Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

This commit is contained in:
Ludger Küperkoch 2017-08-18 15:40:30 +02:00
commit 6ba7fd8874

View File

@ -523,28 +523,31 @@ class MainWindow(QMainWindow):
self.loadpilotevent) self.loadpilotevent)
fileToolBar = self.addToolBar("FileTools") toolbars_keys = [
eventToolBar = self.addToolBar("EventTools") "FileTools",
componentToolBar = self.addToolBar("ComponentSelection") "EventTools",
autoPickToolBar = self.addToolBar("autoPyLoT") "ComponentSelection",
locationToolBar = self.addToolBar("LocationTools") "autoPyLoT",
"LocationTools"
]
fileToolBar.setObjectName("FileTools") toolbars = {}
eventToolBar.setObjectName("EventTools")
componentToolBar.setObjectName("PhaseTools") for name in toolbars_keys:
autoPickToolBar.setObjectName('autopickTools') toolbars[name] = self.addToolBar(name)
locationToolBar.setObjectName("LocationTools") toolbars[name].setObjectName(name)
toolbars[name].setMovable(False)
self.addActions(self.editMenu, editActions) self.addActions(self.editMenu, editActions)
self.addActions(self.autoPickMenu, autoPickActions) self.addActions(self.autoPickMenu, autoPickActions)
self.addActions(self.pickMenu, pickMenuActions) self.addActions(self.pickMenu, pickMenuActions)
self.addActions(self.helpMenu, helpActions) self.addActions(self.helpMenu, helpActions)
self.addActions(fileToolBar, fileToolActions) self.addActions(toolbars["FileTools"], fileToolActions)
self.addActions(eventToolBar, eventToolActions) self.addActions(toolbars["EventTools"], eventToolActions)
self.addActions(componentToolBar, componentActions) self.addActions(toolbars["ComponentSelection"], componentActions)
self.addActions(autoPickToolBar, pickActions) self.addActions(toolbars["autoPyLoT"], pickActions)
self.addActions(locationToolBar, locationToolActions) self.addActions(toolbars["LocationTools"], locationToolActions)
# add event combo box and ref/test buttons # add event combo box and ref/test buttons