From 7ad606bbd468a5394a9ac08715eb280b30e3c02f Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 20 Oct 2024 18:29:42 +0000 Subject: [PATCH 1/7] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7afd17c..6b6d060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spark-store (4.3.2.0) UNRELEASED; urgency=medium + + * 后续更新请从4.3.2.0版本号开始，4.3.2版本仅用于GXDE测试 + + -- shenmo Tue, 24 Sep 2024 11:27:08 +0800 + spark-store (4.3.2) UNRELEASED; urgency=medium * ssinstall支持安装conflict包 From fb01686527ef2370b8a261fe7563b69627515544 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 20 Oct 2024 18:41:27 +0000 Subject: [PATCH 2/7] fix: Now only use apt but not dpkg Signed-off-by: shenmo --- tool/ssaudit | 4 ++-- tool/ssinstall | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tool/ssaudit b/tool/ssaudit index 0c529ea..682e545 100755 --- a/tool/ssaudit +++ b/tool/ssaudit @@ -122,8 +122,8 @@ DEBPATH=$(realpath "$1") exit "$try_run_ret" fi - dpkg --force-conflicts -i "$DEBPATH" - aptss install "$DEBPATH" -yf + + aptss install "$DEBPATH" -yf --reinstall if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then if dpkg -s "$package_name" >/dev/null 2>&1; then diff --git a/tool/ssinstall b/tool/ssinstall index 5ca76da..6ac1470 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -164,9 +164,8 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then echo -e "${try_run_output}" exit "$try_run_ret" fi - - dpkg --force-conflicts -i "$DEBPATH" - aptss install "$DEBPATH" -yf + + aptss install "$DEBPATH" -yf --reinstall unlock_file "$DEBPATH" From f4fa07d5898e9c46a7b72d1fe31492b4171f91a2 Mon Sep 17 00:00:00 2001 From: zty199 <46324746+zty199@users.noreply.github.com> Date: Mon, 21 Oct 2024 21:41:18 +0800 Subject: [PATCH 3/7] fix: incorrect download water drop animation start position use rect().center() instead of event->rect().center() in WaterDrop::paintEvent; all coordinate calculation should use float instead of int Log: fix incorrect download water drop animation start position --- src/mainwindow-dtk.cpp | 6 ++++-- src/widgets/common/progressbutton.cpp | 31 +++++++++++++-------------- src/widgets/common/progressbutton.h | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/mainwindow-dtk.cpp b/src/mainwindow-dtk.cpp index 219bec4..d788d62 100755 --- a/src/mainwindow-dtk.cpp +++ b/src/mainwindow-dtk.cpp @@ -190,15 +190,17 @@ void MainWindow::initTitleBar() QHBoxLayout *customWidgetLayout = new QHBoxLayout(customWidget); customWidgetLayout->setContentsMargins(8, 0, 0, 0); - customWidgetLayout->setSpacing(8); + customWidgetLayout->setSpacing(0); customWidgetLayout->addWidget(titleLabel, 0, Qt::AlignLeft); + customWidgetLayout->addSpacing(8); customWidgetLayout->addWidget(backButton, 0, Qt::AlignLeft); + customWidgetLayout->setSpacing(20); QWidget *centralWidget = new QWidget(customWidget); centralWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); customWidgetLayout->addWidget(centralWidget, 1, Qt::AlignHCenter); QHBoxLayout *centralLayout = new QHBoxLayout(centralWidget); - centralLayout->setContentsMargins(0, 0, 10, 0); + centralLayout->setContentsMargins(0, 0, 20, 0); centralLayout->setSpacing(0); centralLayout->addWidget(searchEdit, 0, Qt::AlignHCenter); diff --git a/src/widgets/common/progressbutton.cpp b/src/widgets/common/progressbutton.cpp index 464664e..005b096 100644 --- a/src/widgets/common/progressbutton.cpp +++ b/src/widgets/common/progressbutton.cpp @@ -33,7 +33,7 @@ void ProgressButton::setProgress(int progress) buttonState = state::closeProgress; update(); WaterDrop *waterDrop = new WaterDrop(parentWidget()); - waterDrop->move(geometry().center()); + waterDrop->move(QRectF(geometry()).center()); waterDrop->show(); } repaint(); @@ -124,12 +124,12 @@ void ProgressButton::paintEvent(QPaintEvent *event) { QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing, true); - QRect rect = event->rect(); + QRectF rect = this->rect(); if (buttonState == state::normal || buttonState == state::hover) { - qreal radius = rect.height() / 2.0; - painter.translate(QRectF(rect).center()); + qreal radius = rect.height() / 2; + painter.translate(rect.center()); painter.setPen(Qt::transparent); painter.setBrush(backColor); painter.drawEllipse(QPointF(0, 0), radius, radius); @@ -140,8 +140,8 @@ void ProgressButton::paintEvent(QPaintEvent *event) } else if (buttonState == state::openProgress) { - qreal radius = rect.height() / 2.0 - 1; - painter.translate(QRectF(rect).center()); + qreal radius = rect.height() / 2 - 1; + painter.translate(rect.center()); painter.setPen(QPen(backColor.darker(), 2)); painter.setBrush(backColor); painter.drawEllipse(QPointF(0, 0), radius, radius); @@ -157,8 +157,8 @@ void ProgressButton::paintEvent(QPaintEvent *event) } else if (buttonState == state::closeProgress) { - qreal radius = rect.height() / 2.0 - 1; - painter.translate(QRectF(rect).center()); + qreal radius = rect.height() / 2 - 1; + painter.translate(rect.center()); painter.setPen(QPen(color.darker(100), 2)); painter.setBrush(backColor); painter.drawEllipse(QPointF(0, 0), radius, radius); @@ -176,7 +176,7 @@ void ProgressButton::operationProcessing() { } -const int RADIUS = 60; +const int RADIUS = 30; WaterDrop::WaterDrop(QWidget *parent) : QWidget(parent) , m_waterDropAnimation(new QVariantAnimation(this)) @@ -191,16 +191,16 @@ WaterDrop::WaterDrop(QWidget *parent) } // 把鼠标点击的点转换为圆心点坐标 -void WaterDrop::move(const QPoint &point) +void WaterDrop::move(const QPointF &point) { - QPoint translatePoint = point - rect().center(); - QWidget::move(translatePoint); + QPointF translatePoint = point - QRectF(rect()).center(); + QWidget::move(qRound(translatePoint.x()), qRound(translatePoint.y())); } void WaterDrop::show() { m_waterDropAnimation->setStartValue(0); - m_waterDropAnimation->setEndValue(RADIUS); + m_waterDropAnimation->setEndValue(RADIUS - 2); m_waterDropAnimation->setDuration(350); connect(m_waterDropAnimation, &QVariantAnimation::valueChanged, this, &WaterDrop::onRadiusChanged); @@ -213,10 +213,9 @@ void WaterDrop::paintEvent(QPaintEvent *event) { QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); - QPen pen(QBrush(QColor("#ffff80")), 5.0); - pen.setWidth(5); + QPen pen(QBrush(QColor("#ffff80")), 4.0); painter.setPen(pen); - painter.drawEllipse(event->rect().center(), m_animationRadius, m_animationRadius); + painter.drawEllipse(QRectF(rect()).center(), m_animationRadius, m_animationRadius); QWidget::paintEvent(event); } diff --git a/src/widgets/common/progressbutton.h b/src/widgets/common/progressbutton.h index 514622f..6b036cf 100644 --- a/src/widgets/common/progressbutton.h +++ b/src/widgets/common/progressbutton.h @@ -65,7 +65,7 @@ class WaterDrop : public QWidget public: explicit WaterDrop(QWidget *parent = nullptr); void show(); - void move(const QPoint &point); + void move(const QPointF &point); protected: void paintEvent(QPaintEvent *event); From 019f20dcba86669674a55f39ff819f62ad7cf0b7 Mon Sep 17 00:00:00 2001 From: zty199 <46324746+zty199@users.noreply.github.com> Date: Mon, 21 Oct 2024 22:25:49 +0800 Subject: [PATCH 4/7] fix: wrong back button position mistakenly use setSpacing in layout Log: delete setSpacing operation; adjust layout margin --- src/mainwindow-dtk.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mainwindow-dtk.cpp b/src/mainwindow-dtk.cpp index d788d62..45bc6e2 100755 --- a/src/mainwindow-dtk.cpp +++ b/src/mainwindow-dtk.cpp @@ -194,13 +194,12 @@ void MainWindow::initTitleBar() customWidgetLayout->addWidget(titleLabel, 0, Qt::AlignLeft); customWidgetLayout->addSpacing(8); customWidgetLayout->addWidget(backButton, 0, Qt::AlignLeft); - customWidgetLayout->setSpacing(20); QWidget *centralWidget = new QWidget(customWidget); centralWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); customWidgetLayout->addWidget(centralWidget, 1, Qt::AlignHCenter); QHBoxLayout *centralLayout = new QHBoxLayout(centralWidget); - centralLayout->setContentsMargins(0, 0, 20, 0); + centralLayout->setContentsMargins(20, 0, 10, 0); centralLayout->setSpacing(0); centralLayout->addWidget(searchEdit, 0, Qt::AlignHCenter); From 22ea57c263539b5431b1c52e27a90c351c3f174a Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 22 Oct 2024 09:58:18 +0000 Subject: [PATCH 5/7] update tool/update-upgrade/ss-do-upgrade-worker.sh. Signed-off-by: shenmo --- tool/update-upgrade/ss-do-upgrade-worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/update-upgrade/ss-do-upgrade-worker.sh b/tool/update-upgrade/ss-do-upgrade-worker.sh index 4e3cf6e..75c0f89 100755 --- a/tool/update-upgrade/ss-do-upgrade-worker.sh +++ b/tool/update-upgrade/ss-do-upgrade-worker.sh @@ -1,6 +1,6 @@ #!/bin/bash export LANGUAGE=en_US - +export DEBIAN_FRONTEND=noninteractive case $1 in ssupdate) if [ "$(id -u)" != "0" ] ; then From 4bb389e3786307cac4d8afd4b23ef5b53085bd40 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 22 Oct 2024 11:43:15 +0000 Subject: [PATCH 6/7] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6b6d060..1ff90df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ spark-store (4.3.2.0) UNRELEASED; urgency=medium * 后续更新请从4.3.2.0版本号开始，4.3.2版本仅用于GXDE测试 + * 支持dummyapps 安装包安装 + * 支持紧凑模式 + * 修复部分情况下升级安装失败的问题 -- shenmo Tue, 24 Sep 2024 11:27:08 +0800 From 7c1e44010c131e59412d376068e2f879215e63a9 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 22 Oct 2024 11:43:59 +0000 Subject: [PATCH 7/7] export DEBIAN_FRONTEND=noninteractive Signed-off-by: shenmo --- tool/ssaudit | 1 + tool/ssinstall | 1 + 2 files changed, 2 insertions(+) diff --git a/tool/ssaudit b/tool/ssaudit index 682e545..e486023 100755 --- a/tool/ssaudit +++ b/tool/ssaudit @@ -2,6 +2,7 @@ source /opt/durapps/spark-store/bin/bashimport/transhell.amber load_transhell_debug +export DEBIAN_FRONTEND=noninteractive case $(arch) in x86_64) diff --git a/tool/ssinstall b/tool/ssinstall index 6ac1470..42d2c20 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -2,6 +2,7 @@ source /opt/durapps/spark-store/bin/bashimport/transhell.amber load_transhell_debug +export DEBIAN_FRONTEND=noninteractive trap 'unlock_file $DEBPATH' EXIT case $(arch) in