Merge with default branch. Py2 comp.

Fri, 13 Dec 2013 23:39:14 +0100

author
T.Rzepka <Tobias.Rzepka@gmail.com>
date
Fri, 13 Dec 2013 23:39:14 +0100
branch
Py2 comp.
changeset 3142
55030c09e142
parent 3141
72f3bde98c58 (current diff)
parent 3136
0ede9c1c7284 (diff)
child 3143
b6ee3ac90a6f

Merge with default branch.

APIs/Python3/eric5.api file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
E5XML/PluginRepositoryReader.py file | annotate | diff | comparison | revisions
MultiProject/AddProjectDialog.py file | annotate | diff | comparison | revisions
PluginManager/PluginManager.py file | annotate | diff | comparison | revisions
PluginManager/PluginRepositoryDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py file | annotate | diff | comparison | revisions
Plugins/PluginWizardQFileDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/subversion.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/subversion.py file | annotate | diff | comparison | revisions
Plugins/ViewManagerPlugins/Listspace/Listspace.py file | annotate | diff | comparison | revisions
Plugins/ViewManagerPlugins/Tabview/Tabview.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py file | annotate | diff | comparison | revisions
Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorAPIsPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorHighlightingStylesPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/PluginManagerPage.py file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
Project/CreateDialogCodeDialog.py file | annotate | diff | comparison | revisions
Project/Project.py file | annotate | diff | comparison | revisions
QScintilla/APIsManager.py file | annotate | diff | comparison | revisions
QScintilla/Editor.py file | annotate | diff | comparison | revisions
QScintilla/Lexers/__init__.py file | annotate | diff | comparison | revisions
QScintilla/MiniEditor.py file | annotate | diff | comparison | revisions
QScintilla/Shell.py file | annotate | diff | comparison | revisions
Snapshot/SnapWidget.py file | annotate | diff | comparison | revisions
UI/ErrorLogDialog.py file | annotate | diff | comparison | revisions
UI/UserInterface.py file | annotate | diff | comparison | revisions
ViewManager/ViewManager.py file | annotate | diff | comparison | revisions
eric5.py file | annotate | diff | comparison | revisions
i18n/eric5_cs.ts file | annotate | diff | comparison | revisions
i18n/eric5_de.qm file | annotate | diff | comparison | revisions
i18n/eric5_de.ts file | annotate | diff | comparison | revisions
i18n/eric5_en.ts file | annotate | diff | comparison | revisions
i18n/eric5_es.ts file | annotate | diff | comparison | revisions
i18n/eric5_fr.ts file | annotate | diff | comparison | revisions
i18n/eric5_it.ts file | annotate | diff | comparison | revisions
i18n/eric5_ru.ts file | annotate | diff | comparison | revisions
i18n/eric5_tr.ts file | annotate | diff | comparison | revisions
i18n/eric5_zh_CN.GB2312.ts file | annotate | diff | comparison | revisions
--- a/.hgtags	Fri Dec 13 22:45:47 2013 +0100
+++ b/.hgtags	Fri Dec 13 23:39:14 2013 +0100
@@ -19,3 +19,4 @@
 0ad47d8b7e57551ede6be336de57b6be32399a2d snapshot-20120624
 b7cf4e2a30126b8e9eb90bd3c1b1daf1af06cb89 snapshot-20121101
 ac0b798529d81a128a7c00def4e2c7fc39a7fb7f snapshot-20130106
+13069ce079f2bdf8c12506442017e9e454bb3254 release-5.4.0-RC1
--- a/APIs/Python3/eric5.api	Fri Dec 13 22:45:47 2013 +0100
+++ b/APIs/Python3/eric5.api	Fri Dec 13 23:39:14 2013 +0100
@@ -1707,7 +1707,7 @@
 eric5.E5XML.MultiProjectWriter.MultiProjectWriter?1(device, multiProject, multiProjectName)
 eric5.E5XML.PluginRepositoryReader.PluginRepositoryReader.readXML?4()
 eric5.E5XML.PluginRepositoryReader.PluginRepositoryReader.supportedVersions?7
-eric5.E5XML.PluginRepositoryReader.PluginRepositoryReader?1(device, dlg)
+eric5.E5XML.PluginRepositoryReader.PluginRepositoryReader?1(device, entryCallback)
 eric5.E5XML.ProjectReader.ProjectReader.readXML?4()
 eric5.E5XML.ProjectReader.ProjectReader.supportedVersions?7
 eric5.E5XML.ProjectReader.ProjectReader?1(device, project)
@@ -3675,6 +3675,8 @@
 eric5.PluginManager.PluginManager.PluginManager.activatePlugin?4(name, onDemand=False)
 eric5.PluginManager.PluginManager.PluginManager.activatePlugins?4()
 eric5.PluginManager.PluginManager.PluginManager.allPlugginsActivated?7
+eric5.PluginManager.PluginManager.PluginManager.checkPluginEntry?4(name, short, description, url, author, version, filename, status)
+eric5.PluginManager.PluginManager.PluginManager.checkPluginUpdatesAvailable?4()
 eric5.PluginManager.PluginManager.PluginManager.deactivatePlugin?4(name, onDemand=False)
 eric5.PluginManager.PluginManager.PluginManager.deactivateVcsPlugins?4()
 eric5.PluginManager.PluginManager.PluginManager.doShutdown?4()
@@ -3778,6 +3780,7 @@
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleStatisticsDialog.CodeStyleStatisticsDialog?1(statistics, parent=None)
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.Codes?7
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.Messages?7
+eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.MessagesSampleArgs?7
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.getMessage?4(code, *args)
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.run?4()
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.unpackArgs?4()
@@ -3789,6 +3792,7 @@
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.ssource?4()
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.start?4()
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext?1(source, startLine, contextType)
+eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.PyCF_ONLY_AST?7
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.NamingStyleChecker.CamelcaseRegexp?7
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.NamingStyleChecker.Codes?7
 eric5.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.NamingStyleChecker.LowercaseRegex?7
@@ -5121,6 +5125,7 @@
 eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnSetProp?4(name, recursive=False)
 eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnShowChangelists?4(path)
 eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None)
+eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUpgrade?4(path)
 eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.svnUrlDiff?4(name)
 eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAdd?4(name, isDir=False, noDialog=False)
 eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsAddBinary?4(name, isDir=False)
@@ -5360,6 +5365,7 @@
 eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnSetProp?4(name, recursive=False)
 eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnShowChangelists?4(path)
 eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUnlock?4(name, breakIt=False, parent=None)
+eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUpgrade?4(path)
 eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.svnUrlDiff?4(name)
 eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAdd?4(name, isDir=False, noDialog=False)
 eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsAddBinary?4(name, isDir=False)
@@ -5423,6 +5429,7 @@
 eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.editorSaved?7
 eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.editorTextChanged?7
 eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.eventFilter?4(watched, event)
+eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.getSplitOrientation?4()
 eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.lastEditorClosed?7
 eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.nextSplit?4()
 eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace.prevSplit?4()
@@ -5492,6 +5499,7 @@
 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.editorSaved?7
 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.editorTextChanged?7
 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.eventFilter?4(watched, event)
+eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.getSplitOrientation?4()
 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.getTabWidgetById?4(id_)
 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.insertView?4(win, tabWidget, index, fn=None, noName="")
 eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview.lastEditorClosed?7
@@ -5529,7 +5537,8 @@
 eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog.getCode?4(indLevel, indString)
 eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog.on_bTest_clicked?4()
 eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog.on_buttonBox_clicked?4(button)
-eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog?1(parent=None)
+eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog.on_pyqtComboBox_currentIndexChanged?4(txt)
+eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.FileDialogWizardDialog?1(pyqtVariant, parent=None)
 eric5.Plugins.WizardPlugins.FontDialogWizard.FontDialogWizardDialog.FontDialogWizardDialog.getCode?4(indLevel, indString)
 eric5.Plugins.WizardPlugins.FontDialogWizard.FontDialogWizardDialog.FontDialogWizardDialog.on_bTest_clicked?4()
 eric5.Plugins.WizardPlugins.FontDialogWizard.FontDialogWizardDialog.FontDialogWizardDialog.on_buttonBox_clicked?4(button)
@@ -5756,7 +5765,9 @@
 eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_addInstalledApiFileButton_clicked?4()
 eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_addPluginApiFileButton_clicked?4()
 eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_apiFileButton_clicked?4()
+eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_apiFileEdit_textChanged?4(txt)
 eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_apiLanguageComboBox_activated?4(language)
+eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_apiList_itemSelectionChanged?4()
 eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_deleteApiFileButton_clicked?4()
 eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_prepareApiButton_clicked?4()
 eric5.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.save?4()
@@ -5810,7 +5821,7 @@
 eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_allEolFillButton_clicked?4()
 eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_backgroundButton_clicked?4()
 eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_defaultButton_clicked?4()
-eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_eolfillCheckBox_toggled?4(b)
+eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_eolfillCheckBox_toggled?4(on)
 eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_exportAllButton_clicked?4()
 eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_exportCurrentButton_clicked?4()
 eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_foregroundButton_clicked?4()
@@ -5957,6 +5968,7 @@
 eric5.Preferences.ConfigurationPages.NotificationsPage.NotificationsPage?1()
 eric5.Preferences.ConfigurationPages.NotificationsPage.create?4(dlg)
 eric5.Preferences.ConfigurationPages.PluginManagerPage.PluginManagerPage.on_downloadDirButton_clicked?4()
+eric5.Preferences.ConfigurationPages.PluginManagerPage.PluginManagerPage.on_repositoryUrlEditButton_toggled?4(checked)
 eric5.Preferences.ConfigurationPages.PluginManagerPage.PluginManagerPage.save?4()
 eric5.Preferences.ConfigurationPages.PluginManagerPage.PluginManagerPage?1()
 eric5.Preferences.ConfigurationPages.PluginManagerPage.create?4(dlg)
@@ -6685,6 +6697,7 @@
 eric5.QScintilla.Editor.Editor.clearFlakesWarnings?4()
 eric5.QScintilla.Editor.Editor.clearSearchIndicators?4()
 eric5.QScintilla.Editor.Editor.clearStyleWarnings?4()
+eric5.QScintilla.Editor.Editor.clearStyles?4()
 eric5.QScintilla.Editor.Editor.clearSyntaxError?4()
 eric5.QScintilla.Editor.Editor.clearWarnings?4()
 eric5.QScintilla.Editor.Editor.close?4(alsoDelete=False)
@@ -7420,6 +7433,7 @@
 eric5.Snapshot.SnapWidget.SnapWidget.closeEvent?4(evt)
 eric5.Snapshot.SnapWidget.SnapWidget.eventFilter?4(obj, evt)
 eric5.Snapshot.SnapWidget.SnapWidget.on_copyButton_clicked?4()
+eric5.Snapshot.SnapWidget.SnapWidget.on_copyPreviewButton_clicked?4()
 eric5.Snapshot.SnapWidget.SnapWidget.on_saveButton_clicked?4()
 eric5.Snapshot.SnapWidget.SnapWidget.on_takeButton_clicked?4()
 eric5.Snapshot.SnapWidget.SnapWidget.resizeEvent?4(evt)
@@ -7833,7 +7847,7 @@
 eric5.UI.ErrorLogDialog.ErrorLogDialog.on_deleteButton_clicked?4()
 eric5.UI.ErrorLogDialog.ErrorLogDialog.on_emailButton_clicked?4()
 eric5.UI.ErrorLogDialog.ErrorLogDialog.on_keepButton_clicked?4()
-eric5.UI.ErrorLogDialog.ErrorLogDialog?1(logFile, parent=None)
+eric5.UI.ErrorLogDialog.ErrorLogDialog?1(logFile, showMode, parent=None)
 eric5.UI.FindFileDialog.FindFileDialog.designerFile?7
 eric5.UI.FindFileDialog.FindFileDialog.endRole?7
 eric5.UI.FindFileDialog.FindFileDialog.lineRole?7
@@ -7985,6 +7999,7 @@
 eric5.UI.UserInterface.Redirector.write?4(s)
 eric5.UI.UserInterface.Redirector?1(stderr)
 eric5.UI.UserInterface.UserInterface.BottomSide?7
+eric5.UI.UserInterface.UserInterface.ErrorLogFileName?7
 eric5.UI.UserInterface.UserInterface.LeftSide?7
 eric5.UI.UserInterface.UserInterface.RightSide?7
 eric5.UI.UserInterface.UserInterface.activateCooperationViewer?4()
@@ -7997,6 +8012,7 @@
 eric5.UI.UserInterface.UserInterface.autoConnectIrc?4()
 eric5.UI.UserInterface.UserInterface.checkConfigurationStatus?4()
 eric5.UI.UserInterface.UserInterface.checkForErrorLog?4()
+eric5.UI.UserInterface.UserInterface.checkPluginUpdatesAvailable?4()
 eric5.UI.UserInterface.UserInterface.checkProjectsWorkspace?4()
 eric5.UI.UserInterface.UserInterface.closeEvent?4(event)
 eric5.UI.UserInterface.UserInterface.dragEnterEvent?4(event)
@@ -8034,6 +8050,7 @@
 eric5.UI.UserInterface.UserInterface.showLogTab?4(tabname)
 eric5.UI.UserInterface.UserInterface.showMenu?7
 eric5.UI.UserInterface.UserInterface.showNotification?4(icon, heading, text)
+eric5.UI.UserInterface.UserInterface.showPluginsAvailable?4()
 eric5.UI.UserInterface.UserInterface.showPreferences?4(pageName=None)
 eric5.UI.UserInterface.UserInterface.showReplaceFilesDialog?4(txt="", searchDir="", openFiles=False)
 eric5.UI.UserInterface.UserInterface.unregisterToolbar?4(name)
@@ -8899,6 +8916,7 @@
 eric5.ViewManager.ViewManager.ViewManager.getOpenEditorsCount?4()
 eric5.ViewManager.ViewManager.ViewManager.getOpenFilenames?4()
 eric5.ViewManager.ViewManager.ViewManager.getSRHistory?4(key)
+eric5.ViewManager.ViewManager.ViewManager.getSplitOrientation?4()
 eric5.ViewManager.ViewManager.ViewManager.handleResetUI?4()
 eric5.ViewManager.ViewManager.ViewManager.initActions?4()
 eric5.ViewManager.ViewManager.ViewManager.initBookmarkMenu?4()
--- a/DebugClients/Python3/DebugBase.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/DebugClients/Python3/DebugBase.py	Fri Dec 13 23:39:14 2013 +0100
@@ -661,9 +661,11 @@
         
         if exctype in [SyntaxError, IndentationError]:
             try:
-                message, (filename, linenr, charnr, text) = \
-                    excval[0], excval[1]
-            except ValueError:
+                message = str(excval)
+                filename = excval.filename
+                linenr = excval.lineno
+                charnr = excval.offset
+            except (AttributeError, ValueError):
                 exclist = []
                 realSyntaxError = True
             else:
--- a/DebugClients/Python3/DebugClientBase.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/DebugClients/Python3/DebugClientBase.py	Fri Dec 13 23:39:14 2013 +0100
@@ -364,9 +364,11 @@
         except SyntaxError:
             exctype, excval, exctb = sys.exc_info()
             try:
-                message, (filename, linenr, charnr, text) = \
-                    excval[0], excval[1]
-            except ValueError:
+                message = str(excval)
+                filename = excval.filename
+                linenr = excval.lineno
+                charnr = excval.offset
+            except (AttributeError, ValueError):
                 exclist = []
             else:
                 exclist = [message, [filename, linenr, charnr]]
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Help/source.qhp	Fri Dec 13 23:39:14 2013 +0100
@@ -3511,6 +3511,7 @@
       <keyword name="DocStyleChecker.__parseTopLevel" id="DocStyleChecker.__parseTopLevel" ref="eric5.UtilitiesPython2.DocStyleCheckerPy2.html#DocStyleChecker.__parseTopLevel" />
       <keyword name="DocStyleChecker.__readline" id="DocStyleChecker.__readline" ref="eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html#DocStyleChecker.__readline" />
       <keyword name="DocStyleChecker.__readline" id="DocStyleChecker.__readline" ref="eric5.UtilitiesPython2.DocStyleCheckerPy2.html#DocStyleChecker.__readline" />
+      <keyword name="DocStyleChecker.__reportInvalidSyntax" id="DocStyleChecker.__reportInvalidSyntax" ref="eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html#DocStyleChecker.__reportInvalidSyntax" />
       <keyword name="DocStyleChecker.__resetReadline" id="DocStyleChecker.__resetReadline" ref="eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html#DocStyleChecker.__resetReadline" />
       <keyword name="DocStyleChecker.__resetReadline" id="DocStyleChecker.__resetReadline" ref="eric5.UtilitiesPython2.DocStyleCheckerPy2.html#DocStyleChecker.__resetReadline" />
       <keyword name="DocStyleChecker.__skipIndentedBlock" id="DocStyleChecker.__skipIndentedBlock" ref="eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html#DocStyleChecker.__skipIndentedBlock" />
@@ -4402,6 +4403,7 @@
       <keyword name="Editor.clearFlakesWarnings" id="Editor.clearFlakesWarnings" ref="eric5.QScintilla.Editor.html#Editor.clearFlakesWarnings" />
       <keyword name="Editor.clearSearchIndicators" id="Editor.clearSearchIndicators" ref="eric5.QScintilla.Editor.html#Editor.clearSearchIndicators" />
       <keyword name="Editor.clearStyleWarnings" id="Editor.clearStyleWarnings" ref="eric5.QScintilla.Editor.html#Editor.clearStyleWarnings" />
+      <keyword name="Editor.clearStyles" id="Editor.clearStyles" ref="eric5.QScintilla.Editor.html#Editor.clearStyles" />
       <keyword name="Editor.clearSyntaxError" id="Editor.clearSyntaxError" ref="eric5.QScintilla.Editor.html#Editor.clearSyntaxError" />
       <keyword name="Editor.clearWarnings" id="Editor.clearWarnings" ref="eric5.QScintilla.Editor.html#Editor.clearWarnings" />
       <keyword name="Editor.close" id="Editor.close" ref="eric5.QScintilla.Editor.html#Editor.close" />
@@ -4558,7 +4560,9 @@
       <keyword name="EditorAPIsPage.on_addInstalledApiFileButton_clicked" id="EditorAPIsPage.on_addInstalledApiFileButton_clicked" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.on_addInstalledApiFileButton_clicked" />
       <keyword name="EditorAPIsPage.on_addPluginApiFileButton_clicked" id="EditorAPIsPage.on_addPluginApiFileButton_clicked" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.on_addPluginApiFileButton_clicked" />
       <keyword name="EditorAPIsPage.on_apiFileButton_clicked" id="EditorAPIsPage.on_apiFileButton_clicked" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.on_apiFileButton_clicked" />
+      <keyword name="EditorAPIsPage.on_apiFileEdit_textChanged" id="EditorAPIsPage.on_apiFileEdit_textChanged" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.on_apiFileEdit_textChanged" />
       <keyword name="EditorAPIsPage.on_apiLanguageComboBox_activated" id="EditorAPIsPage.on_apiLanguageComboBox_activated" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.on_apiLanguageComboBox_activated" />
+      <keyword name="EditorAPIsPage.on_apiList_itemSelectionChanged" id="EditorAPIsPage.on_apiList_itemSelectionChanged" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.on_apiList_itemSelectionChanged" />
       <keyword name="EditorAPIsPage.on_deleteApiFileButton_clicked" id="EditorAPIsPage.on_deleteApiFileButton_clicked" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.on_deleteApiFileButton_clicked" />
       <keyword name="EditorAPIsPage.on_prepareApiButton_clicked" id="EditorAPIsPage.on_prepareApiButton_clicked" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.on_prepareApiButton_clicked" />
       <keyword name="EditorAPIsPage.save" id="EditorAPIsPage.save" ref="eric5.Preferences.ConfigurationPages.EditorAPIsPage.html#EditorAPIsPage.save" />
@@ -4631,6 +4635,7 @@
       <keyword name="EditorHighlightingStylesPage.__fontButtonMenuTriggered" id="EditorHighlightingStylesPage.__fontButtonMenuTriggered" ref="eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__fontButtonMenuTriggered" />
       <keyword name="EditorHighlightingStylesPage.__importStyles" id="EditorHighlightingStylesPage.__importStyles" ref="eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__importStyles" />
       <keyword name="EditorHighlightingStylesPage.__setToDefault" id="EditorHighlightingStylesPage.__setToDefault" ref="eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__setToDefault" />
+      <keyword name="EditorHighlightingStylesPage.__styleAllItems" id="EditorHighlightingStylesPage.__styleAllItems" ref="eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__styleAllItems" />
       <keyword name="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" id="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" ref="eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_allDefaultButton_clicked" id="EditorHighlightingStylesPage.on_allDefaultButton_clicked" ref="eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allDefaultButton_clicked" />
       <keyword name="EditorHighlightingStylesPage.on_allEolFillButton_clicked" id="EditorHighlightingStylesPage.on_allEolFillButton_clicked" ref="eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allEolFillButton_clicked" />
@@ -4935,12 +4940,13 @@
       <keyword name="FileDialogWizardDialog (Constructor)" id="FileDialogWizardDialog (Constructor)" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__init__" />
       <keyword name="FileDialogWizardDialog (Module)" id="FileDialogWizardDialog (Module)" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html" />
       <keyword name="FileDialogWizardDialog.__adjustOptions" id="FileDialogWizardDialog.__adjustOptions" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__adjustOptions" />
-      <keyword name="FileDialogWizardDialog.__getCode4" id="FileDialogWizardDialog.__getCode4" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__getCode4" />
       <keyword name="FileDialogWizardDialog.__toggleConfirmCheckBox" id="FileDialogWizardDialog.__toggleConfirmCheckBox" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__toggleConfirmCheckBox" />
       <keyword name="FileDialogWizardDialog.__toggleGroupsAndTest" id="FileDialogWizardDialog.__toggleGroupsAndTest" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__toggleGroupsAndTest" />
+      <keyword name="FileDialogWizardDialog.__toggleInitialFilterAndResult" id="FileDialogWizardDialog.__toggleInitialFilterAndResult" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.__toggleInitialFilterAndResult" />
       <keyword name="FileDialogWizardDialog.getCode" id="FileDialogWizardDialog.getCode" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.getCode" />
       <keyword name="FileDialogWizardDialog.on_bTest_clicked" id="FileDialogWizardDialog.on_bTest_clicked" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.on_bTest_clicked" />
       <keyword name="FileDialogWizardDialog.on_buttonBox_clicked" id="FileDialogWizardDialog.on_buttonBox_clicked" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.on_buttonBox_clicked" />
+      <keyword name="FileDialogWizardDialog.on_pyqtComboBox_currentIndexChanged" id="FileDialogWizardDialog.on_pyqtComboBox_currentIndexChanged" ref="eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html#FileDialogWizardDialog.on_pyqtComboBox_currentIndexChanged" />
       <keyword name="FileReply" id="FileReply" ref="eric5.Helpviewer.Network.FileReply.html#FileReply" />
       <keyword name="FileReply (Constructor)" id="FileReply (Constructor)" ref="eric5.Helpviewer.Network.FileReply.html#FileReply.__init__" />
       <keyword name="FileReply (Module)" id="FileReply (Module)" ref="eric5.Helpviewer.Network.FileReply.html" />
@@ -6874,7 +6880,6 @@
       <keyword name="InputDialogWizardDialog" id="InputDialogWizardDialog" ref="eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html#InputDialogWizardDialog" />
       <keyword name="InputDialogWizardDialog (Constructor)" id="InputDialogWizardDialog (Constructor)" ref="eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html#InputDialogWizardDialog.__init__" />
       <keyword name="InputDialogWizardDialog (Module)" id="InputDialogWizardDialog (Module)" ref="eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html" />
-      <keyword name="InputDialogWizardDialog.__getCode4" id="InputDialogWizardDialog.__getCode4" ref="eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html#InputDialogWizardDialog.__getCode4" />
       <keyword name="InputDialogWizardDialog.getCode" id="InputDialogWizardDialog.getCode" ref="eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html#InputDialogWizardDialog.getCode" />
       <keyword name="InputDialogWizardDialog.on_bTest_clicked" id="InputDialogWizardDialog.on_bTest_clicked" ref="eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html#InputDialogWizardDialog.on_bTest_clicked" />
       <keyword name="InputDialogWizardDialog.on_buttonBox_clicked" id="InputDialogWizardDialog.on_buttonBox_clicked" ref="eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html#InputDialogWizardDialog.on_buttonBox_clicked" />
@@ -7552,6 +7557,7 @@
       <keyword name="Listspace.canTile" id="Listspace.canTile" ref="eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html#Listspace.canTile" />
       <keyword name="Listspace.cascade" id="Listspace.cascade" ref="eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html#Listspace.cascade" />
       <keyword name="Listspace.eventFilter" id="Listspace.eventFilter" ref="eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html#Listspace.eventFilter" />
+      <keyword name="Listspace.getSplitOrientation" id="Listspace.getSplitOrientation" ref="eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html#Listspace.getSplitOrientation" />
       <keyword name="Listspace.nextSplit" id="Listspace.nextSplit" ref="eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html#Listspace.nextSplit" />
       <keyword name="Listspace.prevSplit" id="Listspace.prevSplit" ref="eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html#Listspace.prevSplit" />
       <keyword name="Listspace.removeSplit" id="Listspace.removeSplit" ref="eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html#Listspace.removeSplit" />
@@ -8399,13 +8405,17 @@
       <keyword name="PluginManager.__canActivatePlugin" id="PluginManager.__canActivatePlugin" ref="eric5.PluginManager.PluginManager.html#PluginManager.__canActivatePlugin" />
       <keyword name="PluginManager.__canDeactivatePlugin" id="PluginManager.__canDeactivatePlugin" ref="eric5.PluginManager.PluginManager.html#PluginManager.__canDeactivatePlugin" />
       <keyword name="PluginManager.__checkPluginsDownloadDirectory" id="PluginManager.__checkPluginsDownloadDirectory" ref="eric5.PluginManager.PluginManager.html#PluginManager.__checkPluginsDownloadDirectory" />
+      <keyword name="PluginManager.__downloadRepositoryFileDone" id="PluginManager.__downloadRepositoryFileDone" ref="eric5.PluginManager.PluginManager.html#PluginManager.__downloadRepositoryFileDone" />
       <keyword name="PluginManager.__getShortInfo" id="PluginManager.__getShortInfo" ref="eric5.PluginManager.PluginManager.html#PluginManager.__getShortInfo" />
       <keyword name="PluginManager.__insertPluginsPaths" id="PluginManager.__insertPluginsPaths" ref="eric5.PluginManager.PluginManager.html#PluginManager.__insertPluginsPaths" />
       <keyword name="PluginManager.__loadPlugins" id="PluginManager.__loadPlugins" ref="eric5.PluginManager.PluginManager.html#PluginManager.__loadPlugins" />
       <keyword name="PluginManager.__pluginDirectoriesExist" id="PluginManager.__pluginDirectoriesExist" ref="eric5.PluginManager.PluginManager.html#PluginManager.__pluginDirectoriesExist" />
       <keyword name="PluginManager.__pluginModulesExist" id="PluginManager.__pluginModulesExist" ref="eric5.PluginManager.PluginManager.html#PluginManager.__pluginModulesExist" />
+      <keyword name="PluginManager.__sslErrors" id="PluginManager.__sslErrors" ref="eric5.PluginManager.PluginManager.html#PluginManager.__sslErrors" />
       <keyword name="PluginManager.activatePlugin" id="PluginManager.activatePlugin" ref="eric5.PluginManager.PluginManager.html#PluginManager.activatePlugin" />
       <keyword name="PluginManager.activatePlugins" id="PluginManager.activatePlugins" ref="eric5.PluginManager.PluginManager.html#PluginManager.activatePlugins" />
+      <keyword name="PluginManager.checkPluginEntry" id="PluginManager.checkPluginEntry" ref="eric5.PluginManager.PluginManager.html#PluginManager.checkPluginEntry" />
+      <keyword name="PluginManager.checkPluginUpdatesAvailable" id="PluginManager.checkPluginUpdatesAvailable" ref="eric5.PluginManager.PluginManager.html#PluginManager.checkPluginUpdatesAvailable" />
       <keyword name="PluginManager.deactivatePlugin" id="PluginManager.deactivatePlugin" ref="eric5.PluginManager.PluginManager.html#PluginManager.deactivatePlugin" />
       <keyword name="PluginManager.deactivateVcsPlugins" id="PluginManager.deactivateVcsPlugins" ref="eric5.PluginManager.PluginManager.html#PluginManager.deactivateVcsPlugins" />
       <keyword name="PluginManager.doShutdown" id="PluginManager.doShutdown" ref="eric5.PluginManager.PluginManager.html#PluginManager.doShutdown" />
@@ -8434,6 +8444,7 @@
       <keyword name="PluginManagerPage (Constructor)" id="PluginManagerPage (Constructor)" ref="eric5.Preferences.ConfigurationPages.PluginManagerPage.html#PluginManagerPage.__init__" />
       <keyword name="PluginManagerPage (Module)" id="PluginManagerPage (Module)" ref="eric5.Preferences.ConfigurationPages.PluginManagerPage.html" />
       <keyword name="PluginManagerPage.on_downloadDirButton_clicked" id="PluginManagerPage.on_downloadDirButton_clicked" ref="eric5.Preferences.ConfigurationPages.PluginManagerPage.html#PluginManagerPage.on_downloadDirButton_clicked" />
+      <keyword name="PluginManagerPage.on_repositoryUrlEditButton_toggled" id="PluginManagerPage.on_repositoryUrlEditButton_toggled" ref="eric5.Preferences.ConfigurationPages.PluginManagerPage.html#PluginManagerPage.on_repositoryUrlEditButton_toggled" />
       <keyword name="PluginManagerPage.save" id="PluginManagerPage.save" ref="eric5.Preferences.ConfigurationPages.PluginManagerPage.html#PluginManagerPage.save" />
       <keyword name="PluginModuleFormatError" id="PluginModuleFormatError" ref="eric5.PluginManager.PluginExceptions.html#PluginModuleFormatError" />
       <keyword name="PluginModuleFormatError (Constructor)" id="PluginModuleFormatError (Constructor)" ref="eric5.PluginManager.PluginExceptions.html#PluginModuleFormatError.__init__" />
@@ -9946,6 +9957,7 @@
       <keyword name="SnapWidget.closeEvent" id="SnapWidget.closeEvent" ref="eric5.Snapshot.SnapWidget.html#SnapWidget.closeEvent" />
       <keyword name="SnapWidget.eventFilter" id="SnapWidget.eventFilter" ref="eric5.Snapshot.SnapWidget.html#SnapWidget.eventFilter" />
       <keyword name="SnapWidget.on_copyButton_clicked" id="SnapWidget.on_copyButton_clicked" ref="eric5.Snapshot.SnapWidget.html#SnapWidget.on_copyButton_clicked" />
+      <keyword name="SnapWidget.on_copyPreviewButton_clicked" id="SnapWidget.on_copyPreviewButton_clicked" ref="eric5.Snapshot.SnapWidget.html#SnapWidget.on_copyPreviewButton_clicked" />
       <keyword name="SnapWidget.on_saveButton_clicked" id="SnapWidget.on_saveButton_clicked" ref="eric5.Snapshot.SnapWidget.html#SnapWidget.on_saveButton_clicked" />
       <keyword name="SnapWidget.on_takeButton_clicked" id="SnapWidget.on_takeButton_clicked" ref="eric5.Snapshot.SnapWidget.html#SnapWidget.on_takeButton_clicked" />
       <keyword name="SnapWidget.resizeEvent" id="SnapWidget.resizeEvent" ref="eric5.Snapshot.SnapWidget.html#SnapWidget.resizeEvent" />
@@ -10241,6 +10253,7 @@
       <keyword name="Subversion" id="Subversion" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion" />
       <keyword name="Subversion (Constructor)" id="Subversion (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__init__" />
       <keyword name="Subversion (Constructor)" id="Subversion (Constructor)" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.__init__" />
+      <keyword name="Subversion.__isVersioned" id="Subversion.__isVersioned" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__isVersioned" />
       <keyword name="Subversion.__svnGetFileForRevision" id="Subversion.__svnGetFileForRevision" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__svnGetFileForRevision" />
       <keyword name="Subversion.__svnGetFileForRevision" id="Subversion.__svnGetFileForRevision" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.__svnGetFileForRevision" />
       <keyword name="Subversion.__svnURL" id="Subversion.__svnURL" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__svnURL" />
@@ -10303,6 +10316,8 @@
       <keyword name="Subversion.svnShowChangelists" id="Subversion.svnShowChangelists" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnShowChangelists" />
       <keyword name="Subversion.svnUnlock" id="Subversion.svnUnlock" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnUnlock" />
       <keyword name="Subversion.svnUnlock" id="Subversion.svnUnlock" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnUnlock" />
+      <keyword name="Subversion.svnUpgrade" id="Subversion.svnUpgrade" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnUpgrade" />
+      <keyword name="Subversion.svnUpgrade" id="Subversion.svnUpgrade" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnUpgrade" />
       <keyword name="Subversion.svnUrlDiff" id="Subversion.svnUrlDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.svnUrlDiff" />
       <keyword name="Subversion.svnUrlDiff" id="Subversion.svnUrlDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.svnUrlDiff" />
       <keyword name="Subversion.vcsAdd" id="Subversion.vcsAdd" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsAdd" />
@@ -10790,6 +10805,8 @@
       <keyword name="SvnProjectHelper.__svnResolve" id="SvnProjectHelper.__svnResolve" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnResolve" />
       <keyword name="SvnProjectHelper.__svnTagList" id="SvnProjectHelper.__svnTagList" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnTagList" />
       <keyword name="SvnProjectHelper.__svnTagList" id="SvnProjectHelper.__svnTagList" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnTagList" />
