AppList: modified

xcatsan · Apr 15, 2010 · 7767ca2 · 7767ca2
1 parent 62c1831
commit 7767ca2
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 40 deletions.
diff --git a/AppList/AppList.xcodeproj/project.pbxproj b/AppList/AppList.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
 		256AC3DA0F4B6AC300CF3369 /* AppListAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* AppListAppDelegate.m */; };
 		4C19D0CC1173E5B0006A352C /* ApplicationEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C19D0CB1173E5B0006A352C /* ApplicationEntry.m */; };
+		4C4A13CB11767CFE00016D81 /* ApplicationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A13CA11767CFE00016D81 /* ApplicationCell.m */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
@@ -28,6 +29,8 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		4C19D0CA1173E5B0006A352C /* ApplicationEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationEntry.h; sourceTree = "<group>"; };
 		4C19D0CB1173E5B0006A352C /* ApplicationEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationEntry.m; sourceTree = "<group>"; };
+		4C4A13C911767CFE00016D81 /* ApplicationCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationCell.h; sourceTree = "<group>"; };
+		4C4A13CA11767CFE00016D81 /* ApplicationCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationCell.m; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* AppList-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "AppList-Info.plist"; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* AppList.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AppList.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -51,6 +54,8 @@
 				256AC3D90F4B6AC300CF3369 /* AppListAppDelegate.m */,
 				4C19D0CA1173E5B0006A352C /* ApplicationEntry.h */,
 				4C19D0CB1173E5B0006A352C /* ApplicationEntry.m */,
+				4C4A13C911767CFE00016D81 /* ApplicationCell.h */,
+				4C4A13CA11767CFE00016D81 /* ApplicationCell.m */,
 			);
 			name = Classes;
 			sourceTree = "<group>";
@@ -179,6 +184,7 @@
 				8D11072D0486CEB800E47090 /* main.m in Sources */,
 				256AC3DA0F4B6AC300CF3369 /* AppListAppDelegate.m in Sources */,
 				4C19D0CC1173E5B0006A352C /* ApplicationEntry.m in Sources */,
