Hide catalog menu items if not logged in. Refs #8192.

Code/Mantid/MantidPlot/src/ApplicationWindow.cpp

@@ -1292,8 +1292,6 @@ void ApplicationWindow::initMainMenu()
   icat = new QMenu(this);
   icat->setObjectName("CatalogMenu");
   icat->addAction(actionCatalogLogin);//Login menu item
-  icat->addAction(actionCatalogSearch); // ICAT GUI menu item
-  icat->addAction(actionCatalogLogout);//logout menu item
   disableActions();
 }
 
@@ -17442,7 +17440,12 @@ void ApplicationWindow::panOnPlot()
 /// Handler for ICat Login Menu
 void ApplicationWindow::CatalogLogin()
 {
-  mantidUI->executeAlgorithm("CatalogLogin",1);
+  // Executes the catalog login algorithm, and returns true if user can login.
+  if (mantidUI->isValidCatalogLogin())
+  {
+    icat->addAction(actionCatalogSearch);
+    icat->addAction(actionCatalogLogout);
+  }
 }
 
 void ApplicationWindow::CatalogSearch()
@@ -17460,6 +17463,14 @@ void ApplicationWindow::CatalogSearch()
   }
 }
 
+void ApplicationWindow::CatalogLogout()
+{
+  auto logout = mantidUI->createAlgorithm("CatalogLogout");
+  mantidUI->executeAlgorithmAsync(logout);
+  icat->removeAction(actionCatalogSearch);
+  icat->removeAction(actionCatalogLogout);
+}
+
 void ApplicationWindow::setGeometry(MdiSubWindow* usr_win,QWidget* user_interface)
 {   
   QRect frame = QRect(usr_win->frameGeometry().topLeft() - usr_win->geometry().topLeft(),
@@ -17472,12 +17483,6 @@ void ApplicationWindow::setGeometry(MdiSubWindow* usr_win,QWidget* user_interfac
   addMdiSubWindow(usr_win);
 }
 
-void ApplicationWindow::CatalogLogout()
-{
-  auto logout = mantidUI->createAlgorithm("CatalogLogout");
-  mantidUI->executeAlgorithmAsync(logout);
-}
-
 /**
  * Write a message to the log window. The message priority will be information
  * or error if error=true

Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp

@@ -2032,6 +2032,22 @@ void MantidUI::enableSaveNexus(const QString& wsName)
   appWindow()->enablesaveNexus(wsName);
 }
 
+/**
+ * Executes the catalog login algorithm.
+ * Returns true if login was a success.
+ */
+bool MantidUI::isValidCatalogLogin()
+{
+  auto catalogAlgorithm = this->createAlgorithm("CatalogLogin");
+  auto loginDialog      = this->createAlgorithmDialog(catalogAlgorithm);
+
+  if(loginDialog->exec() == QDialog::Accepted)
+  {
+    if (catalogAlgorithm->execute()) return true;
+  }
+  return false;
+}
+
 /** This method is sueful for saving the currently loaded workspaces to project file on save.
 *  saves the names of all the workspaces loaded into mantid workspace tree
 *  into a string and calls save nexus on each workspace to save the data to a nexus file.

Code/Mantid/MantidPlot/src/Mantid/MantidUI.h

@@ -290,6 +290,9 @@ public slots:
   void saveProject(bool save);
   void enableSaveNexus(const QString & wsName);
 
+  /// Verifies if the Catalog login was a success.
+  bool isValidCatalogLogin();
+
 signals:
   //A signal to indicate that we want a script to produce a dialog
   void showPropertyInputDialog(const QString & algName);