From 85c4ecd494c045b6046f5ead0c3f159fba77a0f9 Mon Sep 17 00:00:00 2001 From: pixhawk Date: Sun, 9 Jan 2011 16:51:33 +0100 Subject: [PATCH] Visual improvements and minor usability bugfixes --- images/style-mission.css | 21 ++++- src/ui/HDDisplay.cc | 2 +- src/ui/QGCMAVLinkLogPlayer.ui | 54 +++++++++++ src/ui/SerialSettings.ui | 90 ++++++++++++++++++ src/ui/WaypointList.ui | 89 +++++++++++++++++- src/ui/linechart/LinechartWidget.cc | 2 +- src/ui/map3D/QGCGoogleEarthView.ui | 139 +++++++++++++++++++++------- 7 files changed, 351 insertions(+), 46 deletions(-) diff --git a/images/style-mission.css b/images/style-mission.css index afeecadd9..96ac39109 100644 --- a/images/style-mission.css +++ b/images/style-mission.css @@ -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 */ diff --git a/src/ui/HDDisplay.cc b/src/ui/HDDisplay.cc index 378eeadd6..fc365fd16 100644 --- a/src/ui/HDDisplay.cc +++ b/src/ui/HDDisplay.cc @@ -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); diff --git a/src/ui/QGCMAVLinkLogPlayer.ui b/src/ui/QGCMAVLinkLogPlayer.ui index d035c044e..780c3ba4d 100644 --- a/src/ui/QGCMAVLinkLogPlayer.ui +++ b/src/ui/QGCMAVLinkLogPlayer.ui @@ -26,6 +26,15 @@ + + Select the logfile to replay + + + Select the logfile to replay + + + Select the logfile to replay + Select File @@ -33,6 +42,15 @@ + + Set the replay speed + + + Set the replay speed + + + Set the replay speed + 1 @@ -59,6 +77,15 @@ + + Pause the logfile + + + Pause the logfile + + + Pause the logfile + ... @@ -76,6 +103,15 @@ + + Percent of the logfile replayed + + + Percent of the logfile replayed + + + Percent of the logfile replayed + 0 @@ -83,6 +119,15 @@ + + Current replay speed + + + Current replay speed + + + Current replay speed + Speed @@ -90,6 +135,15 @@ + + Start to replay the logfile + + + Start to replay the logfile + + + Start to replay the logfile + ... diff --git a/src/ui/SerialSettings.ui b/src/ui/SerialSettings.ui index b116400b2..491078404 100644 --- a/src/ui/SerialSettings.ui +++ b/src/ui/SerialSettings.ui @@ -26,6 +26,15 @@ + + The serial port to which the system is connected. All ports listed here should work. + + + The serial port to which the system is connected. All ports listed here should work. + + + The serial port to which the system is connected. All ports listed here should work. + true @@ -48,6 +57,15 @@ + + The data transmission rate. If unsure 57600 and 115200 are very common rates. + + + The data transmission rate. If unsure 57600 and 115200 are very common rates. + + + The data transmission rate. If unsure 57600 and 115200 are very common rates. + false @@ -190,6 +208,15 @@ + + Activate / deactivate hardware flow control. Commonly deactivated + + + Activate / deactivate hardware flow control. Commonly deactivated + + + Activate / deactivate hardware flow control. Commonly deactivated + Active @@ -206,6 +233,15 @@ + + Set the parity. In most cases no parity (None) is used. + + + Set the parity. In most cases no parity (None) is used. + + + Set the parity. In most cases no parity (None) is used. + None @@ -216,6 +252,15 @@ + + Set the parity. In most cases no parity (None) is used. + + + Set the parity. In most cases no parity (None) is used. + + + Set the parity. In most cases no parity (None) is used. + Odd @@ -223,6 +268,15 @@ + + Set the parity. In most cases no parity (None) is used. + + + Set the parity. In most cases no parity (None) is used. + + + Set the parity. In most cases no parity (None) is used. + Even @@ -251,6 +305,15 @@ 0 + + Number of data bits per symbol. This is almost always 8. + + + Number of data bits per symbol. This is almost always 8. + + + Number of data bits per symbol. This is almost always 8. + 5 @@ -277,6 +340,15 @@ 0 + + Number of stop bits per symbol. This is almost always 2. + + + Number of stop bits per symbol. This is almost always 2. + + + Number of stop bits per symbol. This is almost always 2. + true @@ -315,6 +387,12 @@ Delete this link + + Delete this link + + + Link delete button + @@ -323,6 +401,12 @@ Connect this link + + Connect this link + + + Connect this link + @@ -331,6 +415,12 @@ Close the configuration window + + Close the configuration window + + + Close the configuration window + diff --git a/src/ui/WaypointList.ui b/src/ui/WaypointList.ui index 587a8c929..c00a83ca2 100644 --- a/src/ui/WaypointList.ui +++ b/src/ui/WaypointList.ui @@ -36,8 +36,8 @@ 0 0 - 466 - 163 + 464 + 158 @@ -48,7 +48,17 @@ 4 - + + + Waypoint list. The list is empty until you issue a read command or add waypoints. + + + Waypoint list. The list is empty until you issue a read command or add waypoints. + + + Waypoint list. The list is empty until you issue a read command or add waypoints. + + @@ -56,6 +66,15 @@ + + Read all waypoints from the MAV. Clears the list on this computer. + + + Read all waypoints from the MAV. Clears the list on this computer. + + + Read all waypoints from the MAV. Clears the list on this computer. + Read @@ -67,6 +86,15 @@ + + Transmit all waypoints on this list to the MAV. + + + Transmit all waypoints on this list to the MAV. + + + Transmit all waypoints on this list to the MAV. + Write @@ -78,6 +106,15 @@ + + The current waypoint transmission status + + + The current waypoint transmission status + + + The current waypoint transmission status + TextLabel @@ -85,6 +122,15 @@ + + Add a new waypoint to this list. Transmit via write to the MAV. + + + Add a new waypoint to this list. Transmit via write to the MAV. + + + Add a new waypoint to this list. Transmit via write to the MAV. + ... @@ -96,6 +142,15 @@ + + Load waypoints from a file on the local harddisk. Does not load the waypoints on the MAV. + + + Load waypoints from a file on the local harddisk. Does not load the waypoints on the MAV. + + + Load waypoints from a file on the local harddisk. Does not load the waypoints on the MAV. + Load WPs @@ -103,6 +158,15 @@ + + Save waypoints to a file on the local harddisk. Does not save them on the MAV. + + + Save waypoints to a file on the local harddisk. Does not save them on the MAV. + + + Save waypoints to a file on the local harddisk. Does not save them on the MAV. + Save WPs @@ -126,6 +190,12 @@ Set the current vehicle position as new waypoint + + Set the current vehicle position as new waypoint + + + Set the current vehicle position as new waypoint + ... @@ -136,9 +206,18 @@ - + + + Delete all waypoints from this list. You have to click write to clear the list on the MAV as well. + + + Delete all waypoints from this list. You have to click write to clear the list on the MAV as well. + + + Delete all waypoints from this list. You have to click write to clear the list on the MAV as well. + - + ... diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index e22a8282e..704b83bb2 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -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); diff --git a/src/ui/map3D/QGCGoogleEarthView.ui b/src/ui/map3D/QGCGoogleEarthView.ui index 53269ab8f..62ed1354b 100644 --- a/src/ui/map3D/QGCGoogleEarthView.ui +++ b/src/ui/map3D/QGCGoogleEarthView.ui @@ -15,49 +15,50 @@ - 10 + 8 - 5 + 2 2 - + - - - - - Home + + Go to home location + + + Go to home location + + + Go to home location - - - - - Follow + Home - - Trail + + Show MAV trajectories + + + Show MAV trajectories + + + Show MAV trajectories - - - - - Clear WPs + Trails - + Qt::Horizontal @@ -70,8 +71,17 @@ - + + + Distance of the chase camera to the MAV + + + Distance of the chase camera to the MAV + + + Distance of the chase camera to the MAV + 30 @@ -86,30 +96,87 @@ - + + + Distance of the chase camera to the MAV + + + Distance of the chase camera to the MAV + + + Distance of the chase camera to the MAV + + + Dist + + + + + + + Show waypoints + + + Show waypoints + + + Show waypoints + + + WPs + + + + + + + Chase the MAV + + + Chase the MAV + + + Chase the MAV + - Cam Distance + Follow - - - Qt::Horizontal + + + Select the MAV to chase - - - 40 - 20 - + + Select the MAV to chase - + + Select the MAV to chase + + - - + + + + Delete all waypoints + + + Delete all waypoints + + + Delete all waypoints + - Waypoints + Clear WPs + + + + + + + Qt::Vertical -- 2.22.0