Merge pull request #253 from slarosa/master

New style for the toolbar icons (Python Console)
qgis · Sep 28, 2012 · 500a953 · 500a953
2 parents f2f1426 + 32deee7
commit 500a953
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 23 deletions.
diff --git a/python/console.py b/python/console.py
@@ -128,7 +128,7 @@ def __init__(self, parent=None):
         self.actionScript = QAction(parent)
         self.actionScript.setCheckable(False)
         self.actionScript.setEnabled(True)
-        self.actionScript.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconTempConsole.png"))
+        self.actionScript.setIcon(QIcon(os.path.dirname(__file__) + "/iconConsole/iconScriptConsole.png"))
         self.actionScript.setMenuRole(QAction.PreferencesRole)
         self.actionScript.setIconVisibleInMenu(True)
         self.actionScript.setToolTip(actionScriptBt)

diff --git a/python/help.py b/python/help.py
@@ -9,9 +9,9 @@ def __init__(self):
         QtGui.QDialog.__init__(self)
         self.setModal(True)
         self.setupUi()
-
+        
     def setupUi(self):
-        self.resize(400, 300)
+        self.setMaximumSize(500, 300)
         self.webView = QtWebKit.QWebView()
         self.setWindowTitle("Help Python Console")
         self.verticalLayout= QtGui.QVBoxLayout()

diff --git a/python/helpConsole/help.htm b/python/helpConsole/help.htm
@@ -9,9 +9,13 @@
     		font-size : 12px;
 		}
 		#header{
-    		background: #c6c6c6;
+    		background: #cccccc;
     		width: 100%;
 		}
+		#headerTool td{
+    		background: #f6f6f6;
+    		/*width: 100%;*/
+		}
 	</style>
 </head>
 <body>
@@ -56,16 +60,16 @@ <h4>Features</h4>
 		<br>
 		<li>CTRL+ALT+SPACE to view the command history list.</li>
 		<br>
-		<li>Saves command history by typing <b>_save</b> or closing the widget.<br>
+		<li>Saves the command history by typing <b>_save</b> or closing the widget.<br>
 			This command saves the history command in the file ~/.qgis/console_history.txt
 		</li>
 		<br>
-		<li>Clears command history  by typing <b>_clear</b>.<br>
-			This command clears the history command from file ~/.qgis/console_history.txt
+		<li>Clears the command history  by typing <b>_clear</b>.<br>
+			This command clears the command history from file ~/.qgis/console_history.txt
 		</li>
 		<br>
 		<li>Clears completely command history  by typing <b>_clearAll</b>.<br>
-			This command clears completely the history command. It has an irreversible effect.
+			This command clears completely the command history. It has an irreversible effect.
 		</li>
 		</ul>
 	</p>
@@ -77,34 +81,38 @@ <h4>Toolbar</h4>
 		</tr>
 	</table>
 	<p>The following is a description of the tools in the toolbar:</p>		
-	<table width="100%">
+	<table width="100%" border="0" id="headerTool">
 		<tr>
-		<td><img src="../iconConsole/iconClearConsole.png" /></td>
-		<td>Tool to clear python console</td>
+			<td><img src="../iconConsole/iconClearConsole.png" /></td>
+			<td colspan="2">Tool to clear python console</td>
 		</tr>
 		<tr>
-		<td><img src="../iconConsole/iconIfaceConsole.png" /></td>
-		<td>Tool to import iface class</td>
+			<td><img src="../iconConsole/iconClassConsole.png" /></td>
+			<td><img src="../iconConsole/iconIfaceConsole.png" /></td>
+			<td>Tool to import iface class</td>
 		</tr>
 		<tr>
-		<td><img src="../iconConsole/iconSextanteConsole.png" /></td>
-		<td>Tool to import Sextante class</td>
+			<td></td>
+			<td><img src="../iconConsole/iconSextanteConsole.png" /></td>
+			<td>Tool to import Sextante class</td>
 		</tr>
 		<tr>
-		<td><img src="../iconConsole/iconOpenConsole.png" /></td>
-		<td>Tool to open a python script and load in console</td>
+			<td><img src="../iconConsole/iconScriptConsole.png" /></td>
+			<td><img src="../iconConsole/iconOpenConsole.png" /></td>
+			<td>Tool to open a python script and load in console</td>
 		</tr>
 		<tr>
-		<td><img src="../iconConsole/iconSaveConsole.png" /></td>
-		<td>Tool to save a python script</td>
+			<td></td>
+			<td><img src="../iconConsole/iconSaveConsole.png" /></td>
+			<td>Tool to save a python script</td>
 		</tr>
 		<tr>
-		<td><img src="../iconConsole/iconHelpConsole.png" /></td>
-		<td>This! ;-)</td>
+			<td><img src="../iconConsole/iconHelpConsole.png" /></td>
+			<td colspan="2">Help</td>
 		</tr>
 		<tr>
-		<td><img src="../iconConsole/iconRunConsole.png" /></td>
-		<td>Run command (like Enter key pressed)</td>
+			<td><img src="../iconConsole/iconRunConsole.png" /></td>
+			<td colspan="2">Run command (like Enter key pressed)</td>
 		</tr>
 	</table>
 	<br>

diff --git a/python/iconConsole/CMakeLists.txt b/python/iconConsole/CMakeLists.txt
@@ -9,6 +9,7 @@ iconHelpConsole.png
 imgHelpDialog.png
 iconIfaceConsole.png
 iconClassConsole.png
+iconScriptConsole.png
 )
 
 FILE(GLOB ICON_FILES *.png)

diff --git a/python/iconConsole/iconClassConsole.png b/python/iconConsole/iconClassConsole.png
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/iconIfaceConsole.png b/python/iconConsole/iconIfaceConsole.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/iconScriptConsole.png b/python/iconConsole/iconScriptConsole.png
diff --git a/python/iconConsole/iconSextanteConsole.png b/python/iconConsole/iconSextanteConsole.png
diff --git a/python/iconConsole/iconTempConsole.png b/python/iconConsole/iconTempConsole.png