!299 4320

Merge pull request !299 from shenmo/dev

debian/changelog

@@ -1,3 +1,12 @@
+spark-store (4.3.2.0) UNRELEASED; urgency=medium
+
+  * 后续更新请从4.3.2.0版本号开始，4.3.2版本仅用于GXDE测试
+  * 支持dummyapps 安装包安装
+  * 支持紧凑模式
+  * 修复部分情况下升级安装失败的问题
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
 spark-store (4.3.2) UNRELEASED; urgency=medium
 
   * ssinstall支持安装conflict包

src/mainwindow-dtk.cpp

@@ -190,15 +190,16 @@ 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);
     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(20, 0, 10, 0);
     centralLayout->setSpacing(0);
 
     centralLayout->addWidget(searchEdit, 0, Qt::AlignHCenter);

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);
 }

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);

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)

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

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