From b110da792704a1d7d1e4553db6382d24baea2d96 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Sun, 18 Jan 2015 23:39:02 +0000
Subject: 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
---
 macosx/Source/RecentItemsMenu.h |  2 +-
 macosx/Source/RecentItemsMenu.m | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'macosx/Source')

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];
-- 
cgit v1.2.3