Skip to content

Q
qgroundcontrol
Commit f724ddbe authored by pixhawk's avatar pixhawk
Browse files
Options

Improved the visuals of the "Onboard Waypoints"-tab contents. Not yet complete.

parent cf178232
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 47 deletions
src/ui/WaypointList.ui
View file @ f724ddbe
...@@ -260,6 +260,18 @@ ...@@ -260,6 +260,18 @@
<string>Onboard Waypoints</string> <string>Onboard Waypoints</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="QScrollArea" name="readOnlyScrollArea"> <widget class="QScrollArea" name="readOnlyScrollArea">
<property name="widgetResizable"> <property name="widgetResizable">
...@@ -270,8 +282,8 @@ ...@@ -270,8 +282,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>830</width> <width>836</width>
<height>304</height> <height>316</height>
</rect> </rect>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
...@@ -285,7 +297,7 @@ ...@@ -285,7 +297,7 @@
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>828</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
......
src/ui/WaypointViewOnlyView.ui
View file @ f724ddbe
...@@ -6,43 +6,63 @@ ...@@ -6,43 +6,63 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>381</width> <width>704</width>
<height>40</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>200</width>
<height>31</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true">QGroupBox {
</property> border: 1px solid #EEEEEE;
<layout class="QHBoxLayout" name="horizontalLayout_2"> border-radius: 5px;
<property name="spacing"> padding: 0px 0px 0px 0px;
margin-top: 1ex; /* leave space at the top for the title */
margin: 0px;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top center; /* position at the top center */
margin: 0 3px 0px 3px;
padding: 0 3px 0px 0px;
font: bold 8px;
}</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="spacing">
<number>2</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item row="0" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="title"> <property name="title">
<string/> <string/>
</property> </property>
...@@ -55,24 +75,21 @@ ...@@ -55,24 +75,21 @@
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,100,1"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="3,2,100,10,5,1">
<property name="spacing"> <property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
<number>2</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="margin">
<number>0</number> <number>4</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property> </property>
<item> <item>
<widget class="QCheckBox" name="current"> <widget class="QCheckBox" name="current">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Currently executed waypoint</string> <string>Currently executed waypoint</string>
</property> </property>
...@@ -92,34 +109,49 @@ ...@@ -92,34 +109,49 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTextBrowser" name="displayBar"> <widget class="QLabel" name="displayBar">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize"> <property name="text">
<size> <string>test 1</string>
<width>16777215</width> </property>
<height>31</height> </widget>
</size> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
<property name="font"> <property name="sizeType">
<font> <enum>QSizePolicy::Expanding</enum>
<pointsize>8</pointsize>
</font>
</property> </property>
<property name="frameShape"> <property name="sizeHint" stdset="0">
<enum>QFrame::NoFrame</enum> <size>
<width>79</width>
<height>17</height>
</size>
</property> </property>
<property name="frameShadow"> </spacer>
<enum>QFrame::Sunken</enum> </item>
<item>
<widget class="QLabel" name="frameLabel">
<property name="text">
<string>v10</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="autoContinue"> <widget class="QCheckBox" name="autoContinue">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Automatically continue after this waypoint</string> <string>Automatically continue after this waypoint</string>
</property> </property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment