From ccbd650a1db0e3ea2e827c8c9f3a7508c52089d1 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 12 Apr 2019 03:47:40 +0200
Subject: [PATCH] Basic sim settings, removed unnecessary column in grid layout

---
 .../settingssimulatorbasicscomponent.ui       | 166 +++++++++---------
 1 file changed, 87 insertions(+), 79 deletions(-)

diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.ui b/src/blackgui/components/settingssimulatorbasicscomponent.ui
index dc0fa1170..0644387a6 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.ui
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.ui
@@ -2,10 +2,18 @@
 <ui version="4.0">
  <class>CSettingsSimulatorBasicsComponent</class>
  <widget class="QFrame" name="CSettingsSimulatorBasicsComponent">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>459</width>
+    <height>347</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Simulator basic settings</string>
   </property>
-  <layout class="QGridLayout" name="gl_SimulatorBasics" columnstretch="0,1,0,0">
+  <layout class="QGridLayout" name="gl_SettingsSimulatorBasics">
    <property name="leftMargin">
     <number>3</number>
    </property>
@@ -18,16 +26,6 @@
    <property name="bottomMargin">
     <number>3</number>
    </property>
-   <item row="9" column="3">
-    <widget class="QPushButton" name="pb_CopyDefaults">
-     <property name="toolTip">
-      <string>copy (materialize) defaults</string>
-     </property>
-     <property name="text">
-      <string>copy def.</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="lbl_Simulator">
      <property name="text">
@@ -35,14 +33,59 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
+   <item row="0" column="1" colspan="2" alignment="Qt::AlignLeft">
+    <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
+     <property name="minimumSize">
+      <size>
+       <width>150</width>
+       <height>25</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="lbl_SimulatorDirectory">
+     <property name="text">
+      <string>Simulator directory:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="le_SimulatorDirectory">
+     <property name="placeholderText">
+      <string>Simulator directory path</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
     <widget class="QPushButton" name="pb_SimulatorFileDialog">
      <property name="text">
       <string>...</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="3">
+   <item row="2" column="0">
+    <widget class="QLabel" name="lbl_ModelDirectory">
+     <property name="text">
+      <string>Model directories:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" rowspan="3">
+    <widget class="QPlainTextEdit" name="pte_ModelDirectories">
+     <property name="placeholderText">
+      <string>Model directories</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QPushButton" name="pb_ModelFileDialog">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
     <spacer name="hs_Buttons">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -58,42 +101,27 @@
      </property>
     </spacer>
    </item>
-   <item row="8" column="3">
-    <widget class="QPushButton" name="pb_Reset">
+   <item row="4" column="2">
+    <widget class="QPushButton" name="pb_AdjustModelDirectory">
+     <property name="toolTip">
+      <string>remove redundant directories, fix file paths ...</string>
+     </property>
      <property name="text">
-      <string>reset</string>
+      <string>adjust</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QLineEdit" name="le_SimulatorDirectory">
-     <property name="placeholderText">
-      <string>Simulator directory path</string>
+   <item row="5" column="0">
+    <widget class="QLabel" name="lbl_ExcludeDirectories">
+     <property name="toolTip">
+      <string>Excluded from model loading</string>
      </property>
-    </widget>
-   </item>
-   <item row="7" column="3">
-    <widget class="QPushButton" name="pb_ExcludeFileDialog">
      <property name="text">
-      <string>...</string>
+      <string>Exclude directory patterns:</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" alignment="Qt::AlignTop">
-    <widget class="QLabel" name="lbl_ModelDirectory">
-     <property name="text">
-      <string>Model directories:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="3">
-    <widget class="QPushButton" name="pb_ModelFileDialog">
-     <property name="text">
-      <string>...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="2" rowspan="4">
+   <item row="5" column="1" rowspan="4">
     <widget class="QPlainTextEdit" name="pte_ExcludeDirectories">
      <property name="documentTitle">
       <string>Excluded directory patterns</string>
@@ -106,57 +134,37 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="3">
-    <widget class="QPushButton" name="pb_AdjustModelDirectory">
+   <item row="5" column="2">
+    <widget class="QPushButton" name="pb_ExcludeFileDialog">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="2">
+    <widget class="QPushButton" name="pb_Reset">
+     <property name="text">
+      <string>reset</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="2">
+    <widget class="QPushButton" name="pb_CopyDefaults">
      <property name="toolTip">
-      <string>remove redundant directories, fix file paths ...</string>
+      <string>copy (materialize) defaults</string>
      </property>
      <property name="text">
-      <string>adjust</string>
+      <string>copy def.</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="2" rowspan="4">
-    <widget class="QPlainTextEdit" name="pte_ModelDirectories">
-     <property name="placeholderText">
-      <string>Model directories</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0" rowspan="4" alignment="Qt::AlignTop">
-    <widget class="QLabel" name="lbl_ExcludeDirectories">
-     <property name="toolTip">
-      <string>Excluded from model loading</string>
-     </property>
-     <property name="text">
-      <string>Exclude directory patterns:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="3">
+   <item row="8" column="2">
     <widget class="QPushButton" name="pb_Save">
      <property name="text">
       <string>save</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="3" alignment="Qt::AlignLeft">
-    <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>25</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="lbl_SimulatorDirectory">
-     <property name="text">
-      <string>Simulator directory:</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>