From 376da146f62a28505abb98059094247dc27871fc Mon Sep 17 00:00:00 2001
From: Matthew Price <mattprice91@gmail.com>
Date: Sun, 6 Mar 2011 18:28:10 -0500
Subject: [PATCH] Greatly improved how we grab and display show posters on the
 Subscription screen (no longer requires model change).

---
 Classes/CacheDelegate.m                       |   8 +-
 Classes/PresetShowsDelegate.m                 |   8 +-
 Classes/SubscriptionsDelegate.m               |   8 +-
 Classes/TSCollectionView.m                    |  38 ----
 Classes/TVShowsPref.m                         |  13 ++
 Classes/TheTVDB.h                             |   2 +-
 Classes/TheTVDB.m                             |   9 +-
 ...TSCollectionView.h => ValueTransformers.h} |  10 +-
 Classes/ValueTransformers.m                   |  41 +++++
 .../Subscriptions.xcdatamodel/elements        | Bin
 .../Subscriptions.xcdatamodel/layout          | Bin
 .../.xccurrentversion                         |   8 -
 .../Subscriptions 2.xcdatamodel/elements      | Bin 18354 -> 0 bytes
 .../Subscriptions 2.xcdatamodel/layout        | Bin 4027 -> 0 bytes
 Resources/en.lproj/TVShowsPref.xib            | 167 ++++++------------
 TVShows.xcodeproj/project.pbxproj             |  40 ++---
 16 files changed, 134 insertions(+), 218 deletions(-)
 delete mode 100644 Classes/TSCollectionView.m
 rename Classes/{TSCollectionView.h => ValueTransformers.h} (76%)
 create mode 100644 Classes/ValueTransformers.m
 rename Models/{Subscriptions.xcdatamodeld => }/Subscriptions.xcdatamodel/elements (100%)
 rename Models/{Subscriptions.xcdatamodeld => }/Subscriptions.xcdatamodel/layout (100%)
 delete mode 100644 Models/Subscriptions.xcdatamodeld/.xccurrentversion
 delete mode 100644 Models/Subscriptions.xcdatamodeld/Subscriptions 2.xcdatamodel/elements
 delete mode 100644 Models/Subscriptions.xcdatamodeld/Subscriptions 2.xcdatamodel/layout

diff --git a/Classes/CacheDelegate.m b/Classes/CacheDelegate.m
index 6707917..31948f4 100644
--- a/Classes/CacheDelegate.m
+++ b/Classes/CacheDelegate.m
@@ -69,18 +69,12 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator
 		}
 	}
 	
-	// Ignoring persistent versioning is bad. We should change this later...
-	NSMutableDictionary *options = [NSMutableDictionary dictionary];
-	[options setObject:[NSNumber numberWithBool:YES] forKey:NSMigratePersistentStoresAutomaticallyOption];
-	[options setObject:[NSNumber numberWithBool:YES] forKey:NSIgnorePersistentStoreVersioningOption];
-//	[options setObject:[NSNumber numberWithBool:YES] forKey:NSInferMappingModelAutomaticallyOption];
-	
 	NSURL *url = [NSURL fileURLWithPath: [applicationSupportDirectory stringByAppendingPathComponent: @"Cache"]];
 	persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: mom];
 	if (![persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType
 												  configuration:nil
 															URL:url
-														options:options
+														options:nil
 														  error:&error]){
 		[[NSApplication sharedApplication] presentError:error];
 		[persistentStoreCoordinator release], persistentStoreCoordinator = nil;
diff --git a/Classes/PresetShowsDelegate.m b/Classes/PresetShowsDelegate.m
index 424e6a9..44a4b1f 100644
--- a/Classes/PresetShowsDelegate.m
+++ b/Classes/PresetShowsDelegate.m
@@ -69,18 +69,12 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator
 		}
 	}
 	
-	// Ignoring persistent versioning is bad. We should change this later...
-	NSMutableDictionary *options = [NSMutableDictionary dictionary];
-	[options setObject:[NSNumber numberWithBool:YES] forKey:NSMigratePersistentStoresAutomaticallyOption];
-	[options setObject:[NSNumber numberWithBool:YES] forKey:NSIgnorePersistentStoreVersioningOption];
-//	[options setObject:[NSNumber numberWithBool:YES] forKey:NSInferMappingModelAutomaticallyOption];
-	
 	NSURL *url = [NSURL fileURLWithPath: [applicationSupportDirectory stringByAppendingPathComponent: @"Preset Shows"]];
 	persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: mom];
 	if (![persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType
 												  configuration:nil
 															URL:url
-														options:options
+														options:nil
 														  error:&error]){
 		[[NSApplication sharedApplication] presentError:error];
 		[persistentStoreCoordinator release], persistentStoreCoordinator = nil;
diff --git a/Classes/SubscriptionsDelegate.m b/Classes/SubscriptionsDelegate.m
index 39355a6..de804c2 100644
--- a/Classes/SubscriptionsDelegate.m
+++ b/Classes/SubscriptionsDelegate.m
@@ -70,18 +70,12 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator
 		}
 	}
 	
