Fix button colors in the settings dialog with the default theme

3 files changed, 30 insertions, 23 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index 7d9fb7c0..0f8eaa2a 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -741,24 +741,21 @@ Settings::GeneralTab::GeneralTab(Settings *m_parent, SettingsDialog &m_dialog)
   m_containsBtn->setPalette(palette3);
   m_containedBtn->setPalette(palette4);
   */
-  
-  //version with stylesheet 
-  QString COLOR_STYLE("QPushButton { background-color : %1; color : %2; }");
 
-
-  m_overwritingBtn->setStyleSheet(COLOR_STYLE.arg(
+  //version with stylesheet
+  m_overwritingBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg(
     m_parent->modlistOverwritingLooseColor().name()).arg(getIdealTextColor(
       m_parent->modlistOverwritingLooseColor()).name()));
-  m_overwrittenBtn->setStyleSheet(COLOR_STYLE.arg(
+  m_overwrittenBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg(
     m_parent->modlistOverwrittenLooseColor().name()).arg(getIdealTextColor(
       m_parent->modlistOverwrittenLooseColor()).name()));
-  m_containsBtn->setStyleSheet(COLOR_STYLE.arg(
+  m_containsBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg(
     m_parent->modlistContainsPluginColor().name()).arg(getIdealTextColor(
       m_parent->modlistContainsPluginColor()).name()));
-  m_containedBtn->setStyleSheet(COLOR_STYLE.arg(
+  m_containedBtn->setStyleSheet(m_dialog.getColoredButtonStyleSheet().arg(
     m_parent->pluginListContainedColor().name()).arg(getIdealTextColor(
       m_parent->pluginListContainedColor()).name()));
-  
+
   m_dialog.setOverwritingColor(m_parent->modlistOverwritingLooseColor());
   m_dialog.setOverwrittenColor(m_parent->modlistOverwrittenLooseColor());
   m_dialog.setContainsColor(m_parent->modlistContainsPluginColor());
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 7f484830..8a983896 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -59,6 +59,16 @@ SettingsDialog::~SettingsDialog()
   delete ui;
 }
 
+QString SettingsDialog::getColoredButtonStyleSheet() const
+{
+  return QString("QPushButton {"
+    "background-color: %1;"
+    "color: %2;"
+    "border: 1px solid;"
+    "padding: 3px;"
+    "}");
+}
+
 void SettingsDialog::accept()
 {
   QString newModPath = ui->modDirEdit->text();
@@ -184,8 +194,7 @@ void SettingsDialog::on_containsBtn_clicked()
   if (result.isValid()) {
     m_ContainsColor = result;
 
-    QString COLOR_STYLE("QPushButton { background-color : %1; color : %2; }");
-    ui->containsBtn->setStyleSheet(COLOR_STYLE.arg(
+    ui->containsBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
      result.name()).arg(Settings::getIdealTextColor(
         result).name()));
 
@@ -203,8 +212,7 @@ void SettingsDialog::on_containedBtn_clicked()
   if (result.isValid()) {
     m_ContainedColor = result;
 
-    QString COLOR_STYLE("QPushButton { background-color : %1; color : %2; }");
-    ui->containedBtn->setStyleSheet(COLOR_STYLE.arg(
+    ui->containedBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
       result.name()).arg(Settings::getIdealTextColor(
         result).name()));
 
@@ -222,8 +230,7 @@ void SettingsDialog::on_overwrittenBtn_clicked()
   if (result.isValid()) {
     m_OverwrittenColor = result;
 
-    QString COLOR_STYLE("QPushButton { background-color : %1; color : %2; }");
-    ui->overwrittenBtn->setStyleSheet(COLOR_STYLE.arg(
+    ui->overwrittenBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
       result.name()).arg(Settings::getIdealTextColor(
         result).name()));
 
@@ -241,8 +248,7 @@ void SettingsDialog::on_overwritingBtn_clicked()
   if (result.isValid()) {
     m_OverwritingColor = result;
 
-    QString COLOR_STYLE("QPushButton { background-color : %1; color : %2; }");
-    ui->overwritingBtn->setStyleSheet(COLOR_STYLE.arg(
+    ui->overwritingBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
       result.name()).arg(Settings::getIdealTextColor(
         result).name()));
 
@@ -261,21 +267,19 @@ void SettingsDialog::on_resetColorsBtn_clicked()
   m_ContainsColor = QColor(0, 0, 255, 64);
   m_ContainedColor = QColor(0, 0, 255, 64);
 
-  QString COLOR_STYLE("QPushButton { background-color : %1; color : %2; }");
-
-  ui->overwritingBtn->setStyleSheet(COLOR_STYLE.arg(
+  ui->overwritingBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
     QColor(255, 0, 0, 64).name()).arg(Settings::getIdealTextColor(
       QColor(255, 0, 0, 64)).name()));
 
-  ui->overwrittenBtn->setStyleSheet(COLOR_STYLE.arg(
+  ui->overwrittenBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
     QColor(0, 255, 0, 64).name()).arg(Settings::getIdealTextColor(
       QColor(0, 255, 0, 64)).name()));
 
-  ui->containsBtn->setStyleSheet(COLOR_STYLE.arg(
+  ui->containsBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
     QColor(0, 0, 255, 64).name()).arg(Settings::getIdealTextColor(
       QColor(0, 0, 255, 64)).name()));
 
-  ui->containedBtn->setStyleSheet(COLOR_STYLE.arg(
+  ui->containedBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
     QColor(0, 0, 255, 64).name()).arg(Settings::getIdealTextColor(
       QColor(0, 0, 255, 64)).name()));
 
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index c678ec78..7df52ccd 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -44,6 +44,12 @@ public:
   explicit SettingsDialog(PluginContainer *pluginContainer, QWidget *parent = 0);

   ~SettingsDialog();

 

+  /**

+  * @brief get stylesheet of settings buttons with colored background

+  * @return string of stylesheet

+  */

+  QString getColoredButtonStyleSheet() const;

+

 public slots:

 

   virtual void accept();