Refs #10457 Merge QToolButtons into a QToolBar

mantidproject · Oct 30, 2014 · 49e699c · 49e699c
1 parent 7cc1d8f
commit 49e699c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 47 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainWidget.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainWidget.ui
@@ -232,49 +232,15 @@
            <number>1</number>
           </property>
           <item>
-           <layout class="QHBoxLayout" name="layoutTableButtons">
-            <item>
-             <widget class="QToolButton" name="buttonAppendRow">
-              <property name="text">
-               <string>AppendRow</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QToolButton" name="buttonDeleteRow">
-              <property name="text">
-               <string>DeleteRow</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QToolButton" name="buttonGroupRows">
-              <property name="text">
-               <string>GroupRows</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QToolButton" name="buttonExpandSelection">
-              <property name="text">
-               <string>ExpandSelection</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="spacerTableButtons">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
+           <widget class="QToolBar" name="rowToolBar">
+            <property name="styleSheet">
+             <string>QToolBar{border: none;}</string>
+            </property>
+            <addaction name="actionAppendRow"/>
+            <addaction name="actionDeleteRow"/>
+            <addaction name="actionGroupRows"/>
+            <addaction name="actionExpandSelection"/>
+           </widget>
           </item>
           <item>
            <widget class="QTableView" name="viewTable">

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/QtReflMainView.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/QtReflMainView.cpp
@@ -36,10 +36,6 @@ namespace MantidQt
     {
       ui.setupUi(this);
 
-      ui.buttonAppendRow->setDefaultAction(ui.actionAppendRow);
-      ui.buttonDeleteRow->setDefaultAction(ui.actionDeleteRow);
-      ui.buttonGroupRows->setDefaultAction(ui.actionGroupRows);
-      ui.buttonExpandSelection->setDefaultAction(ui.actionExpandSelection);
       ui.buttonProcess->setDefaultAction(ui.actionProcess);
 
       //Expand the process runs column at the expense of the search column