Sat, 02 May 2020 14:45:06 +0200
Merged with default branch.
--- a/docs/THANKS Sat May 02 14:35:03 2020 +0200 +++ b/docs/THANKS Sat May 02 14:45:06 2020 +0200 @@ -38,5 +38,8 @@ And all the people who reported bugs and made suggestions. +Translator plug-in flag icons: +These flag icons are based on flag icons designed by from Flaticon. + Thanks, Detlev
--- a/docs/changelog Sat May 02 14:35:03 2020 +0200 +++ b/docs/changelog Sat May 02 14:45:06 2020 +0200 @@ -1,11 +1,23 @@ Change Log ---------- +Version 20.5: +- bug fixes +- MicroPython + -- added support for Calliope mini +- Third Party packages + -- updated Pygments to 2.3.1 + +Version 20.4: +- bug fixes +- General + -- included a new icon set based on the Breeze icons of KDE + Version 20.3: - bug fixes - Debugger -- added debugging support for QRunable - Mercurial Interface - -- added support for the '--secure' flag of hg import as of Mercurial 5.3 + -- added support for the '--secure' flag of "hg import" as of Mercurial 5.3 - Syntax Checker -- updated pyflakes to repository as of 2020-02-03 - Third Party packages
--- a/eric6.e4p Sat May 02 14:35:03 2020 +0200 +++ b/eric6.e4p Sat May 02 14:45:06 2020 +0200 @@ -133,6 +133,7 @@ <Source>eric6/E5Graphics/E5GraphicsView.py</Source> <Source>eric6/E5Graphics/__init__.py</Source> <Source>eric6/E5Gui/E5Action.py</Source> + <Source>eric6/E5Gui/E5AnimatedLabel.py</Source> <Source>eric6/E5Gui/E5AnimatedWidget.py</Source> <Source>eric6/E5Gui/E5Application.py</Source> <Source>eric6/E5Gui/E5ClickableLabel.py</Source> @@ -732,6 +733,7 @@ <Source>eric6/Preferences/ConfigurationPages/ViewmanagerPage.py</Source> <Source>eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.py</Source> <Source>eric6/Preferences/ConfigurationPages/WebBrowserFlashCookieManagerPage.py</Source> + <Source>eric6/Preferences/ConfigurationPages/WebBrowserInterfacePage.py</Source> <Source>eric6/Preferences/ConfigurationPages/WebBrowserPage.py</Source> <Source>eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py</Source> <Source>eric6/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py</Source> @@ -964,6 +966,7 @@ <Source>eric6/ThirdParty/Jasy/jasy/script/util/__init__.py</Source> <Source>eric6/ThirdParty/Pygments/__init__.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/__init__.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/__main__.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/cmdline.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/console.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/filter.py</Source> @@ -999,6 +1002,8 @@ <Source>eric6/ThirdParty/Pygments/pygments/lexers/_stan_builtins.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/_stata_builtins.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/_tsql_builtins.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/_usd_builtins.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/_vbscript_builtins.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/_vim_builtins.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/actionscript.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/agile.py</Source> @@ -1011,6 +1016,7 @@ <Source>eric6/ThirdParty/Pygments/pygments/lexers/automation.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/basic.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/bibtex.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/boa.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/business.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/c_cpp.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/c_like.py</Source> @@ -1033,15 +1039,18 @@ <Source>eric6/ThirdParty/Pygments/pygments/lexers/ecl.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/eiffel.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/elm.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/email.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/erlang.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/esoteric.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/ezhil.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/factor.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/fantom.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/felix.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/floscript.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/forth.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/fortran.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/foxpro.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/freefem.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/functional.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/go.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/grammar_notation.py</Source> @@ -1067,10 +1076,12 @@ <Source>eric6/ThirdParty/Pygments/pygments/lexers/markup.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/math.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/matlab.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/mime.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/ml.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/modeling.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/modula2.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/monte.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/mosel.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/ncl.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/nimrod.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/nit.py</Source> @@ -1085,6 +1096,7 @@ <Source>eric6/ThirdParty/Pygments/pygments/lexers/pawn.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/perl.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/php.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/pony.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/praat.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/prolog.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/python.py</Source> @@ -1093,23 +1105,30 @@ <Source>eric6/ThirdParty/Pygments/pygments/lexers/rdf.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/rebol.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/resource.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/ride.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/rnc.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/roboconf.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/robotframework.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/ruby.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/rust.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/sas.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/scdoc.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/scripting.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/sgf.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/shell.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/sieve.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/slash.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/smalltalk.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/smv.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/snobol.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/solidity.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/special.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/sql.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/stata.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/supercollider.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/tcl.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/templates.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/teraterm.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/testing.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/text.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/textedit.py</Source> @@ -1117,14 +1136,18 @@ <Source>eric6/ThirdParty/Pygments/pygments/lexers/theorem.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/trafficscript.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/typoscript.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/unicon.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/urbi.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/usd.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/varnish.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/verification.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/web.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/webidl.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/webmisc.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/whiley.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/x10.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/lexers/xorg.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/lexers/zig.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/modeline.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/plugin.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/regexopt.py</Source> @@ -1145,6 +1168,7 @@ <Source>eric6/ThirdParty/Pygments/pygments/styles/friendly.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/fruity.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/igor.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/styles/inkpot.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/lovelace.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/manni.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/monokai.py</Source> @@ -1157,7 +1181,9 @@ <Source>eric6/ThirdParty/Pygments/pygments/styles/rainbow_dash.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/rrt.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/sas.py</Source> - <Source>eric6/ThirdParty/Pygments/pygments/styles/stata.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/styles/solarized.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/styles/stata_dark.py</Source> + <Source>eric6/ThirdParty/Pygments/pygments/styles/stata_light.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/tango.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/trac.py</Source> <Source>eric6/ThirdParty/Pygments/pygments/styles/vim.py</Source> @@ -1872,6 +1898,7 @@ <Form>eric6/Preferences/ConfigurationPages/ViewmanagerPage.ui</Form> <Form>eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui</Form> <Form>eric6/Preferences/ConfigurationPages/WebBrowserFlashCookieManagerPage.ui</Form> + <Form>eric6/Preferences/ConfigurationPages/WebBrowserInterfacePage.ui</Form> <Form>eric6/Preferences/ConfigurationPages/WebBrowserPage.ui</Form> <Form>eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.ui</Form> <Form>eric6/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.ui</Form> @@ -2052,6 +2079,7 @@ <Other>docs/THANKS</Other> <Other>docs/changelog</Other> <Other>eric6.e4p</Other> + <Other>eric6/APIs/MicroPython/calliope.api</Other> <Other>eric6/APIs/MicroPython/circuitpython.api</Other> <Other>eric6/APIs/MicroPython/microbit.api</Other> <Other>eric6/APIs/MicroPython/micropython.api</Other> @@ -2083,81 +2111,93 @@ <Other>eric6/IconEditor/cursors/eraser-cursor.xpm</Other> <Other>eric6/IconEditor/cursors/fill-cursor.xpm</Other> <Other>eric6/IconEditor/cursors/paintbrush-cursor.xpm</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/glosbe.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev2.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/promt.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flag.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/af.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ar.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/be.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bg.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bs.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ca.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/cs.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/da.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/de.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/el.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/en.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/es.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/et.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fi.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fr.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ga.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/gl.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/he.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hi.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hr.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hu.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/id.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/is.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/it.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/iw.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ja.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ka.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ko.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lt.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lv.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mk.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mt.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/nl.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/no.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pl.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pt.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ro.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ru.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sk.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sl.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sq.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sr.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sv.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/th.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tl.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tr.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/uk.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/vi.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-CN.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-TW.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/swap.png</Other> - <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/translate.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/conflict.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git92.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/preferences-git.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/mercurial.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/preferences-mercurial.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/startServer.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/stopServer.png</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-light.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/glosbe.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev2.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson-light.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/microsoft-light.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/mymemory-light.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/promt.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/yandex-light.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flag-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flag-light.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/af.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ar.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/be.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bg.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/bs.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ca.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/cs.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/da.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/de.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/el.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/en.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/es.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/et.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fi.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/fr.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ga.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/gl.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/he.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hi.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hr.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/hu.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/id.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/is.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/it.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/iw.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ja.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ka.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ko.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lt.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/lv.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mk.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/mt.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/nl.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/no.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pl.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/pt.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ro.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/ru.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sk.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sl.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sq.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sr.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/sv.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/th.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tl.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/tr.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/uk.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/vi.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-CN.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/flags/zh-TW.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/pronounce-light.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/swap-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/swap-light.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/translate-dark.svg</Other> + <Other>eric6/Plugins/UiExtensionPlugins/Translator/icons/translate-light.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/conflict.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/git92.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsGit/icons/preferences-git.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/mercurial.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/preferences-mercurial.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/startServer-dark.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/startServer-light.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/stopServer-dark.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsMercurial/icons/stopServer-light.svg</Other> <Other>eric6/Plugins/VcsPlugins/vcsMercurial/templates/logBrowserBookmarkPhase.tmpl</Other> - <Other>eric6/Plugins/VcsPlugins/vcsPySvn/icons/preferences-subversion.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsPySvn/icons/pysvn.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsSubversion/icons/preferences-subversion.png</Other> - <Other>eric6/Plugins/VcsPlugins/vcsSubversion/icons/subversion.png</Other> + <Other>eric6/Plugins/VcsPlugins/vcsPySvn/icons/preferences-subversion.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsPySvn/icons/pysvn.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsSubversion/icons/preferences-subversion.svg</Other> + <Other>eric6/Plugins/VcsPlugins/vcsSubversion/icons/subversion.svg</Other> <Other>eric6/Plugins/ViewManagerPlugins/Listspace/preview.png</Other> <Other>eric6/Plugins/ViewManagerPlugins/Tabview/preview.png</Other> <Other>eric6/Plugins/WizardPlugins/SetupWizard/data/trove_classifiers.txt</Other> @@ -2177,7 +2217,8 @@ <Other>eric6/ThirdParty/Send2Trash/PKG-INFO</Other> <Other>eric6/ThirdParty/asttokens/asttokens/LICENSE</Other> <Other>eric6/ThirdParty/enum/LICENSE</Other> - <Other>eric6/UI/data/documentViewerStyle.css</Other> + <Other>eric6/UI/data/documentViewerStyle-dark.css</Other> + <Other>eric6/UI/data/documentViewerStyle-light.css</Other> <Other>eric6/WebBrowser/Bookmarks/DefaultBookmarks.xbel</Other> <Other>eric6/WebBrowser/OpenSearch/DefaultSearchEngines/Amazoncom.xml</Other> <Other>eric6/WebBrowser/OpenSearch/DefaultSearchEngines/Bing.xml</Other>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/APIs/MicroPython/calliope.api Sat May 02 14:45:06 2020 +0200 @@ -0,0 +1,324 @@ +audio.AudioFrame?1() +audio.is_playing?4() +audio.play?4(source, wait=True, pin=pin0, return_pin=None) +audio.stop?4() +calliope_mini.Image.ANGRY?7 +calliope_mini.Image.ARROW_E?7 +calliope_mini.Image.ARROW_N?7 +calliope_mini.Image.ARROW_NE?7 +calliope_mini.Image.ARROW_NW?7 +calliope_mini.Image.ARROW_S?7 +calliope_mini.Image.ARROW_SE?7 +calliope_mini.Image.ARROW_SW?7 +calliope_mini.Image.ARROW_W?7 +calliope_mini.Image.ASLEEP?7 +calliope_mini.Image.BUTTERFLY?7 +calliope_mini.Image.CHESSBOARD?7 +calliope_mini.Image.CLOCK10?7 +calliope_mini.Image.CLOCK11?7 +calliope_mini.Image.CLOCK12?7 +calliope_mini.Image.CLOCK1?7 +calliope_mini.Image.CLOCK2?7 +calliope_mini.Image.CLOCK3?7 +calliope_mini.Image.CLOCK4?7 +calliope_mini.Image.CLOCK5?7 +calliope_mini.Image.CLOCK6?7 +calliope_mini.Image.CLOCK7?7 +calliope_mini.Image.CLOCK8?7 +calliope_mini.Image.CLOCK9?7 +calliope_mini.Image.CONFUSED?7 +calliope_mini.Image.COW?7 +calliope_mini.Image.DIAMOND?7 +calliope_mini.Image.DIAMOND_SMALL?7 +calliope_mini.Image.DUCK?7 +calliope_mini.Image.FABULOUS?7 +calliope_mini.Image.GHOST?7 +calliope_mini.Image.GIRAFFE?7 +calliope_mini.Image.HAPPY?7 +calliope_mini.Image.HEART?7 +calliope_mini.Image.HEART_SMALL?7 +calliope_mini.Image.HOUSE?7 +calliope_mini.Image.MEH?7 +calliope_mini.Image.MUSIC_CROTCHET?7 +calliope_mini.Image.MUSIC_QUAVER?7 +calliope_mini.Image.MUSIC_QUAVERS?7 +calliope_mini.Image.NO?7 +calliope_mini.Image.PACMAN?7 +calliope_mini.Image.PITCHFORK?7 +calliope_mini.Image.RABBIT?7 +calliope_mini.Image.ROLLERSKATE?7 +calliope_mini.Image.SAD?7 +calliope_mini.Image.SILLY?7 +calliope_mini.Image.SKULL?7 +calliope_mini.Image.SMILE?7 +calliope_mini.Image.SNAKE?7 +calliope_mini.Image.SQUARE?7 +calliope_mini.Image.SQUARE_SMALL?7 +calliope_mini.Image.STICKFIGURE?7 +calliope_mini.Image.SURPRISED?7 +calliope_mini.Image.SWORD?7 +calliope_mini.Image.TARGET?7 +calliope_mini.Image.TORTOISE?7 +calliope_mini.Image.TRIANGLE?7 +calliope_mini.Image.TRIANGLE_LEFT?7 +calliope_mini.Image.TSHIRT?7 +calliope_mini.Image.UMBRELLA?7 +calliope_mini.Image.XMAS?7 +calliope_mini.Image.YES?7 +calliope_mini.Image.blit?4(src, x, y, width, height, xdest=0, ydest=0) +calliope_mini.Image.copy?4() +calliope_mini.Image.crop?4(x, y, width, height) +calliope_mini.Image.fill?4(value) +calliope_mini.Image.get_pixel?4(x, y) +calliope_mini.Image.height?4() +calliope_mini.Image.invert?4() +calliope_mini.Image.set_pixel?4(x, y, value) +calliope_mini.Image.shift_down?4(n) +calliope_mini.Image.shift_left?4(n) +calliope_mini.Image.shift_right?4(n) +calliope_mini.Image.shift_up?4(n) +calliope_mini.Image.width?4() +calliope_mini.Image?1(stringOrWidth=None, height=None, buffer=None) +calliope_mini.MicroBitAnalogDigitalPin.NO_PULL?7 +calliope_mini.MicroBitAnalogDigitalPin.PULL_DOWN?7 +calliope_mini.MicroBitAnalogDigitalPin.PULL_UP?7 +calliope_mini.MicroBitAnalogDigitalPin.get_mode?4() +calliope_mini.MicroBitAnalogDigitalPin.get_pull?4() +calliope_mini.MicroBitAnalogDigitalPin.read_analog?4() +calliope_mini.MicroBitAnalogDigitalPin.read_digital?4() +calliope_mini.MicroBitAnalogDigitalPin.set_analog_period?4(period) +calliope_mini.MicroBitAnalogDigitalPin.set_analog_period_microseconds?4(period) +calliope_mini.MicroBitAnalogDigitalPin.set_pull?4(mode) +calliope_mini.MicroBitAnalogDigitalPin.write_analog?4(value) +calliope_mini.MicroBitAnalogDigitalPin.write_digital?4(value) +calliope_mini.MicroBitButton.get_presses?4() +calliope_mini.MicroBitButton.is_pressed?4() +calliope_mini.MicroBitButton.was_pressed?4() +calliope_mini.MicroBitDigitalPin.NO_PULL?7 +calliope_mini.MicroBitDigitalPin.PULL_DOWN?7 +calliope_mini.MicroBitDigitalPin.PULL_UP?7 +calliope_mini.MicroBitDigitalPin.get_analog_period_microseconds?4() +calliope_mini.MicroBitDigitalPin.get_mode?4() +calliope_mini.MicroBitDigitalPin.get_pull?4() +calliope_mini.MicroBitDigitalPin.read_digital?4() +calliope_mini.MicroBitDigitalPin.set_analog_period?4(period) +calliope_mini.MicroBitDigitalPin.set_analog_period_microseconds?4(period) +calliope_mini.MicroBitDigitalPin.set_pull?4(mode) +calliope_mini.MicroBitDigitalPin.write_analog?4(value) +calliope_mini.MicroBitDigitalPin.write_digital?4(value) +calliope_mini.MicroBitTouchPin.NO_PULL?7 +calliope_mini.MicroBitTouchPin.PULL_DOWN?7 +calliope_mini.MicroBitTouchPin.PULL_UP?7 +calliope_mini.MicroBitTouchPin.get_mode?4() +calliope_mini.MicroBitTouchPin.get_pull?4() +calliope_mini.MicroBitTouchPin.is_touched?4() +calliope_mini.MicroBitTouchPin.read_analog?4() +calliope_mini.MicroBitTouchPin.read_digital?4() +calliope_mini.MicroBitTouchPin.set_analog_period?4(period) +calliope_mini.MicroBitTouchPin.set_analog_period_microseconds?4(period) +calliope_mini.MicroBitTouchPin.set_pull?4(mode) +calliope_mini.MicroBitTouchPin.write_analog?4(value) +calliope_mini.MicroBitTouchPin.write_digital?4(value) +calliope_mini.accelerometer.get_values?4() +calliope_mini.accelerometer.get_x?4() +calliope_mini.accelerometer.get_y?4() +calliope_mini.accelerometer.get_z?4() +calliope_mini.button_a?7 +calliope_mini.button_b?7 +calliope_mini.c0?7 +calliope_mini.c10?7 +calliope_mini.c11?7 +calliope_mini.c12?7 +calliope_mini.c16?7 +calliope_mini.c17?7 +calliope_mini.c18?7 +calliope_mini.c19?7 +calliope_mini.c1?7 +calliope_mini.c21?7 +calliope_mini.c2?7 +calliope_mini.c3?7 +calliope_mini.c4?7 +calliope_mini.c5?7 +calliope_mini.c6?7 +calliope_mini.c7?7 +calliope_mini.c8?7 +calliope_mini.c9?7 +calliope_mini.display.clear?4() +calliope_mini.display.get_pixel?4(x, y) +calliope_mini.display.is_on?4() +calliope_mini.display.off?4() +calliope_mini.display.on?4() +calliope_mini.display.scroll?4(value, delay=150, *, wait=True, loop=False, monospace=False) +calliope_mini.display.set_pixel?4(x, y, value) +calliope_mini.display.show?4(image) +calliope_mini.display.show?4(value, delay=400, *, wait=True, loop=False, clear=False) +calliope_mini.gyrometer.get_values?4() +calliope_mini.gyrometer.get_x?4() +calliope_mini.gyrometer.get_y?4() +calliope_mini.gyrometer.get_z?4() +calliope_mini.i2c.init?4(freq=100000, sda=pin20, scl=pin19) +calliope_mini.i2c.read?4(addr, n, repeat=False) +calliope_mini.i2c.scan?4() +calliope_mini.i2c.write?4(addr, buf, repeat=False) +calliope_mini.led.clear?4() +calliope_mini.led.get_blue?4() +calliope_mini.led.get_colors?4() +calliope_mini.led.get_green?4() +calliope_mini.led.get_red?4() +calliope_mini.led.set_blue?4(blue_value) +calliope_mini.led.set_colors?4(red_value, green_value, blue_value) +calliope_mini.led.set_green?4(green_value) +calliope_mini.led.set_red?4(red_value) +calliope_mini.magnetometer.get_values?4() +calliope_mini.magnetometer.get_x?4() +calliope_mini.magnetometer.get_y?4() +calliope_mini.magnetometer.get_z?4() +calliope_mini.p0?7 +calliope_mini.p1?7 +calliope_mini.p2?7 +calliope_mini.p3?7 +calliope_mini.panic?4(code) +calliope_mini.pin0?7 +calliope_mini.pin10?7 +calliope_mini.pin11?7 +calliope_mini.pin12?7 +calliope_mini.pin13?7 +calliope_mini.pin14?7 +calliope_mini.pin15?7 +calliope_mini.pin16?7 +calliope_mini.pin19?7 +calliope_mini.pin1?7 +calliope_mini.pin20?7 +calliope_mini.pin21?7 +calliope_mini.pin22?7 +calliope_mini.pin23?7 +calliope_mini.pin24?7 +calliope_mini.pin25?7 +calliope_mini.pin26?7 +calliope_mini.pin27?7 +calliope_mini.pin28?7 +calliope_mini.pin29?7 +calliope_mini.pin2?7 +calliope_mini.pin30?7 +calliope_mini.pin3?7 +calliope_mini.pin4?7 +calliope_mini.pin5?7 +calliope_mini.pin6?7 +calliope_mini.pin7?7 +calliope_mini.pin8?7 +calliope_mini.pin9?7 +calliope_mini.reset?4() +calliope_mini.running_time?4() +calliope_mini.sensor.get_acc_values?4() +calliope_mini.sensor.get_acc_x?4() +calliope_mini.sensor.get_acc_y?4() +calliope_mini.sensor.get_acc_z?4() +calliope_mini.sensor.get_gyro_values?4() +calliope_mini.sensor.get_gyro_x?4() +calliope_mini.sensor.get_gyro_y?4() +calliope_mini.sensor.get_gyro_z?4() +calliope_mini.sensor.get_mag_values?4() +calliope_mini.sensor.get_mag_x?4() +calliope_mini.sensor.get_mag_y?4() +calliope_mini.sensor.get_mag_z?4() +calliope_mini.sensor.get_temp?4() +calliope_mini.sleep?4(ms) +calliope_mini.spi.init?4(baudrate=1000000, bits=8, mode=0, sclk=pin13, mosi=pin15, miso=pin14) +calliope_mini.spi.read?4(nbytes) +calliope_mini.spi.write?4(buffer) +calliope_mini.spi.write_readinto?4(out_buffer, in_buffer) +calliope_mini.temperature?4() +calliope_mini.uart.EVEN?7 +calliope_mini.uart.ODD?7 +calliope_mini.uart.any?4() +calliope_mini.uart.init?4(baudrate=9600, bits=8, parity=None, stop=1, *, tx=None, rx=None) +calliope_mini.uart.read?4() +calliope_mini.uart.read?4(nbytes) +calliope_mini.uart.readinto?4(buf) +calliope_mini.uart.readinto?4(buf, nbytes) +calliope_mini.uart.readline?4() +calliope_mini.uart.write?4(buf) +machine.disable_irq?4() +machine.enable_irq?4() +machine.freq?4() +machine.reset?4() +machine.time_pulse_us?4(pin, pulse_level, timeout_us=1000000) +machine.unique_id?4() +micropython.const?4(expr) +micropython.heap_lock?4() +micropython.heap_unlock?4() +micropython.kbd_intr?4(chr) +micropython.mem_info?4() +micropython.mem_info?4(verbose) +micropython.opt_level?4() +micropython.opt_level?4(level) +micropython.qstr_info?4() +micropython.qstr_info?4(verbose) +micropython.stack_use?4() +music.BADDY?7 +music.BA_DING?7 +music.BIRTHDAY?7 +music.BLUES?7 +music.CHASE?7 +music.DADADADUM?7 +music.ENTERTAINER?7 +music.FUNERAL?7 +music.FUNK?7 +music.JUMP_DOWN?7 +music.JUMP_UP?7 +music.NYAN?7 +music.ODE?7 +music.POWER_DOWN?7 +music.POWER_UP?7 +music.PRELUDE?7 +music.PUNCHLINE?7 +music.PYTHON?7 +music.RINGTONE?7 +music.WAWAWAWAA?7 +music.WEDDING?7 +music.get_tempo?4() +music.pitch?4(frequency, duration=-1, pin=microbit.pin0, wait=True) +music.play?4(music, pin=microbit.pin0, wait=True, loop=False) +music.reset?4() +music.set_tempo?4(ticks=4, bpm=120) +music.stop?4(pin=microbit.pin0) +neopixel.NeoPixel.clear?4() +neopixel.NeoPixel.show?4() +neopixel.NeoPixel?1(pin, n) +os.listdir?4() +os.remove?4(filename) +os.size?4(filename) +os.uname?4() +radio.RATE_1MBIT?7 +radio.RATE_250KBIT?7 +radio.RATE_2MBIT?7 +radio.config?4(length=32, queue=3, channel=7, power=6, address=0x75626974, group=0, data_rate=RATE_1MBIT) +radio.off?4() +radio.on?4() +radio.receive?4() +radio.receive_bytes?4() +radio.receive_bytes_into?4(buffer) +radio.receive_full?4() +radio.reset?4() +radio.send?4(message) +radio.send_bytes?4(message) +random.choice?4(seq) +random.getrandbits?4(n) +random.randint?4(a, b) +random.random?4() +random.randrange?4(start, stop) +random.randrange?4(start, stop, step) +random.randrange?4(stop) +random.seed?4(n) +random.uniform?4(a, b) +speech.pronounce?4(phonemes, *, pitch=64, speed=72, mouth=128, throat=128) +speech.say?4(words, *, pitch=64, speed=72, mouth=128, throat=128) +speech.sing?4(phonemes, *, pitch=64, speed=72, mouth=128, throat=128) +speech.translate?4(words) +utime.sleep?4(seconds) +utime.sleep_ms?4(ms) +utime.sleep_us?4(us) +utime.ticks_add?4(ticks, delta) +utime.ticks_diff?4(ticks1, ticks2) +utime.ticks_ms?4() +utime.ticks_us?4()
--- a/eric6/APIs/MicroPython/circuitpython.api Sat May 02 14:35:03 2020 +0200 +++ b/eric6/APIs/MicroPython/circuitpython.api Sat May 02 14:45:06 2020 +0200 @@ -683,6 +683,8 @@ ustack.max_stack_usage?4() ustack.stack_size?4() ustack.stack_usage?4() +uzlib.DecompIO?1(stream, wbits=0) +uzlib.decompress?4(data, wbits=0, bufsize=0) wiznet.WIZNET5K.connected?7 wiznet.WIZNET5K.dhcp?7 wiznet.WIZNET5K.ifconfig?4(params=None)
--- a/eric6/APIs/MicroPython/microbit.api Sat May 02 14:35:03 2020 +0200 +++ b/eric6/APIs/MicroPython/microbit.api Sat May 02 14:45:06 2020 +0200 @@ -1,14 +1,13 @@ audio.AudioFrame?1() +audio.is_playing?4() audio.play?4(source, wait=True, pin=pin0, return_pin=None) +audio.stop?4() machine.disable_irq?4() machine.enable_irq?4() machine.freq?4() machine.reset?4() machine.time_pulse_us?4(pin, pulse_level, timeout_us=1000000) machine.unique_id?4() -microbit.Button.get_presses?4() -microbit.Button.is_pressed?4() -microbit.Button.was_pressed?4() microbit.Image.ANGRY?7 microbit.Image.ARROW_E?7 microbit.Image.ARROW_N?7 @@ -98,6 +97,9 @@ microbit.MicroBitAnalogDigitalPin.set_pull?4(mode) microbit.MicroBitAnalogDigitalPin.write_analog?4(value) microbit.MicroBitAnalogDigitalPin.write_digital?4(value) +microbit.MicroBitButton.get_presses?4() +microbit.MicroBitButton.is_pressed?4() +microbit.MicroBitButton.was_pressed?4() microbit.MicroBitDigitalPin.NO_PULL?7 microbit.MicroBitDigitalPin.PULL_DOWN?7 microbit.MicroBitDigitalPin.PULL_UP?7
--- a/eric6/APIs/Python3/eric6.api Sat May 02 14:35:03 2020 +0200 +++ b/eric6/APIs/Python3/eric6.api Sat May 02 14:45:06 2020 +0200 @@ -319,7 +319,7 @@ eric6.DebugClients.Python.DebugClientBase.DebugClientBase?1() eric6.DebugClients.Python.DebugClientBase.DebugClientClose?4(fd) eric6.DebugClients.Python.DebugClientBase.DebugClientFork?4() -eric6.DebugClients.Python.DebugClientBase.DebugClientInput?4(prompt="", echo=True) +eric6.DebugClients.Python.DebugClientBase.DebugClientInput?4(prompt="") eric6.DebugClients.Python.DebugClientBase.DebugClientInstance?7 eric6.DebugClients.Python.DebugClientBase.DebugClientRawInput?4(prompt="", echo=True) eric6.DebugClients.Python.DebugClientBase.DebugClientSetRecursionLimit?4(limit) @@ -411,6 +411,7 @@ eric6.DebugClients.Python.eric6dbgstub.setScriptname?4(name) eric6.DebugClients.Python.eric6dbgstub.startDebugger?4(enableTrace=True, exceptions=True, tracePython=False, redirect=True) eric6.DebugClients.Python.getpass.default_getpass?7 +eric6.DebugClients.Python.getpass.fallback_getpass?7 eric6.DebugClients.Python.getpass.getpass?4(prompt='Password: ') eric6.DebugClients.Python.getpass.getuser?4() eric6.DebugClients.Python.getpass.unix_getpass?7 @@ -923,7 +924,7 @@ eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setEndPoint?4(x, y) eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setPoints?4(xa, ya, xb, yb) eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setStartPoint?4(x, y) -eric6.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=None, end=None, filled=False, arrowType=NormalArrow, parent=None) +eric6.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=None, end=None, filled=False, arrowType=NormalArrow, colors=None, parent=None) eric6.E5Graphics.E5ArrowItem.NormalArrow?7 eric6.E5Graphics.E5ArrowItem.WideArrow?7 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.ZoomLevelDefault?7 @@ -932,6 +933,9 @@ eric6.E5Graphics.E5GraphicsView.E5GraphicsView._getDiagramSize?5(border=0) eric6.E5Graphics.E5GraphicsView.E5GraphicsView.autoAdjustSceneSize?4(limit=False) eric6.E5Graphics.E5GraphicsView.E5GraphicsView.filteredItems?4(items) +eric6.E5Graphics.E5GraphicsView.E5GraphicsView.getBackgroundColor?4() +eric6.E5Graphics.E5GraphicsView.E5GraphicsView.getDrawingColors?4() +eric6.E5Graphics.E5GraphicsView.E5GraphicsView.getForegroundColor?4() eric6.E5Graphics.E5GraphicsView.E5GraphicsView.printDiagram?4(printer, diagramName="") eric6.E5Graphics.E5GraphicsView.E5GraphicsView.resizeScene?4(amount, isWidth=True) eric6.E5Graphics.E5GraphicsView.E5GraphicsView.saveImage?4(filename, imageFormat="PNG") @@ -952,6 +956,17 @@ eric6.E5Gui.E5Action.E5Action?1(*args) eric6.E5Gui.E5Action.addActions?4(target, actions) eric6.E5Gui.E5Action.createActionGroup?4(parent, name=None, exclusive=False) +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.getAnimationFile?4() +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.getInterval?4() +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.isActive?4() +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.isAnimationFileLoaded?4() +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.reset?4() +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.setAnimationFile?4(animationFile) +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.setInterval?4(interval) +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.setPixmap?4(pixmap) +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.start?4() +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel.stop?4() +eric6.E5Gui.E5AnimatedLabel.E5AnimatedLabel?1(parent=None, *, animationFile="", interval=100) eric6.E5Gui.E5AnimatedWidget.E5AnimatedWidget.DirectionDown?7 eric6.E5Gui.E5AnimatedWidget.E5AnimatedWidget.DirectionUp?7 eric6.E5Gui.E5AnimatedWidget.E5AnimatedWidget.hide?4() @@ -966,6 +981,7 @@ eric6.E5Gui.E5Application.E5Application.registerObject?4(name, objectRef) eric6.E5Gui.E5Application.E5Application.registerPluginObject?4(name, objectRef, pluginType=None) eric6.E5Gui.E5Application.E5Application.unregisterPluginObject?4(name) +eric6.E5Gui.E5Application.E5Application.usesDarkPalette?4() eric6.E5Gui.E5Application.E5Application?1(argv) eric6.E5Gui.E5Application.e5App?7 eric6.E5Gui.E5ClickableLabel.E5ClickableLabel.clicked?7 @@ -1370,7 +1386,7 @@ eric6.E5Gui.E5TabWidget.E5DnDTabBar.mousePressEvent?4(event) eric6.E5Gui.E5TabWidget.E5DnDTabBar.tabMoveRequested?7 eric6.E5Gui.E5TabWidget.E5DnDTabBar?1(parent=None) -eric6.E5Gui.E5TabWidget.E5TabWidget.animationLabel?4(index, animationFile, speed=100) +eric6.E5Gui.E5TabWidget.E5TabWidget.animationLabel?4(index, animationFile, interval=100) eric6.E5Gui.E5TabWidget.E5TabWidget.customTabContextMenuRequested?7 eric6.E5Gui.E5TabWidget.E5TabWidget.moveTab?4(curIndex, newIndex) eric6.E5Gui.E5TabWidget.E5TabWidget.nextTab?4() @@ -1835,7 +1851,7 @@ eric6.Graphics.AssociationItem.AssociationItem.parseAssociationItemDataString?4(data) eric6.Graphics.AssociationItem.AssociationItem.unassociate?4() eric6.Graphics.AssociationItem.AssociationItem.widgetMoved?4() -eric6.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, assocType=Normal, topToBottom=False, parent=None) +eric6.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, assocType=Normal, topToBottom=False, colors=None, parent=None) eric6.Graphics.AssociationItem.Center?7 eric6.Graphics.AssociationItem.East?7 eric6.Graphics.AssociationItem.Generalisation?7 @@ -1855,7 +1871,7 @@ eric6.Graphics.ClassItem.ClassItem.paint?4(painter, option, widget=None) eric6.Graphics.ClassItem.ClassItem.parseItemDataString?4(version, data) eric6.Graphics.ClassItem.ClassItem.setModel?4(model) -eric6.Graphics.ClassItem.ClassItem?1(model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, parent=None, scene=None) +eric6.Graphics.ClassItem.ClassItem?1(model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, colors=None, parent=None, scene=None) eric6.Graphics.ClassItem.ClassModel.addAttribute?4(attribute) eric6.Graphics.ClassItem.ClassModel.addMethod?4(method) eric6.Graphics.ClassItem.ClassModel.getAttributes?4() @@ -1873,7 +1889,7 @@ eric6.Graphics.ModuleItem.ModuleItem.paint?4(painter, option, widget=None) eric6.Graphics.ModuleItem.ModuleItem.parseItemDataString?4(version, data) eric6.Graphics.ModuleItem.ModuleItem.setModel?4(model) -eric6.Graphics.ModuleItem.ModuleItem?1(model=None, x=0, y=0, rounded=False, parent=None, scene=None) +eric6.Graphics.ModuleItem.ModuleItem?1(model=None, x=0, y=0, rounded=False, colors=None, parent=None, scene=None) eric6.Graphics.ModuleItem.ModuleModel.addClass?4(classname) eric6.Graphics.ModuleItem.ModuleModel.getClasses?4() eric6.Graphics.ModuleItem.ModuleModel?1(name, classlist=None) @@ -1887,7 +1903,7 @@ eric6.Graphics.PackageItem.PackageItem.paint?4(painter, option, widget=None) eric6.Graphics.PackageItem.PackageItem.parseItemDataString?4(version, data) eric6.Graphics.PackageItem.PackageItem.setModel?4(model) -eric6.Graphics.PackageItem.PackageItem?1(model=None, x=0, y=0, rounded=False, noModules=False, parent=None, scene=None) +eric6.Graphics.PackageItem.PackageItem?1(model=None, x=0, y=0, rounded=False, noModules=False, colors=None, parent=None, scene=None) eric6.Graphics.PackageItem.PackageModel.addModule?4(modulename) eric6.Graphics.PackageItem.PackageModel.getModules?4() eric6.Graphics.PackageItem.PackageModel?1(name, moduleslist=None) @@ -1961,7 +1977,7 @@ eric6.Graphics.UMLItem.UMLItem.setId?4(itemId) eric6.Graphics.UMLItem.UMLItem.setPos?4(x, y) eric6.Graphics.UMLItem.UMLItem.setSize?4(width, height) -eric6.Graphics.UMLItem.UMLItem?1(model=None, x=0, y=0, rounded=False, parent=None) +eric6.Graphics.UMLItem.UMLItem?1(model=None, x=0, y=0, rounded=False, colors=None, parent=None) eric6.Graphics.UMLItem.UMLModel.getName?4() eric6.Graphics.UMLItem.UMLModel?1(name) eric6.Graphics.UMLSceneSizeDialog.UMLSceneSizeDialog.getData?4() @@ -2364,6 +2380,7 @@ eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.hasData?4() eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.isDirty?4() eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.on_saveButton_clicked?4() +eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.preferencesChanged?4() eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.processData?4(data) eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget.saveData?4() eric6.MicroPython.MicroPythonGraphWidget.MicroPythonGraphWidget?1(parent=None) @@ -2413,7 +2430,7 @@ eric6.MicroPython.MicrobitDevices.MicrobitDevice.hasTimeCommands?4() eric6.MicroPython.MicrobitDevices.MicrobitDevice.runScript?4(script) eric6.MicroPython.MicrobitDevices.MicrobitDevice.setButtons?4() -eric6.MicroPython.MicrobitDevices.MicrobitDevice?1(microPythonWidget, parent=None) +eric6.MicroPython.MicrobitDevices.MicrobitDevice?1(microPythonWidget, deviceType, parent=None) eric6.MicroPython.PyBoardDevices.PyBoardDevice.DeviceVolumeName?7 eric6.MicroPython.PyBoardDevices.PyBoardDevice.FlashInstructionsURL?7 eric6.MicroPython.PyBoardDevices.PyBoardDevice.addDeviceMenuEntries?4(menu) @@ -3824,7 +3841,7 @@ eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator.activate?4() eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator.deactivate?4() eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator.getAppIcon?4(name) -eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator?1(plugin, parent=None) +eric6.Plugins.UiExtensionPlugins.Translator.Translator.Translator?1(plugin, usesDarkPalette, parent=None) eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.DeepLEngine.MaxTranslationTextLen?7 eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.DeepLEngine.TranslatorUrl?7 eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.DeepLEngine.engineName?4() @@ -4096,6 +4113,7 @@ eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog.start?4(fn, isFile=False, noEntries=0) eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.GitLogBrowserDialog?1(vcs, parent=None) +eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.LIGHTCOLORS?7 eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.getParameters?4() eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_branchButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.GitMergeDialog.on_branchCombo_editTextChanged?4(txt) @@ -4678,6 +4696,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn, bundle=None, isFile=False, noEntries=0) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode="", parent=None) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.LIGHTCOLORS?7 eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.getParameters?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkCombo_editTextChanged?4(txt) @@ -6247,12 +6266,16 @@ eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_downButton_clicked?4() eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_iconDirectoryList_currentRowChanged?4(row) eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_iconDirectoryPicker_textChanged?4(txt) +eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_showDefaultIconsButton_clicked?4() eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_showIconsButton_clicked?4() eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.on_upButton_clicked?4() eric6.Preferences.ConfigurationPages.IconsPage.IconsPage.save?4() eric6.Preferences.ConfigurationPages.IconsPage.IconsPage?1() eric6.Preferences.ConfigurationPages.IconsPage.create?4(dlg) -eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog?1(parent, dirName) +eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog.on_directoryCombo_currentTextChanged?4(dirName) +eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog.on_invertButton_toggled?4(checked) +eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog.on_refreshButton_clicked?4() +eric6.Preferences.ConfigurationPages.IconsPreviewDialog.IconsPreviewDialog?1(directories, parent=None) eric6.Preferences.ConfigurationPages.InterfacePage.InterfacePage.on_resetLayoutButton_clicked?4() eric6.Preferences.ConfigurationPages.InterfacePage.InterfacePage.save?4() eric6.Preferences.ConfigurationPages.InterfacePage.InterfacePage?1() @@ -6360,6 +6383,9 @@ eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.WebBrowserFlashCookieManagerPage.save?4() eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.WebBrowserFlashCookieManagerPage?1() eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.create?4(dlg) +eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.WebBrowserInterfacePage.save?4() +eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.WebBrowserInterfacePage?1() +eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.create?4(dlg) eric6.Preferences.ConfigurationPages.WebBrowserPage.WebBrowserPage.on_defaultHomeButton_clicked?4() eric6.Preferences.ConfigurationPages.WebBrowserPage.WebBrowserPage.on_refererWhitelistButton_clicked?4() eric6.Preferences.ConfigurationPages.WebBrowserPage.WebBrowserPage.on_setCurrentPageButton_clicked?4() @@ -6869,8 +6895,10 @@ eric6.Project.Project.Project.setTranslationPattern?4(pattern) eric6.Project.Project.Project.showMenu?7 eric6.Project.Project.Project.sourceFile?7 +eric6.Project.Project.Project.startFileSystemMonitoring?4() eric6.Project.Project.Project.startStatusMonitor?4() eric6.Project.Project.Project.startswithProjectPath?4(path) +eric6.Project.Project.Project.stopFileSystemMonitoring?4() eric6.Project.Project.Project.stopStatusMonitor?4() eric6.Project.Project.Project.unregisterProjectType?4(type_) eric6.Project.Project.Project.updateFileTypes?4() @@ -6970,6 +6998,8 @@ eric6.Project.ProjectBrowserModel.ProjectBrowserModel.removeItem?4(name) eric6.Project.ProjectBrowserModel.ProjectBrowserModel.renameItem?4(name, newFilename) eric6.Project.ProjectBrowserModel.ProjectBrowserModel.repopulateItem?4(name) +eric6.Project.ProjectBrowserModel.ProjectBrowserModel.startFileSystemMonitoring?4() +eric6.Project.ProjectBrowserModel.ProjectBrowserModel.stopFileSystemMonitoring?4() eric6.Project.ProjectBrowserModel.ProjectBrowserModel.updateVCSStatus?4(name, recursive=True) eric6.Project.ProjectBrowserModel.ProjectBrowserModel.vcsStateChanged?7 eric6.Project.ProjectBrowserModel.ProjectBrowserModel?1(parent) @@ -8424,8 +8454,9 @@ eric6.Toolbox.SingleApplication.SingleApplicationServer.shutdown?4() eric6.Toolbox.SingleApplication.SingleApplicationServer?1(name) eric6.Toolbox.Startup.application?7 +eric6.Toolbox.Startup.getDefaultIconPaths?4(application) eric6.Toolbox.Startup.handleArgs?4(argv, appinfo) -eric6.Toolbox.Startup.initializeResourceSearchPath?4() +eric6.Toolbox.Startup.initializeResourceSearchPath?4(application) eric6.Toolbox.Startup.loadTranslatorForLocale?4(dirs, tn) eric6.Toolbox.Startup.loadTranslators?4(qtTransDir, app, translationFiles=()) eric6.Toolbox.Startup.loaded_translators?7 @@ -8661,6 +8692,8 @@ eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.shutdown?4() eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.unregisterProvider?4(providerName) eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer?1(parent=None) +eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.EmpytDocument_Dark?7 +eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.EmpytDocument_Light?7 eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.clear?4() eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget.setHtml?4(html) eric6.UI.CodeDocumentationViewer.DocumentationViewerWidget?1(parent=None) @@ -8806,6 +8839,7 @@ eric6.UI.PixmapCache.PixmapCache.SupportedExtensions?7 eric6.UI.PixmapCache.PixmapCache.addSearchPath?4(path) eric6.UI.PixmapCache.PixmapCache.getPixmap?4(key, size=None) +eric6.UI.PixmapCache.PixmapCache.removeSearchPath?4(path) eric6.UI.PixmapCache.PixmapCache?1() eric6.UI.PixmapCache.addSearchPath?4(path, cache=pixCache) eric6.UI.PixmapCache.getCombinedIcon?4(keys, size=None, cache=pixCache) @@ -8813,6 +8847,7 @@ eric6.UI.PixmapCache.getPixmap?4(key, size=None, cache=pixCache) eric6.UI.PixmapCache.getSymlinkIcon?4(key, size=None, cache=pixCache) eric6.UI.PixmapCache.pixCache?7 +eric6.UI.PixmapCache.removeSearchPath?4(path, cache=pixCache) eric6.UI.Previewer.Previewer.hide?4() eric6.UI.Previewer.Previewer.preferencesChanged?4() eric6.UI.Previewer.Previewer.show?4() @@ -8839,8 +8874,10 @@ eric6.UI.Previewers.PreviewerHTML.PreviewerHTML.resultCallback?4(resDict=resultDict) eric6.UI.Previewers.PreviewerHTML.PreviewerHTML.shutdown?4() eric6.UI.Previewers.PreviewerHTML.PreviewerHTML?1(parent=None) -eric6.UI.Previewers.PreviewerHTMLStyles.css_markdown?7 -eric6.UI.Previewers.PreviewerHTMLStyles.css_pygments?7 +eric6.UI.Previewers.PreviewerHTMLStyles.css_markdown_dark?7 +eric6.UI.Previewers.PreviewerHTMLStyles.css_markdown_light?7 +eric6.UI.Previewers.PreviewerHTMLStyles.css_pygments_dark?7 +eric6.UI.Previewers.PreviewerHTMLStyles.css_pygments_light?7 eric6.UI.Previewers.PreviewerQSS.PreviewerQSS.processEditor?4(editor=None) eric6.UI.Previewers.PreviewerQSS.PreviewerQSS?1(parent=None) eric6.UI.PythonAstViewer.PythonAstViewer.EndIndexRole?7 @@ -11725,6 +11762,7 @@ install.initGlobals?4() install.installApis?7 install.installEric?4() +install.isPipOutdated?4() install.macAppBundleName?7 install.macAppBundlePath?7 install.macPythonExe?7 @@ -11739,6 +11777,7 @@ install.pyModDir?7 install.shutilCopy?4(src, dst, perm=0o644) install.sourceDir?7 +install.updatePip?4() install.usage?4(rcode=2) install.windowsDesktopEntries?4() install.windowsDesktopNames?4()
--- a/eric6/APIs/Python3/eric6.bas Sat May 02 14:35:03 2020 +0200 +++ b/eric6/APIs/Python3/eric6.bas Sat May 02 14:45:06 2020 +0200 @@ -161,6 +161,7 @@ DummyThreadWrapper ThreadWrapper module._DummyThread DuplicateParamError Exception E5Action QAction +E5AnimatedLabel QLabel E5AnimatedWidget QWidget E5Application QApplication E5ArrowItem QAbstractGraphicsShapeItem @@ -1001,6 +1002,7 @@ WebBrowserAppearancePage ConfigurationPageBase Ui_WebBrowserAppearancePage WebBrowserClearPrivateDataDialog QDialog Ui_WebBrowserClearPrivateDataDialog WebBrowserFlashCookieManagerPage ConfigurationPageBase Ui_WebBrowserFlashCookieManagerPage +WebBrowserInterfacePage ConfigurationPageBase Ui_WebBrowserInterfacePage WebBrowserJavaScriptConsole QTextEdit WebBrowserLanguagesDialog QDialog Ui_WebBrowserLanguagesDialog WebBrowserPage QWebEnginePage
--- a/eric6/Cooperation/ChatWidget.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Cooperation/ChatWidget.py Sat May 02 14:45:06 2020 +0200 @@ -59,13 +59,13 @@ self.setupUi(self) self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditDisconnected.png")) + UI.PixmapCache.getIcon("sharedEditDisconnected")) self.startEditButton.setIcon( - UI.PixmapCache.getIcon("sharedEditStart.png")) + UI.PixmapCache.getIcon("sharedEditStart")) self.sendEditButton.setIcon( - UI.PixmapCache.getIcon("sharedEditSend.png")) + UI.PixmapCache.getIcon("sharedEditSend")) self.cancelEditButton.setIcon( - UI.PixmapCache.getIcon("sharedEditCancel.png")) + UI.PixmapCache.getIcon("sharedEditCancel")) self.__ui = ui self.__client = CooperationClient(self) @@ -177,7 +177,7 @@ QListWidgetItem( UI.PixmapCache.getIcon( - "chatUser{0}.png".format(1 + self.usersList.count() % 6)), + "chatUser{0}".format(1 + self.usersList.count() % 6)), nick, self.usersList) if not self.__connected: @@ -185,7 +185,7 @@ if not self.isVisible(): self.__ui.showNotification( - UI.PixmapCache.getPixmap("cooperation48.png"), + UI.PixmapCache.getPixmap("cooperation48"), self.tr("New User"), self.tr("{0} has joined.") .format(nick)) @@ -216,7 +216,7 @@ if not self.isVisible(): self.__ui.showNotification( - UI.PixmapCache.getPixmap("cooperation48.png"), + UI.PixmapCache.getPixmap("cooperation48"), self.tr("User Left"), self.tr("{0} has left.") .format(nick)) @@ -239,7 +239,7 @@ if not self.isVisible(): self.__ui.showNotification( - UI.PixmapCache.getPixmap("cooperation48.png"), + UI.PixmapCache.getPixmap("cooperation48"), self.tr("Message from <{0}>").format(from_), message) @pyqtSlot(str) @@ -417,10 +417,10 @@ """ if checked: self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditConnected.png")) + UI.PixmapCache.getIcon("sharedEditConnected")) else: self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditDisconnected.png")) + UI.PixmapCache.getIcon("sharedEditDisconnected")) self.startEditButton.setEnabled(checked) self.shareEditor.emit(checked) @@ -477,10 +477,10 @@ self.shareButton.setChecked(sharing) if sharing: self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditConnected.png")) + UI.PixmapCache.getIcon("sharedEditConnected")) else: self.shareButton.setIcon( - UI.PixmapCache.getIcon("sharedEditDisconnected.png")) + UI.PixmapCache.getIcon("sharedEditDisconnected")) self.startEditButton.setChecked(editing) self.shareButton.setEnabled(shareable and not editing) @@ -495,22 +495,22 @@ """ self.__chatMenu = QMenu(self) self.__copyChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr("Copy"), self.__copyChat) self.__chatMenu.addSeparator() self.__cutAllChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr("Cut all"), self.__cutAllChat) self.__copyAllChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr("Copy all"), self.__copyAllChat) self.__chatMenu.addSeparator() self.__clearChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("editDelete.png"), + UI.PixmapCache.getIcon("editDelete"), self.tr("Clear"), self.__clearChat) self.__chatMenu.addSeparator() self.__saveChatAct = self.__chatMenu.addAction( - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr("Save"), self.__saveChat) self.on_chatEdit_copyAvailable(False) @@ -617,13 +617,13 @@ """ self.__usersMenu = QMenu(self) self.__kickUserAct = self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatKickUser.png"), + UI.PixmapCache.getIcon("chatKickUser"), self.tr("Kick User"), self.__kickUser) self.__banUserAct = self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatBanUser.png"), + UI.PixmapCache.getIcon("chatBanUser"), self.tr("Ban User"), self.__banUser) self.__banKickUserAct = self.__usersMenu.addAction( - UI.PixmapCache.getIcon("chatBanKickUser.png"), + UI.PixmapCache.getIcon("chatBanKickUser"), self.tr("Ban and Kick User"), self.__banKickUser) @pyqtSlot(QPoint)
--- a/eric6/DebugClients/Python/DebugClientBase.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/DebugClients/Python/DebugClientBase.py Sat May 02 14:45:06 2020 +0200 @@ -48,13 +48,17 @@ def DebugClientRawInput(prompt="", echo=True): """ - Replacement for the standard raw_input builtin. + Replacement for the standard raw_input() builtin (Python 2) and + the standard input() builtin (Python 3). This function works with the split debugger. - @param prompt prompt to be shown. (string) - @param echo flag indicating echoing of the input (boolean) - @return result of the raw_input() call + @param prompt prompt to be shown + @type str + @param echo flag indicating echoing of the input + @type bool + @return result of the raw_input()/input() call + @rtype str """ if DebugClientInstance is None or not DebugClientInstance.redirect: return DebugClientOrigRawInput(prompt) @@ -62,20 +66,21 @@ return DebugClientInstance.raw_input(prompt, echo) -def DebugClientInput(prompt="", echo=True): +def DebugClientInput(prompt=""): """ - Replacement for the standard input builtin. + Replacement for the standard input() builtin (Python 2). This function works with the split debugger. - @param prompt prompt to be shown (string) - @param echo flag indicating to echo the output (boolean) + @param prompt prompt to be shown + @type str @return result of the input() call + @rtype str """ if DebugClientInstance is None or not DebugClientInstance.redirect: return DebugClientOrigInput(prompt) - return DebugClientInstance.input(prompt, echo) + return DebugClientInstance.input(prompt) # Use our own input() and on Python 2 raw_input(). if sys.version_info[0] == 2: @@ -105,14 +110,11 @@ else: try: DebugClientOrigInput = __builtins__.__dict__['input'] - __builtins__.__dict__['input'] = DebugClientInput + __builtins__.__dict__['input'] = DebugClientRawInput except (AttributeError, KeyError): - try: - import __main__ - DebugClientOrigInput = __main__.__builtins__.__dict__['input'] - __main__.__builtins__.__dict__['input'] = DebugClientInput - except (AttributeError, KeyError): - DebugClientOrigInput = lambda x: '' # __IGNORE_WARNING__ + import __main__ + DebugClientOrigInput = __main__.__builtins__.__dict__['input'] + __main__.__builtins__.__dict__['input'] = DebugClientRawInput ###############################################################################
--- a/eric6/DebugClients/Python/getpass.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/DebugClients/Python/getpass.py Sat May 02 14:45:06 2020 +0200 @@ -23,7 +23,8 @@ First try various environment variables, then the password database. This works on Windows as long as USERNAME is set. - @return username (string) + @return username + @rtype str """ # this is copied from the oroginal getpass.py @@ -43,8 +44,10 @@ """ Function to prompt for a password, with echo turned off. - @param prompt Prompt to be shown to the user (string) - @return Password entered by the user (string) + @param prompt Prompt to be shown to the user + @type str + @return Password entered by the user + @rtype str """ return input(prompt, False) @@ -52,6 +55,7 @@ unix_getpass = getpass win_getpass = getpass default_getpass = getpass +fallback_getpass = getpass # # eflag: noqa = M702
--- a/eric6/Debugger/CallTraceViewer.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Debugger/CallTraceViewer.py Sat May 02 14:45:06 2020 +0200 @@ -48,16 +48,16 @@ self.__debugViewer = debugViewer self.startTraceButton.setIcon( - UI.PixmapCache.getIcon("callTraceStart.png")) + UI.PixmapCache.getIcon("callTraceStart")) self.stopTraceButton.setIcon( - UI.PixmapCache.getIcon("callTraceStop.png")) - self.resizeButton.setIcon(UI.PixmapCache.getIcon("resizeColumns.png")) - self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete.png")) - self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSave.png")) + UI.PixmapCache.getIcon("callTraceStop")) + self.resizeButton.setIcon(UI.PixmapCache.getIcon("resizeColumns")) + self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete")) + self.saveButton.setIcon(UI.PixmapCache.getIcon("fileSave")) self.__headerItem = QTreeWidgetItem( ["", self.tr("From"), self.tr("To")]) - self.__headerItem.setIcon(0, UI.PixmapCache.getIcon("callReturn.png")) + self.__headerItem.setIcon(0, UI.PixmapCache.getIcon("callReturn")) self.callTrace.setHeaderItem(self.__headerItem) self.__callStack = [] @@ -266,9 +266,9 @@ """ if debuggerId == self.__tracedDebuggerId: if isCall: - icon = UI.PixmapCache.getIcon("forward.png") + icon = UI.PixmapCache.getIcon("forward") else: - icon = UI.PixmapCache.getIcon("back.png") + icon = UI.PixmapCache.getIcon("back") parentItem = ( self.__callStack[-1] if self.__callStack else self.callTrace)
--- a/eric6/Debugger/DebugUI.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Debugger/DebugUI.py Sat May 02 14:45:06 2020 +0200 @@ -180,7 +180,7 @@ self.runAct = E5Action( self.tr('Run Script'), - UI.PixmapCache.getIcon("runScript.png"), + UI.PixmapCache.getIcon("runScript"), self.tr('&Run Script...'), Qt.Key_F2, 0, self, 'dbg_run_script') self.runAct.setStatusTip(self.tr('Run the current Script')) @@ -195,7 +195,7 @@ self.runProjectAct = E5Action( self.tr('Run Project'), - UI.PixmapCache.getIcon("runProject.png"), + UI.PixmapCache.getIcon("runProject"), self.tr('Run &Project...'), Qt.SHIFT + Qt.Key_F2, 0, self, 'dbg_run_project') self.runProjectAct.setStatusTip(self.tr('Run the current Project')) @@ -211,7 +211,7 @@ self.coverageAct = E5Action( self.tr('Coverage run of Script'), - UI.PixmapCache.getIcon("coverageScript.png"), + UI.PixmapCache.getIcon("coverageScript"), self.tr('Coverage run of Script...'), 0, 0, self, 'dbg_coverage_script') self.coverageAct.setStatusTip( @@ -227,7 +227,7 @@ self.coverageProjectAct = E5Action( self.tr('Coverage run of Project'), - UI.PixmapCache.getIcon("coverageProject.png"), + UI.PixmapCache.getIcon("coverageProject"), self.tr('Coverage run of Project...'), 0, 0, self, 'dbg_coverage_project') self.coverageProjectAct.setStatusTip( @@ -244,7 +244,7 @@ self.profileAct = E5Action( self.tr('Profile Script'), - UI.PixmapCache.getIcon("profileScript.png"), + UI.PixmapCache.getIcon("profileScript"), self.tr('Profile Script...'), 0, 0, self, 'dbg_profile_script') self.profileAct.setStatusTip(self.tr('Profile the current Script')) self.profileAct.setWhatsThis(self.tr( @@ -257,7 +257,7 @@ self.profileProjectAct = E5Action( self.tr('Profile Project'), - UI.PixmapCache.getIcon("profileProject.png"), + UI.PixmapCache.getIcon("profileProject"), self.tr('Profile Project...'), 0, 0, self, 'dbg_profile_project') self.profileProjectAct.setStatusTip( @@ -273,7 +273,7 @@ self.debugAct = E5Action( self.tr('Debug Script'), - UI.PixmapCache.getIcon("debugScript.png"), + UI.PixmapCache.getIcon("debugScript"), self.tr('&Debug Script...'), Qt.Key_F5, 0, self, 'dbg_debug_script') self.debugAct.setStatusTip(self.tr('Debug the current Script')) @@ -289,7 +289,7 @@ self.debugProjectAct = E5Action( self.tr('Debug Project'), - UI.PixmapCache.getIcon("debugProject.png"), + UI.PixmapCache.getIcon("debugProject"), self.tr('Debug &Project...'), Qt.SHIFT + Qt.Key_F5, 0, self, 'dbg_debug_project') self.debugProjectAct.setStatusTip(self.tr( @@ -306,7 +306,7 @@ self.restartAct = E5Action( self.tr('Restart'), - UI.PixmapCache.getIcon("debugRestart.png"), + UI.PixmapCache.getIcon("debugRestart"), self.tr('Restart'), Qt.Key_F4, 0, self, 'dbg_restart_script') self.restartAct.setStatusTip(self.tr( 'Restart the last debugged script')) @@ -322,7 +322,7 @@ self.stopAct = E5Action( self.tr('Stop'), - UI.PixmapCache.getIcon("stopScript.png"), + UI.PixmapCache.getIcon("stopScript"), self.tr('Stop'), Qt.SHIFT + Qt.Key_F10, 0, self, 'dbg_stop_script') self.stopAct.setStatusTip(self.tr("""Stop the running script.""")) @@ -337,7 +337,7 @@ act = E5Action( self.tr('Continue'), - UI.PixmapCache.getIcon("continue.png"), + UI.PixmapCache.getIcon("continue"), self.tr('&Continue'), Qt.Key_F6, 0, self.debugActGrp, 'dbg_continue') act.setStatusTip( @@ -353,7 +353,7 @@ act = E5Action( self.tr('Continue to Cursor'), - UI.PixmapCache.getIcon("continueToCursor.png"), + UI.PixmapCache.getIcon("continueToCursor"), self.tr('Continue &To Cursor'), Qt.SHIFT + Qt.Key_F6, 0, self.debugActGrp, 'dbg_continue_to_cursor') act.setStatusTip(self.tr( @@ -369,7 +369,7 @@ act = E5Action( self.tr('Move Instruction Pointer to Cursor'), - UI.PixmapCache.getIcon("moveInstructionPointer.png"), + UI.PixmapCache.getIcon("moveInstructionPointer"), self.tr('&Jump To Cursor'), Qt.Key_F12, 0, self.debugActGrp, 'dbg_jump_to_cursor') act.setStatusTip(self.tr( @@ -389,7 +389,7 @@ act = E5Action( self.tr('Single Step'), - UI.PixmapCache.getIcon("step.png"), + UI.PixmapCache.getIcon("step"), self.tr('Sin&gle Step'), Qt.Key_F7, 0, self.debugActGrp, 'dbg_single_step') act.setStatusTip(self.tr('Execute a single Python statement')) @@ -405,7 +405,7 @@ act = E5Action( self.tr('Step Over'), - UI.PixmapCache.getIcon("stepOver.png"), + UI.PixmapCache.getIcon("stepOver"), self.tr('Step &Over'), Qt.Key_F8, 0, self.debugActGrp, 'dbg_step_over') act.setStatusTip(self.tr( @@ -424,7 +424,7 @@ act = E5Action( self.tr('Step Out'), - UI.PixmapCache.getIcon("stepOut.png"), + UI.PixmapCache.getIcon("stepOut"), self.tr('Step Ou&t'), Qt.Key_F9, 0, self.debugActGrp, 'dbg_step_out') act.setStatusTip(self.tr( @@ -443,7 +443,7 @@ act = E5Action( self.tr('Stop'), - UI.PixmapCache.getIcon("stepQuit.png"), + UI.PixmapCache.getIcon("stepQuit"), self.tr('&Stop'), Qt.Key_F10, 0, self.debugActGrp, 'dbg_stop') act.setStatusTip(self.tr('Stop debugging')) @@ -508,7 +508,7 @@ self.dbgToggleBpAct = E5Action( self.tr('Toggle Breakpoint'), - UI.PixmapCache.getIcon("breakpointToggle.png"), + UI.PixmapCache.getIcon("breakpointToggle"), self.tr('Toggle Breakpoint'), QKeySequence(self.tr("Shift+F11", "Debug|Toggle Breakpoint")), 0, self.dbgSetBpActGrp, 'dbg_toggle_breakpoint') @@ -523,7 +523,7 @@ self.dbgEditBpAct = E5Action( self.tr('Edit Breakpoint'), - UI.PixmapCache.getIcon("cBreakpointToggle.png"), + UI.PixmapCache.getIcon("cBreakpointToggle"), self.tr('Edit Breakpoint...'), QKeySequence(self.tr("Shift+F12", "Debug|Edit Breakpoint")), 0, self.dbgSetBpActGrp, 'dbg_edit_breakpoint') @@ -538,7 +538,7 @@ self.dbgNextBpAct = E5Action( self.tr('Next Breakpoint'), - UI.PixmapCache.getIcon("breakpointNext.png"), + UI.PixmapCache.getIcon("breakpointNext"), self.tr('Next Breakpoint'), QKeySequence( self.tr("Ctrl+Shift+PgDown", "Debug|Next Breakpoint")), 0, @@ -553,7 +553,7 @@ self.dbgPrevBpAct = E5Action( self.tr('Previous Breakpoint'), - UI.PixmapCache.getIcon("breakpointPrevious.png"), + UI.PixmapCache.getIcon("breakpointPrevious"), self.tr('Previous Breakpoint'), QKeySequence( self.tr("Ctrl+Shift+PgUp", "Debug|Previous Breakpoint")), @@ -1090,7 +1090,7 @@ ' {1}.\n{2}').format( os.path.basename(program), status, info) self.ui.showNotification( - UI.PixmapCache.getPixmap("debug48.png"), + UI.PixmapCache.getPixmap("debug48"), self.tr("Program terminated"), msg) else: if program is None:
--- a/eric6/Debugger/DebugViewer.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Debugger/DebugViewer.py Sat May 02 14:45:06 2020 +0200 @@ -198,7 +198,7 @@ self.callStackViewer = CallStackViewer(self.debugServer) index = self.__tabWidget.addTab( self.callStackViewer, - UI.PixmapCache.getIcon("step"), "") + UI.PixmapCache.getIcon("callStack"), "") self.__tabWidget.setTabToolTip( index, self.callStackViewer.windowTitle()) self.callStackViewer.sourceFile.connect(self.sourceFile)
--- a/eric6/Debugger/ExceptionLogger.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Debugger/ExceptionLogger.py Sat May 02 14:45:06 2020 +0200 @@ -110,11 +110,14 @@ return if not exceptionMessage: - itm.setText(0, self.tr("{0}: {1}").format( - debuggerId, exceptionType)) + text = self.tr("{0}: {1}").format( + debuggerId, exceptionType) else: - itm.setText(0, self.tr("{0}: {1}, {2}").format( - debuggerId, exceptionType, exceptionMessage)) + text = self.tr("{0}: {1}, {2}").format( + debuggerId, exceptionType, exceptionMessage) + + itm.setText(0, text) + itm.setToolTip(0, text) # now add the call stack, most recent call first for entry in stackTrace:
--- a/eric6/Documentation/Help/source.qhp Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Help/source.qhp Sat May 02 14:45:06 2020 +0200 @@ -92,6 +92,7 @@ </section> <section title="eric6.E5Gui" ref="index-eric6.E5Gui.html"> <section title="eric6.E5Gui.E5Action" ref="eric6.E5Gui.E5Action.html" /> + <section title="eric6.E5Gui.E5AnimatedLabel" ref="eric6.E5Gui.E5AnimatedLabel.html" /> <section title="eric6.E5Gui.E5AnimatedWidget" ref="eric6.E5Gui.E5AnimatedWidget.html" /> <section title="eric6.E5Gui.E5Application" ref="eric6.E5Gui.E5Application.html" /> <section title="eric6.E5Gui.E5ClickableLabel" ref="eric6.E5Gui.E5ClickableLabel.html" /> @@ -753,6 +754,7 @@ <section title="eric6.Preferences.ConfigurationPages.ViewmanagerPage" ref="eric6.Preferences.ConfigurationPages.ViewmanagerPage.html" /> <section title="eric6.Preferences.ConfigurationPages.WebBrowserAppearancePage" ref="eric6.Preferences.ConfigurationPages.WebBrowserAppearancePage.html" /> <section title="eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage" ref="eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.html" /> + <section title="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage" ref="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html" /> <section title="eric6.Preferences.ConfigurationPages.WebBrowserPage" ref="eric6.Preferences.ConfigurationPages.WebBrowserPage.html" /> <section title="eric6.Preferences.ConfigurationPages.WebBrowserSpellCheckingPage" ref="eric6.Preferences.ConfigurationPages.WebBrowserSpellCheckingPage.html" /> <section title="eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage" ref="eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.html" /> @@ -3776,6 +3778,21 @@ <keyword name="E5Action.setIconText" id="E5Action.setIconText" ref="eric6.E5Gui.E5Action.html#E5Action.setIconText" /> <keyword name="E5Action.setShortcut" id="E5Action.setShortcut" ref="eric6.E5Gui.E5Action.html#E5Action.setShortcut" /> <keyword name="E5Action.setShortcuts" id="E5Action.setShortcuts" ref="eric6.E5Gui.E5Action.html#E5Action.setShortcuts" /> + <keyword name="E5AnimatedLabel" id="E5AnimatedLabel" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel" /> + <keyword name="E5AnimatedLabel (Constructor)" id="E5AnimatedLabel (Constructor)" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.__init__" /> + <keyword name="E5AnimatedLabel (Module)" id="E5AnimatedLabel (Module)" ref="eric6.E5Gui.E5AnimatedLabel.html" /> + <keyword name="E5AnimatedLabel.__animate" id="E5AnimatedLabel.__animate" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.__animate" /> + <keyword name="E5AnimatedLabel.__loadAnimationFile" id="E5AnimatedLabel.__loadAnimationFile" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.__loadAnimationFile" /> + <keyword name="E5AnimatedLabel.getAnimationFile" id="E5AnimatedLabel.getAnimationFile" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.getAnimationFile" /> + <keyword name="E5AnimatedLabel.getInterval" id="E5AnimatedLabel.getInterval" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.getInterval" /> + <keyword name="E5AnimatedLabel.isActive" id="E5AnimatedLabel.isActive" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.isActive" /> + <keyword name="E5AnimatedLabel.isAnimationFileLoaded" id="E5AnimatedLabel.isAnimationFileLoaded" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.isAnimationFileLoaded" /> + <keyword name="E5AnimatedLabel.reset" id="E5AnimatedLabel.reset" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.reset" /> + <keyword name="E5AnimatedLabel.setAnimationFile" id="E5AnimatedLabel.setAnimationFile" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.setAnimationFile" /> + <keyword name="E5AnimatedLabel.setInterval" id="E5AnimatedLabel.setInterval" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.setInterval" /> + <keyword name="E5AnimatedLabel.setPixmap" id="E5AnimatedLabel.setPixmap" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.setPixmap" /> + <keyword name="E5AnimatedLabel.start" id="E5AnimatedLabel.start" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.start" /> + <keyword name="E5AnimatedLabel.stop" id="E5AnimatedLabel.stop" ref="eric6.E5Gui.E5AnimatedLabel.html#E5AnimatedLabel.stop" /> <keyword name="E5AnimatedWidget" id="E5AnimatedWidget" ref="eric6.E5Gui.E5AnimatedWidget.html#E5AnimatedWidget" /> <keyword name="E5AnimatedWidget (Constructor)" id="E5AnimatedWidget (Constructor)" ref="eric6.E5Gui.E5AnimatedWidget.html#E5AnimatedWidget.__init__" /> <keyword name="E5AnimatedWidget (Module)" id="E5AnimatedWidget (Module)" ref="eric6.E5Gui.E5AnimatedWidget.html" /> @@ -3794,6 +3811,7 @@ <keyword name="E5Application.registerObject" id="E5Application.registerObject" ref="eric6.E5Gui.E5Application.html#E5Application.registerObject" /> <keyword name="E5Application.registerPluginObject" id="E5Application.registerPluginObject" ref="eric6.E5Gui.E5Application.html#E5Application.registerPluginObject" /> <keyword name="E5Application.unregisterPluginObject" id="E5Application.unregisterPluginObject" ref="eric6.E5Gui.E5Application.html#E5Application.unregisterPluginObject" /> + <keyword name="E5Application.usesDarkPalette" id="E5Application.usesDarkPalette" ref="eric6.E5Gui.E5Application.html#E5Application.usesDarkPalette" /> <keyword name="E5ArrowItem" id="E5ArrowItem" ref="eric6.E5Graphics.E5ArrowItem.html#E5ArrowItem" /> <keyword name="E5ArrowItem (Constructor)" id="E5ArrowItem (Constructor)" ref="eric6.E5Graphics.E5ArrowItem.html#E5ArrowItem.__init__" /> <keyword name="E5ArrowItem (Module)" id="E5ArrowItem (Module)" ref="eric6.E5Graphics.E5ArrowItem.html" /> @@ -3917,6 +3935,9 @@ <keyword name="E5GraphicsView._getDiagramSize" id="E5GraphicsView._getDiagramSize" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView._getDiagramSize" /> <keyword name="E5GraphicsView.autoAdjustSceneSize" id="E5GraphicsView.autoAdjustSceneSize" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.autoAdjustSceneSize" /> <keyword name="E5GraphicsView.filteredItems" id="E5GraphicsView.filteredItems" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.filteredItems" /> + <keyword name="E5GraphicsView.getBackgroundColor" id="E5GraphicsView.getBackgroundColor" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.getBackgroundColor" /> + <keyword name="E5GraphicsView.getDrawingColors" id="E5GraphicsView.getDrawingColors" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.getDrawingColors" /> + <keyword name="E5GraphicsView.getForegroundColor" id="E5GraphicsView.getForegroundColor" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.getForegroundColor" /> <keyword name="E5GraphicsView.printDiagram" id="E5GraphicsView.printDiagram" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.printDiagram" /> <keyword name="E5GraphicsView.resizeScene" id="E5GraphicsView.resizeScene" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.resizeScene" /> <keyword name="E5GraphicsView.saveImage" id="E5GraphicsView.saveImage" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.saveImage" /> @@ -7384,6 +7405,7 @@ <keyword name="HgDialog (Constructor)" id="HgDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__init__" /> <keyword name="HgDialog (Module)" id="HgDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html" /> <keyword name="HgDialog.__finish" id="HgDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__finish" /> + <keyword name="HgDialog.__getInput" id="HgDialog.__getInput" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__getInput" /> <keyword name="HgDialog.__showError" id="HgDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__showError" /> <keyword name="HgDialog.__showOutput" id="HgDialog.__showOutput" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.__showOutput" /> <keyword name="HgDialog.hasAddOrDelete" id="HgDialog.hasAddOrDelete" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html#HgDialog.hasAddOrDelete" /> @@ -8465,17 +8487,22 @@ <keyword name="IconsPage" id="IconsPage" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage" /> <keyword name="IconsPage (Constructor)" id="IconsPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.__init__" /> <keyword name="IconsPage (Module)" id="IconsPage (Module)" ref="eric6.Preferences.ConfigurationPages.IconsPage.html" /> + <keyword name="IconsPage.__getSelectedDefaultIconsPath" id="IconsPage.__getSelectedDefaultIconsPath" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.__getSelectedDefaultIconsPath" /> <keyword name="IconsPage.on_addIconDirectoryButton_clicked" id="IconsPage.on_addIconDirectoryButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_addIconDirectoryButton_clicked" /> <keyword name="IconsPage.on_deleteIconDirectoryButton_clicked" id="IconsPage.on_deleteIconDirectoryButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_deleteIconDirectoryButton_clicked" /> <keyword name="IconsPage.on_downButton_clicked" id="IconsPage.on_downButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_downButton_clicked" /> <keyword name="IconsPage.on_iconDirectoryList_currentRowChanged" id="IconsPage.on_iconDirectoryList_currentRowChanged" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_iconDirectoryList_currentRowChanged" /> <keyword name="IconsPage.on_iconDirectoryPicker_textChanged" id="IconsPage.on_iconDirectoryPicker_textChanged" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_iconDirectoryPicker_textChanged" /> + <keyword name="IconsPage.on_showDefaultIconsButton_clicked" id="IconsPage.on_showDefaultIconsButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_showDefaultIconsButton_clicked" /> <keyword name="IconsPage.on_showIconsButton_clicked" id="IconsPage.on_showIconsButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_showIconsButton_clicked" /> <keyword name="IconsPage.on_upButton_clicked" id="IconsPage.on_upButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.on_upButton_clicked" /> <keyword name="IconsPage.save" id="IconsPage.save" ref="eric6.Preferences.ConfigurationPages.IconsPage.html#IconsPage.save" /> <keyword name="IconsPreviewDialog" id="IconsPreviewDialog" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog" /> <keyword name="IconsPreviewDialog (Constructor)" id="IconsPreviewDialog (Constructor)" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.__init__" /> <keyword name="IconsPreviewDialog (Module)" id="IconsPreviewDialog (Module)" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html" /> + <keyword name="IconsPreviewDialog.on_directoryCombo_currentTextChanged" id="IconsPreviewDialog.on_directoryCombo_currentTextChanged" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.on_directoryCombo_currentTextChanged" /> + <keyword name="IconsPreviewDialog.on_invertButton_toggled" id="IconsPreviewDialog.on_invertButton_toggled" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.on_invertButton_toggled" /> + <keyword name="IconsPreviewDialog.on_refreshButton_clicked" id="IconsPreviewDialog.on_refreshButton_clicked" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.on_refreshButton_clicked" /> <keyword name="IdlCompilerDefineNameDialog" id="IdlCompilerDefineNameDialog" ref="eric6.Project.IdlCompilerDefineNameDialog.html#IdlCompilerDefineNameDialog" /> <keyword name="IdlCompilerDefineNameDialog (Constructor)" id="IdlCompilerDefineNameDialog (Constructor)" ref="eric6.Project.IdlCompilerDefineNameDialog.html#IdlCompilerDefineNameDialog.__init__" /> <keyword name="IdlCompilerDefineNameDialog (Module)" id="IdlCompilerDefineNameDialog (Module)" ref="eric6.Project.IdlCompilerDefineNameDialog.html" /> @@ -9663,6 +9690,7 @@ <keyword name="MicroPythonGraphWidget.hasData" id="MicroPythonGraphWidget.hasData" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.hasData" /> <keyword name="MicroPythonGraphWidget.isDirty" id="MicroPythonGraphWidget.isDirty" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.isDirty" /> <keyword name="MicroPythonGraphWidget.on_saveButton_clicked" id="MicroPythonGraphWidget.on_saveButton_clicked" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.on_saveButton_clicked" /> + <keyword name="MicroPythonGraphWidget.preferencesChanged" id="MicroPythonGraphWidget.preferencesChanged" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.preferencesChanged" /> <keyword name="MicroPythonGraphWidget.processData" id="MicroPythonGraphWidget.processData" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.processData" /> <keyword name="MicroPythonGraphWidget.saveData" id="MicroPythonGraphWidget.saveData" ref="eric6.MicroPython.MicroPythonGraphWidget.html#MicroPythonGraphWidget.saveData" /> <keyword name="MicroPythonPage" id="MicroPythonPage" ref="eric6.Preferences.ConfigurationPages.MicroPythonPage.html#MicroPythonPage" /> @@ -10659,6 +10687,7 @@ <keyword name="PixmapCache (Module)" id="PixmapCache (Module)" ref="eric6.UI.PixmapCache.html" /> <keyword name="PixmapCache.addSearchPath" id="PixmapCache.addSearchPath" ref="eric6.UI.PixmapCache.html#PixmapCache.addSearchPath" /> <keyword name="PixmapCache.getPixmap" id="PixmapCache.getPixmap" ref="eric6.UI.PixmapCache.html#PixmapCache.getPixmap" /> + <keyword name="PixmapCache.removeSearchPath" id="PixmapCache.removeSearchPath" ref="eric6.UI.PixmapCache.html#PixmapCache.removeSearchPath" /> <keyword name="PixmapDiagram" id="PixmapDiagram" ref="eric6.Graphics.PixmapDiagram.html#PixmapDiagram" /> <keyword name="PixmapDiagram (Constructor)" id="PixmapDiagram (Constructor)" ref="eric6.Graphics.PixmapDiagram.html#PixmapDiagram.__init__" /> <keyword name="PixmapDiagram (Module)" id="PixmapDiagram (Module)" ref="eric6.Graphics.PixmapDiagram.html" /> @@ -11058,6 +11087,7 @@ <keyword name="Project.__initData" id="Project.__initData" ref="eric6.Project.Project.html#Project.__initData" /> <keyword name="Project.__initDebugProperties" id="Project.__initDebugProperties" ref="eric6.Project.Project.html#Project.__initDebugProperties" /> <keyword name="Project.__initProjectTypes" id="Project.__initProjectTypes" ref="eric6.Project.Project.html#Project.__initProjectTypes" /> + <keyword name="Project.__isInPdata" id="Project.__isInPdata" ref="eric6.Project.Project.html#Project.__isInPdata" /> <keyword name="Project.__loadDiagram" id="Project.__loadDiagram" ref="eric6.Project.Project.html#Project.__loadDiagram" /> <keyword name="Project.__loadRecent" id="Project.__loadRecent" ref="eric6.Project.Project.html#Project.__loadRecent" /> <keyword name="Project.__makeFinished" id="Project.__makeFinished" ref="eric6.Project.Project.html#Project.__makeFinished" /> @@ -11231,8 +11261,10 @@ <keyword name="Project.setStatusMonitorAutoUpdate" id="Project.setStatusMonitorAutoUpdate" ref="eric6.Project.Project.html#Project.setStatusMonitorAutoUpdate" /> <keyword name="Project.setStatusMonitorInterval" id="Project.setStatusMonitorInterval" ref="eric6.Project.Project.html#Project.setStatusMonitorInterval" /> <keyword name="Project.setTranslationPattern" id="Project.setTranslationPattern" ref="eric6.Project.Project.html#Project.setTranslationPattern" /> + <keyword name="Project.startFileSystemMonitoring" id="Project.startFileSystemMonitoring" ref="eric6.Project.Project.html#Project.startFileSystemMonitoring" /> <keyword name="Project.startStatusMonitor" id="Project.startStatusMonitor" ref="eric6.Project.Project.html#Project.startStatusMonitor" /> <keyword name="Project.startswithProjectPath" id="Project.startswithProjectPath" ref="eric6.Project.Project.html#Project.startswithProjectPath" /> + <keyword name="Project.stopFileSystemMonitoring" id="Project.stopFileSystemMonitoring" ref="eric6.Project.Project.html#Project.stopFileSystemMonitoring" /> <keyword name="Project.stopStatusMonitor" id="Project.stopStatusMonitor" ref="eric6.Project.Project.html#Project.stopStatusMonitor" /> <keyword name="Project.unregisterProjectType" id="Project.unregisterProjectType" ref="eric6.Project.Project.html#Project.unregisterProjectType" /> <keyword name="Project.updateFileTypes" id="Project.updateFileTypes" ref="eric6.Project.Project.html#Project.updateFileTypes" /> @@ -11347,6 +11379,8 @@ <keyword name="ProjectBrowserModel.removeItem" id="ProjectBrowserModel.removeItem" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.removeItem" /> <keyword name="ProjectBrowserModel.renameItem" id="ProjectBrowserModel.renameItem" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.renameItem" /> <keyword name="ProjectBrowserModel.repopulateItem" id="ProjectBrowserModel.repopulateItem" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.repopulateItem" /> + <keyword name="ProjectBrowserModel.startFileSystemMonitoring" id="ProjectBrowserModel.startFileSystemMonitoring" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.startFileSystemMonitoring" /> + <keyword name="ProjectBrowserModel.stopFileSystemMonitoring" id="ProjectBrowserModel.stopFileSystemMonitoring" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.stopFileSystemMonitoring" /> <keyword name="ProjectBrowserModel.updateVCSStatus" id="ProjectBrowserModel.updateVCSStatus" ref="eric6.Project.ProjectBrowserModel.html#ProjectBrowserModel.updateVCSStatus" /> <keyword name="ProjectBrowserPage" id="ProjectBrowserPage" ref="eric6.Preferences.ConfigurationPages.ProjectBrowserPage.html#ProjectBrowserPage" /> <keyword name="ProjectBrowserPage (Constructor)" id="ProjectBrowserPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.ProjectBrowserPage.html#ProjectBrowserPage.__init__" /> @@ -16156,6 +16190,11 @@ <keyword name="WebBrowserFlashCookieManagerPage (Constructor)" id="WebBrowserFlashCookieManagerPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.html#WebBrowserFlashCookieManagerPage.__init__" /> <keyword name="WebBrowserFlashCookieManagerPage (Module)" id="WebBrowserFlashCookieManagerPage (Module)" ref="eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.html" /> <keyword name="WebBrowserFlashCookieManagerPage.save" id="WebBrowserFlashCookieManagerPage.save" ref="eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.html#WebBrowserFlashCookieManagerPage.save" /> + <keyword name="WebBrowserInterfacePage" id="WebBrowserInterfacePage" ref="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html#WebBrowserInterfacePage" /> + <keyword name="WebBrowserInterfacePage (Constructor)" id="WebBrowserInterfacePage (Constructor)" ref="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html#WebBrowserInterfacePage.__init__" /> + <keyword name="WebBrowserInterfacePage (Module)" id="WebBrowserInterfacePage (Module)" ref="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html" /> + <keyword name="WebBrowserInterfacePage.__populateStyleCombo" id="WebBrowserInterfacePage.__populateStyleCombo" ref="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html#WebBrowserInterfacePage.__populateStyleCombo" /> + <keyword name="WebBrowserInterfacePage.save" id="WebBrowserInterfacePage.save" ref="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html#WebBrowserInterfacePage.save" /> <keyword name="WebBrowserJavaScriptConsole" id="WebBrowserJavaScriptConsole" ref="eric6.WebBrowser.WebBrowserJavaScriptConsole.html#WebBrowserJavaScriptConsole" /> <keyword name="WebBrowserJavaScriptConsole (Constructor)" id="WebBrowserJavaScriptConsole (Constructor)" ref="eric6.WebBrowser.WebBrowserJavaScriptConsole.html#WebBrowserJavaScriptConsole.__init__" /> <keyword name="WebBrowserJavaScriptConsole (Module)" id="WebBrowserJavaScriptConsole (Module)" ref="eric6.WebBrowser.WebBrowserJavaScriptConsole.html" /> @@ -17016,6 +17055,7 @@ <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.ViewmanagerPage.html#create" /> <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.WebBrowserAppearancePage.html#create" /> <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.html#create" /> + <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html#create" /> <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.WebBrowserPage.html#create" /> <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.WebBrowserSpellCheckingPage.html#create" /> <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.html#create" /> @@ -17195,6 +17235,7 @@ <keyword name="getCorba" id="getCorba" ref="eric6.Preferences.__init__.html#getCorba" /> <keyword name="getDataFiles" id="getDataFiles" ref="setup.html#getDataFiles" /> <keyword name="getDebugger" id="getDebugger" ref="eric6.Preferences.__init__.html#getDebugger" /> + <keyword name="getDefaultIconPaths" id="getDefaultIconPaths" ref="eric6.Toolbox.Startup.html#getDefaultIconPaths" /> <keyword name="getDefaultLexerAssociations" id="getDefaultLexerAssociations" ref="eric6.QScintilla.Lexers.__init__.html#getDefaultLexerAssociations" /> <keyword name="getDefaults" id="getDefaults" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__.html#getDefaults" /> <keyword name="getDevice" id="getDevice" ref="eric6.MicroPython.MicroPythonDevices.html#getDevice" /> @@ -17407,6 +17448,7 @@ <keyword name="isNameConstant_1" id="isNameConstant_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.AstUtilities.html#isNameConstant_1" /> <keyword name="isNumber" id="isNumber" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.AstUtilities.html#isNumber" /> <keyword name="isNumber_1" id="isNumber_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.AstUtilities.html#isNumber_1" /> + <keyword name="isPipOutdated" id="isPipOutdated" ref="install.html#isPipOutdated" /> <keyword name="isString" id="isString" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.AstUtilities.html#isString" /> <keyword name="isString_1" id="isString_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.AstUtilities.html#isString_1" /> <keyword name="isTextFile" id="isTextFile" ref="eric6.Utilities.MimeTypes.html#isTextFile" /> @@ -17591,6 +17633,7 @@ <keyword name="removeMarkers" id="removeMarkers" ref="eric6.UI.CompareDialog.html#removeMarkers" /> <keyword name="removePluginDirectories" id="removePluginDirectories" ref="uninstall.html#removePluginDirectories" /> <keyword name="removeProjectBrowserFlags" id="removeProjectBrowserFlags" ref="eric6.Preferences.__init__.html#removeProjectBrowserFlags" /> + <keyword name="removeSearchPath" id="removeSearchPath" ref="eric6.UI.PixmapCache.html#removeSearchPath" /> <keyword name="renderTabPreview" id="renderTabPreview" ref="eric6.WebBrowser.WebBrowserSnap.html#renderTabPreview" /> <keyword name="resetInterface" id="resetInterface" ref="eric6.CondaInterface.__init__.html#resetInterface" /> <keyword name="resetLayout" id="resetLayout" ref="eric6.Preferences.__init__.html#resetLayout" /> @@ -17723,6 +17766,7 @@ <keyword name="uninstallWindowsLinks" id="uninstallWindowsLinks" ref="uninstall.html#uninstallWindowsLinks" /> <keyword name="unregisterLexer" id="unregisterLexer" ref="eric6.QScintilla.Lexers.__init__.html#unregisterLexer" /> <keyword name="unregisterView" id="unregisterView" ref="eric6.WebBrowser.WebInspector.html#unregisterView" /> + <keyword name="updatePip" id="updatePip" ref="install.html#updatePip" /> <keyword name="update_counts" id="update_counts" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#update_counts" /> <keyword name="usage" id="usage" ref="eric6.Toolbox.Startup.html#usage" /> <keyword name="usage" id="usage" ref="eric6.eric6_api.html#usage" /> @@ -17847,6 +17891,7 @@ <file>eric6.E5Graphics.E5ArrowItem.html</file> <file>eric6.E5Graphics.E5GraphicsView.html</file> <file>eric6.E5Gui.E5Action.html</file> + <file>eric6.E5Gui.E5AnimatedLabel.html</file> <file>eric6.E5Gui.E5AnimatedWidget.html</file> <file>eric6.E5Gui.E5Application.html</file> <file>eric6.E5Gui.E5ClickableLabel.html</file> @@ -18380,6 +18425,7 @@ <file>eric6.Preferences.ConfigurationPages.ViewmanagerPage.html</file> <file>eric6.Preferences.ConfigurationPages.WebBrowserAppearancePage.html</file> <file>eric6.Preferences.ConfigurationPages.WebBrowserFlashCookieManagerPage.html</file> + <file>eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html</file> <file>eric6.Preferences.ConfigurationPages.WebBrowserPage.html</file> <file>eric6.Preferences.ConfigurationPages.WebBrowserSpellCheckingPage.html</file> <file>eric6.Preferences.ConfigurationPages.WebBrowserVirusTotalPage.html</file>
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html Sat May 02 14:45:06 2020 +0200 @@ -53,11 +53,11 @@ </tr> <tr> <td><a href="#DebugClientInput">DebugClientInput</a></td> -<td>Replacement for the standard input builtin.</td> +<td>Replacement for the standard input() builtin (Python 2).</td> </tr> <tr> <td><a href="#DebugClientRawInput">DebugClientRawInput</a></td> -<td>Replacement for the standard raw_input builtin.</td> +<td>Replacement for the standard raw_input() builtin (Python 2) and the standard input() builtin (Python 3).</td> </tr> <tr> <td><a href="#DebugClientSetRecursionLimit">DebugClientSetRecursionLimit</a></td> @@ -1261,23 +1261,19 @@ <hr /> <a NAME="DebugClientInput" ID="DebugClientInput"></a> <h2>DebugClientInput</h2> -<b>DebugClientInput</b>(<i>prompt="", echo=True</i>) +<b>DebugClientInput</b>(<i>prompt=""</i>) <p> - Replacement for the standard input builtin. + Replacement for the standard input() builtin (Python 2). </p> <p> This function works with the split debugger. </p> <dl> -<dt><i>prompt</i></dt> +<dt><i>prompt</i> (str)</dt> <dd> -prompt to be shown (string) -</dd> -<dt><i>echo</i></dt> -<dd> -flag indicating to echo the output (boolean) +prompt to be shown </dd> </dl> <dl> @@ -1286,6 +1282,12 @@ result of the input() call </dd> </dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr /> @@ -1294,26 +1296,33 @@ <b>DebugClientRawInput</b>(<i>prompt="", echo=True</i>) <p> - Replacement for the standard raw_input builtin. + Replacement for the standard raw_input() builtin (Python 2) and + the standard input() builtin (Python 3). </p> <p> This function works with the split debugger. </p> <dl> -<dt><i>prompt</i></dt> +<dt><i>prompt</i> (str)</dt> <dd> -prompt to be shown. (string) +prompt to be shown </dd> -<dt><i>echo</i></dt> +<dt><i>echo</i> (bool)</dt> <dd> -flag indicating echoing of the input (boolean) +flag indicating echoing of the input </dd> </dl> <dl> <dt>Returns:</dt> <dd> -result of the raw_input() call +result of the raw_input()/input() call +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.getpass.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.DebugClients.Python.getpass.html Sat May 02 14:45:06 2020 +0200 @@ -36,7 +36,7 @@ <h3>Global Attributes</h3> <table> -<tr><td>__all__</td></tr><tr><td>default_getpass</td></tr><tr><td>unix_getpass</td></tr><tr><td>win_getpass</td></tr> +<tr><td>__all__</td></tr><tr><td>default_getpass</td></tr><tr><td>fallback_getpass</td></tr><tr><td>unix_getpass</td></tr><tr><td>win_getpass</td></tr> </table> <h3>Classes</h3> @@ -67,15 +67,21 @@ </p> <dl> -<dt><i>prompt</i></dt> +<dt><i>prompt</i> (str)</dt> <dd> -Prompt to be shown to the user (string) +Prompt to be shown to the user </dd> </dl> <dl> <dt>Returns:</dt> <dd> -Password entered by the user (string) +Password entered by the user +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl> <div align="right"><a href="#top">Up</a></div> @@ -95,7 +101,13 @@ <dl> <dt>Returns:</dt> <dd> -username (string) +username +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html Sat May 02 14:45:06 2020 +0200 @@ -101,32 +101,36 @@ <a NAME="E5ArrowItem.__init__" ID="E5ArrowItem.__init__"></a> <h4>E5ArrowItem (Constructor)</h4> -<b>E5ArrowItem</b>(<i>origin=None, end=None, filled=False, arrowType=NormalArrow, parent=None</i>) +<b>E5ArrowItem</b>(<i>origin=None, end=None, filled=False, arrowType=NormalArrow, colors=None, parent=None</i>) <p> Constructor </p> <dl> -<dt><i>origin</i></dt> +<dt><i>origin</i> (QPointF)</dt> <dd> -origin of the arrow (QPointF) +origin of the arrow </dd> -<dt><i>end</i></dt> +<dt><i>end</i> (QPointF)</dt> <dd> -end point of the arrow (QPointF) +end point of the arrow </dd> -<dt><i>filled</i></dt> +<dt><i>filled</i> (bool)</dt> <dd> -flag indicating a filled arrow head (boolean) +flag indicating a filled arrow head </dd> -<dt><i>arrowType</i></dt> +<dt><i>arrowType</i> (int, one of NormalArrow, WideArrow)</dt> <dd> -arrow type (NormalArrow, WideArrow) +arrow type </dd> -<dt><i>parent=</i></dt> +<dt><i>colors</i> (tuple of (QColor, QColor))</dt> <dd> -reference to the parent object (QGraphicsItem) +tuple containing the foreground and background colors +</dd> +<dt><i>parent</i> (QGraphicsItem)</dt> +<dd> +reference to the parent object </dd> </dl> <a NAME="E5ArrowItem.boundingRect" ID="E5ArrowItem.boundingRect"></a>
--- a/eric6/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html Sat May 02 14:45:06 2020 +0200 @@ -105,6 +105,18 @@ <td>Public method to filter a list of items.</td> </tr> <tr> +<td><a href="#E5GraphicsView.getBackgroundColor">getBackgroundColor</a></td> +<td>Public method to get the configured background color.</td> +</tr> +<tr> +<td><a href="#E5GraphicsView.getDrawingColors">getDrawingColors</a></td> +<td>Public method to get the configured drawing colors.</td> +</tr> +<tr> +<td><a href="#E5GraphicsView.getForegroundColor">getForegroundColor</a></td> +<td>Public method to get the configured foreground color.</td> +</tr> +<tr> <td><a href="#E5GraphicsView.printDiagram">printDiagram</a></td> <td>Public method to print the diagram.</td> </tr> @@ -291,6 +303,63 @@ list of interesting collision items (QGraphicsItem) </dd> </dl> +<a NAME="E5GraphicsView.getBackgroundColor" ID="E5GraphicsView.getBackgroundColor"></a> +<h4>E5GraphicsView.getBackgroundColor</h4> +<b>getBackgroundColor</b>(<i></i>) + +<p> + Public method to get the configured background color. +</p> +<dl> +<dt>Returns:</dt> +<dd> +background color +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl> +<a NAME="E5GraphicsView.getDrawingColors" ID="E5GraphicsView.getDrawingColors"></a> +<h4>E5GraphicsView.getDrawingColors</h4> +<b>getDrawingColors</b>(<i></i>) + +<p> + Public method to get the configured drawing colors. +</p> +<dl> +<dt>Returns:</dt> +<dd> +tuple containing the foreground and background colors +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (QColor, QColor) +</dd> +</dl> +<a NAME="E5GraphicsView.getForegroundColor" ID="E5GraphicsView.getForegroundColor"></a> +<h4>E5GraphicsView.getForegroundColor</h4> +<b>getForegroundColor</b>(<i></i>) + +<p> + Public method to get the configured foreground color. +</p> +<dl> +<dt>Returns:</dt> +<dd> +foreground color +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl> <a NAME="E5GraphicsView.printDiagram" ID="E5GraphicsView.printDiagram"></a> <h4>E5GraphicsView.printDiagram</h4> <b>printDiagram</b>(<i>printer, diagramName=""</i>)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Documentation/Source/eric6.E5Gui.E5AnimatedLabel.html Sat May 02 14:45:06 2020 +0200 @@ -0,0 +1,319 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.E5Gui.E5AnimatedLabel</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric6.E5Gui.E5AnimatedLabel</h1> + +<p> +Module implementing a label widget showing an animated pixmap. +</p> +<h3>Global Attributes</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> + +<table> + +<tr> +<td><a href="#E5AnimatedLabel">E5AnimatedLabel</a></td> +<td>Class implementing a label widget showing an animated pixmap.</td> +</tr> +</table> +<h3>Functions</h3> + +<table> +<tr><td>None</td></tr> +</table> +<hr /> +<hr /> +<a NAME="E5AnimatedLabel" ID="E5AnimatedLabel"></a> +<h2>E5AnimatedLabel</h2> + +<p> + Class implementing a label widget showing an animated pixmap. +</p> +<h3>Derived from</h3> +QLabel +<h3>Class Attributes</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> + +<table> + +<tr> +<td><a href="#E5AnimatedLabel.__init__">E5AnimatedLabel</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.__animate">__animate</a></td> +<td>Private slot to animate the pixmap.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.__loadAnimationFile">__loadAnimationFile</a></td> +<td>Private method to load an animation file.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.getAnimationFile">getAnimationFile</a></td> +<td>Public method to get the name of the animation file.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.getInterval">getInterval</a></td> +<td>Public method to get the interval between the animated frames.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.isActive">isActive</a></td> +<td>Public method to check, if the animation is active.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.isAnimationFileLoaded">isAnimationFileLoaded</a></td> +<td>Public method to check, if the animation file was loaded.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.reset">reset</a></td> +<td>Public slot to reset the animation.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.setAnimationFile">setAnimationFile</a></td> +<td>Public method to set the name of the animation file.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.setInterval">setInterval</a></td> +<td>Public method to set the interval between the animated frames.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.setPixmap">setPixmap</a></td> +<td>Public slot to set the pixmap of the label.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.start">start</a></td> +<td>Public slot to start the animation.</td> +</tr> +<tr> +<td><a href="#E5AnimatedLabel.stop">stop</a></td> +<td>Public slot to stop the animation.</td> +</tr> +</table> +<h3>Static Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> + +<a NAME="E5AnimatedLabel.__init__" ID="E5AnimatedLabel.__init__"></a> +<h4>E5AnimatedLabel (Constructor)</h4> +<b>E5AnimatedLabel</b>(<i>parent=None, *, animationFile="", interval=100</i>) + +<p> + Constructor +</p> +<dl> + +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent window +</dd> +<dt><i>animationFile=</i> (str)</dt> +<dd> +path to the file containing the animation data +</dd> +<dt><i>interval=</i> (int)</dt> +<dd> +interval in milliseconds between animation frames +</dd> +</dl> +<a NAME="E5AnimatedLabel.__animate" ID="E5AnimatedLabel.__animate"></a> +<h4>E5AnimatedLabel.__animate</h4> +<b>__animate</b>(<i></i>) + +<p> + Private slot to animate the pixmap. +</p> +<a NAME="E5AnimatedLabel.__loadAnimationFile" ID="E5AnimatedLabel.__loadAnimationFile"></a> +<h4>E5AnimatedLabel.__loadAnimationFile</h4> +<b>__loadAnimationFile</b>(<i>animationFile</i>) + +<p> + Private method to load an animation file. +</p> +<dl> + +<dt><i>animationFile</i> (str)</dt> +<dd> +path to the file containing the animation data +</dd> +</dl> +<a NAME="E5AnimatedLabel.getAnimationFile" ID="E5AnimatedLabel.getAnimationFile"></a> +<h4>E5AnimatedLabel.getAnimationFile</h4> +<b>getAnimationFile</b>(<i></i>) + +<p> + Public method to get the name of the animation file. +</p> +<dl> +<dt>Returns:</dt> +<dd> +path to the file containing the animation data +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<a NAME="E5AnimatedLabel.getInterval" ID="E5AnimatedLabel.getInterval"></a> +<h4>E5AnimatedLabel.getInterval</h4> +<b>getInterval</b>(<i></i>) + +<p> + Public method to get the interval between the animated frames. +</p> +<dl> +<dt>Returns:</dt> +<dd> +interval in milliseconds between animation frames +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl> +<a NAME="E5AnimatedLabel.isActive" ID="E5AnimatedLabel.isActive"></a> +<h4>E5AnimatedLabel.isActive</h4> +<b>isActive</b>(<i></i>) + +<p> + Public method to check, if the animation is active. +</p> +<dl> +<dt>Returns:</dt> +<dd> +flag indicating an active animation +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<a NAME="E5AnimatedLabel.isAnimationFileLoaded" ID="E5AnimatedLabel.isAnimationFileLoaded"></a> +<h4>E5AnimatedLabel.isAnimationFileLoaded</h4> +<b>isAnimationFileLoaded</b>(<i></i>) + +<p> + Public method to check, if the animation file was loaded. +</p> +<dl> +<dt>Returns:</dt> +<dd> +flag indicating a successfully loaded animation file +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<a NAME="E5AnimatedLabel.reset" ID="E5AnimatedLabel.reset"></a> +<h4>E5AnimatedLabel.reset</h4> +<b>reset</b>(<i></i>) + +<p> + Public slot to reset the animation. +</p> +<a NAME="E5AnimatedLabel.setAnimationFile" ID="E5AnimatedLabel.setAnimationFile"></a> +<h4>E5AnimatedLabel.setAnimationFile</h4> +<b>setAnimationFile</b>(<i>animationFile</i>) + +<p> + Public method to set the name of the animation file. +</p> +<dl> + +<dt><i>animationFile</i> (str)</dt> +<dd> +path to the file containing the animation data +</dd> +</dl> +<a NAME="E5AnimatedLabel.setInterval" ID="E5AnimatedLabel.setInterval"></a> +<h4>E5AnimatedLabel.setInterval</h4> +<b>setInterval</b>(<i>interval</i>) + +<p> + Public method to set the interval between the animated frames. +</p> +<dl> + +<dt><i>interval</i> (int)</dt> +<dd> +interval in milliseconds between animation frames +</dd> +</dl> +<a NAME="E5AnimatedLabel.setPixmap" ID="E5AnimatedLabel.setPixmap"></a> +<h4>E5AnimatedLabel.setPixmap</h4> +<b>setPixmap</b>(<i>pixmap</i>) + +<p> + Public slot to set the pixmap of the label. +</p> +<p> + Setting a standard pixmap will stop the animation and set the given + pixmap without animating it. Thereafter the animation has to be + restarted with the start() method. +</p> +<dl> + +<dt><i>pixmap</i> (QPixmap)</dt> +<dd> +pixmap to be set +</dd> +</dl> +<a NAME="E5AnimatedLabel.start" ID="E5AnimatedLabel.start"></a> +<h4>E5AnimatedLabel.start</h4> +<b>start</b>(<i></i>) + +<p> + Public slot to start the animation. +</p> +<a NAME="E5AnimatedLabel.stop" ID="E5AnimatedLabel.stop"></a> +<h4>E5AnimatedLabel.stop</h4> +<b>stop</b>(<i></i>) + +<p> + Public slot to stop the animation. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/eric6.E5Gui.E5Application.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.E5Gui.E5Application.html Sat May 02 14:45:06 2020 +0200 @@ -100,6 +100,10 @@ <td><a href="#E5Application.unregisterPluginObject">unregisterPluginObject</a></td> <td>Public method to unregister a plugin object in the object registry.</td> </tr> +<tr> +<td><a href="#E5Application.usesDarkPalette">usesDarkPalette</a></td> +<td>Public method to check, if the application uses a palette with a dark background.</td> +</tr> </table> <h3>Static Methods</h3> @@ -116,7 +120,7 @@ </p> <dl> -<dt><i>argv</i></dt> +<dt><i>argv</i> (list)</dt> <dd> command line arguments </dd> @@ -130,9 +134,9 @@ </p> <dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -name of the object (string) +name of the object </dd> </dl> <dl> @@ -142,6 +146,12 @@ </dd> </dl> <dl> +<dt>Return Type:</dt> +<dd> +any +</dd> +</dl> +<dl> <dt>Raises <b>KeyError</b>:</dt> <dd> @@ -157,9 +167,9 @@ </p> <dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -name of the plugin object (string) +name of the plugin object </dd> </dl> <dl> @@ -169,6 +179,12 @@ </dd> </dl> <dl> +<dt>Return Type:</dt> +<dd> +any +</dd> +</dl> +<dl> <dt>Raises <b>KeyError</b>:</dt> <dd> @@ -184,15 +200,21 @@ </p> <dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -name of the plugin object (string) +name of the plugin object </dd> </dl> <dl> <dt>Returns:</dt> <dd> -type of the plugin object (string) +type of the plugin object +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl> <dl> @@ -216,6 +238,12 @@ list of (name, reference) pairs </dd> </dl> +<dl> +<dt>Return Type:</dt> +<dd> +list of (str, any) +</dd> +</dl> <a NAME="E5Application.registerObject" ID="E5Application.registerObject"></a> <h4>E5Application.registerObject</h4> <b>registerObject</b>(<i>name, objectRef</i>) @@ -225,11 +253,11 @@ </p> <dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -name of the object (string) +name of the object </dd> -<dt><i>objectRef</i></dt> +<dt><i>objectRef</i> (any)</dt> <dd> reference to the object </dd> @@ -250,17 +278,17 @@ </p> <dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -name of the plugin object (string) +name of the plugin object </dd> -<dt><i>objectRef</i></dt> +<dt><i>objectRef</i> (any)</dt> <dd> reference to the plugin object </dd> -<dt><i>pluginType=</i></dt> +<dt><i>pluginType</i> (str)</dt> <dd> -type of the plugin object (string) +type of the plugin object </dd> </dl> <dl> @@ -279,9 +307,29 @@ </p> <dl> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -name of the plugin object (string) +name of the plugin object +</dd> +</dl> +<a NAME="E5Application.usesDarkPalette" ID="E5Application.usesDarkPalette"></a> +<h4>E5Application.usesDarkPalette</h4> +<b>usesDarkPalette</b>(<i></i>) + +<p> + Public method to check, if the application uses a palette with a dark + background. +</p> +<dl> +<dt>Returns:</dt> +<dd> +flag indicating the use of a palette with a dark background +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.E5Gui.E5TabWidget.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.E5Gui.E5TabWidget.html Sat May 02 14:45:06 2020 +0200 @@ -339,31 +339,36 @@ </dl> <a NAME="E5TabWidget.animationLabel" ID="E5TabWidget.animationLabel"></a> <h4>E5TabWidget.animationLabel</h4> -<b>animationLabel</b>(<i>index, animationFile, speed=100</i>) +<b>animationLabel</b>(<i>index, animationFile, interval=100</i>) <p> Public slot to set an animated icon. </p> <dl> -<dt><i>index</i></dt> +<dt><i>index</i> (int)</dt> <dd> -tab index (integer) +tab index </dd> -<dt><i>animationFile</i></dt> +<dt><i>animationFile</i> (str)</dt> <dd> -name of the file containing the animation (string) +name of the file containing the animation </dd> -<dt><i>speed</i></dt> +<dt><i>interval</i> (int)</dt> <dd> -animation speed of the icon in percent of the original - icon's speed (integer) +interval in milliseconds between animation frames </dd> </dl> <dl> <dt>Returns:</dt> <dd> -reference to the created label (QLabel) +reference to the created label +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +E5AnimatedLabel </dd> </dl> <a NAME="E5TabWidget.moveTab" ID="E5TabWidget.moveTab"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.AssociationItem.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.AssociationItem.html Sat May 02 14:45:06 2020 +0200 @@ -155,7 +155,7 @@ </dl> <a NAME="AssociationItem.__init__" ID="AssociationItem.__init__"></a> <h4>AssociationItem (Constructor)</h4> -<b>AssociationItem</b>(<i>itemA, itemB, assocType=Normal, topToBottom=False, parent=None</i>) +<b>AssociationItem</b>(<i>itemA, itemB, assocType=Normal, topToBottom=False, colors=None, parent=None</i>) <p> Constructor @@ -179,14 +179,18 @@ <li>Imports</li> </ul> </dd> -<dt><i>topToBottom=</i></dt> +<dt><i>topToBottom</i> (bool)</dt> <dd> flag indicating to draw the association - from item A top to item B bottom (boolean) + from item A top to item B bottom </dd> -<dt><i>parent=</i></dt> +<dt><i>colors</i> (tuple of (QColor, QColor))</dt> <dd> -reference to the parent object (QGraphicsItem) +tuple containing the foreground and background colors +</dd> +<dt><i>parent</i> (QGraphicsItem)</dt> +<dd> +reference to the parent object </dd> </dl> <a NAME="AssociationItem.__calculateEndingPoints_center" ID="AssociationItem.__calculateEndingPoints_center"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.ClassItem.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.ClassItem.html Sat May 02 14:45:06 2020 +0200 @@ -113,46 +113,48 @@ <a NAME="ClassItem.__init__" ID="ClassItem.__init__"></a> <h4>ClassItem (Constructor)</h4> -<b>ClassItem</b>(<i>model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, parent=None, scene=None</i>) +<b>ClassItem</b>(<i>model=None, external=False, x=0, y=0, rounded=False, noAttrs=False, colors=None, parent=None, scene=None</i>) <p> Constructor </p> <dl> -<dt><i>model</i></dt> +<dt><i>model</i> (ClassModel)</dt> <dd> -class model containing the class data (ClassModel) +class model containing the class data </dd> -<dt><i>external</i></dt> +<dt><i>external</i> (boolean)</dt> <dd> flag indicating a class defined outside our scope - (boolean) </dd> -<dt><i>x</i></dt> +<dt><i>x</i> (int)</dt> <dd> -x-coordinate (integer) +x-coordinate </dd> -<dt><i>y</i></dt> +<dt><i>y</i> (int)</dt> <dd> -y-coordinate (integer) +y-coordinate </dd> -<dt><i>rounded=</i></dt> +<dt><i>rounded</i> (bool)</dt> <dd> -flag indicating a rounded corner (boolean) +flag indicating a rounded corner </dd> -<dt><i>noAttrs=</i></dt> +<dt><i>noAttrs</i> (bool)</dt> <dd> flag indicating, that no attributes should be shown - (boolean) </dd> -<dt><i>parent=</i></dt> +<dt><i>colors</i> (tuple of (QColor, QColor))</dt> <dd> -reference to the parent object (QGraphicsItem) +tuple containing the foreground and background colors </dd> -<dt><i>scene=</i></dt> +<dt><i>parent</i> (QGraphicsItem)</dt> <dd> -reference to the scene object (QGraphicsScene) +reference to the parent object +</dd> +<dt><i>scene</i> (QGraphicsScene)</dt> +<dd> +reference to the scene object </dd> </dl> <a NAME="ClassItem.__calculateSize" ID="ClassItem.__calculateSize"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.ModuleItem.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.ModuleItem.html Sat May 02 14:45:06 2020 +0200 @@ -109,36 +109,40 @@ <a NAME="ModuleItem.__init__" ID="ModuleItem.__init__"></a> <h4>ModuleItem (Constructor)</h4> -<b>ModuleItem</b>(<i>model=None, x=0, y=0, rounded=False, parent=None, scene=None</i>) +<b>ModuleItem</b>(<i>model=None, x=0, y=0, rounded=False, colors=None, parent=None, scene=None</i>) <p> Constructor </p> <dl> -<dt><i>model</i></dt> +<dt><i>model</i> (ModuleModel)</dt> <dd> -module model containing the module data (ModuleModel) +module model containing the module data </dd> -<dt><i>x</i></dt> +<dt><i>x</i> (int)</dt> <dd> -x-coordinate (integer) +x-coordinate </dd> -<dt><i>y</i></dt> +<dt><i>y</i> (int)</dt> <dd> -y-coordinate (integer) +y-coordinate </dd> -<dt><i>rounded=</i></dt> +<dt><i>rounded</i> (bool)</dt> <dd> -flag indicating a rounded corner (boolean) +flag indicating a rounded corner </dd> -<dt><i>parent=</i></dt> +<dt><i>colors</i> (tuple of (QColor, QColor))</dt> <dd> -reference to the parent object (QGraphicsItem) +tuple containing the foreground and background colors </dd> -<dt><i>scene=</i></dt> +<dt><i>parent</i> (QGraphicsItem)</dt> <dd> -reference to the scene object (QGraphicsScene) +reference to the parent object +</dd> +<dt><i>scene</i> (QGraphicsScene)</dt> +<dd> +reference to the scene object </dd> </dl> <a NAME="ModuleItem.__calculateSize" ID="ModuleItem.__calculateSize"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.PackageItem.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.PackageItem.html Sat May 02 14:45:06 2020 +0200 @@ -109,41 +109,45 @@ <a NAME="PackageItem.__init__" ID="PackageItem.__init__"></a> <h4>PackageItem (Constructor)</h4> -<b>PackageItem</b>(<i>model=None, x=0, y=0, rounded=False, noModules=False, parent=None, scene=None</i>) +<b>PackageItem</b>(<i>model=None, x=0, y=0, rounded=False, noModules=False, colors=None, parent=None, scene=None</i>) <p> Constructor </p> <dl> -<dt><i>model</i></dt> +<dt><i>model</i> (PackageModel)</dt> <dd> -package model containing the package data (PackageModel) +package model containing the package data </dd> -<dt><i>x</i></dt> +<dt><i>x</i> (int)</dt> <dd> -x-coordinate (integer) +x-coordinate </dd> -<dt><i>y</i></dt> +<dt><i>y</i> (int)</dt> <dd> -y-coordinate (integer) +y-coordinate </dd> -<dt><i>rounded</i></dt> +<dt><i>rounded</i> (bool)</dt> <dd> -flag indicating a rounded corner (boolean) +flag indicating a rounded corner </dd> -<dt><i>noModules=</i></dt> +<dt><i>noModules</i> (bool)</dt> <dd> flag indicating, that no module names should be - shown (boolean) + shown </dd> -<dt><i>parent=</i></dt> +<dt><i>colors</i> (tuple of (QColor, QColor))</dt> <dd> -reference to the parent object (QGraphicsItem) +tuple containing the foreground and background colors </dd> -<dt><i>scene=</i></dt> +<dt><i>parent</i> (QGraphicsItem)</dt> <dd> -reference to the scene object (QGraphicsScene) +reference to the parent object +</dd> +<dt><i>scene</i> (QGraphicsScene)</dt> +<dd> +reference to the scene object </dd> </dl> <a NAME="PackageItem.__calculateSize" ID="PackageItem.__calculateSize"></a>
--- a/eric6/Documentation/Source/eric6.Graphics.UMLItem.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.UMLItem.html Sat May 02 14:45:06 2020 +0200 @@ -145,32 +145,36 @@ <a NAME="UMLItem.__init__" ID="UMLItem.__init__"></a> <h4>UMLItem (Constructor)</h4> -<b>UMLItem</b>(<i>model=None, x=0, y=0, rounded=False, parent=None</i>) +<b>UMLItem</b>(<i>model=None, x=0, y=0, rounded=False, colors=None, parent=None</i>) <p> Constructor </p> <dl> -<dt><i>model</i></dt> +<dt><i>model</i> (UMLModel)</dt> <dd> -UML model containing the item data (UMLModel) +UML model containing the item data </dd> -<dt><i>x</i></dt> +<dt><i>x</i> (int)</dt> <dd> -x-coordinate (integer) +x-coordinate </dd> -<dt><i>y</i></dt> +<dt><i>y</i> (int)</dt> <dd> -y-coordinate (integer) +y-coordinate </dd> -<dt><i>rounded</i></dt> +<dt><i>rounded</i> (bool)</dt> <dd> -flag indicating a rounded corner (boolean) +flag indicating a rounded corner </dd> -<dt><i>parent=</i></dt> +<dt><i>colors</i> (tuple of (QColor, QColor))</dt> <dd> -reference to the parent object (QGraphicsItem) +tuple containing the foreground and background colors +</dd> +<dt><i>parent</i> (QGraphicsItem)</dt> +<dd> +reference to the parent object </dd> </dl> <a NAME="UMLItem.addAssociation" ID="UMLItem.addAssociation"></a>
--- a/eric6/Documentation/Source/eric6.MicroPython.MicroPythonGraphWidget.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.MicroPython.MicroPythonGraphWidget.html Sat May 02 14:45:06 2020 +0200 @@ -101,6 +101,10 @@ <td>Private slot to save the raw data to a CSV file.</td> </tr> <tr> +<td><a href="#MicroPythonGraphWidget.preferencesChanged">preferencesChanged</a></td> +<td>Public slot to apply changed preferences.</td> +</tr> +<tr> <td><a href="#MicroPythonGraphWidget.processData">processData</a></td> <td>Public slot to process the raw data.</td> </tr> @@ -207,6 +211,13 @@ <p> Private slot to save the raw data to a CSV file. </p> +<a NAME="MicroPythonGraphWidget.preferencesChanged" ID="MicroPythonGraphWidget.preferencesChanged"></a> +<h4>MicroPythonGraphWidget.preferencesChanged</h4> +<b>preferencesChanged</b>(<i></i>) + +<p> + Public slot to apply changed preferences. +</p> <a NAME="MicroPythonGraphWidget.processData" ID="MicroPythonGraphWidget.processData"></a> <h4>MicroPythonGraphWidget.processData</h4> <b>processData</b>(<i>data</i>)
--- a/eric6/Documentation/Source/eric6.MicroPython.MicrobitDevices.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.MicroPython.MicrobitDevices.html Sat May 02 14:45:06 2020 +0200 @@ -23,7 +23,8 @@ <h1>eric6.MicroPython.MicrobitDevices</h1> <p> -Module implementing the device interface class for BBC micro:bit boards. +Module implementing the device interface class for BBC micro:bit and +Calliope mini boards. </p> <h3>Global Attributes</h3> @@ -36,7 +37,7 @@ <tr> <td><a href="#MicrobitDevice">MicrobitDevice</a></td> -<td>Class implementing the device for BBC micro:bit boards.</td> +<td>Class implementing the device for BBC micro:bit and Calliope mini boards.</td> </tr> </table> <h3>Functions</h3> @@ -50,7 +51,7 @@ <h2>MicrobitDevice</h2> <p> - Class implementing the device for BBC micro:bit boards. + Class implementing the device for BBC micro:bit and Calliope mini boards. </p> <h3>Derived from</h3> MicroPythonDevice @@ -149,7 +150,7 @@ <a NAME="MicrobitDevice.__init__" ID="MicrobitDevice.__init__"></a> <h4>MicrobitDevice (Constructor)</h4> -<b>MicrobitDevice</b>(<i>microPythonWidget, parent=None</i>) +<b>MicrobitDevice</b>(<i>microPythonWidget, deviceType, parent=None</i>) <p> Constructor @@ -160,6 +161,10 @@ <dd> reference to the main MicroPython widget </dd> +<dt><i>deviceType</i> (str)</dt> +<dd> +type of the device +</dd> <dt><i>parent</i> (QObject)</dt> <dd> reference to the parent object
--- a/eric6/Documentation/Source/eric6.Plugins.UiExtensionPlugins.Translator.Translator.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.UiExtensionPlugins.Translator.Translator.html Sat May 02 14:45:06 2020 +0200 @@ -97,20 +97,25 @@ <a NAME="Translator.__init__" ID="Translator.__init__"></a> <h4>Translator (Constructor)</h4> -<b>Translator</b>(<i>plugin, parent=None</i>) +<b>Translator</b>(<i>plugin, usesDarkPalette, parent=None</i>) <p> Constructor </p> <dl> -<dt><i>plugin</i></dt> +<dt><i>plugin</i> (TranslatorPlugin)</dt> <dd> -reference to the plugin object (TranslatorPlugin) +reference to the plugin object </dd> -<dt><i>parent</i></dt> +<dt><i>usesDarkPalette</i> (bool)</dt> <dd> -parent (QObject) +flag indicating that the platform uses a palette + with a dark background +</dd> +<dt><i>parent</i> (QObject)</dt> +<dd> +parent </dd> </dl> <a NAME="Translator.__activateWidget" ID="Translator.__activateWidget"></a>
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitLogBrowserDialog.html Sat May 02 14:45:06 2020 +0200 @@ -28,7 +28,7 @@ <h3>Global Attributes</h3> <table> -<tr><td>COLORNAMES</td></tr><tr><td>COLORS</td></tr> +<tr><td>COLORNAMES</td></tr><tr><td>COLORS</td></tr><tr><td>LIGHTCOLORS</td></tr> </table> <h3>Classes</h3> @@ -786,15 +786,21 @@ </p> <dl> -<dt><i>n</i></dt> +<dt><i>n</i> (int)</dt> <dd> -color index (integer) +color index </dd> </dl> <dl> <dt>Returns:</dt> <dd> -color name (string) +color name +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl> <a NAME="GitLogBrowserDialog.__getCommitForTag" ID="GitLogBrowserDialog.__getCommitForTag"></a>
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.html Sat May 02 14:45:06 2020 +0200 @@ -148,21 +148,21 @@ </p> <dl> -<dt><i>repoPath</i></dt> +<dt><i>repoPath</i> (str)</dt> <dd> -root directory of the repository (string) +root directory of the repository </dd> -<dt><i>encoding</i></dt> +<dt><i>encoding</i> (str)</dt> <dd> -encoding to be used by the command server (string) +encoding to be used by the command server </dd> -<dt><i>vcs</i></dt> +<dt><i>vcs</i> (Hg)</dt> <dd> -reference to the VCS object (Hg) +reference to the VCS object </dd> -<dt><i>parent</i></dt> +<dt><i>parent</i> (QObject)</dt> <dd> -reference to the parent object (QObject) +reference to the parent object </dd> </dl> <a NAME="HgClient.__prompt" ID="HgClient.__prompt"></a> @@ -174,19 +174,26 @@ </p> <dl> -<dt><i>size</i></dt> +<dt><i>size</i> (int)</dt> <dd> -maximum length of the requested input (integer) +maximum length of the requested input </dd> -<dt><i>message</i></dt> +<dt><i>message</i> (str)</dt> <dd> -message sent by the server (string) +message sent by the server </dd> </dl> <dl> <dt>Returns:</dt> <dd> -data entered by the user (string) +tuple containing data entered by the user and + a flag indicating a password input +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, bool) </dd> </dl> <a NAME="HgClient.__readChannel" ID="HgClient.__readChannel"></a> @@ -200,7 +207,12 @@ <dt>Returns:</dt> <dd> tuple of channel designator and channel data - (string, integer or string or bytes) +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, int or str or bytes) </dd> </dl> <a NAME="HgClient.__readHello" ID="HgClient.__readHello"></a> @@ -213,8 +225,14 @@ <dl> <dt>Returns:</dt> <dd> -tuple of flag indicating success (boolean) and an error message - in case of failure (string) +tuple of flag indicating success and an error message in case + of failure +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (bool, str) </dd> </dl> <a NAME="HgClient.__runcommand" ID="HgClient.__runcommand"></a> @@ -226,17 +244,17 @@ </p> <dl> -<dt><i>args</i></dt> +<dt><i>args</i> (list of str)</dt> <dd> -list of arguments for the command (list of string) +list of arguments for the command </dd> -<dt><i>inputChannels</i></dt> +<dt><i>inputChannels</i> (dict)</dt> <dd> dictionary of input channels. The dictionary must have the keys 'I' and 'L' and each entry must be a function receiving the number of bytes to write. </dd> -<dt><i>outputChannels</i></dt> +<dt><i>outputChannels</i> (dict)</dt> <dd> dictionary of output channels. The dictionary must have the keys 'o' and 'e' and each entry must be a function @@ -247,7 +265,13 @@ <dt>Returns:</dt> <dd> result code of the command, -1 if the command server wasn't - started or -10, if the command was canceled (integer) + started or -10, if the command was canceled +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +int </dd> </dl> <dl> @@ -267,13 +291,13 @@ </p> <dl> -<dt><i>exitCode</i></dt> +<dt><i>exitCode</i> (int)</dt> <dd> -exit code of the process (integer) +exit code of the process </dd> -<dt><i>exitStatus</i></dt> +<dt><i>exitStatus</i> (QProcess.ExitStatus)</dt> <dd> -exit status of the process (QProcess.ExitStatus) +exit status of the process </dd> </dl> <a NAME="HgClient.__writeDataBlock" ID="HgClient.__writeDataBlock"></a> @@ -285,9 +309,9 @@ </p> <dl> -<dt><i>data</i></dt> +<dt><i>data</i> (str)</dt> <dd> -data to be sent (string) +data to be sent </dd> </dl> <a NAME="HgClient.cancel" ID="HgClient.cancel"></a> @@ -311,7 +335,13 @@ <dl> <dt>Returns:</dt> <dd> -flag indicating the execution of a command (boolean) +flag indicating the execution of a command +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl> <a NAME="HgClient.myprompt" ID="HgClient.myprompt"></a> @@ -328,8 +358,14 @@ <dl> <dt>Returns:</dt> <dd> -tuple of flag indicating a successful start (boolean) and - an error message (string) in case of failure +tuple of flag indicating a successful start and an error + message in case of failure +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (bool, str) </dd> </dl> <a NAME="HgClient.runcommand" ID="HgClient.runcommand"></a> @@ -341,40 +377,49 @@ </p> <dl> -<dt><i>args</i></dt> +<dt><i>args</i> (list of str)</dt> <dd> -list of arguments for the command (list of string) +list of arguments for the command </dd> -<dt><i>prompt=</i></dt> +<dt><i>prompt</i> (func(int, str) -> (str, bool))</dt> <dd> function to reply to prompts by the server. It receives the max number of bytes to return and the contents - of the output channel received so far. + of the output channel received so far. If an output function is + given as well, the prompt data is passed through the output + function. The function must return the input data and a flag + indicating a password input. </dd> -<dt><i>inputData=</i></dt> +<dt><i>inputData</i> (func(int) -> bytes)</dt> <dd> function to reply to bulk data requests by the server. It receives the max number of bytes to return. </dd> -<dt><i>output=</i></dt> +<dt><i>output</i> (func(str))</dt> <dd> -function receiving the data from the server (string). - If a prompt function is given, this parameter will be ignored. +function receiving the data from the server. If a + prompt function is given, it is assumed, that the prompt output + is passed via this function. </dd> -<dt><i>error=</i></dt> +<dt><i>error</i> (func(str))</dt> <dd> function receiving error messages from the server - (string) </dd> </dl> <dl> <dt>Returns:</dt> <dd> -output and errors of the command server (string). In case +tuple of output and errors of the command server. In case output and/or error functions were given, the respective return value will be an empty string. </dd> </dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) +</dd> +</dl> <a NAME="HgClient.startServer" ID="HgClient.startServer"></a> <h4>HgClient.startServer</h4> <b>startServer</b>(<i></i>) @@ -385,8 +430,14 @@ <dl> <dt>Returns:</dt> <dd> -tuple of flag indicating a successful start (boolean) and - an error message (string) in case of failure +tuple of flag indicating a successful start and an error + message in case of failure +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (bool, str) </dd> </dl> <a NAME="HgClient.stopServer" ID="HgClient.stopServer"></a> @@ -406,7 +457,13 @@ <dl> <dt>Returns:</dt> <dd> -flag indicating the cancel state (boolean) +flag indicating the cancel state +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Sat May 02 14:45:06 2020 +0200 @@ -82,6 +82,10 @@ <td>Private slot called when the process finished or the user pressed the button.</td> </tr> <tr> +<td><a href="#HgDialog.__getInput">__getInput</a></td> +<td>Private method to get some input from the user.</td> +</tr> +<tr> <td><a href="#HgDialog.__showError">__showError</a></td> <td>Private slot to show some error.</td> </tr> @@ -151,6 +155,37 @@ Private slot called when the process finished or the user pressed the button. </p> +<a NAME="HgDialog.__getInput" ID="HgDialog.__getInput"></a> +<h4>HgDialog.__getInput</h4> +<b>__getInput</b>(<i>size, message</i>) + +<p> + Private method to get some input from the user. +</p> +<dl> + +<dt><i>size</i> (int)</dt> +<dd> +maximum length of the requested input +</dd> +<dt><i>message</i> (str)</dt> +<dd> +message sent by the server +</dd> +</dl> +<dl> +<dt>Returns:</dt> +<dd> +tuple containing data entered by the user and + a flag indicating a password input +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, bool) +</dd> +</dl> <a NAME="HgDialog.__showError" ID="HgDialog.__showError"></a> <h4>HgDialog.__showError</h4> <b>__showError</b>(<i>out</i>)
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sat May 02 14:45:06 2020 +0200 @@ -28,7 +28,7 @@ <h3>Global Attributes</h3> <table> -<tr><td>COLORNAMES</td></tr><tr><td>COLORS</td></tr> +<tr><td>COLORNAMES</td></tr><tr><td>COLORS</td></tr><tr><td>LIGHTCOLORS</td></tr> </table> <h3>Classes</h3> @@ -750,15 +750,21 @@ </p> <dl> -<dt><i>n</i></dt> +<dt><i>n</i> (int)</dt> <dd> -color index (integer) +color index </dd> </dl> <dl> <dt>Returns:</dt> <dd> -color name (string) +color name +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl> <a NAME="HgLogBrowserDialog.__getHeads" ID="HgLogBrowserDialog.__getHeads"></a>
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html Sat May 02 14:45:06 2020 +0200 @@ -120,17 +120,17 @@ </p> <dl> -<dt><i>vcs</i></dt> +<dt><i>vcs</i> (Hg)</dt> <dd> reference to the vcs object </dd> -<dt><i>path</i></dt> +<dt><i>path</i> (str)</dt> <dd> -path of the repository to serve (string) +path of the repository to serve </dd> -<dt><i>parent</i></dt> +<dt><i>parent</i> (QWidget)</dt> <dd> -reference to the parent widget (QWidget) +reference to the parent widget </dd> </dl> <a NAME="HgServeDialog.__appendText" ID="HgServeDialog.__appendText"></a> @@ -142,13 +142,13 @@ </p> <dl> -<dt><i>txt</i></dt> +<dt><i>txt</i> (str)</dt> <dd> -text to insert (string) +text to insert </dd> -<dt><i>error</i></dt> +<dt><i>error</i> (bool)</dt> <dd> -flag indicating to insert error text (boolean) +flag indicating to insert error text </dd> </dl> <a NAME="HgServeDialog.__procFinished" ID="HgServeDialog.__procFinished"></a> @@ -160,13 +160,13 @@ </p> <dl> -<dt><i>exitCode</i></dt> +<dt><i>exitCode</i> (int)</dt> <dd> -exit code of the process (integer) +exit code of the process </dd> -<dt><i>exitStatus</i></dt> +<dt><i>exitStatus</i> (QProcess.ExitStatus)</dt> <dd> -exit status of the process (QProcess.ExitStatus) +exit status of the process </dd> </dl> <a NAME="HgServeDialog.__readStderr" ID="HgServeDialog.__readStderr"></a> @@ -219,9 +219,9 @@ </p> <dl> -<dt><i>e</i></dt> +<dt><i>e</i> (QCloseEvent)</dt> <dd> -close event (QCloseEvent) +close event </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPage.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPage.html Sat May 02 14:45:06 2020 +0200 @@ -77,6 +77,10 @@ <td>Constructor</td> </tr> <tr> +<td><a href="#IconsPage.__getSelectedDefaultIconsPath">__getSelectedDefaultIconsPath</a></td> +<td>Private method to determine the selected default icons path.</td> +</tr> +<tr> <td><a href="#IconsPage.on_addIconDirectoryButton_clicked">on_addIconDirectoryButton_clicked</a></td> <td>Private slot to add the icon directory displayed to the listbox.</td> </tr> @@ -97,6 +101,10 @@ <td>Private slot to handle the textChanged signal of the directory picker.</td> </tr> <tr> +<td><a href="#IconsPage.on_showDefaultIconsButton_clicked">on_showDefaultIconsButton_clicked</a></td> +<td>Private slot to display a preview of the selected default icons.</td> +</tr> +<tr> <td><a href="#IconsPage.on_showIconsButton_clicked">on_showIconsButton_clicked</a></td> <td>Private slot to display a preview of an icons directory.</td> </tr> @@ -122,6 +130,25 @@ <p> Constructor </p> +<a NAME="IconsPage.__getSelectedDefaultIconsPath" ID="IconsPage.__getSelectedDefaultIconsPath"></a> +<h4>IconsPage.__getSelectedDefaultIconsPath</h4> +<b>__getSelectedDefaultIconsPath</b>(<i></i>) + +<p> + Private method to determine the selected default icons path. +</p> +<dl> +<dt>Returns:</dt> +<dd> +selected default icons path +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> <a NAME="IconsPage.on_addIconDirectoryButton_clicked" ID="IconsPage.on_addIconDirectoryButton_clicked"></a> <h4>IconsPage.on_addIconDirectoryButton_clicked</h4> <b>on_addIconDirectoryButton_clicked</b>(<i></i>) @@ -172,6 +199,13 @@ the text of the directory picker (string) </dd> </dl> +<a NAME="IconsPage.on_showDefaultIconsButton_clicked" ID="IconsPage.on_showDefaultIconsButton_clicked"></a> +<h4>IconsPage.on_showDefaultIconsButton_clicked</h4> +<b>on_showDefaultIconsButton_clicked</b>(<i></i>) + +<p> + Private slot to display a preview of the selected default icons. +</p> <a NAME="IconsPage.on_showIconsButton_clicked" ID="IconsPage.on_showIconsButton_clicked"></a> <h4>IconsPage.on_showIconsButton_clicked</h4> <b>on_showIconsButton_clicked</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html Sat May 02 14:45:06 2020 +0200 @@ -72,6 +72,18 @@ <td><a href="#IconsPreviewDialog.__init__">IconsPreviewDialog</a></td> <td>Constructor</td> </tr> +<tr> +<td><a href="#IconsPreviewDialog.on_directoryCombo_currentTextChanged">on_directoryCombo_currentTextChanged</a></td> +<td>Private slot to show the icons of the selected icon directory.</td> +</tr> +<tr> +<td><a href="#IconsPreviewDialog.on_invertButton_toggled">on_invertButton_toggled</a></td> +<td>Private slot to show the icons on an inverted background.</td> +</tr> +<tr> +<td><a href="#IconsPreviewDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the view.</td> +</tr> </table> <h3>Static Methods</h3> @@ -81,22 +93,57 @@ <a NAME="IconsPreviewDialog.__init__" ID="IconsPreviewDialog.__init__"></a> <h4>IconsPreviewDialog (Constructor)</h4> -<b>IconsPreviewDialog</b>(<i>parent, dirName</i>) +<b>IconsPreviewDialog</b>(<i>directories, parent=None</i>) <p> Constructor </p> <dl> -<dt><i>parent</i></dt> +<dt><i>directories</i> (list of str)</dt> <dd> -parent widget (QWidget) +list of directories to be shown </dd> -<dt><i>dirName</i></dt> +<dt><i>parent</i> (QWidget)</dt> <dd> -name of directory to show (string) +parent widget </dd> </dl> +<a NAME="IconsPreviewDialog.on_directoryCombo_currentTextChanged" ID="IconsPreviewDialog.on_directoryCombo_currentTextChanged"></a> +<h4>IconsPreviewDialog.on_directoryCombo_currentTextChanged</h4> +<b>on_directoryCombo_currentTextChanged</b>(<i>dirName</i>) + +<p> + Private slot to show the icons of the selected icon directory. +</p> +<dl> + +<dt><i>dirName</i> (str)</dt> +<dd> +selected icon directory +</dd> +</dl> +<a NAME="IconsPreviewDialog.on_invertButton_toggled" ID="IconsPreviewDialog.on_invertButton_toggled"></a> +<h4>IconsPreviewDialog.on_invertButton_toggled</h4> +<b>on_invertButton_toggled</b>(<i>checked</i>) + +<p> + Private slot to show the icons on an inverted background. +</p> +<dl> + +<dt><i>checked</i> (bool)</dt> +<dd> +state of the button +</dd> +</dl> +<a NAME="IconsPreviewDialog.on_refreshButton_clicked" ID="IconsPreviewDialog.on_refreshButton_clicked"></a> +<h4>IconsPreviewDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) + +<p> + Private slot to refresh the view. +</p> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html Sat May 02 14:45:06 2020 +0200 @@ -0,0 +1,141 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage</h1> + +<p> +Module implementing the Interface configuration page (variant for web browser). +</p> +<h3>Global Attributes</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> + +<table> + +<tr> +<td><a href="#WebBrowserInterfacePage">WebBrowserInterfacePage</a></td> +<td>Class implementing the Interface configuration page (variant for web browser).</td> +</tr> +</table> +<h3>Functions</h3> + +<table> + +<tr> +<td><a href="#create">create</a></td> +<td>Module function to create the configuration page.</td> +</tr> +</table> +<hr /> +<hr /> +<a NAME="WebBrowserInterfacePage" ID="WebBrowserInterfacePage"></a> +<h2>WebBrowserInterfacePage</h2> + +<p> + Class implementing the Interface configuration page (variant for web + browser). +</p> +<h3>Derived from</h3> +ConfigurationPageBase, Ui_WebBrowserInterfacePage +<h3>Class Attributes</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> + +<table> + +<tr> +<td><a href="#WebBrowserInterfacePage.__init__">WebBrowserInterfacePage</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#WebBrowserInterfacePage.__populateStyleCombo">__populateStyleCombo</a></td> +<td>Private method to populate the style combo box.</td> +</tr> +<tr> +<td><a href="#WebBrowserInterfacePage.save">save</a></td> +<td>Public slot to save the Interface configuration.</td> +</tr> +</table> +<h3>Static Methods</h3> + +<table> +<tr><td>None</td></tr> +</table> + +<a NAME="WebBrowserInterfacePage.__init__" ID="WebBrowserInterfacePage.__init__"></a> +<h4>WebBrowserInterfacePage (Constructor)</h4> +<b>WebBrowserInterfacePage</b>(<i></i>) + +<p> + Constructor +</p> +<a NAME="WebBrowserInterfacePage.__populateStyleCombo" ID="WebBrowserInterfacePage.__populateStyleCombo"></a> +<h4>WebBrowserInterfacePage.__populateStyleCombo</h4> +<b>__populateStyleCombo</b>(<i></i>) + +<p> + Private method to populate the style combo box. +</p> +<a NAME="WebBrowserInterfacePage.save" ID="WebBrowserInterfacePage.save"></a> +<h4>WebBrowserInterfacePage.save</h4> +<b>save</b>(<i></i>) + +<p> + Public slot to save the Interface configuration. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +<hr /> +<a NAME="create" ID="create"></a> +<h2>create</h2> +<b>create</b>(<i>dlg</i>) + +<p> + Module function to create the configuration page. +</p> +<dl> + +<dt><i>dlg</i></dt> +<dd> +reference to the configuration dialog +</dd> +</dl> +<dl> +<dt>Returns:</dt> +<dd> +reference to the instantiated page (ConfigurationPageBase) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/eric6.Project.Project.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Project.Project.html Sat May 02 14:45:06 2020 +0200 @@ -321,6 +321,10 @@ <td>Private method to initialize the list of supported project types.</td> </tr> <tr> +<td><a href="#Project.__isInPdata">__isInPdata</a></td> +<td>Private method used to check, if the passed in filename is project controlled..</td> +</tr> +<tr> <td><a href="#Project.__loadDiagram">__loadDiagram</a></td> <td>Private slot to load a diagram from file.</td> </tr> @@ -1013,6 +1017,10 @@ <td>Public method to set the translation pattern.</td> </tr> <tr> +<td><a href="#Project.startFileSystemMonitoring">startFileSystemMonitoring</a></td> +<td>Public method to (re)start monitoring the project file system.</td> +</tr> +<tr> <td><a href="#Project.startStatusMonitor">startStatusMonitor</a></td> <td>Public method to start the VCS status monitor thread.</td> </tr> @@ -1021,6 +1029,10 @@ <td>Public method to check, if a path starts with the project path.</td> </tr> <tr> +<td><a href="#Project.stopFileSystemMonitoring">stopFileSystemMonitoring</a></td> +<td>Public method to stop monitoring the project file system.</td> +</tr> +<tr> <td><a href="#Project.stopStatusMonitor">stopStatusMonitor</a></td> <td>Public method to stop the VCS status monitor thread.</td> </tr> @@ -1324,6 +1336,33 @@ <p> Private method to initialize the list of supported project types. </p> +<a NAME="Project.__isInPdata" ID="Project.__isInPdata"></a> +<h4>Project.__isInPdata</h4> +<b>__isInPdata</b>(<i>fn</i>) + +<p> + Private method used to check, if the passed in filename is project + controlled.. +</p> +<dl> + +<dt><i>fn</i> (str)</dt> +<dd> +filename to be checked +</dd> +</dl> +<dl> +<dt>Returns:</dt> +<dd> +flag indicating membership +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> <a NAME="Project.__loadDiagram" ID="Project.__loadDiagram"></a> <h4>Project.__loadDiagram</h4> <b>__loadDiagram</b>(<i></i>) @@ -3878,6 +3917,13 @@ translation pattern </dd> </dl> +<a NAME="Project.startFileSystemMonitoring" ID="Project.startFileSystemMonitoring"></a> +<h4>Project.startFileSystemMonitoring</h4> +<b>startFileSystemMonitoring</b>(<i></i>) + +<p> + Public method to (re)start monitoring the project file system. +</p> <a NAME="Project.startStatusMonitor" ID="Project.startStatusMonitor"></a> <h4>Project.startStatusMonitor</h4> <b>startStatusMonitor</b>(<i></i>) @@ -3906,6 +3952,13 @@ (boolean) </dd> </dl> +<a NAME="Project.stopFileSystemMonitoring" ID="Project.stopFileSystemMonitoring"></a> +<h4>Project.stopFileSystemMonitoring</h4> +<b>stopFileSystemMonitoring</b>(<i></i>) + +<p> + Public method to stop monitoring the project file system. +</p> <a NAME="Project.stopStatusMonitor" ID="Project.stopStatusMonitor"></a> <h4>Project.stopStatusMonitor</h4> <b>stopStatusMonitor</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.Project.ProjectBrowserModel.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Project.ProjectBrowserModel.html Sat May 02 14:45:06 2020 +0200 @@ -480,6 +480,14 @@ <td>Public method to repopulate an item.</td> </tr> <tr> +<td><a href="#ProjectBrowserModel.startFileSystemMonitoring">startFileSystemMonitoring</a></td> +<td>Public method to (re)start monitoring the project file system.</td> +</tr> +<tr> +<td><a href="#ProjectBrowserModel.stopFileSystemMonitoring">stopFileSystemMonitoring</a></td> +<td>Public method to stop monitoring the project file system.</td> +</tr> +<tr> <td><a href="#ProjectBrowserModel.updateVCSStatus">updateVCSStatus</a></td> <td>Public method used to update the vcs status of a node.</td> </tr> @@ -884,6 +892,20 @@ name of the file relative to the project root (string) </dd> </dl> +<a NAME="ProjectBrowserModel.startFileSystemMonitoring" ID="ProjectBrowserModel.startFileSystemMonitoring"></a> +<h4>ProjectBrowserModel.startFileSystemMonitoring</h4> +<b>startFileSystemMonitoring</b>(<i></i>) + +<p> + Public method to (re)start monitoring the project file system. +</p> +<a NAME="ProjectBrowserModel.stopFileSystemMonitoring" ID="ProjectBrowserModel.stopFileSystemMonitoring"></a> +<h4>ProjectBrowserModel.stopFileSystemMonitoring</h4> +<b>stopFileSystemMonitoring</b>(<i></i>) + +<p> + Public method to stop monitoring the project file system. +</p> <a NAME="ProjectBrowserModel.updateVCSStatus" ID="ProjectBrowserModel.updateVCSStatus"></a> <h4>ProjectBrowserModel.updateVCSStatus</h4> <b>updateVCSStatus</b>(<i>name, recursive=True</i>)
--- a/eric6/Documentation/Source/eric6.QScintilla.Exporters.ExporterHTML.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.QScintilla.Exporters.ExporterHTML.html Sat May 02 14:45:06 2020 +0200 @@ -115,12 +115,20 @@ </dl> <a NAME="ExporterHTML.__generateFromMarkdown" ID="ExporterHTML.__generateFromMarkdown"></a> <h4>ExporterHTML.__generateFromMarkdown</h4> -<b>__generateFromMarkdown</b>(<i></i>) +<b>__generateFromMarkdown</b>(<i>useDarkScheme</i>) <p> Private method to convert Markdown text into HTML. </p> <dl> + +<dt><i>useDarkScheme</i> (bool)</dt> +<dd> +flag indicating to export using a dark color + scheme +</dd> +</dl> +<dl> <dt>Returns:</dt> <dd> processed HTML
--- a/eric6/Documentation/Source/eric6.Toolbox.Startup.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Toolbox.Startup.html Sat May 02 14:45:06 2020 +0200 @@ -40,6 +40,10 @@ <table> <tr> +<td><a href="#getDefaultIconPaths">getDefaultIconPaths</a></td> +<td>Module function to determine the default icon paths.</td> +</tr> +<tr> <td><a href="#handleArgs">handleArgs</a></td> <td>Module function to handle the always present commandline options.</td> </tr> @@ -74,6 +78,35 @@ </table> <hr /> <hr /> +<a NAME="getDefaultIconPaths" ID="getDefaultIconPaths"></a> +<h2>getDefaultIconPaths</h2> +<b>getDefaultIconPaths</b>(<i>application</i>) + +<p> + Module function to determine the default icon paths. +</p> +<dl> + +<dt><i>application</i> (E5Application)</dt> +<dd> +reference to the application object +</dd> +</dl> +<dl> +<dt>Returns:</dt> +<dd> +list of default icon paths +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +<hr /> <a NAME="handleArgs" ID="handleArgs"></a> <h2>handleArgs</h2> <b>handleArgs</b>(<i>argv, appinfo</i>) @@ -105,11 +138,18 @@ <hr /> <a NAME="initializeResourceSearchPath" ID="initializeResourceSearchPath"></a> <h2>initializeResourceSearchPath</h2> -<b>initializeResourceSearchPath</b>(<i></i>) +<b>initializeResourceSearchPath</b>(<i>application</i>) <p> Module function to initialize the default mime source factory. </p> +<dl> + +<dt><i>application</i> (E5Application)</dt> +<dd> +reference to the application object +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr />
--- a/eric6/Documentation/Source/eric6.UI.CodeDocumentationViewer.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.UI.CodeDocumentationViewer.html Sat May 02 14:45:06 2020 +0200 @@ -395,7 +395,7 @@ <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>EmpytDocument_Dark</td></tr><tr><td>EmpytDocument_Light</td></tr> </table> <h3>Class Methods</h3>
--- a/eric6/Documentation/Source/eric6.UI.PixmapCache.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.UI.PixmapCache.html Sat May 02 14:45:06 2020 +0200 @@ -63,6 +63,10 @@ <td><a href="#getSymlinkIcon">getSymlinkIcon</a></td> <td>Module function to retrieve a symbolic link icon.</td> </tr> +<tr> +<td><a href="#removeSearchPath">removeSearchPath</a></td> +<td>Public method to remove a path from the search path.</td> +</tr> </table> <hr /> <hr /> @@ -100,6 +104,10 @@ <td><a href="#PixmapCache.getPixmap">getPixmap</a></td> <td>Public method to retrieve a pixmap.</td> </tr> +<tr> +<td><a href="#PixmapCache.removeSearchPath">removeSearchPath</a></td> +<td>Public method to remove a path from the search path.</td> +</tr> </table> <h3>Static Methods</h3> @@ -123,9 +131,9 @@ </p> <dl> -<dt><i>path</i></dt> +<dt><i>path</i> (str)</dt> <dd> -path to add (string) +path to add </dd> </dl> <a NAME="PixmapCache.getPixmap" ID="PixmapCache.getPixmap"></a> @@ -158,6 +166,20 @@ QPixmap </dd> </dl> +<a NAME="PixmapCache.removeSearchPath" ID="PixmapCache.removeSearchPath"></a> +<h4>PixmapCache.removeSearchPath</h4> +<b>removeSearchPath</b>(<i>path</i>) + +<p> + Public method to remove a path from the search path. +</p> +<dl> + +<dt><i>path</i> (str)</dt> +<dd> +path to remove +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr /> @@ -170,13 +192,13 @@ </p> <dl> -<dt><i>path</i></dt> +<dt><i>path</i> (str)</dt> <dd> -path to add (string) +path to add </dd> -<dt><i>cache</i></dt> +<dt><i>cache</i> (PixmapCache)</dt> <dd> -reference to the pixmap cache object (PixmapCache) +reference to the pixmap cache object </dd> </dl> <div align="right"><a href="#top">Up</a></div> @@ -329,4 +351,25 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /> +<hr /> +<a NAME="removeSearchPath" ID="removeSearchPath"></a> +<h2>removeSearchPath</h2> +<b>removeSearchPath</b>(<i>path, cache=pixCache</i>) + +<p> + Public method to remove a path from the search path. +</p> +<dl> + +<dt><i>path</i> (str)</dt> +<dd> +path to remove +</dd> +<dt><i>cache</i> (PixmapCache)</dt> +<dd> +reference to the pixmap cache object +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> </body></html> \ No newline at end of file
--- a/eric6/Documentation/Source/eric6.UI.Previewers.PreviewerHTMLStyles.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.UI.Previewers.PreviewerHTMLStyles.html Sat May 02 14:45:06 2020 +0200 @@ -28,7 +28,7 @@ <h3>Global Attributes</h3> <table> -<tr><td>css_markdown</td></tr><tr><td>css_pygments</td></tr> +<tr><td>css_markdown_dark</td></tr><tr><td>css_markdown_light</td></tr><tr><td>css_pygments_dark</td></tr><tr><td>css_pygments_light</td></tr> </table> <h3>Classes</h3>
--- a/eric6/Documentation/Source/eric6.WebBrowser.Sync.SyncCheckPage.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/eric6.WebBrowser.Sync.SyncCheckPage.html Sat May 02 14:45:06 2020 +0200 @@ -122,13 +122,13 @@ </p> <dl> -<dt><i>fileName</i></dt> +<dt><i>fileName</i> (str)</dt> <dd> -name of the file containing the animation (string) +name of the file containing the animation </dd> -<dt><i>label</i></dt> +<dt><i>label</i> (E5AnimatedLabel)</dt> <dd> -reference to the label to be animated (QLabel) +reference to the label to be animated </dd> </dl> <a NAME="SyncCheckPage.__syncError" ID="SyncCheckPage.__syncError"></a>
--- a/eric6/Documentation/Source/index-eric6.E5Gui.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/index-eric6.E5Gui.html Sat May 02 14:45:06 2020 +0200 @@ -37,6 +37,10 @@ <td>Module implementing an Action class extending QAction.</td> </tr> <tr> +<td><a href="eric6.E5Gui.E5AnimatedLabel.html">E5AnimatedLabel</a></td> +<td>Module implementing a label widget showing an animated pixmap.</td> +</tr> +<tr> <td><a href="eric6.E5Gui.E5AnimatedWidget.html">E5AnimatedWidget</a></td> <td>Module implementing an animated widget.</td> </tr>
--- a/eric6/Documentation/Source/index-eric6.MicroPython.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/index-eric6.MicroPython.html Sat May 02 14:45:06 2020 +0200 @@ -87,7 +87,7 @@ </tr> <tr> <td><a href="eric6.MicroPython.MicrobitDevices.html">MicrobitDevices</a></td> -<td>Module implementing the device interface class for BBC micro:bit boards.</td> +<td>Module implementing the device interface class for BBC micro:bit and Calliope mini boards.</td> </tr> <tr> <td><a href="eric6.MicroPython.PyBoardDevices.html">PyBoardDevices</a></td>
--- a/eric6/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html Sat May 02 14:45:06 2020 +0200 @@ -278,6 +278,10 @@ <td>Module implementing the Flash Cookies Manager configuration page.</td> </tr> <tr> +<td><a href="eric6.Preferences.ConfigurationPages.WebBrowserInterfacePage.html">WebBrowserInterfacePage</a></td> +<td>Module implementing the Interface configuration page (variant for web browser).</td> +</tr> +<tr> <td><a href="eric6.Preferences.ConfigurationPages.WebBrowserPage.html">WebBrowserPage</a></td> <td>Module implementing the Web Browser configuration page.</td> </tr>
--- a/eric6/Documentation/Source/install.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/install.html Sat May 02 14:45:06 2020 +0200 @@ -136,6 +136,10 @@ <td>Actually perform the installation steps.</td> </tr> <tr> +<td><a href="#isPipOutdated">isPipOutdated</a></td> +<td>Check, if pip is outdated.</td> +</tr> +<tr> <td><a href="#main">main</a></td> <td>The main function of the script.</td> </tr> @@ -152,6 +156,10 @@ <td>Wrapper function around shutil.copy() to ensure the permissions.</td> </tr> <tr> +<td><a href="#updatePip">updatePip</a></td> +<td>Update the installed pip package.</td> +</tr> +<tr> <td><a href="#usage">usage</a></td> <td>Display a usage message and exit.</td> </tr> @@ -585,6 +593,28 @@ <div align="right"><a href="#top">Up</a></div> <hr /> <hr /> +<a NAME="isPipOutdated" ID="isPipOutdated"></a> +<h2>isPipOutdated</h2> +<b>isPipOutdated</b>(<i></i>) + +<p> + Check, if pip is outdated. +</p> +<dl> +<dt>Returns:</dt> +<dd> +flag indicating an outdated pip +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +<hr /> <a NAME="main" ID="main"></a> <h2>main</h2> <b>main</b>(<i>argv</i>) @@ -677,6 +707,16 @@ <div align="right"><a href="#top">Up</a></div> <hr /> <hr /> +<a NAME="updatePip" ID="updatePip"></a> +<h2>updatePip</h2> +<b>updatePip</b>(<i></i>) + +<p> + Update the installed pip package. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +<hr /> <a NAME="usage" ID="usage"></a> <h2>usage</h2> <b>usage</b>(<i>rcode=2</i>)
--- a/eric6/Documentation/Source/setup.html Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Documentation/Source/setup.html Sat May 02 14:45:06 2020 +0200 @@ -61,7 +61,7 @@ </tr> <tr> <td><a href="#getPackageData">getPackageData</a></td> -<td>Function to return data files of a package with givene extensions.</td> +<td>Function to return data files of a package with given extensions.</td> </tr> <tr> <td><a href="#getVersion">getVersion</a></td> @@ -190,7 +190,7 @@ <b>getPackageData</b>(<i>package, extensions</i>) <p> - Function to return data files of a package with givene extensions. + Function to return data files of a package with given extensions. </p> <dl>
--- a/eric6/E5Graphics/E5ArrowItem.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Graphics/E5ArrowItem.py Sat May 02 14:45:06 2020 +0200 @@ -11,7 +11,7 @@ import math from PyQt5.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt -from PyQt5.QtGui import QPen, QPolygonF +from PyQt5.QtGui import QPen, QPolygonF, QColor from PyQt5.QtWidgets import QAbstractGraphicsShapeItem, QGraphicsItem, QStyle NormalArrow = 1 @@ -26,15 +26,23 @@ Class implementing an arrow graphics item subclass. """ def __init__(self, origin=None, end=None, - filled=False, arrowType=NormalArrow, parent=None): + filled=False, arrowType=NormalArrow, colors=None, + parent=None): """ Constructor - @param origin origin of the arrow (QPointF) - @param end end point of the arrow (QPointF) - @param filled flag indicating a filled arrow head (boolean) - @param arrowType arrow type (NormalArrow, WideArrow) - @keyparam parent reference to the parent object (QGraphicsItem) + @param origin origin of the arrow + @type QPointF + @param end end point of the arrow + @type QPointF + @param filled flag indicating a filled arrow head + @type bool + @param arrowType arrow type + @type int, one of NormalArrow, WideArrow + @param colors tuple containing the foreground and background colors + @type tuple of (QColor, QColor) + @param parent reference to the parent object + @type QGraphicsItem """ super(E5ArrowItem, self).__init__(parent) @@ -43,6 +51,11 @@ self._filled = filled self._type = arrowType + if colors is None: + self._colors = (QColor(Qt.black), QColor(Qt.white)) + else: + self._colors = colors + self._halfLength = 13.0 self.setFlag(QGraphicsItem.ItemIsMovable, True) @@ -114,7 +127,8 @@ # draw the line first line = QLineF(self._origin, self._end) painter.setPen( - QPen(Qt.black, width, Qt.SolidLine, Qt.FlatCap, Qt.MiterJoin)) + QPen(self._colors[0], width, Qt.SolidLine, Qt.FlatCap, + Qt.MiterJoin)) painter.drawLine(line) # draw the arrow head @@ -132,9 +146,9 @@ self._end.y() - self._halfLength * math.sin(arrowSlope)) if self._filled: - painter.setBrush(Qt.black) + painter.setBrush(self._colors[0]) else: - painter.setBrush(Qt.white) + painter.setBrush(self._colors[1]) polygon = QPolygonF() polygon.append(line.p2()) polygon.append(a1)
--- a/eric6/E5Graphics/E5GraphicsView.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Graphics/E5GraphicsView.py Sat May 02 14:45:06 2020 +0200 @@ -14,6 +14,8 @@ from PyQt5.QtGui import QBrush, QPainter, QPixmap, QFont, QColor from PyQt5.QtWidgets import QGraphicsView +from E5Gui.E5Application import e5App + import Preferences @@ -45,7 +47,7 @@ self.setObjectName("E5GraphicsView") self.__initialSceneSize = self.scene().sceneRect().size() - self.setBackgroundBrush(QBrush(Qt.white)) + self.setBackgroundBrush(QBrush(self.getBackgroundColor())) self.setRenderHint(QPainter.Antialiasing, True) self.setDragMode(QGraphicsView.RubberBandDrag) self.setAlignment(Qt.Alignment(Qt.AlignLeft | Qt.AlignTop)) @@ -70,7 +72,44 @@ "whole selection.</li>\n" "</ul>\n" )) + + def getDrawingColors(self): + """ + Public method to get the configured drawing colors. + @return tuple containing the foreground and background colors + @rtype tuple of (QColor, QColor) + """ + drawingMode = Preferences.getGraphics("DrawingMode") + if drawingMode == "automatic": + if e5App().usesDarkPalette(): + drawingMode = "white_black" + else: + drawingMode = "black_white" + + if drawingMode == "white_black": + return (QColor("#ffffff"), QColor("#262626")) + else: + return (QColor("#000000"), QColor("#ffffff")) + + def getForegroundColor(self): + """ + Public method to get the configured foreground color. + + @return foreground color + @rtype QColor + """ + return self.getDrawingColors()[0] + + def getBackgroundColor(self): + """ + Public method to get the configured background color. + + @return background color + @rtype QColor + """ + return self.getDrawingColors()[1] + def __levelForZoom(self, zoom): """ Private method determining the zoom level index given a zoom factor.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/E5Gui/E5AnimatedLabel.py Sat May 02 14:45:06 2020 +0200 @@ -0,0 +1,180 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2020 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a label widget showing an animated pixmap. +""" + +from PyQt5.QtCore import pyqtSlot, QTimer +from PyQt5.QtGui import QPixmap +from PyQt5.QtWidgets import QLabel + +import UI.PixmapCache + + +class E5AnimatedLabel(QLabel): + """ + Class implementing a label widget showing an animated pixmap. + """ + def __init__(self, parent=None, *, animationFile="", interval=100): + """ + Constructor + + @param parent reference to the parent window + @type QWidget + @keyparam animationFile path to the file containing the animation data + @type str + @keyparam interval interval in milliseconds between animation frames + @type int + """ + super(E5AnimatedLabel, self).__init__(parent) + + self.__timer = QTimer(self) + self.__timer.setInterval(interval) + self.__timer.timeout.connect(self.__animate) + + self.__currentFrame = 0 + self.__frames = 0 + self.__pixmap = None + self.__pixmapHeight = 0 + self.__animationFile = "" + self.__animationFileLoaded = False + + self.__loadAnimationFile(animationFile) + + def __loadAnimationFile(self, animationFile): + """ + Private method to load an animation file. + + @param animationFile path to the file containing the animation data + @type str + """ + self.__animationFile = animationFile + + pixmap = UI.PixmapCache.getPixmap(animationFile) + if not pixmap.isNull(): + self.__pixmap = pixmap + self.__pixmapHeight = pixmap.height() + self.__frames = pixmap.width() // pixmap.height() + # assume quadratic animation frames + self.__animationFileLoaded = True + else: + self.__pixmap = QPixmap() + self.__pixmapHeight = 0 + self.__frames = 0 + self.__animationFileLoaded = False + + self.reset() + + @pyqtSlot() + def __animate(self): + """ + Private slot to animate the pixmap. + """ + if self.__animationFileLoaded: + self.__currentFrame = (self.__currentFrame + 1) % self.__frames + super(E5AnimatedLabel, self).setPixmap(self.__pixmap.copy( + self.__currentFrame * self.__pixmapHeight, + 0, + self.__pixmapHeight, + self.__pixmapHeight + )) + else: + self.clear() + + @pyqtSlot() + def reset(self): + """ + Public slot to reset the animation. + """ + self.__currentFrame = -1 + self.__animate() + + @pyqtSlot() + def start(self): + """ + Public slot to start the animation. + """ + if self.__animationFileLoaded: + self.__timer.start() + + @pyqtSlot() + def stop(self): + """ + Public slot to stop the animation. + """ + self.__timer.stop() + + def isActive(self): + """ + Public method to check, if the animation is active. + + @return flag indicating an active animation + @rtype bool + """ + return self.__timer.isActive() and self.__animationFileLoaded + + def setAnimationFile(self, animationFile): + """ + Public method to set the name of the animation file. + + @param animationFile path to the file containing the animation data + @type str + """ + active = self.__timer.isActive() + self.__timer.stop() + self.__loadAnimationFile(animationFile) + if active and self.__animationFileLoaded: + self.__timer.start() + + def getAnimationFile(self): + """ + Public method to get the name of the animation file. + + @return path to the file containing the animation data + @rtype str + """ + return self.__animationFile + + def isAnimationFileLoaded(self): + """ + Public method to check, if the animation file was loaded. + + @return flag indicating a successfully loaded animation file + @rtype bool + """ + return self.__animationFileLoaded + + def setInterval(self, interval): + """ + Public method to set the interval between the animated frames. + + @param interval interval in milliseconds between animation frames + @type int + """ + self.__timer.setInterval(interval) + + def getInterval(self): + """ + Public method to get the interval between the animated frames. + + @return interval in milliseconds between animation frames + @rtype int + """ + return self.__timer.interval() + + def setPixmap(self, pixmap): + """ + Public slot to set the pixmap of the label. + + Setting a standard pixmap will stop the animation and set the given + pixmap without animating it. Thereafter the animation has to be + restarted with the start() method. + + @param pixmap pixmap to be set + @type QPixmap + """ + self.stop() + super(E5AnimatedLabel, self).setPixmap(pixmap)
--- a/eric6/E5Gui/E5Application.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Gui/E5Application.py Sat May 02 14:45:06 2020 +0200 @@ -9,6 +9,7 @@ from PyQt5.QtCore import Qt, QCoreApplication +from PyQt5.QtGui import QPalette from PyQt5.QtWidgets import QApplication @@ -21,6 +22,7 @@ Constructor @param argv command line arguments + @type list """ try: QCoreApplication.setAttribute(Qt.AA_EnableHighDpiScaling) @@ -44,40 +46,47 @@ self.__objectRegistry = {} self.__pluginObjectRegistry = {} - + def registerObject(self, name, objectRef): """ Public method to register an object in the object registry. - @param name name of the object (string) + @param name name of the object + @type str @param objectRef reference to the object + @type any @exception KeyError raised when the given name is already in use """ if name in self.__objectRegistry: raise KeyError('Object "{0}" already registered.'.format(name)) else: self.__objectRegistry[name] = objectRef - + def getObject(self, name): """ Public method to get a reference to a registered object. - @param name name of the object (string) + @param name name of the object + @type str @return reference to the registered object + @rtype any @exception KeyError raised when the given name is not known """ if name in self.__objectRegistry: return self.__objectRegistry[name] else: raise KeyError('Object "{0}" is not registered.'.format(name)) - + def registerPluginObject(self, name, objectRef, pluginType=None): """ Public method to register a plugin object in the object registry. - @param name name of the plugin object (string) + @param name name of the plugin object + @type str @param objectRef reference to the plugin object - @keyparam pluginType type of the plugin object (string) + @type any + @param pluginType type of the plugin object + @type str @exception KeyError raised when the given name is already in use """ if name in self.__pluginObjectRegistry: @@ -85,22 +94,25 @@ 'Pluginobject "{0}" already registered.'.format(name)) else: self.__pluginObjectRegistry[name] = (objectRef, pluginType) - + def unregisterPluginObject(self, name): """ Public method to unregister a plugin object in the object registry. - @param name name of the plugin object (string) + @param name name of the plugin object + @type str """ if name in self.__pluginObjectRegistry: del self.__pluginObjectRegistry[name] - + def getPluginObject(self, name): """ Public method to get a reference to a registered plugin object. - @param name name of the plugin object (string) + @param name name of the plugin object + @type str @return reference to the registered plugin object + @rtype any @exception KeyError raised when the given name is not known """ if name in self.__pluginObjectRegistry: @@ -108,25 +120,28 @@ else: raise KeyError( 'Pluginobject "{0}" is not registered.'.format(name)) - + def getPluginObjects(self): """ Public method to get a list of (name, reference) pairs of all registered plugin objects. @return list of (name, reference) pairs + @rtype list of (str, any) """ objects = [] for name in self.__pluginObjectRegistry: objects.append((name, self.__pluginObjectRegistry[name][0])) return objects - + def getPluginObjectType(self, name): """ Public method to get the type of a registered plugin object. - @param name name of the plugin object (string) - @return type of the plugin object (string) + @param name name of the plugin object + @type str + @return type of the plugin object + @rtype str @exception KeyError raised when the given name is not known """ if name in self.__pluginObjectRegistry: @@ -134,5 +149,17 @@ else: raise KeyError( 'Pluginobject "{0}" is not registered.'.format(name)) + + def usesDarkPalette(self): + """ + Public method to check, if the application uses a palette with a dark + background. + + @return flag indicating the use of a palette with a dark background + @rtype bool + """ + palette = self.palette() + lightness = palette.color(QPalette.Window).lightness() + return lightness <= 128 e5App = QCoreApplication.instance
--- a/eric6/E5Gui/E5LineEdit.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Gui/E5LineEdit.py Sat May 02 14:45:06 2020 +0200 @@ -260,7 +260,7 @@ from E5Gui.E5LineEditButton import E5LineEditButton self.__clearButton = E5LineEditButton(self) - self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft.png")) + self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft")) self.addWidget(self.__clearButton, side) self.__clearButton.setVisible(False)
--- a/eric6/E5Gui/E5ModelMenu.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Gui/E5ModelMenu.py Sat May 02 14:45:06 2020 +0200 @@ -206,7 +206,7 @@ icon = parent.data(Qt.DecorationRole) if icon == NotImplemented or icon is None: - icon = UI.PixmapCache.getIcon("defaultIcon.png") + icon = UI.PixmapCache.getIcon("defaultIcon") modelMenu.setIcon(icon) if parentMenu is not None: parentMenu.addMenu(modelMenu).setData(v) @@ -246,7 +246,7 @@ """ icon = idx.data(Qt.DecorationRole) if icon == NotImplemented or icon is None: - icon = UI.PixmapCache.getIcon("defaultIcon.png") + icon = UI.PixmapCache.getIcon("defaultIcon") action = self.makeAction(icon, idx.data(), self) action.setStatusTip(idx.data(self.__statusBarTextRole))
--- a/eric6/E5Gui/E5PathPicker.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Gui/E5PathPicker.py Sat May 02 14:45:06 2020 +0200 @@ -101,7 +101,7 @@ self.__button = QToolButton(self) self.__button.setToolButtonStyle(Qt.ToolButtonIconOnly) - self.__button.setIcon(UI.PixmapCache.getIcon("open.png")) + self.__button.setIcon(UI.PixmapCache.getIcon("open")) self.__layout.addWidget(self._editor) self.__layout.addWidget(self.__button)
--- a/eric6/E5Gui/E5SideBar.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Gui/E5SideBar.py Sat May 02 14:45:06 2020 +0200 @@ -54,7 +54,7 @@ self.__autoHideButton = QToolButton() self.__autoHideButton.setCheckable(True) self.__autoHideButton.setIcon( - UI.PixmapCache.getIcon("autoHideOff.png")) + UI.PixmapCache.getIcon("autoHideOff")) self.__autoHideButton.setChecked(True) self.__autoHideButton.setToolTip( self.tr("Deselect to activate automatic collapsing")) @@ -647,10 +647,10 @@ self.__autoHide = not checked if self.__autoHide: self.__autoHideButton.setIcon( - UI.PixmapCache.getIcon("autoHideOn.png")) + UI.PixmapCache.getIcon("autoHideOn")) else: self.__autoHideButton.setIcon( - UI.PixmapCache.getIcon("autoHideOff.png")) + UI.PixmapCache.getIcon("autoHideOff")) def __appFocusChanged(self, old, now): """
--- a/eric6/E5Gui/E5TabWidget.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Gui/E5TabWidget.py Sat May 02 14:45:06 2020 +0200 @@ -8,9 +8,11 @@ """ -from PyQt5.QtCore import Qt, QPoint, QMimeData, QByteArray, pyqtSignal -from PyQt5.QtGui import QDrag, QMovie -from PyQt5.QtWidgets import QTabWidget, QTabBar, QApplication, QStyle, QLabel +from PyQt5.QtCore import pyqtSignal, Qt, QPoint, QMimeData +from PyQt5.QtGui import QDrag +from PyQt5.QtWidgets import QTabWidget, QTabBar, QApplication, QStyle + +from E5Gui.E5AnimatedLabel import E5AnimatedLabel class E5WheelTabBar(QTabBar): @@ -311,29 +313,29 @@ side = QTabBar.LeftSide return side - def animationLabel(self, index, animationFile, speed=100): + def animationLabel(self, index, animationFile, interval=100): """ Public slot to set an animated icon. - @param index tab index (integer) - @param animationFile name of the file containing the animation (string) - @param speed animation speed of the icon in percent of the original - icon's speed (integer) - @return reference to the created label (QLabel) + @param index tab index + @type int + @param animationFile name of the file containing the animation + @type str + @param interval interval in milliseconds between animation frames + @type int + @return reference to the created label + @rtype E5AnimatedLabel """ if index == -1: return None if hasattr(self.__tabBar, 'setTabButton'): side = self.__freeSide() - animation = QLabel(self) - if animationFile and not animation.movie(): - movie = QMovie(animationFile, QByteArray(), animation) - movie.setSpeed(speed) - animation.setMovie(movie) - movie.start() + animation = E5AnimatedLabel( + self, animationFile=animationFile, interval=interval) self.__tabBar.setTabButton(index, side, None) self.__tabBar.setTabButton(index, side, animation) + animation.start() return animation else: return None @@ -351,6 +353,6 @@ side = self.__freeSide() animation = self.__tabBar.tabButton(index, side) if animation is not None: - animation.movie().stop() + animation.stop() self.__tabBar.setTabButton(index, side, None) del animation
--- a/eric6/E5Gui/E5TextEditSearchWidget.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Gui/E5TextEditSearchWidget.py Sat May 02 14:45:06 2020 +0200 @@ -119,14 +119,14 @@ self.findPrevButton.setObjectName("findPrevButton") self.findPrevButton.setToolTip(self.tr( "Press to find the previous occurrence")) - self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) + self.findPrevButton.setIcon(UI.PixmapCache.getIcon("1leftarrow")) self.horizontalLayout3.addWidget(self.findPrevButton) self.findNextButton = QToolButton(self) self.findNextButton.setObjectName("findNextButton") self.findNextButton.setToolTip(self.tr( "Press to find the next occurrence")) - self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) + self.findNextButton.setIcon(UI.PixmapCache.getIcon("1rightarrow")) self.horizontalLayout3.addWidget(self.findNextButton) self.horizontalLayout2.addLayout(self.horizontalLayout3)
--- a/eric6/E5Gui/E5ToolBarDialog.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Gui/E5ToolBarDialog.py Sat May 02 14:45:06 2020 +0200 @@ -72,10 +72,10 @@ self.__toolBarItemToWidgetActionID = {} # maps toolbar item IDs to widget action IDs - self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) - self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) - self.leftButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) - self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow")) + self.leftButton.setIcon(UI.PixmapCache.getIcon("1leftarrow")) + self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow")) self.__restoreDefaultsButton = self.buttonBox.button( QDialogButtonBox.RestoreDefaults)
--- a/eric6/E5Network/E5NetworkIcon.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Network/E5NetworkIcon.py Sat May 02 14:45:06 2020 +0200 @@ -54,9 +54,9 @@ @type bool """ if online: - self.setPixmap(UI.PixmapCache.getPixmap("network-online.png")) + self.setPixmap(UI.PixmapCache.getPixmap("network-online")) else: - self.setPixmap(UI.PixmapCache.getPixmap("network-offline.png")) + self.setPixmap(UI.PixmapCache.getPixmap("network-offline")) tooltip = self.tr("<p>Shows the network status<br/><br/>" "<b>Network:</b> {0}</p>")
--- a/eric6/E5Network/E5SslCertificateSelectionDialog.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Network/E5SslCertificateSelectionDialog.py Sat May 02 14:45:06 2020 +0200 @@ -43,7 +43,7 @@ self.setupUi(self) self.viewButton.setIcon( - UI.PixmapCache.getIcon("certificates.png")) + UI.PixmapCache.getIcon("certificates")) self.buttonBox.button(QDialogButtonBox.OK).setEnabled(False) self.viewButton.setEnabled(False)
--- a/eric6/E5Network/E5SslCertificatesDialog.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Network/E5SslCertificatesDialog.py Sat May 02 14:45:06 2020 +0200 @@ -45,22 +45,22 @@ self.setupUi(self) self.serversViewButton.setIcon( - UI.PixmapCache.getIcon("certificates.png")) + UI.PixmapCache.getIcon("certificates")) self.serversDeleteButton.setIcon( - UI.PixmapCache.getIcon("certificateDelete.png")) + UI.PixmapCache.getIcon("certificateDelete")) self.serversExportButton.setIcon( - UI.PixmapCache.getIcon("certificateExport.png")) + UI.PixmapCache.getIcon("certificateExport")) self.serversImportButton.setIcon( - UI.PixmapCache.getIcon("certificateImport.png")) + UI.PixmapCache.getIcon("certificateImport")) self.caViewButton.setIcon( - UI.PixmapCache.getIcon("certificates.png")) + UI.PixmapCache.getIcon("certificates")) self.caDeleteButton.setIcon( - UI.PixmapCache.getIcon("certificateDelete.png")) + UI.PixmapCache.getIcon("certificateDelete")) self.caExportButton.setIcon( - UI.PixmapCache.getIcon("certificateExport.png")) + UI.PixmapCache.getIcon("certificateExport")) self.caImportButton.setIcon( - UI.PixmapCache.getIcon("certificateImport.png")) + UI.PixmapCache.getIcon("certificateImport")) self.__populateServerCertificatesTree() self.__populateCaCertificatesTree()
--- a/eric6/E5Network/E5SslInfoWidget.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/E5Network/E5SslInfoWidget.py Sat May 02 14:45:06 2020 +0200 @@ -65,7 +65,7 @@ if cert.isNull(): label.setText(self.tr( "Warning: this site is NOT carrying a certificate.")) - imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32.png")) + imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32")) else: valid = not cert.isBlacklisted() if valid: @@ -76,12 +76,12 @@ " and has been verified by:\n{0}").format( Utilities.decodeString(txt))) imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) else: label.setText(self.tr( "The certificate for this site is NOT valid.")) imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) layout.addWidget(label, rows, 1) rows += 1 @@ -117,7 +117,7 @@ 'Your connection to "{0}" is NOT encrypted.\n').format( self.__url.host())) layout.addWidget(label, rows, 1) - imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32.png")) + imageLabel.setPixmap(UI.PixmapCache.getPixmap("securityLow32")) rows += 1 else: label = QLabel(self) @@ -131,37 +131,37 @@ if proto == QSsl.SslV3: sslVersion = "SSL 3.0" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) elif proto == QSsl.TlsV1SslV3: sslVersion = "TLS 1.0/SSL 3.0" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) elif proto == QSsl.SslV2: sslVersion = "SSL 2.0" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) else: sslVersion = self.tr("unknown") imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityLow32.png")) + UI.PixmapCache.getPixmap("securityLow32")) if proto == QSsl.TlsV1_0: sslVersion = "TLS 1.0" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) elif proto == QSsl.TlsV1_1: sslVersion = "TLS 1.1" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) elif proto == QSsl.TlsV1_2: sslVersion = "TLS 1.2" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) try: # Qt 5.12 and newer if proto == QSsl.TlsV1_2: sslVersion = "TLS 1.2" imageLabel.setPixmap( - UI.PixmapCache.getPixmap("securityHigh32.png")) + UI.PixmapCache.getPixmap("securityHigh32")) except AttributeError: pass rows += 1
--- a/eric6/Graphics/ApplicationDiagramBuilder.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/ApplicationDiagramBuilder.py Sat May 02 14:45:06 2020 +0200 @@ -244,7 +244,8 @@ from .PackageItem import PackageItem, PackageModel modules.sort() pm = PackageModel(name, modules) - pw = PackageItem(pm, x, y, noModules=self.noModules, scene=self.scene) + pw = PackageItem(pm, x, y, noModules=self.noModules, scene=self.scene, + colors=self.umlView.getDrawingColors()) pw.setId(self.umlView.getItemId()) return pw @@ -259,7 +260,8 @@ for rel in shapes[package][1]: assoc = AssociationItem( shapes[package][0], shapes[rel][0], - Imports) + Imports, + colors=self.umlView.getDrawingColors()) self.scene.addItem(assoc) def getPersistenceData(self):
--- a/eric6/Graphics/AssociationItem.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/AssociationItem.py Sat May 02 14:45:06 2020 +0200 @@ -41,7 +41,7 @@ ending at the second. """ def __init__(self, itemA, itemB, assocType=Normal, topToBottom=False, - parent=None): + colors=None, parent=None): """ Constructor @@ -53,9 +53,13 @@ <li>Generalisation</li> <li>Imports</li> </ul> - @keyparam topToBottom flag indicating to draw the association - from item A top to item B bottom (boolean) - @keyparam parent reference to the parent object (QGraphicsItem) + @param topToBottom flag indicating to draw the association + from item A top to item B bottom + @type bool + @param colors tuple containing the foreground and background colors + @type tuple of (QColor, QColor) + @param parent reference to the parent object + @type QGraphicsItem """ if assocType == Normal: arrowType = NormalArrow @@ -68,7 +72,7 @@ arrowFilled = False E5ArrowItem.__init__(self, QPointF(0, 0), QPointF(100, 100), - arrowFilled, arrowType, parent) + arrowFilled, arrowType, colors, parent) self.setFlag(QGraphicsItem.ItemIsMovable, False) self.setFlag(QGraphicsItem.ItemIsSelectable, False)
--- a/eric6/Graphics/ClassItem.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/ClassItem.py Sat May 02 14:45:06 2020 +0200 @@ -75,22 +75,31 @@ ItemType = "class" def __init__(self, model=None, external=False, x=0, y=0, - rounded=False, noAttrs=False, parent=None, scene=None): + rounded=False, noAttrs=False, colors=None, parent=None, + scene=None): """ Constructor - @param model class model containing the class data (ClassModel) + @param model class model containing the class data + @type ClassModel @param external flag indicating a class defined outside our scope - (boolean) - @param x x-coordinate (integer) - @param y y-coordinate (integer) - @keyparam rounded flag indicating a rounded corner (boolean) - @keyparam noAttrs flag indicating, that no attributes should be shown - (boolean) - @keyparam parent reference to the parent object (QGraphicsItem) - @keyparam scene reference to the scene object (QGraphicsScene) + @type boolean + @param x x-coordinate + @type int + @param y y-coordinate + @type int + @param rounded flag indicating a rounded corner + @type bool + @param noAttrs flag indicating, that no attributes should be shown + @type bool + @param colors tuple containing the foreground and background colors + @type tuple of (QColor, QColor) + @param parent reference to the parent object + @type QGraphicsItem + @param scene reference to the scene object + @type QGraphicsScene """ - UMLItem.__init__(self, model, x, y, rounded, parent) + UMLItem.__init__(self, model, x, y, rounded, colors, parent) self.external = external self.noAttrs = noAttrs @@ -117,6 +126,7 @@ x = self.margin + self.rect().x() y = self.margin + self.rect().y() self.header = QGraphicsSimpleTextItem(self) + self.header.setBrush(self._colors[0]) self.header.setFont(boldFont) self.header.setText(self.model.getName()) self.header.setPos(x, y) @@ -127,6 +137,7 @@ else: txt = " " self.attrs = QGraphicsSimpleTextItem(self) + self.attrs.setBrush(self._colors[0]) self.attrs.setFont(self.font) self.attrs.setText(txt) self.attrs.setPos(x, y) @@ -138,6 +149,7 @@ else: txt = " " self.meths = QGraphicsSimpleTextItem(self) + self.meths.setBrush(self._colors[0]) self.meths.setFont(self.font) self.meths.setText(txt) self.meths.setPos(x, y)
--- a/eric6/Graphics/ImportsDiagramBuilder.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/ImportsDiagramBuilder.py Sat May 02 14:45:06 2020 +0200 @@ -241,7 +241,8 @@ from .ModuleItem import ModuleItem, ModuleModel classes.sort() impM = ModuleModel(name, classes) - impW = ModuleItem(impM, x, y, scene=self.scene) + impW = ModuleItem(impM, x, y, scene=self.scene, + colors=self.umlView.getDrawingColors()) impW.setId(self.umlView.getItemId()) return impW @@ -256,7 +257,8 @@ for rel in shapes[module][1]: assoc = AssociationItem( shapes[module][0], shapes[rel][0], - Imports) + Imports, + colors=self.umlView.getDrawingColors()) self.scene.addItem(assoc) def getPersistenceData(self):
--- a/eric6/Graphics/ModuleItem.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/ModuleItem.py Sat May 02 14:45:06 2020 +0200 @@ -52,19 +52,27 @@ """ ItemType = "module" - def __init__(self, model=None, x=0, y=0, rounded=False, + def __init__(self, model=None, x=0, y=0, rounded=False, colors=None, parent=None, scene=None): """ Constructor - @param model module model containing the module data (ModuleModel) - @param x x-coordinate (integer) - @param y y-coordinate (integer) - @keyparam rounded flag indicating a rounded corner (boolean) - @keyparam parent reference to the parent object (QGraphicsItem) - @keyparam scene reference to the scene object (QGraphicsScene) + @param model module model containing the module data + @type ModuleModel + @param x x-coordinate + @type int + @param y y-coordinate + @type int + @param rounded flag indicating a rounded corner + @type bool + @param colors tuple containing the foreground and background colors + @type tuple of (QColor, QColor) + @param parent reference to the parent object + @type QGraphicsItem + @param scene reference to the scene object + @type QGraphicsScene """ - UMLItem.__init__(self, model, x, y, rounded, parent) + UMLItem.__init__(self, model, x, y, rounded, colors, parent) scene.addItem(self) @@ -87,6 +95,7 @@ x = self.margin + self.rect().x() y = self.margin + self.rect().y() self.header = QGraphicsSimpleTextItem(self) + self.header.setBrush(self._colors[0]) self.header.setFont(boldFont) self.header.setText(self.model.getName()) self.header.setPos(x, y) @@ -96,6 +105,7 @@ else: txt = " " self.classes = QGraphicsSimpleTextItem(self) + self.classes.setBrush(self._colors[0]) self.classes.setFont(self.font) self.classes.setText(txt) self.classes.setPos(x, y)
--- a/eric6/Graphics/PackageDiagramBuilder.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/PackageDiagramBuilder.py Sat May 02 14:45:06 2020 +0200 @@ -394,7 +394,8 @@ if isRbModule: name = "{0} (Module)".format(name) cl = ClassModel(name, meths[:], attrs[:]) - cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene) + cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene, + colors=self.umlView.getDrawingColors()) cw.setId(self.umlView.getItemId()) self.allClasses[className] = cw @@ -411,7 +412,8 @@ """ from .ClassItem import ClassItem, ClassModel cl = ClassModel(_class) - cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene) + cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene, + colors=self.umlView.getDrawingColors()) cw.setId(self.umlView.getItemId()) self.allClasses[_class] = cw @@ -427,7 +429,8 @@ """ from .PackageItem import PackageItem, PackageModel pm = PackageModel(name, modules) - pw = PackageItem(pm, x, y, scene=self.scene) + pw = PackageItem(pm, x, y, scene=self.scene, + colors=self.umlView.getDrawingColors()) pw.setId(self.umlView.getItemId()) self.allClasses[name] = pw @@ -444,7 +447,8 @@ self.__getCurrentShape(route[1]), self.__getCurrentShape(route[0]), Generalisation, - topToBottom=True) + topToBottom=True, + colors=self.umlView.getDrawingColors()) self.scene.addItem(assoc) def getPersistenceData(self):
--- a/eric6/Graphics/PackageItem.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/PackageItem.py Sat May 02 14:45:06 2020 +0200 @@ -55,20 +55,29 @@ ItemType = "package" def __init__(self, model=None, x=0, y=0, rounded=False, - noModules=False, parent=None, scene=None): + noModules=False, colors=None, parent=None, scene=None): """ Constructor - @param model package model containing the package data (PackageModel) - @param x x-coordinate (integer) - @param y y-coordinate (integer) - @param rounded flag indicating a rounded corner (boolean) - @keyparam noModules flag indicating, that no module names should be - shown (boolean) - @keyparam parent reference to the parent object (QGraphicsItem) - @keyparam scene reference to the scene object (QGraphicsScene) + @param model package model containing the package data + @type PackageModel + @param x x-coordinate + @type int + @param y y-coordinate + @type int + @param rounded flag indicating a rounded corner + @type bool + @param noModules flag indicating, that no module names should be + shown + @type bool + @param colors tuple containing the foreground and background colors + @type tuple of (QColor, QColor) + @param parent reference to the parent object + @type QGraphicsItem + @param scene reference to the scene object + @type QGraphicsScene """ - UMLItem.__init__(self, model, x, y, rounded, parent) + UMLItem.__init__(self, model, x, y, rounded, colors, parent) self.noModules = noModules scene.addItem(self) @@ -92,6 +101,7 @@ x = self.margin + self.rect().x() y = self.margin + self.rect().y() self.header = QGraphicsSimpleTextItem(self) + self.header.setBrush(self._colors[0]) self.header.setFont(boldFont) self.header.setText(self.model.getName()) self.header.setPos(x, y) @@ -103,6 +113,7 @@ else: txt = " " self.modules = QGraphicsSimpleTextItem(self) + self.modules.setBrush(self._colors[0]) self.modules.setFont(self.font) self.modules.setText(txt) self.modules.setPos(x, y)
--- a/eric6/Graphics/PixmapDiagram.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/PixmapDiagram.py Sat May 02 14:45:06 2020 +0200 @@ -67,9 +67,9 @@ self.setCentralWidget(self.pixmapView) self.__zoomWidget = E5ZoomWidget( - UI.PixmapCache.getPixmap("zoomOut.png"), - UI.PixmapCache.getPixmap("zoomIn.png"), - UI.PixmapCache.getPixmap("zoomReset.png"), self) + UI.PixmapCache.getPixmap("zoomOut"), + UI.PixmapCache.getPixmap("zoomIn"), + UI.PixmapCache.getPixmap("zoomReset"), self) self.statusBar().addPermanentWidget(self.__zoomWidget) self.__zoomWidget.setMapping( PixmapDiagram.ZoomLevels, PixmapDiagram.ZoomLevelDefault) @@ -92,17 +92,17 @@ Private method to initialize the view actions. """ self.closeAct = QAction( - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr("Close"), self) self.closeAct.triggered.connect(self.close) self.printAct = QAction( - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr("Print"), self) self.printAct.triggered.connect(self.__printDiagram) self.printPreviewAct = QAction( - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self) self.printPreviewAct.triggered.connect(self.__printPreviewDiagram)
--- a/eric6/Graphics/SvgDiagram.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/SvgDiagram.py Sat May 02 14:45:06 2020 +0200 @@ -63,9 +63,9 @@ self.setCentralWidget(self.svgView) self.__zoomWidget = E5ZoomWidget( - UI.PixmapCache.getPixmap("zoomOut.png"), - UI.PixmapCache.getPixmap("zoomIn.png"), - UI.PixmapCache.getPixmap("zoomReset.png"), self) + UI.PixmapCache.getPixmap("zoomOut"), + UI.PixmapCache.getPixmap("zoomIn"), + UI.PixmapCache.getPixmap("zoomReset"), self) self.statusBar().addPermanentWidget(self.__zoomWidget) self.__zoomWidget.setMapping( SvgDiagram.ZoomLevels, SvgDiagram.ZoomLevelDefault) @@ -90,17 +90,17 @@ Private method to initialize the view actions. """ self.closeAct = QAction( - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr("Close"), self) self.closeAct.triggered.connect(self.close) self.printAct = QAction( - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr("Print"), self) self.printAct.triggered.connect(self.__printDiagram) self.printPreviewAct = QAction( - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self) self.printPreviewAct.triggered.connect(self.__printPreviewDiagram)
--- a/eric6/Graphics/UMLClassDiagramBuilder.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/UMLClassDiagramBuilder.py Sat May 02 14:45:06 2020 +0200 @@ -241,7 +241,8 @@ if isRbModule: name = "{0} (Module)".format(name) cl = ClassModel(name, meths[:], attrs[:]) - cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene) + cw = ClassItem(cl, False, x, y, noAttrs=self.noAttrs, scene=self.scene, + colors=self.umlView.getDrawingColors()) cw.setId(self.umlView.getItemId()) self.allClasses[className] = cw if _class.name not in self.allModules[self.file]: @@ -260,7 +261,8 @@ """ from .ClassItem import ClassItem, ClassModel cl = ClassModel(_class) - cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene) + cw = ClassItem(cl, True, x, y, noAttrs=self.noAttrs, scene=self.scene, + colors=self.umlView.getDrawingColors()) cw.setId(self.umlView.getItemId()) self.allClasses[_class] = cw if _class not in self.allModules[self.file]: @@ -279,7 +281,8 @@ self.__getCurrentShape(route[1]), self.__getCurrentShape(route[0]), Generalisation, - topToBottom=True) + topToBottom=True, + colors=self.umlView.getDrawingColors()) self.scene.addItem(assoc) def getPersistenceData(self):
--- a/eric6/Graphics/UMLDialog.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/UMLDialog.py Sat May 02 14:45:06 2020 +0200 @@ -74,37 +74,37 @@ Private slot to initialize the actions. """ self.closeAct = QAction( - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr("Close"), self) self.closeAct.triggered.connect(self.close) self.openAct = QAction( - UI.PixmapCache.getIcon("open.png"), + UI.PixmapCache.getIcon("open"), self.tr("Load"), self) self.openAct.triggered.connect(self.load) self.saveAct = QAction( - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr("Save"), self) self.saveAct.triggered.connect(self.__save) self.saveAsAct = QAction( - UI.PixmapCache.getIcon("fileSaveAs.png"), + UI.PixmapCache.getIcon("fileSaveAs"), self.tr("Save As..."), self) self.saveAsAct.triggered.connect(self.__saveAs) self.saveImageAct = QAction( - UI.PixmapCache.getIcon("fileSavePixmap.png"), + UI.PixmapCache.getIcon("fileSavePixmap"), self.tr("Save as Image"), self) self.saveImageAct.triggered.connect(self.umlView.saveImage) self.printAct = QAction( - UI.PixmapCache.getIcon("print.png"), + UI.PixmapCache.getIcon("print"), self.tr("Print"), self) self.printAct.triggered.connect(self.umlView.printDiagram) self.printPreviewAct = QAction( - UI.PixmapCache.getIcon("printPreview.png"), + UI.PixmapCache.getIcon("printPreview"), self.tr("Print Preview"), self) self.printPreviewAct.triggered.connect( self.umlView.printPreviewDiagram)
--- a/eric6/Graphics/UMLGraphicsView.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/UMLGraphicsView.py Sat May 02 14:45:06 2020 +0200 @@ -54,9 +54,9 @@ self.deltaSize = 100.0 self.__zoomWidget = E5ZoomWidget( - UI.PixmapCache.getPixmap("zoomOut.png"), - UI.PixmapCache.getPixmap("zoomIn.png"), - UI.PixmapCache.getPixmap("zoomReset.png"), self) + UI.PixmapCache.getPixmap("zoomOut"), + UI.PixmapCache.getPixmap("zoomIn"), + UI.PixmapCache.getPixmap("zoomReset"), self) parent.statusBar().addPermanentWidget(self.__zoomWidget) self.__zoomWidget.setMapping( E5GraphicsView.ZoomLevels, E5GraphicsView.ZoomLevelDefault) @@ -77,85 +77,85 @@ self.alignMapper.mapped[int].connect(self.__alignShapes) self.deleteShapeAct = QAction( - UI.PixmapCache.getIcon("deleteShape.png"), + UI.PixmapCache.getIcon("deleteShape"), self.tr("Delete shapes"), self) self.deleteShapeAct.triggered.connect(self.__deleteShape) self.incWidthAct = QAction( - UI.PixmapCache.getIcon("sceneWidthInc.png"), + UI.PixmapCache.getIcon("sceneWidthInc"), self.tr("Increase width by {0} points").format( self.deltaSize), self) self.incWidthAct.triggered.connect(self.__incWidth) self.incHeightAct = QAction( - UI.PixmapCache.getIcon("sceneHeightInc.png"), + UI.PixmapCache.getIcon("sceneHeightInc"), self.tr("Increase height by {0} points").format( self.deltaSize), self) self.incHeightAct.triggered.connect(self.__incHeight) self.decWidthAct = QAction( - UI.PixmapCache.getIcon("sceneWidthDec.png"), + UI.PixmapCache.getIcon("sceneWidthDec"), self.tr("Decrease width by {0} points").format( self.deltaSize), self) self.decWidthAct.triggered.connect(self.__decWidth) self.decHeightAct = QAction( - UI.PixmapCache.getIcon("sceneHeightDec.png"), + UI.PixmapCache.getIcon("sceneHeightDec"), self.tr("Decrease height by {0} points").format( self.deltaSize), self) self.decHeightAct.triggered.connect(self.__decHeight) self.setSizeAct = QAction( - UI.PixmapCache.getIcon("sceneSize.png"), + UI.PixmapCache.getIcon("sceneSize"), self.tr("Set size"), self) self.setSizeAct.triggered.connect(self.__setSize) self.rescanAct = QAction( - UI.PixmapCache.getIcon("rescan.png"), + UI.PixmapCache.getIcon("rescan"), self.tr("Re-Scan"), self) self.rescanAct.triggered.connect(self.__rescan) self.relayoutAct = QAction( - UI.PixmapCache.getIcon("relayout.png"), + UI.PixmapCache.getIcon("relayout"), self.tr("Re-Layout"), self) self.relayoutAct.triggered.connect(self.__relayout) self.alignLeftAct = QAction( - UI.PixmapCache.getIcon("shapesAlignLeft.png"), + UI.PixmapCache.getIcon("shapesAlignLeft"), self.tr("Align Left"), self) self.alignMapper.setMapping(self.alignLeftAct, Qt.AlignLeft) self.alignLeftAct.triggered.connect(self.alignMapper.map) self.alignHCenterAct = QAction( - UI.PixmapCache.getIcon("shapesAlignHCenter.png"), + UI.PixmapCache.getIcon("shapesAlignHCenter"), self.tr("Align Center Horizontal"), self) self.alignMapper.setMapping(self.alignHCenterAct, Qt.AlignHCenter) self.alignHCenterAct.triggered.connect(self.alignMapper.map) self.alignRightAct = QAction( - UI.PixmapCache.getIcon("shapesAlignRight.png"), + UI.PixmapCache.getIcon("shapesAlignRight"), self.tr("Align Right"), self) self.alignMapper.setMapping(self.alignRightAct, Qt.AlignRight) self.alignRightAct.triggered.connect(self.alignMapper.map) self.alignTopAct = QAction( - UI.PixmapCache.getIcon("shapesAlignTop.png"), + UI.PixmapCache.getIcon("shapesAlignTop"), self.tr("Align Top"), self) self.alignMapper.setMapping(self.alignTopAct, Qt.AlignTop) self.alignTopAct.triggered.connect(self.alignMapper.map) self.alignVCenterAct = QAction( - UI.PixmapCache.getIcon("shapesAlignVCenter.png"), + UI.PixmapCache.getIcon("shapesAlignVCenter"), self.tr("Align Center Vertical"), self) self.alignMapper.setMapping(self.alignVCenterAct, Qt.AlignVCenter) self.alignVCenterAct.triggered.connect(self.alignMapper.map) self.alignBottomAct = QAction( - UI.PixmapCache.getIcon("shapesAlignBottom.png"), + UI.PixmapCache.getIcon("shapesAlignBottom"), self.tr("Align Bottom"), self) self.alignMapper.setMapping(self.alignBottomAct, Qt.AlignBottom) self.alignBottomAct.triggered.connect(self.alignMapper.map) @@ -744,11 +744,14 @@ y = float(y.split("=", 1)[1].strip()) itemType = itemType.split("=", 1)[1].strip() if itemType == ClassItem.ItemType: - itm = ClassItem(x=x, y=y, scene=self.scene()) + itm = ClassItem(x=x, y=y, scene=self.scene(), + colors=self.getDrawingColors()) elif itemType == ModuleItem.ItemType: - itm = ModuleItem(x=x, y=y, scene=self.scene()) + itm = ModuleItem(x=x, y=y, scene=self.scene(), + colors=self.getDrawingColors()) elif itemType == PackageItem.ItemType: - itm = PackageItem(x=x, y=y, scene=self.scene()) + itm = PackageItem(x=x, y=y, scene=self.scene(), + colors=self.getDrawingColors()) itm.setId(itemId) umlItems[itemId] = itm if not itm.parseItemDataString(version, itemData):
--- a/eric6/Graphics/UMLItem.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/Graphics/UMLItem.py Sat May 02 14:45:06 2020 +0200 @@ -9,6 +9,7 @@ from PyQt5.QtCore import Qt, QSizeF +from PyQt5.QtGui import QColor, QPen from PyQt5.QtWidgets import QGraphicsItem, QGraphicsRectItem, QStyle import Preferences @@ -41,19 +42,33 @@ """ ItemType = "UMLItem" - def __init__(self, model=None, x=0, y=0, rounded=False, parent=None): + def __init__(self, model=None, x=0, y=0, rounded=False, colors=None, + parent=None): """ Constructor - @param model UML model containing the item data (UMLModel) - @param x x-coordinate (integer) - @param y y-coordinate (integer) - @param rounded flag indicating a rounded corner (boolean) - @keyparam parent reference to the parent object (QGraphicsItem) + @param model UML model containing the item data + @type UMLModel + @param x x-coordinate + @type int + @param y y-coordinate + @type int + @param rounded flag indicating a rounded corner + @type bool + @param colors tuple containing the foreground and background colors + @type tuple of (QColor, QColor) + @param parent reference to the parent object + @type QGraphicsItem """ super(UMLItem, self).__init__(parent) self.model = model + if colors is None: + self._colors = (QColor(Qt.black), QColor(Qt.white)) + else: + self._colors = colors + self.setPen(QPen(self._colors[0])) + self.font = Preferences.getGraphics("Font") self.margin = 5 self.associations = []
--- a/eric6/HexEdit/HexEditGotoWidget.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/HexEdit/HexEditGotoWidget.py Sat May 02 14:45:06 2020 +0200 @@ -45,7 +45,7 @@ self.__currentFormat = "" - self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) + self.closeButton.setIcon(UI.PixmapCache.getIcon("close")) for dataFormat in formatOrder: formatStr, validator = self.__formatAndValidators[dataFormat]
--- a/eric6/HexEdit/HexEditMainWindow.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/HexEdit/HexEditMainWindow.py Sat May 02 14:45:06 2020 +0200 @@ -71,7 +71,7 @@ } self.__fromEric = fromEric - self.setWindowIcon(UI.PixmapCache.getIcon("hexEditor.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("hexEditor")) if not self.__fromEric: self.setStyle(Preferences.getUI("Style"), @@ -158,7 +158,7 @@ """ self.newWindowAct = E5Action( self.tr('New Window'), - UI.PixmapCache.getIcon("newWindow.png"), + UI.PixmapCache.getIcon("newWindow"), self.tr('New &Window'), 0, 0, self, 'hexEditor_file_new_window') self.newWindowAct.setStatusTip(self.tr( @@ -174,7 +174,7 @@ # correct texts will be set later self.openAct = E5Action( self.tr('Open'), - UI.PixmapCache.getIcon("open.png"), + UI.PixmapCache.getIcon("open"), self.tr('&Open...'), QKeySequence(self.tr("Ctrl+O", "File|Open")), 0, self, 'hexEditor_file_open') @@ -190,7 +190,7 @@ self.saveAct = E5Action( self.tr('Save'), - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr('&Save'), QKeySequence(self.tr("Ctrl+S", "File|Save")), 0, self, 'hexEditor_file_save') @@ -204,7 +204,7 @@ self.saveAsAct = E5Action( self.tr('Save As'), - UI.PixmapCache.getIcon("fileSaveAs.png"), + UI.PixmapCache.getIcon("fileSaveAs"), self.tr('Save &As...'), QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")), 0, self, 'hexEditor_file_save_as') @@ -234,7 +234,7 @@ self.closeAct = E5Action( self.tr('Close'), - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr('&Close'), QKeySequence(self.tr("Ctrl+W", "File|Close")), 0, self, 'hexEditor_file_close') @@ -275,7 +275,7 @@ self.exitAct = E5Action( self.tr('Quit'), - UI.PixmapCache.getIcon("exit.png"), + UI.PixmapCache.getIcon("exit"), self.tr('&Quit'), QKeySequence(self.tr("Ctrl+Q", "File|Quit")), 0, self, 'hexEditor_file_quit') @@ -294,7 +294,7 @@ """ self.undoAct = E5Action( self.tr('Undo'), - UI.PixmapCache.getIcon("editUndo.png"), + UI.PixmapCache.getIcon("editUndo"), self.tr('&Undo'), QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")), QKeySequence(self.tr("Alt+Backspace", "Edit|Undo")), @@ -309,7 +309,7 @@ self.redoAct = E5Action( self.tr('Redo'), - UI.PixmapCache.getIcon("editRedo.png"), + UI.PixmapCache.getIcon("editRedo"), self.tr('&Redo'), QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")), 0, self, 'hexEditor_edit_redo') @@ -338,7 +338,7 @@ self.cutAct = E5Action( self.tr('Cut'), - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr('Cu&t'), QKeySequence(self.tr("Ctrl+X", "Edit|Cut")), QKeySequence(self.tr("Shift+Del", "Edit|Cut")), @@ -353,7 +353,7 @@ self.copyAct = E5Action( self.tr('Copy'), - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr('&Copy'), QKeySequence(self.tr("Ctrl+C", "Edit|Copy")), QKeySequence(self.tr("Ctrl+Ins", "Edit|Copy")), @@ -368,7 +368,7 @@ self.pasteAct = E5Action( self.tr('Paste'), - UI.PixmapCache.getIcon("editPaste.png"), + UI.PixmapCache.getIcon("editPaste"), self.tr('&Paste'), QKeySequence(self.tr("Ctrl+V", "Edit|Paste")), QKeySequence(self.tr("Shift+Ins", "Edit|Paste")), @@ -383,7 +383,7 @@ self.selectAllAct = E5Action( self.tr('Select All'), - UI.PixmapCache.getIcon("editSelectAll.png"), + UI.PixmapCache.getIcon("editSelectAll"), self.tr('&Select All'), QKeySequence(self.tr("Ctrl+A", "Edit|Select All")), 0, @@ -445,7 +445,7 @@ self.searchAct = E5Action( self.tr('Search'), - UI.PixmapCache.getIcon("find.png"), + UI.PixmapCache.getIcon("find"), self.tr('&Search...'), QKeySequence(self.tr("Ctrl+F", "Search|Search")), 0, @@ -461,7 +461,7 @@ self.searchNextAct = E5Action( self.tr('Search next'), - UI.PixmapCache.getIcon("findNext.png"), + UI.PixmapCache.getIcon("findNext"), self.tr('Search &next'), QKeySequence(self.tr("F3", "Search|Search next")), 0, @@ -478,7 +478,7 @@ self.searchPrevAct = E5Action( self.tr('Search previous'), - UI.PixmapCache.getIcon("findPrev.png"), + UI.PixmapCache.getIcon("findPrev"), self.tr('Search &previous'), QKeySequence(self.tr("Shift+F3", "Search|Search previous")), 0, @@ -512,7 +512,7 @@ self.gotoAct = E5Action( self.tr('Goto Offset'), - UI.PixmapCache.getIcon("goto.png"), + UI.PixmapCache.getIcon("goto"), self.tr('&Goto Offset...'), QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+G", "Search|Goto Offset")), @@ -575,7 +575,7 @@ self.whatsThisAct = E5Action( self.tr('What\'s This?'), - UI.PixmapCache.getIcon("whatsThis.png"), + UI.PixmapCache.getIcon("whatsThis"), self.tr('&What\'s This?'), QKeySequence(self.tr("Shift+F1", "Help|What's This?'")), 0, self, 'hexEditor_help_whats_this') @@ -597,7 +597,7 @@ """ self.prefAct = E5Action( self.tr('Preferences'), - UI.PixmapCache.getIcon("configure.png"), + UI.PixmapCache.getIcon("configure"), self.tr('&Preferences...'), 0, 0, self, 'hexEditor_settings_preferences') self.prefAct.setStatusTip(self.tr(
--- a/eric6/HexEdit/HexEditSearchReplaceWidget.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/HexEdit/HexEditSearchReplaceWidget.py Sat May 02 14:45:06 2020 +0200 @@ -66,19 +66,19 @@ self.__ui = Ui_HexEditSearchWidget() self.__ui.setupUi(self) - self.__ui.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) + self.__ui.closeButton.setIcon(UI.PixmapCache.getIcon("close")) self.__ui.findPrevButton.setIcon( - UI.PixmapCache.getIcon("1leftarrow.png")) + UI.PixmapCache.getIcon("1leftarrow")) self.__ui.findNextButton.setIcon( - UI.PixmapCache.getIcon("1rightarrow.png")) + UI.PixmapCache.getIcon("1rightarrow")) if replace: self.__ui.replaceButton.setIcon( - UI.PixmapCache.getIcon("editReplace.png")) + UI.PixmapCache.getIcon("editReplace")) self.__ui.replaceSearchButton.setIcon( - UI.PixmapCache.getIcon("editReplaceSearch.png")) + UI.PixmapCache.getIcon("editReplaceSearch")) self.__ui.replaceAllButton.setIcon( - UI.PixmapCache.getIcon("editReplaceAll.png")) + UI.PixmapCache.getIcon("editReplaceAll")) for dataFormat in formatOrder: formatStr, validator = self.__formatAndValidators[dataFormat]
--- a/eric6/IconEditor/IconEditorWindow.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/IconEditor/IconEditorWindow.py Sat May 02 14:45:06 2020 +0200 @@ -59,7 +59,7 @@ self.fromEric = fromEric self.initShortcutsOnly = initShortcutsOnly - self.setWindowIcon(UI.PixmapCache.getIcon("iconEditor.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("iconEditor")) if self.initShortcutsOnly: self.__initActions() @@ -193,7 +193,7 @@ """ self.newAct = E5Action( self.tr('New'), - UI.PixmapCache.getIcon("new.png"), + UI.PixmapCache.getIcon("new"), self.tr('&New'), QKeySequence(self.tr("Ctrl+N", "File|New")), 0, self, 'iconEditor_file_new') @@ -207,7 +207,7 @@ self.newWindowAct = E5Action( self.tr('New Window'), - UI.PixmapCache.getIcon("newWindow.png"), + UI.PixmapCache.getIcon("newWindow"), self.tr('New &Window'), 0, 0, self, 'iconEditor_file_new_window') self.newWindowAct.setStatusTip(self.tr( @@ -221,7 +221,7 @@ self.openAct = E5Action( self.tr('Open'), - UI.PixmapCache.getIcon("open.png"), + UI.PixmapCache.getIcon("open"), self.tr('&Open...'), QKeySequence(self.tr("Ctrl+O", "File|Open")), 0, self, 'iconEditor_file_open') @@ -236,7 +236,7 @@ self.saveAct = E5Action( self.tr('Save'), - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr('&Save'), QKeySequence(self.tr("Ctrl+S", "File|Save")), 0, self, 'iconEditor_file_save') @@ -250,7 +250,7 @@ self.saveAsAct = E5Action( self.tr('Save As'), - UI.PixmapCache.getIcon("fileSaveAs.png"), + UI.PixmapCache.getIcon("fileSaveAs"), self.tr('Save &As...'), QKeySequence(self.tr("Shift+Ctrl+S", "File|Save As")), 0, self, 'iconEditor_file_save_as') @@ -265,7 +265,7 @@ self.closeAct = E5Action( self.tr('Close'), - UI.PixmapCache.getIcon("close.png"), + UI.PixmapCache.getIcon("close"), self.tr('&Close'), QKeySequence(self.tr("Ctrl+W", "File|Close")), 0, self, 'iconEditor_file_close') @@ -306,7 +306,7 @@ self.exitAct = E5Action( self.tr('Quit'), - UI.PixmapCache.getIcon("exit.png"), + UI.PixmapCache.getIcon("exit"), self.tr('&Quit'), QKeySequence(self.tr("Ctrl+Q", "File|Quit")), 0, self, 'iconEditor_file_quit') @@ -325,7 +325,7 @@ """ self.undoAct = E5Action( self.tr('Undo'), - UI.PixmapCache.getIcon("editUndo.png"), + UI.PixmapCache.getIcon("editUndo"), self.tr('&Undo'), QKeySequence(self.tr("Ctrl+Z", "Edit|Undo")), QKeySequence(self.tr("Alt+Backspace", "Edit|Undo")), @@ -340,7 +340,7 @@ self.redoAct = E5Action( self.tr('Redo'), - UI.PixmapCache.getIcon("editRedo.png"), + UI.PixmapCache.getIcon("editRedo"), self.tr('&Redo'), QKeySequence(self.tr("Ctrl+Shift+Z", "Edit|Redo")), 0, self, 'iconEditor_edit_redo') @@ -354,7 +354,7 @@ self.cutAct = E5Action( self.tr('Cut'), - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr('Cu&t'), QKeySequence(self.tr("Ctrl+X", "Edit|Cut")), QKeySequence(self.tr("Shift+Del", "Edit|Cut")), @@ -369,7 +369,7 @@ self.copyAct = E5Action( self.tr('Copy'), - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr('&Copy'), QKeySequence(self.tr("Ctrl+C", "Edit|Copy")), QKeySequence(self.tr("Ctrl+Ins", "Edit|Copy")), @@ -384,7 +384,7 @@ self.pasteAct = E5Action( self.tr('Paste'), - UI.PixmapCache.getIcon("editPaste.png"), + UI.PixmapCache.getIcon("editPaste"), self.tr('&Paste'), QKeySequence(self.tr("Ctrl+V", "Edit|Paste")), QKeySequence(self.tr("Shift+Ins", "Edit|Paste")), @@ -412,7 +412,7 @@ self.deleteAct = E5Action( self.tr('Clear'), - UI.PixmapCache.getIcon("editDelete.png"), + UI.PixmapCache.getIcon("editDelete"), self.tr('Cl&ear'), QKeySequence(self.tr("Alt+Shift+C", "Edit|Clear")), 0, @@ -443,7 +443,7 @@ self.resizeAct = E5Action( self.tr('Change Size'), - UI.PixmapCache.getIcon("transformResize.png"), + UI.PixmapCache.getIcon("transformResize"), self.tr('Change Si&ze...'), 0, 0, self, 'iconEditor_edit_change_size') @@ -457,7 +457,7 @@ self.grayscaleAct = E5Action( self.tr('Grayscale'), - UI.PixmapCache.getIcon("grayscale.png"), + UI.PixmapCache.getIcon("grayscale"), self.tr('&Grayscale'), 0, 0, self, 'iconEditor_edit_grayscale') @@ -494,7 +494,7 @@ """ self.zoomInAct = E5Action( self.tr('Zoom in'), - UI.PixmapCache.getIcon("zoomIn.png"), + UI.PixmapCache.getIcon("zoomIn"), self.tr('Zoom &in'), QKeySequence(self.tr("Ctrl++", "View|Zoom in")), 0, self, 'iconEditor_view_zoom_in') @@ -508,7 +508,7 @@ self.zoomOutAct = E5Action( self.tr('Zoom out'), - UI.PixmapCache.getIcon("zoomOut.png"), + UI.PixmapCache.getIcon("zoomOut"), self.tr('Zoom &out'), QKeySequence(self.tr("Ctrl+-", "View|Zoom out")), 0, self, 'iconEditor_view_zoom_out') @@ -522,7 +522,7 @@ self.zoomResetAct = E5Action( self.tr('Zoom reset'), - UI.PixmapCache.getIcon("zoomReset.png"), + UI.PixmapCache.getIcon("zoomReset"), self.tr('Zoom &reset'), QKeySequence(self.tr("Ctrl+0", "View|Zoom reset")), 0, self, 'iconEditor_view_zoom_reset') @@ -538,7 +538,7 @@ self.showGridAct = E5Action( self.tr('Show Grid'), - UI.PixmapCache.getIcon("grid.png"), + UI.PixmapCache.getIcon("grid"), self.tr('Show &Grid'), 0, 0, self, 'iconEditor_view_show_grid') @@ -565,7 +565,7 @@ self.drawPencilAct = E5Action( self.tr('Freehand'), - UI.PixmapCache.getIcon("drawBrush.png"), + UI.PixmapCache.getIcon("drawBrush"), self.tr('&Freehand'), 0, 0, self.drawingActGrp, 'iconEditor_tools_pencil') @@ -580,7 +580,7 @@ self.drawColorPickerAct = E5Action( self.tr('Color Picker'), - UI.PixmapCache.getIcon("colorPicker.png"), + UI.PixmapCache.getIcon("colorPicker"), self.tr('&Color Picker'), 0, 0, self.drawingActGrp, 'iconEditor_tools_color_picker') @@ -597,7 +597,7 @@ self.drawRectangleAct = E5Action( self.tr('Rectangle'), - UI.PixmapCache.getIcon("drawRectangle.png"), + UI.PixmapCache.getIcon("drawRectangle"), self.tr('&Rectangle'), 0, 0, self.drawingActGrp, 'iconEditor_tools_rectangle') @@ -612,7 +612,7 @@ self.drawFilledRectangleAct = E5Action( self.tr('Filled Rectangle'), - UI.PixmapCache.getIcon("drawRectangleFilled.png"), + UI.PixmapCache.getIcon("drawRectangleFilled"), self.tr('F&illed Rectangle'), 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_rectangle') @@ -628,7 +628,7 @@ self.drawCircleAct = E5Action( self.tr('Circle'), - UI.PixmapCache.getIcon("drawCircle.png"), + UI.PixmapCache.getIcon("drawCircle"), self.tr('Circle'), 0, 0, self.drawingActGrp, 'iconEditor_tools_circle') @@ -643,7 +643,7 @@ self.drawFilledCircleAct = E5Action( self.tr('Filled Circle'), - UI.PixmapCache.getIcon("drawCircleFilled.png"), + UI.PixmapCache.getIcon("drawCircleFilled"), self.tr('Fille&d Circle'), 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_circle') @@ -659,7 +659,7 @@ self.drawEllipseAct = E5Action( self.tr('Ellipse'), - UI.PixmapCache.getIcon("drawEllipse.png"), + UI.PixmapCache.getIcon("drawEllipse"), self.tr('&Ellipse'), 0, 0, self.drawingActGrp, 'iconEditor_tools_ellipse') @@ -674,7 +674,7 @@ self.drawFilledEllipseAct = E5Action( self.tr('Filled Ellipse'), - UI.PixmapCache.getIcon("drawEllipseFilled.png"), + UI.PixmapCache.getIcon("drawEllipseFilled"), self.tr('Fille&d Elli&pse'), 0, 0, self.drawingActGrp, 'iconEditor_tools_filled_ellipse') @@ -690,7 +690,7 @@ self.drawFloodFillAct = E5Action( self.tr('Flood Fill'), - UI.PixmapCache.getIcon("drawFill.png"), + UI.PixmapCache.getIcon("drawFill"), self.tr('Fl&ood Fill'), 0, 0, self.drawingActGrp, 'iconEditor_tools_flood_fill') @@ -706,7 +706,7 @@ self.drawLineAct = E5Action( self.tr('Line'), - UI.PixmapCache.getIcon("drawLine.png"), + UI.PixmapCache.getIcon("drawLine"), self.tr('&Line'), 0, 0, self.drawingActGrp, 'iconEditor_tools_line') @@ -721,7 +721,7 @@ self.drawEraserAct = E5Action( self.tr('Eraser (Transparent)'), - UI.PixmapCache.getIcon("drawEraser.png"), + UI.PixmapCache.getIcon("drawEraser"), self.tr('Eraser (&Transparent)'), 0, 0, self.drawingActGrp, 'iconEditor_tools_eraser') @@ -736,7 +736,7 @@ self.drawRectangleSelectionAct = E5Action( self.tr('Rectangular Selection'), - UI.PixmapCache.getIcon("selectRectangle.png"), + UI.PixmapCache.getIcon("selectRectangle"), self.tr('Rect&angular Selection'), 0, 0, self.drawingActGrp, 'iconEditor_tools_selection_rectangle') @@ -753,7 +753,7 @@ self.drawCircleSelectionAct = E5Action( self.tr('Circular Selection'), - UI.PixmapCache.getIcon("selectCircle.png"), + UI.PixmapCache.getIcon("selectCircle"), self.tr('Rect&angular Selection'), 0, 0, self.drawingActGrp, 'iconEditor_tools_selection_circle') @@ -801,7 +801,7 @@ self.whatsThisAct = E5Action( self.tr('What\'s This?'), - UI.PixmapCache.getIcon("whatsThis.png"), + UI.PixmapCache.getIcon("whatsThis"), self.tr('&What\'s This?'), QKeySequence(self.tr("Shift+F1", "Help|What's This?'")), 0, self, 'iconEditor_help_whats_this') @@ -971,9 +971,9 @@ self.__updatePosition(0, 0) self.__zoomWidget = E5ZoomWidget( - UI.PixmapCache.getPixmap("zoomOut.png"), - UI.PixmapCache.getPixmap("zoomIn.png"), - UI.PixmapCache.getPixmap("zoomReset.png"), self) + UI.PixmapCache.getPixmap("zoomOut"), + UI.PixmapCache.getPixmap("zoomIn"), + UI.PixmapCache.getPixmap("zoomReset"), self) self.__zoomWidget.setMinimum(IconEditorGrid.ZoomMinimum) self.__zoomWidget.setMaximum(IconEditorGrid.ZoomMaximum) self.__zoomWidget.setDefault(IconEditorGrid.ZoomDefault)
--- a/eric6/MicroPython/MicroPythonDevices.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/MicroPython/MicroPythonDevices.py Sat May 02 14:45:06 2020 +0200 @@ -55,6 +55,14 @@ "icon": "microbitDevice", }, + "calliope": { + "ids": [ + (0x0D28, 0x0204), # Calliope mini + ], + "description": "Calliope mini", + "icon": "calliope_mini", + }, + "pyboard": { "ids": [ (0xF055, 0x9800), # Pyboard in CDC mode @@ -63,7 +71,7 @@ ], "description": "PyBoard", "icon": "micropython48", - } + }, } @@ -103,7 +111,6 @@ foundDevices.append( (board, SupportedBoards[board]["description"], port.portName())) - break else: logging.debug("Unknown device: (0x%04x:0x%04x)", vid, pid) @@ -151,9 +158,9 @@ elif deviceType == "circuitpython": from .CircuitPythonDevices import CircuitPythonDevice return CircuitPythonDevice(microPythonWidget) - elif deviceType == "bbc_microbit": + elif deviceType in ("bbc_microbit", "calliope"): from .MicrobitDevices import MicrobitDevice - return MicrobitDevice(microPythonWidget) + return MicrobitDevice(microPythonWidget, deviceType) elif deviceType == "pyboard": from .PyBoardDevices import PyBoardDevice return PyBoardDevice(microPythonWidget)
--- a/eric6/MicroPython/MicroPythonGraphWidget.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/MicroPython/MicroPythonGraphWidget.py Sat May 02 14:45:06 2020 +0200 @@ -23,6 +23,7 @@ from PyQt5.QtChart import QChartView, QChart, QLineSeries, QValueAxis from E5Gui import E5MessageBox +from E5Gui.E5Application import e5App import UI.PixmapCache import Preferences @@ -113,9 +114,26 @@ self.__chart.setAxisY(self.__axisY, self.__series[0]) self.__chartView.setChart(self.__chart) self.__chartView.setRenderHint(QPainter.Antialiasing) + self.preferencesChanged() self.__maxXSpinBox.valueChanged.connect(self.__handleMaxXChanged) + @pyqtSlot() + def preferencesChanged(self): + """ + Public slot to apply changed preferences. + """ + chartColorTheme = Preferences.getMicroPython("ChartColorTheme") + if chartColorTheme == -1: + # automatic selection of light or dark depending on desktop + # color scheme + if e5App().usesDarkPalette(): + self.__chart.setTheme(QChart.ChartThemeDark) + else: + self.__chart.setTheme(QChart.ChartThemeLight) + else: + self.__chart.setTheme(chartColorTheme) + @pyqtSlot(bytes) def processData(self, data): """
--- a/eric6/MicroPython/MicroPythonWidget.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/MicroPython/MicroPythonWidget.py Sat May 02 14:45:06 2020 +0200 @@ -136,6 +136,42 @@ 16: QBrush(QColor(0, 255, 255)), 17: QBrush(QColor(255, 255, 255)), }, + "Ubuntu (dark)": { + 0: QBrush(QColor(96, 96, 96)), + 1: QBrush(QColor(235, 58, 45)), + 2: QBrush(QColor(57, 181, 74)), + 3: QBrush(QColor(255, 199, 29)), + 4: QBrush(QColor(25, 56, 230)), + 5: QBrush(QColor(200, 64, 193)), + 6: QBrush(QColor(48, 200, 255)), + 7: QBrush(QColor(204, 204, 204)), + 10: QBrush(QColor(128, 128, 128)), + 11: QBrush(QColor(255, 0, 0)), + 12: QBrush(QColor(0, 255, 0)), + 13: QBrush(QColor(255, 255, 0)), + 14: QBrush(QColor(0, 0, 255)), + 15: QBrush(QColor(255, 0, 255)), + 16: QBrush(QColor(0, 255, 255)), + 17: QBrush(QColor(255, 255, 255)), + }, + "Breeze (dark)": { + 0: QBrush(QColor(35, 38, 39)), + 1: QBrush(QColor(237, 21, 21)), + 2: QBrush(QColor(17, 209, 22)), + 3: QBrush(QColor(246, 116, 0)), + 4: QBrush(QColor(29, 153, 243)), + 5: QBrush(QColor(155, 89, 182)), + 6: QBrush(QColor(26, 188, 156)), + 7: QBrush(QColor(252, 252, 252)), + 10: QBrush(QColor(127, 140, 141)), + 11: QBrush(QColor(192, 57, 43)), + 12: QBrush(QColor(28, 220, 154)), + 13: QBrush(QColor(253, 188, 75)), + 14: QBrush(QColor(61, 174, 233)), + 15: QBrush(QColor(142, 68, 173)), + 16: QBrush(QColor(22, 160, 133)), + 17: QBrush(QColor(255, 255, 255)), + }, } @@ -213,6 +249,7 @@ self.__currentZoom = 0 self.__fileManagerWidget = None + self.__chartWidget = None if HAS_QTSERIALPORT: self.__interface = MicroPythonCommandsInterface(self) @@ -303,6 +340,9 @@ self.replEdit.setLineWrapMode(QTextEdit.WidgetWidth) else: self.replEdit.setLineWrapMode(QTextEdit.NoWrap) + + if self.__chartWidget is not None: + self.__chartWidget.preferencesChanged() def commandsInterface(self): """ @@ -370,7 +410,7 @@ if "files" in kwargs: self.filesButton.setEnabled(kwargs["files"]) if "chart" in kwargs: - self.chartButton.setEnabled(kwargs["chart"]) + self.chartButton.setEnabled(kwargs["chart"] and HAS_QTCHART) @pyqtSlot(QPoint) def __showContextMenu(self, pos):
--- a/eric6/MicroPython/MicrobitDevices.py Sat May 02 14:35:03 2020 +0200 +++ b/eric6/MicroPython/MicrobitDevices.py Sat May 02 14:45:06 2020 +0200 @@ -4,7 +4,8 @@ # """ -Module implementing the device interface class for BBC micro:bit boards. +Module implementing the device interface class for BBC micro:bit and +Calliope mini boards. """ @@ -26,18 +27,22 @@ class MicrobitDevice(MicroPythonDevice): """ - Class implementing the device for BBC micro:bit boards. + Class implementing the device for BBC micro:bit and Calliope mini boards. """ - def __init__(self, microPythonWidget, parent=None): + def __init__(self, microPythonWidget, deviceType, parent=None): """ Constructor @param microPythonWidget reference to the main MicroPython widget @type MicroPythonWidget + @param deviceType type of the device + @type str @param parent reference to the parent object @type QObject """ super(MicrobitDevice, self).__init__(microPythonWidget, parent) + + self.__deviceType = deviceType def setButtons(self): """ @@ -64,7 +69,12 @@ @return name of the device @rtype str """ - return self.tr("BBC micro:bit") + if self.__deviceType == "bbc_microbit": + # BBC micro:bit + return self.tr("BBC micro:bit") + else: + # Calliope mini + return self.tr("Calliope mini") def canStartRepl(self): """ @@ -124,8 +134,13 @@ @rtype str """ # Attempts to find the path on the filesystem that represents the - # plugged in MICROBIT board. - deviceDirectory = Utilities.findVolume(
