全部改为zenity

Merge pull request !132 from shenmo/dev

debian/changelog

@@ -1,3 +1,42 @@
+spark-store (3.3~test2) stable; urgency=medium
+
+  * 更新检测功能全部更改到zenity
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.3~test1) stable; urgency=medium
+
+  * zenity，选择可更新应用
+  * 自动更新检测现在会跳过hold
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.4) stable; urgency=medium
+
+  * 修改tag相关的文案内容：wine相关环境已可自动配置了
+  * 准备发版
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.4~test4) stable; urgency=medium
+
+  * 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/deepin-community-store/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
+  
+
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+spark-store (3.2.4~test3) stable; urgency=medium
+
+  * 发版，合入到master
+  * 翻译完毕
+  * 合入先前的各项改动，为：客户端集成投稿器入口和支持，修复：安装依赖时间较长时错误地返回“安装完毕”结果，现在客户端版本更新时不关闭免密码登录，UOS安装进程合并正常aptss中
+
+
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (3.2.4~test2) stable; urgency=medium
 
   * 客户端集成投稿器入口和支持

debian/control

@@ -35,10 +35,12 @@ Depends:${shlibs:Depends}, ${misc:Depends},
  libnotify4,
  curl,
  openssl,
+ libssl-dev,
  dde-qt5integration,
  bubblewrap,
  aria2,
- gcc
+ gcc,
+ zenity
 Description: Spark Store
  A community powered app store, based on DTK.
 Recommends: apt-fast

src/dbus/dbussparkstore.cpp

@@ -0,0 +1,12 @@
+#include "dbussparkstore.h"
+#include <QDebug>
+DBusSparkStoreService::DBusSparkStoreService(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+
+}
+
+void DBusSparkStoreService::activeWindow(const QString & arg)
+{
+    emit sigOpenUrl(arg);
+}

src/dbus/dbussparkstore.h

@@ -0,0 +1,24 @@
+#ifndef DBUSSPARKSTORE_H
+#define DBUSSPARKSTORE_H
+
+#include <QObject>
+#include <QUrl>
+#include <QtDBus/QtDBus>
+
+class Wallpaper;
+class DBusSparkStoreService : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.gitee.spark.store")
+public:
+    explicit DBusSparkStoreService(QObject *parent);
+
+signals :
+    void sigOpenUrl(const QString &url);
+public Q_SLOTS:
+
+    void activeWindow(const QString &arg);
+
+};
+
+#endif // DBUSSPARKSTORE_H

src/downloadworker.cpp

@@ -116,7 +116,7 @@ void DownloadController::startDownload(const QString &url)
         else{
             for (int i = 0; i < domains.size(); i++)
             {
-                command.append(replaceDomain(url, domains.at(i)).toUtf8());
+                command.append(replaceDomain(url, domains.at(i)).replace("+","%2B").toUtf8()); //对+进行转译，避免oss出错
             }
         }
 

src/main.cpp

@@ -4,6 +4,9 @@
 #include <DAboutDialog>
 #include <QVector>
 #include <QScreen>
+//新增dbus
+#include <QDBusInterface>
+#include <QDBusPendingCall>
 
 #include "widget.h"
 
@@ -34,7 +37,7 @@ int main(int argc, char *argv[])
      DAboutDialog dialog;
       a.setAboutDialog(&dialog);
       dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
