From 73842ee245a09fe4ead0e1a2a5f778d89f0a8039 Mon Sep 17 00:00:00 2001
From: Al12rs <gabriel.cortesi@outlook.com>
Date: Thu, 1 Nov 2018 16:20:53 +0100
Subject: Added ability to change color of conflict and plugin highlighting
 from the settings.

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

(limited to 'src/settingsdialog.h')

diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index 2e270131..c678ec78 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -56,6 +56,18 @@ private:
 
   void storeSettings(QListWidgetItem *pluginItem);
 
+public:
+
+  QColor getOverwritingColor() { return m_OverwritingColor; }
+  QColor getOverwrittenColor() { return m_OverwrittenColor; }
+  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 setContainsColor(QColor col) { m_ContainsColor = col; }
+  void setContainedColor(QColor col) { m_ContainedColor = col; }
+
 private slots:
   void on_loginCheckBox_toggled(bool checked);
 
@@ -85,9 +97,24 @@ private slots:
 
   void on_browseProfilesDirBtn_clicked();
 
+  void on_overwritingBtn_clicked();
+
+  void on_overwrittenBtn_clicked();
+
+  void on_containsBtn_clicked();
+
+  void on_containedBtn_clicked();
+
+  void on_resetColorsBtn_clicked();
+
 private:
     Ui::SettingsDialog *ui;
     PluginContainer *m_PluginContainer;
+
+    QColor m_OverwritingColor;
+    QColor m_OverwrittenColor;
+    QColor m_ContainsColor;
+    QColor m_ContainedColor;
 };
 
 
-- 
cgit v1.3.1