[change] rearranged menu (pick para, preferences)

This commit is contained in:
Marcel Paffrath 2017-08-15 16:28:38 +02:00
parent 9bfba65aee
commit 81f3758414
2 changed files with 8 additions and 5 deletions

View File

@ -503,7 +503,7 @@ class MainWindow(QMainWindow):
' the complete project on grid engine.')
self.auto_pick_sge.setEnabled(False)
autoPickActions = (self.auto_tune, self.auto_pick, self.compare_action)
pickActions = (self.auto_tune, self.auto_pick, self.compare_action)
# pickToolBar = self.addToolBar("PickTools")
# pickToolActions = (selectStation, )
@ -525,20 +525,22 @@ class MainWindow(QMainWindow):
self.openProjectAction, self.saveProjectAction,
self.saveProjectAsAction,
self.openEventAction, self.saveEventAction, None,
prefsEventAction, self.parameterAction, quitAction)
quitAction)
self.fileMenu.aboutToShow.connect(self.updateFileMenu)
self.updateFileMenu()
self.editMenu = self.menuBar().addMenu('&Edit')
editActions = (self.filterAction, filterEditAction, None,
self.selectPAction, self.selectSAction, None,
printAction)
prefsEventAction)
#printAction) #TODO: print event?
pickMenuActions = (self.parameterAction,)
self.pickMenu = self.menuBar().addMenu('&Picking')
self.autoPickMenu = self.pickMenu.addMenu('Automatic picking')
self.autoPickMenu.setEnabled(False)
pickActions = (self.auto_pick, self.auto_pick_local, self.auto_pick_sge)
autoPickActions = (self.auto_pick, self.auto_pick_local, self.auto_pick_sge)
self.helpMenu = self.menuBar().addMenu('&Help')
helpActions = (helpAction,)
@ -567,6 +569,7 @@ class MainWindow(QMainWindow):
self.addActions(self.editMenu, editActions)
self.addActions(self.autoPickMenu, pickActions)
self.addActions(self.pickMenu, pickMenuActions)
self.addActions(self.helpMenu, helpActions)
self.addActions(fileToolBar, fileToolActions)

View File

@ -2453,7 +2453,7 @@ class PylotParaBox(QtGui.QWidget):
self.add_special_pick_parameters_tab()
self.params_to_gui()
self._toggle_advanced_settings()
self.resize(720, 1280)
self.resize(720, 860)
self.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
self.accepted.connect(self.params_from_gui)
self.rejected.connect(self.params_to_gui)