-      dialog.setVersion(DApplication::buildVersion("Version 3.2.4"));
+      dialog.setVersion(DApplication::buildVersion("Version 3.3~test2"));
       dialog.setProductIcon(QIcon::fromTheme("spark-store"));  // 设置Logo
       dialog.setProductName(QLabel::tr("Spark Store"));
       dialog.setDescription(
@@ -55,7 +58,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("spark-union");
     a.setOrganizationDomain("https://www.deepinos.org/");
     a.setApplicationName("Spark Store");    //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文
-    a.setApplicationVersion(DApplication::buildVersion("3.2.4"));
+    a.setApplicationVersion(DApplication::buildVersion("3.3~test2"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setApplicationDescription(
                 QObject::tr(
@@ -69,6 +72,17 @@ int main(int argc, char *argv[])
     // 限制单实例运行
     if(!a.setSingleInstance("spark-store"))
     {
+        qDebug() << "The application is already running!";
+        QDBusInterface iface("com.gitee.spark.store",
+                             "/com/gitee/spark/store",
+                             "com.gitee.spark.store",
+                             QDBusConnection::sessionBus());
+
+        QString arg1 = argv[1];
+
+        iface.asyncCall("activeWindow",arg1);
+
+
         return -1;
     }
 

src/spark-store.pro

@@ -8,6 +8,7 @@ QT       += core gui network concurrent webenginewidgets
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+QT       += dbus
 TARGET = spark-store
 TEMPLATE = app
 
@@ -41,7 +42,8 @@ SOURCES += \
     main.cpp \
     progressload.cpp \
     widget.cpp \
-    workerthreads.cpp
+    workerthreads.cpp \
+    dbus/dbussparkstore.cpp
 
 HEADERS += \
     appitem.h \
@@ -52,7 +54,8 @@ HEADERS += \
     image_show.h \
     progressload.h \
     widget.h \
-    workerthreads.h
+    workerthreads.h \
+    dbus/dbussparkstore.h
 
 FORMS += \
     appitem.ui \

src/widget.cpp

@@ -33,6 +33,7 @@
 #include "HttpClient.h"
 #include "downloadworker.h"
 
+#include "./dbus/dbussparkstore.h"
 DWIDGET_USE_NAMESPACE
 
 Widget::Widget(DBlurEffectWidget *parent) :
@@ -138,6 +139,9 @@ Widget::Widget(DBlurEffectWidget *parent) :
     });
 
     notify_init(tr("Spark\\ Store").toLocal8Bit());
+
+    //初始化dbus服务
+    initDbus();
 }
 
 Widget::~Widget()
@@ -207,7 +211,7 @@ void Widget::initUI()
 
     connect(actionSubmission, &QAction::triggered, this, [=]{QDesktopServices::openUrl(QUrl("https://upload.deepinos.org/"));});
     connect(setting, &QAction::triggered, this, &Widget::opensetting);
-    connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("x-terminal-emulator -e /opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");});
+    connect(upgrade, &QAction::triggered, this, [=]{QProcess::startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh");});
 
     // 投稿器
     connect(actionSubmissionWithClient, &QAction::triggered, this, [=]
@@ -452,6 +456,15 @@ void Widget::sendNotification(const char *message, const int msTimeout, const QS
     notify_notification_show(_notify, nullptr);
 }
 
+void Widget::initDbus()
+{
+    DBusSparkStoreService *dbusInter = new DBusSparkStoreService(this);
+
+    QDBusConnection::sessionBus().registerService("com.gitee.spark.store");
+    QDBusConnection::sessionBus().registerObject("/com/gitee/spark/store", "com.gitee.spark.store", this);
+    connect(dbusInter,&DBusSparkStoreService::sigOpenUrl,this,&Widget::onGetUrl);
+}
+
 void Widget::updateUI()
 {
     if(themeIsDark)
@@ -497,6 +510,9 @@ void Widget::updateUI()
          * left_list[i]->setFont(temp);
          */
 
+        QFont temp;
+        temp.setFamily(temp.defaultFamily());
+        left_list[i]->setFont(temp);
         left_list[i]->setFixedHeight(38);
         if(themeIsDark)
         {
@@ -1303,6 +1319,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
         ui->stackedWidget->setCurrentIndex(2);
         
         qDebug() << "程序跳转链接地址：" << arg1;
+        QString url = arg1.toString();
 
         /*
         load.cancel();  // 打开并发加载线程前关闭正在执行的线程
@@ -1313,7 +1330,7 @@ void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
         */
         appinfoLoadThread.requestInterruption();
         appinfoLoadThread.wait(100);
-        appinfoLoadThread.setUrl(arg1);
+        appinfoLoadThread.setUrl(url.replace("+","%2B")); //对+进行转译，避免oss出错
         appinfoLoadThread.start();
     }
 }
@@ -1353,3 +1370,12 @@ void Widget::on_pushButton_update_clicked()
     QDesktopServices::openUrl(QUrl("https://www.deepinos.org/"));
 }
 
+void Widget::onGetUrl(const QString &url)
+{
+    if(url.left(6)=="spk://")
+    {
+        openUrl(QUrl(url));
+    }
+    activateWindow();
+}
+

src/widget.h

@@ -64,6 +64,7 @@ public:
     static void sendNotification(const QString &message, const int msTimeout = 5000, const QString &icon = "spark-store");
     static void sendNotification(const char *message, const int msTimeout = 5000, const QString &icon = "spark-store");
 
+    void initDbus();
 private slots:
 
     void httpFinished();
@@ -103,6 +104,9 @@ private slots:
     void on_pushButton_refresh_clicked();
     void on_pushButton_update_clicked();
 
+    //接受来自dbus的url
+    void onGetUrl(const QString &url);
+
   public:
     QUrl url;
     QString cdnSeverUrl;

src/widget.ui

@@ -345,7 +345,7 @@
       <number>0</number>
      </property>
      <property name="currentIndex">
-      <number>3</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -365,11 +365,11 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="QWebEngineView" name="webEngineView">
+        <widget class="QWebEngineView" name="webEngineView" native="true">
          <property name="contextMenuPolicy">
           <enum>Qt::DefaultContextMenu</enum>
          </property>
-         <property name="url">
+         <property name="url" stdset="0">
           <url>
            <string>about:blank</string>
           </url>
@@ -842,7 +842,7 @@
                     </size>
                    </property>
                    <property name="toolTip">
-                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will configure the wine environment for you， so don‘t worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                    </property>
                    <property name="whatsThis">
                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -861,7 +861,7 @@
                     </size>
                    </property>
                    <property name="toolTip">
-                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will configure the wine environment for you， so don‘t worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                    </property>
                    <property name="whatsThis">
                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

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

@@ -1,24 +1,26 @@
-#!/bin/bash
+PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)" 
+####如果没更新，就弹出不需要更新
+if [ -z "$PKG_LIST" ];then
+zenity --info --icon-name=spark-store --text "没有软件需要更新\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300
+else
+PKG_UPGRADE_LIST=`for PKG_NAME in $PKG_LIST;
+do
+#### 检测是否是hold状态
+	if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" = "" ];then
+       echo "true"
+       echo "$PKG_NAME"
+	else
+	echo "false"
+	echo "$PKG_NAME (无法更新：请先执行 sudo apt-mark unhold 后再更新)"
+	fi
+done | zenity --list --text="选择你想更新的应用" --column=是否更新 --column=应用包名 --separator=" " --checklist --print-column=2 --multiple --height 350 --width 550 ` 
 
-echo "以上可升级，是否升级？[y/n]"
-read yes_or_no
-if [ "$yes_or_no" = "y" ];then ###这是确定是否同意
+#### 如果没有选择，则直接退出
 
-echo "获取更新列表..."
-PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)"
+if [ "$PKG_UPGRADE_LIST" = "" ];then
+zenity --info --icon-name=spark-store --text "没有选中任何软件\n但是你并没有站在世界之巅" --title "星火商店更新检测服务" --height 150 --width 300
+else
+sudo aptss install $PKG_UPGRADE_LIST -y
+fi
 