+				4C4A13CB11767CFE00016D81 /* ApplicationCell.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/AppList/AppListAppDelegate.h b/AppList/AppListAppDelegate.h
@@ -13,6 +13,7 @@
 
 	IBOutlet NSTableView* tableView_;
 	IBOutlet NSArrayController* arrayController_;
+	IBOutlet NSTableColumn* tableColumn_;
 
 	NSMutableArray* appList_;
 }

diff --git a/AppList/AppListAppDelegate.m b/AppList/AppListAppDelegate.m
@@ -9,6 +9,7 @@
 #import "AppListAppDelegate.h"
 
 #import "ApplicationEntry.h"
+#import "ApplicationCell.h"
 
 @implementation AppListAppDelegate
 
@@ -54,6 +55,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
 
 	[tableView_ registerForDraggedTypes:
 	 [NSArray arrayWithObjects:NSFilenamesPboardType, nil]];
+
+	[tableColumn_ setDataCell:[[[ApplicationCell alloc] init] autorelease]];
 }
 
 #pragma mark -
@@ -92,9 +95,7 @@ - (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id <NSDraggingInfo>)info
 	NSArray*filenames = [pboard propertyListForType:NSFilenamesPboardType];
 
 	for (NSString* filename in filenames) {
-		ApplicationEntry* entry = [[[ApplicationEntry alloc] init] autorelease];
-		entry.path = filename;
-//		entry.name = [filename lastPathComponent];
+		ApplicationEntry* entry = [[[ApplicationEntry alloc] initWithPath:filename] autorelease];
 		[arrayController_ insertObject:entry atArrangedObjectIndex:row];
 	}
 

diff --git a/AppList/ApplicationEntry.h b/AppList/ApplicationEntry.h
@@ -18,4 +18,6 @@
 @property (copy) NSString* name;
 @property (copy) NSString* path;
 @property (retain) NSImage* icon;
+
+-(id)initWithPath:(NSString*)aPath;
 @end
diff --git a/AppList/ApplicationEntry.m b/AppList/ApplicationEntry.m
@@ -13,17 +13,47 @@ @implementation ApplicationEntry
 
 @synthesize name, path, icon;
 
--(void)setPath:(NSString *)aPath
+#pragma mark -
+#pragma mark Initialization & Deallocation
+-(id)initWithPath:(NSString*)aPath;
 {
-	[aPath retain];
-	[path release];
-	path = aPath;
+	self = [super init];
+	if (self != nil) {
+		self.path = aPath;
+		NSString* appName;
+		LSCopyDisplayNameForURL((CFURLRef)[NSURL fileURLWithPath:path], (CFStringRef *)&appName);
+
+		if (!appName) {
+			appName = @"(not found)";
+		}
+		self.name = appName;
+
+		self.icon = [[NSWorkspace sharedWorkspace] iconForFile:path];
+		[icon setSize:NSMakeSize(16, 16)];
+	}
+	return self;
+}
+
+- (void) dealloc
+{
+	self.path = nil;
+	self.name = nil;
+	self.icon = nil;
+	[super dealloc];
+}
+
+#pragma mark -
+#pragma mark Accessors
+
+- (id)copyWithZone:(NSZone *)zone
+{
+	ApplicationEntry* entry = [[[self class] allocWithZone:zone] init];
 
-	LSCopyDisplayNameForURL((CFURLRef)[NSURL fileURLWithPath:path], (CFStringRef *)&name);
+	entry.path = [path copyWithZone:zone];
+	entry.name = [name copyWithZone:zone];
+	entry.icon = [icon copyWithZone:zone];
 
-	if (!name) {
-		name = @"(not found)";
-	}
+	return entry;
 }
 
 @end
diff --git a/AppList/English.lproj/MainMenu.xib b/AppList/English.lproj/MainMenu.xib
@@ -12,6 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="536"/>
 			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -1314,9 +1315,6 @@
 				</object>
 				<string key="NSName">_NSMainMenu</string>
 			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
 			<object class="NSWindowTemplate" id="972006081">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
@@ -1346,22 +1344,19 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{367, 190}</string>
 											<reference key="NSSuperview" ref="70107259"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="84217362">
 												<reference key="NSNextResponder" ref="940491372"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{367, 17}</string>
 												<reference key="NSSuperview" ref="940491372"/>
-												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="118153432"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="1023461112">
 												<reference key="NSNextResponder" ref="738471903"/>
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="738471903"/>
-												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1451,7 +1446,6 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {367, 190}}</string>
 									<reference key="NSSuperview" ref="738471903"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="118153432"/>
 									<reference key="NSDocView" ref="118153432"/>
 									<reference key="NSBGColor" ref="208638811"/>
@@ -1462,7 +1456,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 									<reference key="NSSuperview" ref="738471903"/>
-									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="738471903"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.99476438760757446</double>
@@ -1472,7 +1465,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {367, 15}}</string>
 									<reference key="NSSuperview" ref="738471903"/>
-									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="738471903"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1487,7 +1479,6 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {367, 17}}</string>
 									<reference key="NSSuperview" ref="738471903"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="84217362"/>
 									<reference key="NSDocView" ref="84217362"/>
 									<reference key="NSBGColor" ref="208638811"/>
@@ -1497,7 +1488,6 @@
 							</object>
 							<string key="NSFrame">{{20, 48}, {369, 208}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="70107259"/>
 							<int key="NSsFlags">530</int>
 							<reference key="NSVScroller" ref="994067818"/>
@@ -1512,7 +1502,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 264}, {416, 17}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="664973123">
 								<int key="NSCellFlags">68288064</int>
@@ -1534,7 +1523,6 @@
 							<int key="NSvFlags">260</int>
 							<string key="NSFrame">{{20, 19}, {23, 22}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="594828877">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1559,7 +1547,6 @@
 							<int key="NSvFlags">260</int>
 							<string key="NSFrame">{{42, 19}, {23, 22}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="138229259">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1582,11 +1569,13 @@
 					</object>
 					<string key="NSFrameSize">{409, 301}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
+			<object class="NSCustomObject" id="755631768">
+				<string key="NSClassName">NSFontManager</string>
+			</object>
 			<object class="NSCustomObject" id="976324537">
 				<string key="NSClassName">AppListAppDelegate</string>
 			</object>
@@ -2345,17 +2334,33 @@
 					</object>
 					<int key="connectionID">572</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">arrayController_</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="170240774"/>
+					</object>
+					<int key="connectionID">574</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tableColumn_</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="427243853"/>
+					</object>
+					<int key="connectionID">575</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.name</string>
+						<string key="label">value: arrangedObjects</string>
 						<reference key="source" ref="427243853"/>
 						<reference key="destination" ref="170240774"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="427243853"/>
 							<reference key="NSDestination" ref="170240774"/>
-							<string key="NSLabel">value: arrangedObjects.name</string>
+							<string key="NSLabel">value: arrangedObjects</string>
 							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.name</string>
+							<string key="NSKeyPath">arrangedObjects</string>
 							<object class="NSDictionary" key="NSOptions">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSArray" key="dict.sortedKeys">
@@ -2372,15 +2377,7 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">573</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">arrayController_</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="170240774"/>
-					</object>
-					<int key="connectionID">574</int>
+					<int key="connectionID">576</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2938,9 +2935,9 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="1015124532"/>
-							<reference ref="738471903"/>
 							<reference ref="12032461"/>
 							<reference ref="977962396"/>
+							<reference ref="738471903"/>
 						</object>
 						<reference key="parent" ref="972006081"/>
 					</object>
@@ -4082,7 +4079,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">574</int>
+			<int key="maxID">576</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4108,12 +4105,14 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>arrayController_</string>
+							<string>tableColumn_</string>
 							<string>tableView_</string>
 							<string>window</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSArrayController</string>
+							<string>NSTableColumn</string>
 							<string>NSTableView</string>
 							<string>NSWindow</string>
 						</object>