zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

HIL: small ui tweaking

QGC4.4
Thomas Gubler 13 years ago
parent
9d7dba170f
commit
2e5f26563a
3 changed files with 97 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/ui/QGCHilConfiguration.ui
  2. 127
      src/ui/QGCHilFlightGearConfiguration.ui
  3. 5
      src/ui/QGCHilXPlaneConfiguration.ui

35
src/ui/QGCHilConfiguration.ui
Unescape View File

@ -10,6 +10,12 @@
<height>355</height> <height>355</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
@ -21,7 +27,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="2"> <item row="3" column="0">
<widget class="QLabel" name="statusLabel">
<property name="text">
<string>Status</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QComboBox" name="simComboBox"> <widget class="QComboBox" name="simComboBox">
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
@ -48,7 +61,7 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="2" column="0" colspan="3">
<widget class="QDockWidget" name="simulatorConfigurationDockWidget"> <widget class="QDockWidget" name="simulatorConfigurationDockWidget">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -58,7 +71,7 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>33</width> <width>20</width>
<height>150</height> <height>150</height>
</size> </size>
</property> </property>
@ -68,14 +81,14 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Simulator Options</string> <string>Simulator Options</string>
</property> </property>
<widget class="QWidget" name="dockWidgetContents"/> <widget class="QWidget" name="dockWidgetContents">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<item row="2" column="0"> <horstretch>0</horstretch>
<widget class="QLabel" name="statusLabel"> <verstretch>0</verstretch>
<property name="text"> </sizepolicy>
<string>Status</string> </property>
</property> </widget>
</widget> </widget>
</item> </item>
</layout> </layout>

127
src/ui/QGCHilFlightGearConfiguration.ui
Unescape View File

@ -6,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>350</width> <width>190</width>
<height>261</height> <height>246</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -19,62 +19,73 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<widget class="QWidget" name="gridLayoutWidget"> <property name="layoutDirection">
<property name="geometry"> <enum>Qt::LeftToRight</enum>
<rect> </property>
<x>10</x> <property name="autoFillBackground">
<y>0</y> <bool>false</bool>
<width>331</width> </property>
<height>261</height> <layout class="QGridLayout" name="gridLayout" rowminimumheight="0,0,0,0,0,0">
</rect> <property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>6</number>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <item row="5" column="0">
<property name="margin"> <widget class="QPushButton" name="startButton">
<number>9</number> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<item row="2" column="0"> <horstretch>0</horstretch>
<widget class="QPlainTextEdit" name="optionsPlainTextEdit"> <verstretch>0</verstretch>
<property name="plainText"> </sizepolicy>
<string>--in-air --roll=0 --pitch=0 --vc=90 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --notrim --prop:/engines/engine/running=true</string> </property>
</property> <property name="text">
</widget> <string>Start</string>
</item> </property>
<item row="4" column="0"> </widget>
<spacer name="verticalSpacer"> </item>
<property name="orientation"> <item row="0" column="0">
<enum>Qt::Vertical</enum> <widget class="QLabel" name="aircraftPlaintextInfoLabel">
</property> <property name="text">
<property name="sizeHint" stdset="0"> <string>Airframe:</string>
<size> </property>
<width>20</width> </widget>
<height>68</height> </item>
</size> <item row="1" column="0">
</property> <widget class="QComboBox" name="aircraftComboBox">
</spacer> <property name="sizePolicy">
</item> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<item row="1" column="0"> <horstretch>0</horstretch>
<widget class="QLabel" name="plaintextInfoLabel"> <verstretch>0</verstretch>
<property name="text"> </sizepolicy>
<string>Additional Options:</string> </property>
</property> <property name="editable">
</widget> <bool>true</bool>
</item> </property>
<item row="3" column="0"> </widget>
<widget class="QPushButton" name="startButton"> </item>
<property name="text"> <item row="2" column="0">
<string>Start</string> <widget class="QLabel" name="optionsLabel">
</property> <property name="text">
</widget> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Additional Options:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</item> </property>
<item row="0" column="0"> </widget>
<widget class="QComboBox" name="aircraftComboBox"> </item>
<property name="editable"> <item row="3" column="0">
<bool>true</bool> <widget class="QPlainTextEdit" name="optionsPlainTextEdit">
</property> <property name="sizePolicy">
</widget> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
</item> <horstretch>0</horstretch>
</layout> <verstretch>0</verstretch>
</widget> </sizepolicy>
</property>
<property name="plainText">
<string>--in-air --roll=0 --pitch=0 --vc=90 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --notrim --prop:/engines/engine/running=true</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

5
src/ui/QGCHilXPlaneConfiguration.ui
Unescape View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>305</width> <width>243</width>
<height>261</height> <height>261</height>
</rect> </rect>
</property> </property>
@ -14,6 +14,9 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" columnstretch="40,0,0,0"> <layout class="QGridLayout" name="gridLayout" columnstretch="40,0,0,0">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">

Write Preview
Loading…
Cancel
Save