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 000000000..fba9c6df8 Binary files /dev/null and b/desmume/src/cocoa/images/Icon_ActionReplay_32x32@2x.png differ diff --git a/desmume/src/cocoa/images/Icon_CodeBreaker_32x32@2x.png b/desmume/src/cocoa/images/Icon_CodeBreaker_32x32@2x.png new file mode 100644 index 000000000..de5a31781 Binary files /dev/null and b/desmume/src/cocoa/images/Icon_CodeBreaker_32x32@2x.png differ diff --git a/desmume/src/cocoa/images/Icon_DeSmuME_32x32.png b/desmume/src/cocoa/images/Icon_DeSmuME_32x32.png index 97021467d..efea973de 100644 Binary files a/desmume/src/cocoa/images/Icon_DeSmuME_32x32.png and b/desmume/src/cocoa/images/Icon_DeSmuME_32x32.png differ 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 000000000..87afa258b Binary files /dev/null and b/desmume/src/cocoa/images/Icon_DeSmuME_32x32@2x.png differ 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 000000000..80e07de29 Binary files /dev/null and b/desmume/src/cocoa/images/Icon_VolumeFull_16x16@2x.png differ diff --git a/desmume/src/cocoa/images/Icon_VolumeMute_16x16@2x.png b/desmume/src/cocoa/images/Icon_VolumeMute_16x16@2x.png new file mode 100644 index 000000000..1b7ba0732 Binary files /dev/null and b/desmume/src/cocoa/images/Icon_VolumeMute_16x16@2x.png differ diff --git a/desmume/src/cocoa/images/Icon_VolumeOneThird_16x16@2x.png b/desmume/src/cocoa/images/Icon_VolumeOneThird_16x16@2x.png new file mode 100644 index 000000000..922b26c61 Binary files /dev/null and b/desmume/src/cocoa/images/Icon_VolumeOneThird_16x16@2x.png differ diff --git a/desmume/src/cocoa/images/Icon_VolumeTwoThird_16x16@2x.png b/desmume/src/cocoa/images/Icon_VolumeTwoThird_16x16@2x.png new file mode 100644 index 000000000..fd7c24dff Binary files /dev/null and b/desmume/src/cocoa/images/Icon_VolumeTwoThird_16x16@2x.png differ diff --git a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm index bd7072781..0a2c4946d 100644 --- a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm +++ b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm @@ -143,20 +143,21 @@ isSoundMuted = NO; lastSetVolumeValue = MAX_VOLUME; - iconExecute = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Execute_420x420" ofType:@"png"]]; - iconPause = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Pause_420x420" ofType:@"png"]]; - iconSpeedNormal = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Speed1x_420x420" ofType:@"png"]]; - iconSpeedDouble = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Speed2x_420x420" ofType:@"png"]]; + iconExecute = [[NSImage imageNamed:@"Icon_Execute_420x420"] retain]; + iconPause = [[NSImage imageNamed:@"Icon_Pause_420x420"] retain]; + iconSpeedNormal = [[NSImage imageNamed:@"Icon_Speed1x_420x420"] retain]; + iconSpeedDouble = [[NSImage imageNamed:@"Icon_Speed2x_420x420"] retain]; - iconMicDisabled = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_MicrophoneBlack_256x256" ofType:@"png"]]; - iconMicIdle = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_MicrophoneDarkGreen_256x256" ofType:@"png"]]; - iconMicActive = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_MicrophoneGreen_256x256" ofType:@"png"]]; - iconMicInClip = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_MicrophoneRed_256x256" ofType:@"png"]]; - iconMicManualOverride = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_MicrophoneGray_256x256" ofType:@"png"]]; - 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"]]; + iconMicDisabled = [[NSImage imageNamed:@"Icon_MicrophoneBlack_256x256"] retain]; + iconMicIdle = [[NSImage imageNamed:@"Icon_MicrophoneDarkGreen_256x256"] retain]; + iconMicActive = [[NSImage imageNamed:@"Icon_MicrophoneGreen_256x256"] retain]; + iconMicInClip = [[NSImage imageNamed:@"Icon_MicrophoneRed_256x256"] retain]; + iconMicManualOverride = [[NSImage imageNamed:@"Icon_MicrophoneGray_256x256"] retain]; + + 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]; isWorking = NO; isRomLoading = NO; @@ -187,6 +188,7 @@ [iconMicActive release]; [iconMicInClip release]; [iconMicManualOverride release]; + [iconVolumeFull release]; [iconVolumeTwoThird release]; [iconVolumeOneThird release]; diff --git a/desmume/src/cocoa/userinterface/InputManager.mm b/desmume/src/cocoa/userinterface/InputManager.mm index 076a8a83f..fd5b858d5 100644 --- a/desmume/src/cocoa/userinterface/InputManager.mm +++ b/desmume/src/cocoa/userinterface/InputManager.mm @@ -1014,52 +1014,52 @@ static std::unordered_map 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;