-
-  for PKG_NAME in $PKG_LIST;
-  do
-    echo "$PKG_NAME 正在更新..."
-    if sudo aptss install "$PKG_NAME" -y >/dev/null 2>&1;
-    then
-      echo "$PKG_NAME 已更新"
-    else
-      echo "WARNING: $PKG_NAME 无法更新"
-    fi
-  done
-
-
-
-fi  ###这是确定是否同意
+fi

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

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-reset
 
 endloop=0
 
@@ -21,85 +20,44 @@ else
 text_auto_install_open="开启"
 fi
 
-
-echo "欢迎使用星火更新和安装设置工具"
-echo "请在以下操作中选择一个进行~"
-echo "输入0 查看自动更新相关功能使用前须知（重要）"
-echo "输入1 $text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)"
-echo "输入2 查看可更新软件包列表并决定是否更新"
-echo "输入3 $text_auto_install_open点击安装免输入密码功能"
-echo "输入4 退出脚本"
-echo
-read -e option
+option=`zenity --list --text="欢迎使用星火更新和安装设置工具\n请在以下操作中选择一个进行~" --column 数字 --column=操作选项  --print-column=2  --height 350 --width 760 0 "查看自动更新相关功能使用前须知（重要）" 1 "$text_update_open星火更新检测工具(如果开启则会在系统启动后自动检测更新。如有更新则会弹出通知)" 2 查看可更新软件包列表并决定是否更新 3 "$text_auto_install_open点击安装免输入密码功能" 4 退出脚本 --hide-column=1 --print-column=1` 
 
 case $option in 
 	0)
-	reset
-	echo "此须知适用于自动更新功能"
-	echo "此脚本可以检测星火源中是否有比当前系统更高版本的软件包，由您决定是否安装；在安装更新过程中请不要直接点击关闭本页面，以免发生错误"
-	echo "此脚本使用apt update/apt list --upgrade/apt upgrade来更新软件源、列出更新列表和操作更新"
-	echo
-	echo "该脚本不对其使用效果有任何明示或暗示的担保，在使用前请您确保您清楚地知道您在干什么。您应当清楚，星火商店的软件包并不是适配所有发行版的；尽管绝大多数的软件更新是无害的，您仍然应该仔细检查显示出来的更新内容，以确保不会对您	的依赖环境造成破坏，尤其是那些看起来和系统依赖相关的软件包。在查看过更新列表之后，确认更新之前，您仍有一次取消更新的机会。"
-	echo "本脚本的开发者不对使用该脚本可能造成的后果负责"
-	echo 
-	echo 
-	echo
-	echo "请按回车继续..."
-#"只有回车可以用啊！""啊？"“你说的任意都行啊”“唔。。。戳到我的盲区了”
-	read
-	reset
+	zenity --info --icon-name=spark-store --height 450 --width 500 --text "此须知适用于自动更新功能\n\n此脚本可以检测星火源中是否有比当前系统更高版本的软件包，由您决定是否安装；在安装更新过程中请不要直接点击关闭本页面，以免发生错误\n\n此脚本使用apt update/apt list --upgrade/apt upgrade来更新软件源、列出更新列表和操作更新\n\n该脚本不对其使用效果有任何明示或暗示的担保，在使用前请您确保您清楚地知道您在干什么。您应当清楚，星火商店的软件包并不是适配所有发行版的；尽管绝大多数的软件更新是无害的，您仍然应该仔细检查显示出来的更新内容，以确保不会对您的依赖环境造成破坏，尤其是那些看起来和系统依赖相关的软件包。在查看过更新列表之后，确认更新之前，您仍有取消更新的机会。\n\n本脚本的开发者不对使用该脚本可能造成的后果负责"
 	;;
 	1)
-	echo "执行以下操作需要授权..."
 	if [  -e /etc/systemd/system/multi-user.target.wants/spark-update-notifier.service ];then 
-	echo "---检测到已经启动了自动更新检测，执行关闭"
-	sudo systemctl disable spark-update-notifier
-	sleep 3
-	reset
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text "检测到已经启动了自动更新检测，执行关闭" --timeout=2 
+	pkexec systemctl disable spark-update-notifier
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text "已关闭" --timeout=2
 	else
-	echo "---未检测到自动更新检测，执行启动"
-	sudo systemctl enable spark-update-notifier
-	sudo service spark-update-notifier start
-	sleep 3
-	reset
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text  "未检测到自动更新检测，执行启动" --timeout=2 
+	pkexec systemctl enable spark-update-notifier
+	pkexec service spark-update-notifier start
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text "已启动" --timeout=2
 	fi
 	;;
 
 	2)
