zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

The light and dark style sheets are now self-contained instead of only coloring. Both the have been synchronized, though the light style sheet still needs some adjustments.

QGC4.4
Bryant 12 years ago
parent
19506a7acd
commit
3126bdd5f3
5 changed files with 513 additions and 694 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 319
      files/styles/style-base.css
  2. 533
      files/styles/style-dark.css
  3. 337
      files/styles/style-light.css
  4. 11
      src/ui/MainWindow.cc
  5. 1
      src/ui/MainWindow.h

319
files/styles/style-base.css
Unescape View File

@ -1,319 +0,0 @@
/* Due to the lack of support for @include in Qt's CSS implementation (see QTBUG-2047), the following is the base styles for the application. They are later modified with colors.*/
* {
font-size: 11px;
}
QCheckBox::indicator {
border-radius: 2px;
border-width: 1px;
border-style: solid;
width: 10px;
height: 10px;
}
QComboBox {
border-radius: 2px;
border-width: 1px;
border-style: solid;
}
QDialog {
border-width: 1px;
border-style: solid;
border-radius: 2px;
}
QDockWidget {
border-radius: 1px;
border-width: 10px;
border-style: solid;
}
QDockWidget::title {
text-align: left;
padding-left: 10px;
height: 14px;
border-bottom-width: 2px;
border-bottom-style: solid;
}
QDockWidget::close-button, QDockWidget::float-button {
border-width: 1px;
border-style: solid;
background: none;
padding: 0;
}
QDockWidget::close-button:hover, QDockWidget::float-button:hover {
background: none;
}
QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
padding: 1px -1px -1px 1px;
background: none;
}
QGCToolWidgetItem {
border-radius: 3px;
border-width: 1px;
border-style: solid;
padding: 10px 0 0 0;
margin-top: 1ex; /* leave space at the top for the title */
}
QGroupBox {
border-radius: 3px;
border-width: 1px;
border-style: solid;
padding: 10px 0 0 0;
margin-top: 1ex; /* leave space at the top for the title */
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top center; /* position at the top center */
margin: 0 3px 0 3px;
padding: 0 3px 0 0;
font: bold 8px;
}
QLabel {
background: rgba(0,0,0,0);
}
QLabel#toolBarNameLabel {
font: bold 16px;
}
QLabel#toolBarModeLabel {
font: 12px;
}
QLabel#toolBarStateLabel {
font: 12px;
}
QLabel#toolBarMessageLabel {
font: 12px;
font-style: italic;
}
QLineEdit {
border-radius: 2px;
border-width: 1px;
border-style: solid;
}
QMainWindow::separator {
width: 2px; /* when vertical */
height: 2px; /* when horizontal */
}
QMenu {
border-width: 1px;
border-style: solid;
}
QMenu::separator {
height: 1px;
margin: 8px 5px 4px 5px;
}
QMenuBar::item:disabled {
border: none;
background: none;
}
QMenuBar::item:disabled:selected {
border: none;
background: none;
}
QMenuBar::item:disabled:pressed {
background: none;
border: none;
}
QPlainTextEdit {
border-radius: 2px;
border-width: 1px;
border-style: solid;
font-family: "Monospace";
font: large;
}
QPushButton {
min-height: 20px;
max-height: 20px;
margin: 1px;
border-width: 1px;
border-style: solid;
border-radius: 2px;
padding-left: 8px;
padding-right: 8px;
}
QPushButton#forceLandButton, QPushButton#killButton {
font-weight: bold;
min-height: 30px;
background-clip: border;
border-width: 1px;
border-radius: 5px;
}
QPushButton#controlButton {
min-height: 25px;
}
QProgressBar {
border-radius: 4px;
border-width: 1px;
border-style: solid;
text-align: center;
padding: 2px;
height: 10px;
}
QProgressBar:horizontal {
height: 9px;
}
QProgressBar:vertical {
width: 9px;
}
QSlider::groove:horizontal {
border-width: 1px;
border-style: solid;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
margin: 2px 0;
}
QSlider::groove:disabled:horizontal {
border-width: 1px;
border-style: solid;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
margin: 2px 0;
}
QSlider::handle:horizontal {
border-width: 2px;
border-style: solid;
width: 18px;
margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QSlider::handle:disabled:horizontal {
border-width: 2px;
border-style: solid;
width: 18px;
margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QSlider::groove:vertical {
border-width: 1px;
border-style: solid;
width: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
margin: 2px 0;
}
QSlider::handle:vertical {
border-width: 2px;
border-style: solid;
height: 18px;
margin: 0 -5px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QSpinBox, QDoubleSpinBox {
min-height: 14px;
max-height: 18px;
border-radius: 5px;
border-width: 1px;
border-style: solid;
padding-right: 16px; /* make room for the arrows */
}
QSpinBox::up-button, QDoubleSpinBox::up-button {
subcontrol-origin: border;
subcontrol-position: top right; /* position at the top right corner */
width: 16px;
padding-right: 1px;
border: none;
}
QSpinBox::down-button, QDoubleSpinBox::down-button {
subcontrol-origin: border;
subcontrol-position: bottom right; /* position at bottom right corner */
width: 16px;
padding-right: 1px;
border: none;
}
QSpinBox::up-arrow, QDoubleSpinBox::up-arrow {
width: 16px;
}
QSpinBox::down-arrow, QDoubleSpinBox::down-arrow {
width: 16px;
}
QStatusBar {
border-width: 1px 0;
border-style: solid;
}
QTabWidget::pane { /* The tab widget frame */
border-radius: 2px;
border-width: 1px;
border-style: solid;
position: absolute;
top: -0.5em;
}
QTabWidget::tab-bar {
alignment: center;
}
/* Style the tab using the tab sub-control. Note that
it reads QTabBar _not_ QTabWidget */
QTabBar::tab {
border-radius: 4px;
min-width: 8ex;
padding: 2px;
border-width: 2px;
border-style: solid;
}
QTextEdit {
border-radius: 2px;
border-width: 1px;
border-style: solid;
}
QToolBar {
margin: 0;
border-width: 1px 0;
border-style: solid;
}
QToolButton {
font-weight: bold;
min-height: 20px;
max-height: 20px;
margin: 1px;
border-radius: 2px;
border-width: 1px;
border-style: solid;
padding-left: 3px;
padding-right: 3px;
}
QToolTip {
margin: 3px;
border: none;
border-radius: 3px;
}

533
files/styles/style-dark.css
Unescape View File

@ -1,97 +1,44 @@
QWidget { * {
background-color: #222224; background-color: #222;
color: #FFFFFF; color: #FFF;
background-clip: border; background-clip: border;
font-size: 11px; font-size: 11px;
} }
QGroupBox { *::disabled {
border: 1px solid #66666B; color: #777;
border-radius: 3px;
padding: 10px 0 0 0;
margin-top: 1ex; /* leave space at the top for the title */
} }
QCheckBox { QCheckBox {
color: #DDDDDF; color: #DDD;
} }
QCheckBox::indicator { QCheckBox::indicator {
border: 1px solid #777777; border: 1px solid #777;
border-radius: 2px; border-radius: 2px;
color: #FFFFFF;
width: 10px; width: 10px;
height: 10px; height: 10px;
} }
QLineEdit { QCheckBox::indicator:checked, QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed {
border: 1px solid #777777; background-color: #379AC3;
border-radius: 2px;
} }
QTextEdit { QComboBox {
border: 1px solid #777777; border: 1px solid #777;
border-radius: 2px; border-radius: 2px;
} }
QPlainTextEdit { QDialog {
border: 1px solid #777777; border: 1px solid #62676B;
border-radius: 2px; border-radius: 2px;
font-family: "Monospace";
font: large;
} }
QComboBox { QDockWidget {
border: 1px solid #777777; border: 10px solid #666;
border-radius: 2px; border-radius: 1px;
} }
QCheckBox::indicator:checked {
background-color: #379AC3;
}
QCheckBox::indicator:checked:hover {
background-color: #379AC3;
}
QCheckBox::indicator:checked:pressed {
background-color: #379AC3;
}
QCheckBox::indicator:indeterminate:hover {
image: url(:/files/images/checkbox_indeterminate_hover.png);
}
QCheckBox::indicator:indeterminate:pressed {
image: url(:/files/images/checkbox_indeterminate_pressed.png);
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top center; /* position at the top center */
margin: 0 3px 0 3px;
padding: 0 3px 0 0;
font: bold 8px;
color: #DDDDDF;
}
QMainWindow::separator {
background-color: #323235;
width: 2px; /* when vertical */
height: 2px; /* when horizontal */
}
QMainWindow::separator:hover {
background: white;
}
QGCToolWidgetItem {
border: 1px solid #66666B;
border-radius: 3px;
padding: 10px 0 0 0;
margin-top: 1ex; /* leave space at the top for the title */
}
QDockWidget::close-button, QDockWidget::float-button { QDockWidget::close-button, QDockWidget::float-button {
border: 1px solid transparent; border: 1px solid transparent;
background: none; background: none;
@ -103,13 +50,8 @@ QDockWidget::close-button:hover, QDockWidget::float-button:hover {
} }
QDockWidget::close-button:pressed, QDockWidget::float-button:pressed { QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
padding: 1px -1px -1px 1px; padding: 1px -1px -1px 1px;
background: none; background: none;
}
QDockWidget {
border: 10px solid #66666B;
border-radius: 1px;
} }
QDockWidget::title { QDockWidget::title {
@ -121,324 +63,341 @@ QDockWidget::title {
border-bottom: 2px solid #2C3A4A; border-bottom: 2px solid #2C3A4A;
} }
QSeparator { QGCToolWidgetItem {
color: #EEEEEE; border: 1px solid #666;
} border-radius: 3px;
padding: 10px 0 0 0;
margin-top: 1ex; /* leave space at the top for the title */
QSpinBox {
min-height: 14px;
max-height: 18px;
border: 1px solid #4A4A4F;
border-radius: 5px;
} }
QSpinBox::up-button { QGroupBox {
subcontrol-origin: border; border: 1px solid #666;
subcontrol-position: top right; /* position at the top right corner */ border-radius: 3px;
border-image: url(:/files/images/actions/go-up.svg) 1; padding: 10px 0 0 0;
border-width: 1px; margin-top: 1ex; /* leave space at the top for the title */
}
QSpinBox::down-button {
subcontrol-origin: border;
subcontrol-position: bottom right; /* position at the top right corner */
border-image: url(:/files/images/actions/go-down.svg) 1;
border-width: 1px;
} }
QDoubleSpinBox { QGroupBox::title {
min-height: 14px; subcontrol-origin: margin;
max-height: 18px; subcontrol-position: top center;
border: 1px solid #4A4A4F; margin: 0 3px 0 3px;
border-radius: 5px; padding: 0 3px 0 0;
font: bold 8px;
color: #DDD;
} }
QDoubleSpinBox::up-button { QLabel {
subcontrol-origin: border; background-color: transparent;
subcontrol-position: top right; /* position at the top right corner */
border-image: url(:/files/images/actions/go-up.svg) 1;
border-width: 1px;
max-width: 5px;
} }
QDoubleSpinBox::down-button { QLabel:disabled {
subcontrol-origin: border; color: #353535;
subcontrol-position: bottom right; /* position at the top right corner */
border-image: url(:/files/images/actions/go-down.svg) 1;
border-width: 1px;
max-width: 5px;
} }
QPushButton { QLabel#toolBarNameLabel {
min-height: 20px; font: bold 16px;
max-height: 20px; color: #3C7B9E;
border: 1px solid #465158;
margin: 1px;
border-radius: 2px;
padding-left: 8px;
padding-right: 8px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);
} }
QPushButton:disabled { QLabel#toolBarModeLabel {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208); font: 12px;
} }
QPushButton:checked { QLabel#toolBarStateLabel {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52); font: 12px;
color: #3C7B9E;
} }
QPushButton:pressed { QLabel#toolBarMessageLabel {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bbbbbb, stop: 1 #b0b0b0); font: 12px;
font-style: italic;
color: #3C7B9E;
} }
QToolButton { QLineEdit {
font-weight: bold; border: 1px solid #777;
min-height: 20px;
max-height: 20px;
border: 1px solid #4A4A4F;
margin: 1px;
border-radius: 2px; border-radius: 2px;
padding-left: 3px;
padding-right: 3px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);
} }
QToolButton:disabled { QMainWindow::separator {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208); background-color: #323235;
width: 2px; /* when vertical */
height: 2px; /* when horizontal */
} }
QToolButton:checked { QMainWindow::separator:hover {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52); background-color: #FFF;
} }
QToolButton:pressed { QMenu {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bbbbbb, stop: 1 #b0b0b0); border: 1px solid #379AC3;
} }
QToolTip { QMenu::item:selected {
background-color: #3D5368; background-color: #666;
border:0 solid #379AC3;
margin: 3px;
border-radius: 3px;
color: #DDDDDF;
} }
QMenu { QMenu::separator {
border: 1px solid #379AC3; height: 1px;
background: #379AC3;
margin: 8px 5px 4px 5px;
} }
QMenu::separator { QMenuBar::item:selected {
height: 1px; background-color: #666;
background: #379AC3; }
margin: 8px 5px 4px 5px;
}
QMenuBar::item:disabled { QMenuBar::item:disabled {
border: none; border: none;
background: none; background: none;
} }
QMenuBar::item:disabled:selected { QPlainTextEdit {
border: none; border: 1px solid #777;
background: none; border-radius: 2px;
font-family: "Monospace";
font: large;
} }
QMenuBar::item:disabled:pressed { QProgressBar {
background: none; border: 1px solid #4A4A4A;
border: none; border-radius: 4px;
text-align: center;
padding: 2px;
color: #DDD;
background-color: #111;
height: 10px;
} }
QSlider { QProgressBar::chunk {
background-color: transparent; background-color: #3C7B9E;
} }
QSlider::groove:horizontal { QProgressBar::chunk#batteryBar {
border: 1px solid #999999; background-color: green;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ }
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #4A4A4F, stop:1 #4A4A4F);
margin: 2px 0;
}
QSlider::groove:disabled:horizontal {
border: 1px solid #454545;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #4A4A4F, stop:1 #4A4A4F);
margin: 2px 0;
}
QSlider::handle:horizontal {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208);
border: 2px solid #379AC3;
width: 18px;
margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QSlider::handle:disabled:horizontal {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #535258, stop: 1 #050508);
border: 2px solid #444444;
width: 18px;
margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QSlider::groove:vertical {
border: 1px solid #999999;
width: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop:0 #4A4A4F, stop:1 #4A4A4F);
margin: 2px 0;
}
QSlider::handle:vertical {
background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #232228, stop: 1 #020208);
border: 2px solid #379AC3;
height: 18px;
margin: 0 -5px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QStatusBar { QProgressBar::chunk#speedBar {
border: 0; background-color: yellow;
border-bottom: 1px solid #101010; }
border-top: 1px solid #4F4F4F;
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818); QProgressBar::chunk#thrustBar {
background-color: orange;
}
QProgressBar:horizontal {
height: 9px;
}
QProgressBar:vertical {
width: 9px;
}
QPushButton {
min-height: 20px;
max-height: 20px;
border: 1px solid #465158;
margin: 1px;
border-radius: 2px;
padding-left: 8px;
padding-right: 8px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);
}
QPushButton#controlButton {
min-height: 25px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00);
} }
QPushButton#killButton { QPushButton#killButton {
font-weight: bold; font-weight: bold;
min-height: 30px; min-height: 30px;
color: #000000; color: #000;
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffb917, stop:1 #b37300);
stop:0 #ffb917, stop:1 #b37300)
background-clip: border; background-clip: border;
border-width: 1px; border-width: 1px;
border-color: #555555; border-color: #555;
border-radius: 5px; border-radius: 5px;
} }
QPushButton:checked {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52);
}
QPushButton:checked#controlButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718);
}
QPushButton:disabled {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208);
}
QPushButton:hover {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #333);
}
QPushButton:pressed {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bbbbbb, stop: 1 #b0b0b0);
}
QPushButton:pressed#killButton { QPushButton:pressed#killButton {
font-weight: bold; font-weight: bold;
min-height: 30px; min-height: 30px;
color: #000000; color: #000000;
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #bb8500, stop:1 #903000);
stop:0 #bb8500, stop:1 #903000);
background-clip: border; background-clip: border;
border-width: 1px; border-width: 1px;
border-color: #555555; border-color: #555555;
border-radius: 5px; border-radius: 5px;
} }
QPushButton#controlButton { QSeparator {
min-height: 25px; color: #EEE;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00);
} }
QPushButton:checked#controlButton { QSlider {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718); background-color: transparent;
} }
QProgressBar { QSlider::groove:horizontal {
border: 1px solid #4A4A4F; border: 1px solid #999999;
border-radius: 4px; height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
text-align: center; background-color: #4A4A4A;
padding: 2px; margin: 2px 0;
color: #DDDDDF;
background-color: #111118;
height: 10px;
} }
QProgressBar:horizontal { QSlider::groove:horizontal:disabled {
height: 9px; border: 1px solid #454545;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background-color: #4A4A4A;
margin: 2px 0;
} }
QProgressBar:vertical { QSlider::groove:vertical {
width: 9px; border: 1px solid #999999;
width: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background-color: #4A4A4A;
margin: 2px 0;
} }
QProgressBar::chunk { QSlider::handle:horizontal {
background-color: #3C7B9E; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208);
border: 2px solid #379AC3;
width: 18px;
margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
} }
QProgressBar::chunk#batteryBar { QSlider::handle:horizontal:disabled {
background-color: green; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #535258, stop: 1 #050508);
border: 2px solid #444444;
width: 18px;
margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
} }
QProgressBar::chunk#speedBar { QSlider::handle:vertical {
background-color: yellow; background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #232228, stop: 1 #020208);
border: 2px solid #379AC3;
height: 18px;
margin: 0 -5px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
} }
QProgressBar::chunk#thrustBar { QSizeGrip {
background-color: orange; background: none;
} }
QDialog { QSpinBox, QDoubleSpinBox {
border: 1px solid #62676B; min-height: 14px;
border-radius: 2px; max-height: 18px;
border: 1px solid #4A4A4A;
border-radius: 5px;
} }
QTabWidget::pane { /* The tab widget frame */ QSpinBox::down-arrow, QDoubleSpinBox::down-arrow {
border: 1px solid #62676B; image: url(:/files/images/actions/go-down.svg);
border-radius: 2px; width: 16px;
position: absolute;
top: -0.5em;
} }
QTabWidget::tab-bar { QSpinBox::down-button, QDoubleSpinBox::down-button {
alignment: center; border: none;
}
QSpinBox::up-arrow, QDoubleSpinBox::up-arrow {
image: url(:/files/images/actions/go-up.svg);
width: 16px;
}
QSpinBox::up-button, QDoubleSpinBox::up-button {
border: none;
}
QStatusBar {
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818);
} }
/* Style the tab using the tab sub-control. Note that QTabBar::tab {
it reads QTabBar _not_ QTabWidget */
QTabBar::tab {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #090909, stop: 1 #353535);
border: 2px solid #62676B; border: 2px solid #62676B;
border-radius: 4px; border-radius: 4px;
min-width: 8ex; min-width: 8ex;
padding: 2px; padding: 2px;
} }
QTabBar::tab:selected, QTabBar::tab:hover { QTabBar::tab:selected, QTabBar::tab:hover {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #090909, stop: 1 #353535);
border: 2px solid #379AC3; border: 2px solid #379AC3;
} }
QTabBar::tab:selected { QTabWidget::tab-bar {
border: 2px solid #379AC3; alignment: center;
} }
QToolBar { QTabWidget::pane {
margin: 0px; border: 1px solid #62676B;
border-bottom: 1px solid #484848; border-radius: 2px;
border-top: 1px solid #969696; position: absolute;
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #8B8B8B, stop:0.3 #808080, stop:0.34 #747474, stop:1 #484848); top: -0.5em;
} }
QLabel { QTextEdit {
background-color: transparent; border: 1px solid #777;
border-radius: 2px;
} }
QLabel:disabled { QToolBar {
color: #353535; border-top-color: #969696;
border-bottom-color: #484848;
background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818);
} }
QLabel#toolBarNameLabel { QToolButton {
font: bold 16px; font-weight: bold;
color: #3C7B9E; min-height: 20px;
max-height: 20px;
border: 1px solid #4A4A4A;
margin: 1px;
border-radius: 2px;
padding-left: 3px;
padding-right: 3px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);
} }
QLabel#toolBarModeLabel { QToolButton:disabled {
font: 12px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208);
} }
QLabel#toolBarStateLabel { QToolButton:checked {
font: 12px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52);
color: #3C7B9E;
} }
QLabel#toolBarMessageLabel { QToolButton:pressed {
font: 12px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bbbbbb, stop: 1 #b0b0b0);
font-style: italic;
color: #3C7B9E;
} }
QToolTip {
background-color: #3D5368;
border:0 solid #379AC3;
margin: 3px;
border-radius: 3px;
color: #DDD;
}

