From d37650a8a54be4c2ada0bf453e7c705369826dd2 Mon Sep 17 00:00:00 2001 From: rogerman Date: Mon, 31 Dec 2012 02:01:37 +0000 Subject: [PATCH] Cocoa Port: - Fix some compilation issues related to r4452. - Switch the order of model identifier info and OS info in the About box. - Do some minor code cleanup. --- .../project.pbxproj | 12 + .../project.pbxproj | 8 + .../translations/English.lproj/MainMenu.xib | 288 ++---------------- desmume/src/cocoa/userinterface/appDelegate.h | 4 - .../src/cocoa/userinterface/appDelegate.mm | 4 +- .../troubleshootingWindowDelegate.mm | 2 +- 6 files changed, 42 insertions(+), 276 deletions(-) diff --git a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj index ee783fedc..a88b161a0 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj @@ -577,6 +577,10 @@ AB73AA2E1507C9F500A310C8 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABC570D4134431DA00E7B0B1 /* OpenGL.framework */; }; AB73AA2F1507C9F500A310C8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0A0D1914AACA9600E83E91 /* libz.dylib */; }; AB75226F14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; }; + ABA03570169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */; }; + ABA03571169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */; }; + ABA03572169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */; }; + ABA03573169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */; }; ABAD0F7315ACE7A00000EC47 /* KeyNames.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB02475B13886BF300E9F9AB /* KeyNames.plist */; }; ABAD0F7415ACE7A00000EC47 /* DefaultKeyMappings.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABC719E1138CB25E002827A9 /* DefaultKeyMappings.plist */; }; ABAD0F7515ACE7A00000EC47 /* DefaultUserPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABBC0F8C1394B1AA0028B6BD /* DefaultUserPrefs.plist */; }; @@ -915,6 +919,8 @@ AB901BE31420707D00348EEC /* Norwegian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Norwegian; path = translations/Norwegian.lproj/Localizable.strings; sourceTree = ""; }; AB901BE41420708200348EEC /* Romanian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Romanian; path = translations/Romanian.lproj/Localizable.strings; sourceTree = ""; }; AB9971CE134EDA0800531BA7 /* cocoa_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_globals.h; sourceTree = ""; }; + ABA0356E169127BB00817C69 /* troubleshootingWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = troubleshootingWindowDelegate.h; sourceTree = ""; }; + ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = troubleshootingWindowDelegate.mm; sourceTree = ""; }; ABA6574914511EC90077E5E9 /* cocoa_cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_cheat.h; sourceTree = ""; }; ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_cheat.mm; sourceTree = ""; }; ABAD104915ACE7A00000EC47 /* DeSmuME (PPC).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeSmuME (PPC).app"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1395,12 +1401,14 @@ AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */, AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */, AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */, + ABA0356E169127BB00817C69 /* troubleshootingWindowDelegate.h */, AB3ACB6714C2361100D7D192 /* appDelegate.mm */, AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */, AB3ACB6B14C2361100D7D192 /* displayView.mm */, AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */, AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */, AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */, + ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */, ); path = userinterface; sourceTree = ""; @@ -2489,6 +2497,7 @@ AB2F3C3715CF9C6000858373 /* scanline.cpp in Sources */, AB2F3C3815CF9C6000858373 /* coreaudiosound.cpp in Sources */, AB2F3C3915CF9C6000858373 /* ringbuffer.cpp in Sources */, + ABA03571169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2627,6 +2636,7 @@ ABBCE2F215ACB29100A2C965 /* OperandX86X64.cpp in Sources */, ABBCE2F315ACB29100A2C965 /* Platform.cpp in Sources */, ABBCE2F615ACB29100A2C965 /* Util.cpp in Sources */, + ABA03572169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2765,6 +2775,7 @@ ABBCE2E215ACB29100A2C965 /* OperandX86X64.cpp in Sources */, ABBCE2E315ACB29100A2C965 /* Platform.cpp in Sources */, ABBCE2E615ACB29100A2C965 /* Util.cpp in Sources */, + ABA03570169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2889,6 +2900,7 @@ ABAD102D15ACE7A00000EC47 /* scanline.cpp in Sources */, ABAD102E15ACE7A00000EC47 /* coreaudiosound.cpp in Sources */, ABAD102F15ACE7A00000EC47 /* ringbuffer.cpp in Sources */, + ABA03573169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj index 826ce3b73..efde25d94 100644 --- a/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj @@ -547,6 +547,8 @@ ABEFCF62141AB82A000CC0CD /* AppIcon_DeSmuME.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABEFCF5E141AB82A000CC0CD /* AppIcon_DeSmuME.icns */; }; ABEFCF63141AB82A000CC0CD /* AppIcon_NintendoDS_ROM.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABEFCF5F141AB82A000CC0CD /* AppIcon_NintendoDS_ROM.icns */; }; ABEFCF64141AB82A000CC0CD /* AppIcon_SaveState.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABEFCF60141AB82A000CC0CD /* AppIcon_SaveState.icns */; }; + ABF2B9FB16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */; }; + ABF2B9FC16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */; }; ABFE150714C92FF5005D6699 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */; }; ABFE150814C92FF5005D6699 /* bilinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FB14C92FF5005D6699 /* bilinear.cpp */; }; ABFE150914C92FF5005D6699 /* epx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FC14C92FF5005D6699 /* epx.cpp */; }; @@ -933,6 +935,8 @@ ABEFCF5E141AB82A000CC0CD /* AppIcon_DeSmuME.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_DeSmuME.icns; sourceTree = ""; }; ABEFCF5F141AB82A000CC0CD /* AppIcon_NintendoDS_ROM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_NintendoDS_ROM.icns; sourceTree = ""; }; ABEFCF60141AB82A000CC0CD /* AppIcon_SaveState.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_SaveState.icns; sourceTree = ""; }; + ABF2B9F81690412A000FF7C0 /* troubleshootingWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = troubleshootingWindowDelegate.h; sourceTree = ""; }; + ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = troubleshootingWindowDelegate.mm; sourceTree = ""; }; ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 2xsai.cpp; sourceTree = ""; }; ABFE14FB14C92FF5005D6699 /* bilinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bilinear.cpp; sourceTree = ""; }; ABFE14FC14C92FF5005D6699 /* epx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = epx.cpp; sourceTree = ""; }; @@ -1128,12 +1132,14 @@ AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */, AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */, AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */, + ABF2B9F81690412A000FF7C0 /* troubleshootingWindowDelegate.h */, AB3ACB6714C2361100D7D192 /* appDelegate.mm */, AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */, AB3ACB6B14C2361100D7D192 /* displayView.mm */, AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */, AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */, AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */, + ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */, ); path = userinterface; sourceTree = ""; @@ -2052,6 +2058,7 @@ AB796DD115CDD20F00C59155 /* OperandX86X64.cpp in Sources */, AB796DD615CDD20F00C59155 /* Platform.cpp in Sources */, AB796DE515CDD20F00C59155 /* Util.cpp in Sources */, + ABF2B9FC16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2190,6 +2197,7 @@ AB796DD415CDD20F00C59155 /* OperandX86X64.cpp in Sources */, AB796DD915CDD20F00C59155 /* Platform.cpp in Sources */, AB796DE815CDD20F00C59155 /* Util.cpp in Sources */, + ABF2B9FB16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib index 2df5c0eed..fdfd41c1e 100644 --- a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib +++ b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib @@ -4260,7 +4260,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {1.79769e+308, 1.79769e+308} - + 256 YES @@ -4281,7 +4281,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 302}, {128, 128}} - YES 130560 @@ -4302,7 +4301,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 18 {{13, 10}, {524, 290}} - YES @@ -4327,7 +4325,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 2322 {490, 14} - @@ -4407,7 +4404,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {490, 244} - + @@ -4421,7 +4418,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{490, 0}, {15, 244}} - _doScroller: 0.96240601503759393 @@ -4431,7 +4427,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{-100, -100}, {87, 18}} - 1 _doScroller: @@ -4441,7 +4436,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{-3, -3}, {505, 244}} - + 16 @@ -4450,7 +4445,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{10, 33}, {504, 244}} - Read Me @@ -4853,7 +4847,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 270 {{153, 374}, {380, 56}} - YES 69336577 @@ -4871,7 +4864,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 270 {{156, 302}, {374, 64}} - YES 73530881 @@ -4887,8 +4879,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {550, 450} - - {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -5458,11 +5448,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {1.79769e+308, 1.79769e+308} - + 256 {400, 100} - - {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -10520,7 +10508,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {1.79769e+308, 1.79769e+308} - + 256 YES @@ -10529,7 +10517,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{119, 300}, {166, 22}} - YES -1804468671 @@ -10548,7 +10535,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{119, 246}, {166, 44}} - YES -1805517311 @@ -10567,7 +10553,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 302}, {71, 17}} - YES 68288064 @@ -10584,7 +10569,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 270}, {63, 17}} - YES 68288064 @@ -10601,7 +10585,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 220}, {97, 17}} - YES 68288064 @@ -10618,7 +10601,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 178}, {60, 17}} - YES 68288064 @@ -10635,7 +10617,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 150}, {69, 17}} - YES 68288064 @@ -10652,7 +10633,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{119, 176}, {169, 27}} - YES 71433728 @@ -10673,7 +10653,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{116, 144}, {172, 26}} - YES -2076049856 @@ -10773,7 +10752,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{116, 214}, {172, 26}} - YES -2076049856 @@ -11046,7 +11024,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 55}, {271, 85}} - YES 67239424 @@ -11063,7 +11040,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{104, 12}, {96, 32}} - YES 67239424 @@ -11081,8 +11057,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {305, 339} - - {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -11680,7 +11654,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {1.79769e+308, 1.79769e+308} - + 256 YES @@ -11699,14 +11673,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {270, 321} - YES 256 {270, 17} - @@ -11714,7 +11686,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{256, 0}, {16, 17}} - YES @@ -11824,7 +11795,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 17}, {270, 321}} - @@ -11835,7 +11805,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{256, 17}, {15, 306}} - _doScroller: 0.99689440993788825 @@ -11845,7 +11814,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{1, 323}, {270, 15}} - 1 _doScroller: @@ -11860,7 +11828,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 0}, {270, 17}} - @@ -11870,7 +11837,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 49}, {272, 339}} - 562 @@ -11885,7 +11851,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{113, 12}, {185, 32}} - YES 67239424 @@ -11906,7 +11871,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{47, 19}, {28, 23}} - YES -2080244224 @@ -11928,7 +11892,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{20, 19}, {28, 23}} - YES -2080244224 @@ -11960,7 +11923,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{100, 372}, {209, 26}} - YES -2076049856 @@ -12025,7 +11987,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 301 {{2, 33}, {320, 290}} - NSView @@ -12033,7 +11994,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{16, 402}, {129, 18}} - YES 67239424 @@ -12056,7 +12016,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 378}, {83, 17}} - YES 68288064 @@ -12077,7 +12036,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 12 {{14, 320}, {292, 5}} - {0, 0} 67239424 @@ -12100,7 +12058,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{103, 331}, {203, 39}} - YES -1805517311 @@ -12118,7 +12075,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 353}, {83, 17}} - YES 68288064 @@ -12135,7 +12091,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{114, 6}, {96, 32}} - YES 67239424 @@ -12154,12 +12109,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {324, 428}} - {{297, 16}, {326, 444}} - {0, 0} 67239424 @@ -12183,7 +12136,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{89, 446}, {70, 14}} - YES 68288064 @@ -12204,7 +12156,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{89, 421}, {69, 14}} - YES 68288064 @@ -12221,7 +12172,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{160, 421}, {135, 14}} - YES 70385217 @@ -12239,7 +12189,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{161, 446}, {134, 14}} - YES 70385217 @@ -12257,7 +12206,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{90, 394}, {190, 18}} - YES -2080244224 @@ -12292,7 +12240,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 396}, {64, 64}} - YES 130560 @@ -12307,8 +12254,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {640, 480} - - {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -12317,7 +12262,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA CheatWindowDelegate - + 256 YES @@ -12326,7 +12271,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 292 {{17, 4}, {294, 14}} - YES 68288064 @@ -12344,7 +12288,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{214, 220}, {16, 16}} - 28938 100 @@ -12353,7 +12296,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{133, 369}, {136, 22}} - YES -1539178944 @@ -12410,7 +12352,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{59, 374}, {60, 14}} - YES 68288064 @@ -12427,7 +12368,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{59, 398}, {72, 14}} - YES 68288064 @@ -12444,7 +12384,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{133, 393}, {136, 22}} - YES -2076049856 @@ -12501,7 +12440,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{0, 237}, {328, 134}} - NSView @@ -12509,7 +12447,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{233, 213}, {80, 28}} - YES 67239424 @@ -12530,7 +12467,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{59, 222}, {150, 14}} - YES 68288064 @@ -12548,7 +12484,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 222}, {45, 14}} - YES 68288064 @@ -12575,14 +12510,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {286, 176} - YES 256 {286, 17} - @@ -12590,7 +12523,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{224, 0}, {16, 17}} - YES @@ -12670,7 +12602,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 17}, {286, 176}} - @@ -12681,7 +12612,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{224, 17}, {15, 102}} - _doScroller: 0.94863013698630139 @@ -12691,7 +12621,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{1, 294}, {338, 15}} - 1 _doScroller: @@ -12706,7 +12635,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 0}, {286, 17}} - @@ -12716,7 +12644,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 20}, {288, 194}} - 562 @@ -12728,8 +12655,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {328, 434} - - NSView @@ -13106,7 +13031,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {1.79769e+308, 1.79769e+308} - + 268 YES @@ -13115,7 +13040,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{233, 54}, {80, 28}} - YES 67239424 @@ -13136,7 +13060,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{20, 59}, {210, 19}} - YES 343014976 @@ -13198,7 +13121,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 86}, {294, 14}} - YES 67239424 @@ -13215,7 +13137,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 100}, {294, 14}} - YES 67239424 @@ -13229,8 +13150,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {328, 134} - - NSView @@ -13899,7 +13818,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSView - + 301 YES @@ -13941,7 +13860,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{0, 125}, {278, 53}} - @@ -14013,7 +13931,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {278, 223}} - @@ -14025,7 +13942,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{231, 1}, {15, 172}} - _doScroller: 0.68253968253968256 @@ -14035,7 +13951,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{-100, -100}, {87, 18}} - 1 _doScroller: @@ -14045,7 +13960,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 20}, {280, 225}} - 530 @@ -14057,7 +13971,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 253}, {138, 17}} - YES 68288064 @@ -14071,8 +13984,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {320, 290} - - NSView @@ -18152,7 +18063,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {1.79769e+308, 1.79769e+308} - + 256 YES @@ -18172,7 +18083,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 440}, {128, 128}} - YES 130560 @@ -18200,7 +18110,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 89}, {131, 17}} - YES 68288064 @@ -18217,7 +18126,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 64}, {131, 17}} - YES 68288064 @@ -18234,7 +18142,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 39}, {131, 17}} - YES 68288064 @@ -18251,7 +18158,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 14}, {131, 17}} - YES 68288064 @@ -18268,7 +18174,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{148, 89}, {245, 17}} - YES 68288064 @@ -18289,7 +18194,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{148, 64}, {245, 17}} - YES 68288064 @@ -18307,7 +18211,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{148, 39}, {245, 17}} - YES 68288064 @@ -18325,7 +18228,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{148, 14}, {245, 17}} - YES 68288064 @@ -18341,12 +18243,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {408, 116}} - {{153, 436}, {410, 132}} - {0, 0} 67239424 @@ -18380,7 +18280,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 376}, {186, 14}} - YES 68288064 @@ -18397,7 +18296,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 312}, {186, 14}} - YES 68288064 @@ -18414,7 +18312,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 248}, {186, 14}} - YES 68288064 @@ -18431,7 +18328,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 184}, {186, 14}} - YES 68288064 @@ -18448,7 +18344,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 120}, {186, 14}} - YES 68288064 @@ -18465,7 +18360,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 56}, {186, 14}} - YES 68288064 @@ -18482,7 +18376,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 334}, {186, 42}} - YES 67239424 @@ -18500,7 +18393,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 270}, {186, 42}} - YES 67239424 @@ -18518,7 +18410,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 206}, {186, 42}} - YES 67239424 @@ -18536,7 +18427,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 142}, {186, 42}} - YES 67239424 @@ -18554,7 +18444,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 78}, {186, 42}} - YES 67239424 @@ -18572,7 +18461,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 14}, {186, 42}} - YES 67239424 @@ -18588,12 +18476,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {216, 400}} - {{17, 16}, {218, 416}} - {0, 0} 67239424 @@ -18627,7 +18513,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 168}, {186, 14}} - YES 68288064 @@ -18644,7 +18529,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 146}, {186, 14}} - YES 68288064 @@ -18661,7 +18545,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 124}, {186, 14}} - YES 68288064 @@ -18678,7 +18561,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 102}, {186, 14}} - YES 68288064 @@ -18695,7 +18577,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 80}, {186, 14}} - YES 68288064 @@ -18712,7 +18593,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 58}, {186, 14}} - YES 68288064 @@ -18729,7 +18609,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 36}, {186, 14}} - YES 68288064 @@ -18746,7 +18625,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 14}, {186, 14}} - YES 68288064 @@ -18763,7 +18641,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 168}, {106, 14}} - YES 68288064 @@ -18780,7 +18657,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 146}, {106, 14}} - YES 68288064 @@ -18798,7 +18674,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 124}, {106, 14}} - YES 68288064 @@ -18816,7 +18691,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 102}, {106, 14}} - YES 68288064 @@ -18834,7 +18708,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 80}, {106, 14}} - YES 68288064 @@ -18852,7 +18725,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 58}, {106, 14}} - YES 68288064 @@ -18870,7 +18742,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 36}, {106, 14}} - YES 68288064 @@ -18888,7 +18759,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 14}, {106, 14}} - YES 68288064 @@ -18904,12 +18774,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {324, 192}} - {{237, 224}, {326, 208}} - {0, 0} 67239424 @@ -18943,7 +18811,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 80}, {186, 14}} - YES 68288064 @@ -18960,7 +18827,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 80}, {106, 14}} - YES 68288064 @@ -18978,7 +18844,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 58}, {186, 14}} - YES 68288064 @@ -18995,7 +18860,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 58}, {106, 14}} - YES 68288064 @@ -19013,7 +18877,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 36}, {186, 14}} - YES 68288064 @@ -19030,7 +18893,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 36}, {106, 14}} - YES 68288064 @@ -19048,7 +18910,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 14}, {186, 14}} - YES 68288064 @@ -19065,7 +18926,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 14}, {106, 14}} - YES 68288064 @@ -19081,12 +18941,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {324, 104}} - {{237, 98}, {326, 120}} - {0, 0} 67239424 @@ -19120,7 +18978,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 36}, {186, 14}} - YES 68288064 @@ -19137,7 +18994,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 36}, {106, 14}} - YES 68288064 @@ -19155,7 +19011,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{15, 14}, {186, 14}} - YES 68288064 @@ -19172,7 +19027,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{203, 14}, {106, 14}} - YES 68288064 @@ -19188,12 +19042,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {324, 60}} - {{237, 16}, {326, 76}} - {0, 0} 67239424 @@ -19214,8 +19066,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {580, 588} - - {{0, 0}, {1920, 1178}} {1.79769e+308, 1.79769e+308} @@ -19964,18 +19814,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {580, 592} {580, 592} - + 256 {580, 592} - - {{0, 0}, {1920, 1178}} {580, 614} {580, 614} - + 268 YES @@ -20015,9 +19863,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA public.url - {523, 202} + {{0, 69}, {523, 133}} - @@ -20081,7 +19928,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {523, 202}} - @@ -20093,7 +19939,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{524, 1}, {15, 202}} - _doScroller: 0.99248120300751874 @@ -20103,7 +19948,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{-100, -100}, {87, 18}} - 1 _doScroller: @@ -20113,7 +19957,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 61}, {540, 204}} - 18 @@ -20125,7 +19968,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 265 {{397, 342}, {166, 28}} - YES 69336577 @@ -20154,7 +19996,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{365, 340}, {30, 30}} - YES 130560 @@ -20172,7 +20013,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 288 {{125, 16}, {438, 28}} - YES 67239424 @@ -20189,7 +20029,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 34 {{12, 50}, {556, 5}} - {0, 0} 67239424 @@ -20212,7 +20051,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 273}, {546, 28}} - YES 67239424 @@ -20229,7 +20067,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 309}, {546, 17}} - YES 68288064 @@ -20246,7 +20083,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 10 {{12, 332}, {556, 5}} - {0, 0} 67239424 @@ -20269,7 +20105,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 489}, {546, 42}} - YES 67239424 @@ -20286,7 +20121,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 539}, {546, 17}} - YES 68288064 @@ -20303,7 +20137,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 10 {{12, 478}, {556, 5}} - {0, 0} 67239424 @@ -20326,7 +20159,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 455}, {546, 17}} - YES 68288064 @@ -20343,7 +20175,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 405}, {546, 42}} - YES 67239424 @@ -20360,7 +20191,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 347}, {77, 17}} - YES 68288064 @@ -20377,7 +20207,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 377}, {78, 17}} - YES 68288064 @@ -20394,7 +20223,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 266 {{100, 345}, {256, 22}} - YES -1804468671 @@ -20412,7 +20240,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 266 {{100, 375}, {256, 22}} - YES -1804468671 @@ -20430,7 +20257,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 265 {{358, 370}, {209, 32}} - YES 67239424 @@ -20451,7 +20277,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 288 {{14, 12}, {112, 32}} - YES 67239424 @@ -20469,12 +20294,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {580, 567} - - NSView - + 268 YES @@ -20514,9 +20337,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA public.url - {524, 80} + {{0, 18}, {524, 62}} - @@ -20580,7 +20402,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {524, 80}} - @@ -20592,7 +20413,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{525, 1}, {15, 80}} - _doScroller: 0.99248120300751874 @@ -20602,7 +20422,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{-100, -100}, {87, 18}} - 1 _doScroller: @@ -20612,7 +20431,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 61}, {541, 82}} - 18 @@ -20655,9 +20473,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA public.url - {523, 71} + {{0, 6}, {523, 65}} - @@ -20721,7 +20538,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {523, 80}} - @@ -20733,7 +20549,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{524, 1}, {15, 80}} - _doScroller: 0.99248120300751874 @@ -20743,7 +20558,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{-100, -100}, {87, 18}} - 1 _doScroller: @@ -20753,7 +20567,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 167}, {540, 82}} - 18 @@ -20765,7 +20578,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 265 {{397, 342}, {166, 28}} - YES 69336577 @@ -20794,7 +20606,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{365, 340}, {30, 30}} - YES 130560 @@ -20812,7 +20623,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 288 {{125, 16}, {438, 28}} - YES 67239424 @@ -20829,7 +20639,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 34 {{12, 50}, {556, 5}} - {0, 0} 67239424 @@ -20852,7 +20661,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{17, 145}, {206, 14}} - YES 68288064 @@ -20869,7 +20677,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{17, 251}, {206, 14}} - YES 68288064 @@ -20886,7 +20693,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 273}, {546, 28}} - YES 67239424 @@ -20903,7 +20709,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 309}, {546, 17}} - YES 68288064 @@ -20920,7 +20725,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 10 {{12, 332}, {556, 5}} - {0, 0} 67239424 @@ -20943,7 +20747,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 489}, {546, 42}} - YES 67239424 @@ -20960,7 +20763,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 539}, {546, 17}} - YES 68288064 @@ -20977,7 +20779,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 10 {{12, 478}, {556, 5}} - {0, 0} 67239424 @@ -21000,7 +20801,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 455}, {546, 17}} - YES 68288064 @@ -21017,7 +20817,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 269 {{17, 405}, {546, 42}} - YES 67239424 @@ -21034,7 +20833,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 347}, {77, 17}} - YES 68288064 @@ -21051,7 +20849,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 377}, {78, 17}} - YES 68288064 @@ -21068,7 +20865,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 266 {{100, 345}, {255, 22}} - YES -1804468671 @@ -21086,7 +20882,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 266 {{100, 375}, {255, 22}} - YES -1804468671 @@ -21104,7 +20899,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 265 {{358, 370}, {209, 32}} - YES 67239424 @@ -21125,7 +20919,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 288 {{14, 12}, {112, 32}} - YES 67239424 @@ -21143,12 +20936,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {580, 567} - - NSView - + 268 YES @@ -21157,7 +20948,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{342, 55}, {224, 32}} - YES 67239424 @@ -21178,7 +20968,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{17, 52}, {326, 42}} - YES 67239424 @@ -21195,7 +20984,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{342, 12}, {224, 32}} - YES 67239424 @@ -21216,7 +21004,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 {{14, 12}, {112, 32}} - YES 67239424 @@ -21245,9 +21032,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 2322 - {523, 171} + {{0, 157}, {523, 14}} - @@ -21311,7 +21097,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{1, 1}, {523, 443}} - + @@ -21322,7 +21108,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 {{524, 1}, {15, 443}} - _doScroller: 1 @@ -21333,7 +21118,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA -2147483392 {{-100, -100}, {87, 18}} - 1 _doScroller: @@ -21343,7 +21127,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{20, 102}, {540, 445}} - + 18 @@ -21351,8 +21135,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {580, 567} - - NSView @@ -30498,22 +30280,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 6446 - - - troubleshootingBugReportView - - - - 6447 - - - - troubleshootingSupportRequestView - - - - 6448 - troubleshootingWindow @@ -49099,8 +48865,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA prefGeneralView prefWindow prefWindowController - troubleshootingBugReportView - troubleshootingSupportRequestView troubleshootingWindow @@ -49124,8 +48888,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSView NSWindow NSObjectController - NSView - NSView NSWindow @@ -49152,8 +48914,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA prefGeneralView prefWindow prefWindowController - troubleshootingBugReportView - troubleshootingSupportRequestView troubleshootingWindow @@ -49234,14 +48994,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA prefWindowController NSObjectController - - troubleshootingBugReportView - NSView - - - troubleshootingSupportRequestView - NSView - troubleshootingWindow NSWindow diff --git a/desmume/src/cocoa/userinterface/appDelegate.h b/desmume/src/cocoa/userinterface/appDelegate.h index a9a6a7e2f..29c00ef35 100644 --- a/desmume/src/cocoa/userinterface/appDelegate.h +++ b/desmume/src/cocoa/userinterface/appDelegate.h @@ -43,8 +43,6 @@ NSWindow *migrationWindow; NSView *prefGeneralView; InputPrefsView *inputPrefsView; - NSView *troubleshootingSupportRequestView; - NSView *troubleshootingBugReportView; NSMenu *mLoadStateSlot; NSMenu *mSaveStateSlot; @@ -76,8 +74,6 @@ @property (readonly) IBOutlet NSMenu *mLoadStateSlot; @property (readonly) IBOutlet NSMenu *mSaveStateSlot; @property (readonly) IBOutlet InputPrefsView *inputPrefsView; -@property (readonly) IBOutlet NSView *troubleshootingSupportRequestView; -@property (readonly) IBOutlet NSView *troubleshootingBugReportView; @property (readonly) IBOutlet NSBox *boxGeneralInfo; @property (readonly) IBOutlet NSBox *boxTitles; diff --git a/desmume/src/cocoa/userinterface/appDelegate.mm b/desmume/src/cocoa/userinterface/appDelegate.mm index 56e9523e8..2b568249b 100644 --- a/desmume/src/cocoa/userinterface/appDelegate.mm +++ b/desmume/src/cocoa/userinterface/appDelegate.mm @@ -46,8 +46,6 @@ @synthesize mLoadStateSlot; @synthesize mSaveStateSlot; @synthesize inputPrefsView; -@synthesize troubleshootingSupportRequestView; -@synthesize troubleshootingBugReportView; @synthesize fileMigrationList; @synthesize aboutWindowController; @synthesize emuWindowController; @@ -125,8 +123,8 @@ NSString *buildInfoStr = @"Build Info:"; buildInfoStr = [[buildInfoStr stringByAppendingString:[CocoaDSUtil appInternalVersionString]] stringByAppendingString:[CocoaDSUtil appCompilerDetailString]]; buildInfoStr = [[buildInfoStr stringByAppendingString:@"\nBuild Date: "] stringByAppendingString:@__DATE__]; - buildInfoStr = [[buildInfoStr stringByAppendingString:@"\nModel Identifier: "] stringByAppendingString:[CocoaDSUtil modelIdentifierString]]; buildInfoStr = [[buildInfoStr stringByAppendingString:@"\nOperating System: "] stringByAppendingString:[CocoaDSUtil operatingSystemString]]; + buildInfoStr = [[buildInfoStr stringByAppendingString:@"\nModel Identifier: "] stringByAppendingString:[CocoaDSUtil modelIdentifierString]]; NSFont *aboutTextFilesFont = [NSFont fontWithName:@"Monaco" size:10]; NSMutableDictionary *aboutWindowProperties = [NSMutableDictionary dictionaryWithObjectsAndKeys: diff --git a/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm b/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm index b5e54de25..f20b0bf21 100644 --- a/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm +++ b/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm @@ -67,7 +67,7 @@ - (IBAction) continueToFinalForm:(id)sender { - static const NSString *unspecifiedStr = @"Unspecified"; // Do not expose localized version for this NSString -- we want this to be in English + static NSString *unspecifiedStr = @"Unspecified"; // Do not expose localized version for this NSString -- we want this to be in English // Force end of editing of any text fields. [window makeFirstResponder:nil];