From b57f2dec12ddb2539061aaecad76e881627469ee Mon Sep 17 00:00:00 2001 From: rogerman Date: Sun, 27 Nov 2016 16:43:53 -0800 Subject: [PATCH] Cocoa Port: Update GUI to reflect the new SoftRasterizer texture post-processing support. Moves the Deposterize Textures and Texture Scaling Factor UI items from OpenGL Options to General Settings in the 3D Rendering Settings panel and DeSmuME Preferences. --- .../translations/English.lproj/MainMenu.xib | 862 ++++++++++-------- 1 file changed, 478 insertions(+), 384 deletions(-) diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib index d118678e9..059ab2679 100644 --- a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib +++ b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib @@ -2,7 +2,7 @@ 1050 - 13F1808 + 13F1911 851 1265.21 698.00 @@ -3959,7 +3959,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXAInputPrefsView - + 268 YES @@ -3975,12 +3975,13 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{13, 10}, {463, 413}} + YES 1 - + 274 YES @@ -3999,6 +4000,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{72, 44}, {84, 17}} + YES @@ -4018,6 +4020,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{44, 16}, {112, 17}} + YES @@ -4037,6 +4040,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{158, 38}, {126, 26}} + YES @@ -4130,6 +4134,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{289, 14}, {72, 22}} + YES @@ -4223,6 +4228,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{63, 72}, {93, 17}} + YES @@ -4242,6 +4248,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{158, 66}, {126, 26}} + YES @@ -4311,6 +4318,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{158, 11}, {126, 26}} + YES @@ -4413,11 +4421,13 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{1, 1}, {429, 100}} + {{6, 218}, {431, 116}} + {0, 0} @@ -4459,6 +4469,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{18, 14}, {100, 38}} + YES NO @@ -4706,11 +4717,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {194, 62}} + {{15, 53}, {196, 78}} + {0, 0} @@ -4742,6 +4755,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{18, 14}, {150, 38}} + YES NO @@ -4987,11 +5001,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {194, 62}} + {{218, 53}, {196, 78}} + {0, 0} @@ -5013,6 +5029,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 18}, {126, 17}} + YES @@ -5032,6 +5049,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{339, 16}, {72, 22}} + YES -1804599231 @@ -5115,6 +5133,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{144, 12}, {189, 26}} + YES @@ -5138,6 +5157,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{305, 38}, {38, 11}} + YES @@ -5161,6 +5181,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{263, 38}, {38, 11}} + YES @@ -5180,6 +5201,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{220, 38}, {38, 11}} + YES @@ -5199,6 +5221,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{178, 38}, {38, 11}} + YES @@ -5218,6 +5241,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{137, 38}, {38, 11}} + YES @@ -5235,11 +5259,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {429, 141}} + {{6, 57}, {431, 157}} + {0, 0} @@ -5258,6 +5284,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{10, 33}, {443, 367}} + + Display Views @@ -5267,7 +5295,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 2 - + 274 YES @@ -5819,7 +5847,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{10, 33}, {443, 367}} - Video Settings @@ -6064,23 +6091,25 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - + 0 YES YES YES - + {489, 437} + + NSView - + 268 YES @@ -6089,6 +6118,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{163, 329}, {220, 26}} + YES @@ -6148,6 +6178,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{17, 335}, {144, 17}} + YES @@ -6177,6 +6208,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 12}, {153, 18}} + YES @@ -6199,11 +6231,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {364, 38}} + {{17, 209}, {366, 54}} + {0, 0} @@ -6235,6 +6269,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{18, 15}, {180, 46}} + YES NO @@ -6483,6 +6518,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{145, 10}, {204, 26}} + YES -2076180416 @@ -6550,11 +6586,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {364, 71}} + {{17, 16}, {366, 87}} + {0, 0} @@ -6586,6 +6624,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{18, 14}, {328, 58}} + YES NO @@ -6845,11 +6884,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {364, 82}} + {{17, 107}, {366, 98}} + {0, 0} @@ -6881,6 +6922,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{40, 13}, {246, 21}} + YES @@ -6904,6 +6946,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{287, 17}, {62, 17}} + YES @@ -7004,6 +7047,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{18, 16}, {16, 16}} + YES @@ -7024,11 +7068,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {364, 44}} + {{17, 267}, {366, 60}} + {0, 0} @@ -7047,6 +7093,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {400, 373} + + NSView @@ -7065,7 +7113,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 public.item - {{13, 10}, {528, 473}} + {{13, 10}, {528, 441}} @@ -7144,7 +7192,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - {{6, 333}, {496, 74}} + {{6, 301}, {496, 74}} @@ -7548,7 +7596,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - {{6, 251}, {496, 78}} + {{6, 219}, {496, 78}} @@ -7805,7 +7853,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 _NS:11 - {{6, 171}, {496, 76}} + {{6, 139}, {496, 76}} @@ -7867,7 +7915,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - {{6, 113}, {496, 54}} + {{6, 81}, {496, 54}} @@ -7952,7 +8000,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - {{6, 35}, {496, 74}} + {{6, 3}, {496, 74}} @@ -7972,7 +8020,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - {{10, 33}, {508, 427}} + {{10, 33}, {508, 395}} @@ -8200,7 +8248,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - {{6, 217}, {496, 159}} + {{6, 184}, {496, 159}} {0, 0} @@ -8366,7 +8414,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - {{6, 78}, {496, 135}} + {{6, 45}, {496, 135}} {0, 0} @@ -8385,7 +8433,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - {{10, 33}, {508, 427}} + {{10, 33}, {508, 394.2109375}} BIOS and Firmware @@ -8780,7 +8828,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - {{6, 129}, {496, 153}} + {{6, 86}, {496, 153}} {0, 0} @@ -8801,7 +8849,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{244, 389}, {169, 26}} + {{244, 357}, {169, 26}} YES @@ -8869,7 +8917,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{74, 395}, {168, 17}} + {{74, 363}, {168, 17}} YES @@ -8898,7 +8946,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{258, 52}, {124, 18}} + {{280, 63}, {124, 18}} YES @@ -8922,7 +8970,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{258, 32}, {154, 18}} + {{280, 37}, {154, 18}} YES @@ -8946,7 +8994,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{258, 12}, {92, 18}} + {{280, 12}, {92, 18}} YES @@ -8970,7 +9018,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{16, 53}, {130, 17}} + {{37, 64}, {130, 17}} _NS:526 @@ -8978,7 +9026,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES 68157504 - 272630784 + 71304192 GPU Scaling Factor: _NS:526 @@ -8992,7 +9040,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{152, 50}, {52, 22}} + {{172, 61}, {52, 22}} _NS:9 @@ -9070,7 +9118,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{209, 48}, {19, 27}} + {{227, 59}, {19, 27}} _NS:1592 @@ -9087,68 +9135,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - - {{1, 1}, {494, 81}} - - - - - {{6, 286}, {496, 97}} - - - {0, 0} - - 67108864 - 0 - General Settings - - - - - - 1 - 0 - 2 - NO - - - - 12 - - YES - - - 274 - - YES - - - 268 - {{123, 78}, {223, 18}} - - YES - - 67108864 - 0 - Enable Multisample Antialiasing - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - + 268 - {{123, 58}, {158, 18}} - + {{16, 12}, {158, 18}} + YES 67108864 @@ -9167,34 +9158,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - - - 268 - {{123, 38}, {130, 18}} - - YES - - 67108864 - 0 - Smooth Textures - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - + 268 - {{273, 8}, {129, 26}} - + {{169, 32}, {77, 26}} + YES -2076180416 @@ -9258,15 +9226,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - + 268 - {{122, 14}, {149, 17}} - + {{18, 38}, {149, 17}} + YES 68157504 - 4195328 + 71304192 Texture Scaling Factor: @@ -9277,12 +9245,92 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1 - {{1, 1}, {494, 104}} + {{1, 1}, {494, 92}} + + + + + {{6, 243}, {496, 108}} + + + {0, 0} + + 67108864 + 0 + General Settings + + + + + + 1 + 0 + 2 + NO + + + + 12 + + YES + + + 274 + + YES + + + 268 + {{123, 32}, {223, 18}} + + YES + + 67108864 + 0 + Enable Multisample Antialiasing + + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{123, 12}, {130, 18}} + + YES + + 67108864 + 0 + Smooth Textures + + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + {{1, 1}, {494, 58}} - {{6, 5}, {496, 120}} + {{6, 8}, {496, 74}} {0, 0} @@ -9301,7 +9349,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - {{10, 33}, {508, 427}} + {{10, 33}, {508, 395}} 3D Rendering @@ -9320,7 +9368,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - {554, 497} + {554, 465} @@ -22458,7 +22506,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {1.7976931348623157e+308, 1.7976931348623157e+308} - + 256 YES @@ -22477,6 +22525,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 109}, {206, 18}} + YES @@ -22501,6 +22550,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{185, 39}, {45, 19}} + YES @@ -22585,6 +22635,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 41}, {165, 14}} + YES @@ -22604,6 +22655,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 15}, {109, 14}} + YES @@ -22623,6 +22675,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{231, 34}, {19, 27}} + YES @@ -22641,6 +22694,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 89}, {115, 18}} + YES @@ -22665,6 +22719,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 69}, {195, 18}} + YES @@ -22689,6 +22744,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{126, 10}, {124, 22}} + _NS:791 YES @@ -22800,11 +22856,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {265, 134}} + - {{17, 150}, {267, 150}} + {{17, 107}, {267, 150}} + {0, 0} @@ -22824,8 +22882,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{69, 8}, {162, 19}} + {{69, 7}, {162, 19}} + YES -2080374784 @@ -22857,6 +22916,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{18, 14}, {107, 58}} + YES NO @@ -23116,11 +23176,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {265, 82}} + {{17, 425}, {267, 98}} + {0, 0} @@ -23150,8 +23212,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{15, 51}, {108, 18}} + {{15, 52}, {108, 18}} + YES @@ -23174,8 +23237,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{15, 31}, {135, 18}} + {{15, 32}, {135, 18}} + YES @@ -23198,8 +23262,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{15, 11}, {82, 18}} + {{15, 12}, {82, 18}} + YES @@ -23222,8 +23287,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{16, 76}, {112, 14}} + {{16, 119}, {112, 14}} + _NS:526 {251, 750} @@ -23244,8 +23310,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{134, 74}, {48, 19}} + {{134, 117}, {48, 19}} + _NS:9 YES @@ -23322,8 +23389,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{187, 69}, {19, 27}} + {{187, 113}, {19, 27}} + _NS:1592 YES @@ -23339,69 +23407,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - - {{1, 1}, {265, 101}} - - - - - {{17, 304}, {267, 117}} - - - {0, 0} - - 67108864 - 0 - General Settings - - - - - - 1 - 0 - 2 - NO - - - - 12 - - YES - - - 274 - - YES - - - 268 - {{16, 73}, {192, 18}} - - - YES - - 67108864 - 131072 - Enable Multisample Antialiasing - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - + 268 - {{16, 53}, {137, 18}} - + {{15, 72}, {137, 18}} + + YES 67108864 @@ -23420,34 +23431,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - - - 268 - {{16, 33}, {114, 18}} - - YES - - 67108864 - 131072 - Smooth Textures - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - + 268 - {{16, 14}, {127, 14}} - + {{16, 96}, {127, 14}} + + YES 68157504 @@ -23462,10 +23451,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1 - + 268 - {{164, 7}, {19, 27}} - + {{187, 89}, {19, 27}} + + YES 67895328 @@ -23481,10 +23471,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - + 268 - {{143, 14}, {19, 14}} - + {{161, 96}, {19, 14}} + + _NS:4068 YES @@ -23555,13 +23546,100 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1 - {{1, 1}, {265, 99}} + {{1, 1}, {265, 144}} + + + + + + {{17, 261}, {267, 160}} + + + + {0, 0} + + 67108864 + 0 + General Settings + + + + + + 1 + 0 + 2 + NO + + + + 12 + + YES + + + 274 + + YES + + + 268 + {{16, 32}, {192, 18}} + + + + YES + + 67108864 + 131072 + Enable Multisample Antialiasing + + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{16, 12}, {114, 18}} + + + YES + + 67108864 + 131072 + Smooth Textures + + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + {{1, 1}, {265, 58}} + - {{17, 31}, {267, 115}} + {{17, 29}, {267, 74}} + {0, 0} @@ -23580,6 +23658,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {301, 543} + + {{0, 0}, {1920, 1177}} @@ -45656,12 +45736,16 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - - - + + + + + + + @@ -49650,10 +49734,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - - - - @@ -57188,9 +57268,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - - - @@ -57222,6 +57299,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + + @@ -58380,143 +58460,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - - 10205 - - - YES - - - - - - 10206 - - - - - 10213 - - - YES - - - - - - 10214 - - - - - 10218 - - - YES - - - - - - 10219 - - - - - 10221 - - - YES - - - - - - 10222 - - - YES - - - - - - 10223 - - - - - 10224 - - - YES - - - - - - 10225 - - - YES - - - - - - - - 10227 - - - - - 10228 - - - - - 10229 - - - - - 10236 - - - YES - - - - - - 10237 - - - - - 10239 - - - YES - - - - - - 10240 - - - YES - - - - - - 10241 - - - 10243 @@ -58545,6 +58488,143 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + 10218 + + + YES + + + + + + 10219 + + + + + 10221 + + + YES + + + + + + 10224 + + + YES + + + + + + 10225 + + + YES + + + + + + + + 10229 + + + + + 10228 + + + + + 10227 + + + + + 10222 + + + YES + + + + + + 10223 + + + + + 10213 + + + YES + + + + + + 10214 + + + + + 10205 + + + YES + + + + + + 10206 + + + + + 10236 + + + YES + + + + + + 10237 + + + + + 10239 + + + YES + + + + + + 10240 + + + YES + + + + + + 10241 + + + @@ -58871,6 +58951,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 2246.IBPluginDependency 2246.designableToolbarItemIdentifier 2246.toolbarItem.selectable + 2248.IBEditorWindowLastContentRect 2248.IBPersistedLastKnownCanvasPosition 2248.IBPluginDependency 2250.IBPluginDependency @@ -59164,12 +59245,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 3772.IBPluginDependency 3773.IBAttributePlaceholdersKey 3773.IBPluginDependency + 3773.IBViewBoundsToFrameTransform 3774.IBPluginDependency 3775.IBAttributePlaceholdersKey 3775.IBPluginDependency + 3775.IBViewBoundsToFrameTransform 3776.IBPluginDependency 3777.IBAttributePlaceholdersKey 3777.IBPluginDependency + 3777.IBViewBoundsToFrameTransform 3778.IBPluginDependency 3779.IBAttributePlaceholdersKey 3779.IBPluginDependency @@ -61262,7 +61346,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBgAAAwcAAAA + P4AAAL+AAABCuAAAwoQAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -61275,7 +61359,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBgAAAwvoAAA + P4AAAL+AAABDIQAAwtYAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -61288,7 +61372,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBgAAAwqIAAA + P4AAAL+AAABC9gAAwpQAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -61301,7 +61385,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDJgAAwnAAAA + P4AAAL+AAABDJwAAwggAAA YES @@ -61312,11 +61396,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBcAAAwmQAAA + P4AAAL+AAABBgAAAwfgAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{201, 387}, {129, 63}} + {{340, 512}, {129, 63}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -61344,7 +61428,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - AUNlAABAwAAAA + AUMkAABCrgAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -61357,7 +61441,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDEAAAwcgAAA + P4AAAL+AAABDWwAAwoQAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -61572,6 +61656,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin Sound + {{0, 472}, {400, 373}} {668, 408.5} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -61650,7 +61735,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - {{16, 359}, {554, 497}} + {{220, 320}, {554, 465}} {686, 460.5} com.apple.InterfaceBuilder.CocoaPlugin @@ -62081,6 +62166,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDUAAAwogAAA + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -62091,6 +62179,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDUAAAwkAAAA + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -62101,6 +62192,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDUAAAwrAAAA + com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -62131,10 +62225,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{609, 319}, {301, 543}} + {{684, 181}, {301, 543}} {193.5, 488.5} com.apple.InterfaceBuilder.CocoaPlugin - {{609, 319}, {301, 543}} + {{684, 181}, {301, 543}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin