Merge pull request #18979 from mantidproject/18978_fix_delete_confirm…

…ations Fix delete confirmations in workspace dock
mantidproject · Feb 24, 2017 · 0cc7201 · 0cc7201
2 parents a75a4b3 + 3689784
commit 0cc7201
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 0 deletions.
diff --git a/MantidPlot/src/ApplicationWindow.cpp b/MantidPlot/src/ApplicationWindow.cpp
@@ -5338,6 +5338,8 @@ void ApplicationWindow::readSettings() {
   settings.endGroup();
   settings.endGroup();
   // END Mantid Muon interface one time only change
+
+  emit configModified();
 }
 
 void ApplicationWindow::saveSettings() {

diff --git a/MantidPlot/src/ApplicationWindow.h b/MantidPlot/src/ApplicationWindow.h
@@ -1123,6 +1123,7 @@ public slots:
 signals:
   void modified();
   void shutting_down();
+  void configModified();
 
 protected:
   bool event(QEvent *e) override;

diff --git a/MantidPlot/src/ConfigDialog.cpp b/MantidPlot/src/ConfigDialog.cpp
@@ -2690,6 +2690,7 @@ void ConfigDialog::apply() {
 
   // MD Plotting
   updateMdPlottingSettings();
+  emit app->configModified();
 }
 
 /**

diff --git a/MantidPlot/src/Mantid/MantidUI.cpp b/MantidPlot/src/Mantid/MantidUI.cpp
@@ -216,6 +216,8 @@ MantidUI::MantidUI(ApplicationWindow *aw)
 
   m_exploreMantid = boost::make_shared<QWorkspaceDockView>(this, aw);
   m_exploreMantid->init();
+  m_exploreMantid->enableDeletePrompt(
+      appWindow()->isDeleteWorkspacePromptEnabled());
   m_exploreAlgorithms = new AlgorithmDockWidget(this, aw);
 
   actionCopyRowToTable = new QAction(this);
@@ -292,6 +294,8 @@ MantidUI::MantidUI(ApplicationWindow *aw)
   connect(menuMantidMatrix, SIGNAL(aboutToShow()), this,
           SLOT(menuMantidMatrixAboutToShow()));
 
+  connect(m_appWindow, SIGNAL(configModified(void)), this,
+          SLOT(configModified(void)));
   init();
 }
 
@@ -2702,6 +2706,11 @@ void MantidUI::formatLogName(QString &label, const QString &wsName) {
   }
 }
 
+void MantidUI::configModified() {
+  m_exploreMantid->enableDeletePrompt(
+      appWindow()->isDeleteWorkspacePromptEnabled());
+}
+
 std::string MantidUI::extractLogTime(Mantid::Kernel::DateAndTime value,
                                      bool useAbsoluteDate,
                                      Mantid::Kernel::DateAndTime start) {

diff --git a/MantidPlot/src/Mantid/MantidUI.h b/MantidPlot/src/Mantid/MantidUI.h
@@ -560,6 +560,8 @@ public slots:
 #endif
 
 private slots:
+  // respond to the global Mantid properties being modifed
+  void configModified();
 
   // slot for file open dialogs created from the main app menu, or the
   // workspaces dock window

diff --git a/docs/source/release/v3.10.0/ui.rst b/docs/source/release/v3.10.0/ui.rst
@@ -21,6 +21,7 @@ User Interface
 Instrument View
 ###############
  - Fixed a bug preventing the some of the banks from being visible when using a U correction.
+ - Fixed a bug where the user would not be prompted before deleting workspaces even if confirmations were turned on.
 
 Plotting Improvements
 #####################