Fixes #749

Author: dcwhite

src/Interface/Application/ModuleWidget.cc

@@ -472,7 +472,8 @@ ModuleWidget::ModuleWidget(NetworkEditor* ed, const QString& name, SCIRun::Dataf
   deleting_(false),
   defaultBackgroundColor_(SCIRunMainWindow::Instance()->newInterface() ? moduleRGBA(99,99,104) : moduleRGBA(192,192,192)),
   fullIndex_(0),
-  miniIndex_(0)
+  miniIndex_(0),
+  isViewScene_(name == "ViewScene")
 {
   setupModuleActions();
   setupLogging();
@@ -539,7 +540,7 @@ void ModuleWidget::setupDisplayWidgets(ModuleWidgetDisplayBase* display, const Q
 
   //TODO: ultra ugly. no other place for this code right now.
   //TODO: to be handled in issue #212
-  if (name == "ViewScene")
+  if (isViewScene_)
   {
     display->setupSpecial();
   }
@@ -620,6 +621,8 @@ void ModuleWidget::setupModuleActions()
   connect(actionsMenu_->getAction("Help"), SIGNAL(triggered()), this, SLOT(launchDocumentation()));
   connect(actionsMenu_->getAction("Collapse"), SIGNAL(triggered()), this, SLOT(collapseToMiniMode()));
   connect(actionsMenu_->getAction("Duplicate"), SIGNAL(triggered()), this, SLOT(duplicate()));
+  if (isViewScene_)
+    actionsMenu_->getAction("Duplicate")->setDisabled(true);
 
   connectNoteEditorToAction(actionsMenu_->getAction("Notes"));
   connectUpdateNote(this);
@@ -1015,7 +1018,8 @@ void ModuleWidget::makeOptionsDialog()
       dockable_->setAllowedAreas(allowedDockArea());
       dockable_->setAutoFillBackground(true);
       SCIRunMainWindow::Instance()->addDockWidget(Qt::RightDockWidgetArea, dockable_);
-      dockable_->setFloating(!Core::Preferences::Instance().modulesAreDockable);
+      if (!isViewScene_)
+        dockable_->setFloating(!Core::Preferences::Instance().modulesAreDockable);
       dockable_->hide();
       connect(dockable_, SIGNAL(visibilityChanged(bool)), this, SLOT(colorOptionsButton(bool)));
     }
@@ -1066,8 +1070,7 @@ void ModuleWidget::toggleOptionsDialog()
       dockable_->show();
       dockable_->raise();
       dockable_->activateWindow();
-      //TODO--more special viewscene code...
-      if (dialog_->windowTitle().startsWith("ViewScene"))
+      if (isViewScene_)
       {
         dockable_->setFloating(true);
       }

src/Interface/Application/ModuleWidget.h

@@ -223,6 +223,7 @@ private Q_SLOTS:
   bool deleting_;
   const QString defaultBackgroundColor_;
   int fullIndex_, miniIndex_;
+  bool isViewScene_; //TODO: lots of special logic around this case. 
 
   static bool globalMiniMode_;
 };