Skip to content

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

Visual improvements and minor usability bugfixes

parent 5e91a152
Hide whitespace changes
Inline Side-by-side
Showing with 351 additions and 46 deletions
images/style-mission.css
View file @ 85c4ecd4
......@@ -182,8 +182,8 @@ QPushButton {
max-height: 18px;
border: 2px solid #4A4A4F;
border-radius: 5px;
padding-left: 10px;
padding-right: 10px;
padding-left: 5px;
padding-right: 5px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208);
}
......@@ -218,10 +218,25 @@ QToolButton:pressed {
}
QToolTip {
background-color: #404040;
background-color: #090909;
border: 1px solid #379AC3;
border-radius: 3px;
color: #DDDDDF;
}
QMenu {
border: 1px solid #379AC3;
}
QMenu::separator {
height: 1px;
background: #379AC3;
margin-top: 8px;
margin-bottom: 4px;
margin-left: 5px;
margin-right: 5px;
}
QSlider::groove:horizontal {
border: 1px solid #999999;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
......
src/ui/HDDisplay.cc
View file @ 85c4ecd4
......@@ -80,7 +80,7 @@ HDDisplay::HDDisplay(QStringList* plotList, QString title, QWidget *parent) :
restoreState();
// Set minimum size
setMinimumSize(80, 80);
setMinimumSize(60, 60);
// Set preferred size
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
......
src/ui/QGCMAVLinkLogPlayer.ui
View file @ 85c4ecd4
......@@ -26,6 +26,15 @@
</item>
<item row="0" column="3" colspan="3">
<widget class="QPushButton" name="selectFileButton">
<property name="toolTip">
<string>Select the logfile to replay</string>
</property>
<property name="statusTip">
<string>Select the logfile to replay</string>
</property>
<property name="whatsThis">
<string>Select the logfile to replay</string>
</property>
<property name="text">
<string>Select File</string>
</property>
......@@ -33,6 +42,15 @@
</item>
<item row="1" column="1" colspan="5">
<widget class="QSlider" name="speedSlider">
<property name="toolTip">
<string>Set the replay speed</string>
</property>
<property name="statusTip">
<string>Set the replay speed</string>
</property>
<property name="whatsThis">
<string>Set the replay speed</string>
</property>
<property name="minimum">
<number>1</number>
</property>
......@@ -59,6 +77,15 @@
</item>
<item row="3" column="5">
<widget class="QToolButton" name="pauseButton">
<property name="toolTip">
<string>Pause the logfile</string>
</property>
<property name="statusTip">
<string>Pause the logfile</string>
</property>
<property name="whatsThis">
<string>Pause the logfile</string>
</property>
<property name="text">
<string>...</string>
</property>
......@@ -76,6 +103,15 @@
</item>
<item row="4" column="0" colspan="6">
<widget class="QProgressBar" name="progressBar">
<property name="toolTip">
<string>Percent of the logfile replayed</string>
</property>
<property name="statusTip">
<string>Percent of the logfile replayed</string>
</property>
<property name="whatsThis">
<string>Percent of the logfile replayed</string>
</property>
<property name="value">
<number>0</number>
</property>
......@@ -83,6 +119,15 @@
</item>
<item row="1" column="0">
<widget class="QLabel" name="speedLabel">
<property name="toolTip">
<string>Current replay speed</string>
</property>
<property name="statusTip">
<string>Current replay speed</string>
</property>
<property name="whatsThis">
<string>Current replay speed</string>
</property>
<property name="text">
<string>Speed</string>
</property>
......@@ -90,6 +135,15 @@
</item>
<item row="3" column="4">
<widget class="QToolButton" name="playButton">
<property name="toolTip">
<string>Start to replay the logfile</string>
</property>
<property name="statusTip">
<string>Start to replay the logfile</string>
</property>
<property name="whatsThis">
<string>Start to replay the logfile</string>
</property>
<property name="text">
<string>...</string>
</property>
......
src/ui/SerialSettings.ui
View file @ 85c4ecd4
......@@ -26,6 +26,15 @@
</item>
<item row="0" column="1">
<widget class="QComboBox" name="portName">
<property name="toolTip">
<string>The serial port to which the system is connected. All ports listed here should work.</string>
</property>
<property name="statusTip">
<string>The serial port to which the system is connected. All ports listed here should work.</string>
</property>
<property name="whatsThis">
<string>The serial port to which the system is connected. All ports listed here should work.</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
......@@ -48,6 +57,15 @@
</item>
<item row="1" column="1">
<widget class="QComboBox" name="baudRate">
<property name="toolTip">
<string>The data transmission rate. If unsure 57600 and 115200 are very common rates.</string>
</property>
<property name="statusTip">
<string>The data transmission rate. If unsure 57600 and 115200 are very common rates.</string>
</property>
<property name="whatsThis">
<string>The data transmission rate. If unsure 57600 and 115200 are very common rates.</string>
</property>
<property name="editable">
<bool>false</bool>
</property>
......@@ -190,6 +208,15 @@
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="flowControlCheckBox">
<property name="toolTip">
<string>Activate / deactivate hardware flow control. Commonly deactivated</string>
</property>
<property name="statusTip">
<string>Activate / deactivate hardware flow control. Commonly deactivated</string>
</property>
<property name="whatsThis">
<string>Activate / deactivate hardware flow control. Commonly deactivated</string>
</property>
<property name="text">
<string>Active</string>
</property>
......@@ -206,6 +233,15 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QRadioButton" name="parNone">
<property name="toolTip">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="statusTip">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="whatsThis">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="text">
<string>None</string>
</property>
......@@ -216,6 +252,15 @@
</item>
<item>
<widget class="QRadioButton" name="parOdd">
<property name="toolTip">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="statusTip">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="whatsThis">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="text">
<string>Odd</string>
</property>
......@@ -223,6 +268,15 @@
</item>
<item>
<widget class="QRadioButton" name="parEven">
<property name="toolTip">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="statusTip">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="whatsThis">
<string>Set the parity. In most cases no parity (None) is used.</string>
</property>
<property name="text">
<string>Even</string>
</property>
......@@ -251,6 +305,15 @@
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Number of data bits per symbol. This is almost always 8.</string>
</property>
<property name="statusTip">
<string>Number of data bits per symbol. This is almost always 8.</string>
</property>
<property name="whatsThis">
<string>Number of data bits per symbol. This is almost always 8.</string>
</property>
<property name="minimum">
<number>5</number>
</property>
......@@ -277,6 +340,15 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Number of stop bits per symbol. This is almost always 2.</string>
</property>
<property name="statusTip">
<string>Number of stop bits per symbol. This is almost always 2.</string>
</property>
<property name="whatsThis">
<string>Number of stop bits per symbol. This is almost always 2.</string>
</property>
<property name="frame">
<bool>true</bool>
</property>
......@@ -315,6 +387,12 @@
<property name="toolTip">
<string>Delete this link</string>
</property>
<property name="statusTip">
<string>Delete this link</string>
</property>
<property name="whatsThis">
<string>Link delete button</string>
</property>
</action>
<action name="actionConnect">
<property name="text">
......@@ -323,6 +401,12 @@
<property name="toolTip">
<string>Connect this link</string>
</property>
<property name="statusTip">
<string>Connect this link</string>
</property>
<property name="whatsThis">
<string>Connect this link</string>
</property>
</action>
<action name="actionClose">
<property name="text">
......@@ -331,6 +415,12 @@
<property name="toolTip">
<string>Close the configuration window</string>
</property>
<property name="statusTip">
<string>Close the configuration window</string>
</property>
<property name="whatsThis">
<string>Close the configuration window</string>
</property>
</action>
</widget>
<resources/>
......
src/ui/WaypointList.ui
View file @ 85c4ecd4
......@@ -36,8 +36,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>466</width>
<height>163</height>
<width>464</width>
<height>158</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
......@@ -48,7 +48,17 @@
<number>4</number>
</property>
<item>
<widget class="QWidget" name="listWidget" native="true"/>
<widget class="QWidget" name="listWidget" native="true">
<property name="toolTip">
<string>Waypoint list. The list is empty until you issue a read command or add waypoints.</string>
</property>
<property name="statusTip">
<string>Waypoint list. The list is empty until you issue a read command or add waypoints.</string>
</property>
<property name="whatsThis">
<string>Waypoint list. The list is empty until you issue a read command or add waypoints.</string>
</property>
</widget>
</item>
</layout>
</widget>
......@@ -56,6 +66,15 @@
</item>
<item row="2" column="8">
<widget class="QPushButton" name="readButton">
<property name="toolTip">
<string>Read all waypoints from the MAV. Clears the list on this computer.</string>
</property>
<property name="statusTip">
<string>Read all waypoints from the MAV. Clears the list on this computer.</string>
</property>
<property name="whatsThis">
<string>Read all waypoints from the MAV. Clears the list on this computer.</string>
</property>
<property name="text">
<string>Read</string>
</property>
......@@ -67,6 +86,15 @@
</item>
<item row="2" column="9">
<widget class="QPushButton" name="transmitButton">
<property name="toolTip">
<string>Transmit all waypoints on this list to the MAV.</string>
</property>
<property name="statusTip">
<string>Transmit all waypoints on this list to the MAV.</string>
</property>
<property name="whatsThis">
<string>Transmit all waypoints on this list to the MAV.</string>
</property>
<property name="text">
<string>Write</string>
</property>
......@@ -78,6 +106,15 @@
</item>
<item row="3" column="0" colspan="10">
<widget class="QLabel" name="statusLabel">
<property name="toolTip">
<string>The current waypoint transmission status</string>
</property>
<property name="statusTip">
<string>The current waypoint transmission status</string>
</property>
<property name="whatsThis">
<string>The current waypoint transmission status</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
......@@ -85,6 +122,15 @@
</item>
<item row="2" column="6">
<widget class="QToolButton" name="addButton">
<property name="toolTip">
<string>Add a new waypoint to this list. Transmit via write to the MAV.</string>
</property>
<property name="statusTip">
<string>Add a new waypoint to this list. Transmit via write to the MAV.</string>
</property>
<property name="whatsThis">
<string>Add a new waypoint to this list. Transmit via write to the MAV.</string>
</property>
<property name="text">
<string>...</string>
</property>
......@@ -96,6 +142,15 @@
</item>
<item row="2" column="3">
<widget class="QPushButton" name="loadButton">
<property name="toolTip">
<string>Load waypoints from a file on the local harddisk. Does not load the waypoints on the MAV.</string>
</property>
<property name="statusTip">
<string>Load waypoints from a file on the local harddisk. Does not load the waypoints on the MAV.</string>
</property>
<property name="whatsThis">
<string>Load waypoints from a file on the local harddisk. Does not load the waypoints on the MAV.</string>
</property>
<property name="text">
<string>Load WPs</string>
</property>
......@@ -103,6 +158,15 @@
</item>
<item row="2" column="2">
<widget class="QPushButton" name="saveButton">
<property name="toolTip">
<string>Save waypoints to a file on the local harddisk. Does not save them on the MAV.</string>
</property>
<property name="statusTip">
<string>Save waypoints to a file on the local harddisk. Does not save them on the MAV.</string>
</property>
<property name="whatsThis">
<string>Save waypoints to a file on the local harddisk. Does not save them on the MAV.</string>
</property>
<property name="text">
<string>Save WPs</string>
</property>
......@@ -126,6 +190,12 @@
<property name="toolTip">
<string>Set the current vehicle position as new waypoint</string>
</property>
<property name="statusTip">
<string>Set the current vehicle position as new waypoint</string>
</property>
<property name="whatsThis">
<string>Set the current vehicle position as new waypoint</string>
</property>
<property name="text">
<string>...</string>
</property>
......@@ -136,9 +206,18 @@
</widget>
</item>
<item row="2" column="7">
<widget class="QPushButton" name="clearWPListButton">
<widget class="QToolButton" name="clearWPListButton">
<property name="toolTip">
<string>Delete all waypoints from this list. You have to click write to clear the list on the MAV as well.</string>
</property>
<property name="statusTip">
<string>Delete all waypoints from this list. You have to click write to clear the list on the MAV as well.</string>
</property>
<property name="whatsThis">
<string>Delete all waypoints from this list. You have to click write to clear the list on the MAV as well.</string>
</property>
<property name="text">
<string/>
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../mavground.qrc">
......
src/ui/linechart/LinechartWidget.cc
View file @ 85c4ecd4
......@@ -75,7 +75,7 @@ updateTimer(new QTimer())
{
// Add elements defined in Qt Designer
ui.setupUi(this);
this->setMinimumSize(400, 250);
this->setMinimumSize(300, 200);
// Add and customize curve list elements (left side)
curvesWidget = new QWidget(ui.curveListWidget);
......
src/ui/map3D/QGCGoogleEarthView.ui
View file @ 85c4ecd4
......@@ -15,49 +15,50 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="horizontalSpacing">
<number>10</number>
<number>8</number>
</property>
<property name="verticalSpacing">
<number>5</number>
<number>2</number>
</property>
<property name="margin">
<number>2</number>
</property>
<item row="0" column="0" colspan="10">
<item row="0" column="0" colspan="12">
<layout class="QVBoxLayout" name="webViewLayout"/>
</item>
<item row="1" column="0">
<widget class="QComboBox" name="mavComboBox"/>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="goHomeButton">
<property name="text">
<string>Home</string>
<property name="toolTip">
<string>Go to home location</string>
</property>
<property name="statusTip">
<string>Go to home location</string>
</property>
<property name="whatsThis">
<string>Go to home location</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="followAirplaneCheckbox">
<property name="text">
<string>Follow</string>
<string>Home</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QCheckBox" name="trailCheckbox">
<property name="text">
<string>Trail</string>
<property name="toolTip">
<string>Show MAV trajectories</string>
</property>
<property name="statusTip">
<string>Show MAV trajectories</string>
</property>
<property name="whatsThis">
<string>Show MAV trajectories</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QPushButton" name="clearWPButton">
<property name="text">
<string>Clear WPs</string>
<string>Trails</string>
</property>
</widget>
</item>
<item row="1" column="9">
<item row="1" column="11">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -70,8 +71,17 @@
</property>
</spacer>
</item>
<item row="1" column="8">
<item row="1" column="9">
<widget class="QSlider" name="camDistanceSlider">
<property name="toolTip">
<string>Distance of the chase camera to the MAV</string>
</property>
<property name="statusTip">
<string>Distance of the chase camera to the MAV</string>
</property>
<property name="whatsThis">
<string>Distance of the chase camera to the MAV</string>
</property>
<property name="minimum">
<number>30</number>
</property>
......@@ -86,30 +96,87 @@
</property>
</widget>
</item>
<item row="1" column="7">
<item row="1" column="8">
<widget class="QLabel" name="camDistanceLabel">
<property name="toolTip">
<string>Distance of the chase camera to the MAV</string>
</property>
<property name="statusTip">
<string>Distance of the chase camera to the MAV</string>
</property>
<property name="whatsThis">
<string>Distance of the chase camera to the MAV</string>
</property>
<property name="text">
<string>Dist</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QCheckBox" name="waypointsCheckbox">
<property name="toolTip">
<string>Show waypoints</string>
</property>
<property name="statusTip">
<string>Show waypoints</string>
</property>
<property name="whatsThis">
<string>Show waypoints</string>
</property>
<property name="text">
<string>WPs</string>
</property>
</widget>
</item>
<item row="1" column="10">
<widget class="QCheckBox" name="followAirplaneCheckbox">
<property name="toolTip">
<string>Chase the MAV</string>
</property>
<property name="statusTip">
<string>Chase the MAV</string>
</property>
<property name="whatsThis">
<string>Chase the MAV</string>
</property>
<property name="text">
<string>Cam Distance</string>
<string>Follow</string>
</property>
</widget>
</item>
<item row="1" column="6">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QComboBox" name="mavComboBox">
<property name="toolTip">
<string>Select the MAV to chase</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
<property name="statusTip">
<string>Select the MAV to chase</string>
</property>
</spacer>
<property name="whatsThis">
<string>Select the MAV to chase</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QCheckBox" name="waypointsCheckbox">
<item row="1" column="7">
<widget class="QPushButton" name="clearWPButton">
<property name="toolTip">
<string>Delete all waypoints</string>
</property>
<property name="statusTip">
<string>Delete all waypoints</string>
</property>
<property name="whatsThis">
<string>Delete all waypoints</string>
</property>
<property name="text">
<string>Waypoints</string>
<string>Clear WPs</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
......
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