A few minor adjustments to modeledit to give it a more consistent layout for both Taranis and 9x.

This commit is contained in:
Kjell Kernen
2014-03-28 01:20:01 +01:00
parent 34b2fdcd7e
commit e61b411d7a
5 changed files with 754 additions and 495 deletions
+163 -122
View File
@@ -6,14 +6,46 @@
<rect>
<x>0</x>
<y>0</y>
<width>694</width>
<height>340</height>
<width>628</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_module">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Label</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="moduleGB">
<property name="sizePolicy">
@@ -35,7 +67,41 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_69" rowstretch="0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0">
<item row="7" column="1" colspan="5">
<property name="margin">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="2" column="3" alignment="Qt::AlignLeft">
<widget class="QSpinBox" name="channelsStart">
<property name="maximumSize">
<size>
<width>125</width>
<height>16777215</height>
</size>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="suffix">
<string>ch</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>32</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="6" column="1" colspan="5">
<widget class="QFrame" name="failsafesFrame">
<property name="maximumSize">
<size>
@@ -56,7 +122,7 @@
</layout>
</widget>
</item>
<item row="6" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_failsafeMode">
<property name="maximumSize">
<size>
@@ -72,7 +138,7 @@
</property>
</widget>
</item>
<item row="3" column="2" alignment="Qt::AlignRight">
<item row="2" column="2" alignment="Qt::AlignRight">
<widget class="QLabel" name="label_channelsStart">
<property name="maximumSize">
<size>
@@ -88,7 +154,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="2" column="1">
<widget class="QComboBox" name="protocol">
<property name="maximumSize">
<size>
@@ -98,7 +164,7 @@
</property>
</widget>
</item>
<item row="4" column="4" alignment="Qt::AlignRight">
<item row="3" column="4" alignment="Qt::AlignRight">
<widget class="QLabel" name="label_ppmDelay">
<property name="maximumSize">
<size>
@@ -114,7 +180,7 @@
</property>
</widget>
</item>
<item row="4" column="5">
<item row="3" column="5">
<widget class="QSpinBox" name="ppmDelay">
<property name="maximumSize">
<size>
@@ -142,7 +208,7 @@
</property>
</widget>
</item>
<item row="4" column="3" alignment="Qt::AlignLeft">
<item row="3" column="3" alignment="Qt::AlignLeft">
<widget class="QComboBox" name="ppmPolarity">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -168,23 +234,7 @@
</item>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_rxNumber">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>RX Number</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="0" column="1">
<widget class="QComboBox" name="trainerMode">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -210,7 +260,7 @@
</item>
</widget>
</item>
<item row="4" column="2" alignment="Qt::AlignRight">
<item row="3" column="2" alignment="Qt::AlignRight">
<widget class="QLabel" name="label_ppmPolarity">
<property name="maximumSize">
<size>
@@ -226,7 +276,7 @@
</property>
</widget>
</item>
<item row="1" column="0" alignment="Qt::AlignRight">
<item row="0" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="label_trainerMode">
<property name="maximumSize">
<size>
@@ -242,38 +292,7 @@
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QSpinBox" name="rxNumber">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>125</width>
<height>16777215</height>
</size>
</property>
<property name="suffix">
<string/>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>125</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="ppmFrameLength">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -307,33 +326,7 @@
</property>
</widget>
</item>
<item row="4" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="label_ppmFrameLength">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>PPM Frame Length</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="7">
<widget class="QLabel" name="label_module">
<property name="styleSheet">
<string notr="true">font-weight: bold;</string>
</property>
<property name="text">
<string>Label</string>
</property>
</widget>
</item>
<item row="3" column="5" alignment="Qt::AlignLeft">
<item row="2" column="5" alignment="Qt::AlignLeft">
<widget class="QSpinBox" name="channelsCount">
<property name="maximumSize">
<size>
@@ -361,35 +354,23 @@
</property>
</widget>
</item>
<item row="3" column="3" alignment="Qt::AlignLeft">
<widget class="QSpinBox" name="channelsStart">
<item row="3" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="label_ppmFrameLength">
<property name="maximumSize">
<size>
<width>125</width>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>PPM Frame Length</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="suffix">
<string>ch</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>32</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="3" column="4" alignment="Qt::AlignRight">
<item row="2" column="4" alignment="Qt::AlignRight">
<widget class="QLabel" name="label_channelsCount">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -411,7 +392,7 @@
</property>
</widget>
</item>
<item row="6" column="1" alignment="Qt::AlignLeft">
<item row="5" column="1" alignment="Qt::AlignLeft">
<widget class="QComboBox" name="failsafeMode">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -447,7 +428,7 @@
</item>
</widget>
</item>
<item row="7" column="0" alignment="Qt::AlignRight">
<item row="6" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="failsafesLayoutLabel">
<property name="maximumSize">
<size>
@@ -463,20 +444,7 @@
</property>
</widget>
</item>
<item row="8" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" alignment="Qt::AlignRight">
<item row="2" column="0" alignment="Qt::AlignRight">
<widget class="QLabel" name="label_protocol">
<property name="maximumSize">
<size>
@@ -492,6 +460,79 @@
</property>
</widget>
</item>
<item row="2" column="6">
<spacer name="horizontalSpacer_2">
<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 row="8" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="5" column="5">
<widget class="QSpinBox" name="rxNumber">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>125</width>
<height>16777215</height>
</size>
</property>
<property name="suffix">
<string/>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>125</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="5" column="4">
<widget class="QLabel" name="label_rxNumber">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>RX Number</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>