ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: fix fullscreen icon

This commit is contained in:
Unknown 2017-10-07 18:06:36 +02:00 committed by Ivan
parent b7f6bd4c91
commit 78ef467138
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/rpcs3qt/main_window.cpp
View File

@ -787,11 +787,11 @@ void main_window::RepaintToolBarIcons()
if (isFullScreen()) if (isFullScreen())
{ {
ui->toolbar_fullscreen->setIcon(m_icon_fullscreen_on); ui->toolbar_fullscreen->setIcon(m_icon_fullscreen_off);
} }
else else
{ {
ui->toolbar_fullscreen->setIcon(m_icon_fullscreen_off); ui->toolbar_fullscreen->setIcon(m_icon_fullscreen_on);
} }
ui->sizeSlider->setStyleSheet(ui->sizeSlider->styleSheet().append("QSlider::handle:horizontal{ background: rgba(%1, %2, %3, %4); }") ui->sizeSlider->setStyleSheet(ui->sizeSlider->styleSheet().append("QSlider::handle:horizontal{ background: rgba(%1, %2, %3, %4); }")
@ -1213,7 +1213,7 @@ void main_window::CreateConnects()
{ {
settings_dialog dlg(guiSettings, emuSettings, tabIndex, this); settings_dialog dlg(guiSettings, emuSettings, tabIndex, this);
connect(&dlg, &settings_dialog::GuiSettingsSaveRequest, this, &main_window::SaveWindowState); connect(&dlg, &settings_dialog::GuiSettingsSaveRequest, this, &main_window::SaveWindowState);
connect(&dlg, &settings_dialog::GuiSettingsSyncRequest, [=]() {ConfigureGuiFromSettings(true); }); connect(&dlg, &settings_dialog::GuiSettingsSyncRequest, this, &main_window::ConfigureGuiFromSettings);
connect(&dlg, &settings_dialog::GuiStylesheetRequest, this, &main_window::RequestGlobalStylesheetChange); connect(&dlg, &settings_dialog::GuiStylesheetRequest, this, &main_window::RequestGlobalStylesheetChange);
connect(&dlg, &settings_dialog::GuiRepaintRequest, this, &main_window::RepaintGui); connect(&dlg, &settings_dialog::GuiRepaintRequest, this, &main_window::RepaintGui);
dlg.exec(); dlg.exec();
@ -1493,7 +1493,7 @@ void main_window::CreateDockWindows()
connect(m_gameListFrame, &game_list_frame::RequestAddRecentGame, this, &main_window::AddRecentAction); connect(m_gameListFrame, &game_list_frame::RequestAddRecentGame, this, &main_window::AddRecentAction);
} }
void main_window::ConfigureGuiFromSettings(bool configureAll) void main_window::ConfigureGuiFromSettings(bool configure_all)
{ {
// Restore GUI state if needed. We need to if they exist. // Restore GUI state if needed. We need to if they exist.
QByteArray geometry = guiSettings->GetValue(GUI::mw_geometry).toByteArray(); QByteArray geometry = guiSettings->GetValue(GUI::mw_geometry).toByteArray();
@ -1576,7 +1576,7 @@ void main_window::ConfigureGuiFromSettings(bool configureAll)
else ui->setlistModeGridAct->setChecked(true); else ui->setlistModeGridAct->setChecked(true);
m_categoryVisibleActGroup->setEnabled(isListMode); m_categoryVisibleActGroup->setEnabled(isListMode);
if (configureAll) if (configure_all)
{ {
// Handle log settings // Handle log settings
m_logFrame->LoadSettings(); m_logFrame->LoadSettings();

2
rpcs3/rpcs3qt/main_window.h
View File

@ -90,6 +90,7 @@ private Q_SLOTS:
void DecryptSPRXLibraries(); void DecryptSPRXLibraries();
void SaveWindowState(); void SaveWindowState();
void ConfigureGuiFromSettings(bool configure_all = false);
protected: protected:
void closeEvent(QCloseEvent *event) override; void closeEvent(QCloseEvent *event) override;
@ -107,7 +108,6 @@ private:
void CreateActions(); void CreateActions();
void CreateConnects(); void CreateConnects();
void CreateDockWindows(); void CreateDockWindows();
void ConfigureGuiFromSettings(bool configureAll = false);
void EnableMenus(bool enabled); void EnableMenus(bool enabled);
void InstallPkg(const QString& dropPath = ""); void InstallPkg(const QString& dropPath = "");
void InstallPup(const QString& dropPath = ""); void InstallPup(const QString& dropPath = "");

4
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -700,7 +700,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
ApplyGuiOptions(true); ApplyGuiOptions(true);
xgui_settings->Reset(true); xgui_settings->Reset(true);
xgui_settings->ChangeToConfig(GUI::Default); xgui_settings->ChangeToConfig(GUI::Default);
Q_EMIT GuiSettingsSyncRequest(); Q_EMIT GuiSettingsSyncRequest(true);
AddConfigs(); AddConfigs();
AddStylesheets(); AddStylesheets();
AddColoredIcons(); AddColoredIcons();
@ -969,7 +969,7 @@ void settings_dialog::OnApplyConfig()
m_currentConfig = ui->combo_configs->currentText(); m_currentConfig = ui->combo_configs->currentText();
xgui_settings->SetValue(GUI::m_currentConfig, m_currentConfig); xgui_settings->SetValue(GUI::m_currentConfig, m_currentConfig);
xgui_settings->ChangeToConfig(m_currentConfig); xgui_settings->ChangeToConfig(m_currentConfig);
Q_EMIT GuiSettingsSyncRequest(); Q_EMIT GuiSettingsSyncRequest(true);
} }
void settings_dialog::OnApplyStylesheet() void settings_dialog::OnApplyStylesheet()

2
rpcs3/rpcs3qt/settings_dialog.h
View File

@ -24,7 +24,7 @@ public:
~settings_dialog(); ~settings_dialog();
int exec(); int exec();
Q_SIGNALS: Q_SIGNALS:
void GuiSettingsSyncRequest(); void GuiSettingsSyncRequest(bool configure_all);
void GuiStylesheetRequest(const QString& path); void GuiStylesheetRequest(const QString& path);
void GuiSettingsSaveRequest(); void GuiSettingsSaveRequest();
void GuiRepaintRequest(); void GuiRepaintRequest();