From 845cdb5c0ef9ce4e94495452afb01ae5e5f86777 Mon Sep 17 00:00:00 2001
From: wuweiran <wwrnfls@126.com>
Date: Wed, 6 Mar 2024 19:14:02 +0800
Subject: [PATCH] Revert name and order change of configs

---
 po/wxvbam/wxvbam.pot                       | 100 ++++++++++-----------
 src/wx/cmdevents.cpp                       |  10 +--
 src/wx/config/internal/option-internal.cpp |   4 +-
 src/wx/config/option-id.h                  |   2 +-
 src/wx/config/option-proxy.h               |   2 +-
 src/wx/wxvbam.cpp                          |   6 +-
 src/wx/xrc/MainMenu.xrc                    |   2 +-
 7 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot
index ad6a0a63..87a52961 100644
--- a/po/wxvbam/wxvbam.pot
+++ b/po/wxvbam/wxvbam.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-05 21:49+0800\n"
+"POT-Creation-Date: 2024-03-06 18:49+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -581,7 +581,7 @@ msgid ""
 "along with this program. If not, see http://www.gnu.org/licenses ."
 msgstr ""
 
-#: cmdevents.cpp:2495
+#: cmdevents.cpp:2500
 msgid "Cannot use Game Boy BIOS when Colorizer Hack is enabled."
 msgstr ""
 
@@ -1059,10 +1059,14 @@ msgid ""
 msgstr ""
 
 #: config/internal/option-internal.cpp:467
+msgid "Enable status bar"
+msgstr ""
+
+#: config/internal/option-internal.cpp:468
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid ""
 "The parameter Joypad/<n>/<button> contains a comma-separated list of key "
 "names which map to joypad #<n> button <button>. Button is one of Up, Down, "
@@ -1070,185 +1074,181 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:477
+#: config/internal/option-internal.cpp:478
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:479
+#: config/internal/option-internal.cpp:480
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid ""
 "The parameter Keyboard/<cmd> contains a comma-separated list of key names (e."
 "g. Alt-Shift-F1).  When the named key is pressed, the command <cmd> is "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:499
+#: config/internal/option-internal.cpp:500
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:507
+#: config/internal/option-internal.cpp:508
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:509
+#: config/internal/option-internal.cpp:510
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:511
+#: config/internal/option-internal.cpp:512
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:515
+#: config/internal/option-internal.cpp:516
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:522
+#: config/internal/option-internal.cpp:523
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:525
+#: config/internal/option-internal.cpp:526
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:527
+#: config/internal/option-internal.cpp:528
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:529
+#: config/internal/option-internal.cpp:530
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:534
+#: config/internal/option-internal.cpp:535
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:538
+#: config/internal/option-internal.cpp:539
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:545
+#: config/internal/option-internal.cpp:546
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:547
+#: config/internal/option-internal.cpp:548
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:552
+#: config/internal/option-internal.cpp:553
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:554
+#: config/internal/option-internal.cpp:555
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:561
+#: config/internal/option-internal.cpp:562
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
-msgid "Enable status bar"
-msgstr ""
-
 #: config/internal/option-internal.cpp:573
 msgid "Capture key events while on background"
 msgstr ""
diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index 6b565983..5b73f272 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -2447,6 +2447,11 @@ EVT_HANDLER(KeepOnTop, "Keep window on top")
     GetMenuOptionConfig("KeepOnTop", config::OptionID::kDispKeepOnTop);
 }
 
+EVT_HANDLER(StatusBar, "Enable status bar")
+{
+    GetMenuOptionConfig("StatusBar", config::OptionID::kGenStatusBar);
+}
+
 EVT_HANDLER(NoStatusMsg, "Disable on-screen status messages")
 {
     GetMenuOptionConfig("NoStatusMsg", config::OptionID::kPrefDisableStatus);
@@ -2508,11 +2513,6 @@ EVT_HANDLER(VSync, "Wait for vertical sync")
     GetMenuOptionConfig("VSync", config::OptionID::kPrefVsync);
 }
 
