From 20cd1559e41c85c219639fde9699be466dd97375 Mon Sep 17 00:00:00 2001
From: Collin Kidder <collink@kkmfg.com>
Date: Sun, 17 Feb 2019 17:19:27 -0500
Subject: [PATCH] Change layout of signal editor to be not quite so tall. It
 now fits better in a variety of screen resolutions.

---
 dbc/dbcsignaleditor.cpp |   2 +-
 ui/dbcsignaleditor.ui   | 315 ++++++++++++++++++++--------------------
 2 files changed, 155 insertions(+), 162 deletions(-)

diff --git a/dbc/dbcsignaleditor.cpp b/dbc/dbcsignaleditor.cpp
index fb179e7..5e47d0a 100644
--- a/dbc/dbcsignaleditor.cpp
+++ b/dbc/dbcsignaleditor.cpp
@@ -257,7 +257,7 @@ void DBCSignalEditor::readSettings()
     QSettings settings;
     if (settings.value("Main/SaveRestorePositions", false).toBool())
     {
-        resize(settings.value("DBCSignalEditor/WindowSize", QSize(800, 572)).toSize());
+        resize(settings.value("DBCSignalEditor/WindowSize", QSize(1000, 600)).toSize());
         move(settings.value("DBCSignalEditor/WindowPos", QPoint(100, 100)).toPoint());
     }
 }
diff --git a/ui/dbcsignaleditor.ui b/ui/dbcsignaleditor.ui
index f49da05..d2ea6aa 100644
--- a/ui/dbcsignaleditor.ui
+++ b/ui/dbcsignaleditor.ui
@@ -6,16 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>884</width>
-    <height>915</height>
+    <width>1239</width>
+    <height>644</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Signal Editor</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="10,1,5">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="10,1,4">
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2,1">
      <item>
       <widget class="QListWidget" name="signalsList"/>
      </item>
@@ -52,155 +52,159 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Bit Length:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>Byte Order</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QLineEdit" name="txtBitLength"/>
-        </item>
-        <item row="3" column="1">
-         <widget class="QCheckBox" name="cbIntelFormat">
-          <property name="text">
-           <string>LSB First (Little Endian)</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_6">
-          <property name="text">
-           <string>Type:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>Scale:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="6" column="0">
-         <widget class="QLabel" name="label_8">
-          <property name="text">
-           <string>Bias:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="label_9">
-          <property name="text">
-           <string>Min Value:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="8" column="0">
-         <widget class="QLabel" name="label_10">
-          <property name="text">
-           <string>Max Value:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="10" column="0">
-         <widget class="QLabel" name="label_11">
-          <property name="text">
-           <string>Receiving Node:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="14" column="0">
-         <widget class="QLabel" name="label_13">
-          <property name="text">
-           <string>Comment:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="9" column="0">
-         <widget class="QLabel" name="label_12">
-          <property name="text">
-           <string>Units Name:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="QComboBox" name="comboType"/>
-        </item>
-        <item row="5" column="1">
-         <widget class="QLineEdit" name="txtScale"/>
-        </item>
-        <item row="6" column="1">
-         <widget class="QLineEdit" name="txtBias"/>
-        </item>
-        <item row="7" column="1">
-         <widget class="QLineEdit" name="txtMinVal"/>
-        </item>
-        <item row="8" column="1">
-         <widget class="QLineEdit" name="txtMaxVal"/>
-        </item>
-        <item row="9" column="1">
-         <widget class="QLineEdit" name="txtUnitName"/>
-        </item>
-        <item row="10" column="1">
-         <widget class="QComboBox" name="comboReceiver"/>
-        </item>
-        <item row="14" column="1">
-         <widget class="QLineEdit" name="txtComment"/>
-        </item>
-        <item row="12" column="0">
-         <widget class="QLabel" name="label_14">
-          <property name="text">
-           <string>Multiplexing</string>
-          </property>
-         </widget>
-        </item>
-        <item row="12" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <widget class="QRadioButton" name="rbNotMulti">
-            <property name="text">
-             <string>Not multiplexed</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="rbMultiplexed">
-            <property name="text">
-             <string>Multiplexed</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QRadioButton" name="rbMultiplexor">
-            <property name="text">
-             <string>Multiplexor</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="13" column="0">
-         <widget class="QLabel" name="label_15">
-          <property name="text">
-           <string>Multiplex Value</string>
-          </property>
-         </widget>
-        </item>
-        <item row="13" column="1">
-         <widget class="QLineEdit" name="txtMultiplexValue"/>
-        </item>
        </layout>
       </widget>
      </item>
+     <item>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Bit Length:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="txtBitLength"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Byte Order</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="cbIntelFormat">
+         <property name="text">
+          <string>LSB First (Little Endian)</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Type:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QComboBox" name="comboType"/>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Scale:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="txtScale"/>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Bias:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QLineEdit" name="txtBias"/>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Min Value:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QLineEdit" name="txtMinVal"/>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_10">
+         <property name="text">
+          <string>Max Value:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QLineEdit" name="txtMaxVal"/>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="label_12">
+         <property name="text">
+          <string>Units Name:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <widget class="QLineEdit" name="txtUnitName"/>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Receiving Node:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QComboBox" name="comboReceiver"/>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="label_14">
+         <property name="text">
+          <string>Multiplexing</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QRadioButton" name="rbNotMulti">
+           <property name="text">
+            <string>Not multiplexed</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="rbMultiplexed">
+           <property name="text">
+            <string>Multiplexed</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="rbMultiplexor">
+           <property name="text">
+            <string>Multiplexor</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="10" column="0">
+        <widget class="QLabel" name="label_15">
+         <property name="text">
+          <string>Multiplex Value</string>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="1">
+        <widget class="QLineEdit" name="txtMultiplexValue"/>
+       </item>
+       <item row="11" column="0">
+        <widget class="QLabel" name="label_13">
+         <property name="text">
+          <string>Comment:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="1">
+        <widget class="QLineEdit" name="txtComment"/>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
    <item>
@@ -226,20 +230,9 @@
  <tabstops>
   <tabstop>signalsList</tabstop>
   <tabstop>txtName</tabstop>
-  <tabstop>txtBitLength</tabstop>
-  <tabstop>cbIntelFormat</tabstop>
-  <tabstop>comboType</tabstop>
-  <tabstop>txtScale</tabstop>
-  <tabstop>txtBias</tabstop>
-  <tabstop>txtMinVal</tabstop>
-  <tabstop>txtMaxVal</tabstop>
-  <tabstop>txtUnitName</tabstop>
-  <tabstop>comboReceiver</tabstop>
   <tabstop>rbNotMulti</tabstop>
   <tabstop>rbMultiplexed</tabstop>
   <tabstop>rbMultiplexor</tabstop>
-  <tabstop>txtMultiplexValue</tabstop>
-  <tabstop>txtComment</tabstop>
   <tabstop>valuesTable</tabstop>
  </tabstops>
  <resources/>