diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib index 12e666bd3..12eecc9d5 100644 --- a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib +++ b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib @@ -4107,7 +4107,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXAInputPrefsView - + 268 YES @@ -4123,7 +4123,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{13, 10}, {463, 396}} - YES @@ -4148,7 +4147,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{72, 43}, {84, 17}} - YES 68157504 @@ -4167,7 +4165,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{44, 16}, {112, 17}} - YES 68157504 @@ -4186,7 +4183,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{158, 37}, {126, 26}} - YES -2076180416 @@ -4279,7 +4275,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{289, 14}, {72, 22}} - YES -1804599231 @@ -4372,7 +4367,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{63, 69}, {93, 17}} - YES 68157504 @@ -4391,7 +4385,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{158, 63}, {126, 26}} - YES -2076180416 @@ -4460,7 +4453,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{158, 11}, {126, 26}} - YES -2076180416 @@ -4562,12 +4554,10 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{1, 1}, {429, 97}} - {{6, 232}, {431, 113}} - {0, 0} 67108864 @@ -4598,7 +4588,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{15, 16}, {126, 17}} - YES 68157504 @@ -4617,7 +4606,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{339, 14}, {72, 22}} - YES -1804599231 @@ -4701,7 +4689,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{144, 10}, {189, 26}} - YES -2080112384 @@ -4724,7 +4711,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{305, 36}, {38, 11}} - YES 68157504 @@ -4747,7 +4733,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{263, 36}, {38, 11}} - YES 68157504 @@ -4766,7 +4751,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{220, 36}, {38, 11}} - YES 68157504 @@ -4785,7 +4769,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{178, 36}, {38, 11}} - YES 68157504 @@ -4804,7 +4787,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{137, 36}, {38, 11}} - YES 68157504 @@ -4823,7 +4805,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{181, 82}, {175, 26}} - _NS:791 YES @@ -4914,7 +4895,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{181, 56}, {175, 26}} - _NS:791 YES @@ -4972,7 +4952,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{64, 88}, {115, 17}} - _NS:4068 YES @@ -4993,7 +4972,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{64, 62}, {114, 17}} - _NS:4068 YES @@ -5012,12 +4990,10 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{1, 1}, {429, 116}} - {{6, 5}, {431, 132}} - {0, 0} 67108864 @@ -5048,7 +5024,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{223, 36}, {175, 26}} - _NS:791 YES @@ -5129,7 +5104,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{31, 42}, {190, 17}} - _NS:4068 YES @@ -5150,7 +5124,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{223, 10}, {175, 26}} - _NS:791 YES @@ -5231,7 +5204,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA268 {{32, 16}, {190, 17}} - _NS:4068 YES @@ -5250,13 +5222,11 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{1, 1}, {429, 71}} - _NS:21 {{6, 141}, {431, 87}} - _NS:18 {0, 0} @@ -5279,7 +5249,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {{10, 33}, {443, 350}} - Display Views @@ -6339,8 +6308,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA {489, 420} - - NSView @@ -7317,7 +7284,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSView - + 268 YES @@ -7333,7 +7300,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{13, 10}, {528, 441}} - YES @@ -7358,7 +7324,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 52}, {198, 18}} - YES @@ -7383,7 +7348,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 32}, {217, 18}} - YES @@ -7408,7 +7372,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 12}, {183, 18}} - _NS:682 YES @@ -7432,13 +7395,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {494, 78}} - {{6, 301}, {496, 94}} - {0, 0} @@ -7470,7 +7431,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{18, 14}, {165, 38}} - YES NO @@ -7718,7 +7678,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{242, 15}, {73, 17}} - YES @@ -7738,7 +7697,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{320, 13}, {50, 22}} - YES @@ -7817,7 +7775,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{371, 10}, {19, 27}} - YES @@ -7836,13 +7793,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {494, 62}} - {{6, 219}, {496, 78}} - {0, 0} @@ -7874,7 +7829,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{95, 14}, {66, 17}} - _NS:526 {251, 750} @@ -7897,7 +7851,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{164, 12}, {176, 26}} - _NS:9 YES @@ -7923,7 +7876,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{343, 14}, {52, 17}} - _NS:526 {251, 750} YES @@ -7997,7 +7949,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{161, 36}, {26, 14}} - _NS:526 {251, 750} @@ -8020,7 +7971,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{239, 36}, {26, 14}} - _NS:526 {251, 750} @@ -8043,7 +7993,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{314, 36}, {31, 14}} - _NS:526 {251, 750} @@ -8064,14 +8013,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {494, 60}} - _NS:11 {{6, 139}, {496, 76}} - _NS:9 {0, 0} @@ -8104,7 +8051,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 12}, {462, 18}} - YES @@ -8127,13 +8073,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {494, 38}} - {{6, 81}, {496, 54}} - {0, 0} @@ -8165,7 +8109,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 32}, {146, 18}} - YES @@ -8190,7 +8133,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 12}, {118, 18}} - YES 67108864 @@ -8212,13 +8154,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {494, 58}} - {{6, 3}, {496, 74}} - {0, 0} @@ -8238,7 +8178,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{10, 33}, {508, 395}} - General Settings @@ -9511,8 +9450,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {554, 465} - - NSView @@ -21832,7 +21769,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {1.7976931348623157e+308, 1.7976931348623157e+308} - + 256 YES @@ -21841,7 +21778,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 209}, {99, 18}} - YES 67108864 @@ -21865,7 +21801,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 259}, {84, 18}} - YES -2080374784 @@ -21889,7 +21824,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 97}, {60, 18}} - YES 67108864 @@ -21913,7 +21847,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 234}, {121, 18}} - YES 67108864 @@ -21937,7 +21870,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 184}, {98, 18}} - YES 67108864 @@ -21961,7 +21893,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 134}, {121, 18}} - YES 67108864 @@ -21985,7 +21916,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 159}, {130, 18}} - YES 67108864 @@ -22009,7 +21939,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{37, 13}, {162, 19}} - YES -2080374784 @@ -22031,7 +21960,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 319}, {167, 18}} - YES 67108864 @@ -22055,7 +21983,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 12 {{12, 310}, {211, 5}} - {0, 0} 67108864 @@ -22082,7 +22009,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 256}, {44, 23}} - _NS:4132 YES NO @@ -22094,7 +22020,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 284}, {110, 18}} - YES 67108864 @@ -22125,7 +22050,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 281}, {44, 23}} - _NS:4132 YES NO @@ -22144,7 +22068,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 231}, {44, 23}} - _NS:4132 YES NO @@ -22163,7 +22086,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 206}, {44, 23}} - _NS:4132 YES NO @@ -22182,7 +22104,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 181}, {44, 23}} - _NS:4132 YES NO @@ -22201,7 +22122,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 156}, {44, 23}} - _NS:4132 YES NO @@ -22220,7 +22140,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 131}, {44, 23}} - _NS:4132 YES NO @@ -22239,7 +22158,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 95}, {44, 23}} - _NS:4132 YES NO @@ -22258,7 +22176,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 70}, {44, 23}} - _NS:4132 YES NO @@ -22277,7 +22194,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{171, 45}, {44, 23}} - _NS:4132 YES NO @@ -22289,7 +22205,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{107.8203125, 45}, {62, 17}} - _NS:4068 YES @@ -22310,7 +22225,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{109, 69}, {61, 17}} - _NS:4068 YES @@ -22331,7 +22245,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{85, 94}, {85, 17}} - _NS:4068 YES @@ -22349,8 +22262,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {235, 355} - - {{0, 0}, {1920, 1177}} {1.7976931348623157e+308, 1.7976931348623157e+308} @@ -47898,6 +47809,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 11043 + + + displayHUDSettingsPanel + + + + 11044 + @@ -72841,7 +72760,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - 11043 + 11044 @@ -74026,6 +73945,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 cheatListController cheatWindowController cheatWindowDelegate + displayHUDSettingsPanel displayRotationPanel displaySeparationPanel displayVideoSettingsPanel @@ -74056,6 +73976,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NSWindow NSWindow NSWindow + NSWindow NSView NSObjectController NSArrayController @@ -74081,6 +74002,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 cheatListController cheatWindowController cheatWindowDelegate + displayHUDSettingsPanel displayRotationPanel displaySeparationPanel displayVideoSettingsPanel @@ -74125,6 +74047,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 cheatWindowDelegate CheatWindowDelegate + + displayHUDSettingsPanel + NSWindow + displayRotationPanel NSWindow diff --git a/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.h b/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.h index ed09a29f2..03dea7f1a 100644 --- a/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.h +++ b/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.h @@ -60,9 +60,12 @@ class AudioSampleBlockGenerator; NSWindow *displayRotationPanel; NSWindow *displaySeparationPanel; NSWindow *displayVideoSettingsPanel; - NSString *displayRotationPanelTitle; - NSString *displaySeparationPanelTitle; - NSString *displayVideoSettingsPanelTitle; + NSWindow *displayHUDSettingsPanel; + + NSString *_displayRotationPanelTitle; + NSString *_displaySeparationPanelTitle; + NSString *_displayVideoSettingsPanelTitle; + NSString *_displayHUDSettingsPanelTitle; NSWindow *executionControlWindow; NSWindow *slot1ManagerWindow; @@ -139,6 +142,7 @@ class AudioSampleBlockGenerator; @property (readonly) IBOutlet NSWindow *displayRotationPanel; @property (readonly) IBOutlet NSWindow *displaySeparationPanel; @property (readonly) IBOutlet NSWindow *displayVideoSettingsPanel; +@property (readonly) IBOutlet NSWindow *displayHUDSettingsPanel; @property (readonly) IBOutlet NSWindow *executionControlWindow; @property (readonly) IBOutlet NSWindow *slot1ManagerWindow; diff --git a/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.mm b/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.mm index c89a2adde..28b40eb2c 100644 --- a/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.mm +++ b/desmume/src/frontend/cocoa/userinterface/EmuControllerDelegate.mm @@ -59,6 +59,7 @@ @synthesize displayRotationPanel; @synthesize displaySeparationPanel; @synthesize displayVideoSettingsPanel; +@synthesize displayHUDSettingsPanel; @synthesize executionControlWindow; @synthesize slot1ManagerWindow; @@ -110,9 +111,10 @@ mainWindow = nil; windowList = [[NSMutableArray alloc] initWithCapacity:32]; - displayRotationPanelTitle = nil; - displaySeparationPanelTitle = nil; - displayVideoSettingsPanelTitle = nil; + _displayRotationPanelTitle = nil; + _displaySeparationPanelTitle = nil; + _displayVideoSettingsPanelTitle = nil; + _displayHUDSettingsPanelTitle = nil; currentRom = nil; cdsFirmware = nil; @@ -2172,26 +2174,29 @@ - (void) updateDisplayPanelTitles { // If the original panel titles haven't been saved yet, then save them now. - if (displayRotationPanelTitle == nil) + if (_displayRotationPanelTitle == nil) { - displayRotationPanelTitle = [[displayRotationPanel title] copy]; - displaySeparationPanelTitle = [[displaySeparationPanel title] copy]; - displayVideoSettingsPanelTitle = [[displayVideoSettingsPanel title] copy]; + _displayRotationPanelTitle = [[displayRotationPanel title] copy]; + _displaySeparationPanelTitle = [[displaySeparationPanel title] copy]; + _displayVideoSettingsPanelTitle = [[displayVideoSettingsPanel title] copy]; + _displayHUDSettingsPanelTitle = [[displayHUDSettingsPanel title] copy]; } // Set the panel titles to the window number. if ([windowList count] <= 1) { - [displayRotationPanel setTitle:displayRotationPanelTitle]; - [displaySeparationPanel setTitle:displaySeparationPanelTitle]; - [displayVideoSettingsPanel setTitle:displayVideoSettingsPanelTitle]; + [displayRotationPanel setTitle:_displayRotationPanelTitle]; + [displaySeparationPanel setTitle:_displaySeparationPanelTitle]; + [displayVideoSettingsPanel setTitle:_displayVideoSettingsPanelTitle]; + [displayHUDSettingsPanel setTitle:_displayHUDSettingsPanelTitle]; } else { unsigned long windowNumber = (unsigned long)[windowList indexOfObject:mainWindow] + 1; - [displayRotationPanel setTitle:[displayRotationPanelTitle stringByAppendingFormat:@":%ld", windowNumber]]; - [displaySeparationPanel setTitle:[displaySeparationPanelTitle stringByAppendingFormat:@":%ld", windowNumber]]; - [displayVideoSettingsPanel setTitle:[displayVideoSettingsPanelTitle stringByAppendingFormat:@":%ld", windowNumber]]; + [displayRotationPanel setTitle:[_displayRotationPanelTitle stringByAppendingFormat:@":%ld", windowNumber]]; + [displaySeparationPanel setTitle:[_displaySeparationPanelTitle stringByAppendingFormat:@":%ld", windowNumber]]; + [displayVideoSettingsPanel setTitle:[_displayVideoSettingsPanelTitle stringByAppendingFormat:@":%ld", windowNumber]]; + [displayHUDSettingsPanel setTitle:[_displayHUDSettingsPanelTitle stringByAppendingFormat:@":%ld", windowNumber]]; } }