diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 4158e37813..d4fc9349dd 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -466,11 +466,11 @@ void gui_application::OnChangeStyleSheetRequest() const QString stylesheet = m_gui_settings->GetValue(gui::m_currentStylesheet).toString(); - if (stylesheet.isEmpty() || stylesheet == gui::Default) + if (stylesheet.isEmpty() || stylesheet == gui::DefaultStylesheet) { setStyleSheet(gui::stylesheets::default_style_sheet); } - else if (stylesheet == gui::None) + else if (stylesheet == gui::NoStylesheet) { setStyleSheet("/* none */"); } diff --git a/rpcs3/rpcs3qt/gui_settings.h b/rpcs3/rpcs3qt/gui_settings.h index a014d62da1..c093c07919 100644 --- a/rpcs3/rpcs3qt/gui_settings.h +++ b/rpcs3/rpcs3qt/gui_settings.h @@ -95,8 +95,8 @@ namespace gui } const QString Settings = "CurrentSettings"; - const QString Default = "default"; - const QString None = "none"; + const QString DefaultStylesheet = "default"; + const QString NoStylesheet = "none"; const QString main_window = "main_window"; const QString game_list = "GameList"; @@ -183,7 +183,7 @@ namespace gui const gui_save rsx_states = gui_save(rsx, "states", QVariantMap()); const gui_save m_currentConfig = gui_save(meta, "currentConfig", Settings); - const gui_save m_currentStylesheet = gui_save(meta, "currentStylesheet", Default); + const gui_save m_currentStylesheet = gui_save(meta, "currentStylesheet", DefaultStylesheet); const gui_save m_saveNotes = gui_save(meta, "saveNotes", QVariantMap()); // Deprecated const gui_save m_showDebugTab = gui_save(meta, "showDebugTab", false); const gui_save m_enableUIColors = gui_save(meta, "enableUIColors", false); diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index cd0f9a0bd2..5cb5540efc 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -1575,7 +1575,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std { if (reset) { - m_current_stylesheet = gui::Default; + m_current_stylesheet = gui::DefaultStylesheet; ui->combo_configs->setCurrentIndex(0); ui->combo_stylesheets->setCurrentIndex(0); } @@ -1837,12 +1837,12 @@ void settings_dialog::AddStylesheets() { ui->combo_stylesheets->clear(); - ui->combo_stylesheets->addItem(tr("None", "Stylesheets"), gui::None); - ui->combo_stylesheets->addItem(tr("Default (Bright)", "Stylesheets"), gui::Default); + ui->combo_stylesheets->addItem(tr("None", "Stylesheets"), gui::NoStylesheet); + ui->combo_stylesheets->addItem(tr("Default (Bright)", "Stylesheets"), gui::DefaultStylesheet); for (const QString& entry : m_gui_settings->GetStylesheetEntries()) { - if (entry != gui::Default) + if (entry != gui::DefaultStylesheet) { ui->combo_stylesheets->addItem(entry, entry); }