Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Fri Mar 22 20:39:32 2013 +0400
+++ b/APIs/Python3/eric5.api	Fri Mar 22 18:48:40 2013 +0100
@@ -3398,6 +3398,7 @@
 eric5.Network.IRC.IrcChannelWidget.IrcChannelWidget.name?4()
 eric5.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_editTopicButton_clicked?4()
 eric5.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_messageEdit_returnPressed?4()
+eric5.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_messages_anchorClicked?4(url)
 eric5.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_messages_copyAvailable?4(yes)
 eric5.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_messages_customContextMenuRequested?4(pos)
 eric5.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_usersList_customContextMenuRequested?4(pos)
@@ -3425,6 +3426,7 @@
 eric5.Network.IRC.IrcChannelWidget.IrcUserItem.Owner?7
 eric5.Network.IRC.IrcChannelWidget.IrcUserItem.PrivilegeMapping?7
 eric5.Network.IRC.IrcChannelWidget.IrcUserItem.Voice?7
+eric5.Network.IRC.IrcChannelWidget.IrcUserItem.canChangeTopic?4()
 eric5.Network.IRC.IrcChannelWidget.IrcUserItem.changePrivilege?4(privilege)
 eric5.Network.IRC.IrcChannelWidget.IrcUserItem.clearPrivileges?4()
 eric5.Network.IRC.IrcChannelWidget.IrcUserItem.name?4()
@@ -3579,6 +3581,7 @@
 eric5.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.on_connectButton_clicked?4()
 eric5.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.on_editButton_clicked?4()
 eric5.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.on_joinButton_clicked?4()
+eric5.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.on_messages_anchorClicked?4(url)
 eric5.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.on_messages_copyAvailable?4(yes)
 eric5.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.on_messages_customContextMenuRequested?4(pos)
 eric5.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.on_networkCombo_currentIndexChanged?4(networkName)
@@ -4450,6 +4453,7 @@
 eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_projectDirButton_clicked?4()
 eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_vcsUrlButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_vcsUrlEdit_textChanged?4(txt)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog?1(vcs, parent=None)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog.getData?4()
 eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.HgOptionsDialog?1(vcs, project, parent=None)
@@ -4873,10 +4877,12 @@
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_projectDirButton_clicked?4()
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol)
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged?4(txt)
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog?1(vcs, parent=None)
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog.getData?4()
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog.on_protocolCombo_activated?4(protocol)
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog.on_vcsUrlButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog.on_vcsUrlEdit_textChanged?4(txt)
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.SvnOptionsDialog?1(vcs, project, parent=None)
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.SvnPropDelDialog.getData?4()
 eric5.Plugins.VcsPlugins.vcsPySvn.SvnPropDelDialog.SvnPropDelDialog.on_propNameEdit_textChanged?4(text)
@@ -5099,10 +5105,12 @@
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_projectDirButton_clicked?4()
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol)
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged?4(txt)
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.SvnNewProjectOptionsDialog?1(vcs, parent=None)
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog.getData?4()
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog.on_protocolCombo_activated?4(protocol)
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog.on_vcsUrlButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog.on_vcsUrlEdit_textChanged?4(txt)
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.SvnOptionsDialog?1(vcs, project, parent=None)
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.SvnPropListDialog.closeEvent?4(e)
 eric5.Plugins.VcsPlugins.vcsSubversion.SvnPropListDialog.SvnPropListDialog.on_buttonBox_clicked?4(button)
@@ -5781,12 +5789,6 @@
 eric5.Preferences.ConfigurationPages.TemplatesPage.TemplatesPage.save?4()
 eric5.Preferences.ConfigurationPages.TemplatesPage.TemplatesPage?1()
 eric5.Preferences.ConfigurationPages.TemplatesPage.create?4(dlg)
-eric5.Preferences.ConfigurationPages.TerminalPage.TerminalPage.on_linenumbersFontButton_clicked?4()
-eric5.Preferences.ConfigurationPages.TerminalPage.TerminalPage.on_monospacedFontButton_clicked?4()
-eric5.Preferences.ConfigurationPages.TerminalPage.TerminalPage.polishPage?4()
-eric5.Preferences.ConfigurationPages.TerminalPage.TerminalPage.save?4()
-eric5.Preferences.ConfigurationPages.TerminalPage.TerminalPage?1()
-eric5.Preferences.ConfigurationPages.TerminalPage.create?4(dlg)
 eric5.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage.save?4()
 eric5.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage?1(parent=None)
 eric5.Preferences.ConfigurationPages.TrayStarterPage.create?4(dlg)
@@ -5842,7 +5844,6 @@
 eric5.Preferences.Prefs.sysDefaults?7
 eric5.Preferences.Prefs.tasksDefaults?7
 eric5.Preferences.Prefs.templatesDefaults?7
-eric5.Preferences.Prefs.terminalDefaults?7
 eric5.Preferences.Prefs.trayStarterDefaults?7
 eric5.Preferences.Prefs.uiDefaults?7
 eric5.Preferences.Prefs.userDefaults?7
@@ -5942,7 +5943,6 @@
 eric5.Preferences.getSystem?4(key, prefClass=Prefs)
 eric5.Preferences.getTasks?4(key, prefClass=Prefs)
 eric5.Preferences.getTemplates?4(key, prefClass=Prefs)
-eric5.Preferences.getTerminal?4(key, prefClass=Prefs)
 eric5.Preferences.getTrayStarter?4(key, prefClass=Prefs)
 eric5.Preferences.getUI?4(key, prefClass=Prefs)
 eric5.Preferences.getUILanguage?4(prefClass=Prefs)
@@ -5991,7 +5991,6 @@
 eric5.Preferences.setSystem?4(key, value, prefClass=Prefs)
 eric5.Preferences.setTasks?4(key, value, prefClass=Prefs)
 eric5.Preferences.setTemplates?4(key, value, prefClass=Prefs)
-eric5.Preferences.setTerminal?4(key, value, prefClass=Prefs)
 eric5.Preferences.setTrayStarter?4(key, value, prefClass=Prefs)
 eric5.Preferences.setUI?4(key, value, prefClass=Prefs)
 eric5.Preferences.setUILanguage?4(lang, prefClass=Prefs)
@@ -7120,30 +7119,6 @@
 eric5.QScintilla.SpellingDictionaryEditDialog.SpellingDictionaryEditDialog.getData?4()
 eric5.QScintilla.SpellingDictionaryEditDialog.SpellingDictionaryEditDialog.on_addButton_clicked?4()
 eric5.QScintilla.SpellingDictionaryEditDialog.SpellingDictionaryEditDialog?1(data, info, parent=None)
-eric5.QScintilla.Terminal.Terminal.clear?4()
-eric5.QScintilla.Terminal.Terminal.closeTerminal?4()
-eric5.QScintilla.Terminal.Terminal.contextMenuEvent?4(ev)
-eric5.QScintilla.Terminal.Terminal.editorCommand?4(cmd)
-eric5.QScintilla.Terminal.Terminal.event?4(evt)
-eric5.QScintilla.Terminal.Terminal.focusInEvent?4(event)
-eric5.QScintilla.Terminal.Terminal.focusOutEvent?4(event)
-eric5.QScintilla.Terminal.Terminal.gestureEvent?4(evt)
-eric5.QScintilla.Terminal.Terminal.getHistory?4()
-eric5.QScintilla.Terminal.Terminal.handlePreferencesChanged?4()
-eric5.QScintilla.Terminal.Terminal.insert?4(txt)
-eric5.QScintilla.Terminal.Terminal.keyPressEvent?4(ev)
-eric5.QScintilla.Terminal.Terminal.loadHistory?4()
-eric5.QScintilla.Terminal.Terminal.mousePressEvent?4(event)
-eric5.QScintilla.Terminal.Terminal.reloadHistory?4()
-eric5.QScintilla.Terminal.Terminal.saveHistory?4()
-eric5.QScintilla.Terminal.Terminal.searchNext?4(txt, caseSensitive, wholeWord)
-eric5.QScintilla.Terminal.Terminal.searchPrev?4(txt, caseSensitive, wholeWord)
-eric5.QScintilla.Terminal.Terminal.searchStringFound?7
-eric5.QScintilla.Terminal.Terminal.wheelEvent?4(evt)
-eric5.QScintilla.Terminal.Terminal?1(vm, parent=None)
-eric5.QScintilla.Terminal.TerminalAssembly.showFind?4(txt="")
-eric5.QScintilla.Terminal.TerminalAssembly.terminal?4()
-eric5.QScintilla.Terminal.TerminalAssembly?1(vm, parent=None)
 eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.charAdded?4(charNumber)
 eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.isEnabled?4()
 eric5.QScintilla.TypingCompleters.CompleterBase.CompleterBase.readSettings?4()

--- a/APIs/Python3/eric5.bas	Fri Mar 22 20:39:32 2013 +0400
+++ b/APIs/Python3/eric5.bas	Fri Mar 22 18:48:40 2013 +0100
@@ -673,9 +673,6 @@
 TemplatesPage ConfigurationPageBase Ui_TemplatesPage
 TemplatesReader XMLStreamReaderBase
 TemplatesWriter XMLStreamWriterBase
-Terminal QsciScintillaCompat
-TerminalAssembly QWidget
-TerminalPage ConfigurationPageBase Ui_TerminalPage
 ToolConfigurationDialog QDialog Ui_ToolConfigurationDialog
 ToolGroupConfigurationDialog QDialog Ui_ToolGroupConfigurationDialog
 TranslationPropertiesDialog QDialog Ui_TranslationPropertiesDialog

--- a/APIs/Ruby/eric5.api	Fri Mar 22 20:39:32 2013 +0400
+++ b/APIs/Ruby/eric5.api	Fri Mar 22 18:48:40 2013 +0100
@@ -23,7 +23,7 @@
 eric5.DebugClients.Ruby.Completer.Completer.ReservedWords?7
 eric5.DebugClients.Ruby.Completer.Completer.complete?4()
 eric5.DebugClients.Ruby.Completer.Completer.initialize?4()
-eric5.DebugClients.Ruby.Completer.Completer.select_message?4(message, candidates)
+eric5.DebugClients.Ruby.Completer.Completer.select_message?4(message, candidates, sep = ".")
 eric5.DebugClients.Ruby.Config.ConfigVarTypeStrings?7
 eric5.DebugClients.Ruby.DebugClient.DebugClient.initialize?4()
 eric5.DebugClients.Ruby.DebugClientCapabilities.HasAll?7
@@ -149,10 +149,6 @@
 eric5.DebugClients.Ruby.Debuggee.DEBUGGER__.thnum?4()
 eric5.DebugClients.Ruby.Debuggee.DEBUGGER__.trace_func?4(file, line, id, binding_, klass)
 eric5.DebugClients.Ruby.Debuggee.DEBUGGER__.waiting?4()
-eric5.DebugClients.Ruby.Debuggee.Mutex.initialize?4()
-eric5.DebugClients.Ruby.Debuggee.Mutex.lock?4()
-eric5.DebugClients.Ruby.Debuggee.Mutex.locked??4()
-eric5.DebugClients.Ruby.Debuggee.Mutex.unlock?4()
 eric5.DebugClients.Ruby.Debuggee.SilentObject.method_missing?4(*a, &b)
 eric5.DebugClients.Ruby.Debuggee.context?4(thread=Thread.current)
 eric5.DebugClients.Ruby.Debuggee.debug_thread_info?4(input, binding_)

--- a/DebugClients/Python/DebugClientBase.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/DebugClients/Python/DebugClientBase.py	Fri Mar 22 18:48:40 2013 +0100
@@ -1484,12 +1484,15 @@
             varlist.extend(vlist)
         
             if obj is not None and not formatSequences:
-                if unicode(repr(obj)).startswith('{'):
-                    varlist.append(('...', 'dict', "%d" % len(obj.keys())))
-                elif unicode(repr(obj)).startswith('['):
-                    varlist.append(('...', 'list', "%d" % len(obj)))
-                elif unicode(repr(obj)).startswith('('):
-                    varlist.append(('...', 'tuple', "%d" % len(obj)))
+                try:
+                    if unicode(repr(obj)).startswith('{'):
+                        varlist.append(('...', 'dict', "%d" % len(obj.keys())))
+                    elif unicode(repr(obj)).startswith('['):
+                        varlist.append(('...', 'list', "%d" % len(obj)))
+                    elif unicode(repr(obj)).startswith('('):
+                        varlist.append(('...', 'tuple', "%d" % len(obj)))
+                except:
+                    pass
         
         self.write('%s%s\n' % (DebugProtocol.ResponseVariable, unicode(varlist)))
         

--- a/DebugClients/Python3/DebugBase.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/DebugClients/Python3/DebugBase.py	Fri Mar 22 18:48:40 2013 +0100
@@ -686,7 +686,7 @@
         
         @param exctype type of the exception
         """
-        return repr(exctype).replace("<class '", "").replace("'>", "")
+        return str(exctype).replace("<class '", "").replace("'>", "")
     
     def __extract_stack(self, exctb):
         """

--- a/DebugClients/Python3/DebugClientBase.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/DebugClients/Python3/DebugClientBase.py	Fri Mar 22 18:48:40 2013 +0100
@@ -1517,12 +1517,15 @@
             varlist.extend(vlist)
         
             if obj is not None and not formatSequences:
-                if repr(obj).startswith('{'):
-                    varlist.append(('...', 'dict', "{0:d}".format(len(obj.keys()))))
-                elif repr(obj).startswith('['):
-                    varlist.append(('...', 'list', "{0:d}".format(len(obj))))
-                elif repr(obj).startswith('('):
-                    varlist.append(('...', 'tuple', "{0:d}".format(len(obj))))
+                try:
+                    if repr(obj).startswith('{'):
+                        varlist.append(('...', 'dict', "{0:d}".format(len(obj.keys()))))
+                    elif repr(obj).startswith('['):
+                        varlist.append(('...', 'list', "{0:d}".format(len(obj))))
+                    elif repr(obj).startswith('('):
+                        varlist.append(('...', 'tuple', "{0:d}".format(len(obj))))
+                except:
+                    pass
         
         self.write('{0}{1}\n'.format(DebugProtocol.ResponseVariable, str(varlist)))
         

--- a/Debugger/DebugServer.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Debugger/DebugServer.py	Fri Mar 22 18:48:40 2013 +0100
@@ -358,13 +358,8 @@
         # only start the client, if we are not in passive mode
         if not self.passive:
             if self.clientProcess:
-##                self.clientProcess.readyReadStandardError.disconnect(
-##                    self.__clientProcessError)
-##                self.clientProcess.readyReadStandardOutput.disconnect(
-##                    self.__clientProcessOutput)
-                self.clientProcess.close()
                 self.clientProcess.kill()
-                self.clientProcess.waitForFinished(10000)
+                self.clientProcess.waitForFinished(1000)
                 self.clientProcess.deleteLater()
                 self.clientProcess = None
             

--- a/Debugger/VariablesViewer.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Debugger/VariablesViewer.py	Fri Mar 22 18:48:40 2013 +0100
@@ -10,6 +10,7 @@
 from PyQt4.QtCore import Qt, QRegExp, qVersion
 from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QApplication, QAbstractItemView, \
     QMenu
+from PyQt4.QtGui import QTextDocument   # __IGNORE_WARNING__
 
 from E5Gui.E5Application import e5App
 
@@ -18,6 +19,7 @@
 from .Config import ConfigVarTypeDispStrings
 
 import Preferences
+import Utilities
 
 
 class VariableItem(QTreeWidgetItem):
@@ -33,10 +35,30 @@
         @param dvalue value string (string)
         @param dtype type string (string)
         """
-        self.value = dvalue
+        self.__value = dvalue
         if len(dvalue) > 2048:     # 1024 * 2
             dvalue = QApplication.translate("VariableItem",
                                             "<double click to show value>")
+            self.__tooltip = dvalue
+        else:
+            if Qt.mightBeRichText(dvalue):
+                self.__tooltip = Utilities.html_encode(dvalue)
+            else:
+                self.__tooltip = dvalue
+            lines = dvalue.splitlines()
+            if len(lines) > 1:
+                # only show the first non-empty line;
+                # indicate skipped lines by <...> at the
+                # beginning and/or end
+                index = 0
+                while index < len(lines) and lines[index] == "":
+                    index += 1
+                dvalue = ""
+                if index > 0:
+                    dvalue += "<...>"
+                dvalue += lines[index]
+                if index < len(lines) - 1:
+                    dvalue += "<...>"
         
         super().__init__(parent, [dvar, dvalue, dtype])
         
@@ -48,7 +70,7 @@
         
         @return value of the item (string)
         """
-        return self.value
+        return self.__value
         
     def data(self, column, role):
         """
@@ -62,8 +84,8 @@
         @return requested data
         """
         if column == 1 and role == Qt.ToolTipRole:
