From 9f993e702aeffd2126f4eae4b4bd2b24cd589c73 Mon Sep 17 00:00:00 2001 From: Anys Date: Fri, 10 Jun 2022 11:43:22 +0200 Subject: [PATCH] * chg: try to import QtCore and QtWidget by using qtpy when Qt.py module is not found --- examples/declarative-form.py | 5 ++++- examples/tag-bar.py | 6 +++++- guibedos/blender.py | 10 ++++++++-- guibedos/declarative_form/form.py | 5 ++++- guibedos/declarative_form/groupbox.py | 5 ++++- guibedos/declarative_form/maker.py | 5 ++++- guibedos/declarative_form/widgets/checkbox.py | 5 ++++- guibedos/declarative_form/widgets/combobox.py | 6 ++++-- guibedos/declarative_form/widgets/filepath_widget.py | 5 ++++- guibedos/declarative_form/widgets/label_widget.py | 6 ++++-- guibedos/declarative_form/widgets/lineedit.py | 6 ++++-- guibedos/declarative_form/widgets/spinbox.py | 6 ++++-- guibedos/helpers.py | 9 +++++++-- guibedos/widgets/flow_layout.py | 9 +++++++-- guibedos/widgets/tag_bar.py | 10 ++++++++-- 15 files changed, 75 insertions(+), 23 deletions(-) diff --git a/examples/declarative-form.py b/examples/declarative-form.py index 57c3718..7f15a8f 100644 --- a/examples/declarative-form.py +++ b/examples/declarative-form.py @@ -1,6 +1,9 @@ import json import os.path -from Qt import QtWidgets +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets from guibedos import css from guibedos import declarative_form as df diff --git a/examples/tag-bar.py b/examples/tag-bar.py index 948f6da..8627550 100644 --- a/examples/tag-bar.py +++ b/examples/tag-bar.py @@ -1,4 +1,8 @@ -from Qt import QtWidgets +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets + from guibedos import css from guibedos.widgets import TagBar diff --git a/guibedos/blender.py b/guibedos/blender.py index 1adf830..8bb3573 100644 --- a/guibedos/blender.py +++ b/guibedos/blender.py @@ -7,8 +7,14 @@ See `tube_scenemanager`, `character_picker` and `resource_library` for examples """ import atexit -from Qt import QtCore -from Qt import QtWidgets + +try: + from Qt import QtWidgets + from Qt import QtCore +except ImportError: + from qtpy import QtWidgets + from qtpy import QtCore + from . import css import bpy from bpy.app.handlers import persistent diff --git a/guibedos/declarative_form/form.py b/guibedos/declarative_form/form.py index 621a139..c2ffc00 100644 --- a/guibedos/declarative_form/form.py +++ b/guibedos/declarative_form/form.py @@ -1,4 +1,7 @@ -from Qt import QtWidgets +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets from . import maker, handler diff --git a/guibedos/declarative_form/groupbox.py b/guibedos/declarative_form/groupbox.py index 66d9e5c..2eb38c7 100644 --- a/guibedos/declarative_form/groupbox.py +++ b/guibedos/declarative_form/groupbox.py @@ -1,4 +1,7 @@ -from Qt import QtWidgets +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets from guibedos.widgets import FlowLayout # TODO : this is not part of the widgets packages because maker cannot be imported from there -> "find a better way" try: diff --git a/guibedos/declarative_form/maker.py b/guibedos/declarative_form/maker.py index 61ba500..708e420 100644 --- a/guibedos/declarative_form/maker.py +++ b/guibedos/declarative_form/maker.py @@ -1,4 +1,7 @@ -from Qt import QtWidgets +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets from .widgets import * from .properties import * from .groupbox import GroupBox diff --git a/guibedos/declarative_form/widgets/checkbox.py b/guibedos/declarative_form/widgets/checkbox.py index a0e4af6..9e90fb4 100644 --- a/guibedos/declarative_form/widgets/checkbox.py +++ b/guibedos/declarative_form/widgets/checkbox.py @@ -1,4 +1,7 @@ -from Qt import QtWidgets +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets class CheckBox(QtWidgets.QCheckBox): diff --git a/guibedos/declarative_form/widgets/combobox.py b/guibedos/declarative_form/widgets/combobox.py index 11a45de..a41653e 100644 --- a/guibedos/declarative_form/widgets/combobox.py +++ b/guibedos/declarative_form/widgets/combobox.py @@ -1,5 +1,7 @@ -from Qt import QtWidgets - +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets class ComboBox(QtWidgets.QComboBox): diff --git a/guibedos/declarative_form/widgets/filepath_widget.py b/guibedos/declarative_form/widgets/filepath_widget.py index 50e760f..0883b3b 100644 --- a/guibedos/declarative_form/widgets/filepath_widget.py +++ b/guibedos/declarative_form/widgets/filepath_widget.py @@ -1,5 +1,8 @@ import os -from Qt import QtWidgets +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets class FileDialog(QtWidgets.QFileDialog): diff --git a/guibedos/declarative_form/widgets/label_widget.py b/guibedos/declarative_form/widgets/label_widget.py index 9d8efa6..f8b789a 100644 --- a/guibedos/declarative_form/widgets/label_widget.py +++ b/guibedos/declarative_form/widgets/label_widget.py @@ -1,5 +1,7 @@ -from Qt import QtWidgets - +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets class LabelWidget(QtWidgets.QLabel): diff --git a/guibedos/declarative_form/widgets/lineedit.py b/guibedos/declarative_form/widgets/lineedit.py index d06a939..e95dcbe 100644 --- a/guibedos/declarative_form/widgets/lineedit.py +++ b/guibedos/declarative_form/widgets/lineedit.py @@ -1,5 +1,7 @@ -from Qt import QtWidgets - +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets class LineEdit(QtWidgets.QLineEdit): diff --git a/guibedos/declarative_form/widgets/spinbox.py b/guibedos/declarative_form/widgets/spinbox.py index ee48a8a..085e4bb 100644 --- a/guibedos/declarative_form/widgets/spinbox.py +++ b/guibedos/declarative_form/widgets/spinbox.py @@ -1,5 +1,7 @@ -from Qt import QtWidgets - +try: + from Qt import QtWidgets +except ImportError: + from qtpy import QtWidgets _MAX = 2147483647 diff --git a/guibedos/helpers.py b/guibedos/helpers.py index b070384..e16f1da 100644 --- a/guibedos/helpers.py +++ b/guibedos/helpers.py @@ -1,5 +1,10 @@ -from Qt import QtCore -from Qt import QtWidgets + +try: + from Qt import QtWidgets + from Qt import QtCore +except ImportError: + from qtpy import QtWidgets + from qtpy import QtCore class Hourglass: diff --git a/guibedos/widgets/flow_layout.py b/guibedos/widgets/flow_layout.py index dd40a68..ad5aedb 100644 --- a/guibedos/widgets/flow_layout.py +++ b/guibedos/widgets/flow_layout.py @@ -7,8 +7,13 @@ This file is licensed under GPLv2 """ -from Qt import QtCore -from Qt import QtWidgets + +try: + from Qt import QtWidgets + from Qt import QtCore +except ImportError: + from qtpy import QtWidgets + from qtpy import QtCore class FlowLayout(QtWidgets.QLayout): diff --git a/guibedos/widgets/tag_bar.py b/guibedos/widgets/tag_bar.py index 4f0a1af..964388e 100644 --- a/guibedos/widgets/tag_bar.py +++ b/guibedos/widgets/tag_bar.py @@ -2,8 +2,14 @@ Button based LineEdit, for tag edition """ import re -from Qt import QtCore -from Qt import QtWidgets + +try: + from Qt import QtWidgets + from Qt import QtCore +except ImportError: + from qtpy import QtWidgets + from qtpy import QtCore + from ..css import parse_images from .flow_layout import FlowLayout