-	// Ignoring persistent versioning is bad. We should change this later...
-	NSMutableDictionary *options = [NSMutableDictionary dictionary];
-	[options setObject:[NSNumber numberWithBool:YES] forKey:NSMigratePersistentStoresAutomaticallyOption];
-	[options setObject:[NSNumber numberWithBool:YES] forKey:NSIgnorePersistentStoreVersioningOption];
-//	[options setObject:[NSNumber numberWithBool:YES] forKey:NSInferMappingModelAutomaticallyOption];
-	
 	NSURL *url = [NSURL fileURLWithPath: [applicationSupportDirectory stringByAppendingPathComponent: @"Subscriptions"]];
 	persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: mom];
 	if (![persistentStoreCoordinator addPersistentStoreWithType:NSXMLStoreType
 												  configuration:nil
 															URL:url
-														options:options
+														options:nil
 														  error:&error]){
 		[[NSApplication sharedApplication] presentError:error];
 		[persistentStoreCoordinator release], persistentStoreCoordinator = nil;
diff --git a/Classes/TSCollectionView.m b/Classes/TSCollectionView.m
deleted file mode 100644
index 4b0d27e..0000000
--- a/Classes/TSCollectionView.m
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *	This file is part of the TVShows 2 ("Phoenix") source code.
- *	http://github.com/mattprice/TVShows/
- *
- *	TVShows is free software: you can redistribute it and/or modify
- *	it under the terms of the GNU General Public License as published by
- *	the Free Software Foundation, either version 3 of the License, or
- *	(at your option) any later version.
- *
- *	You should have received a copy of the GNU General Public License
- *	along with TVShows. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#import "TSCollectionView.h"
-#import "TheTVDB.h"
-
-
-@implementation TSCollectionView
-
-- (NSCollectionViewItem *)newItemForRepresentedObject:(id)object
-{
-	
-    // Get a copy of the item prototype, set represented object.
-    NSCollectionViewItem *newItem = [[self itemPrototype] copy];
-    [newItem setRepresentedObject:object];
-	
-    // Set the show poster now that we have the object
-	[object setValue:[TheTVDB getPosterForShow:[object valueForKey:@"name"]
-									withHeight:96
-									 withWidth:66] forKey:@"showPoster"];
-	
-	// Return the newly created CollectionViewItem
-    return newItem;
-}
-
-@end
diff --git a/Classes/TVShowsPref.m b/Classes/TVShowsPref.m
index 12e1d9d..3858e40 100644
--- a/Classes/TVShowsPref.m
+++ b/Classes/TVShowsPref.m
@@ -15,12 +15,25 @@
 #import "TVShowsPref.h"
 #import "TSUserDefaults.h"
 #import "AppInfoConstants.h"
+#import "ValueTransformers.h"
 
 
 @implementation TVShowsPref
 
 @synthesize releaseNotesURL;
 
+- init
+{
+	if((self = [super init])) {
+		// Initialize any transformers we need to use in Interface Builder.
+		ShowPosterValueTransformer *trOne = [[[ShowPosterValueTransformer alloc] init] autorelease];
+		[NSValueTransformer setValueTransformer:trOne
+										forName:@"ShowPosterValueTransformer"];
+	}
+	
+	return self;
+}
+
 - (void) didSelect
 {
 	NSString *buildVersion = [[[NSBundle bundleWithIdentifier: TVShowsAppDomain] infoDictionary]
diff --git a/Classes/TheTVDB.h b/Classes/TheTVDB.h
index 7853f25..107097d 100644
--- a/Classes/TheTVDB.h
+++ b/Classes/TheTVDB.h
@@ -27,6 +27,6 @@
 
 + (NSString *) getShowStatus:(NSString *)showName;
 + (NSImage *) getPosterForShow:(NSString *)showName withHeight:(float)height withWidth:(float)width;
-+ (NSString *) getPosterPathForShow:(NSString *)showName;
+- (NSImage *) getPosterForShow:(NSString *)showName withHeight:(float)height withWidth:(float)width;
 
 @end
diff --git a/Classes/TheTVDB.m b/Classes/TheTVDB.m
index f17cc23..b4d9225 100644
--- a/Classes/TheTVDB.m
+++ b/Classes/TheTVDB.m
@@ -195,16 +195,11 @@ + (NSImage *) getPosterForShow:(NSString *)showName withHeight:(float)height wit
 	}
 }
 
-+ (NSString *) getPosterPathForShow:(id)showName
+- (NSImage *) getPosterForShow:(NSString *)showName withHeight:(float)height withWidth:(float)width
 {
-	// Tell the app to download a poster (if needed) like normal...
-	[self getPosterForShow:showName withHeight:96 withWidth:66];
-	
-	// But return the path to the poster instead of an NSImage.
-	return [[[self applicationCacheDirectory] stringByAppendingPathComponent:showName] stringByAppendingFormat:@".jpg"];
+	return [[TheTVDB class] getPosterForShow:showName withHeight:height withWidth:width];
 }
 
-
 - (void) dealloc
 {
 	[serverTime release];
diff --git a/Classes/TSCollectionView.h b/Classes/ValueTransformers.h
similarity index 76%
rename from Classes/TSCollectionView.h
rename to Classes/ValueTransformers.h
index 963e032..eec42dd 100644
--- a/Classes/TSCollectionView.h
+++ b/Classes/ValueTransformers.h
@@ -12,13 +12,15 @@
  *
  */
 
-
 #import <Cocoa/Cocoa.h>
 
 
-@interface TSCollectionView : NSCollectionView
-{
-
+@interface ShowPosterValueTransformer : NSValueTransformer {
+	
 }
 
++ (Class) transformedValueClass;
++ (BOOL) allowsReverseTransformation;
+- (id) transformedValue:(id)value;
+
 @end
diff --git a/Classes/ValueTransformers.m b/Classes/ValueTransformers.m
new file mode 100644
index 0000000..1694b53
--- /dev/null
+++ b/Classes/ValueTransformers.m
@@ -0,0 +1,41 @@
+/*
+ *	This file is part of the TVShows 2 ("Phoenix") source code.
+ *	http://github.com/mattprice/TVShows/
+ *
+ *	TVShows is free software: you can redistribute it and/or modify
+ *	it under the terms of the GNU General Public License as published by
+ *	the Free Software Foundation, either version 3 of the License, or
+ *	(at your option) any later version.
+ *
+ *	You should have received a copy of the GNU General Public License
+ *	along with TVShows. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#import "ValueTransformers.h"
+#import "TheTVDB.h"
+
+
+@implementation ShowPosterValueTransformer
+
++ (Class) transformedValueClass;
+{
+	return [NSImage class];
+}
+
++ (BOOL) allowsReverseTransformation
+{
+    return NO;
+}
+
+- (id) transformedValue:(id)value
+{
+	// For some reason, we sometimes receive nil values.
+	// Those will crash the program if we aren't careful.
+	if (value == nil) return nil;
+	
+	NSImage *showPoster = [[TheTVDB class] getPosterForShow:value withHeight:96 withWidth:66];
+	return showPoster;
+}
+
+@end
diff --git a/Models/Subscriptions.xcdatamodeld/Subscriptions.xcdatamodel/elements b/Models/Subscriptions.xcdatamodel/elements
similarity index 100%
rename from Models/Subscriptions.xcdatamodeld/Subscriptions.xcdatamodel/elements
rename to Models/Subscriptions.xcdatamodel/elements
diff --git a/Models/Subscriptions.xcdatamodeld/Subscriptions.xcdatamodel/layout b/Models/Subscriptions.xcdatamodel/layout
similarity index 100%
rename from Models/Subscriptions.xcdatamodeld/Subscriptions.xcdatamodel/layout
rename to Models/Subscriptions.xcdatamodel/layout
diff --git a/Models/Subscriptions.xcdatamodeld/.xccurrentversion b/Models/Subscriptions.xcdatamodeld/.xccurrentversion
deleted file mode 100644
index 817c43a..0000000
--- a/Models/Subscriptions.xcdatamodeld/.xccurrentversion
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>_XCCurrentVersionName</key>
-	<string>Subscriptions 2.xcdatamodel</string>
-</dict>
-</plist>
diff --git a/Models/Subscriptions.xcdatamodeld/Subscriptions 2.xcdatamodel/elements b/Models/Subscriptions.xcdatamodeld/Subscriptions 2.xcdatamodel/elements
deleted file mode 100644
index f872a03e3edabfd7d194f3d0f7e49b192671ccf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18354
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
EAE|Lv{r~^~

diff --git a/Models/Subscriptions.xcdatamodeld/Subscriptions 2.xcdatamodel/layout b/Models/Subscriptions.xcdatamodeld/Subscriptions 2.xcdatamodel/layout
deleted file mode 100644
index 91e1208d51e62f8950f67b4b74eaf3a765eefcfe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4027
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
U{n|Q?fnm~5QkQ;a{?%{)2dZ|%z5oCK

diff --git a/Resources/en.lproj/TVShowsPref.xib b/Resources/en.lproj/TVShowsPref.xib
index f486363..a7e626b 100644
--- a/Resources/en.lproj/TVShowsPref.xib
+++ b/Resources/en.lproj/TVShowsPref.xib
@@ -3,7 +3,7 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">10J567</string>
-		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.InterfaceBuilderVersion">823</string>
 		<string key="IBDocument.AppKitVersion">1038.35</string>
 		<string key="IBDocument.HIToolboxVersion">462.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
@@ -15,7 +15,7 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>788</string>
+				<string>823</string>
 				<string>1.2.5</string>
 			</object>
 		</object>
@@ -30,13 +30,8 @@
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="409411428">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -370,7 +365,7 @@
 															<object class="NSCollectionView" id="447295497">
 																<reference key="NSNextResponder" ref="454151064"/>
 																<int key="NSvFlags">274</int>
-																<string key="NSFrameSize">{489, 309}</string>
+																<string key="NSFrameSize">{490, 309}</string>
 																<reference key="NSSuperview" ref="454151064"/>
 																<string key="NSMinGridSize">{0, 0}</string>
 																<string key="NSMaxGridSize">{0, 0}</string>
@@ -387,7 +382,7 @@
 																<int key="NSDraggingSourceMaskForNonLocal">0</int>
 															</object>
 														</object>
-														<string key="NSFrameSize">{489, 309}</string>
+														<string key="NSFrameSize">{490, 309}</string>
 														<reference key="NSSuperview" ref="325784506"/>
 														<reference key="NSNextKeyView" ref="447295497"/>
 														<reference key="NSDocView" ref="447295497"/>
@@ -397,7 +392,7 @@
 													<object class="NSScroller" id="813474239">
 														<reference key="NSNextResponder" ref="325784506"/>
 														<int key="NSvFlags">-2147483392</int>
-														<string key="NSFrame">{{474.5, 0}, {15, 295}}</string>
+														<string key="NSFrame">{{475, 0}, {15, 294}}</string>
 														<reference key="NSSuperview" ref="325784506"/>
 														<reference key="NSTarget" ref="325784506"/>
 														<string key="NSAction">_doScroller:</string>
@@ -407,7 +402,7 @@
 													<object class="NSScroller" id="386281777">
 														<reference key="NSNextResponder" ref="325784506"/>
 														<int key="NSvFlags">-2147483392</int>
-														<string key="NSFrame">{{0, 295}, {474.5, 15}}</string>
+														<string key="NSFrame">{{-100, -100}, {475, 15}}</string>
 														<reference key="NSSuperview" ref="325784506"/>
 														<int key="NSsFlags">1</int>
 														<reference key="NSTarget" ref="325784506"/>
@@ -415,10 +410,10 @@
 														<double key="NSPercent">0.63157892227172852</double>
 													</object>
 												</object>
-												<string key="NSFrame">{{0, -3}, {489, 309}}</string>
+												<string key="NSFrame">{{-3, -3}, {490, 309}}</string>
 												<reference key="NSSuperview" ref="1035194241"/>
 												<reference key="NSNextKeyView" ref="454151064"/>
-												<int key="NSsFlags">560</int>
+												<int key="NSsFlags">528</int>
 												<reference key="NSVScroller" ref="813474239"/>
 												<reference key="NSHScroller" ref="386281777"/>
 												<reference key="NSContentView" ref="454151064"/>
@@ -1352,7 +1347,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<object class="NSView" key="NSWindowView" id="241592026">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1373,7 +1368,6 @@
 							</object>
 							<string key="NSFrame">{{190, 207}, {135, 194}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<bool key="NSViewIsLayerTreeHost">YES</bool>
 							<object class="NSShadow" key="NSViewShadow">
 								<double key="NSShadowHoriz">1</double>
@@ -1416,7 +1410,6 @@
 											<int key="NSvFlags">4352</int>
 											<string key="NSFrameSize">{173, 409}</string>
 											<reference key="NSSuperview" ref="465963800"/>
-											<reference key="NSWindow"/>
 											<int key="NSViewLayerContentsRedrawPolicy">2</int>
 											<bool key="NSEnabled">YES</bool>
 											<object class="_NSCornerView" key="NSCornerView">
@@ -1490,7 +1483,6 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {173, 409}}</string>
 									<reference key="NSSuperview" ref="456449400"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="432545239"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<reference key="NSDocView" ref="432545239"/>
@@ -1502,7 +1494,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{159, 1}, {15, 394}}</string>
 									<reference key="NSSuperview" ref="456449400"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<reference key="NSTarget" ref="456449400"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1513,7 +1504,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 395}, {158, 15}}</string>
 									<reference key="NSSuperview" ref="456449400"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="456449400"/>
@@ -1523,7 +1513,6 @@
 							</object>
 							<string key="NSFrameSize">{175, 411}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="465963800"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<int key="NSsFlags">562</int>
@@ -1537,7 +1526,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{549, 15}, {100, 25}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="989689781">
@@ -1559,7 +1547,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{441, 15}, {100, 25}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="810617944">
@@ -1591,7 +1578,6 @@
 											<int key="NSvFlags">4352</int>
 											<string key="NSFrameSize">{457, 128}</string>
 											<reference key="NSSuperview" ref="296058340"/>
-											<reference key="NSWindow"/>
 											<int key="NSViewLayerContentsRedrawPolicy">2</int>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="778812733">
@@ -1599,7 +1585,6 @@
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{457, 17}</string>
 												<reference key="NSSuperview" ref="444946804"/>
-												<reference key="NSWindow"/>
 												<int key="NSViewLayerContentsRedrawPolicy">2</int>
 												<reference key="NSTableView" ref="881577092"/>
 											</object>
@@ -1608,7 +1593,6 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{443, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="900080676"/>
-												<reference key="NSWindow"/>
 												<int key="NSViewLayerContentsRedrawPolicy">2</int>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
@@ -1781,7 +1765,6 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {457, 128}}</string>
 									<reference key="NSSuperview" ref="900080676"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="881577092"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<reference key="NSDocView" ref="881577092"/>
@@ -1793,7 +1776,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{443, 17}, {15, 113}}</string>
 									<reference key="NSSuperview" ref="900080676"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<reference key="NSTarget" ref="900080676"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1804,7 +1786,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 130}, {442, 15}}</string>
 									<reference key="NSSuperview" ref="900080676"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="900080676"/>
@@ -1820,7 +1801,6 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {457, 17}}</string>
 									<reference key="NSSuperview" ref="900080676"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="778812733"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<reference key="NSDocView" ref="778812733"/>
@@ -1831,7 +1811,6 @@
 							</object>
 							<string key="NSFrame">{{190, 53}, {459, 146}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="296058340"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<int key="NSsFlags">562</int>
@@ -1847,7 +1826,6 @@
 							<int key="NSvFlags">-2147483381</int>
 							<string key="NSFrame">{{519, 206}, {130, 19}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1043348334">
@@ -1873,7 +1851,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{188, 19}, {231, 18}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="795820203">
@@ -1902,7 +1879,6 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{7, 9}, {161, 22}}</string>
 									<reference key="NSSuperview" ref="73267891"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSearchFieldCell" key="NSCell" id="867960039">
@@ -1966,7 +1942,6 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{173, 10}, {499, 19}}</string>
 									<reference key="NSSuperview" ref="73267891"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSTextFieldCell" key="NSCell" id="409384117">
@@ -1987,7 +1962,6 @@
 							</object>
 							<string key="NSFrame">{{0, 410}, {669, 40}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<object class="NSColor" key="BWGBFillStartingColor">
 								<int key="NSColorSpace">1</int>
@@ -2021,7 +1995,6 @@
 							<int key="NSvFlags">-2147483380</int>
 							<string key="NSFrame">{{377, 209}, {65, 13}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<bool key="NSViewIsLayerTreeHost">YES</bool>
 							<double key="NSViewAlphaValue">0.30000001192092896</double>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
@@ -2040,7 +2013,6 @@
 							<int key="NSvFlags">-2147483380</int>
 							<string key="NSFrame">{{378, 209}, {40, 13}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<bool key="NSViewIsLayerTreeHost">YES</bool>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<bool key="NSEnabled">YES</bool>
@@ -2058,7 +2030,6 @@
 							<int key="NSvFlags">-2147483380</int>
 							<string key="NSFrame">{{330, 209}, {42, 14}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="972123786">
@@ -2084,9 +2055,8 @@
 										<object class="NSTextView" id="993814608">
 											<reference key="NSNextResponder" ref="560160419"/>
 											<int key="NSvFlags">2322</int>
-											<string key="NSFrameSize">{316, 112}</string>
+											<string key="NSFrame">{{0, 34}, {316, 78}}</string>
 											<reference key="NSSuperview" ref="560160419"/>
-											<reference key="NSWindow"/>
 											<int key="NSViewLayerContentsRedrawPolicy">2</int>
 											<object class="NSTextContainer" key="NSTextContainer" id="1006128716">
 												<object class="NSLayoutManager" key="NSLayoutManager">
@@ -2176,7 +2146,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 									</object>
 									<string key="NSFrameSize">{316, 192}</string>
 									<reference key="NSSuperview" ref="868051296"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="993814608"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<reference key="NSDocView" ref="993814608"/>
@@ -2189,7 +2158,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{300, 1}, {15, 166}}</string>
 									<reference key="NSSuperview" ref="868051296"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<reference key="NSTarget" ref="868051296"/>
 									<string key="NSAction">_doScroller:</string>
@@ -2201,7 +2169,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="868051296"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="868051296"/>
@@ -2212,7 +2179,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 							</object>
 							<string key="NSFrame">{{333, 209}, {316, 192}}</string>
 							<reference key="NSSuperview" ref="241592026"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="560160419"/>
 							<int key="NSViewLayerContentsRedrawPolicy">2</int>
 							<int key="NSsFlags">528</int>
@@ -2222,8 +2188,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 						</object>
 					</object>
 					<string key="NSFrameSize">{669, 450}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<int key="NSViewLayerContentsRedrawPolicy">2</int>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
@@ -3894,7 +3858,7 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<object class="NSView" key="NSWindowView" id="362435439">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3908,7 +3872,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 									<int key="NSvFlags">265</int>
 									<string key="NSFrame">{{445, 386}, {100, 25}}</string>
 									<reference key="NSSuperview" ref="849076746"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="96944145">
@@ -3940,7 +3903,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{15, 39}, {167, 17}}</string>
 													<reference key="NSSuperview" ref="900772342"/>
-													<reference key="NSWindow"/>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTextFieldCell" key="NSCell" id="706901831">
 														<int key="NSCellFlags">68288064</int>
@@ -3957,7 +3919,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{184, 39}, {184, 17}}</string>
 													<reference key="NSSuperview" ref="900772342"/>
-													<reference key="NSWindow"/>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTextFieldCell" key="NSCell" id="903646714">
 														<int key="NSCellFlags">68288064</int>
@@ -3974,7 +3935,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{15, 14}, {167, 17}}</string>
 													<reference key="NSSuperview" ref="900772342"/>
-													<reference key="NSWindow"/>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTextFieldCell" key="NSCell" id="408413567">
 														<int key="NSCellFlags">68288064</int>
@@ -3991,7 +3951,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{184, 14}, {184, 17}}</string>
 													<reference key="NSSuperview" ref="900772342"/>
-													<reference key="NSWindow"/>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTextFieldCell" key="NSCell" id="11049408">
 														<int key="NSCellFlags">68288064</int>
@@ -4006,12 +3965,10 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 											</object>
 											<string key="NSFrame">{{1, 1}, {383, 61}}</string>
 											<reference key="NSSuperview" ref="408645204"/>
-											<reference key="NSWindow"/>
 										</object>
 									</object>
 									<string key="NSFrame">{{163, 32}, {385, 77}}</string>
 									<reference key="NSSuperview" ref="849076746"/>
-									<reference key="NSWindow"/>
 									<string key="NSOffsets">{0, 0}</string>
 									<object class="NSTextFieldCell" key="NSTitleCell">
 										<int key="NSCellFlags">67239424</int>
@@ -4035,7 +3992,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 									<int key="NSvFlags">265</int>
 									<string key="NSFrame">{{337, 386}, {100, 25}}</string>
 									<reference key="NSSuperview" ref="849076746"/>
-									<reference key="NSWindow"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="186825478">
@@ -4067,7 +4023,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 													<int key="NSvFlags">4352</int>
 													<string key="NSFrameSize">{523, 128}</string>
 													<reference key="NSSuperview" ref="766966216"/>
-													<reference key="NSWindow"/>
 													<int key="NSViewLayerContentsRedrawPolicy">2</int>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTableHeaderView" key="NSHeaderView" id="274718854">
@@ -4075,7 +4030,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 														<int key="NSvFlags">256</int>
 														<string key="NSFrameSize">{523, 17}</string>
 														<reference key="NSSuperview" ref="15563609"/>
-														<reference key="NSWindow"/>
 														<int key="NSViewLayerContentsRedrawPolicy">2</int>
 														<reference key="NSTableView" ref="78190003"/>
 													</object>
@@ -4084,7 +4038,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 														<int key="NSvFlags">-2147483392</int>
 														<string key="NSFrame">{{509, 0}, {16, 17}}</string>
 														<reference key="NSSuperview" ref="590746428"/>
-														<reference key="NSWindow"/>
 														<int key="NSViewLayerContentsRedrawPolicy">2</int>
 													</object>
 													<object class="NSMutableArray" key="NSTableColumns">
@@ -4295,7 +4248,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 											</object>
 											<string key="NSFrame">{{1, 17}, {523, 128}}</string>
 											<reference key="NSSuperview" ref="590746428"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="78190003"/>
 											<int key="NSViewLayerContentsRedrawPolicy">2</int>
 											<reference key="NSDocView" ref="78190003"/>
@@ -4307,7 +4259,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{509, 17}, {15, 113}}</string>
 											<reference key="NSSuperview" ref="590746428"/>
-											<reference key="NSWindow"/>
 											<int key="NSViewLayerContentsRedrawPolicy">2</int>
 											<reference key="NSTarget" ref="590746428"/>
 											<string key="NSAction">_doScroller:</string>
@@ -4318,7 +4269,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{1, 130}, {508, 15}}</string>
 											<reference key="NSSuperview" ref="590746428"/>
-											<reference key="NSWindow"/>
 											<int key="NSViewLayerContentsRedrawPolicy">2</int>
 											<int key="NSsFlags">1</int>
 											<reference key="NSTarget" ref="590746428"/>
@@ -4334,7 +4284,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 											</object>
 											<string key="NSFrame">{{1, 0}, {523, 17}}</string>
 											<reference key="NSSuperview" ref="590746428"/>
-											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="274718854"/>
 											<int key="NSViewLayerContentsRedrawPolicy">2</int>
 											<reference key="NSDocView" ref="274718854"/>
@@ -4345,7 +4294,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 									</object>
 									<string key="NSFrame">{{20, 227}, {525, 146}}</string>
 									<reference key="NSSuperview" ref="849076746"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="766966216"/>
 									<int key="NSViewLayerContentsRedrawPolicy">2</int>
 									<int key="NSsFlags">562</int>
@@ -4361,7 +4309,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{163, 17}, {385, 18}}</string>
 									<reference key="NSSuperview" ref="849076746"/>
-									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSTextFieldCell" key="NSCell" id="711014479">
 										<int key="NSCellFlags">67239424</int>
@@ -4388,7 +4335,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{16, 32}, {351, 18}}</string>
 													<reference key="NSSuperview" ref="441060820"/>
-													<reference key="NSWindow"/>
 													<int key="NSViewLayerContentsRedrawPolicy">2</int>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSButtonCell" key="NSCell" id="253806778">
@@ -4412,7 +4358,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{16, 12}, {351, 18}}</string>
 													<reference key="NSSuperview" ref="441060820"/>
-													<reference key="NSWindow"/>
 													<int key="NSViewLayerContentsRedrawPolicy">2</int>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSButtonCell" key="NSCell" id="648923767">
@@ -4434,12 +4379,10 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 											</object>
 											<string key="NSFrame">{{1, 1}, {383, 58}}</string>
 											<reference key="NSSuperview" ref="634754353"/>
-											<reference key="NSWindow"/>
 										</object>
 									</object>
 									<string key="NSFrame">{{163, 113}, {385, 74}}</string>
 									<reference key="NSSuperview" ref="849076746"/>
-									<reference key="NSWindow"/>
 									<string key="NSOffsets">{0, 0}</string>
 									<object class="NSTextFieldCell" key="NSTitleCell">
 										<int key="NSCellFlags">67239424</int>
@@ -4475,7 +4418,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 									</object>
 									<string key="NSFrame">{{20, 17}, {138, 199}}</string>
 									<reference key="NSSuperview" ref="849076746"/>
-									<reference key="NSWindow"/>
 									<bool key="NSViewIsLayerTreeHost">YES</bool>
 									<object class="NSShadow" key="NSViewShadow">
 										<double key="NSShadowHoriz">2</double>
@@ -4502,7 +4444,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 							</object>
 							<string key="NSFrameSize">{565, 426}</string>
 							<reference key="NSSuperview" ref="362435439"/>
-							<reference key="NSWindow"/>
 							<object class="NSColor" key="BWGBFillStartingColor">
 								<int key="NSColorSpace">2</int>
 								<bytes key="NSRGB">MC45Mjk0MTE4Mjg1IDAuOTI5NDExODI4NSAwLjkyOTQxMTgyODUAA</bytes>
@@ -4532,8 +4473,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 						</object>
 					</object>
 					<string key="NSFrameSize">{565, 426}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<int key="NSViewLayerContentsRedrawPolicy">2</int>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
@@ -4679,8 +4618,9 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<object class="NSButton" id="516368037">
 						<reference key="NSNextResponder" ref="1073573348"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{-4, -3}, {126, 141}}</string>
+						<string key="NSFrame">{{-5, -6}, {126, 141}}</string>
 						<reference key="NSSuperview" ref="1073573348"/>
+						<int key="NSViewLayerContentsRedrawPolicy">2</int>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="436780844">
 							<int key="NSCellFlags">67239424</int>
@@ -4701,6 +4641,7 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{-3, 0}, {123, 28}}</string>
 						<reference key="NSSuperview" ref="1073573348"/>
+						<int key="NSViewLayerContentsRedrawPolicy">2</int>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="266235255">
 							<int key="NSCellFlags">67239424</int>
@@ -4756,6 +4697,7 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 				</object>
 				<string key="NSFrameSize">{117, 135}</string>
 				<reference key="NSSuperview"/>
+				<int key="NSViewLayerContentsRedrawPolicy">2</int>
 			</object>
 			<object class="NSCustomObject" id="890328359">
 				<string key="NSClassName">SUUpdaterSubclass</string>
@@ -4772,9 +4714,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 			<object class="NSCustomObject" id="777393052">
 				<string key="NSClassName">CustomRSSController</string>
 			</object>
-			<object class="NSCustomObject" id="433475855">
-				<string key="NSClassName">TSCollectionView</string>
-			</object>
 			<object class="NSCustomObject" id="321551853">
 				<string key="NSClassName">PresetShowsDelegate</string>
 			</object>
@@ -4817,6 +4756,7 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>displayName</string>
+					<string>re</string>
 				</object>
 				<bool key="NSEditable">YES</bool>
 				<bool key="NSAutomaticallyPreparesContent">YES</bool>
@@ -5987,14 +5927,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					</object>
 					<int key="connectionID">2008</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">showPoster</string>
-						<reference key="source" ref="433475855"/>
-						<reference key="destination" ref="126047570"/>
-					</object>
-					<int key="connectionID">2010</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">PTArrayController</string>
@@ -6013,23 +5945,34 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: representedObject.showPoster</string>
+						<string key="label">value: representedObject.name</string>
 						<reference key="source" ref="126047570"/>
 						<reference key="destination" ref="465742794"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="126047570"/>
 							<reference key="NSDestination" ref="465742794"/>
-							<string key="NSLabel">value: representedObject.showPoster</string>
+							<string key="NSLabel">value: representedObject.name</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">representedObject.showPoster</string>
+							<string key="NSKeyPath">representedObject.name</string>
 							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSConditionallySetsEnabled</string>
-								<boolean value="NO" key="NS.object.0"/>
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSConditionallySetsEnabled</string>
+									<string>NSRaisesForNotApplicableKeys</string>
+									<string>NSValueTransformerName</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<boolean value="NO"/>
+									<boolean value="NO"/>
+									<string>ShowPosterValueTransformer</string>
+								</object>
 							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">2027</int>
+					<int key="connectionID">2112</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -6037,7 +5980,9 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="409411428"/>
 						<nil key="parent"/>
 					</object>
@@ -7583,12 +7528,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 						<reference key="object" ref="1019841435"/>
 						<reference key="parent" ref="773782199"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2009</int>
-						<reference key="object" ref="433475855"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Collection View</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">102</int>
 						<reference key="object" ref="890473180"/>
@@ -8395,9 +8334,9 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<string>153.IBPluginDependency</string>
 					<string>154.IBPluginDependency</string>
 					<string>1540.IBPluginDependency</string>
+					<string>1540.IBViewBoundsToFrameTransform</string>
 					<string>1541.IBPluginDependency</string>
 					<string>1542.IBPluginDependency</string>
-					<string>1543.CustomClassName</string>
 					<string>1543.IBCollectionViewIntegration.primaryColor</string>
 					<string>1543.IBPluginDependency</string>
 					<string>1544.IBPluginDependency</string>
@@ -8407,6 +8346,7 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<string>155.IBPluginDependency</string>
 					<string>1556.CustomClassName</string>
 					<string>1556.IBPluginDependency</string>
+					<string>1556.IBViewBoundsToFrameTransform</string>
 					<string>1557.IBPluginDependency</string>
 					<string>1590.IBPluginDependency</string>
 					<string>1590.IBViewIntegration.shadowBlurRadius</string>
@@ -8415,6 +8355,7 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<string>1590.IBViewIntegration.shadowOffsetWidth</string>
 					<string>1591.IBPluginDependency</string>
 					<string>1594.IBPluginDependency</string>
+					<string>1594.IBViewBoundsToFrameTransform</string>
 					<string>1595.IBPluginDependency</string>
 					<string>1611.IBEditorWindowLastContentRect</string>
 					<string>1611.IBPluginDependency</string>
@@ -8488,6 +8429,7 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<string>1875.IBPluginDependency</string>
 					<string>1876.IBPluginDependency</string>
 					<string>1889.IBPluginDependency</string>
+					<string>1889.IBViewBoundsToFrameTransform</string>
 					<string>1889.IBViewIntegration.shadowBlurRadius</string>
 					<string>1889.IBViewIntegration.shadowColor</string>
 					<string>1889.IBViewIntegration.shadowOffsetHeight</string>
@@ -8758,9 +8700,11 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAADBuAAAw5gAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>TSCollectionView</string>
 					<reference ref="439357951"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -8771,11 +8715,14 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 						</object>
 					</object>
-					<string>{{548, 180}, {117, 135}}</string>
+					<string>{{417, 574}, {117, 135}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>BWInsetTextField</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAADAQAAAw4oAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<real value="1"/>
@@ -8784,6 +8731,9 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<real value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAADAoAAAwwUAAA</bytes>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{366, 216}, {565, 426}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -8865,6 +8815,9 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AUGwAABDi4AAA</bytes>
+					</object>
 					<real value="1"/>
 					<reference ref="74346578"/>
 					<real value="-1"/>
@@ -9031,7 +8984,7 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">2027</int>
+			<int key="maxID">2112</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -9738,14 +9691,6 @@ bW1vZG8gY29uc2VxdWF0Lg</bytes>
 						<string key="minorKey">Classes/SubscriptionsDelegate.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">TSCollectionView</string>
-					<string key="superclassName">NSCollectionView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Classes/TSCollectionView.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">TVShowsPref</string>
 					<string key="superclassName">NSPreferencePane</string>
diff --git a/TVShows.xcodeproj/project.pbxproj b/TVShows.xcodeproj/project.pbxproj
index 7b94fa9..6b311fe 100644
--- a/TVShows.xcodeproj/project.pbxproj
+++ b/TVShows.xcodeproj/project.pbxproj
@@ -18,8 +18,6 @@
 		342A32FB11AA4C8C00C433CD /* CacheDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 342A32F911AA4C8C00C433CD /* CacheDelegate.m */; };
 		342FEC8511E1864000E21FC0 /* hd.png in Resources */ = {isa = PBXBuildFile; fileRef = 342FEC8411E1864000E21FC0 /* hd.png */; };
 		343BF4CE1183DB3C008CE71D /* RSS-Large.png in Resources */ = {isa = PBXBuildFile; fileRef = 34EB966F118384DB005825C1 /* RSS-Large.png */; };
-		343D1BED1321C8D6001D9043 /* Subscriptions.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 343D1BEC1321C8D6001D9043 /* Subscriptions.xcdatamodeld */; };
-		343D1BEE1321C8D6001D9043 /* Subscriptions.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 343D1BEC1321C8D6001D9043 /* Subscriptions.xcdatamodeld */; };
 		3444F2CC11DD186500BF3724 /* Relaunch.m in Sources */ = {isa = PBXBuildFile; fileRef = 3444F2CB11DD186500BF3724 /* Relaunch.m */; };
 		3444F2CD11DD189600BF3724 /* relaunch in Resources */ = {isa = PBXBuildFile; fileRef = 3444F2C311DD182000BF3724 /* relaunch */; };
 		3446722911C155690014C522 /* TVShowsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3446722811C155690014C522 /* TVShowsHelper.m */; };