-            role = Qt.DisplayRole
-        return QTreeWidgetItem.data(self, column, role)
+            return self.__tooltip
+        return super().data(column, role)
         
     def attachDummy(self):
         """

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DesignerTemplates/qdockwidget4.tmpl	Fri Mar 22 18:48:40 2013 +0100
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DockWidget</class>
+ <widget class="QDockWidget" name="DockWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>DockWidget</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DesignerTemplates/qframe4.tmpl	Fri Mar 22 18:48:40 2013 +0100
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Frame</class>
+ <widget class="QFrame" name="Frame">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Frame</string>
+  </property>
+  <property name="frameShape">
+   <enum>QFrame::StyledPanel</enum>
+  </property>
+  <property name="frameShadow">
+   <enum>QFrame::Raised</enum>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DesignerTemplates/qgroupbox4.tmpl	Fri Mar 22 18:48:40 2013 +0100
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GroupBox</class>
+ <widget class="QGroupBox" name="GroupBox">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>GroupBox</string>
+  </property>
+  <property name="title">
+   <string>GroupBox</string>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DesignerTemplates/qmdiarea4.tmpl	Fri Mar 22 18:48:40 2013 +0100
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MdiArea</class>
+ <widget class="QMdiArea" name="MdiArea">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MdiArea</string>
+  </property>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DesignerTemplates/qscrollarea4.tmpl	Fri Mar 22 18:48:40 2013 +0100
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ScrollArea</class>
+ <widget class="QScrollArea" name="ScrollArea">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>ScrollArea</string>
+  </property>
+  <property name="widgetResizable">
+   <bool>true</bool>
+  </property>
+  <widget class="QWidget" name="scrollAreaWidgetContents">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>396</width>
+     <height>296</height>
+    </rect>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DesignerTemplates/qstackedwidget4.tmpl	Fri Mar 22 18:48:40 2013 +0100
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>StackedWidget</class>
+ <widget class="QStackedWidget" name="StackedWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>StackedWidget</string>
+  </property>
+  <widget class="QWidget" name="page"/>
+  <widget class="QWidget" name="page"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DesignerTemplates/qtabwidget4.tmpl	Fri Mar 22 18:48:40 2013 +0100
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TabWidget</class>
+ <widget class="QTabWidget" name="TabWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>TabWidget</string>
+  </property>
+  <widget class="QWidget" name="tab">
+   <attribute name="title">
+    <string>Tab 1</string>
+   </attribute>
+  </widget>
+  <widget class="QWidget" name="tab">
+   <attribute name="title">
+    <string>Tab 2</string>
+   </attribute>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DesignerTemplates/qtoolbox4.tmpl	Fri Mar 22 18:48:40 2013 +0100
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ToolBox</class>
+ <widget class="QToolBox" name="ToolBox">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>ToolBox</string>
+  </property>
+  <property name="currentIndex">
+   <number>0</number>
+  </property>
+  <widget class="QWidget" name="page">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>400</width>
+     <height>244</height>
+    </rect>
+   </property>
+   <attribute name="label">
+    <string>Page 1</string>
+   </attribute>
+  </widget>
+  <widget class="QWidget" name="page">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>96</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <attribute name="label">
+    <string>Page 2</string>
+   </attribute>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Help/source.qhp	Fri Mar 22 18:48:40 2013 +0100
@@ -749,7 +749,6 @@
               <section title="eric5.Preferences.ConfigurationPages.ShellPage" ref="eric5.Preferences.ConfigurationPages.ShellPage.html" />
               <section title="eric5.Preferences.ConfigurationPages.TasksPage" ref="eric5.Preferences.ConfigurationPages.TasksPage.html" />
               <section title="eric5.Preferences.ConfigurationPages.TemplatesPage" ref="eric5.Preferences.ConfigurationPages.TemplatesPage.html" />
-              <section title="eric5.Preferences.ConfigurationPages.TerminalPage" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html" />
               <section title="eric5.Preferences.ConfigurationPages.TrayStarterPage" ref="eric5.Preferences.ConfigurationPages.TrayStarterPage.html" />
               <section title="eric5.Preferences.ConfigurationPages.VcsPage" ref="eric5.Preferences.ConfigurationPages.VcsPage.html" />
               <section title="eric5.Preferences.ConfigurationPages.ViewmanagerPage" ref="eric5.Preferences.ConfigurationPages.ViewmanagerPage.html" />
@@ -862,7 +861,6 @@
             <section title="eric5.QScintilla.SpellChecker" ref="eric5.QScintilla.SpellChecker.html" />
             <section title="eric5.QScintilla.SpellCheckingDialog" ref="eric5.QScintilla.SpellCheckingDialog.html" />
             <section title="eric5.QScintilla.SpellingDictionaryEditDialog" ref="eric5.QScintilla.SpellingDictionaryEditDialog.html" />
-            <section title="eric5.QScintilla.Terminal" ref="eric5.QScintilla.Terminal.html" />
             <section title="eric5.QScintilla.ZoomDialog" ref="eric5.QScintilla.ZoomDialog.html" />
           </section>
           <section title="eric5.Snapshot" ref="index-eric5.Snapshot.html">
@@ -3970,6 +3968,7 @@
       <keyword name="Editor.__initContextMenuUnifiedMargins" id="Editor.__initContextMenuUnifiedMargins" ref="eric5.QScintilla.Editor.html#Editor.__initContextMenuUnifiedMargins" />
       <keyword name="Editor.__initOnlineChangeTrace" id="Editor.__initOnlineChangeTrace" ref="eric5.QScintilla.Editor.html#Editor.__initOnlineChangeTrace" />
       <keyword name="Editor.__initOnlineSyntaxCheck" id="Editor.__initOnlineSyntaxCheck" ref="eric5.QScintilla.Editor.html#Editor.__initOnlineSyntaxCheck" />
+      <keyword name="Editor.__isCommentedLine" id="Editor.__isCommentedLine" ref="eric5.QScintilla.Editor.html#Editor.__isCommentedLine" />
       <keyword name="Editor.__isStartChar" id="Editor.__isStartChar" ref="eric5.QScintilla.Editor.html#Editor.__isStartChar" />
       <keyword name="Editor.__languageChanged" id="Editor.__languageChanged" ref="eric5.QScintilla.Editor.html#Editor.__languageChanged" />
       <keyword name="Editor.__languageMenuTriggered" id="Editor.__languageMenuTriggered" ref="eric5.QScintilla.Editor.html#Editor.__languageMenuTriggered" />
@@ -5800,6 +5799,7 @@
       <keyword name="HgNewProjectOptionsDialog.on_projectDirButton_clicked" id="HgNewProjectOptionsDialog.on_projectDirButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog.on_projectDirButton_clicked" />
       <keyword name="HgNewProjectOptionsDialog.on_protocolCombo_activated" id="HgNewProjectOptionsDialog.on_protocolCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog.on_protocolCombo_activated" />
       <keyword name="HgNewProjectOptionsDialog.on_vcsUrlButton_clicked" id="HgNewProjectOptionsDialog.on_vcsUrlButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog.on_vcsUrlButton_clicked" />
+      <keyword name="HgNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" id="HgNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" />
       <keyword name="HgOptionsDialog" id="HgOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html#HgOptionsDialog" />
       <keyword name="HgOptionsDialog (Constructor)" id="HgOptionsDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html#HgOptionsDialog.__init__" />
       <keyword name="HgOptionsDialog (Module)" id="HgOptionsDialog (Module)" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" />
@@ -6523,7 +6523,6 @@
       <keyword name="IrcChannelWidget.__copyAllMessages" id="IrcChannelWidget.__copyAllMessages" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__copyAllMessages" />
       <keyword name="IrcChannelWidget.__copyMessages" id="IrcChannelWidget.__copyMessages" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__copyMessages" />
       <keyword name="IrcChannelWidget.__cutAllMessages" id="IrcChannelWidget.__cutAllMessages" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__cutAllMessages" />
-      <keyword name="IrcChannelWidget.__cutMessages" id="IrcChannelWidget.__cutMessages" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__cutMessages" />
       <keyword name="IrcChannelWidget.__extractPrivilege" id="IrcChannelWidget.__extractPrivilege" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__extractPrivilege" />
       <keyword name="IrcChannelWidget.__findUser" id="IrcChannelWidget.__findUser" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__findUser" />
       <keyword name="IrcChannelWidget.__handleCtcp" id="IrcChannelWidget.__handleCtcp" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__handleCtcp" />
@@ -6535,6 +6534,7 @@
       <keyword name="IrcChannelWidget.__openPrivateChat" id="IrcChannelWidget.__openPrivateChat" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__openPrivateChat" />
       <keyword name="IrcChannelWidget.__saveMessages" id="IrcChannelWidget.__saveMessages" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__saveMessages" />
       <keyword name="IrcChannelWidget.__sendAutoWhoCommand" id="IrcChannelWidget.__sendAutoWhoCommand" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__sendAutoWhoCommand" />
+      <keyword name="IrcChannelWidget.__setEditTopicButton" id="IrcChannelWidget.__setEditTopicButton" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__setEditTopicButton" />
       <keyword name="IrcChannelWidget.__setTopic" id="IrcChannelWidget.__setTopic" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__setTopic" />
       <keyword name="IrcChannelWidget.__setUserPrivilege" id="IrcChannelWidget.__setUserPrivilege" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__setUserPrivilege" />
       <keyword name="IrcChannelWidget.__topicCreated" id="IrcChannelWidget.__topicCreated" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcChannelWidget.__topicCreated" />
@@ -6721,7 +6721,6 @@
       <keyword name="IrcNetworkWidget.__copyAllMessages" id="IrcNetworkWidget.__copyAllMessages" ref="eric5.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.__copyAllMessages" />
       <keyword name="IrcNetworkWidget.__copyMessages" id="IrcNetworkWidget.__copyMessages" ref="eric5.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.__copyMessages" />
       <keyword name="IrcNetworkWidget.__cutAllMessages" id="IrcNetworkWidget.__cutAllMessages" ref="eric5.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.__cutAllMessages" />
-      <keyword name="IrcNetworkWidget.__cutMessages" id="IrcNetworkWidget.__cutMessages" ref="eric5.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.__cutMessages" />
       <keyword name="IrcNetworkWidget.__initMessagesMenu" id="IrcNetworkWidget.__initMessagesMenu" ref="eric5.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.__initMessagesMenu" />
       <keyword name="IrcNetworkWidget.__refreshNetworks" id="IrcNetworkWidget.__refreshNetworks" ref="eric5.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.__refreshNetworks" />
       <keyword name="IrcNetworkWidget.__saveMessages" id="IrcNetworkWidget.__saveMessages" ref="eric5.Network.IRC.IrcNetworkWidget.html#IrcNetworkWidget.__saveMessages" />
@@ -6771,6 +6770,7 @@
       <keyword name="IrcUserItem (Constructor)" id="IrcUserItem (Constructor)" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcUserItem.__init__" />
       <keyword name="IrcUserItem.__awayIcon" id="IrcUserItem.__awayIcon" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcUserItem.__awayIcon" />
       <keyword name="IrcUserItem.__setIcon" id="IrcUserItem.__setIcon" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcUserItem.__setIcon" />
+      <keyword name="IrcUserItem.canChangeTopic" id="IrcUserItem.canChangeTopic" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcUserItem.canChangeTopic" />
       <keyword name="IrcUserItem.changePrivilege" id="IrcUserItem.changePrivilege" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcUserItem.changePrivilege" />
       <keyword name="IrcUserItem.clearPrivileges" id="IrcUserItem.clearPrivileges" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcUserItem.clearPrivileges" />
       <keyword name="IrcUserItem.name" id="IrcUserItem.name" ref="eric5.Network.IRC.IrcChannelWidget.html#IrcUserItem.name" />
@@ -10165,6 +10165,8 @@
       <keyword name="SvnNewProjectOptionsDialog.on_protocolCombo_activated" id="SvnNewProjectOptionsDialog.on_protocolCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html#SvnNewProjectOptionsDialog.on_protocolCombo_activated" />
       <keyword name="SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked" id="SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html#SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked" />
       <keyword name="SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked" id="SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html#SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked" />
+      <keyword name="SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" id="SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html#SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" />
+      <keyword name="SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" id="SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html#SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" />
       <keyword name="SvnOptionsDialog" id="SvnOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.html#SvnOptionsDialog" />
       <keyword name="SvnOptionsDialog" id="SvnOptionsDialog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html#SvnOptionsDialog" />
       <keyword name="SvnOptionsDialog (Constructor)" id="SvnOptionsDialog (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.html#SvnOptionsDialog.__init__" />
@@ -10177,6 +10179,8 @@
       <keyword name="SvnOptionsDialog.on_protocolCombo_activated" id="SvnOptionsDialog.on_protocolCombo_activated" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html#SvnOptionsDialog.on_protocolCombo_activated" />
       <keyword name="SvnOptionsDialog.on_vcsUrlButton_clicked" id="SvnOptionsDialog.on_vcsUrlButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.html#SvnOptionsDialog.on_vcsUrlButton_clicked" />
       <keyword name="SvnOptionsDialog.on_vcsUrlButton_clicked" id="SvnOptionsDialog.on_vcsUrlButton_clicked" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html#SvnOptionsDialog.on_vcsUrlButton_clicked" />
+      <keyword name="SvnOptionsDialog.on_vcsUrlEdit_textChanged" id="SvnOptionsDialog.on_vcsUrlEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.html#SvnOptionsDialog.on_vcsUrlEdit_textChanged" />
+      <keyword name="SvnOptionsDialog.on_vcsUrlEdit_textChanged" id="SvnOptionsDialog.on_vcsUrlEdit_textChanged" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html#SvnOptionsDialog.on_vcsUrlEdit_textChanged" />
       <keyword name="SvnProjectBrowserHelper" id="SvnProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper" />
       <keyword name="SvnProjectBrowserHelper" id="SvnProjectBrowserHelper" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html#SvnProjectBrowserHelper" />
       <keyword name="SvnProjectBrowserHelper (Constructor)" id="SvnProjectBrowserHelper (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html#SvnProjectBrowserHelper.__init__" />
@@ -10952,90 +10956,6 @@
       <keyword name="TemplatesWriter (Constructor)" id="TemplatesWriter (Constructor)" ref="eric5.E5XML.TemplatesWriter.html#TemplatesWriter.__init__" />
       <keyword name="TemplatesWriter (Module)" id="TemplatesWriter (Module)" ref="eric5.E5XML.TemplatesWriter.html" />
       <keyword name="TemplatesWriter.writeXML" id="TemplatesWriter.writeXML" ref="eric5.E5XML.TemplatesWriter.html#TemplatesWriter.writeXML" />
-      <keyword name="Terminal" id="Terminal" ref="eric5.QScintilla.Terminal.html#Terminal" />
-      <keyword name="Terminal (Constructor)" id="Terminal (Constructor)" ref="eric5.QScintilla.Terminal.html#Terminal.__init__" />
-      <keyword name="Terminal (Module)" id="Terminal (Module)" ref="eric5.QScintilla.Terminal.html" />
-      <keyword name="Terminal.__QScintillaCharLeft" id="Terminal.__QScintillaCharLeft" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaCharLeft" />
-      <keyword name="Terminal.__QScintillaCharLeftExtend" id="Terminal.__QScintillaCharLeftExtend" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaCharLeftExtend" />
-      <keyword name="Terminal.__QScintillaCharRight" id="Terminal.__QScintillaCharRight" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaCharRight" />
-      <keyword name="Terminal.__QScintillaDelete" id="Terminal.__QScintillaDelete" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaDelete" />
-      <keyword name="Terminal.__QScintillaDeleteBack" id="Terminal.__QScintillaDeleteBack" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaDeleteBack" />
-      <keyword name="Terminal.__QScintillaDeleteLineLeft" id="Terminal.__QScintillaDeleteLineLeft" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaDeleteLineLeft" />
-      <keyword name="Terminal.__QScintillaDeleteLineRight" id="Terminal.__QScintillaDeleteLineRight" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaDeleteLineRight" />
-      <keyword name="Terminal.__QScintillaDeleteWordLeft" id="Terminal.__QScintillaDeleteWordLeft" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaDeleteWordLeft" />
-      <keyword name="Terminal.__QScintillaDeleteWordRight" id="Terminal.__QScintillaDeleteWordRight" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaDeleteWordRight" />
-      <keyword name="Terminal.__QScintillaLeftCommand" id="Terminal.__QScintillaLeftCommand" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaLeftCommand" />
-      <keyword name="Terminal.__QScintillaLeftDeleteCommand" id="Terminal.__QScintillaLeftDeleteCommand" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaLeftDeleteCommand" />
-      <keyword name="Terminal.__QScintillaLineDown" id="Terminal.__QScintillaLineDown" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaLineDown" />
-      <keyword name="Terminal.__QScintillaLineEnd" id="Terminal.__QScintillaLineEnd" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaLineEnd" />
-      <keyword name="Terminal.__QScintillaLineUp" id="Terminal.__QScintillaLineUp" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaLineUp" />
-      <keyword name="Terminal.__QScintillaNewline" id="Terminal.__QScintillaNewline" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaNewline" />
-      <keyword name="Terminal.__QScintillaRightCommand" id="Terminal.__QScintillaRightCommand" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaRightCommand" />
-      <keyword name="Terminal.__QScintillaVCHome" id="Terminal.__QScintillaVCHome" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaVCHome" />
-      <keyword name="Terminal.__QScintillaVCHomeExtend" id="Terminal.__QScintillaVCHomeExtend" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaVCHomeExtend" />
-      <keyword name="Terminal.__QScintillaWordLeft" id="Terminal.__QScintillaWordLeft" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaWordLeft" />
-      <keyword name="Terminal.__QScintillaWordLeftExtend" id="Terminal.__QScintillaWordLeftExtend" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaWordLeftExtend" />
-      <keyword name="Terminal.__QScintillaWordRight" id="Terminal.__QScintillaWordRight" ref="eric5.QScintilla.Terminal.html#Terminal.__QScintillaWordRight" />
-      <keyword name="Terminal.__bindLexer" id="Terminal.__bindLexer" ref="eric5.QScintilla.Terminal.html#Terminal.__bindLexer" />
-      <keyword name="Terminal.__clearCurrentLine" id="Terminal.__clearCurrentLine" ref="eric5.QScintilla.Terminal.html#Terminal.__clearCurrentLine" />
-      <keyword name="Terminal.__clearHistory" id="Terminal.__clearHistory" ref="eric5.QScintilla.Terminal.html#Terminal.__clearHistory" />
-      <keyword name="Terminal.__configure" id="Terminal.__configure" ref="eric5.QScintilla.Terminal.html#Terminal.__configure" />
-      <keyword name="Terminal.__executeCommand" id="Terminal.__executeCommand" ref="eric5.QScintilla.Terminal.html#Terminal.__executeCommand" />
-      <keyword name="Terminal.__find" id="Terminal.__find" ref="eric5.QScintilla.Terminal.html#Terminal.__find" />
-      <keyword name="Terminal.__finished" id="Terminal.__finished" ref="eric5.QScintilla.Terminal.html#Terminal.__finished" />
-      <keyword name="Terminal.__getEndPos" id="Terminal.__getEndPos" ref="eric5.QScintilla.Terminal.html#Terminal.__getEndPos" />
-      <keyword name="Terminal.__insertHistory" id="Terminal.__insertHistory" ref="eric5.QScintilla.Terminal.html#Terminal.__insertHistory" />
-      <keyword name="Terminal.__insertText" id="Terminal.__insertText" ref="eric5.QScintilla.Terminal.html#Terminal.__insertText" />
-      <keyword name="Terminal.__insertTextAtEnd" id="Terminal.__insertTextAtEnd" ref="eric5.QScintilla.Terminal.html#Terminal.__insertTextAtEnd" />
-      <keyword name="Terminal.__isCursorOnLastLine" id="Terminal.__isCursorOnLastLine" ref="eric5.QScintilla.Terminal.html#Terminal.__isCursorOnLastLine" />
-      <keyword name="Terminal.__readOutput" id="Terminal.__readOutput" ref="eric5.QScintilla.Terminal.html#Terminal.__readOutput" />
-      <keyword name="Terminal.__reset" id="Terminal.__reset" ref="eric5.QScintilla.Terminal.html#Terminal.__reset" />
-      <keyword name="Terminal.__rsearchHistory" id="Terminal.__rsearchHistory" ref="eric5.QScintilla.Terminal.html#Terminal.__rsearchHistory" />
-      <keyword name="Terminal.__searchHistory" id="Terminal.__searchHistory" ref="eric5.QScintilla.Terminal.html#Terminal.__searchHistory" />
-      <keyword name="Terminal.__searchNext" id="Terminal.__searchNext" ref="eric5.QScintilla.Terminal.html#Terminal.__searchNext" />
-      <keyword name="Terminal.__searchPrev" id="Terminal.__searchPrev" ref="eric5.QScintilla.Terminal.html#Terminal.__searchPrev" />
-      <keyword name="Terminal.__selectHistory" id="Terminal.__selectHistory" ref="eric5.QScintilla.Terminal.html#Terminal.__selectHistory" />
-      <keyword name="Terminal.__send" id="Terminal.__send" ref="eric5.QScintilla.Terminal.html#Terminal.__send" />
-      <keyword name="Terminal.__sendCtrl" id="Terminal.__sendCtrl" ref="eric5.QScintilla.Terminal.html#Terminal.__sendCtrl" />
-      <keyword name="Terminal.__setMargin0" id="Terminal.__setMargin0" ref="eric5.QScintilla.Terminal.html#Terminal.__setMargin0" />
-      <keyword name="Terminal.__setMonospaced" id="Terminal.__setMonospaced" ref="eric5.QScintilla.Terminal.html#Terminal.__setMonospaced" />
-      <keyword name="Terminal.__setTextDisplay" id="Terminal.__setTextDisplay" ref="eric5.QScintilla.Terminal.html#Terminal.__setTextDisplay" />
-      <keyword name="Terminal.__showHistory" id="Terminal.__showHistory" ref="eric5.QScintilla.Terminal.html#Terminal.__showHistory" />
-      <keyword name="Terminal.__startShell" id="Terminal.__startShell" ref="eric5.QScintilla.Terminal.html#Terminal.__startShell" />
-      <keyword name="Terminal.__started" id="Terminal.__started" ref="eric5.QScintilla.Terminal.html#Terminal.__started" />
-      <keyword name="Terminal.__stopShell" id="Terminal.__stopShell" ref="eric5.QScintilla.Terminal.html#Terminal.__stopShell" />
-      <keyword name="Terminal.__useHistory" id="Terminal.__useHistory" ref="eric5.QScintilla.Terminal.html#Terminal.__useHistory" />
-      <keyword name="Terminal.__write" id="Terminal.__write" ref="eric5.QScintilla.Terminal.html#Terminal.__write" />
-      <keyword name="Terminal.clear" id="Terminal.clear" ref="eric5.QScintilla.Terminal.html#Terminal.clear" />
-      <keyword name="Terminal.closeTerminal" id="Terminal.closeTerminal" ref="eric5.QScintilla.Terminal.html#Terminal.closeTerminal" />
-      <keyword name="Terminal.contextMenuEvent" id="Terminal.contextMenuEvent" ref="eric5.QScintilla.Terminal.html#Terminal.contextMenuEvent" />
-      <keyword name="Terminal.editorCommand" id="Terminal.editorCommand" ref="eric5.QScintilla.Terminal.html#Terminal.editorCommand" />
-      <keyword name="Terminal.event" id="Terminal.event" ref="eric5.QScintilla.Terminal.html#Terminal.event" />
-      <keyword name="Terminal.focusInEvent" id="Terminal.focusInEvent" ref="eric5.QScintilla.Terminal.html#Terminal.focusInEvent" />
-      <keyword name="Terminal.focusOutEvent" id="Terminal.focusOutEvent" ref="eric5.QScintilla.Terminal.html#Terminal.focusOutEvent" />
-      <keyword name="Terminal.gestureEvent" id="Terminal.gestureEvent" ref="eric5.QScintilla.Terminal.html#Terminal.gestureEvent" />
-      <keyword name="Terminal.getHistory" id="Terminal.getHistory" ref="eric5.QScintilla.Terminal.html#Terminal.getHistory" />
-      <keyword name="Terminal.handlePreferencesChanged" id="Terminal.handlePreferencesChanged" ref="eric5.QScintilla.Terminal.html#Terminal.handlePreferencesChanged" />
-      <keyword name="Terminal.insert" id="Terminal.insert" ref="eric5.QScintilla.Terminal.html#Terminal.insert" />
-      <keyword name="Terminal.keyPressEvent" id="Terminal.keyPressEvent" ref="eric5.QScintilla.Terminal.html#Terminal.keyPressEvent" />
-      <keyword name="Terminal.loadHistory" id="Terminal.loadHistory" ref="eric5.QScintilla.Terminal.html#Terminal.loadHistory" />
-      <keyword name="Terminal.mousePressEvent" id="Terminal.mousePressEvent" ref="eric5.QScintilla.Terminal.html#Terminal.mousePressEvent" />
-      <keyword name="Terminal.reloadHistory" id="Terminal.reloadHistory" ref="eric5.QScintilla.Terminal.html#Terminal.reloadHistory" />
-      <keyword name="Terminal.saveHistory" id="Terminal.saveHistory" ref="eric5.QScintilla.Terminal.html#Terminal.saveHistory" />
-      <keyword name="Terminal.searchNext" id="Terminal.searchNext" ref="eric5.QScintilla.Terminal.html#Terminal.searchNext" />
-      <keyword name="Terminal.searchPrev" id="Terminal.searchPrev" ref="eric5.QScintilla.Terminal.html#Terminal.searchPrev" />
-      <keyword name="Terminal.wheelEvent" id="Terminal.wheelEvent" ref="eric5.QScintilla.Terminal.html#Terminal.wheelEvent" />
-      <keyword name="TerminalAssembly" id="TerminalAssembly" ref="eric5.QScintilla.Terminal.html#TerminalAssembly" />
-      <keyword name="TerminalAssembly (Constructor)" id="TerminalAssembly (Constructor)" ref="eric5.QScintilla.Terminal.html#TerminalAssembly.__init__" />
-      <keyword name="TerminalAssembly.showFind" id="TerminalAssembly.showFind" ref="eric5.QScintilla.Terminal.html#TerminalAssembly.showFind" />
-      <keyword name="TerminalAssembly.terminal" id="TerminalAssembly.terminal" ref="eric5.QScintilla.Terminal.html#TerminalAssembly.terminal" />
-      <keyword name="TerminalPage" id="TerminalPage" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html#TerminalPage" />
-      <keyword name="TerminalPage (Constructor)" id="TerminalPage (Constructor)" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html#TerminalPage.__init__" />
-      <keyword name="TerminalPage (Module)" id="TerminalPage (Module)" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html" />
-      <keyword name="TerminalPage.on_linenumbersFontButton_clicked" id="TerminalPage.on_linenumbersFontButton_clicked" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html#TerminalPage.on_linenumbersFontButton_clicked" />
-      <keyword name="TerminalPage.on_monospacedFontButton_clicked" id="TerminalPage.on_monospacedFontButton_clicked" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html#TerminalPage.on_monospacedFontButton_clicked" />
-      <keyword name="TerminalPage.polishPage" id="TerminalPage.polishPage" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html#TerminalPage.polishPage" />
-      <keyword name="TerminalPage.save" id="TerminalPage.save" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html#TerminalPage.save" />
       <keyword name="Token" id="Token" ref="eric5.DataViews.CodeMetrics.html#Token" />
       <keyword name="Token (Constructor)" id="Token (Constructor)" ref="eric5.DataViews.CodeMetrics.html#Token.__init__" />
       <keyword name="ToolConfigurationDialog" id="ToolConfigurationDialog" ref="eric5.Preferences.ToolConfigurationDialog.html#ToolConfigurationDialog" />
@@ -11422,7 +11342,6 @@
       <keyword name="UserInterface.__activateSymbolsViewer" id="UserInterface.__activateSymbolsViewer" ref="eric5.UI.UserInterface.html#UserInterface.__activateSymbolsViewer" />
       <keyword name="UserInterface.__activateTaskViewer" id="UserInterface.__activateTaskViewer" ref="eric5.UI.UserInterface.html#UserInterface.__activateTaskViewer" />
       <keyword name="UserInterface.__activateTemplateViewer" id="UserInterface.__activateTemplateViewer" ref="eric5.UI.UserInterface.html#UserInterface.__activateTemplateViewer" />
-      <keyword name="UserInterface.__activateTerminal" id="UserInterface.__activateTerminal" ref="eric5.UI.UserInterface.html#UserInterface.__activateTerminal" />
       <keyword name="UserInterface.__activateViewProfile" id="UserInterface.__activateViewProfile" ref="eric5.UI.UserInterface.html#UserInterface.__activateViewProfile" />
       <keyword name="UserInterface.__activateViewmanager" id="UserInterface.__activateViewmanager" ref="eric5.UI.UserInterface.html#UserInterface.__activateViewmanager" />
       <keyword name="UserInterface.__assistant" id="UserInterface.__assistant" ref="eric5.UI.UserInterface.html#UserInterface.__assistant" />
@@ -12378,7 +12297,6 @@
       <keyword name="create" id="create" ref="eric5.Preferences.ConfigurationPages.ShellPage.html#create" />
       <keyword name="create" id="create" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#create" />
       <keyword name="create" id="create" ref="eric5.Preferences.ConfigurationPages.TemplatesPage.html#create" />
-      <keyword name="create" id="create" ref="eric5.Preferences.ConfigurationPages.TerminalPage.html#create" />
       <keyword name="create" id="create" ref="eric5.Preferences.ConfigurationPages.TrayStarterPage.html#create" />
       <keyword name="create" id="create" ref="eric5.Preferences.ConfigurationPages.VcsPage.html#create" />
       <keyword name="create" id="create" ref="eric5.Preferences.ConfigurationPages.ViewmanagerPage.html#create" />
@@ -12597,7 +12515,6 @@
       <keyword name="getSystem" id="getSystem" ref="eric5.Preferences.__init__.html#getSystem" />
       <keyword name="getTasks" id="getTasks" ref="eric5.Preferences.__init__.html#getTasks" />
       <keyword name="getTemplates" id="getTemplates" ref="eric5.Preferences.__init__.html#getTemplates" />
-      <keyword name="getTerminal" id="getTerminal" ref="eric5.Preferences.__init__.html#getTerminal" />
       <keyword name="getTestFileName" id="getTestFileName" ref="eric5.Utilities.__init__.html#getTestFileName" />
       <keyword name="getTrayStarter" id="getTrayStarter" ref="eric5.Preferences.__init__.html#getTrayStarter" />
       <keyword name="getTypeFromTypeName" id="getTypeFromTypeName" ref="eric5.Utilities.ModuleParser.html#getTypeFromTypeName" />
@@ -12871,7 +12788,6 @@
       <keyword name="setSystem" id="setSystem" ref="eric5.Preferences.__init__.html#setSystem" />
       <keyword name="setTasks" id="setTasks" ref="eric5.Preferences.__init__.html#setTasks" />
       <keyword name="setTemplates" id="setTemplates" ref="eric5.Preferences.__init__.html#setTemplates" />
-      <keyword name="setTerminal" id="setTerminal" ref="eric5.Preferences.__init__.html#setTerminal" />
       <keyword name="setTrayStarter" id="setTrayStarter" ref="eric5.Preferences.__init__.html#setTrayStarter" />
       <keyword name="setUI" id="setUI" ref="eric5.Preferences.__init__.html#setUI" />
       <keyword name="setUILanguage" id="setUILanguage" ref="eric5.Preferences.__init__.html#setUILanguage" />
@@ -13542,7 +13458,6 @@
       <file>eric5.Preferences.ConfigurationPages.ShellPage.html</file>
       <file>eric5.Preferences.ConfigurationPages.TasksPage.html</file>
       <file>eric5.Preferences.ConfigurationPages.TemplatesPage.html</file>
-      <file>eric5.Preferences.ConfigurationPages.TerminalPage.html</file>
       <file>eric5.Preferences.ConfigurationPages.TrayStarterPage.html</file>
       <file>eric5.Preferences.ConfigurationPages.VcsPage.html</file>
       <file>eric5.Preferences.ConfigurationPages.ViewmanagerPage.html</file>
@@ -13637,7 +13552,6 @@
       <file>eric5.QScintilla.SpellChecker.html</file>
       <file>eric5.QScintilla.SpellCheckingDialog.html</file>
       <file>eric5.QScintilla.SpellingDictionaryEditDialog.html</file>
-      <file>eric5.QScintilla.Terminal.html</file>
       <file>eric5.QScintilla.TypingCompleters.CompleterBase.html</file>
       <file>eric5.QScintilla.TypingCompleters.CompleterPython.html</file>
       <file>eric5.QScintilla.TypingCompleters.CompleterRuby.html</file>

--- a/Documentation/Source/eric5.Network.IRC.IrcChannelWidget.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.Network.IRC.IrcChannelWidget.html	Fri Mar 22 18:48:40 2013 +0100
@@ -108,9 +108,6 @@
 <td><a href="#IrcChannelWidget.__cutAllMessages">__cutAllMessages</a></td>
 <td>Private slot to cut the contents of the messages display to the clipboard.</td>
 </tr><tr>
-<td><a href="#IrcChannelWidget.__cutMessages">__cutMessages</a></td>
-<td>Private slot to cut the selection of the messages display to the clipboard.</td>
-</tr><tr>
 <td><a href="#IrcChannelWidget.__extractPrivilege">__extractPrivilege</a></td>
 <td>Private method to extract the user privileges out of the name.</td>
 </tr><tr>
@@ -144,6 +141,9 @@
 <td><a href="#IrcChannelWidget.__sendAutoWhoCommand">__sendAutoWhoCommand</a></td>
 <td>Private slot to send the WHO command to update the users list.</td>
 </tr><tr>
+<td><a href="#IrcChannelWidget.__setEditTopicButton">__setEditTopicButton</a></td>
+<td>Private method to set the visibility of the Edit Topic button.</td>
+</tr><tr>
 <td><a href="#IrcChannelWidget.__setTopic">__setTopic</a></td>
 <td>Private method to handle a topic change of the channel.</td>
 </tr><tr>
@@ -411,11 +411,6 @@
 <b>__cutAllMessages</b>(<i></i>)
 <p>
         Private slot to cut the contents of the messages display to the clipboard.
-</p><a NAME="IrcChannelWidget.__cutMessages" ID="IrcChannelWidget.__cutMessages"></a>
-<h4>IrcChannelWidget.__cutMessages</h4>
-<b>__cutMessages</b>(<i></i>)
-<p>
-        Private slot to cut the selection of the messages display to the clipboard.
 </p><a NAME="IrcChannelWidget.__extractPrivilege" ID="IrcChannelWidget.__extractPrivilege"></a>
 <h4>IrcChannelWidget.__extractPrivilege</h4>
 <b>__extractPrivilege</b>(<i>name</i>)
@@ -527,6 +522,11 @@
 <b>__sendAutoWhoCommand</b>(<i></i>)
 <p>
         Private slot to send the WHO command to update the users list.
+</p><a NAME="IrcChannelWidget.__setEditTopicButton" ID="IrcChannelWidget.__setEditTopicButton"></a>
+<h4>IrcChannelWidget.__setEditTopicButton</h4>
+<b>__setEditTopicButton</b>(<i></i>)
+<p>
+        Private method to set the visibility of the Edit Topic button.
 </p><a NAME="IrcChannelWidget.__setTopic" ID="IrcChannelWidget.__setTopic"></a>
 <h4>IrcChannelWidget.__setTopic</h4>
 <b>__setTopic</b>(<i>match</i>)
@@ -1149,6 +1149,9 @@
 <td><a href="#IrcUserItem.__setIcon">__setIcon</a></td>
 <td>Private method to set the icon dependent on user privileges.</td>
 </tr><tr>
+<td><a href="#IrcUserItem.canChangeTopic">canChangeTopic</a></td>
+<td>Public method to check, if the user is allowed to change the topic.</td>
+</tr><tr>
 <td><a href="#IrcUserItem.changePrivilege">changePrivilege</a></td>
 <td>Public method to set or unset a user privilege.</td>
 </tr><tr>
@@ -1200,7 +1203,17 @@
 <b>__setIcon</b>(<i></i>)
 <p>
         Private method to set the icon dependent on user privileges.
-</p><a NAME="IrcUserItem.changePrivilege" ID="IrcUserItem.changePrivilege"></a>
+</p><a NAME="IrcUserItem.canChangeTopic" ID="IrcUserItem.canChangeTopic"></a>
+<h4>IrcUserItem.canChangeTopic</h4>
+<b>canChangeTopic</b>(<i></i>)
+<p>
+        Public method to check, if the user is allowed to change the topic.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating that the topic can be changed (boolean)
+</dd>
+</dl><a NAME="IrcUserItem.changePrivilege" ID="IrcUserItem.changePrivilege"></a>
 <h4>IrcUserItem.changePrivilege</h4>
 <b>changePrivilege</b>(<i>privilege</i>)
 <p>

--- a/Documentation/Source/eric5.Network.IRC.IrcNetworkWidget.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.Network.IRC.IrcNetworkWidget.html	Fri Mar 22 18:48:40 2013 +0100
@@ -96,9 +96,6 @@
 <td><a href="#IrcNetworkWidget.__cutAllMessages">__cutAllMessages</a></td>
 <td>Private slot to cut the contents of the messages display to the clipboard.</td>
 </tr><tr>
-<td><a href="#IrcNetworkWidget.__cutMessages">__cutMessages</a></td>
-<td>Private slot to cut the selection of the messages display to the clipboard.</td>
-</tr><tr>
 <td><a href="#IrcNetworkWidget.__initMessagesMenu">__initMessagesMenu</a></td>
 <td>Private slot to initialize the context menu of the messages pane.</td>
 </tr><tr>
@@ -203,11 +200,6 @@
 <b>__cutAllMessages</b>(<i></i>)
 <p>
         Private slot to cut the contents of the messages display to the clipboard.
-</p><a NAME="IrcNetworkWidget.__cutMessages" ID="IrcNetworkWidget.__cutMessages"></a>
-<h4>IrcNetworkWidget.__cutMessages</h4>
-<b>__cutMessages</b>(<i></i>)
-<p>
-        Private slot to cut the selection of the messages display to the clipboard.
 </p><a NAME="IrcNetworkWidget.__initMessagesMenu" ID="IrcNetworkWidget.__initMessagesMenu"></a>
 <h4>IrcNetworkWidget.__initMessagesMenu</h4>
 <b>__initMessagesMenu</b>(<i></i>)

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html	Fri Mar 22 18:48:40 2013 +0100
@@ -71,6 +71,9 @@
 </tr><tr>
 <td><a href="#HgNewProjectOptionsDialog.on_vcsUrlButton_clicked">on_vcsUrlButton_clicked</a></td>
 <td>Private slot to display a selection dialog.</td>
+</tr><tr>
+<td><a href="#HgNewProjectOptionsDialog.on_vcsUrlEdit_textChanged">on_vcsUrlEdit_textChanged</a></td>
+<td>Private slot to handle changes of the URL.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -121,7 +124,17 @@
 <b>on_vcsUrlButton_clicked</b>(<i></i>)
 <p>
         Private slot to display a selection dialog.
-</p>
+</p><a NAME="HgNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" ID="HgNewProjectOptionsDialog.on_vcsUrlEdit_textChanged"></a>
+<h4>HgNewProjectOptionsDialog.on_vcsUrlEdit_textChanged</h4>
+<b>on_vcsUrlEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the URL.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+current text of the line edit (string)
+</dd>
+</dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html	Fri Mar 22 18:48:40 2013 +0100
@@ -74,6 +74,9 @@
 </tr><tr>
 <td><a href="#SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked">on_vcsUrlButton_clicked</a></td>
 <td>Private slot to display a selection dialog.</td>
+</tr><tr>
+<td><a href="#SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged">on_vcsUrlEdit_textChanged</a></td>
+<td>Private slot to handle changes of the URL.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -134,7 +137,17 @@
 <b>on_vcsUrlButton_clicked</b>(<i></i>)
 <p>
         Private slot to display a selection dialog.
-</p>
+</p><a NAME="SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" ID="SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged"></a>
+<h4>SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged</h4>
+<b>on_vcsUrlEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the URL.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+current text of the line edit (string)
+</dd>
+</dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnOptionsDialog.html	Fri Mar 22 18:48:40 2013 +0100
@@ -69,6 +69,9 @@
 </tr><tr>
 <td><a href="#SvnOptionsDialog.on_vcsUrlButton_clicked">on_vcsUrlButton_clicked</a></td>
 <td>Private slot to display a selection dialog.</td>
+</tr><tr>
+<td><a href="#SvnOptionsDialog.on_vcsUrlEdit_textChanged">on_vcsUrlEdit_textChanged</a></td>
+<td>Private slot to handle changes of the URL.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -111,7 +114,17 @@
 <b>on_vcsUrlButton_clicked</b>(<i></i>)
 <p>
         Private slot to display a selection dialog.
-</p>
+</p><a NAME="SvnOptionsDialog.on_vcsUrlEdit_textChanged" ID="SvnOptionsDialog.on_vcsUrlEdit_textChanged"></a>
+<h4>SvnOptionsDialog.on_vcsUrlEdit_textChanged</h4>
+<b>on_vcsUrlEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the URL.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+current text of the line edit (string)
+</dd>
+</dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html	Fri Mar 22 18:48:40 2013 +0100
@@ -74,6 +74,9 @@
 </tr><tr>
 <td><a href="#SvnNewProjectOptionsDialog.on_vcsUrlButton_clicked">on_vcsUrlButton_clicked</a></td>
 <td>Private slot to display a selection dialog.</td>
+</tr><tr>
+<td><a href="#SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged">on_vcsUrlEdit_textChanged</a></td>
+<td>Private slot to handle changes of the URL.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -134,7 +137,17 @@
 <b>on_vcsUrlButton_clicked</b>(<i></i>)
 <p>
         Private slot to display a selection dialog.
-</p>
+</p><a NAME="SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged" ID="SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged"></a>
+<h4>SvnNewProjectOptionsDialog.on_vcsUrlEdit_textChanged</h4>
+<b>on_vcsUrlEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the URL.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+current text of the line edit (string)
+</dd>
+</dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html	Fri Mar 22 18:48:40 2013 +0100
@@ -69,6 +69,9 @@
 </tr><tr>
 <td><a href="#SvnOptionsDialog.on_vcsUrlButton_clicked">on_vcsUrlButton_clicked</a></td>
 <td>Private slot to display a selection dialog.</td>
+</tr><tr>
+<td><a href="#SvnOptionsDialog.on_vcsUrlEdit_textChanged">on_vcsUrlEdit_textChanged</a></td>
+<td>Private slot to handle changes of the URL.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -111,7 +114,17 @@
 <b>on_vcsUrlButton_clicked</b>(<i></i>)
 <p>
         Private slot to display a selection dialog.
-</p>
+</p><a NAME="SvnOptionsDialog.on_vcsUrlEdit_textChanged" ID="SvnOptionsDialog.on_vcsUrlEdit_textChanged"></a>
+<h4>SvnOptionsDialog.on_vcsUrlEdit_textChanged</h4>
+<b>on_vcsUrlEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the URL.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+current text of the line edit (string)
+</dd>
+</dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
 </body></html>
\ No newline at end of file

--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.TerminalPage.html	Fri Mar 22 20:39:32 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<title>eric5.Preferences.ConfigurationPages.TerminalPage</title>
-<meta charset="UTF-8">
-<style>
-body {
-    background: #EDECE6;
-    margin: 0em 1em 10em 1em;
-    color: black;
-}
-
-h1 { color: white; background: #85774A; }
-h2 { color: white; background: #85774A; }
-h3 { color: white; background: #9D936E; }
-h4 { color: white; background: #9D936E; }
-    
-a { color: #BA6D36; }
-
-</style>
-</head>
-<body><a NAME="top" ID="top"></a>
-<h1>eric5.Preferences.ConfigurationPages.TerminalPage</h1>
-<p>
-Module implementing the Terminal configuration page.
-</p>
-<h3>Global Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Classes</h3>
-<table>
-<tr>
-<td><a href="#TerminalPage">TerminalPage</a></td>
-<td>Class implementing the Terminal configuration page.</td>
-</tr>
-</table>
-<h3>Functions</h3>
-<table>
-<tr>
-<td><a href="#create">create</a></td>
-<td>Module function to create the configuration page.</td>
-</tr>
-</table>
-<hr /><hr />
-<a NAME="TerminalPage" ID="TerminalPage"></a>
-<h2>TerminalPage</h2>
-<p>
-    Class implementing the Terminal configuration page.
-</p>
-<h3>Derived from</h3>
-ConfigurationPageBase, Ui_TerminalPage
-<h3>Class Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#TerminalPage.__init__">TerminalPage</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#TerminalPage.on_linenumbersFontButton_clicked">on_linenumbersFontButton_clicked</a></td>
-<td>Private method used to select the font for the editor margins.</td>
-</tr><tr>
-<td><a href="#TerminalPage.on_monospacedFontButton_clicked">on_monospacedFontButton_clicked</a></td>
-<td>Private method used to select the font to be used as the monospaced font.</td>
-</tr><tr>
-<td><a href="#TerminalPage.polishPage">polishPage</a></td>
-<td>Public slot to perform some polishing actions.</td>
-</tr><tr>
-<td><a href="#TerminalPage.save">save</a></td>
-<td>Public slot to save the Shell configuration.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="TerminalPage.__init__" ID="TerminalPage.__init__"></a>
-<h4>TerminalPage (Constructor)</h4>
-<b>TerminalPage</b>(<i></i>)
-<p>
-        Constructor
-</p><a NAME="TerminalPage.on_linenumbersFontButton_clicked" ID="TerminalPage.on_linenumbersFontButton_clicked"></a>
-<h4>TerminalPage.on_linenumbersFontButton_clicked</h4>
-<b>on_linenumbersFontButton_clicked</b>(<i></i>)
-<p>
-        Private method used to select the font for the editor margins.
-</p><a NAME="TerminalPage.on_monospacedFontButton_clicked" ID="TerminalPage.on_monospacedFontButton_clicked"></a>
-<h4>TerminalPage.on_monospacedFontButton_clicked</h4>
-<b>on_monospacedFontButton_clicked</b>(<i></i>)
-<p>
-        Private method used to select the font to be used as the monospaced font.
-</p><a NAME="TerminalPage.polishPage" ID="TerminalPage.polishPage"></a>
-<h4>TerminalPage.polishPage</h4>
-<b>polishPage</b>(<i></i>)
-<p>
-        Public slot to perform some polishing actions.
-</p><a NAME="TerminalPage.save" ID="TerminalPage.save"></a>
-<h4>TerminalPage.save</h4>
-<b>save</b>(<i></i>)
-<p>
-        Public slot to save the Shell configuration.
-</p>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="create" ID="create"></a>
-<h2>create</h2>
-<b>create</b>(<i>dlg</i>)
-<p>
-    Module function to create the configuration page.
-</p><dl>
-<dt><i>dlg</i></dt>
-<dd>
-reference to the configuration dialog
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
-</body></html>
\ No newline at end of file

--- a/Documentation/Source/eric5.Preferences.__init__.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.Preferences.__init__.html	Fri Mar 22 18:48:40 2013 +0100
@@ -154,9 +154,6 @@
 <td><a href="#getTemplates">getTemplates</a></td>
 <td>Module function to retrieve the Templates related settings.</td>
 </tr><tr>
-<td><a href="#getTerminal">getTerminal</a></td>
-<td>Module function to retrieve the various terminal settings.</td>
-</tr><tr>
 <td><a href="#getTrayStarter">getTrayStarter</a></td>
 <td>Module function to retrieve the tray starter related settings.</td>
 </tr><tr>
@@ -301,9 +298,6 @@
 <td><a href="#setTemplates">setTemplates</a></td>
 <td>Module function to store the Templates related settings.</td>
 </tr><tr>
-<td><a href="#setTerminal">setTerminal</a></td>
-<td>Module function to store the various terminal settings.</td>
-</tr><tr>
 <td><a href="#setTrayStarter">setTrayStarter</a></td>
 <td>Module function to store the tray starter related settings.</td>
 </tr><tr>
@@ -357,7 +351,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>cooperationDefaults</td></tr><tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>ircDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>py3flakesDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>terminalDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>viewProfilesLength</td></tr><tr><td>webSettingsIntitialized</td></tr>
+<tr><td>cooperationDefaults</td></tr><tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>ircDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>py3flakesDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>viewProfilesLength</td></tr><tr><td>webSettingsIntitialized</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -1117,27 +1111,6 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
-<a NAME="getTerminal" ID="getTerminal"></a>
-<h2>getTerminal</h2>
-<b>getTerminal</b>(<i>key, prefClass=Prefs</i>)
-<p>
-    Module function to retrieve the various terminal settings.
-</p><dl>
-<dt><i>key</i></dt>
-<dd>
-the key of the value to get
-</dd><dt><i>prefClass</i></dt>
-<dd>
-preferences class used as the storage area
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-the requested shell setting
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
 <a NAME="getTrayStarter" ID="getTrayStarter"></a>
 <h2>getTrayStarter</h2>
 <b>getTrayStarter</b>(<i>key, prefClass=Prefs</i>)
@@ -2006,25 +1979,6 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
-<a NAME="setTerminal" ID="setTerminal"></a>
-<h2>setTerminal</h2>
-<b>setTerminal</b>(<i>key, value, prefClass=Prefs</i>)
-<p>
-    Module function to store the various terminal settings.
-</p><dl>
-<dt><i>key</i></dt>
-<dd>
-the key of the setting to be set
-</dd><dt><i>value</i></dt>
-<dd>
-the value to be set
-</dd><dt><i>prefClass</i></dt>
-<dd>
-preferences class used as the storage area
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
 <a NAME="setTrayStarter" ID="setTrayStarter"></a>
 <h2>setTrayStarter</h2>
 <b>setTrayStarter</b>(<i>key, value, prefClass=Prefs</i>)

--- a/Documentation/Source/eric5.QScintilla.Editor.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.QScintilla.Editor.html	Fri Mar 22 18:48:40 2013 +0100
@@ -335,6 +335,9 @@
 <td><a href="#Editor.__initOnlineSyntaxCheck">__initOnlineSyntaxCheck</a></td>
 <td>Private slot to initialize the online syntax check.</td>
 </tr><tr>
+<td><a href="#Editor.__isCommentedLine">__isCommentedLine</a></td>
+<td>Private method to check, if the given line is a comment line as produced by the configured comment rules.</td>
+</tr><tr>
 <td><a href="#Editor.__isStartChar">__isStartChar</a></td>
 <td>Private method to check, if a character is an autocompletion start character.</td>
 </tr><tr>
@@ -1619,7 +1622,26 @@
 <b>__initOnlineSyntaxCheck</b>(<i></i>)
 <p>
         Private slot to initialize the online syntax check.
-</p><a NAME="Editor.__isStartChar" ID="Editor.__isStartChar"></a>
+</p><a NAME="Editor.__isCommentedLine" ID="Editor.__isCommentedLine"></a>
+<h4>Editor.__isCommentedLine</h4>
+<b>__isCommentedLine</b>(<i>line, commentStr</i>)
+<p>
+        Private method to check, if the given line is a comment line as produced
+        by the configured comment rules.
+</p><dl>
+<dt><i>line</i></dt>
+<dd>
+text of the line to check (string)
+</dd><dt><i>commentStr</i></dt>
+<dd>
+comment string to check against (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating a commented line (boolean)
+</dd>
+</dl><a NAME="Editor.__isStartChar" ID="Editor.__isStartChar"></a>
 <h4>Editor.__isStartChar</h4>
 <b>__isStartChar</b>(<i>ch</i>)
 <p>

--- a/Documentation/Source/eric5.QScintilla.Shell.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.QScintilla.Shell.html	Fri Mar 22 18:48:40 2013 +0100
@@ -1245,7 +1245,7 @@
 </p><dl>
 <dt>Returns:</dt>
 <dd>
-reference to the terminal widget (Terminal)
+reference to the shell widget (Shell)
 </dd>
 </dl><a NAME="ShellAssembly.showFind" ID="ShellAssembly.showFind"></a>
 <h4>ShellAssembly.showFind</h4>

--- a/Documentation/Source/eric5.QScintilla.Terminal.html	Fri Mar 22 20:39:32 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,922 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<title>eric5.QScintilla.Terminal</title>
-<meta charset="UTF-8">
-<style>
-body {
-    background: #EDECE6;
-    margin: 0em 1em 10em 1em;
-    color: black;
-}
-
-h1 { color: white; background: #85774A; }
-h2 { color: white; background: #85774A; }
-h3 { color: white; background: #9D936E; }
-h4 { color: white; background: #9D936E; }
-    
-a { color: #BA6D36; }
-
-</style>
-</head>
-<body><a NAME="top" ID="top"></a>
-<h1>eric5.QScintilla.Terminal</h1>
-<p>
-Module implementing a simple terminal based on QScintilla.
-</p>
-<h3>Global Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Classes</h3>
-<table>
-<tr>
-<td><a href="#Terminal">Terminal</a></td>
-<td>Class implementing a simple terminal based on QScintilla.</td>
-</tr><tr>
-<td><a href="#TerminalAssembly">TerminalAssembly</a></td>
-<td>Class implementing the containing widget for the terminal.</td>
-</tr>
-</table>
-<h3>Functions</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<hr /><hr />
-<a NAME="Terminal" ID="Terminal"></a>
-<h2>Terminal</h2>
-<p>
-    Class implementing a simple terminal based on QScintilla.
-</p><p>
-    A user can enter commands that are executed by a shell process.
-</p><h3>Signals</h3>
-<dl>
-<dt>searchStringFound(found)</dt>
-<dd>
-emitted to indicate the search result (boolean)
-</dd>
-</dl>
-<h3>Derived from</h3>
-QsciScintillaCompat
-<h3>Class Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#Terminal.__init__">Terminal</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaCharLeft">__QScintillaCharLeft</a></td>
-<td>Private method to handle the Cursor Left command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaCharLeftExtend">__QScintillaCharLeftExtend</a></td>
-<td>Private method to handle the Extend Selection Left command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaCharRight">__QScintillaCharRight</a></td>
-<td>Private method to handle the Cursor Right command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaDelete">__QScintillaDelete</a></td>
-<td>Private method to handle the delete command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaDeleteBack">__QScintillaDeleteBack</a></td>
-<td>Private method to handle the Backspace key.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaDeleteLineLeft">__QScintillaDeleteLineLeft</a></td>
-<td>Private method to handle the Delete Line Left command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaDeleteLineRight">__QScintillaDeleteLineRight</a></td>
-<td>Private method to handle the Delete Line Right command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaDeleteWordLeft">__QScintillaDeleteWordLeft</a></td>
-<td>Private method to handle the Delete Word Left command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaDeleteWordRight">__QScintillaDeleteWordRight</a></td>
-<td>Private method to handle the Delete Word Right command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaLeftCommand">__QScintillaLeftCommand</a></td>
-<td>Private method to handle a QScintilla command working to the left.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaLeftDeleteCommand">__QScintillaLeftDeleteCommand</a></td>
-<td>Private method to handle a QScintilla delete command working to the left.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaLineDown">__QScintillaLineDown</a></td>
-<td>Private method to handle the Down key.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaLineEnd">__QScintillaLineEnd</a></td>
-<td>Private method to handle the End key.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaLineUp">__QScintillaLineUp</a></td>
-<td>Private method to handle the Up key.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaNewline">__QScintillaNewline</a></td>
-<td>Private method to handle the Return key.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaRightCommand">__QScintillaRightCommand</a></td>
-<td>Private method to handle a QScintilla command working to the right.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaVCHome">__QScintillaVCHome</a></td>
-<td>Private method to handle the Home key.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaVCHomeExtend">__QScintillaVCHomeExtend</a></td>
-<td>Private method to handle the Extend Selection to start of line command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaWordLeft">__QScintillaWordLeft</a></td>
-<td>Private method to handle the Cursor Word Left command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaWordLeftExtend">__QScintillaWordLeftExtend</a></td>
-<td>Private method to handle the Extend Selection Left one word command.</td>
-</tr><tr>
-<td><a href="#Terminal.__QScintillaWordRight">__QScintillaWordRight</a></td>
-<td>Private method to handle the Cursor Word Right command.</td>
-</tr><tr>
-<td><a href="#Terminal.__bindLexer">__bindLexer</a></td>
-<td>Private slot to set the lexer.</td>
-</tr><tr>
-<td><a href="#Terminal.__clearCurrentLine">__clearCurrentLine</a></td>
-<td>Private method to clear the line containing the cursor.</td>
-</tr><tr>
-<td><a href="#Terminal.__clearHistory">__clearHistory</a></td>
-<td>Private slot to clear the current history.</td>
-</tr><tr>
-<td><a href="#Terminal.__configure">__configure</a></td>
-<td>Private method to open the configuration dialog.</td>
-</tr><tr>
-<td><a href="#Terminal.__executeCommand">__executeCommand</a></td>
-<td>Private slot to execute a command.</td>
-</tr><tr>
-<td><a href="#Terminal.__find">__find</a></td>
-<td>Private slot to show the find widget.</td>
-</tr><tr>
-<td><a href="#Terminal.__finished">__finished</a></td>
-<td>Private method called, when the shell process has finished.</td>
-</tr><tr>
-<td><a href="#Terminal.__getEndPos">__getEndPos</a></td>
-<td>Private method to return the line and column of the last character.</td>
-</tr><tr>
-<td><a href="#Terminal.__insertHistory">__insertHistory</a></td>
-<td>Private method to insert a command selected from the history.</td>
-</tr><tr>
-<td><a href="#Terminal.__insertText">__insertText</a></td>
-<td>Private method to insert some text at the current cursor position.</td>
-</tr><tr>
-<td><a href="#Terminal.__insertTextAtEnd">__insertTextAtEnd</a></td>
-<td>Private method to insert some text at the end of the command line.</td>
-</tr><tr>
-<td><a href="#Terminal.__isCursorOnLastLine">__isCursorOnLastLine</a></td>
-<td>Private method to check, if the cursor is on the last line.</td>
-</tr><tr>
-<td><a href="#Terminal.__readOutput">__readOutput</a></td>
-<td>Private method to process the output of the shell.</td>
-</tr><tr>
-<td><a href="#Terminal.__reset">__reset</a></td>
-<td>Private slot to handle the 'reset' context menu entry.</td>
-</tr><tr>
-<td><a href="#Terminal.__rsearchHistory">__rsearchHistory</a></td>
-<td>Private method used to reverse search the history.</td>
-</tr><tr>
-<td><a href="#Terminal.__searchHistory">__searchHistory</a></td>
-<td>Private method used to search the history.</td>
-</tr><tr>
-<td><a href="#Terminal.__searchNext">__searchNext</a></td>
-<td>Private method to search for the next occurrence.</td>
-</tr><tr>
-<td><a href="#Terminal.__searchPrev">__searchPrev</a></td>
-<td>Private method to search for the next occurrence.</td>
-</tr><tr>
-<td><a href="#Terminal.__selectHistory">__selectHistory</a></td>
-<td>Private slot to select a history entry to execute.</td>
-</tr><tr>
-<td><a href="#Terminal.__send">__send</a></td>
-<td>Private method to send data to the shell process.</td>
-</tr><tr>
-<td><a href="#Terminal.__sendCtrl">__sendCtrl</a></td>
-<td>Private slot to send a control command to the shell process.</td>
-</tr><tr>
-<td><a href="#Terminal.__setMargin0">__setMargin0</a></td>
-<td>Private method to configure margin 0.</td>
-</tr><tr>
-<td><a href="#Terminal.__setMonospaced">__setMonospaced</a></td>
-<td>Private method to set/reset a monospaced font.</td>
-</tr><tr>
-<td><a href="#Terminal.__setTextDisplay">__setTextDisplay</a></td>
-<td>Private method to configure the text display.</td>
-</tr><tr>
-<td><a href="#Terminal.__showHistory">__showHistory</a></td>
-<td>Private slot to show the shell history dialog.</td>
-</tr><tr>
-<td><a href="#Terminal.__startShell">__startShell</a></td>
-<td>Private slot to start the shell process.</td>
-</tr><tr>
-<td><a href="#Terminal.__started">__started</a></td>
-<td>Private method called, when the shell process has started.</td>
-</tr><tr>
-<td><a href="#Terminal.__stopShell">__stopShell</a></td>
-<td>Private slot to stop the shell process.</td>
-</tr><tr>
-<td><a href="#Terminal.__useHistory">__useHistory</a></td>
-<td>Private method to display a command from the history.</td>
-</tr><tr>
-<td><a href="#Terminal.__write">__write</a></td>
-<td>Private method to display some text.</td>
-</tr><tr>
-<td><a href="#Terminal.clear">clear</a></td>
-<td>Public slot to clear the display.</td>
-</tr><tr>
-<td><a href="#Terminal.closeTerminal">closeTerminal</a></td>
-<td>Public method to shutdown the terminal.</td>
-</tr><tr>
-<td><a href="#Terminal.contextMenuEvent">contextMenuEvent</a></td>
-<td>Reimplemented to show our own context menu.</td>
-</tr><tr>
-<td><a href="#Terminal.editorCommand">editorCommand</a></td>
-<td>Public method to perform an editor command.</td>
-</tr><tr>
-<td><a href="#Terminal.event">event</a></td>
-<td>Protected method handling events.</td>
-</tr><tr>
-<td><a href="#Terminal.focusInEvent">focusInEvent</a></td>
-<td>Public method called when the shell receives focus.</td>
-</tr><tr>
-<td><a href="#Terminal.focusOutEvent">focusOutEvent</a></td>
-<td>Public method called when the shell loses focus.</td>
-</tr><tr>
-<td><a href="#Terminal.gestureEvent">gestureEvent</a></td>
-<td>Protected method handling gesture events.</td>
-</tr><tr>
-<td><a href="#Terminal.getHistory">getHistory</a></td>
-<td>Public method to get the history.</td>
-</tr><tr>
-<td><a href="#Terminal.handlePreferencesChanged">handlePreferencesChanged</a></td>
-<td>Public slot to handle the preferencesChanged signal.</td>
-</tr><tr>
-<td><a href="#Terminal.insert">insert</a></td>
-<td>Public slot to insert text at the current cursor position.</td>
-</tr><tr>
-<td><a href="#Terminal.keyPressEvent">keyPressEvent</a></td>
-<td>Re-implemented to handle the user input a key at a time.</td>
-</tr><tr>
-<td><a href="#Terminal.loadHistory">loadHistory</a></td>
-<td>Public method to load the history.</td>
-</tr><tr>
-<td><a href="#Terminal.mousePressEvent">mousePressEvent</a></td>
-<td>Protected method to handle the mouse press event.</td>
-</tr><tr>
-<td><a href="#Terminal.reloadHistory">reloadHistory</a></td>
-<td>Public method to reload the history.</td>
-</tr><tr>
-<td><a href="#Terminal.saveHistory">saveHistory</a></td>
-<td>Public method to save the history.</td>
-</tr><tr>
-<td><a href="#Terminal.searchNext">searchNext</a></td>
-<td>Public method to search the next occurrence of the given text.</td>
-</tr><tr>
-<td><a href="#Terminal.searchPrev">searchPrev</a></td>
-<td>Public method to search the previous occurrence of the given text.</td>
-</tr><tr>
-<td><a href="#Terminal.wheelEvent">wheelEvent</a></td>
-<td>Protected method to handle wheel events.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="Terminal.__init__" ID="Terminal.__init__"></a>
-<h4>Terminal (Constructor)</h4>
-<b>Terminal</b>(<i>vm, parent=None</i>)
-<p>
-        Constructor
-</p><dl>
-<dt><i>vm</i></dt>
-<dd>
-reference to the viewmanager object
-</dd><dt><i>parent</i></dt>
-<dd>
-parent widget (QWidget)
-</dd>
-</dl><a NAME="Terminal.__QScintillaCharLeft" ID="Terminal.__QScintillaCharLeft"></a>
-<h4>Terminal.__QScintillaCharLeft</h4>
-<b>__QScintillaCharLeft</b>(<i></i>)
-<p>
-        Private method to handle the Cursor Left command.
-</p><a NAME="Terminal.__QScintillaCharLeftExtend" ID="Terminal.__QScintillaCharLeftExtend"></a>
-<h4>Terminal.__QScintillaCharLeftExtend</h4>
-<b>__QScintillaCharLeftExtend</b>(<i></i>)
-<p>
-        Private method to handle the Extend Selection Left command.
-</p><a NAME="Terminal.__QScintillaCharRight" ID="Terminal.__QScintillaCharRight"></a>
-<h4>Terminal.__QScintillaCharRight</h4>
-<b>__QScintillaCharRight</b>(<i></i>)
-<p>
-        Private method to handle the Cursor Right command.
-</p><a NAME="Terminal.__QScintillaDelete" ID="Terminal.__QScintillaDelete"></a>
-<h4>Terminal.__QScintillaDelete</h4>
-<b>__QScintillaDelete</b>(<i></i>)
-<p>
-        Private method to handle the delete command.
-</p><a NAME="Terminal.__QScintillaDeleteBack" ID="Terminal.__QScintillaDeleteBack"></a>
-<h4>Terminal.__QScintillaDeleteBack</h4>
-<b>__QScintillaDeleteBack</b>(<i></i>)
-<p>
-        Private method to handle the Backspace key.
-</p><a NAME="Terminal.__QScintillaDeleteLineLeft" ID="Terminal.__QScintillaDeleteLineLeft"></a>
-<h4>Terminal.__QScintillaDeleteLineLeft</h4>
-<b>__QScintillaDeleteLineLeft</b>(<i></i>)
-<p>
-        Private method to handle the Delete Line Left command.
-</p><a NAME="Terminal.__QScintillaDeleteLineRight" ID="Terminal.__QScintillaDeleteLineRight"></a>
-<h4>Terminal.__QScintillaDeleteLineRight</h4>
-<b>__QScintillaDeleteLineRight</b>(<i></i>)
-<p>
-        Private method to handle the Delete Line Right command.
-</p><a NAME="Terminal.__QScintillaDeleteWordLeft" ID="Terminal.__QScintillaDeleteWordLeft"></a>
-<h4>Terminal.__QScintillaDeleteWordLeft</h4>
-<b>__QScintillaDeleteWordLeft</b>(<i></i>)
-<p>
-        Private method to handle the Delete Word Left command.
-</p><a NAME="Terminal.__QScintillaDeleteWordRight" ID="Terminal.__QScintillaDeleteWordRight"></a>
-<h4>Terminal.__QScintillaDeleteWordRight</h4>
-<b>__QScintillaDeleteWordRight</b>(<i></i>)
-<p>
-        Private method to handle the Delete Word Right command.
-</p><a NAME="Terminal.__QScintillaLeftCommand" ID="Terminal.__QScintillaLeftCommand"></a>
-<h4>Terminal.__QScintillaLeftCommand</h4>
-<b>__QScintillaLeftCommand</b>(<i>method, allLinesAllowed=False</i>)
-<p>
-        Private method to handle a QScintilla command working to the left.
-</p><dl>
-<dt><i>method</i></dt>
-<dd>
-shell method to execute
-</dd>
-</dl><a NAME="Terminal.__QScintillaLeftDeleteCommand" ID="Terminal.__QScintillaLeftDeleteCommand"></a>
-<h4>Terminal.__QScintillaLeftDeleteCommand</h4>
-<b>__QScintillaLeftDeleteCommand</b>(<i>method</i>)
-<p>
-        Private method to handle a QScintilla delete command working to the left.
-</p><dl>
-<dt><i>method</i></dt>
-<dd>
-shell method to execute
-</dd>
-</dl><a NAME="Terminal.__QScintillaLineDown" ID="Terminal.__QScintillaLineDown"></a>
-<h4>Terminal.__QScintillaLineDown</h4>
-<b>__QScintillaLineDown</b>(<i>cmd</i>)
-<p>
-        Private method to handle the Down key.
-</p><dl>
-<dt><i>cmd</i></dt>
-<dd>
-QScintilla command
-</dd>
-</dl><a NAME="Terminal.__QScintillaLineEnd" ID="Terminal.__QScintillaLineEnd"></a>
-<h4>Terminal.__QScintillaLineEnd</h4>
-<b>__QScintillaLineEnd</b>(<i>cmd</i>)
-<p>
-        Private method to handle the End key.
-</p><dl>
-<dt><i>cmd</i></dt>
-<dd>
-QScintilla command
-</dd>
-</dl><a NAME="Terminal.__QScintillaLineUp" ID="Terminal.__QScintillaLineUp"></a>
-<h4>Terminal.__QScintillaLineUp</h4>
-<b>__QScintillaLineUp</b>(<i>cmd</i>)
-<p>
-        Private method to handle the Up key.
-</p><dl>
-<dt><i>cmd</i></dt>
-<dd>
-QScintilla command
-</dd>
-</dl><a NAME="Terminal.__QScintillaNewline" ID="Terminal.__QScintillaNewline"></a>
-<h4>Terminal.__QScintillaNewline</h4>
-<b>__QScintillaNewline</b>(<i>cmd</i>)
-<p>
-        Private method to handle the Return key.
-</p><dl>
-<dt><i>cmd</i></dt>
-<dd>
-QScintilla command
-</dd>
-</dl><a NAME="Terminal.__QScintillaRightCommand" ID="Terminal.__QScintillaRightCommand"></a>
-<h4>Terminal.__QScintillaRightCommand</h4>
-<b>__QScintillaRightCommand</b>(<i>method</i>)
-<p>
-        Private method to handle a QScintilla command working to the right.
-</p><dl>
-<dt><i>method</i></dt>
-<dd>
-shell method to execute
-</dd>
-</dl><a NAME="Terminal.__QScintillaVCHome" ID="Terminal.__QScintillaVCHome"></a>
-<h4>Terminal.__QScintillaVCHome</h4>
-<b>__QScintillaVCHome</b>(<i>cmd</i>)
-<p>
-        Private method to handle the Home key.
-</p><dl>
-<dt><i>cmd</i></dt>
-<dd>
-QScintilla command
-</dd>
-</dl><a NAME="Terminal.__QScintillaVCHomeExtend" ID="Terminal.__QScintillaVCHomeExtend"></a>
-<h4>Terminal.__QScintillaVCHomeExtend</h4>
-<b>__QScintillaVCHomeExtend</b>(<i></i>)
-<p>
-        Private method to handle the Extend Selection to start of line command.
-</p><a NAME="Terminal.__QScintillaWordLeft" ID="Terminal.__QScintillaWordLeft"></a>
-<h4>Terminal.__QScintillaWordLeft</h4>
-<b>__QScintillaWordLeft</b>(<i></i>)
-<p>
-        Private method to handle the Cursor Word Left command.
-</p><a NAME="Terminal.__QScintillaWordLeftExtend" ID="Terminal.__QScintillaWordLeftExtend"></a>
-<h4>Terminal.__QScintillaWordLeftExtend</h4>
-<b>__QScintillaWordLeftExtend</b>(<i></i>)
-<p>
-        Private method to handle the Extend Selection Left one word command.
-</p><a NAME="Terminal.__QScintillaWordRight" ID="Terminal.__QScintillaWordRight"></a>
-<h4>Terminal.__QScintillaWordRight</h4>
-<b>__QScintillaWordRight</b>(<i></i>)
-<p>
-        Private method to handle the Cursor Word Right command.
-</p><a NAME="Terminal.__bindLexer" ID="Terminal.__bindLexer"></a>
-<h4>Terminal.__bindLexer</h4>
-<b>__bindLexer</b>(<i></i>)
-<p>
-        Private slot to set the lexer.
-</p><a NAME="Terminal.__clearCurrentLine" ID="Terminal.__clearCurrentLine"></a>
-<h4>Terminal.__clearCurrentLine</h4>
-<b>__clearCurrentLine</b>(<i></i>)
-<p>
-        Private method to clear the line containing the cursor.
-</p><a NAME="Terminal.__clearHistory" ID="Terminal.__clearHistory"></a>
-<h4>Terminal.__clearHistory</h4>
-<b>__clearHistory</b>(<i></i>)
-<p>
-        Private slot to clear the current history.
-</p><a NAME="Terminal.__configure" ID="Terminal.__configure"></a>
-<h4>Terminal.__configure</h4>
-<b>__configure</b>(<i></i>)
-<p>
-        Private method to open the configuration dialog.
-</p><a NAME="Terminal.__executeCommand" ID="Terminal.__executeCommand"></a>
-<h4>Terminal.__executeCommand</h4>
-<b>__executeCommand</b>(<i>cmd</i>)
-<p>
-        Private slot to execute a command.
-</p><dl>
-<dt><i>cmd</i></dt>
-<dd>
-command to be executed by debug client (string)
-</dd>
-</dl><a NAME="Terminal.__find" ID="Terminal.__find"></a>
-<h4>Terminal.__find</h4>
-<b>__find</b>(<i></i>)
-<p>
-        Private slot to show the find widget.
-</p><a NAME="Terminal.__finished" ID="Terminal.__finished"></a>
-<h4>Terminal.__finished</h4>
-<b>__finished</b>(<i></i>)
-<p>
-        Private method called, when the shell process has finished.
-</p><a NAME="Terminal.__getEndPos" ID="Terminal.__getEndPos"></a>
-<h4>Terminal.__getEndPos</h4>
-<b>__getEndPos</b>(<i></i>)
-<p>
-        Private method to return the line and column of the last character.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-tuple of two values (int, int) giving the line and column
-</dd>
-</dl><a NAME="Terminal.__insertHistory" ID="Terminal.__insertHistory"></a>
-<h4>Terminal.__insertHistory</h4>
-<b>__insertHistory</b>(<i>cmd</i>)
-<p>
-        Private method to insert a command selected from the history.
-</p><dl>
-<dt><i>cmd</i></dt>
-<dd>
-history entry to be inserted (string)
-</dd>
-</dl><a NAME="Terminal.__insertText" ID="Terminal.__insertText"></a>
-<h4>Terminal.__insertText</h4>
-<b>__insertText</b>(<i>s</i>)
-<p>
-        Private method to insert some text at the current cursor position.
-</p><dl>
-<dt><i>s</i></dt>
-<dd>
-text to be inserted (string)
-</dd>
-</dl><a NAME="Terminal.__insertTextAtEnd" ID="Terminal.__insertTextAtEnd"></a>
-<h4>Terminal.__insertTextAtEnd</h4>
-<b>__insertTextAtEnd</b>(<i>s</i>)
-<p>
-        Private method to insert some text at the end of the command line.
-</p><dl>
-<dt><i>s</i></dt>
-<dd>
-text to be inserted (string)
-</dd>
-</dl><a NAME="Terminal.__isCursorOnLastLine" ID="Terminal.__isCursorOnLastLine"></a>
-<h4>Terminal.__isCursorOnLastLine</h4>
-<b>__isCursorOnLastLine</b>(<i></i>)
-<p>
-        Private method to check, if the cursor is on the last line.
-</p><a NAME="Terminal.__readOutput" ID="Terminal.__readOutput"></a>
-<h4>Terminal.__readOutput</h4>
-<b>__readOutput</b>(<i></i>)
-<p>
-        Private method to process the output of the shell.
-</p><a NAME="Terminal.__reset" ID="Terminal.__reset"></a>
-<h4>Terminal.__reset</h4>
-<b>__reset</b>(<i></i>)
-<p>
-        Private slot to handle the 'reset' context menu entry.
-</p><a NAME="Terminal.__rsearchHistory" ID="Terminal.__rsearchHistory"></a>
-<h4>Terminal.__rsearchHistory</h4>
-<b>__rsearchHistory</b>(<i>txt, startIdx=-1</i>)
-<p>
-        Private method used to reverse search the history.
-</p><dl>
-<dt><i>txt</i></dt>
-<dd>
-text to match at the beginning (string)
-</dd><dt><i>startIdx</i></dt>
-<dd>
-index to start search from (integer)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-index of found entry (integer)
-</dd>
-</dl><a NAME="Terminal.__searchHistory" ID="Terminal.__searchHistory"></a>
-<h4>Terminal.__searchHistory</h4>
-<b>__searchHistory</b>(<i>txt, startIdx=-1</i>)
-<p>
-        Private method used to search the history.
-</p><dl>
-<dt><i>txt</i></dt>
-<dd>
-text to match at the beginning (string)
-</dd><dt><i>startIdx</i></dt>
-<dd>
-index to start search from (integer)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-index of found entry (integer)
-</dd>
-</dl><a NAME="Terminal.__searchNext" ID="Terminal.__searchNext"></a>
-<h4>Terminal.__searchNext</h4>
-<b>__searchNext</b>(<i></i>)
-<p>
-        Private method to search for the next occurrence.
-</p><a NAME="Terminal.__searchPrev" ID="Terminal.__searchPrev"></a>
-<h4>Terminal.__searchPrev</h4>
-<b>__searchPrev</b>(<i></i>)
-<p>
-        Private method to search for the next occurrence.
-</p><a NAME="Terminal.__selectHistory" ID="Terminal.__selectHistory"></a>
-<h4>Terminal.__selectHistory</h4>
-<b>__selectHistory</b>(<i></i>)
-<p>
-        Private slot to select a history entry to execute.
-</p><a NAME="Terminal.__send" ID="Terminal.__send"></a>
-<h4>Terminal.__send</h4>
-<b>__send</b>(<i>data</i>)
-<p>
-        Private method to send data to the shell process.
-</p><dl>
-<dt><i>data</i></dt>
-<dd>
-data to be sent to the shell process (string)
-</dd>
-</dl><a NAME="Terminal.__sendCtrl" ID="Terminal.__sendCtrl"></a>
-<h4>Terminal.__sendCtrl</h4>
-<b>__sendCtrl</b>(<i>cmd</i>)
-<p>
-        Private slot to send a control command to the shell process.
-</p><dl>
-<dt><i>the</i></dt>
-<dd>
-control command to be sent (integer)
-</dd>
-</dl><a NAME="Terminal.__setMargin0" ID="Terminal.__setMargin0"></a>
-<h4>Terminal.__setMargin0</h4>
-<b>__setMargin0</b>(<i></i>)
-<p>
-        Private method to configure margin 0.
-</p><a NAME="Terminal.__setMonospaced" ID="Terminal.__setMonospaced"></a>
-<h4>Terminal.__setMonospaced</h4>
-<b>__setMonospaced</b>(<i>on</i>)
-<p>
-        Private method to set/reset a monospaced font.
-</p><dl>
-<dt><i>on</i></dt>
-<dd>
-flag to indicate usage of a monospace font (boolean)
-</dd>
-</dl><a NAME="Terminal.__setTextDisplay" ID="Terminal.__setTextDisplay"></a>
-<h4>Terminal.__setTextDisplay</h4>
-<b>__setTextDisplay</b>(<i></i>)
-<p>
-        Private method to configure the text display.
-</p><a NAME="Terminal.__showHistory" ID="Terminal.__showHistory"></a>
-<h4>Terminal.__showHistory</h4>
-<b>__showHistory</b>(<i></i>)
-<p>
-        Private slot to show the shell history dialog.
-</p><a NAME="Terminal.__startShell" ID="Terminal.__startShell"></a>
-<h4>Terminal.__startShell</h4>
-<b>__startShell</b>(<i></i>)
-<p>
-        Private slot to start the shell process.
-</p><a NAME="Terminal.__started" ID="Terminal.__started"></a>
-<h4>Terminal.__started</h4>
-<b>__started</b>(<i></i>)
-<p>
-        Private method called, when the shell process has started.
-</p><a NAME="Terminal.__stopShell" ID="Terminal.__stopShell"></a>
-<h4>Terminal.__stopShell</h4>
-<b>__stopShell</b>(<i></i>)
-<p>
-        Private slot to stop the shell process.
-</p><a NAME="Terminal.__useHistory" ID="Terminal.__useHistory"></a>
-<h4>Terminal.__useHistory</h4>
-<b>__useHistory</b>(<i></i>)
-<p>
-        Private method to display a command from the history.
-</p><a NAME="Terminal.__write" ID="Terminal.__write"></a>
-<h4>Terminal.__write</h4>
-<b>__write</b>(<i>s</i>)
-<p>
-        Private method to display some text.
-</p><dl>
-<dt><i>s</i></dt>
-<dd>
-text to be displayed (string)
-</dd>
-</dl><a NAME="Terminal.clear" ID="Terminal.clear"></a>
-<h4>Terminal.clear</h4>
-<b>clear</b>(<i></i>)
-<p>
-        Public slot to clear the display.
-</p><a NAME="Terminal.closeTerminal" ID="Terminal.closeTerminal"></a>
-<h4>Terminal.closeTerminal</h4>
-<b>closeTerminal</b>(<i></i>)
-<p>
-        Public method to shutdown the terminal.
-</p><a NAME="Terminal.contextMenuEvent" ID="Terminal.contextMenuEvent"></a>
-<h4>Terminal.contextMenuEvent</h4>
-<b>contextMenuEvent</b>(<i>ev</i>)
-<p>
-        Reimplemented to show our own context menu.
-</p><dl>
-<dt><i>ev</i></dt>
-<dd>
-context menu event (QContextMenuEvent)
-</dd>
-</dl><a NAME="Terminal.editorCommand" ID="Terminal.editorCommand"></a>
-<h4>Terminal.editorCommand</h4>
-<b>editorCommand</b>(<i>cmd</i>)
-<p>
-        Public method to perform an editor command.
-</p><dl>
-<dt><i>cmd</i></dt>
-<dd>
-the scintilla command to be performed
-</dd>
-</dl><a NAME="Terminal.event" ID="Terminal.event"></a>
-<h4>Terminal.event</h4>
-<b>event</b>(<i>evt</i>)
-<p>
-        Protected method handling events.
-</p><dl>
-<dt><i>evt</i></dt>
-<dd>
-reference to the event (QEvent)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-flag indicating, if the event was handled (boolean)
-</dd>
-</dl><a NAME="Terminal.focusInEvent" ID="Terminal.focusInEvent"></a>
-<h4>Terminal.focusInEvent</h4>
-<b>focusInEvent</b>(<i>event</i>)
-<p>
-        Public method called when the shell receives focus.
-</p><dl>
-<dt><i>event</i></dt>
-<dd>
-the event object (QFocusEvent)
-</dd>
-</dl><a NAME="Terminal.focusOutEvent" ID="Terminal.focusOutEvent"></a>
-<h4>Terminal.focusOutEvent</h4>
-<b>focusOutEvent</b>(<i>event</i>)
-<p>
-        Public method called when the shell loses focus.
-</p><dl>
-<dt><i>event</i></dt>
-<dd>
-the event object (QFocusEvent)
-</dd>
-</dl><a NAME="Terminal.gestureEvent" ID="Terminal.gestureEvent"></a>
-<h4>Terminal.gestureEvent</h4>
-<b>gestureEvent</b>(<i>evt</i>)
-<p>
-        Protected method handling gesture events.
-</p><dl>
-<dt><i>evt</i></dt>
-<dd>
-reference to the gesture event (QGestureEvent
-</dd>
-</dl><a NAME="Terminal.getHistory" ID="Terminal.getHistory"></a>
-<h4>Terminal.getHistory</h4>
-<b>getHistory</b>(<i></i>)
-<p>
-        Public method to get the history.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-reference to the history list (list of strings)
-</dd>
-</dl><a NAME="Terminal.handlePreferencesChanged" ID="Terminal.handlePreferencesChanged"></a>
-<h4>Terminal.handlePreferencesChanged</h4>
-<b>handlePreferencesChanged</b>(<i></i>)
-<p>
-        Public slot to handle the preferencesChanged signal.
-</p><a NAME="Terminal.insert" ID="Terminal.insert"></a>
-<h4>Terminal.insert</h4>
-<b>insert</b>(<i>txt</i>)
-<p>
-        Public slot to insert text at the current cursor position.
-</p><p>
-        The cursor is advanced to the end of the inserted text.
-</p><dl>
-<dt><i>txt</i></dt>
-<dd>
-text to be inserted (string)
-</dd>
-</dl><a NAME="Terminal.keyPressEvent" ID="Terminal.keyPressEvent"></a>
-<h4>Terminal.keyPressEvent</h4>
-<b>keyPressEvent</b>(<i>ev</i>)
-<p>
-        Re-implemented to handle the user input a key at a time.
-</p><dl>
-<dt><i>ev</i></dt>
-<dd>
-key event (QKeyEvent)
-</dd>
-</dl><a NAME="Terminal.loadHistory" ID="Terminal.loadHistory"></a>
-<h4>Terminal.loadHistory</h4>
-<b>loadHistory</b>(<i></i>)
-<p>
-        Public method to load the history.
-</p><a NAME="Terminal.mousePressEvent" ID="Terminal.mousePressEvent"></a>
-<h4>Terminal.mousePressEvent</h4>
-<b>mousePressEvent</b>(<i>event</i>)
-<p>
-        Protected method to handle the mouse press event.
-</p><dl>
-<dt><i>event</i></dt>
-<dd>
-the mouse press event (QMouseEvent)
-</dd>
-</dl><a NAME="Terminal.reloadHistory" ID="Terminal.reloadHistory"></a>
-<h4>Terminal.reloadHistory</h4>
-<b>reloadHistory</b>(<i></i>)
-<p>
-        Public method to reload the history.
-</p><a NAME="Terminal.saveHistory" ID="Terminal.saveHistory"></a>
-<h4>Terminal.saveHistory</h4>
-<b>saveHistory</b>(<i></i>)
-<p>
-        Public method to save the history.
-</p><a NAME="Terminal.searchNext" ID="Terminal.searchNext"></a>
-<h4>Terminal.searchNext</h4>
-<b>searchNext</b>(<i>txt, caseSensitive, wholeWord</i>)
-<p>
-        Public method to search the next occurrence of the given text.
-</p><dl>
-<dt><i>txt</i></dt>
-<dd>
-text to search for (string)
-</dd><dt><i>caseSensitive</i></dt>
-<dd>
-flag indicating to perform a case sensitive
-            search (boolean)
-</dd><dt><i>wholeWord</i></dt>
-<dd>
-flag indicating to search for whole words
-            only (boolean)
-</dd>
-</dl><a NAME="Terminal.searchPrev" ID="Terminal.searchPrev"></a>
-<h4>Terminal.searchPrev</h4>
-<b>searchPrev</b>(<i>txt, caseSensitive, wholeWord</i>)
-<p>
-        Public method to search the previous occurrence of the given text.
-</p><dl>
-<dt><i>txt</i></dt>
-<dd>
-text to search for (string)
-</dd><dt><i>caseSensitive</i></dt>
-<dd>
-flag indicating to perform a case sensitive
-            search (boolean)
-</dd><dt><i>wholeWord</i></dt>
-<dd>
-flag indicating to search for whole words
-            only (boolean)
-</dd>
-</dl><a NAME="Terminal.wheelEvent" ID="Terminal.wheelEvent"></a>
-<h4>Terminal.wheelEvent</h4>
-<b>wheelEvent</b>(<i>evt</i>)
-<p>
-        Protected method to handle wheel events.
-</p><dl>
-<dt><i>evt</i></dt>
-<dd>
-reference to the wheel event (QWheelEvent)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="TerminalAssembly" ID="TerminalAssembly"></a>
-<h2>TerminalAssembly</h2>
-<p>
-    Class implementing the containing widget for the terminal.
-</p>
-<h3>Derived from</h3>
-QWidget
-<h3>Class Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#TerminalAssembly.__init__">TerminalAssembly</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#TerminalAssembly.showFind">showFind</a></td>
-<td>Public method to display the search widget.</td>
-</tr><tr>
-<td><a href="#TerminalAssembly.terminal">terminal</a></td>
-<td>Public method to get a reference to the terminal widget.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="TerminalAssembly.__init__" ID="TerminalAssembly.__init__"></a>
-<h4>TerminalAssembly (Constructor)</h4>
-<b>TerminalAssembly</b>(<i>vm, parent=None</i>)
-<p>
-        Constructor
-</p><dl>
-<dt><i>vm</i></dt>
-<dd>
-reference to the viewmanager object
-</dd><dt><i>parent</i></dt>
-<dd>
-reference to the parent widget (QWidget)
-</dd>
-</dl><a NAME="TerminalAssembly.showFind" ID="TerminalAssembly.showFind"></a>
-<h4>TerminalAssembly.showFind</h4>
-<b>showFind</b>(<i>txt=""</i>)
-<p>
-        Public method to display the search widget.
-</p><dl>
-<dt><i>txt</i></dt>
-<dd>
-text to be shown in the combo (string)
-</dd>
-</dl><a NAME="TerminalAssembly.terminal" ID="TerminalAssembly.terminal"></a>
-<h4>TerminalAssembly.terminal</h4>
-<b>terminal</b>(<i></i>)
-<p>
-        Public method to get a reference to the terminal widget.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-reference to the terminal widget (Terminal)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
-</body></html>
\ No newline at end of file

--- a/Documentation/Source/eric5.UI.UserInterface.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/eric5.UI.UserInterface.html	Fri Mar 22 18:48:40 2013 +0100
@@ -223,9 +223,6 @@
 <td><a href="#UserInterface.__activateTemplateViewer">__activateTemplateViewer</a></td>
 <td>Private slot to handle the activation of the Template Viewer.</td>
 </tr><tr>
-<td><a href="#UserInterface.__activateTerminal">__activateTerminal</a></td>
-<td>Private slot to handle the activation of the Terminal window.</td>
-</tr><tr>
 <td><a href="#UserInterface.__activateViewProfile">__activateViewProfile</a></td>
 <td>Private slot to activate a view profile.</td>
 </tr><tr>
@@ -875,11 +872,6 @@
 <b>__activateTemplateViewer</b>(<i></i>)
 <p>
         Private slot to handle the activation of the Template Viewer.
-</p><a NAME="UserInterface.__activateTerminal" ID="UserInterface.__activateTerminal"></a>
-<h4>UserInterface.__activateTerminal</h4>
-<b>__activateTerminal</b>(<i></i>)
-<p>
-        Private slot to handle the activation of the Terminal window.
 </p><a NAME="UserInterface.__activateViewProfile" ID="UserInterface.__activateViewProfile"></a>
 <h4>UserInterface.__activateViewProfile</h4>
 <b>__activateViewProfile</b>(<i>name, save=True</i>)

--- a/Documentation/Source/index-eric5.Preferences.ConfigurationPages.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/index-eric5.Preferences.ConfigurationPages.html	Fri Mar 22 18:48:40 2013 +0100
@@ -184,9 +184,6 @@
 <td><a href="eric5.Preferences.ConfigurationPages.TemplatesPage.html">TemplatesPage</a></td>
 <td>Module implementing the Templates configuration page.</td>
 </tr><tr>
-<td><a href="eric5.Preferences.ConfigurationPages.TerminalPage.html">TerminalPage</a></td>
-<td>Module implementing the Terminal configuration page.</td>
-</tr><tr>
 <td><a href="eric5.Preferences.ConfigurationPages.TrayStarterPage.html">TrayStarterPage</a></td>
 <td>Module implementing the tray starter configuration page.</td>
 </tr><tr>

--- a/Documentation/Source/index-eric5.QScintilla.html	Fri Mar 22 20:39:32 2013 +0400
+++ b/Documentation/Source/index-eric5.QScintilla.html	Fri Mar 22 18:48:40 2013 +0100
@@ -89,9 +89,6 @@
 <td><a href="eric5.QScintilla.SpellingDictionaryEditDialog.html">SpellingDictionaryEditDialog</a></td>
 <td>Module implementing a dialog to edit the various spell checking dictionaries.</td>
 </tr><tr>
-<td><a href="eric5.QScintilla.Terminal.html">Terminal</a></td>
-<td>Module implementing a simple terminal based on QScintilla.</td>
-</tr><tr>
 <td><a href="eric5.QScintilla.ZoomDialog.html">ZoomDialog</a></td>
 <td>Module implementing a dialog to select the zoom scale.</td>
 </tr>

--- a/E5Gui/E5ModelMenu.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/E5Gui/E5ModelMenu.py	Fri Mar 22 18:48:40 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a menu populated from a QAbstractItemModel.
 """
 
