Skip to content

Q
qgroundcontrol
Commit bf112ef0 authored by Bryant's avatar Bryant
Browse files
Options

The toolbar now displays much nicer under the light theme. Also colorized the... 

The toolbar now displays much nicer under the light theme. Also colorized the connect/disconnect & delete buttons in the communications settings window.
parent 652fce85
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 141 deletions
files/styles/style-dark.css
View file @ bf112ef0
...@@ -70,6 +70,47 @@ QDockWidget::title { ...@@ -70,6 +70,47 @@ QDockWidget::title {
height: 14px; height: 14px;
} }
QGCToolBar QLabel {
font-size: 10pt;
margin: 3px 2px;
}
QGCToolBar QLabel#symbolLabel {
background-clip: content;
}
QGCToolBar QToolButton#firstAction {
margin-left: 8px;
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
border-right: none;
}
QGCToolBar QToolButton {
margin: 0;
padding-left: 0;
padding-right: 0;
border-radius: 0;
text-align: left;
}
/* background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFb917, stop:1 #B37300);*/
QGCToolBar QToolButton#advancedButton {
margin-left: 0;
margin-right: 13px;
padding-left: 4px;
padding-right: 8px;
border-radius: 0;
border-bottom-right-radius: 6px;
border-top-right-radius: 6px;
border-left: none;
}
QGCToolBar .QWidget {
margin: 0;
background-color: transparent;
}
QGCToolWidgetItem { QGCToolWidgetItem {
border: 1px solid #666; border: 1px solid #666;
border-radius: 3px; border-radius: 3px;
......
files/styles/style-light.css
View file @ bf112ef0
...@@ -70,8 +70,55 @@ QDockWidget::title { ...@@ -70,8 +70,55 @@ QDockWidget::title {
height: 14px; height: 14px;
} }
QGCToolBar { QGCToolBar QLabel {
min-height: 60px; font-size: 10pt;
margin: 3px 2px;
}
QGCToolBar QLabel#symbolLabel {
background-clip: content;
}
QGCToolBar QLabel#toolBarBatteryBar {
color: #008000;
}
QGCToolBar QLabel#toolBarTimeoutLabel {
border-radius: 4px;
padding: 0;
color: #000;
background-color: #FF0037;
}
QGCToolBar QToolButton#firstAction {
margin-left: 8px;
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
border-right: none;
}
QGCToolBar QToolButton {
margin: 0;
padding-left: 0;
padding-right: 0;
border-radius: 0;
text-align: left;
}
QGCToolBar QToolButton#advancedButton {
margin-left: 0;
margin-right: 13px;
padding-left: 4px;
padding-right: 8px;
border-radius: 0;
border-bottom-right-radius: 6px;
border-top-right-radius: 6px;
border-left: none;
}
QGCToolBar .QWidget {
margin: 0;
background-color: transparent;
} }
QGCToolWidgetItem { QGCToolWidgetItem {
...@@ -149,7 +196,11 @@ QMenu { ...@@ -149,7 +196,11 @@ QMenu {
} }
QMenu::item:selected { QMenu::item:selected {
background-color: #000; background-color: #CCC;
}
QMenu::item:checked {
background-color: #B8D3E6;
} }
QMenu::separator { QMenu::separator {
...@@ -158,6 +209,11 @@ QMenu::separator { ...@@ -158,6 +209,11 @@ QMenu::separator {
margin: 8px 5px 4px 5px; margin: 8px 5px 4px 5px;
} }
QMenu::icon, QMenu::icon:selected, QMenu::icon:disabled, QMenu::icon:checked {
background: #F00;
border: none;
}
QMenuBar::item:selected { QMenuBar::item:selected {
background-color: #CCC; background-color: #CCC;
} }
...@@ -213,7 +269,7 @@ QPushButton, QToolButton { ...@@ -213,7 +269,7 @@ QPushButton, QToolButton {
max-height: 20px; max-height: 20px;
border: 1px solid #465158; border: 1px solid #465158;
margin: 1px; margin: 1px;
border-radius: 2px; border-radius: 4px;
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777);
...@@ -239,16 +295,31 @@ QPushButton#killButton { ...@@ -239,16 +295,31 @@ QPushButton#killButton {
border-radius: 5px; border-radius: 5px;
} }
QPushButton#connectButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
}
QPushButton#deleteButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF0037, stop: 1 #AC0025);
}
QPushButton:checked, QToolButton:checked { QPushButton:checked, QToolButton:checked {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444, stop: 1 #888); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444, stop: 1 #888);
color: #FFF;
}
QPushButton:checked#connectButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF9000, stop: 1 #B37300);
color: #000;
} }
QPushButton:checked#controlButton { QPushButton:checked#controlButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52);
} }
QPushButton:disabled, QToolButton:disabled { QPushButton:disabled, QToolButton:disabled {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEE, stop: 1 #CCC); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEE, stop: 1 #CCC);
color: #AAA;
} }
QPushButton:hover, QToolButton:hover { QPushButton:hover, QToolButton:hover {
...@@ -269,22 +340,6 @@ QPushButton:pressed#killButton { ...@@ -269,22 +340,6 @@ QPushButton:pressed#killButton {
border-radius: 5px; border-radius: 5px;
} }
QPushButton#connectButton {
min-height: 20px;
color: #222222;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5AAA49, stop: 1 #106B38);
margin-left: 4px;
margin-right: 4px;
border-radius: 4px;
border: 1px solid #085B35;
}
QPushButton:checked#connectButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF9000, stop: 1 #FFD450);
color: #222222;
border-color: #D1892A;
}
QScrollBar { QScrollBar {
border: 1px solid #333; border: 1px solid #333;
} }
...@@ -411,43 +466,6 @@ QToolBar { ...@@ -411,43 +466,6 @@ QToolBar {
border-bottom-color: #484848; border-bottom-color: #484848;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
} }
QToolButton#symbolButton {
margin-left: 10px;
background-color: #050508;
color: #DDD;
background-clip: border;
}
QLabel#toolBarTimeoutLabel { margin: 3px 2px; padding: 2px; padding-left: 4px; padding-right: 4px; font: 14px;
border-radius: 4px;
}
QLabel#toolBarBatteryVoltageLabel {
margin: 0 0 0 4px; font: 14px;
}
QLabel#toolBarWpLabel { margin: 3px 2px; font: 18px; color: #ACEBFE; }
QLabel#toolBarMessageLabel { margin: 3px 2px; font: 14px; color: #ACEBFE; }
QPushButton#connectButton {min-height: 20px; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5AAA49, stop: 1 #106B38); margin-left: 4px; margin-right: 4px; border-radius: 4px; border: 1px solid #085B35; }
QPushButton:checked#connectButton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF9000, stop: 1 #FFD450); color: #222; border-color: #D1892A}
QLabel#toolBarSafetyLabel { margin: 3px 2px; padding: 2px; padding-left: 4px; padding-right: 4px; font: 14px; color: #14C814; }
QLabel#toolBarModeLabel { margin: 3px 2px; font: 14px; color: #ACEBFE; }
QLabel#toolBarStateLabel { margin: 3px 2px; font: 14px; color: #FEC654; }
QToolButton#firstAction { min-width: 60px; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 8px; margin-right: 0px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-left-radius: 6px; border-top-left-radius: 6px; border-left: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; }
QToolButton:checked#firstAction { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDD; }
QGCToolBar QToolButton { min-width: 60px; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: -2px; margin-right: -2px; padding-left: 0px; padding-right: 0px; border-radius: 0px; border-top: 1px solid #484848; border-bottom: 1px solid #484848; }
QGCToolBar QToolButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDD; }
QPushButton#advancedButton { min-width: 60px; font-weight: bold; text-align: left; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 0px; margin-right: 13px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-right-radius: 6px; border-top-right-radius: 6px; border-right: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; }
QPushButton:checked#advancedButton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDD; }
QGCToolBar QMenu { font-weight: bold; min-width: 70px; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); border: 1px solid #484848; }
QGCToolBar QMenu::item:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDD; }
QGCToolBar .QWidget {
margin: 0px;
background-color: transparent;
min-height: 24px;
background-color: #F00;
}
QToolTip { QToolTip {
background-color: #F6F6F6; background-color: #F6F6F6;
......
src/ui/CommSettings.ui
View file @ bf112ef0
...@@ -14,7 +14,16 @@ ...@@ -14,7 +14,16 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2" rowstretch="1,1,1,100,100,1"> <layout class="QGridLayout" name="gridLayout_2" rowstretch="1,1,1,100,100,1">
<property name="margin"> <property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
...@@ -84,7 +93,16 @@ ...@@ -84,7 +93,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
...@@ -97,8 +115,8 @@ ...@@ -97,8 +115,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>393</width> <width>391</width>
<height>76</height> <height>85</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -116,7 +134,16 @@ ...@@ -116,7 +134,16 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin"> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
...@@ -129,8 +156,8 @@ ...@@ -129,8 +156,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>393</width> <width>391</width>
<height>76</height> <height>84</height>
</rect> </rect>
</property> </property>
</widget> </widget>
...@@ -166,7 +193,7 @@ ...@@ -166,7 +193,7 @@
<string>Connect</string> <string>Connect</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
......
src/ui/QGCToolBar.cc
View file @ bf112ef0
This diff is collapsed.
src/ui/QGCToolBar.h
View file @ bf112ef0
...@@ -119,7 +119,7 @@ protected: ...@@ -119,7 +119,7 @@ protected:
bool systemArmed; bool systemArmed;
LinkInterface* currentLink; LinkInterface* currentLink;
QAction* firstAction; QAction* firstAction;
QPushButton *advancedButton; QToolButton *advancedButton;
QButtonGroup *group; QButtonGroup *group;
}; };
......
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