Move Adapter Poll Rate Warning toggle to new OSD settings pane

Author: Motobug

Source/Core/DolphinQt/Settings/InterfacePane.cpp

@@ -203,8 +203,6 @@ void InterfacePane::CreateInGame()
   m_checkbox_confirm_on_stop = new ConfigBool(tr("Confirm on Stop"), Config::MAIN_CONFIRM_ON_STOP);
   m_checkbox_use_panic_handlers =
       new ConfigBool(tr("Use Panic Handlers"), Config::MAIN_USE_PANIC_HANDLERS);
-  m_checkbox_adapter_warning = 
-      new ConfigBool(tr("Show Adapter Poll Rate Warning"), Config::MAIN_SHOW_ADAPTER_WARNING);  // move after merge to OSD settings
   m_checkbox_show_active_title =
       new ConfigBool(tr("Show Active Title in Window Title"), Config::MAIN_SHOW_ACTIVE_TITLE);
   m_checkbox_pause_on_focus_lost =
@@ -234,7 +232,6 @@ void InterfacePane::CreateInGame()
   groupbox_layout->addWidget(m_checkbox_top_window);
   groupbox_layout->addWidget(m_checkbox_confirm_on_stop);
   groupbox_layout->addWidget(m_checkbox_use_panic_handlers);
-  groupbox_layout->addWidget(m_checkbox_adapter_warning); // move after merge to OSD settings
   groupbox_layout->addWidget(m_checkbox_show_active_title);
   groupbox_layout->addWidget(m_checkbox_pause_on_focus_lost);
   groupbox_layout->addWidget(mouse_groupbox);
@@ -375,11 +372,6 @@ void InterfacePane::AddDescriptions()
                  "present choices on how to proceed. With this option disabled, Dolphin will "
                  "\"ignore\" all errors. Emulation will not be halted and you will not be notified."
                  "<br><br><dolphin_emphasis>If unsure, leave this checked.</dolphin_emphasis>");
-  static constexpr char TR_ADAPTER_WARNING_DESCRIPTION[] =
-      QT_TR_NOOP("This setting makes Dolphin warn and show a message when inputs are being read at a reduced rate when an adapter problem is detected."
-        " This should only occur when your adapter returns something other than LIBUSB_SUCCESS."
-        " Before turning this off, try reinstalling drivers and switching USB ports."
-        "<br><br><dolphin_emphasis>If unsure, leave this checked.</dolphin_emphasis>"); // move to OSD settings after merge
   static constexpr char TR_SHOW_ACTIVE_TITLE_DESCRIPTION[] =
       QT_TR_NOOP("Shows the active game title in the render window's title bar."
                  "<br><br><dolphin_emphasis>If unsure, leave this checked.</dolphin_emphasis>");
@@ -426,8 +418,6 @@ void InterfacePane::AddDescriptions()
   m_checkbox_confirm_on_stop->SetDescription(tr(TR_CONFIRM_ON_STOP_DESCRIPTION));
 
   m_checkbox_use_panic_handlers->SetDescription(tr(TR_USE_PANIC_HANDLERS_DESCRIPTION));
-  
-  m_checkbox_adapter_warning->SetDescription(tr(TR_ADAPTER_WARNING_DESCRIPTION)); // move to OSD settings after merge
 
   m_checkbox_show_active_title->SetDescription(tr(TR_SHOW_ACTIVE_TITLE_DESCRIPTION));
 

Source/Core/DolphinQt/Settings/InterfacePane.h

@@ -53,7 +53,6 @@ class InterfacePane final : public QWidget
 
   ConfigBool* m_checkbox_confirm_on_stop;
   ConfigBool* m_checkbox_use_panic_handlers;
-  ConfigBool* m_checkbox_adapter_warning; // move to OSD settings after merge
 
   ConfigBool* m_checkbox_show_active_title;
   ConfigBool* m_checkbox_pause_on_focus_lost;

Source/Core/DolphinQt/Settings/OnScreenDisplayPane.cpp

@@ -30,9 +30,11 @@ void OnScreenDisplayPane::CreateLayout()
   general_box->setLayout(general_layout);
 
   m_enable_osd = new ConfigBool(tr("Show Messages"), Config::MAIN_OSD_MESSAGES);
+  m_checkbox_adapter_warning = new ConfigBool(tr("Show Adapter Poll Rate Warning"), Config::MAIN_SHOW_ADAPTER_WARNING);
   m_font_size = new ConfigInteger(12, 40, Config::MAIN_OSD_FONT_SIZE);
 
   general_layout->addWidget(m_enable_osd, 0, 0);
+  general_layout->addWidget(m_checkbox_adapter_warning, 0, 1);
   general_layout->addWidget(new QLabel(tr("Font Size:")), 1, 0);
   general_layout->addWidget(m_font_size, 1, 1);
 
@@ -139,6 +141,13 @@ void OnScreenDisplayPane::AddDescriptions()
       QT_TR_NOOP("Shows on-screen display messages over the render window. These messages "
                  "disappear after several seconds."
                  "<br><br><dolphin_emphasis>If unsure, leave this checked.</dolphin_emphasis>");
+  static constexpr char TR_ADAPTER_WARNING_DESCRIPTION[] = QT_TR_NOOP(
+      "This setting makes Dolphin warn and show a message when inputs are being read at a reduced "
+      "rate when an adapter problem is detected."
+      " This should only occur when your adapter returns something other than LIBUSB_SUCCESS."
+      " Before turning this off, try reinstalling drivers and switching USB ports."
+      "<br><br><dolphin_emphasis>If unsure, leave this checked.</dolphin_emphasis>");
+
   static const char TR_OSD_FONT_SIZE_DESCRIPTION[] = QT_TR_NOOP(
       "Changes the font size of the On-Screen Display. Affects features such as performance "
       "statistics, frame counter, and netplay chat."
@@ -219,6 +228,7 @@ void OnScreenDisplayPane::AddDescriptions()
                  "leave this unchecked.</dolphin_emphasis>");
 
   m_enable_osd->SetDescription(tr(TR_ENABLE_OSD_DESCRIPTION));
+  m_checkbox_adapter_warning->SetDescription(tr(TR_ADAPTER_WARNING_DESCRIPTION));
   m_font_size->SetDescription(tr(TR_OSD_FONT_SIZE_DESCRIPTION));
 
   m_show_fps->SetDescription(tr(TR_SHOW_FPS_DESCRIPTION));

Source/Core/DolphinQt/Settings/OnScreenDisplayPane.h

@@ -21,6 +21,7 @@ class OnScreenDisplayPane final : public QWidget
 
   // General
   ConfigBool* m_enable_osd;
+  ConfigBool* m_checkbox_adapter_warning;
   ConfigInteger* m_font_size;
 
   // Performance