-from PyQt4.QtCore import pyqtSignal, Qt, QModelIndex, QPoint
+from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint
 from PyQt4.QtGui import QMenu, QFontMetrics, QAction, QApplication, QDrag, QPixmap
 
 import UI.PixmapCache
@@ -378,7 +378,10 @@
         drag = QDrag(self)
         drag.setMimeData(self.__model.mimeData([idx]))
         actionRect = self.actionGeometry(act)
-        drag.setPixmap(QPixmap.grabWidget(self, actionRect))
+        if qVersion() >= "5.0.0":
+            drag.setPixmap(self.grab(actionRect))
+        else:
+            drag.setPixmap(QPixmap.grabWidget(self, actionRect))
         
         if drag.exec_() == Qt.MoveAction:
             row = idx.row()

--- a/E5Gui/E5ModelToolBar.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/E5Gui/E5ModelToolBar.py	Fri Mar 22 18:48:40 2013 +0100
@@ -7,7 +7,7 @@
 Module implementing a tool bar populated from a QAbstractItemModel.
 """
 
-from PyQt4.QtCore import pyqtSignal, Qt, QModelIndex, QPoint, QEvent
+from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint, QEvent
 from PyQt4.QtGui import QApplication, QDrag, QPixmap, QToolBar, QIcon, QToolButton
 
 
@@ -241,7 +241,10 @@
         drag = QDrag(self)
         drag.setMimeData(self.__model.mimeData([idx]))
         actionRect = self.actionGeometry(act)
-        drag.setPixmap(QPixmap.grabWidget(self, actionRect))
+        if qVersion() >= "5.0.0":
+            drag.setPixmap(self.grab(actionRect))
+        else:
+            drag.setPixmap(QPixmap.grabWidget(self, actionRect))
         
         if drag.exec_() == Qt.MoveAction:
             row = idx.row()

--- a/Network/IRC/IrcChannelWidget.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Network/IRC/IrcChannelWidget.py	Fri Mar 22 18:48:40 2013 +0100
@@ -161,6 +161,16 @@
             privilege |= IrcUserItem.Away
         self.__privilege = privilege
         self.__setIcon()
+    
+    def canChangeTopic(self):
+        """
+        Public method to check, if the user is allowed to change the topic.
+        
+        @return flag indicating that the topic can be changed (boolean)
+        """
+        return(bool(self.__privilege & IrcUserItem.Operator) or \
+               bool(self.__privilege & IrcUserItem.Admin) or \
+               bool(self.__privilege & IrcUserItem.Owner))
 
 
 class IrcChannelWidget(QWidget, Ui_IrcChannelWidget):
@@ -197,6 +207,7 @@
         self.__ircWidget = parent
         
         self.editTopicButton.setIcon(UI.PixmapCache.getIcon("ircEditTopic.png"))
+        self.editTopicButton.hide()
         
         height = self.usersList.height() + self.messages.height()
         self.splitter.setSizes([height * 0.3, height * 0.7])
@@ -452,7 +463,7 @@
         # group(2)   sender user@host
         # group(3)   target nick
         # group(4)   message
-        if match.group(3).lower() == self.__name:
+        if match.group(3).lower() == self.__name.lower():
             if match.group(4).startswith("\x01"):
                 return self.__handleCtcp(match)
             
@@ -503,7 +514,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(3).lower() == self.__name:
+        if match.group(3).lower() == self.__name.lower():
             if self.__userName != match.group(1):
                 IrcUserItem(match.group(1), self.usersList)
                 msg = self.trUtf8("{0} has joined the channel {1} ({2}).").format(
@@ -528,7 +539,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(2).lower() == self.__name:
+        if match.group(2).lower() == self.__name.lower():
             itm = self.__findUser(match.group(1))
             self.usersList.takeItem(self.usersList.row(itm))
             del itm
@@ -608,7 +619,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             users = match.group(2).split()
             for user in users:
                 userPrivileges, userName = self.__extractPrivilege(user)
@@ -617,10 +628,12 @@
                     itm = IrcUserItem(userName, self.usersList)
                 for privilege in userPrivileges:
                     itm.changePrivilege(privilege)
+            
+            self.__setEditTopicButton()
             return True
         
         return False
-    
+
     def __userAway(self, match):
         """
         Private method to handle a topic change of the channel.
