summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2015-01-18 23:39:02 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2015-01-18 23:39:02 +0000
commitb110da792704a1d7d1e4553db6382d24baea2d96 (patch)
tree99e88a4667274675ac838069b9a277a9274ed42f
parent6d22fc23d241b17c059b4582741bb49787c324a1 (diff)
downloadpcsxr-b110da792704a1d7d1e4553db6382d24baea2d96.tar.gz
OS X: Add icons to the recent item menu.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92935 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--macosx/Resources/en.lproj/PCSXR.strings2
-rw-r--r--macosx/Source/RecentItemsMenu.h2
-rw-r--r--macosx/Source/RecentItemsMenu.m12
3 files changed, 8 insertions, 8 deletions
diff --git a/macosx/Resources/en.lproj/PCSXR.strings b/macosx/Resources/en.lproj/PCSXR.strings
index bbeaed80..b1ef8cff 100644
--- a/macosx/Resources/en.lproj/PCSXR.strings
+++ b/macosx/Resources/en.lproj/PCSXR.strings
@@ -141,7 +141,7 @@
"330.title" = "Run Recent…";
/* Class = "NSMenuItem"; title = "Clear recent list"; ObjectID = "366"; */
-"366.title" = "Clear recent list";
+"366.title" = "Clear Recent List";
/* Class = "NSMenuItem"; title = "Cheats"; ObjectID = "371"; */
"371.title" = "Cheats";
diff --git a/macosx/Source/RecentItemsMenu.h b/macosx/Source/RecentItemsMenu.h
index d5bb2e07..0d0a64e4 100644
--- a/macosx/Source/RecentItemsMenu.h
+++ b/macosx/Source/RecentItemsMenu.h
@@ -16,7 +16,7 @@
- (IBAction)clearRecentDocuments:(id)sender;
- (void)addRecentItem:(NSURL*)documentURL;
- (NSMenuItem*)newMenuItem:(NSURL*)documentURL;
-- (void)openRecentItem:(NSMenuItem*)sender;
+- (IBAction)openRecentItem:(NSMenuItem*)sender;
- (void)addMenuItem:(NSMenuItem*)item;
@end
diff --git a/macosx/Source/RecentItemsMenu.m b/macosx/Source/RecentItemsMenu.m
index 926bd270..469ab011 100644
--- a/macosx/Source/RecentItemsMenu.m
+++ b/macosx/Source/RecentItemsMenu.m
@@ -71,20 +71,20 @@
- (NSMenuItem*)newMenuItem:(NSURL*)documentURL
{
- NSString *lastName = nil;
- [documentURL getResourceValue:&lastName forKey:NSURLLocalizedNameKey error:NULL];
- if (!lastName) {
- lastName = [documentURL lastPathComponent];
- }
+ NSString *documentPath = [documentURL path];
+ NSString *lastName = [[NSFileManager defaultManager] displayNameAtPath:documentPath];
+ NSImage *fileImage = [[NSWorkspace sharedWorkspace] iconForFile:documentPath];
+ fileImage.size = NSMakeSize(16, 16);
NSMenuItem *newItem = [[NSMenuItem alloc] initWithTitle:lastName action:@selector(openRecentItem:) keyEquivalent:@""];
[newItem setRepresentedObject:documentURL];
+ newItem.image = fileImage;
[newItem setTarget:self];
return newItem;
}
-- (void)openRecentItem:(NSMenuItem*)sender
+- (IBAction)openRecentItem:(NSMenuItem*)sender
{
NSURL* url = [sender representedObject];
[self addRecentItem:url];