Merge pull request #1361 from Holt59/ui-fixes-and-others

UI fixes and others.

1 files changed, 146 insertions, 62 deletions

diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index b23e6d90..bcef5d95 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -311,22 +311,16 @@ If you disable this feature, MO will only display official DLCs this way. Please
               <property name="checked">
                <bool>false</bool>
               </property>
-              <layout class="QVBoxLayout" name="verticalLayout_20">
-               <property name="leftMargin">
-                <number>7</number>
-               </property>
-               <property name="rightMargin">
-                <number>7</number>
-               </property>
-               <item>
-                <widget class="QWidget" name="widget_8" native="true">
+              <layout class="QGridLayout" name="gridLayout_7">
+               <item row="0" column="0">
+                <widget class="QWidget" name="collapsibleSeparatorsWidget" native="true">
                  <property name="minimumSize">
                   <size>
                    <width>0</width>
-                   <height>0</height>
+                   <height>50</height>
                   </size>
                  </property>
-                 <layout class="QHBoxLayout" name="horizontalLayout_13">
+                 <layout class="QGridLayout" name="gridLayout_10">
                   <property name="leftMargin">
                    <number>0</number>
                   </property>
@@ -339,62 +333,139 @@ If you disable this feature, MO will only display official DLCs this way. Please
                   <property name="bottomMargin">
                    <number>0</number>
                   </property>
-                  <item>
-                   <widget class="QLabel" name="label_18">
-                    <property name="text">
-                     <string>When sorting by</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QCheckBox" name="collapsibleSeparatorsAscBox">
-                    <property name="text">
-                     <string>ascending priority</string>
-                    </property>
-                    <property name="checked">
-                     <bool>true</bool>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QCheckBox" name="collapsibleSeparatorsDscBox">
-                    <property name="text">
-                     <string>descending  priority</string>
+                  <item row="0" column="0">
+                   <layout class="QGridLayout" name="gridLayout_9">
+                    <property name="verticalSpacing">
+                     <number>9</number>
                     </property>
-                   </widget>
+                    <item row="0" column="0">
+                     <widget class="QLabel" name="collapsibleSeparatorsLabel">
+                      <property name="text">
+                       <string>When sorting by</string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="3" column="0">
+                     <widget class="QLabel" name="label_35">
+                      <property name="text">
+                       <string>Show icons on separators</string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="1" column="0" colspan="3">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsPerProfileBox">
+                      <property name="toolTip">
+                       <string>Do not share the collapse/expanded state of separators between profiles.</string>
+                      </property>
+                      <property name="whatsThis">
+                       <string>Do not share the collapse/expanded state of separators between profiles.</string>
+                      </property>
+                      <property name="text">
+                       <string>Profile-specific collapse states for separators</string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="3" column="2">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsIconsFlagsBox">
+                      <property name="text">
+                       <string>flags</string>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="2" column="0">
+                     <widget class="QLabel" name="label_34">
+                      <property name="text">
+                       <string>Show conflicts and plugins </string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="3" column="1">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsIconsConflictsBox">
+                      <property name="text">
+                       <string>conflicts</string>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="3" column="3">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsIconsContentsBox">
+                      <property name="text">
+                       <string>content</string>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="3" column="4">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsIconsVersionBox">
+                      <property name="text">
+                       <string>version</string>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="0" column="1" colspan="2">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsAscBox">
+                      <property name="text">
+                       <string>ascending priority</string>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="0" column="3" colspan="2">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsDscBox">
+                      <property name="text">
+                       <string>descending  priority</string>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="2" column="1" colspan="2">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsHighlightToBox">
+                      <property name="toolTip">
+                       <string>Highlight collapsed separators based on conflicts and plugins from mods inside them.</string>
+                      </property>
+                      <property name="whatsThis">
+                       <string>Highlight collapsed separators based on conflicts and plugins from mods inside them.</string>
+                      </property>
+                      <property name="text">
+                       <string>on separators</string>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="2" column="3" colspan="2">
+                     <widget class="QCheckBox" name="collapsibleSeparatorsHighlightFromBox">
+                      <property name="toolTip">
+                       <string>When selecting a collapsed separator, highlight conflicting mods and plugins from mods inside the separator.</string>
+                      </property>
+                      <property name="whatsThis">
+                       <string>When selecting a collapsed separator, highlight conflicting mods and plugins from mods inside the separator.</string>
+                      </property>
+                      <property name="text">
+                       <string>from separators</string>
+                      </property>
+                      <property name="checked">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
                   </item>
                  </layout>
                 </widget>
                </item>
-               <item>
-                <widget class="QCheckBox" name="collapsibleSeparatorsConflictsBox">
-                 <property name="toolTip">
-                  <string>Display mod conflicts on and from separator when collapsed, and show plugins from collapsed separators.</string>
-                 </property>
-                 <property name="whatsThis">
-                  <string>Display mod conflicts on and from separator when collapsed, and show plugins from collapsed separators.</string>
-                 </property>
-                 <property name="text">
-                  <string>Show conflicts and plugins on separators and from separators</string>
-                 </property>
-                 <property name="checked">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QCheckBox" name="collapsibleSeparatorsPerProfileBox">
-                 <property name="toolTip">
-                  <string>Do not share the collapse/expanded state of separators between profiles.</string>
-                 </property>
-                 <property name="whatsThis">
-                  <string>Do not share the collapse/expanded state of separators between profiles.</string>
-                 </property>
-                 <property name="text">
-                  <string>Profile-specific collapse states for separators</string>
-                 </property>
-                </widget>
-               </item>
               </layout>
              </widget>
             </item>
@@ -450,6 +521,19 @@ If you disable this feature, MO will only display official DLCs this way. Please
              </widget>
             </item>
             <item>
+             <widget class="QCheckBox" name="hideDownloadInstallBox">
+              <property name="toolTip">
+               <string>Automatically hide downloads after successful installation.</string>
+              </property>
+              <property name="whatsThis">
+               <string>Automatically hide downloads after successful installation.</string>
+              </property>
+              <property name="text">
+               <string>Hide downloads after installation</string>
+              </property>
+             </widget>
+            </item>
+            <item>
              <spacer name="verticalSpacer_5">
               <property name="orientation">
                <enum>Qt::Vertical</enum>