Commit 18c9b4e6 authored by Bryant's avatar Bryant

Further refinements to the dark/light themes. Focused mostly on the status bar at the bottom.

parent b8becd3b
...@@ -70,6 +70,18 @@ QDockWidget::title { ...@@ -70,6 +70,18 @@ QDockWidget::title {
height: 14px; height: 14px;
} }
QGCMAVLinkLogPlayer {
background: none;
}
QGCMAVLinkLogPlayer QLabel {
color: #FFF;
}
QGCMAVLinkLogPlayer QLabel:disabled {
color: #AAA;
}
QGCToolBar QLabel { QGCToolBar QLabel {
font-size: 10pt; font-size: 10pt;
margin: 3px 2px; margin: 3px 2px;
...@@ -182,6 +194,7 @@ QMenu::item:selected, QMenu::item:checked:selected { ...@@ -182,6 +194,7 @@ QMenu::item:selected, QMenu::item:checked:selected {
QMenu::item:checked { QMenu::item:checked {
background-color: #B8D3E6; background-color: #B8D3E6;
color: #000;
} }
QMenu::separator { QMenu::separator {
...@@ -329,7 +342,7 @@ QSlider::groove:horizontal { ...@@ -329,7 +342,7 @@ QSlider::groove:horizontal {
QSlider::groove:horizontal:disabled { QSlider::groove:horizontal:disabled {
border: 1px solid #454545; border: 1px solid #454545;
background-color: #CCC; background-color: #4A4A4A;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ 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; margin: 2px 0;
} }
......
...@@ -70,6 +70,18 @@ QDockWidget::title { ...@@ -70,6 +70,18 @@ QDockWidget::title {
height: 14px; height: 14px;
} }
QGCMAVLinkLogPlayer {
background: none;
}
QGCMAVLinkLogPlayer QLabel {
color: #FFF;
}
QGCMAVLinkLogPlayer QLabel:disabled {
color: #666;
}
QGCToolBar QLabel { QGCToolBar QLabel {
font-size: 10pt; font-size: 10pt;
margin: 3px 2px; margin: 3px 2px;
...@@ -329,7 +341,7 @@ QSlider::groove:horizontal { ...@@ -329,7 +341,7 @@ QSlider::groove:horizontal {
} }
QSlider::groove:horizontal:disabled { QSlider::groove:horizontal:disabled {
border: 1px solid #454545; border: 1px solid #999;
background-color: #CCC; background-color: #CCC;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ 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; margin: 2px 0;
......
...@@ -561,3 +561,14 @@ void QGCMAVLinkLogPlayer::changeEvent(QEvent *e) ...@@ -561,3 +561,14 @@ void QGCMAVLinkLogPlayer::changeEvent(QEvent *e)
break; break;
} }
} }
/**
* Implement paintEvent() so that stylesheets work for our custom widget.
*/
void QGCMAVLinkLogPlayer::paintEvent(QPaintEvent *)
{
QStyleOption opt;
opt.init(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
\ No newline at end of file
...@@ -99,6 +99,7 @@ protected: ...@@ -99,6 +99,7 @@ protected:
private: private:
Ui::QGCMAVLinkLogPlayer *ui; Ui::QGCMAVLinkLogPlayer *ui;
virtual void paintEvent(QPaintEvent *);
}; };
#endif // QGCMAVLINKLOGPLAYER_H #endif // QGCMAVLINKLOGPLAYER_H
...@@ -722,9 +722,9 @@ void UASView::changeEvent(QEvent *e) ...@@ -722,9 +722,9 @@ void UASView::changeEvent(QEvent *e)
* Implement paintEvent() so that stylesheets work for our custom widget. * Implement paintEvent() so that stylesheets work for our custom widget.
*/ */
void UASView::paintEvent(QPaintEvent *) void UASView::paintEvent(QPaintEvent *)
{ {
QStyleOption opt; QStyleOption opt;
opt.init(this); opt.init(this);
QPainter p(this); QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
} }
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