@@ -34,6 +32,9 @@
 		3452ABE211DADF22000C3AA7 /* Growl.framework in Copy Linked Libraries */ = {isa = PBXBuildFile; fileRef = 3452AB2711DADEFB000C3AA7 /* Growl.framework */; };
 		345BE414119344E10016EA2D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 345BE411119344E10016EA2D /* InfoPlist.strings */; };
 		345CE34F11D9712200C03A9F /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 345CE34E11D9712200C03A9F /* WebKit.framework */; };
+		345EC8DA13235DA400F36BFF /* Subscriptions.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 345EC8D913235DA400F36BFF /* Subscriptions.xcdatamodel */; };
+		345EC8DB13235DA400F36BFF /* Subscriptions.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 345EC8D913235DA400F36BFF /* Subscriptions.xcdatamodel */; };
+		345EC8EE13235E4800F36BFF /* ValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = 345EC8ED13235E4800F36BFF /* ValueTransformers.m */; };
 		3471BB8911ACDF8700A65728 /* TSUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 3471BB8711ACDF8700A65728 /* TSUserDefaults.m */; };
 		3473849E11907678003DFFA0 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3473845E119074C8003DFFA0 /* Sparkle.framework */; };
 		3473849F1190767A003DFFA0 /* Sparkle.framework in Copy Linked Libraries */ = {isa = PBXBuildFile; fileRef = 3473845E119074C8003DFFA0 /* Sparkle.framework */; };
