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

Qt: remove redundant custom toolbar colors.

Browse source 
They got too complicated when used with stylesheets. I left the gamelist icon color option since it does in no way interfere with the stylesheets
This commit is contained in:
Megamouse 2018-07-01 20:46:26 +02:00 • committed by Ivan
parent 1270ee4b38
commit 3a5ce90148
7 changed files with 38 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/rpcs3qt/settings_dialog.cpp
View file

@ -950,8 +950,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
auto AddColoredIcons = [=]()
{
addColoredIcon(ui->pb_gl_icon_color, xgui_settings->GetValue(gui::gl_iconColor).value<QColor>());
addColoredIcon(ui->pb_tool_bar_color, xgui_settings->GetValue(gui::mw_toolBarColor).value<QColor>());
addColoredIcon(ui->pb_tool_icon_color, xgui_settings->GetValue(gui::mw_toolIconColor).value<QColor>());
};
AddColoredIcons();
@ -960,8 +958,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
bool enableUIColors = xgui_settings->GetValue(gui::m_enableUIColors).toBool();
ui->cb_custom_colors->setChecked(enableUIColors);
ui->pb_gl_icon_color->setEnabled(enableUIColors);
ui->pb_tool_bar_color->setEnabled(enableUIColors);
ui->pb_tool_icon_color->setEnabled(enableUIColors);
auto ApplyGuiOptions = [&](bool reset = false)
{
@ -1021,8 +1017,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
{
xgui_settings->SetValue(gui::m_enableUIColors, val);
ui->pb_gl_icon_color->setEnabled(val);
ui->pb_tool_bar_color->setEnabled(val);
ui->pb_tool_icon_color->setEnabled(val);
Q_EMIT GuiRepaintRequest();
});
auto colorDialog = [&](const gui_save& color, const QString& title, QPushButton *button)
@ -1052,16 +1046,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
colorDialog(gui::gl_iconColor, tr("Choose gamelist icon color"), ui->pb_gl_icon_color);
});
connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]()
{
colorDialog(gui::mw_toolBarColor, tr("Choose tool bar color"), ui->pb_tool_bar_color);
});
connect(ui->pb_tool_icon_color, &QAbstractButton::clicked, [=]()
{
colorDialog(gui::mw_toolIconColor, tr("Choose tool icon color"), ui->pb_tool_icon_color);
});
AddConfigs();
AddStylesheets();
}