diff --git a/ground/src/plugins/opmap/opmap_edit_waypoint_dialog.ui b/ground/src/plugins/opmap/opmap_edit_waypoint_dialog.ui
index 2645345fc..7db936a9b 100644
--- a/ground/src/plugins/opmap/opmap_edit_waypoint_dialog.ui
+++ b/ground/src/plugins/opmap/opmap_edit_waypoint_dialog.ui
@@ -9,7 +9,7 @@
0
0
- 476
+ 500
187
@@ -19,6 +19,18 @@
0
+
+
+ 500
+ 187
+
+
+
+
+ 500
+ 187
+
+
OpenPilot GCS Edit Waypoint
@@ -27,26 +39,19 @@
:/core/images/openpilot_logo_128.png:/core/images/openpilot_logo_128.png
- true
+ false
-
-
-
-
-
- Description
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
+
+
+ 0
+ 0
+
+
Number
@@ -55,37 +60,7 @@
- -
-
-
- Latitude
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Longitude
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Height
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
+
-
@@ -107,51 +82,113 @@
- -
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Latitude
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
-
+
0
0
- 130
+ 0
0
- 130
+ 16777215
16777215
- -
+
-
+
+
+ degrees
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Longitude
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
-
+
0
0
- 130
+ 0
0
- 130
+ 16777215
16777215
- -
+
-
+
+
+ degrees
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Height
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
@@ -161,43 +198,61 @@
- 130
+ 80
0
- 130
+ 80
16777215
- -
-
-
- degrees
-
-
-
- -
-
-
- degrees
-
-
-
- -
+
-
feet
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Description
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
-
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
diff --git a/ground/src/plugins/opmap/opmap_mapoverlaywidget.ui b/ground/src/plugins/opmap/opmap_mapoverlaywidget.ui
index 56f763d37..b5d68b64e 100644
--- a/ground/src/plugins/opmap/opmap_mapoverlaywidget.ui
+++ b/ground/src/plugins/opmap/opmap_mapoverlaywidget.ui
@@ -110,6 +110,9 @@ border-radius: 2px;
0
+
+ 0
+
-
@@ -376,59 +379,99 @@ color: rgb(255, 255, 255);
20
-
-
-
-
- QLabel { /* all label types */
-/* background-color: rgba(0, 0, 0, 0); */
- background-color: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:0.5, fx:0.5, fy:0.5, stop:0.778409 rgba(0, 0, 0, 176), stop:1 rgba(0, 0, 0, 0));
-color: rgb(255, 255, 255);
-
-}
-
-
- QFrame::NoFrame
-
-
- TextLabel
-
-
- 8
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- QLabel { /* all label types */
-/* background-color: rgba(0, 0, 0, 0); */
- background-color: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:0.5, fx:0.5, fy:0.5, stop:0.778409 rgba(0, 0, 0, 176), stop:1 rgba(0, 0, 0, 0));
-color: rgb(255, 255, 255);
-}
-
-
- TextLabel
-
-
- 8
-
-
-
+ -
+
+
+ background-color: rgba(0, 0, 0, 100);
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
+ 3
+
+
+ 3
+
+
-
+
+
+ QLabel { /* all label types */
+color: rgb(255, 255, 255);
+ background-color: rgba(255, 255, 255, 0);
+border: none;
+border-radius: 10px;
+}
+
+
+ QFrame::NoFrame
+
+
+ TextLabel
+
+
+ Qt::AlignCenter
+
+
+ 1
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 16777215
+ 15
+
+
+
+ QProgressBar {
+border: nonei;
+padding: 3px;
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
+color: rgb(255, 255, 255);
+}
+QProgressBar::chunk {
+background-color: rgb(85, 85, 255);
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(160, 160, 255, 255), stop:1 rgba(80, 80, 160, 255));
+border: none;
+border-radius: 3px;
+}
+
+
+ 24
+
+
+ Qt::AlignCenter
+
+
+ %v
+
+
+
+
+
+
diff --git a/ground/src/plugins/opmap/opmap_widget.ui b/ground/src/plugins/opmap/opmap_widget.ui
index a40a86a82..f3bec5d70 100644
--- a/ground/src/plugins/opmap/opmap_widget.ui
+++ b/ground/src/plugins/opmap/opmap_widget.ui
@@ -70,6 +70,8 @@ QLabel { /* all label types */
/* background-color: rgba(255, 255, 255, 0); */
background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(64, 64, 64, 255), stop:1 rgba(128, 128, 128, 255));
color: rgb(255, 255, 255);
+border: 0px;
+border-radius: 3px;
}
QToolButton { /* all types of tool button */
@@ -77,19 +79,26 @@ background-color: rgba(255, 255, 255, 0);
color: rgb(255, 255, 255);
/*border-style: none;*/
border: 0px;
+border-radius: 3px;
}
QToolButton:hover {
-background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(255, 160, 0, 255), stop:1 rgba(160, 100, 0, 255));
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(255, 255, 255, 200), stop:1 rgba(180, 180, 180, 200));
color: rgb(255, 255, 255);
+border: 0px;
+border-radius: 3px;
}
QToolButton:pressed {
background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
color: rgb(255, 255, 255);
+border: 0px;
+border-radius: 3px;
}
QToolButton:checked {
background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
color: rgb(255, 255, 255);
+border: 0px;
+border-radius: 3px;
}
QSlider::groove:horizontal {
@@ -110,17 +119,18 @@ QComboBox {
background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
color: rgb(255, 255, 255);
}
-QComboBox:hover {
+QComboBox::down-arrow:on {
background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
- background-color: rgb(197, 138, 0);
+top: 1px; left: 1px; /* shift the arrow when popup is open */
}
QComboBox::down-arrow {
image: url(:/opmap/images/combobox_down_arrow.png);
}
QComboBox:drop-down {
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(110, 110, 110, 255), stop:1 rgba(71, 71, 71, 255));
subcontrol-origin: padding;
subcontrol-position: top right;
- border-left-style: 1px solid black;
+ border-left-style: 1px solid white;
border-top-right-radius: 1px;
border-bottom-right-radius: 1px;
}
@@ -129,6 +139,7 @@ background-color: rgb(255, 255, 255);
color: rgb(0, 0, 0);
border: 2px solid darkgray;
selection-background-color: lightgray;
+border-radius: 3px;
}
QToolTip {
@@ -136,7 +147,7 @@ background-color: white;
color: black;
border: 1px solid black;
padding: 5px;
-border-radius: 2px;
+border-radius: 3px;
/* opacity: 170; */
}
@@ -195,6 +206,12 @@ border-radius: 2px;
:/core/images/prev.png:/core/images/prev.png
+
+
+ 20
+ 20
+
+
false
@@ -282,8 +299,8 @@ border-radius: 2px;
- 16
- 16
+ 20
+ 20
@@ -327,8 +344,8 @@ border-radius: 2px;
- 16
- 16
+ 20
+ 20
@@ -356,8 +373,8 @@ border-radius: 2px;
- 16
- 16
+ 20
+ 20
@@ -404,8 +421,8 @@ border-radius: 2px;
- 16
- 16
+ 20
+ 20
@@ -433,8 +450,8 @@ border-radius: 2px;
- 16
- 16
+ 20
+ 20
@@ -475,8 +492,8 @@ border-radius: 2px;
- 16
- 16
+ 20
+ 20
@@ -505,8 +522,8 @@ p, li { white-space: pre-wrap; }
- 16
- 16
+ 20
+ 20
@@ -544,8 +561,7 @@ p, li { white-space: pre-wrap; }
false
- background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);
+
2
@@ -605,8 +621,8 @@ color: rgb(255, 255, 255);
- 16
- 16
+ 20
+ 20
@@ -638,6 +654,12 @@ color: rgb(255, 255, 255);
:/core/images/next.png:/core/images/next.png
+
+
+ 20
+ 20
+
+
false
@@ -1161,6 +1183,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
color: rgb(255, 255, 255);
/*border: 1px solid black;*/
border: none;
+border-radius: 3px;
}
QToolTip {
@@ -1369,7 +1392,7 @@ border-radius: 3px;
100
- 12
+ 20
@@ -1377,14 +1400,17 @@ border-radius: 3px;
QProgressBar {
-border: nonei;
-padding: 1px;
+border: none;
+border-radius: 5px;
+padding: 3px;
background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
color: rgb(255, 255, 255);
}
QProgressBar::chunk {
- background-color: rgb(85, 85, 255);
+background-color: rgb(85, 85, 255);
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(160, 160, 255, 255), stop:1 rgba(80, 80, 160, 255));
border: none;
+border-radius: 3px;
}