From 1fef8b3b73f96e34e5342839a4346df47cc8fe25 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 21 Aug 2012 15:43:36 -0700 Subject: [PATCH] Addressed issue #26. Select System, Plugins and System are disabled when neccessary. Removed style-outdoor-dark.css. Moved the other two .css files and Vera.ttf into files/styles. --- files/images/style-outdoor-dark.css | 426 ------------------ files/{images => styles}/Vera.ttf | Bin .../style-indoor.css} | 15 + files/{images => styles}/style-outdoor.css | 15 + qgroundcontrol.pri | 6 +- qgroundcontrol.qrc | 6 +- src/ui/MainWindow.cc | 12 +- src/ui/MainWindow.ui | 9 +- src/ui/map3D/Q3DWidget.cc | 2 +- 9 files changed, 49 insertions(+), 442 deletions(-) delete mode 100644 files/images/style-outdoor-dark.css rename files/{images => styles}/Vera.ttf (100%) rename files/{images/style-mission.css => styles/style-indoor.css} (97%) rename files/{images => styles}/style-outdoor.css (96%) diff --git a/files/images/style-outdoor-dark.css b/files/images/style-outdoor-dark.css deleted file mode 100644 index c0d0015f1..000000000 --- a/files/images/style-outdoor-dark.css +++ /dev/null @@ -1,426 +0,0 @@ -* { font-family: "Bitstream Vera Sans"; font: "Roman"; font-size: 12px; } -QWidget#colorIcon {} - -QWidget { -background-color: #050508; -color: #FFFFFF; -background-clip: border; -font-size: 11px; -} - -QGroupBox { -border: 1px solid #66666B; -border-radius: 3px; -padding: 10px 0px 0px 0px; -margin-top: 1ex; /* leave space at the top for the title */ -} - -QCheckBox { -/*background-color: #252528;*/ -color: #DDDDDF; -} - -QCheckBox::indicator { - border: 1px solid #777777; - border-radius: 2px; - color: #DDDDDF; - width: 10px; - height: 10px; -} - -QLineEdit { -border: 1px solid #777777; - border-radius: 2px; -} - -QTextEdit { -border: 1px solid #777777; - border-radius: 2px; -} - -QPlainTextEdit { -border: 1px solid #777777; - border-radius: 2px; -} - -QComboBox { -border: 1px solid #777777; - border-radius: 2px; - } - - 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 0px 3px; - padding: 0 3px 0px 0px; - font: bold 8px; - color: #DDDDDF; - } - - QMainWindow::separator { - background: #090909; - width: 2px; /* when vertical */ - height: 2px; /* when horizontal */ - } - - QMainWindow::separator:hover { - background: white; - } - - QGCToolWidgetItem { - border: 1px solid #66666B; - border-radius: 3px; - padding: 10px 0px 0px 0px; - margin-top: 1ex; /* leave space at the top for the title */ - } - - QDockWidget { - border: 1px solid #32345E; - /* titlebar-close-icon: url(close.png); - titlebar-normal-icon: url(undock.png);*/ - } - - QDockWidget::title { - text-align: left; /* align the text to the left */ - background: lightgray; - padding-left: 5px; - } - - QDockWidget::close-button, QDockWidget::float-button { - border: 1px solid transparent; - background: darkgray; - padding: 0px; - } - - QDockWidget::close-button:hover, QDockWidget::float-button:hover { - background: gray; - } - - QDockWidget::close-button:pressed, QDockWidget::float-button:pressed { - padding: 1px -1px -1px 1px; - } - - - -QDockWidget::close-button, QDockWidget::float-button { - background-color: #181820; - color: #EEEEEE; -} - -QDockWidget::title { - text-align: left; - background: #121214; - color: #4A4A4F; - padding-left: 5px; - height: 10px; - border-bottom: 1px solid #555555; -} - -QSeparator { - color: #EEEEEE; - } - - -QSpinBox { - min-height: 14px; - max-height: 18px; - border: 1px solid #4A4A4F; - border-radius: 5px; -} - -QSpinBox::up-button { - subcontrol-origin: border; - subcontrol-position: top right; /* position at the top right corner */ - border-image: url(:/files/images/actions/go-up.svg) 1; - border-width: 1px; -} -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 { - min-height: 14px; - max-height: 18px; - border: 1px solid #4A4A4F; - border-radius: 5px; -} - -QDoubleSpinBox::up-button { - subcontrol-origin: border; - 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 { - 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; - max-width: 5px; -} - -QPushButton { - font-weight: bold; - min-height: 18px; - max-height: 18px; - border: 2px solid #4A4A4F; - border-radius: 5px; - padding-left: 5px; - padding-right: 5px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208); -} - -QPushButton:checked { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #404040, stop: 1 #808080); - border: 2px solid #379AC3; -} - -QPushButton:pressed { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bbbbbb, stop: 1 #b0b0b0); - border: 2px solid #379AC3; -} - -QToolButton { - font-weight: bold; - min-height: 16px; - min-width: 24px; - max-height: 18px; - border: 2px solid #4A4A4F; - border-radius: 5px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #232228, stop: 1 #020208); -} - -QToolButton:checked { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #090909, stop: 1 #353535); - border: 2px solid #379AC3; -} - -QToolButton:pressed { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #bbbbbb, stop: 1 #b0b0b0); - border: 2px solid #379AC3; -} - -QToolTip { - 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 */ - 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::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; - } - -QPushButton#forceLandButton { - font-weight: bold; - min-height: 30px; - color: #000000; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #ffee01, stop:1 #ae8f00) url("ICONDIR/control/emergency-button.png"); - background-clip: border; - border-width: 1px; - border-color: #555555; - border-radius: 5px; -} - -QPushButton:pressed#forceLandButton { - font-weight: bold; - min-height: 30px; - color: #000000; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #bbaa00, stop:1 #a05b00) url("ICONDIR/control/emergency-button.png"); - background-clip: border; - border-width: 1px; - border-color: #555555; - border-radius: 5px; -} - -QPushButton#killButton { - font-weight: bold; - min-height: 30px; - color: #000000; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #ffb917, stop:1 #b37300) url("ICONDIR/control/emergency-button.png"); - background-clip: border; - border-width: 1px; - border-color: #555555; - border-radius: 5px; -} - -QPushButton:pressed#killButton { - font-weight: bold; - min-height: 30px; - color: #000000; - background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #bb8500, stop:1 #903000) url("ICONDIR/control/emergency-button.png"); - background-clip: border; - border-width: 1px; - border-color: #555555; - border-radius: 5px; -} - -QPushButton#controlButton { - min-height: 25px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00); -} - -QPushButton:checked#controlButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718); -} - -QProgressBar { - border: 1px solid #4A4A4F; - border-radius: 4px; - text-align: center; - padding: 2px; - color: #DDDDDF; - background-color: #111118; - height: 10px; -} - -QProgressBar:horizontal { - height: 9px; -} - -QProgressBar:vertical { - width: 9px; -} - -QProgressBar::chunk { - background-color: #3C7B9E; -} - -QProgressBar::chunk#batteryBar { - background-color: green; -} - -QProgressBar::chunk#speedBar { - background-color: yellow; -} - -QProgressBar::chunk#thrustBar { - background-color: orange; -} - -QDialog { - border: 1px solid #62676B; - border-radius: 2px; -} - - QTabWidget::pane { /* The tab widget frame */ - border: 1px solid #62676B; - border-radius: 2px; - 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 { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #090909, stop: 1 #353535); - border: 2px solid #62676B; - border-radius: 4px; - min-width: 8ex; - padding: 2px; - } - - 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; - } - - QTabBar::tab:selected { - border: 2px solid #379AC3; - } - -QLabel { - background-color: transparent; -} - -QLabel#toolBarNameLabel { - font: bold 16px; - color: #3C7B9E; -} - -QLabel#toolBarModeLabel { - font: 12px; -} - -QLabel#toolBarStateLabel { - font: 12px; - color: #3C7B9E; -} - -QLabel#toolBarMessageLabel { - font: 12px; - font-style: italic; - color: #3C7B9E; -} - diff --git a/files/images/Vera.ttf b/files/styles/Vera.ttf similarity index 100% rename from files/images/Vera.ttf rename to files/styles/Vera.ttf diff --git a/files/images/style-mission.css b/files/styles/style-indoor.css similarity index 97% rename from files/images/style-mission.css rename to files/styles/style-indoor.css index 8b74a0d68..e75fb48a3 100644 --- a/files/images/style-mission.css +++ b/files/styles/style-indoor.css @@ -247,6 +247,21 @@ QMenu::separator { margin-right: 5px; } +QMenuBar::item:disabled { + border: none; + background: none; +} + +QMenuBar::item:diabled:selected { + border: none; + background: none; +} + +QMenuBar::item:disabled:pressed { + background: none; + border: none; +} + 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/files/images/style-outdoor.css b/files/styles/style-outdoor.css similarity index 96% rename from files/images/style-outdoor.css rename to files/styles/style-outdoor.css index f43f04196..cffcc19dd 100644 --- a/files/images/style-outdoor.css +++ b/files/styles/style-outdoor.css @@ -87,6 +87,21 @@ border: 1px solid #111111; background: white; } +QMenuBar::item:disabled { + border: none; + background: none; +} + +QMenuBar::item:diabled:selected { + border: none; + background: none; +} + +QMenuBar::item:disabled:pressed { + background: none; + border: none; +} + QDockWidget { border: 1px solid #32345E; /* titlebar-close-icon: url(close.png); diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 234950165..69d21e384 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -52,8 +52,8 @@ macx|macx-g++42|macx-g++: { # Copy google earth starter file QMAKE_POST_LINK += && cp -f $$BASEDIR/files/images/earth.html $$TARGETDIR/qgroundcontrol.app/Contents/MacOS # Copy CSS stylesheets - QMAKE_POST_LINK += && cp -f $$BASEDIR/files/images/style-mission.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/style-indoor.css - QMAKE_POST_LINK += && cp -f $$BASEDIR/files/images/style-outdoor.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS + QMAKE_POST_LINK += && cp -f $$BASEDIR/files/styles/style-indoor.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS/style-indoor.css + QMAKE_POST_LINK += && cp -f $$BASEDIR/files/styles/style-outdoor.css $$TARGETDIR/qgroundcontrol.app/Contents/MacOS # Copy support files QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR/qgroundcontrol.app/Contents/MacOS # Copy MAVLink @@ -233,7 +233,7 @@ linux-g++|linux-g++-64{ QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$TARGETDIR QMAKE_POST_LINK += && mkdir -p $$TARGETDIR/files/images - QMAKE_POST_LINK += && cp -rf $$BASEDIR/files/images/Vera.ttf $$TARGETDIR/files/images/Vera.ttf + QMAKE_POST_LINK += && cp -rf $$BASEDIR/files/styles/Vera.ttf $$TARGETDIR/files/styles/Vera.ttf # osg/osgEarth dynamic casts might fail without this compiler option. # see http://osgearth.org/wiki/FAQ for details. diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index be0566ad1..373b9b593 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -76,7 +76,7 @@ files/images/status/audio-volume-low.svg files/images/status/audio-volume-high.svg files/images/status/colorbars.png - files/images/style-mission.css + files/styles/style-indoor.css files/images/splash.png files/audio/alert.wav demo-log.txt @@ -86,10 +86,10 @@ files/images/earth.html files/images/mapproviders/googleearth.svg files/images/contrib/slugs.png - files/images/style-outdoor.css + files/styles/style-outdoor.css files/images/patterns/lenna.jpg - files/images/Vera.ttf + files/styles/Vera.ttf diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index ea00ff707..9232e729f 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -867,13 +867,13 @@ void MainWindow::loadStyle(QGC_MAINWINDOW_STYLE style) } break; case QGC_MAINWINDOW_STYLE_INDOOR: - qApp->setStyle("plastique"); - styleFileName = ":files/images/style-mission.css"; + qApp->setStyle("plastique"); + styleFileName = ":files/styles/style-indoor.css"; reloadStylesheet(); break; case QGC_MAINWINDOW_STYLE_OUTDOOR: - qApp->setStyle("plastique"); - styleFileName = ":files/images/style-outdoor.css"; + qApp->setStyle("plastique"); + styleFileName = ":files/styles/style-outdoor.css"; reloadStylesheet(); break; } @@ -907,12 +907,12 @@ void MainWindow::reloadStylesheet() QFile* styleSheet = new QFile(styleFileName); if (!styleSheet->exists()) { - styleSheet = new QFile(":files/images/style-mission.css"); + styleSheet = new QFile(":files/styles/style-indoor.css"); } if (styleSheet->open(QIODevice::ReadOnly | QIODevice::Text)) { QString style = QString(styleSheet->readAll()); - style.replace("ICONDIR", QCoreApplication::applicationDirPath()+ "files/images/"); + style.replace("ICONDIR", QCoreApplication::applicationDirPath()+ "files/styles/"); qApp->setStyleSheet(style); } else diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui index 0a3ba15b5..be71c1632 100644 --- a/src/ui/MainWindow.ui +++ b/src/ui/MainWindow.ui @@ -51,7 +51,7 @@ 0 0 800 - 22 + 25 @@ -84,7 +84,7 @@ - true + false Select System @@ -92,7 +92,7 @@ - true + false System @@ -142,6 +142,9 @@ + + false + Plugins diff --git a/src/ui/map3D/Q3DWidget.cc b/src/ui/map3D/Q3DWidget.cc index 0e62366bd..54fc876fa 100644 --- a/src/ui/map3D/Q3DWidget.cc +++ b/src/ui/map3D/Q3DWidget.cc @@ -55,7 +55,7 @@ Q3DWidget::Q3DWidget(QWidget* parent) fontImpl = new osgQt::QFontImplementation(QFont(":/general/vera.ttf")); #else osg::ref_ptr fontImpl; - fontImpl = 0;//new osgText::Font::Font("files/images/Vera.ttf"); + fontImpl = 0;//new osgText::Font::Font("files/styles/Vera.ttf"); #endif mFont = new osgText::Font(fontImpl); -- 2.22.0