Qt: clean up gui_settings.h - move general functions to qt_utils.h

This commit is contained in:
Megamouse 2018-03-17 00:13:40 +01:00 committed by Ivan
parent c10e195dba
commit baea538c32
15 changed files with 187 additions and 175 deletions

View file

@ -1,5 +1,4 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QPushButton>
#include <QMessageBox>
#include <QInputDialog>
@ -13,8 +12,8 @@
#include <QDesktopWidget>
#include <QTimer>
#include "qt_utils.h"
#include "settings_dialog.h"
#include "ui_settings_dialog.h"
#include "stdafx.h"
@ -756,7 +755,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
}
else
{
button->setIcon(gui_settings::colorizedIcon(icon, iconColor, color));
button->setIcon(gui::utils::get_colorized_icon(icon, iconColor, color));
}
button->setText("");
button->setStyleSheet(styleSheet().append("text-align:left;"));
@ -857,7 +856,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
xgui_settings->SetCustomColor(i, dlg.customColor(i));
}
xgui_settings->SetValue(color, dlg.selectedColor());
button->setIcon(gui_settings::colorizedIcon(button->icon(), oldColor, dlg.selectedColor(), true));
button->setIcon(gui::utils::get_colorized_icon(button->icon(), oldColor, dlg.selectedColor(), true));
Q_EMIT GuiRepaintRequest();
}
};