-	echo "执行以下操作需要授权..."
-	sudo aptss ssupdate
-    /opt/durapps/spark-store/bin/update-upgrade/ss-upgrade-list.sh
-	/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
-	echo "---请按回车返回"
-	read
-	reset
+	pkexec bash /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh
 	;;
 	3)
 	if [ -f /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy ];then 
-	echo "---检测到已经启动了免输入密码，执行关闭"
-	sudo rm /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
-	sleep 3
-	reset
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text   "---检测到已经启动了免输入密码，执行关闭" --timeout=2 
+	pkexec rm /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text   "已关闭" --timeout=2 
 	else
 
-cat << EOF
-请注意：这个功能尚未开发完成，一旦开启，则运行pkexec ssinstall时不再需要授权
-仅对星火内置安装器生效
-理论上会存在一定的安全风险~
-如果接受，请输入1，否则输入2
-EOF
-read is_accept_polkiy
+	is_accept_polkiy=`zenity --list  --height 350 --width 300 --text "请注意：这个功能尚未开发完成，一旦开启，则运行pkexec ssinstall时不再需要授权\n仅对星火内置安装器生效\n理论上会存在一定的安全风险" --column 数字 --column=操作选项 --hide-column=1 --print-column=1 1 同意 2 拒绝`
+
+
 
 if [ "$is_accept_polkiy" = "1" ];then
-	echo "执行以下操作需要授权..."
-	sudo ln -s /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
-	echo "---已启动"
-	sleep 3
-	reset
+	pkexec ln -s /opt/durapps/spark-store/bin/auto-install-policy/store.spark-app.ssinstall.policy /usr/share/polkit-1/actions/store.spark-app.ssinstall.policy
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text  "---已启动"
 	else
-	echo "---未同意，返回"
-	sleep 3
-	reset
+	zenity --info --icon-name=spark-store --height 150 --width 200 --text  "---未同意，返回"
 fi
 fi
 	;;
@@ -107,8 +65,7 @@ fi
 	exit 0
 	;;
 	*) 
-	echo "---无法识别的输入！请重新输入"
-	reset
+	exit 0
 esac
 
 done

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

@@ -66,12 +66,31 @@ isupdate=`echo ${updatetext: -5}`
 if [ "$isupdate" = "date." ];then
 exit 0 
 fi
-
+#### 从这里开始，只有检测到了更新才会进行
 
 update_app_number=`echo ${updatetext%package*} #从右向左截取第一个 src 后的字符串`
 update_app_number=`echo ${update_app_number##*information...}`
 
 
+PKG_LIST="$(bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" | awk 'BEGIN {FS="/"} {print $1}' | awk NR\>1)" 
+
+
+
+for PKG_NAME in $PKG_LIST;do
+if [ "$(dpkg-query -W -f='${Status}' $PKG_NAME | grep hold)" != "" ];then
+       let update_app_number=$update_app_number-1
+	echo $update_app_number
+	echo $PKG_NAME 
+fi
+done
+
+
+
+if [ $update_app_number -lt 1 ];then
+exit
+fi
+#### 如果都是hold的那就直接退出，否则把剩余的给提醒了
+
 notify-send -i spark-store "星火更新提醒" "星火商店仓库中有$update_app_number个软件包可以更新啦！请到星火商店的菜单处理"
 
 

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

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-
-
-echo "---可更新的应用有："
-bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt list --upgradable -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list"     -o Dir::Etc::sourceparts="-"   -o APT::Get::List-Cleanup="0" 

translations/spark-store_en.ts

@@ -12,9 +12,9 @@
 <context>
     <name>QLabel</name>
     <message>
-        <location filename="../src/main.cpp" line="35"/>
-        <location filename="../src/main.cpp" line="43"/>
-        <location filename="../src/main.cpp" line="49"/>
+        <location filename="../src/main.cpp" line="42"/>
+        <location filename="../src/main.cpp" line="50"/>
+        <location filename="../src/main.cpp" line="56"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22,22 +22,22 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/main.cpp" line="32"/>
+        <location filename="../src/main.cpp" line="39"/>
         <source>We publish this program under GPL V3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="37"/>
+        <location filename="../src/main.cpp" line="44"/>
         <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by  community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="45"/>
+        <location filename="../src/main.cpp" line="52"/>
         <source>The Spark Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="57"/>
+        <location filename="../src/main.cpp" line="64"/>
         <source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -149,8 +149,8 @@
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="910"/>
-        <location filename="../src/widget.cpp" line="1119"/>
+        <location filename="../src/widget.cpp" line="943"/>
+        <location filename="../src/widget.cpp" line="1152"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -254,7 +254,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="864"/>
         <location filename="../src/widget.ui" line="867"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -303,6 +302,10 @@
     </message>
     <message>
         <location filename="../src/widget.ui" line="845"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will configure the wine environment for you， so don‘t worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/widget.ui" line="848"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -312,6 +315,11 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine2-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/widget.ui" line="864"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will configure the wine environment for you， so don‘t worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/widget.ui" line="870"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine5-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
