archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 14:31:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: Fix weird naming issue on linux

Browse source
This commit is contained in:
Megamouse 2021-02-07 15:07:42 +01:00 • committed by Ivan
parent 62ca7a9b60
commit 7c683c368d
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/rpcs3qt/gui_application.cpp
View file

@ -466,11 +466,11 @@ void gui_application::OnChangeStyleSheetRequest()
const QString stylesheet = m_gui_settings->GetValue(gui::m_currentStylesheet).toString(); 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); setStyleSheet(gui::stylesheets::default_style_sheet);
} }
else if (stylesheet == gui::None) else if (stylesheet == gui::NoStylesheet)
{ {
setStyleSheet("/* none */"); setStyleSheet("/* none */");
} }

6
rpcs3/rpcs3qt/gui_settings.h
View file

@ -95,8 +95,8 @@ namespace gui
} }
const QString Settings = "CurrentSettings"; const QString Settings = "CurrentSettings";
const QString Default = "default"; const QString DefaultStylesheet = "default";
const QString None = "none"; const QString NoStylesheet = "none";
const QString main_window = "main_window"; const QString main_window = "main_window";
const QString game_list = "GameList"; const QString game_list = "GameList";
@ -183,7 +183,7 @@ namespace gui
const gui_save rsx_states = gui_save(rsx, "states", QVariantMap()); const gui_save rsx_states = gui_save(rsx, "states", QVariantMap());
const gui_save m_currentConfig = gui_save(meta, "currentConfig", Settings); 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_saveNotes = gui_save(meta, "saveNotes", QVariantMap()); // Deprecated
const gui_save m_showDebugTab = gui_save(meta, "showDebugTab", false); const gui_save m_showDebugTab = gui_save(meta, "showDebugTab", false);
const gui_save m_enableUIColors = gui_save(meta, "enableUIColors", false); const gui_save m_enableUIColors = gui_save(meta, "enableUIColors", false);

8
rpcs3/rpcs3qt/settings_dialog.cpp
View file

@ -1575,7 +1575,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
{ {
if (reset) if (reset)
{ {
m_current_stylesheet = gui::Default; m_current_stylesheet = gui::DefaultStylesheet;
ui->combo_configs->setCurrentIndex(0); ui->combo_configs->setCurrentIndex(0);
ui->combo_stylesheets->setCurrentIndex(0); ui->combo_stylesheets->setCurrentIndex(0);
} }
@ -1837,12 +1837,12 @@ void settings_dialog::AddStylesheets()
{ {
ui->combo_stylesheets->clear(); ui->combo_stylesheets->clear();
ui->combo_stylesheets->addItem(tr("None", "Stylesheets"), gui::None); ui->combo_stylesheets->addItem(tr("None", "Stylesheets"), gui::NoStylesheet);
ui->combo_stylesheets->addItem(tr("Default (Bright)", "Stylesheets"), gui::Default); ui->combo_stylesheets->addItem(tr("Default (Bright)", "Stylesheets"), gui::DefaultStylesheet);
for (const QString& entry : m_gui_settings->GetStylesheetEntries()) for (const QString& entry : m_gui_settings->GetStylesheetEntries())
{ {
if (entry != gui::Default) if (entry != gui::DefaultStylesheet)
{ {
ui->combo_stylesheets->addItem(entry, entry); ui->combo_stylesheets->addItem(entry, entry);
} }