Mercurial Repositories > Color String Tool / changeset
changeset
Removed support for Python2.
Wed, 24 Jun 2020 17:51:28 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 24 Jun 2020 17:51:28 +0200
- changeset 40
- e0086d2cb15d
- parent 39
- a72b02f76b16
- child 41
- 77de96a63b89
Removed support for Python2.
--- a/ChangeLog Wed Jan 01 11:59:02 2020 +0100 +++ b/ChangeLog Wed Jun 24 17:51:28 2020 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 3.0.0: +- removed support for Python2 + Version 2.2.3: - bug fixes
--- a/ColorString.e4p Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString.e4p Wed Jun 24 17:51:28 2020 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Project SYSTEM "Project-5.1.dtd"> <!-- eric project file for project ColorString --> -<!-- Copyright (C) 2017 Detlev Offenbach, detlev@die-offenbachs.de --> +<!-- Copyright (C) 2020 Detlev Offenbach, detlev@die-offenbachs.de --> <Project version="5.1"> <Language>en_US</Language> <Hash>bf7dfc760db7f57239ae96b215ea79bb0df717d5</Hash> @@ -33,8 +33,6 @@ <Translation>ColorString/i18n/colorstring_ru.qm</Translation> <Translation>ColorString/i18n/colorstring_ru.ts</Translation> </Translations> - <Resources/> - <Interfaces/> <Others> <Other>.hgignore</Other> <Other>ChangeLog</Other> @@ -235,6 +233,34 @@ <value> <dict> <key> + <string>AnnotationsChecker</string> + </key> + <value> + <dict> + <key> + <string>MaximumComplexity</string> + </key> + <value> + <int>3</int> + </value> + <key> + <string>MinimumCoverage</string> + </key> + <value> + <int>75</int> + </value> + </dict> + </value> + <key> + <string>BlankLines</string> + </key> + <value> + <tuple> + <int>2</int> + <int>1</int> + </tuple> + </value> + <key> <string>BuiltinsChecker</string> </key> <value> @@ -266,6 +292,19 @@ </dict> </value> <key> + <string>CommentedCodeChecker</string> + </key> + <value> + <dict> + <key> + <string>Aggressive</string> + </key> + <value> + <bool>False</bool> + </value> + </dict> + </value> + <key> <string>CopyrightAuthor</string> </key> <value> @@ -284,6 +323,12 @@ <string>eric</string> </value> <key> + <string>EnabledCheckerCategories</string> + </key> + <value> + <string>C, D, E, M, N, S, W</string> + </value> + <key> <string>ExcludeFiles</string> </key> <value> @@ -293,7 +338,7 @@ <string>ExcludeMessages</string> </key> <value> - <string>C101, E265, E266, E305, E402, M811, N802, N803, N807, N808, N821, W293</string> + <string>C101,E265,E266,E305,E402,M811,N802,N803,N807,N808,N821,W293</string> </value> <key> <string>FixCodes</string> @@ -311,7 +356,7 @@ <string>FutureChecker</string> </key> <value> - <string>unicode_literals</string> + <string></string> </value> <key> <string>HangClosing</string> @@ -344,6 +389,12 @@ <int>10</int> </value> <key> + <string>MaxDocLineLength</string> + </key> + <value> + <int>79</int> + </value> + <key> <string>MaxLineLength</string> </key> <value> @@ -362,6 +413,91 @@ <bool>True</bool> </value> <key> + <string>SecurityChecker</string> + </key> + <value> + <dict> + <key> + <string>CheckTypedException</string> + </key> + <value> + <bool>False</bool> + </value> + <key> + <string>HardcodedTmpDirectories</string> + </key> + <value> + <list> + <string>/tmp</string> + <string>/var/tmp</string> + <string>/dev/shm</string> + <string>~/tmp</string> + </list> + </value> + <key> + <string>InsecureHashes</string> + </key> + <value> + <list> + <string>md4</string> + <string>md5</string> + <string>sha</string> + <string>sha1</string> + </list> + </value> + <key> + <string>InsecureSslProtocolVersions</string> + </key> + <value> + <list> + <string>PROTOCOL_SSLv2</string> + <string>SSLv2_METHOD</string> + <string>SSLv23_METHOD</string> + <string>PROTOCOL_SSLv3</string> + <string>PROTOCOL_TLSv1</string> + <string>SSLv3_METHOD</string> + <string>TLSv1_METHOD</string> + </list> + </value> + <key> + <string>WeakKeySizeDsaHigh</string> + </key> + <value> + <string>1024</string> + </value> + <key> + <string>WeakKeySizeDsaMedium</string> + </key> + <value> + <string>2048</string> + </value> + <key> + <string>WeakKeySizeEcHigh</string> + </key> + <value> + <string>160</string> + </value> + <key> + <string>WeakKeySizeEcMedium</string> + </key> + <value> + <string>224</string> + </value> + <key> + <string>WeakKeySizeRsaHigh</string> + </key> + <value> + <string>1024</string> + </value> + <key> + <string>WeakKeySizeRsaMedium</string> + </key> + <value> + <string>2048</string> + </value> + </dict> + </value> + <key> <string>ShowIgnored</string> </key> <value>
--- a/ColorString/ColorSelectionDialog.py Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/ColorSelectionDialog.py Wed Jun 24 17:51:28 2020 +0200 @@ -7,8 +7,6 @@ Module implementing a dialog to select a color by name. """ -from __future__ import unicode_literals - from PyQt5.QtGui import QColor, QPixmap, QIcon from PyQt5.QtWidgets import QDialog
--- a/ColorString/Documentation/source/Plugin_Tools_ColorString.ColorString.ColorSelectionDialog.html Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/Documentation/source/Plugin_Tools_ColorString.ColorString.ColorSelectionDialog.html Wed Jun 24 17:51:28 2020 +0200 @@ -18,76 +18,98 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>Plugin_Tools_ColorString.ColorString.ColorSelectionDialog</h1> + <p> Module implementing a dialog to select a color by name. </p> <h3>Global Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#ColorSelectionDialog">ColorSelectionDialog</a></td> <td>Class implementing a dialog to select a color by name.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="ColorSelectionDialog" ID="ColorSelectionDialog"></a> <h2>ColorSelectionDialog</h2> + <p> Class implementing a dialog to select a color by name. </p> <h3>Derived from</h3> QDialog, Ui_ColorSelectionDialog <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="#ColorSelectionDialog.__init__">ColorSelectionDialog</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorSelectionDialog.getColor">getColor</a></td> <td>Public method to retrieve the selected color name.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="ColorSelectionDialog.__init__" ID="ColorSelectionDialog.__init__"></a> <h4>ColorSelectionDialog (Constructor)</h4> <b>ColorSelectionDialog</b>(<i>selectedName="", parent=None</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>selectedName</i></dt> <dd> name of the color to be selected initially (string) -</dd><dt><i>parent</i></dt> +</dd> +<dt><i>parent</i></dt> <dd> reference to the parent widget (QWidget) </dd> -</dl><a NAME="ColorSelectionDialog.getColor" ID="ColorSelectionDialog.getColor"></a> +</dl> +<a NAME="ColorSelectionDialog.getColor" ID="ColorSelectionDialog.getColor"></a> <h4>ColorSelectionDialog.getColor</h4> <b>getColor</b>(<i></i>) + <p> Public method to retrieve the selected color name. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> color name (string)
--- a/ColorString/Documentation/source/Plugin_Tools_ColorString.PluginColorString.html Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/Documentation/source/Plugin_Tools_ColorString.PluginColorString.html Wed Jun 24 17:51:28 2020 +0200 @@ -18,239 +18,319 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>Plugin_Tools_ColorString.PluginColorString</h1> + <p> Module implementing the 'Color String' tool plug-in. </p> <h3>Global Attributes</h3> + <table> -<tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>error</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>python2Compatible</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr> +<tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>error</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#ColorStringPlugin">ColorStringPlugin</a></td> <td>Class implementing the 'Color String' tool plug-in.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="ColorStringPlugin" ID="ColorStringPlugin"></a> <h2>ColorStringPlugin</h2> + <p> Class implementing the 'Color String' tool plug-in. </p> <h3>Derived from</h3> QObject <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="#ColorStringPlugin.__init__">ColorStringPlugin</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__editorClosed">__editorClosed</a></td> <td>Private slot called, when an editor was closed.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__editorOpened">__editorOpened</a></td> <td>Private slot called, when a new editor was opened.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__editorShowMenu">__editorShowMenu</a></td> <td>Private slot called, when the the editor context menu or a submenu is about to be shown.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__initMenu">__initMenu</a></td> <td>Private method to initialize the menu.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__isHexString">__isHexString</a></td> <td>Private method to check, if a given text is a hex string.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__isValidColor">__isValidColor</a></td> <td>Private method to check for a valid color name.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__isValidRgbaColor">__isValidRgbaColor</a></td> <td>Private method to check for a valid RGBA color.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__loadTranslator">__loadTranslator</a></td> <td>Private method to load the translation file.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__populateMenu">__populateMenu</a></td> <td>Private slot to populate the tools menu with our entry.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__selectColorName">__selectColorName</a></td> <td>Private slot implementing the named color string selection.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__selectHexColor">__selectHexColor</a></td> <td>Private slot implementing the hex color string selection.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.__selectRgbaColor">__selectRgbaColor</a></td> <td>Private slot implementing the RGBA color string selection.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.activate">activate</a></td> <td>Public method to activate this plugin.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ColorStringPlugin.deactivate">deactivate</a></td> <td>Public method to deactivate this plugin.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="ColorStringPlugin.__init__" ID="ColorStringPlugin.__init__"></a> <h4>ColorStringPlugin (Constructor)</h4> <b>ColorStringPlugin</b>(<i>ui</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>ui</i></dt> <dd> reference to the user interface object (UI.UserInterface) </dd> -</dl><a NAME="ColorStringPlugin.__editorClosed" ID="ColorStringPlugin.__editorClosed"></a> +</dl> +<a NAME="ColorStringPlugin.__editorClosed" ID="ColorStringPlugin.__editorClosed"></a> <h4>ColorStringPlugin.__editorClosed</h4> <b>__editorClosed</b>(<i>editor</i>) + <p> Private slot called, when an editor was closed. -</p><dl> +</p> +<dl> + <dt><i>editor</i></dt> <dd> reference to the editor (QScintilla.Editor) </dd> -</dl><a NAME="ColorStringPlugin.__editorOpened" ID="ColorStringPlugin.__editorOpened"></a> +</dl> +<a NAME="ColorStringPlugin.__editorOpened" ID="ColorStringPlugin.__editorOpened"></a> <h4>ColorStringPlugin.__editorOpened</h4> <b>__editorOpened</b>(<i>editor</i>) + <p> Private slot called, when a new editor was opened. -</p><dl> +</p> +<dl> + <dt><i>editor</i></dt> <dd> reference to the new editor (QScintilla.Editor) </dd> -</dl><a NAME="ColorStringPlugin.__editorShowMenu" ID="ColorStringPlugin.__editorShowMenu"></a> +</dl> +<a NAME="ColorStringPlugin.__editorShowMenu" ID="ColorStringPlugin.__editorShowMenu"></a> <h4>ColorStringPlugin.__editorShowMenu</h4> <b>__editorShowMenu</b>(<i>menuName, menu, editor</i>) + <p> Private slot called, when the the editor context menu or a submenu is about to be shown. -</p><dl> +</p> +<dl> + <dt><i>menuName</i></dt> <dd> name of the menu to be shown (string) -</dd><dt><i>menu</i></dt> +</dd> +<dt><i>menu</i></dt> <dd> reference to the menu (QMenu) -</dd><dt><i>editor</i></dt> +</dd> +<dt><i>editor</i></dt> <dd> reference to the editor </dd> -</dl><a NAME="ColorStringPlugin.__initMenu" ID="ColorStringPlugin.__initMenu"></a> +</dl> +<a NAME="ColorStringPlugin.__initMenu" ID="ColorStringPlugin.__initMenu"></a> <h4>ColorStringPlugin.__initMenu</h4> <b>__initMenu</b>(<i></i>) + <p> Private method to initialize the menu. -</p><a NAME="ColorStringPlugin.__isHexString" ID="ColorStringPlugin.__isHexString"></a> +</p> +<a NAME="ColorStringPlugin.__isHexString" ID="ColorStringPlugin.__isHexString"></a> <h4>ColorStringPlugin.__isHexString</h4> <b>__isHexString</b>(<i>text</i>) + <p> Private method to check, if a given text is a hex string. -</p><dl> +</p> +<dl> + <dt><i>text</i></dt> <dd> text to check (string) </dd> -</dl><dl> +</dl> +<dl> <dt>Returns:</dt> <dd> flag indicating a hex string (boolean) </dd> -</dl><a NAME="ColorStringPlugin.__isValidColor" ID="ColorStringPlugin.__isValidColor"></a> +</dl> +<a NAME="ColorStringPlugin.__isValidColor" ID="ColorStringPlugin.__isValidColor"></a> <h4>ColorStringPlugin.__isValidColor</h4> <b>__isValidColor</b>(<i>name</i>) + <p> Private method to check for a valid color name. -</p><dl> +</p> +<dl> + <dt><i>name</i></dt> <dd> color name to check (string) </dd> -</dl><dl> +</dl> +<dl> <dt>Returns:</dt> <dd> flag indicating a valid color name (boolean) </dd> -</dl><a NAME="ColorStringPlugin.__isValidRgbaColor" ID="ColorStringPlugin.__isValidRgbaColor"></a> +</dl> +<a NAME="ColorStringPlugin.__isValidRgbaColor" ID="ColorStringPlugin.__isValidRgbaColor"></a> <h4>ColorStringPlugin.__isValidRgbaColor</h4> <b>__isValidRgbaColor</b>(<i>color</i>) + <p> Private method to check for a valid RGBA color. -</p><dl> +</p> +<dl> + <dt><i>color</i></dt> <dd> color string to check (string) </dd> -</dl><dl> +</dl> +<dl> <dt>Returns:</dt> <dd> flag indicating a valid RGBA color (boolean) and a list with the RGBA components of the color (three or four integers) </dd> -</dl><a NAME="ColorStringPlugin.__loadTranslator" ID="ColorStringPlugin.__loadTranslator"></a> +</dl> +<a NAME="ColorStringPlugin.__loadTranslator" ID="ColorStringPlugin.__loadTranslator"></a> <h4>ColorStringPlugin.__loadTranslator</h4> <b>__loadTranslator</b>(<i></i>) + <p> Private method to load the translation file. -</p><a NAME="ColorStringPlugin.__populateMenu" ID="ColorStringPlugin.__populateMenu"></a> +</p> +<a NAME="ColorStringPlugin.__populateMenu" ID="ColorStringPlugin.__populateMenu"></a> <h4>ColorStringPlugin.__populateMenu</h4> <b>__populateMenu</b>(<i>name, menu</i>) + <p> Private slot to populate the tools menu with our entry. -</p><dl> +</p> +<dl> + <dt><i>name</i></dt> <dd> name of the menu (string) -</dd><dt><i>menu</i></dt> +</dd> +<dt><i>menu</i></dt> <dd> reference to the menu to be populated (QMenu) </dd> -</dl><a NAME="ColorStringPlugin.__selectColorName" ID="ColorStringPlugin.__selectColorName"></a> +</dl> +<a NAME="ColorStringPlugin.__selectColorName" ID="ColorStringPlugin.__selectColorName"></a> <h4>ColorStringPlugin.__selectColorName</h4> <b>__selectColorName</b>(<i></i>) + <p> Private slot implementing the named color string selection. -</p><a NAME="ColorStringPlugin.__selectHexColor" ID="ColorStringPlugin.__selectHexColor"></a> +</p> +<a NAME="ColorStringPlugin.__selectHexColor" ID="ColorStringPlugin.__selectHexColor"></a> <h4>ColorStringPlugin.__selectHexColor</h4> <b>__selectHexColor</b>(<i></i>) + <p> Private slot implementing the hex color string selection. -</p><a NAME="ColorStringPlugin.__selectRgbaColor" ID="ColorStringPlugin.__selectRgbaColor"></a> +</p> +<a NAME="ColorStringPlugin.__selectRgbaColor" ID="ColorStringPlugin.__selectRgbaColor"></a> <h4>ColorStringPlugin.__selectRgbaColor</h4> <b>__selectRgbaColor</b>(<i></i>) + <p> Private slot implementing the RGBA color string selection. -</p><a NAME="ColorStringPlugin.activate" ID="ColorStringPlugin.activate"></a> +</p> +<a NAME="ColorStringPlugin.activate" ID="ColorStringPlugin.activate"></a> <h4>ColorStringPlugin.activate</h4> <b>activate</b>(<i></i>) + <p> Public method to activate this plugin. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> tuple of None and activation status (boolean) </dd> -</dl><a NAME="ColorStringPlugin.deactivate" ID="ColorStringPlugin.deactivate"></a> +</dl> +<a NAME="ColorStringPlugin.deactivate" ID="ColorStringPlugin.deactivate"></a> <h4>ColorStringPlugin.deactivate</h4> <b>deactivate</b>(<i></i>) + <p> Public method to deactivate this plugin. </p>
--- a/ColorString/Documentation/source/index-Plugin_Tools_ColorString.ColorString.html Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/Documentation/source/index-Plugin_Tools_ColorString.ColorString.html Wed Jun 24 17:51:28 2020 +0200 @@ -20,6 +20,7 @@ </head> <body> <h1>Plugin_Tools_ColorString.ColorString</h1> + <p> Package implementing the 'Color String' tool plug-in dialogs and data. </p> @@ -27,6 +28,7 @@ <h3>Modules</h3> <table> + <tr> <td><a href="Plugin_Tools_ColorString.ColorString.ColorSelectionDialog.html">ColorSelectionDialog</a></td> <td>Module implementing a dialog to select a color by name.</td>
--- a/ColorString/Documentation/source/index-Plugin_Tools_ColorString.html Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/Documentation/source/index-Plugin_Tools_ColorString.html Wed Jun 24 17:51:28 2020 +0200 @@ -20,12 +20,14 @@ </head> <body> <h1>Plugin_Tools_ColorString</h1> + <p> Package implementing the 'Color String' tool plug-in. </p> <h3>Packages</h3> <table> + <tr> <td><a href="index-Plugin_Tools_ColorString.ColorString.html">ColorString</a></td> <td>Package implementing the 'Color String' tool plug-in dialogs and data.</td> @@ -34,6 +36,7 @@ <h3>Modules</h3> <table> + <tr> <td><a href="Plugin_Tools_ColorString.PluginColorString.html">PluginColorString</a></td> <td>Module implementing the 'Color String' tool plug-in.</td>
--- a/ColorString/Documentation/source/index.html Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/Documentation/source/index.html Wed Jun 24 17:51:28 2020 +0200 @@ -24,6 +24,7 @@ <h3>Packages</h3> <table> + <tr> <td><a href="index-Plugin_Tools_ColorString.html">Plugin_Tools_ColorString</a></td> <td>Package implementing the 'Color String' tool plug-in.</td>
--- a/ColorString/i18n/colorstring_de.ts Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/i18n/colorstring_de.ts Wed Jun 24 17:51:28 2020 +0200 @@ -3,17 +3,17 @@ <context> <name>ColorSelectionDialog</name> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="14"/> + <location filename="../ColorSelectionDialog.ui" line="14"/> <source>Color String</source> <translation>Farbzeichenkette</translation> </message> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="23"/> + <location filename="../ColorSelectionDialog.ui" line="23"/> <source>Select Color Name:</source> <translation>Wähle den Farbnamen:</translation> </message> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="30"/> + <location filename="../ColorSelectionDialog.ui" line="30"/> <source>Select a color by name</source> <translation>Wähle eine Farbe über ihren Namen</translation> </message> @@ -21,32 +21,32 @@ <context> <name>ColorStringPlugin</name> <message> - <location filename="../../PluginColorString.py" line="340"/> + <location filename="../../PluginColorString.py" line="353"/> <source>Color String</source> <translation>Farbzeichenkette</translation> </message> <message> - <location filename="../../PluginColorString.py" line="328"/> + <location filename="../../PluginColorString.py" line="341"/> <source><p>The selected string <b>{0}</b> is not a valid color string. Aborting!</p></source> <translation><p>Die ausgewählte Zeichenkette <b>{0}</b> ist keine gültige Farbe. Abbruch!</p></translation> </message> <message> - <location filename="../../PluginColorString.py" line="291"/> + <location filename="../../PluginColorString.py" line="305"/> <source><p>The selected string <b>{0}</b> is not a valid color name. Aborting!</p></source> <translation><p>Die ausgewählte Zeichenkette <b>{0}</b> ist kein gültiger Farbname. Abbruch!</p></translation> </message> <message> - <location filename="../../PluginColorString.py" line="129"/> + <location filename="../../PluginColorString.py" line="141"/> <source>Hex Color</source> <translation>Hex Farbe</translation> </message> <message> - <location filename="../../PluginColorString.py" line="130"/> + <location filename="../../PluginColorString.py" line="142"/> <source>Color Name</source> <translation>Farbname</translation> </message> <message> - <location filename="../../PluginColorString.py" line="131"/> + <location filename="../../PluginColorString.py" line="143"/> <source>RGBA Color</source> <translation>RGBA Farbe</translation> </message>
--- a/ColorString/i18n/colorstring_en.ts Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/i18n/colorstring_en.ts Wed Jun 24 17:51:28 2020 +0200 @@ -3,17 +3,17 @@ <context> <name>ColorSelectionDialog</name> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="14"/> + <location filename="../ColorSelectionDialog.ui" line="14"/> <source>Color String</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="23"/> + <location filename="../ColorSelectionDialog.ui" line="23"/> <source>Select Color Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="30"/> + <location filename="../ColorSelectionDialog.ui" line="30"/> <source>Select a color by name</source> <translation type="unfinished"></translation> </message> @@ -21,32 +21,32 @@ <context> <name>ColorStringPlugin</name> <message> - <location filename="../../PluginColorString.py" line="340"/> + <location filename="../../PluginColorString.py" line="353"/> <source>Color String</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../PluginColorString.py" line="328"/> + <location filename="../../PluginColorString.py" line="341"/> <source><p>The selected string <b>{0}</b> is not a valid color string. Aborting!</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../PluginColorString.py" line="291"/> + <location filename="../../PluginColorString.py" line="305"/> <source><p>The selected string <b>{0}</b> is not a valid color name. Aborting!</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../PluginColorString.py" line="129"/> + <location filename="../../PluginColorString.py" line="141"/> <source>Hex Color</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../PluginColorString.py" line="130"/> + <location filename="../../PluginColorString.py" line="142"/> <source>Color Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../PluginColorString.py" line="131"/> + <location filename="../../PluginColorString.py" line="143"/> <source>RGBA Color</source> <translation type="unfinished"></translation> </message>
--- a/ColorString/i18n/colorstring_es.ts Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/i18n/colorstring_es.ts Wed Jun 24 17:51:28 2020 +0200 @@ -3,17 +3,17 @@ <context> <name>ColorSelectionDialog</name> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="14"/> + <location filename="../ColorSelectionDialog.ui" line="14"/> <source>Color String</source> <translation>Cadena de Color</translation> </message> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="23"/> + <location filename="../ColorSelectionDialog.ui" line="23"/> <source>Select Color Name:</source> <translation>Seleccionar Nombre de Color:</translation> </message> <message> - <location filename="../../ColorString/ColorSelectionDialog.ui" line="30"/> + <location filename="../ColorSelectionDialog.ui" line="30"/> <source>Select a color by name</source> <translation>Seleccionar un color por nombre</translation> </message> @@ -21,32 +21,32 @@ <context> <name>ColorStringPlugin</name> <message> - <location filename="../../PluginColorString.py" line="340"/> + <location filename="../../PluginColorString.py" line="353"/> <source>Color String</source> <translation>Cadena de Color</translation> </message> <message> - <location filename="../../PluginColorString.py" line="328"/> + <location filename="../../PluginColorString.py" line="341"/> <source><p>The selected string <b>{0}</b> is not a valid color string. Aborting!</p></source> <translation><p>La cadena seleccionada<b>{0}</b> no es una cadena de color válida. ¡Abortando!</p></translation> </message> <message> - <location filename="../../PluginColorString.py" line="291"/> + <location filename="../../PluginColorString.py" line="305"/> <source><p>The selected string <b>{0}</b> is not a valid color name. Aborting!</p></source> <translation><p>La cadena seleccionada<b>{0}</b> no es un nombre de color válido. ¡Abortando!</p></translation> </message> <message> - <location filename="../../PluginColorString.py" line="129"/> + <location filename="../../PluginColorString.py" line="141"/> <source>Hex Color</source> <translation>Color Hex</translation> </message> <message> - <location filename="../../PluginColorString.py" line="130"/> + <location filename="../../PluginColorString.py" line="142"/> <source>Color Name</source> <translation>Nombre de Color</translation> </message> <message> - <location filename="../../PluginColorString.py" line="131"/> + <location filename="../../PluginColorString.py" line="143"/> <source>RGBA Color</source> <translation>Color RGBA</translation> </message>
--- a/ColorString/i18n/colorstring_ru.ts Wed Jan 01 11:59:02 2020 +0100 +++ b/ColorString/i18n/colorstring_ru.ts Wed Jun 24 17:51:28 2020 +0200 @@ -21,32 +21,32 @@ <context> <name>ColorStringPlugin</name> <message> - <location filename="../../PluginColorString.py" line="361"/> + <location filename="../../PluginColorString.py" line="353"/> <source>Color String</source> <translation>Строка определения цвета</translation> </message> <message> - <location filename="../../PluginColorString.py" line="349"/> + <location filename="../../PluginColorString.py" line="341"/> <source><p>The selected string <b>{0}</b> is not a valid color string. Aborting!</p></source> <translation><p>Выбранная строка <b>{0}</b> неприменима для определения цвета. Отмена!</p></translation> </message> <message> - <location filename="../../PluginColorString.py" line="312"/> + <location filename="../../PluginColorString.py" line="305"/> <source><p>The selected string <b>{0}</b> is not a valid color name. Aborting!</p></source> <translation><p>Выбранная строка <b>{0}</b> не действительна для названия цвета. Отмена!</p></translation> </message> <message> - <location filename="../../PluginColorString.py" line="144"/> + <location filename="../../PluginColorString.py" line="141"/> <source>Hex Color</source> <translation>Hex Color</translation> </message> <message> - <location filename="../../PluginColorString.py" line="145"/> + <location filename="../../PluginColorString.py" line="142"/> <source>Color Name</source> <translation>Color Name</translation> </message> <message> - <location filename="../../PluginColorString.py" line="146"/> + <location filename="../../PluginColorString.py" line="143"/> <source>RGBA Color</source> <translation>RGBA Color</translation> </message>
--- a/PluginColorString.py Wed Jan 01 11:59:02 2020 +0100 +++ b/PluginColorString.py Wed Jun 24 17:51:28 2020 +0200 @@ -7,8 +7,6 @@ Module implementing the 'Color String' tool plug-in. """ -from __future__ import unicode_literals - import os from PyQt5.QtCore import QObject, QTranslator @@ -23,18 +21,18 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "2.2.3" +version = "3.0.0" className = "ColorStringPlugin" packageName = "ColorString" shortDescription = "Insert color as string" -longDescription = \ - """This plug-in implements a tool to select a color via a""" \ - """ color selection dialog and insert it as a hex string at the""" \ - """ current cursor position. Selected text is used to initialize""" \ +longDescription = ( + """This plug-in implements a tool to select a color via a""" + """ color selection dialog and insert it as a hex string at the""" + """ current cursor position. Selected text is used to initialize""" """ the dialog and is replaced with the new color.""" +) needsRestart = False pyqtApi = 2 -python2Compatible = True # End-Of-Header error = "" @@ -221,10 +219,7 @@ @param text text to check (string) @return flag indicating a hex string (boolean) """ - isHex = True - for c in text: - isHex = isHex and c in "0123456789abcdefABCDEF" - return isHex + return all(map(lambda c: c in "0123456789abcdefABCDEF", text)) def __isValidColor(self, name): """
