Merge branch 'Develop' into archive_conflicts_2

1 files changed, 35 insertions, 55 deletions

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 75e08afd..bbd9a22c 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -42,7 +42,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
-
 SettingsDialog::SettingsDialog(PluginContainer *pluginContainer, QWidget *parent)
   : TutorableDialog("SettingsDialog", parent)
   , ui(new Ui::SettingsDialog)
@@ -71,6 +70,23 @@ QString SettingsDialog::getColoredButtonStyleSheet() const
     "}");
 }
 
+void SettingsDialog::setButtonColor(QPushButton *button, QColor &color)
+{
+  button->setStyleSheet(
+    QString("QPushButton {"
+      "background-color: rgba(%1, %2, %3, %4);"
+      "color: %5;"
+      "border: 1px solid;"
+      "padding: 3px;"
+      "}")
+    .arg(color.red())
+    .arg(color.green())
+    .arg(color.blue())
+    .arg(color.alpha())
+    .arg(Settings::getIdealTextColor(color).name())
+    );
+};
+
 void SettingsDialog::accept()
 {
   QString newModPath = ui->modDirEdit->text();
@@ -232,73 +248,55 @@ void SettingsDialog::on_browseGameDirBtn_clicked()
 
 void SettingsDialog::on_containsBtn_clicked()
 {
-  QColor result = QColorDialog::getColor(m_ContainsColor, this);
+  QColor result = QColorDialog::getColor(m_ContainsColor, this, "Color Picker: Mod contains selected plugin", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
     m_ContainsColor = result;
-
-    ui->containsBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-     result.name()).arg(Settings::getIdealTextColor(
-        result).name()));
+    setButtonColor(ui->containsBtn, result);
   }
 }
 
 void SettingsDialog::on_containedBtn_clicked()
 {
-  QColor result = QColorDialog::getColor(m_ContainedColor, this);
+  QColor result = QColorDialog::getColor(m_ContainedColor, this, "ColorPicker: Plugin is Contained in selected Mod", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
     m_ContainedColor = result;
-
-    ui->containedBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-      result.name()).arg(Settings::getIdealTextColor(
-        result).name()));
+    setButtonColor(ui->containedBtn, result);
   }
 }
 
 void SettingsDialog::on_overwrittenBtn_clicked()
 {
-  QColor result = QColorDialog::getColor(m_OverwrittenColor, this);
+  QColor result = QColorDialog::getColor(m_OverwrittenColor, this, "ColorPicker: Is overwritten (loose files)", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
     m_OverwrittenColor = result;
-
-    ui->overwrittenBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-      result.name()).arg(Settings::getIdealTextColor(
-        result).name()));
+    setButtonColor(ui->overwrittenBtn, result);
   }
 }
 
 void SettingsDialog::on_overwritingBtn_clicked()
 {
-  QColor result = QColorDialog::getColor(m_OverwritingColor, this);
+  QColor result = QColorDialog::getColor(m_OverwritingColor, this, "ColorPicker: Is overwriting (loose files)", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
     m_OverwritingColor = result;
-
-    ui->overwritingBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-      result.name()).arg(Settings::getIdealTextColor(
-        result).name()));
+    setButtonColor(ui->overwritingBtn, result);
   }
 }
 
 void SettingsDialog::on_overwrittenArchiveBtn_clicked()
 {
-  QColor result = QColorDialog::getColor(m_OverwrittenArchiveColor, this);
+  QColor result = QColorDialog::getColor(m_OverwrittenArchiveColor, this, "ColorPicker: Is overwritten (archive files)", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
     m_OverwrittenArchiveColor = result;
-
-    ui->overwrittenArchiveBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-      result.name()).arg(Settings::getIdealTextColor(
-        result).name()));
+    setButtonColor(ui->overwrittenArchiveBtn, result);
   }
 }
 
 void SettingsDialog::on_overwritingArchiveBtn_clicked()
 {
-  QColor result = QColorDialog::getColor(m_OverwritingArchiveColor, this);
+  QColor result = QColorDialog::getColor(m_OverwritingArchiveColor, this, "ColorPicker: Is overwriting (archive files)", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
     m_OverwritingArchiveColor = result;
-
-    ui->overwritingArchiveBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-      result.name()).arg(Settings::getIdealTextColor(
-        result).name()));
+    setButtonColor(ui->overwritingArchiveBtn, result);
   }
 }
 
@@ -311,30 +309,12 @@ void SettingsDialog::on_resetColorsBtn_clicked()
   m_ContainsColor = QColor(0, 0, 255, 64);
   m_ContainedColor = QColor(0, 0, 255, 64);
 
-  ui->overwritingBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-    QColor(255, 0, 0, 64).name()).arg(Settings::getIdealTextColor(
-      QColor(255, 0, 0, 64)).name()));
-
-  ui->overwrittenBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-    QColor(0, 255, 0, 64).name()).arg(Settings::getIdealTextColor(
-      QColor(0, 255, 0, 64)).name()));
-
-  ui->overwritingArchiveBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-    QColor(255, 0, 255, 64).name()).arg(Settings::getIdealTextColor(
-      QColor(255, 0, 255, 64)).name()));
-
-  ui->overwrittenArchiveBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-    QColor(0, 255, 255, 64).name()).arg(Settings::getIdealTextColor(
-      QColor(0, 255, 255, 64)).name()));
-
-  ui->containsBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-    QColor(0, 0, 255, 64).name()).arg(Settings::getIdealTextColor(
-      QColor(0, 0, 255, 64)).name()));
-
-  ui->containedBtn->setStyleSheet(getColoredButtonStyleSheet().arg(
-    QColor(0, 0, 255, 64).name()).arg(Settings::getIdealTextColor(
-      QColor(0, 0, 255, 64)).name()));
-
+  setButtonColor(ui->overwritingBtn, m_OverwritingColor);
+  setButtonColor(ui->overwrittenBtn, m_OverwrittenColor);
+  setButtonColor(ui->overwritingArchiveBtn, m_OverwritingArchiveColor);
+  setButtonColor(ui->overwrittenArchiveBtn, m_OverwrittenArchiveColor);
+  setButtonColor(ui->containsBtn, m_ContainsColor);
+  setButtonColor(ui->containedBtn, m_ContainedColor);
 }
 
 void SettingsDialog::on_resetDialogsButton_clicked()