@@ -628,7 +641,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             self.__addManagementMessage(self.trUtf8("Away"),
                 self.trUtf8("{0} is away: {1}").format(match.group(2), match.group(3)))
             return True
@@ -642,7 +655,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             self.topicLabel.setText(match.group(2))
             self.__addManagementMessage(IrcChannelWidget.MessageIndicator,
                 ircFilter(self.trUtf8('The channel topic is: "{0}".').format(
@@ -658,7 +671,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             self.__addManagementMessage(IrcChannelWidget.MessageIndicator,
                 self.trUtf8("The topic was set by {0} on {1}.").format(
                     match.group(2), QDateTime.fromTime_t(int(match.group(3)))\
@@ -674,7 +687,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             self.__addManagementMessage(IrcChannelWidget.MessageIndicator,
                 ircFilter(self.trUtf8("Channel URL: {0}").format(match.group(2))))
             return True
@@ -688,7 +701,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             modesDict = getChannelModesDict()
             modesParameters = match.group(2).split()
             modeString = modesParameters.pop(0)
@@ -723,7 +736,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             self.__addManagementMessage(IrcChannelWidget.MessageIndicator,
                 self.trUtf8("This channel was created on {0}.").format(
                     QDateTime.fromTime_t(int(match.group(2)))\
@@ -742,7 +755,7 @@
         # group(1)  user or server
         # group(2)  channel
         # group(3)  modes and parameter list
-        if match.group(2).lower() == self.__name:
+        if match.group(2).lower() == self.__name.lower():
             nick = match.group(1)
             modesParameters = match.group(3).split()
             modeString = modesParameters.pop(0)
@@ -884,10 +897,11 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(2).lower() == self.__name:
+        if match.group(2).lower() == self.__name.lower():
             itm = self.__findUser(match.group(4))
             if itm:
                 itm.changePrivilege(match.group(3))
+                self.__setEditTopicButton()
             self.__addManagementMessage(IrcChannelWidget.MessageIndicator,
                 self.trUtf8("{0} sets mode for {1}: {2}.").format(
                     match.group(1), match.group(4), match.group(3)))
@@ -902,7 +916,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             return True
         
         return False
@@ -1072,12 +1086,6 @@
         """
         self.messages.copy()
     
-    def __cutMessages(self):
-        """
-        Private slot to cut the selection of the messages display to the clipboard.
-        """
-        self.messages.cut()
-    
     def __copyAllMessages(self):
         """
         Private slot to copy the contents of the messages display to the clipboard.
@@ -1153,10 +1161,6 @@
         Private slot to initialize the context menu of the messages pane.
         """
         self.__messagesMenu = QMenu(self)
-        self.__cutMessagesAct = \
-            self.__messagesMenu.addAction(
-                UI.PixmapCache.getIcon("editCut.png"),
-                self.trUtf8("Cut"), self.__cutMessages)
         self.__copyMessagesAct = \
             self.__messagesMenu.addAction(
                 UI.PixmapCache.getIcon("editCopy.png"),
@@ -1198,7 +1202,6 @@
         @param yes flag signaling the availability of selected text (boolean)
         """
         self.__copyMessagesAct.setEnabled(yes)
-        self.__cutMessagesAct.setEnabled(yes)
     
     @pyqtSlot(QPoint)
     def on_messages_customContextMenuRequested(self, pos):
@@ -1324,7 +1327,7 @@
         @param match match object that matched the pattern
         @return flag indicating whether the message was handled (boolean)
         """
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             if self.__autoWhoRequested:
                 self.__autoWhoRequested = False
                 self.initAutoWho()
@@ -1349,7 +1352,7 @@
         # group(4)  nick
         # group(5)  user flags
         # group(6)  real name
-        if match.group(1).lower() == self.__name:
+        if match.group(1).lower() == self.__name.lower():
             away = self.trUtf8(" (Away)") if match.group(5).startswith("G") else ""
             self.__addManagementMessage(self.trUtf8("Who"),
                 self.trUtf8("{0} is {1}@{2} ({3}){4}").format(
@@ -1659,6 +1662,14 @@
         
         return False
     
+    def __setEditTopicButton(self):
+        """
+        Private method to set the visibility of the Edit Topic button.
+        """
+        itm = self.__findUser(self.__userName)
+        if itm:
+            self.editTopicButton.setVisible(itm.canChangeTopic())
+    
     @pyqtSlot()
     def on_editTopicButton_clicked(self):
         """

--- a/Network/IRC/IrcNetworkWidget.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Network/IRC/IrcNetworkWidget.py	Fri Mar 22 18:48:40 2013 +0100
@@ -313,12 +313,6 @@
         """
         self.messages.copy()
     
-    def __cutMessages(self):
-        """
-        Private slot to cut the selection of the messages display to the clipboard.
-        """
-        self.messages.cut()
-    
     def __copyAllMessages(self):
         """
         Private slot to copy the contents of the messages display to the clipboard.
@@ -394,10 +388,6 @@
         Private slot to initialize the context menu of the messages pane.
         """
         self.__messagesMenu = QMenu(self)
-        self.__cutMessagesAct = \
-            self.__messagesMenu.addAction(
-                UI.PixmapCache.getIcon("editCut.png"),
-                self.trUtf8("Cut"), self.__cutMessages)
         self.__copyMessagesAct = \
             self.__messagesMenu.addAction(
                 UI.PixmapCache.getIcon("editCopy.png"),
@@ -432,7 +422,6 @@
         @param yes flag signaling the availability of selected text (boolean)
         """
         self.__copyMessagesAct.setEnabled(yes)
-        self.__cutMessagesAct.setEnabled(yes)
     
     @pyqtSlot(QPoint)
     def on_messages_customContextMenuRequested(self, pos):

--- a/Network/IRC/IrcWidget.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Network/IRC/IrcWidget.py	Fri Mar 22 18:48:40 2013 +0100
@@ -359,6 +359,11 @@
             self.channelsWidget.removeTab(self.channelsWidget.indexOf(channel))
             channel.deleteLater()
             channel = None
+        
+        self.channelsWidget.addTab(self.__emptyLabel, "")
+        self.__emptyLabel.show()
+        self.__leaveButton.setEnabled(False)
+        self.channelsWidget.setTabsClosable(False)
     
     def __closeChannel(self, name):
         """

--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Fri Mar 22 18:48:40 2013 +0100
@@ -10,7 +10,7 @@
 import os
 
 from PyQt4.QtCore import pyqtSlot, QDir
-from PyQt4.QtGui import QDialog
+from PyQt4.QtGui import QDialog, QDialogButtonBox
 
 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
@@ -101,6 +101,16 @@
                 self.vcsUrlEdit.setText(self.networkPath)
                 self.localProtocol = False
     
+    @pyqtSlot(str)
+    def on_vcsUrlEdit_textChanged(self, txt):
+        """
+        Private slot to handle changes of the URL.
+        
+        @param txt current text of the line edit (string)
+        """
+        enable = "://" not in txt
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
+    
     def getData(self):
         """
         Public slot to retrieve the data entered into the dialog.

--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui	Fri Mar 22 18:48:40 2013 +0100
@@ -54,7 +54,7 @@
      <item row="1" column="1">
       <widget class="QLineEdit" name="vcsUrlEdit">
        <property name="toolTip">
-        <string>Enter the url path of the repository</string>
+        <string>Enter the url path of the repository (without protocol part)</string>
        </property>
       </widget>
      </item>

--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Fri Mar 22 18:48:40 2013 +0100
@@ -10,7 +10,7 @@
 import os
 
 from PyQt4.QtCore import QDir, pyqtSlot
-from PyQt4.QtGui import QDialog
+from PyQt4.QtGui import QDialog, QDialogButtonBox
 
 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
@@ -124,6 +124,16 @@
                 self.vcsUrlEdit.setText(self.networkPath)
                 self.vcsUrlLabel.setText(self.trUtf8("&URL:"))
                 self.localProtocol = False
+    
+    @pyqtSlot(str)
+    def on_vcsUrlEdit_textChanged(self, txt):
+        """
+        Private slot to handle changes of the URL.
+        
+        @param txt current text of the line edit (string)
+        """
+        enable = "://" not in txt
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
         
     def getData(self):
         """

--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui	Fri Mar 22 18:48:40 2013 +0100
@@ -65,7 +65,7 @@
      <item row="1" column="1">
       <widget class="QLineEdit" name="vcsUrlEdit">
        <property name="toolTip">
-        <string>Enter the url path of the module in the repository</string>
+        <string>Enter the url path of the module in the repository (without protocol part)</string>
        </property>
        <property name="whatsThis">
         <string>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.&lt;/p&gt;</string>

--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Fri Mar 22 18:48:40 2013 +0100
@@ -10,7 +10,7 @@
 import os
 
 from PyQt4.QtCore import QDir, pyqtSlot
-from PyQt4.QtGui import QDialog
+from PyQt4.QtGui import QDialog, QDialogButtonBox
 
 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
@@ -96,6 +96,16 @@
                 self.vcsUrlEdit.setText(self.networkPath)
                 self.vcsUrlLabel.setText(self.trUtf8("&URL:"))
                 self.localProtocol = False
+    
+    @pyqtSlot(str)
+    def on_vcsUrlEdit_textChanged(self, txt):
+        """
+        Private slot to handle changes of the URL.
+        
+        @param txt current text of the line edit (string)
+        """
+        enable = "://" not in txt
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
         
     def getData(self):
         """

--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui	Fri Mar 22 18:48:40 2013 +0100
@@ -104,7 +104,7 @@
      <item row="1" column="1">
       <widget class="QLineEdit" name="vcsUrlEdit">
        <property name="toolTip">
-        <string>Enter the url path of the module in the repository</string>
+        <string>Enter the url path of the module in the repository (without protocol part)</string>
        </property>
        <property name="whatsThis">
         <string>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.&lt;/p&gt;</string>

--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Fri Mar 22 18:48:40 2013 +0100
@@ -2295,7 +2295,7 @@
         @param url url string (string)
         @return properly normalized url for subversion (string)
         """
-        protocol, url = url.split("://")
+        protocol, url = url.split("://", 1)
         if url.startswith("\\\\"):
             url = url[2:]
         if protocol == "file":

--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Fri Mar 22 18:48:40 2013 +0100
@@ -10,7 +10,7 @@
 import os
 
 from PyQt4.QtCore import QDir, pyqtSlot
-from PyQt4.QtGui import QDialog
+from PyQt4.QtGui import QDialog, QDialogButtonBox
 
 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
@@ -124,6 +124,16 @@
                 self.vcsUrlEdit.setText(self.networkPath)
                 self.vcsUrlLabel.setText(self.trUtf8("&URL:"))
                 self.localProtocol = False
+    
+    @pyqtSlot(str)
+    def on_vcsUrlEdit_textChanged(self, txt):
+        """
+        Private slot to handle changes of the URL.
+        
+        @param txt current text of the line edit (string)
+        """
+        enable = "://" not in txt
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
         
     def getData(self):
         """

--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui	Fri Mar 22 18:48:40 2013 +0100
@@ -62,7 +62,7 @@
      <item row="1" column="1">
       <widget class="QLineEdit" name="vcsUrlEdit">
        <property name="toolTip">
-        <string>Enter the url path of the module in the repository</string>
+        <string>Enter the url path of the module in the repository (without protocol part)</string>
        </property>
        <property name="whatsThis">
         <string>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.&lt;/p&gt;</string>

--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Fri Mar 22 18:48:40 2013 +0100
@@ -10,7 +10,7 @@
 import os
 
 from PyQt4.QtCore import QDir, pyqtSlot
-from PyQt4.QtGui import QDialog
+from PyQt4.QtGui import QDialog, QDialogButtonBox
 
 from E5Gui.E5Completers import E5DirCompleter
 from E5Gui import E5FileDialog
@@ -96,6 +96,16 @@
                 self.vcsUrlEdit.setText(self.networkPath)
                 self.vcsUrlLabel.setText(self.trUtf8("&URL:"))
                 self.localProtocol = False
+    
+    @pyqtSlot(str)
+    def on_vcsUrlEdit_textChanged(self, txt):
+        """
+        Private slot to handle changes of the URL.
+        
+        @param txt current text of the line edit (string)
+        """
+        enable = "://" not in txt
+        self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
         
     def getData(self):
         """

--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui	Fri Mar 22 18:48:40 2013 +0100
@@ -104,7 +104,7 @@
      <item row="1" column="1">
       <widget class="QLineEdit" name="vcsUrlEdit">
        <property name="toolTip">
-        <string>Enter the url path of the module in the repository</string>
+        <string>Enter the url path of the module in the repository (without protocol part)</string>
        </property>
        <property name="whatsThis">
         <string>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.&lt;/p&gt;</string>

--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Mar 22 18:48:40 2013 +0100
@@ -2092,7 +2092,7 @@
         @param url url string (string)
         @return properly normalized url for subversion (string)
         """
-        protocol, url = url.split("://")
+        protocol, url = url.split("://", 1)
         if url.startswith("\\\\"):
             url = url[2:]
         if protocol == "file":

--- a/Preferences/ConfigurationDialog.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Preferences/ConfigurationDialog.py	Fri Mar 22 18:48:40 2013 +0100
@@ -169,9 +169,6 @@
                 "templatesPage": \
                     [self.trUtf8("Templates"), "preferences-template.png",
                     "TemplatesPage", None, None],
-                "terminalPage": \
-                    [self.trUtf8("Terminal"), "terminal.png",
-                    "TerminalPage", None, None],
                 "trayStarterPage": \
                     [self.trUtf8("Tray Starter"), "erict.png",
                     "TrayStarterPage", None, None],

--- a/Preferences/ConfigurationPages/TerminalPage.py	Fri Mar 22 20:39:32 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2008 - 2013 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Module implementing the Terminal configuration page.
-"""
-
-from PyQt4.QtCore import pyqtSlot
-
-from .ConfigurationPageBase import ConfigurationPageBase
-from .Ui_TerminalPage import Ui_TerminalPage
-
-import Preferences
-import Utilities
-
-
-class TerminalPage(ConfigurationPageBase, Ui_TerminalPage):
-    """
-    Class implementing the Terminal configuration page.
-    """
-    def __init__(self):
-        """
-        Constructor
-        """
-        super().__init__()
-        self.setupUi(self)
-        self.setObjectName("TerminalPage")
-        
-        if Utilities.isWindowsPlatform():
-            self.shellGroup.setEnabled(False)
-        else:
-            self.shellCombo.addItems(["ash", "bash", "csh", "ksh", "sh", "tcsh", "zsh"])
-        
-        # set initial values
-        self.linenowidthSlider.setValue(
-            Preferences.getTerminal("LinenoWidth"))
-        self.linenoCheckBox.setChecked(
-            Preferences.getTerminal("LinenoMargin"))
-        self.syntaxHighlightingCheckBox.setChecked(
-            Preferences.getTerminal("SyntaxHighlightingEnabled"))
-        self.historySpinBox.setValue(
-            Preferences.getTerminal("MaxHistoryEntries"))
-        
-        self.monospacedFont = Preferences.getTerminal("MonospacedFont")
-        self.monospacedFontSample.setFont(self.monospacedFont)
-        self.monospacedCheckBox.setChecked(
-            Preferences.getTerminal("UseMonospacedFont"))
-        self.marginsFont = Preferences.getTerminal("MarginsFont")
-        self.marginsFontSample.setFont(self.marginsFont)
-        
-        self.shellCombo.setEditText(
-            Preferences.getTerminal("Shell"))
-        self.interactiveCheckBox.setChecked(
-            Preferences.getTerminal("ShellInteractive"))
-        
-    def save(self):
-        """
-        Public slot to save the Shell configuration.
-        """
-        Preferences.setTerminal("LinenoWidth",
-            self.linenowidthSlider.value())
-        Preferences.setTerminal("LinenoMargin",
-            self.linenoCheckBox.isChecked())
-        Preferences.setTerminal("SyntaxHighlightingEnabled",
-            self.syntaxHighlightingCheckBox.isChecked())
-        Preferences.setTerminal("MaxHistoryEntries",
-            self.historySpinBox.value())
-        
-        Preferences.setTerminal("MonospacedFont", self.monospacedFont)
-        Preferences.setTerminal("UseMonospacedFont",
-            self.monospacedCheckBox.isChecked())
-        Preferences.setTerminal("MarginsFont", self.marginsFont)
-        
-        Preferences.setTerminal("Shell",
-            self.shellCombo.currentText())
-        Preferences.setTerminal("ShellInteractive",
-            self.interactiveCheckBox.isChecked())
-        
-    @pyqtSlot()
-    def on_monospacedFontButton_clicked(self):
-        """
-        Private method used to select the font to be used as the monospaced font.
-        """
-        self.monospacedFont = \
-            self.selectFont(self.monospacedFontSample, self.monospacedFont)
-        
-    @pyqtSlot()
-    def on_linenumbersFontButton_clicked(self):
-        """
-        Private method used to select the font for the editor margins.
-        """
-        self.marginsFont = self.selectFont(self.marginsFontSample, self.marginsFont)
-        
-    def polishPage(self):
-        """
-        Public slot to perform some polishing actions.
-        """
-        self.monospacedFontSample.setFont(self.monospacedFont)
-        self.marginsFontSample.setFont(self.marginsFont)
-    
-
-def create(dlg):
-    """
-    Module function to create the configuration page.
-    
-    @param dlg reference to the configuration dialog
-    """
-    page = TerminalPage()
-    return page

--- a/Preferences/ConfigurationPages/TerminalPage.ui	Fri Mar 22 20:39:32 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TerminalPage</class>
- <widget class="QWidget" name="TerminalPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>585</width>
-    <height>488</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="headerLabel">
-     <property name="text">
-      <string>&lt;b&gt;Configure Terminal&lt;/b&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="Line" name="line14">
-     <property name="frameShape">
-      <enum>QFrame::HLine</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QLabel" name="TextLabel13_2_2_2_2">
-       <property name="text">
-        <string>Linenumbers width:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="linenowidthSlider">
-       <property name="toolTip">
-        <string>Move to set the width of the linenumbers margin.</string>
-       </property>
-       <property name="minimum">
-        <number>2</number>
-       </property>
-       <property name="maximum">
-        <number>8</number>
-       </property>
-       <property name="value">
-        <number>2</number>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="tickInterval">
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLCDNumber" name="linenowidthLCD">
-       <property name="toolTip">
-        <string>Displays the selected width of the linenumbers margin.</string>
-       </property>
-       <property name="digitCount">
-        <number>1</number>
-       </property>
-       <property name="segmentStyle">
-        <enum>QLCDNumber::Flat</enum>
-       </property>
-       <property name="value" stdset="0">
-        <double>2.000000000000000</double>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QCheckBox" name="linenoCheckBox">
-       <property name="toolTip">
-        <string>Select whether line numbers margin should be shown.</string>
-       </property>
-       <property name="text">
-        <string>Show Line Numbers Margin</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="syntaxHighlightingCheckBox">
-       <property name="toolTip">
-        <string>Select to enable syntax highlighting</string>
-       </property>
-       <property name="text">
-        <string>Syntax Highlighting Enabled</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QLabel" name="textLabel1_20">
-       <property name="text">
-        <string>max. History Entries:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="historySpinBox">
-       <property name="toolTip">
-        <string>Enter the number of history entries allowed</string>
-       </property>
-       <property name="minimum">
-        <number>10</number>
-       </property>
-       <property name="maximum">
-        <number>1000</number>
-       </property>
-       <property name="singleStep">
-        <number>10</number>
-       </property>
-       <property name="value">
-        <number>100</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_5">
-     <property name="title">
-      <string>Font</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QPushButton" name="monospacedFontButton">
-        <property name="toolTip">
-         <string>Press to select the font to be used as the monospaced font</string>
-        </property>
-        <property name="text">
-         <string>Monospaced Font</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="monospacedFontSample">
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
-        <property name="text">
-         <string>Monospaced Text</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignHCenter</set>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QCheckBox" name="monospacedCheckBox">
-        <property name="toolTip">
-         <string>Select, whether the monospaced font should be used as default</string>
-        </property>
-        <property name="text">
-         <string>Use monospaced as default</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="linenumbersFontButton">
-        <property name="toolTip">
-         <string>Press to select the font for the line numbers</string>
-        </property>
-        <property name="text">
-         <string>Line Numbers Font</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="marginsFontSample">
-        <property name="minimumSize">
-         <size>
-          <width>200</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
-        <property name="text">
-         <string>2345</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignHCenter</set>
-        </property>
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="shellGroup">
-     <property name="title">
-      <string>Shell</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Shell command:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="shellCombo">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip">
-         <string>Enter the shell to be used</string>
-        </property>
-        <property name="editable">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QCheckBox" name="interactiveCheckBox">
-        <property name="toolTip">
-         <string>Select to start an interactive shell</string>
-        </property>
-        <property name="text">
-         <string>Interactive Shell</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>linenowidthSlider</tabstop>
-  <tabstop>linenoCheckBox</tabstop>
-  <tabstop>syntaxHighlightingCheckBox</tabstop>
-  <tabstop>historySpinBox</tabstop>
-  <tabstop>monospacedFontButton</tabstop>
-  <tabstop>monospacedCheckBox</tabstop>
-  <tabstop>linenumbersFontButton</tabstop>
-  <tabstop>shellCombo</tabstop>
-  <tabstop>interactiveCheckBox</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>linenowidthSlider</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>linenowidthLCD</receiver>
-   <slot>display(int)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>209</x>
-     <y>74</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>366</x>
-     <y>73</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

--- a/Preferences/PreferencesLexer.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Preferences/PreferencesLexer.py	Fri Mar 22 18:48:40 2013 +0100
@@ -11,6 +11,7 @@
 from PyQt4.Qsci import QsciLexer
 
 import Preferences
+import Globals
 
 
 class PreferencesLexerError(Exception):
@@ -69,6 +70,14 @@
         """
         super().__init__(parent)
         
+        # These default font families are taken from QScintilla
+        if Globals.isWindowsPlatform():
+            self.__defaultFontFamily = "Courier New"
+        elif Globals.isMacPlatform():
+            self.__defaultFontFamily = "Courier"
+        else:
+            self.__defaultFontFamily = "Bitstream Vera Sans Mono"
+        
         # instantiate a lexer object for the given language
         import QScintilla.Lexers
         lex = QScintilla.Lexers.getLexer(language)
@@ -103,11 +112,15 @@
                 self.papers[i] = lex.defaultPaper(i)
                 self.eolFills[i] = lex.defaultEolFill(i)
                 self.fonts[i] = lex.defaultFont(i)
+                # Override QScintilla's default font family to
+                # always use a monospaced font
+                self.fonts[i].setFamily(self.__defaultFontFamily)
                 
                 self.defaultColours[i] = lex.defaultColor(i)
                 self.defaultPapers[i] = lex.defaultPaper(i)
                 self.defaultEolFills[i] = lex.defaultEolFill(i)
                 self.defaultFonts[i] = lex.defaultFont(i)
+                self.defaultFonts[i].setFamily(self.__defaultFontFamily)
                 
                 self.ind2style[index] = i
                 index += 1

--- a/Preferences/__init__.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Preferences/__init__.py	Fri Mar 22 18:48:40 2013 +0100
@@ -32,7 +32,7 @@
 from E5Network.E5Ftp import E5FtpProxyType
 
 from Globals import settingsNameOrganization, settingsNameGlobal, settingsNameRecent, \
-    isWindowsPlatform, isLinuxPlatform, findPython2Interpreters
+    isWindowsPlatform, findPython2Interpreters
 
 from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
     ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
@@ -321,8 +321,10 @@
         "SpellCheckingPersonalExcludeList": "",
         
         "DefaultEncoding": "utf-8",
-        "DefaultOpenFilter": "",
-        "DefaultSaveFilter": "",
+        "DefaultOpenFilter": QApplication.translate('Lexers',
+                                                    'Python Files (*.py *.py2 *.py3)'),
+        "DefaultSaveFilter": QApplication.translate('Lexers',
+                                                    "Python3 Files (*.py)"),
         "AdditionalOpenFilters": [],
         "AdditionalSaveFilters": [],
         
@@ -491,7 +493,7 @@
     editorTypingDefaults = {
         "Python/EnabledTypingAids": True,
         "Python/InsertClosingBrace": True,
-        "Python/IndentBrace": True,
+        "Python/IndentBrace": False,
         "Python/SkipBrace": True,
         "Python/InsertQuote": True,
         "Python/DedentElse": True,
@@ -817,21 +819,6 @@
         "MarginsFont": "Sans Serif,10,-1,5,50,0,0,0,0,0",
     }
 
-    # defaults for the terminal settings
-    terminalDefaults = {
-        "LinenoWidth": 4,
-        "LinenoMargin": True,
-        "MaxHistoryEntries": 100,
-        "SyntaxHighlightingEnabled": True,
-        "Shell": "",
-        "ShellInteractive": True,
-        "UseMonospacedFont": False,
-        "MonospacedFont": "Courier,10,-1,5,50,0,0,0,0,0",
-        "MarginsFont": "Sans Serif,10,-1,5,50,0,0,0,0,0",
-    }
-    if isLinuxPlatform():
-        terminalDefaults["Shell"] = "bash"
-
     # defaults for Qt related stuff
     qtDefaults = {
         "Qt4TranslationsDir": "",
@@ -1914,44 +1901,6 @@
         prefClass.settings.setValue("Shell/" + key, value)
 
 
-def getTerminal(key, prefClass=Prefs):
-    """
-    Module function to retrieve the various terminal settings.
-    
-    @param key the key of the value to get
-    @param prefClass preferences class used as the storage area
-    @return the requested shell setting
-    """
-    if key in ["Shell"]:
-        return prefClass.settings.value("Terminal/" + key,
-            prefClass.terminalDefaults[key])
-    elif key in ["MonospacedFont", "MarginsFont"]:
-        f = QFont()
-        f.fromString(prefClass.settings.value("Terminal/" + key,
-            prefClass.terminalDefaults[key]))
-        return f
-    elif key in ["LinenoWidth", "MaxHistoryEntries"]:
-        return int(prefClass.settings.value("Terminal/" + key,
-            prefClass.terminalDefaults[key]))
-    else:
-        return toBool(prefClass.settings.value("Terminal/" + key,
-            prefClass.terminalDefaults[key]))
-
-
-def setTerminal(key, value, prefClass=Prefs):
-    """
-    Module function to store the various terminal settings.
-    
-    @param key the key of the setting to be set
-    @param value the value to be set
-    @param prefClass preferences class used as the storage area
-    """
-    if key in ["MonospacedFont", "MarginsFont"]:
-        prefClass.settings.setValue("Terminal/" + key, value.toString())
-    else:
-        prefClass.settings.setValue("Terminal/" + key, value)
-
-
 def getProject(key, prefClass=Prefs):
     """
     Module function to retrieve the various project handling settings.

--- a/Project/AddFileDialog.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Project/AddFileDialog.py	Fri Mar 22 18:48:40 2013 +0100
@@ -48,7 +48,7 @@
         self.startdir = startdir
         self.filetypes = pro.pdata["FILETYPES"]  # save a reference to the filetypes dict
         
-        if self.filter is not None and self.filter != 'source':
+        if self.filter is not None:
             self.sourcecodeCheckBox.hide()
         
     @pyqtSlot()

--- a/Project/CreateDialogCodeDialog.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Project/CreateDialogCodeDialog.py	Fri Mar 22 18:48:40 2013 +0100
@@ -31,7 +31,9 @@
     """
     Class implementing a dialog to generate code for a Qt4/Qt5 dialog.
     """
-    DialogClasses = {"QDialog", "QWidget", "QMainWindow", "QWizardPage"}
+    DialogClasses = {"QDialog", "QWidget", "QMainWindow", "QWizard", "QWizardPage",
+        "QDockWidget", "QFrame", "QGroupBox", "QScrollArea", "QMdiArea",
+        "QTabWidget", "QToolBox", "QStackedWidget"}
     Separator = 25 * "="
     
     def __init__(self, formName, project, parent=None):

--- a/Project/Project.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Project/Project.py	Fri Mar 22 18:48:40 2013 +0100
@@ -1390,8 +1390,8 @@
                                 self.trUtf8("<p>The selected file <b>{0}</b> could not be"
                                     " added to <b>{1}</b>.</p><p>Reason: {2}</p>")
                                     .format(fn, target, str(why)))
-                            return
-                            
+                            continue
+                    
                     self.appendFile(targetfile, isSource or filter == 'source')
             else:
                 E5MessageBox.critical(self.ui,

--- a/Project/ProjectFormsBrowser.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/Project/ProjectFormsBrowser.py	Fri Mar 22 18:48:40 2013 +0100
@@ -77,7 +77,10 @@
         self.templates4 = ['dialog4.tmpl', 'widget4.tmpl', 'mainwindow4.tmpl',
             'dialogbuttonboxbottom4.tmpl', 'dialogbuttonboxright4.tmpl',
             'dialogbuttonsbottom4.tmpl', 'dialogbuttonsbottomcenter4.tmpl',
-            'dialogbuttonsright4.tmpl', 'wizard4.tmpl', 'wizardpage4.tmpl']
+            'dialogbuttonsright4.tmpl', '', 'wizard4.tmpl', 'wizardpage4.tmpl',
+            'qdockwidget4.tmpl', 'qframe4.tmpl', 'qgroupbox4.tmpl',
+            'qscrollarea4.tmpl', 'qmdiarea4.tmpl', 'qtabwidget4.tmpl',
+            'qtoolbox4.tmpl', 'qstackedwidget4.tmpl']
         self.templateTypes4 = [
             self.trUtf8("Dialog"),
             self.trUtf8("Widget"),
@@ -87,8 +90,17 @@
             self.trUtf8("Dialog with Buttons (Bottom)"),
             self.trUtf8("Dialog with Buttons (Bottom-Center)"),
             self.trUtf8("Dialog with Buttons (Right)"),
-            self.trUtf8("Wizard"),
-            self.trUtf8("Wizard Page"),
+            '',
+            self.trUtf8("QWizard"),
+            self.trUtf8("QWizardPage"),
+            self.trUtf8("QDockWidget"),
+            self.trUtf8("QFrame"),
+            self.trUtf8("QGroupBox"),
+            self.trUtf8("QScrollArea"),
+            self.trUtf8("QMdiArea"),
+            self.trUtf8("QTabWidget"),
+            self.trUtf8("QToolBox"),
+            self.trUtf8("QStackedWidget"),
         ]
         
         self.compileProc = None
@@ -487,7 +499,7 @@
             self.trUtf8("Select a form type:"),
             self.templateTypes4,
             0, False)
-        if not ok:
+        if not ok or not selectedForm:
             # user pressed cancel
             return
         

--- a/QScintilla/Editor.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/QScintilla/Editor.py	Fri Mar 22 18:48:40 2013 +0100
@@ -3140,7 +3140,21 @@
     ############################################################################
     ## Comment handling methods below
     ############################################################################
-
+    
+    def __isCommentedLine(self, line, commentStr):
+        """
+        Private method to check, if the given line is a comment line as produced
+        by the configured comment rules.
+        
+        @param line text of the line to check (string)
+        @param commentStr comment string to check against (string)
+        @return flag indicating a commented line (boolean)
+        """
+        if Preferences.getEditor("CommentColumn0"):
+            return line.startswith(commentStr)
+        else:
+            return line.strip().startswith(commentStr)
+    
     def toggleCommentBlock(self):
         """
         Public slot to toggle the comment of a block.
@@ -3157,20 +3171,23 @@
         
         # check if line starts with our comment string (i.e. was commented
         # by our comment...() slots
-        if not self.text(line).strip().startswith(commentStr):
+        if self.hasSelectedText() and \
+           self.__isCommentedLine(self.text(self.getSelection()[0]), commentStr):
+            self.uncommentLineOrSelection()
+        elif not self.__isCommentedLine(self.text(line), commentStr):
             # it doesn't, so comment the line or selection
             self.commentLineOrSelection()
         else:
             # determine the start of the comment block
             begline = line
             while begline > 0 and \
-                  self.text(begline - 1).strip().startswith(commentStr):
+                  self.__isCommentedLine(self.text(begline - 1), commentStr):
                 begline -= 1
             # determine the end of the comment block
             endline = line
             lines = self.lines()
             while endline < lines and \
-                  self.text(endline + 1).strip().startswith(commentStr):
+                  self.__isCommentedLine(self.text(endline + 1), commentStr):
                 endline += 1
             
             self.setSelection(begline, 0, endline, self.lineLength(endline))
@@ -3206,7 +3223,7 @@
         
         # check if line starts with our comment string (i.e. was commented
         # by our comment...() slots
-        if not self.text(line).strip().startswith(commentStr):
+        if not self.__isCommentedLine(self.text(line), commentStr):
             return
         
         # now remove the comment string
@@ -3274,7 +3291,7 @@
         for line in range(lineFrom, endLine + 1):
             # check if line starts with our comment string (i.e. was commented
             # by our comment...() slots
-            if not self.text(line).strip().startswith(commentStr):
+            if not self.__isCommentedLine(self.text(line), commentStr):
                 continue
             
             if Preferences.getEditor("CommentColumn0"):

--- a/QScintilla/QsciScintillaCompat.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/QScintilla/QsciScintillaCompat.py	Fri Mar 22 18:48:40 2013 +0100
@@ -108,9 +108,15 @@
         
         f = font.family().encode()
         ps = font.pointSize()
+        weight = -font.weight()
+        italic = font.italic()
+        underline = font.underline()
         for style in rangeLow + rangeHigh:
             self.SendScintilla(QsciScintilla.SCI_STYLESETFONT, style, f)
             self.SendScintilla(QsciScintilla.SCI_STYLESETSIZE, style, ps)
+            self.SendScintilla(QsciScintilla.SCI_STYLESETWEIGHT, style, weight);
+            self.SendScintilla(QsciScintilla.SCI_STYLESETITALIC, style, italic);
+            self.SendScintilla(QsciScintilla.SCI_STYLESETUNDERLINE, style, underline);
     
     def linesOnScreen(self):
         """

--- a/QScintilla/Shell.py	Fri Mar 22 20:39:32 2013 +0400
+++ b/QScintilla/Shell.py	Fri Mar 22 18:48:40 2013 +0100
@@ -72,7 +72,7 @@
         """
         Public method to get a reference to the terminal widget.
         
-        @return reference to the terminal widget (Terminal)
+        @return reference to the shell widget (Shell)
         """
         return self.__shell
 

--- a/QScintilla/Terminal.py	Fri Mar 22 20:39:32 2013 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1128 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2008 - 2013 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-"""
-Module implementing a simple terminal based on QScintilla.
-"""
-
-import sys
-import os
-import re
-
-from PyQt4.QtCore import pyqtSignal, QSignalMapper, QTimer, QByteArray, QProcess, Qt, \
-    QEvent
-from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QMenu, QPalette, QFont, \
-    QWidget, QHBoxLayout, QShortcut
-from PyQt4.Qsci import QsciScintilla
-
-from E5Gui.E5Application import e5App
-
-from .QsciScintillaCompat import QsciScintillaCompat
-
-import Preferences
-import Utilities
-
-import UI.PixmapCache
-
-
-class TerminalAssembly(QWidget):
-    """
-    Class implementing the containing widget for the terminal.
-    """
-    def __init__(self, vm, parent=None):
-        """
-        Constructor
-        
-        @param vm reference to the viewmanager object
-        @param parent reference to the parent widget (QWidget)
-        """
-        super().__init__(parent)
-        
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
-        
-        self.__terminal = Terminal(vm, self)
-        
-        from UI.SearchWidget import SearchWidget
-        self.__searchWidget = SearchWidget(self.__terminal, self)
-        self.__searchWidget.hide()
-        
-        self.__layout = QHBoxLayout(self)
-        self.__layout.setContentsMargins(1, 1, 1, 1)
-        self.__layout.addWidget(self.__terminal)
-        self.__layout.addWidget(self.__searchWidget)
-        
-        self.__searchWidget.searchNext.connect(self.__terminal.searchNext)
-        self.__searchWidget.searchPrevious.connect(self.__terminal.searchPrev)
-        self.__terminal.searchStringFound.connect(self.__searchWidget.searchStringFound)
-    
-    def showFind(self, txt=""):
-        """
-        Public method to display the search widget.
-        
-        @param txt text to be shown in the combo (string)
-        """
-        self.__searchWidget.showFind(txt)
-    
-    def terminal(self):
-        """
-        Public method to get a reference to the terminal widget.
-        
-        @return reference to the terminal widget (Terminal)
-        """
-        return self.__terminal
-
-
-class Terminal(QsciScintillaCompat):
-    """
-    Class implementing a simple terminal based on QScintilla.
-    
-    A user can enter commands that are executed by a shell process.
-    
-    @signal searchStringFound(found) emitted to indicate the search result (boolean)
-    """
-    searchStringFound = pyqtSignal(bool)
-    
-    def __init__(self, vm, parent=None):
-        """
-        Constructor
-        
-        @param vm reference to the viewmanager object
-        @param parent parent widget (QWidget)
-        """
-        super().__init__(parent)
-        self.setUtf8(True)
-        
-        self.vm = vm
-        self.__mainWindow = parent
-        self.__lastSearch = ()
-        
-        self.linesepRegExp = r"\r\n|\n|\r"
-        
-        self.setWindowTitle(self.trUtf8('Terminal'))
-        
-        self.setWhatsThis(self.trUtf8(
-            """<b>The Terminal Window</b>"""
-            """<p>This is a very simple terminal like window, that runs a shell"""
-            """ process in the background.</p>"""
-            """<p>The process can be stopped and started via the context menu. Some"""
-            """ Ctrl command may be sent as well. However, the shell may ignore"""
-            """ them.</p>"""
-            """<p>You can use the cursor keys while entering commands. There is also a"""
-            """ history of commands that can be recalled using the up and down cursor"""
-            """ keys. Pressing the up or down key after some text has been entered will"""
-            """ start an incremental search.</p>"""
-        ))
-        
-        self.ansi_re = re.compile("\033\[\??[\d;]*\w")
-        
-        # Initialise instance variables.
-        self.prline = 0
-        self.prcol = 0
-        self.inDragDrop = False
-        self.lexer_ = None
-        
-        # Initialize history
-        self.maxHistoryEntries = Preferences.getTerminal("MaxHistoryEntries")
-        self.history = []
-        self.histidx = -1
-        
-        # clear QScintilla defined keyboard commands
-        # we do our own handling through the view manager
-        self.clearAlternateKeys()
-        self.clearKeys()
-        self.__actionsAdded = False
-        
-        # 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)
-        
-        # Create a little context menu to send Ctrl-C, Ctrl-D or Ctrl-Z
-        self.csm = QSignalMapper(self)
-        self.csm.mapped[int].connect(self.__sendCtrl)
-        
-        self.cmenu = QMenu(self.trUtf8('Ctrl Commands'))
-        act = self.cmenu.addAction(self.trUtf8('Ctrl-C'))
-        self.csm.setMapping(act, 3)
-        act.triggered[()].connect(self.csm.map)
-        act = self.cmenu.addAction(self.trUtf8('Ctrl-D'))
-        self.csm.setMapping(act, 4)
-        act.triggered[()].connect(self.csm.map)
-        act = self.cmenu.addAction(self.trUtf8('Ctrl-Z'))
-        self.csm.setMapping(act, 26)
-        act.triggered[()].connect(self.csm.map)
-        
-        # 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.addSeparator()
-        self.menu.addAction(self.trUtf8('Find'), self.__find)
-        self.menu.addSeparator()
-        self.menu.addMenu(self.hmenu)
-        self.menu.addSeparator()
-        self.menu.addAction(self.trUtf8('Clear'), self.clear)
-        self.__startAct = self.menu.addAction(self.trUtf8("Start"), self.__startShell)
-        self.__stopAct = self.menu.addAction(self.trUtf8("Stop"), self.__stopShell)
-        self.__resetAct = self.menu.addAction(self.trUtf8('Reset'), self.__reset)
-        self.menu.addSeparator()
-        self.__ctrlAct = self.menu.addMenu(self.cmenu)
-        self.menu.addSeparator()
-        self.menu.addAction(self.trUtf8("Configure..."), self.__configure)
-        
-        self.__bindLexer()
-        self.__setTextDisplay()
-        self.__setMargin0()
-        
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
-        
-        self.incrementalSearchString = ""
-        self.incrementalSearchActive = False
-        
-        self.supportedEditorCommands = {
-            QsciScintilla.SCI_LINEDELETE: self.__clearCurrentLine,
-            QsciScintilla.SCI_NEWLINE: self.__QScintillaNewline,
-            
-            QsciScintilla.SCI_DELETEBACK: self.__QScintillaDeleteBack,
-            QsciScintilla.SCI_CLEAR: self.__QScintillaDelete,
-            QsciScintilla.SCI_DELWORDLEFT: self.__QScintillaDeleteWordLeft,
-            QsciScintilla.SCI_DELWORDRIGHT: self.__QScintillaDeleteWordRight,
-            QsciScintilla.SCI_DELLINELEFT: self.__QScintillaDeleteLineLeft,
-            QsciScintilla.SCI_DELLINERIGHT: self.__QScintillaDeleteLineRight,
-            
-            QsciScintilla.SCI_CHARLEFT: self.__QScintillaCharLeft,
-            QsciScintilla.SCI_CHARRIGHT: self.__QScintillaCharRight,
-            QsciScintilla.SCI_WORDLEFT: self.__QScintillaWordLeft,
-            QsciScintilla.SCI_WORDRIGHT: self.__QScintillaWordRight,
-            QsciScintilla.SCI_VCHOME: self.__QScintillaVCHome,
-            QsciScintilla.SCI_LINEEND: self.__QScintillaLineEnd,
-            QsciScintilla.SCI_LINEUP: self.__QScintillaLineUp,
-            QsciScintilla.SCI_LINEDOWN: self.__QScintillaLineDown,
-            
-            QsciScintilla.SCI_CHARLEFTEXTEND: self.__QScintillaCharLeftExtend,
-            QsciScintilla.SCI_CHARRIGHTEXTEND: self.extendSelectionRight,
-            QsciScintilla.SCI_WORDLEFTEXTEND: self.__QScintillaWordLeftExtend,
-            QsciScintilla.SCI_WORDRIGHTEXTEND: self.extendSelectionWordRight,
-            QsciScintilla.SCI_VCHOMEEXTEND: self.__QScintillaVCHomeExtend,
-            QsciScintilla.SCI_LINEENDEXTEND: self.extendSelectionToEOL,
-        }
-        
-        self.__ioEncoding = Preferences.getSystem("IOEncoding")
-        
-        self.__process = QProcess()
-        self.__process.setProcessChannelMode(QProcess.MergedChannels)
-        self.__process.setReadChannel(QProcess.StandardOutput)
-        
-        self.__process.readyReadStandardOutput.connect(self.__readOutput)
-        self.__process.started.connect(self.__started)
-        self.__process.finished.connect(self.__finished)
-        
-        self.__ctrl = {}
-        for ascii_number, letter in enumerate("abcdefghijklmnopqrstuvwxyz"):
-            self.__ctrl[letter] = chr(ascii_number + 1)
-        
-        self.__lastPos = (0, 0)
-        
-        self.grabGesture(Qt.PinchGesture)
-        
-        self.__startShell()
-        
-    def __readOutput(self):
-        """
-        Private method to process the output of the shell.
-        """
-        output = str(self.__process.readAllStandardOutput(),
-                         self.__ioEncoding, 'replace')
-        self.__write(self.ansi_re.sub("", output))
-        self.__lastPos = self.__getEndPos()
-        
-    def __started(self):
-        """
-        Private method called, when the shell process has started.
-        """
-        if not Utilities.isWindowsPlatform():
-            QTimer.singleShot(250, self.clear)
-        
-        self.__startAct.setEnabled(False)
-        self.__stopAct.setEnabled(True)
-        self.__resetAct.setEnabled(True)
-        self.__ctrlAct.setEnabled(True)
-        
-    def __finished(self):
-        """
-        Private method called, when the shell process has finished.
-        """
-        super().clear()
-        
-        self.__startAct.setEnabled(True)
-        self.__stopAct.setEnabled(False)
-        self.__resetAct.setEnabled(False)
-        self.__ctrlAct.setEnabled(False)
-        
-    def __send(self, data):
-        """
-        Private method to send data to the shell process.
-        
-        @param data data to be sent to the shell process (string)
-        """
-        pdata = QByteArray()
-        pdata.append(bytes(data, encoding="utf-8"))
-        self.__process.write(pdata)
-        
-    def __sendCtrl(self, cmd):
-        """
-        Private slot to send a control command to the shell process.
-        
-        @param the control command to be sent (integer)
-        """
-        self.__send(chr(cmd))
-        
-    def closeTerminal(self):
-        """
-        Public method to shutdown the terminal.
-        """
-        self.__stopShell()
-        self.saveHistory()
-        
-    def __bindLexer(self):
-        """
-        Private slot to set the lexer.
-        """
-        if Utilities.isWindowsPlatform():
-            self.language = "Batch"
-        else:
-            self.language = "Bash"
-        if Preferences.getTerminal("SyntaxHighlightingEnabled"):
-            from . import Lexers
-            self.lexer_ = Lexers.getLexer(self.language, self)
-        else:
-            self.lexer_ = None
-        
-        if self.lexer_ is None:
-            self.setLexer(None)
-            font = Preferences.getTerminal("MonospacedFont")
-            self.monospacedStyles(font)
-            return
-        
-        # get the font for style 0 and set it as the default font
-        key = 'Scintilla/{0}/style0/font'.format(self.lexer_.language())
-        fdesc = Preferences.Prefs.settings.value(key)
-        if fdesc is not None:
-            font = QFont(fdesc[0], int(fdesc[1]))
-            self.lexer_.setDefaultFont(font)
-        self.setLexer(self.lexer_)
-        self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
-        
-        self.lexer_.setDefaultColor(self.lexer_.color(0))
-        self.lexer_.setDefaultPaper(self.lexer_.paper(0))
-        
-    def __setMargin0(self):
-        """
-        Private method to configure margin 0.
-        """
-        # set the settings for all margins
-        self.setMarginsFont(Preferences.getTerminal("MarginsFont"))
-        self.setMarginsForegroundColor(Preferences.getEditorColour("MarginsForeground"))
-        self.setMarginsBackgroundColor(Preferences.getEditorColour("MarginsBackground"))
-        
-        # set margin 0 settings
-        linenoMargin = Preferences.getTerminal("LinenoMargin")
-        self.setMarginLineNumbers(0, linenoMargin)
-        if linenoMargin:
-            self.setMarginWidth(0, ' ' + '8' * Preferences.getTerminal("LinenoWidth"))
-        else:
-            self.setMarginWidth(0, 0)
-        
-        # disable margins 1 and 2
-        self.setMarginWidth(1, 0)
-        self.setMarginWidth(2, 0)
-        
-    def __setTextDisplay(self):
-        """
-        Private method to configure the text display.
-        """
-        self.setTabWidth(Preferences.getEditor("TabWidth"))
-        if Preferences.getEditor("ShowWhitespace"):
-            self.setWhitespaceVisibility(QsciScintilla.WsVisible)
-            try:
-                self.setWhitespaceForegroundColor(
-                    Preferences.getEditorColour("WhitespaceForeground"))
-                self.setWhitespaceBackgroundColor(
-                    Preferences.getEditorColour("WhitespaceBackground"))
-                self.setWhitespaceSize(
-                    Preferences.getEditor("WhitespaceSize"))
-            except AttributeError:
-                # QScintilla before 2.5 doesn't support this
-                pass
-        else:
-            self.setWhitespaceVisibility(QsciScintilla.WsInvisible)
-        self.setEolVisibility(Preferences.getEditor("ShowEOL"))
-        if Preferences.getEditor("BraceHighlighting"):
-            self.setBraceMatching(QsciScintilla.SloppyBraceMatch)
-        else:
-            self.setBraceMatching(QsciScintilla.NoBraceMatch)
-        self.setMatchedBraceForegroundColor(
-            Preferences.getEditorColour("MatchingBrace"))
-        self.setMatchedBraceBackgroundColor(
-            Preferences.getEditorColour("MatchingBraceBack"))
-        self.setUnmatchedBraceForegroundColor(
-            Preferences.getEditorColour("NonmatchingBrace"))
-        self.setUnmatchedBraceBackgroundColor(
-            Preferences.getEditorColour("NonmatchingBraceBack"))
-        if Preferences.getEditor("CustomSelectionColours"):
-            self.setSelectionBackgroundColor(
-                Preferences.getEditorColour("SelectionBackground"))
-        else:
-            self.setSelectionBackgroundColor(
-                QApplication.palette().color(QPalette.Highlight))
-        if Preferences.getEditor("ColourizeSelText"):
-            self.resetSelectionForegroundColor()
-        elif Preferences.getEditor("CustomSelectionColours"):
-            self.setSelectionForegroundColor(
-                Preferences.getEditorColour("SelectionForeground"))
-        else:
-            self.setSelectionForegroundColor(
-                QApplication.palette().color(QPalette.HighlightedText))
-        self.setSelectionToEol(Preferences.getEditor("ExtendSelectionToEol"))
-        self.setCaretForegroundColor(
-            Preferences.getEditorColour("CaretForeground"))
-        self.setCaretLineBackgroundColor(
-            Preferences.getEditorColour("CaretLineBackground"))
-        self.setCaretLineVisible(Preferences.getEditor("CaretLineVisible"))
-        self.caretWidth = Preferences.getEditor("CaretWidth")
-        self.setCaretWidth(self.caretWidth)
-        self.setWrapMode(QsciScintilla.WrapNone)
-        self.useMonospaced = Preferences.getTerminal("UseMonospacedFont")
-        self.__setMonospaced(self.useMonospaced)
-        
-        self.setCursorFlashTime(QApplication.cursorFlashTime())
-        
-        if Preferences.getEditor("OverrideEditAreaColours"):
-            self.setColor(Preferences.getEditorColour("EditAreaForeground"))
-            self.setPaper(Preferences.getEditorColour("EditAreaBackground"))
-        
-    def __setMonospaced(self, on):
-        """
-        Private method to set/reset a monospaced font.
-        
-        @param on flag to indicate usage of a monospace font (boolean)
-        """
-        if on:
-            f = Preferences.getTerminal("MonospacedFont")
-            self.monospacedStyles(f)
-        else:
-            if not self.lexer_:
-                self.clearStyles()
-                self.__setMargin0()
-            self.setFont(Preferences.getTerminal("MonospacedFont"))
-        
-        self.useMonospaced = on
-        
-    def loadHistory(self):
-        """
-        Public method to load the history.
-        """
-        hl = Preferences.Prefs.settings.value("Terminal/History")
-        if hl is not None:
-            self.history = hl[-self.maxHistoryEntries:]
-        else:
-            self.history = []
-        
-    def reloadHistory(self):
-        """
-        Public method to reload the history.
-        """
-        self.loadHistory(self.clientType)
-        self.history = self.historyLists[self.clientType]
-        self.histidx = -1
-        
-    def saveHistory(self):
-        """
-        Public method to save the history.
-        """
-        Preferences.Prefs.settings.setValue("Terminal/History", self.history)
-        
-    def getHistory(self):
-        """
-        Public method to get the history.
-        
-        @return reference to the history list (list of strings)
-        """
-        return self.history
-        
-    def __clearHistory(self):
-        """
-        Private slot to clear the current history.
-        """
-        self.history = []
-        
-    def __selectHistory(self):
-        """
-        Private slot to select a history entry to execute.
-        """
-        cmd, ok = QInputDialog.getItem(
-            self,
-            self.trUtf8("Select History"),
-            self.trUtf8("Select the history entry to execute (most recent shown last)."),
-            self.history,
-            0, False)
-        if ok:
-            self.__insertHistory(cmd)
-        
-    def __showHistory(self):
-        """
-        Private slot to show the shell history dialog.
-        """
-        from .ShellHistoryDialog import ShellHistoryDialog
-        dlg = ShellHistoryDialog(self.history, self.vm, self)
-        if dlg.exec_() == QDialog.Accepted:
-            self.history = dlg.getHistory()
-            self.histidx = -1
-        
-    def __getEndPos(self):
-        """
-        Private method to return the line and column of the last character.
-        
-        @return tuple of two values (int, int) giving the line and column
-        """
-        line = self.lines() - 1
-        return (line, len(self.text(line)))
-        
-    def __write(self, s):
-        """
-        Private method to display some text.
-        
-        @param s text to be displayed (string)
-        """
-        line, col = self.__getEndPos()
-        self.setCursorPosition(line, col)
-        self.insert(s)
-        self.prline, self.prcol = self.getCursorPosition()
-        self.ensureCursorVisible()
-        self.ensureLineVisible(self.prline)
-        
-    def __clearCurrentLine(self):
-        """
-        Private method to clear the line containing the cursor.
-        """
-        line, col = self.getCursorPosition()
-        if self.text(line).startswith(sys.ps1):
-            col = len(sys.ps1)
-        elif self.text(line).startswith(sys.ps2):
-            col = len(sys.ps2)
-        else:
-            col = 0
-        self.setCursorPosition(line, col)
-        self.deleteLineRight()
-        
-    def __insertText(self, s):
-        """
-        Private method to insert some text at the current cursor position.
-        
-        @param s text to be inserted (string)
-        """
-        line, col = self.getCursorPosition()
-        self.insertAt(s, line, col)
-        self.setCursorPosition(line, col + len(s))
-        
-    def __insertTextAtEnd(self, s):
-        """
-        Private method to insert some text at the end of the command line.
-        
-        @param s text to be inserted (string)
-        """
-        line, col = self.__getEndPos()
-        self.setCursorPosition(line, col)
-        self.insert(s)
-        self.prline, self.prcol = self.getCursorPosition()
-        
-    def mousePressEvent(self, event):
-        """
-        Protected method to handle the mouse press event.
-        
-        @param event the mouse press event (QMouseEvent)
-        """
-        self.setFocus()
-        super().mousePressEvent(event)
-        
-    def wheelEvent(self, evt):
-        """
-        Protected method to handle wheel events.
-        
-        @param evt reference to the wheel event (QWheelEvent)
-        """
-        if evt.modifiers() & Qt.ControlModifier:
-            if evt.delta() < 0:
-                self.zoomOut()
-            else:
-                self.zoomIn()
-            evt.accept()
-            return
-        
-        super().wheelEvent(evt)
-    
-    
-    def event(self, evt):
-        """
-        Protected method handling events.
-        
-        @param evt reference to the event (QEvent)
-        @return flag indicating, if the event was handled (boolean)
-        """
-        if evt.type() == QEvent.Gesture:
-            self.gestureEvent(evt)
-            return True
-        
-        return super().event(evt)
-    
-    def gestureEvent(self, evt):
-        """
-        Protected method handling gesture events.
-        
-        @param evt reference to the gesture event (QGestureEvent
-        """
-        pinch = evt.gesture(Qt.PinchGesture)
-        if pinch:
-            if pinch.state() == Qt.GestureStarted:
-                zoom = (self.getZoom() + 10) / 10.0
-                pinch.setScaleFactor(zoom)
-            else:
-                zoom = int(pinch.scaleFactor() * 10) - 10
-                if zoom <= -9:
-                    zoom = -9
-                    pinch.setScaleFactor(0.1)
-                elif zoom >= 20:
-                    zoom = 20
-                    pinch.setScaleFactor(3.0)
-                self.zoomTo(zoom)
-            evt.accept()
-
-    def editorCommand(self, cmd):
-        """
-        Public method to perform an editor command.
-        
-        @param cmd the scintilla command to be performed
-        """
-        try:
-            self.supportedEditorCommands[cmd]()
-        except TypeError:
-            self.supportedEditorCommands[cmd](cmd)
-        except KeyError:
-            pass
-        
-    def __isCursorOnLastLine(self):
-        """
-        Private method to check, if the cursor is on the last line.
-        """
-        cline, ccol = self.getCursorPosition()
-        return cline == self.lines() - 1
-        
-    def keyPressEvent(self, ev):
-        """
-        Re-implemented to handle the user input a key at a time.
-        
-        @param ev key event (QKeyEvent)
-        """
-        txt = ev.text()
-        
-        # See it is text to insert.
-        if len(txt) and txt >= " ":
-            if not self.__isCursorOnLastLine():
-                line, col = self.__getEndPos()
-                self.setCursorPosition(line, col)
-                self.prline, self.prcol = self.getCursorPosition()
-            super().keyPressEvent(ev)
-            self.incrementalSearchActive = True
-        else:
-            ev.ignore()
-        
-    def __QScintillaLeftDeleteCommand(self, method):
-        """
-        Private method to handle a QScintilla delete command working to the left.
-        
-        @param method shell method to execute
-        """
-        if self.__isCursorOnLastLine():
-            line, col = self.getCursorPosition()
-            if col > self.__lastPos[1]:
-                method()
-        
-    def __QScintillaDeleteBack(self):
-        """
-        Private method to handle the Backspace key.
-        """
-        self.__QScintillaLeftDeleteCommand(self.deleteBack)
-        
-    def __QScintillaDeleteWordLeft(self):
-        """
-        Private method to handle the Delete Word Left command.
-        """
-        self.__QScintillaLeftDeleteCommand(self.deleteWordLeft)
-        
-    def __QScintillaDelete(self):
-        """
-        Private method to handle the delete command.
-        """
-        if self.__isCursorOnLastLine():
-            if self.hasSelectedText():
-                lineFrom, indexFrom, lineTo, indexTo = self.getSelection()
-                if indexFrom >= self.__lastPos[1]:
-                    self.delete()
-                self.setSelection(lineTo, indexTo, lineTo, indexTo)
-            else:
-                self.delete()
-        
-    def __QScintillaDeleteLineLeft(self):
-        """
-        Private method to handle the Delete Line Left command.
-        """
-        if self.__isCursorOnLastLine():
-            if self.isListActive():
-                self.cancelList()
-            
-            line, col = self.getCursorPosition()
-            prompt = self.text(line)[:self.__lastPos[1]]
-            self.deleteLineLeft()
-            self.insertAt(prompt, line, 0)
-            self.setCursorPosition(line, len(prompt))
-        
-    def __QScintillaNewline(self, cmd):
-        """
-        Private method to handle the Return key.
-        
-        @param cmd QScintilla command
-        """
-        if self.__isCursorOnLastLine():
-            self.incrementalSearchString = ""
-            self.incrementalSearchActive = False
-            line, col = self.__getEndPos()
-            self.setCursorPosition(line, col)
-            self.setSelection(*(self.__lastPos + self.getCursorPosition()))
-            buf = self.selectedText()
-            self.setCursorPosition(line, col)   # select nothin
-            self.insert('\n')
-            self.__executeCommand(buf)
-        
-    def __QScintillaLeftCommand(self, method, allLinesAllowed=False):
-        """
-        Private method to handle a QScintilla command working to the left.
-        
-        @param method shell method to execute
-        """
-        if self.__isCursorOnLastLine() or allLinesAllowed:
-            line, col = self.getCursorPosition()
-            if col > self.__lastPos[1]:
-                method()
-        
-    def __QScintillaCharLeft(self):
-        """
-        Private method to handle the Cursor Left command.
-        """
-        self.__QScintillaLeftCommand(self.moveCursorLeft)
-        
-    def __QScintillaWordLeft(self):
-        """
-        Private method to handle the Cursor Word Left command.
-        """
-        self.__QScintillaLeftCommand(self.moveCursorWordLeft)
-        
-    def __QScintillaRightCommand(self, method):
-        """
-        Private method to handle a QScintilla command working to the right.
-        
-        @param method shell method to execute
-        """
-        if self.__isCursorOnLastLine():
-            method()
-        
-    def __QScintillaCharRight(self):
-        """
-        Private method to handle the Cursor Right command.
-        """
-        self.__QScintillaRightCommand(self.moveCursorRight)
-        
-    def __QScintillaWordRight(self):
-        """
-        Private method to handle the Cursor Word Right command.
-        """
-        self.__QScintillaRightCommand(self.moveCursorWordRight)
-        
-    def __QScintillaDeleteWordRight(self):
-        """
-        Private method to handle the Delete Word Right command.
-        """
-        self.__QScintillaRightCommand(self.deleteWordRight)
-        
-    def __QScintillaDeleteLineRight(self):
-        """
-        Private method to handle the Delete Line Right command.
-        """
-        self.__QScintillaRightCommand(self.deleteLineRight)
-        
-    def __QScintillaVCHome(self, cmd):
-        """
-        Private method to handle the Home key.
-        
-        @param cmd QScintilla command
-        """
-        self.setCursorPosition(*self.__lastPos)
-        
-    def __QScintillaLineEnd(self, cmd):
-        """
-        Private method to handle the End key.
-        
-        @param cmd QScintilla command
-        """
-        self.moveCursorToEOL()
-        
-    def __QScintillaLineUp(self, cmd):
-        """
-        Private method to handle the Up key.
-        
-        @param cmd QScintilla command
-        """
-        line, col = self.__getEndPos()
-        buf = self.text(line)[self.__lastPos[1]:]
-        if buf and self.incrementalSearchActive:
-            if self.incrementalSearchString:
-                idx = self.__rsearchHistory(self.incrementalSearchString,
-                                            self.histidx)
-                if idx >= 0:
-                    self.histidx = idx
-                    self.__useHistory()
-            else:
-                idx = self.__rsearchHistory(buf)
-                if idx >= 0:
-                    self.histidx = idx
-                    self.incrementalSearchString = buf
-                    self.__useHistory()
-        else:
-            if self.histidx < 0:
-                self.histidx = len(self.history)
-            if self.histidx > 0:
-                self.histidx = self.histidx - 1
-                self.__useHistory()
-        
-    def __QScintillaLineDown(self, cmd):
-        """
-        Private method to handle the Down key.
-        
-        @param cmd QScintilla command
-        """
-        line, col = self.__getEndPos()
-        buf = self.text(line)[self.__lastPos[1]:]
-        if buf and self.incrementalSearchActive:
-            if self.incrementalSearchString:
-                idx = self.__searchHistory(self.incrementalSearchString, self.histidx)
-                if idx >= 0:
-                    self.histidx = idx
-                    self.__useHistory()
-            else:
-                idx = self.__searchHistory(buf)
-                if idx >= 0:
-                    self.histidx = idx
-                    self.incrementalSearchString = buf
-                    self.__useHistory()
-        else:
-            if self.histidx >= 0 and self.histidx < len(self.history):
-                self.histidx += 1
-                self.__useHistory()
-        
-    def __QScintillaCharLeftExtend(self):
-        """
-        Private method to handle the Extend Selection Left command.
-        """
-        self.__QScintillaLeftCommand(self.extendSelectionLeft, True)
-        
-    def __QScintillaWordLeftExtend(self):
-        """
-        Private method to handle the Extend Selection Left one word command.
-        """
-        self.__QScintillaLeftCommand(self.extendSelectionWordLeft, True)
-        
-    def __QScintillaVCHomeExtend(self):
-        """
-        Private method to handle the Extend Selection to start of line command.
-        """
-        col = self.__lastPos[1]
-        self.extendSelectionToBOL()
-        while col > 0:
-            self.extendSelectionRight()
-            col -= 1
-        
-    def __executeCommand(self, cmd):
-        """
-        Private slot to execute a command.
-        
-        @param cmd command to be executed by debug client (string)
-        """
-        if not cmd:
-            cmd = ''
-        if len(self.history) == 0 or self.history[-1] != cmd:
-            if len(self.history) == self.maxHistoryEntries:
-                del self.history[0]
-            self.history.append(cmd)
-        self.histidx = -1
-        
-        if cmd.lower() in ["clear", "cls"]:
-            self.clear()
-            return
-        else:
-            if not cmd.endswith("\n"):
-                cmd = "{0}\n".format(cmd)
-            self.__send(cmd)
-        
-    def __useHistory(self):
-        """
-        Private method to display a command from the history.
-        """
-        if self.histidx < len(self.history):
-            cmd = self.history[self.histidx]
-        else:
-            cmd = ""
-            self.incrementalSearchString = ""
-            self.incrementalSearchActive = False
-        
-        self.__insertHistory(cmd)
-
-    def __insertHistory(self, cmd):
-        """
-        Private method to insert a command selected from the history.
-        
-        @param cmd history entry to be inserted (string)
-        """
-        self.setCursorPosition(self.prline, self.prcol)
-        self.setSelection(self.prline, self.prcol,\
-                          self.prline, self.lineLength(self.prline))
-        self.removeSelectedText()
-        self.__insertText(cmd)
-        
-    def __searchHistory(self, txt, startIdx=-1):
-        """
-        Private method used to search the history.
-        
-        @param txt text to match at the beginning (string)
-        @param startIdx index to start search from (integer)
-        @return index of found entry (integer)
-        """
-        if startIdx == -1:
-            idx = 0
-        else:
-            idx = startIdx + 1
-        while idx < len(self.history) and \
-              not self.history[idx].startswith(txt):
-            idx += 1
-        return idx
-        
-    def __rsearchHistory(self, txt, startIdx=-1):
-        """
-        Private method used to reverse search the history.
-        
-        @param txt text to match at the beginning (string)
-        @param startIdx index to start search from (integer)
-        @return index of found entry (integer)
-        """
-        if startIdx == -1:
-            idx = len(self.history) - 1
-        else:
-            idx = startIdx - 1
-        while idx >= 0 and \
-              not self.history[idx].startswith(txt):
-            idx -= 1
-        return idx
-        
-    def contextMenuEvent(self, ev):
-        """
-        Reimplemented to show our own context menu.
-        
-        @param ev context menu event (QContextMenuEvent)
-        """
-        self.menu.popup(ev.globalPos())
-        ev.accept()
-        
-    def clear(self):
-        """
-        Public slot to clear the display.
-        """
-        super().clear()
-        self.__send("\n")
-        
-    def __reset(self):
-        """
-        Private slot to handle the 'reset' context menu entry.
-        """
-        self.__stopShell()
-        self.__startShell()
-        
-    def __startShell(self):
-        """
-        Private slot to start the shell process.
-        """
-        args = []
-        if Utilities.isWindowsPlatform():
-            args.append("/Q")
-            self.__process.start("cmd.exe", args)
-        else:
-            shell = Preferences.getTerminal("Shell")
-            if not shell:
-                shell = os.environ.get('SHELL')
-                if shell is None:
-                    self.__insertText(self.trUtf8("No shell has been configured."))
-                    return
-            if Preferences.getTerminal("ShellInteractive"):
-                args.append("-i")
-            self.__process.start(shell,  args)
-        
-    def __stopShell(self):
-        """
-        Private slot to stop the shell process.
-        """
-        self.__process.kill()
-        self.__process.waitForFinished(3000)
-        
-    def handlePreferencesChanged(self):
-        """
-        Public slot to handle the preferencesChanged signal.
-        """
-        # rebind the lexer
-        self.__bindLexer()
-        self.recolor()
-        
-        # set margin 0 configuration
-        self.__setTextDisplay()
-        self.__setMargin0()
-        
-        # do the history related stuff
-        self.maxHistoryEntries = Preferences.getTerminal("MaxHistoryEntries")
-        self.history = self.history[-self.maxHistoryEntries:]
-        
-        # do the I/O encoding
-        self.__ioEncoding = Preferences.getSystem("IOEncoding")
-    
-    def focusInEvent(self, event):
-        """
-        Public method called when the shell receives focus.
-        
-        @param event the event object (QFocusEvent)
-        """
-        if not self.__actionsAdded:
-            self.addActions(self.vm.editorActGrp.actions())
-            self.addActions(self.vm.copyActGrp.actions())
-            self.addActions(self.vm.viewActGrp.actions())
-            self.__searchShortcut = QShortcut(self.vm.searchAct.shortcut(), self,
-                self.__find, self.__find)
-            self.__searchNextShortcut = QShortcut(self.vm.searchNextAct.shortcut(), self,
-                self.__searchNext, self.__searchNext)
-            self.__searchPrevShortcut = QShortcut(self.vm.searchPrevAct.shortcut(), self,
-                self.__searchPrev, self.__searchPrev)
-        
-        try:
-            self.vm.editActGrp.setEnabled(False)
-            self.vm.editorActGrp.setEnabled(True)
-            self.vm.copyActGrp.setEnabled(True)
-            self.vm.viewActGrp.setEnabled(True)
-            self.vm.searchActGrp.setEnabled(False)
-        except AttributeError:
-            pass
-        self.__searchShortcut.setEnabled(True)
-        self.__searchNextShortcut.setEnabled(True)
-        self.__searchPrevShortcut.setEnabled(True)
-        self.setCaretWidth(self.caretWidth)
-        self.setCursorFlashTime(QApplication.cursorFlashTime())
-        
-        super().focusInEvent(event)
-        
-    def focusOutEvent(self, event):
-        """
-        Public method called when the shell loses focus.
-        
-        @param event the event object (QFocusEvent)
-        """
-        try:
-            self.vm.editorActGrp.setEnabled(False)
-        except AttributeError:
-            pass
-        self.__searchShortcut.setEnabled(False)
-        self.__searchNextShortcut.setEnabled(False)
-        self.__searchPrevShortcut.setEnabled(False)
-        self.setCaretWidth(0)
-        super().focusOutEvent(event)
-        
-    def insert(self, txt):
-        """
-        Public slot to insert text at the current cursor position.
-        
-        The cursor is advanced to the end of the inserted text.
-        
-        @param txt text to be inserted (string)
-        """
-        l = len(txt)
-        line, col = self.getCursorPosition()
-        self.insertAt(txt, line, col)
-        if re.search(self.linesepRegExp, txt) is not None:
-            line += 1
-        self.setCursorPosition(line, col + l)
-        
-    def __configure(self):
-        """
-        Private method to open the configuration dialog.
-        """
-        e5App().getObject("UserInterface").showPreferences("terminalPage")
-    
-    def __find(self):
-        """
-        Private slot to show the find widget.
-        """
-        txt = self.selectedText()
-        self.__mainWindow.showFind(txt)
-    
-    def __searchNext(self):
-        """
-        Private method to search for the next occurrence.
-        """
-        if self.__lastSearch:
-            self.searchNext(*self.__lastSearch)
-    
-    def searchNext(self, txt, caseSensitive, wholeWord):
-        """
-        Public method to search the next occurrence of the given text.
-        
-        @param txt text to search for (string)
-        @param caseSensitive flag indicating to perform a case sensitive
-            search (boolean)
-        @param wholeWord flag indicating to search for whole words
-            only (boolean)
-        """
-        self.__lastSearch = (txt, caseSensitive, wholeWord)
-        ok = self.findFirst(txt, False, caseSensitive, wholeWord, False, forward=True)
-        self.searchStringFound.emit(ok)
-    
-    def __searchPrev(self):
-        """
-        Private method to search for the next occurrence.
-        """
-        if self.__lastSearch:
-            self.searchPrev(*self.__lastSearch)
-    
-    def searchPrev(self, txt, caseSensitive, wholeWord):
-        """
-        Public method to search the previous occurrence of the given text.
-        
-        @param txt text to search for (string)
-        @param caseSensitive flag indicating to perform a case sensitive
-            search (boolean)
-        @param wholeWord flag indicating to search for whole words
-            only (boolean)
-        """
-        self.__lastSearch = (txt, caseSensitive, wholeWord)
-        if self.hasSelectedText():
-            line, index = self.getSelection()[:2]
-        else:
-            line, index = -1, -1
-        ok = self.findFirst(txt, False, caseSensitive, wholeWord, False, forward=False,
-                            line=line, index=index)
-        self.searchStringFound.emit(ok)