Merge pull request #726 from isanae/Develop

adds a no-conflict list in the conflicts tab, makes all three lists collapsible

1 files changed, 134 insertions, 52 deletions

diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 39173a14..1187de87 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -400,28 +400,45 @@ Most mods do not have optional esps, so chances are good you are looking at an e
       <attribute name="title">

        <string>Conflicts</string>

       </attribute>

-      <layout class="QVBoxLayout" name="verticalLayout_8">

+      <layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,1,0,1,0,1,0">

+       <property name="bottomMargin">

+        <number>0</number>

+       </property>

        <item>

-        <layout class="QHBoxLayout" name="horizontalLayout_10" stretch="1,0">

-         <item>

-          <widget class="QLabel" name="label_7">

-           <property name="text">

-            <string>The following conflicted files are provided by this mod</string>

-           </property>

-          </widget>

-         </item>

+        <layout class="QVBoxLayout" name="overwriteRoot">

          <item>

-          <widget class="QLCDNumber" name="overwriteCount">

-           <property name="frameShadow">

-            <enum>QFrame::Sunken</enum>

-           </property>

-           <property name="lineWidth">

-            <number>1</number>

-           </property>

-           <property name="segmentStyle">

-            <enum>QLCDNumber::Flat</enum>

-           </property>

-          </widget>

+          <layout class="QHBoxLayout" name="overwriteHeader" stretch="1,0">

+           <item>

+            <widget class="QToolButton" name="overwriteExpander">

+             <property name="sizePolicy">

+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">

+               <horstretch>0</horstretch>

+               <verstretch>0</verstretch>

+              </sizepolicy>

+             </property>

+             <property name="styleSheet">

+              <string notr="true">border: none;

+text-align: left;</string>

+             </property>

+             <property name="text">

+              <string>The following conflicted files are provided by this mod</string>

+             </property>

+            </widget>

+           </item>

+           <item>

+            <widget class="QLCDNumber" name="overwriteCount">

+             <property name="frameShadow">

+              <enum>QFrame::Sunken</enum>

+             </property>

+             <property name="lineWidth">

+              <number>1</number>

+             </property>

+             <property name="segmentStyle">

+              <enum>QLCDNumber::Flat</enum>

+             </property>

+            </widget>

+           </item>

+          </layout>

          </item>

         </layout>

        </item>

@@ -470,23 +487,37 @@ Most mods do not have optional esps, so chances are good you are looking at an e
         </widget>

        </item>

        <item>

-        <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="1,0">

+        <layout class="QVBoxLayout" name="overwrittenRoot">

          <item>

-          <widget class="QLabel" name="label_8">

-           <property name="text">

-            <string>The following conflicted files are provided by other mods</string>

-           </property>

-          </widget>

-         </item>

-         <item>

-          <widget class="QLCDNumber" name="overwrittenCount">

-           <property name="frameShadow">

-            <enum>QFrame::Sunken</enum>

-           </property>

-           <property name="segmentStyle">

-            <enum>QLCDNumber::Flat</enum>

-           </property>

-          </widget>

+          <layout class="QHBoxLayout" name="overwrittenHeader" stretch="1,0">

+           <item>

+            <widget class="QToolButton" name="overwrittenExpander">

+             <property name="sizePolicy">

+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">

+               <horstretch>0</horstretch>

+               <verstretch>0</verstretch>

+              </sizepolicy>

+             </property>

+             <property name="styleSheet">

+              <string notr="true">border: none;

+text-align: left;</string>

+             </property>

+             <property name="text">

+              <string>The following conflicted files are provided by other mods</string>

+             </property>

+            </widget>

+           </item>

+           <item>

+            <widget class="QLCDNumber" name="overwrittenCount">

+             <property name="frameShadow">

+              <enum>QFrame::Sunken</enum>

+             </property>

+             <property name="segmentStyle">

+              <enum>QLCDNumber::Flat</enum>

+             </property>

+            </widget>

+           </item>

+          </layout>

          </item>

         </layout>

        </item>

@@ -526,26 +557,77 @@ Most mods do not have optional esps, so chances are good you are looking at an e
         </widget>

        </item>

        <item>

-        <layout class="QHBoxLayout" name="horizontalLayout_8" stretch="1,0">

+        <layout class="QVBoxLayout" name="noConflictRoot">

          <item>

-          <widget class="QLabel" name="label_9">

-           <property name="text">

-            <string>Non-Conflicted files</string>

-           </property>

-          </widget>

-         </item>

-         <item>

-          <widget class="QLCDNumber" name="noConflictCount">

-           <property name="frameShadow">

-            <enum>QFrame::Sunken</enum>

-           </property>

-           <property name="segmentStyle">

-            <enum>QLCDNumber::Flat</enum>

-           </property>

-          </widget>

+          <layout class="QHBoxLayout" name="noConflictHeader" stretch="1,0">

+           <item>

+            <widget class="QToolButton" name="noConflictExpander">

+             <property name="sizePolicy">

+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">

+               <horstretch>0</horstretch>

+               <verstretch>0</verstretch>

+              </sizepolicy>

+             </property>

+             <property name="styleSheet">

+              <string notr="true">border: none;

+text-align: left;</string>

+             </property>

+             <property name="text">

+              <string>The following files have no conflicts</string>

+             </property>

+            </widget>

+           </item>

+           <item>

+            <widget class="QLCDNumber" name="noConflictCount">

+             <property name="frameShadow">

+              <enum>QFrame::Sunken</enum>

+             </property>

+             <property name="segmentStyle">

+              <enum>QLCDNumber::Flat</enum>

+             </property>

+            </widget>

+           </item>

+          </layout>

          </item>

         </layout>

        </item>

+       <item>

+        <widget class="QTreeWidget" name="noConflictTree">

+         <property name="contextMenuPolicy">

+          <enum>Qt::CustomContextMenu</enum>

+         </property>

+         <property name="textElideMode">

+          <enum>Qt::ElideLeft</enum>

+         </property>

+         <property name="sortingEnabled">

+          <bool>true</bool>

+         </property>

+         <property name="animated">

+          <bool>true</bool>

+         </property>

+         <property name="columnCount">

+          <number>1</number>

+         </property>

+         <column>

+          <property name="text">

+           <string>File</string>

+          </property>

+         </column>

+        </widget>

+       </item>

+       <item>

+        <spacer name="verticalSpacer">

+         <property name="orientation">

+          <enum>Qt::Vertical</enum>

+         </property>

+         <property name="sizeHint" stdset="0">

+          <size>

+           <width>20</width>

+           <height>0</height>

+          </size>

+         </property>

+        </spacer>

+       </item>

       </layout>

      </widget>

      <widget class="QWidget" name="tabCategories">