@@ -368,32 +376,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1304"/>
+        <location filename="../src/widget.ui" line="1328"/>
         <source>Clean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1314"/>
+        <location filename="../src/widget.ui" line="1294"/>
         <source>Since the dictionary is at /tmp,It would be cleaned automatically when  system reboot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1327"/>
+        <location filename="../src/widget.ui" line="1341"/>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1341"/>
+        <location filename="../src/widget.ui" line="1308"/>
         <source>Location：/tmp/spark-store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1362"/>
-        <source>About us</source>
+        <location filename="../src/widget.ui" line="1348"/>
+        <source>Clear Web Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1369"/>
+        <source>About us</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widget.ui" line="1376"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We are &lt;span style=&quot; font-weight:600;&quot;&gt;NOT&lt;/span&gt; the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &amp;quot;Spark Store&amp;quot;! &amp;quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. &lt;/p&gt;&lt;p&gt;We don&apos;t make a profit from this, all developers and maintainers don&apos;t get paid, and we rely on the community&apos;s donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. &lt;/p&gt;&lt;p&gt;Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. &lt;/p&gt;&lt;p&gt;If any part of the store infringes your rights, please tell us &amp;lt;jifengshenmo@outlook.com&amp;gt; we will remove the infringing content as soon as possible. &lt;/p&gt;&lt;p&gt;If you&apos;d like to get involved with us too, whether you&apos;re involved in development, design, pitching or submitting work, we welcome you to join us. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -428,92 +441,97 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1334"/>
+        <location filename="../src/widget.ui" line="1301"/>
         <source>0B</source>
         <translation type="unfinished">0B</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="187"/>
+        <location filename="../src/widget.cpp" line="192"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="188"/>
+        <location filename="../src/widget.cpp" line="193"/>
         <source>Search or enter spk://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="194"/>
+        <location filename="../src/widget.cpp" line="199"/>
         <source>Submit App</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="195"/>
+        <location filename="../src/widget.cpp" line="200"/>
+        <source>Submit App with client(Recommanded)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="201"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="196"/>
+        <location filename="../src/widget.cpp" line="202"/>
         <source>APP Upgrade and Install Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="347"/>
+        <location filename="../src/widget.cpp" line="371"/>
         <source>Not Exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="139"/>
-        <location filename="../src/widget.cpp" line="409"/>
-        <location filename="../src/widget.cpp" line="414"/>
-        <location filename="../src/widget.cpp" line="424"/>
-        <location filename="../src/widget.cpp" line="429"/>
+        <location filename="../src/widget.cpp" line="141"/>
+        <location filename="../src/widget.cpp" line="433"/>
+        <location filename="../src/widget.cpp" line="438"/>
+        <location filename="../src/widget.cpp" line="448"/>
+        <location filename="../src/widget.cpp" line="453"/>
         <source>Spark\ Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="659"/>
-        <location filename="../src/widget.cpp" line="899"/>
+        <location filename="../src/widget.cpp" line="692"/>
+        <location filename="../src/widget.cpp" line="932"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="625"/>
+        <location filename="../src/widget.cpp" line="658"/>
         <source>Failed to get the name to the file to be downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="904"/>
+        <location filename="../src/widget.cpp" line="937"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1091"/>
+        <location filename="../src/widget.cpp" line="1124"/>
         <source>Updating, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1123"/>
+        <location filename="../src/widget.cpp" line="1156"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="710"/>
+        <location filename="../src/widget.cpp" line="739"/>
         <source>Relative apps Not Found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="719"/>
+        <location filename="../src/widget.cpp" line="747"/>
         <source>Request Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1145"/>
+        <location filename="../src/widget.cpp" line="1178"/>
         <source>Temporary cache was cleaned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1227"/>
+        <location filename="../src/widget.cpp" line="1270"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_fr.ts

@@ -23,9 +23,9 @@ Spark Store est publié sous licence GPL V3
 Nous sommes nés pour le changement.</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="35"/>
-        <location filename="../src/main.cpp" line="43"/>
-        <location filename="../src/main.cpp" line="49"/>
+        <location filename="../src/main.cpp" line="42"/>
+        <location filename="../src/main.cpp" line="50"/>
+        <location filename="../src/main.cpp" line="56"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33,22 +33,22 @@ Nous sommes nés pour le changement.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/main.cpp" line="32"/>
+        <location filename="../src/main.cpp" line="39"/>
         <source>We publish this program under GPL V3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="37"/>
+        <location filename="../src/main.cpp" line="44"/>
         <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by  community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="45"/>
+        <location filename="../src/main.cpp" line="52"/>
         <source>The Spark Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="57"/>
+        <location filename="../src/main.cpp" line="64"/>
         <source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -210,8 +210,8 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="910"/>
-        <location filename="../src/widget.cpp" line="1119"/>
+        <location filename="../src/widget.cpp" line="943"/>
+        <location filename="../src/widget.cpp" line="1152"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -297,6 +297,10 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="845"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will configure the wine environment for you， so don‘t worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/widget.ui" line="848"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -308,6 +312,10 @@ Nous sommes nés pour le changement.</translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="864"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will configure the wine environment for you， so don‘t worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../src/widget.ui" line="867"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -394,32 +402,37 @@ Nous sommes nés pour le changement.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1304"/>
+        <location filename="../src/widget.ui" line="1328"/>
         <source>Clean</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1314"/>
