[pyqgis-console] small fixes

slarosa · slarosa · commit 9242170d8d16 · 2013-05-22T01:52:24.000+02:00
diff --git a/python/console/console_editor.py b/python/console/console_editor.py
@@ -514,8 +514,8 @@ def _runSubProcess(self, filename, tmp=False):
                         else:
                             raise e
             if tmp:
-                tmpFileTr = QCoreApplication.translate('PythonConsole', ' [Temporary file saved in ')
-                file = file + tmpFileTr + dir + ']'
+                tmpFileTr = QCoreApplication.translate('PythonConsole', ' [Temporary file saved in %1]').arg(dir)
+                file = file + tmpFileTr
             if _traceback:
                 msgTraceTr = QCoreApplication.translate('PythonConsole', '## Script error: %1').arg(file)
                 print "## %s" % datetime.datetime.now()
@@ -608,7 +608,7 @@ def syntaxCheck(self, filename=None, fromContextMenu=True):
                 source = source.encode('utf-8')
             if type(filename) == type(u""):
                 filename = filename.encode('utf-8')
-            compile(source, filename, 'exec')
+            compile(source, str(filename), 'exec')
         except SyntaxError, detail:
             s = traceback.format_exception_only(SyntaxError, detail)
             fn = detail.filename
diff --git a/python/console/console_history_dlg.ui b/python/console/console_history_dlg.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>HistoryDialog</class>
- <widget class="QDialog" name="HistoryDialog">
+ <class>HistoryDialogPythonConsole</class>
+ <widget class="QDialog" name="HistoryDialogPythonConsole">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -69,7 +69,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>HistoryDialog</receiver>
+   <receiver>HistoryDialogPythonConsole</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -85,7 +85,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>HistoryDialog</receiver>
+   <receiver>HistoryDialogPythonConsole</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -31,7 +31,7 @@
 import code
 
 from qgis.core import QgsApplication
-from ui_console_history_dlg import Ui_HistoryDialog
+from ui_console_history_dlg import Ui_HistoryDialogPythonConsole
 
 _init_commands = ["from qgis.core import *", "import qgis.utils",
                   "from qgis.utils import iface"]
@@ -562,7 +562,7 @@ def writeCMD(self, txt):
             prompt = getCmdString[0:4]
             sys.stdout.write(prompt+txt+'\n')
 
-class HistoryDialog(QDialog, Ui_HistoryDialog):
+class HistoryDialog(QDialog, Ui_HistoryDialogPythonConsole):
     def __init__(self, parent):
         QDialog.__init__(self, parent)
         self.setupUi(self)
