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.ui | 92 +++++++++++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 39 deletions(-)

(limited to 'src/settingsdialog.ui')

diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 832fa71a..58b2b48f 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>586</width>
-    <height>462</height>
+    <height>486</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -99,10 +99,26 @@ If you use pre-releases, never contact me directly by e-mail or via private mess
              <string>Colors</string>
             </property>
             <layout class="QGridLayout" name="gridLayout_5">
+             <item row="6" column="0">
+              <widget class="QCheckBox" name="colorSeparatorsBox">
+               <property name="toolTip">
+                <string>When this is enabled, the color defined for a separator will be shown on the mod list scrollbar at the location of the separator.  This can be useful for quick navigation between separator sections or to a specific separator section.</string>
+               </property>
+               <property name="whatsThis">
+                <string>When this is enabled, the color defined for a separator will be shown on the mod list scrollbar at the location of the separator.  This can be useful for quick navigation between separator sections or to a specific separator section.</string>
+               </property>
+               <property name="text">
+                <string>Show mod list separator colors on the scrollbar</string>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
              <item row="4" column="0" colspan="2">
-              <widget class="QPushButton" name="resetColorsBtn">
+              <widget class="QPushButton" name="containedBtn">
                <property name="text">
-                <string>Reset Colors</string>
+                <string>Plugin is Contained in selected Mod</string>
                </property>
               </widget>
              </item>
@@ -113,40 +129,38 @@ If you use pre-releases, never contact me directly by e-mail or via private mess
                </property>
               </widget>
              </item>
-             <item row="2" column="0" colspan="2">
-              <widget class="QPushButton" name="containsBtn">
+             <item row="1" column="1">
+              <widget class="QPushButton" name="overwritingBtn">
                <property name="text">
-                <string>Mod Contains selected Plugin</string>
+                <string>Is overwriting (loose files)</string>
                </property>
               </widget>
              </item>
-             <item row="3" column="0" colspan="2">
-              <widget class="QPushButton" name="containedBtn">
+             <item row="5" column="0" colspan="2">
+              <widget class="QPushButton" name="resetColorsBtn">
                <property name="text">
-                <string>Plugin is Contained in selected Mod</string>
+                <string>Reset Colors</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="1">
-              <widget class="QPushButton" name="overwritingBtn">
+             <item row="3" column="0" colspan="2">
+              <widget class="QPushButton" name="containsBtn">
                <property name="text">
-                <string>Is overwriting (loose files)</string>
+                <string>Mod Contains selected Plugin</string>
                </property>
               </widget>
              </item>
-             <item row="5" column="0">
-              <widget class="QCheckBox" name="colorSeparatorsBox">
-               <property name="toolTip">
-                <string>When this is enabled, the color defined for a separator will be shown on the mod list scrollbar at the location of the separator.  This can be useful for quick navigation between separator sections or to a specific separator section.</string>
-               </property>
-               <property name="whatsThis">
-                <string>When this is enabled, the color defined for a separator will be shown on the mod list scrollbar at the location of the separator.  This can be useful for quick navigation between separator sections or to a specific separator section.</string>
-               </property>
+             <item row="2" column="0">
+              <widget class="QPushButton" name="overwrittenArchiveBtn">
                <property name="text">
-                <string>Show mod list separator colors on the scrollbar</string>
+                <string>Is overwritten (archive files)</string>
                </property>
-               <property name="checked">
-                <bool>true</bool>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QPushButton" name="overwritingArchiveBtn">
+               <property name="text">
+                <string>Is overwriting (archive files)</string>
                </property>
               </widget>
              </item>
@@ -1114,27 +1128,27 @@ programs you are intentionally running.</string>
          </property>
         </widget>
        </item>
-        <item>
-          <widget class="QCheckBox" name="enableArchiveParsingBox">
-            <property name="toolTip">
-              <string>Enable parsing of Archives Archives, has effects on perfromance.</string>
-            </property>
-            <property name="whatsThis">
-              <string>
+       <item>
+        <widget class="QCheckBox" name="enableArchiveParsingBox">
+         <property name="toolTip">
+          <string>Enable parsing of Archives Archives, has effects on perfromance.</string>
+         </property>
+         <property name="whatsThis">
+          <string>
                 By default Mod Organizer will parse Archive files to calculate conflicts between themselves and loose files, this process has a noticeable cost in performance.
                 This feature should not be confused from the one offered by ModOrganizer 1, ModOrganizer 2 will only show conflicts with archives NOT load them into the game or program.
 
                 If you disable this feature, MO will only display conflicts with Loose files.
               </string>
-            </property>
-            <property name="text">
-              <string>Enable parsing of Archives</string>
-            </property>
-            <property name="checked">
-              <bool>true</bool>
-            </property>
-          </widget>
-        </item>
+         </property>
+         <property name="text">
+          <string>Enable parsing of Archives</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QPushButton" name="resetGeometryBtn">
          <property name="toolTip">
-- 
cgit v1.3.1