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

settings_dialog: add color picker for main window tool icons

Browse source
This commit is contained in:
Megamouse 2017-07-12 18:54:28 +02:00 • committed by Ivan
parent fb191693d1
commit cfa7d04c49
3 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/rpcs3qt/settings_dialog.cpp
View file

@ -81,6 +81,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
} }
std::vector<std::string> selected_ls = std::vector<std::string>(selectedlle.begin(), selectedlle.end()); std::vector<std::string> selected_ls = std::vector<std::string>(selectedlle.begin(), selectedlle.end());
xemu_settings->SaveSelectedLibraries(selected_ls); xemu_settings->SaveSelectedLibraries(selected_ls);
ToolBarRepaintRequest();
}); });
connect(ui->okButton, &QAbstractButton::clicked, xemu_settings.get(), &emu_settings::SaveSettings); connect(ui->okButton, &QAbstractButton::clicked, xemu_settings.get(), &emu_settings::SaveSettings);
connect(ui->okButton, &QAbstractButton::clicked, this, &QDialog::accept); connect(ui->okButton, &QAbstractButton::clicked, this, &QDialog::accept);
@ -704,6 +705,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
}; };
connect(ui->pb_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::gl_iconColor, "Choose icon color"); }); connect(ui->pb_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::gl_iconColor, "Choose icon color"); });
connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolBarColor, "Choose tool bar color"); }); connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolBarColor, "Choose tool bar color"); });
connect(ui->pb_tool_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolIconColor, "Choose tool icon color"); });
AddConfigs(); AddConfigs();
AddStylesheets(); AddStylesheets();

1
rpcs3/rpcs3qt/settings_dialog.h
View file

@ -24,6 +24,7 @@ Q_SIGNALS:
void GuiSettingsSyncRequest(); void GuiSettingsSyncRequest();
void GuiStylesheetRequest(const QString& path); void GuiStylesheetRequest(const QString& path);
void GuiSettingsSaveRequest(); void GuiSettingsSaveRequest();
void ToolBarRepaintRequest();
private Q_SLOTS: private Q_SLOTS:
void OnBackupCurrentConfig(); void OnBackupCurrentConfig();
void OnApplyConfig(); void OnApplyConfig();

7
rpcs3/rpcs3qt/settings_dialog.ui
View file

@ -1166,6 +1166,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pb_tool_icon_color">
<property name="text">
<string>Main window tool icons</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="pb_icon_color"> <widget class="QPushButton" name="pb_icon_color">
<property name="text"> <property name="text">