+      <keyword name="SvnProjectHelper.__svnUpgrade" id="SvnProjectHelper.__svnUpgrade" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnUpgrade" />
+      <keyword name="SvnProjectHelper.__svnUpgrade" id="SvnProjectHelper.__svnUpgrade" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnUpgrade" />
       <keyword name="SvnProjectHelper.__svnUrlDiff" id="SvnProjectHelper.__svnUrlDiff" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.__svnUrlDiff" />
       <keyword name="SvnProjectHelper.__svnUrlDiff" id="SvnProjectHelper.__svnUrlDiff" ref="eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html#SvnProjectHelper.__svnUrlDiff" />
       <keyword name="SvnProjectHelper.getActions" id="SvnProjectHelper.getActions" ref="eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#SvnProjectHelper.getActions" />
@@ -11298,6 +11315,7 @@
       <keyword name="Tabview.canTile" id="Tabview.canTile" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.canTile" />
       <keyword name="Tabview.cascade" id="Tabview.cascade" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.cascade" />
       <keyword name="Tabview.eventFilter" id="Tabview.eventFilter" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.eventFilter" />
+      <keyword name="Tabview.getSplitOrientation" id="Tabview.getSplitOrientation" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.getSplitOrientation" />
       <keyword name="Tabview.getTabWidgetById" id="Tabview.getTabWidgetById" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.getTabWidgetById" />
       <keyword name="Tabview.insertView" id="Tabview.insertView" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.insertView" />
       <keyword name="Tabview.nextSplit" id="Tabview.nextSplit" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.nextSplit" />
@@ -11893,6 +11911,7 @@
       <keyword name="UserInterface.__exportPreferences" id="UserInterface.__exportPreferences" ref="eric5.UI.UserInterface.html#UserInterface.__exportPreferences" />
       <keyword name="UserInterface.__exportShortcuts" id="UserInterface.__exportShortcuts" ref="eric5.UI.UserInterface.html#UserInterface.__exportShortcuts" />
       <keyword name="UserInterface.__getFloatingGeometry" id="UserInterface.__getFloatingGeometry" ref="eric5.UI.UserInterface.html#UserInterface.__getFloatingGeometry" />
+      <keyword name="UserInterface.__hasErrorLog" id="UserInterface.__hasErrorLog" ref="eric5.UI.UserInterface.html#UserInterface.__hasErrorLog" />
       <keyword name="UserInterface.__helpClosed" id="UserInterface.__helpClosed" ref="eric5.UI.UserInterface.html#UserInterface.__helpClosed" />
       <keyword name="UserInterface.__helpViewer" id="UserInterface.__helpViewer" ref="eric5.UI.UserInterface.html#UserInterface.__helpViewer" />
       <keyword name="UserInterface.__importPreferences" id="UserInterface.__importPreferences" ref="eric5.UI.UserInterface.html#UserInterface.__importPreferences" />
@@ -11938,6 +11957,7 @@
       <keyword name="UserInterface.__showAvailableVersionInfos" id="UserInterface.__showAvailableVersionInfos" ref="eric5.UI.UserInterface.html#UserInterface.__showAvailableVersionInfos" />
       <keyword name="UserInterface.__showCertificatesDialog" id="UserInterface.__showCertificatesDialog" ref="eric5.UI.UserInterface.html#UserInterface.__showCertificatesDialog" />
       <keyword name="UserInterface.__showEricDoc" id="UserInterface.__showEricDoc" ref="eric5.UI.UserInterface.html#UserInterface.__showEricDoc" />
+      <keyword name="UserInterface.__showErrorLog" id="UserInterface.__showErrorLog" ref="eric5.UI.UserInterface.html#UserInterface.__showErrorLog" />
       <keyword name="UserInterface.__showExternalTools" id="UserInterface.__showExternalTools" ref="eric5.UI.UserInterface.html#UserInterface.__showExternalTools" />
       <keyword name="UserInterface.__showExtrasMenu" id="UserInterface.__showExtrasMenu" ref="eric5.UI.UserInterface.html#UserInterface.__showExtrasMenu" />
       <keyword name="UserInterface.__showFileMenu" id="UserInterface.__showFileMenu" ref="eric5.UI.UserInterface.html#UserInterface.__showFileMenu" />
@@ -11945,7 +11965,6 @@
       <keyword name="UserInterface.__showNext" id="UserInterface.__showNext" ref="eric5.UI.UserInterface.html#UserInterface.__showNext" />
       <keyword name="UserInterface.__showPixmap" id="UserInterface.__showPixmap" ref="eric5.UI.UserInterface.html#UserInterface.__showPixmap" />
       <keyword name="UserInterface.__showPluginInfo" id="UserInterface.__showPluginInfo" ref="eric5.UI.UserInterface.html#UserInterface.__showPluginInfo" />
-      <keyword name="UserInterface.__showPluginsAvailable" id="UserInterface.__showPluginsAvailable" ref="eric5.UI.UserInterface.html#UserInterface.__showPluginsAvailable" />
       <keyword name="UserInterface.__showPrevious" id="UserInterface.__showPrevious" ref="eric5.UI.UserInterface.html#UserInterface.__showPrevious" />
       <keyword name="UserInterface.__showPyQt4Doc" id="UserInterface.__showPyQt4Doc" ref="eric5.UI.UserInterface.html#UserInterface.__showPyQt4Doc" />
       <keyword name="UserInterface.__showPyQt5Doc" id="UserInterface.__showPyQt5Doc" ref="eric5.UI.UserInterface.html#UserInterface.__showPyQt5Doc" />
@@ -12008,6 +12027,7 @@
       <keyword name="UserInterface.autoConnectIrc" id="UserInterface.autoConnectIrc" ref="eric5.UI.UserInterface.html#UserInterface.autoConnectIrc" />
       <keyword name="UserInterface.checkConfigurationStatus" id="UserInterface.checkConfigurationStatus" ref="eric5.UI.UserInterface.html#UserInterface.checkConfigurationStatus" />
       <keyword name="UserInterface.checkForErrorLog" id="UserInterface.checkForErrorLog" ref="eric5.UI.UserInterface.html#UserInterface.checkForErrorLog" />
+      <keyword name="UserInterface.checkPluginUpdatesAvailable" id="UserInterface.checkPluginUpdatesAvailable" ref="eric5.UI.UserInterface.html#UserInterface.checkPluginUpdatesAvailable" />
       <keyword name="UserInterface.checkProjectsWorkspace" id="UserInterface.checkProjectsWorkspace" ref="eric5.UI.UserInterface.html#UserInterface.checkProjectsWorkspace" />
       <keyword name="UserInterface.closeEvent" id="UserInterface.closeEvent" ref="eric5.UI.UserInterface.html#UserInterface.closeEvent" />
       <keyword name="UserInterface.dragEnterEvent" id="UserInterface.dragEnterEvent" ref="eric5.UI.UserInterface.html#UserInterface.dragEnterEvent" />
@@ -12039,6 +12059,7 @@
       <keyword name="UserInterface.showFindFilesDialog" id="UserInterface.showFindFilesDialog" ref="eric5.UI.UserInterface.html#UserInterface.showFindFilesDialog" />
       <keyword name="UserInterface.showLogTab" id="UserInterface.showLogTab" ref="eric5.UI.UserInterface.html#UserInterface.showLogTab" />
       <keyword name="UserInterface.showNotification" id="UserInterface.showNotification" ref="eric5.UI.UserInterface.html#UserInterface.showNotification" />
+      <keyword name="UserInterface.showPluginsAvailable" id="UserInterface.showPluginsAvailable" ref="eric5.UI.UserInterface.html#UserInterface.showPluginsAvailable" />
       <keyword name="UserInterface.showPreferences" id="UserInterface.showPreferences" ref="eric5.UI.UserInterface.html#UserInterface.showPreferences" />
       <keyword name="UserInterface.showReplaceFilesDialog" id="UserInterface.showReplaceFilesDialog" ref="eric5.UI.UserInterface.html#UserInterface.showReplaceFilesDialog" />
       <keyword name="UserInterface.unregisterToolbar" id="UserInterface.unregisterToolbar" ref="eric5.UI.UserInterface.html#UserInterface.unregisterToolbar" />
@@ -12336,6 +12357,8 @@
       <keyword name="ViewManager.__macroSave" id="ViewManager.__macroSave" ref="eric5.ViewManager.ViewManager.html#ViewManager.__macroSave" />
       <keyword name="ViewManager.__macroStartRecording" id="ViewManager.__macroStartRecording" ref="eric5.ViewManager.ViewManager.html#ViewManager.__macroStartRecording" />
       <keyword name="ViewManager.__macroStopRecording" id="ViewManager.__macroStopRecording" ref="eric5.ViewManager.ViewManager.html#ViewManager.__macroStopRecording" />
+      <keyword name="ViewManager.__newDocumentSplitView" id="ViewManager.__newDocumentSplitView" ref="eric5.ViewManager.ViewManager.html#ViewManager.__newDocumentSplitView" />
+      <keyword name="ViewManager.__newDocumentView" id="ViewManager.__newDocumentView" ref="eric5.ViewManager.ViewManager.html#ViewManager.__newDocumentView" />
       <keyword name="ViewManager.__newLineBelow" id="ViewManager.__newLineBelow" ref="eric5.ViewManager.ViewManager.html#ViewManager.__newLineBelow" />
       <keyword name="ViewManager.__nextBookmark" id="ViewManager.__nextBookmark" ref="eric5.ViewManager.ViewManager.html#ViewManager.__nextBookmark" />
       <keyword name="ViewManager.__nextChange" id="ViewManager.__nextChange" ref="eric5.ViewManager.ViewManager.html#ViewManager.__nextChange" />
@@ -12433,6 +12456,7 @@
       <keyword name="ViewManager.getOpenEditorsCount" id="ViewManager.getOpenEditorsCount" ref="eric5.ViewManager.ViewManager.html#ViewManager.getOpenEditorsCount" />
       <keyword name="ViewManager.getOpenFilenames" id="ViewManager.getOpenFilenames" ref="eric5.ViewManager.ViewManager.html#ViewManager.getOpenFilenames" />
       <keyword name="ViewManager.getSRHistory" id="ViewManager.getSRHistory" ref="eric5.ViewManager.ViewManager.html#ViewManager.getSRHistory" />
+      <keyword name="ViewManager.getSplitOrientation" id="ViewManager.getSplitOrientation" ref="eric5.ViewManager.ViewManager.html#ViewManager.getSplitOrientation" />
       <keyword name="ViewManager.handleResetUI" id="ViewManager.handleResetUI" ref="eric5.ViewManager.ViewManager.html#ViewManager.handleResetUI" />
       <keyword name="ViewManager.initActions" id="ViewManager.initActions" ref="eric5.ViewManager.ViewManager.html#ViewManager.initActions" />
       <keyword name="ViewManager.initBookmarkMenu" id="ViewManager.initBookmarkMenu" ref="eric5.ViewManager.ViewManager.html#ViewManager.initBookmarkMenu" />
--- a/Documentation/Source/eric5.E5XML.PluginRepositoryReader.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.E5XML.PluginRepositoryReader.html	Fri Dec 13 23:39:14 2013 +0100
@@ -73,16 +73,17 @@
 </table>
 <a NAME="PluginRepositoryReader.__init__" ID="PluginRepositoryReader.__init__"></a>
 <h4>PluginRepositoryReader (Constructor)</h4>
-<b>PluginRepositoryReader</b>(<i>device, dlg</i>)
+<b>PluginRepositoryReader</b>(<i>device, entryCallback</i>)
 <p>
         Constructor
 </p><dl>
 <dt><i>device</i></dt>
 <dd>
 reference to the I/O device to read from (QIODevice)
-</dd><dt><i>dlg</i></dt>
+</dd><dt><i>entryCallback</i></dt>
 <dd>
-reference to the plug-in repository dialog
+reference to a function to be called once the
+            data for a plug-in has been read (function)
 </dd>
 </dl><a NAME="PluginRepositoryReader.__readPlugin" ID="PluginRepositoryReader.__readPlugin"></a>
 <h4>PluginRepositoryReader.__readPlugin</h4>
--- a/Documentation/Source/eric5.PluginManager.PluginManager.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.PluginManager.PluginManager.html	Fri Dec 13 23:39:14 2013 +0100
@@ -95,6 +95,9 @@
 <td><a href="#PluginManager.__checkPluginsDownloadDirectory">__checkPluginsDownloadDirectory</a></td>
 <td>Private slot to check for the existence of the plugins download directory.</td>
 </tr><tr>
+<td><a href="#PluginManager.__downloadRepositoryFileDone">__downloadRepositoryFileDone</a></td>
+<td>Private method called after the repository file was downloaded.</td>
+</tr><tr>
 <td><a href="#PluginManager.__getShortInfo">__getShortInfo</a></td>
 <td>Private method to extract the short info from a module.</td>
 </tr><tr>
@@ -110,12 +113,21 @@
 <td><a href="#PluginManager.__pluginModulesExist">__pluginModulesExist</a></td>
 <td>Private method to check, if there are plugins available.</td>
 </tr><tr>
+<td><a href="#PluginManager.__sslErrors">__sslErrors</a></td>
+<td>Private slot to handle SSL errors.</td>
+</tr><tr>
 <td><a href="#PluginManager.activatePlugin">activatePlugin</a></td>
 <td>Public method to activate a plugin.</td>
 </tr><tr>
 <td><a href="#PluginManager.activatePlugins">activatePlugins</a></td>
 <td>Public method to activate all plugins having the "autoactivate" attribute set to True.</td>
 </tr><tr>
+<td><a href="#PluginManager.checkPluginEntry">checkPluginEntry</a></td>
+<td>Public method to check a plug-in's data for an update.</td>
+</tr><tr>
+<td><a href="#PluginManager.checkPluginUpdatesAvailable">checkPluginUpdatesAvailable</a></td>
+<td>Public method to check the availability of updates of plug-ins.</td>
+</tr><tr>
 <td><a href="#PluginManager.deactivatePlugin">deactivatePlugin</a></td>
 <td>Public method to deactivate a plugin.</td>
 </tr><tr>
@@ -271,6 +283,11 @@
 <p>
         Private slot to check for the existence of the plugins download
         directory.
+</p><a NAME="PluginManager.__downloadRepositoryFileDone" ID="PluginManager.__downloadRepositoryFileDone"></a>
+<h4>PluginManager.__downloadRepositoryFileDone</h4>
+<b>__downloadRepositoryFileDone</b>(<i></i>)
+<p>
+        Private method called after the repository file was downloaded.
 </p><a NAME="PluginManager.__getShortInfo" ID="PluginManager.__getShortInfo"></a>
 <h4>PluginManager.__getShortInfo</h4>
 <b>__getShortInfo</b>(<i>module</i>)
@@ -321,6 +338,19 @@
 <dd>
 flag indicating the availability of plugins (boolean)
 </dd>
+</dl><a NAME="PluginManager.__sslErrors" ID="PluginManager.__sslErrors"></a>
+<h4>PluginManager.__sslErrors</h4>
+<b>__sslErrors</b>(<i>reply, errors</i>)
+<p>
+        Private slot to handle SSL errors.
+</p><dl>
+<dt><i>reply</i></dt>
+<dd>
+reference to the reply object (QNetworkReply)
+</dd><dt><i>errors</i></dt>
+<dd>
+list of SSL errors (list of QSslError)
+</dd>
 </dl><a NAME="PluginManager.activatePlugin" ID="PluginManager.activatePlugin"></a>
 <h4>PluginManager.activatePlugin</h4>
 <b>activatePlugin</b>(<i>name, onDemand=False</i>)
@@ -352,6 +382,42 @@
 <p>
         Public method to activate all plugins having the "autoactivate"
         attribute set to True.
+</p><a NAME="PluginManager.checkPluginEntry" ID="PluginManager.checkPluginEntry"></a>
+<h4>PluginManager.checkPluginEntry</h4>
+<b>checkPluginEntry</b>(<i>name, short, description, url, author, version, filename, status</i>)
+<p>
+        Public method to check a plug-in's data for an update.
+</p><dl>
+<dt><i>name</i></dt>
+<dd>
+data for the name field (string)
+</dd><dt><i>short</i></dt>
+<dd>
+data for the short field (string)
+</dd><dt><i>description</i></dt>
+<dd>
+data for the description field (list of strings)
+</dd><dt><i>url</i></dt>
+<dd>
+data for the url field (string)
+</dd><dt><i>author</i></dt>
+<dd>
+data for the author field (string)
+</dd><dt><i>version</i></dt>
+<dd>
+data for the version field (string)
+</dd><dt><i>filename</i></dt>
+<dd>
+data for the filename field (string)
+</dd><dt><i>status</i></dt>
+<dd>
+status of the plugin (string [stable, unstable, unknown])
+</dd>
+</dl><a NAME="PluginManager.checkPluginUpdatesAvailable" ID="PluginManager.checkPluginUpdatesAvailable"></a>
+<h4>PluginManager.checkPluginUpdatesAvailable</h4>
+<b>checkPluginUpdatesAvailable</b>(<i></i>)
+<p>
+        Public method to check the availability of updates of plug-ins.
 </p><a NAME="PluginManager.deactivatePlugin" ID="PluginManager.deactivatePlugin"></a>
 <h4>PluginManager.deactivatePlugin</h4>
 <b>deactivatePlugin</b>(<i>name, onDemand=False</i>)
--- a/Documentation/Source/eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html	Fri Dec 13 23:39:14 2013 +0100
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>None</td></tr>
+<tr><td>PyCF_ONLY_AST</td></tr>
 </table>
 <h3>Classes</h3>
 <table>
@@ -51,7 +51,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>Codes</td></tr><tr><td>Messages</td></tr>
+<tr><td>Codes</td></tr><tr><td>Messages</td></tr><tr><td>MessagesSampleArgs</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -177,6 +177,9 @@
 <td><a href="#DocStyleChecker.__readline">__readline</a></td>
 <td>Private method to get the next line from the source.</td>
 </tr><tr>
+<td><a href="#DocStyleChecker.__reportInvalidSyntax">__reportInvalidSyntax</a></td>
+<td>Private method to report a syntax error.</td>
+</tr><tr>
 <td><a href="#DocStyleChecker.__resetReadline">__resetReadline</a></td>
 <td>Private method to reset the internal readline function.</td>
 </tr><tr>
@@ -748,7 +751,12 @@
 <dd>
 next line of source (string)
 </dd>
-</dl><a NAME="DocStyleChecker.__resetReadline" ID="DocStyleChecker.__resetReadline"></a>
+</dl><a NAME="DocStyleChecker.__reportInvalidSyntax" ID="DocStyleChecker.__reportInvalidSyntax"></a>
+<h4>DocStyleChecker.__reportInvalidSyntax</h4>
+<b>__reportInvalidSyntax</b>(<i></i>)
+<p>
+        Private method to report a syntax error.
+</p><a NAME="DocStyleChecker.__resetReadline" ID="DocStyleChecker.__resetReadline"></a>
 <h4>DocStyleChecker.__resetReadline</h4>
 <b>__resetReadline</b>(<i></i>)
 <p>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html	Fri Dec 13 23:39:14 2013 +0100
@@ -99,6 +99,9 @@
 <td><a href="#SvnProjectHelper.__svnTagList">__svnTagList</a></td>
 <td>Private slot used to list the tags of the project.</td>
 </tr><tr>
+<td><a href="#SvnProjectHelper.__svnUpgrade">__svnUpgrade</a></td>
+<td>Private slot used to upgrade the working copy format.</td>
+</tr><tr>
 <td><a href="#SvnProjectHelper.__svnUrlDiff">__svnUrlDiff</a></td>
 <td>Private slot used to perform a svn diff with the selection of repository URLs.</td>
 </tr><tr>
@@ -201,6 +204,11 @@
 <b>__svnTagList</b>(<i></i>)
 <p>
         Private slot used to list the tags of the project.
+</p><a NAME="SvnProjectHelper.__svnUpgrade" ID="SvnProjectHelper.__svnUpgrade"></a>
+<h4>SvnProjectHelper.__svnUpgrade</h4>
+<b>__svnUpgrade</b>(<i></i>)
+<p>
+        Private slot used to upgrade the working copy format.
 </p><a NAME="SvnProjectHelper.__svnUrlDiff" ID="SvnProjectHelper.__svnUrlDiff"></a>
 <h4>SvnProjectHelper.__svnUrlDiff</h4>
 <b>__svnUrlDiff</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html	Fri Dec 13 23:39:14 2013 +0100
@@ -66,6 +66,9 @@
 <td><a href="#Subversion.__init__">Subversion</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#Subversion.__isVersioned">__isVersioned</a></td>
+<td>Private method to check, if the given status indicates a versioned state.</td>
+</tr><tr>
 <td><a href="#Subversion.__svnGetFileForRevision">__svnGetFileForRevision</a></td>
 <td>Private method to get a file for a specific revision from the repository.</td>
 </tr><tr>
@@ -162,6 +165,9 @@
 <td><a href="#Subversion.svnUnlock">svnUnlock</a></td>
 <td>Public method used to unlock a file in the Subversion repository.</td>
 </tr><tr>
+<td><a href="#Subversion.svnUpgrade">svnUpgrade</a></td>
+<td>Public method to upgrade the working copy format.</td>
+</tr><tr>
 <td><a href="#Subversion.svnUrlDiff">svnUrlDiff</a></td>
 <td>Public method used to view the difference of a file/directory of two repository URLs.</td>
 </tr><tr>
@@ -282,6 +288,22 @@
 <dd>
 name of this object (string)
 </dd>
+</dl><a NAME="Subversion.__isVersioned" ID="Subversion.__isVersioned"></a>
+<h4>Subversion.__isVersioned</h4>
+<b>__isVersioned</b>(<i>status</i>)
+<p>
+        Private method to check, if the given status indicates a
+        versioned state.
+</p><dl>
+<dt><i>status</i></dt>
+<dd>
+status object to check (pysvn.PysvnStatus)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating a versioned state (boolean)
+</dd>
 </dl><a NAME="Subversion.__svnGetFileForRevision" ID="Subversion.__svnGetFileForRevision"></a>
 <h4>Subversion.__svnGetFileForRevision</h4>
 <b>__svnGetFileForRevision</b>(<i>name, rev=""</i>)
@@ -753,6 +775,16 @@
 reference to the parent object of the subversion dialog
             (QWidget)
 </dd>
