diff -r 96232974dcdb -r 645c12de6b0c QScintilla/Shell.py
--- a/QScintilla/Shell.py Sun Mar 30 22:00:14 2014 +0200
+++ b/QScintilla/Shell.py Thu Apr 03 23:05:31 2014 +0200
@@ -111,11 +111,11 @@
self.passive = Preferences.getDebugger("PassiveDbgEnabled")
if self.passive:
- self.setWindowTitle(self.trUtf8('Shell - Passive'))
+ self.setWindowTitle(self.tr('Shell - Passive'))
else:
- self.setWindowTitle(self.trUtf8('Shell'))
+ self.setWindowTitle(self.tr('Shell'))
- self.setWhatsThis(self.trUtf8(
+ self.setWhatsThis(self.tr(
"""<b>The Shell Window</b>"""
"""<p>This is simply an interpreter running in a window. The"""
""" interpreter is the one that is used to run the program"""
@@ -185,7 +185,7 @@
# Make sure we have prompts.
if self.passive:
- sys.ps1 = self.trUtf8("Passive >>> ")
+ sys.ps1 = self.tr("Passive >>> ")
else:
try:
sys.ps1
@@ -200,7 +200,7 @@
self.__getBanner()
# Create a little language context menu
- self.lmenu = QMenu(self.trUtf8('Start'))
+ self.lmenu = QMenu(self.tr('Start'))
self.clientLanguages = self.dbs.getSupportedLanguages(shellOnly=True)
self.clientLanguages.sort()
for language in self.clientLanguages:
@@ -209,28 +209,28 @@
self.lmenu.triggered.connect(self.__startDebugClient)
# Create the history context menu
- self.hmenu = QMenu(self.trUtf8('History'))
- self.hmenu.addAction(self.trUtf8('Select entry'), self.__selectHistory)
- self.hmenu.addAction(self.trUtf8('Show'), self.__showHistory)
- self.hmenu.addAction(self.trUtf8('Clear'), self.__clearHistory)
+ self.hmenu = QMenu(self.tr('History'))
+ self.hmenu.addAction(self.tr('Select entry'), self.__selectHistory)
+ self.hmenu.addAction(self.tr('Show'), self.__showHistory)
+ self.hmenu.addAction(self.tr('Clear'), self.__clearHistory)
# Create a little context menu
self.menu = QMenu(self)
- self.menu.addAction(self.trUtf8('Cut'), self.cut)
- self.menu.addAction(self.trUtf8('Copy'), self.copy)
- self.menu.addAction(self.trUtf8('Paste'), self.paste)
+ self.menu.addAction(self.tr('Cut'), self.cut)
+ self.menu.addAction(self.tr('Copy'), self.copy)
+ self.menu.addAction(self.tr('Paste'), self.paste)
self.menu.addMenu(self.hmenu)
self.menu.addSeparator()
- self.menu.addAction(self.trUtf8('Find'), self.__find)
+ self.menu.addAction(self.tr('Find'), self.__find)
self.menu.addSeparator()
- self.menu.addAction(self.trUtf8('Clear'), self.clear)
- self.menu.addAction(self.trUtf8('Reset'), self.__reset)
+ self.menu.addAction(self.tr('Clear'), self.clear)
+ self.menu.addAction(self.tr('Reset'), self.__reset)
self.menu.addAction(
- self.trUtf8('Reset and Clear'), self.__resetAndClear)
+ self.tr('Reset and Clear'), self.__resetAndClear)
self.menu.addSeparator()
self.menu.addMenu(self.lmenu)
self.menu.addSeparator()
- self.menu.addAction(self.trUtf8("Configure..."), self.__configure)
+ self.menu.addAction(self.tr("Configure..."), self.__configure)
self.__bindLexer()
self.__setTextDisplay()
@@ -576,9 +576,9 @@
"""
cmd, ok = QInputDialog.getItem(
self,
- self.trUtf8("Select History"),
- self.trUtf8("Select the history entry to execute"
- " (most recent shown last)."),
+ self.tr("Select History"),
+ self.tr("Select the history entry to execute"
+ " (most recent shown last)."),
self.history,
0, False)
if ok:
@@ -625,12 +625,12 @@
"""
super(Shell, self).clear()
if self.passive and not self.dbs.isConnected():
- self.__write(self.trUtf8('Passive Debug Mode'))
- self.__write(self.trUtf8('\nNot connected'))
+ self.__write(self.tr('Passive Debug Mode'))
+ self.__write(self.tr('\nNot connected'))
else:
- version = version.replace("#", self.trUtf8("No."))
+ version = version.replace("#", self.tr("No."))
if platform != "" and dbgclient != "":
- self.__write(self.trUtf8('{0} on {1}, {2}')
+ self.__write(self.tr('{0} on {1}, {2}')
.format(version, platform, dbgclient))
else:
self.__write(version)
@@ -691,7 +691,7 @@
@param s text to be displayed (string)
"""
- self.__write(self.trUtf8("StdOut: {0}").format(s))
+ self.__write(self.tr("StdOut: {0}").format(s))
def __writeStdErr(self, s):
"""
@@ -699,7 +699,7 @@
@param s text to be displayed (string)
"""
- self.__write(self.trUtf8("StdErr: {0}").format(s))
+ self.__write(self.tr("StdErr: {0}").format(s))
def __raw_input(self, s, echo):
"""
@@ -1268,7 +1268,7 @@
else:
# language not supported or typo
self.__write(
- self.trUtf8(
+ self.tr(
'Shell language "{0}" not supported.\n')
.format(cmdList[1]))
self.__clientStatement(False)
@@ -1295,7 +1295,10 @@
self.dbs.remoteStatement(cmd)
while self.inCommandExecution:
- QApplication.processEvents()
+ try:
+ QApplication.processEvents()
+ except KeyboardInterrupt:
+ pass
else:
if not self.echoInput:
cmd = self.buff
@@ -1453,6 +1456,14 @@
self.dbs.clientProcessStderr.disconnect(self.__writeStdErr)
self.__showStdOutErr = showStdOutErr
+ # recreate the languages menu
+ self.lmenu.clear()
+ self.clientLanguages = self.dbs.getSupportedLanguages(shellOnly=True)
+ self.clientLanguages.sort()
+ for language in self.clientLanguages:
+ act = self.lmenu.addAction(language)
+ act.setData(language)
+
def __showCompletions(self, completions, text):
"""
Private method to display the possible completions.
@@ -1542,8 +1553,8 @@
else:
E5MessageBox.information(
self,
- self.trUtf8("Drop Error"),
- self.trUtf8("""<p><b>{0}</b> is not a file.</p>""")
+ self.tr("Drop Error"),
+ self.tr("""<p><b>{0}</b> is not a file.</p>""")
.format(fname))
event.acceptProposedAction()
elif event.mimeData().hasText():
