diff --git a/desmume/src/frontend/cocoa/openemu/NDSGameCore.h b/desmume/src/frontend/cocoa/openemu/NDSGameCore.h index 3c23cd2b1..c7d3702d3 100644 --- a/desmume/src/frontend/cocoa/openemu/NDSGameCore.h +++ b/desmume/src/frontend/cocoa/openemu/NDSGameCore.h @@ -54,8 +54,8 @@ class OE_OGLDisplayPresenter; #define NDSDISPLAYMODE_NAMEKEY_LAYOUT_HYBRID_16_9 "Hybrid (16:9)" #define NDSDISPLAYMODE_NAMEKEY_LAYOUT_HYBRID_16_10 "Hybrid (16:10)" -#define NDSDISPLAYMODE_NAMEKEY_DISPLAYORDER_MAIN "Main First" -#define NDSDISPLAYMODE_NAMEKEY_DISPLAYORDER_TOUCH "Touch First" +#define NDSDISPLAYMODE_NAMEKEY_DISPLAYORDER_MAIN "Main Display First" +#define NDSDISPLAYMODE_NAMEKEY_DISPLAYORDER_TOUCH "Touch Display First" #define NDSDISPLAYMODE_NAMEKEY_ROTATION_0 "0°" #define NDSDISPLAYMODE_NAMEKEY_ROTATION_90 "90°" @@ -78,7 +78,7 @@ class OE_OGLDisplayPresenter; #define NDSDISPLAYMODE_NAMEKEY_VIDEOSOURCETOUCH_FORCEMAIN "Touch Display - Force Main Engine" #define NDSDISPLAYMODE_NAMEKEY_VIDEOSOURCETOUCH_FORCESUB "Touch Display - Force Sub Engine" -#define NDSDISPLAYMODE_NAMEKEY_HUD_ENABLE "Enable HUD" +#define NDSDISPLAYMODE_NAMEKEY_HUD_ENABLE "Enable Heads-Up Display" #define NDSDISPLAYMODE_NAMEKEY_HUD_EXECUTIONSPEED "Execution Speed" #define NDSDISPLAYMODE_NAMEKEY_HUD_VIDEOFPS "Video FPS" #define NDSDISPLAYMODE_NAMEKEY_HUD_3DRENDERERFPS "3D Renderer FPS" diff --git a/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm b/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm index 166a488c4..0d36e8dd4 100644 --- a/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm +++ b/desmume/src/frontend/cocoa/openemu/NDSGameCore.mm @@ -1293,8 +1293,6 @@ void UpdateDisplayPropertiesFromStates(uint64_t displayModeStates, ClientDisplay NSArray< NSDictionary *> *displayHUDMenu = [NSArray arrayWithObjects: - [self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_Enable states:s], - [NSDictionary dictionaryWithObjectsAndKeys:@"---", OEGameCoreDisplayModeSeparatorItemKey, nil], [self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_ExecutionSpeed states:s], [self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_VideoFPS states:s], [self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_3DRendererFPS states:s], @@ -1349,13 +1347,14 @@ void UpdateDisplayPropertiesFromStates(uint64_t displayModeStates, ClientDisplay NSArray< NSDictionary *> *newDisplayModeMenuDescription = [[NSArray alloc] initWithObjects: [NSDictionary dictionaryWithObjectsAndKeys: @"Mode", OEGameCoreDisplayModeGroupNameKey, displayModeMenu, OEGameCoreDisplayModeGroupItemsKey, nil], - [NSDictionary dictionaryWithObjectsAndKeys: @"Rotation", OEGameCoreDisplayModeGroupNameKey, displayRotationMenu, OEGameCoreDisplayModeGroupItemsKey, nil], [NSDictionary dictionaryWithObjectsAndKeys: @"Layout", OEGameCoreDisplayModeGroupNameKey, displayLayoutMenu, OEGameCoreDisplayModeGroupItemsKey, nil], + [NSDictionary dictionaryWithObjectsAndKeys: @"Rotation", OEGameCoreDisplayModeGroupNameKey, displayRotationMenu, OEGameCoreDisplayModeGroupItemsKey, nil], [NSDictionary dictionaryWithObjectsAndKeys: @"Order", OEGameCoreDisplayModeGroupNameKey, displayOrderMenu, OEGameCoreDisplayModeGroupItemsKey, nil], [NSDictionary dictionaryWithObjectsAndKeys: @"Separation", OEGameCoreDisplayModeGroupNameKey, displaySeparationMenu, OEGameCoreDisplayModeGroupItemsKey, nil], [NSDictionary dictionaryWithObjectsAndKeys: @"Video Source", OEGameCoreDisplayModeGroupNameKey, displayVideoSourceMenu, OEGameCoreDisplayModeGroupItemsKey, nil], [NSDictionary dictionaryWithObjectsAndKeys:@"---", OEGameCoreDisplayModeSeparatorItemKey, nil], - [NSDictionary dictionaryWithObjectsAndKeys: @"Heads-Up Display", OEGameCoreDisplayModeGroupNameKey, displayHUDMenu, OEGameCoreDisplayModeGroupItemsKey, nil], + [self generateDisplayModeItemByID:NDSDisplayOptionID_HUD_Enable states:s], + [NSDictionary dictionaryWithObjectsAndKeys: @"HUD Info Visibility", OEGameCoreDisplayModeGroupNameKey, displayHUDMenu, OEGameCoreDisplayModeGroupItemsKey, nil], [NSDictionary dictionaryWithObjectsAndKeys:@"---", OEGameCoreDisplayModeSeparatorItemKey, nil], [NSDictionary dictionaryWithObjectsAndKeys: @"GPU Emulation", OEGameCoreDisplayModeGroupNameKey, displayGPUEmulationMenu, OEGameCoreDisplayModeGroupItemsKey, nil], [NSDictionary dictionaryWithObjectsAndKeys: @"3D Rendering", OEGameCoreDisplayModeGroupNameKey, display3DRenderingMenu, OEGameCoreDisplayModeGroupItemsKey, nil], diff --git a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib index d78a0c348..0ac797388 100644 --- a/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib +++ b/desmume/src/frontend/cocoa/translations/English.lproj/MainMenu.xib @@ -1089,6 +1089,15 @@ Display Mode + + + Dual Screen + + 2147483647 + + + 2 + Main @@ -1106,14 +1115,64 @@ 1 - - - Dual Screen + + + + + + Display Layout + + 2147483647 + + + submenuAction: + + + Display Layout + + + + Vertical 2147483647 - 2 + + + + Horizontal + + 2147483647 + + + 1 + + + + Hybrid (2:1) + + 2147483647 + + + 1000 + + + + Hybrid (16:9) + + 2147483647 + + + 1001 + + + + Hybrid (16:10) + + 2147483647 + + + 1002 @@ -1275,162 +1334,6 @@ - - - Display Video Source - - 2147483647 - - - submenuAction: - - - Display Video Source - - - - Main Display - None - - 2147483647 - - - 1000 - - - - Main Display - Let NDS Decide - - 2147483647 - - - 1001 - - - - Main Display - Force Main Engine - - 2147483647 - - - 1002 - - - - Main Display - Force Sub Engine - - 2147483647 - - - 1003 - - - - YES - YES - - - 2147483647 - - - - - - Touch Display - None - - 2147483647 - - - 2000 - - - - Touch Display - Let NDS Decide - - 2147483647 - - - 2001 - - - - Touch Display - Force Main Engine - - 2147483647 - - - 2002 - - - - Touch Display - Force Sub Engine - - 2147483647 - - - 2003 - - - - - - - Display Layout - - 2147483647 - - - submenuAction: - - - Display Layout - - - - Vertical - - 2147483647 - - - - - - Horizontal - - 2147483647 - - - 1 - - - - Hybrid (2:1) - - 2147483647 - - - 1000 - - - - Hybrid (16:9) - - 2147483647 - - - 1001 - - - - Hybrid (16:10) - - 2147483647 - - - 1002 - - - - Display Order @@ -1541,6 +1444,103 @@ + + + Display Video Source + + 2147483647 + + + submenuAction: + + + Display Video Source + + + + Main Display - None + + 2147483647 + + + 1000 + + + + Main Display - Let NDS Decide + + 2147483647 + + + 1001 + + + + Main Display - Force Main Engine + + 2147483647 + + + 1002 + + + + Main Display - Force Sub Engine + + 2147483647 + + + 1003 + + + + YES + YES + + + 2147483647 + + + + + + Touch Display - None + + 2147483647 + + + 2000 + + + + Touch Display - Let NDS Decide + + 2147483647 + + + 2001 + + + + Touch Display - Force Main Engine + + 2147483647 + + + 2002 + + + + Touch Display - Force Sub Engine + + 2147483647 + + + 2003 + + + + YES @@ -7348,7 +7348,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ NSView - + 268 @@ -7361,7 +7361,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ {{13, 10}, {528, 441}} - 1 @@ -7386,7 +7385,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{16, 52}, {198, 18}} - YES @@ -7412,7 +7410,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{16, 32}, {217, 18}} - YES @@ -7438,7 +7435,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{16, 12}, {183, 18}} - YES -2080374784 @@ -7460,13 +7456,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ {{1, 1}, {494, 78}} - {{6, 301}, {496, 94}} - {0, 0} @@ -7499,7 +7493,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{18, 14}, {165, 38}} - YES NO @@ -7743,7 +7736,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{242, 15}, {73, 17}} - YES @@ -7764,7 +7756,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{320, 13}, {50, 22}} - YES @@ -7826,7 +7817,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{371, 10}, {19, 27}} - YES @@ -7845,13 +7835,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ {{1, 1}, {494, 62}} - {{6, 219}, {496, 78}} - {0, 0} @@ -7884,7 +7872,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{95, 14}, {66, 17}} - YES @@ -7905,7 +7892,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{164, 12}, {176, 26}} - YES @@ -7930,7 +7916,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{343, 14}, {52, 17}} - YES 68157504 @@ -7987,7 +7972,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{161, 36}, {26, 14}} - YES @@ -8008,7 +7992,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{239, 36}, {26, 14}} - YES @@ -8029,7 +8012,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{314, 36}, {31, 14}} - YES @@ -8047,13 +8029,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ {{1, 1}, {494, 60}} - {{6, 139}, {496, 76}} - {0, 0} @@ -8086,7 +8066,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{16, 12}, {462, 18}} - YES @@ -8109,13 +8088,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ {{1, 1}, {494, 38}} - {{6, 81}, {496, 54}} - {0, 0} @@ -8148,7 +8125,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{16, 32}, {146, 18}} - YES @@ -8174,7 +8150,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ 268 {{16, 12}, {118, 18}} - YES 67108864 @@ -8196,13 +8171,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ {{1, 1}, {494, 58}} - {{6, 3}, {496, 74}} - {0, 0} @@ -8222,7 +8195,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ {{10, 33}, {508, 395}} - General Settings @@ -9697,8 +9669,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ {554, 465} - - NSView @@ -61295,7 +61265,6 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ - @@ -61312,6 +61281,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ + @@ -83013,7 +82983,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{813, 603}, {289, 173}} + {{966, 842}, {275, 173}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -85795,7 +85765,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{598, 1061}, {187, 73}} + {{767, 1062}, {187, 73}} com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -85906,14 +85876,14 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{228, 1135}, {500, 20}} + {{397, 1135}, {500, 20}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{469, 363}, {315, 473}} + {{664, 662}, {302, 473}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -86370,7 +86340,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{784, 773}, {132, 63}} + {{966, 1072}, {130, 63}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -86875,7 +86845,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{646, 723}, {261, 113}} + {{837, 1022}, {255, 113}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -87044,7 +87014,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{413, 682}, {249, 453}} + {{582, 682}, {249, 453}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -87059,7 +87029,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{545, 961}, {281, 173}} + {{714, 962}, {281, 173}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -87105,11 +87075,11 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{863, 653}, {151, 103}} + {{966, 1012}, {149, 103}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{813, 693}, {182, 43}} + {{966, 1012}, {175, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -87633,7 +87603,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{714, 583}, {118, 133}} + {{966, 902}, {114, 133}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -87721,7 +87691,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ P4AAAL+AAABDp4AAwwIAAA com.apple.InterfaceBuilder.CocoaPlugin - {{863, 633}, {136, 163}} + {{966, 912}, {132, 163}} com.apple.InterfaceBuilder.CocoaPlugin @@ -87807,7 +87777,7 @@ xcjGRsbDx0HHv8g9yLzJOsm5yjjKt8s2y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{784, 713}, {70, 103}} + {{966, 992}, {69, 103}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin