Closes #418

Author: dcwhite

src/Interface/Application/ModuleWidget.cc

@@ -655,6 +655,7 @@ void ModuleWidget::makeOptionsDialog()
 
       dialog_ = dialogFactory_->makeDialog(moduleId_, theModule_->get_state());
       dialog_->pull();
+      addWidgetToExecutionDisableList(dialog_->getExecuteAction());
       connect(dialog_, SIGNAL(executeActionTriggered()), this, SLOT(executeButtonPushed()));
       connect(this, SIGNAL(moduleExecuted()), dialog_, SLOT(moduleExecuted()));
       dockable_ = new QDockWidget(QString::fromStdString(moduleId_), 0);

src/Interface/Modules/Base/ModuleDialogGeneric.cc

@@ -28,7 +28,6 @@
 
 #include <Dataflow/Network/ModuleStateInterface.h>
 #include <Interface/Modules/Base/ModuleDialogGeneric.h>
-//#include <Interface/Application/MainWindowCollaborators.h>
 #include <Core/Logging/Log.h>
 #include <boost/foreach.hpp>
 
@@ -38,7 +37,8 @@ using namespace SCIRun::Core::Algorithms;
 
 ModuleDialogGeneric::ModuleDialogGeneric(SCIRun::Dataflow::Networks::ModuleStateHandle state, QWidget* parent) : QDialog(parent),
   state_(state),
-  pulling_(false)
+  pulling_(false),
+  executeAction_(0)
 {
   setModal(false);
 
@@ -72,8 +72,6 @@ void ModuleDialogGeneric::createExecuteAction()
   //executeAction_->setShortcut(QKeySequence("Ctrl+1"));
   executeAction_->setIcon(QApplication::style()->standardIcon(QStyle::SP_MediaPlay));
   connect(executeAction_, SIGNAL(triggered()), this, SIGNAL(executeActionTriggered()));
-  //TODO
-  //addWidgetToExecutionDisableList(executeAction_);
 }
 
 void ModuleDialogGeneric::contextMenuEvent(QContextMenuEvent* e) 

src/Interface/Modules/Base/ModuleDialogGeneric.h

@@ -49,6 +49,7 @@ namespace Gui {
   public:
     virtual ~ModuleDialogGeneric();
     bool isPulling() const { return pulling_; } //yuck
+    QAction* getExecuteAction() { return executeAction_; }
 
     //TODO: input state hookup?
     //yeah: eventually replace int with generic dialog state object, but needs to be two-way (set/get)