Mercurial Repositories > Django Tags Menu / changeset
changeset
Ported to PyQt5 and eric6.
Fri, 11 Jul 2014 19:25:03 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 11 Jul 2014 19:25:03 +0200
- changeset 26
- b21b4fc418bc
- parent 24
- 200ccb1e083c
- child 27
- 578756093767
Ported to PyQt5 and eric6.
--- a/.hgignore Sat Apr 26 16:16:18 2014 +0200 +++ b/.hgignore Fri Jul 11 19:25:03 2014 +0200 @@ -1,3 +1,5 @@ +glob:.eric6project +glob:_eric6project glob:.eric5project glob:_eric5project glob:.eric4project
--- a/ChangeLog Sat Apr 26 16:16:18 2014 +0200 +++ b/ChangeLog Fri Jul 11 19:25:03 2014 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 2.0.0: +- ported for eric6 using PyQt5 + Version 1.0.0: - first stable release
--- a/PluginDjangoTagsMenu.e4p Sat Apr 26 16:16:18 2014 +0200 +++ b/PluginDjangoTagsMenu.e4p Fri Jul 11 19:25:03 2014 +0200 @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Project SYSTEM "Project-5.1.dtd"> -<!-- eric5 project file for project PluginDjangoTagsMenu --> +<!-- eric6 project file for project PluginDjangoTagsMenu --> +<!-- Copyright (C) 2014 Detlev Offenbach, detlev@die-offenbachs.de --> <Project version="5.1"> <Language>en_US</Language> <Hash>fac07f0675a7c77618ebfac9d2cbbfb763f751f3</Hash> <ProgLanguage mixed="0">Python3</ProgLanguage> - <ProjectType>E4Plugin</ProjectType> + <ProjectType>E6Plugin</ProjectType> <Description>This plug-in adds a menu to select various tag templates to the Django menu.</Description> <Version>0.x</Version> <Author>Detlev Offenbach</Author> @@ -184,7 +185,7 @@ <string>cssFile</string> </key> <value> - <string>%PYTHON%/eric5/CSSs/default.css</string> + <string>%PYTHON%/eric6/CSSs/default.css</string> </value> <key> <string>ignoreDirectories</string> @@ -196,6 +197,7 @@ <string>_eric5project</string> <string>_ropeproject</string> <string>.hg</string> + <string>.eric6project</string> </list> </value> <key> @@ -261,7 +263,7 @@ <string>ExcludeMessages</string> </key> <value> - <string>W293, N802, N803, N807, N808, N821</string> + <string>W293, N802, N803, N807, N808, N821, E265</string> </value> <key> <string>FixCodes</string> @@ -305,6 +307,12 @@ <value> <bool>True</bool> </value> + <key> + <string>ShowIgnored</string> + </key> + <value> + <bool>False</bool> + </value> </dict> </value> </dict>
--- a/PluginProjectDjangoTagsMenu.py Sat Apr 26 16:16:18 2014 +0200 +++ b/PluginProjectDjangoTagsMenu.py Fri Jul 11 19:25:03 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QObject, QTranslator -from PyQt4.QtGui import QMenu +from PyQt5.QtCore import QObject, QTranslator +from PyQt5.QtWidgets import QMenu from E5Gui.E5Application import e5App @@ -23,7 +23,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "1.0.0" +version = "2.0.0" className = "ProjectDjangoTagsMenuPlugin" packageName = "ProjectDjangoTagsMenu" shortDescription = "Tags menu for Django projects."
--- a/ProjectDjangoTagsMenu/DjangoTagInputDialog.py Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/DjangoTagInputDialog.py Fri Jul 11 19:25:03 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox, QVBoxLayout, QLabel +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel from E5Gui.E5LineEdit import E5ClearableLineEdit @@ -69,7 +69,7 @@ @staticmethod def getText(parent, title, labels, defaults=[]): """ - Static method to create the dialog and return the entered data. + Public static method to create the dialog and return the entered data. @param parent reference to the parent widget (QWidget) @param title title of the dialog (string)
--- a/ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py Fri Jul 11 19:25:03 2014 +0200 @@ -16,8 +16,8 @@ import os import datetime -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QMenu, QInputDialog, QDialog, QApplication +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QMenu, QInputDialog, QDialog, QApplication from E5Gui.E5Application import e5App from E5Gui import E5FileDialog, E5MessageBox
--- a/ProjectDjangoTagsMenu/Documentation/source/Plugin_Project_Django_Tags_Menu.ProjectDjangoTagsMenu.DjangoTagInputDialog.html Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/Documentation/source/Plugin_Project_Django_Tags_Menu.ProjectDjangoTagsMenu.DjangoTagInputDialog.html Fri Jul 11 19:25:03 2014 +0200 @@ -68,7 +68,7 @@ <table> <tr> <td><a href="#DjangoTagInputDialog.getText">getText</a></td> -<td>Static method to create the dialog and return the entered data.</td> +<td>Public static method to create the dialog and return the entered data.</td> </tr> </table> <a NAME="DjangoTagInputDialog.__init__" ID="DjangoTagInputDialog.__init__"></a> @@ -102,7 +102,7 @@ <h4>DjangoTagInputDialog.getText (static)</h4> <b>getText</b>(<i>title, labels, defaults=[]</i>) <p> - Static method to create the dialog and return the entered data. + Public static method to create the dialog and return the entered data. </p><dl> <dt><i>parent</i></dt> <dd>
--- a/ProjectDjangoTagsMenu/Documentation/source/Plugin_Project_Django_Tags_Menu.ProjectDjangoTagsMenu.IeCommentDialog.html Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/Documentation/source/Plugin_Project_Django_Tags_Menu.ProjectDjangoTagsMenu.IeCommentDialog.html Fri Jul 11 19:25:03 2014 +0200 @@ -68,7 +68,7 @@ <table> <tr> <td><a href="#IeCommentDialog.getTag">getTag</a></td> -<td>Static method to get the formatted tag.</td> +<td>Public static method to get the formatted tag.</td> </tr> </table> <a NAME="IeCommentDialog.__init__" ID="IeCommentDialog.__init__"></a> @@ -95,7 +95,7 @@ <h4>IeCommentDialog.getTag (static)</h4> <b>getTag</b>(<i></i>) <p> - Static method to get the formatted tag. + Public static method to get the formatted tag. </p><dl> <dt><i>selectedText</i></dt> <dd>
--- a/ProjectDjangoTagsMenu/Documentation/source/Plugin_Project_Django_Tags_Menu.ProjectDjangoTagsMenu.MultiLineInputDialog.html Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/Documentation/source/Plugin_Project_Django_Tags_Menu.ProjectDjangoTagsMenu.MultiLineInputDialog.html Fri Jul 11 19:25:03 2014 +0200 @@ -68,7 +68,7 @@ <table> <tr> <td><a href="#MultiLineInputDialog.getText">getText</a></td> -<td>Static method to create the dialog and return the multi line text.</td> +<td>Public static method to create the dialog and return the multi line text.</td> </tr> </table> <a NAME="MultiLineInputDialog.__init__" ID="MultiLineInputDialog.__init__"></a> @@ -101,7 +101,8 @@ <h4>MultiLineInputDialog.getText (static)</h4> <b>getText</b>(<i>title, label, default=""</i>) <p> - Static method to create the dialog and return the multi line text. + Public static method to create the dialog and return the multi line + text. </p><dl> <dt><i>parent</i></dt> <dd>
--- a/ProjectDjangoTagsMenu/Documentation/source/Plugin_Project_Django_Tags_Menu.ProjectDjangoTagsMenu.TimezoneSelectionDialog.html Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/Documentation/source/Plugin_Project_Django_Tags_Menu.ProjectDjangoTagsMenu.TimezoneSelectionDialog.html Fri Jul 11 19:25:03 2014 +0200 @@ -77,7 +77,7 @@ <table> <tr> <td><a href="#TimezoneSelectionDialog.getTimezone">getTimezone</a></td> -<td>Static method to select a time zone.</td> +<td>Public static method to select a time zone.</td> </tr> </table> <a NAME="TimezoneSelectionDialog.__init__" ID="TimezoneSelectionDialog.__init__"></a> @@ -124,7 +124,7 @@ <h4>TimezoneSelectionDialog.getTimezone (static)</h4> <b>getTimezone</b>(<i></i>) <p> - Static method to select a time zone. + Public static method to select a time zone. </p><dl> <dt><i>parent</i></dt> <dd>
--- a/ProjectDjangoTagsMenu/FindTemplateTagDialog.py Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/FindTemplateTagDialog.py Fri Jul 11 19:25:03 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, pyqtSlot -from PyQt4.QtGui import QDialog, QCompleter +from PyQt5.QtCore import pyqtSignal, pyqtSlot +from PyQt5.QtWidgets import QDialog, QCompleter from .Ui_FindTemplateTagDialog import Ui_FindTemplateTagDialog
--- a/ProjectDjangoTagsMenu/IeCommentDialog.py Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/IeCommentDialog.py Fri Jul 11 19:25:03 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_IeCommentDialog import Ui_IeCommentDialog @@ -47,7 +47,7 @@ @staticmethod def getTag(selectedText): """ - Static method to get the formatted tag. + Public static method to get the formatted tag. @param selectedText selected text to embed (string) @return formatted tag (string) and a flag indicating the acceptance
--- a/ProjectDjangoTagsMenu/IfTagInputDialog.py Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/IfTagInputDialog.py Fri Jul 11 19:25:03 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_IfTagInputDialog import Ui_IfTagInputDialog
--- a/ProjectDjangoTagsMenu/LoremTagInputDialog.py Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/LoremTagInputDialog.py Fri Jul 11 19:25:03 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_LoremTagInputDialog import Ui_LoremTagInputDialog
--- a/ProjectDjangoTagsMenu/MultiLineInputDialog.py Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/MultiLineInputDialog.py Fri Jul 11 19:25:03 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_MultiLineInputDialog import Ui_MultiLineInputDialog @@ -40,7 +40,8 @@ @staticmethod def getText(parent, title, label, default=""): """ - Static method to create the dialog and return the multi line text. + Public static method to create the dialog and return the multi line + text. @param parent reference to the parent widget (QWidget) @param title title of the dialog (string)
--- a/ProjectDjangoTagsMenu/TimezoneSelectionDialog.py Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/TimezoneSelectionDialog.py Fri Jul 11 19:25:03 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_TimezoneSelectionDialog import Ui_TimezoneSelectionDialog @@ -570,7 +570,7 @@ @staticmethod def getTimezone(parent=None): """ - Static method to select a time zone. + Public static method to select a time zone. @param parent reference to the parent widget (QWidget) @return tuple of selected time zone (string) and flag indicating
--- a/ProjectDjangoTagsMenu/i18n/djangotagsmenu_de.ts Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/i18n/djangotagsmenu_de.ts Fri Jul 11 19:25:03 2014 +0200 @@ -1433,7 +1433,7 @@ <context> <name>ProjectDjangoTagsMenuPlugin</name> <message> - <location filename="../../PluginProjectDjangoTagsMenu.py" line="66"/> + <location filename="../../PluginProjectDjangoTagsMenu.py" line="67"/> <source>Template Tags</source> <translation>Tag Vorlagen</translation> </message>
--- a/ProjectDjangoTagsMenu/i18n/djangotagsmenu_en.ts Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/i18n/djangotagsmenu_en.ts Fri Jul 11 19:25:03 2014 +0200 @@ -1433,7 +1433,7 @@ <context> <name>ProjectDjangoTagsMenuPlugin</name> <message> - <location filename="../../PluginProjectDjangoTagsMenu.py" line="66"/> + <location filename="../../PluginProjectDjangoTagsMenu.py" line="67"/> <source>Template Tags</source> <translation type="unfinished"></translation> </message>
--- a/ProjectDjangoTagsMenu/i18n/djangotagsmenu_es.ts Sat Apr 26 16:16:18 2014 +0200 +++ b/ProjectDjangoTagsMenu/i18n/djangotagsmenu_es.ts Fri Jul 11 19:25:03 2014 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="es_ES"> +<!DOCTYPE TS><TS version="2.0" language="es_ES" sourcelanguage=""> <context> <name>DjangoTagsMenuHandler</name> <message> @@ -1434,7 +1433,7 @@ <context> <name>ProjectDjangoTagsMenuPlugin</name> <message> - <location filename="../../PluginProjectDjangoTagsMenu.py" line="66"/> + <location filename="../../PluginProjectDjangoTagsMenu.py" line="67"/> <source>Template Tags</source> <translation>Template Tags</translation> </message>
