Added icons for all tool bar actions and reorganized them.

JLuebben · JLuebben · commit 937031e9934c · 2016-08-19T11:21:08.000+02:00
diff --git a/floppy/painter.py b/floppy/painter.py
@@ -702,7 +702,7 @@ def initActions(self):
         self.updateRunnerAction.setIconVisibleInMenu(True)
         self.addAction(self.updateRunnerAction)
         
-        self.spawnRunnerAction = QAction('Spawn', self)
+        self.spawnRunnerAction = QAction(QIcon(os.path.join(self.iconRoot, 'spawn.png')), 'Spawn', self)
         self.spawnRunnerAction.setShortcut('Ctrl+Q')
         self.spawnRunnerAction.triggered.connect(self.spawnRunner)
         self.spawnRunnerAction.setIconVisibleInMenu(True)
@@ -714,7 +714,7 @@ def initActions(self):
         self.deleteNodeAction.setIconVisibleInMenu(True)
         self.addAction(self.deleteNodeAction)
         
-        self.connectAction = QAction('Connect', self)
+        self.connectAction = QAction(QIcon(os.path.join(self.iconRoot, 'connect.png')), 'Connect', self)
         self.connectAction.setShortcut('Ctrl+R')
         self.connectAction.triggered.connect(self.connect)
         self.connectAction.setIconVisibleInMenu(True)
@@ -726,19 +726,19 @@ def initActions(self):
         self.statusAction.setIconVisibleInMenu(True)
         self.addAction(self.statusAction)
 
-        self.dropAction = QAction('Drop', self)
+        self.dropAction = QAction(QIcon(os.path.join(self.iconRoot, 'drop.png')), 'Drop', self)
         self.dropAction.setShortcut('Ctrl+R')
         self.dropAction.triggered.connect(self.dropGraph)
         self.dropAction.setIconVisibleInMenu(True)
         self.addAction(self.dropAction)
 
-        self.pushAction = QAction('Push', self)
+        self.pushAction = QAction(QIcon(os.path.join(self.iconRoot, 'push.png')), 'Push', self)
         self.pushAction.setShortcut('Ctrl+R')
         self.pushAction.triggered.connect(self.pushGraph)
         self.pushAction.setIconVisibleInMenu(True)
         self.addAction(self.pushAction)
         
-        self.settingsAction = QAction('Settings', self)
+        self.settingsAction = QAction(QIcon(os.path.join(self.iconRoot, 'settings.png')), 'Settings', self)
         self.settingsAction.setShortcut('Ctrl+O')
         self.settingsAction.triggered.connect(self.openSettingsDialog)
         self.settingsAction.setIconVisibleInMenu(False)
@@ -758,23 +758,30 @@ def initMenus(self):
         settingsMenu.addAction(self.settingsAction)
         
         self.mainToolBar.addAction(self.exitAction)
+        self.mainToolBar.addSeparator()
         self.mainToolBar.addAction(self.newAction)
         self.mainToolBar.addAction(self.saveAction)
         self.mainToolBar.addAction(self.loadAction)
         self.mainToolBar.addSeparator()
         self.mainToolBar.addAction(self.runAction)
-        self.mainToolBar.addAction(self.killRunnerAction)
+        self.mainToolBar.addSeparator()
         self.mainToolBar.addAction(self.pauseRunnerAction)
         self.mainToolBar.addAction(self.unpauseRunnerAction)
         self.mainToolBar.addAction(self.stepRunnerAction)
         self.mainToolBar.addAction(self.gotoRunnerAction)
-        self.mainToolBar.addAction(self.updateRunnerAction)
+        self.mainToolBar.addSeparator()
         self.mainToolBar.addAction(self.spawnRunnerAction)
-        self.mainToolBar.addAction(self.deleteNodeAction)
+        self.mainToolBar.addAction(self.killRunnerAction)
+        self.mainToolBar.addSeparator()
+        # self.mainToolBar.addAction(self.deleteNodeAction)
         self.mainToolBar.addAction(self.connectAction)
-        self.mainToolBar.addAction(self.statusAction)
+        # self.mainToolBar.addAction(self.statusAction)
         self.mainToolBar.addAction(self.dropAction)
         self.mainToolBar.addAction(self.pushAction)
+        self.mainToolBar.addAction(self.updateRunnerAction)
+
+        self.mainToolBar.addSeparator()
+        self.mainToolBar.addAction(self.settingsAction)
 
     def new(self):
         self.drawer.reset()
