Re #149 reverted change in widgets naming algorithm

Author: abuts

rascal2/ui/view.py

@@ -347,19 +347,19 @@ def setup_mdi(self):
             return
 
         widgets = {
-            "Plots": self.plot_widget,
-            "Project": self.project_widget,
-            "Terminal": self.terminal_widget,
-            "Fitting Controls": self.controls_widget,
+            "plots": self.plot_widget,
+            "project": self.project_widget,
+            "terminal": self.terminal_widget,
+            "fitting controls": self.controls_widget,
         }
         self.setup_mdi_widgets()
 
         for title, widget in reversed(widgets.items()):
-            widget.setWindowTitle(title)
+            widget.setWindowTitle(title.title())
             window = self.mdi.addSubWindow(
                 widget, QtCore.Qt.WindowType.WindowMinMaxButtonsHint | QtCore.Qt.WindowType.WindowTitleHint
             )
-            window.setWindowTitle(title)
+            window.setWindowTitle(title.title())
 
         self.reset_mdi_layout()
         self.startup_dlg = self.takeCentralWidget()
@@ -384,7 +384,7 @@ def reset_mdi_layout(self):
         else:
             for window in self.mdi.subWindowList():
                 # get corresponding MDIGeometries entry for the widget
-                widget_name = window.windowTitle().replace(" ", "")
+                widget_name = window.windowTitle().lower().split(" ")[-1]
                 x, y, width, height, minimized = getattr(self.settings.mdi_defaults, widget_name)
                 if minimized:
                     window.showMinimized()
@@ -397,7 +397,7 @@ def save_mdi_layout(self):
         geoms = {}
         for window in self.mdi.subWindowList():
             # get corresponding MDIGeometries entry for the widget
-            widget_name = window.windowTitle().replace(" ", "")
+            widget_name = window.windowTitle().lower().split(" ")[-1]
             geom = window.geometry()
             geoms[widget_name] = (geom.x(), geom.y(), geom.width(), geom.height(), window.isMinimized())
 

tests/ui/test_view.py

@@ -64,16 +64,12 @@ def test_reset_mdi(self, mock1, mock2, mock3, test_view, geometry):
         test_view.settings = Settings()
         test_view.setup_mdi()
         test_view.settings.mdi_defaults = MDIGeometries(
-            Plots=geometry[0],
-            Project=geometry[1],
-            Terminal=geometry[2],
-            FittingControls=geometry[3],
-            SlidersView=geometry[4],
+            plots=geometry[0], project=geometry[1], terminal=geometry[2], controls=geometry[3]
         )
         test_view.reset_mdi_layout()
         for window in test_view.mdi.subWindowList():
             # get corresponding MDIGeometries entry for the widget
-            widget_name = window.windowTitle().replace(" ", "")
+            widget_name = window.windowTitle().lower().split(" ")[-1]
             w_geom = window.geometry()
             assert getattr(test_view.settings.mdi_defaults, widget_name) == (
                 w_geom.x(),
@@ -90,7 +86,7 @@ def test_set_mdi(self, mock1, mock2, mock3, test_view, geometry):
         widgets_in_order = []
 
         for i, window in enumerate(test_view.mdi.subWindowList()):
-            widgets_in_order.append(window.windowTitle().replace(" ", ""))
+            widgets_in_order.append(window.windowTitle().lower().split(" ")[-1])
             window.setGeometry(*geometry[i][0:4])
             if geometry[i][4] is True:
                 window.showMinimized()