--- a/PluginPySide2PyQt.py Wed Jan 01 11:59:03 2020 +0100
+++ b/PluginPySide2PyQt.py Wed Jun 24 17:58:48 2020 +0200
@@ -7,8 +7,6 @@
Module implementing the PySide to PyQt (and vice versa) plug-in.
"""
-from __future__ import unicode_literals
-
import os
from PyQt5.QtCore import QObject, QTranslator
@@ -21,17 +19,16 @@
author = "Detlev Offenbach <detlev@die-offenbachs.de>"
autoactivate = True
deactivateable = True
-version = "2.2.1"
+version = "3.0.0"
className = "PySide2PyQtPlugin"
packageName = "PySide2PyQt"
shortDescription = "Convert PySide file to PyQt and vice versa"
-longDescription = \
- """This plug-in implements a tool to convert a PySide/PySide2 file""" \
- """ to PyQt4 or PyQt5 and vice versa. It works with the text of the""" \
- """ current editor."""
+longDescription = (
+ """This plug-in implements a tool to convert a PySide2 file to PyQt5"""
+ """ and vice versa. It works with the text of the current editor."""
+)
needsRestart = False
pyqtApi = 2
-python2Compatible = True
# End-Of-Header
error = ""
@@ -137,19 +134,11 @@
Private method to initialize the menu.
"""
self.__menu = QMenu(self.tr("PySide to/from PyQt"))
- self.__menu.addAction(self.tr("PySide to PyQt4"),
- lambda: self.__pyside2Pyqt("pyside", "pyqt4"))
- self.__menu.addAction(self.tr("PySide to PyQt5"),
- lambda: self.__pyside2Pyqt("pyside", "pyqt5"))
self.__menu.addAction(self.tr("PySide2 to PyQt5"),
lambda: self.__pyside2Pyqt("pyside2", "pyqt5"))
self.__menu.addSeparator()
- self.__menu.addAction(self.tr("PyQt4 to PySide"),
- lambda: self.__pyqt2Pyside("pyqt4", "pyside"))
self.__menu.addAction(self.tr("PyQt5 to PySide2"),
lambda: self.__pyqt2Pyside("pyqt5", "pyside2"))
- self.__menu.addAction(self.tr("PyQt5 to PySide"),
- lambda: self.__pyqt2Pyside("pyqt5", "pyside"))
self.__menu.setEnabled(False)
def __populateMenu(self, name, menu):
@@ -226,9 +215,9 @@
Private slot to convert the code of the current editor from PySide
to PyQt.
- @param pyside PySide variant (pyside or pyside2)
+ @param pyside PySide variant (pyside2)
@type str
- @param pyqt PyQt variant (pyqt4 or pyqt5)
+ @param pyqt PyQt variant (pyqt5)
@type str
"""
editor = e5App().getObject("ViewManager").activeWindow()
@@ -236,30 +225,17 @@
return
text = editor.text()
- if pyqt == "pyqt4":
- newText = (text
- .replace("PySide", "PyQt4")
- .replace("Signal", "pyqtSignal")
- .replace("Slot", "pyqtSlot")
- .replace("Property", "pyqtProperty")
- .replace("pyside-uic", "pyuic4")
- .replace("pyside-rcc", "pyrcc4")
- .replace("pyside-lupdate", "pylupdate4")
- )
- elif pyqt == "pyqt5":
- newText = (text
- .replace("Signal", "pyqtSignal")
- .replace("Slot", "pyqtSlot")
- .replace("Property", "pyqtProperty")
- .replace("PySide2", "PyQt5")
- .replace("pyside2-uic", "pyuic5")
- .replace("pyside2-rcc", "pyrcc5")
- .replace("pyside2-lupdate", "pylupdate5")
- .replace("PySide", "PyQt5")
- .replace("pyside-uic", "pyuic5")
- .replace("pyside-rcc", "pyrcc5")
- .replace("pyside-lupdate", "pylupdate5")
- )
+ if pyqt == "pyqt5" and pyside == "pyside2":
+ newText = (
+ text
+ .replace("Signal", "pyqtSignal")
+ .replace("Slot", "pyqtSlot")
+ .replace("Property", "pyqtProperty")
+ .replace("PySide2", "PyQt5")
+ .replace("pyside2-uic", "pyuic5")
+ .replace("pyside2-rcc", "pyrcc5")
+ .replace("pyside2-lupdate", "pylupdate5")
+ )
else:
return
@@ -274,9 +250,9 @@
Private slot to convert the code of the current editor from PyQt
to PySide.
- @param pyqt PyQt variant (pyqt4 or pyqt5)
+ @param pyqt PyQt variant (pyqt5)
@type str
- @param pyside PySide variant (pyside or pyside2)
+ @param pyside PySide variant (pyside2)
@type str
"""
editor = e5App().getObject("ViewManager").activeWindow()
@@ -284,36 +260,17 @@
return
text = editor.text()
- if pyqt == "pyqt4":
- newText = (text
- .replace("PyQt4", "PySide")
- .replace("pyqtSignal", "Signal")
- .replace("pyqtSlot", "Slot")
- .replace("pyqtProperty", "Property")
- .replace("pyuic4", "pyside-uic")
- .replace("pyrcc4", "pyside-rcc")
- .replace("pylupdate4", "pyside-lupdate")
- )
- elif pyqt == "pyqt5" and pyside == "pyside":
- newText = (text
- .replace("PyQt5", "PySide")
- .replace("pyqtSignal", "Signal")
- .replace("pyqtSlot", "Slot")
- .replace("pyqtProperty", "Property")
- .replace("pyuic5", "pyside-uic")
- .replace("pyrcc5", "pyside-rcc")
- .replace("pylupdate5", "pyside-lupdate")
- )
- elif pyqt == "pyqt5" and pyside == "pyside2":
- newText = (text
- .replace("PyQt5", "PySide2")
- .replace("pyqtSignal", "Signal")
- .replace("pyqtSlot", "Slot")
- .replace("pyqtProperty", "Property")
- .replace("pyuic5", "pyside2-uic")
- .replace("pyrcc5", "pyside2-rcc")
- .replace("pylupdate5", "pyside2-lupdate")
- )
+ if pyqt == "pyqt5" and pyside == "pyside2":
+ newText = (
+ text
+ .replace("PyQt5", "PySide2")
+ .replace("pyqtSignal", "Signal")
+ .replace("pyqtSlot", "Slot")
+ .replace("pyqtProperty", "Property")
+ .replace("pyuic5", "pyside2-uic")
+ .replace("pyrcc5", "pyside2-rcc")
+ .replace("pylupdate5", "pyside2-lupdate")
+ )
else:
return
