diff -Nru eric-18.05/changelog eric-18.11+ds1/changelog
--- eric-18.05/changelog 2018-05-01 10:05:17.000000000 +0000
+++ eric-18.11+ds1/changelog 2018-11-01 10:48:47.000000000 +0000
@@ -1,5 +1,103 @@
Change Log
----------
+Version 18.11:
+- bug fixes
+- IRC
+ -- added support for some of the "/" commands to the user list context menu
+- Translator
+ -- changed DeepL support to DeepL Pro
+- VCS
+ -- added capability to show some VCS info in the status bar of the main
+ window (next to the VCS status LED)
+
+Version 18.10:
+- bug fixes
+- General
+ -- changed the extension of the generated script files for Windows from
+ '.bat' to '.cmd'
+- Debugger
+ -- added code to use the default virtual environment, if none has been
+ configured yet
+- IRC
+ -- added support for the /query, /notice, /ping, /ignore, /unignore, /away,
+ /join, /part and /partall commands
+- Tasks
+ -- added code to mark a line as not containing a task with '__NO-TASK__'
+
+Version 18.09:
+- bug fixes
+- Mercurial Interface
+ -- added support for Mercurial 4.7 extended commands 'graft', 'rebase' and
+ 'export'
+
+Version 18.08:
+- bug fixes
+- General
+ -- made the activation of these internal tools configurable
+ * Template-Viewer
+ * File-Browser
+ * Symbols
+ * Code Documentation Viewer
+ * Cooperation
+ * IRC
+ * Numbers
+- File-Browser
+ -- changed code so file-browser is always a standalone window
+- Project Interfaces Browser
+ -- added actions to configure some IDL compiler options (-I, -D, -U)
+- Shell
+ -- changed code so shell is always a standalone window
+- Translator
+ -- added a translation engine for the IBM Watson Language Translator
+- Web Browser (NG)
+ -- added default search engine definitions for
+ * Qwant
+ * StartPage
+
+Version 18.07:
+- bug fixes
+- Checkers
+ -- upgraded pyflakes to version 2.0.0
+- Debugger
+ -- added support of breakpoint() builtin of Python 3.7
+ -- added code to try to open the source file if an exception occurred in
+ a cython .pyd file
+- Git Interface
+ -- added capability to change the URL and/or user credentials for a
+ remote repository
+- pip Interface
+ -- added support for the '--user' option of install and list commands
+ -- changed to use the new VirtualEnv Manager
+- Unit Test
+ -- extended the standalone unit test tool to be able to open source in an
+ editor window
+- VirtualEnv Manager
+ -- added a manager for virtual environments
+ -- changed a few places to use the newly introduced virtual environments
+ (Note: a new session file format and debug properties file format
+ has been introduced)
+
+**Upgrade note**: It may be neccessary to configure the Python environments,
+the environments to be used for the debugger. Once that is done, the eric6
+IDE should be restarted.
+
+Version 18.06:
+- bug fixes
+- Editor
+ -- added a configuration option (Editor->Style page) to show the marker map
+ on the left or right of the editor
+ -- added a context menu for the "fold" margin
+ -- improved handling of folded lines when using "go to" functions
+ -- resize auto complete list box to fit with contents
+ -- added a configuration option (Editor->autocomplete to set up maximum
+ width and height of the auto complete list box
+- Shell
+ -- resize auto complete list box to fit with contents
+- pip Interface
+ -- added an action to install a locally available package/wheel
+- Web Browser (NG)
+ -- improved the sending of the "Referer" header like it is done by Firefox
+
Version 18.05:
- bug fixes
- General
diff -Nru eric-18.05/debian/changelog eric-18.11+ds1/debian/changelog
--- eric-18.05/debian/changelog 2018-07-19 05:41:47.000000000 +0000
+++ eric-18.11+ds1/debian/changelog 2018-11-01 20:05:32.000000000 +0000
@@ -1,3 +1,85 @@
+eric (18.11+ds1-1) unstable; urgency=medium
+
+ * New upstream release 18.11.
+ * debian/README.source: Add some instruction about how to prepare
+ new version using "gbp import-orig".
+
+ -- Boyuan Yang Thu, 01 Nov 2018 16:05:32 -0400
+
+eric (18.10+ds1-4) unstable; urgency=medium
+
+ * debian/rules:
+ + Migrate to debhelper v7 (dh) syntax.
+ + Remove code about custom api generation.
+ + Remove unnecessary get-orig-source target. uscan(1) will
+ handle it.
+ * debian/control: Remove unnecessary build-dependency to python3.
+ * debian/changelog: Remove trailing empty line.
+
+ -- Boyuan Yang Mon, 08 Oct 2018 12:06:03 -0400
+
+eric (18.10+ds1-3) unstable; urgency=high
+
+ * debian/rules: Fix broken symlink for jquery-ui (Closes: #910412).
+ * debian/rules: Use uscan (debian/watch) for get-orig-source target.
+ * debian/debian-manpages: Add eric6_browser(1).
+
+ -- Boyuan Yang Sat, 06 Oct 2018 10:53:13 -0400
+
+eric (18.10+ds1-2) unstable; urgency=medium
+
+ * debian/install: Drop obsolete .xpm file.
+ * debian/desktop: Do not install debian-customized .desktop file.
+ * debian/rules:
+ + Drop instruction to remove README-PyXML.txt, this file no longer
+ exists.
+
+ -- Boyuan Yang Fri, 05 Oct 2018 09:57:19 -0400
+
+eric (18.10+ds1-1) unstable; urgency=medium
+
+ [ Ondřej Nový ]
+ * d/watch: Use https protocol.
+
+ [ Boyuan Yang ]
+ * New upstream version 18.10.
+ + Remove jquery source code and generate a +ds1 tarball.
+ * debian: Apply "wrap-and-sort -abst".
+ * debian/control:
+ + Add new recommendation python3-pyqt5.qtwebengine for qtwebengine
+ support.
+ + Update recommendation python-rope to python3-rope.
+ * debian/watch: Update watch files for +ds tarball.
+ * debian/copyright: Update Files-Excluded field for +ds tarball.
+ * debian/eric.desktop: Minor updates with grammar and zh_CN translation.
+ * debian/rules:
+ + Remove translation retrieval in get-orig-source.
+ + Remove instructions to remove web browser;
+ current browser is indeed working correctly.
+ + Use "dh_missing --fail-missing".
+ * debian/get_translations: Remove useless get_translations.sh.
+ * debian/README.source: Update information.
+ * debian/copyright: Update Source field.
+ * debian/patches: Refresh patches.
+
+ -- Boyuan Yang Thu, 04 Oct 2018 13:47:39 -0400
+
+eric (18.08-1) unstable; urgency=medium
+
+ * New upstream release
+ * Bump standards version to 4.2.1 no changes needed
+ * Refresh most patches and merged patch 05 and 07
+ * Fix get-orig-source target. Javascript files no longer in orig source
+ * Add symbolic links to Debian jquery files instead of the ones
+ shipped with the sources.
+ * Add Boyuan Yang as a co-maintainer.
+
+ [ Boyuan Yang ]
+ * debian/changelog: Remove some trailing spaces
+ * Bump debhelper compat to v11
+
+ -- Gudjon I. Gudjonsson Thu, 27 Sep 2018 19:22:26 -0400
+
eric (18.05-1.1) unstable; urgency=medium
* Non-maintainer upload.
@@ -760,6 +842,4 @@
* Initial Release. (Closes: #170615)
-
-- Rogerio Reis Mon, 7 Jun 2004 19:10:29 +0100
-
diff -Nru eric-18.05/debian/clean eric-18.11+ds1/debian/clean
--- eric-18.05/debian/clean 1970-01-01 00:00:00.000000000 +0000
+++ eric-18.11+ds1/debian/clean 2018-11-01 19:58:48.000000000 +0000
@@ -0,0 +1,2 @@
+eric6*
+*-stamp
diff -Nru eric-18.05/debian/compat eric-18.11+ds1/debian/compat
--- eric-18.05/debian/compat 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/compat 2018-11-01 19:58:48.000000000 +0000
@@ -1 +1 @@
-9
+11
diff -Nru eric-18.05/debian/control eric-18.11+ds1/debian/control
--- eric-18.05/debian/control 2018-07-19 05:41:47.000000000 +0000
+++ eric-18.11+ds1/debian/control 2018-11-01 20:05:04.000000000 +0000
@@ -2,51 +2,58 @@
Section: devel
Priority: optional
Maintainer: Gudjon I. Gudjonsson
-Uploaders: Python Applications Packaging Team
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: dh-python,
- python3,
- python3-all,
- python3-pyqt5,
- python3-pyqt5.qsci,
- pyqt5-dev,
- python3-sip-dev,
- qttools5-dev-tools
-Standards-Version: 4.1.4
+Uploaders:
+ Boyuan Yang ,
+ Python Applications Packaging Team ,
+Build-Depends:
+ debhelper (>= 11),
+Build-Depends-Indep:
+ dh-python,
+ pyqt5-dev,
+ python3-all,
+ python3-pyqt5,
+ python3-pyqt5.qsci,
+ python3-sip-dev,
+ qttools5-dev-tools,
+Standards-Version: 4.2.1
Homepage: http://eric-ide.python-projects.org/
Vcs-Git: https://salsa.debian.org/python-team/applications/eric.git
Vcs-Browser: https://salsa.debian.org/python-team/applications/eric
Package: eric
Architecture: all
-Depends: python3-chardet,
- python3-distutils,
- python3-pygments,
- python3-pyqt5,
- python3-pyqt5.qsci,
- python3-pyqt5.qtsql,
- python3-pyqt5.qtwebkit,
- python3-pyqt5.qtsvg,
- libjs-jquery,
- libjs-jquery-isonscreen,
- libjs-jquery-hotkeys,
- libjs-jquery-tablesorter,
- libjs-jquery-ui,
- ${python3:Depends},
- ${misc:Depends}
-Recommends: eric-api-files,
- python-rope
-Suggests: pyqt5-dev-tools,
- python-qt4-doc,
- pyqt5-doc,
- python-doc,
- python-profiler,
- python3-doc,
- qt4-doc-html,
- qt5-doc-html,
- qtbase5-doc-html,
- qttools5-dev,
- ruby
+Depends:
+ libjs-jquery,
+ libjs-jquery-hotkeys,
+ libjs-jquery-isonscreen,
+ libjs-jquery-tablesorter,
+ libjs-jquery-ui,
+ python3-chardet,
+ python3-distutils,
+ python3-pygments,
+ python3-pyqt5,
+ python3-pyqt5.qsci,
+ python3-pyqt5.qtsql,
+ python3-pyqt5.qtsvg,
+ python3-pyqt5.qtwebkit,
+ ${misc:Depends},
+ ${python3:Depends},
+Recommends:
+ eric-api-files,
+ python3-rope,
+ python3-pyqt5.qtwebengine,
+Suggests:
+ pyqt5-dev-tools,
+ pyqt5-doc,
+ python-doc,
+ python-profiler,
+ python-qt4-doc,
+ python3-doc,
+ qt4-doc-html,
+ qt5-doc-html,
+ qtbase5-doc-html,
+ qttools5-dev,
+ ruby,
Description: full featured Python IDE
eric is a full featured Python IDE written in PyQt using the QScintilla
editor widget. Some highlights
@@ -72,7 +79,9 @@
Package: eric-api-files
Architecture: all
-Depends: eric, ${misc:Depends}
+Depends:
+ eric,
+ ${misc:Depends},
Description: API description files for use with eric
This package contains code completion API files of
Python standard modules & builtins, PyQt and PyKDE.
diff -Nru eric-18.05/debian/copyright eric-18.11+ds1/debian/copyright
--- eric-18.05/debian/copyright 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/copyright 2018-11-01 19:58:48.000000000 +0000
@@ -1,7 +1,12 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: eric6
Upstream-Contact: Detlev Offenbach
-Source: http://www.die-offenbachs.de/eric/
+Source: https://sourceforge.net/projects/eric-ide/files/eric6/stable/
+Files-Excluded:
+ eric/Helpviewer/data/javascript/jquery.js
+ eric/Helpviewer/data/javascript/jquery-ui.js
+ eric/WebBrowser/data/javascript/jquery.js
+ eric/WebBrowser/data/javascript/jquery-ui.js
Files: *
Copyright: 2002 - 2018 Detlev Offenbach
@@ -164,7 +169,7 @@
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
.
6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
+ breach of its terms and conditions.
.
7. This License Agreement shall be governed by the federal
intellectual property law of the United States, including without
@@ -244,7 +249,7 @@
- Matthew Harrison
- Steven Hazel
License: BSD-3-clause
-
+
Files: eric/ThirdParty/Jasy/*
Copyright: 2011-2012 Zynga Inc. http://zynga.com/
2013-2014 Sebastian Werner http://seabstian-werner.com
@@ -277,28 +282,28 @@
License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without modification,
+ Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
.
- 1. Redistributions of source code must retain the above copyright notice, this
+ 1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
.
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
.
- 3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software
+ 3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software
without specific prior written permission.
.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -Nru eric-18.05/debian/debian-manpages/eric6.1 eric-18.11+ds1/debian/debian-manpages/eric6.1
--- eric-18.05/debian/debian-manpages/eric6.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6.1 2018-11-01 19:58:48.000000000 +0000
@@ -44,6 +44,7 @@
Show version of program.
.SH SEE ALSO
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_api.1 eric-18.11+ds1/debian/debian-manpages/eric6_api.1
--- eric-18.05/debian/debian-manpages/eric6_api.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_api.1 2018-11-01 19:58:48.000000000 +0000
@@ -87,6 +87,7 @@
.SH SEE ALSO
.BR eric6 (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_browser.1 eric-18.11+ds1/debian/debian-manpages/eric6_browser.1
--- eric-18.05/debian/debian-manpages/eric6_browser.1 1970-01-01 00:00:00.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_browser.1 2018-11-01 19:58:48.000000000 +0000
@@ -0,0 +1,82 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ERIC6_BROWSER 1 "October 06, 2018"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+eric6_browser \- eric6 web browser (QtWebEngine)
+.SH SYNOPSIS
+.B eric6_browser
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B eric6_browser
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB\fP and
+.\" \fI\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBeric6_browser\fP is a web browser to read the HTML pages for the Qt
+API and the eric6 documentation. It can be used from inside the eric6 IDE or as
+a standalone application.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program and exit.
+.B \-\-config=configDir
+Use the given directory as the one containing the config files.
+.B \-\-private
+Start the browser in private browsing mode.
+.B \-\-qthelp
+Start the browser with support for QtHelp.
+.B \-\-search=word
+Search for the given word
+.B \-\-settings=settingsDir
+Use the given directory to store the settings files.
+.SH SEE ALSO
+.BR eric6 (1),
+.BR eric6_api (1),
+.BR eric6_compare (1),
+.BR eric6_configure (1),
+.BR eric6_diff (1),
+.BR eric6_doc (1),
+.BR eric6_editor (1),
+.BR eric6_helpviewer (1),
+.BR eric6_iconeditor (1),
+.BR eric6_plugininstall (1),
+.BR eric6_pluginrepository (1),
+.BR eric6_pluginuninstall (1),
+.BR eric6_qregexp (1),
+.BR eric6_re (1),
+.BR eric6_shell (1),
+.BR eric6_sqlbrowser (1),
+.BR eric6_tray (1),
+.BR eric6_trpreviewer (1),
+.BR eric6_uipreviewer (1),
+.BR eric6_unittest (1)
+.BR eric6_webbrowser (1),
+.br
+.SH AUTHOR
+This manual page was written by Boyuan Yang
+for the Debian project (but may be used by others).
diff -Nru eric-18.05/debian/debian-manpages/eric6_compare.1 eric-18.11+ds1/debian/debian-manpages/eric6_compare.1
--- eric-18.05/debian/debian-manpages/eric6_compare.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_compare.1 2018-11-01 19:58:48.000000000 +0000
@@ -27,6 +27,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
.BR eric6_doc (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_configure.1 eric-18.11+ds1/debian/debian-manpages/eric6_configure.1
--- eric-18.05/debian/debian-manpages/eric6_configure.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_configure.1 2018-11-01 19:58:48.000000000 +0000
@@ -28,6 +28,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_diff (1),
.BR eric6_doc (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_diff.1 eric-18.11+ds1/debian/debian-manpages/eric6_diff.1
--- eric-18.05/debian/debian-manpages/eric6_diff.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_diff.1 2018-11-01 19:58:48.000000000 +0000
@@ -27,6 +27,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_doc (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_doc.1 eric-18.11+ds1/debian/debian-manpages/eric6_doc.1
--- eric-18.05/debian/debian-manpages/eric6_doc.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_doc.1 2018-11-01 19:58:48.000000000 +0000
@@ -67,6 +67,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_editor.1 eric-18.11+ds1/debian/debian-manpages/eric6_editor.1
--- eric-18.05/debian/debian-manpages/eric6_editor.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_editor.1 2018-11-01 19:58:48.000000000 +0000
@@ -27,6 +27,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_helpviewer.1 eric-18.11+ds1/debian/debian-manpages/eric6_helpviewer.1
--- eric-18.05/debian/debian-manpages/eric6_helpviewer.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_helpviewer.1 2018-11-01 19:58:48.000000000 +0000
@@ -45,6 +45,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_hexeditor.1 eric-18.11+ds1/debian/debian-manpages/eric6_hexeditor.1
--- eric-18.05/debian/debian-manpages/eric6_hexeditor.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_hexeditor.1 2018-11-01 19:58:48.000000000 +0000
@@ -50,6 +50,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_iconeditor.1 eric-18.11+ds1/debian/debian-manpages/eric6_iconeditor.1
--- eric-18.05/debian/debian-manpages/eric6_iconeditor.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_iconeditor.1 2018-11-01 19:58:48.000000000 +0000
@@ -31,6 +31,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_plugininstall.1 eric-18.11+ds1/debian/debian-manpages/eric6_plugininstall.1
--- eric-18.05/debian/debian-manpages/eric6_plugininstall.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_plugininstall.1 2018-11-01 19:58:48.000000000 +0000
@@ -26,8 +26,8 @@
Don't use KDE widgets
.SH SEE ALSO
.BR eric6 (1),
-.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_pluginrepository.1 eric-18.11+ds1/debian/debian-manpages/eric6_pluginrepository.1
--- eric-18.05/debian/debian-manpages/eric6_pluginrepository.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_pluginrepository.1 2018-11-01 19:58:48.000000000 +0000
@@ -27,6 +27,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_pluginuninstall.1 eric-18.11+ds1/debian/debian-manpages/eric6_pluginuninstall.1
--- eric-18.05/debian/debian-manpages/eric6_pluginuninstall.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_pluginuninstall.1 2018-11-01 19:58:48.000000000 +0000
@@ -27,6 +27,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_qregexp.1 eric-18.11+ds1/debian/debian-manpages/eric6_qregexp.1
--- eric-18.05/debian/debian-manpages/eric6_qregexp.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_qregexp.1 2018-11-01 19:58:48.000000000 +0000
@@ -45,6 +45,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_qregularexpression.1 eric-18.11+ds1/debian/debian-manpages/eric6_qregularexpression.1
--- eric-18.05/debian/debian-manpages/eric6_qregularexpression.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_qregularexpression.1 2018-11-01 19:58:48.000000000 +0000
@@ -45,6 +45,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_re.1 eric-18.11+ds1/debian/debian-manpages/eric6_re.1
--- eric-18.05/debian/debian-manpages/eric6_re.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_re.1 2018-11-01 19:58:48.000000000 +0000
@@ -45,6 +45,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_shell.1 eric-18.11+ds1/debian/debian-manpages/eric6_shell.1
--- eric-18.05/debian/debian-manpages/eric6_shell.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_shell.1 2018-11-01 19:58:48.000000000 +0000
@@ -50,6 +50,8 @@
.SH SEE ALSO
.BR eric6 (1),
+.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_snap.1 eric-18.11+ds1/debian/debian-manpages/eric6_snap.1
--- eric-18.05/debian/debian-manpages/eric6_snap.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_snap.1 2018-11-01 19:58:48.000000000 +0000
@@ -49,6 +49,8 @@
.SH SEE ALSO
.BR eric6 (1),
+.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_sqlbrowser.1 eric-18.11+ds1/debian/debian-manpages/eric6_sqlbrowser.1
--- eric-18.05/debian/debian-manpages/eric6_sqlbrowser.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_sqlbrowser.1 2018-11-01 19:58:48.000000000 +0000
@@ -49,6 +49,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_tray.1 eric-18.11+ds1/debian/debian-manpages/eric6_tray.1
--- eric-18.05/debian/debian-manpages/eric6_tray.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_tray.1 2018-11-01 19:58:48.000000000 +0000
@@ -27,6 +27,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_trpreviewer.1 eric-18.11+ds1/debian/debian-manpages/eric6_trpreviewer.1
--- eric-18.05/debian/debian-manpages/eric6_trpreviewer.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_trpreviewer.1 2018-11-01 19:58:48.000000000 +0000
@@ -45,6 +45,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_uipreviewer.1 eric-18.11+ds1/debian/debian-manpages/eric6_uipreviewer.1
--- eric-18.05/debian/debian-manpages/eric6_uipreviewer.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_uipreviewer.1 2018-11-01 19:58:48.000000000 +0000
@@ -45,6 +45,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_unittest.1 eric-18.11+ds1/debian/debian-manpages/eric6_unittest.1
--- eric-18.05/debian/debian-manpages/eric6_unittest.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_unittest.1 2018-11-01 19:58:48.000000000 +0000
@@ -45,6 +45,7 @@
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/debian-manpages/eric6_webbrowser.1 eric-18.11+ds1/debian/debian-manpages/eric6_webbrowser.1
--- eric-18.05/debian/debian-manpages/eric6_webbrowser.1 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/debian-manpages/eric6_webbrowser.1 2018-11-01 19:58:48.000000000 +0000
@@ -16,7 +16,7 @@
.\" .sp insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
-eric6_webbrowser \- eric6 web browser
+eric6_webbrowser \- eric6 web browser (QtWebKit)
.SH SYNOPSIS
.B eric6_webbrowser
.RI [ options ] " files" ...
@@ -30,7 +30,9 @@
.\" TeX users may be more comfortable with the \fB\fP and
.\" \fI\fP escape sequences to invode bold face and italics,
.\" respectively.
-\fBeric6_webbrowser\fP is a web browser to read the HTML pages for the Qt API and the eric6 documentation. It can be used from inside the eric6 IDE or as a standalone application.
+\fBeric6_webbrowser\fP is a web browser to read the HTML pages for the Qt API
+and the eric6 documentation. It can be used from inside the eric6 IDE or as
+a standalone application.
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
@@ -44,13 +46,12 @@
Show version of program.
.B \-\-config=configDir
Use the given directory as the one containing the config files
-.B \-\-nokde
-Don't use KDE widgets
.B \-\-search=word
Search for the given word
.SH SEE ALSO
.BR eric6 (1),
.BR eric6_api (1),
+.BR eric6_browser (1),
.BR eric6_compare (1),
.BR eric6_configure (1),
.BR eric6_diff (1),
diff -Nru eric-18.05/debian/docs eric-18.11+ds1/debian/docs
--- eric-18.05/debian/docs 2018-07-19 05:28:24.000000000 +0000
+++ eric-18.11+ds1/debian/docs 2018-11-01 19:58:48.000000000 +0000
@@ -1,2 +1,2 @@
-README.rst
README-i18n.rst
+README.rst
diff -Nru eric-18.05/debian/eric.desktop eric-18.11+ds1/debian/eric.desktop
--- eric-18.05/debian/eric.desktop 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/eric.desktop 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=Eric python IDE
-Name[es]=IDE para python Eric
-Comment=Integrated Development Environment for Python
-Comment[es]=Completo entorno de programaci贸n para Python
-Comment[de]=Integrierte Entwicklungsumgebung für Python
-GenericName=Integrated Development Environment for Python
-GenericName[de]=Integrierte Entwicklungsumgebung für Python
-Keywords=programming;code;python;ruby
-Exec=eric %F
-Terminal=false
-Type=Application
-MimeType=text/x-python;
-Icon=eric
-Categories=Development;IDE;
-StartupNotify=true
diff -Nru eric-18.05/debian/eric.install eric-18.11+ds1/debian/eric.install
--- eric-18.05/debian/eric.install 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/eric.install 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-debian/eric.desktop /usr/share/applications
-debian/eric.xpm /usr/share/pixmaps/
diff -Nru eric-18.05/debian/eric.xpm eric-18.11+ds1/debian/eric.xpm
--- eric-18.05/debian/eric.xpm 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/eric.xpm 1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/* XPM */
-static char *eric-icon[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 31 1",
-" c #0E0D0C",
-". c #24201E",
-"X c #46352D",
-"o c #55433D",
-"O c #754A35",
-"+ c #775B3E",
-"@ c #5E5441",
-"# c #7F6A4A",
-"$ c #9A5B40",
-"% c #897A54",
-"& c #887B79",
-"* c #A26D47",
-"= c #B3704D",
-"- c #BB7E57",
-"; c red",
-": c #9E9069",
-"> c #A6835D",
-", c #BC9076",
-"< c #C99068",
-"1 c #9C9496",
-"2 c #AEA18A",
-"3 c #B9B2AD",
-"4 c #C9A182",
-"5 c #DEA284",
-"6 c #D7B49B",
-"7 c #CCBFB4",
-"8 c #D7D0CC",
-"9 c #E0DEDD",
-"0 c #ECE8E8",
-"q c #F1F0F0",
-"w c gray100",
-/* pixels */
-"wwwwwwwwwwwwwwwwqqw8990wwwwwwwww",
-"wwwwwwwwwwwwwwwq887@@@18wwwwwwww",
-"wwwwwwwwwwwwwww02#X...X18qwwwwww",
-"wwwwwwwwwwwwww02@. . .@3qwwwww",
-"wwwwwwwwwwwwq8&o ..1qwwwww",
-"wwwwwwwwwwwq3@X. .X$. X&9wwwww",
-"wwww;www;ww8@.. ...*@o$o1wwwww",
-"www;wwwww;w3X.@+. ...*55-$3qwwww",
-"www;wwwww;w8o&-OXXOO&,<=$X&9wwww",
-"wwww;www;wq&o4$OX$<$$$$$OO*wwwww",
-"wwwww;;;wwq731*$$*--=$O$$O6wwwww",
-"wwwwwwwwwwwq#*<<$$==-=$$=-9wwwww",
-"wwwwwwwwwww03&<-=$$=<-=O=wwwwww",
-"wwww;;www;ww6<-7q*>->+>:*4wwwwww",
-"www;ww;w;www00q13%:>%%@7wwwwwwww",
-"www;ww;;wwwwq07@222:%:#:wwwwwwww",
-"www;;;;;;;wwq3&%2:::::>>wwwwwwww",
-"wwwwwwwwwwwww2o::::%%%#%wwwwwwww",
-"wwwwwwwwwwww03@%##%%%#%#9wwwwwww",
-"www;wwwww;ww91@:#@@#@@@+:wwwwwww",
-"www;ww;ww;ww911::%@o@@o%%wwwwwww",
-"www;ww;ww;wwwq81::%@.Xo#:wwwwwww",
-"www;;;;;;;wwqq9%@#@% X@+7wwwwwww",
-"wwwwwwwwwwwwwq3:%%@..X@@3wwwwwww",
-"wwwwwwwwwwwqq932%%@.X@O#*6qwwwww",
-"wwwwwwwwwwwwq9322:>@X@+#4,4wwwww",
-"wwwwwwwwwwwqqq322>,>1&+>>-,qwwww",
-"wwwwwwwwwwwwwq32,-<-7988660wwwww",
-"wwwwwwwwwwwwwwq764470qwqwqwwwwww"
-};
diff -Nru eric-18.05/debian/gen_kde_apis.py eric-18.11+ds1/debian/gen_kde_apis.py
--- eric-18.05/debian/gen_kde_apis.py 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/gen_kde_apis.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2002-2004 Detlev Offenbach
-# Adapted for usage with Debian by Torsten Marek
-# Changed by Gudjon, only to create kde apis
-import os
-import sys
-import PyQt4.pyqtconfig as pyqtconfig
-
-apidir = sys.argv[1]
-if not os.path.isdir(apidir):
- print "Generating the api directory."
- os.makedirs(apidir)
-
-sip = "/usr/bin/sip"
-
-def createAPIFiles(baseDir, modules, defaultImports, getFlags):
- for mod in modules:
- try:
- sipfile = os.path.join(baseDir, mod, "%smod.sip" % (mod, ))
- apifile = os.path.join(apidir, os.path.split(sipfile.replace("mod.sip", ".api"))[1])
- args = [sip, "-a", apifile,
- "-I", os.path.join(baseDir, mod),
- "-I", baseDir] \
- + defaultImports \
- + getFlags(mod) \
- + [sipfile]
- print "Generating %s ..." % apifile
- ret = os.spawnv(os.P_WAIT, sip, args)
- if ret != 0:
- print "Error: the process returned the exit code %d" % ret
- except OSError:
- print "Warning: The module '%s' does not exist." % mod
-
-
-
-qtsipdir = os.path.abspath(pyqtconfig._pkg_config['pyqt_sip_dir'])
-modules = pyqtconfig._pkg_config['pyqt_modules'].split()
-
-#createAPIFiles(qtsipdir, modules, [],
-# lambda x: pyqtconfig._pkg_config["pyqt_%s_sip_flags" % (x,)].split())
-#createAPIFiles(qtsipdir, modules, [],
-# lambda x: pyqtconfig._pkg_config["pyqt_sip_flags"].split())
-
-
-try:
- import PyKDE4.pykdeconfig as pykdeconfig
- kdesipdir = "/usr/share/sip/PyKDE4"
- modules = pykdeconfig._pkg_config['pykde_modules'].split()
-
- extraimport = []
- # just import anything for anything else, so we get rid of keeping track of the
- # inter-module deps
- for mod in modules:
- extraimport.extend(["-I", os.path.join(kdesipdir, mod)])
- extraimport.extend(["-I", qtsipdir])
-
- createAPIFiles(kdesipdir, modules, extraimport,
- lambda x: pykdeconfig._pkg_config["pykde_kde_sip_flags"].split())
-except:
- print "Error: No PyKDE4 api files generated"
diff -Nru eric-18.05/debian/gen_python_api.py eric-18.11+ds1/debian/gen_python_api.py
--- eric-18.05/debian/gen_python_api.py 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/gen_python_api.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,302 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-'''gen_python_api.py generates a python.api file for eric3
-
-The generated api file includes
- *) all Python keywords
- *) all builtin functions
- *) all module attributes
-
-Module functions are represented by their docstring if available,
-otherwise by the function definition from the source file.
-
-Classes are represented by their constructor if available.
-
-Usage:
-Edit the list of modules which should be excluded. This list is located
-some lines below. Look for excludemodulelist = [...]
-Specify the modules whose contents should be added as global names
-(i.e. from parrot import *). Look for addasgloballist = [...]
-
-Start the script by typing 'python gen_python_api.py [-a]' or
-'python gen_python_api.py [-a] apidir' in the shell.
-
-The -a switch will include everything in the API file, without it,
-just functions and methods will be included.
-
-Copy the generated python.api file into your eric3 api directory and
-add it via the Preferences dialog.
-
-Original by Markus Gritsch (gritsch@iue.tuwien.ac.at)
-Modified to work with eric3 by Detlev Offenbach (detlev@die-offenbachs.de)
-Modified for the Debian package of eric by Torsten Marek
-'''
-
-# if one of these substrings is found in a specific sys.path directory,
-# the modules in this particular directory are not processed
-excludedirlist = ['lib-tk', 'site-packages', 'plat-linux-i386',
- 'plat-win', 'plat-linux2', 'site-python', 'idlelib', 'python-support']
-
-excludemodulelist = []
-# switch for excluding modules whose names begin with _
-exclude_modules = 1
-
-# list of modules whose contents should be added as global names
-addasgloballist = []
-
-# list of modules which are otherwise not accessible
-# sourcefile-parsing is NOT done for these modules
-# also activate the add_manual_modules-switch below
-manuallist = ['os.path', '_xmlplus']
-
-# import modules of the following type (the dot must be present!!)
-moduletypes = ['.py', '.pyd', '.dll', '.so']
-
-# some switches
-add_keywords = 1 # e.g. print
-add_builtins = 1 # e.g. open()
-add_builtin_modules = 1 # e.g. sys
-add_manual_modules = 1 # modules from manuallist
-add_package_modules = 1 # modules which are directories with __init__.py files
-add_other_modules = 1 # all the other modules
-
-#------------------------------------------------------------------------------
-
-import string, re, sys, os, types
-
-api = {}
-
-def processName(entryprefix, moduleprefix, name, ns):
- exec 'hasdoc = hasattr(' + moduleprefix + name + ', "__doc__")' in ns
- exec 'nametype = type(' + moduleprefix + name + ')' in ns
- if ns['hasdoc']:
- exec 'doc = ' + moduleprefix + name + '.__doc__' in ns
- pattern = re.compile('^ *' + name + r' *\(.*?\)')
- if ns['doc']:
- if type(ns['doc']) in [types.StringType, types.BufferType] and \
- pattern.search(ns['doc']):
- if not api.has_key(entryprefix + name):
- api[entryprefix + name] = entryprefix + string.strip(string.split(ns['doc'], '\n')[0]) + '\n'
- return
- else:
- if ns['nametype'] in [types.ClassType, types.FunctionType]:
- api[entryprefix + name] = entryprefix + name + '(??) [doc: ' + string.strip(string.split(ns['doc'], '\n')[0]) + ']' + '\n'
- if not api.has_key(entryprefix + name):
- if ns['nametype'] == types.ClassType:
- api[entryprefix + name] = entryprefix + name + '(??) [class]\n'
- elif ns['nametype'] == types.FunctionType:
- api[entryprefix + name] = entryprefix + name + '(??) [function]\n'
- elif ns['nametype'] == types.ModuleType:
- api[entryprefix + name] = entryprefix + name + ' [module]\n'
- else:
- api[entryprefix + name] = entryprefix + name + '\n'
-
-def processModule(module, file=''):
- print ' ', string.ljust(module, 22), ': importing ...',
- if module in excludemodulelist:
- print 'in exclude list'
- return
-
- if exclude_modules and module[0] == '_':
- for mmod in manuallist:
- if module.startswith(mmod):
- break
- else:
- print 'modulename begins with _'
- return
-
- entryprefix = module + '.'
- for addasglobal in addasgloballist:
- if module[:len(addasglobal)] == addasglobal:
- entryprefix = module[len(addasglobal)+1:]
- break
-
- ns = {}
- try:
- exec 'import ' + module in ns
- print 'ok,',
- except:
- print sys.exc_info()[0]
- return
-
- print 'processing ...',
- try:
- exec 'names = dir(%s)' % module in ns
- except:
- print sys.exc_info()[0]
- return
- for name in ns['names']:
- processName(entryprefix, module + '.', name, ns)
- print 'ok,',
-
- # parse module source file if available
-
- if file[-3:] != '.py':
- print 'no source file'
- return
- print 'parsing ...',
- try:
- f = open(file, 'rt')
- except IOError:
- print sys.exc_info()[0]
- return
- contents = f.readlines()
- f.close()
-
- def_p = re.compile(r'^def (\w*)( *\(.*?\)):')
- class_p = re.compile(r'^class +(\w*)')
- init_p = re.compile(r'^[ \t]+def +__init__\(\w*, *(.*?)\):')
- inclass = 0
- classname = ''
- for line in contents:
- def_m = def_p.search(line)
- if def_m:
- name = def_m.group(1)
- if api.has_key(entryprefix + name):
- docindex = string.find(api[entryprefix + name], '[doc:')
- if docindex + 1:
- doc = ' ' + api[entryprefix + name][docindex:] # trailing \n included
- api[entryprefix + name] = entryprefix + name + def_m.group(2) + doc
- if api[entryprefix + name] == entryprefix + name + '(??) [function]\n':
- api[entryprefix + name] = entryprefix + name + def_m.group(2) + '\n'
-
- if inclass:
- init_m = init_p.search(line)
- if init_m:
- if api.has_key(entryprefix + classname):
- docindex = string.find(api[entryprefix + classname], '[doc:')
- if docindex + 1:
- doc = ' ' + api[entryprefix + classname][docindex:] # trailing \n included
- api[entryprefix + classname] = entryprefix + classname + '(' + init_m.group(1) + ')' + doc
- if api[entryprefix + classname] == entryprefix + classname + '(??) [class]\n':
- api[entryprefix + classname] = entryprefix + classname + '(' + init_m.group(1) + ')' + '\n'
- inclass = 0
- if not line[0] in ' \t\n':
- inclass = 0
-
- class_m = class_p.search(line)
- if class_m:
- inclass = 1
- classname = class_m.group(1)
- print 'ok'
-
-def processFolder(folder, prefix=''):
- print 'processing', folder,
- for excludedir in excludedirlist:
- if string.find(folder, excludedir) + 1:
- print '... in exclude list',
- folder = ''
- break
- print
- if folder == '' or not os.path.isdir(folder):
- return
-
- entries = os.listdir(folder)
- for entry in entries:
- if add_package_modules and \
- os.path.isdir(folder + os.sep + entry) and \
- os.path.isfile(folder + os.sep + entry + os.sep + '__init__.py'):
- # package
- processFolder(folder + os.sep + entry, prefix=prefix+entry+'.')
- print '-done with', folder + os.sep + entry
- elif prefix and entry == '__init__.py':
- # modules which are directories with __init__.py files
- # The probing of 'prefix' is unfortunately necessary, because of
- # the incorrect behavior of some packages (e.g. PIL) which add
- # their directory to the searchpath via a .pth file AND are
- # packages because of an __init__.py file.
- module = prefix[:-1]
- file = folder + os.sep + entry
- processModule(module, file)
- elif add_other_modules:
- # normal file-modules
- root, ext = os.path.splitext(entry)
- if not ext in moduletypes:
- continue
- if entry[-9:] == 'module.so':
- module = prefix + entry[:-9]
- else:
- module = prefix + root
- file = folder + os.sep + entry
- processModule(module, file)
-
-#------------------------------------------------------------------------------
-
-# keywords
-if add_keywords:
- print '\nadding keywords ...',
- keywords = string.split('''and assert break class continue def del elif else
- except exec finally for from global if import in is lambda None not or pass
- print raise return try while''')
- for keyword in keywords:
- api[keyword] = keyword + '\n'
- print 'ok'
-
-# __builtins__
-if add_builtins:
- print '\nadding __builtins__ ...',
- for builtin in dir(__builtins__):
- processName(entryprefix = '', moduleprefix = '', name = builtin, ns = {})
- print 'ok'
-
-# sys.builtin_module_names
-if add_builtin_modules:
- print '\nprocessing builtin modules'
- for module in sys.builtin_module_names:
- processModule(module)
-
-# modules specified in manuallist
-if add_manual_modules:
- print '\nprocessing modules specified in manuallist'
- for module in manuallist:
- processModule(module)
-
-# modules from sys.path
-if add_package_modules or add_other_modules:
- print '\nprocessing searchpath'
- # avoid duplicated entries in sys.path
- folders = {}
- for folder in sys.path:
- folders[folder] = None
-
- for folder in folders.keys():
- if folder != os.getcwd() and \
- folder != os.path.dirname(os.path.abspath(sys.argv[0])):
- processFolder(folder)
-
-#------------------------------------------------------------------------------
-
-# filtering
-print 'filtering api file ...',
-if len(sys.argv) > 1 and sys.argv[1] == '-a':
- del sys.argv[1]
- api_p = re.compile(r'^(\w+\.)*(\w*\([^\)]*\)|\w*)')
-else:
- api_p = re.compile(r'^(\w+\.)*([^\)]*\))')
-
-apiv = api.values()
-apilist=[]
-
-for apientry in apiv:
- api_m = api_p.search(apientry)
- if api_m:
- fun = api_m.group(2)
- if not fun in api:
- apilist.append('%s%s' % (fun, os.linesep))
-print 'done\n'
-
-# saving
-if len(sys.argv) == 2:
- apidir = sys.argv[1]
- if not os.path.isdir(apidir):
- print "Generating the api directory."
- os.makedirs(apidir)
- apifile = os.path.join(apidir, 'python.api')
-else:
- apifile = 'python.api'
-print 'saving api file "%s" ...' % apifile,
-f = open(apifile, 'wt')
-f.writelines(apilist)
-f.close()
-print 'done\n'
diff -Nru eric-18.05/debian/gen_qt_apis.py eric-18.11+ds1/debian/gen_qt_apis.py
--- eric-18.05/debian/gen_qt_apis.py 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/gen_qt_apis.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2002-2004 Detlev Offenbach
-# Adapted for usage with Debian by Torsten Marek
-# Changed by Gudjon, only to create qt apis
-import os
-import sys
-#import PyQt4.pyqtconfig as pyqtconfig
-import PyQt5.QtCore
-
-apidir = sys.argv[1]
-if not os.path.isdir(apidir):
- print("Generating the api directory.")
- os.makedirs(apidir)
-
-sip = "/usr/bin/sip"
-
-def createAPIFiles(baseDir, modules, defaultImports, getFlags):
- for mod in modules:
- try:
- sipfile = os.path.join(baseDir, mod, "%smod.sip" % (mod, ))
- apifile = os.path.join(apidir, os.path.split(sipfile.replace("mod.sip", ".api"))[1])
- args = [sip, "-a", apifile,
- "-I", os.path.join(baseDir, mod),
- "-I", baseDir] \
- + defaultImports \
- + getFlags(mod) \
- + [sipfile]
- print("Generating %s ..." % apifile)
- ret = os.spawnv(os.P_WAIT, sip, args)
- if ret != 0:
- print("Error: the process returned the exit code %d" % ret)
- except OSError:
- print("Warning: The module '%s' does not exist." % mod)
-
-
-
-#qtsipdir = os.path.abspath(pyqtconfig._pkg_config['pyqt_sip_dir'])
-# I don't like to have these hardcoded but I found no other way.
-qtsipdir = "/usr/share/sip/PyQt5/"
-modules = ['QtSql', 'QtWidgets', 'QtSvg', 'QtNetwork', 'QtWebKitWidgets', 'QtXml', 'QtPrintSupport',\
-'QtOpenGL', 'QtHelp', 'QtWebEngineWidgets', 'QtQuick', 'QtMultimediaWidgets', 'QtDBus',\
-'QtWebChannel', 'QtWebKit', 'QtMultimedia', 'QtQuickWidgets', 'QtSensors',\
-'QtDesigner', 'QtX11Extras', 'QtCore', 'QtWebSockets', 'QtBluetooth', 'QtMacExtras', 'QtWinExtras',\
-'QtSerialPort', 'QtGui', 'QtQml', 'QtTest', 'QtXmlPatterns', 'QtPositioning', 'Enginio']
-#pyqtconfig._pkg_config['pyqt_modules'].split()
-
-#createAPIFiles(qtsipdir, modules, [],
-# lambda x: pyqtconfig._pkg_config["pyqt_%s_sip_flags" % (x,)].split())
-#createAPIFiles(qtsipdir, modules, [],
-# lambda x: pyqtconfig._pkg_config["pyqt_sip_flags"].split())
-pyqt_sip_flags = PyQt5.QtCore.PYQT_CONFIGURATION
-createAPIFiles(qtsipdir, modules, [],
- lambda x: pyqt_sip_flags["sip_flags"].split())
-
-#try:
- #import PyKDE4.pykdeconfig as pykdeconfig
- #kdesipdir = "/usr/share/sip/PyKDE4"
- #modules = pykdeconfig._pkg_config['pykde_modules'].split()
-
- #extraimport = []
- ## just import anything for anything else, so we get rid of keeping track of the
- ## inter-module deps
- #for mod in modules:
- #extraimport.extend(["-I", os.path.join(kdesipdir, mod)])
- #extraimport.extend(["-I", qtsipdir])
-
- #createAPIFiles(kdesipdir, modules, extraimport,
- #lambda x: pykdeconfig._pkg_config["pykde_kde_sip_flags"].split())
-#except:
- #print "Error: No PyKDE4 api files generated"
diff -Nru eric-18.05/debian/gen_sip_apis.py eric-18.11+ds1/debian/gen_sip_apis.py
--- eric-18.05/debian/gen_sip_apis.py 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/gen_sip_apis.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright (c) 2002-2004 Detlev Offenbach
-# Adapted for usage with Debian by Torsten Marek
-import os
-import sys
-import PyQt4.pyqtconfig as pyqtconfig
-
-apidir = sys.argv[1]
-if not os.path.isdir(apidir):
- print "Generating the api directory."
- os.makedirs(apidir)
-
-sip = "/usr/bin/sip"
-
-def createAPIFiles(baseDir, modules, defaultImports, getFlags):
- for mod in modules:
- try:
- sipfile = os.path.join(baseDir, mod, "%smod.sip" % (mod, ))
- apifile = os.path.join(apidir, os.path.split(sipfile.replace("mod.sip", ".api"))[1])
- args = [sip, "-a", apifile,
- "-I", os.path.join(baseDir, mod),
- "-I", baseDir] \
- + defaultImports \
- + getFlags(mod) \
- + [sipfile]
- print "Generating %s ..." % apifile
- ret = os.spawnv(os.P_WAIT, sip, args)
- if ret != 0:
- print "Error: the process returned the exit code %d" % ret
- except OSError:
- print "Warning: The module '%s' does not exist." % mod
-
-
-
-qtsipdir = os.path.abspath(pyqtconfig._pkg_config['pyqt_sip_dir'])
-modules = pyqtconfig._pkg_config['pyqt_modules'].split()
-
-#createAPIFiles(qtsipdir, modules, [],
-# lambda x: pyqtconfig._pkg_config["pyqt_%s_sip_flags" % (x,)].split())
-createAPIFiles(qtsipdir, modules, [],
- lambda x: pyqtconfig._pkg_config["pyqt_sip_flags"].split())
-
-
-try:
- import PyKDE4.pykdeconfig as pykdeconfig
- kdesipdir = "/usr/share/sip/PyKDE4"
- modules = pykdeconfig._pkg_config['pykde_modules'].split()
-
- extraimport = []
- # just import anything for anything else, so we get rid of keeping track of the
- # inter-module deps
- for mod in modules:
- extraimport.extend(["-I", os.path.join(kdesipdir, mod)])
- extraimport.extend(["-I", qtsipdir])
-
- createAPIFiles(kdesipdir, modules, extraimport,
- lambda x: pykdeconfig._pkg_config["pykde_kde_sip_flags"].split())
-except:
- print "Error: No PyKDE4 api files generated"
diff -Nru eric-18.05/debian/get_translations.sh eric-18.11+ds1/debian/get_translations.sh
--- eric-18.05/debian/get_translations.sh 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/get_translations.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-VERSION=$(dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-echo $VERSION
-cd debian
-wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-cs-${VERSION}.tar.gz/download
-wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-de-${VERSION}.tar.gz/download
-wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-es-${VERSION}.tar.gz/download
-wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-fr-${VERSION}.tar.gz/download
-wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-it-${VERSION}.tar.gz/download
-wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-ru-${VERSION}.tar.gz/download
-wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-tr-${VERSION}.tar.gz/download
-wget http://sourceforge.net/projects/eric-ide/files/eric4/stable/${VERSION}/eric4-i18n-zh_CN.GB2312-${VERSION}.tar.gz/download
-for name in eric4-i18n-*.tar.gz ; do tar xzf $name; done
-mv -f eric4-${VERSION}/eric/i18n/eric4_*.ts i18n/
-rm -rf eric4-${VERSION}
-rm -f eric4-i18n-*.tar.gz*
-cd ..
diff -Nru eric-18.05/debian/links eric-18.11+ds1/debian/links
--- eric-18.05/debian/links 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/links 2018-11-01 19:58:48.000000000 +0000
@@ -1,2 +1,3 @@
usr/bin/eric6 usr/bin/eric
usr/share/man/man1/eric6.1 usr/share/man/man1/eric.1
+usr/share/doc/eric/Examples usr/share/doc/eric/examples
diff -Nru eric-18.05/debian/manpages eric-18.11+ds1/debian/manpages
--- eric-18.05/debian/manpages 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/manpages 2018-11-01 19:58:48.000000000 +0000
@@ -1,5 +1,6 @@
debian/debian-manpages/eric6.1
debian/debian-manpages/eric6_api.1
+debian/debian-manpages/eric6_browser.1
debian/debian-manpages/eric6_compare.1
debian/debian-manpages/eric6_configure.1
debian/debian-manpages/eric6_diff.1
@@ -14,8 +15,8 @@
debian/debian-manpages/eric6_qregexp.1
debian/debian-manpages/eric6_qregularexpression.1
debian/debian-manpages/eric6_re.1
-debian/debian-manpages/eric6_snap.1
debian/debian-manpages/eric6_shell.1
+debian/debian-manpages/eric6_snap.1
debian/debian-manpages/eric6_sqlbrowser.1
debian/debian-manpages/eric6_tray.1
debian/debian-manpages/eric6_trpreviewer.1
diff -Nru eric-18.05/debian/patches/01_path_fix.patch eric-18.11+ds1/debian/patches/01_path_fix.patch
--- eric-18.05/debian/patches/01_path_fix.patch 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/patches/01_path_fix.patch 2018-11-01 19:58:48.000000000 +0000
@@ -8,9 +8,11 @@
eric/Preferences/__init__.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
+diff --git a/eric/Preferences/__init__.py b/eric/Preferences/__init__.py
+index 20835d4..2a1bacb 100644
--- a/eric/Preferences/__init__.py
+++ b/eric/Preferences/__init__.py
-@@ -861,13 +861,13 @@
+@@ -886,13 +886,13 @@ class Prefs(object):
# defaults for the help settings
helpDefaults = {
"CustomViewer": "",
@@ -28,5 +30,5 @@
+ "PyQt4DocDir": "/usr/share/doc/python-qt4-doc/html/index.html",
+ "PyQt5DocDir": "/usr/share/doc/pyqt5-doc/index.html",
"PySideDocDir": "",
+ "PySide2DocDir": "",
"EricDocDir": "",
- "SingleHelpWindow": True,
diff -Nru eric-18.05/debian/patches/03_disable-update-warning.patch eric-18.11+ds1/debian/patches/03_disable-update-warning.patch
--- eric-18.05/debian/patches/03_disable-update-warning.patch 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/patches/03_disable-update-warning.patch 2018-11-01 19:58:48.000000000 +0000
@@ -4,9 +4,16 @@
Disable checking of updates of eric and plugin repository at startup.
Disable download of new version of eric
+---
+ eric/UI/UserInterface.py | 10 +++++-----
+ eric/eric6.py | 4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/eric/UI/UserInterface.py b/eric/UI/UserInterface.py
+index 1920639..6bbd124 100644
--- a/eric/UI/UserInterface.py
+++ b/eric/UI/UserInterface.py
-@@ -5607,7 +5607,7 @@
+@@ -5805,7 +5805,7 @@ class UserInterface(E5MainWindow):
self.__setWindowCaption(editor="")
self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
@@ -15,7 +22,7 @@
self.__configureDockareaCornerUsage()
-@@ -6637,8 +6637,8 @@
+@@ -6844,8 +6844,8 @@ class UserInterface(E5MainWindow):
self.tr("Update available"),
self.tr(
"""The update to {0} of eric6 is"""
@@ -26,7 +33,7 @@
.format(versions[0], versions[1]),
yesDefault=True)
url = res and versions[1] or ''
-@@ -6656,8 +6656,8 @@
+@@ -6863,8 +6863,8 @@ class UserInterface(E5MainWindow):
self.tr("Error during updates check"),
self.tr("""Could not perform updates check."""))
@@ -37,9 +44,11 @@
@pyqtSlot()
def __versionsDownloadCanceled(self):
+diff --git a/eric/eric6.py b/eric/eric6.py
+index 410cfce..1df1ba0 100644
--- a/eric/eric6.py
+++ b/eric/eric6.py
-@@ -241,8 +241,8 @@
+@@ -244,8 +244,8 @@ def uiStartUp():
mainWindow.processArgs(args)
mainWindow.checkProjectsWorkspace()
mainWindow.checkConfigurationStatus()
diff -Nru eric-18.05/debian/patches/04_debian_chardet.patch eric-18.11+ds1/debian/patches/04_debian_chardet.patch
--- eric-18.05/debian/patches/04_debian_chardet.patch 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/patches/04_debian_chardet.patch 2018-11-01 19:58:48.000000000 +0000
@@ -9,10 +9,10 @@
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eric/Utilities/__init__.py b/eric/Utilities/__init__.py
-index 89ec73d..fdad22e 100644
+index d3bdb05..fac4756 100644
--- a/eric/Utilities/__init__.py
+++ b/eric/Utilities/__init__.py
-@@ -240,8 +240,8 @@ def decode(text):
+@@ -241,8 +241,8 @@ def decode(text):
if Preferences.getEditor("AdvancedEncodingDetection"):
# Try the universal character encoding detector
try:
@@ -23,7 +23,7 @@
if guess and guess['confidence'] > 0.95 and \
guess['encoding'] is not None:
codec = guess['encoding'].lower()
-@@ -446,8 +446,8 @@ def decodeBytes(buffer):
+@@ -447,8 +447,8 @@ def decodeBytes(buffer):
# try codec detection
try:
diff -Nru eric-18.05/debian/patches/05_desktop.patch eric-18.11+ds1/debian/patches/05_desktop.patch
--- eric-18.05/debian/patches/05_desktop.patch 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/patches/05_desktop.patch 2018-11-01 19:58:48.000000000 +0000
@@ -4,29 +4,88 @@
Fixing desktop exec codes.
---
- eric/eric6.desktop | 2 +-
- eric/eric6_webbrowser.desktop | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ eric/eric6.desktop | 9 +++++----
+ eric/eric6_browser.desktop | 11 +++++++----
+ eric/eric6_webbrowser.desktop | 14 +++++++++-----
+ 3 files changed, 21 insertions(+), 13 deletions(-)
+diff --git a/eric/eric6.desktop b/eric/eric6.desktop
+index f6a2b6c..cad706a 100644
--- a/eric/eric6.desktop
+++ b/eric/eric6.desktop
-@@ -1,7 +1,7 @@
+@@ -1,14 +1,15 @@
[Desktop Entry]
Version=1.0
Type=Application
-Exec=@BINDIR@/eric6@MARKER@
-+Exec=@BINDIR@/eric6 %F@MARKER@
++Exec=/usr/bin/eric6 %F
MimeType=text/x-python;
- Icon=eric@MARKER@
+-Icon=eric@MARKER@
++Icon=eric
Terminal=false
+-Name=eric6@PY_MARKER@
+-Name[de]=eric6@PY_MARKER@
++Name=eric
++Name[de]=eric
+ Comment=Integrated Development Environment for Python
+ Comment[de]=Integrierte Entwicklungsumgebung für Python
++Comment[zh_CN]=Python 集成开发环境
+ GenericName=IDE for Python
+ GenericName[de]=IDE für Python
+ Categories=Qt;X-Python;Development;IDE;
+diff --git a/eric/eric6_browser.desktop b/eric/eric6_browser.desktop
+index d27d534..3098468 100644
+--- a/eric/eric6_browser.desktop
++++ b/eric/eric6_browser.desktop
+@@ -1,15 +1,18 @@
+ [Desktop Entry]
+ Version=1.0
+ Type=Application
+-Exec=@BINDIR@/eric6_browser@MARKER@
++Exec=/usr/bin/eric6_browser %u
+ MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-mimearchive;
+-Icon=ericWeb@MARKER@
++Icon=ericWeb
+ Terminal=false
+-Name=eric6 Web Browser (QtWebEngine)@PY_MARKER@
+-Name[de]=eric6 Web Browser (QtWebEngine)@PY_MARKER@
++Name=eric6 Web Browser (QtWebEngine)
++Name[de]=eric6 Web Browser (QtWebEngine)
++Name[zh_CN]=eric6 网页浏览器(QtWebEngine)
+ Comment=Web Browser for PyQt5 based on QtWebEngine
+ Comment[de]=Web Browser für PyQt5 basierend auf QtWebEngine
++Comment[zh_CN]=基于 QtWebEngine 的 PyQt5 网页浏览器
+ GenericName=Web Browser
+ GenericName[de]=Web Browser
++GenericName[zh_CN]=网页浏览器
+ Categories=Qt;X-Python;Network;WebBrowser;X-QtWebEngine;
+ StartupNotify=true
+diff --git a/eric/eric6_webbrowser.desktop b/eric/eric6_webbrowser.desktop
+index b3d38df..5e9a61a 100644
--- a/eric/eric6_webbrowser.desktop
+++ b/eric/eric6_webbrowser.desktop
-@@ -1,7 +1,7 @@
+@@ -1,15 +1,19 @@
[Desktop Entry]
Version=1.0
Type=Application
--Exec=eric6_webbrowser@MARKER@
-+Exec=eric6_webbrowser %u@MARKER@
+-Exec=@BINDIR@/eric6_webbrowser@MARKER@
++Exec=/usr/bin/eric6_webbrowser %u
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
- Icon=ericWeb@MARKER@
+-Icon=ericWeb@MARKER@
++Icon=ericWeb
Terminal=false
+-Name=eric6 Web Browser (QtWebKit)@PY_MARKER@
+-Name[de]=eric6 Web Browser (QtWebKit)@PY_MARKER@
++Name=eric6 Web Browser (QtWebKit)
++Name[de]=eric6 Web Browser (QtWebKit)
++Name[zh_CN]=eric6 网页浏览器(QtWebKit)
+ Comment=Web Browser for PyQt based on QtWebKit
+ Comment[de]=Web Browser für PyQt basierend auf QtWebKit
++Comment[zh_CN]=基于 QtWebKit 的 PyQt 网页浏览器
+ GenericName=Web Browser
+ GenericName[de]=Web Browser
+-Categories=Qt;X-Python;Network;WebBrowser;X-QtWebKit;
++GenericName[zh_CN]=网页浏览器
++Categories=Development;IDE;
++Keywords=programming;code;python;ruby
+ StartupNotify=true
diff -Nru eric-18.05/debian/patches/06_no_blacklist.patch eric-18.11+ds1/debian/patches/06_no_blacklist.patch
--- eric-18.05/debian/patches/06_no_blacklist.patch 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/patches/06_no_blacklist.patch 2018-11-01 19:58:48.000000000 +0000
@@ -5,19 +5,16 @@
Disables blacklisting of unusable sip versions. Usable versions is handled
in the control file.
---
- eric/Globals/__init__.py | 58 ------------------------------------------------
- 1 file changed, 58 deletions(-)
+ eric/Globals/__init__.py | 59 ------------------------------------------------
+ 1 file changed, 59 deletions(-)
diff --git a/eric/Globals/__init__.py b/eric/Globals/__init__.py
-index 6ec168a..e64b8bc 100644
+index b8d2b98..5b925db 100644
--- a/eric/Globals/__init__.py
+++ b/eric/Globals/__init__.py
-@@ -67,65 +67,7 @@ def isLinuxPlatform():
- def checkBlacklistedVersions():
- """
- Module functions to check for blacklisted versions of the prerequisites.
--
-- @return flag indicating good versions were found (boolean)
+@@ -97,65 +97,6 @@ def checkBlacklistedVersions():
+
+ @return flag indicating good versions were found (boolean)
"""
- from install import BlackLists, PlatformsBlackLists
-
@@ -31,7 +28,10 @@
-
- # check version of sip
- try:
-- import sip
+- try:
+- from PyQt5 import sip
+- except ImportError:
+- import sip
- sipVersion = sip.SIP_VERSION_STR
- # always assume, that snapshots are good
- if "snapshot" not in sipVersion:
diff -Nru eric-18.05/debian/patches/07_webbrowser.patch eric-18.11+ds1/debian/patches/07_webbrowser.patch
--- eric-18.05/debian/patches/07_webbrowser.patch 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/patches/07_webbrowser.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-From: "Gudjon I. Gudjonsson"
-Date: Fri, 27 Apr 2018 22:52:20 +0200
-Subject: _webbrowser
-
-Move desktop file into the same category as the IDE
----
- eric/eric6_browser.desktop | 2 +-
- eric/eric6_webbrowser.desktop | 5 +++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/eric/eric6_browser.desktop b/eric/eric6_browser.desktop
-index 54e32ac..276ecba 100644
---- a/eric/eric6_browser.desktop
-+++ b/eric/eric6_browser.desktop
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Version=1.0
- Type=Application
--Exec=eric6_browser@MARKER@
-+Exec=eric6_browser %u
- MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-mimearchive;
- Icon=ericWeb@MARKER@
- Terminal=false
-diff --git a/eric/eric6_webbrowser.desktop b/eric/eric6_webbrowser.desktop
-index 47fdb4c..5cb2430 100644
---- a/eric/eric6_webbrowser.desktop
-+++ b/eric/eric6_webbrowser.desktop
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Version=1.0
- Type=Application
--Exec=eric6_webbrowser %u@MARKER@
-+Exec=eric6_webbrowser %u
- MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
- Icon=ericWeb@MARKER@
- Terminal=false
-@@ -11,5 +11,6 @@ Comment=Web Browser for PyQt based on QtWebKit
- Comment[de]=Web Browser für PyQt basierend auf QtWebKit
- GenericName=Web Browser
- GenericName[de]=Web Browser
--Categories=Qt;X-Python;Network;WebBrowser;X-QtWebKit;
-+Categories=Development;IDE;
-+Keywords=programming;code;python;ruby
- StartupNotify=true
diff -Nru eric-18.05/debian/patches/09_message_filter.patch eric-18.11+ds1/debian/patches/09_message_filter.patch
--- eric-18.05/debian/patches/09_message_filter.patch 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/patches/09_message_filter.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-From: "Gudjon I. Gudjonsson"
-Date: Fri, 27 Apr 2018 22:52:20 +0200
-Subject: _message_filter
-
-Avoids popups when an QXcbConnection error occurs. The error message
-is unimportant.
----
- eric/E5Gui/E5ErrorMessage.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/eric/E5Gui/E5ErrorMessage.py b/eric/E5Gui/E5ErrorMessage.py
-index 6425305..490b248 100644
---- a/eric/E5Gui/E5ErrorMessage.py
-+++ b/eric/E5Gui/E5ErrorMessage.py
-@@ -40,6 +40,7 @@ class E5ErrorMessage(QErrorMessage):
- "eric6messagefilters")
-
- self.__defaultFilters = [
-+ "QXcbConnection:",
- "QFont::",
- "QCocoaMenu::removeMenuItem",
- "QCocoaMenu::insertNative",
diff -Nru eric-18.05/debian/patches/series eric-18.11+ds1/debian/patches/series
--- eric-18.05/debian/patches/series 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/patches/series 2018-11-01 19:58:48.000000000 +0000
@@ -3,5 +3,3 @@
04_debian_chardet.patch
05_desktop.patch
06_no_blacklist.patch
-07_webbrowser.patch
-09_message_filter.patch
diff -Nru eric-18.05/debian/README.source eric-18.11+ds1/debian/README.source
--- eric-18.05/debian/README.source 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/README.source 2018-11-01 20:04:48.000000000 +0000
@@ -1,25 +1,17 @@
-The sources can be downloaded by running
-./debian/rules get-orig-source
+The repacked source tarball can be prepared by running "uscan --force-download".
+When using git-buildpackage, please invoke the following command to prepare
+a new version (with debian/master branch checked out):
-The following source files are excluded from the source package
- eric/DebugClients/Python/coverage/htmlfiles/jquery.tablesorter.min.js
- eric/DebugClients/Python/coverage/htmlfiles/jquery.min.js
- eric/DebugClients/Python/coverage/htmlfiles/coverage_html.js
- eric/DebugClients/Python/coverage/htmlfiles/jquery.isonscreen.js
- eric/DebugClients/Python/coverage/htmlfiles/jquery.hotkeys.js
- eric/DebugClients/Python3/coverage/htmlfiles/jquery.tablesorter.min.js
- eric/DebugClients/Python3/coverage/htmlfiles/jquery.min.js
- eric/DebugClients/Python3/coverage/htmlfiles/coverage_html.js
- eric/DebugClients/Python3/coverage/htmlfiles/jquery.isonscreen.js
- eric/DebugClients/Python3/coverage/htmlfiles/jquery.hotkeys.js
- eric/Helpviewer/data/javascript/jquery.js
- eric/Helpviewer/data/javascript/jquery-ui.js
- eric/WebBrowser/data/javascript/jquery.js
- eric/WebBrowser/data/javascript/jquery-ui.js
+ gbp import-orig --uscan --pristine-tar
+This will automatically prepare new version in the git repository and exclude
+unwanted files as listed in debian/copyright Files-Excluded field.
-The binary package excludes:
+For a complete list of files excluded from the source package,
+please take a look at "Files-Excluded" field in debian/copyright file.
+
+The binary package should exclude:
eric/ThirdParty/CharDet/
eric/ThirdParty/enum/
eric/ThirdParty/Pygments/
diff -Nru eric-18.05/debian/rules eric-18.11+ds1/debian/rules
--- eric-18.05/debian/rules 2018-07-19 05:41:47.000000000 +0000
+++ eric-18.11+ds1/debian/rules 2018-11-01 19:58:48.000000000 +0000
@@ -1,145 +1,60 @@
#!/usr/bin/make -f
# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
include /usr/share/dpkg/pkg-info.mk
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --with python3
-ERICDIR=debian/eric/usr/share/eric/modules
-QTAPIFILE=debian/apis/pyqt.api
-KDEAPIFILE=debian/apis/pykde.api
-PYTHONAPIFILE=debian/apis/python.api
-APIFILES= $(QTAPIFILE) $(PYTHONAPIFILE)
-# $(KDEAPIFILE)
-LAN=ru es en de
-#cs de en es fr it pt ru tr zh_CN
-
-
-clean:
- dh_testdir
- dh_testroot
- find . -name "*.pyc" -exec rm {} \;
+override_dh_clean:
+ dh_clean debian/eric
+ find . -name '*.py[co]' -delete;
find . -name "Ui_*" -exec rm {} \;
find . -name __pycache__ -prune | xargs rm -rf
- rm -rf debian/eric debian/apis debian/qtapis debian/kdeapis debian/pyapis
- rm -f eric6*
- rm -f *-stamp
- dh_clean
-
-
-apifile-stamp:
- # generate API files
- #mkdir -p debian/qtapis
- #mkdir -p debian/apis
- #debian/kdeapis debian/pyapis debian/apis
- #python3 debian/gen_qt_apis.py debian/qtapis/
- #python debian/gen_kde_apis.py debian/kdeapis/
- #python debian/gen_python_api.py debian/pyapis/
- #sort -u debian/qtapis/*.api > $(QTAPIFILE)
- #sort -u debian/kdeapis/*.api > $(KDEAPIFILE)
- #sort -u debian/pyapis/*.api > $(PYAPIFILE)
- touch apifile-stamp
-
-build: build-arch build-indep
-build-arch:
-build-indep:
-
-install: apifile-stamp
- dh_testdir -i
- dh_testroot -i
- dh_prep -i
- python3 install.py -i debian/eric -x -c -f debian/eric6config.debian
- dh_installdirs -i
- for i in eric/i18n/*.ts; do\
- lrelease -qt=5 $$i -qm debian/eric/usr/share/qt5/translations/`basename $$i .ts`.qm;\
- done
+override_dh_auto_build:
+ # Nothing to be built
- rm -f debian/eric/usr/share/doc/eric/LICENSE.GPL3
- rm -f $(ERICDIR)/LICENSE.GPL3
- rm -f $(ERICDIR)/install*.py
-
-# copy API files
- mv debian/eric/usr/share/eric/api/* debian/eric-api-files/usr/share/eric/api
-
- #for i in $(APIFILES); do \
- # install -o root -g root -m 644 $$i \
- # debian/eric-api-files/usr/share/eric/api/python; \
- #done
-
-# remove README-PyXML.txt
- rm -f debian/eric/usr/share/doc/eric/README-PyXML.txt
-# remove the ThirdParty libraries that are not needed.
+override_dh_auto_install:
+ #
+ # Customized installation script, provided by upstream
+ # For argument explanation, see "python3 ./install.py --help"
+ python3 install.py -i debian/eric -x -c -z -f debian/eric6config.debian
+ #
+ # Generate .qm translation files from source
+ for i in eric/i18n/*.ts; do \
+ lrelease -qt=5 $$i -qm debian/eric/usr/share/qt5/translations/`basename $$i .ts`.qm; \
+ done
+ #
+ # Split API files into separate binary package eric-api-files
+ mv debian/eric/usr/share/eric/api/* debian/eric-api-files/usr/share/eric/api/
+ #
+ # Remove LICENSE.GPL3 file from documentation directory.
+ rm -f debian/eric/usr/share/doc/eric/LICENSE.GPL3*
+ rm -f debian/eric/usr/share/eric/modules/LICENSE.GPL3
+ #
+ # Remove the ThirdParty libraries that are not needed.
rm -rf debian/eric/usr/share/eric/modules/ThirdParty/CharDet
rm -rf debian/eric/usr/share/eric/modules/ThirdParty/enum
rm -rf debian/eric/usr/share/eric/modules/ThirdParty/Pygments
- find debian/eric/ -name '*.py[co]' -delete
- rm -f debian/eric/usr/share/applications/eric6.desktop
+ #
+ # Clean up __pycache__ directory
find . -name __pycache__ -prune | xargs rm -rf
- #Removing eric6_browser. QtWebEngineWidgets is not included in Debian
- rm -f debian/eric/usr/share/eric/modules/eric6_browser.py
- rm -f debian/eric/usr/share/eric/modules/eric6_browser.pyw
- rm -f debian/eric/usr/share/applications/eric6_browser.desktop
- rm -f debian/eric/usr/bin/eric6_browser
-
-
-# Build architecture-independent files here.
-binary-indep: install
- dh_testdir -i
- dh_testroot -i
- dh_installchangelogs
- dh_installdocs -i --exclude=LICENSE.GPL3
- #dh_installmenu -i
- dh_installman -i
- dh_install -i -X__pycache__
- dh_link -i
- dh_lintian -i
- dh_compress -i -Xsource.qch
- dh_python3 -X.*/DebugClients/Python/.* -X.*/UtilitiesPython2/.*
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch:
-# Nothing to do
-
-
-
-get-orig-source:
- set -e;\
- VER=$(DEB_VERSION_UPSTREAM);\
- wget -q http://sourceforge.net/projects/eric-ide/files/eric6/stable/$$VER/eric6-$$VER.tar.gz/download\
- -O eric_$$VER.orig.tar.gz; \
- tar -xz --exclude=eric/DebugClients/Python/coverage/htmlfiles/jquery.tablesorter.min.js \
- --exclude=eric/DebugClients/Python/coverage/htmlfiles/jquery.min.js \
- --exclude=eric/DebugClients/Python/coverage/htmlfiles/coverage_html.js \
- --exclude=eric/DebugClients/Python/coverage/htmlfiles/jquery.isonscreen.js \
- --exclude=eric/DebugClients/Python/coverage/htmlfiles/jquery.hotkeys.js \
- --exclude=eric/DebugClients/Python3/coverage/htmlfiles/jquery.tablesorter.min.js \
- --exclude=eric/DebugClients/Python3/coverage/htmlfiles/jquery.min.js \
- --exclude=eric/DebugClients/Python3/coverage/htmlfiles/coverage_html.js \
- --exclude=eric/DebugClients/Python3/coverage/htmlfiles/jquery.isonscreen.js \
- --exclude=eric/DebugClients/Python3/coverage/htmlfiles/jquery.hotkeys.js \
- --exclude=eric/Helpviewer/data/javascript/jquery.js \
- --exclude=eric/Helpviewer/data/javascript/jquery-ui.js \
- --exclude=eric/WebBrowser/data/javascript/jquery.js \
- --exclude=eric/WebBrowser/data/javascript/jquery-ui.js \
- -f eric_$$VER.orig.tar.gz; \
- mv eric6-$$VER eric-$$VER; \
- tar -czf eric_$$VER.orig.tar.gz eric-$$VER; \
- rm -rf eric-$$VER; \
- for L in ${LAN}; do\
- wget -q http://sourceforge.net/projects/eric-ide/files/eric6/stable/$$VER/eric6-i18n-$$L-$$VER.tar.gz/download\
- -O eric_$$VER.orig-transl-$$L.tar.gz;\
- done
- #;\
- #mv eric_$$VER.orig-transl-zh_CN.tar.gz eric_$$VER.orig-transl-zhCN.tar.gz
-
-binary: binary-indep binary-arch
-.PHONY: clean binary-indep binary-arch binary install
-
+ #
+ #Add symbolic links to jquery files.
+ mkdir debian/eric/usr/share/eric/modules/Helpviewer/data/javascript
+ mkdir debian/eric/usr/share/eric/modules/WebBrowser/data/javascript
+ cd debian/eric/usr/share/eric/modules/Helpviewer/data/javascript && ln -s /usr/share/javascript/jquery/jquery.js .
+ cd debian/eric/usr/share/eric/modules/Helpviewer/data/javascript && ln -s /usr/share/javascript/jquery-ui/jquery-ui.js .
+ cd debian/eric/usr/share/eric/modules/WebBrowser/data/javascript && ln -s /usr/share/javascript/jquery/jquery.js .
+ cd debian/eric/usr/share/eric/modules/WebBrowser/data/javascript && ln -s /usr/share/javascript/jquery-ui/jquery-ui.js .
+
+override_dh_compress:
+ # Qch Help files should not be compressed
+ dh_compress --exclude=source.qch
+override_dh_missing:
+ dh_missing --fail-missing
diff -Nru eric-18.05/debian/watch eric-18.11+ds1/debian/watch
--- eric-18.05/debian/watch 2018-07-19 05:21:09.000000000 +0000
+++ eric-18.11+ds1/debian/watch 2018-11-01 19:58:48.000000000 +0000
@@ -1,2 +1,4 @@
-version=3
-http://sf.net/eric-ide/eric6-(\d\S+)\.tar\.gz
+version=4
+opts="repack,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%eric-$1.tar.gz%,dversionmangle=s/\+ds\d*$//,compression=gzip,repacksuffix=+ds1" \
+ https://sf.net/eric-ide/eric6-(\d\S+)\.tar\.gz \
+ debian uupdate
diff -Nru eric-18.05/eric/APIs/Python3/eric6.api eric-18.11+ds1/eric/APIs/Python3/eric6.api
--- eric-18.05/eric/APIs/Python3/eric6.api 2018-05-01 10:02:01.000000000 +0000
+++ eric-18.11+ds1/eric/APIs/Python3/eric6.api 2018-11-01 10:46:30.000000000 +0000
@@ -59,6 +59,7 @@
eric6.Cooperation.Connection.PingInterval?7
eric6.Cooperation.Connection.PongTimeout?7
eric6.Cooperation.Connection.SeparatorToken?7
+eric6.Cooperation.Connection.SeparatorToken_b?7
eric6.Cooperation.Connection.TransferTimeout?7
eric6.Cooperation.CooperationClient.CooperationClient.banKickUser?4(nick)
eric6.Cooperation.CooperationClient.CooperationClient.banUser?4(nick)
@@ -205,7 +206,6 @@
eric6.DebugClients.Python.DebugBase.gRecursionLimit?7
eric6.DebugClients.Python.DebugBase.printerr?4(s)
eric6.DebugClients.Python.DebugBase.setRecursionLimit?4(limit)
-eric6.DebugClients.Python.DebugClient.DebugClient.debugClient?7
eric6.DebugClients.Python.DebugClient.DebugClient?1()
eric6.DebugClients.Python.DebugClientBase.DebugClientBase.Indicators?7
eric6.DebugClients.Python.DebugClientBase.DebugClientBase.absPath?4(fn)
@@ -424,15 +424,18 @@
eric6.Debugger.DebugServer.DebugServer.getBreakPointModel?4()
eric6.Debugger.DebugServer.DebugServer.getClientCapabilities?4(clientType)
eric6.Debugger.DebugServer.DebugServer.getClientInterpreter?4()
+eric6.Debugger.DebugServer.DebugServer.getClientType?4()
eric6.Debugger.DebugServer.DebugServer.getExtensions?4(language)
eric6.Debugger.DebugServer.DebugServer.getHostAddress?4(localhost)
eric6.Debugger.DebugServer.DebugServer.getSupportedLanguages?4(shellOnly=False)
eric6.Debugger.DebugServer.DebugServer.getWatchPointModel?4()
+eric6.Debugger.DebugServer.DebugServer.isClientProcessUp?4()
eric6.Debugger.DebugServer.DebugServer.isConnected?4()
+eric6.Debugger.DebugServer.DebugServer.isDebugging?4()
eric6.Debugger.DebugServer.DebugServer.passiveDebugStarted?7
eric6.Debugger.DebugServer.DebugServer.passiveStartUp?4(fn, exc)
eric6.Debugger.DebugServer.DebugServer.preferencesChanged?4()
-eric6.Debugger.DebugServer.DebugServer.registerDebuggerInterface?4(interfaceName, getRegistryData)
+eric6.Debugger.DebugServer.DebugServer.registerDebuggerInterface?4(interfaceName, getRegistryData, reregister=False)
eric6.Debugger.DebugServer.DebugServer.remoteBanner?4()
eric6.Debugger.DebugServer.DebugServer.remoteBreakpoint?4(fn, line, setBreakpoint, cond=None, temp=False)
eric6.Debugger.DebugServer.DebugServer.remoteCapabilities?4()
@@ -441,13 +444,13 @@
eric6.Debugger.DebugServer.DebugServer.remoteClientVariables?4(scope, filterList, framenr=0)
eric6.Debugger.DebugServer.DebugServer.remoteCompletion?4(text)
eric6.Debugger.DebugServer.DebugServer.remoteContinue?4(special=False)
-eric6.Debugger.DebugServer.DebugServer.remoteCoverage?4(interpreter, fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
+eric6.Debugger.DebugServer.DebugServer.remoteCoverage?4(venvName, fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
eric6.Debugger.DebugServer.DebugServer.remoteEnvironment?4(env)
-eric6.Debugger.DebugServer.DebugServer.remoteLoad?4(interpreter, fn, argv, wd, env, autoClearShell=True, tracePython=False, autoContinue=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="", enableCallTrace=False)
+eric6.Debugger.DebugServer.DebugServer.remoteLoad?4(venvName, fn, argv, wd, env, autoClearShell=True, tracePython=False, autoContinue=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="", enableCallTrace=False)
eric6.Debugger.DebugServer.DebugServer.remoteMoveIP?4(line)
-eric6.Debugger.DebugServer.DebugServer.remoteProfile?4(interpreter, fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
+eric6.Debugger.DebugServer.DebugServer.remoteProfile?4(venvName, fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
eric6.Debugger.DebugServer.DebugServer.remoteRawInput?4(s)
-eric6.Debugger.DebugServer.DebugServer.remoteRun?4(interpreter, fn, argv, wd, env, autoClearShell=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="")
+eric6.Debugger.DebugServer.DebugServer.remoteRun?4(venvName, fn, argv, wd, env, autoClearShell=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="")
eric6.Debugger.DebugServer.DebugServer.remoteSetThread?4(tid)
eric6.Debugger.DebugServer.DebugServer.remoteStatement?4(stmt)
eric6.Debugger.DebugServer.DebugServer.remoteStep?4()
@@ -459,6 +462,7 @@
eric6.Debugger.DebugServer.DebugServer.remoteUTRun?4()
eric6.Debugger.DebugServer.DebugServer.remoteUTStop?4()
eric6.Debugger.DebugServer.DebugServer.setCallTraceEnabled?4(on)
+eric6.Debugger.DebugServer.DebugServer.setDebugging?4(on)
eric6.Debugger.DebugServer.DebugServer.shutdownServer?4()
eric6.Debugger.DebugServer.DebugServer.signalClientBanner?4(version, platform, debugClient)
eric6.Debugger.DebugServer.DebugServer.signalClientBreakConditionError?4(filename, lineno)
@@ -481,7 +485,7 @@
eric6.Debugger.DebugServer.DebugServer.signalClientVariable?4(scope, variables)
eric6.Debugger.DebugServer.DebugServer.signalClientVariables?4(scope, variables)
eric6.Debugger.DebugServer.DebugServer.signalClientWatchConditionError?4(condition)
-eric6.Debugger.DebugServer.DebugServer.startClient?4(unplanned=True, clType=None, forProject=False, runInConsole=False, interpreter="")
+eric6.Debugger.DebugServer.DebugServer.startClient?4(unplanned=True, clType=None, forProject=False, runInConsole=False, venvName="")
eric6.Debugger.DebugServer.DebugServer.unregisterDebuggerInterface?4(interfaceName)
eric6.Debugger.DebugServer.DebugServer.utFinished?7
eric6.Debugger.DebugServer.DebugServer.utPrepared?7
@@ -514,7 +518,6 @@
eric6.Debugger.DebugUI.DebugUI.setExcIgnoreList?4(excIgnoreList)
eric6.Debugger.DebugUI.DebugUI.setExcList?4(excList)
eric6.Debugger.DebugUI.DebugUI.setExceptionReporting?4(exceptions)
-eric6.Debugger.DebugUI.DebugUI.setInterpreterHistory?4(interpreterStr, clearHistories=False, history=None)
eric6.Debugger.DebugUI.DebugUI.setTracePython?4(tracePython)
eric6.Debugger.DebugUI.DebugUI.setWdHistory?4(wdStr, clearHistories=False, history=None)
eric6.Debugger.DebugUI.DebugUI.shutdown?4()
@@ -525,13 +528,10 @@
eric6.Debugger.DebugViewer.DebugViewer.currentWidget?4()
eric6.Debugger.DebugViewer.DebugViewer.handleClientStack?4(stack)
eric6.Debugger.DebugViewer.DebugViewer.handleDebuggingStarted?4()
-eric6.Debugger.DebugViewer.DebugViewer.handleRawInput?4()
eric6.Debugger.DebugViewer.DebugViewer.handleResetUI?4()
eric6.Debugger.DebugViewer.DebugViewer.initCallStackViewer?4(projectMode)
eric6.Debugger.DebugViewer.DebugViewer.isCallTraceEnabled?4()
eric6.Debugger.DebugViewer.DebugViewer.preferencesChanged?4()
-eric6.Debugger.DebugViewer.DebugViewer.restoreCurrentPage?4()
-eric6.Debugger.DebugViewer.DebugViewer.saveCurrentPage?4()
eric6.Debugger.DebugViewer.DebugViewer.setCallTraceToProjectMode?4(enabled)
eric6.Debugger.DebugViewer.DebugViewer.setCurrentWidget?4(widget)
eric6.Debugger.DebugViewer.DebugViewer.setDebugger?4(debugUI)
@@ -543,13 +543,14 @@
eric6.Debugger.DebugViewer.DebugViewer.showVariables?4(vlist, showGlobals)
eric6.Debugger.DebugViewer.DebugViewer.showVariablesTab?4(showGlobals)
eric6.Debugger.DebugViewer.DebugViewer.sourceFile?7
-eric6.Debugger.DebugViewer.DebugViewer?1(debugServer, docked, vm, parent=None, embeddedShell=True, embeddedBrowser=True)
+eric6.Debugger.DebugViewer.DebugViewer?1(debugServer, docked, vm, parent=None)
eric6.Debugger.DebuggerInterfaceNone.ClientDefaultCapabilities?7
eric6.Debugger.DebuggerInterfaceNone.ClientTypeAssociations?7
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.flush?4()
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.getClientCapabilities?4()
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.isConnected?4()
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.newConnection?4(sock)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBanner?4()
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpoint?4(fn, line, setBreakpoint, cond=None, temp=False)
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpointEnable?4(fn, line, enable)
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpointIgnore?4(fn, line, count)
@@ -582,8 +583,8 @@
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpointIgnore?4(cond, count)
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.setCallTraceEnabled?4(on)
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.shutdown?4()
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.startRemote?4(port, runInConsole, interpreter)
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.startRemoteForProject?4(port, runInConsole, interpreter)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.startRemote?4(port, runInConsole, venvName)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.startRemoteForProject?4(port, runInConsole, venvName)
eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone?1(debugServer, passive)
eric6.Debugger.DebuggerInterfaceNone.createDebuggerInterfaceNone?4(debugServer, passive)
eric6.Debugger.DebuggerInterfaceNone.getRegistryData?4()
@@ -624,8 +625,8 @@
eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteWatchpointIgnore?4(cond, count)
eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.setCallTraceEnabled?4(on)
eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.shutdown?4()
-eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.startRemote?4(port, runInConsole, interpreter)
-eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.startRemoteForProject?4(port, runInConsole, interpreter)
+eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.startRemote?4(port, runInConsole, venvName)
+eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.startRemoteForProject?4(port, runInConsole, venvName)
eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython?1(debugServer, passive, pythonVariant)
eric6.Debugger.DebuggerInterfacePython.createDebuggerInterfacePython2?4(debugServer, passive)
eric6.Debugger.DebuggerInterfacePython.createDebuggerInterfacePython3?4(debugServer, passive)
@@ -657,7 +658,7 @@
eric6.Debugger.StartDialog.StartDialog.historiesModified?4()
eric6.Debugger.StartDialog.StartDialog.on_buttonBox_clicked?4(button)
eric6.Debugger.StartDialog.StartDialog.on_modFuncCombo_editTextChanged?4()
-eric6.Debugger.StartDialog.StartDialog?1(caption, interpreterList, argvList, wdList, envList, exceptions, parent=None, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False)
+eric6.Debugger.StartDialog.StartDialog?1(caption, lastUsedVenvName, argvList, wdList, envList, exceptions, parent=None, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False)
eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.getHistory?4()
eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.on_deleteAllButton_clicked?4()
eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.on_deleteButton_clicked?4()
@@ -883,7 +884,12 @@
eric6.E5Gui.E5ErrorMessage.E5ErrorMessage.editMessageFilters?4()
eric6.E5Gui.E5ErrorMessage.E5ErrorMessage.showMessage?4(message, msgType="")
eric6.E5Gui.E5ErrorMessage.E5ErrorMessage?1(parent=None)
+eric6.E5Gui.E5ErrorMessage._defaultFilters?8
+eric6.E5Gui.E5ErrorMessage._filterSettings?8
+eric6.E5Gui.E5ErrorMessage._msgHandlerDialog?8
+eric6.E5Gui.E5ErrorMessage._origMsgHandler?8
eric6.E5Gui.E5ErrorMessage.editMessageFilters?4()
+eric6.E5Gui.E5ErrorMessage.filterMessage?4(message)
eric6.E5Gui.E5ErrorMessage.messageHandler?4(msgType, *args)
eric6.E5Gui.E5ErrorMessage.messageHandlerInstalled?4()
eric6.E5Gui.E5ErrorMessage.qtHandler?4()
@@ -964,8 +970,9 @@
eric6.E5Gui.E5LineEditButton.E5LineEditButton.setMenu?4(menu)
eric6.E5Gui.E5LineEditButton.E5LineEditButton?1(parent=None)
eric6.E5Gui.E5ListSelectionDialog.E5ListSelectionDialog.getSelection?4()
+eric6.E5Gui.E5ListSelectionDialog.E5ListSelectionDialog.on_selectionList_itemChanged?4(itm)
eric6.E5Gui.E5ListSelectionDialog.E5ListSelectionDialog.on_selectionList_itemSelectionChanged?4()
-eric6.E5Gui.E5ListSelectionDialog.E5ListSelectionDialog?1(entries, selectionMode=QAbstractItemView.ExtendedSelection, title="", message="", parent=None)
+eric6.E5Gui.E5ListSelectionDialog.E5ListSelectionDialog?1(entries, selectionMode=QAbstractItemView.ExtendedSelection, title="", message="", checkBoxSelection=False, parent=None)
eric6.E5Gui.E5ListView.E5ListView.keyPressEvent?4(evt)
eric6.E5Gui.E5ListView.E5ListView.removeAll?4()
eric6.E5Gui.E5ListView.E5ListView.removeSelected?4()
@@ -976,6 +983,7 @@
eric6.E5Gui.E5MapWidget.E5MapWidget.calculateGeometry?4()
eric6.E5Gui.E5MapWidget.E5MapWidget.generateIndicatorRect?4(position)
eric6.E5Gui.E5MapWidget.E5MapWidget.isEnabled?4()
+eric6.E5Gui.E5MapWidget.E5MapWidget.isOnRightSide?4()
eric6.E5Gui.E5MapWidget.E5MapWidget.lineDimensions?4()
eric6.E5Gui.E5MapWidget.E5MapWidget.mouseMoveEvent?4(event)
eric6.E5Gui.E5MapWidget.E5MapWidget.mousePressEvent?4(event)
@@ -985,6 +993,7 @@
eric6.E5Gui.E5MapWidget.E5MapWidget.setBackgroundColor?4(color)
eric6.E5Gui.E5MapWidget.E5MapWidget.setEnabled?4(enable)
eric6.E5Gui.E5MapWidget.E5MapWidget.setLineDimensions?4(border, height)
+eric6.E5Gui.E5MapWidget.E5MapWidget.setMapPosition?4(onRight)
eric6.E5Gui.E5MapWidget.E5MapWidget.setMaster?4(master)
eric6.E5Gui.E5MapWidget.E5MapWidget.setWidth?4(width)
eric6.E5Gui.E5MapWidget.E5MapWidget.sizeHint?4()
@@ -1097,9 +1106,7 @@
eric6.E5Gui.E5PassivePopup.E5PassivePopup.view?4()
eric6.E5Gui.E5PassivePopup.E5PassivePopup?1(parent=None)
eric6.E5Gui.E5PassivePopup.POPUP_FLAGS?7
-eric6.E5Gui.E5PasswordMeter.E5PasswordMeter.app?7
eric6.E5Gui.E5PasswordMeter.E5PasswordMeter.checkPasswordStrength?4(password)
-eric6.E5Gui.E5PasswordMeter.E5PasswordMeter.meter?7
eric6.E5Gui.E5PasswordMeter.E5PasswordMeter.setMaximum?4(value)
eric6.E5Gui.E5PasswordMeter.E5PasswordMeter.setMinimum?4(value)
eric6.E5Gui.E5PasswordMeter.E5PasswordMeter.setValue?4(value)
@@ -1161,6 +1168,15 @@
eric6.E5Gui.E5PathPicker.E5PathPickerModes.SaveFileEnsureExtensionMode?7
eric6.E5Gui.E5PathPicker.E5PathPickerModes.SaveFileMode?7
eric6.E5Gui.E5PathPicker.E5PathPickerModes.SaveFileOverwriteMode?7
+eric6.E5Gui.E5PathPickerDialog.E5PathPickerDialog.getPath?4()
+eric6.E5Gui.E5PathPickerDialog.E5PathPickerDialog.setDefaultDirectory?4(directory)
+eric6.E5Gui.E5PathPickerDialog.E5PathPickerDialog.setLabelText?4(text)
+eric6.E5Gui.E5PathPickerDialog.E5PathPickerDialog.setPickerFilters?4(filters)
+eric6.E5Gui.E5PathPickerDialog.E5PathPickerDialog.setPickerMode?4(mode)
+eric6.E5Gui.E5PathPickerDialog.E5PathPickerDialog.setPickerPath?4(path)
+eric6.E5Gui.E5PathPickerDialog.E5PathPickerDialog.setTitle?4(title)
+eric6.E5Gui.E5PathPickerDialog.E5PathPickerDialog?1(parent=None)
+eric6.E5Gui.E5PathPickerDialog.getPath?4(parent, title, label, mode=E5PathPickerModes.OpenFileMode, path="", defaultDirectory="", filters=None)
eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.format?4()
eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.setFormat?4(labelFormat)
eric6.E5Gui.E5ProgressDialog.E5ProgressDialog?1(labelText, cancelButtonText, minimum, maximum, labelFormat=None, parent=None, flags=None)
@@ -1261,7 +1277,16 @@
eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findNextButton_clicked?4()
eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findPrevButton_clicked?4()
eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findtextCombo_editTextChanged?4(txt)
+eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.setWidthForHeight?4(widthForHeight)
eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget?1(parent=None, widthForHeight=True)
+eric6.E5Gui.E5TextInputDialog.E5TextInputDialog.labelText?4()
+eric6.E5Gui.E5TextInputDialog.E5TextInputDialog.setLabelText?4(text)
+eric6.E5Gui.E5TextInputDialog.E5TextInputDialog.setTextEchoMode?4(echoMode)
+eric6.E5Gui.E5TextInputDialog.E5TextInputDialog.setTextValue?4(text)
+eric6.E5Gui.E5TextInputDialog.E5TextInputDialog.textEchoMode?4()
+eric6.E5Gui.E5TextInputDialog.E5TextInputDialog.textValue?4()
+eric6.E5Gui.E5TextInputDialog.E5TextInputDialog?1(parent=None)
+eric6.E5Gui.E5TextInputDialog.getText?4(parent, title, label, mode=QLineEdit.Normal, text="", minimumWidth=300)
eric6.E5Gui.E5TextSpinBox.E5TextSpinBox.addItem?4(txt, data=None)
eric6.E5Gui.E5TextSpinBox.E5TextSpinBox.currentIndex?4()
eric6.E5Gui.E5TextSpinBox.E5TextSpinBox.itemData?4(index)
@@ -1411,6 +1436,7 @@
eric6.E5Network.E5GoogleMail._prepareMessage_v2?5(message)
eric6.E5Network.E5GoogleMail._prepareMessage_v3?5(message)
eric6.E5Network.E5GoogleMail.getCredentials?4()
+eric6.E5Network.E5GoogleMail.isCredentialsFileAvailable?4()
eric6.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog.setData?4(name, value)
eric6.E5Network.E5NetworkHeaderDetailsDialog.E5NetworkHeaderDetailsDialog?1(parent=None)
eric6.E5Network.E5NetworkIcon.E5NetworkIcon.isOnline?4()
@@ -1564,6 +1590,7 @@
eric6.E5XML.Config.pluginRepositoryFileFormatVersion?7
eric6.E5XML.Config.projectFileFormatVersion?7
eric6.E5XML.Config.projectFileFormatVersionAlt?7
+eric6.E5XML.Config.projectFileFormatVersionMake?7
eric6.E5XML.Config.projectFileFormatVersionProto?7
eric6.E5XML.Config.sessionFileFormatVersion?7
eric6.E5XML.Config.shortcutsFileFormatVersion?7
@@ -1614,7 +1641,7 @@
eric6.E5XML.TasksWriter.TasksWriter?1(device, forProject=False, projectName="")
eric6.E5XML.TemplatesReader.TemplatesReader.readXML?4()
eric6.E5XML.TemplatesReader.TemplatesReader.supportedVersions?7
-eric6.E5XML.TemplatesReader.TemplatesReader?1(device, viewer=None)
+eric6.E5XML.TemplatesReader.TemplatesReader?1(device, viewer)
eric6.E5XML.TemplatesWriter.TemplatesWriter.writeXML?4()
eric6.E5XML.TemplatesWriter.TemplatesWriter?1(device, templatesViewer)
eric6.E5XML.UserProjectReader.UserProjectReader.readXML?4()
@@ -1670,7 +1697,7 @@
eric6.Globals.compatibility_fixes.load_sourceAsStr?4(*args)
eric6.Globals.compatibility_fixes.open?4(filein, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True)
eric6.Globals.configDir?7
-eric6.Globals.findPythonInterpreters?4(pyVersion)
+eric6.Globals.desktopName?4()
eric6.Globals.getConfigDir?4()
eric6.Globals.getPyQt5ModulesDirectory?4()
eric6.Globals.getPyQtToolsPath?4(version=5)
@@ -2667,6 +2694,7 @@
eric6.Helpviewer.HelpWindow.HelpWindow.shutdown?4()
eric6.Helpviewer.HelpWindow.HelpWindow.speedDial?4()
eric6.Helpviewer.HelpWindow.HelpWindow.syncManager?4()
+eric6.Helpviewer.HelpWindow.HelpWindow.urlHandler?4(url)
eric6.Helpviewer.HelpWindow.HelpWindow.userAgentsManager?4()
eric6.Helpviewer.HelpWindow.HelpWindow.zoomManager?4()
eric6.Helpviewer.HelpWindow.HelpWindow.zoomTextOnlyChanged?7
@@ -3631,11 +3659,15 @@
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.UrlRe?7
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.addMessage?4(sender, msg)
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.addUsers?4(users)
+eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.awayCommand?7
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.channelClosed?7
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.getUsersCount?4()
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.handleMessage?4(line)
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.hideEvent?4(evt)
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.initAutoWho?4()
+eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveAllChannels?7
+eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveChannel?4()
+eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.leaveChannels?7
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.name?4()
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_editTopicButton_clicked?4()
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.on_messageEdit_returnPressed?4()
@@ -3647,6 +3679,7 @@
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.partMessage?4()
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.requestLeave?4()
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendCtcpReply?7
+eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendCtcpRequest?7
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.sendData?7
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.setMarkerLine?4()
eric6.Network.IRC.IrcChannelWidget.IrcChannelWidget.setName?4(name)
@@ -3670,8 +3703,10 @@
eric6.Network.IRC.IrcChannelWidget.IrcUserItem.canChangeTopic?4()
eric6.Network.IRC.IrcChannelWidget.IrcUserItem.changePrivilege?4(privilege)
eric6.Network.IRC.IrcChannelWidget.IrcUserItem.clearPrivileges?4()
+eric6.Network.IRC.IrcChannelWidget.IrcUserItem.isIgnored?4()
eric6.Network.IRC.IrcChannelWidget.IrcUserItem.name?4()
eric6.Network.IRC.IrcChannelWidget.IrcUserItem.parseWhoFlags?4(flags)
+eric6.Network.IRC.IrcChannelWidget.IrcUserItem.setIgnored?4(ignored)
eric6.Network.IRC.IrcChannelWidget.IrcUserItem.setName?4(name)
eric6.Network.IRC.IrcChannelWidget.IrcUserItem?1(name, parent=None)
eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.accept?4()
@@ -3687,6 +3722,7 @@
eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.on_nicknameUpButton_clicked?4()
eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.on_nicknamesList_itemSelectionChanged?4()
eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.on_renameButton_clicked?4()
+eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog.on_showPasswordButton_clicked?4(checked)
eric6.Network.IRC.IrcIdentitiesEditDialog.IrcIdentitiesEditDialog?1(manager, identityName, parent=None)
eric6.Network.IRC.IrcMessageEdit.IrcMessageEdit.MaxHistory?7
eric6.Network.IRC.IrcMessageEdit.IrcMessageEdit.keyPressEvent?4(evt)
@@ -3814,6 +3850,7 @@
eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.editNetwork?7
eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.getNetworkChannels?4()
eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.getNickname?4()
+eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.handleAwayCommand?4(awayMessage)
eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.initialize?4(manager)
eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.isConnected?4()
eric6.Network.IRC.IrcNetworkWidget.IrcNetworkWidget.joinChannel?7
@@ -3845,6 +3882,7 @@
eric6.Network.IRC.IrcWidget.IrcWidget.autoConnect?4()
eric6.Network.IRC.IrcWidget.IrcWidget.autoConnected?7
eric6.Network.IRC.IrcWidget.IrcWidget.isChannelName?4(name)
+eric6.Network.IRC.IrcWidget.IrcWidget.joinChannel?4(name, key="")
eric6.Network.IRC.IrcWidget.IrcWidget.on_channelsWidget_tabCloseRequested?4(index)
eric6.Network.IRC.IrcWidget.IrcWidget.shutdown?4()
eric6.Network.IRC.IrcWidget.IrcWidget?1(parent=None)
@@ -4406,15 +4444,13 @@
eric6.Plugins.PluginEricdoc.version?7
eric6.Plugins.PluginPipInterface.PipInterfacePlugin.PreferencesKey?7
eric6.Plugins.PluginPipInterface.PipInterfacePlugin.activate?4()
-eric6.Plugins.PluginPipInterface.PipInterfacePlugin.currentPipChanged?7
+eric6.Plugins.PluginPipInterface.PipInterfacePlugin.currentEnvironmentChanged?7
eric6.Plugins.PluginPipInterface.PipInterfacePlugin.deactivate?4()
-eric6.Plugins.PluginPipInterface.PipInterfacePlugin.getDefaultPipExecutables?4()
eric6.Plugins.PluginPipInterface.PipInterfacePlugin.getMenu?4(name)
eric6.Plugins.PluginPipInterface.PipInterfacePlugin.getMenuNames?4()
eric6.Plugins.PluginPipInterface.PipInterfacePlugin.getPreferences?4(key)
eric6.Plugins.PluginPipInterface.PipInterfacePlugin.setPreferences?4(key, value)
eric6.Plugins.PluginPipInterface.PipInterfacePlugin?1(ui)
-eric6.Plugins.PluginPipInterface._findDefaultExecutables?5(majorVersion)
eric6.Plugins.PluginPipInterface.author?7
eric6.Plugins.PluginPipInterface.autoactivate?7
eric6.Plugins.PluginPipInterface.className?7
@@ -4423,7 +4459,6 @@
eric6.Plugins.PluginPipInterface.error?7
eric6.Plugins.PluginPipInterface.exeDisplayDataList?4()
eric6.Plugins.PluginPipInterface.getConfigData?4()
-eric6.Plugins.PluginPipInterface.getExePath?4(branch, access, versionStr)
eric6.Plugins.PluginPipInterface.longDescription?7
eric6.Plugins.PluginPipInterface.name?7
eric6.Plugins.PluginPipInterface.needsRestart?7
@@ -4629,22 +4664,6 @@
eric6.Plugins.PluginVcsSubversion.shortDescription?7
eric6.Plugins.PluginVcsSubversion.subversionCfgPluginObject?7
eric6.Plugins.PluginVcsSubversion.version?7
-eric6.Plugins.PluginVirtualenvInterface.VirtualenvInterfacePlugin.activate?4()
-eric6.Plugins.PluginVirtualenvInterface.VirtualenvInterfacePlugin.deactivate?4()
-eric6.Plugins.PluginVirtualenvInterface.VirtualenvInterfacePlugin?1(ui)
-eric6.Plugins.PluginVirtualenvInterface.author?7
-eric6.Plugins.PluginVirtualenvInterface.autoactivate?7
-eric6.Plugins.PluginVirtualenvInterface.className?7
-eric6.Plugins.PluginVirtualenvInterface.deactivateable?7
-eric6.Plugins.PluginVirtualenvInterface.error?7
-eric6.Plugins.PluginVirtualenvInterface.longDescription?7
-eric6.Plugins.PluginVirtualenvInterface.name?7
-eric6.Plugins.PluginVirtualenvInterface.needsRestart?7
-eric6.Plugins.PluginVirtualenvInterface.packageName?7
-eric6.Plugins.PluginVirtualenvInterface.pyqtApi?7
-eric6.Plugins.PluginVirtualenvInterface.python2Compatible?7
-eric6.Plugins.PluginVirtualenvInterface.shortDescription?7
-eric6.Plugins.PluginVirtualenvInterface.version?7
eric6.Plugins.PluginVmListspace.VmListspacePlugin.activate?4()
eric6.Plugins.PluginVmListspace.VmListspacePlugin.deactivate?4()
eric6.Plugins.PluginVmListspace.VmListspacePlugin?1(ui)
@@ -4866,43 +4885,46 @@
eric6.Plugins.PluginWizardSetup.python2Compatible?7
eric6.Plugins.PluginWizardSetup.shortDescription?7
eric6.Plugins.PluginWizardSetup.version?7
-eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage.on_addButton_clicked?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage.on_defaultListButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage.save?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage?1(plugin)
eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultIndexUrlPip?7
eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultIndexUrlXml?7
eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultPyPiUrl?7
+eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getDefaultEnvironmentString?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getMenu?4(name)
eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getMenuNames?4()
+eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getVirtualenvInterpreter?4(venvName)
+eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getVirtualenvNames?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.initActions?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.initMenu?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.installPackages?4(packages, cmd="")
-eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.runProcess?4(args, cmd="")
-eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.uninstallPackages?4(packages, cmd="")
-eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.upgradePackages?4(packages, cmd="")
-eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.upgradePip?4(pip="")
+eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.installPackages?4(packages, venvName="", userSite=False)
+eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.runProcess?4(args, interpreter)
+eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.uninstallPackages?4(packages, venvName="")
+eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.upgradePackages?4(packages, venvName="", userSite=False)
+eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.upgradePip?4(venvName="", userSite=False)
eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip?1(plugin, parent=None)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.PipDialog.closeEvent?4(e)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.PipDialog.on_buttonBox_clicked?4(button)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.PipDialog.startProcess?4(cmd, args, showArgs=True)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.PipDialog.startProcesses?4(processParams)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.PipDialog?1(text, parent=None)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.PipFileSelectionDialog.getData?4()
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.PipFileSelectionDialog.on_filePicker_textChanged?4(txt)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.PipFileSelectionDialog?1(pip, mode, install=True, parent=None)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.closeEvent?4(e)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_buttonBox_clicked?4(button)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_copyButton_clicked?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_fileButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_insertButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_localCheckBox_clicked?4(checked)
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_pipComboBox_activated?4(txt)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_replaceAllButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_replaceSelectionButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_requirementsEdit_textChanged?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_requirementsFileEdit_textChanged?4(txt)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_requirementsFilePicker_textChanged?4(txt)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_saveButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_saveToButton_clicked?4()
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.on_venvComboBox_activated?4(txt)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog.start?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog?1(pip, plugin, parent=None)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.PipFreezeDialog?1(pip, parent=None)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.CommandArguments?7
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.ShowProcessClassifiersMode?7
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.ShowProcessEntryPointsMode?7
@@ -4914,18 +4936,15 @@
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.on_localCheckBox_clicked?4(checked)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.on_notRequiredCheckBox_clicked?4(checked)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.on_packageList_itemSelectionChanged?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.on_pipComboBox_activated?4(txt)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.on_userCheckBox_clicked?4(checked)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.on_venvComboBox_activated?4(txt)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.on_verboseCheckBox_clicked?4(checked)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog.start?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog?1(pip, mode, plugin, title, parent=None)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.PipListDialog?1(pip, mode, indexUrl, title, parent=None)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackageDetailsDialog.PipPackageDetailsDialog?1(detailsData, downloadsData, parent=None)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.PipPackagesInputDialog.getData?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.PipPackagesInputDialog.on_packagesEdit_textChanged?4(txt)
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.PipPackagesInputDialog?1(plugin, title, parent=None)
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.PipRequirementsSelectionDialog.getData?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.PipRequirementsSelectionDialog.on_fileButton_clicked?4()
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.PipRequirementsSelectionDialog.on_requirementsEdit_textChanged?4(txt)
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.PipRequirementsSelectionDialog?1(plugin, parent=None)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.PipPackagesInputDialog?1(pip, title, install=True, parent=None)
eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.Stopwords?7
eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.VersionRole?7
eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.closeEvent?4(e)
@@ -4934,7 +4953,9 @@
eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.on_resultList_itemSelectionChanged?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.on_searchButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog.on_searchEdit_textChanged?4(txt)
-eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog?1(pip, plugin, parent=None)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.PipSearchDialog?1(pip, indexUrl, parent=None)
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipSelectionDialog.PipSelectionDialog.getData?4()
+eric6.Plugins.UiExtensionPlugins.PipInterface.PipSelectionDialog.PipSelectionDialog?1(pip, parent=None)
eric6.Plugins.UiExtensionPlugins.Translator.ConfigurationPage.TranslatorPage.TranslatorPage.on_defaultButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.Translator.ConfigurationPage.TranslatorPage.TranslatorPage.on_languagesList_itemChanged?4(item)
eric6.Plugins.UiExtensionPlugins.Translator.ConfigurationPage.TranslatorPage.TranslatorPage.on_setButton_clicked?4()
@@ -4970,6 +4991,12 @@
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.GoogleV2Engine.GoogleV2Engine.getTranslation?4(requestObject, text, originalLanguage, translationLanguage)
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.GoogleV2Engine.GoogleV2Engine.supportedLanguages?4()
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.GoogleV2Engine.GoogleV2Engine?1(plugin, parent=None)
+eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.IbmWatsonEngine.IbmWatsonEngine.engineName?4()
+eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.IbmWatsonEngine.IbmWatsonEngine.getTranslation?4(requestObject, text, originalLanguage, translationLanguage)
+eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.IbmWatsonEngine.IbmWatsonEngine.hasTTS?4()
+eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.IbmWatsonEngine.IbmWatsonEngine.supportedLanguages?4()
+eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.IbmWatsonEngine.IbmWatsonEngine.supportedTargetLanguages?4(original)
+eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.IbmWatsonEngine.IbmWatsonEngine?1(plugin, parent=None)
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.MicrosoftEngine.MicrosoftEngine.AccessTokenUrl?7
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.MicrosoftEngine.MicrosoftEngine.TextToSpeechUrl?7
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.MicrosoftEngine.MicrosoftEngine.TranslatorUrl?7
@@ -4990,11 +5017,13 @@
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.PromtEngine.PromtEngine.getTranslation?4(requestObject, text, originalLanguage, translationLanguage)
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.PromtEngine.PromtEngine.supportedLanguages?4()
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.PromtEngine.PromtEngine?1(plugin, parent=None)
+eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.TranslationEngine.TranslationEngine.availableTranslationsLoaded?7
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.TranslationEngine.TranslationEngine.engineName?4()
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.TranslationEngine.TranslationEngine.getTextToSpeechData?4(requestObject, text, language)
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.TranslationEngine.TranslationEngine.getTranslation?4(requestObject, text, originalLanguage, translationLanguage)
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.TranslationEngine.TranslationEngine.hasTTS?4()
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.TranslationEngine.TranslationEngine.supportedLanguages?4()
+eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.TranslationEngine.TranslationEngine.supportedTargetLanguages?4(original)
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.TranslationEngine.TranslationEngine?1(plugin, parent=None)
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.YandexEngine.YandexEngine.TranslatorLimit?7
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.YandexEngine.YandexEngine.TranslatorUrl?7
@@ -5025,18 +5054,6 @@
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorWidget.TranslatorWidget.on_transLanguageComboBox_currentIndexChanged?4(index)
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorWidget.TranslatorWidget.on_translateButton_clicked?4()
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorWidget.TranslatorWidget?1(plugin, translator, parent=None)
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.getData?4()
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_extraSearchPathButton_clicked?4()
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pythonExecButton_clicked?4()
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pythonExecEdit_textChanged?4(txt)
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pyvenvButton_toggled?4(checked)
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_targetDirectoryButton_clicked?4()
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_targetDirectoryEdit_textChanged?4(txt)
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_virtualenvButton_toggled?4(checked)
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog?1(parent=None)
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvExecDialog.VirtualenvExecDialog.on_buttonBox_clicked?4(button)
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvExecDialog.VirtualenvExecDialog.start?4(arguments)
-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvExecDialog.VirtualenvExecDialog?1(pyvenv, targetDir, openTarget, createLog, createScript, interpreter, parent=None)
eric6.Plugins.VcsPlugins.vcsGit.Config.ConfigGitSchemes?7
eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.GitPage.on_configButton_clicked?4()
eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.GitPage.save?4()
@@ -5044,6 +5061,7 @@
eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog.getData?4()
eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog.on_nameEdit_textChanged?4(txt)
eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog.on_urlEdit_textChanged?4(txt)
+eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog.on_userEdit_textChanged?4(txt)
eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.GitAddRemoteDialog?1(parent=None)
eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.GitApplyBundleDataDialog.getData?4()
eric6.Plugins.VcsPlugins.vcsGit.GitApplyBundleDataDialog.GitApplyBundleDataDialog?1(bundleHeads, branches, parent=None)
@@ -5106,6 +5124,9 @@
eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.on_tagButton_toggled?4(checked)
eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog.on_tagCombo_editTextChanged?4(txt)
eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.GitBundleDialog?1(tagsList, branchesList, parent=None)
+eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.GitChangeRemoteUrlDialog.getData?4()
+eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.GitChangeRemoteUrlDialog.on_newUrlEdit_textChanged?4(txt)
+eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.GitChangeRemoteUrlDialog?1(remoteName, remoteUrl, parent=None)
eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.GitCherryPickDialog.getData?4()
eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.GitCherryPickDialog.on_commitsEdit_textChanged?4()
eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.GitCherryPickDialog?1(commits=None, parent=None)
@@ -5283,10 +5304,15 @@
eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.show?4()
eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog.start?4(projectdir)
eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.GitReflogBrowserDialog?1(vcs, parent=None)
+eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.GitRemoteCredentialsDialog.getData?4()
+eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.GitRemoteCredentialsDialog.on_userEdit_textChanged?4(txt)
+eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.GitRemoteCredentialsDialog?1(remoteName, remoteUrl, parent=None)
eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.closeEvent?4(e)
eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.keyPressEvent?4(evt)
eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_addButton_clicked?4()
eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_buttonBox_clicked?4(button)
+eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_changeUrlButton_clicked?4()
+eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_credentialsButton_clicked?4()
eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_input_returnPressed?4()
eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_passwordCheckBox_toggled?4(isOn)
eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.GitRemoteRepositoriesDialog.on_pruneButton_clicked?4()
@@ -5360,6 +5386,7 @@
eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog.start?4(fn)
eric6.Plugins.VcsPlugins.vcsGit.GitStatusDialog.GitStatusDialog?1(vcs, parent=None)
eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread.ConflictStates?7
+eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread._getInfo?5()
eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread._performMonitor?5()
eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread._shutdown?5()
eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.GitStatusMonitorThread?1(interval, project, vcs, parent=None)
@@ -5447,6 +5474,8 @@
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBundleListHeads?4(projectDir)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitBundlePull?4(projectDir)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCancelMerge?4(name)
+eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitChangeRemoteCredentials?4(projectDir, remoteName, remoteUrl="")
+eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitChangeRemoteUrl?4(projectDir, remoteName, remoteUrl="")
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPick?4(projectDir, commits=None)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPickAbort?4(projectDir)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitCherryPickContinue?4(projectDir)
@@ -5466,6 +5495,7 @@
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetBundleHeads?4(repodir, bundleFile)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetCurrentBranch?4(repodir)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemoteBranchesList?4(repodir, remote)
+eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemoteUrl?4(repodir, remoteName)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemoteUrlsList?4(repodir, forFetch=True)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetRemotesList?4(repodir)
eric6.Plugins.VcsPlugins.vcsGit.git.Git.gitGetTagsList?4(repodir, withType=False)
@@ -5745,7 +5775,7 @@
eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_changesetsEdit_textChanged?4()
eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_directoryPicker_textChanged?4(txt)
eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog.on_patternEdit_textChanged?4(txt)
-eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog?1(parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgExportDialog.HgExportDialog?1(bookmarksList, bookmarkAvailable, parent=None)
eric6.Plugins.VcsPlugins.vcsMercurial.HgExtension.HgExtension.shutdown?4()
eric6.Plugins.VcsPlugins.vcsMercurial.HgExtension.HgExtension?1(vcs)
eric6.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper._updateVCSStatus?5(name)
@@ -5886,6 +5916,7 @@
eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.show?4()
eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog.start?4(fn)
eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.HgStatusDialog?1(vcs, mq=False, parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._getInfo?5()
eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._performMonitor?5()
eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread._shutdown?5()
eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.HgStatusMonitorThread?1(interval, project, vcs, parent=None)
@@ -6142,7 +6173,7 @@
eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag1Combo_editTextChanged?4(txt)
eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag2Button_toggled?4(checked)
eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog.on_tag2Combo_editTextChanged?4(txt)
-eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog?1(tagsList, branchesList, bookmarksList=None, parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.HgRebaseDialog?1(tagsList, branchesList, bookmarksList, version, parent=None)
eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.initActions?4()
eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.initMenu?4(mainMenu)
eric6.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.RebaseProjectHelper.menuTitle?4()
@@ -6249,7 +6280,9 @@
eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetCurrentBranch?4(repodir)
eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetTagsList?4(repodir, withType=False)
eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraft?4(path, revs=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftAbort?4(path)
eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftContinue?4(path)
+eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGraftStop?4(path)
eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIdentify?4(name)
eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgImport?4(name)
eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name)
@@ -6945,6 +6978,7 @@
eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.configTemplate1?7
eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.configTemplate2?7
eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.configTemplate3?7
+eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.exeDisplayDataInfoTemplate?7
eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.exeDisplayDataListTemplate?7
eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.exeDisplayDataTemplate?7
eric6.Plugins.WizardPlugins.EricPluginWizard.Templates.mainTemplate?7
@@ -7197,12 +7231,16 @@
eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.DebuggerGeneralPage.save?4()
eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.DebuggerGeneralPage?1()
eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page.on_refreshButton_clicked?4()
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page.on_venvDlgButton_clicked?4()
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page.save?4()
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page?1()
+eric6.Preferences.ConfigurationPages.DebuggerPython2Page.create?4(dlg)
+eric6.Preferences.ConfigurationPages.DebuggerPython3Page.DebuggerPython3Page.on_refreshButton_clicked?4()
+eric6.Preferences.ConfigurationPages.DebuggerPython3Page.DebuggerPython3Page.on_venvDlgButton_clicked?4()
eric6.Preferences.ConfigurationPages.DebuggerPython3Page.DebuggerPython3Page.save?4()
eric6.Preferences.ConfigurationPages.DebuggerPython3Page.DebuggerPython3Page?1()
eric6.Preferences.ConfigurationPages.DebuggerPython3Page.create?4(dlg)
-eric6.Preferences.ConfigurationPages.DebuggerPythonPage.DebuggerPythonPage.save?4()
-eric6.Preferences.ConfigurationPages.DebuggerPythonPage.DebuggerPythonPage?1()
-eric6.Preferences.ConfigurationPages.DebuggerPythonPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.DiffColoursPage.DiffColoursPage.save?4()
eric6.Preferences.ConfigurationPages.DiffColoursPage.DiffColoursPage?1()
eric6.Preferences.ConfigurationPages.DiffColoursPage.create?4(dlg)
@@ -7233,7 +7271,7 @@
eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.EditorCalltipsQScintillaPage?1()
eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage.save?4()
-eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage?1()
eric6.Preferences.ConfigurationPages.EditorDocViewerPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.on_exportersCombo_activated?4(exporter)
eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.on_rtfFontButton_clicked?4()
@@ -7316,12 +7354,13 @@
eric6.Preferences.ConfigurationPages.EditorStylesPage.EditorStylesPage?1()
eric6.Preferences.ConfigurationPages.EditorStylesPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.EditorSyntaxPage.EditorSyntaxPage.save?4()
-eric6.Preferences.ConfigurationPages.EditorSyntaxPage.EditorSyntaxPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.EditorSyntaxPage.EditorSyntaxPage?1()
eric6.Preferences.ConfigurationPages.EditorSyntaxPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage.on_languageCombo_activated?4(language)
eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage.save?4()
eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage?1()
eric6.Preferences.ConfigurationPages.EditorTypingPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_googleHelpButton_clicked?4()
eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailAuthenticationGroup_toggled?4(checked)
eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailPasswordEdit_textChanged?4(txt)
eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailServerEdit_textChanged?4(txt)
@@ -7359,7 +7398,7 @@
eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage.on_testButton_clicked?4()
eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage.on_vtServiceKeyEdit_textChanged?4(txt)
eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage.save?4()
-eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.HelpVirusTotalPage?1()
eric6.Preferences.ConfigurationPages.HelpVirusTotalPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.HelpWebBrowserPage.HelpWebBrowserPage.on_defaultHomeButton_clicked?4()
eric6.Preferences.ConfigurationPages.HelpWebBrowserPage.HelpWebBrowserPage.on_noCacheHostsButton_clicked?4()
@@ -7405,7 +7444,7 @@
eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.MasterPasswordEntryDialog?1(oldPasswordHash, parent=None)
eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage.on_resetButton_clicked?4()
eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage.save?4()
-eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.MimeTypesPage.MimeTypesPage?1()
eric6.Preferences.ConfigurationPages.MimeTypesPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage.save?4()
eric6.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage?1()
@@ -7441,6 +7480,7 @@
eric6.Preferences.ConfigurationPages.ProtobufPage.ProtobufPage.save?4()
eric6.Preferences.ConfigurationPages.ProtobufPage.ProtobufPage?1()
eric6.Preferences.ConfigurationPages.ProtobufPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.PythonPage.PythonPage.on_refreshButton_clicked?4()
eric6.Preferences.ConfigurationPages.PythonPage.PythonPage.save?4()
eric6.Preferences.ConfigurationPages.PythonPage.PythonPage?1()
eric6.Preferences.ConfigurationPages.PythonPage.create?4(dlg)
@@ -7469,7 +7509,7 @@
eric6.Preferences.ConfigurationPages.TemplatesPage.TemplatesPage?1()
eric6.Preferences.ConfigurationPages.TemplatesPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage.save?4()
-eric6.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.TrayStarterPage.TrayStarterPage?1()
eric6.Preferences.ConfigurationPages.TrayStarterPage.create?4(dlg)
eric6.Preferences.ConfigurationPages.VcsPage.VcsPage.save?4()
eric6.Preferences.ConfigurationPages.VcsPage.VcsPage?1()
@@ -7497,7 +7537,7 @@
eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage.on_testButton_clicked?4()
eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage.on_vtServiceKeyEdit_textChanged?4(txt)
eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage.save?4()
-eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.WebBrowserVirusTotalPage?1()
eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.create?4(dlg)
eric6.Preferences.MouseClickDialog.MouseClickDialog.eventFilter?4(watched, event)
eric6.Preferences.MouseClickDialog.MouseClickDialog.getClick?4()
@@ -7659,7 +7699,6 @@
eric6.Preferences.getTrayStarter?4(key, prefClass=Prefs)
eric6.Preferences.getUI?4(key, prefClass=Prefs)
eric6.Preferences.getUILanguage?4(prefClass=Prefs)
-eric6.Preferences.getUILayout?4(prefClass=Prefs)
eric6.Preferences.getUser?4(key, prefClass=Prefs)
eric6.Preferences.getVCS?4(key, prefClass=Prefs)
eric6.Preferences.getVarFilters?4(prefClass=Prefs)
@@ -7712,7 +7751,6 @@
eric6.Preferences.setTrayStarter?4(key, value, prefClass=Prefs)
eric6.Preferences.setUI?4(key, value, prefClass=Prefs)
eric6.Preferences.setUILanguage?4(lang, prefClass=Prefs)
-eric6.Preferences.setUILayout?4(layout, prefClass=Prefs)
eric6.Preferences.setUser?4(key, value, prefClass=Prefs)
eric6.Preferences.setVCS?4(key, value, prefClass=Prefs)
eric6.Preferences.setVarFilters?4(filters, prefClass=Prefs)
@@ -7755,7 +7793,6 @@
eric6.Project.CreateDialogCodeDialog.rubySignatureRole?7
eric6.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog.on_debugClientClearHistoryButton_clicked?4()
eric6.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog.on_debugClientPicker_aboutToShowPathPickerDialog?4()
-eric6.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog.on_interpreterClearHistoryButton_clicked?4()
eric6.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog.storeData?4()
eric6.Project.DebuggerPropertiesDialog.DebuggerPropertiesDialog?1(project, parent=None, name=None)
eric6.Project.FiletypeAssociationDialog.FiletypeAssociationDialog.on_addAssociationButton_clicked?4()
@@ -7764,6 +7801,23 @@
eric6.Project.FiletypeAssociationDialog.FiletypeAssociationDialog.on_filetypeAssociationList_currentItemChanged?4(itm, prevItm)
eric6.Project.FiletypeAssociationDialog.FiletypeAssociationDialog.transferData?4()
eric6.Project.FiletypeAssociationDialog.FiletypeAssociationDialog?1(project, parent=None)
+eric6.Project.IdlCompilerDefineNameDialog.IdlCompilerDefineNameDialog.getData?4()
+eric6.Project.IdlCompilerDefineNameDialog.IdlCompilerDefineNameDialog.on_nameEdit_textChanged?4(txt)
+eric6.Project.IdlCompilerDefineNameDialog.IdlCompilerDefineNameDialog?1(name="", value="", parent=None)
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.getData?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_dnAddButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_dnDeleteButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_dnEditButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_dnList_itemSelectionChanged?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_idAddButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_idDeleteButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_idEditButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_idList_itemSelectionChanged?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_unAddButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_unDeleteButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_unEditButton_clicked?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog.on_unList_itemSelectionChanged?4()
+eric6.Project.IdlCompilerOptionsDialog.IdlCompilerOptionsDialog?1(includeDirectories, definedNames, undefinedNames, project=None, parent=None)
eric6.Project.LexerAssociationDialog.LexerAssociationDialog.on_addLexerButton_clicked?4()
eric6.Project.LexerAssociationDialog.LexerAssociationDialog.on_deleteLexerButton_clicked?4()
eric6.Project.LexerAssociationDialog.LexerAssociationDialog.on_editorLexerCombo_currentIndexChanged?4(text)
@@ -7863,6 +7917,7 @@
eric6.Project.Project.Project.getVcs?4()
eric6.Project.Project.Project.handleApplicationDiagram?4()
eric6.Project.Project.Project.handlePreferencesChanged?4()
+eric6.Project.Project.Project.hasDefaultIdlCompilerParameters?4()
eric6.Project.Project.Project.hasDefaultMakeParameters?4()
eric6.Project.Project.Project.hasEntry?4(fn)
eric6.Project.Project.Project.hasProjectType?4(type_, progLanguage="")
@@ -7931,11 +7986,12 @@
eric6.Project.Project.Project.renameMainScript?4(oldfn, newfn)
eric6.Project.Project.Project.reopenProject?4()
eric6.Project.Project.Project.repopulateItem?4(fullname)
+eric6.Project.Project.Project.resetVCS?4()
eric6.Project.Project.Project.saveAllScripts?4(reportSyntaxErrors=False)
eric6.Project.Project.Project.saveProject?4()
eric6.Project.Project.Project.saveProjectAs?4()
eric6.Project.Project.Project.setData?4(category, key, data)
-eric6.Project.Project.Project.setDbgInfo?4(interpreter, argv, wd, env, excReporting, excList, excIgnoreList, autoClearShell, tracePython=None, autoContinue=None)
+eric6.Project.Project.Project.setDbgInfo?4(venvName, argv, wd, env, excReporting, excList, excIgnoreList, autoClearShell, tracePython=None, autoContinue=None)
eric6.Project.Project.Project.setDirty?4(b)
eric6.Project.Project.Project.setStatusMonitorAutoUpdate?4(auto)
eric6.Project.Project.Project.setStatusMonitorInterval?4(interval)
@@ -7949,6 +8005,7 @@
eric6.Project.Project.Project.updateFileTypes?4()
eric6.Project.Project.Project.useSystemEol?4()
eric6.Project.Project.Project.vcsSoftwareAvailable?4()
+eric6.Project.Project.Project.vcsStatusMonitorInfo?7
eric6.Project.Project.Project.vcsStatusMonitorStatus?7
eric6.Project.Project.Project.writeTasks?4()
eric6.Project.Project.Project?1(parent=None, filename=None)
@@ -8001,8 +8058,7 @@
eric6.Project.ProjectBrowser.ProjectBrowser.handleEditorChanged?4(fn)
eric6.Project.ProjectBrowser.ProjectBrowser.handleEditorLineChanged?4(fn, lineno)
eric6.Project.ProjectBrowser.ProjectBrowser.handlePreferencesChanged?4()
-eric6.Project.ProjectBrowser.ProjectBrowser.showEvent?4(evt)
-eric6.Project.ProjectBrowser.ProjectBrowser?1(project, parent=None, embeddedBrowser=True)
+eric6.Project.ProjectBrowser.ProjectBrowser?1(project, parent=None)
eric6.Project.ProjectBrowserFlags.AllBrowsersFlag?7
eric6.Project.ProjectBrowserFlags.FormsBrowserFlag?7
eric6.Project.ProjectBrowserFlags.InterfacesBrowserFlag?7
@@ -8158,6 +8214,9 @@
eric6.Project.TranslationPropertiesDialog.TranslationPropertiesDialog.on_transPatternPicker_textChanged?4(txt)
eric6.Project.TranslationPropertiesDialog.TranslationPropertiesDialog.storeData?4()
eric6.Project.TranslationPropertiesDialog.TranslationPropertiesDialog?1(project, new, parent)
+eric6.Project.UicLoadUi.className?4(formFile, projectPath)
+eric6.Project.UicLoadUi.objectName?4(formFile, projectPath)
+eric6.Project.UicLoadUi.signatures?4(formFile, projectPath)
eric6.Project.UserPropertiesDialog.UserPropertiesDialog.storeData?4()
eric6.Project.UserPropertiesDialog.UserPropertiesDialog?1(project, parent=None, name=None)
eric6.PyUnit.UnittestDialog.QtTestResult.addError?4(test, err)
@@ -8168,6 +8227,7 @@
eric6.PyUnit.UnittestDialog.QtTestResult.startTest?4(test)
eric6.PyUnit.UnittestDialog.QtTestResult.stopTest?4(test)
eric6.PyUnit.UnittestDialog.QtTestResult?1(parent)
+eric6.PyUnit.UnittestDialog.UnittestDialog.closeEvent?4(event)
eric6.PyUnit.UnittestDialog.UnittestDialog.hasFailedTests?4()
eric6.PyUnit.UnittestDialog.UnittestDialog.insertProg?4(prog)
eric6.PyUnit.UnittestDialog.UnittestDialog.insertTestName?4(testName)
@@ -8262,6 +8322,7 @@
eric6.QScintilla.Editor.Editor.close?4(alsoDelete=False)
eric6.QScintilla.Editor.Editor.closeIt?4()
eric6.QScintilla.Editor.Editor.codeCoverageShowAnnotations?4(silent=False)
+eric6.QScintilla.Editor.Editor.collapseFoldWithChildren?4(line=-1)
eric6.QScintilla.Editor.Editor.commentLine?4()
eric6.QScintilla.Editor.Editor.commentLineOrSelection?4()
eric6.QScintilla.Editor.Editor.commentSelection?4()
@@ -8281,10 +8342,11 @@
eric6.QScintilla.Editor.Editor.editorRenamed?7
eric6.QScintilla.Editor.Editor.editorSaved?7
eric6.QScintilla.Editor.Editor.encodingChanged?7
-eric6.QScintilla.Editor.Editor.ensureVisible?4(line)
-eric6.QScintilla.Editor.Editor.ensureVisibleTop?4(line)
+eric6.QScintilla.Editor.Editor.ensureVisible?4(line, expand=False)
+eric6.QScintilla.Editor.Editor.ensureVisibleTop?4(line, expand=False)
eric6.QScintilla.Editor.Editor.eolChanged?7
eric6.QScintilla.Editor.Editor.event?4(evt)
+eric6.QScintilla.Editor.Editor.expandFoldWithChildren?4(line=-1)
eric6.QScintilla.Editor.Editor.exportFile?4(exporterFormat)
eric6.QScintilla.Editor.Editor.extractTasks?4()
eric6.QScintilla.Editor.Editor.fileRenamed?4(fn)
@@ -8328,7 +8390,7 @@
eric6.QScintilla.Editor.Editor.getWordLeft?4(line, index)
eric6.QScintilla.Editor.Editor.getWordRight?4(line, index)
eric6.QScintilla.Editor.Editor.gotoLastEditPosition?4()
-eric6.QScintilla.Editor.Editor.gotoLine?4(line, pos=1, firstVisible=False)
+eric6.QScintilla.Editor.Editor.gotoLine?4(line, pos=1, firstVisible=False, expand=False)
eric6.QScintilla.Editor.Editor.gotoMethodClass?4(goUp=False)
eric6.QScintilla.Editor.Editor.gotoSyntaxError?4()
eric6.QScintilla.Editor.Editor.handleMonospacedEnable?4()
@@ -8433,6 +8495,7 @@
eric6.QScintilla.Editor.Editor.taskMarkersUpdated?7
eric6.QScintilla.Editor.Editor.toggleBookmark?4(line)
eric6.QScintilla.Editor.Editor.toggleCommentBlock?4()
+eric6.QScintilla.Editor.Editor.toggleCurrentFold?4()
eric6.QScintilla.Editor.Editor.toggleSyntaxError?4(line, index, error, msg="", show=False)
eric6.QScintilla.Editor.Editor.toggleWarning?4(line, col, warning, msg="", warningType=WarningCode)
eric6.QScintilla.Editor.Editor.uncommentLine?4()
@@ -8954,6 +9017,7 @@
eric6.QScintilla.MiniEditor.MiniEditor.getFileName?4()
eric6.QScintilla.MiniEditor.MiniEditor.getLanguage?4()
eric6.QScintilla.MiniEditor.MiniEditor.getSRHistory?4(key)
+eric6.QScintilla.MiniEditor.MiniEditor.gotoLine?4(line, pos=1)
eric6.QScintilla.MiniEditor.MiniEditor.setLanguage?4(filename, initTextDisplay=True, pyname="")
eric6.QScintilla.MiniEditor.MiniEditor.setSearchIndicator?4(startPos, indicLength)
eric6.QScintilla.MiniEditor.MiniEditor.setText?4(txt, filetype=None)
@@ -8975,6 +9039,9 @@
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.IndicatorStyleMax?7
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.UserSeparator?7
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat._encodeString?5(string)
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.autoCompleteFromAPIs?4()
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.autoCompleteFromAll?4()
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.autoCompleteFromDocument?4()
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.byteAt?4(pos)
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.canPaste?4()
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.charAt?4(pos)
@@ -9074,6 +9141,7 @@
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(listId, lst)
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.startStyling?4(pos, mask)
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.styleAt?4(pos)
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.updateUserListSize?4()
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.updateVerticalScrollBar?4()
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomIn?4(zoom=1)
eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomOut?4(zoom=1)
@@ -9139,6 +9207,7 @@
eric6.QScintilla.Shell.Shell.loadHistory?4(clientType)
eric6.QScintilla.Shell.Shell.mousePressEvent?4(event)
eric6.QScintilla.Shell.Shell.paste?4()
+eric6.QScintilla.Shell.Shell.queueText?7
eric6.QScintilla.Shell.Shell.reloadHistory?4()
eric6.QScintilla.Shell.Shell.saveHistory?4(clientType)
eric6.QScintilla.Shell.Shell.searchNext?4(txt, caseSensitive, wholeWord)
@@ -9167,6 +9236,7 @@
eric6.QScintilla.ShellWindow.ShellWindow.closeEvent?4(event)
eric6.QScintilla.ShellWindow.ShellWindow.getAPIsManager?4()
eric6.QScintilla.ShellWindow.ShellWindow.quit?4()
+eric6.QScintilla.ShellWindow.ShellWindow.showFind?4(txt="")
eric6.QScintilla.ShellWindow.ShellWindow?1(parent=None, name=None)
eric6.QScintilla.SortOptionsDialog.SortOptionsDialog.getData?4()
eric6.QScintilla.SortOptionsDialog.SortOptionsDialog?1(parent=None)
@@ -9654,13 +9724,9 @@
eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.shutdown?4()
eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.unregisterProvider?4(providerName)
eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer?1(parent=None)
-eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.clear?4()
-eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.preferencesChanged?4()
-eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.setText?4(text)
-eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer?1(parent=None)
-eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer.clear?4()
-eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer.setHtml?4(html)
-eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer?1(parent=None)
+eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.clear?4()
+eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.setHtml?4(html)
+eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget?1(parent=None)
eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocWarningDocument?4(text)
eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocument?4(documentationInfo)
eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlWarningDocument?4(text)
@@ -9892,6 +9958,7 @@
eric6.UI.UserInterface.UserInterface.dropEvent?4(event)
eric6.UI.UserInterface.UserInterface.getActions?4(actionType)
eric6.UI.UserInterface.UserInterface.getHelpViewer?4(preview=False)
+eric6.UI.UserInterface.UserInterface.getLayoutType?4()
eric6.UI.UserInterface.UserInterface.getLocale?4()
eric6.UI.UserInterface.UserInterface.getMenu?4(name)
eric6.UI.UserInterface.UserInterface.getMenuAction?4(menuName, actionName)
@@ -9899,6 +9966,7 @@
eric6.UI.UserInterface.UserInterface.getToolBarIconSize?4()
eric6.UI.UserInterface.UserInterface.getToolbar?4(name)
eric6.UI.UserInterface.UserInterface.getViewProfile?4()
+eric6.UI.UserInterface.UserInterface.handleUrl?4(url)
eric6.UI.UserInterface.UserInterface.isOnline?4()
eric6.UI.UserInterface.UserInterface.launchHelpViewer?4(home, searchWord=None, useSingle=False)
eric6.UI.UserInterface.UserInterface.masterPasswordChanged?7
@@ -9935,7 +10003,6 @@
eric6.Utilities.AutoSaver.AutoSaver.saveIfNeccessary?4()
eric6.Utilities.AutoSaver.AutoSaver.timerEvent?4(evt)
eric6.Utilities.AutoSaver.AutoSaver?1(parent, save)
-eric6.Utilities.BackgroundClient.BackgroundClient.backgroundClient?7
eric6.Utilities.BackgroundClient.BackgroundClient.run?4()
eric6.Utilities.BackgroundClient.BackgroundClient?1(host, port, maxProcs)
eric6.Utilities.BackgroundService.BackgroundService.batchJobDone?7
@@ -10183,7 +10250,7 @@
eric6.Utilities.binplistlib.readPlistFromBytes?4(data)
eric6.Utilities.binplistlib.writePlist?4(rootObject, pathOrFile, binary=True)
eric6.Utilities.binplistlib.writePlistToBytes?4(rootObject, binary=True)
-eric6.Utilities.checkPyside?4()
+eric6.Utilities.checkPyside?4(variant="2")
eric6.Utilities.codingBytes_regexps?7
eric6.Utilities.coding_regexps?7
eric6.Utilities.compactPath?4(path, width, measure=len)
@@ -10240,7 +10307,7 @@
eric6.Utilities.generateDistroInfo?4(linesep='\n')
eric6.Utilities.generatePluginsVersionInfo?4(linesep='\n')
eric6.Utilities.generatePyQtToolPath?4(toolname, alternatives=None)
-eric6.Utilities.generatePySideToolPath?4(toolname)
+eric6.Utilities.generatePySideToolPath?4(toolname, variant="2")
eric6.Utilities.generateQtToolName?4(toolname)
eric6.Utilities.generateVersionInfo?4(linesep='\n')
eric6.Utilities.getDirs?4(path, excludeDirs)
@@ -10254,6 +10321,7 @@
eric6.Utilities.getPythonVersion?4()
eric6.Utilities.getQtMacBundle?4(toolname)
eric6.Utilities.getRealName?4()
+eric6.Utilities.getSysPath?4(interpreter)
eric6.Utilities.getTestFileName?4(fn)
eric6.Utilities.getUserName?4()
eric6.Utilities.getWindowsExecutablePath?4(file)
@@ -10348,6 +10416,8 @@
eric6.VCS.RepositoryInfoDialog.VcsRepositoryInfoDialog?1(parent, info)
eric6.VCS.StatusMonitorLed.StatusMonitorLed._showContextMenu?5(coord)
eric6.VCS.StatusMonitorLed.StatusMonitorLed?1(project, parent)
+eric6.VCS.StatusMonitorLed.StatusMonitorLedWidget?1(project, parent)
+eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread._getInfo?5()
eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread._performMonitor?5()
eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread._shutdown?5()
eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread.checkStatus?4()
@@ -10359,6 +10429,7 @@
eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread.setInterval?4(interval)
eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread.stop?4()
eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorData?7
+eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorInfo?7
eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread.vcsStatusMonitorStatus?7
eric6.VCS.StatusMonitorThread.VcsStatusMonitorThread?1(interval, project, vcs, parent=None)
eric6.VCS.VcsBasicHelperSingleton?7
@@ -10415,6 +10486,7 @@
eric6.VCS.VersionControl.VersionControl.vcsStatus?4(name)
eric6.VCS.VersionControl.VersionControl.vcsStatusChanged?7
eric6.VCS.VersionControl.VersionControl.vcsStatusMonitorData?7
+eric6.VCS.VersionControl.VersionControl.vcsStatusMonitorInfo?7
eric6.VCS.VersionControl.VersionControl.vcsStatusMonitorStatus?7
eric6.VCS.VersionControl.VersionControl.vcsSupportCommandOptions?4()
eric6.VCS.VersionControl.VersionControl.vcsSwitch?4(name)
@@ -10576,6 +10648,54 @@
eric6.ViewManager.ViewManager.ViewManager.zoomValueChanged?4(value, zoomingWidget)
eric6.ViewManager.ViewManager.ViewManager?1()
eric6.ViewManager.factory?4(parent, ui, dbs, pluginManager)
+eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.getData?4()
+eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_globalCheckBox_toggled?4(checked)
+eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_nameEdit_textChanged?4(txt)
+eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_pythonExecPicker_textChanged?4(txt)
+eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog.on_targetDirectoryPicker_textChanged?4(txt)
+eric6.VirtualEnv.VirtualenvAddEditDialog.VirtualenvAddEditDialog?1(manager, venvName="", venvDirectory="", venvInterpreter="", venvVariant=3, isGlobal=False, parent=None)
+eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.getData?4()
+eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pythonExecPicker_textChanged?4(txt)
+eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_pyvenvButton_toggled?4(checked)
+eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_targetDirectoryPicker_textChanged?4(txt)
+eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog.on_virtualenvButton_toggled?4(checked)
+eric6.VirtualEnv.VirtualenvConfigurationDialog.VirtualenvConfigurationDialog?1(parent=None)
+eric6.VirtualEnv.VirtualenvExecDialog.VirtualenvExecDialog.on_buttonBox_clicked?4(button)
+eric6.VirtualEnv.VirtualenvExecDialog.VirtualenvExecDialog.start?4(arguments)
+eric6.VirtualEnv.VirtualenvExecDialog.VirtualenvExecDialog?1(pyvenv, targetDir, venvName, openTarget, createLog, createScript, interpreter, venvManager, parent=None)
+eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.VirtualenvInterpreterSelectionDialog.getData?4()
+eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.VirtualenvInterpreterSelectionDialog.on_pythonExecPicker_textChanged?4(txt)
+eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.VirtualenvInterpreterSelectionDialog?1(venvName, venvDirectory, parent=None)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.DefaultKey?7
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.addVirtualEnv?4(venvName, venvDirectory, venvInterpreter="", venvVariant=3, isGlobal=False)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.createVirtualEnv?4()
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.deleteVirtualEnvs?4(venvNames)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getDefaultEnvironment?4()
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getEnvironmentEntries?4()
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvDirectory?4(venvName)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvInterpreter?4(venvName)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvNames?4()
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvNamesForVariant?4(variant)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isGlobalEnvironment?4(venvName)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isUnique?4(venvName)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.removeVirtualEnvs?4(venvNames)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.renameVirtualEnv?4(oldVenvName, venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.setVirtualEnv?4(venvName, venvDirectory, venvInterpreter, venvVariant, isGlobal)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.showVirtualenvManagerDialog?4(modal=False)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.shutdown?4()
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager?1(parent=None)
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.IsGlobalRole?7
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.PythonVariantRole?7
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_addButton_clicked?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_deleteAllButton_clicked?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_deleteButton_clicked?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_editButton_clicked?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_newButton_clicked?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_removeAllButton_clicked?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_removeButton_clicked?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.on_venvList_itemSelectionChanged?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog.refresh?4()
+eric6.VirtualEnv.VirtualenvManagerDialog.VirtualenvManagerDialog?1(manager, parent=None)
eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filterRule)
eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.addSubscription?4(subscription, refresh=True)
eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_adBlockGroup_toggled?4(state)
@@ -11051,7 +11171,7 @@
eric6.WebBrowser.Download.DownloadItem.DownloadItem.setData?4(data)
eric6.WebBrowser.Download.DownloadItem.DownloadItem.setIcon?4(icon)
eric6.WebBrowser.Download.DownloadItem.DownloadItem.statusChanged?7
-eric6.WebBrowser.Download.DownloadItem.DownloadItem?1(downloadItem=None, pageUrl="", parent=None)
+eric6.WebBrowser.Download.DownloadItem.DownloadItem?1(downloadItem=None, pageUrl=None, parent=None)
eric6.WebBrowser.Download.DownloadManager.DownloadManager.RemoveExit?7
eric6.WebBrowser.Download.DownloadManager.DownloadManager.RemoveNever?7
eric6.WebBrowser.Download.DownloadManager.DownloadManager.RemoveSuccessFullDownload?7
@@ -12424,6 +12544,7 @@
eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.tabManager?4()
eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.tabWidget?4()
eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.toggleFullScreen?4()
+eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.urlHandler?4(url)
eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.userAgentsManager?4()
eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webBrowserClosed?7
eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webBrowserOpened?7
@@ -12563,6 +12684,9 @@
eric6.install.apisDir?7
eric6.install.cfg?7
eric6.install.cleanUp?4()
+eric6.install.cleanUpLinuxSpecifics?4()
+eric6.install.cleanUpMacAppBundle?4()
+eric6.install.cleanUpWindowsLinks?4()
eric6.install.cleanupSource?4(dirName)
eric6.install.compileUiFiles?4()
eric6.install.configLength?7
@@ -12574,8 +12698,11 @@
eric6.install.createConfig?4()
eric6.install.createGlobalPluginsDir?4()
eric6.install.createInstallConfig?4()
+eric6.install.createLinuxSpecifics?4()
eric6.install.createMacAppBundle?4(pydir)
eric6.install.createPyWrapper?4(pydir, wfile, isGuiScript=True)
+eric6.install.createWindowsLinks?4()
+eric6.install.createWindowsShortcut?4(linkPath, targetPath, iconPath)
eric6.install.currDir?7
eric6.install.defaultMacAppBundleName?7
eric6.install.defaultMacAppBundlePath?7
@@ -12586,6 +12713,7 @@
eric6.install.doCompile?7
eric6.install.doDependancyChecks?4()
eric6.install.exit?4(rcode=0)
+eric6.install.getWinregEntry?4(name, path)
eric6.install.includePythonVariant?7
eric6.install.initGlobals?4()
eric6.install.installApis?7
@@ -12607,7 +12735,10 @@
eric6.install.shutilCopy?4(src, dst, perm=0o644)
eric6.install.sourceDir?7
eric6.install.usage?4(rcode=2)
-eric6.install.wrapperName?4(dname, wfile)
+eric6.install.windowsDesktopEntries?4()
+eric6.install.windowsDesktopNames?4()
+eric6.install.windowsProgramsEntry?4()
+eric6.install.wrapperNames?4(dname, wfile)
eric6.patch_modpython.initGlobals?4()
eric6.patch_modpython.main?4(argv)
eric6.patch_modpython.modDir?7
@@ -12629,6 +12760,7 @@
eric6.uninstall.defaultMacAppBundlePath?7
eric6.uninstall.exit?4(rcode=0)
eric6.uninstall.getConfigDir?4()
+eric6.uninstall.getWinregEntry?4(name, path)
eric6.uninstall.includePythonVariant?7
eric6.uninstall.initGlobals?4()
eric6.uninstall.main?4(argv)
@@ -12641,5 +12773,10 @@
eric6.uninstall.settingsNameGlobal?7
eric6.uninstall.settingsNameOrganization?7
eric6.uninstall.uninstallEric?4()
+eric6.uninstall.uninstallLinuxSpecifics?4()
+eric6.uninstall.uninstallMacAppBundle?4()
+eric6.uninstall.uninstallWindowsLinks?4()
eric6.uninstall.usage?4(rcode=2)
-eric6.uninstall.wrapperName?4(dname, wfile)
+eric6.uninstall.windowsDesktopNames?4()
+eric6.uninstall.windowsProgramsEntry?4()
+eric6.uninstall.wrapperNames?4(dname, wfile)
diff -Nru eric-18.05/eric/APIs/Python3/eric6.bas eric-18.11+ds1/eric/APIs/Python3/eric6.bas
--- eric-18.05/eric/APIs/Python3/eric6.bas 2018-05-01 10:02:01.000000000 +0000
+++ eric-18.11+ds1/eric/APIs/Python3/eric6.bas 2018-11-01 10:46:30.000000000 +0000
@@ -127,8 +127,8 @@
DebuggerPropertiesDialog QDialog Ui_DebuggerPropertiesDialog
DebuggerPropertiesReader XMLStreamReaderBase
DebuggerPropertiesWriter XMLStreamWriterBase
+DebuggerPython2Page ConfigurationPageBase Ui_DebuggerPython2Page
DebuggerPython3Page ConfigurationPageBase Ui_DebuggerPython3Page
-DebuggerPythonPage ConfigurationPageBase Ui_DebuggerPythonPage
DeepLEngine TranslationEngine
DefaultResolver BaseResolver
DelayedFileWatcher QFileSystemWatcher
@@ -143,6 +143,7 @@
DispositionParm str
DispositionParmList UniqueNamespace
DispositionType peg.List
+DocumentationViewerWidget QWidget
DotDesktopListSelectionDialog QDialog Ui_DotDesktopListSelectionDialog
DotDesktopWizard QObject
DotDesktopWizardDialog QDialog Ui_DotDesktopWizardDialog
@@ -194,6 +195,7 @@
E5PasswordMeter QProgressBar
E5PathPicker E5PathPickerBase
E5PathPickerBase QWidget
+E5PathPickerDialog QDialog
E5PathPickerModes Enum
E5ProgressDialog QProgressDialog
E5RequestModel QAbstractTableModel
@@ -213,6 +215,7 @@
E5TabWidget QTabWidget
E5TableView QTableView
E5TextEditSearchWidget QWidget
+E5TextInputDialog QDialog
E5TextSpinBox QSpinBox
E5TldExtractor QObject
E5ToolBarDialog QDialog Ui_E5ToolBarDialog
@@ -318,6 +321,7 @@
GitBranchDialog QDialog Ui_GitBranchDialog
GitBranchPushDialog QDialog Ui_GitBranchPushDialog
GitBundleDialog QDialog Ui_GitBundleDialog
+GitChangeRemoteUrlDialog QDialog Ui_GitChangeRemoteUrlDialog
GitCherryPickDialog QDialog Ui_GitCherryPickDialog
GitCommandDialog QDialog Ui_GitCommandDialog
GitCommitDialog QWidget Ui_GitCommitDialog
@@ -341,6 +345,7 @@
GitPullDialog QDialog Ui_GitPullDialog
GitPushDialog QDialog Ui_GitPushDialog
GitReflogBrowserDialog QWidget Ui_GitReflogBrowserDialog
+GitRemoteCredentialsDialog QDialog Ui_GitRemoteCredentialsDialog
GitRemoteRepositoriesDialog QWidget Ui_GitRemoteRepositoriesDialog
GitRevisionSelectionDialog QDialog Ui_GitRevisionSelectionDialog
GitRevisionsSelectionDialog QDialog Ui_GitRevisionsSelectionDialog
@@ -494,6 +499,7 @@
HtmlProvider MarkupBase
HyperlinkMarkupDialog QDialog Ui_HyperlinkMarkupDialog
IExplorerImporter BookmarksImporter
+IbmWatsonEngine TranslationEngine
IconEditCommand QUndoCommand
IconEditorGrid QWidget
IconEditorPalette QWidget
@@ -501,6 +507,8 @@
IconSizeDialog QDialog Ui_IconSizeDialog
IconsPage ConfigurationPageBase Ui_IconsPage
IconsPreviewDialog QDialog Ui_IconsPreviewDialog
+IdlCompilerDefineNameDialog QDialog Ui_IdlCompilerDefineNameDialog
+IdlCompilerOptionsDialog QDialog Ui_IdlCompilerOptionsDialog
ImageMarkupDialog QDialog Ui_ImageMarkupDialog
ImageSearchEngine QObject
ImagesIcon StatusBarIcon
@@ -652,17 +660,17 @@
PersonalInformationManager QObject
Pip QObject
PipDialog QDialog Ui_PipDialog
+PipFileSelectionDialog QDialog Ui_PipFileSelectionDialog
PipFreezeDialog QDialog Ui_PipFreezeDialog
PipInterfacePlugin QObject
PipListDialog QDialog Ui_PipListDialog
PipPackageDetailsDialog QDialog Ui_PipPackageDetailsDialog
PipPackagesInputDialog QDialog Ui_PipPackagesInputDialog
PipPage ConfigurationPageBase Ui_PipPage
-PipRequirementsSelectionDialog QDialog Ui_PipRequirementsSelectionDialog
PipSearchDialog QDialog Ui_PipSearchDialog
+PipSelectionDialog QDialog Ui_PipSelectionDialog
PixmapDiagram E5MainWindow
PlainStrList list
-PlainTextDocumentationViewer QWidget
PluginActivationError PluginError
PluginClassFormatError PluginError
PluginDetailsDialog QDialog Ui_PluginDetailsDialog
@@ -837,6 +845,7 @@
StartPageJsObject QObject
StatusBarIcon E5ClickableLabel
StatusMonitorLed E5ClickableLed
+StatusMonitorLedWidget QWidget
Strip HgExtension
StripProjectHelper HgExtensionProjectHelper
Subversion VersionControl
@@ -970,9 +979,12 @@
ViewManager QWidget
ViewProfileDialog QDialog
ViewmanagerPage ConfigurationPageBase Ui_ViewmanagerPage
+VirtualenvAddEditDialog QDialog Ui_VirtualenvAddEditDialog
VirtualenvConfigurationDialog QDialog Ui_VirtualenvConfigurationDialog
VirtualenvExecDialog QDialog Ui_VirtualenvExecDialog
-VirtualenvInterfacePlugin QObject
+VirtualenvInterpreterSelectionDialog QDialog Ui_VirtualenvInterpreterSelectionDialog
+VirtualenvManager QObject
+VirtualenvManagerDialog QDialog Ui_VirtualenvManagerDialog
VirusTotalAPI QObject
VirusTotalDomainReportDialog QDialog Ui_VirusTotalDomainReportDialog
VirusTotalIpReportDialog QDialog Ui_VirusTotalIpReportDialog
@@ -1001,7 +1013,6 @@
WebIconProvider QObject
WebInspector QWebEngineView
WebPluginFactory QWebPluginFactory
-WebViewDocumentationViewer QWidget
WidgetArea QMdiArea
WidgetView QWidget
WizardEricPluginWizard QObject
diff -Nru eric-18.05/eric/changelog eric-18.11+ds1/eric/changelog
--- eric-18.05/eric/changelog 2018-05-01 10:02:11.000000000 +0000
+++ eric-18.11+ds1/eric/changelog 2018-11-01 10:46:46.000000000 +0000
@@ -1,5 +1,103 @@
Change Log
----------
+Version 18.11:
+- bug fixes
+- IRC
+ -- added support for some of the "/" commands to the user list context menu
+- Translator
+ -- changed DeepL support to DeepL Pro
+- VCS
+ -- added capability to show some VCS info in the status bar of the main
+ window (next to the VCS status LED)
+
+Version 18.10:
+- bug fixes
+- General
+ -- changed the extension of the generated script files for Windows from
+ '.bat' to '.cmd'
+- Debugger
+ -- added code to use the default virtual environment, if none has been
+ configured yet
+- IRC
+ -- added support for the /query, /notice, /ping, /ignore, /unignore, /away,
+ /join, /part and /partall commands
+- Tasks
+ -- added code to mark a line as not containing a task with '__NO-TASK__'
+
+Version 18.09:
+- bug fixes
+- Mercurial Interface
+ -- added support for Mercurial 4.7 extended commands 'graft', 'rebase' and
+ 'export'
+
+Version 18.08:
+- bug fixes
+- General
+ -- made the activation of these internal tools configurable
+ * Template-Viewer
+ * File-Browser
+ * Symbols
+ * Code Documentation Viewer
+ * Cooperation
+ * IRC
+ * Numbers
+- File-Browser
+ -- changed code so file-browser is always a standalone window
+- Project Interfaces Browser
+ -- added actions to configure some IDL compiler options (-I, -D, -U)
+- Shell
+ -- changed code so shell is always a standalone window
+- Translator
+ -- added a translation engine for the IBM Watson Language Translator
+- Web Browser (NG)
+ -- added default search engine definitions for
+ * Qwant
+ * StartPage
+
+Version 18.07:
+- bug fixes
+- Checkers
+ -- upgraded pyflakes to version 2.0.0
+- Debugger
+ -- added support of breakpoint() builtin of Python 3.7
+ -- added code to try to open the source file if an exception occurred in
+ a cython .pyd file
+- Git Interface
+ -- added capability to change the URL and/or user credentials for a
+ remote repository
+- pip Interface
+ -- added support for the '--user' option of install and list commands
+ -- changed to use the new VirtualEnv Manager
+- Unit Test
+ -- extended the standalone unit test tool to be able to open source in an
+ editor window
+- VirtualEnv Manager
+ -- added a manager for virtual environments
+ -- changed a few places to use the newly introduced virtual environments
+ (Note: a new session file format and debug properties file format
+ has been introduced)
+
+**Upgrade note**: It may be neccessary to configure the Python environments,
+the environments to be used for the debugger. Once that is done, the eric6
+IDE should be restarted.
+
+Version 18.06:
+- bug fixes
+- Editor
+ -- added a configuration option (Editor->Style page) to show the marker map
+ on the left or right of the editor
+ -- added a context menu for the "fold" margin
+ -- improved handling of folded lines when using "go to" functions
+ -- resize auto complete list box to fit with contents
+ -- added a configuration option (Editor->autocomplete to set up maximum
+ width and height of the auto complete list box
+- Shell
+ -- resize auto complete list box to fit with contents
+- pip Interface
+ -- added an action to install a locally available package/wheel
+- Web Browser (NG)
+ -- improved the sending of the "Referer" header like it is done by Firefox
+
Version 18.05:
- bug fixes
- General
diff -Nru eric-18.05/eric/cleanupSource.py eric-18.11+ds1/eric/cleanupSource.py
--- eric-18.05/eric/cleanupSource.py 2017-12-31 17:26:11.000000000 +0000
+++ eric-18.11+ds1/eric/cleanupSource.py 2018-09-30 09:37:39.000000000 +0000
@@ -8,8 +8,7 @@
Script for eric6 to clean up the source tree.
"""
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import unicode_literals, print_function
import os
import sys
diff -Nru eric-18.05/eric/CodeTemplates/impl_pyside2.py2.tmpl eric-18.11+ds1/eric/CodeTemplates/impl_pyside2.py2.tmpl
--- eric-18.05/eric/CodeTemplates/impl_pyside2.py2.tmpl 1970-01-01 00:00:00.000000000 +0000
+++ eric-18.11+ds1/eric/CodeTemplates/impl_pyside2.py2.tmpl 2018-06-02 10:43:35.000000000 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+"""
+Module implementing $CLASSNAME$.
+"""
+
+from PySide2.QtCore import Slot
+from PySide2.QtWidgets import $SUPERCLASS$
+
+from .Ui_$FORMFILE$ import Ui_$FORMCLASS$
+
+
+class $CLASSNAME$($SUPERCLASS$, Ui_$FORMCLASS$):
+ """
+ Class documentation goes here.
+ """
+ def __init__(self, parent=None):
+ """
+ Constructor
+
+ @param parent reference to the parent widget
+ @type QWidget
+ """
+ super($CLASSNAME$, self).__init__(parent)
+ self.setupUi(self)
diff -Nru eric-18.05/eric/CodeTemplates/impl_pyside2.py.tmpl eric-18.11+ds1/eric/CodeTemplates/impl_pyside2.py.tmpl
--- eric-18.05/eric/CodeTemplates/impl_pyside2.py.tmpl 1970-01-01 00:00:00.000000000 +0000
+++ eric-18.11+ds1/eric/CodeTemplates/impl_pyside2.py.tmpl 2018-06-02 10:43:35.000000000 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+"""
+Module implementing $CLASSNAME$.
+"""
+
+from PySide2.QtCore import Slot
+from PySide2.QtWidgets import $SUPERCLASS$
+
+from .Ui_$FORMFILE$ import Ui_$FORMCLASS$
+
+
+class $CLASSNAME$($SUPERCLASS$, Ui_$FORMCLASS$):
+ """
+ Class documentation goes here.
+ """
+ def __init__(self, parent=None):
+ """
+ Constructor
+
+ @param parent reference to the parent widget
+ @type QWidget
+ """
+ super($CLASSNAME$, self).__init__(parent)
+ self.setupUi(self)
diff -Nru eric-18.05/eric/compileUiFiles.py eric-18.11+ds1/eric/compileUiFiles.py
--- eric-18.05/eric/compileUiFiles.py 2017-12-31 17:26:11.000000000 +0000
+++ eric-18.11+ds1/eric/compileUiFiles.py 2018-09-30 09:37:39.000000000 +0000
@@ -8,8 +8,7 @@
Script for eric6 to compile all .ui files to Python source.
"""
-from __future__ import unicode_literals
-from __future__ import print_function
+from __future__ import unicode_literals, print_function
import sys
diff -Nru eric-18.05/eric/Cooperation/ChatWidget.ui eric-18.11+ds1/eric/Cooperation/ChatWidget.ui
--- eric-18.05/eric/Cooperation/ChatWidget.ui 2014-01-08 16:00:38.000000000 +0000
+++ eric-18.11+ds1/eric/Cooperation/ChatWidget.ui 2018-07-02 16:56:50.000000000 +0000
@@ -105,6 +105,9 @@
Share Editor
+
+ 0
+
-
diff -Nru eric-18.05/eric/Cooperation/Connection.py eric-18.11+ds1/eric/Cooperation/Connection.py
--- eric-18.05/eric/Cooperation/Connection.py 2017-12-31 17:26:11.000000000 +0000
+++ eric-18.11+ds1/eric/Cooperation/Connection.py 2018-09-01 08:18:03.000000000 +0000
@@ -26,6 +26,7 @@
PongTimeout = 60 * 1000
PingInterval = 5 * 1000
SeparatorToken = '|||'
+SeparatorToken_b = b'|||'
class Connection(QTcpSocket):
@@ -262,8 +263,8 @@
self.abort()
return
- self.write("{0}{1}1{1}p".format(
- Connection.ProtocolPing, SeparatorToken))
+ self.write(QByteArray("{0}{1}1{1}p".format(
+ Connection.ProtocolPing, SeparatorToken).encode("utf-8")))
def __sendGreetingMessage(self):
"""
@@ -293,7 +294,7 @@
while self.bytesAvailable() and self.__buffer.size() < maxSize:
self.__buffer.append(self.read(1))
- if self.__buffer.endsWith(SeparatorToken):
+ if self.__buffer.endsWith(SeparatorToken_b):
break
return self.__buffer.size() - numBytesBeforeRead
@@ -306,10 +307,10 @@
"""
if self.bytesAvailable() <= 0 or \
self.__readDataIntoBuffer() <= 0 or \
- not self.__buffer.endsWith(SeparatorToken):
+ not self.__buffer.endsWith(SeparatorToken_b):
return 0
- self.__buffer.chop(len(SeparatorToken))
+ self.__buffer.chop(len(SeparatorToken_b))
number = self.__buffer.toInt()[0]
self.__buffer.clear()
return number
@@ -329,19 +330,20 @@
return False
self.__buffer.chop(len(SeparatorToken))
- if self.__buffer == Connection.ProtocolPing:
+ protocolHeader = str(self.__buffer, encoding="utf-8")
+ if protocolHeader == Connection.ProtocolPing:
self.__currentDataType = Connection.Ping
- elif self.__buffer == Connection.ProtocolPong:
+ elif protocolHeader == Connection.ProtocolPong:
self.__currentDataType = Connection.Pong
- elif self.__buffer == Connection.ProtocolMessage:
+ elif protocolHeader == Connection.ProtocolMessage:
self.__currentDataType = Connection.PlainText
- elif self.__buffer == Connection.ProtocolGreeting:
+ elif protocolHeader == Connection.ProtocolGreeting:
self.__currentDataType = Connection.Greeting
- elif self.__buffer == Connection.ProtocolGetParticipants:
+ elif protocolHeader == Connection.ProtocolGetParticipants:
self.__currentDataType = Connection.GetParticipants
- elif self.__buffer == Connection.ProtocolParticipants:
+ elif protocolHeader == Connection.ProtocolParticipants:
self.__currentDataType = Connection.Participants
- elif self.__buffer == Connection.ProtocolEditor:
+ elif protocolHeader == Connection.ProtocolEditor:
self.__currentDataType = Connection.Editor
else:
self.__currentDataType = Connection.Undefined
@@ -388,8 +390,8 @@
self.newMessage.emit(
self.__username, str(self.__buffer, encoding="utf-8"))
elif self.__currentDataType == Connection.Ping:
- self.write("{0}{1}1{1}p".format(
- Connection.ProtocolPong, SeparatorToken))
+ self.write(QByteArray("{0}{1}1{1}p".format(
+ Connection.ProtocolPong, SeparatorToken).encode("utf-8")))
elif self.__currentDataType == Connection.Pong:
self.__pongTime.restart()
elif self.__currentDataType == Connection.GetParticipants:
@@ -414,10 +416,11 @@
"""
Public method to request a list of participants.
"""
- self.write(
+ self.write(QByteArray(
"{0}{1}1{1}l".format(
- Connection.ProtocolGetParticipants, SeparatorToken)
- )
+ Connection.ProtocolGetParticipants, SeparatorToken
+ ).encode("utf-8")
+ ))
def sendParticipants(self, participants):
"""
diff -Nru eric-18.05/eric/DebugClients/Python/DebugBase.py eric-18.11+ds1/eric/DebugClients/Python/DebugBase.py
--- eric-18.05/eric/DebugClients/Python/DebugBase.py 2017-12-31 17:26:11.000000000 +0000
+++ eric-18.11+ds1/eric/DebugClients/Python/DebugBase.py 2018-07-07 09:57:23.000000000 +0000
@@ -110,6 +110,8 @@
# Use it like this:
# if hasattr(sys, 'breakpoint): sys.breakpoint()
sys.breakpoint = self.set_trace
+ if sys.version_info[:2] >= (3, 7):
+ sys.breakpointhook = self.set_trace
def __eventPollTimer(self):
"""
@@ -585,7 +587,7 @@
return frame.f_code.co_filename
absFilename = os.path.abspath(fn)
- if absFilename.endswith(('.pyc', '.pyo')):
+ if absFilename.endswith(('.pyc', '.pyo', '.pyd')):
fixedName = absFilename[:-1]
if not os.path.exists(fixedName):
fixedName = absFilename
diff -Nru eric-18.05/eric/Debugger/DebuggerInterfaceNone.py eric-18.11+ds1/eric/Debugger/DebuggerInterfaceNone.py
--- eric-18.05/eric/Debugger/DebuggerInterfaceNone.py 2017-12-31 17:26:11.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/DebuggerInterfaceNone.py 2018-07-02 16:56:50.000000000 +0000
@@ -38,33 +38,37 @@
# set default values for capabilities of clients
self.clientCapabilities = ClientDefaultCapabilities
- def startRemote(self, port, runInConsole, interpreter):
+ def startRemote(self, port, runInConsole, venvName):
"""
Public method to start a remote Python interpreter.
- @param port port number the debug server is listening on (integer)
+ @param port port number the debug server is listening on
+ @type int
@param runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @param interpreter interpreter to be used to execute the remote
- side (string)
- @return client process object (QProcess), a flag to indicate
- a network connection (boolean) and the name of the interpreter
- in case of a local execution (string)
+ console window
+ @type bool
+ @param venvName name of the virtual environment to be used
+ @type str
+ @return client process object, a flag to indicate a network connection
+ and the name of the interpreter in case of a local execution
+ @rtype tuple of (QProcess, bool, str)
"""
return None, True, ""
- def startRemoteForProject(self, port, runInConsole, interpreter):
+ def startRemoteForProject(self, port, runInConsole, venvName):
"""
Public method to start a remote Python interpreter for a project.
- @param port port number the debug server is listening on (integer)
+ @param port port number the debug server is listening on
+ @type int
@param runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @param interpreter interpreter to be used to execute the remote
- side (string)
- @return client process object (QProcess), a flag to indicate
- a network connection (boolean) and the name of the interpreter
- in case of a local execution (string)
+ console window
+ @type bool
+ @param venvName name of the virtual environment to be used
+ @type str
+ @return client process object, a flag to indicate a network connection
+ and the name of the interpreter in case of a local execution
+ @rtype tuple of (QProcess, bool, str)
"""
return None, True, ""
@@ -372,6 +376,12 @@
@param arg the arguments to evaluate (string)
"""
return
+
+ def remoteBanner(self):
+ """
+ Public slot to get the banner info of the remote client.
+ """
+ return
def remoteCapabilities(self):
"""
diff -Nru eric-18.05/eric/Debugger/DebuggerInterfacePython.py eric-18.11+ds1/eric/Debugger/DebuggerInterfacePython.py
--- eric-18.05/eric/Debugger/DebuggerInterfacePython.py 2017-12-31 17:26:11.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/DebuggerInterfacePython.py 2018-09-30 09:37:39.000000000 +0000
@@ -132,30 +132,38 @@
return proc
- def startRemote(self, port, runInConsole, interpreter):
+ def startRemote(self, port, runInConsole, venvName):
"""
Public method to start a remote Python interpreter.
- @param port port number the debug server is listening on (integer)
+ @param port port number the debug server is listening on
+ @type int
@param runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @param interpreter interpreter to be used to execute the remote
- side (string)
- @return client process object (QProcess), a flag to indicate
- a network connection (boolean) and the name of the interpreter
- in case of a local execution (string)
+ console window
+ @type bool
+ @param venvName name of the virtual environment to be used
+ @type str
+ @return client process object, a flag to indicate a network connection
+ and the name of the interpreter in case of a local execution
+ @rtype tuple of (QProcess, bool, str)
"""
- if not interpreter:
+ if not venvName:
if self.__variant == "Python2":
- interpreter = Preferences.getDebugger("PythonInterpreter")
+ venvName = Preferences.getDebugger("Python2VirtualEnv")
else:
- interpreter = Preferences.getDebugger("Python3Interpreter")
+ venvName = Preferences.getDebugger("Python3VirtualEnv")
+ interpreter = e5App().getObject("VirtualEnvManager")\
+ .getVirtualenvInterpreter(venvName)
+ if interpreter == "" and \
+ int(self.__variant[-1]) == sys.version_info[0]:
+ # use the interpreter used to run eric for identical variants
+ interpreter = sys.executable.replace("w.exe", ".exe")
if interpreter == "":
E5MessageBox.critical(
None,
self.tr("Start Debugger"),
self.tr(
- """
No {0} interpreter configured.
""")
+ """No suitable {0} environment configured.
""")
.format(self.__variant))
return None, False, ""
@@ -266,32 +274,49 @@
"""The debugger backend could not be started.
"""))
return process, self.__isNetworked, interpreter
- def startRemoteForProject(self, port, runInConsole, interpreter):
+ def startRemoteForProject(self, port, runInConsole, venvName):
"""
Public method to start a remote Python interpreter for a project.
- @param port port number the debug server is listening on (integer)
+ @param port port number the debug server is listening on
+ @type int
@param runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @param interpreter interpreter to be used to execute the remote
- side (string)
- @return client process object (QProcess), a flag to indicate
- a network connection (boolean) and the name of the interpreter
- in case of a local execution (string)
+ console window
+ @type bool
+ @param venvName name of the virtual environment to be used
+ @type str
+ @return client process object, a flag to indicate a network connection
+ and the name of the interpreter in case of a local execution
+ @rtype tuple of (QProcess, bool, str)
"""
project = e5App().getObject("Project")
if not project.isDebugPropertiesLoaded():
return None, self.__isNetworked, ""
# start debugger with project specific settings
- if not interpreter:
- interpreter = project.getDebugProperty("INTERPRETER")
+ if not venvName:
+ venvName = project.getDebugProperty("VIRTUALENV")
debugClient = project.getDebugProperty("DEBUGCLIENT")
redirect = str(project.getDebugProperty("REDIRECT"))
noencoding = \
project.getDebugProperty("NOENCODING") and '--no-encoding' or ''
+ interpreter = e5App().getObject("VirtualEnvManager")\
+ .getVirtualenvInterpreter(venvName)
+ if interpreter == "" and \
+ project.getProjectLanguage().startswith("Python") and \
+ sys.version_info[0] == int(project.getProjectLanguage()[-1]):
+ interpreter = sys.executable.replace("w.exe", ".exe")
+ if interpreter == "":
+ E5MessageBox.critical(
+ None,
+ self.tr("Start Debugger"),
+ self.tr(
+ """No suitable {0} environment configured.
""")
+ .format(self.__variant))
+ return None, self.__isNetworked, ""
+
if project.getDebugProperty("REMOTEDEBUGGER"):
ipaddr = self.debugServer.getHostAddress(False)
rexec = project.getDebugProperty("REMOTECOMMAND")
@@ -1177,13 +1202,15 @@
py3Exts.append(".{0}".format(ext))
registryData = []
- if py2Exts and Preferences.getDebugger("PythonInterpreter"):
+ if py2Exts and (Preferences.getDebugger("Python2VirtualEnv") or
+ sys.version_info[0] == 2):
registryData.append(
("Python2", ClientDefaultCapabilities, py2Exts,
createDebuggerInterfacePython2)
)
- if py3Exts and Preferences.getDebugger("Python3Interpreter"):
+ if py3Exts and (Preferences.getDebugger("Python3VirtualEnv") or
+ sys.version_info[0] == 3):
registryData.append(
("Python3", ClientDefaultCapabilities, py3Exts,
createDebuggerInterfacePython3)
diff -Nru eric-18.05/eric/Debugger/DebugServer.py eric-18.11+ds1/eric/Debugger/DebugServer.py
--- eric-18.05/eric/Debugger/DebugServer.py 2018-02-04 09:58:02.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/DebugServer.py 2018-09-30 09:37:39.000000000 +0000
@@ -14,6 +14,7 @@
pass
import os
+import sys
from PyQt5.QtCore import pyqtSignal, QModelIndex
from PyQt5.QtNetwork import QTcpServer, QHostAddress, QHostInfo, \
@@ -210,18 +211,17 @@
self.clientType = \
Preferences.Prefs.settings.value('DebugClient/Type')
if self.clientType is None:
- import sys
if sys.version_info[0] == 2:
self.clientType = 'Python2'
else:
self.clientType = 'Python3'
- # Change clientType if dependent interpreter not exist anymore
+ # Change clientType if dependent interpreter does not exist anymore
# (maybe deinstalled,...)
elif self.clientType == 'Python2' and Preferences.getDebugger(
- "PythonInterpreter") == '':
+ "Python2VirtualEnv") == '' and sys.version_info[0] == 3:
self.clientType = 'Python3'
elif self.clientType == 'Python3' and Preferences.getDebugger(
- "Python3Interpreter") == '':
+ "Python3VirtualEnv") == '' and sys.version_info[0] == 2:
self.clientType = 'Python2'
self.lastClientType = ''
@@ -301,14 +301,15 @@
registeredInterfaces[interfaceName] = \
self.__debuggerInterfaces[interfaceName]
- self.__debuggerInterfaces = {}
self.__debuggerInterfaceRegistry = {}
for interfaceName, getRegistryData in registeredInterfaces.items():
- self.registerDebuggerInterface(interfaceName, getRegistryData)
+ self.registerDebuggerInterface(interfaceName, getRegistryData,
+ reregister=True)
self.__maxVariableSize = Preferences.getDebugger("MaxVariableSize")
- def registerDebuggerInterface(self, interfaceName, getRegistryData):
+ def registerDebuggerInterface(self, interfaceName, getRegistryData,
+ reregister=False):
"""
Public method to register a debugger interface.
@@ -320,8 +321,10 @@
list of associated file extensions and a function reference
to create the debugger interface (see __createDebuggerInterface())
@type function
+ @param reregister flag indicating to re-register the interface
+ @type bool
"""
- if interfaceName in self.__debuggerInterfaces:
+ if interfaceName in self.__debuggerInterfaces and not reregister:
E5MessageBox.warning(
None,
self.tr("Register Debugger Interface"),
@@ -329,9 +332,10 @@
""" been registered. Ignoring this request.
"""))
return
+ if not reregister:
+ self.__debuggerInterfaces[interfaceName] = getRegistryData
registryDataList = getRegistryData()
if registryDataList:
- self.__debuggerInterfaces[interfaceName] = getRegistryData
for clientLanguage, clientCapabilities, clientExtensions, \
interfaceCreator in registryDataList:
self.__debuggerInterfaceRegistry[clientLanguage] = [
@@ -449,26 +453,35 @@
'DebugClient/Type', self.clientType)
def startClient(self, unplanned=True, clType=None, forProject=False,
- runInConsole=False, interpreter=""):
+ runInConsole=False, venvName=""):
"""
Public method to start a debug client.
- @keyparam unplanned flag indicating that the client has died (boolean)
- @keyparam clType type of client to be started (string)
- @keyparam forProject flag indicating a project related action (boolean)
+ @keyparam unplanned flag indicating that the client has died
+ @type bool
+ @keyparam clType type of client to be started
+ @type str
+ @keyparam forProject flag indicating a project related action
+ @type bool
@keyparam runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @keyparam interpreter interpreter to be used to execute the remote
- side (string)
+ console window
+ @type bool
+ @keyparam venvName name of the virtual environment to be used
+ @type str
"""
self.running = False
if not self.passive or not self.passiveClientExited:
if self.debuggerInterface and self.debuggerInterface.isConnected():
self.shutdownServer()
+ self.debugging = False
self.clientGone.emit(unplanned and self.debugging)
if clType:
+ if clType not in self.getSupportedLanguages():
+ # a not supported client language was requested
+ return
+
self.__setClientType(clType)
# only start the client, if we are not in passive mode
@@ -485,15 +498,15 @@
if not project.isDebugPropertiesLoaded():
self.clientProcess, isNetworked, clientInterpreter = \
self.debuggerInterface.startRemote(
- self.serverPort(), runInConsole, interpreter)
+ self.serverPort(), runInConsole, venvName)
else:
self.clientProcess, isNetworked, clientInterpreter = \
self.debuggerInterface.startRemoteForProject(
- self.serverPort(), runInConsole, interpreter)
+ self.serverPort(), runInConsole, venvName)
else:
self.clientProcess, isNetworked, clientInterpreter = \
self.debuggerInterface.startRemote(
- self.serverPort(), runInConsole, interpreter)
+ self.serverPort(), runInConsole, venvName)
if self.clientProcess:
self.clientProcess.readyReadStandardError.connect(
@@ -508,8 +521,8 @@
elif self.__autoClearShell:
self.__autoClearShell = False
self.remoteBanner()
- self.remoteClientVariables(0, [], 0)
- self.remoteClientVariables(1, [], 0)
+## self.remoteClientVariables(0, [], 0)
+## self.remoteClientVariables(1, [], 0)
else:
if clType and self.lastClientType:
self.__setClientType(self.lastClientType)
@@ -733,7 +746,25 @@
@return interpreter of the debug client (string)
"""
return self.clientInterpreter
+
+ def getClientType(self):
+ """
+ Public method to get the currently running debug client type.
+ @return debug client type
+ @rtype str
+ """
+ return self.clientType
+
+ def isClientProcessUp(self):
+ """
+ Public method to check, if the debug client process is up.
+
+ @return flag indicating a running debug client process
+ @rtype bool
+ """
+ return self.clientProcess is not None
+
def __newConnection(self):
"""
Private slot to handle a new connection.
@@ -804,38 +835,61 @@
pass
self.debuggerInterface.remoteEnvironment(envdict)
- def remoteLoad(self, interpreter, fn, argv, wd, env, autoClearShell=True,
+ def remoteLoad(self, venvName, fn, argv, wd, env, autoClearShell=True,
tracePython=False, autoContinue=True, forProject=False,
runInConsole=False, autoFork=False, forkChild=False,
clientType="", enableCallTrace=False):
"""
Public method to load a new program to debug.
- @param interpreter interpreter to be used to execute the remote
- side (string)
- @param fn the filename to debug (string)
- @param argv the commandline arguments to pass to the program (string)
- @param wd the working directory for the program (string)
- @param env environment settings (string)
+ @param venvName name of the virtual environment to be used
+ @type str
+ @param fn the filename to debug
+ @type str
+ @param argv the command line arguments to pass to the program
+ @type str
+ @param wd the working directory for the program
+ @type str
+ @param env environment parameter settings
+ @type str
@keyparam autoClearShell flag indicating, that the interpreter window
- should be cleared (boolean)
+ should be cleared
+ @type bool
@keyparam tracePython flag indicating if the Python library should be
- traced as well (boolean)
+ traced as well
+ @type bool
@keyparam autoContinue flag indicating, that the debugger should not
- stop at the first executable line (boolean)
- @keyparam forProject flag indicating a project related action (boolean)
+ stop at the first executable line
+ @type bool
+ @keyparam forProject flag indicating a project related action
+ @type bool
@keyparam runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @keyparam autoFork flag indicating the automatic fork mode (boolean)
+ console window
+ @type bool
+ @keyparam autoFork flag indicating the automatic fork mode
+ @type bool
@keyparam forkChild flag indicating to debug the child after forking
- (boolean)
- @keyparam clientType client type to be used (string)
+ @type bool
+ @keyparam clientType client type to be used
+ @type str
@keyparam enableCallTrace flag indicating to enable the call trace
- function (boolean)
+ function
+ @type bool
"""
self.__autoClearShell = autoClearShell
self.__autoContinue = autoContinue
+ if clientType not in self.getSupportedLanguages():
+ # a not supported client language was requested
+ E5MessageBox.critical(
+ None,
+ self.tr("Start Debugger"),
+ self.tr(
+ """The debugger type {0} is not supported"""
+ """ or not configured.
""").format(clientType)
+ )
+ return
+
# Restart the client
try:
if clientType:
@@ -846,7 +900,7 @@
except KeyError:
self.__setClientType('Python3') # assume it is a Python3 file
self.startClient(False, forProject=forProject,
- runInConsole=runInConsole, interpreter=interpreter)
+ runInConsole=runInConsole, venvName=venvName)
self.setCallTraceEnabled(enableCallTrace)
self.remoteEnvironment(env)
@@ -858,30 +912,50 @@
self.__restoreBreakpoints()
self.__restoreWatchpoints()
- def remoteRun(self, interpreter, fn, argv, wd, env, autoClearShell=True,
+ def remoteRun(self, venvName, fn, argv, wd, env, autoClearShell=True,
forProject=False, runInConsole=False, autoFork=False,
forkChild=False, clientType=""):
"""
Public method to load a new program to run.
- @param interpreter interpreter to be used to execute the remote
- side (string)
- @param fn the filename to run (string)
- @param argv the commandline arguments to pass to the program (string)
- @param wd the working directory for the program (string)
- @param env environment settings (string)
+ @param venvName name of the virtual environment to be used
+ @type str
+ @param fn the filename to debug
+ @type str
+ @param argv the command line arguments to pass to the program
+ @type str
+ @param wd the working directory for the program
+ @type str
+ @param env environment parameter settings
+ @type str
@keyparam autoClearShell flag indicating, that the interpreter window
- should be cleared (boolean)
- @keyparam forProject flag indicating a project related action (boolean)
+ should be cleared
+ @type bool
+ @keyparam forProject flag indicating a project related action
+ @type bool
@keyparam runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @keyparam autoFork flag indicating the automatic fork mode (boolean)
+ console window
+ @type bool
+ @keyparam autoFork flag indicating the automatic fork mode
+ @type bool
@keyparam forkChild flag indicating to debug the child after forking
- (boolean)
- @keyparam clientType client type to be used (string)
+ @type bool
+ @keyparam clientType client type to be used
+ @type str
"""
self.__autoClearShell = autoClearShell
+ if clientType not in self.getSupportedLanguages():
+ E5MessageBox.critical(
+ None,
+ self.tr("Start Debugger"),
+ self.tr(
+ """The debugger type {0} is not supported"""
+ """ or not configured.
""").format(clientType)
+ )
+ # a not supported client language was requested
+ return
+
# Restart the client
try:
if clientType:
@@ -892,7 +966,7 @@
except KeyError:
self.__setClientType('Python3') # assume it is a Python3 file
self.startClient(False, forProject=forProject,
- runInConsole=runInConsole, interpreter=interpreter)
+ runInConsole=runInConsole, venvName=venvName)
self.remoteEnvironment(env)
@@ -900,29 +974,49 @@
self.debugging = False
self.running = True
- def remoteCoverage(self, interpreter, fn, argv, wd, env,
+ def remoteCoverage(self, venvName, fn, argv, wd, env,
autoClearShell=True, erase=False, forProject=False,
runInConsole=False, clientType=""):
"""
Public method to load a new program to collect coverage data.
- @param interpreter interpreter to be used to execute the remote
- side (string)
- @param fn the filename to run (string)
- @param argv the commandline arguments to pass to the program (string)
- @param wd the working directory for the program (string)
- @param env environment settings (string)
+ @param venvName name of the virtual environment to be used
+ @type str
+ @param fn the filename to debug
+ @type str
+ @param argv the command line arguments to pass to the program
+ @type str
+ @param wd the working directory for the program
+ @type str
+ @param env environment parameter settings
+ @type str
@keyparam autoClearShell flag indicating, that the interpreter window
- should be cleared (boolean)
+ should be cleared
+ @type bool
@keyparam erase flag indicating that coverage info should be
- cleared first (boolean)
- @keyparam forProject flag indicating a project related action (boolean)
+ cleared first
+ @type bool
+ @keyparam forProject flag indicating a project related action
+ @type bool
@keyparam runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @keyparam clientType client type to be used (string)
+ console window
+ @type bool
+ @keyparam clientType client type to be used
+ @type str
"""
self.__autoClearShell = autoClearShell
+ if clientType not in self.getSupportedLanguages():
+ # a not supported client language was requested
+ E5MessageBox.critical(
+ None,
+ self.tr("Start Debugger"),
+ self.tr(
+ """The debugger type {0} is not supported"""
+ """ or not configured.
""").format(clientType)
+ )
+ return
+
# Restart the client
try:
if clientType:
@@ -933,7 +1027,7 @@
except KeyError:
self.__setClientType('Python3') # assume it is a Python3 file
self.startClient(False, forProject=forProject,
- runInConsole=runInConsole, interpreter=interpreter)
+ runInConsole=runInConsole, venvName=venvName)
self.remoteEnvironment(env)
@@ -941,29 +1035,49 @@
self.debugging = False
self.running = True
- def remoteProfile(self, interpreter, fn, argv, wd, env,
+ def remoteProfile(self, venvName, fn, argv, wd, env,
autoClearShell=True, erase=False, forProject=False,
runInConsole=False, clientType=""):
"""
Public method to load a new program to collect profiling data.
- @param interpreter interpreter to be used to execute the remote
- side (string)
- @param fn the filename to run (string)
- @param argv the commandline arguments to pass to the program (string)
- @param wd the working directory for the program (string)
- @param env environment settings (string)
+ @param venvName name of the virtual environment to be used
+ @type str
+ @param fn the filename to debug
+ @type str
+ @param argv the command line arguments to pass to the program
+ @type str
+ @param wd the working directory for the program
+ @type str
+ @param env environment parameter settings
+ @type str
@keyparam autoClearShell flag indicating, that the interpreter window
- should be cleared (boolean)
- @keyparam erase flag indicating that timing info should be cleared
- first (boolean)
- @keyparam forProject flag indicating a project related action (boolean)
+ should be cleared
+ @type bool
+ @keyparam erase flag indicating that coverage info should be
+ cleared first
+ @type bool
+ @keyparam forProject flag indicating a project related action
+ @type bool
@keyparam runInConsole flag indicating to start the debugger in a
- console window (boolean)
- @keyparam clientType client type to be used (string)
+ console window
+ @type bool
+ @keyparam clientType client type to be used
+ @type str
"""
self.__autoClearShell = autoClearShell
+ if clientType not in self.getSupportedLanguages():
+ # a not supported client language was requested
+ E5MessageBox.critical(
+ None,
+ self.tr("Start Debugger"),
+ self.tr(
+ """The debugger type {0} is not supported"""
+ """ or not configured.
""").format(clientType)
+ )
+ return
+
# Restart the client
try:
if clientType:
@@ -974,7 +1088,7 @@
except KeyError:
self.__setClientType('Python3') # assume it is a Python3 file
self.startClient(False, forProject=forProject,
- runInConsole=runInConsole, interpreter=interpreter)
+ runInConsole=runInConsole, venvName=venvName)
self.remoteEnvironment(env)
@@ -1203,6 +1317,17 @@
(boolean)
@keyparam clientType client type to be used (string)
"""
+ if clientType not in self.getSupportedLanguages():
+ # a not supported client language was requested
+ E5MessageBox.critical(
+ None,
+ self.tr("Start Debugger"),
+ self.tr(
+ """The debugger type {0} is not supported"""
+ """ or not configured.
""").format(clientType)
+ )
+ return
+
# Restart the client if there is already a program loaded.
try:
if clientType:
@@ -1365,6 +1490,7 @@
self.clientExit.emit(int(status), message)
if Preferences.getDebugger("AutomaticReset") or (self.running and
not self.debugging):
+ self.debugging = False
self.startClient(False)
if self.passive:
self.__createDebuggerInterface("None")
@@ -1432,8 +1558,12 @@
@param capabilities bitmaks with the client capabilities (integer)
@param clientType type of the debug client (string)
"""
- self.__debuggerInterfaceRegistry[clientType][0] = capabilities
- self.clientCapabilities.emit(capabilities, clientType)
+ try:
+ self.__debuggerInterfaceRegistry[clientType][0] = capabilities
+ self.clientCapabilities.emit(capabilities, clientType)
+ except KeyError:
+ # ignore silently
+ pass
def signalClientCompletionList(self, completionList, text):
"""
@@ -1604,3 +1734,21 @@
@return flag indicating a connection (boolean)
"""
return self.debuggerInterface and self.debuggerInterface.isConnected()
+
+ def isDebugging(self):
+ """
+ Public method to test, if the debug server is debugging.
+
+ @return flag indicating the debugging state
+ @rtype bool
+ """
+ return self.debugging
+
+ def setDebugging(self, on):
+ """
+ Public method to set the debugging state.
+
+ @param on flag indicating the new debugging state
+ @type bool
+ """
+ self.debugging = on
diff -Nru eric-18.05/eric/Debugger/DebugUI.py eric-18.11+ds1/eric/Debugger/DebugUI.py
--- eric-18.05/eric/Debugger/DebugUI.py 2018-05-01 10:02:01.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/DebugUI.py 2018-08-01 17:24:38.000000000 +0000
@@ -80,8 +80,8 @@
self.editorOpen = False
# read the saved debug info values
- self.interpreterHistory = Preferences.toList(
- Preferences.Prefs.settings.value('DebugInfo/InterpreterHistory'))
+ self.lastUsedVenvName = Preferences.Prefs.settings.value(
+ 'DebugInfo/VirtualEnvironment', '')
self.argvHistory = Preferences.toList(
Preferences.Prefs.settings.value('DebugInfo/ArgumentsHistory'))
self.wdHistory = Preferences.toList(
@@ -137,8 +137,6 @@
debugServer.passiveDebugStarted.connect(self.__passiveDebugStarted)
debugServer.clientThreadSet.connect(self.__clientThreadSet)
- debugServer.clientRawInput.connect(debugViewer.handleRawInput)
- debugServer.clientRawInputSent.connect(debugViewer.restoreCurrentPage)
debugServer.clientThreadList.connect(debugViewer.showThreadList)
# Connect the signals emitted by the viewmanager
@@ -675,25 +673,6 @@
return [starttb, debugtb]
- def setInterpreterHistory(self, interpreterStr, clearHistories=False,
- history=None):
- """
- Public slot to initialize the interpreter history.
-
- @param interpreterStr interpreter (string)
- @param clearHistories flag indicating, that the list should
- be cleared (boolean)
- @param history list of history entries to be set (list of strings)
- """
- if clearHistories:
- del self.interpreterHistory[1:]
- elif history is not None:
- self.interpreterHistory = history[:]
- else:
- if interpreterStr in self.interpreterHistory:
- self.interpreterHistory.remove(interpreterStr)
- self.interpreterHistory.insert(0, interpreterStr)
-
def setArgvHistory(self, argsStr, clearHistories=False, history=None):
"""
Public slot to initialize the argv history.
@@ -934,14 +913,11 @@
"""
Public method to clear the various debug histories.
"""
- self.interpreterHistory = []
self.argvHistory = []
self.wdHistory = []
self.envHistory = []
Preferences.Prefs.settings.setValue(
- 'DebugInfo/InterpreterHistory', self.interpreterHistory)
- Preferences.Prefs.settings.setValue(
'DebugInfo/ArgumentsHistory', self.argvHistory)
Preferences.Prefs.settings.setValue(
'DebugInfo/WorkingDirectoryHistory', self.wdHistory)
@@ -953,13 +929,12 @@
Public method to perform shutdown actions.
"""
# Just save the 10 most recent entries
- del self.interpreterHistory[10:]
del self.argvHistory[10:]
del self.wdHistory[10:]
del self.envHistory[10:]
Preferences.Prefs.settings.setValue(
- 'DebugInfo/InterpreterHistory', self.interpreterHistory)
+ 'DebugInfo/VirtualEnvironment', self.lastUsedVenvName)
Preferences.Prefs.settings.setValue(
'DebugInfo/ArgumentsHistory', self.argvHistory)
Preferences.Prefs.settings.setValue(
@@ -1223,6 +1198,7 @@
exceptionType,
Utilities.html_encode(exceptionMessage)))
if res == E5MessageBox.Yes:
+ self.debugServer.setDebugging(True)
self.exceptionInterrupt.emit()
stack = []
for fn, ln, func, args in stackTrace:
@@ -1579,12 +1555,12 @@
else:
cap = self.tr("Coverage of Script")
dlg = StartDialog(
- cap, self.interpreterHistory, self.argvHistory, self.wdHistory,
+ cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
self.envHistory, self.exceptions, self.ui, 2,
autoClearShell=self.autoClearShell)
if dlg.exec_() == QDialog.Accepted:
- interpreter, argv, wd, env, exceptions, clearShell, console = \
- dlg.getData()
+ (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
+ console) = dlg.getData()
eraseCoverage = dlg.getCoverageData()
if runProject:
@@ -1604,7 +1580,7 @@
# save the info for later use
self.project.setDbgInfo(
- interpreter, argv, wd, env, exceptions, self.excList,
+ lastUsedVenvName, argv, wd, env, exceptions, self.excList,
self.excIgnoreList, clearShell)
self.lastStartAction = 6
@@ -1628,9 +1604,11 @@
self.lastDebuggedFile = fn
self.restartAct.setEnabled(True)
+ # save the most recently used virtual environment
+ self.lastUsedVenvName = lastUsedVenvName
+
# This moves any previous occurrence of these arguments to the head
# of the list.
- self.setInterpreterHistory(interpreter)
self.setArgvHistory(argv)
self.setWdHistory(wd)
self.setEnvHistory(env)
@@ -1660,7 +1638,7 @@
# Ask the client to open the new program.
self.debugServer.remoteCoverage(
- interpreter, fn, argv, wd, env,
+ lastUsedVenvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell, erase=eraseCoverage,
forProject=runProject, runInConsole=console,
clientType=self.clientType)
@@ -1668,14 +1646,11 @@
self.stopAct.setEnabled(True)
if dlg.clearHistories():
- self.setInterpreterHistory("", clearHistories=True)
self.setArgvHistory("", clearHistories=True)
self.setWdHistory("", clearHistories=True)
self.setEnvHistory("", clearHistories=True)
elif dlg.historiesModified():
- argvHistory, wdHistory, envHistory, interpreterHistory = \
- dlg.getHistories()
- self.setInterpreterHistory("", history=interpreterHistory)
+ argvHistory, wdHistory, envHistory = dlg.getHistories()
self.setArgvHistory("", history=argvHistory)
self.setWdHistory("", history=wdHistory)
self.setEnvHistory("", history=envHistory)
@@ -1712,12 +1687,12 @@
else:
cap = self.tr("Profile of Script")
dlg = StartDialog(
- cap, self.interpreterHistory, self.argvHistory, self.wdHistory,
+ cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
self.envHistory, self.exceptions, self.ui, 3,
autoClearShell=self.autoClearShell)
if dlg.exec_() == QDialog.Accepted:
- interpreter, argv, wd, env, exceptions, clearShell, console = \
- dlg.getData()
+ (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
+ console) = dlg.getData()
eraseTimings = dlg.getProfilingData()
if runProject:
@@ -1737,7 +1712,7 @@
# save the info for later use
self.project.setDbgInfo(
- interpreter, argv, wd, env, exceptions, self.excList,
+ lastUsedVenvName, argv, wd, env, exceptions, self.excList,
self.excIgnoreList, clearShell)
self.lastStartAction = 8
@@ -1761,9 +1736,11 @@
self.lastDebuggedFile = fn
self.restartAct.setEnabled(True)
+ # save the most recently used virtual environment
+ self.lastUsedVenvName = lastUsedVenvName
+
# This moves any previous occurrence of these arguments to the head
# of the list.
- self.setInterpreterHistory(interpreter)
self.setArgvHistory(argv)
self.setWdHistory(wd)
self.setEnvHistory(env)
@@ -1793,7 +1770,7 @@
# Ask the client to open the new program.
self.debugServer.remoteProfile(
- interpreter, fn, argv, wd, env,
+ lastUsedVenvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell, erase=eraseTimings,
forProject=runProject, runInConsole=console,
clientType=self.clientType)
@@ -1801,14 +1778,11 @@
self.stopAct.setEnabled(True)
if dlg.clearHistories():
- self.setInterpreterHistory("", clearHistories=True)
self.setArgvHistory("", clearHistories=True)
self.setWdHistory("", clearHistories=True)
self.setEnvHistory("", clearHistories=True)
elif dlg.historiesModified():
- argvHistory, wdHistory, envHistory, interpreterHistory = \
- dlg.getHistories()
- self.setInterpreterHistory("", history=interpreterHistory)
+ argvHistory, wdHistory, envHistory = dlg.getHistories()
self.setArgvHistory("", history=argvHistory)
self.setWdHistory("", history=wdHistory)
self.setEnvHistory("", history=envHistory)
@@ -1845,14 +1819,14 @@
else:
cap = self.tr("Run Script")
dlg = StartDialog(
- cap, self.interpreterHistory, self.argvHistory, self.wdHistory,
+ cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
self.envHistory, self.exceptions, self.ui, 1,
autoClearShell=self.autoClearShell,
autoFork=self.forkAutomatically,
forkChild=self.forkIntoChild)
if dlg.exec_() == QDialog.Accepted:
- interpreter, argv, wd, env, exceptions, clearShell, console = \
- dlg.getData()
+ (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
+ console) = dlg.getData()
forkAutomatically, forkIntoChild = dlg.getRunData()
if runProject:
@@ -1872,7 +1846,7 @@
# save the info for later use
self.project.setDbgInfo(
- interpreter, argv, wd, env, exceptions, self.excList,
+ lastUsedVenvName, argv, wd, env, exceptions, self.excList,
self.excIgnoreList, clearShell)
self.lastStartAction = 4
@@ -1896,9 +1870,11 @@
self.lastDebuggedFile = fn
self.restartAct.setEnabled(True)
+ # save the most recently used virtual environment
+ self.lastUsedVenvName = lastUsedVenvName
+
# This moves any previous occurrence of these arguments to the head
# of the list.
- self.setInterpreterHistory(interpreter)
self.setArgvHistory(argv)
self.setWdHistory(wd)
self.setEnvHistory(env)
@@ -1929,7 +1905,7 @@
# Ask the client to open the new program.
self.debugServer.remoteRun(
- interpreter, fn, argv, wd, env,
+ lastUsedVenvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell, forProject=runProject,
runInConsole=console, autoFork=forkAutomatically,
forkChild=forkIntoChild, clientType=self.clientType)
@@ -1937,14 +1913,11 @@
self.stopAct.setEnabled(True)
if dlg.clearHistories():
- self.setInterpreterHistory("", clearHistories=True)
self.setArgvHistory("", clearHistories=True)
self.setWdHistory("", clearHistories=True)
self.setEnvHistory("", clearHistories=True)
elif dlg.historiesModified():
- argvHistory, wdHistory, envHistory, interpreterHistory = \
- dlg.getHistories()
- self.setInterpreterHistory("", history=interpreterHistory)
+ argvHistory, wdHistory, envHistory = dlg.getHistories()
self.setArgvHistory("", history=argvHistory)
self.setWdHistory("", history=wdHistory)
self.setEnvHistory("", history=envHistory)
@@ -1981,14 +1954,14 @@
else:
cap = self.tr("Debug Script")
dlg = StartDialog(
- cap, self.interpreterHistory, self.argvHistory, self.wdHistory,
+ cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory,
self.envHistory, self.exceptions, self.ui, 0,
tracePython=self.tracePython, autoClearShell=self.autoClearShell,
autoContinue=self.autoContinue, autoFork=self.forkAutomatically,
forkChild=self.forkIntoChild)
if dlg.exec_() == QDialog.Accepted:
- interpreter, argv, wd, env, exceptions, clearShell, console = \
- dlg.getData()
+ (lastUsedVenvName, argv, wd, env, exceptions, clearShell,
+ console) = dlg.getData()
tracePython, autoContinue, forkAutomatically, forkIntoChild = \
dlg.getDebugData()
@@ -2009,7 +1982,7 @@
# save the info for later use
self.project.setDbgInfo(
- interpreter, argv, wd, env, exceptions, self.excList,
+ lastUsedVenvName, argv, wd, env, exceptions, self.excList,
self.excIgnoreList, clearShell, tracePython=tracePython,
autoContinue=self.autoContinue)
@@ -2034,9 +2007,11 @@
self.lastDebuggedFile = fn
self.restartAct.setEnabled(True)
+ # save the most recently used virtual environment
+ self.lastUsedVenvName = lastUsedVenvName
+
# This moves any previous occurrence of these arguments to the head
# of the list.
- self.setInterpreterHistory(interpreter)
self.setArgvHistory(argv)
self.setWdHistory(wd)
self.setEnvHistory(env)
@@ -2079,7 +2054,7 @@
# Ask the client to open the new program.
self.debugServer.remoteLoad(
- interpreter, fn, argv, wd, env,
+ lastUsedVenvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell,
tracePython=tracePython,
autoContinue=autoContinue, forProject=debugProject,
@@ -2087,20 +2062,19 @@
forkChild=forkIntoChild, clientType=self.clientType,
enableCallTrace=enableCallTrace)
- # Signal that we have started a debugging session
- self.debuggingStarted.emit(fn)
-
- self.stopAct.setEnabled(True)
+ if self.debugServer.isClientProcessUp() and \
+ self.debugServer.getClientType() == self.clientType:
+ # Signal that we have started a debugging session
+ self.debuggingStarted.emit(fn)
+
+ self.stopAct.setEnabled(True)
if dlg.clearHistories():
- self.setInterpreterHistory("", clearHistories=True)
self.setArgvHistory("", clearHistories=True)
self.setWdHistory("", clearHistories=True)
self.setEnvHistory("", clearHistories=True)
elif dlg.historiesModified():
- argvHistory, wdHistory, envHistory, interpreterHistory = \
- dlg.getHistories()
- self.setInterpreterHistory("", history=interpreterHistory)
+ argvHistory, wdHistory, envHistory = dlg.getHistories()
self.setArgvHistory("", history=argvHistory)
self.setWdHistory("", history=wdHistory)
self.setEnvHistory("", history=envHistory)
@@ -2131,7 +2105,7 @@
return # should not happen
# get the saved stuff
- interpreter = self.interpreterHistory[0]
+ venvName = self.lastUsedVenvName
wd = self.wdHistory[0]
argv = self.argvHistory[0]
fn = self.lastDebuggedFile
@@ -2156,7 +2130,7 @@
# Ask the client to debug the new program.
self.debugServer.remoteLoad(
- interpreter, fn, argv, wd, env,
+ venvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell,
tracePython=self.tracePython,
autoContinue=self.autoContinue,
@@ -2173,7 +2147,7 @@
elif self.lastStartAction in [3, 4]:
# Ask the client to run the new program.
self.debugServer.remoteRun(
- interpreter, fn, argv, wd, env,
+ venvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell,
forProject=forProject,
runInConsole=self.runInConsole,
@@ -2184,7 +2158,7 @@
elif self.lastStartAction in [5, 6]:
# Ask the client to coverage run the new program.
self.debugServer.remoteCoverage(
- interpreter, fn, argv, wd, env,
+ venvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell,
erase=self.eraseCoverage,
forProject=forProject,
@@ -2194,7 +2168,7 @@
elif self.lastStartAction in [7, 8]:
# Ask the client to profile run the new program.
self.debugServer.remoteProfile(
- interpreter, fn, argv, wd, env,
+ venvName, fn, argv, wd, env,
autoClearShell=self.autoClearShell,
erase=self.eraseTimings,
forProject=forProject,
diff -Nru eric-18.05/eric/Debugger/DebugViewer.py eric-18.11+ds1/eric/Debugger/DebugViewer.py
--- eric-18.05/eric/Debugger/DebugViewer.py 2017-12-31 17:26:11.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/DebugViewer.py 2018-08-01 17:24:38.000000000 +0000
@@ -48,8 +48,7 @@
"""
sourceFile = pyqtSignal(str, int)
- def __init__(self, debugServer, docked, vm, parent=None,
- embeddedShell=True, embeddedBrowser=True):
+ def __init__(self, debugServer, docked, vm, parent=None):
"""
Constructor
@@ -57,13 +56,6 @@
@param docked flag indicating a dock window
@param vm reference to the viewmanager object
@param parent parent widget (QWidget)
- @param embeddedShell flag indicating whether the shell should be
- included. This flag is set to False by those layouts, that have
- the interpreter shell in a separate window.
- @param embeddedBrowser flag indicating whether the file browser should
- be included. This flag is set to False by those layouts, that
- have the file browser in a separate window or embedded
- in the project browser instead.
"""
super(DebugViewer, self).__init__(parent)
@@ -79,27 +71,6 @@
self.__tabWidget = E5TabWidget()
self.__mainLayout.addWidget(self.__tabWidget)
- self.embeddedShell = embeddedShell
- if embeddedShell:
- from QScintilla.Shell import ShellAssembly
- # add the interpreter shell
- self.shellAssembly = ShellAssembly(debugServer, vm, False)
- self.shell = self.shellAssembly.shell()
- index = self.__tabWidget.addTab(
- self.shellAssembly,
- UI.PixmapCache.getIcon("shell.png"), '')
- self.__tabWidget.setTabToolTip(index, self.shell.windowTitle())
-
- self.embeddedBrowser = embeddedBrowser
- if embeddedBrowser:
- from UI.Browser import Browser
- # add the browser
- self.browser = Browser()
- index = self.__tabWidget.addTab(
- self.browser,
- UI.PixmapCache.getIcon("browser.png"), '')
- self.__tabWidget.setTabToolTip(index, self.browser.windowTitle())
-
from .VariablesViewer import VariablesViewer
# add the global variables viewer
self.glvWidget = QWidget()
@@ -249,13 +220,7 @@
self.__tabWidget.setTabToolTip(
index, self.exceptionLogger.windowTitle())
- if self.embeddedShell:
- self.__tabWidget.setCurrentWidget(self.shellAssembly)
- else:
- if self.embeddedBrowser:
- self.__tabWidget.setCurrentWidget(self.browser)
- else:
- self.__tabWidget.setCurrentWidget(self.glvWidget)
+ self.__tabWidget.setCurrentWidget(self.glvWidget)
# add the threads viewer
self.__mainLayout.addWidget(QLabel(self.tr("Threads:")))
@@ -273,7 +238,6 @@
self.__mainLayout.setStretchFactor(self.__tabWidget, 5)
self.__mainLayout.setStretchFactor(self.__threadList, 1)
- self.currPage = None
self.currentStack = None
self.framenr = 0
@@ -311,23 +275,9 @@
self.currentStack = None
self.stackComboBox.clear()
self.__threadList.clear()
- if self.embeddedShell:
- self.__tabWidget.setCurrentWidget(self.shellAssembly)
- else:
- if self.embeddedBrowser:
- self.__tabWidget.setCurrentWidget(self.browser)
- else:
- self.__tabWidget.setCurrentWidget(self.glvWidget)
+ self.__tabWidget.setCurrentWidget(self.glvWidget)
self.breakpointViewer.handleResetUI()
- def handleRawInput(self):
- """
- Public slot to handle the switch to the shell in raw input mode.
- """
- if self.embeddedShell:
- self.saveCurrentPage()
- self.__tabWidget.setCurrentWidget(self.shellAssembly)
-
def initCallStackViewer(self, projectMode):
"""
Public method to initialize the call stack viewer.
@@ -397,19 +347,6 @@
else:
self.__tabWidget.setCurrentWidget(self.lvWidget)
- def saveCurrentPage(self):
- """
- Public slot to save the current page.
- """
- self.currPage = self.__tabWidget.currentWidget()
-
- def restoreCurrentPage(self):
- """
- Public slot to restore the previously saved page.
- """
- if self.currPage is not None:
- self.__tabWidget.setCurrentWidget(self.currPage)
-
def handleClientStack(self, stack):
"""
Public slot to show the call stack of the program being debugged.
@@ -456,7 +393,8 @@
@param frmnr frame number (0 is the current frame) (int)
"""
self.framenr = frmnr
- self.debugServer.remoteClientVariables(0, self.localsFilter, frmnr)
+ if self.debugServer.isDebugging():
+ self.debugServer.remoteClientVariables(0, self.localsFilter, frmnr)
if self.__autoViewSource:
self.__showSource()
@@ -465,19 +403,21 @@
"""
Public slot to set the global variable filter.
"""
- filterStr = self.globalsFilterEdit.text()
- self.debugServer.remoteClientSetFilter(1, filterStr)
- self.debugServer.remoteClientVariables(2, self.globalsFilter)
+ if self.debugServer.isDebugging():
+ filterStr = self.globalsFilterEdit.text()
+ self.debugServer.remoteClientSetFilter(1, filterStr)
+ self.debugServer.remoteClientVariables(2, self.globalsFilter)
def setLocalsFilter(self):
"""
Public slot to set the local variable filter.
"""
- filterStr = self.localsFilterEdit.text()
- self.debugServer.remoteClientSetFilter(0, filterStr)
- if self.currentStack:
- self.debugServer.remoteClientVariables(
- 0, self.localsFilter, self.framenr)
+ if self.debugServer.isDebugging():
+ filterStr = self.localsFilterEdit.text()
+ self.debugServer.remoteClientSetFilter(0, filterStr)
+ if self.currentStack:
+ self.debugServer.remoteClientVariables(
+ 0, self.localsFilter, self.framenr)
def handleDebuggingStarted(self):
"""
diff -Nru eric-18.05/eric/Debugger/StartCoverageDialog.ui eric-18.11+ds1/eric/Debugger/StartCoverageDialog.ui
--- eric-18.05/eric/Debugger/StartCoverageDialog.ui 2017-11-03 11:06:56.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/StartCoverageDialog.ui 2018-11-01 10:46:30.000000000 +0000
@@ -6,8 +6,8 @@
0
0
- 488
- 185
+ 550
+ 228
@@ -18,37 +18,17 @@
-
-
-
-
-
+
+
-
+
- Interpreter:
+ &Working directory:
workdirPicker
- -
-
-
-
- 0
- 0
-
-
-
- Qt::WheelFocus
-
-
- Enter the interpreter to be used
-
-
- <b>Interpreter</b>
-<p>Enter the interpreter to be used. Leave it empty to use the default interprter, i.e. the one configured globally or per project.</p>
-
-
-
-
@@ -88,13 +68,33 @@
- -
-
-
- &Working directory:
+
-
+
+
+
+ 0
+ 0
+
-
- workdirPicker
+
+ Enter the environment variables to be set.
+
+
+ <b>Environment Variables</b>
+<p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p>
+<p>Example: var1=1 var2="hello world" var3+=":/tmp"</p>
+
+
+ true
+
+
+ QComboBox::InsertAtTop
+
+
+ QComboBox::AdjustToMinimumContentsLengthWithIcon
+
+
+ false
@@ -118,18 +118,8 @@
- -
-
-
- &Environment:
-
-
- environmentCombo
-
-
-
- -
-
+
-
+
0
@@ -137,24 +127,30 @@
- Enter the environment variables to be set.
+ Select the virtual environment to be used
- <b>Environment</b>
-<p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p>
-<p>Example: var1=1 var2="hello world" var3+=":/tmp"</p>
+ <b>Virtual Environment</b>\n<p>Enter the virtual environment to be used. Leave it empty to use the default environment, i.e. the one configured globally or per project.</p>
-
- true
+
+
+ -
+
+
+ &Virtual Environment:
-
- QComboBox::InsertAtTop
+
+ venvComboBox
-
- QComboBox::AdjustToMinimumContentsLengthWithIcon
+
+
+ -
+
+
+ &Environment Variables:
-
- false
+
+ environmentCombo
@@ -253,7 +249,7 @@
- interpreterPicker
+ venvComboBox
cmdlineCombo
workdirPicker
environmentCombo
@@ -271,8 +267,8 @@
accept()
- 28
- 176
+ 37
+ 218
28
@@ -287,8 +283,8 @@
reject()
- 113
- 177
+ 122
+ 218
113
diff -Nru eric-18.05/eric/Debugger/StartDebugDialog.ui eric-18.11+ds1/eric/Debugger/StartDebugDialog.ui
--- eric-18.05/eric/Debugger/StartDebugDialog.ui 2017-11-03 11:06:56.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/StartDebugDialog.ui 2018-11-01 10:46:30.000000000 +0000
@@ -6,8 +6,8 @@
0
0
- 488
- 264
+ 550
+ 333
@@ -18,34 +18,30 @@
-
-
+
-
-
+
- Interpreter:
+ &Virtual Environment:
- workdirPicker
+ venvComboBox
-
-
+
-
+
0
0
-
- Qt::WheelFocus
-
- Enter the interpreter to be used
+ Select the virtual environment to be used
- <b>Interpreter</b>
-<p>Enter the interpreter to be used. Leave it empty to use the default interprter, i.e. the one configured globally or per project.</p>
+ <b>Virtual Environment</b>\n<p>Enter the virtual environment to be used. Leave it empty to use the default environment, i.e. the one configured globally or per project.</p>
@@ -121,7 +117,7 @@
-
- &Environment:
+ &Environment Variables:
environmentCombo
@@ -140,7 +136,7 @@
Enter the environment variables to be set.
- <b>Environment</b>
+ <b>Environment Variables</b>
<p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p>
<p>Example: var1=1 var2="hello world" var3+=":/tmp"</p>
@@ -305,7 +301,7 @@
- interpreterPicker
+ venvComboBox
cmdlineCombo
workdirPicker
environmentCombo
@@ -326,8 +322,8 @@
accept()
- 59
- 282
+ 68
+ 323
43
@@ -342,8 +338,8 @@
reject()
- 127
- 282
+ 136
+ 323
118
@@ -358,12 +354,12 @@
setEnabled(bool)
- 164
- 229
+ 185
+ 279
- 276
- 228
+ 528
+ 279
diff -Nru eric-18.05/eric/Debugger/StartDialog.py eric-18.11+ds1/eric/Debugger/StartDialog.py
--- eric-18.05/eric/Debugger/StartDialog.py 2017-12-31 17:26:11.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/StartDialog.py 2018-07-02 16:56:50.000000000 +0000
@@ -12,6 +12,7 @@
from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QComboBox, QInputDialog
from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui.E5Application import e5App
import Preferences
@@ -25,7 +26,7 @@
the commandline parameters, the working directory and
whether exception reporting should be disabled.
"""
- def __init__(self, caption, interpreterList, argvList, wdList, envList,
+ def __init__(self, caption, lastUsedVenvName, argvList, wdList, envList,
exceptions,
parent=None, dialogType=0, modfuncList=None,
tracePython=False, autoClearShell=True, autoContinue=True,
@@ -33,13 +34,21 @@
"""
Constructor
- @param caption the caption to be displayed (string)
- @param interpreterList list of interpreters (list of string)
- @param argvList history list of commandline arguments (list of strings)
- @param wdList history list of working directories (list of strings)
- @param envList history list of environment settings (list of strings)
- @param exceptions exception reporting flag (boolean)
- @param parent parent widget of this dialog (QWidget)
+ @param caption the caption to be displayed
+ @type str
+ @param lastUsedVenvName name of the most recently used virtual
+ environment
+ @type str
+ @param argvList history list of command line arguments
+ @type list of str
+ @param wdList history list of working directories
+ @type list of str
+ @param envList history list of environment parameter settings
+ @type list of str
+ @param exceptions exception reporting flag
+ @type bool
+ @param parent parent widget of this dialog
+ @type QWidget
@param dialogType type of the start dialog
- 0 = start debug dialog
@@ -47,17 +56,22 @@
- 2 = start coverage dialog
- 3 = start profile dialog
+ @type int (0 to 3)
@keyparam modfuncList history list of module functions
- (list of strings)
+ @type list of str
@keyparam tracePython flag indicating if the Python library should
- be traced as well (boolean)
+ be traced as well
+ @type bool
@keyparam autoClearShell flag indicating, that the interpreter window
- should be cleared automatically (boolean)
+ should be cleared automatically
+ @type bool
@keyparam autoContinue flag indicating, that the debugger should not
- stop at the first executable line (boolean)
- @keyparam autoFork flag indicating the automatic fork mode (boolean)
+ stop at the first executable line
+ @type bool
+ @keyparam autoFork flag indicating the automatic fork mode
+ @type bool
@keyparam forkChild flag indicating to debug the child after forking
- (boolean)
+ @type bool
"""
super(StartDialog, self).__init__(parent)
self.setModal(True)
@@ -77,10 +91,10 @@
self.ui = Ui_StartProfileDialog()
self.ui.setupUi(self)
- self.ui.interpreterPicker.setMode(E5PathPickerModes.OpenFileMode)
- self.ui.interpreterPicker.setInsertPolicy(QComboBox.InsertAtTop)
- self.ui.interpreterPicker.setSizeAdjustPolicy(
- QComboBox.AdjustToMinimumContentsLength)
+ self.ui.venvComboBox.addItem("")
+ self.ui.venvComboBox.addItems(
+ sorted(e5App().getObject("VirtualEnvManager")
+ .getVirtualenvNames()))
self.ui.workdirPicker.setMode(E5PathPickerModes.DirectoryMode)
self.ui.workdirPicker.setDefaultDirectory(
@@ -110,10 +124,8 @@
self.ui.consoleCheckBox.setEnabled(
Preferences.getDebugger("ConsoleDbgCommand") != "")
self.ui.consoleCheckBox.setChecked(False)
- self.ui.interpreterPicker.clear()
- self.ui.interpreterPicker.addItems(interpreterList)
- if len(interpreterList) > 0:
- self.ui.interpreterPicker.setCurrentIndex(0)
+ venvIndex = max(0, self.ui.venvComboBox.findText(lastUsedVenvName))
+ self.ui.venvComboBox.setCurrentIndex(venvIndex)
if dialogType == 0: # start debug dialog
self.ui.tracePythonCheckBox.setChecked(tracePython)
@@ -153,9 +165,9 @@
cmdLine = self.ui.cmdlineCombo.currentText()
workdir = self.ui.workdirPicker.currentText()
environment = self.ui.environmentCombo.currentText()
- interpreter = self.ui.interpreterPicker.currentText()
+ venvName = self.ui.venvComboBox.currentText()
- return (interpreter,
+ return (venvName,
cmdLine,
workdir,
environment,
@@ -227,17 +239,14 @@
cmdLine = self.ui.cmdlineCombo.currentText()
workdir = self.ui.workdirPicker.currentText()
environment = self.ui.environmentCombo.currentText()
- interpreter = self.ui.interpreterPicker.currentText()
self.ui.cmdlineCombo.clear()
self.ui.workdirPicker.clear()
self.ui.environmentCombo.clear()
- self.ui.interpreterPicker.clear()
self.ui.cmdlineCombo.addItem(cmdLine)
self.ui.workdirPicker.addItem(workdir)
self.ui.environmentCombo.addItem(environment)
- self.ui.interpreterPicker.addItem(interpreter)
def __editHistory(self):
"""
@@ -245,7 +254,6 @@
"""
histories = [
"",
- self.tr("Interpreter"),
self.tr("Command Line"),
self.tr("Working Directory"),
self.tr("Environment"),
@@ -258,13 +266,11 @@
0, False)
if ok and historyKind:
historiesIndex = histories.index(historyKind)
- if historiesIndex == 3:
+ if historiesIndex == 2:
history = self.ui.workdirPicker.getPathItems()
- elif historiesIndex == 1:
- history = self.ui.interpreterPicker.getPathItems()
else:
history = []
- if historiesIndex == 2:
+ if historiesIndex == 1:
combo = self.ui.cmdlineCombo
else:
combo = self.ui.environmentCombo
@@ -276,10 +282,8 @@
if dlg.exec_() == QDialog.Accepted:
history = dlg.getHistory()
if historiesIndex == 1:
- combo = self.ui.interpreterPicker
- elif historiesIndex == 2:
combo = self.ui.cmdlineCombo
- elif historiesIndex == 3:
+ elif historiesIndex == 2:
combo = self.ui.workdirPicker
else:
combo = self.ui.environmentCombo
@@ -320,7 +324,6 @@
self.ui.workdirPicker.getPathItems(),
[self.ui.environmentCombo.itemText(index) for index in range(
self.ui.environmentCombo.count())],
- self.ui.interpreterPicker.getPathItems(),
)
def on_buttonBox_clicked(self, button):
diff -Nru eric-18.05/eric/Debugger/StartProfileDialog.ui eric-18.11+ds1/eric/Debugger/StartProfileDialog.ui
--- eric-18.05/eric/Debugger/StartProfileDialog.ui 2017-11-03 11:06:56.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/StartProfileDialog.ui 2018-11-01 10:46:30.000000000 +0000
@@ -6,8 +6,8 @@
0
0
- 488
- 185
+ 550
+ 228
@@ -18,34 +18,30 @@
-
-
+
-
-
+
- Interpreter:
+ &Virtual Environment:
- workdirPicker
+ venvComboBox
-
-
+
-
+
0
0
-
- Qt::WheelFocus
-
- Enter the interpreter to be used
+ Select the virtual environment to be used
- <b>Interpreter</b>
-<p>Enter the interpreter to be used. Leave it empty to use the default interprter, i.e. the one configured globally or per project.</p>
+ <b>Virtual Environment</b>\n<p>Enter the virtual environment to be used. Leave it empty to use the default environment, i.e. the one configured globally or per project.</p>
@@ -121,7 +117,7 @@
-
- &Environment:
+ &Environment Variables:
environmentCombo
@@ -140,7 +136,7 @@
Enter the environment variables to be set.
- <b>Environment</b>
+ <b>Environment Variables</b>
<p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p>
<p>Example: var1=1 var2="hello world" var3+=":/tmp"</p>
@@ -253,7 +249,7 @@
- interpreterPicker
+ venvComboBox
cmdlineCombo
workdirPicker
environmentCombo
@@ -271,8 +267,8 @@
accept()
- 20
- 150
+ 29
+ 218
23
@@ -287,8 +283,8 @@
reject()
- 116
- 154
+ 125
+ 218
116
diff -Nru eric-18.05/eric/Debugger/StartRunDialog.ui eric-18.11+ds1/eric/Debugger/StartRunDialog.ui
--- eric-18.05/eric/Debugger/StartRunDialog.ui 2017-11-03 11:06:56.000000000 +0000
+++ eric-18.11+ds1/eric/Debugger/StartRunDialog.ui 2018-11-01 10:46:30.000000000 +0000
@@ -6,8 +6,8 @@
0
0
- 488
- 241
+ 550
+ 303
@@ -20,32 +20,28 @@
-
-
-
+
- Interpreter:
+ &Virtual Environment:
- workdirPicker
+ venvComboBox
-
-
+
-
+
0
0
-
- Qt::WheelFocus
-
- Enter the interpreter to be used
+ Select the virtual environment to be used
- <b>Interpreter</b>
-<p>Enter the interpreter to be used. Leave it empty to use the default interprter, i.e. the one configured globally or per project.</p>
+ <b>Virtual Environment</b>\n<p>Enter the virtual environment to be used. Leave it empty to use the default environment, i.e. the one configured globally or per project.</p>
@@ -121,7 +117,7 @@
-
- &Environment:
+ &Environment Variables:
environmentCombo
@@ -140,7 +136,7 @@
Enter the environment variables to be set.
- <b>Environment</b>
+ <b>Environment Variables</b>
<p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p>
<p>Example: var1=1 var2="hello world" var3+=":/tmp"</p>
@@ -276,7 +272,7 @@
- interpreterPicker
+ venvComboBox
cmdlineCombo
workdirPicker
environmentCombo
@@ -295,8 +291,8 @@
accept()
- 35
- 237
+ 44
+ 293
34
@@ -311,8 +307,8 @@
reject()
- 154
- 237
+ 163
+ 293
150
@@ -327,12 +323,12 @@
setEnabled(bool)
- 121
- 190
+ 142
+ 249
- 265
- 191
+ 528
+ 249
Binary files /tmp/tmp74WYHw/_Ccn0iCZ7Y/eric-18.05/eric/Documentation/Help/source.qch and /tmp/tmp74WYHw/HHpOz1GKvg/eric-18.11+ds1/eric/Documentation/Help/source.qch differ
diff -Nru eric-18.05/eric/Documentation/Help/source.qhp eric-18.11+ds1/eric/Documentation/Help/source.qhp
--- eric-18.05/eric/Documentation/Help/source.qhp 2018-05-01 10:02:11.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Help/source.qhp 2018-11-01 10:46:46.000000000 +0000
@@ -104,6 +104,7 @@
+
@@ -113,6 +114,7 @@
+
@@ -520,12 +522,13 @@
+
-
+
@@ -536,6 +539,7 @@
+
@@ -548,10 +552,6 @@
-
@@ -568,6 +568,7 @@
+
@@ -589,6 +590,7 @@
+
@@ -869,7 +871,6 @@
-
@@ -892,8 +893,8 @@
+
-
@@ -973,6 +974,8 @@
+
+
@@ -994,6 +997,7 @@
+
@@ -1176,6 +1180,7 @@
+
@@ -1200,6 +1205,14 @@
+
@@ -2946,11 +2959,8 @@
-
-
-
@@ -3344,6 +3354,7 @@
+
@@ -3496,12 +3507,15 @@
+
+
+
@@ -3660,11 +3674,14 @@
+
+
+
@@ -3694,6 +3711,7 @@
+
@@ -3789,7 +3807,6 @@
-
@@ -3808,13 +3825,10 @@
-
-
-
@@ -3841,6 +3855,7 @@
+
@@ -3931,7 +3946,6 @@
-
@@ -3943,14 +3957,20 @@
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -4098,6 +4118,11 @@
+
+
+
+
+
@@ -4397,7 +4422,6 @@
-
@@ -4518,6 +4542,7 @@
+
@@ -4539,6 +4564,7 @@
+
@@ -4548,6 +4574,7 @@
+
@@ -4728,6 +4755,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -4906,6 +4943,7 @@
+
@@ -4920,6 +4958,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -5160,7 +5208,6 @@
-
@@ -5172,6 +5219,8 @@
+
+
@@ -5209,10 +5258,8 @@
-
-
@@ -5335,6 +5382,7 @@
+
@@ -5350,6 +5398,7 @@
+
@@ -5489,6 +5538,7 @@
+
@@ -5703,6 +5753,7 @@
+
@@ -6443,6 +6494,7 @@
+
@@ -6469,6 +6521,8 @@
+
+
@@ -6488,6 +6542,7 @@
+
@@ -6569,6 +6624,7 @@
+
@@ -6657,6 +6713,12 @@
+
+
+
+
+
+
@@ -6950,6 +7012,7 @@
+
@@ -6972,6 +7035,7 @@
+
@@ -7053,6 +7117,11 @@
+
+
+
+
+
@@ -7068,6 +7137,8 @@
+
+
@@ -7203,6 +7274,7 @@
+
@@ -8041,6 +8113,7 @@
+
@@ -8287,6 +8360,7 @@
+
@@ -8330,7 +8404,9 @@
+
+
@@ -8949,7 +9025,9 @@
+
+
@@ -9257,6 +9335,8 @@
+
+
@@ -9750,6 +9830,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -9882,6 +9973,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -10005,12 +10129,18 @@
+
+
+
+
+
+
@@ -10043,6 +10173,7 @@
+
@@ -10083,6 +10214,7 @@
+
@@ -10209,6 +10341,7 @@
+
@@ -10250,11 +10383,14 @@
+
+
+
@@ -10268,6 +10404,7 @@
+
@@ -10277,8 +10414,9 @@
-
+
+
@@ -10287,6 +10425,7 @@
+
@@ -10294,6 +10433,7 @@
+
@@ -11000,6 +11140,7 @@
+
@@ -11329,6 +11470,11 @@
+
+
+
+
+
@@ -11932,10 +12078,10 @@
-
+
@@ -11945,12 +12091,15 @@
-
+
+
+
+
@@ -11970,6 +12119,11 @@
+
+
+
+
+
@@ -11979,16 +12133,15 @@
-
-
-
+
+
@@ -11996,7 +12149,6 @@
-
@@ -12022,7 +12174,8 @@
-
+
+
@@ -12042,15 +12195,7 @@
-
-
-
-
-
-
-
-
@@ -12071,6 +12216,10 @@
+
+
+
+
@@ -12104,11 +12253,6 @@
-
-
-
-
-
@@ -12321,7 +12465,6 @@
-
@@ -12583,6 +12726,7 @@
+
@@ -12621,6 +12765,7 @@
+
@@ -12702,7 +12847,6 @@
-
@@ -12824,6 +12968,7 @@
+
@@ -13173,6 +13318,7 @@
+
@@ -13327,6 +13473,9 @@
+
+
+
@@ -13426,6 +13575,7 @@
+
@@ -13516,6 +13666,7 @@
+
@@ -14112,6 +14263,7 @@
+
@@ -14148,6 +14300,7 @@
+
@@ -14243,6 +14396,7 @@
+
@@ -14724,6 +14878,9 @@
+
+
+
@@ -16193,6 +16350,7 @@
+
@@ -16261,7 +16419,9 @@
+
+
@@ -16271,6 +16431,7 @@
+
@@ -16437,6 +16598,7 @@
+
@@ -16445,10 +16607,12 @@
+
+
@@ -16675,7 +16839,7 @@
-
+
@@ -16804,6 +16968,7 @@
+
@@ -16811,6 +16976,7 @@
+
@@ -16988,6 +17154,7 @@
+
@@ -17014,6 +17181,7 @@
+
@@ -17342,43 +17510,86 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17716,6 +17927,8 @@
+
+
@@ -18018,6 +18231,7 @@
+
@@ -18107,11 +18321,6 @@
-
-
-
-
-
@@ -18320,6 +18529,7 @@
+
@@ -18336,7 +18546,6 @@
-
@@ -18375,8 +18584,12 @@
+
+
+
+
@@ -18412,8 +18625,8 @@
+
-
@@ -18483,6 +18696,7 @@
+
@@ -18509,6 +18723,8 @@
+
+
@@ -18525,6 +18741,7 @@
+
@@ -18605,7 +18822,7 @@
-
+
@@ -18662,7 +18879,6 @@
-
@@ -18712,6 +18928,7 @@
+
@@ -18746,10 +18963,12 @@
+
+
@@ -18757,7 +18976,6 @@
-
@@ -18770,6 +18988,8 @@
+
+
@@ -18841,6 +19061,7 @@
+
@@ -18921,6 +19142,7 @@
+
@@ -19085,7 +19307,6 @@
-
@@ -19098,6 +19319,7 @@
+
@@ -19149,6 +19371,9 @@
+
+
+
@@ -19181,12 +19406,17 @@
+
+
+
+
+
-
-
+
+
@@ -19270,6 +19500,7 @@
eric6.E5Gui.E5PassivePopup.html
eric6.E5Gui.E5PasswordMeter.html
eric6.E5Gui.E5PathPicker.html
+ eric6.E5Gui.E5PathPickerDialog.html
eric6.E5Gui.E5ProgressDialog.html
eric6.E5Gui.E5SideBar.html
eric6.E5Gui.E5SimpleHelpDialog.html
@@ -19279,6 +19510,7 @@
eric6.E5Gui.E5TabWidget.html
eric6.E5Gui.E5TableView.html
eric6.E5Gui.E5TextEditSearchWidget.html
+ eric6.E5Gui.E5TextInputDialog.html
eric6.E5Gui.E5TextSpinBox.html
eric6.E5Gui.E5ToolBarDialog.html
eric6.E5Gui.E5ToolBarManager.html
@@ -19609,18 +19841,20 @@
eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.html
eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.html
eric6.Plugins.UiExtensionPlugins.PipInterface.PipDialog.html
+ eric6.Plugins.UiExtensionPlugins.PipInterface.PipFileSelectionDialog.html
eric6.Plugins.UiExtensionPlugins.PipInterface.PipFreezeDialog.html
eric6.Plugins.UiExtensionPlugins.PipInterface.PipListDialog.html
eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackageDetailsDialog.html
eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackagesInputDialog.html
- eric6.Plugins.UiExtensionPlugins.PipInterface.PipRequirementsSelectionDialog.html
eric6.Plugins.UiExtensionPlugins.PipInterface.PipSearchDialog.html
+ eric6.Plugins.UiExtensionPlugins.PipInterface.PipSelectionDialog.html
eric6.Plugins.UiExtensionPlugins.Translator.ConfigurationPage.TranslatorPage.html
eric6.Plugins.UiExtensionPlugins.Translator.Translator.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.GlosbeEngine.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.GoogleV1Engine.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.GoogleV2Engine.html
+ eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.IbmWatsonEngine.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.MicrosoftEngine.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.MyMemoryEngine.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.PromtEngine.html
@@ -19630,8 +19864,6 @@
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorLanguagesDb.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorRequest.html
eric6.Plugins.UiExtensionPlugins.Translator.TranslatorWidget.html
- eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvConfigurationDialog.html
- eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.VirtualenvExecDialog.html
eric6.Plugins.VcsPlugins.vcsGit.Config.html
eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage.html
eric6.Plugins.VcsPlugins.vcsGit.GitAddRemoteDialog.html
@@ -19643,6 +19875,7 @@
eric6.Plugins.VcsPlugins.vcsGit.GitBranchDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitBranchPushDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitBundleDialog.html
+ eric6.Plugins.VcsPlugins.vcsGit.GitChangeRemoteUrlDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitCherryPickDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitCommandDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitCommitDialog.html
@@ -19664,6 +19897,7 @@
eric6.Plugins.VcsPlugins.vcsGit.GitPullDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitPushDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitReflogBrowserDialog.html
+ eric6.Plugins.VcsPlugins.vcsGit.GitRemoteCredentialsDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitRemoteRepositoriesDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitRevisionSelectionDialog.html
eric6.Plugins.VcsPlugins.vcsGit.GitRevisionsSelectionDialog.html
@@ -19874,8 +20108,8 @@
eric6.Preferences.ConfigurationPages.CooperationPage.html
eric6.Preferences.ConfigurationPages.CorbaPage.html
eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html
+ eric6.Preferences.ConfigurationPages.DebuggerPython2Page.html
eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html
- eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html
eric6.Preferences.ConfigurationPages.DiffColoursPage.html
eric6.Preferences.ConfigurationPages.EditorAPIsPage.html
eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html
@@ -19951,6 +20185,8 @@
eric6.Project.CreateDialogCodeDialog.html
eric6.Project.DebuggerPropertiesDialog.html
eric6.Project.FiletypeAssociationDialog.html
+ eric6.Project.IdlCompilerDefineNameDialog.html
+ eric6.Project.IdlCompilerOptionsDialog.html
eric6.Project.LexerAssociationDialog.html
eric6.Project.MakePropertiesDialog.html
eric6.Project.NewDialogClassDialog.html
@@ -19972,6 +20208,7 @@
eric6.Project.QuickFindFileDialog.html
eric6.Project.SpellingPropertiesDialog.html
eric6.Project.TranslationPropertiesDialog.html
+ eric6.Project.UicLoadUi.html
eric6.Project.UserPropertiesDialog.html
eric6.PyUnit.UnittestDialog.html
eric6.QScintilla.APIsManager.html
@@ -20115,6 +20352,7 @@
eric6.Utilities.ClassBrowsers.pyclbr.html
eric6.Utilities.ClassBrowsers.rbclbr.html
eric6.Utilities.FtpUtilities.html
+ eric6.Utilities.GetSysPath.html
eric6.Utilities.MimeTypes.html
eric6.Utilities.ModuleParser.html
eric6.Utilities.MouseUtilities.html
@@ -20137,6 +20375,12 @@
eric6.ViewManager.BookmarkedFilesDialog.html
eric6.ViewManager.ViewManager.html
eric6.ViewManager.__init__.html
+ eric6.VirtualEnv.VirtualenvAddEditDialog.html
+ eric6.VirtualEnv.VirtualenvConfigurationDialog.html
+ eric6.VirtualEnv.VirtualenvExecDialog.html
+ eric6.VirtualEnv.VirtualenvInterpreterSelectionDialog.html
+ eric6.VirtualEnv.VirtualenvManager.html
+ eric6.VirtualEnv.VirtualenvManagerDialog.html
eric6.WebBrowser.AdBlock.AdBlockDialog.html
eric6.WebBrowser.AdBlock.AdBlockExceptionsDialog.html
eric6.WebBrowser.AdBlock.AdBlockIcon.html
@@ -20422,7 +20666,6 @@
index-eric6.Plugins.UiExtensionPlugins.Translator.ConfigurationPage.html
index-eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.html
index-eric6.Plugins.UiExtensionPlugins.Translator.html
- index-eric6.Plugins.UiExtensionPlugins.VirtualenvInterface.html
index-eric6.Plugins.UiExtensionPlugins.html
index-eric6.Plugins.VcsPlugins.html
index-eric6.Plugins.VcsPlugins.vcsGit.ConfigurationPage.html
@@ -20482,6 +20725,7 @@
index-eric6.Utilities.html
index-eric6.VCS.html
index-eric6.ViewManager.html
+ index-eric6.VirtualEnv.html
index-eric6.WebBrowser.AdBlock.html
index-eric6.WebBrowser.AutoScroll.html
index-eric6.WebBrowser.Bookmarks.BookmarksImporters.html
diff -Nru eric-18.05/eric/Documentation/Source/eric6.Cooperation.Connection.html eric-18.11+ds1/eric/Documentation/Source/eric6.Cooperation.Connection.html
--- eric-18.05/eric/Documentation/Source/eric6.Cooperation.Connection.html 2017-06-03 11:11:27.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.Cooperation.Connection.html 2018-09-30 09:37:39.000000000 +0000
@@ -25,7 +25,7 @@
Global Attributes
-MaxBufferSize |
PingInterval |
PongTimeout |
SeparatorToken |
TransferTimeout |
+MaxBufferSize |
PingInterval |
PongTimeout |
SeparatorToken |
SeparatorToken_b |
TransferTimeout |
Classes
diff -Nru eric-18.05/eric/Documentation/Source/eric6.DebugClients.Python.DebugClient.html eric-18.11+ds1/eric/Documentation/Source/eric6.DebugClients.Python.DebugClient.html
--- eric-18.05/eric/Documentation/Source/eric6.DebugClients.Python.DebugClient.html 2017-06-03 11:11:27.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.DebugClients.Python.DebugClient.html 2018-11-01 10:46:30.000000000 +0000
@@ -51,7 +51,7 @@
DebugClientBase, DebugBase, ThreadExtension
Class Attributes
Class Methods
diff -Nru eric-18.05/eric/Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html
--- eric-18.05/eric/Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html 2017-12-02 11:38:18.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html 2018-07-02 16:56:50.000000000 +0000
@@ -78,6 +78,9 @@
newConnection |
Public slot to handle a new connection. |
+remoteBanner |
+Public slot to get the banner info of the remote client. |
+
remoteBreakpoint |
Public method to set or clear a breakpoint. |
@@ -238,7 +241,12 @@
flag indicating success (boolean)
-
+
+DebuggerInterfaceNone.remoteBanner
+remoteBanner()
+
+ Public slot to get the banner info of the remote client.
+
DebuggerInterfaceNone.remoteBreakpoint
remoteBreakpoint(fn, line, setBreakpoint, cond=None, temp=False)
@@ -667,53 +675,59 @@
the debug client. (Needed on Win OS)
DebuggerInterfaceNone.startRemote
-startRemote(port, runInConsole, interpreter)
+startRemote(port, runInConsole, venvName)
Public method to start a remote Python interpreter.
-- port
+- port (int)
-
-port number the debug server is listening on (integer)
-
- runInConsole
+port number the debug server is listening on
+- runInConsole (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- interpreter
+ console window
+- venvName (str)
-
-interpreter to be used to execute the remote
- side (string)
+name of the virtual environment to be used
- Returns:
-
-client process object (QProcess), a flag to indicate
- a network connection (boolean) and the name of the interpreter
- in case of a local execution (string)
+client process object, a flag to indicate a network connection
+ and the name of the interpreter in case of a local execution
+
+
+- Return Type:
+-
+tuple of (QProcess, bool, str)
DebuggerInterfaceNone.startRemoteForProject
-startRemoteForProject(port, runInConsole, interpreter)
+startRemoteForProject(port, runInConsole, venvName)
Public method to start a remote Python interpreter for a project.
-- port
+- port (int)
-
-port number the debug server is listening on (integer)
-
- runInConsole
+port number the debug server is listening on
+- runInConsole (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- interpreter
+ console window
+- venvName (str)
-
-interpreter to be used to execute the remote
- side (string)
+name of the virtual environment to be used
- Returns:
-
-client process object (QProcess), a flag to indicate
- a network connection (boolean) and the name of the interpreter
- in case of a local execution (string)
+client process object, a flag to indicate a network connection
+ and the name of the interpreter in case of a local execution
+
+
+- Return Type:
+-
+tuple of (QProcess, bool, str)
diff -Nru eric-18.05/eric/Documentation/Source/eric6.Debugger.DebuggerInterfacePython.html eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebuggerInterfacePython.html
--- eric-18.05/eric/Documentation/Source/eric6.Debugger.DebuggerInterfacePython.html 2017-12-02 11:38:18.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebuggerInterfacePython.html 2018-07-02 16:56:50.000000000 +0000
@@ -797,53 +797,59 @@
the debug client. (Needed on Win OS)
DebuggerInterfacePython.startRemote
-startRemote(port, runInConsole, interpreter)
+startRemote(port, runInConsole, venvName)
Public method to start a remote Python interpreter.
-- port
+- port (int)
-
-port number the debug server is listening on (integer)
-
- runInConsole
+port number the debug server is listening on
+- runInConsole (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- interpreter
+ console window
+- venvName (str)
-
-interpreter to be used to execute the remote
- side (string)
+name of the virtual environment to be used
- Returns:
-
-client process object (QProcess), a flag to indicate
- a network connection (boolean) and the name of the interpreter
- in case of a local execution (string)
+client process object, a flag to indicate a network connection
+ and the name of the interpreter in case of a local execution
+
+
+- Return Type:
+-
+tuple of (QProcess, bool, str)
DebuggerInterfacePython.startRemoteForProject
-startRemoteForProject(port, runInConsole, interpreter)
+startRemoteForProject(port, runInConsole, venvName)
Public method to start a remote Python interpreter for a project.
-- port
+- port (int)
-
-port number the debug server is listening on (integer)
-
- runInConsole
+port number the debug server is listening on
+- runInConsole (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- interpreter
+ console window
+- venvName (str)
-
-interpreter to be used to execute the remote
- side (string)
+name of the virtual environment to be used
- Returns:
-
-client process object (QProcess), a flag to indicate
- a network connection (boolean) and the name of the interpreter
- in case of a local execution (string)
+client process object, a flag to indicate a network connection
+ and the name of the interpreter in case of a local execution
+
+
+- Return Type:
+-
+tuple of (QProcess, bool, str)
diff -Nru eric-18.05/eric/Documentation/Source/eric6.Debugger.DebugServer.html eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebugServer.html
--- eric-18.05/eric/Documentation/Source/eric6.Debugger.DebugServer.html 2017-11-03 11:06:56.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebugServer.html 2018-08-01 17:24:38.000000000 +0000
@@ -331,6 +331,9 @@
getClientInterpreter |
Public method to get the interpreter of the debug client. |
+getClientType |
+Public method to get the currently running debug client type. |
+
getExtensions |
Public slot to get the extensions associated with the given language. |
@@ -343,9 +346,15 @@
getWatchPointModel |
Public slot to get a reference to the watch expression model object. |
+isClientProcessUp |
+Public method to check, if the debug client process is up. |
+
isConnected |
Public method to test, if the debug server is connected to a backend. |
+isDebugging |
+Public method to test, if the debug server is debugging. |
+
passiveStartUp |
Public method to handle a passive debug connection. |
@@ -433,6 +442,9 @@
setCallTraceEnabled |
Public method to set the call trace state. |
+setDebugging |
+Public method to set the debugging state. |
+
shutdownServer |
Public method to cleanly shut down. |
@@ -1016,6 +1028,21 @@
interpreter of the debug client (string)
+
+DebugServer.getClientType
+getClientType()
+
+ Public method to get the currently running debug client type.
+
+- Returns:
+-
+debug client type
+
+
+- Return Type:
+-
+str
+
DebugServer.getExtensions
getExtensions(language)
@@ -1076,6 +1103,21 @@
reference to the watch expression model object
(WatchPointModel)
+
+DebugServer.isClientProcessUp
+isClientProcessUp()
+
+ Public method to check, if the debug client process is up.
+
+- Returns:
+-
+flag indicating a running debug client process
+
+
+- Return Type:
+-
+bool
+
DebugServer.isConnected
isConnected()
@@ -1086,6 +1128,21 @@
flag indicating a connection (boolean)
+
+DebugServer.isDebugging
+isDebugging()
+
+ Public method to test, if the debug server is debugging.
+
+- Returns:
+-
+flag indicating the debugging state
+
+
+- Return Type:
+-
+bool
+
DebugServer.passiveStartUp
passiveStartUp(fn, exc)
@@ -1106,7 +1163,7 @@
Public slot to handle the preferencesChanged signal.
DebugServer.registerDebuggerInterface
-registerDebuggerInterface(interfaceName, getRegistryData)
+registerDebuggerInterface(interfaceName, getRegistryData, reregister=False)
Public method to register a debugger interface.
@@ -1120,6 +1177,9 @@
return the client language, the client capabilities, the
list of associated file extensions and a function reference
to create the debugger interface (see __createDebuggerInterface())
+- reregister (bool)
+-
+flag indicating to re-register the interface
DebugServer.remoteBanner
@@ -1226,44 +1286,43 @@
DebugServer.remoteCoverage
-remoteCoverage(interpreter, fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
+remoteCoverage(venvName, fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
Public method to load a new program to collect coverage data.
-- interpreter
+- venvName (str)
-
-interpreter to be used to execute the remote
- side (string)
-
- fn
+name of the virtual environment to be used
+- fn (str)
-
-the filename to run (string)
-
- argv
+the filename to debug
+- argv (str)
-
-the commandline arguments to pass to the program (string)
-
- wd
+the command line arguments to pass to the program
+- wd (str)
-
-the working directory for the program (string)
-
- env
+the working directory for the program
+- env (str)
-
-environment settings (string)
-
- autoClearShell=
+environment parameter settings
+- autoClearShell= (bool)
-
flag indicating, that the interpreter window
- should be cleared (boolean)
-
- erase=
+ should be cleared
+- erase= (bool)
-
flag indicating that coverage info should be
- cleared first (boolean)
-
- forProject=
+ cleared first
+- forProject= (bool)
-
-flag indicating a project related action (boolean)
-
- runInConsole=
+flag indicating a project related action
+- runInConsole= (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- clientType=
+ console window
+- clientType= (str)
-
-client type to be used (string)
+client type to be used
DebugServer.remoteEnvironment
@@ -1277,59 +1336,57 @@
DebugServer.remoteLoad
-remoteLoad(interpreter, fn, argv, wd, env, autoClearShell=True, tracePython=False, autoContinue=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="", enableCallTrace=False)
+remoteLoad(venvName, fn, argv, wd, env, autoClearShell=True, tracePython=False, autoContinue=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="", enableCallTrace=False)
Public method to load a new program to debug.
-- interpreter
+- venvName (str)
-
-interpreter to be used to execute the remote
- side (string)
-
- fn
+name of the virtual environment to be used
+- fn (str)
-
-the filename to debug (string)
-
- argv
+the filename to debug
+- argv (str)
-
-the commandline arguments to pass to the program (string)
-
- wd
+the command line arguments to pass to the program
+- wd (str)
-
-the working directory for the program (string)
-
- env
+the working directory for the program
+- env (str)
-
-environment settings (string)
-
- autoClearShell=
+environment parameter settings
+- autoClearShell= (bool)
-
flag indicating, that the interpreter window
- should be cleared (boolean)
-
- tracePython=
+ should be cleared
+- tracePython= (bool)
-
flag indicating if the Python library should be
- traced as well (boolean)
-
- autoContinue=
+ traced as well
+- autoContinue= (bool)
-
flag indicating, that the debugger should not
- stop at the first executable line (boolean)
-
- forProject=
+ stop at the first executable line
+- forProject= (bool)
-
-flag indicating a project related action (boolean)
-
- runInConsole=
+flag indicating a project related action
+- runInConsole= (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- autoFork=
+ console window
+- autoFork= (bool)
-
-flag indicating the automatic fork mode (boolean)
-
- forkChild=
+flag indicating the automatic fork mode
+- forkChild= (bool)
-
flag indicating to debug the child after forking
- (boolean)
-
- clientType=
+- clientType= (str)
-
-client type to be used (string)
-
- enableCallTrace=
+client type to be used
+- enableCallTrace= (bool)
-
flag indicating to enable the call trace
- function (boolean)
+ function
DebugServer.remoteMoveIP
@@ -1343,44 +1400,43 @@
DebugServer.remoteProfile
-remoteProfile(interpreter, fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
+remoteProfile(venvName, fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
Public method to load a new program to collect profiling data.
-- interpreter
+- venvName (str)
-
-interpreter to be used to execute the remote
- side (string)
-
- fn
+name of the virtual environment to be used
+- fn (str)
-
-the filename to run (string)
-
- argv
+the filename to debug
+- argv (str)
-
-the commandline arguments to pass to the program (string)
-
- wd
+the command line arguments to pass to the program
+- wd (str)
-
-the working directory for the program (string)
-
- env
+the working directory for the program
+- env (str)
-
-environment settings (string)
-
- autoClearShell=
+environment parameter settings
+- autoClearShell= (bool)
-
flag indicating, that the interpreter window
- should be cleared (boolean)
-
- erase=
+ should be cleared
+- erase= (bool)
-
-flag indicating that timing info should be cleared
- first (boolean)
-
- forProject=
+flag indicating that coverage info should be
+ cleared first
+- forProject= (bool)
-
-flag indicating a project related action (boolean)
-
- runInConsole=
+flag indicating a project related action
+- runInConsole= (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- clientType=
+ console window
+- clientType= (str)
-
-client type to be used (string)
+client type to be used
DebugServer.remoteRawInput
@@ -1394,47 +1450,45 @@
DebugServer.remoteRun
-remoteRun(interpreter, fn, argv, wd, env, autoClearShell=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="")
+remoteRun(venvName, fn, argv, wd, env, autoClearShell=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="")
Public method to load a new program to run.
-- interpreter
+- venvName (str)
-
-interpreter to be used to execute the remote
- side (string)
-
- fn
+name of the virtual environment to be used
+- fn (str)
-
-the filename to run (string)
-
- argv
+the filename to debug
+- argv (str)
-
-the commandline arguments to pass to the program (string)
-
- wd
+the command line arguments to pass to the program
+- wd (str)
-
-the working directory for the program (string)
-
- env
+the working directory for the program
+- env (str)
-
-environment settings (string)
-
- autoClearShell=
+environment parameter settings
+- autoClearShell= (bool)
-
flag indicating, that the interpreter window
- should be cleared (boolean)
-
- forProject=
+ should be cleared
+- forProject= (bool)
-
-flag indicating a project related action (boolean)
-
- runInConsole=
+flag indicating a project related action
+- runInConsole= (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- autoFork=
+ console window
+- autoFork= (bool)
-
-flag indicating the automatic fork mode (boolean)
-
- forkChild=
+flag indicating the automatic fork mode
+- forkChild= (bool)
-
flag indicating to debug the child after forking
- (boolean)
-
- clientType=
+- clientType= (str)
-
-client type to be used (string)
+client type to be used
DebugServer.remoteSetThread
@@ -1537,6 +1591,16 @@
flag indicating to enable the call trace function (boolean)
+
+DebugServer.setDebugging
+setDebugging(on)
+
+ Public method to set the debugging state.
+
+- on (bool)
+-
+flag indicating the new debugging state
+
DebugServer.shutdownServer
shutdownServer()
@@ -1844,27 +1908,26 @@
DebugServer.startClient
-startClient(unplanned=True, clType=None, forProject=False, runInConsole=False, interpreter="")
+startClient(unplanned=True, clType=None, forProject=False, runInConsole=False, venvName="")
Public method to start a debug client.
-- unplanned=
+- unplanned= (bool)
-
-flag indicating that the client has died (boolean)
-
- clType=
+flag indicating that the client has died
+- clType= (str)
-
-type of client to be started (string)
-
- forProject=
+type of client to be started
+- forProject= (bool)
-
-flag indicating a project related action (boolean)
-
- runInConsole=
+flag indicating a project related action
+- runInConsole= (bool)
-
flag indicating to start the debugger in a
- console window (boolean)
-
- interpreter=
+ console window
+- venvName= (str)
-
-interpreter to be used to execute the remote
- side (string)
+name of the virtual environment to be used
DebugServer.unregisterDebuggerInterface
diff -Nru eric-18.05/eric/Documentation/Source/eric6.Debugger.DebugUI.html eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebugUI.html
--- eric-18.05/eric/Documentation/Source/eric6.Debugger.DebugUI.html 2018-05-01 10:02:01.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebugUI.html 2018-07-02 16:56:50.000000000 +0000
@@ -296,9 +296,6 @@
setExceptionReporting |
Public slot to initialize the exception reporting flag. |
-setInterpreterHistory |
-Public slot to initialize the interpreter history. |
-
setTracePython |
Public slot to initialize the trace Python flag. |
@@ -916,23 +913,6 @@
flag indicating exception reporting status (boolean)
-
-DebugUI.setInterpreterHistory
-setInterpreterHistory(interpreterStr, clearHistories=False, history=None)
-
- Public slot to initialize the interpreter history.
-
-- interpreterStr
--
-interpreter (string)
-
- clearHistories
--
-flag indicating, that the list should
- be cleared (boolean)
-
- history
--
-list of history entries to be set (list of strings)
-
DebugUI.setTracePython
setTracePython(tracePython)
diff -Nru eric-18.05/eric/Documentation/Source/eric6.Debugger.DebugViewer.html eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebugViewer.html
--- eric-18.05/eric/Documentation/Source/eric6.Debugger.DebugViewer.html 2017-06-03 11:11:26.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.DebugViewer.html 2018-08-01 17:24:38.000000000 +0000
@@ -108,9 +108,6 @@
handleDebuggingStarted |
Public slot to handle the start of a debugging session. |
-handleRawInput |
-Public slot to handle the switch to the shell in raw input mode. |
-
handleResetUI |
Public method to reset the SBVviewer. |
@@ -123,12 +120,6 @@
preferencesChanged |
Public slot to handle the preferencesChanged signal. |
-restoreCurrentPage |
-Public slot to restore the previously saved page. |
-
-saveCurrentPage |
-Public slot to save the current page. |
-
setCallTraceToProjectMode |
Public slot to set the call trace viewer to project mode. |
@@ -166,7 +157,7 @@
DebugViewer (Constructor)
-DebugViewer(debugServer, docked, vm, parent=None, embeddedShell=True, embeddedBrowser=True)
+DebugViewer(debugServer, docked, vm, parent=None)
Constructor
@@ -182,17 +173,6 @@
- parent
-
parent widget (QWidget)
-
- embeddedShell
--
-flag indicating whether the shell should be
- included. This flag is set to False by those layouts, that have
- the interpreter shell in a separate window.
-
- embeddedBrowser
--
-flag indicating whether the file browser should
- be included. This flag is set to False by those layouts, that
- have the file browser in a separate window or embedded
- in the project browser instead.
DebugViewer.__callStackFrameSelected
@@ -268,11 +248,6 @@
Public slot to handle the start of a debugging session.
This slot sets the variables filter expressions.
-
-DebugViewer.handleRawInput
-handleRawInput()
-
- Public slot to handle the switch to the shell in raw input mode.
DebugViewer.handleResetUI
handleResetUI()
@@ -303,16 +278,6 @@
preferencesChanged()
Public slot to handle the preferencesChanged signal.
-
-DebugViewer.restoreCurrentPage
-restoreCurrentPage()
-
- Public slot to restore the previously saved page.
-
-DebugViewer.saveCurrentPage
-saveCurrentPage()
-
- Public slot to save the current page.
DebugViewer.setCallTraceToProjectMode
setCallTraceToProjectMode(enabled)
diff -Nru eric-18.05/eric/Documentation/Source/eric6.Debugger.StartDialog.html eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.StartDialog.html
--- eric-18.05/eric/Documentation/Source/eric6.Debugger.StartDialog.html 2017-11-03 11:06:56.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.Debugger.StartDialog.html 2018-07-02 16:56:50.000000000 +0000
@@ -108,32 +108,33 @@
StartDialog (Constructor)
-StartDialog(caption, interpreterList, argvList, wdList, envList, exceptions, parent=None, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False)
+StartDialog(caption, lastUsedVenvName, argvList, wdList, envList, exceptions, parent=None, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False)
Constructor
-- caption
+- caption (str)
-
-the caption to be displayed (string)
-
- interpreterList
+the caption to be displayed
+- lastUsedVenvName (str)
-
-list of interpreters (list of string)
-
- argvList
+name of the most recently used virtual
+ environment
+- argvList (list of str)
-
-history list of commandline arguments (list of strings)
-
- wdList
+history list of command line arguments
+- wdList (list of str)
-
-history list of working directories (list of strings)
-
- envList
+history list of working directories
+- envList (list of str)
-
-history list of environment settings (list of strings)
-
- exceptions
+history list of environment parameter settings
+- exceptions (bool)
-
-exception reporting flag (boolean)
-
- parent
+exception reporting flag
+- parent (QWidget)
-
-parent widget of this dialog (QWidget)
-
- dialogType
+parent widget of this dialog
+- dialogType (int (0 to 3))
-
type of the start dialog
@@ -142,29 +143,27 @@
- 2 = start coverage dialog
- 3 = start profile dialog
- - modfuncList=
+- modfuncList= (list of str)
-
history list of module functions
- (list of strings)
-
- tracePython=
+- tracePython= (bool)
-
flag indicating if the Python library should
- be traced as well (boolean)
-
- autoClearShell=
+ be traced as well
+- autoClearShell= (bool)
-
flag indicating, that the interpreter window
- should be cleared automatically (boolean)
-
- autoContinue=
+ should be cleared automatically
+- autoContinue= (bool)
-
flag indicating, that the debugger should not
- stop at the first executable line (boolean)
-
- autoFork=
+ stop at the first executable line
+- autoFork= (bool)
-
-flag indicating the automatic fork mode (boolean)
-
- forkChild=
+flag indicating the automatic fork mode
+- forkChild= (bool)
-
flag indicating to debug the child after forking
- (boolean)
StartDialog.__clearHistories
diff -Nru eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5ErrorMessage.html eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5ErrorMessage.html
--- eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5ErrorMessage.html 2017-06-03 11:11:26.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5ErrorMessage.html 2018-07-02 16:56:50.000000000 +0000
@@ -25,7 +25,7 @@
Global Attributes
-__msgHandlerDialog |
__origMsgHandler |
+_defaultFilters |
_filterSettings |
_msgHandlerDialog |
_origMsgHandler |
Classes
@@ -40,6 +40,9 @@
editMessageFilters |
Module function to edit the list of message filters. |
+filterMessage |
+Module function to filter messages. |
+
messageHandler |
Module function handling messages. |
@@ -72,9 +75,6 @@
E5ErrorMessage |
Constructor |
-__filterMessage |
-Private method to filter messages. |
-
editMessageFilters |
Public method to edit the list of message filters. |
@@ -92,25 +92,9 @@
Constructor
-- parent
--
-reference to the parent widget (QWidget)
-
-
-E5ErrorMessage.__filterMessage
-__filterMessage(message)
-
- Private method to filter messages.
-
-- message
--
-message to be checked (string)
-
-
-- Returns:
+- parent (QWidget)
-
-flag indicating that the message should be filtered out
- (boolean)
+reference to the parent widget
E5ErrorMessage.editMessageFilters
@@ -123,12 +107,12 @@
Public method to show a message.
-- message
+- message (str)
-
-error message to be shown (string)
-
- msgType
+error message to be shown
+- msgType (str)
-
-type of the error message (string)
+type of the error message
@@ -141,20 +125,42 @@
+
+filterMessage
+filterMessage(message)
+
+ Module function to filter messages.
+
+- message (str)
+-
+message to be checked
+
+
+- Returns:
+-
+flag indicating that the message should be filtered out
+
+
+- Return Type:
+-
+bool
+
+
+
+
messageHandler
messageHandler(msgType, *args)
Module function handling messages.
-- msgType
+- msgType (int, QtMsgType)
-
-type of the message (integer, QtMsgType)
-
- args
+type of the message
+- args (PyQt4: bytes; PyQt5: tuple of (QMessageLogContext, bytes))
-
-message handler arguments, for PyQt4 message to be shown
- (bytes), for PyQt5 context information (QMessageLogContext) and
- message to be shown (bytes)
+message handler arguments, for PyQt4 message to be shown, for
+ PyQt5 context information and message to be shown
@@ -167,7 +173,12 @@
- Returns:
-
-flag indicating an installed message handler (boolean)
+flag indicating an installed message handler
+
+
+- Return Type:
+-
+bool
@@ -181,7 +192,12 @@
- Returns:
-
-reference to the message handler dialog (E5ErrorMessage)
+reference to the message handler dialog
+
+
+- Return Type:
+-
+E5ErrorMessage
diff -Nru eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5ListSelectionDialog.html eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5ListSelectionDialog.html
--- eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5ListSelectionDialog.html 2017-06-03 11:11:26.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5ListSelectionDialog.html 2018-08-01 17:24:38.000000000 +0000
@@ -63,6 +63,9 @@
getSelection |
Public method to retrieve the selected items. |
+on_selectionList_itemChanged |
+Private slot handling a change of an item. |
+
on_selectionList_itemSelectionChanged |
Private slot handling a change of the selection. |
@@ -73,7 +76,7 @@
E5ListSelectionDialog (Constructor)
-E5ListSelectionDialog(entries, selectionMode=QAbstractItemView.ExtendedSelection, title="", message="", parent=None)
+E5ListSelectionDialog(entries, selectionMode=QAbstractItemView.ExtendedSelection, title="", message="", checkBoxSelection=False, parent=None)
Constructor
@@ -89,6 +92,10 @@
- message (str)
-
message to be show in the dialog
+
- checkBoxSelection (bool)
+-
+flag indicating to select items via their
+ checkbox
- parent (QWidget)
-
reference to the parent widget
@@ -108,6 +115,16 @@
-
list of str
+
+E5ListSelectionDialog.on_selectionList_itemChanged
+on_selectionList_itemChanged(itm)
+
+ Private slot handling a change of an item.
+
+- itm (QListWidgetItem)
+-
+reference to the changed item
+
E5ListSelectionDialog.on_selectionList_itemSelectionChanged
on_selectionList_itemSelectionChanged()
diff -Nru eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5MapWidget.html eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5MapWidget.html
--- eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5MapWidget.html 2017-06-03 11:11:26.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5MapWidget.html 2018-06-02 10:43:35.000000000 +0000
@@ -84,6 +84,9 @@
isEnabled |
Public method to check the enabled state. |
+isOnRightSide |
+Public method to test, if the map is shown on the right side of the master widget. |
+
lineDimensions |
Public method to get the line (indicator) dimensions. |
@@ -111,6 +114,9 @@
setLineDimensions |
Public method to set the line (indicator) dimensions. |
+setMapPosition |
+Public method to set, whether the map should be shown to the right or left of the master widget. |
+
setMaster |
Public method to set the map master widget. |
@@ -222,6 +228,23 @@
flag indicating the enabled state (boolean)
+
+E5MapWidget.isOnRightSide
+isOnRightSide()
+
+ Public method to test, if the map is shown on the right side of the
+ master widget.
+
+- Returns:
+-
+flag indicating that the map is to the right of the master
+ widget
+
+
+- Return Type:
+-
+bool
+
E5MapWidget.lineDimensions
lineDimensions()
@@ -330,6 +353,18 @@
height of the line in pixels (integer)
+
+E5MapWidget.setMapPosition
+setMapPosition(onRight)
+
+ Public method to set, whether the map should be shown to the right or
+ left of the master widget.
+
+- onRight (bool)
+-
+flag indicating to show the map on the right side of
+ the master widget
+
E5MapWidget.setMaster
setMaster(master)
diff -Nru eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5PasswordMeter.html eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5PasswordMeter.html
--- eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5PasswordMeter.html 2017-06-03 11:11:26.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5PasswordMeter.html 2018-11-01 10:46:30.000000000 +0000
@@ -48,7 +48,7 @@
QProgressBar
Class Attributes
Class Methods
diff -Nru eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5PathPickerDialog.html eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5PathPickerDialog.html
--- eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5PathPickerDialog.html 1970-01-01 00:00:00.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5PathPickerDialog.html 2018-08-01 17:24:38.000000000 +0000
@@ -0,0 +1,226 @@
+
+
+eric6.E5Gui.E5PathPickerDialog
+
+
+
+
+eric6.E5Gui.E5PathPickerDialog
+
+Module implementing a dialog to enter a file system path using a file picker.
+
+Global Attributes
+
+Classes
+
+
+E5PathPickerDialog |
+Class implementing a dialog to enter a file system path using a file picker. |
+
+
+Functions
+
+
+getPath |
+Function to get a file or directory path from the user. |
+
+
+
+
+E5PathPickerDialog
+
+ Class implementing a dialog to enter a file system path using a file
+ picker.
+
+Derived from
+QDialog
+Class Attributes
+
+Class Methods
+
+Methods
+
+Static Methods
+
+
+E5PathPickerDialog (Constructor)
+E5PathPickerDialog(parent=None)
+
+ Constructor
+
+- parent (QWidget)
+-
+reference to the parent widget
+
+
+E5PathPickerDialog.getPath
+getPath()
+
+ Public method to get the current path.
+
+- Returns:
+-
+current path
+
+
+- Return Type:
+-
+str
+
+
+E5PathPickerDialog.setDefaultDirectory
+setDefaultDirectory(directory)
+
+ Public method to set the default directory of the path picker.
+
+- directory (str)
+-
+default directory
+
+
+E5PathPickerDialog.setLabelText
+setLabelText(text)
+
+ Public method to set the label text.
+
+- text (str)
+-
+label text
+
+
+E5PathPickerDialog.setPickerFilters
+setPickerFilters(filters)
+
+ Public method to set the filters of the path picker.
+
+ Note: Multiple filters must be separated by ';;'.
+
+- filters (str)
+-
+string containing the file filters
+
+
+E5PathPickerDialog.setPickerMode
+setPickerMode(mode)
+
+ Public method to set the mode of the path picker.
+
+- mode (E5PathPickerModes)
+-
+picker mode
+
+
+E5PathPickerDialog.setPickerPath
+setPickerPath(path)
+
+ Public method to set the path of the path picker.
+
+- path (str)
+-
+path to be set
+
+
+E5PathPickerDialog.setTitle
+setTitle(title)
+
+ Public method to set the window title.
+
+- title (str)
+-
+window title
+
+
+
+
+
+getPath
+getPath(parent, title, label, mode=E5PathPickerModes.OpenFileMode, path="", defaultDirectory="", filters=None)
+
+ Function to get a file or directory path from the user.
+
+- parent (QWidget)
+-
+reference to the parent widget
+
- title (str)
+-
+title of the dialog
+
- label (str)
+-
+text to be shown above the path picker
+
- mode (E5PathPickerModes)
+-
+mode of the path picker
+
- path (str)
+-
+initial path to be shown
+
- defaultDirectory (str)
+-
+default directory of the path picker selection
+ dialog
+
- filters (list of str)
+-
+list of file filters
+
+
+- Returns:
+-
+tuple containing the entered path and a flag indicating that the
+ user pressed the OK button
+
+
+- Return Type:
+-
+tuple of (str, bool)
+
+
+
+
+
\ No newline at end of file
diff -Nru eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html
--- eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html 2017-12-02 11:38:18.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html 2018-09-30 09:37:39.000000000 +0000
@@ -60,6 +60,9 @@
E5TextEditSearchWidget |
Constructor |
+__addWidthForHeightLayout |
+Private method to set the middle part of the layout. |
+
__find |
Private method to search the associated text edit. |
@@ -101,6 +104,9 @@
on_findtextCombo_editTextChanged |
Private slot to enable/disable the find buttons. |
+
+setWidthForHeight |
+Public method to set the 'width for height'. |
Static Methods
@@ -122,6 +128,16 @@
If this parameter is False, some widgets are shown in a third
line.
+
+E5TextEditSearchWidget.__addWidthForHeightLayout
+__addWidthForHeightLayout(widthForHeight)
+
+ Private method to set the middle part of the layout.
+
+- widthForHeight (bool)
+-
+flag indicating to prefer width
+
E5TextEditSearchWidget.__find
__find(backwards)
@@ -275,6 +291,16 @@
text of the combobox (string)
+
+E5TextEditSearchWidget.setWidthForHeight
+setWidthForHeight(widthForHeight)
+
+ Public method to set the 'width for height'.
+
+- widthForHeight (bool)
+-
+flag indicating to prefer width
+
diff -Nru eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5TextInputDialog.html eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5TextInputDialog.html
--- eric-18.05/eric/Documentation/Source/eric6.E5Gui.E5TextInputDialog.html 1970-01-01 00:00:00.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.E5Gui.E5TextInputDialog.html 2018-11-01 10:46:30.000000000 +0000
@@ -0,0 +1,216 @@
+
+
+eric6.E5Gui.E5TextInputDialog
+
+
+
+
+eric6.E5Gui.E5TextInputDialog
+
+Module implementing a dialog to enter some text.
+
+Global Attributes
+
+Classes
+
+Functions
+
+
+getText |
+Function to get create a dialog to enter some text and return it. |
+
+
+
+
+E5TextInputDialog
+
+ Class implementing a dialog to enter some text.
+
+Derived from
+QDialog
+Class Attributes
+
+Class Methods
+
+Methods
+
+Static Methods
+
+
+E5TextInputDialog (Constructor)
+E5TextInputDialog(parent=None)
+
+ Constructor
+
+- parent (QWidget)
+-
+reference to the parent widget
+
+
+E5TextInputDialog.labelText
+labelText()
+
+ Public method to get the current label text.
+
+- Returns:
+-
+current label text
+
+
+- Return Type:
+-
+str
+
+
+E5TextInputDialog.setLabelText
+setLabelText(text)
+
+ Public method to set the label text.
+
+- text (str)
+-
+label text
+
+
+E5TextInputDialog.setTextEchoMode
+setTextEchoMode(echoMode)
+
+ Public method to set the echo mode of the line edit.
+
+- echoMode (QLineEdit.EchoMode)
+-
+echo mode of the line edit
+
+
+E5TextInputDialog.setTextValue
+setTextValue(text)
+
+ Public method to set the text of the line edit.
+
+- text (str)
+-
+text for the line edit
+
+
+E5TextInputDialog.textEchoMode
+textEchoMode()
+
+ Public method to get the current echo mode of the line edit.
+
+- Returns:
+-
+echo mode of the line edit
+
+
+- Return Type:
+-
+QLineEdit.EchoMode
+
+
+E5TextInputDialog.textValue
+textValue()
+
+ Public method to get the text of the line edit.
+
+- Returns:
+-
+text of the line edit
+
+
+- Return Type:
+-
+str
+
+
+
+
+
+getText
+getText(parent, title, label, mode=QLineEdit.Normal, text="", minimumWidth=300)
+
+ Function to get create a dialog to enter some text and return it.
+
+- parent (QWidget)
+-
+reference to the parent widget
+
- title (str)
+-
+title of the dialog
+
- label (str)
+-
+label of the dialog
+
- mode (QLineEdit.EchoMode)
+-
+echo mode of the line edit
+
- text (str)
+-
+initial text of the line edit
+
- minimumWidth (int)
+-
+minimum width of the dialog
+
+
+- Returns:
+-
+tuple containing a flag indicating the dialog was accepted and the
+ entered text
+
+
+- Return Type:
+-
+tuple of (bool, str)
+
+
+
+
+
\ No newline at end of file
diff -Nru eric-18.05/eric/Documentation/Source/eric6.E5Network.E5GoogleMail.html eric-18.11+ds1/eric/Documentation/Source/eric6.E5Network.E5GoogleMail.html
--- eric-18.05/eric/Documentation/Source/eric6.E5Network.E5GoogleMail.html 2017-06-28 17:12:58.000000000 +0000
+++ eric-18.11+ds1/eric/Documentation/Source/eric6.E5Network.E5GoogleMail.html 2018-11-01 10:46:30.000000000 +0000
@@ -48,6 +48,9 @@
getCredentials |
Module function to get the Google credentials. |
+
+isCredentialsFileAvailable |
+Module function to check, if the credentials file has been installed. |
@@ -151,5 +154,23 @@
+
+
+isCredentialsFileAvailable
+isCredentialsFileAvailable()
+
+ Module function to check, if the credentials file has been installed.
+
+- Returns:
+-
+flag indicating, that the credentials file is there
+
+
+- Return Type:
+-
+bool
+
+
+