+</dl><a NAME="Subversion.svnUpgrade" ID="Subversion.svnUpgrade"></a>
+<h4>Subversion.svnUpgrade</h4>
+<b>svnUpgrade</b>(<i>path</i>)
+<p>
+        Public method to upgrade the working copy format.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+directory name to show change lists for (string)
+</dd>
 </dl><a NAME="Subversion.svnUrlDiff" ID="Subversion.svnUrlDiff"></a>
 <h4>Subversion.svnUrlDiff</h4>
 <b>svnUrlDiff</b>(<i>name</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html	Fri Dec 13 23:39:14 2013 +0100
@@ -96,6 +96,9 @@
 <td><a href="#SvnProjectHelper.__svnTagList">__svnTagList</a></td>
 <td>Private slot used to list the tags of the project.</td>
 </tr><tr>
+<td><a href="#SvnProjectHelper.__svnUpgrade">__svnUpgrade</a></td>
+<td>Private slot used to upgrade the working copy format.</td>
+</tr><tr>
 <td><a href="#SvnProjectHelper.__svnUrlDiff">__svnUrlDiff</a></td>
 <td>Private slot used to perform a svn diff with the selection of repository URLs.</td>
 </tr><tr>
@@ -193,6 +196,11 @@
 <b>__svnTagList</b>(<i></i>)
 <p>
         Private slot used to list the tags of the project.
+</p><a NAME="SvnProjectHelper.__svnUpgrade" ID="SvnProjectHelper.__svnUpgrade"></a>
+<h4>SvnProjectHelper.__svnUpgrade</h4>
+<b>__svnUpgrade</b>(<i></i>)
+<p>
+        Private slot used to upgrade the working copy format.
 </p><a NAME="SvnProjectHelper.__svnUrlDiff" ID="SvnProjectHelper.__svnUrlDiff"></a>
 <h4>SvnProjectHelper.__svnUrlDiff</h4>
 <b>__svnUrlDiff</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html	Fri Dec 13 23:39:14 2013 +0100
@@ -156,6 +156,9 @@
 <td><a href="#Subversion.svnUnlock">svnUnlock</a></td>
 <td>Public method used to unlock a file in the Subversion repository.</td>
 </tr><tr>
+<td><a href="#Subversion.svnUpgrade">svnUpgrade</a></td>
+<td>Public method to upgrade the working copy format.</td>
+</tr><tr>
 <td><a href="#Subversion.svnUrlDiff">svnUrlDiff</a></td>
 <td>Public method used to view the difference of a file/directory of two repository URLs.</td>
 </tr><tr>
@@ -724,6 +727,16 @@
 reference to the parent object of the subversion dialog
             (QWidget)
 </dd>
+</dl><a NAME="Subversion.svnUpgrade" ID="Subversion.svnUpgrade"></a>
+<h4>Subversion.svnUpgrade</h4>
+<b>svnUpgrade</b>(<i>path</i>)
+<p>
+        Public method to upgrade the working copy format.
+</p><dl>
+<dt><i>path</i></dt>
+<dd>
+directory name to show change lists for (string)
+</dd>
 </dl><a NAME="Subversion.svnUrlDiff" ID="Subversion.svnUrlDiff"></a>
 <h4>Subversion.svnUrlDiff</h4>
 <b>svnUrlDiff</b>(<i>name</i>)
--- a/Documentation/Source/eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.ViewManagerPlugins.Listspace.Listspace.html	Fri Dec 13 23:39:14 2013 +0100
@@ -214,6 +214,9 @@
 <td><a href="#Listspace.eventFilter">eventFilter</a></td>
 <td>Method called to filter the event queue.</td>
 </tr><tr>
+<td><a href="#Listspace.getSplitOrientation">getSplitOrientation</a></td>
+<td>Public method to get the orientation of the split view.</td>
+</tr><tr>
 <td><a href="#Listspace.nextSplit">nextSplit</a></td>
 <td>Public slot used to move to the next split.</td>
 </tr><tr>
@@ -499,6 +502,16 @@
 <dd>
 flag indicating, if we handled the event
 </dd>
+</dl><a NAME="Listspace.getSplitOrientation" ID="Listspace.getSplitOrientation"></a>
+<h4>Listspace.getSplitOrientation</h4>
+<b>getSplitOrientation</b>(<i></i>)
+<p>
+        Public method to get the orientation of the split view.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+orientation of the split (Qt.Horizontal or Qt.Vertical)
+</dd>
 </dl><a NAME="Listspace.nextSplit" ID="Listspace.nextSplit"></a>
 <h4>Listspace.nextSplit</h4>
 <b>nextSplit</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html	Fri Dec 13 23:39:14 2013 +0100
@@ -742,6 +742,9 @@
 <td><a href="#Tabview.eventFilter">eventFilter</a></td>
 <td>Public method called to filter the event queue.</td>
 </tr><tr>
+<td><a href="#Tabview.getSplitOrientation">getSplitOrientation</a></td>
+<td>Public method to get the orientation of the split view.</td>
+</tr><tr>
 <td><a href="#Tabview.getTabWidgetById">getTabWidgetById</a></td>
 <td>Public method to get a reference to a tab widget knowing its ID.</td>
 </tr><tr>
@@ -938,6 +941,16 @@
 <dd>
 always False
 </dd>
+</dl><a NAME="Tabview.getSplitOrientation" ID="Tabview.getSplitOrientation"></a>
+<h4>Tabview.getSplitOrientation</h4>
+<b>getSplitOrientation</b>(<i></i>)
+<p>
+        Public method to get the orientation of the split view.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+orientation of the split (Qt.Horizontal or Qt.Vertical)
+</dd>
 </dl><a NAME="Tabview.getTabWidgetById" ID="Tabview.getTabWidgetById"></a>
 <h4>Tabview.getTabWidgetById</h4>
 <b>getTabWidgetById</b>(<i>id_</i>)
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html	Fri Dec 13 23:39:14 2013 +0100
@@ -66,23 +66,26 @@
 <td><a href="#FileDialogWizardDialog.__adjustOptions">__adjustOptions</a></td>
 <td>Private method to adjust the file dialog options.</td>
 </tr><tr>
-<td><a href="#FileDialogWizardDialog.__getCode4">__getCode4</a></td>
-<td>Private method to get the source code for Qt4/Qt5.</td>
-</tr><tr>
 <td><a href="#FileDialogWizardDialog.__toggleConfirmCheckBox">__toggleConfirmCheckBox</a></td>
 <td>Private slot to enable/disable the confirmation check box.</td>
 </tr><tr>
 <td><a href="#FileDialogWizardDialog.__toggleGroupsAndTest">__toggleGroupsAndTest</a></td>
 <td>Private slot to enable/disable certain groups and the test button.</td>
 </tr><tr>
+<td><a href="#FileDialogWizardDialog.__toggleInitialFilterAndResult">__toggleInitialFilterAndResult</a></td>
+<td>Private slot to enable/disable the initial filter elements and the results entries.</td>
+</tr><tr>
 <td><a href="#FileDialogWizardDialog.getCode">getCode</a></td>
-<td>Public method to get the source code.</td>
+<td>Public method to get the source code for Qt4 and Qt5.</td>
 </tr><tr>
 <td><a href="#FileDialogWizardDialog.on_bTest_clicked">on_bTest_clicked</a></td>
 <td>Private method to test the selected options.</td>
 </tr><tr>
 <td><a href="#FileDialogWizardDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td>
 <td>Private slot called by a button of the button box clicked.</td>
+</tr><tr>
+<td><a href="#FileDialogWizardDialog.on_pyqtComboBox_currentIndexChanged">on_pyqtComboBox_currentIndexChanged</a></td>
+<td>Private slot to setup the dialog for the selected PyQt variant.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -91,11 +94,14 @@
 </table>
 <a NAME="FileDialogWizardDialog.__init__" ID="FileDialogWizardDialog.__init__"></a>
 <h4>FileDialogWizardDialog (Constructor)</h4>
-<b>FileDialogWizardDialog</b>(<i>parent=None</i>)
+<b>FileDialogWizardDialog</b>(<i>pyqtVariant, parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>parent</i></dt>
+<dt><i>pyqtVariant</i></dt>
+<dd>
+variant of PyQt (integer; 0, 4 or 5)
+</dd><dt><i>parent</i></dt>
 <dd>
 parent widget (QWidget)
 </dd>
@@ -114,24 +120,6 @@
 <dd>
 modified options (QFileDialog.Options)
 </dd>
-</dl><a NAME="FileDialogWizardDialog.__getCode4" ID="FileDialogWizardDialog.__getCode4"></a>
-<h4>FileDialogWizardDialog.__getCode4</h4>
-<b>__getCode4</b>(<i>indLevel, indString</i>)
-<p>
-        Private method to get the source code for Qt4/Qt5.
-</p><dl>
-<dt><i>indLevel</i></dt>
-<dd>
-indentation level (int)
-</dd><dt><i>indString</i></dt>
-<dd>
-string used for indentation (space or tab) (string)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-generated code (string)
-</dd>
 </dl><a NAME="FileDialogWizardDialog.__toggleConfirmCheckBox" ID="FileDialogWizardDialog.__toggleConfirmCheckBox"></a>
 <h4>FileDialogWizardDialog.__toggleConfirmCheckBox</h4>
 <b>__toggleConfirmCheckBox</b>(<i></i>)
@@ -142,11 +130,22 @@
 <b>__toggleGroupsAndTest</b>(<i></i>)
 <p>
         Private slot to enable/disable certain groups and the test button.
-</p><a NAME="FileDialogWizardDialog.getCode" ID="FileDialogWizardDialog.getCode"></a>
+</p><a NAME="FileDialogWizardDialog.__toggleInitialFilterAndResult" ID="FileDialogWizardDialog.__toggleInitialFilterAndResult"></a>
+<h4>FileDialogWizardDialog.__toggleInitialFilterAndResult</h4>
+<b>__toggleInitialFilterAndResult</b>(<i>id</i>)
+<p>
+        Private slot to enable/disable the initial filter elements and the
+        results entries.
+</p><dl>
+<dt><i>id</i></dt>
+<dd>
+id of the clicked button (integer)
+</dd>
+</dl><a NAME="FileDialogWizardDialog.getCode" ID="FileDialogWizardDialog.getCode"></a>
 <h4>FileDialogWizardDialog.getCode</h4>
 <b>getCode</b>(<i>indLevel, indString</i>)
 <p>
-        Public method to get the source code.
+        Public method to get the source code for Qt4 and Qt5.
 </p><dl>
 <dt><i>indLevel</i></dt>
 <dd>
@@ -175,6 +174,16 @@
 <dd>
 button that was clicked (QAbstractButton)
 </dd>
+</dl><a NAME="FileDialogWizardDialog.on_pyqtComboBox_currentIndexChanged" ID="FileDialogWizardDialog.on_pyqtComboBox_currentIndexChanged"></a>
+<h4>FileDialogWizardDialog.on_pyqtComboBox_currentIndexChanged</h4>
+<b>on_pyqtComboBox_currentIndexChanged</b>(<i>txt</i>)
+<p>
+        Private slot to setup the dialog for the selected PyQt variant.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+text of the selected combo box entry (string)
+</dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
--- a/Documentation/Source/eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog.html	Fri Dec 13 23:39:14 2013 +0100
@@ -63,12 +63,9 @@
 <td><a href="#InputDialogWizardDialog.__init__">InputDialogWizardDialog</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#InputDialogWizardDialog.__getCode4">__getCode4</a></td>
+<td><a href="#InputDialogWizardDialog.getCode">getCode</a></td>
 <td>Private method to get the source code for Qt4/Qt5.</td>
 </tr><tr>
-<td><a href="#InputDialogWizardDialog.getCode">getCode</a></td>
-<td>Public method to get the source code.</td>
-</tr><tr>
 <td><a href="#InputDialogWizardDialog.on_bTest_clicked">on_bTest_clicked</a></td>
 <td>Private method to test the selected options.</td>
 </tr><tr>
@@ -93,29 +90,11 @@
 <dd>
 parent widget (QWidget)
 </dd>
-</dl><a NAME="InputDialogWizardDialog.__getCode4" ID="InputDialogWizardDialog.__getCode4"></a>
-<h4>InputDialogWizardDialog.__getCode4</h4>
-<b>__getCode4</b>(<i>indLevel, indString</i>)
-<p>
-        Private method to get the source code for Qt4/Qt5.
-</p><dl>
-<dt><i>indLevel</i></dt>
-<dd>
-indentation level (int)
-</dd><dt><i>indString</i></dt>
-<dd>
-string used for indentation (space or tab) (string)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-generated code (string)
-</dd>
 </dl><a NAME="InputDialogWizardDialog.getCode" ID="InputDialogWizardDialog.getCode"></a>
 <h4>InputDialogWizardDialog.getCode</h4>
 <b>getCode</b>(<i>indLevel, indString</i>)
 <p>
-        Public method to get the source code.
+        Private method to get the source code for Qt4/Qt5.
 </p><dl>
 <dt><i>indLevel</i></dt>
 <dd>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.EditorAPIsPage.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.EditorAPIsPage.html	Fri Dec 13 23:39:14 2013 +0100
@@ -87,9 +87,15 @@
 <td><a href="#EditorAPIsPage.on_apiFileButton_clicked">on_apiFileButton_clicked</a></td>
 <td>Private method to select an api file.</td>
 </tr><tr>
+<td><a href="#EditorAPIsPage.on_apiFileEdit_textChanged">on_apiFileEdit_textChanged</a></td>
+<td>Private slot to handle the entering of an API file name.</td>
+</tr><tr>
 <td><a href="#EditorAPIsPage.on_apiLanguageComboBox_activated">on_apiLanguageComboBox_activated</a></td>
 <td>Private slot to fill the api listbox of the api page.</td>
 </tr><tr>
+<td><a href="#EditorAPIsPage.on_apiList_itemSelectionChanged">on_apiList_itemSelectionChanged</a></td>
+<td>Private slot to react on changes of API selections.</td>
+</tr><tr>
 <td><a href="#EditorAPIsPage.on_deleteApiFileButton_clicked">on_deleteApiFileButton_clicked</a></td>
 <td>Private slot to delete the currently selected file of the listbox.</td>
 </tr><tr>
@@ -162,7 +168,17 @@
 <b>on_apiFileButton_clicked</b>(<i></i>)
 <p>
         Private method to select an api file.
-</p><a NAME="EditorAPIsPage.on_apiLanguageComboBox_activated" ID="EditorAPIsPage.on_apiLanguageComboBox_activated"></a>
+</p><a NAME="EditorAPIsPage.on_apiFileEdit_textChanged" ID="EditorAPIsPage.on_apiFileEdit_textChanged"></a>
+<h4>EditorAPIsPage.on_apiFileEdit_textChanged</h4>
+<b>on_apiFileEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle the entering of an API file name.
+</p><dl>
+<dt><i>txt</i></dt>
+<dd>
+text of the line edit (string)
+</dd>
+</dl><a NAME="EditorAPIsPage.on_apiLanguageComboBox_activated" ID="EditorAPIsPage.on_apiLanguageComboBox_activated"></a>
 <h4>EditorAPIsPage.on_apiLanguageComboBox_activated</h4>
 <b>on_apiLanguageComboBox_activated</b>(<i>language</i>)
 <p>
@@ -172,7 +188,12 @@
 <dd>
 selected API language (string)
 </dd>
-</dl><a NAME="EditorAPIsPage.on_deleteApiFileButton_clicked" ID="EditorAPIsPage.on_deleteApiFileButton_clicked"></a>
+</dl><a NAME="EditorAPIsPage.on_apiList_itemSelectionChanged" ID="EditorAPIsPage.on_apiList_itemSelectionChanged"></a>
+<h4>EditorAPIsPage.on_apiList_itemSelectionChanged</h4>
+<b>on_apiList_itemSelectionChanged</b>(<i></i>)
+<p>
+        Private slot to react on changes of API selections.
+</p><a NAME="EditorAPIsPage.on_deleteApiFileButton_clicked" ID="EditorAPIsPage.on_deleteApiFileButton_clicked"></a>
 <h4>EditorAPIsPage.on_deleteApiFileButton_clicked</h4>
 <b>on_deleteApiFileButton_clicked</b>(<i></i>)
 <p>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html	Fri Dec 13 23:39:14 2013 +0100
@@ -81,6 +81,9 @@
 <td><a href="#EditorHighlightingStylesPage.__setToDefault">__setToDefault</a></td>
 <td>Private method to set a specific style to its default values.</td>
 </tr><tr>
+<td><a href="#EditorHighlightingStylesPage.__styleAllItems">__styleAllItems</a></td>
+<td>Private method to style all items of the style element list.</td>
+</tr><tr>
 <td><a href="#EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked">on_allBackgroundColoursButton_clicked</a></td>
 <td>Private method used to select the background colour of all styles of a selected lexer.</td>
 </tr><tr>
@@ -218,7 +221,12 @@
 <dd>
 style to be reset (integer)
 </dd>
-</dl><a NAME="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" ID="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked"></a>
+</dl><a NAME="EditorHighlightingStylesPage.__styleAllItems" ID="EditorHighlightingStylesPage.__styleAllItems"></a>
+<h4>EditorHighlightingStylesPage.__styleAllItems</h4>
+<b>__styleAllItems</b>(<i></i>)
+<p>
+        Private method to style all items of the style element list.
+</p><a NAME="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" ID="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked"></a>
 <h4>EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked</h4>
 <b>on_allBackgroundColoursButton_clicked</b>(<i></i>)
 <p>
@@ -248,14 +256,14 @@
         Private method to set the current style to its default values.
 </p><a NAME="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" ID="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled"></a>
 <h4>EditorHighlightingStylesPage.on_eolfillCheckBox_toggled</h4>
-<b>on_eolfillCheckBox_toggled</b>(<i>b</i>)
+<b>on_eolfillCheckBox_toggled</b>(<i>on</i>)
 <p>
         Private method used to set the eolfill for the selected style and
         lexer.
 </p><dl>
-<dt><i>b</i></dt>
+<dt><i>on</i></dt>
 <dd>
-Flag indicating enabled or disabled state.
+flag indicating enabled or disabled state (boolean)
 </dd>
 </dl><a NAME="EditorHighlightingStylesPage.on_exportAllButton_clicked" ID="EditorHighlightingStylesPage.on_exportAllButton_clicked"></a>
 <h4>EditorHighlightingStylesPage.on_exportAllButton_clicked</h4>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.PluginManagerPage.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.PluginManagerPage.html	Fri Dec 13 23:39:14 2013 +0100
@@ -66,6 +66,9 @@
 <td><a href="#PluginManagerPage.on_downloadDirButton_clicked">on_downloadDirButton_clicked</a></td>
 <td>Private slot to handle the directory selection via dialog.</td>
 </tr><tr>
+<td><a href="#PluginManagerPage.on_repositoryUrlEditButton_toggled">on_repositoryUrlEditButton_toggled</a></td>
+<td>Private slot to set the read only status of the repository URL line edit.</td>
+</tr><tr>
 <td><a href="#PluginManagerPage.save">save</a></td>
 <td>Public slot to save the Viewmanager configuration.</td>
 </tr>
@@ -84,7 +87,18 @@
 <b>on_downloadDirButton_clicked</b>(<i></i>)
 <p>
         Private slot to handle the directory selection via dialog.
-</p><a NAME="PluginManagerPage.save" ID="PluginManagerPage.save"></a>
+</p><a NAME="PluginManagerPage.on_repositoryUrlEditButton_toggled" ID="PluginManagerPage.on_repositoryUrlEditButton_toggled"></a>
+<h4>PluginManagerPage.on_repositoryUrlEditButton_toggled</h4>
+<b>on_repositoryUrlEditButton_toggled</b>(<i>checked</i>)
+<p>
+        Private slot to set the read only status of the repository URL line
+        edit.
+</p><dl>
+<dt><i>checked</i></dt>
+<dd>
+state of the push button (boolean)
+</dd>
+</dl><a NAME="PluginManagerPage.save" ID="PluginManagerPage.save"></a>
 <h4>PluginManagerPage.save</h4>
 <b>save</b>(<i></i>)
 <p>
--- a/Documentation/Source/eric5.QScintilla.Editor.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.QScintilla.Editor.html	Fri Dec 13 23:39:14 2013 +0100
@@ -647,6 +647,9 @@
 <td><a href="#Editor.clearStyleWarnings">clearStyleWarnings</a></td>
 <td>Public slot to clear all style warnings.</td>
 </tr><tr>
+<td><a href="#Editor.clearStyles">clearStyles</a></td>
+<td>Public method to set the styles according the selected Qt style or the selected editor colours.</td>
+</tr><tr>
 <td><a href="#Editor.clearSyntaxError">clearSyntaxError</a></td>
 <td>Public slot to handle the 'Clear all syntax error' context menu action.</td>
 </tr><tr>
@@ -2530,6 +2533,12 @@
 <b>clearStyleWarnings</b>(<i></i>)
 <p>
         Public slot to clear all style warnings.
+</p><a NAME="Editor.clearStyles" ID="Editor.clearStyles"></a>
+<h4>Editor.clearStyles</h4>
+<b>clearStyles</b>(<i></i>)
+<p>
+        Public method to set the styles according the selected Qt style
+        or the selected editor colours.
 </p><a NAME="Editor.clearSyntaxError" ID="Editor.clearSyntaxError"></a>
 <h4>Editor.clearSyntaxError</h4>
 <b>clearSyntaxError</b>(<i></i>)
--- a/Documentation/Source/eric5.Snapshot.SnapWidget.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.Snapshot.SnapWidget.html	Fri Dec 13 23:39:14 2013 +0100
@@ -117,6 +117,9 @@
 <td><a href="#SnapWidget.on_copyButton_clicked">on_copyButton_clicked</a></td>
 <td>Private slot to copy the snapshot to the clipboard.</td>
 </tr><tr>
+<td><a href="#SnapWidget.on_copyPreviewButton_clicked">on_copyPreviewButton_clicked</a></td>
+<td>Private slot to copy the snapshot preview to the clipboard.</td>
+</tr><tr>
 <td><a href="#SnapWidget.on_saveButton_clicked">on_saveButton_clicked</a></td>
 <td>Private slot to save the snapshot.</td>
 </tr><tr>
@@ -269,6 +272,11 @@
 <b>on_copyButton_clicked</b>(<i></i>)
 <p>
         Private slot to copy the snapshot to the clipboard.
+</p><a NAME="SnapWidget.on_copyPreviewButton_clicked" ID="SnapWidget.on_copyPreviewButton_clicked"></a>
+<h4>SnapWidget.on_copyPreviewButton_clicked</h4>
+<b>on_copyPreviewButton_clicked</b>(<i></i>)
+<p>
+        Private slot to copy the snapshot preview to the clipboard.
 </p><a NAME="SnapWidget.on_saveButton_clicked" ID="SnapWidget.on_saveButton_clicked"></a>
 <h4>SnapWidget.on_saveButton_clicked</h4>
 <b>on_saveButton_clicked</b>(<i></i>)
--- a/Documentation/Source/eric5.UI.ErrorLogDialog.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.UI.ErrorLogDialog.html	Fri Dec 13 23:39:14 2013 +0100
@@ -76,13 +76,17 @@
 </table>
 <a NAME="ErrorLogDialog.__init__" ID="ErrorLogDialog.__init__"></a>
 <h4>ErrorLogDialog (Constructor)</h4>
-<b>ErrorLogDialog</b>(<i>logFile, parent=None</i>)
+<b>ErrorLogDialog</b>(<i>logFile, showMode, parent=None</i>)
 <p>
         Constructor
 </p><dl>
 <dt><i>logFile</i></dt>
 <dd>
 name of the log file containing the error info (string)
+</dd><dt><i>showMode</i></dt>
+<dd>
+flag indicating to just show the error log message
+            (boolean)
 </dd><dt><i>parent</i></dt>
 <dd>
 reference to the parent widget (QWidget)
--- a/Documentation/Source/eric5.UI.UserInterface.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.UI.UserInterface.html	Fri Dec 13 23:39:14 2013 +0100
@@ -170,7 +170,7 @@
 E5MainWindow
 <h3>Class Attributes</h3>
 <table>
-<tr><td>BottomSide</td></tr><tr><td>LeftSide</td></tr><tr><td>RightSide</td></tr><tr><td>maxFilePathLen</td></tr><tr><td>maxMenuFilePathLen</td></tr>
+<tr><td>BottomSide</td></tr><tr><td>ErrorLogFileName</td></tr><tr><td>LeftSide</td></tr><tr><td>RightSide</td></tr><tr><td>maxFilePathLen</td></tr><tr><td>maxMenuFilePathLen</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -308,6 +308,9 @@
 <td><a href="#UserInterface.__getFloatingGeometry">__getFloatingGeometry</a></td>
 <td>Private method to get the geometry of a floating windows.</td>
 </tr><tr>
+<td><a href="#UserInterface.__hasErrorLog">__hasErrorLog</a></td>
+<td>Private method to check, if an error log file exists.</td>
+</tr><tr>
 <td><a href="#UserInterface.__helpClosed">__helpClosed</a></td>
 <td>Private slot to handle the helpClosed signal of the help window.</td>
 </tr><tr>
@@ -443,6 +446,9 @@
 <td><a href="#UserInterface.__showEricDoc">__showEricDoc</a></td>
 <td>Private slot to show the Eric documentation.</td>
 </tr><tr>
+<td><a href="#UserInterface.__showErrorLog">__showErrorLog</a></td>
+<td>Private slot to show the most recent error log message.</td>
+</tr><tr>
 <td><a href="#UserInterface.__showExternalTools">__showExternalTools</a></td>
 <td>Private slot to display a dialog show a list of external tools used by eric5.</td>
 </tr><tr>
@@ -464,9 +470,6 @@
 <td><a href="#UserInterface.__showPluginInfo">__showPluginInfo</a></td>
 <td>Private slot to show the plugin info dialog.</td>
 </tr><tr>
-<td><a href="#UserInterface.__showPluginsAvailable">__showPluginsAvailable</a></td>
-<td>Private slot to show the plugins available for download.</td>
-</tr><tr>
 <td><a href="#UserInterface.__showPrevious">__showPrevious</a></td>
 <td>Private slot used to show the previous tab or file.</td>
 </tr><tr>
@@ -653,6 +656,9 @@
 <td><a href="#UserInterface.checkForErrorLog">checkForErrorLog</a></td>
 <td>Public method to check for the presence of an error log and ask the user, what to do with it.</td>
 </tr><tr>
+<td><a href="#UserInterface.checkPluginUpdatesAvailable">checkPluginUpdatesAvailable</a></td>
+<td>Public method to check the availability of updates of plug-ins.</td>
+</tr><tr>
 <td><a href="#UserInterface.checkProjectsWorkspace">checkProjectsWorkspace</a></td>
 <td>Public method to check, if a projects workspace has been configured.</td>
 </tr><tr>
@@ -746,6 +752,9 @@
 <td><a href="#UserInterface.showNotification">showNotification</a></td>
 <td>Public method to show a desktop notification.</td>
 </tr><tr>
+<td><a href="#UserInterface.showPluginsAvailable">showPluginsAvailable</a></td>
+<td>Public slot to show the plugins available for download.</td>
+</tr><tr>
 <td><a href="#UserInterface.showPreferences">showPreferences</a></td>
 <td>Public slot to set the preferences.</td>
 </tr><tr>
@@ -1112,6 +1121,16 @@
 <dd>
 list giving the widget's geometry and its visibility
 </dd>
+</dl><a NAME="UserInterface.__hasErrorLog" ID="UserInterface.__hasErrorLog"></a>
+<h4>UserInterface.__hasErrorLog</h4>
+<b>__hasErrorLog</b>(<i></i>)
+<p>
+        Private method to check, if an error log file exists.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the existence of an error log file (boolean)
+</dd>
 </dl><a NAME="UserInterface.__helpClosed" ID="UserInterface.__helpClosed"></a>
 <h4>UserInterface.__helpClosed</h4>
 <b>__helpClosed</b>(<i></i>)
@@ -1419,6 +1438,11 @@
 <b>__showEricDoc</b>(<i></i>)
 <p>
         Private slot to show the Eric documentation.
+</p><a NAME="UserInterface.__showErrorLog" ID="UserInterface.__showErrorLog"></a>
+<h4>UserInterface.__showErrorLog</h4>
+<b>__showErrorLog</b>(<i></i>)
+<p>
+        Private slot to show the most recent error log message.
 </p><a NAME="UserInterface.__showExternalTools" ID="UserInterface.__showExternalTools"></a>
 <h4>UserInterface.__showExternalTools</h4>
 <b>__showExternalTools</b>(<i></i>)
@@ -1460,11 +1484,6 @@
 <b>__showPluginInfo</b>(<i></i>)
 <p>
         Private slot to show the plugin info dialog.
-</p><a NAME="UserInterface.__showPluginsAvailable" ID="UserInterface.__showPluginsAvailable"></a>
-<h4>UserInterface.__showPluginsAvailable</h4>
-<b>__showPluginsAvailable</b>(<i></i>)
-<p>
-        Private slot to show the plugins available for download.
 </p><a NAME="UserInterface.__showPrevious" ID="UserInterface.__showPrevious"></a>
 <h4>UserInterface.__showPrevious</h4>
 <b>__showPrevious</b>(<i></i>)
@@ -1910,6 +1929,11 @@
 <p>
         Public method to check for the presence of an error log and ask the
         user, what to do with it.
+</p><a NAME="UserInterface.checkPluginUpdatesAvailable" ID="UserInterface.checkPluginUpdatesAvailable"></a>
+<h4>UserInterface.checkPluginUpdatesAvailable</h4>
+<b>checkPluginUpdatesAvailable</b>(<i></i>)
+<p>
+        Public method to check the availability of updates of plug-ins.
 </p><a NAME="UserInterface.checkProjectsWorkspace" ID="UserInterface.checkProjectsWorkspace"></a>
 <h4>UserInterface.checkProjectsWorkspace</h4>
 <b>checkProjectsWorkspace</b>(<i></i>)
@@ -2306,7 +2330,12 @@
 <dd>
 text of the notification (string)
 </dd>
-</dl><a NAME="UserInterface.showPreferences" ID="UserInterface.showPreferences"></a>
+</dl><a NAME="UserInterface.showPluginsAvailable" ID="UserInterface.showPluginsAvailable"></a>
+<h4>UserInterface.showPluginsAvailable</h4>
+<b>showPluginsAvailable</b>(<i></i>)
+<p>
+        Public slot to show the plugins available for download.
+</p><a NAME="UserInterface.showPreferences" ID="UserInterface.showPreferences"></a>
 <h4>UserInterface.showPreferences</h4>
 <b>showPreferences</b>(<i>pageName=None</i>)
 <p>
--- a/Documentation/Source/eric5.ViewManager.ViewManager.html	Fri Dec 13 22:45:47 2013 +0100
+++ b/Documentation/Source/eric5.ViewManager.ViewManager.html	Fri Dec 13 23:39:14 2013 +0100
@@ -450,6 +450,12 @@
 <td><a href="#ViewManager.__macroStopRecording">__macroStopRecording</a></td>
 <td>Private method to handle the stop macro recording action.</td>
 </tr><tr>
+<td><a href="#ViewManager.__newDocumentSplitView">__newDocumentSplitView</a></td>
+<td>Private method to open a new view of the current editor in a new split.</td>
+</tr><tr>
+<td><a href="#ViewManager.__newDocumentView">__newDocumentView</a></td>
+<td>Private method to open a new view of the current editor.</td>
+</tr><tr>
 <td><a href="#ViewManager.__newLineBelow">__newLineBelow</a></td>
 <td>Private method to insert a new line below the current one even if cursor is not at the end of the line.</td>
 </tr><tr>
@@ -741,6 +747,9 @@
 <td><a href="#ViewManager.getSRHistory">getSRHistory</a></td>
 <td>Public method to get the search or replace history list.</td>
 </tr><tr>
+<td><a href="#ViewManager.getSplitOrientation">getSplitOrientation</a></td>
+<td>Public method to get the orientation of the split view.</td>
+</tr><tr>
 <td><a href="#ViewManager.handleResetUI">handleResetUI</a></td>
 <td>Public slot to handle the resetUI signal.</td>
 </tr><tr>
@@ -1431,6 +1440,16 @@
 <b>__macroStopRecording</b>(<i></i>)
 <p>
         Private method to handle the stop macro recording action.
+</p><a NAME="ViewManager.__newDocumentSplitView" ID="ViewManager.__newDocumentSplitView"></a>
+<h4>ViewManager.__newDocumentSplitView</h4>
+<b>__newDocumentSplitView</b>(<i></i>)
+<p>
+        Private method to open a new view of the current editor in a new split.
+</p><a NAME="ViewManager.__newDocumentView" ID="ViewManager.__newDocumentView"></a>
+<h4>ViewManager.__newDocumentView</h4>
+<b>__newDocumentView</b>(<i></i>)
+<p>
+        Private method to open a new view of the current editor.
 </p><a NAME="ViewManager.__newLineBelow" ID="ViewManager.__newLineBelow"></a>
 <h4>ViewManager.__newLineBelow</h4>
 <b>__newLineBelow</b>(<i></i>)
@@ -2342,6 +2361,16 @@
 <dd>
 the requested history list (list of strings)
 </dd>
+</dl><a NAME="ViewManager.getSplitOrientation" ID="ViewManager.getSplitOrientation"></a>
+<h4>ViewManager.getSplitOrientation</h4>
+<b>getSplitOrientation</b>(<i></i>)
+<p>
+        Public method to get the orientation of the split view.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+orientation of the split (Qt.Horizontal or Qt.Vertical)
+</dd>
 </dl><a NAME="ViewManager.handleResetUI" ID="ViewManager.handleResetUI"></a>
 <h4>ViewManager.handleResetUI</h4>
 <b>handleResetUI</b>(<i></i>)
@@ -2891,7 +2920,7 @@
 <dt><i>orientation</i></dt>
 <dd>
 orientation of the split
-                (Qt.Horizontal or Qt.Vertical)
+            (Qt.Horizontal or Qt.Vertical)
 </dd>
 </dl><a NAME="ViewManager.shareConnected" ID="ViewManager.shareConnected"></a>
 <h4>ViewManager.shareConnected</h4>
--- a/E5XML/PluginRepositoryReader.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/E5XML/PluginRepositoryReader.py	Fri Dec 13 23:39:14 2013 +0100
@@ -21,16 +21,17 @@
     """
     supportedVersions = ["4.1", "4.2"]
     
-    def __init__(self, device, dlg):
+    def __init__(self, device, entryCallback):
         """
         Constructor
         
         @param device reference to the I/O device to read from (QIODevice)
-        @param dlg reference to the plug-in repository dialog
+        @param entryCallback reference to a function to be called once the
+            data for a plug-in has been read (function)
         """
         XMLStreamReaderBase.__init__(self, device)
         
-        self.dlg = dlg
+        self.__entryCallback = entryCallback
         
         self.version = ""
     
@@ -74,10 +75,11 @@
         while not self.atEnd():
             self.readNext()
             if self.isEndElement() and self.name() == "Plugin":
-                self.dlg.addEntry(pluginInfo["name"], pluginInfo["short"],
-                                  pluginInfo["description"], pluginInfo["url"],
-                                  pluginInfo["author"], pluginInfo["version"],
-                                  pluginInfo["filename"], pluginInfo["status"])
+                self.__entryCallback(
+                    pluginInfo["name"], pluginInfo["short"],
+                    pluginInfo["description"], pluginInfo["url"],
+                    pluginInfo["author"], pluginInfo["version"],
+                    pluginInfo["filename"], pluginInfo["status"])
                 break
             
             if self.isStartElement():
--- a/MultiProject/AddProjectDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/MultiProject/AddProjectDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -66,10 +66,10 @@
                 self.trUtf8("Add Project"),
                 startdir,
                 self.trUtf8("Project Files (*.e4p)"))
-        
-        if projectFile:
-            self.filenameEdit.setText(
-                Utilities.toNativeSeparators(projectFile))
+            
+            if projectFile:
+                self.filenameEdit.setText(
+                    Utilities.toNativeSeparators(projectFile))
     
     def getData(self):
         """
--- a/PluginManager/PluginManager.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/PluginManager/PluginManager.py	Fri Dec 13 23:39:14 2013 +0100
@@ -12,12 +12,23 @@
 import os
 import sys
 import imp
+import zipfile
 
-from PyQt4.QtCore import pyqtSignal, QObject
+from PyQt4.QtCore import pyqtSignal, QObject, QDate, QFile, QFileInfo, QUrl, \
+    QIODevice
 from PyQt4.QtGui import QPixmap
+from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, \
+    QNetworkReply
 
 from E5Gui import E5MessageBox
 
+from E5Network.E5NetworkProxyFactory import proxyAuthenticationRequired
+try:
+    from E5Network.E5SslErrorHandler import E5SslErrorHandler
+    SSL_AVAILABLE = True
+except ImportError:
+    SSL_AVAILABLE = False
+
 from .PluginExceptions import PluginPathError, PluginModulesError, \
     PluginLoadError, PluginActivationError, PluginModuleFormatError, \
     PluginClassFormatError
@@ -119,6 +130,18 @@
             self.__loadPlugins()
         
         self.__checkPluginsDownloadDirectory()
+        
+        self.pluginRepositoryFile = \
+            os.path.join(Utilities.getConfigDir(), "PluginRepository")
+        
+        # attributes for the network objects
+        self.__networkManager = QNetworkAccessManager(self)
+        self.__networkManager.proxyAuthenticationRequired.connect(
+            proxyAuthenticationRequired)
+        if SSL_AVAILABLE:
+            self.__sslErrorHandler = E5SslErrorHandler(self)
+            self.__networkManager.sslErrors.connect(self.__sslErrors)
+        self.__replies = []
     
     def finalizeSetup(self):
         """
@@ -170,7 +193,7 @@
             fname = os.path.join(self.pluginDirs["user"], "__init__.py")
             if not os.path.exists(fname):
                 if not os.path.exists(self.pluginDirs["user"]):
-                    os.mkdir(self.pluginDirs["user"],  0o755)
+                    os.mkdir(self.pluginDirs["user"], 0o755)
                 try:
                     f = open(fname, "w")
                     f.close()
@@ -343,7 +366,7 @@
             module.error = self.trUtf8(
                 "Module failed to load. Error: {0}").format(str(err))
             self.__failedModules[name] = module
-            print("Error loading plugin module:",  name)
+            print("Error loading plugin module:", name)
             print(str(err))
     
     def unloadPlugin(self, name):
@@ -662,29 +685,29 @@
         infos = []
         
         for name in list(self.__activeModules.keys()):
-            pname,  shortDesc, error, version = \
+            pname, shortDesc, error, version = \
                 self.__getShortInfo(self.__activeModules[name])
-            infos.append((name,  pname, version, True, True, shortDesc, error))
+            infos.append((name, pname, version, True, True, shortDesc, error))
         for name in list(self.__inactiveModules.keys()):
-            pname,  shortDesc, error, version = \
+            pname, shortDesc, error, version = \
                 self.__getShortInfo(self.__inactiveModules[name])
             infos.append(
-                (name,  pname, version, True, False, shortDesc, error))
+                (name, pname, version, True, False, shortDesc, error))
         for name in list(self.__onDemandActiveModules.keys()):
-            pname,  shortDesc, error, version = \
+            pname, shortDesc, error, version = \
                 self.__getShortInfo(self.__onDemandActiveModules[name])
             infos.append(
-                (name,  pname, version, False, True, shortDesc, error))
+                (name, pname, version, False, True, shortDesc, error))
         for name in list(self.__onDemandInactiveModules.keys()):
-            pname,  shortDesc, error, version = \
+            pname, shortDesc, error, version = \
                 self.__getShortInfo(self.__onDemandInactiveModules[name])
             infos.append(
-                (name,  pname, version, False, False, shortDesc, error))
+                (name, pname, version, False, False, shortDesc, error))
         for name in list(self.__failedModules.keys()):
-            pname,  shortDesc, error, version = \
+            pname, shortDesc, error, version = \
                 self.__getShortInfo(self.__failedModules[name])
             infos.append(
-                (name,  pname, version, False, False, shortDesc, error))
+                (name, pname, version, False, False, shortDesc, error))
         return infos
     
     def __getShortInfo(self, module):
@@ -1017,3 +1040,158 @@
         Public slot to react to changes in configuration.
         """
         self.__checkPluginsDownloadDirectory()
+    
+    ########################################################################
+    ## Methods for automatic plug-in update check below
+    ########################################################################
+    
+    def checkPluginUpdatesAvailable(self):
+        """
+        Public method to check the availability of updates of plug-ins.
+        """
+        period = Preferences.getPluginManager("UpdatesCheckInterval")
+        if period == 0:
+            return
+        elif period in [2, 3, 4]:
+            lastModified = QFileInfo(self.pluginRepositoryFile).lastModified()
+            if lastModified.isValid() and lastModified.date().isValid():
+                lastModifiedDate = lastModified.date()
+                now = QDate.currentDate()
+                if period == 2 and lastModifiedDate.day() == now.day():
+                    # daily
+                    return
+                elif period == 3 and lastModifiedDate.daysTo(now) < 7:
+                    # weekly
+                    return
+                elif period == 4 and lastModifiedDate.month() == now.month():
+                    # monthly
+                    return
+        
+        self.__updateAvailable = False
+        
+        request = QNetworkRequest(
+            QUrl(Preferences.getUI("PluginRepositoryUrl5")))
+        request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
+                             QNetworkRequest.AlwaysNetwork)
+        reply = self.__networkManager.get(request)
+        reply.finished[()].connect(self.__downloadRepositoryFileDone)
+        self.__replies.append(reply)
+    
+    def __downloadRepositoryFileDone(self):
+        """
+        Private method called after the repository file was downloaded.
+        """
+        reply = self.sender()
+        if reply in self.__replies:
+            self.__replies.remove(reply)
+        if reply.error() != QNetworkReply.NoError:
+            E5MessageBox.warning(
+                None,
+                self.trUtf8("Error downloading file"),
+                self.trUtf8(
+                    """<p>Could not download the requested file"""
+                    """ from {0}.</p><p>Error: {1}</p>"""
+                ).format(Preferences.getUI("PluginRepositoryUrl5"),
+                         reply.errorString())
+            )
+            return
+        
+        ioDevice = QFile(self.pluginRepositoryFile + ".tmp")
+        ioDevice.open(QIODevice.WriteOnly)
+        ioDevice.write(reply.readAll())
+        ioDevice.close()
+        if QFile.exists(self.pluginRepositoryFile):
+            QFile.remove(self.pluginRepositoryFile)
+        ioDevice.rename(self.pluginRepositoryFile)
+        
+        if os.path.exists(self.pluginRepositoryFile):
+            f = QFile(self.pluginRepositoryFile)
+            if f.open(QIODevice.ReadOnly):
+                # save current URL
+                url = Preferences.getUI("PluginRepositoryUrl5")
+                
+                # read the repository file
+                from E5XML.PluginRepositoryReader import PluginRepositoryReader
+                reader = PluginRepositoryReader(f, self.checkPluginEntry)
+                reader.readXML()
+                if url != Preferences.getUI("PluginRepositoryUrl5"):
+                    # redo if it is a redirect
+                    self.checkPluginUpdatesAvailable()
+                    return
+                
+                if self.__updateAvailable:
+                    res = E5MessageBox.information(
+                        None,
+                        self.trUtf8("New plugin versions available"),
+                        self.trUtf8("<p>There are new plug-ins or plug-in"
+                                    " updates available. Use the plug-in"
+                                    " repository dialog to get them.</p>"),
+                        E5MessageBox.StandardButtons(
+                            E5MessageBox.Ignore | \
+                            E5MessageBox.Open),
+                        E5MessageBox.Open)
+                    if res == E5MessageBox.Open:
+                        self.__ui.showPluginsAvailable()
+    
+    def checkPluginEntry(self, name, short, description, url, author, version,
+                         filename, status):
+        """
+        Public method to check a plug-in's data for an update.
+        
+        @param name data for the name field (string)
+        @param short data for the short field (string)
+        @param description data for the description field (list of strings)
+        @param url data for the url field (string)
+        @param author data for the author field (string)
+        @param version data for the version field (string)
+        @param filename data for the filename field (string)
+        @param status status of the plugin (string [stable, unstable, unknown])
+        """
+        archive = os.path.join(Preferences.getPluginManager("DownloadPath"),
+                               filename)
+        
+        # Check against installed/loaded plug-ins
+        pluginName = os.path.splitext(url.rsplit("/", 1)[1])[0]
+        pluginDetails = self.getPluginDetails(pluginName)
+        if pluginDetails is None:
+            if not Preferences.getPluginManager("CheckInstalledOnly"):
+                self.__updateAvailable = True
+            return
+        
+        if pluginDetails["version"] < version:
+            self.__updateAvailable = True
+            return
+        
+        if not Preferences.getPluginManager("CheckInstalledOnly"):
+            # Check against downloaded plugin archives
+            # 1. Check, if the archive file exists
+            if not os.path.exists(archive):
+                self.__updateAvailable = True
+                return
+            
+            # 2. Check, if the archive is a valid zip file
+            if not zipfile.is_zipfile(archive):
+                self.__updateAvailable = True
+                return
+            
+            # 3. Check the version of the archive file
+            zip = zipfile.ZipFile(archive, "r")
+            try:
+                aversion = zip.read("VERSION").decode("utf-8")
+            except KeyError:
+                aversion = ""
+            zip.close()
+            
+            if aversion != version:
+                self.__updateAvailable = True
+    
+    def __sslErrors(self, reply, errors):
+        """
+        Private slot to handle SSL errors.
+        
+        @param reply reference to the reply object (QNetworkReply)
+        @param errors list of SSL errors (list of QSslError)
+        """
+        ignored = self.__sslErrorHandler.sslErrorsReply(reply, errors)[0]
+        if ignored == E5SslErrorHandler.NotIgnored:
+            self.__downloadCancelled = True
--- a/PluginManager/PluginRepositoryDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/PluginManager/PluginRepositoryDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -316,7 +316,7 @@
             f = QFile(self.pluginRepositoryFile)
             if f.open(QIODevice.ReadOnly):
                 from E5XML.PluginRepositoryReader import PluginRepositoryReader
-                reader = PluginRepositoryReader(f, self)
+                reader = PluginRepositoryReader(f, self.addEntry)
                 reader.readXML()
                 self.repositoryList.resizeColumnToContents(0)
                 self.repositoryList.resizeColumnToContents(1)
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -362,6 +362,8 @@
             self.checkProgress.setMaximum(len(py3files) + len(py2files))
             self.checkProgressLabel.setVisible(
                 len(py3files) + len(py2files) > 1)
+            self.checkProgress.setVisible(
+                len(py3files) + len(py2files) > 1)
             QApplication.processEvents()
             
             # extract the configuration values
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -58,6 +58,11 @@
                 message = QCoreApplication.translate(
                     "NamingStyleChecker",
                     NamingStyleChecker.Messages[code])
+            elif code in DocStyleChecker.MessagesSampleArgs:
+                message = QCoreApplication.translate(
+                    "DocStyleChecker",
+                    DocStyleChecker.Messages[code].format(
+                        *DocStyleChecker.MessagesSampleArgs[code]))
             elif code in DocStyleChecker.Messages:
                 message = QCoreApplication.translate(
                     "DocStyleChecker", DocStyleChecker.Messages[code])
--- a/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py	Fri Dec 13 23:39:14 2013 +0100
@@ -26,6 +26,8 @@
 
 from PyQt4.QtCore import QT_TRANSLATE_NOOP, QCoreApplication
 
+PyCF_ONLY_AST = 1024
+
 
 class DocStyleContext(object):
     """
@@ -118,6 +120,8 @@
         "D231", "D234", "D235", "D236", "D237", "D238", "D239",
         "D242", "D243", "D244", "D245", "D246", "D247",
         "D250", "D251",
+        
+        "D901",
     ]
     
     Messages = {
@@ -230,6 +234,13 @@
             "DocStyleChecker",
             "docstring contains a @exception line but function/method doesn't"
             " raise an exception"),
+        
+        "D901": QT_TRANSLATE_NOOP(
+            "DocStyleChecker", "{0}: {1}"),
+    }
+
+    MessagesSampleArgs = {
+        "D901": ["SyntaxError", "Invalid Syntax"],
     }
     
     def __init__(self, source, filename, select, ignore, expected, repeat,
@@ -394,6 +405,20 @@
             # record the issue with one based line number
             self.errors.append((self.__filename, lineNumber + 1, offset, text))
     
+    def __reportInvalidSyntax(self):
+        """
+        Private method to report a syntax error.
+        """
+        exc_type, exc = sys.exc_info()[:2]
+        if len(exc.args) > 1:
+            offset = exc.args[1]
+            if len(offset) > 2:
+                offset = offset[1:3]
+        else:
+            offset = (1, 0)
+        self.__error(offset[0] - 1, offset[1] or 0,
+                     'D901', exc_type.__name__, exc.args[0])
+    
     @classmethod
     def getMessage(cls, code, *args):
         """
@@ -442,6 +467,12 @@
             # don't do anything, if no codes were selected
             return
         
+        try:
+            compile(''.join(self.__source), '', 'exec', PyCF_ONLY_AST)
+        except (SyntaxError, TypeError):
+            self.__reportInvalidSyntax()
+            return
+        
         for keyword in self.__keywords:
             if keyword in self.__checkers:
                 for check in self.__checkers[keyword]:
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -62,6 +62,8 @@
         self.__project = None
         self.filterFrame.setVisible(False)
         
+        self.checkProgress.setVisible(False)
+        
     def __resort(self):
         """
         Private method to resort the tree.
@@ -140,6 +142,7 @@
         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
         self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.checkProgress.setVisible(True)
         QApplication.processEvents()
         
         self.__clearErrors()
@@ -244,6 +247,8 @@
         self.resultList.header().resizeSections(QHeaderView.ResizeToContents)
         self.resultList.header().setStretchLastSection(True)
         
+        self.checkProgress.setVisible(False)
+        
     def on_buttonBox_clicked(self, button):
         """
         Private slot called by a button of the button box clicked.
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -55,6 +55,8 @@
         self.__project = None
         self.filterFrame.setVisible(False)
         
+        self.checkProgress.setVisible(False)
+        
     def __resort(self):
         """
         Private method to resort the tree.
@@ -112,6 +114,7 @@
         self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
         self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+        self.checkProgress.setVisible(True)
         QApplication.processEvents()
         
         if isinstance(fn, list):
@@ -182,6 +185,8 @@
         self.resultList.header().resizeSections(QHeaderView.ResizeToContents)
         self.resultList.header().setStretchLastSection(True)
         
+        self.checkProgress.setVisible(False)
+        
     def on_buttonBox_clicked(self, button):
         """
         Private slot called by a button of the button box clicked.
--- a/Plugins/PluginWizardQFileDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/PluginWizardQFileDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -9,6 +9,8 @@
 
 from __future__ import unicode_literals    # __IGNORE_WARNING__
 
+import re
+
 from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog
 
@@ -44,6 +46,8 @@
         """
         super(FileDialogWizard, self).__init__(ui)
         self.__ui = ui
+        
+        self.__pyqtRe = re.compile(r"(?:import|from)\s+PyQt([45])")
 
     def activate(self):
         """
@@ -99,9 +103,15 @@
         @param editor reference to the current editor
         @return the generated code (string)
         """
+        match = self.__pyqtRe.search(editor.text())
+        if match is None:
+            pyqtVariant = 0    # unknown
+        else:
+            pyqtVariant = int(match.group(1))   # 4 or 5
+        
         from WizardPlugins.FileDialogWizard.FileDialogWizardDialog import \
             FileDialogWizardDialog
-        dlg = FileDialogWizardDialog(None)
+        dlg = FileDialogWizardDialog(pyqtVariant, None)
         if dlg.exec_() == QDialog.Accepted:
             line, index = editor.getCursorPosition()
             indLevel = editor.indentation(line) // editor.indentationWidth()
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Fri Dec 13 23:39:14 2013 +0100
@@ -483,6 +483,20 @@
         ))
         self.svnConfigAct.triggered[()].connect(self.__svnConfigure)
         self.actions.append(self.svnConfigAct)
+        
+        self.svnUpgradeAct = E5Action(
+            self.trUtf8('Upgrade'),
+            self.trUtf8('Upgrade...'),
+            0, 0, self, 'subversion_upgrade')
+        self.svnUpgradeAct.setStatusTip(self.trUtf8(
+            'Upgrade the working copy to the current format'
+        ))
+        self.svnUpgradeAct.setWhatsThis(self.trUtf8(
+            """<b>Upgrade</b>"""
+            """<p>Upgrades the working copy to the current format.</p>"""
+        ))
+        self.svnUpgradeAct.triggered[()].connect(self.__svnUpgrade)
+        self.actions.append(self.svnUpgradeAct)
     
     def initMenu(self, menu):
         """
@@ -540,6 +554,7 @@
         menu.addSeparator()
         menu.addAction(self.vcsCommandAct)
         menu.addAction(self.svnRepoBrowserAct)
+        menu.addAction(self.svnUpgradeAct)
         menu.addSeparator()
         menu.addAction(self.vcsPropsAct)
         menu.addSeparator()
@@ -631,3 +646,9 @@
         Private slot used to show a list of change lists.
         """
         self.vcs.svnShowChangelists(self.project.ppath)
+    
+    def __svnUpgrade(self):
+        """
+        Private slot used to upgrade the working copy format.
+        """
+        self.vcs.svnUpgrade(self.project.ppath)
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Fri Dec 13 23:39:14 2013 +0100
@@ -1497,7 +1497,7 @@
                 for file in allFiles:
                     # file.path is always unicode in Python 2
                     name = os.path.normcase(file.path)
-                    if file.is_versioned:
+                    if self.__isVersioned(file):
                         if name in names:
                             names[name] = self.canBeCommitted
                             dn = name
@@ -1572,7 +1572,7 @@
                 for file in allFiles:
                     # file.path is always unicode in Python 2
                     name = os.path.normcase(file.path)
-                    if file.is_versioned:
+                    if self.__isVersioned(file):
                         if name in names:
                             names[name] = self.canBeCommitted
                         self.statusCache[name] = self.canBeCommitted
@@ -1583,6 +1583,25 @@
         
         return names
         
+    def __isVersioned(self, status):
+        """
+        Private method to check, if the given status indicates a
+        versioned state.
+        
+        @param status status object to check (pysvn.PysvnStatus)
+        @return flag indicating a versioned state (boolean)
+        """
+        return status["text_status"] in [
+            pysvn.wc_status_kind.normal,
+            pysvn.wc_status_kind.added,
+            pysvn.wc_status_kind.missing,
+            pysvn.wc_status_kind.deleted,
+            pysvn.wc_status_kind.replaced,
+            pysvn.wc_status_kind.modified,
+            pysvn.wc_status_kind.merged,
+            pysvn.wc_status_kind.conflicted,
+        ]
+        
     def clearStatusCache(self):
         """
         Public method to clear the status cache.
@@ -2461,6 +2480,27 @@
             locker.unlock()
         
         return changelists
+        
+    def svnUpgrade(self, path):
+        """
+        Public method to upgrade the working copy format.
+        
+        @param path directory name to show change lists for (string)
+        """
+        client = self.getClient()
+        dlg = \
+            SvnDialog(self.trUtf8('Upgrade'),
+                      "upgrade {0}".format(path),
+                      client)
+        QApplication.processEvents()
+        locker = QMutexLocker(self.vcsExecutionMutex)
+        try:
+            client.upgrade(path)
+        except pysvn.ClientError as e:
+            dlg.showError(e.args[0])
+        locker.unlock()
+        dlg.finish()
+        dlg.exec_()
 
     ###########################################################################
     ## Private Subversion specific methods are below.
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Fri Dec 13 23:39:14 2013 +0100
@@ -467,6 +467,20 @@
         ))
         self.svnConfigAct.triggered[()].connect(self.__svnConfigure)
         self.actions.append(self.svnConfigAct)
