Sat, 02 May 2020 13:51:07 +0200
Merged with default branch to prepare new release.
--- a/docs/THANKS Sun Apr 05 18:17:08 2020 +0200 +++ b/docs/THANKS Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/docs/changelog Sat May 02 13:51:07 2020 +0200 @@ -1,5 +1,12 @@ 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 @@ -10,7 +17,7 @@ - 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6.e4p Sat May 02 13:51:07 2020 +0200 @@ -128,6 +128,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> @@ -960,6 +961,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> @@ -995,6 +997,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> @@ -1007,6 +1011,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> @@ -1029,15 +1034,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> @@ -1063,10 +1071,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> @@ -1081,6 +1091,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> @@ -1089,23 +1100,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> @@ -1113,14 +1131,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> @@ -1141,6 +1163,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> @@ -1153,7 +1176,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> @@ -2049,6 +2074,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> @@ -2080,68 +2106,78 @@ <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/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> @@ -2176,7 +2212,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 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/APIs/MicroPython/circuitpython.api Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/APIs/MicroPython/microbit.api Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/APIs/Python3/eric6.api Sat May 02 13:51:07 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() @@ -1371,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() @@ -1836,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 @@ -1856,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() @@ -1874,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) @@ -1888,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) @@ -1962,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() @@ -2365,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) @@ -2414,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) @@ -3825,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() @@ -6250,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() @@ -6875,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() @@ -6976,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) @@ -8430,6 +8454,7 @@ 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(application) eric6.Toolbox.Startup.loadTranslatorForLocale?4(dirs, tn) @@ -8667,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) @@ -8847,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
--- a/eric6/APIs/Python3/eric6.bas Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/APIs/Python3/eric6.bas Sat May 02 13:51:07 2020 +0200 @@ -161,6 +161,7 @@ DummyThreadWrapper ThreadWrapper module._DummyThread DuplicateParamError Exception E5Action QAction +E5AnimatedLabel QLabel E5AnimatedWidget QWidget E5Application QApplication E5ArrowItem QAbstractGraphicsShapeItem
--- a/eric6/Cooperation/ChatWidget.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Cooperation/ChatWidget.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/DebugClients/Python/DebugClientBase.py Sat May 02 13:51:07 2020 +0200 @@ -44,13 +44,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) @@ -58,20 +62,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: @@ -93,11 +98,11 @@ else: try: DebugClientOrigInput = __builtins__.__dict__['input'] - __builtins__.__dict__['input'] = DebugClientInput + __builtins__.__dict__['input'] = DebugClientRawInput except (AttributeError, KeyError): import __main__ DebugClientOrigInput = __main__.__builtins__.__dict__['input'] - __main__.__builtins__.__dict__['input'] = DebugClientInput + __main__.__builtins__.__dict__['input'] = DebugClientRawInput ###############################################################################
--- a/eric6/DebugClients/Python/getpass.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/DebugClients/Python/getpass.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Debugger/CallTraceViewer.py Sat May 02 13:51:07 2020 +0200 @@ -43,16 +43,16 @@ self.__dbs = debugServer 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 = [] @@ -242,9 +242,9 @@ @param toFunction name of the target function (string) """ 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Debugger/DebugUI.py Sat May 02 13:51:07 2020 +0200 @@ -174,7 +174,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')) @@ -189,7 +189,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')) @@ -205,7 +205,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( @@ -221,7 +221,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( @@ -238,7 +238,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( @@ -251,7 +251,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( @@ -267,7 +267,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')) @@ -283,7 +283,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( @@ -300,7 +300,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')) @@ -316,7 +316,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.""")) @@ -331,7 +331,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( @@ -347,7 +347,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( @@ -363,7 +363,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( @@ -383,7 +383,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')) @@ -399,7 +399,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( @@ -418,7 +418,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( @@ -437,7 +437,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')) @@ -502,7 +502,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') @@ -517,7 +517,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') @@ -532,7 +532,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, @@ -547,7 +547,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")), @@ -1069,7 +1069,7 @@ os.path.basename(self.ui.currentProg), status, info) self.ui.showNotification( - UI.PixmapCache.getPixmap("debug48.png"), + UI.PixmapCache.getPixmap("debug48"), self.tr("Program terminated"), msg) else: if self.ui.currentProg is None:
--- a/eric6/Debugger/DebugViewer.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Debugger/DebugViewer.py Sat May 02 13:51:07 2020 +0200 @@ -62,7 +62,7 @@ self.debugServer = debugServer self.debugUI = None - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.__mainLayout = QVBoxLayout() self.__mainLayout.setContentsMargins(0, 0, 0, 0) @@ -105,7 +105,7 @@ index = self.__tabWidget.addTab( self.glvWidget, - UI.PixmapCache.getIcon("globalVariables.png"), '') + UI.PixmapCache.getIcon("globalVariables"), '') self.__tabWidget.setTabToolTip(index, self.globalsViewer.windowTitle()) self.setGlobalsFilterButton.clicked.connect( @@ -159,7 +159,7 @@ index = self.__tabWidget.addTab( self.lvWidget, - UI.PixmapCache.getIcon("localVariables.png"), '') + UI.PixmapCache.getIcon("localVariables"), '') self.__tabWidget.setTabToolTip(index, self.localsViewer.windowTitle()) self.sourceButton.clicked.connect(self.__showSource) @@ -189,7 +189,7 @@ self.callTraceViewer = CallTraceViewer(self.debugServer) index = self.__tabWidget.addTab( self.callTraceViewer, - UI.PixmapCache.getIcon("callTrace.png"), "") + UI.PixmapCache.getIcon("callTrace"), "") self.__tabWidget.setTabToolTip( index, self.callTraceViewer.windowTitle()) self.callTraceViewer.sourceFile.connect(self.sourceFile) @@ -200,7 +200,7 @@ self.breakpointViewer.setModel(self.debugServer.getBreakPointModel()) index = self.__tabWidget.addTab( self.breakpointViewer, - UI.PixmapCache.getIcon("breakpoints.png"), '') + UI.PixmapCache.getIcon("breakpoints"), '') self.__tabWidget.setTabToolTip( index, self.breakpointViewer.windowTitle()) self.breakpointViewer.sourceFile.connect(self.sourceFile) @@ -211,7 +211,7 @@ self.watchpointViewer.setModel(self.debugServer.getWatchPointModel()) index = self.__tabWidget.addTab( self.watchpointViewer, - UI.PixmapCache.getIcon("watchpoints.png"), '') + UI.PixmapCache.getIcon("watchpoints"), '') self.__tabWidget.setTabToolTip( index, self.watchpointViewer.windowTitle()) @@ -220,7 +220,7 @@ self.exceptionLogger = ExceptionLogger() index = self.__tabWidget.addTab( self.exceptionLogger, - UI.PixmapCache.getIcon("exceptions.png"), '') + UI.PixmapCache.getIcon("exceptions"), '') self.__tabWidget.setTabToolTip( index, self.exceptionLogger.windowTitle())
--- a/eric6/Debugger/ExceptionLogger.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Debugger/ExceptionLogger.py Sat May 02 13:51:07 2020 +0200 @@ -103,9 +103,12 @@ return if exceptionMessage == '': - itm.setText(0, "{0}".format(exceptionType)) + text = "{0}".format(exceptionType) else: - itm.setText(0, "{0}, {1}".format(exceptionType, exceptionMessage)) + text = "{0}, {1}".format(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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Help/source.qhp Sat May 02 13:51:07 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" /> @@ -3777,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" /> @@ -3919,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" /> @@ -8468,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" /> @@ -9666,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" /> @@ -11062,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" /> @@ -11235,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" /> @@ -11351,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__" /> @@ -17205,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" /> @@ -17860,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>
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.DebugClients.Python.getpass.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html Sat May 02 13:51:07 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 13:51:07 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.E5TabWidget.html Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.E5Gui.E5TabWidget.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.AssociationItem.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.ClassItem.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.ModuleItem.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.PackageItem.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Graphics.UMLItem.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.MicroPython.MicroPythonGraphWidget.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.MicroPython.MicrobitDevices.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.UiExtensionPlugins.Translator.Translator.html Sat May 02 13:51:07 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.Preferences.ConfigurationPages.IconsPage.html Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPage.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html Sat May 02 13:51:07 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
--- a/eric6/Documentation/Source/eric6.Project.Project.html Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Project.Project.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Project.ProjectBrowserModel.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.QScintilla.Exporters.ExporterHTML.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.Toolbox.Startup.html Sat May 02 13:51:07 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>)
--- a/eric6/Documentation/Source/eric6.UI.CodeDocumentationViewer.html Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.UI.CodeDocumentationViewer.html Sat May 02 13:51:07 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.Previewers.PreviewerHTMLStyles.html Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.UI.Previewers.PreviewerHTMLStyles.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/eric6.WebBrowser.Sync.SyncCheckPage.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/index-eric6.E5Gui.html Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Documentation/Source/index-eric6.MicroPython.html Sat May 02 13:51:07 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/E5Graphics/E5ArrowItem.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Graphics/E5ArrowItem.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Graphics/E5GraphicsView.py Sat May 02 13:51:07 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 13:51:07 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/E5LineEdit.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Gui/E5LineEdit.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Gui/E5ModelMenu.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Gui/E5PathPicker.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Gui/E5SideBar.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Gui/E5TabWidget.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Gui/E5TextEditSearchWidget.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Gui/E5ToolBarDialog.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Network/E5NetworkIcon.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Network/E5SslCertificateSelectionDialog.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Network/E5SslCertificatesDialog.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/E5Network/E5SslInfoWidget.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/ApplicationDiagramBuilder.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/AssociationItem.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/ClassItem.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/ImportsDiagramBuilder.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/ModuleItem.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/PackageDiagramBuilder.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/PackageItem.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/PixmapDiagram.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/SvgDiagram.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/UMLClassDiagramBuilder.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/UMLDialog.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/UMLGraphicsView.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Graphics/UMLItem.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/HexEdit/HexEditGotoWidget.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/HexEdit/HexEditMainWindow.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/HexEdit/HexEditSearchReplaceWidget.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/IconEditor/IconEditorWindow.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/MicroPython/MicroPythonDevices.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/MicroPython/MicroPythonGraphWidget.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/MicroPython/MicroPythonWidget.py Sat May 02 13:51:07 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 Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/MicroPython/MicrobitDevices.py Sat May 02 13:51:07 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("MICROBIT") + # plugged in MICROBIT or MINI board. + if self.__deviceType == "bbc_microbit": + # BBC micro:bit + deviceDirectory = Utilities.findVolume("MICROBIT") + else: + # Calliope mini + deviceDirectory = Utilities.findVolume("MINI") if deviceDirectory: return deviceDirectory @@ -134,9 +149,9 @@ E5MessageBox.warning( self.microPython, self.tr("Workspace Directory"), - self.tr("Could not find an attached BBC micro:bit.\n\n" + self.tr("Could not find an attached {0}.\n\n" "Please make sure the device is plugged " - "into this computer.")) + "into this computer.").format(self.deviceName())) return super(MicrobitDevice, self).getWorkspace() @@ -174,7 +189,8 @@ "Save the current script as 'main.py' on the connected device")) act.setEnabled(connected) menu.addSeparator() - act = menu.addAction(self.tr("Reset micro:bit"), self.__resetDevice) + act = menu.addAction(self.tr("Reset {0}").format(self.deviceName()), + self.__resetDevice) act.setEnabled(connected) @pyqtSlot() @@ -183,18 +199,42 @@ Private slot to flash the default MicroPython firmware to the device. """ # Attempts to find the path on the filesystem that represents the - # plugged in micro:bit board in maintenance mode. - deviceDirectory = Utilities.findVolume("MAINTENANCE") + # plugged in micro:bit board in maintenance mode or Calliope mini + # board in standard mode. + if self.__deviceType == "bbc_microbit": + # BBC micro:bit + deviceDirectory = Utilities.findVolume("MAINTENANCE") + else: + # Calliope mini + deviceDirectory = Utilities.findVolume("MINI") if not deviceDirectory: - # BBC micro:bit is not ready or not mounted - E5MessageBox.critical( - self.microPython, - self.tr("Flash MicroPython Firmware"), - self.tr( - 'The BBC micro:bit is not ready for flashing. See the' - ' <a href="https://microbit.org/guide/firmware/">' - 'micro:bit web site</a> for details.' - )) + if self.__deviceType == "bbc_microbit": + # BBC micro:bit is not ready or not mounted + E5MessageBox.critical( + self.microPython, + self.tr("Flash MicroPython Firmware"), + self.tr( + '<p>The BBC micro:bit is not ready for flashing.' + ' Follow these instructions.</p>' + '<ul>' + '<li>unplug USB cable and any batteries</li>' + '<li>keep RESET button pressed an plug USB cable back' + ' in</li>' + '<li>a drive called MAINTENANCE should be available' + '</li>' + '</ul>' + '<p>See the ' + '<a href="https://microbit.org/guide/firmware/">' + 'micro:bit web site</a> for details.</p>' + )) + else: + # Calliope mini is not ready or not mounted + E5MessageBox.warning( + self.microPython, + self.tr("Flash MicroPython Firmware"), + self.tr("Could not find an attached {0}.\n\n" + "Please make sure the device is plugged " + "into this computer.").format(self.deviceName())) else: downloadsPath = QStandardPaths.standardLocations( QStandardPaths.DownloadLocation)[0] @@ -286,10 +326,18 @@ """ Private slot to reset the connected device. """ - self.microPython.commandsInterface().execute([ - "import microbit", - "microbit.reset()", - ]) + if self.__deviceType == "bbc_microbit": + # BBC micro:bit + self.microPython.commandsInterface().execute([ + "import microbit", + "microbit.reset()", + ]) + else: + # Calliope mini + self.microPython.commandsInterface().execute([ + "import calliope_mini", + "calliope_mini.reset()", + ]) def getDocumentationUrl(self): """ @@ -298,7 +346,12 @@ @return documentation URL of the device @rtype str """ - return Preferences.getMicroPython("MicrobitDocuUrl") + if self.__deviceType == "bbc_microbit": + # BBC micro:bit + return Preferences.getMicroPython("MicrobitDocuUrl") + else: + # Calliope mini + return Preferences.getMicroPython("CalliopeDocuUrl") def getFirmwareUrl(self): """ @@ -307,4 +360,9 @@ @return firmware download URL of the device @rtype str """ - return Preferences.getMicroPython("MicrobitFirmwareUrl") + if self.__deviceType == "bbc_microbit": + # BBC micro:bit + return Preferences.getMicroPython("MicrobitFirmwareUrl") + else: + # Calliope mini + return Preferences.getMicroPython("CalliopeFirmwareUrl")
--- a/eric6/MultiProject/MultiProject.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/MultiProject/MultiProject.py Sat May 02 13:51:07 2020 +0200 @@ -702,7 +702,7 @@ act = E5Action( self.tr('New multiproject'), - UI.PixmapCache.getIcon("multiProjectNew.png"), + UI.PixmapCache.getIcon("multiProjectNew"), self.tr('&New...'), 0, 0, self.actGrp1, 'multi_project_new') act.setStatusTip(self.tr('Generate a new multiproject')) @@ -716,7 +716,7 @@ act = E5Action( self.tr('Open multiproject'), - UI.PixmapCache.getIcon("multiProjectOpen.png"), + UI.PixmapCache.getIcon("multiProjectOpen"), self.tr('&Open...'), 0, 0, self.actGrp1, 'multi_project_open') act.setStatusTip(self.tr('Open an existing multiproject')) @@ -729,7 +729,7 @@ self.closeAct = E5Action( self.tr('Close multiproject'), - UI.PixmapCache.getIcon("multiProjectClose.png"), + UI.PixmapCache.getIcon("multiProjectClose"), self.tr('&Close'), 0, 0, self, 'multi_project_close') self.closeAct.setStatusTip(self.tr( 'Close the current multiproject')) @@ -742,7 +742,7 @@ self.saveAct = E5Action( self.tr('Save multiproject'), - UI.PixmapCache.getIcon("multiProjectSave.png"), + UI.PixmapCache.getIcon("multiProjectSave"), self.tr('&Save'), 0, 0, self, 'multi_project_save') self.saveAct.setStatusTip(self.tr('Save the current multiproject')) self.saveAct.setWhatsThis(self.tr( @@ -754,7 +754,7 @@ self.saveasAct = E5Action( self.tr('Save multiproject as'), - UI.PixmapCache.getIcon("multiProjectSaveAs.png"), + UI.PixmapCache.getIcon("multiProjectSaveAs"), self.tr('Save &as...'), 0, 0, self, 'multi_project_save_as') self.saveasAct.setStatusTip(self.tr( @@ -768,7 +768,7 @@ self.addProjectAct = E5Action( self.tr('Add project to multiproject'), - UI.PixmapCache.getIcon("fileProject.png"), + UI.PixmapCache.getIcon("fileProject"), self.tr('Add &project...'), 0, 0, self, 'multi_project_add_project') self.addProjectAct.setStatusTip(self.tr( @@ -783,7 +783,7 @@ self.propsAct = E5Action( self.tr('Multiproject properties'), - UI.PixmapCache.getIcon("multiProjectProps.png"), + UI.PixmapCache.getIcon("multiProjectProps"), self.tr('&Properties...'), 0, 0, self, 'multi_project_properties') self.propsAct.setStatusTip(self.tr(
--- a/eric6/MultiProject/MultiProjectBrowser.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/MultiProject/MultiProjectBrowser.py Sat May 02 13:51:07 2020 +0200 @@ -42,7 +42,7 @@ self.multiProject = multiProject self.project = project - self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) + self.setWindowIcon(UI.PixmapCache.getIcon("eric")) self.setAlternatingRowColors(True) self.setHeaderHidden(True) self.setItemsExpandable(False) @@ -252,9 +252,9 @@ """ itm.setText(0, project['name']) if project['master']: - itm.setIcon(0, UI.PixmapCache.getIcon("masterProject.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("masterProject")) else: - itm.setIcon(0, UI.PixmapCache.getIcon("empty.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("empty")) itm.setToolTip(0, project['file']) itm.setData(0, MultiProjectBrowser.ProjectFileNameRole, project['file'])
--- a/eric6/Network/IRC/IrcChannelWidget.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Network/IRC/IrcChannelWidget.py Sat May 02 13:51:07 2020 +0200 @@ -129,17 +129,17 @@ """ # step 1: determine the icon if self.__privilege & IrcUserItem.Voice: - icon = UI.PixmapCache.getIcon("ircVoice.png") + icon = UI.PixmapCache.getIcon("ircVoice") elif self.__privilege & IrcUserItem.Owner: - icon = UI.PixmapCache.getIcon("ircOwner.png") + icon = UI.PixmapCache.getIcon("ircOwner") elif self.__privilege & IrcUserItem.Operator: - icon = UI.PixmapCache.getIcon("ircOp.png") + icon = UI.PixmapCache.getIcon("ircOp") elif self.__privilege & IrcUserItem.Halfop: - icon = UI.PixmapCache.getIcon("ircHalfop.png") + icon = UI.PixmapCache.getIcon("ircHalfop") elif self.__privilege & IrcUserItem.Admin: - icon = UI.PixmapCache.getIcon("ircAdmin.png") + icon = UI.PixmapCache.getIcon("ircAdmin") else: - icon = UI.PixmapCache.getIcon("ircNormal.png") + icon = UI.PixmapCache.getIcon("ircNormal") if self.__privilege & IrcUserItem.Away: icon = self.__awayIcon(icon) @@ -154,7 +154,7 @@ @return away icon (QIcon) """ pix1 = icon.pixmap(16, 16) - pix2 = UI.PixmapCache.getPixmap("ircAway.png") + pix2 = UI.PixmapCache.getPixmap("ircAway") painter = QPainter(pix1) painter.drawPixmap(0, 0, pix2) painter.end() @@ -259,7 +259,7 @@ self.__ircWidget = parent self.editTopicButton.setIcon( - UI.PixmapCache.getIcon("ircEditTopic.png")) + UI.PixmapCache.getIcon("ircEditTopic")) self.editTopicButton.hide() height = self.usersList.height() + self.messages.height() @@ -686,14 +686,14 @@ if Preferences.getIrc("ShowNotifications"): if Preferences.getIrc("NotifyMessage"): self.__ui.showNotification( - UI.PixmapCache.getPixmap("irc48.png"), + UI.PixmapCache.getPixmap("irc48"), self.tr("Channel Message"), msg) elif ( Preferences.getIrc("NotifyNick") and self.__userName.lower() in msg.lower() ): self.__ui.showNotification( - UI.PixmapCache.getPixmap("irc48.png"), + UI.PixmapCache.getPixmap("irc48"), self.tr("Nick mentioned"), msg) def addUsers(self, users): @@ -733,7 +733,7 @@ Preferences.getIrc("NotifyJoinPart") ): self.__ui.showNotification( - UI.PixmapCache.getPixmap("irc48.png"), + UI.PixmapCache.getPixmap("irc48"), self.tr("Join Channel"), msg) return True @@ -768,7 +768,7 @@ Preferences.getIrc("NotifyJoinPart") ): self.__ui.showNotification( - UI.PixmapCache.getPixmap("irc48.png"), + UI.PixmapCache.getPixmap("irc48"), self.tr("Leave Channel"), nmsg) return True @@ -800,7 +800,7 @@ Preferences.getIrc("NotifyJoinPart") ): self.__ui.showNotification( - UI.PixmapCache.getPixmap("irc48.png"), + UI.PixmapCache.getPixmap("irc48"), self.tr("Quit"), msg) # always return False for other channels and server to process @@ -1417,22 +1417,22 @@ """ self.__messagesMenu = QMenu(self) self.__copyMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr("Copy"), self.__copyMessages) self.__messagesMenu.addSeparator() self.__cutAllMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr("Cut all"), self.__cutAllMessages) self.__copyAllMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr("Copy all"), self.__copyAllMessages) self.__messagesMenu.addSeparator() self.__clearMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("editDelete.png"), + UI.PixmapCache.getIcon("editDelete"), self.tr("Clear"), self.__clearMessages) self.__messagesMenu.addSeparator() self.__saveMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr("Save"), self.__saveMessages) self.__messagesMenu.addSeparator() self.__setMarkerMessagesAct = self.__messagesMenu.addAction(
--- a/eric6/Network/IRC/IrcIdentitiesEditDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Network/IRC/IrcIdentitiesEditDialog.py Sat May 02 13:51:07 2020 +0200 @@ -39,17 +39,17 @@ super(IrcIdentitiesEditDialog, self).__init__(parent) self.setupUi(self) - self.addButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy.png")) - self.renameButton.setIcon(UI.PixmapCache.getIcon("editRename.png")) - self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.nicknameAddButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.nicknameDeleteButton.setIcon(UI.PixmapCache.getIcon("minus.png")) - self.nicknameUpButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.addButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.copyButton.setIcon(UI.PixmapCache.getIcon("editCopy")) + self.renameButton.setIcon(UI.PixmapCache.getIcon("editRename")) + self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.nicknameAddButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.nicknameDeleteButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.nicknameUpButton.setIcon(UI.PixmapCache.getIcon("1uparrow")) self.nicknameDownButton.setIcon( - UI.PixmapCache.getIcon("1downarrow.png")) + UI.PixmapCache.getIcon("1downarrow")) self.showPasswordButton.setIcon( - UI.PixmapCache.getIcon("showPassword.png")) + UI.PixmapCache.getIcon("showPassword")) self.__manager = manager @@ -468,13 +468,13 @@ if checked: self.passwordEdit.setEchoMode(QLineEdit.Normal) self.showPasswordButton.setIcon( - UI.PixmapCache.getIcon("hidePassword.png")) + UI.PixmapCache.getIcon("hidePassword")) self.showPasswordButton.setToolTip( self.tr("Press to hide the password")) else: self.passwordEdit.setEchoMode(QLineEdit.Password) self.showPasswordButton.setIcon( - UI.PixmapCache.getIcon("showPassword.png")) + UI.PixmapCache.getIcon("showPassword")) self.showPasswordButton.setToolTip( self.tr("Press to show the password"))
--- a/eric6/Network/IRC/IrcNetworkEditDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Network/IRC/IrcNetworkEditDialog.py Sat May 02 13:51:07 2020 +0200 @@ -39,13 +39,13 @@ self.__manager = manager self.editIdentitiesButton.setIcon( - UI.PixmapCache.getIcon("ircConfigure.png")) + UI.PixmapCache.getIcon("ircConfigure")) self.editServerButton.setIcon( - UI.PixmapCache.getIcon("ircConfigure.png")) + UI.PixmapCache.getIcon("ircConfigure")) self.editChannelButton.setIcon( - UI.PixmapCache.getIcon("ircConfigure.png")) - self.addChannelButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.deleteChannelButton.setIcon(UI.PixmapCache.getIcon("minus.png")) + UI.PixmapCache.getIcon("ircConfigure")) + self.addChannelButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.deleteChannelButton.setIcon(UI.PixmapCache.getIcon("minus")) self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok)
--- a/eric6/Network/IRC/IrcNetworkWidget.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Network/IRC/IrcNetworkWidget.py Sat May 02 13:51:07 2020 +0200 @@ -54,10 +54,10 @@ super(IrcNetworkWidget, self).__init__(parent) self.setupUi(self) - self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect.png")) - self.editButton.setIcon(UI.PixmapCache.getIcon("ircConfigure.png")) - self.joinButton.setIcon(UI.PixmapCache.getIcon("ircJoinChannel.png")) - self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserPresent.png")) + self.connectButton.setIcon(UI.PixmapCache.getIcon("ircConnect")) + self.editButton.setIcon(UI.PixmapCache.getIcon("ircConfigure")) + self.joinButton.setIcon(UI.PixmapCache.getIcon("ircJoinChannel")) + self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserPresent")) self.joinButton.setEnabled(False) self.nickCombo.setEnabled(False) @@ -191,14 +191,14 @@ # set being away # don't send away, if the status is already set self.sendData.emit("AWAY :" + awayMessage) - self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserAway.png")) + self.awayButton.setIcon(UI.PixmapCache.getIcon("ircUserAway")) self.__away = True self.away.emit(self.__away) elif not awayMessage and self.__away: # cancel being away self.sendData.emit("AWAY") self.awayButton.setIcon( - UI.PixmapCache.getIcon("ircUserPresent.png")) + UI.PixmapCache.getIcon("ircUserPresent")) self.__away = False self.away.emit(self.__away) @@ -344,12 +344,12 @@ self.__connected = connected if self.__connected: self.connectButton.setIcon( - UI.PixmapCache.getIcon("ircDisconnect.png")) + UI.PixmapCache.getIcon("ircDisconnect")) self.connectButton.setToolTip( self.tr("Press to disconnect from the network")) else: self.connectButton.setIcon( - UI.PixmapCache.getIcon("ircConnect.png")) + UI.PixmapCache.getIcon("ircConnect")) self.connectButton.setToolTip( self.tr("Press to connect to the selected network")) @@ -374,7 +374,7 @@ self.awayButton.setEnabled(registered) if registered: self.awayButton.setIcon( - UI.PixmapCache.getIcon("ircUserPresent.png")) + UI.PixmapCache.getIcon("ircUserPresent")) self.__away = False def __clearMessages(self): @@ -471,22 +471,22 @@ """ self.__messagesMenu = QMenu(self) self.__copyMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr("Copy"), self.__copyMessages) self.__messagesMenu.addSeparator() self.__cutAllMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("editCut.png"), + UI.PixmapCache.getIcon("editCut"), self.tr("Cut all"), self.__cutAllMessages) self.__copyAllMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("editCopy.png"), + UI.PixmapCache.getIcon("editCopy"), self.tr("Copy all"), self.__copyAllMessages) self.__messagesMenu.addSeparator() self.__clearMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("editDelete.png"), + UI.PixmapCache.getIcon("editDelete"), self.tr("Clear"), self.__clearMessages) self.__messagesMenu.addSeparator() self.__saveMessagesAct = self.__messagesMenu.addAction( - UI.PixmapCache.getIcon("fileSave.png"), + UI.PixmapCache.getIcon("fileSave"), self.tr("Save"), self.__saveMessages) self.on_messages_copyAvailable(False)
--- a/eric6/Network/IRC/IrcWidget.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Network/IRC/IrcWidget.py Sat May 02 13:51:07 2020 +0200 @@ -61,7 +61,7 @@ self.__leaveButton = QToolButton(self) self.__leaveButton.setIcon( - UI.PixmapCache.getIcon("ircCloseChannel.png")) + UI.PixmapCache.getIcon("ircCloseChannel")) self.__leaveButton.setToolTip( self.tr("Press to leave the current channel")) self.__leaveButton.clicked.connect(self.__leaveChannel) @@ -113,7 +113,7 @@ self.__prefixRe = re.compile(r""".*\sPREFIX=\((.*)\)([^ ]+).*""") self.__chanTypesRe = re.compile(r""".*\sCHANTYPES=([^ ]+).*""") - ircPic = UI.PixmapCache.getPixmap("irc128.png") + ircPic = UI.PixmapCache.getPixmap("irc128") self.__emptyLabel = QLabel() self.__emptyLabel.setPixmap(ircPic) self.__emptyLabel.setAlignment(Qt.AlignVCenter | Qt.AlignHCenter)
--- a/eric6/PluginManager/PluginRepositoryDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/PluginManager/PluginRepositoryDialog.py Sat May 02 13:51:07 2020 +0200 @@ -394,7 +394,7 @@ ui = None if ui and ui.notificationsEnabled(): ui.showNotification( - UI.PixmapCache.getPixmap("plugin48.png"), + UI.PixmapCache.getPixmap("plugin48"), self.tr("Download Plugin Files"), self.tr("""The requested plugins were downloaded.""")) @@ -651,22 +651,22 @@ updateStatus = self.__updateStatus(filename, version) if updateStatus == PluginRepositoryWidget.PluginStatusUpToDate: - itm.setIcon(1, UI.PixmapCache.getIcon("empty.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("empty")) itm.setToolTip(1, self.tr("up-to-date")) elif updateStatus == PluginRepositoryWidget.PluginStatusNew: - itm.setIcon(1, UI.PixmapCache.getIcon("download.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("download")) itm.setToolTip(1, self.tr("new download available")) self.__newItems += 1 elif updateStatus == PluginRepositoryWidget.PluginStatusLocalUpdate: - itm.setIcon(1, UI.PixmapCache.getIcon("updateLocal.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("updateLocal")) itm.setToolTip(1, self.tr("update installable")) self.__updateLocalItems += 1 elif updateStatus == PluginRepositoryWidget.PluginStatusRemoteUpdate: - itm.setIcon(1, UI.PixmapCache.getIcon("updateRemote.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("updateRemote")) itm.setToolTip(1, self.tr("updated download available")) self.__updateRemoteItems += 1 elif updateStatus == PluginRepositoryWidget.PluginStatusError: - itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("warning")) itm.setToolTip(1, self.tr("error determining status")) def __updateStatus(self, filename, version):
--- a/eric6/PluginManager/PluginUninstallDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/PluginManager/PluginUninstallDialog.py Sat May 02 13:51:07 2020 +0200 @@ -189,7 +189,7 @@ ui = e5App().getObject("UserInterface") if ui.notificationsEnabled(): ui.showNotification( - UI.PixmapCache.getPixmap("plugin48.png"), + UI.PixmapCache.getPixmap("plugin48"), self.tr("Plugin Uninstallation"), self.tr( """<p>The plugin <b>{0}</b> was uninstalled"""
--- a/eric6/Plugins/AboutPlugin/AboutDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/AboutPlugin/AboutDialog.py Sat May 02 13:51:07 2020 +0200 @@ -753,7 +753,7 @@ self.ericLabel.setText(titleText) self.ericPixmap.setPixmap( - UI.PixmapCache.getPixmap("eric.png").scaled(48, 48)) + UI.PixmapCache.getPixmap("eric").scaled(48, 48)) #################################################################### ## ABOUT
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sat May 02 13:51:07 2020 +0200 @@ -69,13 +69,13 @@ self.optionsTabWidget.setCurrentIndex(0) self.excludeMessagesSelectButton.setIcon( - UI.PixmapCache.getIcon("select.png")) + UI.PixmapCache.getIcon("select")) self.includeMessagesSelectButton.setIcon( - UI.PixmapCache.getIcon("select.png")) + UI.PixmapCache.getIcon("select")) self.fixIssuesSelectButton.setIcon( - UI.PixmapCache.getIcon("select.png")) + UI.PixmapCache.getIcon("select")) self.noFixIssuesSelectButton.setIcon( - UI.PixmapCache.getIcon("select.png")) + UI.PixmapCache.getIcon("select")) self.docTypeComboBox.addItem(self.tr("PEP-257"), "pep257") self.docTypeComboBox.addItem(self.tr("Eric"), "eric") @@ -101,8 +101,8 @@ self.resultList.headerItem().setText(self.resultList.columnCount(), "") self.resultList.header().setSortIndicator(0, Qt.AscendingOrder) - self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus.png")) - self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus.png")) + self.addBuiltinButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.deleteBuiltinButton.setIcon(UI.PixmapCache.getIcon("minus")) self.checkProgress.setVisible(False) self.checkProgressLabel.setVisible(False) @@ -192,20 +192,20 @@ self.__lastFileItem, ["{0:6}".format(line), code, message]) if code.startswith(("W", "-", "C", "M")): - itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("warning")) elif code.startswith("N"): - itm.setIcon(1, UI.PixmapCache.getIcon("namingError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("namingError")) elif code.startswith("D"): - itm.setIcon(1, UI.PixmapCache.getIcon("docstringError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("docstringError")) else: - itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError")) if fixed: - itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed")) elif ( code in FixableCodeStyleIssues and not autofixing and code not in self.__noFixCodesList ): - itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable")) fixable = True itm.setTextAlignment(0, Qt.AlignRight) @@ -243,7 +243,7 @@ if fixed: code, message = text.split(None, 1) itm.setText(2, message) - itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed")) itm.setData(0, self.messageRole, message) else:
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Sat May 02 13:51:07 2020 +0200 @@ -52,16 +52,16 @@ continue itm = QTreeWidgetItem(self.codeTable, [code, message]) if code.startswith(("W", "C", "M")): - itm.setIcon(0, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("warning")) elif code.startswith("E"): - itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError")) elif code.startswith("N"): - itm.setIcon(0, UI.PixmapCache.getIcon("namingError.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("namingError")) elif code.startswith("D"): - itm.setIcon(0, UI.PixmapCache.getIcon("docstringError.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("docstringError")) else: # unknown category prefix => warning - itm.setIcon(0, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("warning")) itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable) if code in codeList: itm.setCheckState(0, Qt.Checked)
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py Sat May 02 13:51:07 2020 +0200 @@ -84,13 +84,13 @@ itm.setData(1, Qt.DisplayRole, code) itm.setData(2, Qt.DisplayRole, message) if code.startswith(("W", "C", "M")): - itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("warning")) elif code.startswith("E"): - itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError")) elif code.startswith("N"): - itm.setIcon(1, UI.PixmapCache.getIcon("namingError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("namingError")) elif code.startswith("D"): - itm.setIcon(1, UI.PixmapCache.getIcon("docstringError.png")) + itm.setIcon(1, UI.PixmapCache.getIcon("docstringError")) itm.setTextAlignment(0, Qt.AlignRight) itm.setTextAlignment(1, Qt.AlignHCenter)
--- a/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sat May 02 13:51:07 2020 +0200 @@ -133,9 +133,9 @@ itm = QTreeWidgetItem(self.__lastFileItem) if isWarning: - itm.setIcon(0, UI.PixmapCache.getIcon("warning.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("warning")) else: - itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError.png")) + itm.setIcon(0, UI.PixmapCache.getIcon("syntaxError")) itm.setData(0, Qt.DisplayRole, line) itm.setData(1, Qt.DisplayRole, error) itm.setData(2, Qt.DisplayRole, sourcecode)
--- a/eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui Sat May 02 13:51:07 2020 +0200 @@ -249,7 +249,7 @@ <enum>Qt::StrongFocus</enum> </property> <property name="toolTip"> - <string>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</string> + <string>Enter the filename of a CSS style sheet. Leave empty to use the colors defined below.</string> </property> </widget> </item> @@ -259,13 +259,13 @@ <item> <widget class="QGroupBox" name="groupBox_2"> <property name="title"> - <string>Colours</string> + <string>Colors</string> </property> <layout class="QGridLayout"> <item row="3" column="1"> <widget class="QPushButton" name="cfBgButton"> <property name="toolTip"> - <string>Press to select the class and function header background colour.</string> + <string>Press to select the class and function header background color.</string> </property> <property name="text"> <string>Class/Function Header Background</string> @@ -275,7 +275,7 @@ <item row="3" column="0"> <widget class="QPushButton" name="cfFgButton"> <property name="toolTip"> - <string>Press to select the class and function header foreground colour.</string> + <string>Press to select the class and function header foreground color.</string> </property> <property name="text"> <string>Class/Function Header Foreground</string> @@ -285,7 +285,7 @@ <item row="2" column="1"> <widget class="QPushButton" name="l2BgButton"> <property name="toolTip"> - <string>Press to select the level 2 header background colour.</string> + <string>Press to select the level 2 header background color.</string> </property> <property name="text"> <string>Level 2 Header Background</string> @@ -295,7 +295,7 @@ <item row="2" column="0"> <widget class="QPushButton" name="l2FgButton"> <property name="toolTip"> - <string>Press to select the level 2 header foreground colour.</string> + <string>Press to select the level 2 header foreground color.</string> </property> <property name="text"> <string>Level 2 Header Foreground</string> @@ -305,7 +305,7 @@ <item row="1" column="1"> <widget class="QPushButton" name="l1BgButton"> <property name="toolTip"> - <string>Press to select the level 1 header background colour.</string> + <string>Press to select the level 1 header background color.</string> </property> <property name="text"> <string>Level 1 Header Background</string> @@ -315,7 +315,7 @@ <item row="1" column="0"> <widget class="QPushButton" name="l1FgButton"> <property name="toolTip"> - <string>Press to select the level 1 header foreground colour.</string> + <string>Press to select the level 1 header foreground color.</string> </property> <property name="text"> <string>Level 1 Header Foreground</string> @@ -325,7 +325,7 @@ <item row="0" column="1"> <widget class="QPushButton" name="bodyBgButton"> <property name="toolTip"> - <string>Press to select the body background colour.</string> + <string>Press to select the body background color.</string> </property> <property name="text"> <string>Body Background</string> @@ -335,7 +335,7 @@ <item row="0" column="0"> <widget class="QPushButton" name="bodyFgButton"> <property name="toolTip"> - <string>Press to select the body foreground colour.</string> + <string>Press to select the body foreground color.</string> </property> <property name="text"> <string>Body Foreground</string> @@ -345,7 +345,7 @@ <item row="4" column="0"> <widget class="QPushButton" name="linkFgButton"> <property name="toolTip"> - <string>Press to select the foreground colour of links.</string> + <string>Press to select the foreground color of links.</string> </property> <property name="text"> <string>Links</string> @@ -355,7 +355,7 @@ <item row="5" column="0" colspan="2"> <widget class="QTextEdit" name="sample"> <property name="toolTip"> - <string>This shows an example of the selected colours.</string> + <string>This shows an example of the selected colors.</string> </property> <property name="readOnly"> <bool>true</bool>
--- a/eric6/Plugins/PluginAbout.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/PluginAbout.py Sat May 02 13:51:07 2020 +0200 @@ -78,7 +78,7 @@ self.aboutAct = E5Action( self.tr('About {0}').format(UI.Info.Program), - UI.PixmapCache.getIcon("helpAbout.png"), + UI.PixmapCache.getIcon("helpAbout"), self.tr('&About {0}').format(UI.Info.Program), 0, 0, self, 'about_eric') self.aboutAct.setStatusTip(self.tr( @@ -93,7 +93,7 @@ self.aboutQtAct = E5Action( self.tr('About Qt'), - UI.PixmapCache.getIcon("helpAboutQt.png"), + UI.PixmapCache.getIcon("helpAboutQt"), self.tr('About &Qt'), 0, 0, self, 'about_qt') self.aboutQtAct.setStatusTip( self.tr('Display information about the Qt toolkit'))
--- a/eric6/Plugins/PluginTranslator.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/PluginTranslator.py Sat May 02 13:51:07 2020 +0200 @@ -60,13 +60,17 @@ @return dictionary containing the relevant data """ + if e5App().usesDarkPalette(): + icon = os.path.join("UiExtensionPlugins", "Translator", "icons", + "flag-dark") + else: + icon = os.path.join("UiExtensionPlugins", "Translator", "icons", + "flag-light") return { "translatorPage": [ QCoreApplication.translate("TranslatorPlugin", "Translator"), - os.path.join("UiExtensionPlugins", "Translator", "icons", - "flag.png"), - createTranslatorPage, None, None], + icon, createTranslatorPage, None, None], } @@ -141,7 +145,7 @@ global translatorPluginObject translatorPluginObject = self - self.__object = Translator(self, self.__ui) + self.__object = Translator(self, e5App().usesDarkPalette(), self.__ui) self.__object.activate() e5App().registerPluginObject("Translator", self.__object)
--- a/eric6/Plugins/UiExtensionPlugins/Translator/Translator.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/Translator.py Sat May 02 13:51:07 2020 +0200 @@ -22,12 +22,17 @@ """ Class implementing the translator object. """ - def __init__(self, plugin, parent=None): + def __init__(self, plugin, usesDarkPalette, parent=None): """ Constructor - @param plugin reference to the plugin object (TranslatorPlugin) - @param parent parent (QObject) + @param plugin reference to the plugin object + @type TranslatorPlugin + @param usesDarkPalette flag indicating that the platform uses a palette + with a dark background + @type bool + @param parent parent + @type QObject """ QObject.__init__(self, parent) @@ -35,6 +40,11 @@ self.__ui = parent self.__widget = None + + if usesDarkPalette: + self.__iconSuffix = "dark" + else: + self.__iconSuffix = "light" def activate(self): """ @@ -46,7 +56,8 @@ self.__ui.addSideWidget( self.__ui.BottomSide, self.__widget, UI.PixmapCache.getIcon( - os.path.join(os.path.dirname(__file__), "icons", "flag.png")), + os.path.join(os.path.dirname(__file__), "icons", + "flag-{0}".format(self.__iconSuffix))), self.tr("Translator")) self.__activateAct = E5Action( @@ -85,7 +96,9 @@ @return icon (QIcon) """ return UI.PixmapCache.getIcon(os.path.join( - os.path.dirname(__file__), "icons", name)) + os.path.dirname(__file__), "icons", + "{0}-{1}".format(name, self.__iconSuffix) + )) def __activateWidget(self): """
--- a/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py Sat May 02 13:51:07 2020 +0200 @@ -13,6 +13,8 @@ from PyQt5.QtCore import QCoreApplication from PyQt5.QtGui import QIcon +from E5Gui.E5Application import e5App + import UI.PixmapCache @@ -107,10 +109,20 @@ @return engine icon @rtype QIcon """ + if e5App().usesDarkPalette(): + iconSuffix = "dark" + else: + iconSuffix = "light" if name in supportedEngineNames(): - return UI.PixmapCache.getIcon(os.path.join( + icon = UI.PixmapCache.getIcon(os.path.join( os.path.dirname(__file__), "..", "icons", "engines", - "{0}.png".format(name))) + "{0}-{1}".format(name, iconSuffix))) + if icon.isNull(): + # try variant without suffix + icon = UI.PixmapCache.getIcon(os.path.join( + os.path.dirname(__file__), "..", "icons", "engines", + "{0}".format(name))) + return icon else: return QIcon()
--- a/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py Sat May 02 13:51:07 2020 +0200 @@ -76,8 +76,8 @@ "tr": self.tr("Turkish"), "uk": self.tr("Ukrainian"), "vi": self.tr("Vietnamese"), - "zh-CN": self.tr("Chinese S"), - "zh-TW": self.tr("Chinese T"), + "zh-CN": self.tr("Chinese (China)"), + "zh-TW": self.tr("Chinese (Taiwan)"), } self.__toThreeCharacterCode = { @@ -142,7 +142,7 @@ """ return UI.PixmapCache.getIcon(os.path.join( os.path.dirname(__file__), "icons", "flags", - "{0}.png".format(code))) + "{0}".format(code))) def getLanguage(self, code): """
--- a/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py Sun Apr 05 18:17:08 2020 +0200 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py Sat May 02 13:51:07 2020 +0200 @@ -59,15 +59,15 @@ self.pronounceTransButton.setVisible(audioAvailable) self.pronounceOrigButton.setIcon( - self.__translator.getAppIcon("pronounce.png")) + self.__translator.getAppIcon("pronounce")) self.pronounceTransButton.setIcon( - self.__translator.getAppIcon("pronounce.png")) + self.__translator.getAppIcon("pronounce")) self.swapButton.setIcon( - self.__translator.getAppIcon("swap.png")) + self.__translator.getAppIcon("swap")) self.translateButton.setIcon( - self.__translator.getAppIcon("translate.png")) - self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete.png")) - self.preferencesButton.setIcon(UI.PixmapCache.getIcon("configure.png")) + self.__translator.getAppIcon("translate")) + self.clearButton.setIcon(UI.PixmapCache.getIcon("editDelete")) + self.preferencesButton.setIcon(UI.PixmapCache.getIcon("configure")) self.translateButton.setEnabled(False) self.clearButton.setEnabled(False)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-dark.svg Sat May 02 13:51:07 2020 +0200 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg"> + <g transform="translate(0 -284.3)"> + <path d="m7.6799 296.37c-1.0956-0.62413-3.3561-1.9093-5.0554-2.8741-0.498-0.28275-0.93515-0.53712-0.97146-0.56527-0.10781-0.0836-0.23751-0.26711-0.28556-0.40413l-0.0446-0.127v-5.0691l0.04257-0.10991c0.05791-0.14977 0.14214-0.27412 0.24933-0.36827 0.05516-0.0484 0.91852-0.54468 2.2359-1.2852 2.254-1.267 2.2575-1.2688 2.4862-1.2715 0.25016-3e-3 0.19984-0.0284 2.4985 1.2642 1.1801 0.66359 2.1834 1.2379 2.2295 1.2763 0.11123 0.0925 0.21208 0.23978 0.26726 0.39029l0.0449 0.12257v5.0505l-0.0449 0.12257c-0.05527 0.15085-0.1563 0.29815-0.26726 0.38983-0.04612 0.0381-0.5508 0.33407-1.1214 0.65764-0.57062 0.32356-1.0481 0.59685-1.0611 0.60731-0.018489 0.0149-0.023569 0.32146-0.023569 1.4186v1.3996l-0.042465-9.3e-4c-0.023366-4.9e-4 -0.53478-0.2814-1.1365-0.62418zm-2.559-3.6121c0.2289-0.0719 0.44031-0.27568 0.53343-0.51426 0.03007-0.0771 0.04114-0.1485 0.04277-0.27562l2e-3 -0.17157 0.74934-0.42261c0.41214-0.23243 0.74955-0.42767 0.74982-0.43386 2.844e-4 -6e-3 -0.028039-0.048-0.062884-0.093-0.069996-0.0902-0.16529-0.25867-0.19696-0.34813l-0.02042-0.0577-0.75665 0.42785-0.75666 0.42784-0.08655-0.0564c-0.44368-0.28929-1.0248-0.13011-1.264 0.34623-0.06217 0.12383-0.07081 0.15857-0.07761 0.31099-0.0126 0.28245 0.06735 0.48595 0.263 0.66962 0.24013 0.22546 0.55407 0.29336 0.88128 0.19062zm3.4774-1.9826c0.27656-0.0841 0.50559-0.31809 0.58095-0.59358 0.012292-0.045 0.022045-0.14935 0.02174-0.23179-0.00203-0.39533-0.2598-0.71667-0.65698-0.8185-0.24186-0.062-0.50725-0.01-0.72764 0.14329l-0.052217 0.0362-1.0257-0.58175-1.0257-0.58175-0.0071-0.19496c-0.0061-0.17242-0.01412-0.20954-0.06735-0.321-0.08412-0.176-0.2386-0.33061-0.4171-0.41745-0.12899-0.0627-0.15699-0.0691-0.33126-0.0754-0.15817-6e-3 -0.2109-2e-5 -0.31194 0.0336-0.4054 0.13474-0.6542 0.52633-0.59075 0.92981 0.09661 0.61458 0.81418 0.94113 1.3248 0.6029l0.09661-0.064 1.032 0.58533 1.0319 0.58534 0.00203 0.16132c0.00305 0.24518 0.076294 0.41437 0.25704 0.5945 0.096307 0.096 0.30321 0.21257 0.41053 0.23128 0.12831 0.0224 0.3417 0.0114 0.45625-0.0234z" fill="#eff0f1" stroke-width=".018715"/> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/deepl-light.svg Sat May 02 13:51:07 2020 +0200 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg"> + <g transform="translate(0 -284.3)"> + <path d="m7.6799 296.37c-1.0956-0.62413-3.3561-1.9093-5.0554-2.8741-0.498-0.28275-0.93515-0.53712-0.97146-0.56527-0.10781-0.0836-0.23751-0.26711-0.28556-0.40413l-0.0446-0.127v-5.0691l0.04257-0.10991c0.05791-0.14977 0.14214-0.27412 0.24933-0.36827 0.05516-0.0484 0.91852-0.54468 2.2359-1.2852 2.254-1.267 2.2575-1.2688 2.4862-1.2715 0.25016-3e-3 0.19984-0.0284 2.4985 1.2642 1.1801 0.66359 2.1834 1.2379 2.2295 1.2763 0.11123 0.0925 0.21208 0.23978 0.26726 0.39029l0.0449 0.12257v5.0505l-0.0449 0.12257c-0.05527 0.15085-0.1563 0.29815-0.26726 0.38983-0.04612 0.0381-0.5508 0.33407-1.1214 0.65764-0.57062 0.32356-1.0481 0.59685-1.0611 0.60731-0.018489 0.0149-0.023569 0.32146-0.023569 1.4186v1.3996l-0.042465-9.3e-4c-0.023366-4.9e-4 -0.53478-0.2814-1.1365-0.62418zm-2.559-3.6121c0.2289-0.0719 0.44031-0.27568 0.53343-0.51426 0.03007-0.0771 0.04114-0.1485 0.04277-0.27562l2e-3 -0.17157 0.74934-0.42261c0.41214-0.23243 0.74955-0.42767 0.74982-0.43386 2.844e-4 -6e-3 -0.028039-0.048-0.062884-0.093-0.069996-0.0902-0.16529-0.25867-0.19696-0.34813l-0.02042-0.0577-0.75665 0.42785-0.75666 0.42784-0.08655-0.0564c-0.44368-0.28929-1.0248-0.13011-1.264 0.34623-0.06217 0.12383-0.07081 0.15857-0.07761 0.31099-0.0126 0.28245 0.06735 0.48595 0.263 0.66962 0.24013 0.22546 0.55407 0.29336 0.88128 0.19062zm3.4774-1.9826c0.27656-0.0841 0.50559-0.31809 0.58095-0.59358 0.012292-0.045 0.022045-0.14935 0.02174-0.23179-0.00203-0.39533-0.2598-0.71667-0.65698-0.8185-0.24186-0.062-0.50725-0.01-0.72764 0.14329l-0.052217 0.0362-1.0257-0.58175-1.0257-0.58175-0.0071-0.19496c-0.0061-0.17242-0.01412-0.20954-0.06735-0.321-0.08412-0.176-0.2386-0.33061-0.4171-0.41745-0.12899-0.0627-0.15699-0.0691-0.33126-0.0754-0.15817-6e-3 -0.2109-2e-5 -0.31194 0.0336-0.4054 0.13474-0.6542 0.52633-0.59075 0.92981 0.09661 0.61458 0.81418 0.94113 1.3248 0.6029l0.09661-0.064 1.032 0.58533 1.0319 0.58534 0.00203 0.16132c0.00305 0.24518 0.076294 0.41437 0.25704 0.5945 0.096307 0.096 0.30321 0.21257 0.41053 0.23128 0.12831 0.0224 0.3417 0.0114 0.45625-0.0234z" fill="#232629" stroke-width=".018715"/> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/glosbe.svg Sat May 02 13:51:07 2020 +0200 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg"> + <g transform="translate(0 -284.3)"> + <g transform="matrix(.13599 0 0 .13437 -17.402 257.84)" stroke="#232629" stroke-width="1.0102"> + <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m695.31 204.03c-21.035-21.821-27.856-39.687-25.07-65.672 2.2764-21.236 7.8317-35.343 18.712-47.518 10.959-12.263 22.952-18.884 38.841-21.441 6.347-1.0216 8.9576-0.97132 15.657 0.30139 17.292 3.2848 25.48 8.542 33.695 21.635 2.4268 3.8676 5.3216 7.5998 6.433 8.2939 1.1113 0.69404 9.9928 3.0405 19.737 5.2143 9.7438 2.1738 17.874 4.1104 18.067 4.3035s-2.9664 0.63158-7.0213 0.97434c-8.9917 0.76008-22.765 4.6483-32.66 9.2198-24.296 11.225-38.436 27.24-66.049 74.804-5.1606 8.8894-9.9234 16.747-10.584 17.462-0.95777 1.0363-2.935-0.49908-9.7591-7.578zm53.93-84.948c7.6619-7.6619 2.5452-21.368-8.598-23.031-10.024-1.4961-18.547 11.823-13.276 20.746 4.415 7.474 15.525 8.6348 21.874 2.2855z" fill="#ff6e00"/> + <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m555.26 377.49c0.29382-0.83338 3.5257-8.8356 7.1819-17.783s9.3498-23.721 12.652-32.83 6.3206-17.358 6.7066-18.33c0.55133-1.3886 1.9246-1.7715 6.4022-1.7853 13.901-0.0428 28.333-5.4423 37.888-14.175 3.0092-2.7502 5.9067-5.0004 6.4389-5.0004 0.5322 0 1.7975 1.8403 2.8118 4.0896 2.1552 4.7794 3.6325 2.8308-12.649 16.685-15.333 13.047-45.622 43.587-56.036 56.502-10.433 12.938-12.195 14.89-11.397 12.627z" fill="#ff6e00"/> + <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m688.86 312.76c-11.807-4.1528-25.978-15.816-34.805-28.646-4.6453-6.7516-10.701-20.014-13.869-30.37-2.668-8.7243-2.7816-9.9887-2.8122-31.315-0.0293-20.416 0.15679-22.824 2.2883-29.607 2.5149-8.0034 10.205-25.446 11.219-25.446 0.34365 0 2.5446 4.432 4.891 9.849 12.529 28.925 27.833 47.246 56.321 67.426 17.002 12.044 24.141 18.568 27.441 25.08 7.375 14.554 0.76067 32.945-14.967 41.616-5.0162 2.7657-6.2697 2.999-17.524 3.2623-10.229 0.23925-13.068-0.0493-18.183-1.8483z" fill="#0cf"/> + <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m583.18 286.19c-8.7118-3.1132-16.94-10.624-21.503-19.628-1.4052-2.7731-3.3294-8.9836-4.276-13.801-1.4695-7.4792-1.5495-10.047-0.54718-17.576 1.3397-10.062 4.7102-20.719 9.2248-29.166 9.4933-17.763 28.103-35.519 45.83-43.728 7.2044-3.3362 21.564-7.7076 22.44-6.8313 0.32735 0.32735-1.2676 4.3002-3.5444 8.8285-4.6161 9.181-9.2031 22.169-11.823 33.478-1.3889 5.9946-1.6708 11.222-1.4117 26.178 0.77303 44.62 0.77417 44.586-1.6208 49.061-6.115 11.427-20.965 17.402-32.769 13.184z" fill="#6c0"/> + <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m517.46 210.47c-13.32-3.743-20.716-17.39-18.08-33.357 3.4129-20.666 21.13-38.102 46.665-45.926 21.935-6.7208 47.585-4.5524 67.056 5.6689l4.0406 2.1211-4.5457 1.7742c-6.5257 2.547-20.525 9.8926-25.895 13.587-10.987 7.5592-21.426 18.539-32.881 34.583-8.7048 12.192-13.026 17.112-17.406 19.819-4.2457 2.624-12.945 3.4176-18.954 1.7292z" fill="#fc0"/> + <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m618.88 119.28c-18.625-9.2704-28.21-10.912-58.37-9.995-20.376 0.61944-23.788 0.50051-27.26-0.95041-8.2354-3.441-12.908-10.971-12.916-20.814-0.0156-20.521 26.82-33.593 52.355-25.504 24.003 7.6043 45.37 28.482 52.668 51.462 1.3577 4.2755 2.3363 8.2657 2.1746 8.8672-0.16813 0.6253-3.8728-0.68778-8.6519-3.0666z" fill="#c09"/> + <path transform="matrix(.26458 0 0 .26458 0 191.17)" d="m646.56 118.89c-0.30018-0.83338-1.2809-4.4699-2.1794-8.0812-2.1021-8.4489-9.5471-24.225-14.516-30.761-2.1326-2.8048-8.5373-10.1-14.233-16.211-15.152-16.258-16.807-21.6-10.015-32.311 6.0999-9.6186 19.627-12.288 30.974-6.1121 8.4861 4.6187 17.088 14.201 20.91 23.293 4.7437 11.285 6.1856 32.184 3.1297 45.36-2.6376 11.373-12.589 28.931-14.069 24.823z" fill="#069"/> + </g> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev1.svg Sat May 02 13:51:07 2020 +0200 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="48" height="48" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> +<style type="text/css"> + .st0{fill:#4285F4;} + .st1{fill:#34A853;} + .st2{fill:#FBBC04;} + .st3{fill:#EA4335;} +</style> + +<g transform="matrix(.089963 0 0 .088184 .0044982 .0016273)"> + <path class="st0" d="m533.5 278.4c0-18.5-1.5-37.1-4.7-55.3h-256.7v104.8h147c-6.1 33.8-25.7 63.7-54.4 82.7v68h87.7c51.5-47.4 81.1-117.4 81.1-200.2z" fill="#4285f4"/> + <path class="st1" d="m272.1 544.3c73.4 0 135.3-24.1 180.4-65.7l-87.7-68c-24.4 16.6-55.9 26-92.6 26-71 0-131.2-47.9-152.8-112.3h-90.5v70.1c46.2 91.9 140.3 149.9 243.2 149.9z" fill="#34a853"/> + <path class="st2" d="m119.3 324.3c-11.4-33.8-11.4-70.4 0-104.2v-70.1h-90.4c-38.6 76.9-38.6 167.5 0 244.4z" fill="#fbbc04"/> + <path class="st3" d="m272.1 107.7c38.8-0.6 76.3 14 104.4 40.8l77.7-77.7c-49.2-46.2-114.5-71.6-182.1-70.8-102.9 0-197 58-243.2 150l90.4 70.1c21.5-64.5 81.8-112.4 152.8-112.4z" fill="#ea4335"/> +</g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/googlev2.svg Sat May 02 13:51:07 2020 +0200 @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="48" height="48" enable-background="new 0 0 998.1 998.3" version="1.1" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> + +<g transform="matrix(.048091 0 0 .048082 0 1e-5)"> + <path d="m931.7 998.3c36.5 0 66.4-29.4 66.4-65.4v-667.1c0-36-29.9-65.4-66.4-65.4h-648.1l260.1 797.9z" fill="#dbdbdb"/> + + + <path d="m931.7 230.4c9.7 0 18.9 3.8 25.8 10.6 6.8 6.7 10.6 15.5 10.6 24.8v667.1c0 9.3-3.7 18.1-10.6 24.8-6.9 6.8-16.1 10.6-25.8 10.6h-366.2l-240.6-737.9h606.8m0-30h-648.1l260.1 797.9h388c36.5 0 66.4-29.4 66.4-65.4v-667.1c0-36-29.9-65.4-66.4-65.4z" fill="#dcdcdc"/> + + + + <polygon points="482.3 809.8 543.7 998.3 714.4 809.8" fill="#4352b8"/> + + <path d="m936.1 476.1v-39.1h-188.5v-63.2h-61.2v63.2h-120.3v39.1h239.4c-12.8 45.1-41.1 87.7-68.7 120.8-48.9-57.9-49.1-76.7-49.1-76.7h-50.8s2.1 28.2 70.7 108.6c-22.3 22.8-39.2 36.3-39.2 36.3l15.6 48.8s23.6-20.3 53.1-51.6c29.6 32.1 67.8 70.7 117.2 116.7l32.1-32.1c-52.9-48-91.7-86.1-120.2-116.7 38.2-45.2 77-102.1 85.2-154.2h84.6v0.1z" fill="#607988"/> + <path d="m66.4 0c-36.5 0-66.4 29.9-66.4 66.5v677c0 36.5 29.9 66.4 66.4 66.4h648.1l-260.1-809.9z" fill="#4285f4"/> + <linearGradient id="SVGID_1_" x1="534.3" x2="998.1" y1="433.2" y2="433.2" gradientUnits="userSpaceOnUse"> + <stop stop-color="#fff" stop-opacity=".2" offset="0"/> + <stop stop-color="#fff" stop-opacity=".02" offset="1"/> + </linearGradient> + <path d="m534.3 200.4h397.4c36.5 0 66.4 29.4 66.4 65.4v400.2z" enable-background="new " fill="url(#SVGID_1_)"/> + <path d="m371.4 430.6c-2.5 30.3-28.4 75.2-91.1 75.2-54.3 0-98.3-44.9-98.3-100.2s44-100.2 98.3-100.2c30.9 0 51.5 13.4 63.3 24.3l41.2-39.6c-27.1-25-62.4-40.6-104.5-40.6-86.1 0-156 69.9-156 156s69.9 156 156 156c90.2 0 149.8-63.3 149.8-152.6 0-12.8-1.6-22.2-3.7-31.8h-146v53.4z" fill="#eee"/> +</g> +<radialGradient id="SVGID_2_" cx="65.208" cy="19.365" r="1398.3" gradientTransform="matrix(.048091 0 0 .048082 0 1.0959e-5)" gradientUnits="userSpaceOnUse"> + <stop stop-color="#fff" stop-opacity=".1" offset="0"/> + <stop stop-color="#fff" stop-opacity="0" offset="1"/> +</radialGradient> +<path d="m44.807 9.6356h-19.857l-3.0971-9.6356h-18.659c-1.7553 0-3.1933 1.4376-3.1933 3.1974v32.551c0 1.755 1.4379 3.1926 3.1933 3.1926h20.001l2.9528 9.0586h18.659c1.7553 0 3.1933-1.4136 3.1933-3.1445v-32.075c0-1.7309-1.4379-3.1445-3.1933-3.1445z" fill="url(#SVGID_2_)" stroke-width=".048087"/> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/icons/engines/ibm_watson-dark.svg Sat May 02 13:51:07 2020 +0200 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="48" height="48" version="1.1" viewBox="0 0 14.746 14.747" xmlns="http://www.w3.org/2000/svg"> + <g transform="matrix(.019202 0 0 .019037 -.0024016 13.862)" fill="#eff0f1"> + <path d="m305.67-467.18c1.437 0.05 2.874 0.1 4.388 0.01 3.202 0.096 6.279 0.124 9.403 0.362 14.293 0.645 28.547 2.554 42.618 5.097 17.167 3.132 34.14 7.81 50.574 13.477 21.535 7.351 42.317 16.677 62.174 27.7 21.486 11.912 41.97 25.662 60.793 41.259 8.95 7.454 17.542 15.263 25.825 23.639 7.01 7.13 13.742 14.474 20.116 22.174 10.906 13.11 20.694 27.077 29.16 41.974 6.634 11.695 12.429 24.033 17.085 36.668 3.722 10.472 6.836 21.163 8.812 32.15 1.33 7.7 2.332 15.403 2.601 23.257 0.366 8.274 0.075 16.556-0.996 24.78-0.666 5.691-1.786 11.319-3.156 16.81-1.524 5.774-3.3 11.41-5.528 16.984-3.55 8.888-8.103 17.23-13.408 25.16-4.254 6.302-9.058 12.121-14.363 17.666-4.08 4.196-8.536 8.186-13.166 11.897-3.23 2.64-6.51 5.07-9.963 7.223a140.33 140.33 0 0 1-7.87 4.879c-1.93 1.149-3.984 2.23-6.038 3.31-14.863 7.851-30.912 13.404-47.27 17.136a119.07 119.07 0 0 1-8.593 1.732c-3.587 0.61-7.175 1.221-10.686 1.69a165.05 165.05 0 0 1-14.466 1.462c-5.932 0.432-11.786 0.723-17.688 0.804a301.42 301.42 0 0 1-45.666-3.091c-18.584-2.621-37.024-6.998-54.971-12.575-24.458-7.662-48.182-17.86-70.623-30.109-22.691-12.387-44.351-26.962-64.197-43.668-16.298-13.667-31.495-28.752-45.063-45.334-10.357-12.626-19.672-25.968-27.868-40.167-6.76-11.764-12.631-23.96-17.211-36.737-3.924-10.4-6.835-21.163-8.811-32.15-1.33-7.7-2.332-15.403-2.679-23.116-0.365-8.273-0.075-16.556 0.794-24.706 0.666-5.692 1.66-11.388 3.03-16.88a129.05 129.05 0 0 1 5.634-17.476c3.55-8.888 8.103-17.23 13.409-25.16 4.254-6.302 9.057-12.12 14.362-17.666 4.235-4.478 8.893-8.541 13.726-12.326 3.23-2.64 6.635-5.002 9.963-7.222a140.33 140.33 0 0 1 7.87-4.88c1.93-1.148 3.984-2.229 6.038-3.31 14.863-7.85 31.037-13.335 47.394-17.067a119.07 119.07 0 0 1 8.594-1.732 211.84 211.84 0 0 1 11.544-1.772c4.9-0.629 9.722-1.116 14.467-1.462l12.036-0.586c1.968-0.027 3.81-0.122 5.7-8e-3 0.733-0.15 1.514-0.091 2.17-0.1zm-1.382 27.871c-2.093-0.041-4.263 0.059-6.433 0.159l-12.036 0.586c-5.073 0.35-10.175 1.052-15.277 1.753-3.916 0.615-7.832 1.23-11.7 2.055-2.806 0.67-5.738 1.272-8.419 2.01-2.401 0.524-4.755 1.258-7.108 1.992-14.043 4.262-27.651 10.412-39.872 18.789-1.6 1.144-3.202 2.289-4.88 3.575-2.315 1.855-4.63 3.711-6.82 5.636-2.903 2.635-5.68 5.34-8.285 8.322-4.109 4.546-7.716 9.367-11.025 14.533-4.003 6.44-7.254 13.29-9.801 20.34a127.47 127.47 0 0 0-4.014 14.508 115.81 115.81 0 0 0-1.892 14.197c-1.004 13.765 0.412 27.566 3.622 41.063 2.169 9.441 5.196 18.8 8.908 27.8 4.57 11.302 10.23 22.099 16.652 32.394 7.86 12.73 16.885 24.814 26.702 36.045a337.6 337.6 0 0 0 39.566 38.113c17.927 14.556 37.311 27.34 57.698 38.284 20.889 11.22 42.983 20.527 65.656 27.582 16.289 5.038 32.944 8.808 49.792 11.032a254.67 254.67 0 0 0 40.072 2.607c6.105-0.154 12.21-0.308 18.344-0.813a209.38 209.38 0 0 0 14.621-1.745c3.713-0.542 7.378-1.294 11.043-2.046l8.42-2.01c2.276-0.592 4.427-1.253 6.578-1.914 13.917-4.33 27.371-10.198 39.39-18.501 1.803-1.218 3.607-2.435 5.362-3.862 2.315-1.856 4.63-3.712 6.82-5.636a84.345 84.345 0 0 0 8.641-8.678 116.31 116.31 0 0 0 10.514-13.895c3.926-6.298 7.303-13.08 9.85-20.13 1.688-4.584 2.923-9.231 3.907-14.015a123.1 123.1 0 0 0 2.123-14.622c1.005-13.765-0.334-27.708-3.293-41.067-2.17-9.441-5.196-18.8-8.909-27.8-4.57-11.303-10.23-22.1-16.652-32.394-7.907-12.94-17.058-25.093-27.048-36.601-12.68-14.63-26.914-27.904-41.968-39.975-16.905-13.448-34.987-25.337-53.917-35.67a360.51 360.51 0 0 0-59.32-25.775 361.74 361.74 0 0 0-41.093-10.871c-12.837-2.42-25.856-4.205-38.963-4.937-3.327-0.165-6.655-0.33-9.857-0.426-1.437-0.05-3.076-0.028-4.513-0.078-0.328 4e-3 -0.733 0.15-1.186 0.086z"/> + <path d="m384.83-529.93c2.458-0.032 5.042 5e-3 7.385 0.185 5.292 0.142 10.47 0.495 15.646 0.849 14.799 1.21 29.28 3.895 43.665 7.352a288.92 288.92 0 0 1 33.96 11.12c9.73 3.937 19.229 8.298 28.38 13.294 8.902 4.859 17.572 10.14 25.896 16.058a322.45 322.45 0 0 1 24.152 18.953c9.26 8.077 17.932 16.932 25.882 26.216 7.95 9.285 15.293 18.787 21.922 29 7.412 11.463 14.1 23.356 19.826 35.822 5.455 11.768 10.071 24.178 13.705 36.601 4.183 14.097 7.153 28.63 9.014 43.107a265.73 265.73 0 0 1 1.92 44.18 282.21 282.21 0 0 1-6.07 47.785c-3.402 15.176-8.038 30.228-13.928 44.595a262.32 262.32 0 0 1-12.822 27.066 275.5 275.5 0 0 1-18.286 29.029c-7.272 10.042-15.17 19.741-23.83 28.75-11.743 12.271-24.509 23.435-38.307 33.21-14.992 10.772-30.902 19.945-47.613 27.306-17.193 7.648-35.061 13.553-53.49 17.504-19.037 4.17-38.393 6.24-57.702 6.14-10.7-0.072-21.421-0.704-32.161-1.896-10.865-1.261-21.51-3.225-32.048-5.681a247.32 247.32 0 0 1-36.438-11.649c-9.98-4.074-19.98-8.708-29.508-13.91a277.66 277.66 0 0 1-24.13-14.82c-7.687-5.294-15.268-11.081-22.368-17.154-8.613-7.174-16.64-15.127-24.184-23.366-8.306-8.93-15.774-18.5-22.77-28.638-7.643-11.04-14.447-22.721-20.403-34.764-6.478-12.876-11.75-26.469-16.04-40.074-4.435-14.234-7.78-28.972-9.776-43.798-2.122-14.894-2.778-30.087-2.441-45.013a259.3 259.3 0 0 1 5.914-48.694 276.54 276.54 0 0 1 13.562-44.52c4.07-10.14 8.884-20.15 14.199-29.887 5.545-10.16 11.843-19.908 18.643-29.383a256.58 256.58 0 0 1 21.585-26.13c11.974-12.694 25.212-24.424 39.491-34.486 14.396-10.274 29.939-19.371 46.158-26.726 11.623-5.194 23.757-9.835 35.93-13.355a271.31 271.31 0 0 1 35.875-7.889 216.89 216.89 0 0 1 26.836-2.658c3.066-0.25 6.015-0.288 8.965-0.326 1.35-0.088 2.825-0.107 4.059 0.017 0.636 0.623 1.128 0.616 1.745 0.678zm-1.485 27.761-4.424 0.057c-2.7 0.175-5.409 0.07-8.108 0.245-7.856 0.382-15.693 1.324-23.404 2.334-11.866 1.765-23.577 4.438-35.008 8.088-9.975 3.071-19.931 6.703-29.491 11.1-14.523 6.632-28.505 14.659-41.455 24.073a245.25 245.25 0 0 0-35.435 30.932c-6.994 7.446-13.486 15.166-19.467 23.44-6.096 8.485-11.691 17.244-16.66 26.345a258.13 258.13 0 0 0-12.706 26.855c-5.206 12.817-9.285 26.25-12.244 40.019-3.066 14.26-4.762 28.994-5.234 43.571a247.7 247.7 0 0 0 2.159 40.464 242.53 242.53 0 0 0 8.76 39.398c3.875 12.28 8.607 24.477 14.428 36.171 5.425 10.929 11.824 21.565 18.82 31.702a220.06 220.06 0 0 0 20.06 24.96c6.897 7.337 14.036 14.53 21.762 20.946a252.24 252.24 0 0 0 41.829 28.602c9.026 4.927 18.4 9.22 27.878 13.02 9.97 3.794 20.172 7.165 30.47 9.764 9.179 2.264 18.589 4.104 27.97 5.103 10.007 1.342 20.11 1.912 30.435 1.779 17.458-0.086 34.857-1.852 51.821-5.503 16.473-3.646 32.645-8.829 48.017-15.823 15.014-6.639 29.479-14.952 42.795-24.441a252.17 252.17 0 0 0 34.366-29.867c7.35-7.8 14.198-15.876 20.41-24.573 6.337-8.628 12.163-17.81 17.237-27.403 4.275-7.832 8.164-16.148 11.561-24.459 5.322-13.028 9.526-26.393 12.495-39.882 3.075-13.98 4.907-28.365 5.504-42.874 0.521-13.177-0.076-26.69-1.763-39.698-1.686-13.009-4.356-26.004-8.124-38.776a243.84 243.84 0 0 0-13.009-34.298c-5.184-11.072-11.217-21.782-17.972-32.063-5.713-8.613-12.033-17.008-18.825-24.836-7.429-8.451-15.34-16.615-23.837-24.001a258.41 258.41 0 0 0-21.74-16.813 245.17 245.17 0 0 0-22.626-13.999 223.73 223.73 0 0 0-28.37-13.013c-8.978-3.527-18.302-6.42-27.606-8.75-12.535-3.272-25.396-5.347-38.353-6.65-4.936-0.498-9.863-0.714-14.789-0.93-2.217-0.112-4.434-0.224-6.642-0.055-0.501-0.274-0.993-0.267-1.485-0.261z"/> + <path d="m479.4-504.04c0.925 0.04 2.022 0.013 2.947 0.052 2.124 0.072 4.35 0.203 6.504 0.457a78.452 78.452 0 0 1 16.376 3.517 81.74 81.74 0 0 1 16.997 7.834c3.786 2.35 7.357 5.072 10.685 7.983 2.383 2.2 4.695 4.525 6.936 6.974 1.602 1.914 3.204 3.828 4.632 5.807 1.064 1.44 2.057 3.002 3.05 4.565 5.794 8.952 9.919 18.92 12.874 29.038 0.444 1.576 0.888 3.152 1.23 4.669 0.474 1.758 0.846 3.457 1.249 5.339 0.492 2.428 0.955 4.674 1.346 7.044 0.512 3.1 0.952 6.322 1.392 9.545 0.52 4.258 0.764 8.523 0.938 12.91 0.21 5.73 0.32 11.401 0.155 17.078-0.27 7.266-0.814 14.538-1.562 21.694-1.149 9.726-2.603 19.277-4.504 28.9a426.41 426.41 0 0 1-7.978 32.338c-3.39 11.732-7.359 23.294-11.703 34.805-5.07 13.235-10.72 26.302-16.846 39.257-6.228 12.898-12.862 25.56-20.105 37.871-7.285 12.617-15.178 24.882-23.406 36.79-7.942 11.412-16.29 22.59-25.177 33.293-7.582 9.147-15.468 18.118-23.79 26.672-7.691 7.93-15.615 15.559-23.975 22.772-5.774 5.078-11.853 9.98-18.063 14.64-6.21 4.662-12.551 9.082-19.126 13.203-5.74 3.613-11.51 7.043-17.544 9.992-5.169 2.623-10.439 5.188-15.871 7.33-8.616 3.436-17.495 6.391-26.585 8.07-7.647 1.523-15.586 2.382-23.432 2.14-4.32-0.02-8.628-0.528-12.865-1.16-4.165-0.756-8.36-1.694-12.443-3.061-5.922-1.934-11.516-4.67-16.651-7.964-3.888-2.41-7.388-5.255-10.817-8.224-2.383-2.201-4.696-4.526-6.865-7.098a52.06 52.06 0 0 1-4.297-5.45c-0.963-1.38-1.926-2.76-2.787-4.082-5.59-8.835-9.757-18.498-12.713-28.615-0.443-1.576-0.887-3.152-1.23-4.669-0.503-1.94-1.007-3.88-1.338-5.885-0.625-2.67-1.076-5.404-1.527-8.139-0.44-3.223-0.88-6.446-1.22-9.61-0.519-4.258-0.692-8.646-0.937-12.91-0.21-5.73-0.147-11.466 0.018-17.143 0.27-7.266 0.814-14.538 1.633-21.817 1.15-9.727 2.675-19.402 4.677-28.966 2.199-10.605 4.773-21.159 7.824-31.602 3.42-11.55 7.246-22.864 11.448-34.128 4.814-12.558 10.035-24.882 15.763-36.914a544.79 544.79 0 0 1 20.33-38.73 559.99 559.99 0 0 1 23.734-37.59c7.555-10.976 15.689-21.783 24.086-32.108a477.59 477.59 0 0 1 23.2-26.353c7.834-8.177 15.901-16.054 24.475-23.638 5.703-4.954 11.435-9.726 17.472-14.322 5.865-4.531 11.86-8.821 18.09-12.811 5.394-3.483 10.818-6.784 16.475-9.784 5.312-2.871 10.827-5.625 16.402-8.014a175.51 175.51 0 0 1 22.57-7.914c6.692-1.745 13.646-3.007 20.62-3.599 1.82-0.104 3.71-0.332 5.631-0.377l2.47-0.058c0.58 0.169 0.853 0.162 1.128 0.156zm-0.813 27.898c-1.748-0.02-3.466 0.143-5.113 0.182-5.357 0.37-10.624 1.288-15.729 2.629-7.139 1.816-13.984 4.296-20.74 7.322-4.71 2.064-9.288 4.368-13.664 6.79a188.02 188.02 0 0 0-15.021 9.14c-5.466 3.606-10.729 7.33-15.931 11.418-5.447 4.277-10.864 8.736-16.078 13.312-7.21 6.393-14.186 13.085-20.757 20.012-7.447 7.74-14.558 15.84-21.467 24.0
