From d22769ee9c59d9aed5914dfd94a6e31cba41a0ed Mon Sep 17 00:00:00 2001
From: Adam Zambrzycki <adam@zambrzycki.net>
Date: Thu, 18 Jul 2019 22:02:13 +0200
Subject: [PATCH] Unify preferences layouts (#1670)

* Unify preferences layout
---
 src/dialogs/preferences/DebugOptionsWidget.ui | 166 +++++++++---------
 src/dialogs/preferences/GraphOptionsWidget.ui |  72 ++++----
 2 files changed, 117 insertions(+), 121 deletions(-)

diff --git a/src/dialogs/preferences/DebugOptionsWidget.ui b/src/dialogs/preferences/DebugOptionsWidget.ui
index 91cab5b1..71c3713d 100644
--- a/src/dialogs/preferences/DebugOptionsWidget.ui
+++ b/src/dialogs/preferences/DebugOptionsWidget.ui
@@ -6,112 +6,108 @@
             <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>442</width>
-                <height>225</height>
+                <width>489</width>
+                <height>201</height>
             </rect>
         </property>
         <property name="windowTitle">
             <string>Debug</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout">
-            <property name="sizeConstraint">
-                <enum>QLayout::SetMinAndMaxSize</enum>
-            </property>
             <item>
                 <layout class="QFormLayout" name="formLayout">
+                    <property name="fieldGrowthPolicy">
+                        <enum>QFormLayout::ExpandingFieldsGrow</enum>
+                    </property>
+                    <property name="labelAlignment">
+                        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                    </property>
                     <item row="0" column="0">
-                        <layout class="QHBoxLayout" name="pluginSelectionLayout">
-                            <item>
-                                <widget class="QLabel" name="pluginLabel">
-                                    <property name="text">
-                                        <string>Debug Plugin:</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item row="0" column="1">
-                                <widget class="QComboBox" name="pluginComboBox">
-                                    <property name="sizePolicy">
-                                        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </item>
-                        </layout>
+                        <widget class="QLabel" name="pluginLabel">
+                            <property name="text">
+                                <string>Debug Plugin:</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item row="0" column="1">
+                        <widget class="QComboBox" name="pluginComboBox"/>
                     </item>
                     <item row="1" column="0">
-                        <layout class="QHBoxLayout" name="argSelectionLayout">
-                            <item>
-                                <widget class="QLabel" name="argsLabel">
-                                    <property name="text">
-                                        <string>Program Arguments:</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item>
-                                <widget class="QLineEdit" name="debugArgs">
-                                    <property name="sizePolicy">
-                                        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </item>
-                        </layout>
+                        <widget class="QLabel" name="argsLabel">
+                            <property name="text">
+                                <string>Program Arguments:</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item row="1" column="1">
+                        <widget class="QLineEdit" name="debugArgs">
+                            <property name="sizePolicy">
+                                <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                        </widget>
                     </item>
                     <item row="2" column="0">
-                        <layout class="QHBoxLayout" name="esilVMOptions1">
-                            <item>
-                                <widget class="QLabel" name="esilstackAddr">
-                                    <property name="text">
-                                        <string>ESIL stack address:</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item>
-                                <widget class="QLineEdit" name="stackAddr">
-                                    <property name="sizePolicy">
-                                        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </item>
-                        </layout>
+                        <widget class="QLabel" name="esilstackAddr">
+                            <property name="text">
+                                <string>ESIL stack address:</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item row="2" column="1">
+                        <widget class="QLineEdit" name="stackAddr">
+                            <property name="sizePolicy">
+                                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                        </widget>
                     </item>
                     <item row="3" column="0">
-                        <layout class="QHBoxLayout" name="esilVMOptions2">
-                            <item>
-                                <widget class="QLabel" name="esilStackSize">
-                                    <property name="text">
-                                        <string>ESIL stack size:</string>
-                                    </property>
-                                </widget>
-                            </item>
-                            <item>
-                                <widget class="QLineEdit" name="stackSize">
-                                    <property name="sizePolicy">
-                                        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-                                            <horstretch>0</horstretch>
-                                            <verstretch>0</verstretch>
-                                        </sizepolicy>
-                                    </property>
-                                </widget>
-                            </item>
-                        </layout>
-                    </item>
-                    <item row="4" column="0">
-                        <widget class="QCheckBox" name="esilBreakOnInvalid">
+                        <widget class="QLabel" name="esilStackSize">
                             <property name="text">
-                                <string>Break esil execution when instruction is invalid (esil.breakoninvalid)</string>
+                                <string>ESIL stack size:</string>
+                            </property>
+                        </widget>
+                    </item>
+                    <item row="3" column="1">
+                        <widget class="QLineEdit" name="stackSize">
+                            <property name="sizePolicy">
+                                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
                             </property>
                         </widget>
                     </item>
                 </layout>
             </item>
+            <item>
+                <widget class="QWidget" name="widget_2" native="true">
+                    <property name="sizePolicy">
+                        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <widget class="QCheckBox" name="esilBreakOnInvalid">
+                        <property name="geometry">
+                            <rect>
+                                <x>0</x>
+                                <y>0</y>
+                                <width>469</width>
+                                <height>24</height>
+                            </rect>
+                        </property>
+                        <property name="text">
+                            <string>Break esil execution when instruction is invalid (esil.breakoninvalid)</string>
+                        </property>
+                    </widget>
+                </widget>
+            </item>
         </layout>
     </widget>
     <resources/>
diff --git a/src/dialogs/preferences/GraphOptionsWidget.ui b/src/dialogs/preferences/GraphOptionsWidget.ui
index 0c76e07c..b7775e55 100644
--- a/src/dialogs/preferences/GraphOptionsWidget.ui
+++ b/src/dialogs/preferences/GraphOptionsWidget.ui
@@ -7,51 +7,51 @@
     <x>0</x>
     <y>0</y>
     <width>567</width>
-    <height>300</height>
+    <height>79</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Graph</string>
   </property>
-  <widget class="QWidget" name="">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>10</y>
-     <width>253</width>
-     <height>62</height>
-    </rect>
-   </property>
-   <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="0">
-     <widget class="QLabel" name="maxColsLabel">
-      <property name="text">
-       <string>Maximum Line Length:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QSpinBox" name="maxColsSpinBox">
-      <property name="minimum">
-       <number>10</number>
-      </property>
-      <property name="maximum">
-       <number>999999999</number>
-      </property>
-      <property name="singleStep">
-       <number>5</number>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0" colspan="2">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="maxColsLabel">
+       <property name="text">
+        <string>Maximum Line Length:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="maxColsSpinBox"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <widget class="QCheckBox" name="graphOffsetCheckBox">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>208</width>
+        <height>24</height>
+       </rect>
+      </property>
       <property name="text">
-       <string>Show offsets (graph.offset) </string>
+       <string>Show offsets (graph.offset)</string>
       </property>
      </widget>
-    </item>
-   </layout>
-  </widget>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections/>