+        
+        self.svnUpgradeAct = E5Action(
+            self.trUtf8('Upgrade'),
+            self.trUtf8('Upgrade...'),
+            0, 0, self, 'subversion_upgrade')
+        self.svnUpgradeAct.setStatusTip(self.trUtf8(
+            'Upgrade the working copy to the current format'
+        ))
+        self.svnUpgradeAct.setWhatsThis(self.trUtf8(
+            """<b>Upgrade</b>"""
+            """<p>Upgrades the working copy to the current format.</p>"""
+        ))
+        self.svnUpgradeAct.triggered[()].connect(self.__svnUpgrade)
+        self.actions.append(self.svnUpgradeAct)
     
     def initMenu(self, menu):
         """
@@ -524,6 +538,7 @@
         menu.addSeparator()
         menu.addAction(self.vcsCommandAct)
         menu.addAction(self.svnRepoBrowserAct)
+        menu.addAction(self.svnUpgradeAct)
         menu.addSeparator()
         menu.addAction(self.vcsPropsAct)
         menu.addSeparator()
@@ -609,3 +624,9 @@
         Private slot used to show a list of change lists.
         """
         self.vcs.svnShowChangelists(self.project.ppath)
+    
+    def __svnUpgrade(self):
+        """
+        Private slot used to upgrade the working copy format.
+        """
+        self.vcs.svnUpgrade(self.project.ppath)
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Dec 13 23:39:14 2013 +0100
@@ -2262,6 +2262,21 @@
                                 changelists.append(changelist)
         
         return changelists
+        
+    def svnUpgrade(self, path):
+        """
+        Public method to upgrade the working copy format.
+        
+        @param path directory name to show change lists for (string)
+        """
+        args = []
+        args.append("upgrade")
+        args.append(".")
+        
+        dia = SvnDialog(self.trUtf8('Upgrade'))
+        res = dia.startProcess(args, path)
+        if res:
+            dia.exec_()
 
     ###########################################################################
     ## Private Subversion specific methods are below.
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Fri Dec 13 23:39:14 2013 +0100
@@ -613,6 +613,14 @@
         
         return False
         
+    def getSplitOrientation(self):
+        """
+        Public method to get the orientation of the split view.
+        
+        @return orientation of the split (Qt.Horizontal or Qt.Vertical)
+        """
+        return self.stackArea.orientation()
+        
     def setSplitOrientation(self, orientation):
         """
         Public method used to set the orientation of the split view.
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Fri Dec 13 23:39:14 2013 +0100
@@ -1089,6 +1089,14 @@
         
         return False
         
+    def getSplitOrientation(self):
+        """
+        Public method to get the orientation of the split view.
+        
+        @return orientation of the split (Qt.Horizontal or Qt.Vertical)
+        """
+        return self.orientation()
+        
     def setSplitOrientation(self, orientation):
         """
         Public method used to set the orientation of the split view.
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -124,30 +124,47 @@
         estring = os.linesep + indLevel * indString
         
         # now generate the code
-        code = 'QColorDialog.'
+        if self.parentSelf.isChecked():
+            parent = "self"
+        elif self.parentNone.isChecked():
+            parent = "None"
+        elif self.parentOther.isChecked():
+            parent = self.parentEdit.text()
+            if parent == "":
+                parent = "None"
+        
+        resvar = self.eResultVar.text()
+        if not resvar:
+            resvar = "color"
+        code = '{0} = QColorDialog.'.format(resvar)
         if self.rColor.isChecked():
-            code += 'getColor('
+            code += 'getColor({0}'.format(os.linesep)
             if self.eColor.currentText():
                 col = self.eColor.currentText()
                 if col.startswith('#'):
-                    code += 'QColor("{0}")'.format(col)
+                    code += '{0}QColor("{1}"),{2}'.format(
+                        istring, col, os.linesep)
                 else:
-                    code += 'QColor({0})'.format(col)
-            code += ', None,{0}'.format(os.linesep)
+                    code += '{0}QColor({1}),{2}'.format(
+                        istring, col, os.linesep)
+            else:
+                code += '{0}QColor(Qt.white),{1}'.format(istring, os.linesep)
+            code += '{0}{1},{2}'.format(istring, parent, os.linesep)
             code += '{0}self.trUtf8("{1}"),{2}'.format(
                 istring, self.eTitle.text(), os.linesep)
             code += '{0}QColorDialog.ColorDialogOptions(' \
                 'QColorDialog.ShowAlphaChannel)'.format(istring)
             code += '){0}'.format(estring)
         elif self.rRGBA.isChecked():
-            code += 'getColor('
+            code += 'getColor({0}'.format(os.linesep)
             if not self.eRGB.text():
-                code += 'QColor({0:d}, {1:d}, {2:d}, {3:d}),{4}'.format(
-                    self.sRed.value(), self.sGreen.value(), self.sBlue.value(),
-                    self.sAlpha.value(), os.linesep)
+                code += '{0}QColor({1:d}, {2:d}, {3:d}, {4:d}),{5}'.format(
+                    istring, self.sRed.value(), self.sGreen.value(),
+                    self.sBlue.value(), self.sAlpha.value(), os.linesep)
             else:
-                code += '{0},{1}'.format(self.eRGB.text(), os.linesep)
-            code += '{0}None,{1}'.format(istring, os.linesep)
+                code += '{0}{1},{2}'.format(
+                    istring, self.eRGB.text(), os.linesep)
+            code += '{0}{1},{2}'.format(istring, parent, os.linesep)
             code += '{0}self.trUtf8("{1}"),{2}'.format(
                 istring, self.eTitle.text(), os.linesep)
             code += '{0}QColorDialog.ColorDialogOptions(' \
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>381</width>
-    <height>338</height>
+    <height>481</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -50,6 +50,22 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>Result</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLineEdit" name="eResultVar">
+        <property name="toolTip">
+         <string>Enter the result variable name</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="titleGroup">
      <property name="title">
       <string>Title</string>
@@ -66,6 +82,62 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="parentGroup">
+     <property name="title">
+      <string>Parent</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="parentSelf">
+        <property name="toolTip">
+         <string>Select &quot;self&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>self</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="parentNone">
+        <property name="toolTip">
+         <string>Select &quot;None&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>None</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="parentOther">
+          <property name="toolTip">
+           <string>Select to enter a parent expression</string>
+          </property>
+          <property name="text">
+           <string>Expression:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="parentEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Enter the parent expression</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Colour</string>
@@ -217,7 +289,7 @@
       <item row="2" column="0" colspan="4">
        <widget class="QLabel" name="TextLabel2">
         <property name="text">
-         <string>Variable</string>
+         <string>Colour Variable</string>
         </property>
        </widget>
       </item>
@@ -318,7 +390,12 @@
  <tabstops>
   <tabstop>rColor</tabstop>
   <tabstop>rRGBA</tabstop>
+  <tabstop>eResultVar</tabstop>
   <tabstop>eTitle</tabstop>
+  <tabstop>parentSelf</tabstop>
+  <tabstop>parentNone</tabstop>
+  <tabstop>parentOther</tabstop>
+  <tabstop>parentEdit</tabstop>
   <tabstop>eColor</tabstop>
   <tabstop>sRed</tabstop>
   <tabstop>sGreen</tabstop>
@@ -340,8 +417,8 @@
      <y>35</y>
     </hint>
     <hint type="destinationlabel">
-     <x>36</x>
-     <y>66</y>
+     <x>45</x>
+     <y>319</y>
     </hint>
    </hints>
   </connection>
@@ -356,8 +433,8 @@
      <y>38</y>
     </hint>
     <hint type="destinationlabel">
-     <x>209</x>
-     <y>122</y>
+     <x>218</x>
+     <y>442</y>
     </hint>
    </hints>
   </connection>
@@ -368,8 +445,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>20</x>
-     <y>263</y>
+     <x>29</x>
+     <y>471</y>
     </hint>
     <hint type="destinationlabel">
      <x>20</x>
@@ -384,8 +461,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>76</x>
-     <y>260</y>
+     <x>85</x>
+     <y>471</y>
     </hint>
     <hint type="destinationlabel">
      <x>76</x>
@@ -393,5 +470,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>parentOther</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>parentEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>82</x>
+     <y>241</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>122</x>
+     <y>240</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -422,7 +422,7 @@
             return ""
         
         istring2 = istring + indString
-        joinstring = ' | \\{0}{1}'.format(os.linesep, istring2)
+        joinstring = ' |{0}{1}'.format(os.linesep, istring2)
         if withIntro:
             btnCode = ',{0}{1}E5MessageBox.StandardButtons('.format(
                 os.linesep, istring)
@@ -482,28 +482,37 @@
             icon = "E5MessageBox.Critical"
         
         if not self.rStandard.isChecked():
+            resvar = self.eResultVar.text()
+            if not resvar:
+                resvar = "res"
+            
             if self.rAbout.isChecked():
                 msgdlg = "E5MessageBox.about({0}".format(os.linesep)
             elif self.rAboutQt.isChecked():
                 msgdlg = "E5MessageBox.aboutQt({0}".format(os.linesep)
             elif self.rInformation.isChecked():
-                msgdlg = "res = E5MessageBox.information({0}".format(
-                    os.linesep)
+                msgdlg = "{0} = E5MessageBox.information({1}".format(
+                    resvar, os.linesep)
             elif self.rQuestion.isChecked():
-                msgdlg = "res = E5MessageBox.question({0}".format(os.linesep)
+                msgdlg = "{0} = E5MessageBox.question({1}".format(
+                    resvar, os.linesep)
             elif self.rWarning.isChecked():
-                msgdlg = "res = E5MessageBox.warning({0}".format(os.linesep)
+                msgdlg = "{0} = E5MessageBox.warning({1}".format(
+                    resvar, os.linesep)
             elif self.rCritical.isChecked():
-                msgdlg = "res = E5MessageBox.critical({0}".format(os.linesep)
+                msgdlg = "{0} = E5MessageBox.critical({1}".format(
+                    resvar, os.linesep)
             elif self.rYesNo.isChecked():
-                msgdlg = "res = E5MessageBox.yesNo({0}".format(os.linesep)
+                msgdlg = "{0} = E5MessageBox.yesNo({1}".format(
+                    resvar, os.linesep)
             elif self.rRetryAbort.isChecked():
-                msgdlg = "res = E5MessageBox.retryAbort({0}".format(os.linesep)
+                msgdlg = "{0} = E5MessageBox.retryAbort({1}".format(
+                    resvar, os.linesep)
             elif self.rOkToClearData.isChecked():
-                msgdlg = "res = E5MessageBox.okToClearData({0}".format(
-                    os.linesep)
+                msgdlg = "{0} = E5MessageBox.okToClearData({1}".format(
+                    resvar, os.linesep)
             
-            msgdlg += '{0}{1}{2}'.format(istring, parent, os.linesep)
+            msgdlg += '{0}{1},{2}'.format(istring, parent, os.linesep)
             msgdlg += '{0}self.trUtf8("{1}")'.format(
                 istring, self.eCaption.text())
             
@@ -534,8 +543,13 @@
                     saveFunc = "lambda: True"
                 msgdlg += ',{0}{1}{2}'.format(os.linesep, istring, saveFunc)
         else:
