From b11472c744844830ae1bdaa5d293a55a185cba85 Mon Sep 17 00:00:00 2001 From: Michael Buckley Date: Sun, 3 Nov 2019 12:55:00 -0800 Subject: [PATCH] Add Mac file icons back in --- macosx/Snes9x/Info.plist | 155 ++++++++++++++++++++++++ macosx/mac-file.mm | 2 +- macosx/snes9x.xcodeproj/project.pbxproj | 16 ++- 3 files changed, 170 insertions(+), 3 deletions(-) diff --git a/macosx/Snes9x/Info.plist b/macosx/Snes9x/Info.plist index 18f71614..92191109 100644 --- a/macosx/Snes9x/Info.plist +++ b/macosx/Snes9x/Info.plist @@ -30,5 +30,160 @@ Snes9x Help NSPrincipalClass NSApplication + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + jma + + CFBundleTypeName + JMA archive + CFBundleTypeOSTypes + + JMAf + + CFBundleTypeRole + Viewer + LSTypeIsPackage + + + + CFBundleTypeExtensions + + sfc + smc + swc + fig + gd3 + + CFBundleTypeIconFile + CART.icns + CFBundleTypeName + Snes9x ROM Image + CFBundleTypeOSTypes + + CART + + CFBundleTypeRole + Viewer + LSTypeIsPackage + + + + CFBundleTypeExtensions + + srm + + CFBundleTypeIconFile + SRAM.icns + CFBundleTypeName + Snes9x SRAM Data + CFBundleTypeOSTypes + + SRAM + + CFBundleTypeRole + None + LSTypeIsPackage + + + + CFBundleTypeExtensions + + frz + + CFBundleTypeIconFile + SAVE.icns + CFBundleTypeName + Snes9x Freeze Data + CFBundleTypeOSTypes + + SAVE + + CFBundleTypeRole + None + LSTypeIsPackage + + + + CFBundleTypeExtensions + + smv + + CFBundleTypeName + Snes9x Movie Data + CFBundleTypeOSTypes + + SMOV + + CFBundleTypeRole + None + LSTypeIsPackage + + + + CFBundleTypeExtensions + + spc + + CFBundleTypeName + Snes9x SPC Data + CFBundleTypeOSTypes + + SSPC + + CFBundleTypeRole + None + LSTypeIsPackage + + + + CFBundleTypeExtensions + + cht + + CFBundleTypeName + Snes9x Cheat Data + CFBundleTypeOSTypes + + SCHT + + CFBundleTypeRole + None + LSTypeIsPackage + + + + CFBundleTypeExtensions + + rtc + + CFBundleTypeName + Snes9x RTC Data + CFBundleTypeOSTypes + + SRTC + + CFBundleTypeRole + None + LSTypeIsPackage + + + + CFBundleTypeExtensions + + * + + CFBundleTypeOSTypes + + **** + + CFBundleTypeRole + None + LSTypeIsPackage + + + diff --git a/macosx/mac-file.mm b/macosx/mac-file.mm index 9084491c..ded631db 100644 --- a/macosx/mac-file.mm +++ b/macosx/mac-file.mm @@ -199,7 +199,7 @@ void ChangeTypeAndCreator (const char *path, OSType type, OSType creator) static void AddFolderIcon (NSURL *fref, const char *folderName) { - NSBundle *bundle = [NSBundle bundleWithIdentifier:@"com.snes9x.macos.snes9x-framework"]; + NSBundle *bundle = [NSBundle mainBundle]; NSString *filename = [@"folder_" stringByAppendingString:[NSString stringWithUTF8String:folderName]]; NSURL *imageURL = [bundle URLForResource:filename withExtension:@"icns"]; NSImage *image = [[NSImage alloc] initWithContentsOfURL:imageURL]; diff --git a/macosx/snes9x.xcodeproj/project.pbxproj b/macosx/snes9x.xcodeproj/project.pbxproj index 225c4c65..a77150a2 100755 --- a/macosx/snes9x.xcodeproj/project.pbxproj +++ b/macosx/snes9x.xcodeproj/project.pbxproj @@ -204,6 +204,13 @@ 30D15DEA22CE6FE1005BC352 /* mac-os.mm in Sources */ = {isa = PBXBuildFile; fileRef = EAE0E96604D582B700A80003 /* mac-os.mm */; }; 30D709B0236F583600AAB7C3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEA980A28384E00A8FAE5 /* Localizable.strings */; }; 30D709B1236F585100AAB7C3 /* Snes9x Help in Resources */ = {isa = PBXBuildFile; fileRef = EA3BEAA80A28386500A8FAE5 /* Snes9x Help */; }; + 30D709B2236F731B00AAB7C3 /* CART.icns in Resources */ = {isa = PBXBuildFile; fileRef = EA3D2F3C0A26083B00BDACCC /* CART.icns */; }; + 30D709B3236F731B00AAB7C3 /* SRAM.icns in Resources */ = {isa = PBXBuildFile; fileRef = EA3D2F360A26083B00BDACCC /* SRAM.icns */; }; + 30D709B4236F731B00AAB7C3 /* SAVE.icns in Resources */ = {isa = PBXBuildFile; fileRef = EA3D2F370A26083B00BDACCC /* SAVE.icns */; }; + 30D709B5236F731B00AAB7C3 /* folder_SRAMs.icns in Resources */ = {isa = PBXBuildFile; fileRef = EA3D2F3A0A26083B00BDACCC /* folder_SRAMs.icns */; }; + 30D709B6236F731B00AAB7C3 /* folder_Freezes.icns in Resources */ = {isa = PBXBuildFile; fileRef = EA3D2F3B0A26083B00BDACCC /* folder_Freezes.icns */; }; + 30D709B7236F731B00AAB7C3 /* musicbox_ledon.icns in Resources */ = {isa = PBXBuildFile; fileRef = EA3D2F380A26083B00BDACCC /* musicbox_ledon.icns */; }; + 30D709B8236F731B00AAB7C3 /* musicbox_ledoff.icns in Resources */ = {isa = PBXBuildFile; fileRef = EA3D2F390A26083B00BDACCC /* musicbox_ledoff.icns */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -338,7 +345,6 @@ EA3D2F3A0A26083B00BDACCC /* folder_SRAMs.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = folder_SRAMs.icns; sourceTree = ""; }; EA3D2F3B0A26083B00BDACCC /* folder_Freezes.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = folder_Freezes.icns; sourceTree = ""; }; EA3D2F3C0A26083B00BDACCC /* CART.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = CART.icns; sourceTree = ""; }; - EA3D2F3D0A26083B00BDACCC /* APPL.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = APPL.icns; sourceTree = ""; }; EA3D2F580A26085800BDACCC /* libHIDUtilities_u.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libHIDUtilities_u.a; sourceTree = ""; }; EA3D300A0A260A3200BDACCC /* musicbox_indicator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicbox_indicator.png; sourceTree = ""; }; EA3D300B0A260A3200BDACCC /* logo_freeze.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_freeze.png; sourceTree = ""; }; @@ -890,7 +896,6 @@ EA2DBC0D0510ABE700A80003 /* mac-screenshot.mm */, EAECB68604AC7FCE00A80003 /* mac-snes9x.mm */, EAECB68804AC7FCE00A80003 /* mac-stringtools.mm */, - EA3D2F3D0A26083B00BDACCC /* APPL.icns */, EA3D2F3C0A26083B00BDACCC /* CART.icns */, EA3D2F360A26083B00BDACCC /* SRAM.icns */, EA3D2F370A26083B00BDACCC /* SAVE.icns */, @@ -1100,8 +1105,15 @@ buildActionMask = 2147483647; files = ( 3071471B230E379600917F82 /* Assets.xcassets in Resources */, + 30D709B4236F731B00AAB7C3 /* SAVE.icns in Resources */, + 30D709B8236F731B00AAB7C3 /* musicbox_ledoff.icns in Resources */, 30D709B0236F583600AAB7C3 /* Localizable.strings in Resources */, 30D709B1236F585100AAB7C3 /* Snes9x Help in Resources */, + 30D709B3236F731B00AAB7C3 /* SRAM.icns in Resources */, + 30D709B5236F731B00AAB7C3 /* folder_SRAMs.icns in Resources */, + 30D709B2236F731B00AAB7C3 /* CART.icns in Resources */, + 30D709B7236F731B00AAB7C3 /* musicbox_ledon.icns in Resources */, + 30D709B6236F731B00AAB7C3 /* folder_Freezes.icns in Resources */, 3071471E230E379600917F82 /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0;