From 01b2a8201dbbb3e5ba8c09246a45cde4f11ed2bc Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 25 Sep 2019 18:24:08 -0400
Subject: replaced color buttons by a QTableWidget

---
 src/settingsdialoggeneral.h | 42 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

(limited to 'src/settingsdialoggeneral.h')

diff --git a/src/settingsdialoggeneral.h b/src/settingsdialoggeneral.h
index 2038ba31..1f7fafff 100644
--- a/src/settingsdialoggeneral.h
+++ b/src/settingsdialoggeneral.h
@@ -12,38 +12,22 @@ public:
   void update();
 
 private:
-  QColor m_OverwritingColor;
-  QColor m_OverwrittenColor;
-  QColor m_OverwritingArchiveColor;
-  QColor m_OverwrittenArchiveColor;
-  QColor m_ContainsColor;
-  QColor m_ContainedColor;
-
   void addLanguages();
+  void selectLanguage();
+
   void addStyles();
+  void selectStyle();
+
+  void setColorTable();
+
   void resetDialogs();
-  void setButtonColor(QPushButton *button, const QColor &color);
-
-  QColor getOverwritingColor() { return m_OverwritingColor; }
-  QColor getOverwrittenColor() { return m_OverwrittenColor; }
-  QColor getOverwritingArchiveColor() { return m_OverwritingArchiveColor; }
-  QColor getOverwrittenArchiveColor() { return m_OverwrittenArchiveColor; }
-  QColor getContainsColor() { return m_ContainsColor; }
-  QColor getContainedColor() { return m_ContainedColor; }
-
-  void setOverwritingColor(QColor col) { m_OverwritingColor = col; }
-  void setOverwrittenColor(QColor col) { m_OverwrittenColor = col; }
-  void setOverwritingArchiveColor(QColor col) { m_OverwritingArchiveColor = col; }
-  void setOverwrittenArchiveColor(QColor col) { m_OverwrittenArchiveColor = col; }
-  void setContainsColor(QColor col) { m_ContainsColor = col; }
-  void setContainedColor(QColor col) { m_ContainedColor = col; }
-
-  void on_overwritingArchiveBtn_clicked();
-  void on_overwritingBtn_clicked();
-  void on_overwrittenArchiveBtn_clicked();
-  void on_overwrittenBtn_clicked();
-  void on_containedBtn_clicked();
-  void on_containsBtn_clicked();
+
+  void addColor(
+    const QString& text, const QColor& defaultColor,
+    std::function<QColor ()> get,
+    std::function<void (const QColor&)> commit);
+
+  void onColorActivated();
 
   void on_categoriesBtn_clicked();
   void on_resetColorsBtn_clicked();
-- 
cgit v1.3.1