Merge pull request #1061 from mantidproject/38671_improve_compose_button

Changed layout of Compose button

Author: SilkeSchomann

src/mslice/app/mainwindow.py

@@ -41,10 +41,10 @@ def __init__(self, in_mantid=False):
         }
 
         self.buttons_to_enable = {
-            TAB_2D: [self.btnAdd, self.btnSubtract, self.composeFrame],
+            TAB_2D: [self.btnAdd, self.btnSubtract, self.btnCompose],
             TAB_EVENT: [self.btnMerge],
             TAB_HISTO: [self.btnPlot, self.btnOverplot],
-            TAB_NONPSD: [self.btnAdd, self.btnSubtract, self.composeFrame],
+            TAB_NONPSD: [self.btnAdd, self.btnSubtract, self.btnCompose],
         }
         if in_mantid:
             self.buttons_to_enable[TAB_HISTO] += [self.btnSaveToADS]
@@ -151,15 +151,10 @@ def setup_save(self):
         self.btnSave.setMenu(menu)
 
     def setup_compose_button(self):
-        self.stackLayout = QStackedLayout(self.stackFrame)
-        self.stackLayout.addWidget(self.btnSaveToADS)
-        self.stackLayout.addWidget(self.composeFrame)
-        self.stackFrame.setLayout(self.stackLayout)
-        menu = QMenu(self.btnComposeMenu)
+        menu = QMenu(self.btnCompose)
         menu.addAction("Scale", lambda: self.button_compose("Scale"))
         menu.addAction("Bose", lambda: self.button_compose("Bose"))
-        self.btnComposeMenu.setMenu(menu)
-        self.btnComposeMenu.setMaximumWidth(10)
+        self.btnCompose.setMenu(menu)
 
     def change_main_tab(self, tab):
         self.tabWidget.setCurrentIndex(tab)
@@ -183,15 +178,14 @@ def enable_widget_tabs(self, workspace_tab):
 
     def enable_buttons(self, tab):
         """Enables correct buttons based on workspace tab"""
-        self.stackLayout.setCurrentIndex(self.stack_to_show[tab])
         variable_buttons = [
             self.btnAdd,
             self.btnSubtract,
             self.btnMerge,
             self.btnPlot,
             self.btnOverplot,
             self.btnSaveToADS,
-            self.composeFrame,
+            self.btnCompose,
         ]
         for button in variable_buttons:
             button.hide()
@@ -227,12 +221,8 @@ def button_overplot(self):
     def button_savetoads(self):
         self.workspace_presenter.notify(ws_command.SaveToADS)
 
-    def button_compose(self, value=False):
-        if value:
-            self.btnCompose.setText(value)
-        self.workspace_presenter.notify(
-            self.composeCommand[str(self.btnCompose.text())]
-        )
+    def button_compose(self, compose_type):
+        self.workspace_presenter.notify(self.composeCommand[str(compose_type)])
 
     def init_ui(self):
         self.setup_ipython()

src/mslice/app/mainwindow.ui

@@ -260,66 +260,17 @@
                  </widget>
                 </widget>
                </item>
-               <item row="7" column="1">
-                <widget class="QFrame" name="composeFrame">
+               <item row="6" column="1">
+                <widget class="QPushButton" name="btnCompose">
                  <property name="maximumSize">
                   <size>
                    <width>130</width>
                    <height>16777215</height>
                   </size>
                  </property>
-                 <layout class="QHBoxLayout" name="composeLayout">
-                  <property name="spacing">
-                   <number>0</number>
-                  </property>
-                  <property name="leftMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="topMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="rightMargin">
-                   <number>0</number>
-                  </property>
-                  <property name="bottomMargin">
-                   <number>0</number>
-                  </property>
-                  <item>
-                   <widget class="QPushButton" name="btnCompose">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="text">
-                     <string>Compose</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QPushButton" name="btnComposeMenu">
-                    <property name="sizePolicy">
-                     <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
-                      <horstretch>0</horstretch>
-                      <verstretch>0</verstretch>
-                     </sizepolicy>
-                    </property>
-                    <property name="minimumSize">
-                     <size>
-                      <width>20</width>
-                      <height>0</height>
-                     </size>
-                    </property>
-                    <property name="maximumSize">
-                     <size>
-                      <width>10</width>
-                      <height>16777215</height>
-                     </size>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
+                 <property name="text">
+                  <string>Compose</string>
+                 </property>
                 </widget>
                </item>
               </layout>