Refs #10440 Add "Cut Selected" action to Refl UI

mantidproject · Nov 3, 2014 · f55d728 · f55d728
1 parent ed2c788
commit f55d728
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 0 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/QtReflMainView.h
@@ -101,6 +101,7 @@ namespace MantidQt
       void on_actionGroupRows_triggered();
       void on_actionClearSelected_triggered();
       void on_actionCopySelected_triggered();
+      void on_actionCutSelected_triggered();
       void on_actionPasteSelected_triggered();
       void on_actionExpandSelection_triggered();
       void on_actionOptionsDialog_triggered();

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h
@@ -84,6 +84,7 @@ namespace MantidQt
       static const int OptionsDialogFlag   = 12;
       static const int ClearSelectedFlag   = 13;
       static const int CopySelectedFlag    = 14;
+      static const int CutSelectedFlag     = 15;
       static const int PasteSelectedFlag   = 16;
     };
   }

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainViewPresenter.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainViewPresenter.h
@@ -97,6 +97,8 @@ namespace MantidQt
       virtual void clearSelected();
       //copy selected rows to clipboard
       virtual void copySelected();
+      //copy selected rows to clipboard and then delete them
+      virtual void cutSelected();
       //paste clipboard into selected rows
       virtual void pasteSelected();
       //group selected rows together

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainWidget.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainWidget.ui
@@ -243,6 +243,7 @@
             <addaction name="separator"/>
             <addaction name="actionGroupRows"/>
             <addaction name="actionCopySelected"/>
+            <addaction name="actionCutSelected"/>
             <addaction name="actionPasteSelected"/>
             <addaction name="actionClearSelected"/>
            </widget>
@@ -383,6 +384,7 @@
     <addaction name="separator"/>
     <addaction name="actionGroupRows"/>
     <addaction name="actionCopySelected"/>
+    <addaction name="actionCutSelected"/>
     <addaction name="actionPasteSelected"/>
     <addaction name="actionClearSelected"/>
     <addaction name="separator"/>
@@ -526,6 +528,18 @@
     <string>Ctrl+V</string>
    </property>
   </action>
+  <action name="actionCutSelected">
+   <property name="icon">
+    <iconset resource="../../../../MantidPlot/icons/icons.qrc">
+     <normaloff>:/cut.png</normaloff>:/cut.png</iconset>
+   </property>
+   <property name="text">
+    <string>Cut Selected</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+X</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>comboSearchInstrument</tabstop>

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/QtReflMainView.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/QtReflMainView.cpp
@@ -168,6 +168,14 @@ namespace MantidQt
       m_presenter->notify(CopySelectedFlag);
     }
 
+    /**
+    This slot notifies the presenter that the "cut selection" button has been pressed
+    */
+    void QtReflMainView::on_actionCutSelected_triggered()
+    {
+      m_presenter->notify(CutSelectedFlag);
+    }
+
     /**
     This slot notifies the presenter that the "paste selection" button has been pressed
     */
@@ -226,6 +234,7 @@ namespace MantidQt
       menu->addSeparator();
       menu->addAction(ui.actionGroupRows);
       menu->addAction(ui.actionCopySelected);
+      menu->addAction(ui.actionCutSelected);
       menu->addAction(ui.actionPasteSelected);
       menu->addAction(ui.actionClearSelected);
       menu->addSeparator();

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
@@ -854,6 +854,7 @@ namespace MantidQt
       case ReflMainView::GroupRowsFlag:       groupRows();          break;
       case ReflMainView::ClearSelectedFlag:   clearSelected();      break;
       case ReflMainView::CopySelectedFlag:    copySelected();       break;
+      case ReflMainView::CutSelectedFlag:     cutSelected();        break;
       case ReflMainView::PasteSelectedFlag:   pasteSelected();      break;
       case ReflMainView::OpenTableFlag:       openTable();          break;
       case ReflMainView::NewTableFlag:        newTable();           break;
@@ -1098,6 +1099,13 @@ namespace MantidQt
       QApplication::clipboard()->setText(QString::fromStdString(output));
     }
 
+    /** Copy currently selected rows to the clipboard, and then delete them. */
+    void ReflMainViewPresenter::cutSelected()
+    {
+      copySelected();
+      deleteRow();
+    }
+
     /** Paste the contents of the clipboard into the currently selected rows, or append new rows */
     void ReflMainViewPresenter::pasteSelected()
     {