+        <location filename="../src/widget.ui" line="1294"/>
         <source>Since the dictionary is at /tmp,It would be cleaned automatically when  system reboot.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1327"/>
+        <location filename="../src/widget.ui" line="1341"/>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1341"/>
+        <location filename="../src/widget.ui" line="1308"/>
         <source>Location：/tmp/spark-store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1362"/>
-        <source>About us</source>
+        <location filename="../src/widget.ui" line="1348"/>
+        <source>Clear Web Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/widget.ui" line="1369"/>
+        <source>About us</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widget.ui" line="1376"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We are &lt;span style=&quot; font-weight:600;&quot;&gt;NOT&lt;/span&gt; the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &amp;quot;Spark Store&amp;quot;! &amp;quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. &lt;/p&gt;&lt;p&gt;We don&apos;t make a profit from this, all developers and maintainers don&apos;t get paid, and we rely on the community&apos;s donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. &lt;/p&gt;&lt;p&gt;Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. &lt;/p&gt;&lt;p&gt;If any part of the store infringes your rights, please tell us &amp;lt;jifengshenmo@outlook.com&amp;gt; we will remove the infringing content as soon as possible. &lt;/p&gt;&lt;p&gt;If you&apos;d like to get involved with us too, whether you&apos;re involved in development, design, pitching or submitting work, we welcome you to join us. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -589,7 +602,7 @@ Nous sommes nés pour le changement.</translation>
         <translation type="vanished">Taille: </translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1334"/>
+        <location filename="../src/widget.ui" line="1301"/>
         <source>0B</source>
         <translation type="unfinished">0B</translation>
     </message>
@@ -606,87 +619,92 @@ Nous sommes nés pour le changement.</translation>
         <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nous ne sommes pas l&apos;équipe officielle, tout comme vous, nous ne sommes qu&apos;un des nombreux passionnés et utilisateurs de systèmes Linux / deepin, nous développons et gérons le &quot;Spark Store&quot;! &quot;, est de rassembler la communauté pour partager des logiciels utiles, ou pour participer au développement ensemble, afin que nous utilisions tous les derniers et meilleurs logiciels. &lt;/p&gt;&lt;p&gt; Nous n&apos;en tirons aucun profit, tous les développeurs et mainteneurs ne sont pas payés, et nous comptons sur les dons de la communauté pour la plupart de nos dépenses, dont nous sommes reconnaissants et qui nous permettent de ne pas dépenser trop d&apos;énergie se soucier du financement. &lt;/p&gt;&lt;p&gt;Notre service et nos logiciels sont gratuits pour tout le monde à utiliser, à communiquer et à apprendre, mais vous devez vous conformer aux lois et réglementations locales dans le processus de votre utilisation, sinon tout problème n&apos;a rien à voir avec nous. &lt;/p&gt;&lt;p&gt;Si une partie du magasin enfreint vos droits, veuillez nous en informer &amp;lt;jifengshenmo@outlook.com&amp;gt; nous retirerons le contenu en infraction dès que possible. &lt;/p&gt;&lt;p&gt;Si vous souhaitez également vous impliquer avec nous, que vous soyez impliqué dans le développement, la conception, le pitching ou la soumission de travaux, nous vous invitons à nous rejoindre. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="139"/>
-        <location filename="../src/widget.cpp" line="409"/>
-        <location filename="../src/widget.cpp" line="414"/>
-        <location filename="../src/widget.cpp" line="424"/>
-        <location filename="../src/widget.cpp" line="429"/>
+        <location filename="../src/widget.cpp" line="141"/>
+        <location filename="../src/widget.cpp" line="433"/>
+        <location filename="../src/widget.cpp" line="438"/>
+        <location filename="../src/widget.cpp" line="448"/>
+        <location filename="../src/widget.cpp" line="453"/>
         <source>Spark\ Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="187"/>
+        <location filename="../src/widget.cpp" line="192"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="188"/>
+        <location filename="../src/widget.cpp" line="193"/>
         <source>Search or enter spk://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="194"/>
+        <location filename="../src/widget.cpp" line="199"/>
         <source>Submit App</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="195"/>
+        <location filename="../src/widget.cpp" line="200"/>
+        <source>Submit App with client(Recommanded)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="201"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="196"/>
+        <location filename="../src/widget.cpp" line="202"/>
         <source>APP Upgrade and Install Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="347"/>
+        <location filename="../src/widget.cpp" line="371"/>
         <source>Not Exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="659"/>
-        <location filename="../src/widget.cpp" line="899"/>
+        <location filename="../src/widget.cpp" line="692"/>
+        <location filename="../src/widget.cpp" line="932"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="625"/>
+        <location filename="../src/widget.cpp" line="658"/>
         <source>Failed to get the name to the file to be downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="710"/>
+        <location filename="../src/widget.cpp" line="739"/>
         <source>Relative apps Not Found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="719"/>
+        <location filename="../src/widget.cpp" line="747"/>
         <source>Request Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="904"/>
+        <location filename="../src/widget.cpp" line="937"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1091"/>
+        <location filename="../src/widget.cpp" line="1124"/>
         <source>Updating, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1123"/>
+        <location filename="../src/widget.cpp" line="1156"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1145"/>
+        <location filename="../src/widget.cpp" line="1178"/>
         <source>Temporary cache was cleaned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1227"/>
