[pyqgis-console] changes and cleans up some icon

qgis · May 24, 2013 · 35489cc1744bd925674fcad399886dcd57beaca7 · 35489cc
1 parent bdcc01e
commit 35489cc1744bd925674fcad399886dcd57beaca7
diff --git a/images/images.qrc b/images/images.qrc
@@ -64,13 +64,11 @@
         <file>themes/default/cap_round.png</file>
         <file>themes/default/cap_square.png</file>
         <file>themes/default/clearInput.png</file>
-        <file>themes/default/console/iconAboutConsole.png</file>
         <file>themes/default/console/iconClassConsole.png</file>
         <file>themes/default/console/iconClearConsole.png</file>
         <file>themes/default/console/iconCodepadConsole.png</file>
         <file>themes/default/console/iconHelpConsole.png</file>
         <file>themes/default/console/iconHideToolConsole.png</file>
-        <file>themes/default/console/iconIfaceConsole.png</file>
         <file>themes/default/console/iconOpenConsole.png</file>
         <file>themes/default/console/iconQtCoreConsole.png</file>
         <file>themes/default/console/iconQtGuiConsole.png</file>
@@ -84,7 +82,6 @@
         <file>themes/default/console/imgHelpMenu.png</file>
         <file>themes/default/console/iconTabEditorConsole.png</file>
         <file>themes/default/console/iconNewTabEditorConsole.png</file>
-        <file>themes/default/console/iconCloseTabEditorConsole.png</file>
         <file>themes/default/console/iconRestoreTabsConsole.png</file>
         <file>themes/default/console/iconFileTabsMenuConsole.png</file>
         <file>themes/default/console/iconShowEditorConsole.png</file>

diff --git a/images/themes/default/console/iconAboutConsole.png b/images/themes/default/console/iconAboutConsole.png
diff --git a/images/themes/default/console/iconCloseTabEditorConsole.png b/images/themes/default/console/iconCloseTabEditorConsole.png
diff --git a/images/themes/default/console/iconFileTabsMenuConsole.png b/images/themes/default/console/iconFileTabsMenuConsole.png
diff --git a/images/themes/default/console/iconIfaceConsole.png b/images/themes/default/console/iconIfaceConsole.png
diff --git a/images/themes/default/console/iconNewTabEditorConsole.png b/images/themes/default/console/iconNewTabEditorConsole.png
diff --git a/python/console/console.py b/python/console/console.py
@@ -708,7 +708,7 @@ def saveSettingsConsole(self):
         self.settings.setValue("pythonConsole/splitterObj", self.splitterObj.saveState())
         self.settings.setValue("pythonConsole/splitterEditor", self.splitterEditor.saveState())
 
-        self.shell.writeHistoryFile()
+        self.shell.writeHistoryFile(True)
 
     def restoreSettingsConsole(self):
         storedTabScripts = self.settings.value("pythonConsole/tabScripts")

diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -271,6 +271,9 @@ def contextMenuEvent(self, e):
         iconFind = QgsApplication.getThemeIcon("console/iconSearchEditorConsole.png")
         iconSyntaxCk = QgsApplication.getThemeIcon("console/iconSyntaxErrorConsole.png")
         iconObjInsp = QgsApplication.getThemeIcon("console/iconClassBrowserConsole.png")
+        iconCut = QgsApplication.getThemeIcon("console/iconCutEditorConsole.png")
+        iconCopy = QgsApplication.getThemeIcon("console/iconCopyEditorConsole.png")
+        iconPaste = QgsApplication.getThemeIcon("console/iconPasteEditorConsole.png")
         hideEditorAction = menu.addAction(QCoreApplication.translate("PythonConsole", "Hide Editor"),
                                           self.hideEditor)
         menu.addSeparator()
@@ -300,15 +303,18 @@ def contextMenuEvent(self, e):
                                                                "Find Text"),
                                     self.showFindWidget)
         menu.addSeparator()
-        cutAction = menu.addAction(QCoreApplication.translate("PythonConsole",
+        cutAction = menu.addAction(iconCut,
+                                   QCoreApplication.translate("PythonConsole",
                                                               "Cut"),
                                     self.cut,
                                     QKeySequence.Cut)
-        copyAction = menu.addAction(QCoreApplication.translate("PythonConsole",
+        copyAction = menu.addAction(iconCopy,
+                                    QCoreApplication.translate("PythonConsole",
                                                                "Copy"),
                                     self.copy,
                                     QKeySequence.Copy)
-        pasteAction = menu.addAction(QCoreApplication.translate("PythonConsole",
+        pasteAction = menu.addAction(iconPaste,
+                                     QCoreApplication.translate("PythonConsole",
                                                                 "Paste"),
                                      self.paste, QKeySequence.Paste)
         menu.addSeparator()

diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -271,7 +271,7 @@ def updateHistory(self, command):
                 self.history.append(command)
         self.historyIndex = len(self.history)
 
-    def writeHistoryFile(self):
+    def writeHistoryFile(self, fromCloseConsole=False):
         ok = False
         try:
             wH = open(_historyFile, 'w')
@@ -281,7 +281,7 @@ def writeHistoryFile(self):
         except:
             raise
         wH.close()
-        if ok:
+        if ok and not fromCloseConsole:
             msgText = QCoreApplication.translate('PythonConsole',
                                                  'History saved successfully.')
             self.parent.callWidgetMessageBar(msgText)