Skip to content
This repository was archived by the owner on Dec 29, 2023. It is now read-only.

Commit 66249d4

Browse files
authored
Merge pull request #318 from srevinsaju/work/srevin/readd-pyqt5
feat: add PyQt5 support for supporting flatpak
2 parents ab2e8c9 + 47eebe8 commit 66249d4

File tree

1 file changed

+30
-6
lines changed

1 file changed

+30
-6
lines changed

guiscrcpy/ux/__init__.py

+30-6
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,34 @@
2020
import os
2121

2222
# flake8: noqa
23+
has_pyside2 = False
24+
has_pyqt5 = False
2325

24-
from guiscrcpy.ui.pyside2.main import Ui_MainWindow # noqa: F401
25-
from guiscrcpy.ui.pyside2.network import Ui_NetworkUI # noqa: F401
26-
from guiscrcpy.ui.pyside2.panel import Ui_HorizontalPanel # noqa: F401
27-
from guiscrcpy.ui.pyside2.settings import Ui_MainWindow as Ui_SettingsWindow
28-
from guiscrcpy.ui.pyside2.downloader import Ui_Initializer # noqa: F401
29-
from guiscrcpy.ui.pyside2.toolkit import Ui_ToolbarPanel # noqa: F401
26+
try:
27+
import PySide2
28+
29+
has_pyside2 = True
30+
except ModuleNotFoundError:
31+
try:
32+
import PyQt5
33+
34+
has_pyqt5 = True
35+
except ModuleNotFoundError:
36+
raise ModuleNotFoundError(
37+
"Did not find either 'PyQt5' or 'PySide2' installations"
38+
)
39+
40+
if has_pyside2:
41+
from guiscrcpy.ui.pyside2.main import Ui_MainWindow # noqa: F401
42+
from guiscrcpy.ui.pyside2.network import Ui_NetworkUI # noqa: F401
43+
from guiscrcpy.ui.pyside2.panel import Ui_HorizontalPanel # noqa: F401
44+
from guiscrcpy.ui.pyside2.settings import Ui_MainWindow as Ui_SettingsWindow
45+
from guiscrcpy.ui.pyside2.downloader import Ui_Initializer # noqa: F401
46+
from guiscrcpy.ui.pyside2.toolkit import Ui_ToolbarPanel # noqa: F401
47+
elif has_pyqt5:
48+
from guiscrcpy.ui.pyqt5.main import Ui_MainWindow # noqa: F401
49+
from guiscrcpy.ui.pyqt5.network import Ui_NetworkUI # noqa: F401
50+
from guiscrcpy.ui.pyqt5.panel import Ui_HorizontalPanel # noqa: F401
51+
from guiscrcpy.ui.pyqt5.settings import Ui_MainWindow as Ui_SettingsWindow
52+
from guiscrcpy.ui.pyqt5.downloader import Ui_Initializer # noqa: F401
53+
from guiscrcpy.ui.pyqt5.toolkit import Ui_ToolbarPanel # noqa: F401

0 commit comments

Comments
 (0)