Merge pull request #310 from srevinsaju/main-revert-new

2022.6.1 Release

Author: srevinsaju

.github/workflows/continuous.yml

@@ -44,8 +44,8 @@ jobs:
         run: git fetch --tags --force
       - name: Build
         run: |
-          # force usage of PySide6 to prevent having surprises with pyinstaller.
-          sed -i 's/qtpy/PySide6/g' **/*.py
+          # force usage of PySide2 to prevent having surprises with pyinstaller.
+          sed -i 's/qtpy/PySide2/g' **/*.py
           docker build -t guiscrcpy-appimage-build -f scripts/ci/pyappimage/Dockerfile .
           docker run --rm -v $(pwd):/usr/src guiscrcpy-appimage-build
           ls -al 
@@ -105,8 +105,8 @@ jobs:
     runs-on: windows-latest
     strategy: 
       matrix:
-        arch: ['x64']
-        qt: ['PySide6']
+        arch: ['x64', 'x86']
+        qt: ['PyQt5', 'PySide2']
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -146,7 +146,7 @@ jobs:
     strategy: 
       matrix:
         arch: ['x64']
-        qt: ['PySide6']
+        qt: ['PySide2']
     steps:
       - name: Checkout
         uses: actions/checkout@v1
@@ -194,8 +194,11 @@ jobs:
         ls -alHR
         wget -q https://github.com/srevinsaju/pyuploadtool/releases/download/continuous/pyuploadtool-x86_64.AppImage && chmod +x pyuploadtool-x86_64.AppImage
         ./pyuploadtool-x86_64.AppImage \
-          guiscrcpy-PySide6-x64-continuous.app/guiscrcpy-PySide6-x64 \
-          guiscrcpy-PySide6-x64-continuous.exe/guiscrcpy-PySide6-x64.exe \
+          guiscrcpy-PyQt5-x64-continuous.exe/guiscrcpy-PyQt5-x64.exe \
+          guiscrcpy-PyQt5-x86-continuous.exe/guiscrcpy-PyQt5-x86.exe \
+          guiscrcpy-PySide2-x64-continuous.app/guiscrcpy-PySide2-x64 \
+          guiscrcpy-PySide2-x64-continuous.exe/guiscrcpy-PySide2-x64.exe \
+          guiscrcpy-PySide2-x86-continuous.exe/guiscrcpy-PySide2-x86.exe \
           guiscrcpy-m-continuous-x86_64.AppImage/guiscrcpy*x86_64.AppImage \
           guiscrcpy-python/guiscrcpy*.* \
           guiscrcpy-r-continuous-x86_64.AppImage/guiscrcpy*.AppImage

.github/workflows/pythonapp.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade poetry wheel
-        poetry install -E PySide6
+        poetry install -E PySide2
         poetry build
         pip3 install dist/*.whl
 

guiscrcpy/cli.py

@@ -42,13 +42,17 @@ def show_version(ctx, param, value):  # noqa:
     if os.getenv("APPDIR"):
         click.echo("AppDir: {}".format(os.getenv("APPDIR")))
     import inspect
+    from PyQt5 import Qt
 
     _pyqt5_version = [
         "%s = %s" % (k, v)
         for k, v in vars(Qt).items()
         if k.lower().find("version") >= 0 and not inspect.isbuiltin(v)
     ]
     print()
+    print("== PyQt5 Version ==")
+    print("\n".join(sorted(_pyqt5_version)))
+    print()
     if platform.system() == "Linux":
         print("== CairoSVG version ==")
         from cairosvg import VERSION as CAIRO_VERSION  # noqa:
@@ -85,7 +89,7 @@ def show_license(ctx, param, value):  # noqa:
     "--theme",
     "theme",
     default="Breeze",
-    help="Set the default theme (based on PyQt "
+    help="Set the default theme (based on PyQt5 "
     "themes - Fusion, Breeze, Windows) "
     "(stored in configuration, override by --theme-no-cfg)",
 )

guiscrcpy/install/finder.py

@@ -7,7 +7,7 @@ def open_exe_name_dialog(parent, appname):
     file_dialog.setFilter(QDir.AllEntries | QDir.Hidden)
     file_dialog.setFileMode(QFileDialog.ExistingFile)
     file_dialog.setWindowTitle(
-        f"{appname} could not be found. Please locate it manually"
+        f"{appname} could not be found. Please locate in" "manually"
     )
     if file_dialog.exec():
         file_name = file_dialog.selectedFiles()

guiscrcpy/ui/pyside/__init__.py guiscrcpy/ui/pyqt5/__init__.py

@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'guiscrcpy/ui/downloader.ui'
+#
+# Created by: PyQt5 UI code generator 5.15.0
+#
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_Initializer(object):
+    def setupUi(self, Initializer):
+        Initializer.setObjectName("Initializer")
+        Initializer.resize(222, 320)
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/res/ui/guiscrcpy_logo.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        Initializer.setWindowIcon(icon)
+        self.widget = QtWidgets.QWidget(Initializer)
+        self.widget.setGeometry(QtCore.QRect(0, 0, 221, 311))
+        self.widget.setObjectName("widget")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.widget)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.label_2 = QtWidgets.QLabel(self.widget)
+        self.label_2.setText("")
+        self.label_2.setTextFormat(QtCore.Qt.PlainText)
+        self.label_2.setPixmap(QtGui.QPixmap(":/res/ui/guiscrcpy_logo.png"))
+        self.label_2.setScaledContents(True)
+        self.label_2.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_2.setWordWrap(True)
+        self.label_2.setObjectName("label_2")
+        self.verticalLayout.addWidget(self.label_2)
+        self.stat = QtWidgets.QLabel(self.widget)
+        font = QtGui.QFont()
+        font.setFamily("Titillium Web")
+        font.setPointSize(30)
+        font.setBold(True)
+        font.setWeight(75)
+        self.stat.setFont(font)
+        self.stat.setScaledContents(False)
+        self.stat.setAlignment(QtCore.Qt.AlignCenter)
+        self.stat.setObjectName("stat")
+        self.verticalLayout.addWidget(self.stat)
+        self.label_3 = QtWidgets.QLabel(self.widget)
+        self.label_3.setAlignment(QtCore.Qt.AlignCenter)
+        self.label_3.setObjectName("label_3")
+        self.verticalLayout.addWidget(self.label_3)
+
+        self.retranslateUi(Initializer)
+        QtCore.QMetaObject.connectSlotsByName(Initializer)
+
+    def retranslateUi(self, Initializer):
+        _translate = QtCore.QCoreApplication.translate
+        Initializer.setWindowTitle(_translate("Initializer", "Initializing"))
+        self.stat.setText(_translate("Initializer", "guiscrcpy"))
+        self.label_3.setText(_translate("Initializer", "Initializing"))
+from . import rsrc_rc