Closes #1272

Author: dcwhite

src/Interface/Application/Port.cc

@@ -121,8 +121,9 @@ namespace SCIRun {
     class PortActionsMenu : public QMenu
     {
     public:
-      explicit PortActionsMenu(PortWidget* parent) : QMenu("Actions", parent), faves_(nullptr)
+      explicit PortActionsMenu(PortWidget* parent) : QMenu("Actions", parent), parent_(parent), faves_(nullptr)
       {
+#if SCIRUN4_CODE_TO_BE_ENABLED_LATER
         QList<QAction*> actions;
         if (!parent->isInput())
         {
@@ -137,23 +138,58 @@ namespace SCIRun {
           actions.append(separatorAction(parent));
         }
         addActions(actions);
+#endif
 
-        auto m = new QMenu("Connect Module", parent);
+        base_ = new QMenu("Connect Module", parent);
         faves_ = new QMenu("Favorites", parent);
-        m->addMenu(faves_);
-        compatibleModuleActions_ = fillConnectToEmptyPortMenu(m, Application::Instance().controller()->getAllAvailableModuleDescriptions(), parent);
-        addMenu(m);
+        base_->addMenu(faves_);
+        compatibleModuleActions_ = fillConnectToEmptyPortMenu(base_, Application::Instance().controller()->getAllAvailableModuleDescriptions(), parent);
+
+        connectModuleAction_ = addAction("Connect Module...");
+        connect(connectModuleAction_, SIGNAL(triggered()), parent, SLOT(pickConnectModule()));
       }
+
       void filterFavorites()
       {
         faves_->clear();
         for (const auto& action : compatibleModuleActions_)
           if (SCIRunMainWindow::Instance()->isInFavorites(action->text())) // TODO: break out predicate
             faves_->addAction(action);
       }
+
+      QStringList compatibleModules() const
+      {
+        QStringList qsl;
+        Q_FOREACH(QAction* q, compatibleModuleActions_)
+          qsl.append(q->text());
+        qsl.sort();
+        return qsl;
+      }
+
+      void portPicked(const QString& module)
+      {
+        auto actionIter = std::find_if(compatibleModuleActions_.begin(), compatibleModuleActions_.end(), [&module](QAction* a) { return a->text() == module; });
+        if (actionIter != compatibleModuleActions_.end())
+        {
+          (*actionIter)->trigger();
+        }
+        else
+          qDebug() << "action not found:" << compatibleModules();
+      }
+
+      virtual void showEvent(QShowEvent* event) override
+      {
+        QPoint p = pos();
+        QRect geo = parent_->geometry();
+        move(p.x() + geo.width() - geometry().width(), p.y());
+      }
+
     private:
+      PortWidget* parent_;
+      QMenu* base_;
       QMenu* faves_;
       QList<QAction*> compatibleModuleActions_;
+      QAction* connectModuleAction_;
     };
   }}
 
@@ -312,6 +348,20 @@ void PortWidget::doMouseRelease(Qt::MouseButton button, const QPointF& pos, Qt::
   }
 }
 
+void PortWidget::pickConnectModule()
+{
+  QInputDialog qid;
+  qid.setWindowTitle("Connect new module here");
+  qid.setLabelText("New module to connect:");
+  qid.setComboBoxItems(menu_->compatibleModules());
+  qid.setOption(QInputDialog::UseListViewForComboBoxItems, true);
+  auto ok = qid.exec();
+  if (ok == QDialog::Accepted)
+  {
+    menu_->portPicked(qid.textValue());
+  }
+}
+
 size_t PortWidget::getIndex() const
 {
   return index_;

src/Interface/Application/Port.h

@@ -156,6 +156,7 @@ public Q_SLOTS:
   void connectNewModule();
   void clearPotentialConnections();
   void insertNewModule(const SCIRun::Dataflow::Networks::PortDescriptionInterface* output, const std::string& newModuleName, const SCIRun::Dataflow::Networks::PortDescriptionInterface* input);
+  void pickConnectModule();
 Q_SIGNALS:
   void requestConnection(const SCIRun::Dataflow::Networks::PortDescriptionInterface* from, const SCIRun::Dataflow::Networks::PortDescriptionInterface* to);
   void connectionDeleted(const SCIRun::Dataflow::Networks::ConnectionId& id);