337
files/styles/style-light.css
Unescape View File

@ -1,11 +1,12 @@
/* These general styles need to go first so that following definitions override them */
* { * {
background-color: #F6F6F6; background-color: #F6F6F6;
color: #000; color: #000;
background-clip: border;
font-size: 11px;
} }
*::disabled { *::disabled {
color: #777; color: #AAA;
} }
QCheckBox { QCheckBox {
@ -13,97 +14,169 @@ QCheckBox {
} }
QCheckBox::indicator { QCheckBox::indicator {
background-color: #F6F6F6; border: 1px solid #111;
border-color: #111; border-radius: 2px;
color: #222; width: 10px;
height: 10px;
} }
QCheckBox::indicator:checked { QCheckBox::indicator:checked, QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:pressed {
background-color: #777; background-color: #379AC3;
} }
QComboBox { QComboBox {
border-color: #111; border: 1px solid #111;
border-radius: 2px;
} }
QDockWidget { QDialog {
border: 1px solid #32345E; border: 1px solid #777;
border-radius: 2px;
} }
QDockWidget::title { QDockWidget {
background: #EEE; border: 1px solid #32345E;
color: #111; border-radius: 1px;
border-bottom: 1px solid #222;
} }
QDockWidget::close-button, QDockWidget::float-button { QDockWidget::close-button, QDockWidget::float-button {
border: 1px solid transparent; border: 1px solid transparent;
background-color: #EEE; background: none;
padding: 0;
} }
QDockWidget::close-button:hover, QDockWidget::float-button:hover { QDockWidget::close-button:hover, QDockWidget::float-button:hover {
background-color: #AAA; background: none;
}
QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
padding: 1px -1px -1px 1px;
background: none;
}
QDockWidget::title {
text-align: left;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #3F556A, stop: 1 #293645);
color: #111;
padding-left: 10px;
height: 14px;
border-bottom: 2px solid #222;
}
QGCToolWidgetItem {
border: 1px solid #666;
border-radius: 3px;
padding: 10px 0 0 0;
margin-top: 1ex; /* leave space at the top for the title */
} }
QGroupBox { QGroupBox {
border-color: #222216; border: 1px solid #666;
border-radius: 3px;
padding: 10px 0 0 0;
margin-top: 1ex; /* leave space at the top for the title */
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top center;
margin: 0 3px 0 3px;
padding: 0 3px 0 0;
font: bold 8px;
color: #000;
} }
QLabel { QLabel {
background-color: transparent; background-color: transparent;
} }
QLineEdit { QLabel:disabled {
border-color: #111; color: #353535;
} }
QGroupBox::title { QLabel#toolBarNameLabel {
color: #000; font: bold 16px;
color: #3C7B9E;
}
QLabel#toolBarModeLabel {
font: 12px;
}
QLabel#toolBarStateLabel {
font: 12px;
color: #3C7B9E;
}
QLabel#toolBarMessageLabel {
font: 12px;
font-style: italic;
color: #3C7B9E;
}
QLineEdit {
border: 1px solid #111;
border-radius: 2px;
} }
QMainWindow::separator { QMainWindow::separator {
background-color: #090909; background-color: #090909;
width: 2px; /* when vertical */
height: 2px; /* when horizontal */
} }
QMainWindow::separator:hover { QMainWindow::separator:hover {
background-color: #222; background-color: #222;
} }
QMenuBar::item:selected { QMenu {
background-color: #CCC; border: 1px solid #379AC3;
} }
QMenuBar::item:disabled { QMenu::item:selected {
border: none; background-color: #CCC;
background: none;
} }
QMenuBar::item:disabled:selected { QMenu::separator {
border: none; height: 1px;
background: none; background: #379AC3;
margin: 8px 5px 4px 5px;
} }
QMenuBar::item:disabled:pressed { QMenuBar::item:selected {
background: none; background-color: #CCC;
border: none;
} }
QMenu::item:selected { QMenuBar::item:disabled {
background-color: #CCC; border: none;
background: none;
} }
QPlainTextEdit { QPlainTextEdit {
border-color: #111; border: 1px solid #111;
border-radius: 2px;
font-family: "Monospace";
font: large;
} }
QProgressBar { QProgressBar {
border-color: #666; border: 1px solid #666;
border-radius: 4px;
text-align: center;
padding: 2px;
color: #000;
background: none;
height: 10px;
} }
QProgressBar::chunk { QProgressBar::chunk {
background-color: #666; background-color: #666;
} }
QProgressBar::chunk#batteryBar {
background-color: green;
}
QProgressBar::chunk#speedBar { QProgressBar::chunk#speedBar {
background-color: yellow; background-color: yellow;
} }
@ -112,20 +185,53 @@ QProgressBar::chunk#thrustBar {
background-color: orange; background-color: orange;
} }
QProgressBar QLabel { QProgressBar:horizontal {
background-color: #FFF; height: 9px;
}
QProgressBar:vertical {
width: 9px;
} }
QPushButton { QPushButton {
border-style: solid; min-height: 20px;
border-color: #444; max-height: 20px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888); border: 1px solid #465158;
margin: 1px;
border-radius: 2px;
padding-left: 8px;
padding-right: 8px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);
}
QPushButton#controlButton {
min-height: 25px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00);
}
QPushButton#killButton {
font-weight: bold;
min-height: 30px;
color: #000;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #ffb917, stop:1 #b37300);
background-clip: border;
border-width: 1px;
border-color: #555;
border-radius: 5px;
} }
QPushButton:checked { QPushButton: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);
} }
QPushButton:checked#controlButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718);
}
QPushButton:disabled {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208);
}
QPushButton:hover { QPushButton:hover {
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);
} }
@ -134,77 +240,154 @@ QPushButton:pressed {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #AAA, stop: 1 #666); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #AAA, stop: 1 #666);
} }
QPushButton#controlButton { QPushButton:pressed#killButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00); font-weight: bold;
} min-height: 30px;
color: #000000;
QPushButton:checked#controlButton { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #bb8500, stop:1 #903000);
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718); background-clip: border;
border-width: 1px;
border-color: #555555;
border-radius: 5px;
} }
QSeparator { QSeparator {
color: #EEE; color: #EEE;
} }
QSpinBox { QSlider {
border-color: #4A4A4F; background-color: transparent;
}
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 */
background-color: #4A4A4A;
margin: 2px 0;
} }
QSpinBox::up-arrow, QDoubleSpinBox::up-arrow { QSlider::groove:horizontal:disabled {
image: url(:/files/images/actions/go-up.svg); border: 1px solid #454545;
width: 16px; height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background-color: #4A4A4A;
margin: 2px 0;
}
QSlider::groove:vertical {
border: 1px solid #999999;
width: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background-color: #4A4A4A;
margin: 2px 0;
}
QSlider::handle:horizontal {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208);
border: 2px solid #379AC3;
width: 18px;
margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QSlider::handle:horizontal:disabled {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #535258, stop: 1 #050508);
border: 2px solid #444444;
width: 18px;
margin: -5px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QSlider::handle:vertical {
background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #232228, stop: 1 #020208);
border: 2px solid #379AC3;
height: 18px;
margin: 0 -5px; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QSizeGrip {
background: none;
}
QSpinBox, QDoubleSpinBox {
min-height: 14px;
max-height: 18px;
border: 1px solid #4A4A4A;
border-radius: 5px;
} }
QSpinBox::down-arrow, QDoubleSpinBox::down-arrow { QSpinBox::down-arrow, QDoubleSpinBox::down-arrow {
image: url(:/files/images/actions/go-down.svg); image: url(:/files/images/actions/go-down.svg);
width: 16px; width: 16px;
} }
QStatusBar { QSpinBox::down-button, QDoubleSpinBox::down-button {
border-bottom-color: #111; border: none;
border-top-color: #EEE;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
} }
QTabBar::tab { QSpinBox::up-arrow, QDoubleSpinBox::up-arrow {
border-color: #62676B; image: url(:/files/images/actions/go-up.svg);
width: 16px;
}
QSpinBox::up-button, QDoubleSpinBox::up-button {
border: none;
}
QStatusBar {
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);
} }
QTabBar::tab:hover { QTabBar::tab {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777); border: 2px solid #62676B;
border-radius: 4px;
min-width: 8ex;
padding: 2px;
} }
QTabBar::tab:pressed { QTabBar::tab:selected, QTabBar::tab:hover {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #AAA, stop: 1 #666); border: 2px solid #379AC3;
} }
QTabBar::tab:selected { QTabWidget::tab-bar {
border-color: #379AC3; alignment: center;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #AAA, stop: 1 #666);
} }
QTabWidget::pane { /* The tab widget frame */ QTabWidget::pane {
border-color: #62676B; border: 1px solid #62676B;
border-radius: 2px;
position: absolute;
top: -0.5em;
} }
QTextEdit { QTextEdit {
border-color: #222; border: 1px solid #222;
border-radius: 2px;
} }
QToolBar { QToolBar {
border-top-color: #969696; border-top-color: #969696;
border-bottom-color: #484848; border-bottom-color: #484848;
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #090909, stop:0.3 #404040, stop:0.34 #383838, stop:1 #F6F6F6); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
} }
QToolButton { QToolButton {
border-color: #4A4A4F; font-weight: bold;
min-height: 20px;
max-height: 20px;
border: 1px solid #4A4A4A;
margin: 1px;
border-radius: 2px;
padding-left: 3px;
padding-right: 3px;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #C3C2C8, stop: 1 #828288); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #C3C2C8, stop: 1 #828288);
} }
QToolButton:disabled {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208);
}
QToolButton:checked { QToolButton:checked {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #090909, stop: 1 #353535); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52);
} }
QToolButton:pressed { QToolButton:pressed {
@ -212,5 +395,9 @@ QToolButton:pressed {
} }
QToolTip { QToolTip {
color: #000; background-color: #3D5368;
border:0 solid #379AC3;
margin: 3px;
border-radius: 3px;
color: #DDD;
} }

11
src/ui/MainWindow.cc
Unescape View File

@ -71,7 +71,6 @@ This file is part of the QGROUNDCONTROL project
#include "LogCompressor.h" #include "LogCompressor.h"
// Set up some constants // Set up some constants
const QString MainWindow::baseStyle = ":files/styles/style-base.css";
const QString MainWindow::defaultDarkStyle = ":files/styles/style-dark.css"; const QString MainWindow::defaultDarkStyle = ":files/styles/style-dark.css";
const QString MainWindow::defaultLightStyle = ":files/styles/style-light.css"; const QString MainWindow::defaultLightStyle = ":files/styles/style-light.css";
@ -1249,15 +1248,9 @@ bool MainWindow::loadStyle(QGC_MAINWINDOW_STYLE style, QString cssFile)
// Signal to the user that the app will pause to apply a new stylesheet // Signal to the user that the app will pause to apply a new stylesheet
qApp->setOverrideCursor(Qt::WaitCursor); qApp->setOverrideCursor(Qt::WaitCursor);
// Now fetch the base stylesheet. qApp->setStyleSheet(styleSheet.readAll());
QFile baseStyleSheet(baseStyle);
QString newStyle(baseStyleSheet.readAll());
// Then append the desired coloring and apply to QGC. // And save the new stylesheet path.
newStyle.append(styleSheet.readAll());
qApp->setStyleSheet(newStyle);
// And save the new stylesheet path.
if (currentStyle == QGC_MAINWINDOW_STYLE_LIGHT) if (currentStyle == QGC_MAINWINDOW_STYLE_LIGHT)
{ {
lightStyleFileName = cssFile; lightStyleFileName = cssFile;

1
src/ui/MainWindow.h
Unescape View File

@ -107,7 +107,6 @@ public:
QGC_MAINWINDOW_STYLE_LIGHT QGC_MAINWINDOW_STYLE_LIGHT
}; };
static const QString baseStyle;
static const QString defaultDarkStyle; static const QString defaultDarkStyle;
static const QString defaultLightStyle; static const QString defaultLightStyle;

Write Preview
Loading…
Cancel
Save