From efb2c5b85862b90925920a475fdd327f8b455606 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 22 Aug 2018 19:50:53 +0200
Subject: [PATCH] Auto stash UI adjustments

---
 .../components/dbautostashingcomponent.ui     | 493 +++++++++---------
 1 file changed, 250 insertions(+), 243 deletions(-)

diff --git a/src/blackgui/components/dbautostashingcomponent.ui b/src/blackgui/components/dbautostashingcomponent.ui
index d53f5c6c3..46ddf46c3 100644
--- a/src/blackgui/components/dbautostashingcomponent.ui
+++ b/src/blackgui/components/dbautostashingcomponent.ui
@@ -20,33 +20,256 @@
    <string>Auto stashing</string>
   </property>
   <layout class="QVBoxLayout" name="vl_AutoStashing">
+   <item>
+    <widget class="QGroupBox" name="gb_Configuration">
+     <property name="title">
+      <string>Configuration</string>
+     </property>
+     <layout class="QGridLayout" name="gl_Configuration">
+      <item row="0" column="3">
+       <widget class="QLineEdit" name="le_All">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+        <property name="placeholderText">
+         <string>all</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QRadioButton" name="rb_All">
+        <property name="text">
+         <string>all</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="le_MaxModelsStashed">
+        <property name="placeholderText">
+         <string>max.models to be stashed</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="lbl_Description">
+        <property name="text">
+         <string>Description:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="lbl_Livery">
+        <property name="text">
+         <string>Livery:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QCheckBox" name="cb_UseTempLivery">
+        <property name="text">
+         <string>use 'temp' livery if not resolved</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="rb_Selected">
+        <property name="text">
+         <string>selected</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="lbl_Max">
+        <property name="text">
+         <string>Max stashed:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="le_Description">
+        <property name="maxLength">
+         <number>255</number>
+        </property>
+        <property name="placeholderText">
+         <string>Override description in model</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="le_Selected">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+        <property name="placeholderText">
+         <string>selected</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" colspan="2">
+       <widget class="QWidget" name="wi_DescriptionRadioButtons" native="true">
+        <layout class="QHBoxLayout" name="hl_DescriptionButtons">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>1</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>1</number>
+         </property>
+         <item>
+          <widget class="QRadioButton" name="rb_DescriptionAll">
+           <property name="text">
+            <string>all</string>
+           </property>
+          </widget>
+         </item>
+         <item alignment="Qt::AlignLeft">
+          <widget class="QRadioButton" name="rb_DescriptionEmptyOnly">
+           <property name="toolTip">
+            <string>apply only if description is empty</string>
+           </property>
+           <property name="text">
+            <string>empty only</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="tb_ResetDescription">
+           <property name="toolTip">
+            <string>reset description</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../blackmisc/blackmisc.qrc">
+             <normaloff>:/diagona/icons/diagona/icons/cross-white.png</normaloff>:/diagona/icons/diagona/icons/cross-white.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="hs_ResetDescription">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="gb_Result">
+     <property name="title">
+      <string>Result</string>
+     </property>
+     <layout class="QHBoxLayout" name="hl_Result">
+      <item>
+       <widget class="BlackGui::Views::CStatusMessageView" name="tvp_StatusMessages">
+        <property name="selectionMode">
+         <enum>QAbstractItemView::NoSelection</enum>
+        </property>
+        <attribute name="verticalHeaderVisible">
+         <bool>false</bool>
+        </attribute>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="gb_Statistics">
+     <property name="title">
+      <string>Statistics</string>
+     </property>
+     <layout class="QHBoxLayout" name="hl_Statistics">
+      <item>
+       <widget class="QLabel" name="lbl_Stashed">
+        <property name="text">
+         <string>Stashed:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="le_Stashed">
+        <property name="dragEnabled">
+         <bool>true</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+        <property name="placeholderText">
+         <string>stashed models</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="lbl_NoData">
+        <property name="text">
+         <string>No data:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="le_NoData">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+        <property name="placeholderText">
+         <string>incomplete data</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="lbl_Invalid">
+        <property name="text">
+         <string>Invalid:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="le_ValidationFailed">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+        <property name="placeholderText">
+         <string>invalid models</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <layout class="QGridLayout" name="gl_AutoStashing">
-     <item row="2" column="0">
-      <widget class="QLabel" name="lbl_Description">
-       <property name="text">
-        <string>Description:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0" colspan="4">
-      <widget class="BlackGui::Views::CStatusMessageView" name="tvp_StatusMessages">
-       <property name="selectionMode">
-        <enum>QAbstractItemView::NoSelection</enum>
-       </property>
-       <attribute name="verticalHeaderVisible">
-        <bool>false</bool>
-       </attribute>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QRadioButton" name="rb_All">
-       <property name="text">
-        <string>all</string>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="2" colspan="2">
+     <property name="leftMargin">
+      <number>5</number>
+     </property>
+     <property name="topMargin">
+      <number>2</number>
+     </property>
+     <property name="rightMargin">
+      <number>5</number>
+     </property>
+     <property name="bottomMargin">
+      <number>2</number>
+     </property>
+     <item row="1" column="2" colspan="2">
       <widget class="QDialogButtonBox" name="bb_AutoStashing">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -56,129 +279,14 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="le_Selected">
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-       <property name="placeholderText">
-        <string>selected</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QRadioButton" name="rb_Selected">
-       <property name="text">
-        <string>selected</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0" colspan="4">
-      <widget class="QFrame" name="fr_Statistics">
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="hl_Statistics">
-        <property name="leftMargin">
-         <number>3</number>
-        </property>
-        <property name="topMargin">
-         <number>3</number>
-        </property>
-        <property name="rightMargin">
-         <number>3</number>
-        </property>
-        <property name="bottomMargin">
-         <number>3</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="lbl_Stashed">
-          <property name="text">
-           <string>Stashed:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="le_Stashed">
-          <property name="dragEnabled">
-           <bool>true</bool>
-          </property>
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-          <property name="placeholderText">
-           <string>stashed models</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="lbl_NoData">
-          <property name="text">
-           <string>No data:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="le_NoData">
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-          <property name="placeholderText">
-           <string>incomplete data</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="lbl_Invalid">
-          <property name="text">
-           <string>Invalid:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="le_ValidationFailed">
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-          <property name="placeholderText">
-           <string>invalid models</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item row="7" column="0" colspan="4">
+     <item row="0" column="0" colspan="4">
       <widget class="QProgressBar" name="pb_StashingProgress">
        <property name="value">
         <number>0</number>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="lbl_Max">
