From a26dbc8a0043267a93676aa45ec00aff52902589 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Mon, 14 Oct 2024 17:39:02 +0200 Subject: [PATCH] Getting rid of Qt5Compat, ridding dependency on PySide6-Addons --- assets/native/linux/debian/depends.packaged | 2 +- assets/native/linux/debian/depends.wheels | 2 +- .../eu/ad5001/LogarithmPlotter/History/HistoryItem.qml | 8 +++----- runtime-pyside6/setup.py | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/assets/native/linux/debian/depends.packaged b/assets/native/linux/debian/depends.packaged index 4ec21f5..0bace27 100644 --- a/assets/native/linux/debian/depends.packaged +++ b/assets/native/linux/debian/depends.packaged @@ -1 +1 @@ -python3 (>= 3.9), python3-pip, python3-pyside6.qtcore (>= 6), python3-pyside6.qtgui (>= 6), python3-pyside6.qtqml (>= 6), python3-pyside6.qtwidgets (>= 6), python3-pyside6.qtquick (>= 6), python3-pyside6.qtquickcontrols2 (>= 6), qml6-module-qt5compat-graphicaleffects (>= 6), qml6-module-qt-labs-platform (>= 6), qml6-module-qtquick-dialogs (>= 6), texlive-latex-base, dvipng +python3 (>= 3.9), python3-pip, python3-pyside6.qtcore (>= 6), python3-pyside6.qtgui (>= 6), python3-pyside6.qtqml (>= 6), python3-pyside6.qtwidgets (>= 6), python3-pyside6.qtquick (>= 6), python3-pyside6.qtquickcontrols2 (>= 6), qml6-module-qt-labs-platform (>= 6), qml6-module-qtquick-dialogs (>= 6), texlive-latex-base, dvipng diff --git a/assets/native/linux/debian/depends.wheels b/assets/native/linux/debian/depends.wheels index 9a874f7..5b7d902 100644 --- a/assets/native/linux/debian/depends.wheels +++ b/assets/native/linux/debian/depends.wheels @@ -1 +1 @@ -python3 (>= 3.9), python3-pip, python3-pyside6-essentials (>= 6.7.0), python3-pyside6-addons (>= 6.7.0), texlive-latex-base, dvipng +python3 (>= 3.9), python3-pip, python3-pyside6-essentials (>= 6.7.0), texlive-latex-base, dvipng diff --git a/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml b/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml index f37eb3b..6ad6556 100644 --- a/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml +++ b/runtime-pyside6/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/History/HistoryItem.qml @@ -16,9 +16,8 @@ * along with this program. If not, see . */ -import QtQuick.Controls import QtQuick -import Qt5Compat.GraphicalEffects +import QtQuick.Controls import eu.ad5001.LogarithmPlotter.Setting 1.0 as Setting @@ -82,12 +81,11 @@ Button { height: hidden ? 8 : Math.max(actionHeight, label.height + 15) - LinearGradient { + Rectangle { anchors.fill: parent //opacity: hidden ? 0.6 : 1 - start: Qt.point(0, 0) - end: Qt.point(parent.width, 0) gradient: Gradient { + orientation: Gradient.Horizontal GradientStop { position: 0.1; color: "transparent" } GradientStop { position: 1.5; color: clr } } diff --git a/runtime-pyside6/setup.py b/runtime-pyside6/setup.py index f76f1d7..524ad29 100644 --- a/runtime-pyside6/setup.py +++ b/runtime-pyside6/setup.py @@ -122,7 +122,7 @@ if sys.platform == 'linux': # os.remove(os.environ["PREFIX"] + '/icons/hicolor/scalable/apps/logplotter.svg') setuptools.setup( - install_requires=([] if "FLATPAK_INSTALL" in os.environ else ["PySide6-Essentials", "PySide6-Addons"]), + install_requires=([] if "FLATPAK_INSTALL" in os.environ else ["PySide6-Essentials"]), python_requires='>=3.9', name='logarithmplotter',