Wed, 04 Nov 2015 14:41:07 +0100
Started the eric 6.2.x line of development.
--- a/Documentation/Help/source.qhp Tue Nov 03 15:24:42 2015 +0100 +++ b/Documentation/Help/source.qhp Wed Nov 04 14:41:07 2015 +0100 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <QtHelpProject version="1.0"> - <namespace>org.eric6.ide.61</namespace> + <namespace>org.eric6.ide.62</namespace> <virtualFolder>eric6</virtualFolder> <customFilter name="eric6"> - <filterAttribute>6.1</filterAttribute> + <filterAttribute>6.2</filterAttribute> <filterAttribute>eric6</filterAttribute> <filterAttribute>ide</filterAttribute> </customFilter> <filterSection> - <filterAttribute>6.1</filterAttribute> + <filterAttribute>6.2</filterAttribute> <filterAttribute>eric6</filterAttribute> <filterAttribute>ide</filterAttribute> <toc> @@ -1878,6 +1878,8 @@ <keyword name="BrowserFileItem.moduleName" id="BrowserFileItem.moduleName" ref="eric6.UI.BrowserModel.html#BrowserFileItem.moduleName" /> <keyword name="BrowserFileItem.name" id="BrowserFileItem.name" ref="eric6.UI.BrowserModel.html#BrowserFileItem.name" /> <keyword name="BrowserFileItem.setName" id="BrowserFileItem.setName" ref="eric6.UI.BrowserModel.html#BrowserFileItem.setName" /> + <keyword name="BrowserGlobalsItem" id="BrowserGlobalsItem" ref="eric6.UI.BrowserModel.html#BrowserGlobalsItem" /> + <keyword name="BrowserGlobalsItem (Constructor)" id="BrowserGlobalsItem (Constructor)" ref="eric6.UI.BrowserModel.html#BrowserGlobalsItem.__init__" /> <keyword name="BrowserImportItem" id="BrowserImportItem" ref="eric6.UI.BrowserModel.html#BrowserImportItem" /> <keyword name="BrowserImportItem (Constructor)" id="BrowserImportItem (Constructor)" ref="eric6.UI.BrowserModel.html#BrowserImportItem.__init__" /> <keyword name="BrowserImportItem.fileName" id="BrowserImportItem.fileName" ref="eric6.UI.BrowserModel.html#BrowserImportItem.fileName" />
--- a/Documentation/Source/eric6.UI.BrowserModel.html Tue Nov 03 15:24:42 2015 +0100 +++ b/Documentation/Source/eric6.UI.BrowserModel.html Wed Nov 04 14:41:07 2015 +0100 @@ -48,6 +48,9 @@ <td><a href="#BrowserFileItem">BrowserFileItem</a></td> <td>Class implementing the data structure for browser file items.</td> </tr><tr> +<td><a href="#BrowserGlobalsItem">BrowserGlobalsItem</a></td> +<td>Class implementing the data structure for browser globals items.</td> +</tr><tr> <td><a href="#BrowserImportItem">BrowserImportItem</a></td> <td>Class implementing the data structure for browser imported module and imported names items.</td> </tr><tr> @@ -963,6 +966,54 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="BrowserGlobalsItem" ID="BrowserGlobalsItem"></a> +<h2>BrowserGlobalsItem</h2> +<p> + Class implementing the data structure for browser globals items. +</p> +<h3>Derived from</h3> +BrowserClassAttributesItem +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#BrowserGlobalsItem.__init__">BrowserGlobalsItem</a></td> +<td>Constructor</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="BrowserGlobalsItem.__init__" ID="BrowserGlobalsItem.__init__"></a> +<h4>BrowserGlobalsItem (Constructor)</h4> +<b>BrowserGlobalsItem</b>(<i>parent, attributes, text, isClass=False</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent item +</dd><dt><i>attributes</i></dt> +<dd> +list of attributes +</dd><dt><i>text</i></dt> +<dd> +text to be shown by this item (string) +</dd><dt><i>isClass</i></dt> +<dd> +flag indicating class attributes (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="BrowserImportItem" ID="BrowserImportItem"></a> <h2>BrowserImportItem</h2> <p>
--- a/Documentation/Source/index-eric6.html Tue Nov 03 15:24:42 2015 +0100 +++ b/Documentation/Source/index-eric6.html Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ <body> <h1>eric6</h1> <p> -Package implementing the eric6 Python IDE (version 6.1). +Package implementing the eric6 Python IDE (version 6.2). </p><p> To get more information about eric6 please see the <a href="http://eric-ide.python-projects.org/index.html">eric web site</a>.
--- a/Documentation/Source/index.html Tue Nov 03 15:24:42 2015 +0100 +++ b/Documentation/Source/index.html Wed Nov 04 14:41:07 2015 +0100 @@ -26,7 +26,7 @@ <table> <tr> <td><a href="index-eric6.html">eric6</a></td> -<td>Package implementing the eric6 Python IDE (version 6.1).</td> +<td>Package implementing the eric6 Python IDE (version 6.2).</td> </tr> </table>
--- a/Plugins/PluginAbout.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginAbout.py Wed Nov 04 14:41:07 2015 +0100 @@ -23,7 +23,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "AboutPlugin" packageName = "__core__" shortDescription = "Show the About dialogs."
--- a/Plugins/PluginCodeStyleChecker.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginCodeStyleChecker.py Wed Nov 04 14:41:07 2015 +0100 @@ -25,7 +25,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "CodeStyleCheckerPlugin" packageName = "__core__" shortDescription = "Show the Python Code Style Checker dialog."
--- a/Plugins/PluginEricapi.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginEricapi.py Wed Nov 04 14:41:07 2015 +0100 @@ -27,7 +27,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "EricapiPlugin" packageName = "__core__" shortDescription = "Show the Ericapi dialogs."
--- a/Plugins/PluginEricdoc.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginEricdoc.py Wed Nov 04 14:41:07 2015 +0100 @@ -27,7 +27,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "EricdocPlugin" packageName = "__core__" shortDescription = "Show the Ericdoc dialogs."
--- a/Plugins/PluginSyntaxChecker.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginSyntaxChecker.py Wed Nov 04 14:41:07 2015 +0100 @@ -26,7 +26,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "SyntaxCheckerPlugin" packageName = "__core__" shortDescription = "Show the Syntax Checker dialog."
--- a/Plugins/PluginTabnanny.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginTabnanny.py Wed Nov 04 14:41:07 2015 +0100 @@ -25,7 +25,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "TabnannyPlugin" packageName = "__core__" shortDescription = "Show the Tabnanny dialog."
--- a/Plugins/PluginVcsMercurial.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginVcsMercurial.py Wed Nov 04 14:41:07 2015 +0100 @@ -27,7 +27,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = False deactivateable = True -version = "6.1.0" +version = "6.2.0" pluginType = "version_control" pluginTypename = "Mercurial" className = "VcsMercurialPlugin"
--- a/Plugins/PluginVcsPySvn.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginVcsPySvn.py Wed Nov 04 14:41:07 2015 +0100 @@ -25,7 +25,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = False deactivateable = True -version = "6.1.0" +version = "6.2.0" pluginType = "version_control" pluginTypename = "PySvn" className = "VcsPySvnPlugin"
--- a/Plugins/PluginVcsSubversion.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginVcsSubversion.py Wed Nov 04 14:41:07 2015 +0100 @@ -27,7 +27,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = False deactivateable = True -version = "6.1.0" +version = "6.2.0" pluginType = "version_control" pluginTypename = "Subversion" className = "VcsSubversionPlugin"
--- a/Plugins/PluginVmListspace.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginVmListspace.py Wed Nov 04 14:41:07 2015 +0100 @@ -19,7 +19,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = False deactivateable = False -version = "6.1.0" +version = "6.2.0" pluginType = "viewmanager" pluginTypename = "listspace" displayString = QT_TRANSLATE_NOOP('VmListspacePlugin', 'Listspace')
--- a/Plugins/PluginVmTabview.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginVmTabview.py Wed Nov 04 14:41:07 2015 +0100 @@ -19,7 +19,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = False deactivateable = False -version = "6.1.0" +version = "6.2.0" pluginType = "viewmanager" pluginTypename = "tabview" displayString = QT_TRANSLATE_NOOP('VmTabviewPlugin', 'Tabbed View')
--- a/Plugins/PluginWizardE5MessageBox.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardE5MessageBox.py Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "E5MessageBoxWizard" packageName = "__core__" shortDescription = "Show the E5MessageBox wizard."
--- a/Plugins/PluginWizardPyRegExp.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardPyRegExp.py Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "PyRegExpWizard" packageName = "__core__" shortDescription = "Show the Python re wizard."
--- a/Plugins/PluginWizardQColorDialog.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardQColorDialog.py Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "ColorDialogWizard" packageName = "__core__" shortDescription = "Show the QColorDialog wizard."
--- a/Plugins/PluginWizardQFileDialog.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardQFileDialog.py Wed Nov 04 14:41:07 2015 +0100 @@ -23,7 +23,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "FileDialogWizard" packageName = "__core__" shortDescription = "Show the QFileDialog wizard."
--- a/Plugins/PluginWizardQFontDialog.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardQFontDialog.py Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "FontDialogWizard" packageName = "__core__" shortDescription = "Show the QFontDialog wizard."
--- a/Plugins/PluginWizardQInputDialog.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardQInputDialog.py Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "InputDialogWizard" packageName = "__core__" shortDescription = "Show the QInputDialog wizard."
--- a/Plugins/PluginWizardQMessageBox.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardQMessageBox.py Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "MessageBoxWizard" packageName = "__core__" shortDescription = "Show the QMessageBox wizard."
--- a/Plugins/PluginWizardQRegExp.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardQRegExp.py Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "QRegExpWizard" packageName = "__core__" shortDescription = "Show the QRegExp wizard."
--- a/Plugins/PluginWizardQRegularExpression.py Tue Nov 03 15:24:42 2015 +0100 +++ b/Plugins/PluginWizardQRegularExpression.py Wed Nov 04 14:41:07 2015 +0100 @@ -21,7 +21,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "6.1.0" +version = "6.2.0" className = "QRegularExpressionWizard" packageName = "__core__" shortDescription = "Show the QRegularExpression wizard."
--- a/__init__.py Tue Nov 03 15:24:42 2015 +0100 +++ b/__init__.py Wed Nov 04 14:41:07 2015 +0100 @@ -4,7 +4,7 @@ # """ -Package implementing the eric6 Python IDE (version 6.1). +Package implementing the eric6 Python IDE (version 6.2). To get more information about eric6 please see the <a href="http://eric-ide.python-projects.org/index.html">eric web site</a>.
--- a/eric6.e4p Tue Nov 03 15:24:42 2015 +0100 +++ b/eric6.e4p Wed Nov 04 14:41:07 2015 +0100 @@ -10,7 +10,7 @@ <ProgLanguage mixed="1">Python3</ProgLanguage> <ProjectType>PyQt5</ProjectType> <Description>eric6 is an integrated development environment for the Python and Ruby language. It uses the PyQt5 bindings and the QScintilla2 editor widget.</Description> - <Version>6.1.x</Version> + <Version>6.2.x</Version> <Author>Detlev Offenbach</Author> <Email>detlev@die-offenbachs.de</Email> <TranslationPattern>i18n/eric6_%language%.ts</TranslationPattern> @@ -2088,7 +2088,7 @@ <string>qtHelpFilterAttributes</string> </key> <value> - <string>eric6:ide:6.1</string> + <string>eric6:ide:6.2</string> </value> <key> <string>qtHelpFilterName</string> @@ -2100,7 +2100,7 @@ <string>qtHelpNamespace</string> </key> <value> - <string>org.eric6.ide.61</string> + <string>org.eric6.ide.62</string> </value> <key> <string>qtHelpOutputDirectory</string>