-            msgdlg = "E5MessageBox.E5MessageBox({0}".format(os.linesep)
-            msgdlg += '{0}{1}{2}'.format(istring, icon, os.linesep)
+            resvar = self.eResultVar.text()
+            if not resvar:
+                resvar = "dlg"
+            
+            msgdlg = "{0} = E5MessageBox.E5MessageBox({1}".format(
+                resvar, os.linesep)
+            msgdlg += '{0}{1},{2}'.format(istring, icon, os.linesep)
             msgdlg += '{0}self.trUtf8("{1}")'.format(
                 istring, self.eCaption.text())
             msgdlg += ',{0}{1}self.trUtf8("""{2}""")'.format(
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>535</width>
-    <height>728</height>
+    <height>681</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -145,6 +145,20 @@
     </widget>
    </item>
    <item>
+    <widget class="QLabel" name="lResultVar">
+     <property name="text">
+      <string>Result:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="eResultVar">
+     <property name="toolTip">
+      <string>Enter the result variable name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Title</string>
@@ -526,6 +540,8 @@
   <tabstop>rOkToClearData</tabstop>
   <tabstop>rAbout</tabstop>
   <tabstop>rAboutQt</tabstop>
+  <tabstop>rStandard</tabstop>
+  <tabstop>eResultVar</tabstop>
   <tabstop>eCaption</tabstop>
   <tabstop>eMessage</tabstop>
   <tabstop>parentSelf</tabstop>
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -12,7 +12,7 @@
 import os
 
 from PyQt4.QtCore import pyqtSlot
-from PyQt4.QtGui import QDialog, QDialogButtonBox, QFileDialog
+from PyQt4.QtGui import QDialog, QDialogButtonBox, QFileDialog, QButtonGroup
 
 from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
 
@@ -28,10 +28,11 @@
     It displays a dialog for entering the parameters
     for the QFileDialog code generator.
     """
-    def __init__(self, parent=None):
+    def __init__(self, pyqtVariant, parent=None):
         """
         Constructor
         
+        @param pyqtVariant variant of PyQt (integer; 0, 4 or 5)
         @param parent parent widget (QWidget)
         """
         super(FileDialogWizardDialog, self).__init__(parent)
@@ -40,6 +41,27 @@
         self.eStartWithCompleter = E5FileCompleter(self.eStartWith)
         self.eWorkDirCompleter = E5DirCompleter(self.eWorkDir)
         
+        self.__pyqtVariant = pyqtVariant
+        
+        self.__typeButtonsGroup = QButtonGroup(self)
+        self.__typeButtonsGroup.setExclusive(True)
+        self.__typeButtonsGroup.addButton(self.rOpenFile, 1)
+        self.__typeButtonsGroup.addButton(self.rOpenFiles, 2)
+        self.__typeButtonsGroup.addButton(self.rSaveFile, 3)
+        self.__typeButtonsGroup.addButton(self.rfOpenFile, 11)
+        self.__typeButtonsGroup.addButton(self.rfOpenFiles, 12)
+        self.__typeButtonsGroup.addButton(self.rfSaveFile, 13)
+        self.__typeButtonsGroup.addButton(self.rDirectory, 20)
+        self.__typeButtonsGroup.buttonClicked[int].connect(
+            self.__toggleInitialFilterAndResult)
+        self.__toggleInitialFilterAndResult(1)
+        
+        self.pyqtComboBox.addItems(["PyQt4", "PyQt5"])
+        if self.__pyqtVariant == 5:
+            self.pyqtComboBox.setCurrentIndex(1)
+        else:
+            self.pyqtComboBox.setCurrentIndex(0)
+        
         self.rSaveFile.toggled[bool].connect(self.__toggleConfirmCheckBox)
         self.rfSaveFile.toggled[bool].connect(self.__toggleConfirmCheckBox)
         self.rDirectory.toggled[bool].connect(self.__toggleGroupsAndTest)
@@ -49,7 +71,7 @@
         
         self.bTest = self.buttonBox.addButton(
             self.trUtf8("Test"), QDialogButtonBox.ActionRole)
-        
+    
     def __adjustOptions(self, options):
         """
         Private method to adjust the file dialog options.
@@ -60,7 +82,30 @@
         if Globals.isLinuxPlatform():
             options |= QFileDialog.DontUseNativeDialog
         return options
+    
+    @pyqtSlot(str)
+    def on_pyqtComboBox_currentIndexChanged(self, txt):
+        """
+        Private slot to setup the dialog for the selected PyQt variant.
         
+        @param txt text of the selected combo box entry (string)
+        """
+        self.rfOpenFile.setEnabled(txt == "PyQt4")
+        self.rfOpenFiles.setEnabled(txt == "PyQt4")
+        self.rfSaveFile.setEnabled(txt == "PyQt4")
+        
+        if txt == "PyQt5":
+            if self.rfOpenFile.isChecked():
+                self.rOpenFile.setChecked(True)
+            elif self.rfOpenFiles.isChecked():
+                self.rOpenFiles.setChecked(True)
+            elif self.rfSaveFile.isChecked():
+                self.rSaveFile.setChecked(True)
+        
+        self.__pyqtVariant = 5 if txt == "PyQt5" else 4
+        
+        self.__toggleInitialFilterAndResult(self.__typeButtonsGroup.checkedId())
+    
     def on_buttonBox_clicked(self, button):
         """
         Private slot called by a button of the button box clicked.
@@ -81,36 +126,63 @@
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
-            QFileDialog.getOpenFileName(
-                None,
-                self.eCaption.text(),
-                self.eStartWith.text(),
-                self.eFilters.text(),
-                options)
+            if self.rOpenFile.isChecked() and self.__pyqtVariant == 4:
+                QFileDialog.getOpenFileName(
+                    None,
+                    self.eCaption.text(),
+                    self.eStartWith.text(),
+                    self.eFilters.text(),
+                    options)
+            else:
+                QFileDialog.getOpenFileNameAndFilter(
+                    None,
+                    self.eCaption.text(),
+                    self.eStartWith.text(),
+                    self.eFilters.text(),
+                    self.eInitialFilter.text(),
+                    options)
         elif self.rOpenFiles.isChecked() or self.rfOpenFiles.isChecked():
             if not self.cSymlinks.isChecked():
                 options = QFileDialog.Options(QFileDialog.DontResolveSymlinks)
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
-            QFileDialog.getOpenFileNames(
-                None,
-                self.eCaption.text(),
-                self.eStartWith.text(),
-                self.eFilters.text(),
-                options)
+            if self.rOpenFiles.isChecked() and self.__pyqtVariant == 4:
+                QFileDialog.getOpenFileNames(
+                    None,
+                    self.eCaption.text(),
+                    self.eStartWith.text(),
+                    self.eFilters.text(),
+                    options)
+            else:
+                QFileDialog.getOpenFileNamesAndFilter(
+                    None,
+                    self.eCaption.text(),
+                    self.eStartWith.text(),
+                    self.eFilters.text(),
+                    self.eInitialFilter.text(),
+                    options)
         elif self.rSaveFile.isChecked() or self.rfSaveFile.isChecked():
             if not self.cSymlinks.isChecked():
                 options = QFileDialog.Options(QFileDialog.DontResolveSymlinks)
             else:
                 options = QFileDialog.Options()
             options = self.__adjustOptions(options)
-            QFileDialog.getSaveFileName(
-                None,
-                self.eCaption.text(),
-                self.eStartWith.text(),
-                self.eFilters.text(),
-                options)
+            if self.rSaveFile.isChecked() and self.__pyqtVariant == 4:
+                QFileDialog.getSaveFileName(
+                    None,
+                    self.eCaption.text(),
+                    self.eStartWith.text(),
+                    self.eFilters.text(),
+                    options)
+            else:
+                QFileDialog.getSaveFileNameAndFilter(
+                    None,
+                    self.eCaption.text(),
+                    self.eStartWith.text(),
+                    self.eFilters.text(),
+                    self.eInitialFilter.text(),
+                    options)
         elif self.rDirectory.isChecked():
             options = QFileDialog.Options()
             if not self.cSymlinks.isChecked():
@@ -125,14 +197,14 @@
                 self.eCaption.text(),
                 self.eWorkDir.text(),
                 options)
-        
+    
     def __toggleConfirmCheckBox(self):
         """
         Private slot to enable/disable the confirmation check box.
         """
         self.cConfirmOverwrite.setEnabled(
             self.rSaveFile.isChecked() or self.rfSaveFile.isChecked())
-        
+    
     def __toggleGroupsAndTest(self):
         """
         Private slot to enable/disable certain groups and the test button.
@@ -146,10 +218,29 @@
             self.dirPropertiesGroup.setEnabled(False)
             self.bTest.setDisabled(
                 self.cStartWith.isChecked() or self.cFilters.isChecked())
+    
+    def __toggleInitialFilterAndResult(self, id):
+        """
+        Private slot to enable/disable the initial filter elements and the
+        results entries.
         
-    def __getCode4(self, indLevel, indString):
+        @param id id of the clicked button (integer)
         """
-        Private method to get the source code for Qt4/Qt5.
+        if (self.__pyqtVariant == 4 and id in [11, 12, 13]) or \
+                (self.__pyqtVariant == 5 and id in [1, 2, 3]):
+            enable = True
+        else:
+            enable = False
+        self.lInitialFilter.setEnabled(enable)
+        self.eInitialFilter.setEnabled(enable)
+        self.cInitialFilter.setEnabled(enable)
+        
+        self.lFilterVariable.setEnabled(enable)
+        self.eFilterVariable.setEnabled(enable)
+    
+    def getCode(self, indLevel, indString):
+        """
+        Public method to get the source code for Qt4 and Qt5.
         
         @param indLevel indentation level (int)
         @param indString string used for indentation (space or tab) (string)
@@ -161,14 +252,49 @@
         estring = os.linesep + indLevel * indString
         
         # now generate the code
-        code = 'QFileDialog.'
+        if self.parentSelf.isChecked():
+            parent = "self"
+        elif self.parentNone.isChecked():
+            parent = "None"
+        elif self.parentOther.isChecked():
+            parent = self.parentEdit.text()
+            if parent == "":
+                parent = "None"
+        
+        # prepare the result variables
+        nameVariable = self.eNameVariable.text()
+        if not nameVariable:
+            if self.__typeButtonsGroup.checkedButton() in [
+                    self.rOpenFile, self.rfOpenFile,
+                    self.rSaveFile, self.rfSaveFile]:
+                nameVariable = "fileName"
+            elif self.__typeButtonsGroup.checkedButton() in [
+                    self.rOpenFiles, self.rfOpenFiles]:
+                nameVariable = "fileNames"
+            elif self.__typeButtonsGroup.checkedButton() == self.rDirectory:
+                nameVariable = "dirName"
+            else:
+                nameVariable = "res"
+        filterVariable = self.eFilterVariable.text()
+        if not filterVariable:
+            if (self.__pyqtVariant == 4 and
+                self.__typeButtonsGroup.checkedButton() in [
+                    self.rfOpenFile, self.rfOpenFiles, self.rfSaveFile]) or \
+                (self.__pyqtVariant == 5 and
+                self.__typeButtonsGroup.checkedButton() in [
+                    self.rOpenFile, self.rOpenFiles, self.rSaveFile]):
+                filterVariable = ", selectedFilter"
+            else:
+                filterVariable = ""
+        
+        code = '{0}{1} = QFileDialog.'.format(nameVariable, filterVariable)
         if self.rOpenFile.isChecked() or self.rfOpenFile.isChecked():
             if self.rOpenFile.isChecked():
                 code += 'getOpenFileName({0}{1}'.format(os.linesep, istring)
             else:
                 code += 'getOpenFileNameAndFilter({0}{1}'.format(
                     os.linesep, istring)
-            code += 'None,{0}{1}'.format(os.linesep, istring)
+            code += '{0},{1}{2}'.format(parent, os.linesep, istring)
             if not self.eCaption.text():
                 code += '"",{0}{1}'.format(os.linesep, istring)
             else:
@@ -190,8 +316,16 @@
                 else:
                     fmt = 'self.trUtf8("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfOpenFile.isChecked():
-                code += ',{0}{1}None'.format(os.linesep, istring)
+            if self.rfOpenFile.isChecked() or self.__pyqtVariant == 5:
+                if self.eInitialFilter.text() == "":
+                    filter = "None"
+                else:
+                    if self.cInitialFilter.isChecked():
+                        fmt = '{0}'
+                    else:
+                        fmt = 'self.trUtf8("{0}")'
+                    filter = fmt.format(self.eInitialFilter.text())
+                code += ',{0}{1}{2}'.format(os.linesep, istring, filter)
             if not self.cSymlinks.isChecked():
                 code += \
                     ',{0}{1}QFileDialog.Options(' \
@@ -204,7 +338,7 @@
             else:
                 code += 'getOpenFileNamesAndFilter({0}{1}'.format(
                     os.linesep, istring)
-            code += 'None,{0}{1}'.format(os.linesep, istring)
+            code += '{0},{1}{2}'.format(parent, os.linesep, istring)
             if not self.eCaption.text():
                 code += '"",{0}{1}'.format(os.linesep, istring)
             else:
@@ -226,8 +360,16 @@
                 else:
                     fmt = 'self.trUtf8("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfOpenFiles.isChecked():
-                code += ',{0}{1}None'.format(os.linesep, istring)
+            if self.rfOpenFiles.isChecked() or self.__pyqtVariant == 5:
+                if self.eInitialFilter.text() == "":
+                    filter = "None"
+                else:
+                    if self.cInitialFilter.isChecked():
+                        fmt = '{0}'
+                    else:
+                        fmt = 'self.trUtf8("{0}")'
+                    filter = fmt.format(self.eInitialFilter.text())
+                code += ',{0}{1}{2}'.format(os.linesep, istring, filter)
             if not self.cSymlinks.isChecked():
                 code += \
                     ',{0}{1}QFileDialog.Options(' \
@@ -240,7 +382,7 @@
             else:
                 code += 'getSaveFileNameAndFilter({0}{1}'.format(
                     os.linesep, istring)
-            code += 'None,{0}{1}'.format(os.linesep, istring)
+            code += '{0},{1}{2}'.format(parent, os.linesep, istring)
             if not self.eCaption.text():
                 code += '"",{0}{1}'.format(os.linesep, istring)
             else:
@@ -262,8 +404,16 @@
                 else:
                     fmt = 'self.trUtf8("{0}")'
                 code += fmt.format(self.eFilters.text())
-            if self.rfSaveFile.isChecked():
-                code += ',{0}{1}None'.format(os.linesep, istring)
+            if self.rfSaveFile.isChecked() or self.__pyqtVariant == 5:
+                if self.eInitialFilter.text() == "":
+                    filter = "None"
+                else:
+                    if self.cInitialFilter.isChecked():
+                        fmt = '{0}'
+                    else:
+                        fmt = 'self.trUtf8("{0}")'
+                    filter = fmt.format(self.eInitialFilter.text())
+                code += ',{0}{1}{2}'.format(os.linesep, istring, filter)
             if (not self.cSymlinks.isChecked()) or \
                (not self.cConfirmOverwrite.isChecked()):
                 code += ',{0}{1}QFileDialog.Options('.format(
@@ -279,7 +429,7 @@
             code += '){0}'.format(estring)
         elif self.rDirectory.isChecked():
             code += 'getExistingDirectory({0}{1}'.format(os.linesep, istring)
-            code += 'None,{0}{1}'.format(os.linesep, istring)
+            code += '{0},{1}{2}'.format(parent, os.linesep, istring)
             if not self.eCaption.text():
                 code += '"",{0}{1}'.format(os.linesep, istring)
             else:
@@ -303,13 +453,3 @@
             code += ')){0}'.format(estring)
             
         return code
-        
-    def getCode(self, indLevel, indString):
-        """
-        Public method to get the source code.
-        
-        @param indLevel indentation level (int)
-        @param indString string used for indentation (space or tab) (string)
-        @return generated code (string)
-        """
-        return self.__getCode4(indLevel, indString)
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>557</width>
-    <height>479</height>
+    <width>604</width>
+    <height>660</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,7 +18,34 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="groupBox">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>PyQt Variant:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="pyqtComboBox"/>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</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="typeGroupBox">
      <property name="title">
       <string>Type</string>
      </property>
@@ -103,18 +130,51 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="TextLabel1">
-     <property name="text">
-      <string>Caption</string>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Results</string>
      </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Name Variable:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="eNameVariable"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="lFilterVariable">
+        <property name="text">
+         <string>Filter Variable:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="eFilterVariable"/>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
-    <widget class="QLineEdit" name="eCaption">
-     <property name="toolTip">
-      <string>Enter the caption text</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="TextLabel1">
+       <property name="text">
+        <string>Title:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="eCaption">
+       <property name="toolTip">
+        <string>Enter the title text</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QCheckBox" name="cSymlinks">
@@ -130,25 +190,78 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="parentGroup">
+     <property name="title">
+      <string>Parent</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="parentSelf">
+        <property name="toolTip">
+         <string>Select &quot;self&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>self</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="parentNone">
+        <property name="toolTip">
+         <string>Select &quot;None&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>None</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="parentOther">
+          <property name="toolTip">
+           <string>Select to enter a parent expression</string>
+          </property>
+          <property name="text">
+           <string>Expression:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="parentEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Enter the parent expression</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="filePropertiesGroup">
      <property name="title">
       <string>File Dialog Properties</string>
      </property>
-     <layout class="QGridLayout">
-      <item row="3" column="1">
-       <widget class="QCheckBox" name="cFilters">
-        <property name="toolTip">
-         <string>Check this if the contents of the edit names a variable or variable function</string>
-        </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="TextLabel3">
         <property name="text">
-         <string>Is Variable</string>
+         <string>Start With / Working Directory</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QLineEdit" name="eFilters">
+      <item row="1" column="0">
+       <widget class="QLineEdit" name="eStartWith">
         <property name="toolTip">
-         <string>Enter the filter specifications separated by ';;'</string>
+         <string>Enter the working directory or a filename</string>
         </property>
        </widget>
       </item>
@@ -162,13 +275,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLineEdit" name="eStartWith">
-        <property name="toolTip">
-         <string>Enter the working directory or a filename</string>
-        </property>
-       </widget>
-      </item>
       <item row="2" column="0" colspan="2">
        <widget class="QLabel" name="TextLabel2">
         <property name="text">
@@ -176,7 +282,48 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0">
+       <widget class="QLineEdit" name="eFilters">
+        <property name="toolTip">
+         <string>Enter the filter specifications separated by ';;'</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QCheckBox" name="cFilters">
+        <property name="toolTip">
+         <string>Check this if the contents of the edit names a variable or variable function</string>
+        </property>
+        <property name="text">
+         <string>Is Variable</string>
+        </property>
+       </widget>
+      </item>
       <item row="4" column="0" colspan="2">
+       <widget class="QLabel" name="lInitialFilter">
+        <property name="text">
+         <string>Initial Filter</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLineEdit" name="eInitialFilter">
+        <property name="toolTip">
+         <string>Enter the initial filter</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QCheckBox" name="cInitialFilter">
+        <property name="toolTip">
+         <string>Check this if the contents of the edit names a variable or variable function</string>
+        </property>
+        <property name="text">
+         <string>Is Variable</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0" colspan="2">
        <widget class="QCheckBox" name="cConfirmOverwrite">
         <property name="enabled">
          <bool>false</bool>
@@ -189,13 +336,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="text">
-         <string>Start With / Working Directory</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -263,19 +403,28 @@
  <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
+  <tabstop>pyqtComboBox</tabstop>
   <tabstop>rOpenFile</tabstop>
+  <tabstop>rOpenFiles</tabstop>
+  <tabstop>rSaveFile</tabstop>
+  <tabstop>rDirectory</tabstop>
   <tabstop>rfOpenFile</tabstop>
-  <tabstop>rOpenFiles</tabstop>
   <tabstop>rfOpenFiles</tabstop>
-  <tabstop>rSaveFile</tabstop>
   <tabstop>rfSaveFile</tabstop>
-  <tabstop>rDirectory</tabstop>
+  <tabstop>eNameVariable</tabstop>
+  <tabstop>eFilterVariable</tabstop>
   <tabstop>eCaption</tabstop>
   <tabstop>cSymlinks</tabstop>
+  <tabstop>parentSelf</tabstop>
+  <tabstop>parentNone</tabstop>
+  <tabstop>parentOther</tabstop>
+  <tabstop>parentEdit</tabstop>
   <tabstop>eStartWith</tabstop>
   <tabstop>cStartWith</tabstop>
   <tabstop>eFilters</tabstop>
   <tabstop>cFilters</tabstop>
+  <tabstop>eInitialFilter</tabstop>
+  <tabstop>cInitialFilter</tabstop>
   <tabstop>cConfirmOverwrite</tabstop>
   <tabstop>eWorkDir</tabstop>
   <tabstop>cWorkDir</tabstop>
@@ -291,8 +440,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>25</x>
-     <y>464</y>
+     <x>29</x>
+     <y>615</y>
     </hint>
     <hint type="destinationlabel">
      <x>24</x>
@@ -307,8 +456,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>124</x>
-     <y>470</y>
+     <x>128</x>
+     <y>615</y>
     </hint>
     <hint type="destinationlabel">
      <x>124</x>
@@ -316,5 +465,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>parentOther</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>parentEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>70</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>141</x>
+     <y>260</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -91,17 +91,44 @@
         @param indString string used for indentation (space or tab) (string)
         @return generated code (string)
         """
+        # calculate our indentation level and the indentation string
+        il = indLevel + 1
+        istring = il * indString
         estring = os.linesep + indLevel * indString
         
         # generate the code
-        code = 'QFontDialog.getFont('
-        if not self.eVariable.text():
-            if self.font is not None:
-                code += 'QFont("{0}", {1:d}, {2:d}, {3:d})'.format(
-                    self.font.family(), self.font.pointSize(),
-                    self.font.weight(), self.font.italic())
-        else:
-            code += self.eVariable.text()
+        resvar = self.eResultVar.text()
+        if not resvar:
+            resvar = "font"
+        title = self.eCaption.text()
+        if self.parentSelf.isChecked():
+            parent = "self"
+        elif self.parentNone.isChecked():
+            parent = "None"
+        elif self.parentOther.isChecked():
+            parent = self.parentEdit.text()
+            if parent == "":
+                parent = "None"
+        
+        code = '{0}, ok = QFontDialog.getFont('.format(resvar)
+        if self.eVariable.text() or self.font is not None:
+            if title or parent != "None":
+                code += '{0}{1}'.format(os.linesep, istring)
+            if not self.eVariable.text():
+                if self.font is not None:
+                    code += 'QFont("{0}", {1:d}, {2:d}, {3:d})'.format(
+                        self.font.family(), self.font.pointSize(),
+                        self.font.weight(), self.font.italic())
+            else:
+                code += self.eVariable.text()
+            if title:
+                code += ',{0}{1}{2}'.format(
+                    os.linesep, istring, parent)
+                code += ',{0}{1}self.trUtf8("{2}")'.format(
+                    os.linesep, istring, title)
+            elif parent != "None":
+                code += ',{0}{1}{2}'.format(
+                    os.linesep, istring, parent)
         code += '){0}'.format(estring)
-            
+        
         return code
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -1,32 +1,117 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>FontDialogWizardDialog</class>
- <widget class="QDialog" name="FontDialogWizardDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="FontDialogWizardDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>377</width>
-    <height>118</height>
+    <height>291</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>QFontDialog Wizard</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Result:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="eResultVar">
+     <property name="toolTip">
+      <string>Enter the result variable name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="textLabel1">
+     <property name="text">
+      <string>Title:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="eCaption">
+     <property name="toolTip">
+      <string>Enter the title for the message box</string>
+     </property>
+    </widget>
+   </item>
    <item>
-    <layout class="QHBoxLayout" >
+    <widget class="QGroupBox" name="parentGroup">
+     <property name="title">
+      <string>Parent</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="parentSelf">
+        <property name="toolTip">
+         <string>Select &quot;self&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>self</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="parentNone">
+        <property name="toolTip">
+         <string>Select &quot;None&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>None</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="parentOther">
+          <property name="toolTip">
+           <string>Select to enter a parent expression</string>
+          </property>
+          <property name="text">
+           <string>Expression:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="parentEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Enter the parent expression</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout">
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>30</width>
          <height>0</height>
@@ -35,24 +120,24 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="fontButton" >
-       <property name="toolTip" >
+      <widget class="QPushButton" name="fontButton">
+       <property name="toolTip">
         <string>Press to select a font via a dialog</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Select Font ...</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>30</width>
          <height>0</height>
@@ -63,36 +148,43 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="TextLabel1" >
-     <property name="text" >
-      <string>Variable</string>
+    <widget class="QLabel" name="TextLabel1">
+     <property name="text">
+      <string>Font Variable:</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLineEdit" name="eVariable" >
-     <property name="toolTip" >
+    <widget class="QLineEdit" name="eVariable">
+     <property name="toolTip">
       <string>Enter a variable name</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
+  <tabstop>eResultVar</tabstop>
+  <tabstop>eCaption</tabstop>
+  <tabstop>parentSelf</tabstop>
+  <tabstop>parentNone</tabstop>
+  <tabstop>parentOther</tabstop>
+  <tabstop>parentEdit</tabstop>
   <tabstop>fontButton</tabstop>
   <tabstop>eVariable</tabstop>
+  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -102,11 +194,11 @@
    <receiver>FontDialogWizardDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>97</y>
+    <hint type="sourcelabel">
+     <x>29</x>
+     <y>281</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>120</y>
     </hint>
@@ -118,15 +210,31 @@
    <receiver>FontDialogWizardDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>76</x>
-     <y>100</y>
+    <hint type="sourcelabel">
+     <x>85</x>
+     <y>281</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>76</x>
      <y>119</y>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>parentOther</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>parentEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>61</x>
+     <y>156</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>130</x>
+     <y>157</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -112,7 +112,7 @@
                 doubleTo,
                 self.sDoubleDecimals.value())
         
-    def __getCode4(self, indLevel, indString):
+    def getCode(self, indLevel, indString):
         """
         Private method to get the source code for Qt4/Qt5.
         
@@ -126,10 +126,23 @@
         estring = os.linesep + indLevel * indString
         
         # now generate the code
-        code = 'QInputDialog.'
+        # TODO: support entering 'parent'
+        if self.parentSelf.isChecked():
+            parent = "self"
+        elif self.parentNone.isChecked():
+            parent = "None"
+        elif self.parentOther.isChecked():
+            parent = self.parentEdit.text()
+            if parent == "":
+                parent = "None"
+        
+        resvar = self.eResultVar.text()
+        if not resvar:
+            resvar = "result"
+        code = '{0}, ok = QInputDialog.'.format(resvar)
         if self.rText.isChecked():
             code += 'getText({0}{1}'.format(os.linesep, istring)
-            code += 'None,{0}{1}'.format(os.linesep, istring)
+            code += '{0},{1}{2}'.format(parent, os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
                 self.eCaption.text(), os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
@@ -146,7 +159,7 @@
             code += '){0}'.format(estring)
         elif self.rInteger.isChecked():
             code += 'getInt({0}{1}'.format(os.linesep, istring)
-            code += 'None,{0}{1}'.format(os.linesep, istring)
+            code += '{0},{1}{2}'.format(parent, os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
                 self.eCaption.text(), os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
@@ -168,7 +181,7 @@
             except ValueError:
                 doubleTo = 2147483647
             code += 'getDouble({0}{1}'.format(os.linesep, istring)
-            code += 'None,{0}{1}'.format(os.linesep, istring)
+            code += '{0},{1}{2}'.format(parent, os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
                 self.eCaption.text(), os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
@@ -178,7 +191,7 @@
                 self.sDoubleDecimals.value(), estring)
         elif self.rItem.isChecked():
             code += 'getItem({0}{1}'.format(os.linesep, istring)
-            code += 'None,{0}{1}'.format(os.linesep, istring)
+            code += '{0},{1}{2}'.format(parent, os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
                 self.eCaption.text(), os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
@@ -189,13 +202,3 @@
                 self.sCurrentItem.value(), self.cEditable.isChecked(), estring)
             
         return code
-        
-    def getCode(self, indLevel, indString):
-        """
-        Public method to get the source code.
-        
-        @param indLevel indentation level (int)
-        @param indString string used for indentation (space or tab) (string)
-        @return generated code (string)
-        """
-        return self.__getCode4(indLevel, indString)
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>501</width>
-    <height>658</height>
+    <height>684</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,7 +16,7 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -58,9 +58,23 @@
     </widget>
    </item>
    <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Result:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="eResultVar">
+     <property name="toolTip">
+      <string>Enter the result variable name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QLabel" name="TextLabel1">
      <property name="text">
-      <string>Caption</string>
+      <string>Title</string>
      </property>
     </widget>
    </item>
@@ -78,6 +92,62 @@
     <widget class="QLineEdit" name="eLabel"/>
    </item>
    <item>
+    <widget class="QGroupBox" name="parentGroup">
+     <property name="title">
+      <string>Parent</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="parentSelf">
+        <property name="toolTip">
+         <string>Select &quot;self&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>self</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QRadioButton" name="parentNone">
+        <property name="toolTip">
+         <string>Select &quot;None&quot; as parent</string>
+        </property>
+        <property name="text">
+         <string>None</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="parentOther">
+          <property name="toolTip">
+           <string>Select to enter a parent expression</string>
+          </property>
+          <property name="text">
+           <string>Expression:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="parentEdit">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Enter the parent expression</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Text</string>
@@ -353,8 +423,13 @@
   <tabstop>rInteger</tabstop>
   <tabstop>rDouble</tabstop>
   <tabstop>rItem</tabstop>
+  <tabstop>eResultVar</tabstop>
   <tabstop>eCaption</tabstop>
   <tabstop>eLabel</tabstop>
+  <tabstop>parentSelf</tabstop>
+  <tabstop>parentNone</tabstop>
+  <tabstop>parentOther</tabstop>
+  <tabstop>parentEdit</tabstop>
   <tabstop>rEchoNormal</tabstop>
   <tabstop>rEchoNoEcho</tabstop>
   <tabstop>rEchoPassword</tabstop>
@@ -370,6 +445,7 @@
   <tabstop>eVariable</tabstop>
   <tabstop>sCurrentItem</tabstop>
   <tabstop>cEditable</tabstop>
+  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -380,12 +456,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>55</x>
-     <y>108</y>
+     <x>74</x>
+     <y>48</y>
     </hint>
     <hint type="destinationlabel">
-     <x>30</x>
-     <y>222</y>
+     <x>39</x>
+     <y>411</y>
     </hint>
    </hints>
   </connection>
@@ -396,12 +472,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>171</x>
-     <y>88</y>
+     <x>247</x>
+     <y>48</y>
     </hint>
     <hint type="destinationlabel">
-     <x>169</x>
-     <y>359</y>
+     <x>178</x>
+     <y>489</y>
     </hint>
    </hints>
   </connection>
@@ -412,12 +488,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>272</x>
-     <y>89</y>
+     <x>364</x>
+     <y>48</y>
     </hint>
     <hint type="destinationlabel">
-     <x>274</x>
-     <y>433</y>
+     <x>283</x>
+     <y>567</y>
     </hint>
    </hints>
   </connection>
@@ -428,12 +504,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>439</x>
-     <y>94</y>
+     <x>481</x>
+     <y>48</y>
     </hint>
     <hint type="destinationlabel">
-     <x>439</x>
-     <y>513</y>
+     <x>448</x>
+     <y>645</y>
     </hint>
    </hints>
   </connection>
@@ -444,8 +520,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>25</x>
-     <y>605</y>
+     <x>34</x>
+     <y>674</y>
     </hint>
     <hint type="destinationlabel">
      <x>25</x>
@@ -460,8 +536,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>111</x>
-     <y>612</y>
+     <x>120</x>
+     <y>674</y>
     </hint>
     <hint type="destinationlabel">
      <x>111</x>
@@ -469,5 +545,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>parentOther</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>parentEdit</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>81</x>
+     <y>253</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>124</x>
+     <y>260</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -215,9 +215,10 @@
         """
         Private method to enable/disable some group boxes.
         """
-        self.standardButtons.setEnabled(not self.rAbout.isChecked() and
-                                        not self.rAboutQt.isChecked()
-                                        )
+        enable = not self.rAbout.isChecked() and not self.rAboutQt.isChecked()
+        self.standardButtons.setEnabled(enable)
+        self.lResultVar.setEnabled(enable)
+        self.eResultVar.setEnabled(enable)
         
         self.eMessage.setEnabled(not self.rAboutQt.isChecked())
     
@@ -286,7 +287,7 @@
             return ""
         
         istring2 = istring + indString
-        joinstring = ' | \\{0}{1}'.format(os.linesep, istring2)
+        joinstring = ' |{0}{1}'.format(os.linesep, istring2)
         btnCode = ',{0}{1}QMessageBox.StandardButtons('.format(
             os.linesep, istring)
         btnCode += '{0}{1}{2})'.format(
@@ -321,25 +322,37 @@
             if parent == "":
                 parent = "None"
         
+        resvar = self.eResultVar.text()
+        if not resvar:
+            resvar = "res"
+        
         if self.rAbout.isChecked():
-            msgdlg = "QMessageBox.about({0}".format(os.linesep)
+            msgdlg = "QMessageBox.about("
         elif self.rAboutQt.isChecked():
-            msgdlg = "QMessageBox.aboutQt({0}".format(os.linesep)
+            msgdlg = "QMessageBox.aboutQt("
         elif self.rInformation.isChecked():
-            msgdlg = "res = QMessageBox.information({0}".format(os.linesep)
+            msgdlg = "{0} = QMessageBox.information(".format(resvar)
         elif self.rQuestion.isChecked():
-            msgdlg = "res = QMessageBox.question({0}".format(os.linesep)
+            msgdlg = "{0} = QMessageBox.question(".format(resvar)
         elif self.rWarning.isChecked():
-            msgdlg = "res = QMessageBox.warning({0}".format(os.linesep)
+            msgdlg = "{0} = QMessageBox.warning(".format(resvar)
         else:
-            msgdlg = "res = QMessageBox.critical({0}".format(os.linesep)
+            msgdlg = "{0} = QMessageBox.critical(".format(resvar)
         
-        msgdlg += '{0}{1}{2}'.format(istring, parent, os.linesep)
-        msgdlg += '{0}self.trUtf8("{1}")'.format(istring, self.eCaption.text())
-        if not self.rAboutQt.isChecked():
+        if self.rAboutQt.isChecked():
+            if self.eCaption.text():
+                msgdlg += '{0}{1}{2}'.format(os.linesep, istring, parent)
+                msgdlg += ',{0}{1}self.trUtf8("{2}")'.format(
+                    os.linesep, istring, self.eCaption.text())
+            else:
+                msgdlg += parent
+        else:
+            msgdlg += '{0}{1}{2}'.format(os.linesep, istring, parent)
+            msgdlg += ',{0}{1}self.trUtf8("{2}")'.format(
+                os.linesep, istring, self.eCaption.text())
             msgdlg += ',{0}{1}self.trUtf8("""{2}""")'.format(
                 os.linesep, istring, self.eMessage.toPlainText())
-        if not self.rAbout.isChecked() and not self.rAboutQt.isChecked():
-            msgdlg += self.__getButtonCode(istring, indString)
+            if not self.rAbout.isChecked() and not self.rAboutQt.isChecked():
+                msgdlg += self.__getButtonCode(istring, indString)
         msgdlg += '){0}'.format(estring)
         return msgdlg
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>535</width>
-    <height>539</height>
+    <height>522</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -105,6 +105,20 @@
     </widget>
    </item>
    <item>
+    <widget class="QLabel" name="lResultVar">
+     <property name="text">
+      <string>Result:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="eResultVar">
+     <property name="toolTip">
+      <string>Enter the result variable name</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QLabel" name="textLabel1">
      <property name="text">
       <string>Title</string>
@@ -114,7 +128,7 @@
    <item>
     <widget class="QLineEdit" name="eCaption">
      <property name="toolTip">
-      <string>Enter the caption for the QMessageBox</string>
+      <string>Enter the title for the QMessageBox</string>
      </property>
     </widget>
    </item>
@@ -375,6 +389,7 @@
   <tabstop>rCritical</tabstop>
   <tabstop>rAbout</tabstop>
   <tabstop>rAboutQt</tabstop>
+  <tabstop>eResultVar</tabstop>
   <tabstop>eCaption</tabstop>
   <tabstop>eMessage</tabstop>
   <tabstop>parentSelf</tabstop>
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -615,7 +615,7 @@
         @param checked state of the Python 2 button (boolean)
         """
         # set the checkboxes
-        self.localeCheckBox.setHidden(not checked)
+        self.localeCheckBox.setEnabled(checked)
         if checked:
             self.unicodeCheckBox.setText(self.trUtf8("Unicode"))
         else:
@@ -674,10 +674,11 @@
         code = ''
         if self.importCheckBox.isChecked():
             code += 'import re{0}{1}'.format(os.linesep, istring)
-        code += '{0} = re.compile(r"""{1}"""'.format(
-            reVar, regexp.replace('"', '\\"'))
+        code += '{0} = re.compile('.format(reVar)
+        code += '{0}{1}r"""{2}"""'.format(
+            os.linesep, i1string, regexp.replace('"', '\\"'))
         if flags:
-            code += ', {0}{1}{2}'.format(os.linesep, i1string, flags)
+            code += ',{0}{1}{2}'.format(os.linesep, i1string, flags)
         code += '){0}'.format(estring)
         return code
 
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -511,6 +511,9 @@
        </item>
        <item row="1" column="1">
         <widget class="QCheckBox" name="localeCheckBox">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
          <property name="text">
           <string>Observe Locale</string>
          </property>
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -758,12 +758,15 @@
             options.append("QRegularExpression.UseUnicodePropertiesOption")
         if self.captureCheckBox.isChecked():
             options.append("QRegularExpression.DontCaptureOption")
-        options = " | \\{0}{1}".format(os.linesep, i1string).join(options)
+        options = " |{0}{1}".format(os.linesep, i1string).join(options)
         
-        code = '{0} = QRegularExpression(r"""{1}"""'.format(
-            reVar, regexp.replace('"', '\\"'))
+        code = '{0} = QRegularExpression('.format(reVar)
         if options:
-            code += ', {0}{1}{2}'.format(os.linesep, i1string, options)
+            code += '{0}{1}r"""{2}""",'.format(
+                os.linesep, i1string, regexp.replace('"', '\\"'))
+            code += '{0}{1}{2}'.format(os.linesep, i1string, options)
+        else:
+            code += 'r"""{0}"""'.format(regexp.replace('"', '\\"'))
         code += '){0}'.format(estring)
         return code
 
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorAPIsPage.py	Fri Dec 13 23:39:14 2013 +0100
@@ -92,9 +92,14 @@
             return
             
         self.apiGroup.setEnabled(True)
+        self.deleteApiFileButton.setEnabled(False)
+        self.addApiFileButton.setEnabled(False)
+        self.apiFileEdit.clear()
+        
         for api in self.apis[self.currentApiLanguage]:
             if api:
                 self.apiList.addItem(api)
+        self.prepareApiButton.setEnabled(self.apiList.count() > 0)
         
         from QScintilla.APIsManager import APIsManager
         self.__currentAPI = APIsManager().getAPIs(self.currentApiLanguage)
@@ -106,7 +111,7 @@
             self.__currentAPI.apiPreparationStarted.connect(
                 self.__apiPreparationStarted)
             self.addInstalledApiFileButton.setEnabled(
-                self.__currentAPI.installedAPIFiles() != "")
+                len(self.__currentAPI.installedAPIFiles()) > 0)
         else:
             self.addInstalledApiFileButton.setEnabled(False)
         
@@ -148,6 +153,7 @@
         if file:
             self.apiList.addItem(Utilities.toNativeSeparators(file))
             self.apiFileEdit.clear()
+        self.prepareApiButton.setEnabled(self.apiList.count() > 0)
         
     @pyqtSlot()
     def on_deleteApiFileButton_clicked(self):
@@ -158,6 +164,7 @@
         if crow >= 0:
             itm = self.apiList.takeItem(crow)
             del itm
+        self.prepareApiButton.setEnabled(self.apiList.count() > 0)
         
     @pyqtSlot()
     def on_addInstalledApiFileButton_clicked(self):
@@ -189,6 +196,7 @@
                 self.trUtf8("""There are no APIs installed yet."""
                             """ Selection is not available."""))
             self.addInstalledApiFileButton.setEnabled(False)
+        self.prepareApiButton.setEnabled(self.apiList.count() > 0)
         
     @pyqtSlot()
     def on_addPluginApiFileButton_clicked(self):
@@ -211,6 +219,7 @@
         if ok:
             self.apiList.addItem(Utilities.toNativeSeparators(
                 pluginAPIFilesDict[file]))
+        self.prepareApiButton.setEnabled(self.apiList.count() > 0)
         
     @pyqtSlot()
     def on_prepareApiButton_clicked(self):
@@ -269,6 +278,32 @@
         self.on_apiLanguageComboBox_activated(
             self.apiLanguageComboBox.currentText())
     