@@ -47,7 +48,6 @@
 		347F1E6911AA090D005A40AA /* PresetShowsDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 347F1E6711AA090D005A40AA /* PresetShowsDelegate.m */; };
 		347F1E6D11AA093C005A40AA /* PresetTorrentsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347F1E6B11AA093C005A40AA /* PresetTorrentsController.m */; };
 		34908BD1119B9C1C00BDFC01 /* SUPublicDSAKey.pem in Resources */ = {isa = PBXBuildFile; fileRef = 34908BD0119B9C1C00BDFC01 /* SUPublicDSAKey.pem */; };
-		349732F312596B0D00417CF0 /* TSCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 349732F212596B0D00417CF0 /* TSCollectionView.m */; };
 		349F2F8311B2E7DB00D10D96 /* NSDate_FeedParserExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 349F2F6511B2E7DB00D10D96 /* NSDate_FeedParserExtensions.m */; };
 		349F2F8511B2E7DB00D10D96 /* NSString_extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 349F2F6711B2E7DB00D10D96 /* NSString_extensions.m */; };
 		349F2F8811B2E7DB00D10D96 /* FPEnclosure.m in Sources */ = {isa = PBXBuildFile; fileRef = 349F2F6A11B2E7DB00D10D96 /* FPEnclosure.m */; };