+        <location filename="../src/widget.cpp" line="1270"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>

translations/spark-store_zh_CN.ts

@@ -12,9 +12,9 @@
 <context>
     <name>QLabel</name>
     <message>
-        <location filename="../src/main.cpp" line="35"/>
-        <location filename="../src/main.cpp" line="43"/>
-        <location filename="../src/main.cpp" line="49"/>
+        <location filename="../src/main.cpp" line="42"/>
+        <location filename="../src/main.cpp" line="50"/>
+        <location filename="../src/main.cpp" line="56"/>
         <source>Spark Store</source>
         <translation>Spark 应用商店</translation>
     </message>
@@ -22,12 +22,12 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/main.cpp" line="32"/>
+        <location filename="../src/main.cpp" line="39"/>
         <source>We publish this program under GPL V3</source>
         <translation>本程序按GPL V3开源</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="37"/>
+        <location filename="../src/main.cpp" line="44"/>
         <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by  community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
         <translation>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;一款社区维护的应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火计划开发者&lt;/span&gt;</translation>
     </message>
@@ -40,7 +40,7 @@
         <translation type="vanished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;deepin 社区驱动的一款第三方应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="45"/>
+        <location filename="../src/main.cpp" line="52"/>
         <source>The Spark Project</source>
         <translation>星火计划 The Spark Project</translation>
     </message>
@@ -49,7 +49,7 @@
         <translation type="vanished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;一款由 深度社区 出品的应用商店&lt;/span&gt;&lt;br/&gt;&quot;&quot;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&quot;&quot;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火开发者联盟&lt;/span&gt;&lt;br/&gt;本程序遵循 GPL V3 协议发布</translation>
     </message>
     <message>
-        <location filename="../src/main.cpp" line="57"/>
+        <location filename="../src/main.cpp" line="64"/>
         <source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
         <translation>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;由 Deepin 社区出品的应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;星火商店开发组&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;遵循 GPL V3 协议发布</translation>
     </message>
@@ -204,8 +204,8 @@
     </message>
     <message>
         <location filename="../src/widget.ui" line="547"/>
-        <location filename="../src/widget.cpp" line="910"/>
-        <location filename="../src/widget.cpp" line="1119"/>
+        <location filename="../src/widget.cpp" line="943"/>
+        <location filename="../src/widget.cpp" line="1152"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
@@ -284,8 +284,17 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dtk-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="../src/widget.ui" line="845"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will configure the wine environment for you， so don‘t worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>这是一个deepin-wine2应用。星火商店将会为你配置好wine环境，无需担心。</translation>
+    </message>
     <message>
         <location filename="../src/widget.ui" line="864"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.Spark Store will configure the wine environment for you， so don‘t worry.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>这是一个deepin-wine5应用。星火商店将会为你配置好wine环境，无需担心。</translation>
+    </message>
+    <message>
         <location filename="../src/widget.ui" line="867"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这是一款deepin-wine5应用，如果你并没有在使用深度系列发行版（比如您在使用ubuntu），你需要自行配置deepin-wine5环境&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -325,7 +334,6 @@
         <translation type="vanished">社交沟通</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="845"/>
         <location filename="../src/widget.ui" line="848"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这是一款 deepin-wine2 应用，如果你并没有在使用深度系列发行版（比如您在使用ubuntu），你需要自行配置 deepin-wine2 环境&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -403,32 +411,37 @@
         <translation>缓存目录</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1304"/>
+        <location filename="../src/widget.ui" line="1328"/>
         <source>Clean</source>
         <translation>清空</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1314"/>
+        <location filename="../src/widget.ui" line="1294"/>
         <source>Since the dictionary is at /tmp,It would be cleaned automatically when  system reboot.</source>
         <translation>因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1327"/>
+        <location filename="../src/widget.ui" line="1341"/>
         <source>Size:</source>
         <translation>目录大小：</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1341"/>
+        <location filename="../src/widget.ui" line="1308"/>
         <source>Location：/tmp/spark-store</source>
         <translation>目录位置：/tmp/spark-store</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1362"/>
+        <location filename="../src/widget.ui" line="1348"/>
+        <source>Clear Web Cache</source>
+        <translation>清理网页缓存</translation>
+    </message>
+    <message>
+        <location filename="../src/widget.ui" line="1369"/>
         <source>About us</source>
         <translation>关于我们</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1369"/>
