diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/legend_tab.ui b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/legend_tab.ui
index 2e130ffce6ebb4b5b648ee1d82985081b0018db7..4161a524ffba33202492e69b4268962022d4dcca 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/legend_tab.ui
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/legend_tab.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>527</width>
- <height>562</height>
+ <height>446</height>
</rect>
</property>
<property name="sizePolicy">
@@ -28,27 +28,34 @@
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
<item>
<layout class="QGridLayout" name="grid_layout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
- <item row="13" column="2" colspan="2">
+ <item row="9" column="2" colspan="2">
+ <widget class="QWidget" name="title_color_selector_dummy_widget" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="2" colspan="2">
<widget class="QComboBox" name="entries_font_combo_box"/>
</item>
+ <item row="4" column="3">
+ <widget class="QSpinBox" name="transparency_spin_box">
+ <property name="suffix">
+ <string>%</string>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ </widget>
+ </item>
<item row="2" column="2" colspan="2">
<widget class="QWidget" name="background_color_selector_dummy_widget" native="true">
<property name="sizePolicy">
@@ -59,10 +66,10 @@
</property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="transparency_label">
+ <item row="2" column="0">
+ <widget class="QLabel" name="background_color_label">
<property name="text">
- <string>Transparency</string>
+ <string>Background Color</string>
</property>
</widget>
</item>
@@ -76,7 +83,14 @@
</property>
</widget>
</item>
- <item row="6" column="0">
+ <item row="4" column="0">
+ <widget class="QLabel" name="transparency_label">
+ <property name="text">
+ <string>Transparency</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
<widget class="QLabel" name="title_label_2">
<property name="font">
<font>
@@ -90,27 +104,17 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="background_color_label">
+ <item row="1" column="0" colspan="2">
+ <widget class="QCheckBox" name="hide_box_check_box">
<property name="text">
- <string>Background Color</string>
- </property>
- </widget>
- </item>
- <item row="4" column="3">
- <widget class="QSpinBox" name="transparency_spin_box">
- <property name="suffix">
- <string>%</string>
- </property>
- <property name="maximum">
- <number>100</number>
+ <string>Hide Box</string>
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QLabel" name="edge_color_label">
+ <item row="12" column="0">
+ <widget class="QLabel" name="entries_size_label">
<property name="text">
- <string>Edge Color</string>
+ <string>Size</string>
</property>
</widget>
</item>
@@ -128,18 +132,12 @@
</property>
</widget>
</item>
- <item row="5" column="0" colspan="4">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
+ <item row="3" column="0">
+ <widget class="QLabel" name="edge_color_label">
+ <property name="text">
+ <string>Edge Color</string>
</property>
- </spacer>
+ </widget>
</item>
<item row="3" column="2" colspan="2">
<widget class="QWidget" name="edge_color_selector_dummy_widget" native="true">
@@ -151,67 +149,17 @@
</property>
</widget>
</item>
- <item row="20" column="0">
+ <item row="17" column="0">
<widget class="QLabel" name="marker_size_label">
<property name="text">
<string>Length</string>
</property>
</widget>
</item>
- <item row="17" column="0" colspan="4">
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" colspan="2">
- <widget class="QCheckBox" name="hide_box_check_box">
- <property name="text">
- <string>Hide Box</string>
- </property>
- </widget>
- </item>
- <item row="11" column="0" colspan="4">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="14" column="0">
- <widget class="QLabel" name="entries_size_label">
- <property name="text">
- <string>Size</string>
- </property>
- </widget>
- </item>
- <item row="15" column="2" colspan="2">
+ <item row="13" column="2" colspan="2">
<widget class="QWidget" name="entries_color_selector_dummy_widget" native="true"/>
</item>
- <item row="10" column="2" colspan="2">
- <widget class="QWidget" name="title_color_selector_dummy_widget" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="13" column="0">
+ <item row="11" column="0">
<widget class="QLabel" name="entries_font_label">
<property name="text">
<string>Font</string>
@@ -234,14 +182,14 @@
</property>
</spacer>
</item>
- <item row="15" column="0">
+ <item row="13" column="0">
<widget class="QLabel" name="entries_color_label">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
- <item row="14" column="2" colspan="2">
+ <item row="12" column="2" colspan="2">
<widget class="QDoubleSpinBox" name="entries_size_spin_box">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -251,44 +199,44 @@
</property>
</widget>
</item>
- <item row="7" column="0">
+ <item row="6" column="0">
<widget class="QLabel" name="title_label">
<property name="text">
<string>Title</string>
</property>
</widget>
</item>
- <item row="7" column="2" colspan="2">
+ <item row="6" column="2" colspan="2">
<widget class="QLineEdit" name="title_line_edit"/>
</item>
- <item row="8" column="0">
+ <item row="7" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
- <item row="10" column="0">
+ <item row="9" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
- <item row="9" column="0">
+ <item row="8" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Size</string>
</property>
</widget>
</item>
- <item row="8" column="2" colspan="2">
+ <item row="7" column="2" colspan="2">
<widget class="QComboBox" name="title_font_combo_box"/>
</item>
- <item row="9" column="2" colspan="2">
+ <item row="8" column="2" colspan="2">
<widget class="QDoubleSpinBox" name="title_size_spin_box"/>
</item>
- <item row="12" column="0">
+ <item row="10" column="0">
<widget class="QLabel" name="entries_label">
<property name="font">
<font>
@@ -302,10 +250,10 @@
</property>
</widget>
</item>
- <item row="20" column="2" colspan="2">
+ <item row="17" column="2" colspan="2">
<widget class="QDoubleSpinBox" name="marker_size_spin_box"/>
</item>
- <item row="19" column="0">
+ <item row="16" column="0">
<widget class="QLabel" name="markers_label">
<property name="font">
<font>
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
index 93c6e0ab72db21529d1d121f4c326703fcecf777..169efbb6ae813dbb9b1683d8586bf87f35afaf8a 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/presenter.py
@@ -43,8 +43,7 @@ class LegendTabWidgetPresenter:
def init_view(self):
if int(matplotlib.__version__[0]) < 2:
- self.view.background_color_selector_widget.setVisible(False)
- self.view.edge_color_selector_widget.setVisible(False)
+ self.view.hide_box_properties()
"""Sets all of the initial values of the input fields when the tab is first loaded"""
legend_props = LegendProperties.from_legend(self.axes[0].get_legend())
@@ -56,9 +55,10 @@ class LegendTabWidgetPresenter:
self.view.set_edge_color(legend_props.edge_color)
# Converts alpha value (opacity value between 0 and 1) to transparency percentage.
- transparency = 100-(legend_props.transparency*100)
- self.view.set_transparency_spin_box(transparency)
- self.view.set_transparency_slider(transparency)
+ if int(matplotlib.__version__[0]) > 2:
+ transparency = 100-(legend_props.transparency*100)
+ self.view.set_transparency_spin_box(transparency)
+ self.view.set_transparency_slider(transparency)
self.view.set_entries_font(legend_props.entries_font)
self.view.set_entries_size(legend_props.entries_size)
self.view.set_entries_color(legend_props.entries_color)
diff --git a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
index 74d2623fcb399caeeea5a904ba32d7acf7ee71ed..44e930baad4cf1f5700e100d3abdcde0d3b250cf 100644
--- a/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
+++ b/qt/python/mantidqt/widgets/plotconfigdialog/legendtabwidget/view.py
@@ -53,6 +53,11 @@ class LegendTabWidgetView(QWidget):
def get_transparency_spin_box_value(self):
return self.transparency_spin_box.value()
+ def hide_transparency(self):
+ self.transparency_label.setHidden(True)
+ self.transparency_slider.setHidden(True)
+ self.transparency_spin_box.setHidden(True)
+
def set_title(self, title):
self.title_line_edit.setText(title)
@@ -130,3 +135,12 @@ class LegendTabWidgetView(QWidget):
advanced_props = self.advanced_options.get_properties()
props.update(advanced_props)
return props
+
+ def hide_box_properties(self):
+ self.box_label.setHidden(True)
+ self.hide_box_check_box.setHidden(True)
+ self.background_color_label.setHidden(True)
+ self.background_color_selector_widget.setHidden(True)
+ self.edge_color_label.setHidden(True)
+ self.edge_color_selector_widget.setHidden(True)
+ self.hide_transparency()