+    @pyqtSlot()
+    def on_apiList_itemSelectionChanged(self):
+        """
+        Private slot to react on changes of API selections.
+        """
+        self.deleteApiFileButton.setEnabled(
+            len(self.apiList.selectedItems()) > 0)
+    
+    @pyqtSlot(str)
+    def on_apiFileEdit_textChanged(self, txt):
+        """
+        Private slot to handle the entering of an API file name.
+        
+        @param txt text of the line edit (string)
+        """
+        enable = txt != ""
+        
+        if enable:
+            # check for already added file
+            for row in range(self.apiList.count()):
+                if txt == self.apiList.item(row).text():
+                    enable = False
+                    break
+        
+        self.addApiFileButton.setEnabled(enable)
+    
 
 def create(dlg):
     """
--- a/Preferences/ConfigurationPages/EditorExportersPage.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorExportersPage.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_10">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -68,58 +68,70 @@
      </property>
      <widget class="QWidget" name="emptyPage"/>
      <widget class="QWidget" name="htmlPage">
-      <layout class="QVBoxLayout">
-       <property name="margin">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QCheckBox" name="htmlWysiwygCheckBox">
-         <property name="toolTip">
-          <string>Select to export in WYSIWYG mode</string>
-         </property>
-         <property name="text">
-          <string>Use WYSIWYG mode</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="htmlFoldingCheckBox">
-         <property name="toolTip">
-          <string>Select to include folding functionality</string>
-         </property>
-         <property name="text">
-          <string>Include folding functionality</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="htmlStylesCheckBox">
-         <property name="toolTip">
-          <string>Select to include only used styles</string>
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string/>
          </property>
-         <property name="text">
-          <string>Include only used styles</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="htmlTitleCheckBox">
-         <property name="toolTip">
-          <string>Select to use the full pathname as the document title</string>
-         </property>
-         <property name="text">
-          <string>Use full pathname as document title</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="htmlTabsCheckBox">
-         <property name="toolTip">
-          <string>Select to use tabs in the generated file</string>
-         </property>
-         <property name="text">
-          <string>Use tabs</string>
-         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QCheckBox" name="htmlWysiwygCheckBox">
+            <property name="toolTip">
+             <string>Select to export in WYSIWYG mode</string>
+            </property>
+            <property name="text">
+             <string>Use WYSIWYG mode</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="htmlFoldingCheckBox">
+            <property name="toolTip">
+             <string>Select to include folding functionality</string>
+            </property>
+            <property name="text">
+             <string>Include folding functionality</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="htmlStylesCheckBox">
+            <property name="toolTip">
+             <string>Select to include only used styles</string>
+            </property>
+            <property name="text">
+             <string>Include only used styles</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="htmlTitleCheckBox">
+            <property name="toolTip">
+             <string>Select to use the full pathname as the document title</string>
+            </property>
+            <property name="text">
+             <string>Use full pathname as document title</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="htmlTabsCheckBox">
+            <property name="toolTip">
+             <string>Select to use tabs in the generated file</string>
+            </property>
+            <property name="text">
+             <string>Use tabs</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
        <item>
@@ -139,34 +151,49 @@
      </widget>
      <widget class="QWidget" name="odtPage">
       <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QCheckBox" name="odtWysiwygCheckBox">
-         <property name="toolTip">
-          <string>Select to export in WYSIWYG mode</string>
-         </property>
-         <property name="text">
-          <string>Use WYSIWYG mode</string>
-         </property>
-        </widget>
-       </item>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QCheckBox" name="odtStylesCheckBox">
-         <property name="toolTip">
-          <string>Select to include only used styles</string>
-         </property>
-         <property name="text">
-          <string>Include only used styles</string>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string/>
          </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="odtTabsCheckBox">
-         <property name="toolTip">
-          <string>Select to use tabs in the generated file</string>
-         </property>
-         <property name="text">
-          <string>Use tabs</string>
-         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QCheckBox" name="odtWysiwygCheckBox">
+            <property name="toolTip">
+             <string>Select to export in WYSIWYG mode</string>
+            </property>
+            <property name="text">
+             <string>Use WYSIWYG mode</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="odtStylesCheckBox">
+            <property name="toolTip">
+             <string>Select to include only used styles</string>
+            </property>
+            <property name="text">
+             <string>Include only used styles</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="odtTabsCheckBox">
+            <property name="toolTip">
+             <string>Select to use tabs in the generated file</string>
+            </property>
+            <property name="text">
+             <string>Use tabs</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
        <item>
@@ -185,138 +212,150 @@
       </layout>
      </widget>
      <widget class="QWidget" name="pdfPage">
-      <layout class="QGridLayout" name="gridLayout">
-       <property name="margin">
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
         <number>0</number>
        </property>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>Magnification:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QSlider" name="pdfMagnificationSlider">
-         <property name="toolTip">
-          <string>Select the magnification value to be added to the font sizes of the styles</string>
-         </property>
-         <property name="maximum">
-          <number>20</number>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QLCDNumber" name="pdfMagnificationLCD">
-         <property name="toolTip">
-          <string>Displays the selected magnification value</string>
-         </property>
-         <property name="digitCount">
-          <number>2</number>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
+          <string/>
          </property>
-         <property name="segmentStyle">
-          <enum>QLCDNumber::Flat</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Font:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QComboBox" name="pdfFontCombo">
-         <property name="toolTip">
-          <string>Select the font from the list</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>Pagesize:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1" colspan="2">
-        <widget class="QComboBox" name="pdfPageSizeCombo">
-         <property name="toolTip">
-          <string>Select the page size from the list</string>
-         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Magnification:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSlider" name="pdfMagnificationSlider">
+            <property name="toolTip">
+             <string>Select the magnification value to be added to the font sizes of the styles</string>
+            </property>
+            <property name="maximum">
+             <number>20</number>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QLCDNumber" name="pdfMagnificationLCD">
+            <property name="toolTip">
+             <string>Displays the selected magnification value</string>
+            </property>
+            <property name="digitCount">
+             <number>2</number>
+            </property>
+            <property name="segmentStyle">
+             <enum>QLCDNumber::Flat</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Font:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" colspan="2">
+           <widget class="QComboBox" name="pdfFontCombo">
+            <property name="toolTip">
+             <string>Select the font from the list</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_3">
+            <property name="text">
+             <string>Pagesize:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" colspan="2">
+           <widget class="QComboBox" name="pdfPageSizeCombo">
+            <property name="toolTip">
+             <string>Select the page size from the list</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" colspan="3">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QGroupBox" name="groupBox">
+              <property name="title">
+               <string>Margins</string>
+              </property>
+              <layout class="QGridLayout">
+               <item row="0" column="1">
+                <widget class="QSpinBox" name="pdfMarginTopSpin">
+                 <property name="toolTip">
+                  <string>Select the top margin in points (72 pt == 1&quot;)</string>
+                 </property>
+                 <property name="maximum">
+                  <number>288</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QSpinBox" name="pdfMarginLeftSpin">
+                 <property name="toolTip">
+                  <string>Select the left margin in points (72 pt == 1&quot;)</string>
+                 </property>
+                 <property name="maximum">
+                  <number>288</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="2">
+                <widget class="QSpinBox" name="pdfMarginRightSpin">
+                 <property name="toolTip">
+                  <string>Select the right margin in points (72 pt == 1&quot;)</string>
+                 </property>
+                 <property name="maximum">
+                  <number>288</number>
+                 </property>
+                </widget>
+               </item>
+               <item row="2" column="1">
+                <widget class="QSpinBox" name="pdfMarginBottomSpin">
+                 <property name="toolTip">
+                  <string>Select the bottom margin in points (72 pt == 1&quot;)</string>
+                 </property>
+                 <property name="maximum">
+                  <number>288</number>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="3" column="0" colspan="3">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QGroupBox" name="groupBox">
-           <property name="title">
-            <string>Margins</string>
-           </property>
-           <layout class="QGridLayout">
-            <item row="0" column="1">
-             <widget class="QSpinBox" name="pdfMarginTopSpin">
-              <property name="toolTip">
-               <string>Select the top margin in points (72 pt == 1&quot;)</string>
-              </property>
-              <property name="maximum">
-               <number>288</number>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QSpinBox" name="pdfMarginLeftSpin">
-              <property name="toolTip">
-               <string>Select the left margin in points (72 pt == 1&quot;)</string>
-              </property>
-              <property name="maximum">
-               <number>288</number>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="2">
-             <widget class="QSpinBox" name="pdfMarginRightSpin">
-              <property name="toolTip">
-               <string>Select the right margin in points (72 pt == 1&quot;)</string>
-              </property>
-              <property name="maximum">
-               <number>288</number>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QSpinBox" name="pdfMarginBottomSpin">
-              <property name="toolTip">
-               <string>Select the bottom margin in points (72 pt == 1&quot;)</string>
-              </property>
-              <property name="maximum">
-               <number>288</number>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="1">
+       <item>
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -332,58 +371,70 @@
       </layout>
      </widget>
      <widget class="QWidget" name="rtfPage">
-      <layout class="QVBoxLayout">
-       <property name="margin">
+      <layout class="QVBoxLayout" name="verticalLayout_7">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QCheckBox" name="rtfWysiwygCheckBox">
-         <property name="toolTip">
-          <string>Select to export in WYSIWYG mode</string>
-         </property>
-         <property name="text">
-          <string>Use WYSIWYG mode</string>
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
+          <string/>
          </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QPushButton" name="rtfFontButton">
-           <property name="toolTip">
-            <string>Press to select the font for the RTF export</string>
-           </property>
-           <property name="text">
-            <string>Select Font</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="rtfFontSample">
-           <property name="focusPolicy">
-            <enum>Qt::NoFocus</enum>
-           </property>
-           <property name="text">
-            <string>Font for RTF export</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignHCenter</set>
-           </property>
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="rtfTabsCheckBox">
-         <property name="toolTip">
-          <string>Select to use tabs in the generated file</string>
-         </property>
-         <property name="text">
-          <string>Use tabs</string>
-         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_6">
+          <item>
+           <widget class="QCheckBox" name="rtfWysiwygCheckBox">
+            <property name="toolTip">
+             <string>Select to export in WYSIWYG mode</string>
+            </property>
+            <property name="text">
+             <string>Use WYSIWYG mode</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout">
+            <item>
+             <widget class="QPushButton" name="rtfFontButton">
+              <property name="toolTip">
+               <string>Press to select the font for the RTF export</string>
+              </property>
+              <property name="text">
+               <string>Select Font</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="rtfFontSample">
+              <property name="focusPolicy">
+               <enum>Qt::NoFocus</enum>
+              </property>
+              <property name="text">
+               <string>Font for RTF export</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignHCenter</set>
+              </property>
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="rtfTabsCheckBox">
+            <property name="toolTip">
+             <string>Select to use tabs in the generated file</string>
+            </property>
+            <property name="text">
+             <string>Use tabs</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
        <item>
@@ -402,28 +453,40 @@
       </layout>
      </widget>
      <widget class="QWidget" name="texPage">
-      <layout class="QVBoxLayout">
-       <property name="margin">
+      <layout class="QVBoxLayout" name="verticalLayout_9">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QCheckBox" name="texStylesCheckBox">
-         <property name="toolTip">
-          <string>Select to include only used styles</string>
-         </property>
-         <property name="text">
-          <string>Include only used styles</string>
+        <widget class="QGroupBox" name="groupBox_6">
+         <property name="title">
+          <string/>
          </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="texTitleCheckBox">
-         <property name="toolTip">
-          <string>Select to use the full pathname as the document title</string>
-         </property>
-         <property name="text">
-          <string>Use full pathname as document title</string>
-         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_8">
+          <item>
+           <widget class="QCheckBox" name="texStylesCheckBox">
+            <property name="toolTip">
+             <string>Select to include only used styles</string>
+            </property>
+            <property name="text">
+             <string>Include only used styles</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="texTitleCheckBox">
+            <property name="toolTip">
+             <string>Select to use the full pathname as the document title</string>
+            </property>
+            <property name="text">
+             <string>Use full pathname as document title</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
        <item>
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Fri Dec 13 23:39:14 2013 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals    # __IGNORE_WARNING__
 
-from PyQt4.QtCore import pyqtSlot, QFileInfo, QFile, QIODevice
+from PyQt4.QtCore import pyqtSlot, Qt, QFileInfo, QFile, QIODevice
 from PyQt4.QtGui import QPalette, QColorDialog, QFontDialog, \
     QInputDialog, QFont, QMenu
 
@@ -109,8 +109,29 @@
         
         self.styleGroup.setEnabled(True)
         self.styleElementList.addItems(self.lexer.styles)
+        self.__styleAllItems()
         self.styleElementList.setCurrentRow(0)
         
+    def __styleAllItems(self):
+        """
+        Private method to style all items of the style element list.
+        """
+        for row in range(self.styleElementList.count()):
+            style = self.lexer.ind2style[row]
+            colour = self.lexer.color(style)
+            paper = self.lexer.paper(style)
+            font = self.lexer.font(style)
+            eolfill = self.lexer.eolFill(style)
+            
+            itm = self.styleElementList.item(row)
+            itm.setFont(font)
+            itm.setBackground(paper)
+            itm.setForeground(colour)
+            if eolfill:
+                itm.setCheckState(Qt.Checked)
+            else:
+                itm.setCheckState(Qt.Unchecked)
+        
     def on_styleElementList_currentRowChanged(self, index):
         """
         Private method to set up the style element part of the source page.
@@ -152,8 +173,10 @@
                     style = self.lexer.ind2style[
                         self.styleElementList.row(selItem)]
                     self.lexer.setColor(colour, style)
+                    selItem.setForeground(colour)
             else:
                 self.lexer.setColor(colour, self.style)
+                self.styleElementList.currentItem().setForeground(colour)
         
     @pyqtSlot()
     def on_backgroundButton_clicked(self):
@@ -172,8 +195,10 @@
                     style = self.lexer.ind2style[
                         self.styleElementList.row(selItem)]
                     self.lexer.setPaper(colour, style)
+                    selItem.setBackground(colour)
             else:
                 self.lexer.setPaper(colour, self.style)
+                self.styleElementList.currentItem().setBackground(colour)
         
     @pyqtSlot()
     def on_allBackgroundColoursButton_clicked(self):
@@ -189,6 +214,7 @@
             self.sampleText.repaint()
             for style in list(self.lexer.ind2style.values()):
                 self.lexer.setPaper(colour, style)
+            self.__styleAllItems()
         
     def __changeFont(self, doAll, familyOnly, sizeOnly):
         """
@@ -244,13 +270,18 @@
             if doAll:
                 for style in list(self.lexer.ind2style.values()):
                     setFont(font, style, familyOnly, sizeOnly)
+                self.__styleAllItems()
             elif len(self.styleElementList.selectedItems()) > 1:
                 for selItem in self.styleElementList.selectedItems():
                     style = self.lexer.ind2style[
                         self.styleElementList.row(selItem)]
                     setFont(font, style, familyOnly, sizeOnly)
+                    itmFont = self.lexer.font(style)
+                    selItem.setFont(itmFont)
             else:
                 setFont(font, self.style, familyOnly, sizeOnly)
+                itmFont = self.lexer.font(self.style)
+                self.styleElementList.currentItem().setFont(itmFont)
         
     def __fontButtonMenuTriggered(self, act):
         """
@@ -278,14 +309,16 @@
         sizeOnly = act.data() in [self.FAMILYANDSIZE, self.SIZEONLY]
         self.__changeFont(True, familyOnly, sizeOnly)
         
-    def on_eolfillCheckBox_toggled(self, b):
+    def on_eolfillCheckBox_toggled(self, on):
         """
         Private method used to set the eolfill for the selected style and
         lexer.
         
-        @param b Flag indicating enabled or disabled state.
+        @param on flag indicating enabled or disabled state (boolean)
         """
-        self.lexer.setEolFill(b, self.style)
+        self.lexer.setEolFill(on, self.style)
+        checkState = Qt.Checked if on else Qt.Unchecked
+        self.styleElementList.currentItem().setCheckState(checkState)
         
     @pyqtSlot()
     def on_allEolFillButton_clicked(self):
@@ -306,6 +339,7 @@
             self.eolfillCheckBox.setChecked(enabled)
             for style in list(self.lexer.ind2style.values()):
                 self.lexer.setEolFill(enabled, style)
+            self.__styleAllItems()
         
     @pyqtSlot()
     def on_defaultButton_clicked(self):
@@ -321,6 +355,7 @@
             self.__setToDefault(self.style)
         self.on_styleElementList_currentRowChanged(
             self.styleElementList.currentRow())
+        self.__styleAllItems()
         
     @pyqtSlot()
     def on_allDefaultButton_clicked(self):
@@ -331,6 +366,7 @@
             self.__setToDefault(style)
         self.on_styleElementList_currentRowChanged(
             self.styleElementList.currentRow())
+        self.__styleAllItems()
         
     def __setToDefault(self, style):
         """
@@ -455,6 +491,8 @@
             self.sampleText.setPalette(pl)
             self.sampleText.repaint()
             self.eolfillCheckBox.setChecked(eolfill)
+            
+            self.__styleAllItems()
         
     def saveState(self):
         """
--- a/Preferences/ConfigurationPages/EditorTypingPage.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Preferences/ConfigurationPages/EditorTypingPage.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -1,62 +1,63 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>EditorTypingPage</class>
- <widget class="QWidget" name="EditorTypingPage" >
-  <property name="geometry" >
+ <widget class="QWidget" name="EditorTypingPage">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>537</width>
+    <width>543</width>
     <height>531</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3" >
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <widget class="QLabel" name="headerLabel" >
-     <property name="text" >
-      <string>&lt;b>Configure typing&lt;/b></string>
+    <widget class="QLabel" name="headerLabel">
+     <property name="text">
+      <string>&lt;b&gt;Configure typing&lt;/b&gt;</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="Line" name="line1" >
-     <property name="frameShape" >
+    <widget class="Line" name="line1">
+     <property name="frameShape">
       <enum>QFrame::HLine</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QLabel" name="TextLabel1_3" >
-       <property name="toolTip" >
+      <widget class="QLabel" name="TextLabel1_3">
+       <property name="toolTip">
         <string/>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Programming Language:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring></cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="languageCombo" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+      <widget class="QComboBox" name="languageCombo">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="toolTip" >
+       <property name="toolTip">
         <string>Select the programming language to be configured.</string>
        </property>
       </widget>
@@ -64,49 +65,55 @@
     </layout>
    </item>
    <item>
-    <widget class="QStackedWidget" name="stackedWidget" >
-     <property name="currentIndex" >
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="emptyPage" />
-     <widget class="QWidget" name="pythonPage" >
-      <layout class="QVBoxLayout" name="verticalLayout_2" >
+     <widget class="QWidget" name="emptyPage"/>
+     <widget class="QWidget" name="pythonPage">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QGroupBox" name="pythonGroup" >
-         <property name="focusPolicy" >
+        <widget class="QGroupBox" name="pythonGroup">
+         <property name="focusPolicy">
           <enum>Qt::TabFocus</enum>
          </property>
-         <property name="toolTip" >
+         <property name="toolTip">
           <string>Select to enable Python typing aids</string>
          </property>
-         <property name="title" >
+         <property name="title">
           <string>Enable Python typing aids</string>
          </property>
-         <property name="checkable" >
+         <property name="checkable">
           <bool>true</bool>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout" >
+         <layout class="QVBoxLayout" name="verticalLayout">
           <item>
-           <widget class="QCheckBox" name="pythonInsertClosingBraceCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonInsertClosingBraceCheckBox">
+            <property name="toolTip">
              <string>Select to insert a closing parenthesis</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic parenthesis insertion</string>
             </property>
            </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" >
+           <layout class="QHBoxLayout">
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeType" >
+              <property name="sizeType">
                <enum>QSizePolicy::Fixed</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
                 <height>20</height>
@@ -115,24 +122,24 @@
              </spacer>
             </item>
             <item>
-             <widget class="QCheckBox" name="pythonSkipBraceCheckBox" >
-              <property name="enabled" >
+             <widget class="QCheckBox" name="pythonSkipBraceCheckBox">
+              <property name="enabled">
                <bool>false</bool>
               </property>
-              <property name="toolTip" >
+              <property name="toolTip">
                <string>Select to skip matching braces when typing</string>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Automatically skip matching braces when typing</string>
               </property>
              </widget>
             </item>
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>131</width>
                 <height>21</height>
@@ -143,66 +150,66 @@
            </layout>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonColonDetectionCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonColonDetectionCheckBox">
+            <property name="toolTip">
              <string>Select to skip a ':', if typed next to another ':'</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic colon detection</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonIndentBraceCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonIndentBraceCheckBox">
+            <property name="toolTip">
              <string>Select to indent to the brace level after typing 'return'</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>After '(' indent to its level</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonInsertQuoteCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonInsertQuoteCheckBox">
+            <property name="toolTip">
              <string>Select to insert the matching quote character</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic quote insertion</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonDedentElseCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonDedentElseCheckBox">
+            <property name="toolTip">
              <string>Select to dedent 'else:' and 'elif' to the matching 'if'</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic dedent of 'else:' and 'elif'</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonDedentExceptCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonDedentExceptCheckBox">
+            <property name="toolTip">
              <string>Select to dedent 'except' and 'finally' to the matching 'try:'</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic dedent of 'except' and 'finally'</string>
             </property>
            </widget>
           </item>
           <item>
-           <layout class="QHBoxLayout" >
+           <layout class="QHBoxLayout">
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeType" >
+              <property name="sizeType">
                <enum>QSizePolicy::Fixed</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
                 <height>20</height>
@@ -211,24 +218,24 @@
              </spacer>
             </item>
             <item>
-             <widget class="QCheckBox" name="pythonDedentExceptPy24CheckBox" >
-              <property name="enabled" >
+             <widget class="QCheckBox" name="pythonDedentExceptPy24CheckBox">
+              <property name="enabled">
                <bool>false</bool>
               </property>
-              <property name="toolTip" >
+              <property name="toolTip">
                <string>Select to treat code as Python 2.4 code</string>
               </property>
-              <property name="text" >
+              <property name="text">
                <string>Python 2.4 style 'try:' blocks</string>
               </property>
              </widget>
             </item>
             <item>
              <spacer>
-              <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>261</width>
                 <height>20</height>
@@ -239,41 +246,41 @@
            </layout>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonInsertImportCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonInsertImportCheckBox">
+            <property name="toolTip">
              <string>Select to insert the 'import' string</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic insertion of the 'import' string on 'from xxx'</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonInsertSelfCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonInsertSelfCheckBox">
+            <property name="toolTip">
              <string>Select to insert the 'self' string when declaring a method</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic insertion of 'self' when declaring methods</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonInsertBlankCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonInsertBlankCheckBox">
+            <property name="toolTip">
              <string>Select to insert a blank after ','</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic insertion of ' ' (blank) after ','</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonDedentDefCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="pythonDedentDefCheckBox">
+            <property name="toolTip">
              <string>Select to dedent 'def' statements to the last 'def' or 'class'</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic dedent of 'def' statements</string>
             </property>
            </widget>
@@ -283,10 +290,10 @@
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>507</width>
            <height>20</height>
@@ -296,95 +303,95 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="rubyPage" >
-      <layout class="QVBoxLayout" >
-       <property name="leftMargin" >
+     <widget class="QWidget" name="rubyPage">
+      <layout class="QVBoxLayout">
+       <property name="leftMargin">
         <number>0</number>
        </property>
-       <property name="rightMargin" >
+       <property name="rightMargin">
         <number>0</number>
        </property>
        <item>
-        <widget class="QGroupBox" name="rubyGroup" >
-         <property name="focusPolicy" >
+        <widget class="QGroupBox" name="rubyGroup">
+         <property name="focusPolicy">
           <enum>Qt::TabFocus</enum>
          </property>
-         <property name="toolTip" >
+         <property name="toolTip">
           <string>Select to enable Ruby typing aids</string>
          </property>
-         <property name="title" >
+         <property name="title">
           <string>Enable Ruby typing aids</string>
          </property>
-         <property name="checkable" >
+         <property name="checkable">
           <bool>true</bool>
          </property>
-         <layout class="QVBoxLayout" >
+         <layout class="QVBoxLayout">
           <item>
-           <widget class="QCheckBox" name="rubyInsertClosingBraceCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="rubyInsertClosingBraceCheckBox">
+            <property name="toolTip">
              <string>Select to insert a closing parenthesis</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic parenthesis insertion</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="rubySkipBraceCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="rubySkipBraceCheckBox">
+            <property name="toolTip">
              <string>Select to skip matching braces when typing</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatically skip matching braces when typing</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="rubyIndentBraceCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="rubyIndentBraceCheckBox">
+            <property name="toolTip">
              <string>Select to indent to the brace level after typing 'return'</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>After '(' indent to its level</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="rubyInsertQuoteCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="rubyInsertQuoteCheckBox">
+            <property name="toolTip">
              <string>Select to insert the matching quote character</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic quote insertion</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="rubyInsertBlankCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="rubyInsertBlankCheckBox">
+            <property name="toolTip">
              <string>Select to insert a blank after ','</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic insertion of ' ' (blank) after ','</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="rubyInsertHereDocCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="rubyInsertHereDocCheckBox">
+            <property name="toolTip">
              <string>Select to automatically complete a here document</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic completion of here document</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="rubyInsertInlineDocCheckBox" >
-            <property name="toolTip" >
+           <widget class="QCheckBox" name="rubyInsertInlineDocCheckBox">
+            <property name="toolTip">
              <string>Select to automatically insert '=end' after entering '=begin'</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Automatic insertion of '=end' after '=begin'</string>
             </property>
            </widget>
@@ -394,10 +401,10 @@
        </item>
        <item>
         <spacer>
-         <property name="orientation" >
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
@@ -411,10 +418,10 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>519</width>
        <height>20</height>
@@ -456,11 +463,11 @@
    <receiver>pythonSkipBraceCheckBox</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>99</x>
      <y>114</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>116</x>
      <y>144</y>
     </hint>
@@ -472,11 +479,11 @@
    <receiver>pythonSkipBraceCheckBox</receiver>
    <slot>setChecked(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>196</x>
      <y>114</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>198</x>
      <y>137</y>
     </hint>
@@ -488,11 +495,11 @@
    <receiver>pythonDedentExceptPy24CheckBox</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>69</x>
      <y>279</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>80</x>
      <y>305</y>
     </hint>
--- a/Preferences/ConfigurationPages/PluginManagerPage.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Preferences/ConfigurationPages/PluginManagerPage.py	Fri Dec 13 23:39:14 2013 +0100
@@ -43,6 +43,22 @@
         self.downloadDirEdit.setText(
             Preferences.getPluginManager("DownloadPath"))
         
+        period = Preferences.getPluginManager("UpdatesCheckInterval")
+        if period == 0:
+            self.noCheckRadioButton.setChecked(True)
+        elif period == 1:
+            self.dailyCheckRadioButton.setChecked(True)
+        elif period == 2:
+            self.weeklyCheckRadioButton.setChecked(True)
+        elif period == 3:
+            self.monthlyCheckRadioButton.setChecked(True)
+        
+        self.downloadedOnlyCheckBox.setChecked(
+            Preferences.getPluginManager("CheckInstalledOnly"))
+        
+        self.__repositoryUrl = Preferences.getUI("PluginRepositoryUrl5")
+        self.repositoryUrlEdit.setText(self.__repositoryUrl)
+    
     def save(self):
         """
         Public slot to save the Viewmanager configuration.
@@ -53,6 +69,24 @@
         Preferences.setPluginManager(
             "DownloadPath",
             self.downloadDirEdit.text())
+        
+        if self.noCheckRadioButton.isChecked():
+            period = 0
+        elif self.dailyCheckRadioButton.isChecked():
+            period = 1
+        elif self.weeklyCheckRadioButton.isChecked():
+            period = 2
+        elif self.monthlyCheckRadioButton.isChecked():
+            period = 3
+        Preferences.setPluginManager("UpdatesCheckInterval", period)
+        
+        Preferences.setPluginManager(
+            "CheckInstalledOnly",
+            self.downloadedOnlyCheckBox.isChecked())
+        
+        if self.repositoryUrlEdit.text() != self.__repositoryUrl:
+            Preferences.setUI(
+                "PluginRepositoryUrl5", self.repositoryUrlEdit.text())
     
     @pyqtSlot()
     def on_downloadDirButton_clicked(self):
@@ -71,6 +105,16 @@
                 dn = dn[:-1]
             self.downloadDirEdit.setText(dn)
     
+    @pyqtSlot(bool)
+    def on_repositoryUrlEditButton_toggled(self, checked):
+        """
+        Private slot to set the read only status of the repository URL line
+        edit.
+        
+        @param checked state of the push button (boolean)
+        """
+        self.repositoryUrlEdit.setReadOnly(not checked)
+    
 
 def create(dlg):
     """
--- a/Preferences/ConfigurationPages/PluginManagerPage.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Preferences/ConfigurationPages/PluginManagerPage.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -10,15 +10,15 @@
     <height>299</height>
    </rect>
   </property>
-  <layout class="QGridLayout">
-   <item row="0" column="0" colspan="3">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
       <string>&lt;b&gt;Configure plugin manager&lt;/b&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="3">
+   <item>
     <widget class="Line" name="line9_2">
      <property name="frameShape">
       <enum>QFrame::HLine</enum>
@@ -31,38 +31,42 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Plugins download directory:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="downloadDirEdit">
+       <property name="toolTip">
+        <string>Enter the plugins download directory</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="downloadDirButton">
+       <property name="toolTip">
+        <string>Select the plugins download directory via a directory selection dialog</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="TextLabel1_2_2_2_3">
      <property name="text">
-      <string>Plugins download directory:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="downloadDirEdit">
-     <property name="toolTip">
-      <string>Enter the plugins download directory</string>
+      <string>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Note:&lt;/b&gt; The following settings are activated at the next startup of the application.&lt;/font&gt;</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="2">
-    <widget class="QPushButton" name="downloadDirButton">
-     <property name="toolTip">
-      <string>Select the plugins download directory via a directory selection dialog</string>
-     </property>
-     <property name="text">
-      <string>...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="3">
-    <widget class="QLabel" name="TextLabel1_2_2_2_3">
-     <property name="text">
-      <string>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Note:&lt;/b&gt; The following setting is activated at the next startup of the application.&lt;/font&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="3">
+   <item>
     <widget class="QCheckBox" name="activateExternalPluginsCheckBox">
      <property name="toolTip">
       <string>Select to enable external plugins to be loaded</string>
@@ -72,7 +76,100 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3">
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Check for plugin updates</string>
+     </property>
+     <layout class="QHBoxLayout" name="_2">
+      <item>
+       <widget class="QRadioButton" name="noCheckRadioButton">
+        <property name="toolTip">
+         <string>Select to disable update checking</string>
+        </property>
+        <property name="text">
+         <string>Never</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="dailyCheckRadioButton">
+        <property name="toolTip">
+         <string>Select to check for updates once a day</string>
+        </property>
+        <property name="text">
+         <string>Daily</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="weeklyCheckRadioButton">
+        <property name="toolTip">
+         <string>Select to check for updates once a week</string>
+        </property>
+        <property name="text">
+         <string>Weekly</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="monthlyCheckRadioButton">
+        <property name="toolTip">
+         <string>Select to check for updates once a month</string>
+        </property>
+        <property name="text">
+         <string>Monthly</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="downloadedOnlyCheckBox">
+     <property name="toolTip">
+      <string>Select to check only already installed plugins for updates</string>
+     </property>
+     <property name="text">
+      <string>Check only installed plugins for updates</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Repository URL:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="repositoryUrlEdit">
+       <property name="toolTip">
+        <string>Shows the repository URL</string>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="repositoryUrlEditButton">
+       <property name="toolTip">
+        <string>Press to edit the plugin repository URL</string>
+       </property>
+       <property name="text">
+        <string>Edit URL</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -91,6 +188,11 @@
   <tabstop>downloadDirEdit</tabstop>
   <tabstop>downloadDirButton</tabstop>
   <tabstop>activateExternalPluginsCheckBox</tabstop>
+  <tabstop>noCheckRadioButton</tabstop>
+  <tabstop>dailyCheckRadioButton</tabstop>
+  <tabstop>weeklyCheckRadioButton</tabstop>
+  <tabstop>monthlyCheckRadioButton</tabstop>
+  <tabstop>downloadedOnlyCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
--- a/Preferences/__init__.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Preferences/__init__.py	Fri Dec 13 23:39:14 2013 +0100
@@ -63,7 +63,7 @@
         "PassiveDbgPort": 42424,
         "PassiveDbgType": "Python",
         "AutomaticReset": False,
-        "Autosave": False,
+        "Autosave": True,
         "ThreeStateBreakPoints": False,
         "SuppressClientExit": False,
         "BreakAlways": False,
@@ -903,7 +903,13 @@
     # defaults for plugin manager related stuff
     pluginManagerDefaults = {
         "ActivateExternal": True,
-        "DownloadPath": ""
+        "DownloadPath": "",
+        "UpdatesCheckInterval": 3,
+        # 0 = off
+        # 1 = daily
+        # 2 = weekly
+        # 3 = monthly
+        "CheckInstalledOnly": True,
     }
     
     # defaults for the printer settings
@@ -2537,6 +2543,9 @@
     if key in ["DownloadPath"]:
         return prefClass.settings.value(
             "PluginManager/" + key, prefClass.pluginManagerDefaults[key])
+    elif key in ["UpdatesCheckInterval"]:
+        return int(prefClass.settings.value(
+            "PluginManager/" + key, prefClass.pluginManagerDefaults[key]))
     else:
         return toBool(prefClass.settings.value(
             "PluginManager/" + key, prefClass.pluginManagerDefaults[key]))
--- a/Project/CreateDialogCodeDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Project/CreateDialogCodeDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -21,6 +21,7 @@
 from E5Gui import E5MessageBox
 
 from .Ui_CreateDialogCodeDialog import Ui_CreateDialogCodeDialog
+from .NewDialogClassDialog import NewDialogClassDialog
 
 from eric5config import getConfig
 
@@ -553,7 +554,6 @@
         path, file = os.path.split(self.srcFile)
         objName = self.__objectName()
         if objName:
-            from .NewDialogClassDialog import NewDialogClassDialog
             dlg = NewDialogClassDialog(objName, file, path, self)
             if dlg.exec_() == QDialog.Accepted:
                 className, fileName = dlg.getData()
--- a/QScintilla/APIsManager.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/QScintilla/APIsManager.py	Fri Dec 13 23:39:14 2013 +0100
@@ -185,14 +185,17 @@
                     Globals.getPyQt4ModulesDirectory(), "qsci")
                 if os.path.exists(qsciPath):
                     # it's the installer
-                    apidir = os.path.join(qsciPath, "api",
-                                          self.__lexer.lexer())
-                    fnames = []
-                    filist = QDir(apidir).entryInfoList(["*.api"], QDir.Files,
-                                                        QDir.IgnoreCase)
-                    for fi in filist:
-                        fnames.append(fi.absoluteFilePath())
-                    return fnames
+                    if self.__lexer.lexer() is not None:
+                        apidir = os.path.join(qsciPath, "api",
+                                              self.__lexer.lexer())
+                        fnames = []
+                        filist = QDir(apidir).entryInfoList(
+                            ["*.api"], QDir.Files, QDir.IgnoreCase)
+                        for fi in filist:
+                            fnames.append(fi.absoluteFilePath())
+                        return fnames
+                    else:
+                        return []
             
             return self.__apis.installedAPIFiles()
         else:
--- a/QScintilla/Editor.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/QScintilla/Editor.py	Fri Dec 13 23:39:14 2013 +0100
@@ -721,11 +721,14 @@
             self.menu.addSeparator()
             self.menuActs["Diagrams"] = self.menu.addMenu(self.graphicsMenu)
         self.menu.addSeparator()
-        self.menu.addAction(self.trUtf8('New view'), self.__newView)
-        act = self.menu.addAction(
-            self.trUtf8('New view (with new split)'), self.__newViewNewSplit)
-        if not self.vm.canSplit():
-                act.setEnabled(False)
+        self.menu.addAction(
+            UI.PixmapCache.getIcon("documentNewView.png"),
+            self.trUtf8('New Document View'), self.__newView)
+        self.menuActs["NewSplit"] = self.menu.addAction(
+            UI.PixmapCache.getIcon("splitVertical.png"),
+            self.trUtf8('New Document View (with new split)'),
+            self.__newViewNewSplit)
+        self.menuActs["NewSplit"].setEnabled(self.vm.canSplit())
         self.menu.addAction(
             UI.PixmapCache.getIcon("close.png"),
             self.trUtf8('Close'), self.__contextClose)
@@ -3069,7 +3072,8 @@
         Private slot to handle the Use Monospaced Font context menu entry.
         """
         if self.menuActs["MonospacedFont"].isChecked():
-            self.setMonospaced(True)
+            if not self.lexer_:
+                self.setMonospaced(True)
         else:
             if self.lexer_:
                 self.lexer_.readSettings(
@@ -4631,6 +4635,16 @@
             else:
                 self.menuActs["OpenRejections"].setEnabled(False)
         
+        self.menuActs["MonospacedFont"].setEnabled(self.lexer_ is None)
+        
+        splitOrientation = self.vm.getSplitOrientation()
+        if splitOrientation == Qt.Horizontal:
+            self.menuActs["NewSplit"].setIcon(
+                UI.PixmapCache.getIcon("splitHorizontal.png"))
+        else:
+            self.menuActs["NewSplit"].setIcon(
+                UI.PixmapCache.getIcon("splitVertical.png"))
+        
         self.showMenu.emit("Main", self.menu,  self)
         
     def __showContextMenuAutocompletion(self):
@@ -6108,8 +6122,9 @@
         @param on flag to indicate usage of a monospace font (boolean)
         """
         if on:
-            f = Preferences.getEditorOtherFonts("MonospacedFont")
-            self.monospacedStyles(f)
+            if not self.lexer_:
+                f = Preferences.getEditorOtherFonts("MonospacedFont")
+                self.monospacedStyles(f)
         else:
             if not self.lexer_:
                 self.clearStyles()
@@ -6118,6 +6133,16 @@
         
         self.useMonospaced = on
     
+    def clearStyles(self):
+        """
+        Public method to set the styles according the selected Qt style
+        or the selected editor colours.
+        """
+        super(Editor, self).clearStyles()
+        if Preferences.getEditor("OverrideEditAreaColours"):
+            self.setColor(Preferences.getEditorColour("EditAreaForeground"))
+            self.setPaper(Preferences.getEditorColour("EditAreaBackground"))
+    
     #################################################################
     ## Drag and Drop Support
     #################################################################
--- a/QScintilla/Lexers/__init__.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/QScintilla/Lexers/__init__.py	Fri Dec 13 23:39:14 2013 +0100
@@ -151,8 +151,9 @@
         })
     
     for name in LexerRegistry:
-        supportedLanguages[name] = \
-            LexerRegistry[name][:2] + [LexerRegistry[name][6]]
+        if not name.startswith("Pygments|"):
+            supportedLanguages[name] = \
+                LexerRegistry[name][:2] + [LexerRegistry[name][6]]
     
     supportedLanguages["Guessed"] = \
         [QApplication.translate('Lexers', "Pygments"), 'dummy.pygments', ""]
--- a/QScintilla/MiniEditor.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/QScintilla/MiniEditor.py	Fri Dec 13 23:39:14 2013 +0100
@@ -2462,8 +2462,9 @@
         @param on flag to indicate usage of a monospace font (boolean)
         """
         if on:
-            f = Preferences.getEditorOtherFonts("MonospacedFont")
-            self.__textEdit.monospacedStyles(f)
+            if not self.lexer_:
+                f = Preferences.getEditorOtherFonts("MonospacedFont")
+                self.__textEdit.monospacedStyles(f)
         else:
             if not self.lexer_:
                 self.__textEdit.clearStyles()
--- a/QScintilla/Shell.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/QScintilla/Shell.py	Fri Dec 13 23:39:14 2013 +0100
@@ -428,8 +428,9 @@
         @param on flag to indicate usage of a monospace font (boolean)
         """
         if on:
