Closes #792

Author: dcwhite

src/Interface/Application/SCIRunMainWindow.cc

@@ -51,6 +51,7 @@
 #include <Interface/Application/NetworkExecutionProgressBar.h>
 #include <Interface/Application/DialogErrorControl.h>
 #include <Interface/Modules/Base/RemembersFileDialogDirectory.h>
+#include <Interface/Modules/Base/ModuleDialogGeneric.h> //TODO
 #include <Dataflow/Network/NetworkFwd.h>
 #include <Dataflow/Engine/Controller/NetworkEditorController.h> //DOH! see TODO in setController
 #include <Dataflow/Engine/Controller/ProvenanceManager.h>
@@ -148,8 +149,7 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true)
   setActionIcons();
 
   QToolBar* standardBar = addToolBar("Standard");
-  standardBar->setStyleSheet("QToolBar { background-color: rgb(66,66,69); border: 1px solid black; color: black }"
-		"QToolTip { color: #ffffff; background - color: #2a82da; border: 1px solid white; }");
+	WidgetStyleMixin::toolbarStyle(standardBar);
   standardBar->setObjectName("StandardToolBar");
   standardBar->addAction(actionNew_);
   standardBar->addAction(actionLoad_);
@@ -304,6 +304,8 @@ SCIRunMainWindow::SCIRunMainWindow() : firstTimePythonShown_(true)
   hideNonfunctioningWidgets();
 
   statusBar()->addPermanentWidget(new QLabel("Version: " + QString::fromStdString(VersionInfo::GIT_VERSION_TAG)));
+
+	WidgetStyleMixin::tabStyle(optionsTabWidget_);
 }
 
 void SCIRunMainWindow::initialize()

src/Interface/Modules/Base/ModuleDialogGeneric.cc

@@ -614,3 +614,9 @@ void WidgetStyleMixin::tableHeaderStyle(QTableWidget* tableHeader)
 		"QHeaderView::section {background: rgb(66,66,69);}"
 		);
 }
+
+void WidgetStyleMixin::toolbarStyle(QToolBar* toolbar)
+{
+  toolbar->setStyleSheet("QToolBar { background-color: rgb(66,66,69); border: 1px solid black; color: black }"
+    "QToolTip { color: #ffffff; background - color: #2a82da; border: 1px solid white; }");
+}

src/Interface/Modules/Base/ModuleDialogGeneric.h

@@ -51,6 +51,7 @@ namespace Gui {
   public:
     static void tabStyle(QTabWidget* tabs);
     static void tableHeaderStyle(QTableWidget* tableHeader);
+    static void toolbarStyle(QToolBar* toolbar);
   };
 
   class SCISHARE ModuleDialogGeneric : public QDialog, boost::noncopyable

src/Interface/Modules/Render/ViewScene.cc

@@ -96,7 +96,7 @@ ViewSceneDialog::ViewSceneDialog(const std::string& name, ModuleStateHandle stat
 
 	state->connect_state_changed(boost::bind(&ViewSceneDialog::newGeometryValueForwarder, this));
 	connect(this, SIGNAL(newGeometryValueForwarder()), this, SLOT(newGeometryValue()));
-	
+
 	addConfigurationDock(QString::fromStdString(name));
 }
 
@@ -463,6 +463,7 @@ void ViewSceneDialog::addViewOptions()
 	mDownViewBox->addItem("-X");
 	mDownViewBox->addItem("-Y");
 	mDownViewBox->addItem("-Z");
+	WidgetStyleMixin::toolbarStyle(mViewBar);
 	connect(mDownViewBox, SIGNAL(currentIndexChanged(int)), this, SLOT(viewAxisSelected(int)));
 	mViewBar->addWidget(mDownViewBox);
 	mViewBar->addSeparator();
@@ -497,7 +498,7 @@ void ViewSceneDialog::addConfigurationDock(const QString& viewName)
   mConfigurationDock = new ViewSceneControlsDock(name, this);
   mConfigurationDock->close();
 
-	showConfiguration_ = false; 
+	showConfiguration_ = false;
 }
 
 void ViewSceneDialog::closeConfigurationDock()

src/Interface/Modules/Render/ViewSceneControlsDock.cc

@@ -36,7 +36,7 @@ ViewSceneControlsDock::ViewSceneControlsDock(const QString& name, ViewSceneDialo
 {
   setupUi(this);
   //scene_ = parent;
-  
+
   close();
   setWindowTitle(name);
   setAllowedAreas(Qt::BottomDockWidgetArea);
@@ -49,8 +49,9 @@ ViewSceneControlsDock::ViewSceneControlsDock(const QString& name, ViewSceneDialo
   connect(orientationCheckBox_, SIGNAL(clicked(bool)), parent, SLOT(showOrientationChecked(bool)));
   connect(mouseControlComboBox_, SIGNAL(currentIndexChanged(int)), parent, SLOT(menuMouseControlChanged(int)));
 
+  WidgetStyleMixin::tabStyle(tabWidget);
 }
 
 ViewSceneControlsDock::~ViewSceneControlsDock()
 {
-}
+}