@@ -191,7 +191,6 @@
 		342A32F811AA4C8C00C433CD /* CacheDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CacheDelegate.h; path = Classes/CacheDelegate.h; sourceTree = "<group>"; };
 		342A32F911AA4C8C00C433CD /* CacheDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CacheDelegate.m; path = Classes/CacheDelegate.m; sourceTree = "<group>"; };
 		342FEC8411E1864000E21FC0 /* hd.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = hd.png; sourceTree = "<group>"; };
-		343D1DA41321E8B5001D9043 /* Subscriptions 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Subscriptions 2.xcdatamodel"; sourceTree = "<group>"; };
 		3444F2C311DD182000BF3724 /* relaunch */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = relaunch; sourceTree = BUILT_PRODUCTS_DIR; };
 		3444F2CB11DD186500BF3724 /* Relaunch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Relaunch.m; path = ../Relaunch.m; sourceTree = "<group>"; };
 		3446722711C155690014C522 /* TVShowsHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVShowsHelper.h; sourceTree = "<group>"; };
@@ -211,6 +210,9 @@
 		3452AB2711DADEFB000C3AA7 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = Frameworks/Growl.framework; sourceTree = "<group>"; };
 		345BE412119344E10016EA2D /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		345CE34E11D9712200C03A9F /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		345EC8D913235DA400F36BFF /* Subscriptions.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; name = Subscriptions.xcdatamodel; path = Models/Subscriptions.xcdatamodel; sourceTree = "<group>"; };
+		345EC8EC13235E4800F36BFF /* ValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValueTransformers.h; sourceTree = "<group>"; };
+		345EC8ED13235E4800F36BFF /* ValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ValueTransformers.m; sourceTree = "<group>"; };
 		346C5BDF11FF6056003830CC /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = Resources/de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		346C5BE011FF605A003830CC /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = Resources/de.lproj/JRFeedbackProvider.strings; sourceTree = "<group>"; };
 		3471BB8611ACDF8700A65728 /* TSUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSUserDefaults.h; sourceTree = "<group>"; };
@@ -226,7 +228,6 @@
 		347AFBD81191207300393565 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		347B35D41210DB6000F4BFF0 /* TheTVDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TheTVDB.h; sourceTree = "<group>"; };
 		347B35D51210DB6000F4BFF0 /* TheTVDB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TheTVDB.m; sourceTree = "<group>"; };
-		347F1E6111A9FA6C005A40AA /* Subscriptions.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = Subscriptions.xcdatamodel; sourceTree = "<group>"; };
 		347F1E6411A9FA96005A40AA /* PresetShows.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; name = PresetShows.xcdatamodel; path = Models/PresetShows.xcdatamodel; sourceTree = "<group>"; };
 		347F1E6611AA090D005A40AA /* PresetShowsDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PresetShowsDelegate.h; path = Classes/PresetShowsDelegate.h; sourceTree = "<group>"; };
 		347F1E6711AA090D005A40AA /* PresetShowsDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PresetShowsDelegate.m; path = Classes/PresetShowsDelegate.m; sourceTree = "<group>"; };
@@ -235,8 +236,6 @@
 		347FC7AB11F6AE1E00E5B353 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = Resources/it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		347FC7AC11F6AE2400E5B353 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = Resources/it.lproj/JRFeedbackProvider.strings; sourceTree = "<group>"; };
 		34908BD0119B9C1C00BDFC01 /* SUPublicDSAKey.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SUPublicDSAKey.pem; path = Resources/SUPublicDSAKey.pem; sourceTree = "<group>"; };
-		349732F112596B0D00417CF0 /* TSCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TSCollectionView.h; sourceTree = "<group>"; };
-		349732F212596B0D00417CF0 /* TSCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSCollectionView.m; sourceTree = "<group>"; };
 		349F2F6411B2E7DB00D10D96 /* NSDate_FeedParserExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDate_FeedParserExtensions.h; sourceTree = "<group>"; };
 		349F2F6511B2E7DB00D10D96 /* NSDate_FeedParserExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSDate_FeedParserExtensions.m; sourceTree = "<group>"; };
 		349F2F6611B2E7DB00D10D96 /* NSString_extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSString_extensions.h; sourceTree = "<group>"; };
@@ -432,7 +431,7 @@
 			children = (
 				342A32F611AA4C6200C433CD /* Cache.xcdatamodel */,
 				347F1E6411A9FA96005A40AA /* PresetShows.xcdatamodel */,
