Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt Setting Panes: Remove original location of options transferred to the OSD pane.

Browse Source
This commit is contained in:
TryTwo committed 2025-10-10 17:02:00 -07:00
1 parent 3b11280c20
commit fcb3d2fb05
6 files changed
+13 -154
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/DolphinQt/Settings/InterfacePane.cpp
-25
View File
@@ -27,7 +27,6 @@
#include "DolphinQt/Config/ConfigControls/ConfigBool.h"
#include "DolphinQt/Config/ConfigControls/ConfigChoice.h"
#include "DolphinQt/Config/ConfigControls/ConfigInteger.h"
#include "DolphinQt/Config/ConfigControls/ConfigRadio.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
#include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h"
@@ -197,16 +196,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_enable_osd =
new ConfigBool(tr("Show On-Screen Display Messages"), Config::MAIN_OSD_MESSAGES);
m_osd_font_size = new ConfigInteger(12, 40, Config::MAIN_OSD_FONT_SIZE);
m_osd_font_size->setMinimumWidth(m_osd_font_size->sizeHint().width() * 2);
auto* font_size_layout = new QHBoxLayout;
font_size_layout->addWidget(new QLabel(tr("On-Screen Display Font Size: ")));
font_size_layout->addWidget(m_osd_font_size);
font_size_layout->addStretch();
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 =
@@ -236,8 +225,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_enable_osd);
groupbox_layout->addLayout(font_size_layout);
groupbox_layout->addWidget(m_checkbox_show_active_title);
groupbox_layout->addWidget(m_checkbox_pause_on_focus_lost);
groupbox_layout->addWidget(mouse_groupbox);
@@ -378,14 +365,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_ENABLE_OSD_DESCRIPTION[] =
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 const char TR_OSD_FONT_SIZE_DESCRIPTION[] =
QT_TR_NOOP("Changes the font size of the On Screen Display. Affects features such as the FPS"
"display, TAS movie window, and netplay chat."
"<br><br><dolphin_emphasis>If unsure, leave this at 13.</dolphin_emphasis>");
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>");
@@ -433,10 +412,6 @@ void InterfacePane::AddDescriptions()
m_checkbox_use_panic_handlers->SetDescription(tr(TR_USE_PANIC_HANDLERS_DESCRIPTION));
m_checkbox_enable_osd->SetDescription(tr(TR_ENABLE_OSD_DESCRIPTION));
m_osd_font_size->SetDescription(tr(TR_OSD_FONT_SIZE_DESCRIPTION));
m_checkbox_show_active_title->SetDescription(tr(TR_SHOW_ACTIVE_TITLE_DESCRIPTION));
m_checkbox_pause_on_focus_lost->SetDescription(tr(TR_PAUSE_ON_FOCUS_LOST_DESCRIPTION));
Source/Core/DolphinQt/Settings/InterfacePane.h
-3
View File
@@ -6,7 +6,6 @@
#include <QWidget>
class ConfigBool;
class ConfigInteger;
class ConfigRadioInt;
class ConfigStringChoice;
class QLabel;
@@ -54,8 +53,6 @@ private:
ConfigBool* m_checkbox_confirm_on_stop;
ConfigBool* m_checkbox_use_panic_handlers;
ConfigBool* m_checkbox_enable_osd;
ConfigInteger* m_osd_font_size;
ConfigBool* m_checkbox_show_active_title;
ConfigBool* m_checkbox_pause_on_focus_lost;
ConfigRadioInt* m_radio_cursor_visible_movement;