Refactor GUI menus

corrscope/gui/view_mainwindow.py

@@ -449,32 +449,35 @@ class MainWindow(QWidget):
         assert s.widget is MainWindow
         with set_menu_bar(s) as self.menuBar:
             with append_menu(s) as self.menuFile:
-                self.menuFile.addAction(self.actionNew)
+                w = self.menuFile
-                self.menuFile.addAction(self.actionOpen)
+                w.addAction(self.actionNew)
-                self.menuFile.addAction(self.actionSave)
+                w.addAction(self.actionOpen)
-                self.menuFile.addAction(self.actionSaveAs)
+                w.addAction(self.actionSave)
-                self.menuFile.addSeparator()
+                w.addAction(self.actionSaveAs)
-                self.menuFile.addAction(self.actionPreview)
+                w.addSeparator()
-                self.menuFile.addAction(self.actionRender)
+                w.addAction(self.actionPreview)
-                self.menuFile.addSeparator()
+                w.addAction(self.actionRender)
-                self.menuFile.addAction(self.actionExit)
+                w.addSeparator()
+                w.addAction(self.actionExit)
 
             with append_menu(s) as self.menuTools:
-                self.menuTools.addAction(self.action_separate_render_dir)
+                w = self.menuTools
+                w.addAction(self.action_separate_render_dir)
 
-            with append_menu(s, title=tr("&Help")) as w:
+            with append_menu(s, title=tr("&Help")) as self.menuHelp:
-                self.menuHelp = w
+                w = self.menuHelp
                 w.addAction(self.actionHelp)
 
         # Setup toolbar
         with add_toolbar(s, Qt.TopToolBarArea) as self.toolBar:
-            self.toolBar.addAction(self.actionNew)
+            w = self.toolBar
-            self.toolBar.addAction(self.actionOpen)
+            w.addAction(self.actionNew)
-            self.toolBar.addAction(self.actionSave)
+            w.addAction(self.actionOpen)
-            self.toolBar.addAction(self.actionSaveAs)
+            w.addAction(self.actionSave)
-            self.toolBar.addSeparator()
+            w.addAction(self.actionSaveAs)
-            self.toolBar.addAction(self.actionPreview)
+            w.addSeparator()
-            self.toolBar.addAction(self.actionRender)
+            w.addAction(self.actionPreview)
+            w.addAction(self.actionRender)
 
     # noinspection PyUnresolvedReferences
     def retranslateUi(self, MainWindow):