-       <property name="text">
-        <string>Max stashed:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="3">
-      <widget class="QLineEdit" name="le_All">
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-       <property name="placeholderText">
-        <string>all</string>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="0" colspan="2" alignment="Qt::AlignLeft">
+     <item row="1" column="0" colspan="2" alignment="Qt::AlignLeft">
       <widget class="QCheckBox" name="cb_RemovedChecked">
        <property name="text">
         <string>Remove stashed</string>
@@ -188,99 +296,6 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="lbl_Livery">
-       <property name="text">
-        <string>Livery:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="le_MaxModelsStashed">
-       <property name="placeholderText">
-        <string>max.models to be stashed</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="le_Description">
-       <property name="maxLength">
-        <number>255</number>
-       </property>
-       <property name="placeholderText">
-        <string>Override description in model</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1" colspan="3">
-      <widget class="QCheckBox" name="cb_UseTempLivery">
-       <property name="text">
-        <string>use 'temp' livery if not resolved</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2" colspan="2" alignment="Qt::AlignLeft">
-      <widget class="QWidget" name="wi_DescriptionRadioButtons" native="true">
-       <layout class="QHBoxLayout" name="hl_DescriptionButtons">
-        <property name="leftMargin">
-         <number>2</number>
-        </property>
-        <property name="topMargin">
-         <number>1</number>
-        </property>
-        <property name="rightMargin">
-         <number>2</number>
-        </property>
-        <property name="bottomMargin">
-         <number>1</number>
-        </property>
-        <item>
-         <widget class="QRadioButton" name="rb_DescriptionAll">
-          <property name="text">
-           <string>all</string>
-          </property>
-         </widget>
-        </item>
-        <item alignment="Qt::AlignLeft">
-         <widget class="QRadioButton" name="rb_DescriptionEmptyOnly">
-          <property name="toolTip">
-           <string>apply only if description is empty</string>
-          </property>
-          <property name="text">
-           <string>empty only</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="hs_ResetDescription">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item alignment="Qt::AlignRight">
-         <widget class="QToolButton" name="tb_ResetDescription">
-          <property name="toolTip">
-           <string>reset description</string>
-          </property>
-          <property name="icon">
-           <iconset resource="../../blackmisc/blackmisc.qrc">
-            <normaloff>:/diagona/icons/diagona/icons/cross-white.png</normaloff>:/diagona/icons/diagona/icons/cross-white.png</iconset>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
@@ -293,14 +308,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>rb_Selected</tabstop>
-  <tabstop>le_Selected</tabstop>
-  <tabstop>rb_All</tabstop>
-  <tabstop>le_All</tabstop>
-  <tabstop>le_MaxModelsStashed</tabstop>
-  <tabstop>le_Description</tabstop>
-  <tabstop>cb_UseTempLivery</tabstop>
-  <tabstop>tvp_StatusMessages</tabstop>
   <tabstop>le_Stashed</tabstop>
   <tabstop>le_NoData</tabstop>
   <tabstop>le_ValidationFailed</tabstop>