Sat, 12 Jul 2014 15:08:19 +0200
Ported to PyQt5 and eric6.
--- a/.hgignore Sat Apr 26 16:00:39 2014 +0200 +++ b/.hgignore Sat Jul 12 15:08:19 2014 +0200 @@ -1,3 +1,5 @@ +glob:.eric6project +glob:_eric6project glob:.eric5project glob:_eric5project glob:.eric4project
--- a/ChangeLog Sat Apr 26 16:00:39 2014 +0200 +++ b/ChangeLog Sat Jul 12 15:08:19 2014 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 2.0.0: +- ported for eric6 using PyQt5 + Version 1.0.0: - first stable release
--- a/PluginSelectionEncloser.py Sat Apr 26 16:00:39 2014 +0200 +++ b/PluginSelectionEncloser.py Sat Jul 12 15:08:19 2014 +0200 @@ -12,8 +12,8 @@ import os import json -from PyQt4.QtCore import QObject, QTranslator, QCoreApplication -from PyQt4.QtGui import QAction, QMenu +from PyQt5.QtCore import QObject, QTranslator, QCoreApplication +from PyQt5.QtWidgets import QAction, QMenu from E5Gui.E5Application import e5App @@ -24,7 +24,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "1.0.0" +version = "2.0.0" className = "SelectionEncloserPlugin" packageName = "SelectionEncloser" shortDescription = "Enclose the selection with a string."
--- a/SelectionEncloser.e4p Sat Apr 26 16:00:39 2014 +0200 +++ b/SelectionEncloser.e4p Sat Jul 12 15:08:19 2014 +0200 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Project SYSTEM "Project-5.1.dtd"> -<!-- eric5 project file for project SelectionEncloser --> +<!-- eric6 project file for project SelectionEncloser --> <!-- Copyright (C) 2014 Detlev Offenbach, detlev@die-offenbachs.de --> <Project version="5.1"> <Language>en_US</Language> <Hash>91f365d0cd272c85920259a5767cf6213841f57c</Hash> <ProgLanguage mixed="0">Python3</ProgLanguage> - <ProjectType>E4Plugin</ProjectType> + <ProjectType>E6Plugin</ProjectType> <Description>Plug-in to enclose the selection of the current editor in a selectable and configurable string.</Description> - <Version>0.1</Version> + <Version>2.x</Version> <Author>Detlev Offenbach</Author> <Email>detlev@die-offenbachs.de</Email> <TranslationPattern>SelectionEncloser/i18n/selectionencloser_%language%.ts</TranslationPattern> @@ -180,7 +180,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> @@ -192,6 +192,8 @@ <string>.hg</string> <string>_ropeproject</string> <string>_eric5project</string> + <string>.eric6project</string> + <string>_eric6project</string> </list> </value> <key>
--- a/SelectionEncloser/ConfigurationPage/SelectionEncloserEditDialog.py Sat Apr 26 16:00:39 2014 +0200 +++ b/SelectionEncloser/ConfigurationPage/SelectionEncloserEditDialog.py Sat Jul 12 15:08:19 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_SelectionEncloserEditDialog import Ui_SelectionEncloserEditDialog
--- a/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py Sat Apr 26 16:00:39 2014 +0200 +++ b/SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py Sat Jul 12 15:08:19 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QTreeWidgetItem, QInputDialog, QLineEdit, QDialog +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QTreeWidgetItem, QInputDialog, QLineEdit, QDialog from Preferences.ConfigurationPages.ConfigurationPageBase import \ ConfigurationPageBase
--- a/SelectionEncloser/i18n/selectionencloser_de.ts Sat Apr 26 16:00:39 2014 +0200 +++ b/SelectionEncloser/i18n/selectionencloser_de.ts Sat Jul 12 15:08:19 2014 +0200 @@ -86,12 +86,12 @@ <translation>Gib den Menütitel ein:</translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="196"/> <source>Menu Entry</source> <translation>Menüeintrag</translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="196"/> <source>Enter menu entry text:</source> <translation>Gib den Menüeintrag ein:</translation> </message> @@ -101,7 +101,7 @@ <translation>Drücken, um eine Trennlinie nach dem ausgewählten Eintrag einzufügen</translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="124"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="252"/> <source>--Separator--</source> <translation>--Trennlinie--</translation> </message>
--- a/SelectionEncloser/i18n/selectionencloser_en.ts Sat Apr 26 16:00:39 2014 +0200 +++ b/SelectionEncloser/i18n/selectionencloser_en.ts Sat Jul 12 15:08:19 2014 +0200 @@ -86,12 +86,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="196"/> <source>Menu Entry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="196"/> <source>Enter menu entry text:</source> <translation type="unfinished"></translation> </message> @@ -101,7 +101,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="124"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="252"/> <source>--Separator--</source> <translation type="unfinished"></translation> </message>
--- a/SelectionEncloser/i18n/selectionencloser_es.ts Sat Apr 26 16:00:39 2014 +0200 +++ b/SelectionEncloser/i18n/selectionencloser_es.ts Sat Jul 12 15:08:19 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>SelectionEncloserEditDialog</name> <message> @@ -87,12 +86,12 @@ <translation>Introducir el título del menú:</translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="196"/> <source>Menu Entry</source> <translation>Entrada de Menú</translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="194"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="196"/> <source>Enter menu entry text:</source> <translation>Introducir el texto de la entrada de menú:</translation> </message> @@ -102,7 +101,7 @@ <translation>Pulsar para añadir una entrada de separador bajo la entrada seleccionada</translation> </message> <message> - <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="124"/> + <location filename="../../SelectionEncloser/ConfigurationPage/SelectionEncloserPage.py" line="252"/> <source>--Separator--</source> <translation>--Separador--</translation> </message>