improved icons and clean code

qgis · Sep 13, 2012 · 78a1f24 · 78a1f24
1 parent c0c8f81
commit 78a1f24
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/python/console.py b/python/console.py
@@ -100,18 +100,11 @@ def __init__(self, parent=None):
         self.clearButton = QAction(parent)
         self.clearButton.setCheckable(False)
         self.clearButton.setEnabled(True)
-        self.clearButton.setIcon(QIcon("icon/iconClearConsole.png"))
-        self.clearButton.setMenuRole(QAction.PreferencesRole)
-        self.clearButton.setIconVisibleInMenu(True)
-        self.clearButton.setToolTip('Clear console')
-        ## Action for paste snippets code
-        self.clearButton = QAction(parent)
-        self.clearButton.setCheckable(False)
-        self.clearButton.setEnabled(True)
         self.clearButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconClearConsole.png"))
         self.clearButton.setMenuRole(QAction.PreferencesRole)
         self.clearButton.setIconVisibleInMenu(True)
         self.clearButton.setToolTip('Clear console')
+        self.clearButton.setText('Clear console')
         ## Action for paste snippets code
 #        self.currentLayerButton = QAction(parent)
 #        self.currentLayerButton.setCheckable(False)
@@ -127,6 +120,7 @@ def __init__(self, parent=None):
         self.loadIfaceButton.setMenuRole(QAction.PreferencesRole)
         self.loadIfaceButton.setIconVisibleInMenu(True)
         self.loadIfaceButton.setToolTip('Import iface class')
+        self.loadIfaceButton.setText('Import iface class')
         ## Action for Open File
         self.openFileButton = QAction(parent)
         self.openFileButton.setCheckable(False)
@@ -135,14 +129,16 @@ def __init__(self, parent=None):
         self.openFileButton.setMenuRole(QAction.PreferencesRole)
         self.openFileButton.setIconVisibleInMenu(True)
         self.openFileButton.setToolTip('Open script file')
+        self.openFileButton.setText('Open script file')
         ## Action for Save File
         self.saveFileButton = QAction(parent)
         self.saveFileButton.setCheckable(False)
         self.saveFileButton.setEnabled(True)
         self.saveFileButton.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconSaveConsole.png"))
         self.saveFileButton.setMenuRole(QAction.PreferencesRole)
         self.saveFileButton.setIconVisibleInMenu(True)
-        self.saveFileButton.setToolTip('Save to file')
+        self.saveFileButton.setToolTip('Save to script file')
+        self.saveFileButton.setText('Save to script file')
         ## Action for Run script
         self.runButton = QAction(parent)
         self.runButton.setCheckable(False)
@@ -151,6 +147,7 @@ def __init__(self, parent=None):
         self.runButton.setMenuRole(QAction.PreferencesRole)
         self.runButton.setIconVisibleInMenu(True)
         self.runButton.setToolTip('Run command')
+        self.runButton.setText('Run')
         ## Help action
         self.helpButton = QAction(parent)
         self.helpButton.setCheckable(False)
@@ -159,6 +156,7 @@ def __init__(self, parent=None):
         self.helpButton.setMenuRole(QAction.PreferencesRole)
         self.helpButton.setIconVisibleInMenu(True)
         self.helpButton.setToolTip('Help')
+        self.helpButton.setText('Help')
 
         self.toolBar.addAction(self.clearButton)
         #self.toolBar.addAction(self.currentLayerButton)

diff --git a/python/iconConsole/iconClearConsole.png b/python/iconConsole/iconClearConsole.png
diff --git a/python/iconConsole/iconHelpConsole.png b/python/iconConsole/iconHelpConsole.png
diff --git a/python/iconConsole/iconOpenConsole.png b/python/iconConsole/iconOpenConsole.png
diff --git a/python/iconConsole/iconRunConsole.png b/python/iconConsole/iconRunConsole.png
diff --git a/python/iconConsole/iconSaveConsole.png b/python/iconConsole/iconSaveConsole.png
diff --git a/python/iconConsole/iconTempConsole.png b/python/iconConsole/iconTempConsole.png