-EVT_HANDLER(EnableStatusBar, "Enable status bar")
-{
-    GetMenuOptionConfig("EnableStatusBar", config::OptionID::kUIEnableStatusBar);
-}
-
 EVT_HANDLER(HideMenuBar, "Hide menu bar when mouse is inactive")
 {
     GetMenuOptionConfig("HideMenuBar", config::OptionID::kUIHideMenuBar);
diff --git a/src/wx/config/internal/option-internal.cpp b/src/wx/config/internal/option-internal.cpp
index 962312c8..125ccd9f 100644
--- a/src/wx/config/internal/option-internal.cpp
+++ b/src/wx/config/internal/option-internal.cpp
@@ -286,6 +286,7 @@ std::array<Option, kNbOptions>& Option::All() {
         Option(OptionID::kGenRewindInterval, &gopts.rewind_interval, 0, 600),
         Option(OptionID::kGenScreenshotDir, &g_owned_opts.screenshot_dir),
         Option(OptionID::kGenStateDir, &g_owned_opts.state_dir),
+        Option(OptionID::kGenStatusBar, &g_owned_opts.statusbar),
         Option(OptionID::kGenIniVersion, &g_owned_opts.ini_version, 0, std::numeric_limits<uint32_t>::max()),
 
         /// Joypad
@@ -343,7 +344,6 @@ std::array<Option, kNbOptions>& Option::All() {
         Option(OptionID::kGeomWindowY, &g_owned_opts.window_pos_y, std::numeric_limits<int32_t>::min(), std::numeric_limits<int32_t>::max()),
 
         /// UI
-        Option(OptionID::kUIEnableStatusBar, &g_owned_opts.statusbar),
         Option(OptionID::kUIAllowKeyboardBackgroundInput, &g_owned_opts.allow_keyboard_background_input),
         Option(OptionID::kUIAllowJoystickBackgroundInput, &g_owned_opts.allow_joystick_background_input),
         Option(OptionID::kUIHideMenuBar, &gopts.hide_menu_bar),
@@ -464,6 +464,7 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     OptionData{"General/StateDir", "",
                _("Directory to store saved state files (relative paths are "
                  "relative to BatteryDir)")},
+    OptionData{"General/StatusBar", "StatusBar", _("Enable status bar")},
     OptionData{"General/IniVersion", "", _("INI file version (DO NOT MODIFY)")},
 
     /// Joypad
@@ -567,7 +568,6 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     OptionData{"geometry/windowY", "Y", _("Window axis Y position at startup")},
 
     /// UI
-    OptionData{"ui/enableStatusBar", "EnableStatusBar", _("Enable status bar")},
     OptionData{"ui/allowKeyboardBackgroundInput",
                "AllowKeyboardBackgroundInput",
                _("Capture key events while on background")},
diff --git a/src/wx/config/option-id.h b/src/wx/config/option-id.h
index 055c9469..90973157 100644
--- a/src/wx/config/option-id.h
+++ b/src/wx/config/option-id.h
@@ -54,6 +54,7 @@ enum class OptionID {
     kGenRewindInterval,
     kGenScreenshotDir,
     kGenStateDir,
+    kGenStatusBar,
     kGenIniVersion,
 
     /// Joypad
@@ -111,7 +112,6 @@ enum class OptionID {
     kGeomWindowY,
 
     /// UI
-    kUIEnableStatusBar,
     kUIAllowKeyboardBackgroundInput,
     kUIAllowJoystickBackgroundInput,
     kUIHideMenuBar,
diff --git a/src/wx/config/option-proxy.h b/src/wx/config/option-proxy.h
index 6b602e94..367162d4 100644
--- a/src/wx/config/option-proxy.h
+++ b/src/wx/config/option-proxy.h
@@ -58,6 +58,7 @@ static constexpr std::array<Option::Type, kNbOptions> kOptionsTypes = {
     /*kGenRewindInterval*/ Option::Type::kInt,
     /*kGenScreenshotDir*/ Option::Type::kString,
     /*kGenStateDir*/ Option::Type::kString,
+    /*kGenStatusBar*/ Option::Type::kBool,
     /*kGenIniVersion*/ Option::Type::kUnsigned,
 
     /// Joypad
@@ -115,7 +116,6 @@ static constexpr std::array<Option::Type, kNbOptions> kOptionsTypes = {
     /*kGeomWindowY*/ Option::Type::kInt,
 
     /// UI
-    /*kUIEnableStatusBar*/ Option::Type::kBool,
     /*kUIAllowKeyboardBackgroundInput*/ Option::Type::kBool,
     /*kUIAllowJoystickBackgroundInput*/ Option::Type::kBool,
     /*kUIHideMenuBar*/ Option::Type::kBool,
diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp
index 2f999079..af5f17df 100644
--- a/src/wx/wxvbam.cpp
+++ b/src/wx/wxvbam.cpp
@@ -845,7 +845,7 @@ MainFrame::MainFrame()
                          std::bind(&MainFrame::EnableNetworkMenu, this)),
 #endif
       keep_on_top_styler_(this),
-      status_bar_observer_(config::OptionID::kUIEnableStatusBar,
+      status_bar_observer_(config::OptionID::kGenStatusBar,
                            std::bind(&MainFrame::OnStatusBarChanged, this)) {
     jpoll = new JoystickPoller();
     this->Connect(wxID_ANY, wxEVT_SHOW, wxShowEventHandler(JoystickPoller::ShowDialog), jpoll, jpoll);
@@ -860,11 +860,11 @@ MainFrame::~MainFrame() {
 void MainFrame::SetStatusBar(wxStatusBar* menu_bar) {
     wxFrame::SetStatusBar(menu_bar);
     // This will take care of hiding the menu bar at startup, if needed.
-    menu_bar->Show(OPTION(kUIEnableStatusBar));
+    menu_bar->Show(OPTION(kGenStatusBar));
 }
 
 void MainFrame::OnStatusBarChanged() {
-    GetStatusBar()->Show(OPTION(kUIEnableStatusBar));
+    GetStatusBar()->Show(OPTION(kGenStatusBar));
     SendSizeEvent();
     panel->AdjustSize(false);
     SendSizeEvent();
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index cd16115d..83bb34b6 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -567,7 +567,7 @@
         </object>
         <object class="wxMenu" name="UIConfigure">
           <label>UI Settings</label>
-					<object class="wxMenuItem" name="EnableStatusBar">
+					<object class="wxMenuItem" name="StatusBar">
 							<label>Enable _Status bar</label>
 							<checkable>1</checkable>
 					</object>