Merge pull request #157 from jjhall89/selectSystemMenu

Addressed issue #26

files/images/style-mission.css → 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 */

files/images/style-outdoor.css → 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);

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.

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>

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

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>

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);