diff --git a/files/images/style-outdoor-dark.css b/files/images/style-outdoor-dark.css
deleted file mode 100644
index c0d0015f1f78a1dd2443dfd40b87d737df872ed9..0000000000000000000000000000000000000000
--- 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 8b74a0d68613bbb259f2552626359509159a3ee3..f9571e7bb2468f9cb30941b6afb42bc434efd8d1 100644
--- a/files/images/style-mission.css
+++ b/files/styles/style-indoor.css
@@ -247,6 +247,19 @@ QMenu::separator {
margin-right: 5px;
}
+QMenuBar::item:disabled {
+ border: none;
+ background: none;
+}
+QMenuBar::item:disabled: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 f43f04196bd12a07a53d08962ba1bdfe4838248b..c153f62f2d0ac6ae45e41bb8fa2747aa38637e50 100644
--- a/files/images/style-outdoor.css
+++ b/files/styles/style-outdoor.css
@@ -87,6 +87,19 @@ border: 1px solid #111111;
background: white;
}
+QMenuBar::item:disabled {
+ border: none;
+ background: none;
+}
+QMenuBar::item:disabled: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 23495016536834bf53540aa0cc81407e2691c070..69d21e384e0216ee0dd2e843530e7bcb51a9e5f0 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 be0566ad134534fdc055b17ae84d0143d0dd7c1a..373b9b593c25b0c041353ec0fc7e9e59f707db2a 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -76,7 +76,7 @@
<file>files/images/status/audio-volume-low.svg</file>
<file>files/images/status/audio-volume-high.svg</file>
<file>files/images/status/colorbars.png</file>
- <file>files/images/style-mission.css</file>
+ <file>files/styles/style-indoor.css</file>
<file>files/images/splash.png</file>
<file>files/audio/alert.wav</file>
<file>demo-log.txt</file>
@@ -86,10 +86,10 @@
<file>files/images/earth.html</file>
<file>files/images/mapproviders/googleearth.svg</file>
<file>files/images/contrib/slugs.png</file>
- <file>files/images/style-outdoor.css</file>
+ <file>files/styles/style-outdoor.css</file>
<file>files/images/patterns/lenna.jpg</file>
</qresource>
<qresource prefix="/general">
- <file alias="vera.ttf">files/images/Vera.ttf</file>
+ <file alias="vera.ttf">files/styles/Vera.ttf</file>
</qresource>
</RCC>
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index ea00ff707f00d37cd26be566b712368dbfee3c6a..9232e729f129446c5247898db4e7c7bd5ea10026 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 0a3ba15b55128b0abea01aa5503efb08d9282f52..dcc1b142a0596e5e2c633252d4545b43572a83ee 100644
--- a/src/ui/MainWindow.ui
+++ b/src/ui/MainWindow.ui
@@ -84,7 +84,7 @@
</widget>
<widget class="QMenu" name="menuConnected_Systems">
<property name="enabled">
- <bool>true</bool>
+ <bool>false</bool>
</property>
<property name="title">
<string>Select System</string>
@@ -92,7 +92,7 @@
</widget>
<widget class="QMenu" name="menuUnmanned_System">
<property name="enabled">
- <bool>true</bool>
+ <bool>false</bool>
</property>
<property name="title">
<string>System</string>
@@ -142,6 +142,9 @@
</property>
</widget>
<widget class="QMenu" name="menuPlugins">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="title">
<string>Plugins</string>
</property>
diff --git a/src/ui/map3D/Q3DWidget.cc b/src/ui/map3D/Q3DWidget.cc
index 0e62366bd3e167d7b5a4db3773c75fee01a01ae2..54fc876fa9eb05694d7b7ca6f180c35d2eeec733 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<osgText::Font::FontImplementation> 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);