-            f = Preferences.getShell("MonospacedFont")
-            self.monospacedStyles(f)
+            if not self.lexer_:
+                f = Preferences.getShell("MonospacedFont")
+                self.monospacedStyles(f)
         else:
             if not self.lexer_:
                 self.clearStyles()
--- a/Snapshot/SnapWidget.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/Snapshot/SnapWidget.py	Fri Dec 13 23:39:14 2013 +0100
@@ -51,6 +51,7 @@
         self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSaveAs.png"))
         self.takeButton.setIcon(UI.PixmapCache.getIcon("cameraPhoto.png"))
         self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy.png"))
+        self.copyPreviewButton.setIcon(UI.PixmapCache.getIcon("editCopy.png"))
         self.setWindowIcon(UI.PixmapCache.getIcon("ericSnap.png"))
         
         self.modeCombo.addItem(self.trUtf8("Fullscreen"),
@@ -404,12 +405,21 @@
         
         self.saveButton.setEnabled(not self.__snapshot.isNull())
         self.copyButton.setEnabled(not self.__snapshot.isNull())
+        self.copyPreviewButton.setEnabled(not self.__snapshot.isNull())
     
     @pyqtSlot()
     def on_copyButton_clicked(self):
         """
         Private slot to copy the snapshot to the clipboard.
         """
+        if not self.__snapshot.isNull():
+            QApplication.clipboard().setPixmap(QPixmap(self.__snapshot))
+    
+    @pyqtSlot()
+    def on_copyPreviewButton_clicked(self):
+        """
+        Private slot to copy the snapshot preview to the clipboard.
+        """
         QApplication.clipboard().setPixmap(self.preview.pixmap())
     
     def __captured(self, pixmap):
--- a/Snapshot/SnapWidget.ui	Fri Dec 13 22:45:47 2013 +0100
+++ b/Snapshot/SnapWidget.ui	Fri Dec 13 23:39:14 2013 +0100
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>450</width>
-    <height>350</height>
+    <width>500</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -187,13 +187,26 @@
       </widget>
      </item>
      <item>
+      <widget class="QPushButton" name="copyPreviewButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>Press to copy the snapshot preview to the clipboard</string>
+       </property>
+       <property name="text">
+        <string>Copy &amp;Preview</string>
+       </property>
+      </widget>
+     </item>
+     <item>
       <spacer name="horizontalSpacer_5">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>40</width>
+         <width>28</width>
          <height>20</height>
         </size>
        </property>
@@ -224,9 +237,10 @@
   <tabstop>modeCombo</tabstop>
   <tabstop>delaySpin</tabstop>
   <tabstop>takeButton</tabstop>
+  <tabstop>pathNameEdit</tabstop>
   <tabstop>saveButton</tabstop>
   <tabstop>copyButton</tabstop>
-  <tabstop>pathNameEdit</tabstop>
+  <tabstop>copyPreviewButton</tabstop>
  </tabstops>
  <resources/>
  <connections/>
--- a/UI/ErrorLogDialog.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/UI/ErrorLogDialog.py	Fri Dec 13 23:39:14 2013 +0100
@@ -21,11 +21,13 @@
     """
     Class implementing a dialog to display an error log.
     """
-    def __init__(self, logFile, parent=None):
+    def __init__(self, logFile, showMode, parent=None):
         """
         Constructor
         
         @param logFile name of the log file containing the error info (string)
+        @param showMode flag indicating to just show the error log message
+            (boolean)
         @param parent reference to the parent widget (QWidget)
         """
         super(ErrorLogDialog, self).__init__(parent)
@@ -35,6 +37,13 @@
             .pixmap(32, 32)
         self.icon.setPixmap(pixmap)
         
+        if showMode:
+            self.icon.hide()
+            self.label.hide()
+            self.deleteButton.setText(self.trUtf8("Delete"))
+            self.keepButton.setText(self.trUtf8("Close"))
+            self.setWindowTitle(self.trUtf8("Error Log"))
+        
         self.__ui = parent
         self.__logFile = logFile
         
--- a/UI/UserInterface.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/UI/UserInterface.py	Fri Dec 13 23:39:14 2013 +0100
@@ -141,6 +141,8 @@
     BottomSide = 2
     RightSide = 3
     
+    ErrorLogFileName = "eric5_error.log"
+    
     def __init__(self, app, locale, splash, plugin, noOpenAtStartup,
                  restartArguments):
         """
@@ -1624,6 +1626,18 @@
             self.showAvailableVersionsInfo)
         self.actions.append(self.showVersionsAct)
 
+        self.showErrorLogAct = E5Action(
+            self.trUtf8('Show Error Log'),
+            self.trUtf8('Show Error &Log...'),
+            0, 0, self, 'show_error_log')
+        self.showErrorLogAct.setStatusTip(self.trUtf8('Show Error Log'))
+        self.showErrorLogAct.setWhatsThis(self.trUtf8(
+            """<b>Show Error Log...</b>"""
+            """<p>Opens a dialog showing the most recent error log.</p>"""
+        ))
+        self.showErrorLogAct.triggered[()].connect(self.__showErrorLog)
+        self.actions.append(self.showErrorLogAct)
+        
         self.reportBugAct = E5Action(
             self.trUtf8('Report Bug'),
             self.trUtf8('Report &Bug...'),
@@ -2171,7 +2185,7 @@
             """<p>This opens a dialog, that shows a list of plugins """
             """available on the Internet.</p>"""
         ))
-        self.pluginRepoAct.triggered[()].connect(self.__showPluginsAvailable)
+        self.pluginRepoAct.triggered[()].connect(self.showPluginsAvailable)
         self.actions.append(self.pluginRepoAct)
         
         # initialize viewmanager actions
@@ -2498,6 +2512,7 @@
         self.__menus["help"].addAction(self.checkUpdateAct)
         self.__menus["help"].addAction(self.showVersionsAct)
         self.__menus["help"].addSeparator()
+        self.__menus["help"].addAction(self.showErrorLogAct)
         self.__menus["help"].addAction(self.reportBugAct)
         self.__menus["help"].addAction(self.requestFeatureAct)
         self.__menus["help"].addSeparator()
@@ -2841,6 +2856,7 @@
         """
         self.checkUpdateAct.setEnabled(not self.__inVersionCheck)
         self.showVersionsAct.setEnabled(not self.__inVersionCheck)
+        self.showErrorLogAct.setEnabled(self.__hasErrorLog())
         
         self.showMenu.emit("Help", self.__menus["help"])
     
@@ -3006,12 +3022,34 @@
         user, what to do with it.
         """
         if Preferences.getUI("CheckErrorLog"):
-            logFile = os.path.join(Utilities.getConfigDir(), "eric5_error.log")
+            logFile = os.path.join(Utilities.getConfigDir(),
+                                   self.ErrorLogFileName)
             if os.path.exists(logFile):
                 from .ErrorLogDialog import ErrorLogDialog
-                dlg = ErrorLogDialog(logFile, self)
+                dlg = ErrorLogDialog(logFile, False, self)
                 dlg.exec_()
         
+    def __hasErrorLog(self):
+        """
+        Private method to check, if an error log file exists.
+        
+        @return flag indicating the existence of an error log file (boolean)
+        """
+        logFile = os.path.join(Utilities.getConfigDir(),
+                               self.ErrorLogFileName)
+        return os.path.exists(logFile)
+        
+    def __showErrorLog(self):
+        """
+        Private slot to show the most recent error log message.
+        """
+        logFile = os.path.join(Utilities.getConfigDir(),
+                               self.ErrorLogFileName)
+        if os.path.exists(logFile):
+            from .ErrorLogDialog import ErrorLogDialog
+            dlg = ErrorLogDialog(logFile, True, self)
+            dlg.show()
+        
     def __compareFiles(self):
         """
         Private slot to handle the Compare Files dialog.
@@ -5569,9 +5607,9 @@
         dlg = PluginUninstallDialog(self.pluginManager, self)
         dlg.exec_()
         
-    def __showPluginsAvailable(self):
-        """
-        Private slot to show the plugins available for download.
+    def showPluginsAvailable(self):
+        """
+        Public slot to show the plugins available for download.
         """
         from PluginManager.PluginRepositoryDialog import PluginRepositoryDialog
         dlg = PluginRepositoryDialog(self)
@@ -5584,6 +5622,12 @@
         Private slot to show the plugin manager configuration page.
         """
         self.showPreferences("pluginManagerPage")
+        
+    def checkPluginUpdatesAvailable(self):
+        """
+        Public method to check the availability of updates of plug-ins.
+        """
+        self.pluginManager.checkPluginUpdatesAvailable()
     
     #################################################################
     ## Drag and Drop Support
@@ -5757,7 +5801,8 @@
                         if period == 2 and lastCheck.day() == now.day():
                             # daily
                             return
-                        elif period == 3 and lastCheck.daysTo(now) < 7:
+                        elif (period == 3 and
+                              lastCheck.weekNumber() == now.weekNumber()):
                             # weekly
                             return
                         elif period == 4 and lastCheck.month() == now.month():
@@ -5774,8 +5819,8 @@
             if self.__versionCheckProgress is None:
                 self.__versionCheckProgress = E5ProgressDialog(
                     "", self.trUtf8("&Cancel"),
-                    0,  len(self.__httpAlternatives),
-                    self.trUtf8("%v/%m"),  self)
+                    0, len(self.__httpAlternatives),
+                    self.trUtf8("%v/%m"), self)
                 self.__versionCheckProgress.setMinimumDuration(0)
                 self.__versionCheckProgress.canceled.connect(
                     self.__versionsDownloadCanceled)
--- a/ViewManager/ViewManager.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/ViewManager/ViewManager.py	Fri Dec 13 23:39:14 2013 +0100
@@ -418,12 +418,20 @@
         """
         return False
         
+    def getSplitOrientation(self):
+        """
+        Public method to get the orientation of the split view.
+        
+        @return orientation of the split (Qt.Horizontal or Qt.Vertical)
+        """
+        return Qt.Vertical
+        
     def setSplitOrientation(self, orientation):
         """
         Public method used to set the orientation of the split view.
         
         @param orientation orientation of the split
-                (Qt.Horizontal or Qt.Vertical)
+            (Qt.Horizontal or Qt.Vertical)
         """
         pass
         
@@ -3321,6 +3329,44 @@
         self.unhighlightAct.triggered[()].connect(self.unhighlight)
         self.viewActions.append(self.unhighlightAct)
         
+        self.newDocumentViewAct = E5Action(
+            QApplication.translate('ViewManager', 'New Document View'),
+            UI.PixmapCache.getIcon("documentNewView.png"),
+            QApplication.translate('ViewManager', 'New &Document View'),
+            0, 0, self, 'vm_view_new_document_view')
+        self.newDocumentViewAct.setStatusTip(QApplication.translate(
+            'ViewManager', 'Open a new view of the current document'))
+        self.newDocumentViewAct.setWhatsThis(QApplication.translate(
+            'ViewManager',
+            """<b>New Document View</b>"""
+            """<p>Opens a new view of the current document. Both views show"""
+            """ the same document. However, the cursors may be positioned"""
+            """ independently.</p>"""
+        ))
+        self.newDocumentViewAct.triggered[()].connect(self.__newDocumentView)
+        self.viewActions.append(self.newDocumentViewAct)
+        
+        self.newDocumentSplitViewAct = E5Action(
+            QApplication.translate(
+                'ViewManager', 'New Document View (with new split)'),
+            UI.PixmapCache.getIcon("splitVertical.png"),
+            QApplication.translate(
+                'ViewManager', 'New Document View (with new split)'),
+            0, 0, self, 'vm_view_new_document_split_view')
+        self.newDocumentSplitViewAct.setStatusTip(QApplication.translate(
+            'ViewManager',
+            'Open a new view of the current document in a new split'))
+        self.newDocumentSplitViewAct.setWhatsThis(QApplication.translate(
+            'ViewManager',
+            """<b>New Document View</b>"""
+            """<p>Opens a new view of the current document in a new split."""
+            """ Both views show the same document. However, the cursors may"""
+            """ be positioned independently.</p>"""
+        ))
+        self.newDocumentSplitViewAct.triggered[()].connect(
+            self.__newDocumentSplitView)
+        self.viewActions.append(self.newDocumentSplitViewAct)
+        
         self.splitViewAct = E5Action(
             QApplication.translate('ViewManager', 'Split view'),
             UI.PixmapCache.getIcon("splitVertical.png"),
@@ -3441,7 +3487,10 @@
         menu.addAction(self.previewAct)
         menu.addSeparator()
         menu.addAction(self.unhighlightAct)
+        menu.addSeparator()
+        menu.addAction(self.newDocumentViewAct)
         if self.canSplit():
+            menu.addAction(self.newDocumentSplitViewAct)
             menu.addSeparator()
             menu.addAction(self.splitViewAct)
             menu.addAction(self.splitOrientationAct)
@@ -3467,6 +3516,10 @@
         tb.addActions(self.viewActGrp.actions())
         tb.addSeparator()
         tb.addAction(self.previewAct)
+        tb.addSeparator()
+        tb.addAction(self.newDocumentViewAct)
+        if self.canSplit():
+            tb.addAction(self.newDocumentSplitViewAct)
         
         toolbarManager.addToolBar(tb, tb.windowTitle())
         toolbarManager.addAction(self.unhighlightAct, tb.windowTitle())
@@ -5545,6 +5598,23 @@
             line, index = aw.getCursorPosition()
             aw.foldLine(line)
         
+    def __newDocumentView(self):
+        """
+        Private method to open a new view of the current editor.
+        """
+        aw = self.activeWindow()
+        if aw:
+            self.newEditorView(aw.getFileName(), aw, aw.getFileType())
+        
+    def __newDocumentSplitView(self):
+        """
+        Private method to open a new view of the current editor in a new split.
+        """
+        aw = self.activeWindow()
+        if aw:
+            self.addSplit()
+            self.newEditorView(aw.getFileName(), aw, aw.getFileType())
+        
     def __splitView(self):
         """
         Private method to handle the split view action.
@@ -5564,12 +5634,16 @@
                 UI.PixmapCache.getIcon("splitHorizontal.png"))
             self.splitRemoveAct.setIcon(
                 UI.PixmapCache.getIcon("remsplitHorizontal.png"))
+            self.newDocumentSplitViewAct.setIcon(
+                UI.PixmapCache.getIcon("splitHorizontal.png"))
         else:
             self.setSplitOrientation(Qt.Vertical)
             self.splitViewAct.setIcon(
                 UI.PixmapCache.getIcon("splitVertical.png"))
             self.splitRemoveAct.setIcon(
                 UI.PixmapCache.getIcon("remsplitVertical.png"))