-				343D1BEC1321C8D6001D9043 /* Subscriptions.xcdatamodeld */,
+				345EC8D913235DA400F36BFF /* Subscriptions.xcdatamodel */,
 			);
 			name = Models;
 			sourceTree = "<group>";
@@ -440,8 +439,6 @@
 		3444F29011DD13F700BF3724 /* Subclasses */ = {
 			isa = PBXGroup;
 			children = (
-				349732F112596B0D00417CF0 /* TSCollectionView.h */,
-				349732F212596B0D00417CF0 /* TSCollectionView.m */,
 				340F15F8118FEBDE00A1BD00 /* SUUpdaterSubclass.h */,
 				340F15F9118FEBDE00A1BD00 /* SUUpdaterSubclass.m */,
 				3444F2CB11DD186500BF3724 /* Relaunch.m */,
@@ -659,6 +656,8 @@
 				3471BB8711ACDF8700A65728 /* TSUserDefaults.m */,
 				3419982611A07913003768D5 /* WebsiteFunctions.h */,
 				3419982711A07913003768D5 /* WebsiteFunctions.m */,
+				345EC8EC13235E4800F36BFF /* ValueTransformers.h */,
+				345EC8ED13235E4800F36BFF /* ValueTransformers.m */,
 			);
 			name = "Helper Classes";
 			sourceTree = "<group>";
@@ -842,7 +841,6 @@
 				34FBC60511C0B4B7005D290B /* NSString_extensions.m in Sources */,
 				34FBC60711C0B4BD005D290B /* PreferencesController.m in Sources */,
 				34FBC60811C0B4C1005D290B /* RegexKitLite.m in Sources */,
-				343D1BEE1321C8D6001D9043 /* Subscriptions.xcdatamodeld in Sources */,
 				34FBC60A11C0B4D0005D290B /* SubscriptionsDelegate.m in Sources */,
 				34FBC60E11C0B4DA005D290B /* TSParseXMLFeeds.m in Sources */,
 				34FBC60F11C0B4DB005D290B /* TSRegexFun.m in Sources */,
@@ -852,6 +850,7 @@
 				34FBC69511C0B7CE005D290B /* SUUpdaterSubclass.m in Sources */,
 				3446722911C155690014C522 /* TVShowsHelper.m in Sources */,
 				34EC6DCD11CDA4F8001AEF04 /* PresetShows.xcdatamodel in Sources */,
+				345EC8DB13235DA400F36BFF /* Subscriptions.xcdatamodel in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -871,7 +870,6 @@
 				344AFA3211A4C58D00D9C4E9 /* ESScroller.m in Sources */,
 				344AFA8611A4D19C00D9C4E9 /* ESScrollView.m in Sources */,
 				34EBF4F211A8501A00962FE5 /* SubscriptionsDelegate.m in Sources */,
-				343D1BED1321C8D6001D9043 /* Subscriptions.xcdatamodeld in Sources */,
 				347F1E6511A9FA96005A40AA /* PresetShows.xcdatamodel in Sources */,
 				347F1E6911AA090D005A40AA /* PresetShowsDelegate.m in Sources */,
 				347F1E6D11AA093C005A40AA /* PresetTorrentsController.m in Sources */,
@@ -895,7 +893,8 @@
 				34C5B59111BB3C1500AAE681 /* TSParseXMLFeeds.m in Sources */,
 				344A204211F5470B00026735 /* MBSliderButton.m in Sources */,
 				347B35D61210DB6000F4BFF0 /* TheTVDB.m in Sources */,
-				349732F312596B0D00417CF0 /* TSCollectionView.m in Sources */,
+				345EC8DA13235DA400F36BFF /* Subscriptions.xcdatamodel in Sources */,
+				345EC8EE13235E4800F36BFF /* ValueTransformers.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1233,21 +1232,6 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
-
-/* Begin XCVersionGroup section */
-		343D1BEC1321C8D6001D9043 /* Subscriptions.xcdatamodeld */ = {
-			isa = XCVersionGroup;
-			children = (
-				347F1E6111A9FA6C005A40AA /* Subscriptions.xcdatamodel */,
-				343D1DA41321E8B5001D9043 /* Subscriptions 2.xcdatamodel */,
-			);
-			currentVersion = 343D1DA41321E8B5001D9043 /* Subscriptions 2.xcdatamodel */;
-			name = Subscriptions.xcdatamodeld;
-			path = Models/Subscriptions.xcdatamodeld;
-			sourceTree = "<group>";
-			versionGroupType = wrapper.xcdatamodel;
-		};
-/* End XCVersionGroup section */
 	};
 	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
 }