From 4d77617e3e08baa75c62c4c6ac0bcab28d135e64 Mon Sep 17 00:00:00 2001 From: rogerman Date: Thu, 9 Jul 2015 08:31:41 +0000 Subject: [PATCH] Cocoa Port: - Add high-resolution UI artwork for Retina displays. --- .../project.pbxproj | 56 +++++++++++ .../project.pbxproj | 84 ++++++++++++++++ desmume/src/cocoa/cocoa_rom.mm | 2 +- .../images/Icon_ActionReplay_32x32@2x.png | Bin 0 -> 3257 bytes .../images/Icon_CodeBreaker_32x32@2x.png | Bin 0 -> 4911 bytes .../src/cocoa/images/Icon_DeSmuME_32x32.png | Bin 1415 -> 1364 bytes .../cocoa/images/Icon_DeSmuME_32x32@2x.png | Bin 0 -> 1817 bytes .../cocoa/images/Icon_VolumeFull_16x16@2x.png | Bin 0 -> 512 bytes .../cocoa/images/Icon_VolumeMute_16x16@2x.png | Bin 0 -> 396 bytes .../images/Icon_VolumeOneThird_16x16@2x.png | Bin 0 -> 307 bytes .../images/Icon_VolumeTwoThird_16x16@2x.png | Bin 0 -> 424 bytes .../userinterface/EmuControllerDelegate.mm | 28 +++--- .../src/cocoa/userinterface/InputManager.mm | 92 +++++++++--------- .../userinterface/cheatWindowDelegate.mm | 6 +- .../preferencesWindowDelegate.mm | 8 +- 15 files changed, 209 insertions(+), 67 deletions(-) create mode 100644 desmume/src/cocoa/images/Icon_ActionReplay_32x32@2x.png create mode 100644 desmume/src/cocoa/images/Icon_CodeBreaker_32x32@2x.png create mode 100644 desmume/src/cocoa/images/Icon_DeSmuME_32x32@2x.png create mode 100644 desmume/src/cocoa/images/Icon_VolumeFull_16x16@2x.png create mode 100644 desmume/src/cocoa/images/Icon_VolumeMute_16x16@2x.png create mode 100644 desmume/src/cocoa/images/Icon_VolumeOneThird_16x16@2x.png create mode 100644 desmume/src/cocoa/images/Icon_VolumeTwoThird_16x16@2x.png diff --git a/desmume/src/cocoa/DeSmuME (Latest).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (Latest).xcodeproj/project.pbxproj index d6b9ce4ba..f818df41f 100644 --- a/desmume/src/cocoa/DeSmuME (Latest).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (Latest).xcodeproj/project.pbxproj @@ -435,6 +435,27 @@ AB82445B1704AE9A00B8EE20 /* utilities.c in Sources */ = {isa = PBXBuildFile; fileRef = AB82445A1704AE9A00B8EE20 /* utilities.c */; }; AB82445C1704AE9A00B8EE20 /* utilities.c in Sources */ = {isa = PBXBuildFile; fileRef = AB82445A1704AE9A00B8EE20 /* utilities.c */; }; AB82445D1704AE9A00B8EE20 /* utilities.c in Sources */ = {isa = PBXBuildFile; fileRef = AB82445A1704AE9A00B8EE20 /* utilities.c */; }; + AB8493AF1B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493A81B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png */; }; + AB8493B01B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493A81B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png */; }; + AB8493B11B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493A81B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png */; }; + AB8493B21B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493A91B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png */; }; + AB8493B31B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493A91B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png */; }; + AB8493B41B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493A91B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png */; }; + AB8493B51B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AA1B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png */; }; + AB8493B61B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AA1B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png */; }; + AB8493B71B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AA1B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png */; }; + AB8493B81B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AB1B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png */; }; + AB8493B91B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AB1B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png */; }; + AB8493BA1B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AB1B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png */; }; + AB8493BB1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AC1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png */; }; + AB8493BC1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AC1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png */; }; + AB8493BD1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AC1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png */; }; + AB8493BE1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AD1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png */; }; + AB8493BF1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AD1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png */; }; + AB8493C01B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AD1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png */; }; + AB8493C11B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AE1B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png */; }; + AB8493C21B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AE1B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png */; }; + AB8493C31B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB8493AE1B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png */; }; AB8967D916D2ED0700F826F1 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */; }; AB8967DA16D2ED0700F826F1 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */; }; AB8967DD16D2ED2700F826F1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */; }; @@ -1207,6 +1228,13 @@ AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = videofilter.cpp; sourceTree = ""; }; AB82445A1704AE9A00B8EE20 /* utilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utilities.c; sourceTree = ""; }; AB82445E1704AEC400B8EE20 /* utilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = utilities.h; sourceTree = ""; }; + AB8493A81B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_ActionReplay_32x32@2x.png"; path = "images/Icon_ActionReplay_32x32@2x.png"; sourceTree = ""; }; + AB8493A91B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_CodeBreaker_32x32@2x.png"; path = "images/Icon_CodeBreaker_32x32@2x.png"; sourceTree = ""; }; + AB8493AA1B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_DeSmuME_32x32@2x.png"; path = "images/Icon_DeSmuME_32x32@2x.png"; sourceTree = ""; }; + AB8493AB1B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_VolumeFull_16x16@2x.png"; path = "images/Icon_VolumeFull_16x16@2x.png"; sourceTree = ""; }; + AB8493AC1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_VolumeMute_16x16@2x.png"; path = "images/Icon_VolumeMute_16x16@2x.png"; sourceTree = ""; }; + AB8493AD1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_VolumeOneThird_16x16@2x.png"; path = "images/Icon_VolumeOneThird_16x16@2x.png"; sourceTree = ""; }; + AB8493AE1B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_VolumeTwoThird_16x16@2x.png"; path = "images/Icon_VolumeTwoThird_16x16@2x.png"; sourceTree = ""; }; AB8967D716D2ED0700F826F1 /* DisplayWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayWindowController.h; sourceTree = ""; }; AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DisplayWindowController.mm; sourceTree = ""; }; AB8967DC16D2ED2700F826F1 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = translations/English.lproj/DisplayWindow.xib; sourceTree = ""; }; @@ -1895,6 +1923,7 @@ AB0F293714BE6FA7009ABC6F /* ColorSwatch_Yellow_16x16.png */, AB0F296B14BE705D009ABC6F /* Icon_ActionReplay_128x128.png */, ABB97873144E89CC00793FA3 /* Icon_ActionReplay_32x32.png */, + AB8493A81B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png */, AB0F298814BE71E0009ABC6F /* Icon_ArrowDown_420x420.png */, AB0F298914BE71E0009ABC6F /* Icon_ArrowLeft_420x420.png */, AB0F298A14BE71E0009ABC6F /* Icon_ArrowRight_420x420.png */, @@ -1903,7 +1932,9 @@ AB7EC7F3189B2B92009D198A /* Icon_AutoholdSet_420x420.png */, AB0F296C14BE705D009ABC6F /* Icon_CodeBreaker_128x128.png */, ABB97874144E89CC00793FA3 /* Icon_CodeBreaker_32x32.png */, + AB8493A91B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png */, ABB97875144E89CC00793FA3 /* Icon_DeSmuME_32x32.png */, + AB8493AA1B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png */, ABDDF7C41898F024007583C1 /* Icon_DisplayToggle_420x420.png */, AB0F299414BE7213009ABC6F /* Icon_DoubleSpeed_420x420.png */, AB0F299514BE7213009ABC6F /* Icon_DSButtonA_420x420.png */, @@ -1941,9 +1972,13 @@ AB0F290014BE6E68009ABC6F /* Icon_Speed1x_420x420.png */, AB0F290114BE6E68009ABC6F /* Icon_Speed2x_420x420.png */, ABC3AF2B14B7F06900D5B13D /* Icon_VolumeFull_16x16.png */, + AB8493AB1B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png */, ABC3AF2C14B7F06900D5B13D /* Icon_VolumeMute_16x16.png */, + AB8493AC1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png */, ABC3AF2D14B7F06900D5B13D /* Icon_VolumeOneThird_16x16.png */, + AB8493AD1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png */, ABC3AF2E14B7F06900D5B13D /* Icon_VolumeTwoThird_16x16.png */, + AB8493AE1B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png */, ABAB454E187CDB70007BE20C /* Image_GuitarGrip.png */, AB564909186E6F67002740F4 /* Image_MemoryExpansionPak.png */, AB0038A61872A96700B0B055 /* Image_PaddleController.png */, @@ -2402,6 +2437,7 @@ AB64987C13ECC73800EE7DD2 /* FileTypeInfo.plist in Resources */, ABEFCF61141AB82A000CC0CD /* AppIcon_ROMSave.icns in Resources */, ABEFCF62141AB82A000CC0CD /* AppIcon_DeSmuME.icns in Resources */, + AB8493B01B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png in Resources */, ABB0FBD01A9EED350060C55A /* Icon_MicrophoneBlueGlow_256x256.png in Resources */, ABEFCF63141AB82A000CC0CD /* AppIcon_NintendoDS_ROM.icns in Resources */, ABEFCF64141AB82A000CC0CD /* AppIcon_SaveState.icns in Resources */, @@ -2420,6 +2456,7 @@ ABC3AF3214B7F06900D5B13D /* Icon_VolumeTwoThird_16x16.png in Resources */, ABB0FBD31A9EED350060C55A /* Icon_MicrophoneGreen_256x256.png in Resources */, ABDDF7CC1898F032007583C1 /* Icon_FrameJump_420x420.png in Resources */, + AB8493C21B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png in Resources */, AB0F290214BE6E68009ABC6F /* Icon_Execute_420x420.png in Resources */, AB0F290314BE6E68009ABC6F /* Icon_Pause_420x420.png in Resources */, AB0F290414BE6E68009ABC6F /* Icon_Speed1x_420x420.png in Resources */, @@ -2428,18 +2465,22 @@ AB0F293914BE6FA7009ABC6F /* ColorSwatch_Brown_16x16.png in Resources */, AB0F293A14BE6FA7009ABC6F /* ColorSwatch_DarkBlue_16x16.png in Resources */, AB0F293B14BE6FA7009ABC6F /* ColorSwatch_DarkGreen_16x16.png in Resources */, + AB8493B31B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png in Resources */, AB0F293C14BE6FA7009ABC6F /* ColorSwatch_DarkPurple_16x16.png in Resources */, AB0F293D14BE6FA7009ABC6F /* ColorSwatch_Gray_16x16.png in Resources */, ABC503AF1AAC2B91002FCD43 /* Icon_MicrophoneDarkGreen_256x256.png in Resources */, AB0F293E14BE6FA7009ABC6F /* ColorSwatch_Green_16x16.png in Resources */, AB0F293F14BE6FA7009ABC6F /* ColorSwatch_LimeGreen_16x16.png in Resources */, AB0F294014BE6FA7009ABC6F /* ColorSwatch_Magenta_16x16.png in Resources */, + AB8493BC1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png in Resources */, AB0F294114BE6FA7009ABC6F /* ColorSwatch_Orange_16x16.png in Resources */, AB0F294214BE6FA7009ABC6F /* ColorSwatch_Pink_16x16.png in Resources */, AB68101E187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, AB0F294314BE6FA7009ABC6F /* ColorSwatch_Red_16x16.png in Resources */, + AB8493BF1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png in Resources */, AB68101C187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, AB0F294414BE6FA7009ABC6F /* ColorSwatch_SeaGreen_16x16.png in Resources */, + AB8493B61B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png in Resources */, AB0F294514BE6FA7009ABC6F /* ColorSwatch_Turquoise_16x16.png in Resources */, AB564911186E6F67002740F4 /* Image_MemoryExpansionPak.png in Resources */, AB0F294614BE6FA7009ABC6F /* ColorSwatch_Violet_16x16.png in Resources */, @@ -2449,6 +2490,7 @@ AB0F297A14BE70BC009ABC6F /* VideoFilterPreview_64x64.png in Resources */, AB564913186E6F67002740F4 /* Image_PassME.png in Resources */, AB681026187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png in Resources */, + AB8493B91B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png in Resources */, AB0F298C14BE71E0009ABC6F /* Icon_ArrowDown_420x420.png in Resources */, AB0F298D14BE71E0009ABC6F /* Icon_ArrowLeft_420x420.png in Resources */, AB0F298E14BE71E0009ABC6F /* Icon_ArrowRight_420x420.png in Resources */, @@ -2502,6 +2544,7 @@ AB796CAA15CDCBA200C59155 /* FileTypeInfo.plist in Resources */, AB796CAB15CDCBA200C59155 /* AppIcon_ROMSave.icns in Resources */, AB796CAC15CDCBA200C59155 /* AppIcon_DeSmuME.icns in Resources */, + AB8493AF1B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png in Resources */, ABB0FBCF1A9EED350060C55A /* Icon_MicrophoneBlueGlow_256x256.png in Resources */, AB796CAD15CDCBA200C59155 /* AppIcon_NintendoDS_ROM.icns in Resources */, AB796CAE15CDCBA200C59155 /* AppIcon_SaveState.icns in Resources */, @@ -2520,6 +2563,7 @@ AB796CBA15CDCBA200C59155 /* Icon_VolumeTwoThird_16x16.png in Resources */, ABB0FBD21A9EED350060C55A /* Icon_MicrophoneGreen_256x256.png in Resources */, ABDDF7CB1898F032007583C1 /* Icon_FrameJump_420x420.png in Resources */, + AB8493C11B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png in Resources */, AB796CBB15CDCBA200C59155 /* Icon_Execute_420x420.png in Resources */, AB796CBC15CDCBA200C59155 /* Icon_Pause_420x420.png in Resources */, AB796CBD15CDCBA200C59155 /* Icon_Speed1x_420x420.png in Resources */, @@ -2528,18 +2572,22 @@ AB796CC015CDCBA200C59155 /* ColorSwatch_Brown_16x16.png in Resources */, AB796CC115CDCBA200C59155 /* ColorSwatch_DarkBlue_16x16.png in Resources */, AB796CC215CDCBA200C59155 /* ColorSwatch_DarkGreen_16x16.png in Resources */, + AB8493B21B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png in Resources */, AB796CC315CDCBA200C59155 /* ColorSwatch_DarkPurple_16x16.png in Resources */, AB796CC415CDCBA200C59155 /* ColorSwatch_Gray_16x16.png in Resources */, ABC503AD1AAC2B71002FCD43 /* Icon_MicrophoneDarkGreen_256x256.png in Resources */, AB796CC515CDCBA200C59155 /* ColorSwatch_Green_16x16.png in Resources */, AB796CC615CDCBA200C59155 /* ColorSwatch_LimeGreen_16x16.png in Resources */, AB796CC715CDCBA200C59155 /* ColorSwatch_Magenta_16x16.png in Resources */, + AB8493BB1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png in Resources */, AB796CC815CDCBA200C59155 /* ColorSwatch_Orange_16x16.png in Resources */, AB796CC915CDCBA200C59155 /* ColorSwatch_Pink_16x16.png in Resources */, AB68101D187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, AB796CCA15CDCBA200C59155 /* ColorSwatch_Red_16x16.png in Resources */, + AB8493BE1B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png in Resources */, AB68101B187D4AEF0049F2C2 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, AB796CCB15CDCBA200C59155 /* ColorSwatch_SeaGreen_16x16.png in Resources */, + AB8493B51B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png in Resources */, AB796CCC15CDCBA200C59155 /* ColorSwatch_Turquoise_16x16.png in Resources */, AB564910186E6F67002740F4 /* Image_MemoryExpansionPak.png in Resources */, AB796CCD15CDCBA200C59155 /* ColorSwatch_Violet_16x16.png in Resources */, @@ -2549,6 +2597,7 @@ AB796CD115CDCBA200C59155 /* VideoFilterPreview_64x64.png in Resources */, AB564912186E6F67002740F4 /* Image_PassME.png in Resources */, AB681025187D4AEF0049F2C2 /* Icon_PaddleKnob_256x256.png in Resources */, + AB8493B81B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png in Resources */, AB796CD215CDCBA200C59155 /* Icon_ArrowDown_420x420.png in Resources */, AB796CD315CDCBA200C59155 /* Icon_ArrowLeft_420x420.png in Resources */, AB796CD415CDCBA200C59155 /* Icon_ArrowRight_420x420.png in Resources */, @@ -2602,6 +2651,7 @@ AB8F3C1D1A53AC2600A80BF6 /* FileTypeInfo.plist in Resources */, AB8F3C1E1A53AC2600A80BF6 /* AppIcon_ROMSave.icns in Resources */, AB8F3C1F1A53AC2600A80BF6 /* AppIcon_DeSmuME.icns in Resources */, + AB8493B11B4E614D00CD1C73 /* Icon_ActionReplay_32x32@2x.png in Resources */, ABB0FBD11A9EED350060C55A /* Icon_MicrophoneBlueGlow_256x256.png in Resources */, AB8F3C201A53AC2600A80BF6 /* AppIcon_NintendoDS_ROM.icns in Resources */, AB8F3C211A53AC2600A80BF6 /* AppIcon_SaveState.icns in Resources */, @@ -2620,6 +2670,7 @@ AB8F3C2E1A53AC2600A80BF6 /* Icon_VolumeTwoThird_16x16.png in Resources */, ABB0FBD41A9EED350060C55A /* Icon_MicrophoneGreen_256x256.png in Resources */, AB8F3C2F1A53AC2600A80BF6 /* Icon_FrameJump_420x420.png in Resources */, + AB8493C31B4E614D00CD1C73 /* Icon_VolumeTwoThird_16x16@2x.png in Resources */, AB8F3C301A53AC2600A80BF6 /* Icon_Execute_420x420.png in Resources */, AB8F3C311A53AC2600A80BF6 /* Icon_Pause_420x420.png in Resources */, AB8F3C321A53AC2600A80BF6 /* Icon_Speed1x_420x420.png in Resources */, @@ -2628,18 +2679,22 @@ AB8F3C351A53AC2600A80BF6 /* ColorSwatch_Brown_16x16.png in Resources */, AB8F3C361A53AC2600A80BF6 /* ColorSwatch_DarkBlue_16x16.png in Resources */, AB8F3C371A53AC2600A80BF6 /* ColorSwatch_DarkGreen_16x16.png in Resources */, + AB8493B41B4E614D00CD1C73 /* Icon_CodeBreaker_32x32@2x.png in Resources */, AB8F3C381A53AC2600A80BF6 /* ColorSwatch_DarkPurple_16x16.png in Resources */, AB8F3C391A53AC2600A80BF6 /* ColorSwatch_Gray_16x16.png in Resources */, ABC503AE1AAC2B90002FCD43 /* Icon_MicrophoneDarkGreen_256x256.png in Resources */, AB8F3C3A1A53AC2600A80BF6 /* ColorSwatch_Green_16x16.png in Resources */, AB8F3C3B1A53AC2600A80BF6 /* ColorSwatch_LimeGreen_16x16.png in Resources */, AB8F3C3C1A53AC2600A80BF6 /* ColorSwatch_Magenta_16x16.png in Resources */, + AB8493BD1B4E614D00CD1C73 /* Icon_VolumeMute_16x16@2x.png in Resources */, AB8F3C3D1A53AC2600A80BF6 /* ColorSwatch_Orange_16x16.png in Resources */, AB8F3C3E1A53AC2600A80BF6 /* ColorSwatch_Pink_16x16.png in Resources */, AB8F3C3F1A53AC2600A80BF6 /* Icon_GuitarGrip_Button_Green_512x512.png in Resources */, AB8F3C401A53AC2600A80BF6 /* ColorSwatch_Red_16x16.png in Resources */, + AB8493C01B4E614D00CD1C73 /* Icon_VolumeOneThird_16x16@2x.png in Resources */, AB8F3C411A53AC2600A80BF6 /* Icon_GuitarGrip_Button_Blue_512x512.png in Resources */, AB8F3C421A53AC2600A80BF6 /* ColorSwatch_SeaGreen_16x16.png in Resources */, + AB8493B71B4E614D00CD1C73 /* Icon_DeSmuME_32x32@2x.png in Resources */, AB8F3C431A53AC2600A80BF6 /* ColorSwatch_Turquoise_16x16.png in Resources */, AB8F3C441A53AC2600A80BF6 /* Image_MemoryExpansionPak.png in Resources */, AB8F3C451A53AC2600A80BF6 /* ColorSwatch_Violet_16x16.png in Resources */, @@ -2649,6 +2704,7 @@ AB8F3C491A53AC2600A80BF6 /* VideoFilterPreview_64x64.png in Resources */, AB8F3C4A1A53AC2600A80BF6 /* Image_PassME.png in Resources */, AB8F3C4B1A53AC2600A80BF6 /* Icon_PaddleKnob_256x256.png in Resources */, + AB8493BA1B4E614D00CD1C73 /* Icon_VolumeFull_16x16@2x.png in Resources */, AB8F3C4C1A53AC2600A80BF6 /* Icon_ArrowDown_420x420.png in Resources */, AB8F3C4D1A53AC2600A80BF6 /* Icon_ArrowLeft_420x420.png in Resources */, AB8F3C4E1A53AC2600A80BF6 /* Icon_ArrowRight_420x420.png in Resources */, diff --git a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj index b48ff7f63..77cb03f8e 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj @@ -7,6 +7,41 @@ objects = { /* Begin PBXBuildFile section */ + AB0819E91B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E21B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png */; }; + AB0819EA1B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E31B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png */; }; + AB0819EB1B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E41B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png */; }; + AB0819EC1B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E51B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png */; }; + AB0819ED1B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E61B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png */; }; + AB0819EE1B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E71B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png */; }; + AB0819EF1B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E81B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png */; }; + AB0819F01B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E21B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png */; }; + AB0819F11B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E31B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png */; }; + AB0819F21B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E41B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png */; }; + AB0819F31B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E51B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png */; }; + AB0819F41B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E61B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png */; }; + AB0819F51B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E71B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png */; }; + AB0819F61B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E81B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png */; }; + AB0819F71B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E21B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png */; }; + AB0819F81B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E31B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png */; }; + AB0819F91B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E41B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png */; }; + AB0819FA1B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E51B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png */; }; + AB0819FB1B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E61B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png */; }; + AB0819FC1B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E71B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png */; }; + AB0819FD1B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E81B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png */; }; + AB0819FE1B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E21B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png */; }; + AB0819FF1B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E31B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png */; }; + AB081A001B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E41B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png */; }; + AB081A011B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E51B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png */; }; + AB081A021B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E61B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png */; }; + AB081A031B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E71B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png */; }; + AB081A041B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E81B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png */; }; + AB081A051B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E21B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png */; }; + AB081A061B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E31B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png */; }; + AB081A071B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E41B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png */; }; + AB081A081B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E51B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png */; }; + AB081A091B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E61B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png */; }; + AB081A0A1B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E71B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png */; }; + AB081A0B1B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0819E81B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png */; }; AB0F290614BE6E68009ABC6F /* Icon_Execute_420x420.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0F28FE14BE6E68009ABC6F /* Icon_Execute_420x420.png */; }; AB0F290714BE6E68009ABC6F /* Icon_Pause_420x420.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0F28FF14BE6E68009ABC6F /* Icon_Pause_420x420.png */; }; AB0F290814BE6E68009ABC6F /* Icon_Speed1x_420x420.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0F290014BE6E68009ABC6F /* Icon_Speed1x_420x420.png */; }; @@ -1299,6 +1334,13 @@ AB00E89114205ECC00DE561F /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = English; path = translations/English.lproj/Localizable.strings; sourceTree = ""; }; AB02475B13886BF300E9F9AB /* KeyNames.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = KeyNames.plist; sourceTree = ""; }; AB02791814415E4C0075E58C /* Info (Debug).plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info (Debug).plist"; sourceTree = ""; }; + AB0819E21B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_ActionReplay_32x32@2x.png"; path = "images/Icon_ActionReplay_32x32@2x.png"; sourceTree = ""; }; + AB0819E31B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_CodeBreaker_32x32@2x.png"; path = "images/Icon_CodeBreaker_32x32@2x.png"; sourceTree = ""; }; + AB0819E41B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_DeSmuME_32x32@2x.png"; path = "images/Icon_DeSmuME_32x32@2x.png"; sourceTree = ""; }; + AB0819E51B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_VolumeFull_16x16@2x.png"; path = "images/Icon_VolumeFull_16x16@2x.png"; sourceTree = ""; }; + AB0819E61B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_VolumeMute_16x16@2x.png"; path = "images/Icon_VolumeMute_16x16@2x.png"; sourceTree = ""; }; + AB0819E71B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_VolumeOneThird_16x16@2x.png"; path = "images/Icon_VolumeOneThird_16x16@2x.png"; sourceTree = ""; }; + AB0819E81B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon_VolumeTwoThird_16x16@2x.png"; path = "images/Icon_VolumeTwoThird_16x16@2x.png"; sourceTree = ""; }; AB0A0D1914AACA9600E83E91 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; AB0F28FE14BE6E68009ABC6F /* Icon_Execute_420x420.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_Execute_420x420.png; path = images/Icon_Execute_420x420.png; sourceTree = ""; }; AB0F28FF14BE6E68009ABC6F /* Icon_Pause_420x420.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_Pause_420x420.png; path = images/Icon_Pause_420x420.png; sourceTree = ""; }; @@ -2082,6 +2124,7 @@ AB0F293714BE6FA7009ABC6F /* ColorSwatch_Yellow_16x16.png */, AB0F296B14BE705D009ABC6F /* Icon_ActionReplay_128x128.png */, ABB97873144E89CC00793FA3 /* Icon_ActionReplay_32x32.png */, + AB0819E21B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png */, AB0F298814BE71E0009ABC6F /* Icon_ArrowDown_420x420.png */, AB0F298914BE71E0009ABC6F /* Icon_ArrowLeft_420x420.png */, AB0F298A14BE71E0009ABC6F /* Icon_ArrowRight_420x420.png */, @@ -2090,7 +2133,9 @@ AB851D29189B2C9A007363CC /* Icon_AutoholdSet_420x420.png */, AB0F296C14BE705D009ABC6F /* Icon_CodeBreaker_128x128.png */, ABB97874144E89CC00793FA3 /* Icon_CodeBreaker_32x32.png */, + AB0819E31B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png */, ABB97875144E89CC00793FA3 /* Icon_DeSmuME_32x32.png */, + AB0819E41B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png */, ABBFDFA61898EE3200A3FFA5 /* Icon_DisplayToggle_420x420.png */, AB0F299414BE7213009ABC6F /* Icon_DoubleSpeed_420x420.png */, AB0F299514BE7213009ABC6F /* Icon_DSButtonA_420x420.png */, @@ -2128,9 +2173,13 @@ AB0F290014BE6E68009ABC6F /* Icon_Speed1x_420x420.png */, AB0F290114BE6E68009ABC6F /* Icon_Speed2x_420x420.png */, ABC3AF2B14B7F06900D5B13D /* Icon_VolumeFull_16x16.png */, + AB0819E51B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png */, ABC3AF2C14B7F06900D5B13D /* Icon_VolumeMute_16x16.png */, + AB0819E61B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png */, ABC3AF2D14B7F06900D5B13D /* Icon_VolumeOneThird_16x16.png */, + AB0819E71B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png */, ABC3AF2E14B7F06900D5B13D /* Icon_VolumeTwoThird_16x16.png */, + AB0819E81B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png */, ABD597BB187CD95A00069403 /* Image_GuitarGrip.png */, AB142025186E2CD80015D52F /* Image_MemoryExpansionPak.png */, AB8FFE491872032B00C10085 /* Image_PaddleController.png */, @@ -2771,6 +2820,13 @@ AB1CC8321AA50C8D008B0A16 /* Icon_MicrophoneGreen_256x256.png in Resources */, AB1CC8331AA50C8D008B0A16 /* Icon_MicrophoneRed_256x256.png in Resources */, ABACB73E1AAC46B20066F429 /* Icon_MicrophoneDarkGreen_256x256.png in Resources */, + AB081A051B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */, + AB081A061B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */, + AB081A071B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */, + AB081A081B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */, + AB081A091B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */, + AB081A0A1B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */, + AB081A0B1B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2871,6 +2927,13 @@ AB1CC81E1AA50C8D008B0A16 /* Icon_MicrophoneGreen_256x256.png in Resources */, AB1CC81F1AA50C8D008B0A16 /* Icon_MicrophoneRed_256x256.png in Resources */, ABACB73A1AAC46B20066F429 /* Icon_MicrophoneDarkGreen_256x256.png in Resources */, + AB0819E91B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */, + AB0819EA1B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */, + AB0819EB1B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */, + AB0819EC1B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */, + AB0819ED1B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */, + AB0819EE1B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */, + AB0819EF1B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2971,6 +3034,13 @@ AB1CC8231AA50C8D008B0A16 /* Icon_MicrophoneGreen_256x256.png in Resources */, AB1CC8241AA50C8D008B0A16 /* Icon_MicrophoneRed_256x256.png in Resources */, ABACB73B1AAC46B20066F429 /* Icon_MicrophoneDarkGreen_256x256.png in Resources */, + AB0819F01B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */, + AB0819F11B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */, + AB0819F21B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */, + AB0819F31B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */, + AB0819F41B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */, + AB0819F51B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */, + AB0819F61B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3071,6 +3141,13 @@ AB1CC82D1AA50C8D008B0A16 /* Icon_MicrophoneGreen_256x256.png in Resources */, AB1CC82E1AA50C8D008B0A16 /* Icon_MicrophoneRed_256x256.png in Resources */, ABACB73D1AAC46B20066F429 /* Icon_MicrophoneDarkGreen_256x256.png in Resources */, + AB0819FE1B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */, + AB0819FF1B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */, + AB081A001B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */, + AB081A011B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */, + AB081A021B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */, + AB081A031B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */, + AB081A041B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3171,6 +3248,13 @@ AB1CC8281AA50C8D008B0A16 /* Icon_MicrophoneGreen_256x256.png in Resources */, AB1CC8291AA50C8D008B0A16 /* Icon_MicrophoneRed_256x256.png in Resources */, ABACB73C1AAC46B20066F429 /* Icon_MicrophoneDarkGreen_256x256.png in Resources */, + AB0819F71B4E64AE008CE1EC /* Icon_ActionReplay_32x32@2x.png in Resources */, + AB0819F81B4E64AE008CE1EC /* Icon_CodeBreaker_32x32@2x.png in Resources */, + AB0819F91B4E64AE008CE1EC /* Icon_DeSmuME_32x32@2x.png in Resources */, + AB0819FA1B4E64AE008CE1EC /* Icon_VolumeFull_16x16@2x.png in Resources */, + AB0819FB1B4E64AE008CE1EC /* Icon_VolumeMute_16x16@2x.png in Resources */, + AB0819FC1B4E64AE008CE1EC /* Icon_VolumeOneThird_16x16@2x.png in Resources */, + AB0819FD1B4E64AE008CE1EC /* Icon_VolumeTwoThird_16x16@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/cocoa_rom.mm b/desmume/src/cocoa/cocoa_rom.mm index 7b2153c89..faba71830 100644 --- a/desmume/src/cocoa/cocoa_rom.mm +++ b/desmume/src/cocoa/cocoa_rom.mm @@ -554,7 +554,7 @@ static NSMutableDictionary *saveTypeValues = nil; + (NSMutableDictionary *) romNotLoadedBindings { - NSImage *iconImage = [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"AppIcon_DeSmuME" ofType:@"icns"]] autorelease]; + NSImage *iconImage = [NSImage imageNamed:@"NSApplicationIcon"]; NSString *romNameAndSerialInfoString = @"Name: "; romNameAndSerialInfoString = [romNameAndSerialInfoString stringByAppendingString:NSSTRING_STATUS_NO_ROM_LOADED]; diff --git a/desmume/src/cocoa/images/Icon_ActionReplay_32x32@2x.png b/desmume/src/cocoa/images/Icon_ActionReplay_32x32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fba9c6df82dc505527df877c2fdb70f352865862 GIT binary patch literal 3257 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 Yub@^JGp~6l_y-I^=$YughdV$0A3(@zA^-pY literal 0 HcmV?d00001 diff --git a/desmume/src/cocoa/images/Icon_DeSmuME_32x32.png b/desmume/src/cocoa/images/Icon_DeSmuME_32x32.png index 97021467dfc0982c6cff7600345183f9ac577b97..efea973deb96f534ee93b2b6ea52211f6e8e8f7b 100644 GIT binary patch delta 1346 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 DgQAyq diff --git a/desmume/src/cocoa/images/Icon_DeSmuME_32x32@2x.png b/desmume/src/cocoa/images/Icon_DeSmuME_32x32@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..87afa258b32b36153a5a20d994aa6ce0765fa9e3 GIT binary patch literal 1817 zcmV+!2j=*RP)Tj{|Ku⪚sbG5>5Nb?z;)B=&A3u@UFU9{M zv87L(i2FTxENv%A{93!F-!&HlY;6HAUp9lvxy z2S}A?A8}#kEWpW=wCndm09Q4?Pkv0(G=Sq~VsLp6VDU@-iu^3v$BoBEy#`qQO;AyA zUmf7aKg}4afC1*_vby~0sx*IaaBBguv`8HThynlVs&wG8v@{|Itp62=uEnFluu#DR zxOs&AbL(ry8>H+NPUq`iy1v#tJ0u_U8i36TivXuiHKTa+NTPckR~CQE-`9RSwNF3E zKlkvVG)9rJ4Zt4D$+)TtaN7V^K*fcAz8k-WL9&u6jcouWxnw5HKrH~(KutXckj6-R zZ4N*s-Xq5}fMStdj6q@lLjd)70058+pC3Gs=)KF!vGpF@6NnFi(LHV=56y)GGM}9o z1C+uUb#rTt4pdl4*5#)BINaCW2Uf#uGR=*Q|??O^~2q(Pi0;<_jHcn`>GkunECWT(a)vOAd4Sj3ma32a#nR#-}v(m;j6YH|i} zUK~Z7Xv z?pj>8hDp3#ypBk(LW1J8h-#u9pesZMt8MHq#q=Hpiai9bUX>^`LWZdZ_fCRdB0p3m z5a6!xAx2KmwOX}AW29DhoQo#73j?UqTf5i;T!zs#ajLl-2A$m+Gwd%kMF?09C}@H) z3HY#Cz_Xq$irz;-DD8oO%vvPD9618K*aSAW!i?TJ3>-b$OyK$R5IP;@#S(3AzYDCKqiJ(M z?R>Gsz|VIt;mdP`yLT@&VbCA7{r!($aBhXLvO=x4P}*zIG@1*g_T)G~H3D11=p^() zbnZxtD$ef#>aGzH@b@}!@nUlHoPf)hX<`sCBxjSIc6*JxkO3K8An^bavr~*XW0Xm9 zfUO!44p+4vkeoZJC=^UN4$%3&a~!yEfhGs|P&Yzd|`VZgJv`A1Ae2OWPIq?AYIfMAzAS;%54{)3qPG+x^ z2Qz>keYdr}p7*N~ZfKPsUky6$fs`ct;#KBZ&k+x2fI4IvVosDv?cKP_hr!aQYG*>K zi~9*rkpwmEb(uWCo*FSLthGZ`NQ9!CAh|xPU@}}76tn6QD?-^YD8UH1Blh+^&o_Xx zXC>kQOwIr%u}L`qf^cdq%^M_~8BQTZ2nQ{N!miX_^7+AP0q5(0_PwZEm&abUKY3{q`pEZ~pF3`={S*0p^y{JEs#115}{nq{itFVmkc2+SH00000NkvXX Hu0mjf@Q6>n literal 0 HcmV?d00001 diff --git a/desmume/src/cocoa/images/Icon_VolumeFull_16x16@2x.png b/desmume/src/cocoa/images/Icon_VolumeFull_16x16@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..80e07de2974563383138c0233fabde4e83b6add5 GIT binary patch literal 512 zcmV+b0{{JqP)`cG09^nn+oN$aDG>x7;*D$ z0MzDrbT0*jvrc7IPo@2z)FN?W^FaX%o9 zY_w$~AKU{Z@f3kEmtx1mGS(2H?&F zn^c_b51VFuul-(#UW1F&Fg0W8GFdQAaj0B+e{@Kh(V(JT8p!stTt zMJqyhPR%tu<@ZYZ)CX3v0R%bTWl;;)0B{h-hnHdasRO1OQ>tcNM8l;QU;%)0p^|EP zj<&@zEa@fcjdQIv8)NR;8)H~&y@6;2xN(k%Y^^QYT5A~*C5UE#)w%bcLkJu~5FxC! z>%8|qhiC^#k*CFzI_Fj!=iFvKWuhA(k1ls2!3kOF11Lcd5fjlp=UjV?Y9O0=Db=;D z`3}HR$%1Hyh+@=4#E2*cQ@e=X0pR!>n$S~59Y$}#o|a5J1HFf^wJ9A|hI`v`9(@tD q{+JBAid$vaW7ORX^ghQ^8B-lhD0mvDi9RqxNu7u)ZLA2@pI^WHu7(LVd8KJV38Z8pnB(m{HIpLhNr z#csZW={p%*8P2dqa2Q0g%ra-lUU1FS%Hc9|0-ub@zHZ(Rr~a632o{Obz4nHIHQ-h3 z%I9ks?)t546yCt3rrG~!LYBVL>k6BI%^e}$@kK@k2EWufMhnKJm+A>U%I~qT+ zXVcQhcC4NASNM1t1v6~d*cFA zEkq;`$Xbg3L^Il3J5Cu${6^L3K$1F=H4(@*lKDgFXCFhU9m{KaM(+d;=oCLichNRu SHV?@F0000 keyboardNameTable; // Key // Initialize the icons associated with each command. commandIcon = [[NSDictionary alloc] initWithObjectsAndKeys: - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonSelect_420x420" ofType:@"png"]] autorelease], @"UNKNOWN COMMAND", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_ArrowUp_420x420" ofType:@"png"]] autorelease], @"Up", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_ArrowDown_420x420" ofType:@"png"]] autorelease], @"Down", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_ArrowLeft_420x420" ofType:@"png"]] autorelease], @"Left", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_ArrowRight_420x420" ofType:@"png"]] autorelease], @"Right", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonA_420x420" ofType:@"png"]] autorelease], @"A", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonB_420x420" ofType:@"png"]] autorelease], @"B", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonX_420x420" ofType:@"png"]] autorelease], @"X", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonY_420x420" ofType:@"png"]] autorelease], @"Y", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonL_420x420" ofType:@"png"]] autorelease], @"L", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonR_420x420" ofType:@"png"]] autorelease], @"R", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonStart_420x420" ofType:@"png"]] autorelease], @"Start", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonSelect_420x420" ofType:@"png"]] autorelease], @"Select", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_MicrophoneBlueGlow_256x256" ofType:@"png"]] autorelease], @"Microphone", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_GuitarGrip_Button_Green_512x512" ofType:@"png"]] autorelease], @"Guitar Grip: Green", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_GuitarGrip_Button_Red_512x512" ofType:@"png"]] autorelease], @"Guitar Grip: Red", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_GuitarGrip_Button_Yellow_512x512" ofType:@"png"]] autorelease], @"Guitar Grip: Yellow", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_GuitarGrip_Button_Blue_512x512" ofType:@"png"]] autorelease], @"Guitar Grip: Blue", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: C", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: C#", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: D", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: D#", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: E", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: F", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: F#", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: G", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: G#", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: A", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: A#", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: B", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Piano_256x256" ofType:@"png"]] autorelease], @"Piano: High C", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_PaddleKnob_256x256" ofType:@"png"]] autorelease], @"Paddle", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_AutoholdSet_420x420" ofType:@"png"]] autorelease], @"Autohold - Set", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_AutoholdClear_420x420" ofType:@"png"]] autorelease], @"Autohold - Clear", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DisplayToggle_420x420" ofType:@"png"]] autorelease], @"Toggle All Displays", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_RotateCCW_420x420" ofType:@"png"]] autorelease], @"Rotate Display Left", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_RotateCW_420x420" ofType:@"png"]] autorelease], @"Rotate Display Right", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_ShowHUD_420x420" ofType:@"png"]] autorelease], @"HUD", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Execute_420x420" ofType:@"png"]] autorelease], @"Execute", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Pause_420x420" ofType:@"png"]] autorelease], @"Pause", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Execute_420x420" ofType:@"png"]] autorelease], @"Execute/Pause", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_FrameAdvance_420x420" ofType:@"png"]] autorelease], @"Frame Advance", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_FrameJump_420x420" ofType:@"png"]] autorelease], @"Frame Jump", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Reset_420x420" ofType:@"png"]] autorelease], @"Reset", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_DSButtonSelect_420x420" ofType:@"png"]] autorelease], @"Touch", - [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_VolumeMute_16x16" ofType:@"png"]] autorelease], @"Mute/Unmute", + [NSImage imageNamed:@"Icon_DSButtonSelect_420x420"], @"UNKNOWN COMMAND", + [NSImage imageNamed:@"Icon_ArrowUp_420x420"], @"Up", + [NSImage imageNamed:@"Icon_ArrowDown_420x420"], @"Down", + [NSImage imageNamed:@"Icon_ArrowLeft_420x420"], @"Left", + [NSImage imageNamed:@"Icon_ArrowRight_420x420"], @"Right", + [NSImage imageNamed:@"Icon_DSButtonA_420x420"], @"A", + [NSImage imageNamed:@"Icon_DSButtonB_420x420"], @"B", + [NSImage imageNamed:@"Icon_DSButtonX_420x420"], @"X", + [NSImage imageNamed:@"Icon_DSButtonY_420x420"], @"Y", + [NSImage imageNamed:@"Icon_DSButtonL_420x420"], @"L", + [NSImage imageNamed:@"Icon_DSButtonR_420x420"], @"R", + [NSImage imageNamed:@"Icon_DSButtonStart_420x420"], @"Start", + [NSImage imageNamed:@"Icon_DSButtonSelect_420x420"], @"Select", + [NSImage imageNamed:@"Icon_MicrophoneBlueGlow_256x256"], @"Microphone", + [NSImage imageNamed:@"Icon_GuitarGrip_Button_Green_512x512"], @"Guitar Grip: Green", + [NSImage imageNamed:@"Icon_GuitarGrip_Button_Red_512x512"], @"Guitar Grip: Red", + [NSImage imageNamed:@"Icon_GuitarGrip_Button_Yellow_512x512"], @"Guitar Grip: Yellow", + [NSImage imageNamed:@"Icon_GuitarGrip_Button_Blue_512x512"], @"Guitar Grip: Blue", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: C", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: C#", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: D", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: D#", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: E", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: F", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: F#", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: G", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: G#", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: A", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: A#", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: B", + [NSImage imageNamed:@"Icon_Piano_256x256"], @"Piano: High C", + [NSImage imageNamed:@"Icon_PaddleKnob_256x256"], @"Paddle", + [NSImage imageNamed:@"Icon_AutoholdSet_420x420"], @"Autohold - Set", + [NSImage imageNamed:@"Icon_AutoholdClear_420x420"], @"Autohold - Clear", + [NSImage imageNamed:@"Icon_DisplayToggle_420x420"], @"Toggle All Displays", + [NSImage imageNamed:@"Icon_RotateCCW_420x420"], @"Rotate Display Left", + [NSImage imageNamed:@"Icon_RotateCW_420x420"], @"Rotate Display Right", + [NSImage imageNamed:@"Icon_ShowHUD_420x420"], @"HUD", + [NSImage imageNamed:@"Icon_Execute_420x420"], @"Execute", + [NSImage imageNamed:@"Icon_Pause_420x420"], @"Pause", + [NSImage imageNamed:@"Icon_Execute_420x420"], @"Execute/Pause", + [NSImage imageNamed:@"Icon_FrameAdvance_420x420"], @"Frame Advance", + [NSImage imageNamed:@"Icon_FrameJump_420x420"], @"Frame Jump", + [NSImage imageNamed:@"Icon_Reset_420x420"], @"Reset", + [NSImage imageNamed:@"Icon_DSButtonSelect_420x420"], @"Touch", + [NSImage imageNamed:@"Icon_VolumeMute_16x16"], @"Mute/Unmute", nil]; // Initialize the selectors used for each command tag. (Do this in code rather than in an external file.) diff --git a/desmume/src/cocoa/userinterface/cheatWindowDelegate.mm b/desmume/src/cocoa/userinterface/cheatWindowDelegate.mm index 14bd9433b..21d4164db 100644 --- a/desmume/src/cocoa/userinterface/cheatWindowDelegate.mm +++ b/desmume/src/cocoa/userinterface/cheatWindowDelegate.mm @@ -96,9 +96,9 @@ if ([CocoaDSCheatItem iconInternalCheat] == nil || [CocoaDSCheatItem iconActionReplay] == nil || [CocoaDSCheatItem iconCodeBreaker] == nil) { - [CocoaDSCheatItem setIconInternalCheat:[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"AppIcon_DeSmuME" ofType:@"icns"]]]; - [CocoaDSCheatItem setIconActionReplay:[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_ActionReplay_128x128" ofType:@"png"]]]; - [CocoaDSCheatItem setIconCodeBreaker:[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_CodeBreaker_128x128" ofType:@"png"]]]; + [CocoaDSCheatItem setIconInternalCheat:[NSImage imageNamed:@"NSApplicationIcon"]]; + [CocoaDSCheatItem setIconActionReplay:[NSImage imageNamed:@"Icon_ActionReplay_128x128"]]; + [CocoaDSCheatItem setIconCodeBreaker:[NSImage imageNamed:@"Icon_CodeBreaker_128x128"]]; } return self; diff --git a/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm b/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm index 7284b62f6..6ac1afcfe 100644 --- a/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm +++ b/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm @@ -303,10 +303,10 @@ } // Load the volume icons. - iconVolumeFull = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_VolumeFull_16x16" ofType:@"png"]]; - iconVolumeTwoThird = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_VolumeTwoThird_16x16" ofType:@"png"]]; - iconVolumeOneThird = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_VolumeOneThird_16x16" ofType:@"png"]]; - iconVolumeMute = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_VolumeMute_16x16" ofType:@"png"]]; + iconVolumeFull = [[NSImage imageNamed:@"Icon_VolumeFull_16x16"] retain]; + iconVolumeTwoThird = [[NSImage imageNamed:@"Icon_VolumeTwoThird_16x16"] retain]; + iconVolumeOneThird = [[NSImage imageNamed:@"Icon_VolumeOneThird_16x16"] retain]; + iconVolumeMute = [[NSImage imageNamed:@"Icon_VolumeMute_16x16"] retain]; [bindings setObject:iconVolumeFull forKey:@"volumeIconImage"]; prefViewDict = nil;