+            self.newDocumentSplitViewAct.setIcon(
+                UI.PixmapCache.getIcon("splitVertical.png"))
     
     def __previewEditor(self, checked):
         """
@@ -6039,6 +6113,8 @@
         self.viewActGrp.setEnabled(False)
         self.viewFoldActGrp.setEnabled(False)
         self.unhighlightAct.setEnabled(False)
+        self.newDocumentViewAct.setEnabled(False)
+        self.newDocumentSplitViewAct.setEnabled(False)
         self.splitViewAct.setEnabled(False)
         self.splitOrientationAct.setEnabled(False)
         self.previewAct.setEnabled(True)
@@ -6076,7 +6152,9 @@
         self.viewActGrp.setEnabled(True)
         self.viewFoldActGrp.setEnabled(True)
         self.unhighlightAct.setEnabled(True)
+        self.newDocumentViewAct.setEnabled(True)
         if self.canSplit():
+            self.newDocumentSplitViewAct.setEnabled(True)
             self.splitViewAct.setEnabled(True)
             self.splitOrientationAct.setEnabled(True)
         self.macroActGrp.setEnabled(True)
--- a/changelog	Fri Dec 13 22:45:47 2013 +0100
+++ b/changelog	Fri Dec 13 23:39:14 2013 +0100
@@ -1,6 +1,6 @@
 Change Log
 ----------
-Version 5.4-snapshot-2013mmdd:
+Version 5.4.0-RC1:
 - bug fixes
 - General
   -- introduced a zoom widget in the status bar of several windows
@@ -15,6 +15,7 @@
   -- added commandline options '--start-file', '--start-multi' and
      '--start-project' to start with the most recently opened file,
      multi project or project
+  -- added a dialog to show the most recent error log
 - Debugger
   -- Debug Viewer
      --- added a viewer for the call stack leading to the current line
@@ -38,7 +39,8 @@
   -- added support to show the current class/method name in the combo boxes
      at the top of the editor
 - File Browser
-  -- added a JavaScript parser in order to show the structure of JavaScript files
+  -- added a JavaScript parser in order to show the structure of JavaScript
+     files
 - Mini Editor
   -- changed the line numbers margin to adjust themselves to the size needed
   -- added support for virtual space
@@ -54,9 +56,10 @@
      --- added support for more widgets in the code creation dialog
      --- added a plug-in hook for the 'open' action
   -- Sources Viewer
-     --- added support to highlight the current class/method name of the current
-         editor
-     --- added a JavaScript parser in order to show the structure of JavaScript files
+     --- added support to highlight the current class/method name of the
+         current editor
+     --- added a JavaScript parser in order to show the structure of JavaScript
+         files
   -- Translations Viewer
      --- added a plug-in hook for the 'open' action
 - Shell
@@ -80,6 +83,7 @@
      --- added capability to compare files side-by-side
   -- Subversion
      --- added capability to compare files side-by-side
+     --- added cabaility to upgrade the working copy format
 - Web Browser
   -- reworked the various SSL info widgets to show more info
   -- added a dialog to configure hosts to be exempted from caching
@@ -87,6 +91,7 @@
      as a screen shot
 - Wizards
   -- added a wizard for the Qt5 QRegularExpression class (requires PyQt5)
+  -- added support for PyQt5 to the QFileDialog wizard
 - Third Party packages
   -- updated to Pygments 1.6
 
@@ -100,8 +105,8 @@
 - Debug Viewer
   -- added a viewer for call trace logs
 - Editor
-  -- added actions to search for the next/previous occurence of the current word
-     (default shortcuts Ctrl+. and Ctrl+,)
+  -- added actions to search for the next/previous occurence of the current
+     word (default shortcuts Ctrl+. and Ctrl+,)
   -- added some icons to the "Languages" and "End-of-Line Type" context menus
 - IRC
   -- added a simple IRC client
@@ -115,10 +120,10 @@
      for the switching between the 'inner' windows.
   -- added a notification system
 - View Manager
-  -- added actions to open the find in files and replace in files dialogs in a mode
-     that searches open files only
-  -- change the status labels for programming language and end-of-line type to show
-     an icon
+  -- added actions to open the find in files and replace in files dialogs in a
+     mode that searches open files only
+  -- change the status labels for programming language and end-of-line type to
+     show an icon
 
 Version 5.3-snapshot-20121101:
 - bug fixes
@@ -141,30 +146,33 @@
   -- added the capability to rebuild a diagram without losing the current item
      positions
 - Plug-ins
-  -- added the 'addSideWidget()' and 'removeSideWidget()' methods to the UserInterface
-     class to allow plug-in developers to add a plug-in widget to the left or bottom
-     side containers
+  -- added the 'addSideWidget()' and 'removeSideWidget()' methods to the
+     UserInterface class to allow plug-in developers to add a plug-in widget
+     to the left or bottom side containers
 - Project
-  -- made the selectable project types of the project properties dialog dependent
-     upon the selected programming language
+  -- made the selectable project types of the project properties dialog
+     dependent upon the selected programming language
 - Version Control System Interfaces
   -- Mercurial
      --- added support for --log and --dry-run to the hg graft operation as of
          Mercurial 2.3.0
-     --- added code to disable the (deprecated) transplant menu for Mercurial 2.3.0
+     --- added code to disable the (deprecated) transplant menu for
+         Mercurial 2.3.0
 - Web Browser
   -- added context menu entries for HTML5 media elements
   -- added a personal information manager to assist in completing form fields
-     through field context menu entries or by pressing Ctrl+Return or Ctrl+Enter
+     through field context menu entries or by pressing Ctrl+Return or
+     Ctrl+Enter
   -- added support for GreaseMonkey scripts
   -- added an icon to the status bar to give direct access to AdBlock
   -- rewrote huge part of AdBlock to speed up
   -- added support for dependent AdBlock subscriptions
   -- added support for AdBlock exceptions
-  -- added support for AdBlock checksum checking when downloading a subscription
+  -- added support for AdBlock checksum checking when downloading a
+     subscription
   -- added support for variable AdBlock update periods (given in subscription)
-  -- changed FTP support to use Python's ftplib instead of QFtp because the later
-     is not supported in Qt5 anymore
+  -- changed FTP support to use Python's ftplib instead of QFtp because the
+     later is not supported in Qt5 anymore
   -- added a handler for file: schemes to allow directory listings
 
 Version 5.3-snapshot-20120624:
@@ -203,7 +211,8 @@
   -- added capability to save project tasks automatically (configurable on
      project configuration page of configuration dialog)
 - Tasks
-  -- changed the tasks handling to allow for more fine grained task designations
+  -- changed the tasks handling to allow for more fine grained task
+     designations
 - Tools
   -- added a tool to take screenshots (fullscreen, selected screen, rectangular
      selection, elliptical selection or freehand selection)
@@ -217,21 +226,22 @@
 - Web Browser
   -- extended the check for acceptable SSL certificates for indication via the
      URL entry field
-  -- extended the web page context menu by several entries to send links or the
-     selected text, handling the clicked frame, translate the selected text with
-     Google Translate and search it in Wictionary
-  -- extended the User Agent handling to be able to set the string on a host basis
-     (next to the global user agent string)
+  -- extended the web page context menu by several entries to send links or
+     the selected text, handling the clicked frame, translate the selected
+     text with Google Translate and search it in Wictionary
+  -- extended the User Agent handling to be able to set the string on a host
+     basis (next to the global user agent string)
   -- added code to save the current page as a screen shot
-  -- added capability to synchronize bookmarks, history, passwords and user agent
-     settings via an FTP server or a shared directory
-  -- added the ClickToFlash plug-in to (temporarily) block Flash and related content
-  -- added capability to suppress Referer Headers (configurable via eric4 Web Browser
-     configuration page)
-  -- added capability to select the first nine tabs by pressing Alt+1 to Alt+9 and to
-     switch to the last tab by pressing Alt+0
-  -- added a Speed Dial to the web browser including the capability to select the first
-     ten pages by pressing Meta+1 to Meta+0
+  -- added capability to synchronize bookmarks, history, passwords and user
+     agent settings via an FTP server or a shared directory
+  -- added the ClickToFlash plug-in to (temporarily) block Flash and related
+     content
+  -- added capability to suppress Referer Headers (configurable via eric4 Web
+     Browser configuration page)
+  -- added capability to select the first nine tabs by pressing Alt+1 to Alt+9
+     and to switch to the last tab by pressing Alt+0
+  -- added a Speed Dial to the web browser including the capability to select
+     the first ten pages by pressing Meta+1 to Meta+0
   -- added a history sub-menu showing the most visited sites
   -- added the capability to restore closed tabs
   -- added a bookmarks importer to get them directly from other browsers files
@@ -263,14 +273,19 @@
   -- added a syntax check while typing function
   -- added source navigation function for Python 2, Python 3 and Ruby sources
   -- added support for QScintilla 2.6 (and newer)
-  -- added capability to zoom by Ctrl + Mouse Wheel (same for the shell and terminal)
-  -- added capability to zoom by a pinch gesture (same for the shell and terminal)
-  -- added capability to go to method and class definitions by Shift + Mouse Wheel
-  -- added the capability to replace just the selected occurence of the search text
+  -- added capability to zoom by Ctrl + Mouse Wheel (same for the shell and
+     terminal)
+  -- added capability to zoom by a pinch gesture (same for the shell and
+     terminal)
+  -- added capability to go to method and class definitions by Shift + Mouse
+     Wheel
+  -- added the capability to replace just the selected occurence of the search
+     text
 - Plug-in Manager Tools
   -- added code to download and install plug-ins
 - Source Browser
-  -- show class attributes, class methods and static methods with different icons
+  -- show class attributes, class methods and static methods with different
+     icons
   -- added context menu for attributes
 - Source Documentor
   -- introduced separate sections for class methods and static methods
@@ -282,7 +297,8 @@
      --- added code to write base class information to be used by the
          eric assistant plug-in
 - Unit Test
-  -- extended the unit test module to allow to rerun only failed tests of the last
+  -- extended the unit test module to allow to rerun only failed tests of the
+     last
 - Version Control System Interfaces
   -- all
      --- made "Show Log" behave like "Show Limited Log" and removed the later
@@ -297,21 +313,24 @@
          file first (created by an hg incoming)
      --- added support for importing patches
      --- added support for exporting patches
-     --- added configuration option to create backup files when reverting changes
+     --- added configuration option to create backup files when reverting
+         changes
 - View Manager
   -- added an action to reset the zoom factor
 - Web Browser
   -- added the "Do Not Track" feature
-  -- added code to indicate invalid SSL certificates in the URL entry and the SSL
-     info dialog
+  -- added code to indicate invalid SSL certificates in the URL entry and the
+     SSL info dialog
   -- added a dialog to show RSS feeds
   -- added a dialog to show some information about the current site
   -- added the capability to go through the history via Shift + Mouse Wheel
   -- added capability to zoom by a pinch gesture
 - other enhancements
   -- added an action to launch another instantiation of eric5
-  -- added capability to zoom by Ctrl + Mouse Wheel to various graphics related windows
-  -- added capability to zoom by a pinch gesture to various graphics related windows
+  -- added capability to zoom by Ctrl + Mouse Wheel to various graphics
+     related windows
+  -- added capability to zoom by a pinch gesture to various graphics
+     related windows
 
 Version 5.2-snapshot-20110724:
 - bug fixes
@@ -330,16 +349,17 @@
   -- added some more search engines to the web browser
   -- added capability to encrypt saved passwords with a master password
      and rearranged some configuration parameters related to security
-  -- improved the handling of mouse XButton1 and XButton2 handling in the web browser
+  -- improved the handling of mouse XButton1 and XButton2 handling in the
+     web browser
 - enhancements of the configuration dialog
   -- added function to test the login data to the Email config page
 - enhancements of the Unit Test module
-  -- extended the unit test interface to support skipped tests, expected failures
-     and unexpected successes and to better cope with Python2 scripts when run
-     from the eric IDE
+  -- extended the unit test interface to support skipped tests, expected
+     failures and unexpected successes and to better cope with Python2
+     scripts when run from the eric IDE
 - enhancements of the editor
-  -- added editor actions to go to the last edit location and to the previous or
-     next Python or Ruby class or method definition
+  -- added editor actions to go to the last edit location and to the previous
+     or next Python or Ruby class or method definition
 
 Version 5.2-snapshot-20110501:
 - bug fixes
--- a/eric5.py	Fri Dec 13 22:45:47 2013 +0100
+++ b/eric5.py	Fri Dec 13 23:39:14 2013 +0100
@@ -153,9 +153,10 @@
     
     mainWindow.checkForErrorLog()
     mainWindow.processArgs(args)
-    mainWindow.performVersionCheck(False)
     mainWindow.checkProjectsWorkspace()
     mainWindow.checkConfigurationStatus()
+    mainWindow.performVersionCheck(False)
+    mainWindow.checkPluginUpdatesAvailable()
     mainWindow.autoConnectIrc()
 
 
--- a/i18n/eric5_cs.ts	Fri Dec 13 22:45:47 2013 +0100
+++ b/i18n/eric5_cs.ts	Fri Dec 13 23:39:14 2013 +0100
@@ -3487,17 +3487,17 @@
         <translation type="unfinished">Stisknout pro zobrazení všech souborů, které obsahují problém</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="402"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="404"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="882"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="884"/>
         <source>Fix: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="545"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="547"/>
         <source>No issues found.</source>
         <translation type="unfinished">Žádné problémy nenalezeny.</translation>
     </message>
@@ -3874,7 +3874,7 @@
 <context>
     <name>CodingError</name>
     <message>
-        <location filename="../Utilities/__init__.py" line="106"/>
+        <location filename="../Utilities/__init__.py" line="117"/>
         <source>The coding &apos;{0}&apos; is wrong for the given text.</source>
         <translation>Nesprávné kódování &apos;{0}&apos; pro daný text.</translation>
     </message>
@@ -3926,7 +3926,7 @@
         <translation>Výběr generování QColorDialog.getColor dialogu</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="71"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="143"/>
         <source>Colour</source>
         <translation>Barva</translation>
     </message>
@@ -3936,162 +3936,162 @@
         <translation>Výběr generování QColorDialog.getRgba dialogu</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="204"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="276"/>
         <source>RGBA</source>
         <translation>RGBA</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="83"/>
-        <source>Enter a variable name or a colour</source>
-        <translation>Zadejte hodnotu barvy nebo název</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="95"/>
-        <source>Qt.red</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="100"/>
-        <source>Qt.darkRed</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="105"/>
-        <source>Qt.green</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="110"/>
-        <source>Qt.darkGreen</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="115"/>
-        <source>Qt.blue</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="120"/>
-        <source>Qt.darkBlue</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="125"/>
-        <source>Qt.cyan</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="130"/>
-        <source>Qt.darkCyan</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="135"/>
-        <source>Qt.magenta</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="140"/>
-        <source>Qt.darkMagenta</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="145"/>
-        <source>Qt.yellow</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="150"/>
-        <source>Qt.darkYellow</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="155"/>
+        <source>Enter a variable name or a colour</source>
+        <translation>Zadejte hodnotu barvy nebo název</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="167"/>
+        <source>Qt.red</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="172"/>
+        <source>Qt.darkRed</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="177"/>
+        <source>Qt.green</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="182"/>
+        <source>Qt.darkGreen</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="187"/>
+        <source>Qt.blue</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="192"/>
+        <source>Qt.darkBlue</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="197"/>
+        <source>Qt.cyan</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="202"/>
+        <source>Qt.darkCyan</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="207"/>
+        <source>Qt.magenta</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="212"/>
+        <source>Qt.darkMagenta</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="217"/>
+        <source>Qt.yellow</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="222"/>
+        <source>Qt.darkYellow</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="227"/>
         <source>Qt.white</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="160"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="232"/>
         <source>Qt.lightGray</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="165"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="237"/>
         <source>Qt.gray</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="170"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="242"/>
         <source>Qt.darkGray</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="175"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="247"/>
         <source>Qt.black</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="180"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="252"/>
         <source>Qt.transparent</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="185"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="257"/>
         <source>Qt.color0</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="190"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="262"/>
         <source>Qt.color1</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="213"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="285"/>
         <source>Enter a variable name</source>
         <translation>Zadejte název proměnné</translation>
     </message>
     <message>
         <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="220"/>
         <source>Variable</source>
-        <translation>Proměnná</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="227"/>
+        <translation type="obsolete">Proměnná</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="299"/>
         <source>Enter the alpha value</source>
         <translation>Zadejte alfa hodnotu</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="237"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="309"/>
         <source>Enter the blue value</source>
         <translation>Zadejte hodnotu modré barvy</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="250"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="322"/>
         <source>Enter the green value</source>
         <translation>Zadejte hodnotu zelené barvy</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="263"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="335"/>
         <source>Enter the red value</source>
         <translation>Zadejte hodnotu červené barvy</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="276"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="348"/>
         <source>Alpha</source>
         <translation>Alfa</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="283"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="355"/>
         <source>Blue</source>
         <translation>Modrá</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="290"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="362"/>
         <source>Red</source>
         <translation>Červená</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="297"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="369"/>
         <source>Green</source>
         <translation>Zelená</translation>
     </message>
@@ -4131,12 +4131,12 @@
         <translation type="obsolete">Qt 4.5</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="71"/>
         <source>Title</source>
         <translation>Titulek</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="61"/>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="77"/>
         <source>Enter the dialog title</source>
         <translation>Zadejte titulek dialogu</translation>
     </message>
@@ -4145,6 +4145,61 @@
         <source>&lt;p&gt;The colour &lt;b&gt;{0}&lt;/b&gt; is not valid.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Barva &lt;b&gt;{0}&lt;/b&gt; není platná.&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="55"/>
+        <source>Result</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="61"/>
+        <source>Enter the result variable name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="292"/>
+        <source>Colour Variable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="87"/>
+        <source>Parent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="93"/>
+        <source>Select &quot;self&quot; as parent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="96"/>
+        <source>self</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="106"/>
+        <source>Select &quot;None&quot; as parent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="109"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="118"/>
+        <source>Select to enter a parent expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="121"/>
+        <source>Expression:</source>
+        <translation type="unfinished">Sledovací bod:</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.ui" line="131"/>
+        <source>Enter the parent expression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CompareDialog</name>
@@ -4209,22 +4264,22 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="104"/>
+        <location filename="../UI/CompareDialog.py" line="108"/>
         <source>Compare</source>
         <translation>Porovnat</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="106"/>
+        <location filename="../UI/CompareDialog.py" line="110"/>
         <source>Press to perform the comparison of the two files</source>
         <translation>Stisknout pro provedení porovnání dvou souborů</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="248"/>
+        <location filename="../UI/CompareDialog.py" line="252"/>
         <source>Compare Files</source>
         <translation>Porovnat soubory</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="441"/>
+        <location filename="../UI/CompareDialog.py" line="445"/>
         <source>Select file to compare</source>
         <translation>Výběr souboru pro porovnání</translation>
     </message>
@@ -4239,27 +4294,27 @@
         <translation>&amp;Synchronizovat vodorovné posuvníky</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="353"/>
+        <location filename="../UI/CompareDialog.py" line="357"/>
         <source>Total: {0}</source>
         <translation>Celkem: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="355"/>
+        <location filename="../UI/CompareDialog.py" line="359"/>
         <source>Changed: {0}</source>
         <translation>Změněno: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="356"/>
+        <location filename="../UI/CompareDialog.py" line="360"/>
         <source>Added: {0}</source>
         <translation>Přidáno: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="357"/>
+        <location filename="../UI/CompareDialog.py" line="361"/>
         <source>Deleted: {0}</source>
         <translation>Smazáno: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="248"/>
+        <location filename="../UI/CompareDialog.py" line="252"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nelze přečíst.&lt;/p&gt;</translation>
     </message>
@@ -5139,42 +5194,42 @@
         <translation>&amp;Filtr pro:</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="512"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="513"/>
         <source>Code Generation</source>
         <translation>Generování kódu</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="328"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="329"/>
         <source>uic error</source>
         <translation>uic chyba</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="117"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="118"/>
         <source>Create Dialog Code</source>
         <translation>Vytvořit Dialog Code</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="117"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="118"/>
         <source>The file &lt;b&gt;{0}&lt;/b&gt; exists but does not contain any classes.</source>
         <translation>Soubor &lt;b&gt;{0}&lt;/b&gt; existuje ale neobsahuje žádné třídy.</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="328"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="329"/>
         <source>&lt;p&gt;There was an error loading the form &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Byla nalezena chyba načtená z &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="397"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="398"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Template soubor &lt;b&gt;{0}&lt;/b&gt; nelze otevřít.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="433"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="434"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nelze ovevřít source soubor &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Project/CreateDialogCodeDialog.py" line="512"/>
+        <location filename="../Project/CreateDialogCodeDialog.py" line="513"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nelze zapsat do source souboru &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -7133,190 +7188,195 @@
 <context>
     <name>DocStyleChecker</name>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="124"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="128"/>
         <source>module is missing a docstring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="126"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="130"/>
         <source>public function/method is missing a docstring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="129"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="133"/>
         <source>private function/method may be missing a docstring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="132"/>
-        <source>public class is missing a docstring</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="134"/>
-        <source>private class may be missing a docstring</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="136"/>
-        <source>docstring not surrounded by &quot;&quot;&quot;</source>
+        <source>public class is missing a docstring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="138"/>
+        <source>private class may be missing a docstring</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="140"/>
+        <source>docstring not surrounded by &quot;&quot;&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="142"/>
         <source>docstring containing \ not surrounded by r&quot;&quot;&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="141"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="145"/>
         <source>docstring containing unicode character not surrounded by u&quot;&quot;&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="144"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="148"/>
         <source>one-liner docstring on multiple lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="146"/>
-        <source>docstring has wrong indentation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="187"/>
-        <source>docstring summary does not end with a period</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="150"/>
-        <source>docstring summary is not in imperative mood (Does instead of Do)</source>
+        <source>docstring has wrong indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="191"/>
+        <source>docstring summary does not end with a period</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="154"/>
+        <source>docstring summary is not in imperative mood (Does instead of Do)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="158"/>
         <source>docstring summary looks like a function&apos;s/method&apos;s signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="157"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="161"/>
         <source>docstring does not mention the return value type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="160"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="164"/>
         <source>function/method docstring is separated by a blank line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="163"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="167"/>
         <source>class docstring is not preceded by a blank line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="166"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="170"/>
         <source>class docstring is not followed by a blank line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="219"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="223"/>
         <source>docstring summary is not followed by a blank line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="172"/>
-        <source>last paragraph of docstring is not followed by a blank line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="176"/>
+        <source>last paragraph of docstring is not followed by a blank line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="180"/>
         <source>private function/method is missing a docstring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="179"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="183"/>
         <source>private class is missing a docstring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="181"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="185"/>
         <source>leading quotes of docstring not on separate line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="184"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="188"/>
         <source>trailing quotes of docstring not on separate line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="189"/>
-        <source>docstring does not contain a @return line but function/method returns something</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="193"/>
-        <source>docstring contains a @return line but function/method doesn&apos;t return anything</source>
+        <source>docstring does not contain a @return line but function/method returns something</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="197"/>
+        <source>docstring contains a @return line but function/method doesn&apos;t return anything</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="201"/>
         <source>docstring does not contain enough @param/@keyparam lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="200"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="204"/>
         <source>docstring contains too many @param/@keyparam lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="203"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="207"/>
         <source>keyword only arguments must be documented with @keyparam lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="206"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="210"/>
         <source>order of @param/@keyparam lines does not match the function/method signature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="209"/>
-        <source>class docstring is preceded by a blank line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="211"/>
-        <source>class docstring is followed by a blank line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="213"/>
+        <source>class docstring is preceded by a blank line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="215"/>
+        <source>class docstring is followed by a blank line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="217"/>
         <source>function/method docstring is preceded by a blank line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="216"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="220"/>
         <source>function/method docstring is followed by a blank line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="222"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="226"/>
         <source>last paragraph of docstring is followed by a blank line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="225"/>
-        <source>docstring does not contain a @exception line but function/method raises an exception</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="229"/>
+        <source>docstring does not contain a @exception line but function/method raises an exception</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="233"/>
         <source>docstring contains a @exception line but function/method doesn&apos;t raise an exception</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="412"/>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="437"/>
         <source>no message for this code defined</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="238"/>
+        <source>{0}: {1}</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DownloadAskActionDialog</name>
@@ -7945,7 +8005,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="403"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="417"/>
         <source>Information</source>
         <translation type="unfinished">Informace</translation>
     </message>
@@ -7955,7 +8015,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="419"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="433"/>
         <source>Question</source>
         <translation type="unfinished">Otázka</translation>
     </message>
@@ -7965,7 +8025,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="435"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="449"/>
         <source>Warning</source>
         <translation type="unfinished">Varování</translation>
     </message>
@@ -7975,7 +8035,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="448"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="462"/>
         <source>Critical</source>
         <translation type="unfinished">Kritický</translation>
     </message>
@@ -8040,67 +8100,67 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="150"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="164"/>
         <source>Title</source>
         <translation type="unfinished">Titulek</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="157"/>
-        <source>Enter the title for the message box</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="164"/>
-        <source>Message</source>
-        <translation type="unfinished">Zpráva</translation>
-    </message>
-    <message>
         <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="171"/>
+        <source>Enter the title for the message box</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="178"/>
+        <source>Message</source>
+        <translation type="unfinished">Zpráva</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="185"/>
         <source>Enter the message to be shown in the message box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="181"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="195"/>
         <source>Parent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="187"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="201"/>
         <source>Select &quot;self&quot; as parent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="190"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="204"/>
         <source>self</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="200"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="214"/>
         <source>Select &quot;None&quot; as parent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="203"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="217"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="212"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="226"/>
         <source>Select to enter a parent expression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="215"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="229"/>
         <source>Expression:</source>
         <translation type="unfinished">Sledovací bod:</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="225"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="239"/>
         <source>Enter the parent expression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="237"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="251"/>
         <source>Standard Buttons</source>
         <translation type="unfinished">Standardní tlačítka</translation>
     </message>
@@ -8195,67 +8255,67 @@
         <translation type="unfinished">Ano pro všechno</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="372"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="386"/>
         <source>Default Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="384"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="398"/>
         <source>Select the default button</source>
         <translation type="unfinished">Vybrat defaultní tlačítko</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="394"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="408"/>
         <source>Icon</source>
         <translation type="unfinished">Ikona</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="400"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="414"/>
         <source>Show an Information icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="416"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="430"/>
         <source>Show a Question icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="432"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="446"/>
         <source>Show a Warning icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="445"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="459"/>
         <source>Show a Critical icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="463"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="477"/>
         <source>Select to generate a modal message box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="466"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="480"/>
         <source>Modal Message Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="476"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="490"/>
         <source>Select to make &apos;Yes&apos; the default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="479"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="493"/>
         <source>Yes is default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="489"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="503"/>
         <source>Save function:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="499"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="513"/>
         <source>Enter the name of the save function</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8269,6 +8329,16 @@
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="150"/>
+        <source>Result:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="157"/>
+        <source>Enter the result variable name</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>E5NetworkHeaderDetailsDialog</name>
@@ -9094,7 +9164,7 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2740"/>
+        <location filename="../QScintilla/Editor.py" line="2743"/>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
@@ -9194,382 +9264,382 @@
         <translation>Zapnout autodoplňování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="724"/>
+        <location filename="../QScintilla/Editor.py" line="722"/>
         <source>New view</source>
-        <translation>Nový pohled</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="725"/>
+        <translation type="obsolete">Nový pohled</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="723"/>
         <source>New view (with new split)</source>
-        <translation>Nový pohled (s novým rozdělením)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="729"/>
+        <translation type="obsolete">Nový pohled (s novým rozdělením)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="732"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="733"/>
-        <source>Save</source>
-        <translation>Uložit</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="736"/>
+        <source>Save</source>
+        <translation>Uložit</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="739"/>
         <source>Save As...</source>
         <translation>Uložit jako...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="749"/>
+        <location filename="../QScintilla/Editor.py" line="752"/>
         <source>Print</source>
         <translation>Tisk</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="770"/>
+        <location filename="../QScintilla/Editor.py" line="773"/>
         <source>Autocomplete</source>
         <translation>Autodoplňování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="775"/>
+        <location filename="../QScintilla/Editor.py" line="778"/>
         <source>from Document</source>
         <translation>z dokumentu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="777"/>
+        <location filename="../QScintilla/Editor.py" line="780"/>
         <source>from APIs</source>
         <translation>z API</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="779"/>
+        <location filename="../QScintilla/Editor.py" line="782"/>
         <source>from Document and APIs</source>
         <translation>z dokumentu a API</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="795"/>
+        <location filename="../QScintilla/Editor.py" line="798"/>
         <source>Check</source>
         <translation>Zkontrolovat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="805"/>
-        <source>Show</source>
-        <translation>Zobrazit</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="807"/>
-        <source>Code metrics...</source>
-        <translation>Metrika kódu...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="808"/>
-        <source>Code coverage...</source>
-        <translation>Pokrytí kódu...</translation>
+        <source>Show</source>
+        <translation>Zobrazit</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="810"/>
-        <source>Show code coverage annotations</source>
-        <translation>Zobrazit poznámky pokrytí kódu</translation>
+        <source>Code metrics...</source>
+        <translation>Metrika kódu...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="811"/>
+        <source>Code coverage...</source>
+        <translation>Pokrytí kódu...</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="813"/>
-        <source>Hide code coverage annotations</source>
-        <translation>Skrýt poznámky pokrytí kódu</translation>
+        <source>Show code coverage annotations</source>
+        <translation>Zobrazit poznámky pokrytí kódu</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="816"/>
+        <source>Hide code coverage annotations</source>
+        <translation>Skrýt poznámky pokrytí kódu</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="819"/>
         <source>Profile data...</source>
         <translation>Profilovat data...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="829"/>
+        <location filename="../QScintilla/Editor.py" line="832"/>
         <source>Diagrams</source>
         <translation>Diagramy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="831"/>
+        <location filename="../QScintilla/Editor.py" line="834"/>
         <source>Class Diagram...</source>
         <translation>Diagram třídy...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="833"/>
+        <location filename="../QScintilla/Editor.py" line="836"/>
         <source>Package Diagram...</source>
         <translation>Diagram balíčku...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="835"/>
+        <location filename="../QScintilla/Editor.py" line="838"/>
         <source>Imports Diagram...</source>
         <translation>Diagram importů...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="837"/>
+        <location filename="../QScintilla/Editor.py" line="840"/>
         <source>Application Diagram...</source>
         <translation>Diagram aplikace...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="855"/>
-        <source>Languages</source>
-        <translation>Jazyky</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="858"/>
+        <source>Languages</source>
+        <translation>Jazyky</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="861"/>
         <source>No Language</source>
         <translation>Žádný jazyk</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1084"/>
+        <location filename="../QScintilla/Editor.py" line="1087"/>
         <source>Toggle bookmark</source>
         <translation>Přepnout záložku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1086"/>
+        <location filename="../QScintilla/Editor.py" line="1089"/>
         <source>Next bookmark</source>
         <translation>Následující záložka</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1088"/>
+        <location filename="../QScintilla/Editor.py" line="1091"/>
         <source>Previous bookmark</source>
         <translation>Předchozí záložka</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1090"/>
-        <source>Clear all bookmarks</source>
-        <translation>Zrušit všechny záložky</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1093"/>
+        <source>Clear all bookmarks</source>
+        <translation>Zrušit všechny záložky</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1096"/>
         <source>Goto syntax error</source>
         <translation>Jít na chybu syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1095"/>
+        <location filename="../QScintilla/Editor.py" line="1098"/>
         <source>Show syntax error message</source>
         <translation>Zobrazit hlášení syntaktické chyby</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1097"/>
+        <location filename="../QScintilla/Editor.py" line="1100"/>
         <source>Clear syntax error</source>
         <translation>Zrušit chybu syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1110"/>
+        <location filename="../QScintilla/Editor.py" line="1113"/>
         <source>Toggle breakpoint</source>
         <translation>Přepnout breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1112"/>
-        <source>Toggle temporary breakpoint</source>
-        <translation>Přepnout dočasný breakpoint</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1115"/>
+        <source>Toggle temporary breakpoint</source>
+        <translation>Přepnout dočasný breakpoint</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1118"/>
         <source>Edit breakpoint...</source>
         <translation>Editovat breakpoint...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4729"/>
+        <location filename="../QScintilla/Editor.py" line="4743"/>
         <source>Enable breakpoint</source>
         <translation>Aktivovat breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1120"/>
+        <location filename="../QScintilla/Editor.py" line="1123"/>
         <source>Next breakpoint</source>
         <translation>Následující breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1122"/>
+        <location filename="../QScintilla/Editor.py" line="1125"/>
         <source>Previous breakpoint</source>
         <translation>Předchozí breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1124"/>
-        <source>Clear all breakpoints</source>
-        <translation>Zrušit všechny breakpointy</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1127"/>
-        <source>Next uncovered line</source>
-        <translation>Následující odkrytá řádka</translation>
+        <source>Clear all breakpoints</source>
+        <translation>Zrušit všechny breakpointy</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="1130"/>
-        <source>Previous uncovered line</source>
-        <translation>Předchozí odkrytá řádka</translation>
+        <source>Next uncovered line</source>
+        <translation>Následující odkrytá řádka</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="1133"/>
+        <source>Previous uncovered line</source>
+        <translation>Předchozí odkrytá řádka</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1136"/>
         <source>Next task</source>
         <translation>Následující úloha</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1135"/>
+        <location filename="../QScintilla/Editor.py" line="1138"/>
         <source>Previous task</source>
         <translation>Předchozí úloha</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1144"/>
+        <location filename="../QScintilla/Editor.py" line="1147"/>
         <source>LMB toggles bookmarks</source>
         <translation>LMB přepínač záložek</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1148"/>
+        <location filename="../QScintilla/Editor.py" line="1151"/>
         <source>LMB toggles breakpoints</source>
         <translation>LMB přepínač breakpointů</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1652"/>
+        <location filename="../QScintilla/Editor.py" line="1655"/>
         <source>Modification of Read Only file</source>
         <translation>Modifikace souboru otevřeného jen pro čtení</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1652"/>
+        <location filename="../QScintilla/Editor.py" line="1655"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Pokoušíte se změnit soubor, který je otevřen jen pro čtení. Prosím, uložte jej nejdříve do jiného souboru.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2348"/>
+        <location filename="../QScintilla/Editor.py" line="2351"/>
         <source>Printing...</source>
         <translation>Tisk...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2365"/>
+        <location filename="../QScintilla/Editor.py" line="2368"/>
         <source>Printing completed</source>
         <translation>Tisk je hotov</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2367"/>
-        <source>Error while printing</source>
-        <translation>Chyba během tisku</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="2370"/>
+        <source>Error while printing</source>
+        <translation>Chyba během tisku</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2373"/>
         <source>Printing aborted</source>
         <translation>Tisk byl zrušen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2910"/>
+        <location filename="../QScintilla/Editor.py" line="2913"/>
         <source>Save File</source>
         <translation>Uložit soubor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2691"/>
+        <location filename="../QScintilla/Editor.py" line="2694"/>
         <source>File Modified</source>
         <translation>Soubor je modifikován</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4215"/>
+        <location filename="../QScintilla/Editor.py" line="4219"/>
         <source>Autocompletion</source>
         <translation>Autodoplňování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4215"/>
+        <location filename="../QScintilla/Editor.py" line="4219"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4732"/>
+        <location filename="../QScintilla/Editor.py" line="4746"/>
         <source>Disable breakpoint</source>
         <translation>Deaktivovat breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5042"/>
+        <location filename="../QScintilla/Editor.py" line="5056"/>
         <source>Code Coverage</source>
         <translation>Pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5042"/>
+        <location filename="../QScintilla/Editor.py" line="5056"/>
         <source>Please select a coverage file</source>
         <translation>Prosím, vyberte soubor s pokrytím kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5105"/>
+        <location filename="../QScintilla/Editor.py" line="5119"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zobrazit poznámky pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5098"/>
+        <location filename="../QScintilla/Editor.py" line="5112"/>
         <source>All lines have been covered.</source>
         <translation>Všechny řádky byly pokryty.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5105"/>
+        <location filename="../QScintilla/Editor.py" line="5119"/>
         <source>There is no coverage file available.</source>
         <translation>Soubor s pokrytím není dostupný.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5203"/>
+        <location filename="../QScintilla/Editor.py" line="5217"/>
         <source>Profile Data</source>
         <translation>Profilovat data</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5203"/>
+        <location filename="../QScintilla/Editor.py" line="5217"/>
         <source>Please select a profile file</source>
         <translation>Prosím, vyberte soubor s profilem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5343"/>
+        <location filename="../QScintilla/Editor.py" line="5357"/>
         <source>Syntax Error</source>
         <translation>Chyba syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5343"/>
+        <location filename="../QScintilla/Editor.py" line="5357"/>
         <source>No syntax error message available.</source>
         <translation>Hlášení syntaktické chyby není dostupné.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5637"/>
+        <location filename="../QScintilla/Editor.py" line="5651"/>
         <source>Macro Name</source>
         <translation>Název makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5637"/>
+        <location filename="../QScintilla/Editor.py" line="5651"/>
         <source>Select a macro name:</source>
         <translation>Vyberte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5665"/>
+        <location filename="../QScintilla/Editor.py" line="5679"/>
         <source>Load macro file</source>
         <translation>Načíst soubor makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5708"/>
+        <location filename="../QScintilla/Editor.py" line="5722"/>
         <source>Macro files (*.macro)</source>
         <translation>Macro soubory (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5688"/>
+        <location filename="../QScintilla/Editor.py" line="5702"/>
         <source>Error loading macro</source>
         <translation>Chyba při načítání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5708"/>
+        <location filename="../QScintilla/Editor.py" line="5722"/>
         <source>Save macro file</source>
         <translation>Uložit soubor s makrem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5725"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>Save macro</source>
         <translation>Uložit makro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5741"/>
+        <location filename="../QScintilla/Editor.py" line="5755"/>
         <source>Error saving macro</source>
         <translation>Chyba při ukládání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5754"/>
+        <location filename="../QScintilla/Editor.py" line="5768"/>
         <source>Start Macro Recording</source>
         <translation>Spustit záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5754"/>
+        <location filename="../QScintilla/Editor.py" line="5768"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Nahrávání makra již probíhá. Spustit nové?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5780"/>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
         <source>Macro Recording</source>
         <translation>Záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5780"/>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
         <source>Enter name of the macro:</source>
         <translation>Vložte název makra:</translation>
     </message>
@@ -9579,117 +9649,117 @@
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Pozor:&lt;/b&gt; Ztratíte všechny změny pokud jej znovu otevřete.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5912"/>
+        <location filename="../QScintilla/Editor.py" line="5926"/>
         <source>File changed</source>
         <translation>Soubor změněn</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6173"/>
-        <source>Drop Error</source>
-        <translation>Zahodit chybu</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6194"/>
-        <source>Resources</source>
-        <translation>Zdroje</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6196"/>
-        <source>Add file...</source>
-        <translation>Přidat soubor...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="6198"/>
+        <source>Drop Error</source>
+        <translation>Zahodit chybu</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6219"/>
+        <source>Resources</source>
+        <translation>Zdroje</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6221"/>
+        <source>Add file...</source>
+        <translation>Přidat soubor...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6223"/>
         <source>Add files...</source>
         <translation>Přidat soubory...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6200"/>
+        <location filename="../QScintilla/Editor.py" line="6225"/>
         <source>Add aliased file...</source>
         <translation>Přidat zástupce souboru...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6203"/>
+        <location filename="../QScintilla/Editor.py" line="6228"/>
         <source>Add localized resource...</source>
         <translation>Přidat lokalizované resource...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6207"/>
+        <location filename="../QScintilla/Editor.py" line="6232"/>
         <source>Add resource frame</source>
         <translation>Přidat resource frame</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6226"/>
+        <location filename="../QScintilla/Editor.py" line="6251"/>
         <source>Add file resource</source>
         <translation>Přidat soubor resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6242"/>
+        <location filename="../QScintilla/Editor.py" line="6267"/>
         <source>Add file resources</source>
         <translation>Přidat soubory resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6269"/>
+        <location filename="../QScintilla/Editor.py" line="6294"/>
         <source>Add aliased file resource</source>
         <translation>Přidat zástupce souboru resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6333"/>
+        <location filename="../QScintilla/Editor.py" line="6358"/>
         <source>Package Diagram</source>
         <translation>Diagram balíčku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6333"/>
+        <location filename="../QScintilla/Editor.py" line="6358"/>
         <source>Include class attributes?</source>
         <translation>Včetně atributů třídy?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6392"/>
         <source>Application Diagram</source>
         <translation>Diagram aplikace</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6367"/>
+        <location filename="../QScintilla/Editor.py" line="6392"/>
         <source>Include module names?</source>
         <translation>Včetně jmen modulů?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="961"/>
+        <location filename="../QScintilla/Editor.py" line="964"/>
         <source>Export as</source>
         <translation>Exportovat jako</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1184"/>
+        <location filename="../QScintilla/Editor.py" line="1187"/>
         <source>Export source</source>
         <translation>Export zdroj</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1184"/>
+        <location filename="../QScintilla/Editor.py" line="1187"/>
         <source>No export format given. Aborting...</source>
         <translation>Nebyl zadán forám exportu. Zrušeno....</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>Imports Diagram</source>
         <translation>Importovat diagram</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6353"/>
+        <location filename="../QScintilla/Editor.py" line="6378"/>
         <source>Include imports from external modules?</source>
         <translation>Zahrnout importy z externích modulů?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="772"/>
+        <location filename="../QScintilla/Editor.py" line="775"/>
         <source>dynamic</source>
         <translation>dynamický</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="782"/>
+        <location filename="../QScintilla/Editor.py" line="785"/>
         <source>Calltip</source>
         <translation>Rychlé tipy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="746"/>
+        <location filename="../QScintilla/Editor.py" line="749"/>
         <source>Print Preview</source>
         <translation>Náhled tisku</translation>
     </message>
@@ -9704,52 +9774,52 @@
         <translation>Pomůcky při psaní zapnuty</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="925"/>
+        <location filename="../QScintilla/Editor.py" line="928"/>
         <source>End-of-Line Type</source>
         <translation>Typ Konec-řádku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="929"/>
+        <location filename="../QScintilla/Editor.py" line="932"/>
         <source>Unix</source>
         <translation>Unix</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="936"/>
+        <location filename="../QScintilla/Editor.py" line="939"/>
         <source>Windows</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="943"/>
+        <location filename="../QScintilla/Editor.py" line="946"/>
         <source>Macintosh</source>
         <translation>Macintosh</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="901"/>
+        <location filename="../QScintilla/Editor.py" line="904"/>
         <source>Encodings</source>
         <translation>Kódování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="881"/>
+        <location filename="../QScintilla/Editor.py" line="884"/>
         <source>Guessed</source>
         <translation>Odhadem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1199"/>
+        <location filename="../QScintilla/Editor.py" line="1202"/>
         <source>Alternatives</source>
         <translation>Alternativy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1215"/>
+        <location filename="../QScintilla/Editor.py" line="1218"/>
         <source>Pygments Lexer</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1215"/>
+        <location filename="../QScintilla/Editor.py" line="1218"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Použít Pygments lexer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6655"/>
+        <location filename="../QScintilla/Editor.py" line="6680"/>
         <source>Check spelling...</source>
         <translation>Zatrhnout kontrolu...</translation>
     </message>
@@ -9759,12 +9829,12 @@
         <translation>Zatrhnout výběr kontroly...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6658"/>
+        <location filename="../QScintilla/Editor.py" line="6683"/>
         <source>Add to dictionary</source>
         <translation>Přidat do slovníku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6660"/>
+        <location filename="../QScintilla/Editor.py" line="6685"/>
         <source>Ignore All</source>
         <translation>Ignorovat vše</translation>
     </message>
@@ -9779,27 +9849,27 @@
         <translation>&lt;p&gt;Velikost souboru &lt;b&gt;{0}&lt;/b&gt; je &lt;b&gt;{1} KB&lt;/b&gt;. Opravdu jej chcete načíst?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1176"/>
+        <location filename="../QScintilla/Editor.py" line="1179"/>
         <source>&lt;p&gt;No exporter available for the export format &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Pro formát exportu &lt;b&gt;{0}&lt;/b&gt; není exportér dostupný. Zrušeno.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1195"/>
+        <location filename="../QScintilla/Editor.py" line="1198"/>
         <source>Alternatives ({0})</source>
         <translation>Alternativy ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2691"/>
+        <location filename="../QScintilla/Editor.py" line="2694"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; obsahuje neuložené změny.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2740"/>
+        <location filename="../QScintilla/Editor.py" line="2743"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2843"/>
+        <location filename="../QScintilla/Editor.py" line="2846"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -9809,12 +9879,12 @@
         <translation type="obsolete">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5679"/>
+        <location filename="../QScintilla/Editor.py" line="5693"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5688"/>
+        <location filename="../QScintilla/Editor.py" line="5702"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; je poškozen.&lt;/p&gt;</translation>
     </message>
@@ -9824,47 +9894,47 @@
         <translation type="obsolete">&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5741"/>
+        <location filename="../QScintilla/Editor.py" line="5755"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;So souboru s makrem &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5902"/>
+        <location filename="../QScintilla/Editor.py" line="5916"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric5. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; byl změněn po té co již byl načten do eric5. Znovu načíst?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6051"/>
+        <location filename="../QScintilla/Editor.py" line="6065"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6173"/>
+        <location filename="../QScintilla/Editor.py" line="6198"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6269"/>
+        <location filename="../QScintilla/Editor.py" line="6294"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Zástupce pro soubor &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1100"/>
-        <source>Next warning</source>
-        <translation>Následující varování</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1103"/>
+        <source>Next warning</source>
+        <translation>Následující varování</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1106"/>
         <source>Previous warning</source>
         <translation>Předchozí varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1105"/>
+        <location filename="../QScintilla/Editor.py" line="1108"/>
         <source>Show warning message</source>
         <translation>Zobrazit varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1107"/>
+        <location filename="../QScintilla/Editor.py" line="1110"/>
         <source>Clear warnings</source>
         <translation>Vyčistit varování</translation>
     </message>
@@ -9879,95 +9949,105 @@
         <translation type="obsolete">Varování py3flakes není dostupné.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2910"/>
+        <location filename="../QScintilla/Editor.py" line="2913"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5725"/>
+        <location filename="../QScintilla/Editor.py" line="5739"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5576"/>
+        <location filename="../QScintilla/Editor.py" line="5590"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5583"/>
+        <location filename="../QScintilla/Editor.py" line="5597"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5908"/>
+        <location filename="../QScintilla/Editor.py" line="5922"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4316"/>
+        <location filename="../QScintilla/Editor.py" line="4320"/>
         <source>Activating Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4316"/>
+        <location filename="../QScintilla/Editor.py" line="4320"/>
         <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4506"/>
+        <location filename="../QScintilla/Editor.py" line="4510"/>
         <source>Activating Calltip Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4506"/>
+        <location filename="../QScintilla/Editor.py" line="4510"/>
         <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="742"/>
+        <location filename="../QScintilla/Editor.py" line="745"/>
         <source>Open &apos;rejection&apos; file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="841"/>
+        <location filename="../QScintilla/Editor.py" line="844"/>
         <source>Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1138"/>
-        <source>Next change</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1141"/>
+        <source>Next change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1144"/>
         <source>Previous change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7069"/>
+        <location filename="../QScintilla/Editor.py" line="7094"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7069"/>
+        <location filename="../QScintilla/Editor.py" line="7094"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5512"/>
+        <location filename="../QScintilla/Editor.py" line="5526"/>
         <source>Warning</source>
         <translation type="unfinished">Varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5512"/>
+        <location filename="../QScintilla/Editor.py" line="5526"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5573"/>
+        <location filename="../QScintilla/Editor.py" line="5587"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="724"/>
+        <source>New Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="727"/>
+        <source>New Document View (with new split)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorAPIsPage</name>
@@ -10007,7 +10087,7 @@
         <translation>Stiskněte pro výběr API souboru ze seznamu instalovaných API</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="186"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="193"/>
         <source>Add from installed APIs</source>
         <translation>Přidat z instalovaných API</translation>
     </message>
@@ -10017,7 +10097,7 @@
         <translation>Stiskněte pro kompilování vybrané API definici</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="245"/>
         <source>Compile APIs</source>
         <translation>Kompilovat API</translation>
     </message>
@@ -10057,22 +10137,22 @@
         <translation>Smazat</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="133"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="138"/>
         <source>Select API file</source>
         <translation>Výběr API souboru</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="133"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="138"/>
         <source>API File (*.api);;All Files (*)</source>
         <translation>API soubor (*.api);;Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="175"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="182"/>
         <source>Select from the list of installed API files</source>
         <translation>Výběr ze seznamu instalovaných API souborů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="251"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="260"/>
         <source>Cancel compilation</source>
         <translation>Zrušit kompilaci</translation>
     </message>
@@ -10087,17 +10167,17 @@
         <translation>Stiskněte pro výběr API souboru ze seznamu API souborů instalovaných z pluginů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="212"/>
         <source>Add from Plugin APIs</source>
         <translation>Přidat z API pluginů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="204"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="212"/>
         <source>Select from the list of API files installed by plugins</source>
         <translation>Vybrat ze seznamu API souborů instalovaných pluginy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="186"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="193"/>
         <source>There are no APIs installed yet. Selection is not available.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -10392,127 +10472,127 @@
         <translation>Výběr exportera pro konfiguraci.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="342"/>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="390"/>
         <source>Select to export in WYSIWYG mode</source>
         <translation>Vybrat pro export ve WYSIWYG módu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="345"/>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="393"/>
         <source>Use WYSIWYG mode</source>
         <translation>Použít WYSIWYG mód</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="88"/>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="97"/>
         <source>Select to include folding functionality</source>
         <translation>Vybrat pro vložení funkcionality skládání kódu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="91"/>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="100"/>
         <source>Include folding functionality</source>
         <translation>Vložit funkcionalitu skládání kódu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="412"/>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="472"/>
         <source>Select to include only used styles</source>
         <translation>Vybrat pro vložení pouze použitých stlů</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="475"/>
+        <source>Include only used styles</source>
+        <translation>Vložit jen použité styly</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="482"/>
+        <source>Select to use the full pathname as the document title</source>
+        <translation>Vybrat pro použití plné cesty k souboru jako nadpisu dokumentu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="485"/>
+        <source>Use full pathname as document title</source>
+        <translation>Použít plnou cestu k souboru jako nadpis dokumentu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="430"/>
+        <source>Select to use tabs in the generated file</source>
+        <translation>Vybrat pro použití štítků v generovaném souboru</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="433"/>
+        <source>Use tabs</source>
+        <translation>Použít štítky</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="402"/>
+        <source>Press to select the font for the RTF export</source>
+        <translation>Stisknout pro výběr fontu pro RTF export</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="405"/>
+        <source>Select Font</source>
+        <translation>Vybrat font</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="415"/>
-        <source>Include only used styles</source>
-        <translation>Vložit jen použité styly</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="422"/>
-        <source>Select to use the full pathname as the document title</source>
-        <translation>Vybrat pro použití plné cesty k souboru jako nadpisu dokumentu</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="425"/>
-        <source>Use full pathname as document title</source>
-        <translation>Použít plnou cestu k souboru jako nadpis dokumentu</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="382"/>
-        <source>Select to use tabs in the generated file</source>
-        <translation>Vybrat pro použití štítků v generovaném souboru</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="385"/>
-        <source>Use tabs</source>
-        <translation>Použít štítky</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="354"/>
-        <source>Press to select the font for the RTF export</source>
-        <translation>Stisknout pro výběr fontu pro RTF export</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="357"/>
-        <source>Select Font</source>
-        <translation>Vybrat font</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="367"/>
         <source>Font for RTF export</source>
         <translation>Font pro RTF export</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="195"/>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="231"/>
         <source>Magnification:</source>
         <translation>Zvětšení:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="202"/>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="238"/>
         <source>Select the magnification value to be added to the font sizes of the styles</source>
         <translation>Vybrat hodnotu zvětšení, která bude ve stylech přičtena k velikosti fontu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="215"/>
+        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="251"/>
         <source>Displays the selected magnification value</source>
         <translation>Zobrazit vybranou hodnotu zvětšení</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="228"/>
-        <source>Font:</source>
-        <translation>Font:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="235"/>
-        <source>Select the font from the list</source>
-        <translation>Výběr fontu ze seznamu</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="242"/>
-        <source>Pagesize:</source>
-        <translation>Velikost strany:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="249"/>
-        <source>Select the page size from the list</source>
-        <translation>Vybrat velikost strany ze seznamu</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="258"/>
-        <source>Margins</source>
-        <translation>Okraje</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorExportersPage.ui" line="264"/>
-        <source>Select the top margin in points (72 pt == 1&quot;)</source>
-        <translation>Vybrat horní okraj v bodech (72 pt == 1&quot;)</translation>
<