update debian/changelog.

Signed-off-by: shenmo <jifengshenmo@outlook.com>

.github/workflows/program-builder.yml

@@ -0,0 +1,13 @@
+name: Building Program
+run-name: Building ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  call:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
+    secrets: inherit

.workflow/dtk-build-release-tag-20220425.yml

@@ -18,22 +18,28 @@ stages:
         name: execute_by_docker
         displayName: 基于镜像的DTK构建
         certificate: ''
-        image: docker.io/debian:buster
+        image: docker.jianmuhub.com/library/debian:buster
         command:
           - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
           - '# 换源'
           - apt update
           - export DEBIAN_FRONTEND=noninteractive
-          - echo "安装git devscripts equivs curl..."
+          - echo "安装依赖..."
-          - 'apt install git devscripts equivs curl -y '
+          - 'apt install libgsettings-qt-dev -y '
+          - 'apt install debhelper git curl fakeroot qtbase5-dev zlib1g-dev qt5-default  -y '
           - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
           - cd dtk-old-bundle
           - apt install ./*.deb -y
           - cd ..
           - rm -rf dtk-old-bundle
           - ''
-          - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
+          - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
-          - dpkg-buildpackage -j2 -b -us -uc
+          - apt build-dep . -y
+          - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
+          - uname -a
+          - sed -i 's/dh \$@ --parallel/dh \$@/' debian/rules
+          - '# Gitee的配置太低了'
+          - dpkg-buildpackage  -b -us -uc
           - cd ..
           - ls -all
           - pwd

debian/changelog

@@ -1,3 +1,43 @@
+spark-store (4.3.3.2) UNRELEASED; urgency=medium
+
+  * 提升升级工具体验，不再反复弹窗
+  * 提升aptss使用体验，汇报目前所在阶段而不是卡住不动
+  * 修复debian sid 无法卸载
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.3.1) UNRELEASED; urgency=medium
+
+  * 修复点击更新需要输入密码的问题
+  * 修复安装速度下降的问题
+  * 修复闪退问题
+  * 修复错误地展示已安装
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+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包
+  * 支持紧凑模式
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.1) UNRELEASED; urgency=medium
+
+  * 修复自提权更新问题
+  * 提升aptss稳定性
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
 spark-store (4.3.0-fix5) stable; urgency=medium
 
 * 支持GXDE,重启空链接清理

debian/control

@@ -30,6 +30,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libnotify-bin,
  qtwayland5,
  desktop-file-utils,
- dpkg-dev
+ dpkg-dev,
+ lsb-release,
 Description: Spark Store
  A community powered app store, based on DTK.

debian/rules

@@ -36,4 +36,6 @@ override_dh_auto_install:
 # Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
 # Qt Mutidedia lib will ref to network libraray.
 override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0
+	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0 --exclude=opt/durapps/spark-store/bin/ss-feedback/
+override_dh_strip:
+	dh_strip --exclude=opt/durapps/spark-store/bin/ss-feedback/

debian/source/format

@@ -1 +1 @@
-1.0
+3.0 (native)

debian/spark-store.postinst

@@ -42,8 +42,7 @@ case "$1" in
 
 		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss
 
-		# Create symbol links for SSINSTALL 
+
-		ln -s -f  /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
 
 		# Install key
 		mkdir -p /tmp/spark-store-install/

debian/spark-store.prerm

@@ -47,12 +47,11 @@ for username in `ls /home`
 	# Stop update detect service
 	systemctl disable spark-update-notifier
 
-	# Clean the auto install polkit file if exist
+
-	rm -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
 
 	# Remove gpg key file
 	rm -f /etc/apt/trusted.gpg.d/spark-store.gpg
-	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C'
+	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C' || true
 else
 	
 	if [ ! -z "`pidof spark-store`" ] ; then

pkg/lib/systemd/system/spark-update-notifier.timer

@@ -0,0 +1,11 @@
+[Unit]  
+Description=Timer for Spark Update Notifier  
+
+[Timer]  
+# 开机后第一次执行  
+OnBootSec=1min  
+# 每天执行一次  
+OnUnitActiveSec=1d  
+
+[Install]  
+WantedBy=timers.target

pkg/usr/lib/systemd/system/spark-update-notifier.service

@@ -2,13 +2,14 @@
 Description=Spark Store update notifier
 After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
 
-
 [Service]
 Type=simple
 RemainAfterExit=yes
 ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
 Restart=on-failure
-RestartSec=10
+RestartSec=15  # 可以设置为更长的重试间隔，比如 15 秒或 30 秒
+StartLimitIntervalSec=1h  # 设置为 1 小时的时间窗口
+StartLimitBurst=3  # 最大允许失败次数为 3 次
 
 [Install]
 WantedBy=multi-user.target

pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade.policy

@@ -4,15 +4,15 @@
 <policyconfig>
     <vendor>Spark Store</vendor>
     <icon_name>x-package-repository</icon_name>
-    <action id="store.spark-app.ss-do-upgrade-worker">
+    <action id="store.spark-app.ss-do-upgrade">
-        <description>运行ss-do-upgrade-worker需要权限</description>
+        <description>运行ss-do-upgrade需要权限</description>
-        <message>要使用ss-do-upgrade-worker需要权限</message>
+        <message>要使用ss-do-upgrade需要权限</message>
         <defaults>
             <allow_any>yes</allow_any>
             <allow_inactive>yes</allow_inactive>
             <allow_active>yes</allow_active>
         </defaults>
-        <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh</annotate>
+        <annotate key="org.freedesktop.policykit.exec.path">/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh</annotate>
         <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
     </action>
 </policyconfig>

spark-store-project.pro

@@ -46,7 +46,7 @@ desktop.path = /usr/share/applications
 service.files += pkg/usr/lib/systemd/system/spark-update-notifier.service
 service.path = /usr/lib/systemd/system/
 
-polkit-1.files += pkg/usr/share/polkit-1/actions/store.spark-app.ss-do-upgrade-worker.policy
+polkit-1.files += pkg/usr/share/polkit-1/actions/*
 polkit-1.path = /usr/share/polkit-1/actions/
 
 icon.files += pkg/usr/share/icons/hicolor/scalable/apps/*.svg

src/mainwindow-dtk.cpp

@@ -22,9 +22,6 @@
 #define AppPageSearchlist 1
 #define AppPageAppdetail 2
 #define AppPageSettings 3
-#define WaylandSearchCenter 1
-#define OtherSearchCenter 2
-#define RightSearchSpace 1
 #define UploadServerUrl "https://upload.deepinos.org.cn/"
 
 MainWindow::MainWindow(QWidget *parent)
@@ -126,6 +123,16 @@ void MainWindow::closeEvent(QCloseEvent *event)
     BaseWidgetOpacity::closeEvent(event);
 }
 
+void MainWindow::changeEvent(QEvent *event)
+{
+    if (event->type() != QEvent::StyleChange) {
+        return BaseWidgetOpacity::changeEvent(event);
+    }
+
+    BaseWidgetOpacity::changeEvent(event);
+    downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
+}
+
 void MainWindow::initUI()
 {
     QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
@@ -159,8 +166,9 @@ void MainWindow::initTitleBar()
     ui->titlebar->setBackgroundTransparent(true);
 
     // 初始化标题栏控件
-    DLabel *title = new DLabel(ui->titlebar);
+    DLabel *titleLabel = new DLabel(ui->titlebar);
-    title->setText(tr("Spark Store"));
+    titleLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    titleLabel->setText(tr("Spark Store"));
 
     backButton = new DPushButton(ui->titlebar);
 
@@ -170,34 +178,37 @@ void MainWindow::initTitleBar()
     searchEdit->lineEdit()->setFixedWidth(350);
 
     downloadButton = new ProgressButton(ui->titlebar);
+    downloadButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     downloadButton->setDownloadListWidget(downloadlistwidget);
     downloadButton->setFocusPolicy(Qt::FocusPolicy::ClickFocus);
+    downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
     downloadlistwidget->setFocusProxy(downloadButton);
 
-    QWidget *w_titlebar = new QWidget(ui->titlebar);
+    QWidget *customWidget = new QWidget(ui->titlebar);
-    QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar);
+    customWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-    ly_titlebar->addWidget(title);
+    ui->titlebar->setCustomWidget(customWidget);
-    ly_titlebar->addWidget(backButton);
+
-    // Check wayland configs
+    QHBoxLayout *customWidgetLayout = new QHBoxLayout(customWidget);
-    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    customWidgetLayout->setContentsMargins(8, 0, 0, 0);
-    if (!config.value("runtime/isDDE").toBool() && config.value("runtime/useWayland").toBool())
+    customWidgetLayout->setSpacing(0);
-    {
+    customWidgetLayout->addWidget(titleLabel, 0, Qt::AlignLeft);
-        // Wayland 搜索栏居中
+    customWidgetLayout->addSpacing(8);
-        ly_titlebar->addStretch(WaylandSearchCenter);
+    customWidgetLayout->addWidget(backButton, 0, Qt::AlignLeft);
-    }
+    QWidget *centralWidget = new QWidget(customWidget);
-    else
+    centralWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-    {
+    customWidgetLayout->addWidget(centralWidget, 1, Qt::AlignHCenter);
-        // dwayland dxcb 搜索栏顶部右侧居中
+
-        ly_titlebar->addStretch(OtherSearchCenter);
+    QHBoxLayout *centralLayout = new QHBoxLayout(centralWidget);
-    }
+    centralLayout->setContentsMargins(20, 0, 10, 0);
-    ly_titlebar->addWidget(searchEdit);
+    centralLayout->setSpacing(0);
-    ly_titlebar->addWidget(downloadButton);
+
-    ly_titlebar->addStretch(RightSearchSpace);
+    centralLayout->addWidget(searchEdit, 0, Qt::AlignHCenter);
-    ui->titlebar->setCustomWidget(w_titlebar);
+    centralLayout->addSpacing(10);
+    centralLayout->addWidget(downloadButton, 0, Qt::AlignHCenter);
 
     initTitleBarMenu();
 
-    backButton->hide();
+    backButton->setDisabled(true);
     downloadlistwidget->hide();
 }
 
@@ -353,9 +364,9 @@ void MainWindow::initConnections()
         ui->stackedWidget->setCurrentIndex(pageHistory.at(pageHistory.count() - 2));
         pageHistory.removeLast();
         if (pageHistory.count() > 1) {
-            backButton->show();
+            backButton->setEnabled(true);
         } else {
-            backButton->hide();
+            backButton->setDisabled(true);
         } });
 
     // 搜索事件
@@ -446,11 +457,11 @@ void MainWindow::switchPage(int now) // 临时方案，回家后修改
     qDebug() << pageHistory.count();
     if (pageHistory.count() >= 1)
     {
-        backButton->show();
+        backButton->setEnabled(true);
     }
     else
     {
-        backButton->hide();
+        backButton->setDisabled(true);
     }
     ui->stackedWidget->setCurrentIndex(now);
     ui->stackedWidget->currentWidget()->setFocus();

src/mainwindow-dtk.h

@@ -34,6 +34,7 @@ public:
 
 protected:
     void closeEvent(QCloseEvent *event) override;
+    void changeEvent(QEvent *event) override;
 
 private:
     void initUI();

src/mainwindow-dtk.ui

@@ -13,53 +13,10 @@
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QVBoxLayout" name="m_mainWindowLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <property name="spacing">
     <number>0</number>
    </property>
-   <item row="1" column="1">
-    <widget class="QWidget" name="mainpage" native="true">
-     <property name="autoFillBackground">
-      <bool>true</bool>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">.QWidget#mainpage {
-    background: transparent;
-    border-radius: 14px;
-}</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QStackedWidget" name="stackedWidget">
-        <property name="currentIndex">
-         <number>3</number>
-        </property>
-        <widget class="QWidget" name="page_1">
-         <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -73,12 +30,53 @@
     <number>0</number>
    </property>
    <item>
-           <widget class="AppListPage" name="applistpage" native="true"/>
+    <widget class="DTitlebar" name="titlebar" native="true">
-          </item>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
      </layout>
     </widget>
-        <widget class="QWidget" name="page_3">
+   </item>
-         <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <widget class="QWidget" name="centralWidget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QHBoxLayout" name="m_centralLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
       <property name="leftMargin">
        <number>0</number>
       </property>
@@ -92,54 +90,6 @@
        <number>0</number>
       </property>
       <item>
-           <widget class="AppListPage" name="applistpage_1" native="true"/>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="page_2">
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="AppIntoPage" name="appintopage" native="true"/>
-          </item>
-         </layout>
-        </widget>
-        <widget class="QWidget" name="page_4">
-         <layout class="QGridLayout" name="gridLayout_3">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <item row="0" column="0">
-           <widget class="SettingsPage" name="settingspage" native="true"/>
-          </item>
-         </layout>
-        </widget>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="0">
        <widget class="QWidget" name="leftbar" native="true">
         <property name="minimumSize">
          <size>
@@ -568,21 +518,18 @@
         </layout>
        </widget>
       </item>
-   <item row="0" column="0" colspan="2">
+      <item>
-    <widget class="DTitlebar" name="titlebar" native="true">
+       <widget class="QWidget" name="mainpage" native="true">
-     <property name="minimumSize">
+        <property name="autoFillBackground">
-      <size>
+         <bool>false</bool>
-       <width>0</width>
-       <height>50</height>
-      </size>
         </property>
-     <property name="maximumSize">
+        <property name="styleSheet">
-      <size>
+         <string notr="true">.QWidget#mainpage {
-       <width>16777215</width>
+    background: transparent;
-       <height>50</height>
+    border-radius: 14px;
-      </size>
+}</string>
         </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
+        <layout class="QGridLayout" name="gridLayout_2">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -595,6 +542,92 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
+         <item row="0" column="0">
+          <widget class="QStackedWidget" name="stackedWidget">
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <widget class="QWidget" name="page_1">
+            <layout class="QVBoxLayout" name="verticalLayout_2">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="AppListPage" name="applistpage" native="true"/>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="page_3">
+            <layout class="QVBoxLayout" name="verticalLayout_3">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="AppListPage" name="applistpage_1" native="true"/>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="page_2">
+            <layout class="QVBoxLayout" name="verticalLayout_4">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="AppIntoPage" name="appintopage" native="true"/>
+             </item>
+            </layout>
+           </widget>
+           <widget class="QWidget" name="page_4">
+            <layout class="QGridLayout" name="gridLayout_3">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="SettingsPage" name="settingspage" native="true"/>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

src/pages/appintopage.cpp

@@ -287,8 +287,10 @@ void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
     }
 
     dw = w;
-    connect(w, &DownloadListWidget::downloadFinished, [=]()
+    connect(w, &DownloadListWidget::downloadFinished, this, [=]() {
-    { isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString()); });
+            isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString());
+        },
+            Qt::QueuedConnection);
 }
 
 void AppIntoPage::initUI()
@@ -486,7 +488,10 @@ void AppIntoPage::on_downloadButton_clicked()
             return;
         }
 
-        connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
+        connect(item, &DownloadItem::finished, this, [=]() {
+                isDownloading(downloadUrl);
+            },
+                Qt::QueuedConnection);
 
         item->install(0);
         isDownloading(downloadUrl);
@@ -507,7 +512,10 @@ void AppIntoPage::on_downloadButton_clicked()
         item->reinstall = true;
     }
     ui->downloadButton->setEnabled(false);
-    connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
+    connect(item, &DownloadItem::finished, this, [=]() {
+        isDownloading(downloadUrl);
+    },
+        Qt::QueuedConnection);
 
     isDownloading(downloadUrl);
 }

src/widgets/common/progressbutton.cpp

@@ -9,10 +9,6 @@
 ProgressButton::ProgressButton(QWidget *parent)
     : QWidget{parent}
 {
-    // this->setWindowFlags(Qt::FramelessWindowHint);
-    // this->setAttribute(Qt::WA_TranslucentBackground, true);
-    setMinimumSize(36, 36);
-
     svgPath = "";
     backColor = Qt::transparent;
 
@@ -37,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();
@@ -77,12 +73,9 @@ void ProgressButton::mousePressEvent(QMouseEvent *event)
 
 void ProgressButton::mouseReleaseEvent(QMouseEvent *event)
 {
-    if (buttonState == state::hover || buttonState == state::normal)
+    if (buttonState == state::hover
-    {
+        || buttonState == state::normal
-        widthChangeValue = (this->width() - 6) / 2;
+        || buttonState == state::closeProgress)
-        update();
-    }
-    else if (buttonState == state::closeProgress)
     {
         update();
     }
@@ -131,19 +124,15 @@ 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)
     {
-        int radius = (rect.height() - 6) / 2;
+        qreal radius = rect.height() / 2;
         painter.translate(rect.center());
         painter.setPen(Qt::transparent);
-        painter.setBrush(QColor(buttonState == state::normal ? color : color.darker()));
-        // painter.drawEllipse(QPoint(0, 0), radius, radius);
-
-        // radiu -= 3;
         painter.setBrush(backColor);
-        painter.drawEllipse(QPoint(0, 0), radius, radius);
+        painter.drawEllipse(QPointF(0, 0), radius, radius);
 
         QSvgRenderer m_svgRender;
         m_svgRender.load(svgPath);
@@ -151,42 +140,34 @@ void ProgressButton::paintEvent(QPaintEvent *event)
     }
     else if (buttonState == state::openProgress)
     {
+        qreal radius = rect.height() / 2 - 1;
         painter.translate(rect.center());
-        int radius = (rect.height() - 6) / 2 - 3;
+        painter.setPen(QPen(backColor.darker(), 2));
         painter.setBrush(backColor);
-        painter.setPen(QPen(backColor, 3));
+        painter.drawEllipse(QPointF(0, 0), radius, radius);
-        painter.drawEllipse(QPoint(0, 0), radius, radius);
 
-        painter.setPen(QPen(backColor, 3));
+        QRectF rectF = QRectF(-radius, -radius, radius * 2, radius * 2);
+        painter.setPen(QPen(color.darker(100), 2));
+        qreal angle = progress * 360 / 100 * 1.0;
+        painter.drawArc(rectF, 90 * 16, -qIntCast(angle * 16));
 
         QSvgRenderer m_svgRender;
         m_svgRender.load(svgPath);
         m_svgRender.render(&painter, QRectF(-radius / 2, -radius / 2, radius, radius));
-
-        QRect rect = QRect(-radius, -radius,
-                           radius * 2, radius * 2);
-
-        painter.setPen(QPen(color.darker(100), 3));
-        qreal angle = progress * 360 / 100 * 1.0;
-        painter.drawArc(rect.adjusted(-3, -3, 3, 3), 90 * 16, -qIntCast(angle * 16));
     }
     else if (buttonState == state::closeProgress)
     {
-        auto radius = (rect.height() - 6) / 2;
+        qreal radius = rect.height() / 2 - 1;
         painter.translate(rect.center());
-        painter.setPen(Qt::transparent);
+        painter.setPen(QPen(color.darker(100), 2));
-        painter.setBrush(QColor(0, 0, 0, 63));
-        painter.drawEllipse(QPoint(0, 0), radius, radius);
-
-        radius -= 3;
         painter.setBrush(backColor);
-        painter.drawEllipse(QPoint(0, 0), radius, radius);
+        painter.drawEllipse(QPointF(0, 0), radius, radius);
 
-        painter.setPen(QPen(color, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+        painter.setPen(QPen(color, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-        painter.drawLine(QPoint(-radius / 3, 0),
+        painter.drawLine(QPointF(-radius / 3, 0),
-                         QPoint(-radius / 5, radius / 3));
+                         QPointF(-radius / 5, radius / 3));
-        painter.drawLine(QPoint(-radius / 5, radius / 3),
+        painter.drawLine(QPointF(-radius / 5, radius / 3),
-                         QPoint(radius / 4, -radius / 4));
+                         QPointF(radius / 4, -radius / 4));
     }
     QWidget::paintEvent(event);
 }
@@ -195,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))
@@ -210,20 +191,20 @@ WaterDrop::WaterDrop(QWidget *parent)
 }
 
 // 把鼠标点击的点转换为圆心点坐标
-void WaterDrop::move(const QPoint &point)
+void WaterDrop::move(const QPointF &point)
 {
-    QPoint translatePoint = point - QPoint(RADIUS, RADIUS);
+    QPointF translatePoint = point - QRectF(rect()).center();
-    QWidget::move(translatePoint);
+    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);
-    connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::close);
+    connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::deleteLater);
     m_waterDropAnimation->start(QVariantAnimation::DeleteWhenStopped);
     QWidget::show();
 }
@@ -232,10 +213,9 @@ void WaterDrop::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
-    QPen pen(QBrush(QColor("#ffff80")), 5.0);
+    QPen pen(QBrush(QColor("#ffff80")), 4.0);
-    pen.setWidth(5);
     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

@@ -52,7 +52,6 @@ private:
     QColor backColor;
     QColor color;
     QString svgPath;
-    int widthChangeValue{0};
     int progress{0};//处理百分比
 
     bool m_mouseMoved = false;
@@ -66,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/apt-fast/ss-apt-fast

@@ -52,7 +52,7 @@ for argument in "$@"; do
       option="source"
       root=0
       ;;
-    changelog)
+    changelog|search|policy|show)
       root=0
       ;;
   esac
@@ -600,9 +600,18 @@ if [ "$option" == "install" ]; then
 
         eval "${_DOWNLOADER}"  # execute downloadhelper command
         if [ "$(find "$DLDIR" -printf . | wc -c)" -gt 1 ]; then
+
+          # Delete incomplete/corrupted downloaded files, if any: Not recursive, as we don't expect any dirs to exist within $DLDIR.
+
+          # When Aria2c downloads a file and detects it is corrupted, its filename won't be renamed back to its actual name,
+          # preserving .aria2 file extension, which also indicates when a file hasn't been completely downloaded.
+          for x in *.aria2; do
+            rm -f "$x" "${x%.aria2}"
+          done
+
           # Move all packages to the apt install directory by force to ensure
           # already existing debs which may be incomplete are replaced
-          find . -type f -name "*.deb" -execdir mv -ft "$APTCACHE" {} \+
+          find . -type f \( -name '*.deb' -o -name '*.ddeb' \) -execdir mv -ft "$APTCACHE" {} \+
         fi
         cd - &>/dev/null || msg "Failed to change back directory" "warning"
       fi

tool/aptss

@@ -3,6 +3,7 @@
 SPARK_DOWNLOAD_SERVER_URL="https://d.spark-app.store/"
 SPARK_DOWNLOAD_SERVER_URL_NO_PROTOCOL="d.spark-app.store"
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
+source /opt/durapps/spark-store/bin/bashimport/log.amber
 load_transhell
 
 case `arch` in
@@ -26,7 +27,17 @@ is_empty_dir(){
     return `ls -A $1|wc -w`
 }
 
+function update_list(){
+curl --progress-bar -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
+log.info "sparkstore${STORE_LIST_URL}.list update done"  
+}
 
+function update_conf(){
+mkdir -p /tmp/aptss-conf/
+curl  --progress-bar -o  /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
+log.info "apt-fast.conf update done"
+chmod -R 755 /tmp/aptss-conf  
+}
 
 if [ "$(id -u)" != "0" ];then
 #############################无root权限时
@@ -46,8 +57,7 @@ if [ ! -e "/tmp/aptss-conf/apt-fast.conf" ];then
 mkdir -p /tmp/aptss-conf/
 echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m"
 echo
-curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
+update_conf
-chmod -R 755 /tmp/aptss-conf
 
 fi
 
@@ -57,11 +67,9 @@ if [ ! -e "/var/lib/aptss/lists/${SPARK_DOWNLOAD_SERVER_URL_NO_PROTOCOL}_${STORE
 mkdir -p /tmp/aptss-conf/
 echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m"
 echo
-curl  --silent -o  /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
-chmod -R 755 /tmp/aptss-conf    
 
-curl --silent -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
+update_list
-/usr/bin/apt update -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
+update_conf 
 
 #只更新星火源
 
@@ -86,45 +94,33 @@ exit $ret
 fi
 
 
-elif [ "$1" = "download" ];then
 
-###执行
-
-                ${SS_APT_FAST} "$@" --allow-downgrades -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
-
-
-elif [ "$1" = "policy" ] || [ "$1" = "search" ];then
-
-
-
-###执行
-                /usr/bin/apt "$@"  -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
 
 elif [ "$1" = "ssupdate" ];then
 
 mkdir -p /tmp/aptss-conf/
 echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m"
 echo
-curl  --silent -o  /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
-chmod -R 755 /tmp/aptss-conf    
  
-curl --silent -o  /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
 
+update_list
+update_conf
  
 /usr/bin/apt update -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list"
 
 #只更新星火源
 
 elif [ "$1" = "update" ];then
+
 echo -e "\e[1;32m${TRANSHELL_CONTENT_GETTING_SERVER_CONFIG_AND_MIRROR_LIST}\e[0m"
 echo
-curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "${SPARK_DOWNLOAD_SERVER_URL}/sparkstore${STORE_LIST_URL}.list"
+update_list
-mkdir -p /tmp/aptss-conf/
+update_conf
-curl --progress-bar -o /tmp/aptss-conf/apt-fast.conf "${SPARK_DOWNLOAD_SERVER_URL}/apt-fast.conf"
-chmod -R 755 /tmp/aptss-conf    
 ### 额外一份拿来给aptss自动补全用
-                /usr/bin/apt "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
+
+                ${SS_APT_FAST} "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
 
 else
-                /usr/bin/apt "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
+                ${SS_APT_FAST} "$@" -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf
 fi
+

tool/bashimport/log.amber

@@ -0,0 +1,5 @@
+#!/bin/bash
+log.warn() { echo -e "[\e[33mWARN\e[0m]:  \e[1m$*\e[0m"; }
+log.error()  { echo -e "[\e[31mERROR\e[0m]: \e[1m$*\e[0m"; }
+log.info() { echo -e "[\e[96mINFO\e[0m]:  \e[1m$*\e[0m"; }
+log.debug()  { echo -e "[\e[32mDEBUG\e[0m]: \e[1m$*\e[0m"; }

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)
@@ -122,7 +123,7 @@ DEBPATH=$(realpath "$1")
         exit "$try_run_ret"
     fi
 
-    dpkg -i "$DEBPATH" || aptss install -yf
+    dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf
 
     if [ "$?" = "0" ] && [ "$2" = "--delete-after-install" ]; then
         if dpkg -s "$package_name" >/dev/null 2>&1; then

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
@@ -165,7 +166,7 @@ if [ ! -z "$IS_SHA512SUM_CHECKED" ]; then
         exit "$try_run_ret"
     fi
 
-    dpkg -i "$DEBPATH" || aptss install -yf
+    dpkg -i "$DEBPATH" || aptss install "$DEBPATH" -yf 
 
 unlock_file "$DEBPATH"
 

tool/store-helper/check-is-installed

@@ -1,2 +1,2 @@
 #!/bin/bash
-dpkg -l | grep "^ii" | grep -w "$1" > /dev/null
+dpkg -l | grep "^ii  $1 " > /dev/null

tool/store-helper/pass-auth.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# We use sudo twice to avoid ACE bug here 
+# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
+
+#!/bin/bash
+# We use sudo twice to avoid ACE bug here 
+# https://gitee.com/amber-ce/amber-ce-bookworm/commit/43e1a1599ede474b37e41aa10c53fd8afc4d35a1
+
+function zenity_prompt() {
+    if [[ -e /usr/bin/garma ]]; then
+        garma "$@"
+    else
+        $(command -v zenity) "$@"
+    fi
+}
+
+# 检查sudo是否需要密码
+if sudo -n true 2>/dev/null; then
+    echo "sudo 无需密码，继续执行"
+else
+    # 循环输入密码直到成功或用户取消
+    while true; do
+        # 使用zenity弹出密码输入框
+        PASSWORD=$(zenity_prompt --password --title="需要sudo权限")
+        
+        # 检查用户是否取消输入
+        if [ -z "$PASSWORD" ]; then
+            zenity_prompt --error --text="操作已取消"
+            exit 1
+        fi
+        
+        # 尝试使用输入的密码执行sudo命令
+        echo "$PASSWORD" | sudo -S -v 2>/dev/null
+        
+        # 检查sudo是否成功
+        if [ $? -eq 0 ]; then
+            echo "密码正确，继续执行"
+            break
+        else
+            zenity_prompt --error --text="密码错误，请重新输入"
+        fi
+    done
+fi
+
+# 使用sudo命令执行目标程序
+echo "$PASSWORD" | sudo sudo -S "$@"

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

tool/update-upgrade/ss-do-upgrade.sh

@@ -1,4 +1,15 @@
 #!/bin/bash
+if [ "$(id -u)" != "0" ] ; then
+    if [ "$IS_ACE_ENV" = "1" ];then
+        /opt/durapps/spark-store/bin/store-helper/pass-auth.sh "$0" "$@"
+    else
+       xhost +
+	   pkexec "$0" "$@"
+	   exit
+    fi
+fi
+
+
 trap "rm -f  /tmp/spark-store/upgradeStatus.txt" EXIT
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
 load_transhell_debug
@@ -46,7 +57,7 @@ echo ${app_name_in_desktop}
 touch /tmp/spark-store/upgradeStatus.txt
 
 # 执行 apt update
-pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate | zenity --progress --auto-close --pulsate --no-cancel --text="${TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT}" --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh ssupdate 2>&1 > /dev/null | zenity --progress --auto-close --pulsate --no-cancel --text="${TRANSHELL_CONTENT_UPDATE_CHEKING_PLEASE_WAIT}" --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 
 if [ -z `cat /tmp/spark-store-app-ssupdate-status.txt` ] ; then
 	/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh clean-log
@@ -109,11 +120,25 @@ done)
 			zenity --info --text "${TRANSHELL_CONTENT_NO_APP_IS_CHOSEN}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
 		else
 			### 更新用户选择的应用
-	for PKG_UPGRADE in $PKG_UPGRADE_LIST;do
+
+
+(for PKG_UPGRADE in $PKG_UPGRADE_LIST; do
     APP_UPGRADE="$(get_name_from_desktop_file $PKG_UPGRADE)"
     update_transhell
-			pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE -y | zenity --progress --auto-close --no-cancel --pulsate --text="${TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT}" --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+
-	done
+    # 启动升级任务
+    (pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE -y 2>&1 > /dev/null ) &
+    cmd_pid=$!
+    # 动态修改zenity的文本
+    echo "# ${TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT}"
+    wait
+done) | zenity --progress --auto-close --no-cancel --pulsate --text="Preparing..." --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg
+
+
+
+	 
+
+
 			#### 更新成功
 			if [ -z "`cat /tmp/spark-store-app-upgrade-status.txt`" ] ; then
 				zenity --info --text "${TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg

tool/update-upgrade/ss-update-notifier.sh

@@ -1,16 +1,12 @@
 #!/bin/bash
-export LANGUAGE=en_US
 
 source /opt/durapps/spark-store/bin/bashimport/transhell.amber
 load_transhell_debug
 
 #############################################################
 
-
 # 发送通知
 function notify-send() {
-
-
     # Detect user using the display
     local user=$(who | awk '{print $1}' | head -n 1)
 
@@ -20,11 +16,8 @@ function notify-send() {
     sudo -u $user  DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus notify-send "$@"
 }
 
-
-
 # 检测网络链接畅通
-function network-check()
+function network-check() {
-{
     # 超时时间
     local timeout=15
 
@@ -32,9 +25,9 @@ function network-check()
     local target=www.baidu.com
 
     # 获取响应状态码
-    local ret_code=`curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1`
+    local ret_code=$(curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1)
 
-    if [ "x$ret_code" = "x200" ] ; then
+    if [ "$ret_code" = "200" ]; then
         # 网络畅通
         return 0
     else
@@ -43,37 +36,49 @@ function network-check()
     fi
 }
 
-network-check
+# 初始化等待时间和最大等待时间
-if [ $? -ne 0 ] ; then
+initial_wait_time=15  # 初始等待时间 15 秒
+max_wait_time=$((12 * 3600))  # 最大等待时间 12 小时
+
+# 检测网络，若不通则进行重试，采用指数退避算法
+wait_time=$initial_wait_time
+while ! network-check; do
     echo "$TRANSHELL_CONTENT_NETWORK_FAIL"
-    exit -1
+    echo "Waiting for network to recover... Retrying in ${wait_time} seconds."
+
+    sleep $wait_time
+    wait_time=$((wait_time * 2))  # 等待时间翻倍
+    if [ $wait_time -gt $max_wait_time ]; then
+        wait_time=$max_wait_time  # 最大等待时间限制为12小时
     fi
-
-# The code above is modified from https://blog.csdn.net/yaxuan88521/article/details/120516298
-
-# 每日更新星火源文件
-
-aptss update
-
-updatetext=`aptss ssupdate 2>&1`
-
-until [ "`echo $updatetext | grep E: `" = "" ];do
-echo "${TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC}"
-sleep 15
-updatetext=`aptss ssupdate 2>&1`
-
-
-
 done
 
-isupdate=`echo ${updatetext: -5}`
+# 每日更新星火源文件
-if [ "$isupdate" = "date." ] ; then
+aptss update
-    exit 0
+
+updatetext=`LANGUAGE=en_US aptss ssupdate 2>&1`
+
+# 在网络恢复后，继续更新操作
+retry_count=0
+max_retries=12  # 最大重试次数，防止死循环
+
+until ! echo $updatetext | grep -q "E:"; do
+    if [ $retry_count -ge $max_retries ]; then
+        echo "Reached maximum retry limit for aptss ssupdate."
+        exit 1
     fi
 
-## 从这里开始，只有检测到了更新才会进行
+    echo "${TRANSHELL_CONTENT_UPDATE_ERROR_AND_WAIT_15_SEC}"
-update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串`
+    sleep 15
-update_app_number=`echo ${update_app_number##*information...}`
+    updatetext=`LANGUAGE=en_US aptss ssupdate 2>&1`
+    retry_count=$((retry_count + 1))
+done
+
+update_app_number=$(env LANGUAGE=en_US /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" 2>/dev/null | grep -c upgradable)
+
+if [ "$update_app_number" -le 0 ]; then
+    exit 0
+fi
 
 # 获取用户选择的要更新的应用
 PKG_LIST="$(/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgradable-list)"
@@ -93,7 +98,7 @@ for line in $PKG_LIST ; do
         continue
     fi
 
-    ## 检测是否是 hold 状态
+    # 检测是否是 hold 状态
     PKG_STA=$(dpkg-query -W -f='${db:Status-Want}' $PKG_NAME)
     if [ "$PKG_STA" = "hold" ]; then
         let update_app_number=$update_app_number-1
@@ -107,11 +112,9 @@ if [ $update_app_number -le 0 ] ; then
 fi
 update_transhell
 
-## 如果都是hold或者版本一致的那就直接退出，否则把剩余的给提醒了
+# 如果都是hold或者版本一致的那就直接退出，否则把剩余的给提醒了
-
+# TODO: 除了apt-mark hold之外额外有一个禁止检查列表
-##TODO:除了apt-mark hold之外额外有一个禁止检查列表
+# 如果不想提示就不提示
-
-## 如果不想提示就不提示
 
 user=$(who | awk '{print $1}' | head -n 1)
 if [ -e "/home/$user/.config/spark-union/spark-store/ssshell-config-do-not-show-upgrade-notify" ]; then
@@ -119,5 +122,5 @@ echo "他不想站在世界之巅，好吧"
     echo "Okay he don't want to be at the top of the world, okay"
     exit
 else
-notify-send -a spark-store "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY}" "${TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE}"
+    notify-send -a spark-store "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_NOTIFY}" "${TRANSHELL_CONTENT_THERE_ARE_APPS_TO_UPGRADE}" || true # Some machine don't have bus, or who command just print nothing.
 fi

translations/spark-store_en.ts

@@ -127,9 +127,9 @@
     <message>
         <location filename="../src/pages/appintopage.ui" line="244"/>
         <location filename="../src/pages/appintopage.cpp" line="198"/>
-        <location filename="../src/pages/appintopage.cpp" line="336"/>
+        <location filename="../src/pages/appintopage.cpp" line="338"/>
-        <location filename="../src/pages/appintopage.cpp" line="370"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
-        <location filename="../src/pages/appintopage.cpp" line="530"/>
+        <location filename="../src/pages/appintopage.cpp" line="541"/>
         <source>Download and Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -187,8 +187,8 @@
     </message>
     <message>
         <location filename="../src/pages/appintopage.cpp" line="183"/>
-        <location filename="../src/pages/appintopage.cpp" line="363"/>
+        <location filename="../src/pages/appintopage.cpp" line="365"/>
-        <location filename="../src/pages/appintopage.cpp" line="502"/>
+        <location filename="../src/pages/appintopage.cpp" line="510"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
@@ -198,57 +198,57 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="341"/>
+        <location filename="../src/pages/appintopage.cpp" line="343"/>
-        <location filename="../src/pages/appintopage.cpp" line="478"/>
+        <location filename="../src/pages/appintopage.cpp" line="483"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="346"/>
+        <location filename="../src/pages/appintopage.cpp" line="348"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
         <source>The current application does not support or tested on deepin, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
         <source>The current application does not support or tested on UOS, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
         <source>The current application does not support or tested on Ubuntu, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>The current application does not support or tested on current platform, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -411,103 +411,103 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="166"/>
+        <location filename="../src/mainwindow-dtk.ui" line="116"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="203"/>
+        <location filename="../src/mainwindow-dtk.ui" line="153"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="231"/>
+        <location filename="../src/mainwindow-dtk.ui" line="181"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="259"/>
+        <location filename="../src/mainwindow-dtk.ui" line="209"/>
         <source>Music</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="287"/>
+        <location filename="../src/mainwindow-dtk.ui" line="237"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="315"/>
+        <location filename="../src/mainwindow-dtk.ui" line="265"/>
         <source>Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="343"/>
+        <location filename="../src/mainwindow-dtk.ui" line="293"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="371"/>
+        <location filename="../src/mainwindow-dtk.ui" line="321"/>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="399"/>
+        <location filename="../src/mainwindow-dtk.ui" line="349"/>
         <source>Reading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="427"/>
+        <location filename="../src/mainwindow-dtk.ui" line="377"/>
         <source>Development</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="455"/>
+        <location filename="../src/mainwindow-dtk.ui" line="405"/>
         <source>Tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="483"/>
+        <location filename="../src/mainwindow-dtk.ui" line="433"/>
         <source>Theme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="511"/>
+        <location filename="../src/mainwindow-dtk.ui" line="461"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="539"/>
+        <location filename="../src/mainwindow-dtk.ui" line="489"/>
         <source>APP Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
         <source>Submit App</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
         <source>Submit App with client(Recommanded)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="220"/>
         <source>APP Upgrade and Install Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="271"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
         <source>Search or enter spk://</source>
         <translation type="unfinished"></translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -537,7 +537,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
         <source>Show MainWindow</source>
         <translation type="unfinished"></translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="276"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_es.ts

@@ -127,9 +127,9 @@
     <message>
         <location filename="../src/pages/appintopage.ui" line="244"/>
         <location filename="../src/pages/appintopage.cpp" line="198"/>
-        <location filename="../src/pages/appintopage.cpp" line="336"/>
+        <location filename="../src/pages/appintopage.cpp" line="338"/>
-        <location filename="../src/pages/appintopage.cpp" line="370"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
-        <location filename="../src/pages/appintopage.cpp" line="530"/>
+        <location filename="../src/pages/appintopage.cpp" line="541"/>
         <source>Download and Install</source>
         <translation>Descargar e instalar</translation>
     </message>
@@ -187,8 +187,8 @@
     </message>
     <message>
         <location filename="../src/pages/appintopage.cpp" line="183"/>
-        <location filename="../src/pages/appintopage.cpp" line="363"/>
+        <location filename="../src/pages/appintopage.cpp" line="365"/>
-        <location filename="../src/pages/appintopage.cpp" line="502"/>
+        <location filename="../src/pages/appintopage.cpp" line="510"/>
         <source>Reinstall</source>
         <translation>Reinstalación</translation>
     </message>
@@ -198,57 +198,57 @@
         <translation>Actualización</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="341"/>
+        <location filename="../src/pages/appintopage.cpp" line="343"/>
-        <location filename="../src/pages/appintopage.cpp" line="478"/>
+        <location filename="../src/pages/appintopage.cpp" line="483"/>
         <source>Install</source>
         <translation>Instalación</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="346"/>
+        <location filename="../src/pages/appintopage.cpp" line="348"/>
         <source>Installing</source>
         <translation>Se está instalando</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
         <source>The current application does not support or tested on deepin, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
         <source>The current application does not support or tested on UOS, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
         <source>The current application does not support or tested on Ubuntu, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>The current application does not support or tested on current platform, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>Spark Store</source>
         <translation>SPARK Store</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
         <source>Uninstall succeeded</source>
         <translation>Desinstalación exitosa</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>La URL ha sido copiada al portapapeles</translation>
     </message>
@@ -411,103 +411,103 @@
         <translation>Ventana principal</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="166"/>
+        <location filename="../src/mainwindow-dtk.ui" line="116"/>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="203"/>
+        <location filename="../src/mainwindow-dtk.ui" line="153"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="231"/>
+        <location filename="../src/mainwindow-dtk.ui" line="181"/>
         <source>Chat</source>
         <translation>Charla</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="259"/>
+        <location filename="../src/mainwindow-dtk.ui" line="209"/>
         <source>Music</source>
         <translation>Música</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="287"/>
+        <location filename="../src/mainwindow-dtk.ui" line="237"/>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="315"/>
+        <location filename="../src/mainwindow-dtk.ui" line="265"/>
         <source>Picture</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="343"/>
+        <location filename="../src/mainwindow-dtk.ui" line="293"/>
         <source>Game</source>
         <translation>Juego</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="371"/>
+        <location filename="../src/mainwindow-dtk.ui" line="321"/>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="399"/>
+        <location filename="../src/mainwindow-dtk.ui" line="349"/>
         <source>Reading</source>
         <translation>Leer</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="427"/>
+        <location filename="../src/mainwindow-dtk.ui" line="377"/>
         <source>Development</source>
         <translation>Desarrollo</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="455"/>
+        <location filename="../src/mainwindow-dtk.ui" line="405"/>
         <source>Tool</source>
         <translation>Herramientas</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="483"/>
+        <location filename="../src/mainwindow-dtk.ui" line="433"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="511"/>
+        <location filename="../src/mainwindow-dtk.ui" line="461"/>
         <source>Other</source>
         <translation>Además</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="539"/>
+        <location filename="../src/mainwindow-dtk.ui" line="489"/>
         <source>APP Upgrade</source>
         <translation>Actualización de app</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
         <source>Submit App</source>
         <translation>Presentación de la aplicación</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
         <source>Submit App with client(Recommanded)</source>
         <translation>Enviar la aplicación al cliente (recomendación)</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="220"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>Actualización e instalación de app</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="271"/>
         <source>Spark Store</source>
         <translation>SPARK Store</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
         <source>Search or enter spk://</source>
         <translation>Buscar o introducir spk: /%</translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
         <source>Spark Store</source>
         <translation>SPARK Store</translation>
     </message>
@@ -537,7 +537,7 @@
         <translation>Descargar lista</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
         <source>Show MainWindow</source>
         <translation>Mostrar la ventana principal</translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="276"/>
         <source>Exit</source>
         <translation>Exportaciones</translation>
     </message>

translations/spark-store_fr.ts

@@ -127,9 +127,9 @@
     <message>
         <location filename="../src/pages/appintopage.ui" line="244"/>
         <location filename="../src/pages/appintopage.cpp" line="198"/>
-        <location filename="../src/pages/appintopage.cpp" line="336"/>
+        <location filename="../src/pages/appintopage.cpp" line="338"/>
-        <location filename="../src/pages/appintopage.cpp" line="370"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
-        <location filename="../src/pages/appintopage.cpp" line="530"/>
+        <location filename="../src/pages/appintopage.cpp" line="541"/>
         <source>Download and Install</source>
         <translation>Télécharger et installer</translation>
     </message>
@@ -187,8 +187,8 @@
     </message>
     <message>
         <location filename="../src/pages/appintopage.cpp" line="183"/>
-        <location filename="../src/pages/appintopage.cpp" line="363"/>
+        <location filename="../src/pages/appintopage.cpp" line="365"/>
-        <location filename="../src/pages/appintopage.cpp" line="502"/>
+        <location filename="../src/pages/appintopage.cpp" line="510"/>
         <source>Reinstall</source>
         <translation>Réinstaller</translation>
     </message>
@@ -198,57 +198,57 @@
         <translation>Mise à niveau</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="341"/>
+        <location filename="../src/pages/appintopage.cpp" line="343"/>
-        <location filename="../src/pages/appintopage.cpp" line="478"/>
+        <location filename="../src/pages/appintopage.cpp" line="483"/>
         <source>Install</source>
         <translation>Installation</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="346"/>
+        <location filename="../src/pages/appintopage.cpp" line="348"/>
         <source>Installing</source>
         <translation>Installation en cours</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
         <source>The current application does not support or tested on deepin, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
         <source>The current application does not support or tested on UOS, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
         <source>The current application does not support or tested on Ubuntu, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>The current application does not support or tested on current platform, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>Spark Store</source>
         <translation>Le Spark store</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
         <source>Uninstall succeeded</source>
         <translation>Désinstallation réussie</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>L&apos;URL a été copiée dans le presse - papiers</translation>
     </message>
@@ -411,103 +411,103 @@
         <translation>Fenêtre principale</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="166"/>
+        <location filename="../src/mainwindow-dtk.ui" line="116"/>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="203"/>
+        <location filename="../src/mainwindow-dtk.ui" line="153"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="231"/>
+        <location filename="../src/mainwindow-dtk.ui" line="181"/>
         <source>Chat</source>
         <translation>Bavarder</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="259"/>
+        <location filename="../src/mainwindow-dtk.ui" line="209"/>
         <source>Music</source>
         <translation>Musique</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="287"/>
+        <location filename="../src/mainwindow-dtk.ui" line="237"/>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="315"/>
+        <location filename="../src/mainwindow-dtk.ui" line="265"/>
         <source>Picture</source>
         <translation>Photos</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="343"/>
+        <location filename="../src/mainwindow-dtk.ui" line="293"/>
         <source>Game</source>
         <translation>Jeux</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="371"/>
+        <location filename="../src/mainwindow-dtk.ui" line="321"/>
         <source>Office</source>
         <translation>Bureaux</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="399"/>
+        <location filename="../src/mainwindow-dtk.ui" line="349"/>
         <source>Reading</source>
         <translation>Lire</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="427"/>
+        <location filename="../src/mainwindow-dtk.ui" line="377"/>
         <source>Development</source>
         <translation>Développement</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="455"/>
+        <location filename="../src/mainwindow-dtk.ui" line="405"/>
         <source>Tool</source>
         <translation>Outils</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="483"/>
+        <location filename="../src/mainwindow-dtk.ui" line="433"/>
         <source>Theme</source>
         <translation>Thèmes</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="511"/>
+        <location filename="../src/mainwindow-dtk.ui" line="461"/>
         <source>Other</source>
         <translation>En outre</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="539"/>
+        <location filename="../src/mainwindow-dtk.ui" line="489"/>
         <source>APP Upgrade</source>
         <translation>Mise à niveau app</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
         <source>Submit App</source>
         <translation>Soumettre une application</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
         <source>Submit App with client(Recommanded)</source>
         <translation>Soumettre une demande au client (recommandé)</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="220"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>Paramètres de mise à niveau et d&apos;installation de l&apos;app</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="271"/>
         <source>Spark Store</source>
         <translation>Le Spark store</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
         <source>Search or enter spk://</source>
         <translation>Rechercher ou entrer SPK /</translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
         <source>Spark Store</source>
         <translation>Le Spark store</translation>
     </message>
@@ -537,7 +537,7 @@
         <translation>Télécharger la Liste</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
         <source>Show MainWindow</source>
         <translation>Afficher la fenêtre principale</translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="276"/>
         <source>Exit</source>
         <translation>Exportations</translation>
     </message>

translations/spark-store_zh_CN.ts

@@ -122,9 +122,9 @@
     <message>
         <location filename="../src/pages/appintopage.ui" line="244"/>
         <location filename="../src/pages/appintopage.cpp" line="198"/>
-        <location filename="../src/pages/appintopage.cpp" line="336"/>
+        <location filename="../src/pages/appintopage.cpp" line="338"/>
-        <location filename="../src/pages/appintopage.cpp" line="370"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
-        <location filename="../src/pages/appintopage.cpp" line="530"/>
+        <location filename="../src/pages/appintopage.cpp" line="541"/>
         <source>Download and Install</source>
         <translation>下载并安装</translation>
     </message>
@@ -187,8 +187,8 @@
     </message>
     <message>
         <location filename="../src/pages/appintopage.cpp" line="183"/>
-        <location filename="../src/pages/appintopage.cpp" line="363"/>
+        <location filename="../src/pages/appintopage.cpp" line="365"/>
-        <location filename="../src/pages/appintopage.cpp" line="502"/>
+        <location filename="../src/pages/appintopage.cpp" line="510"/>
         <source>Reinstall</source>
         <translation>重新安装</translation>
     </message>
@@ -198,57 +198,57 @@
         <translation>升级</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="341"/>
+        <location filename="../src/pages/appintopage.cpp" line="343"/>
-        <location filename="../src/pages/appintopage.cpp" line="478"/>
+        <location filename="../src/pages/appintopage.cpp" line="483"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="346"/>
+        <location filename="../src/pages/appintopage.cpp" line="348"/>
         <source>Installing</source>
         <translation>正在安装</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
         <source>The current application does not support or tested on deepin, there may be problems</source>
         <translation>当前应用不支持或未在deepin上测试过，安装后可能会出现问题</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
         <source>The current application does not support or tested on UOS, there may be problems</source>
         <translation>当前应用不支持或未在UOS上测试过，安装后可能会出现问题</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
         <source>The current application does not support or tested on Ubuntu, there may be problems</source>
         <translation>当前应用不支持或未在Ubuntu上测试过，安装后可能会出现问题</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>The current application does not support or tested on current platform, there may be problems</source>
         <translation>当前应用不支持或未在您的平台上测试过，安装后可能会出现问题</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
         <source>Uninstall succeeded</source>
         <translation>卸载成功</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>链接已复制到剪贴板</translation>
     </message>
@@ -411,103 +411,103 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="166"/>
+        <location filename="../src/mainwindow-dtk.ui" line="116"/>
         <source>Home</source>
         <translation>主页</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="203"/>
+        <location filename="../src/mainwindow-dtk.ui" line="153"/>
         <source>Network</source>
         <translation>网络</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="231"/>
+        <location filename="../src/mainwindow-dtk.ui" line="181"/>
         <source>Chat</source>
         <translation>社交</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="259"/>
+        <location filename="../src/mainwindow-dtk.ui" line="209"/>
         <source>Music</source>
         <translation>音乐</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="287"/>
+        <location filename="../src/mainwindow-dtk.ui" line="237"/>
         <source>Video</source>
         <translation>视频</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="315"/>
+        <location filename="../src/mainwindow-dtk.ui" line="265"/>
         <source>Picture</source>
         <translation>图像</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="343"/>
+        <location filename="../src/mainwindow-dtk.ui" line="293"/>
         <source>Game</source>
         <translation>游戏</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="371"/>
+        <location filename="../src/mainwindow-dtk.ui" line="321"/>
         <source>Office</source>
         <translation>办公</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="399"/>
+        <location filename="../src/mainwindow-dtk.ui" line="349"/>
         <source>Reading</source>
         <translation>阅读</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="427"/>
+        <location filename="../src/mainwindow-dtk.ui" line="377"/>
         <source>Development</source>
         <translation>开发</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="455"/>
+        <location filename="../src/mainwindow-dtk.ui" line="405"/>
         <source>Tool</source>
         <translation>工具</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="483"/>
+        <location filename="../src/mainwindow-dtk.ui" line="433"/>
         <source>Theme</source>
         <translation>主题</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="511"/>
+        <location filename="../src/mainwindow-dtk.ui" line="461"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="539"/>
+        <location filename="../src/mainwindow-dtk.ui" line="489"/>
         <source>APP Upgrade</source>
         <translation>更新</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
         <source>Submit App</source>
         <translation>投递应用</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
         <source>Submit App with client(Recommanded)</source>
         <translation>使用本地投稿器投递应用（推荐）</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="220"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>应用更新和安装设置</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="271"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
         <source>Search or enter spk://</source>
         <translation>搜索或打开链接</translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
@@ -537,7 +537,7 @@
         <translation>下载列表</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
         <source>Show MainWindow</source>
         <translation>显示主窗口</translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="276"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>

translations/spark-store_zh_TW.ts

@@ -122,9 +122,9 @@
     <message>
         <location filename="../src/pages/appintopage.ui" line="244"/>
         <location filename="../src/pages/appintopage.cpp" line="198"/>
-        <location filename="../src/pages/appintopage.cpp" line="336"/>
+        <location filename="../src/pages/appintopage.cpp" line="338"/>
-        <location filename="../src/pages/appintopage.cpp" line="370"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
-        <location filename="../src/pages/appintopage.cpp" line="530"/>
+        <location filename="../src/pages/appintopage.cpp" line="541"/>
         <source>Download and Install</source>
         <translation>下載並安裝</translation>
     </message>
@@ -187,8 +187,8 @@
     </message>
     <message>
         <location filename="../src/pages/appintopage.cpp" line="183"/>
-        <location filename="../src/pages/appintopage.cpp" line="363"/>
+        <location filename="../src/pages/appintopage.cpp" line="365"/>
-        <location filename="../src/pages/appintopage.cpp" line="502"/>
+        <location filename="../src/pages/appintopage.cpp" line="510"/>
         <source>Reinstall</source>
         <translation>重新安裝</translation>
     </message>
@@ -198,57 +198,57 @@
         <translation>升级</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="341"/>
+        <location filename="../src/pages/appintopage.cpp" line="343"/>
-        <location filename="../src/pages/appintopage.cpp" line="478"/>
+        <location filename="../src/pages/appintopage.cpp" line="483"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="346"/>
+        <location filename="../src/pages/appintopage.cpp" line="348"/>
         <source>Installing</source>
         <translation>正在安装</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>Warning</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="457"/>
+        <location filename="../src/pages/appintopage.cpp" line="462"/>
         <source>The current application does not support or tested on deepin, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="461"/>
+        <location filename="../src/pages/appintopage.cpp" line="466"/>
         <source>The current application does not support or tested on UOS, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="465"/>
+        <location filename="../src/pages/appintopage.cpp" line="470"/>
         <source>The current application does not support or tested on Ubuntu, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="469"/>
+        <location filename="../src/pages/appintopage.cpp" line="474"/>
         <source>The current application does not support or tested on current platform, there may be problems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="533"/>
+        <location filename="../src/pages/appintopage.cpp" line="544"/>
         <source>Uninstall succeeded</source>
         <translation>卸载成功</translation>
     </message>
     <message>
-        <location filename="../src/pages/appintopage.cpp" line="548"/>
+        <location filename="../src/pages/appintopage.cpp" line="559"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>链接已复制到剪贴板</translation>
     </message>
@@ -411,103 +411,103 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="166"/>
+        <location filename="../src/mainwindow-dtk.ui" line="116"/>
         <source>Home</source>
         <translation>首頁</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="203"/>
+        <location filename="../src/mainwindow-dtk.ui" line="153"/>
         <source>Network</source>
         <translation>網路</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="231"/>
+        <location filename="../src/mainwindow-dtk.ui" line="181"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="259"/>
+        <location filename="../src/mainwindow-dtk.ui" line="209"/>
         <source>Music</source>
         <translation>音樂</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="287"/>
+        <location filename="../src/mainwindow-dtk.ui" line="237"/>
         <source>Video</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="315"/>
+        <location filename="../src/mainwindow-dtk.ui" line="265"/>
         <source>Picture</source>
         <translation>圖片</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="343"/>
+        <location filename="../src/mainwindow-dtk.ui" line="293"/>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="371"/>
+        <location filename="../src/mainwindow-dtk.ui" line="321"/>
         <source>Office</source>
         <translation>辦公</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="399"/>
+        <location filename="../src/mainwindow-dtk.ui" line="349"/>
         <source>Reading</source>
         <translation>閱讀</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="427"/>
+        <location filename="../src/mainwindow-dtk.ui" line="377"/>
         <source>Development</source>
         <translation>開發</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="455"/>
+        <location filename="../src/mainwindow-dtk.ui" line="405"/>
         <source>Tool</source>
         <translation>工具</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="483"/>
+        <location filename="../src/mainwindow-dtk.ui" line="433"/>
         <source>Theme</source>
         <translation>主題</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="511"/>
+        <location filename="../src/mainwindow-dtk.ui" line="461"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.ui" line="539"/>
+        <location filename="../src/mainwindow-dtk.ui" line="489"/>
         <source>APP Upgrade</source>
         <translation>軟體更新</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="206"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="217"/>
         <source>Submit App</source>
         <translation>上傳軟體</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="207"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="218"/>
         <source>Submit App with client(Recommanded)</source>
         <translation>從客戶端上傳軟體(推薦的)</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="208"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="219"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="209"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="220"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>軟體升級 和 安裝設定</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="163"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="171"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="260"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="271"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="176"/>
         <source>Search or enter spk://</source>
         <translation>搜索或打开链接</translation>
     </message>
@@ -517,7 +517,7 @@
     <message>
         <location filename="../src/application.cpp" line="36"/>
         <location filename="../src/application.cpp" line="37"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="142"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="149"/>
         <source>Spark Store</source>
         <translation>星火应用商店</translation>
     </message>
@@ -537,7 +537,7 @@
         <translation>下载列表</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="263"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="274"/>
         <source>Show MainWindow</source>
         <translation>显示主窗口</translation>
     </message>
@@ -658,12 +658,12 @@
 <context>
     <name>TitleBarMenu</name>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="264"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="275"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="265"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="276"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>