+        <location filename="../src/widget.ui" line="1376"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We are &lt;span style=&quot; font-weight:600;&quot;&gt;NOT&lt;/span&gt; the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &amp;quot;Spark Store&amp;quot;! &amp;quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. &lt;/p&gt;&lt;p&gt;We don&apos;t make a profit from this, all developers and maintainers don&apos;t get paid, and we rely on the community&apos;s donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. &lt;/p&gt;&lt;p&gt;Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. &lt;/p&gt;&lt;p&gt;If any part of the store infringes your rights, please tell us &amp;lt;jifengshenmo@outlook.com&amp;gt; we will remove the infringing content as soon as possible. &lt;/p&gt;&lt;p&gt;If you&apos;d like to get involved with us too, whether you&apos;re involved in development, design, pitching or submitting work, we welcome you to join us. &lt;/p&gt;&lt;p&gt;QQ group:872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;我们并&lt;span style=&quot; font-weight:600;&quot;&gt;不是&lt;/span&gt;官方团队，和你一样，我们也只是众多Linux/deepin系统爱好者和用户之中的一员，我们开发并且运营这个“Spark应用商店”，是为了让社区的朋友们一起分享好用的软件，或者一起参与开发，让大家都用到最新的，最优秀的软件。&lt;/p&gt;&lt;p&gt;我们并没有因此盈利，所有开发和维护人员都不会获得报酬，我们的主要支出大部分依赖于社区对我们的捐助，很感谢大家，这部分捐助让我们并不需要耗费太多精力去担心资金问题。&lt;/p&gt;&lt;p&gt;我们的服务和开发的软件都是免费供给大家使用，交流，学习的，但是在您的使用过程中一定要遵守当地的法律法规，否则出现任何问题和我们无关。&lt;/p&gt;&lt;p&gt;如果商店中任何一部分有侵犯您权益的行为，请告知我们 &amp;lt;jifengshenmo@outlook.com&amp;gt;，我们会第一时间删除侵权内容。&lt;/p&gt;&lt;p&gt;如果你也想参与我们，不管是参与开发，设计，投递还是投稿作品，我们都欢迎你的加入。&lt;/p&gt;&lt;p&gt;QQ 群：872690351&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
@@ -488,37 +501,42 @@
         <translation>检查星火应用商店更新</translation>
     </message>
     <message>
-        <location filename="../src/widget.ui" line="1334"/>
+        <location filename="../src/widget.ui" line="1301"/>
         <source>0B</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="187"/>
+        <location filename="../src/widget.cpp" line="192"/>
         <source>Spark Store</source>
         <translation>Spark 应用商店</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="188"/>
+        <location filename="../src/widget.cpp" line="193"/>
         <source>Search or enter spk://</source>
         <translation>搜索或打开链接</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="194"/>
+        <location filename="../src/widget.cpp" line="199"/>
         <source>Submit App</source>
         <translation>投递应用</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="195"/>
+        <location filename="../src/widget.cpp" line="200"/>
+        <source>Submit App with client(Recommanded)</source>
+        <translation>使用本地投稿器投递应用（推荐）</translation>
+    </message>
+    <message>
+        <location filename="../src/widget.cpp" line="201"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="196"/>
+        <location filename="../src/widget.cpp" line="202"/>
         <source>APP Upgrade and Install Settings</source>
         <translation>应用更新和安装设置</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="347"/>
+        <location filename="../src/widget.cpp" line="371"/>
         <source>Not Exist</source>
         <translation>不存在</translation>
     </message>
@@ -527,11 +545,11 @@
         <translation type="obsolete">更新完毕</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="139"/>
-        <location filename="../src/widget.cpp" line="409"/>
-        <location filename="../src/widget.cpp" line="414"/>
-        <location filename="../src/widget.cpp" line="424"/>
-        <location filename="../src/widget.cpp" line="429"/>
+        <location filename="../src/widget.cpp" line="141"/>
+        <location filename="../src/widget.cpp" line="433"/>
+        <location filename="../src/widget.cpp" line="438"/>
+        <location filename="../src/widget.cpp" line="448"/>
+        <location filename="../src/widget.cpp" line="453"/>
         <source>Spark\ Store</source>
         <translation>星火应用商店</translation>
     </message>
@@ -568,8 +586,8 @@
         <translation type="vanished">大小： </translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="659"/>
-        <location filename="../src/widget.cpp" line="899"/>
+        <location filename="../src/widget.cpp" line="692"/>
+        <location filename="../src/widget.cpp" line="932"/>
         <source>Reinstall</source>
         <translation>重新安装</translation>
     </message>
@@ -578,17 +596,17 @@
         <translation type="vanished">加载应用程序图标失败。</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="625"/>
+        <location filename="../src/widget.cpp" line="658"/>
         <source>Failed to get the name to the file to be downloaded.</source>
         <translation>获取安装包文件名失败。</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="710"/>
+        <location filename="../src/widget.cpp" line="739"/>
         <source>Relative apps Not Found!</source>
         <translation>相关应用未找到！</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="719"/>
+        <location filename="../src/widget.cpp" line="747"/>
         <source>Request Error: %1</source>
         <translation>请求错误：%1</translation>
     </message>
@@ -597,12 +615,12 @@
         <translation type="vanished">目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="904"/>
+        <location filename="../src/widget.cpp" line="937"/>
         <source>Upgrade</source>
         <translation>升级</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1091"/>
+        <location filename="../src/widget.cpp" line="1124"/>
         <source>Updating, please wait...</source>
         <translation>正在更新，请稍候……</translation>
     </message>
@@ -662,17 +680,17 @@ Click yes to continue.</source>
         <translation type="vanished">服务器未知错误</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1123"/>
+        <location filename="../src/widget.cpp" line="1156"/>
         <source>Uninstall succeeded</source>
         <translation>卸载成功</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1145"/>
+        <location filename="../src/widget.cpp" line="1178"/>
         <source>Temporary cache was cleaned</source>
         <translation>缓存目录已清空</translation>
     </message>
     <message>
-        <location filename="../src/widget.cpp" line="1227"/>
+        <location filename="../src/widget.cpp" line="1270"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>链接已复制到剪贴板</translation>
     </message>