t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change layout of signal editor to be not quite so tall. It now fits

Browse Source 
better in a variety of screen resolutions.
This commit is contained in:
Collin Kidder
2019-02-17 17:19:27 -05:00
parent 2b871c625b
commit 20cd1559e4
2 changed files with 155 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbc/dbcsignaleditor.cpp
+1 -1
View File
@@ -257,7 +257,7 @@ void DBCSignalEditor::readSettings()
QSettings settings; QSettings settings;
if (settings.value("Main/SaveRestorePositions", false).toBool()) 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()); move(settings.value("DBCSignalEditor/WindowPos", QPoint(100, 100)).toPoint());
} }
} }
ui/dbcsignaleditor.ui
+57 -64
View File
@@ -6,16 +6,16 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>884</width> <width>1239</width>
<height>915</height> <height>644</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Signal Editor</string> <string>Signal Editor</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="10,1,5"> <layout class="QVBoxLayout" name="verticalLayout" stretch="10,1,4">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,2,1">
<item> <item>
<widget class="QListWidget" name="signalsList"/> <widget class="QListWidget" name="signalsList"/>
</item> </item>
@@ -52,118 +52,113 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> </layout>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Bit Length:</string> <string>Bit Length:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="0" column="1">
<widget class="QLineEdit" name="txtBitLength"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Byte Order</string> <string>Byte Order</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="txtBitLength"/>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="cbIntelFormat"> <widget class="QCheckBox" name="cbIntelFormat">
<property name="text"> <property name="text">
<string>LSB First (Little Endian)</string> <string>LSB First (Little Endian)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Type:</string> <string>Type:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="2" column="1">
<widget class="QComboBox" name="comboType"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Scale:</string> <string>Scale:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="3" column="1">
<widget class="QLineEdit" name="txtScale"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="text"> <property name="text">
<string>Bias:</string> <string>Bias:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="4" column="1">
<widget class="QLineEdit" name="txtBias"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>Min Value:</string> <string>Min Value:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="5" column="1">
<widget class="QLineEdit" name="txtMinVal"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Max Value:</string> <string>Max Value:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="6" column="1">
<widget class="QLabel" name="label_11"> <widget class="QLineEdit" name="txtMaxVal"/>
<property name="text">
<string>Receiving Node:</string>
</property>
</widget>
</item> </item>
<item row="14" column="0"> <item row="7" 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"> <widget class="QLabel" name="label_12">
<property name="text"> <property name="text">
<string>Units Name:</string> <string>Units Name:</string>
</property> </property>
</widget> </widget>
</item> </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"> <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"/> <widget class="QLineEdit" name="txtUnitName"/>
</item> </item>
<item row="10" column="1"> <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"/> <widget class="QComboBox" name="comboReceiver"/>
</item> </item>
<item row="14" column="1"> <item row="9" column="0">
<widget class="QLineEdit" name="txtComment"/>
</item>
<item row="12" column="0">
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string>Multiplexing</string> <string>Multiplexing</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1"> <item row="9" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QRadioButton" name="rbNotMulti"> <widget class="QRadioButton" name="rbNotMulti">
@@ -188,19 +183,28 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="13" column="0"> <item row="10" column="0">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="text"> <property name="text">
<string>Multiplex Value</string> <string>Multiplex Value</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="10" column="1">
<widget class="QLineEdit" name="txtMultiplexValue"/> <widget class="QLineEdit" name="txtMultiplexValue"/>
</item> </item>
</layout> <item row="11" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Comment:</string>
</property>
</widget> </widget>
</item> </item>
<item row="11" column="1">
<widget class="QLineEdit" name="txtComment"/>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@@ -226,20 +230,9 @@
<tabstops> <tabstops>
<tabstop>signalsList</tabstop> <tabstop>signalsList</tabstop>
<tabstop>txtName</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>rbNotMulti</tabstop>
<tabstop>rbMultiplexed</tabstop> <tabstop>rbMultiplexed</tabstop>
<tabstop>rbMultiplexor</tabstop> <tabstop>rbMultiplexor</tabstop>
<tabstop>txtMultiplexValue</tabstop>
<tabstop>txtComment</tabstop>
<tabstop>valuesTable</tabstop> <tabstop>valuesTable</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>