From 580f45429fca07a4d3cd8daae83b6963ce5de54a Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Sun, 30 Dec 2018 18:52:15 -0600
Subject: Fix conflict colors and make archive conflict colors configurable

---
 src/settingsdialog.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/settingsdialog.h')

diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index f0567d87..e3c7d413 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -67,6 +67,8 @@ public:
 
   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; }
   QString getExecutableBlacklist() { return m_ExecutableBlacklist; }
@@ -74,6 +76,8 @@ public:
 
   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 setExecutableBlacklist(QString blacklist) { m_ExecutableBlacklist = blacklist; }
@@ -116,6 +120,10 @@ private slots:
 
   void on_overwrittenBtn_clicked();
 
+  void on_overwritingArchiveBtn_clicked();
+
+  void on_overwrittenArchiveBtn_clicked();
+
   void on_containsBtn_clicked();
 
   void on_containedBtn_clicked();
@@ -140,6 +148,8 @@ private:
 
     QColor m_OverwritingColor;
     QColor m_OverwrittenColor;
+    QColor m_OverwritingArchiveColor;
+    QColor m_OverwrittenArchiveColor;
     QColor m_ContainsColor;
     QColor m_ContainedColor;
 
-- 
cgit v1.3.1