2.0+1发布

完全改好了
更新DAboutDialog
2025-12-15 21:32:05 +08:00 · 2020-09-23 17:32:26 +08:00 · 2020-09-23 17:30:46 +08:00 · 2020-09-23 16:08:44 +08:00 · 2020-09-19 10:20:37 +08:00 · 2020-09-18 23:57:40 +08:00
18 changed files with 1160 additions and 815 deletions
--- a/Logo-Spark.png
+++ b/Logo-Spark.png
--- a/Logo-Spark.png.bak
+++ b/Logo-Spark.png.bak
--- a/README.md
+++ b/README.md
@@ -9,8 +9,9 @@ web页面部分正在开发当中，详情请见[web仓库](https://gitee.com/de
 当前服务器线路列表（项目中包含）：

 ```
-http://dcstore.shenmo.tech/
+http://sucdn.jerrywang.top/
 http://store.jerrywang.top/
+http://dcstore.spark-app.store/
 ```

 #### 参数
@@ -25,7 +26,7 @@ http://store.jerrywang.top/

 可选的web分类：

-| 分类名称 | web分类        |
+| 分类名称 | web分类   　    |
 | -------- | -------------- |
 | 网络应用 | network        |
 | 社交沟通 | chat           |
@@ -48,6 +49,25 @@ http://store.jerrywang.top/

 线路文件：新版的线路文件被放置于源服务器中，可随时刷新更新源列表

+#### 如何编译
+
+Deepin V20/UOS 系统下, 安装依赖
+
+```shell
+sudo apt install qt5-default libdtkcore-dev libdtkwidget-dev qtwebengine5-dev
+```
+
+```shell
+git clone https://gitee.com/deepin-community-store/spark-store.git
+cd spark-store
+mkdir build
+cd build
+qmake ..
+make -j
+```
+
+./build文件下的spark-store即为可执行文件
+
 #### 参与贡献

 1.  Fork 本仓库
--- a/downloadlist.cpp
+++ b/downloadlist.cpp
@@ -22,8 +22,10 @@ downloadlist::downloadlist(QWidget *parent) :
    ui->widget_spinner->hide();
    action_dpkg->setText("dpkg");
    action_gdebi->setText("gdebi");
+    action_deepin->setText("深度安装器");
    connect(action_dpkg,&QAction::triggered,[=](){downloadlist::install(1);});
    connect(action_gdebi,&QAction::triggered,[=](){downloadlist::install(0);});
+    connect(action_deepin,&QAction::triggered,[=](){downloadlist::install(2);});
    menu_install->addAction(action_gdebi);
    //ssinstall命令存在时再加入该选项
    QFile ssinstall("/bin/ssinstall");
@@ -31,6 +33,11 @@ downloadlist::downloadlist(QWidget *parent) :
    if(ssinstall.isOpen()){
        menu_install->addAction(action_dpkg);
    }
+    QFile deepin("/bin/deepin-deb-installer");
+    deepin.open(QIODevice::ReadOnly);
+    if(deepin.isOpen()){
+        menu_install->addAction(action_deepin);
+    }

 }

@@ -115,28 +122,37 @@ void downloadlist::install(int t)
        ui->label_2->setText("正在安装，请稍候");
        QtConcurrent::run([=](){
            QProcess installer;
-            if(reinstall){
-                if(t==0){
+            if(!reinstall){
+                switch (t) {
+                case 0:
                    installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-                }else {
+                    break;
+                case 1:
                    installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+                    break;
+                case 2:
+                    installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+                    break;
                }
-
            }else {
-                if(t==0){
+                switch (t) {
+                case 0:
                    installer.start("pkexec gdebi -n /tmp/spark-store/"+ui->label_filename->text().toUtf8());
-                }else {
+                    break;
+                case 1:
                    installer.start("pkexec ssinstall /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+                    break;
+                case 2:
+                    installer.start("deepin-deb-installer /tmp/spark-store/"+ui->label_filename->text().toUtf8());
+                    break;
                }
            }
-
+            bool haveError=false;
+            bool notRoot=false;
            installer.waitForFinished();
            out=installer.readAllStandardOutput();
            QStringList everyOut=out.split("\n");
-            bool haveError=false;
-            bool notRoot=false;
            for (int i=0;i<everyOut.size();i++) {
-                qDebug()<<everyOut[i].left(2);
                if(everyOut[i].left(2)=="E:"){
                    haveError=true;
                }
--- a/downloadlist.h
+++ b/downloadlist.h
@@ -38,6 +38,7 @@ public:
    QMenu *menu_install=new QMenu;
    QAction *action_gdebi=new QAction;
    QAction *action_dpkg=new QAction;
+    QAction *action_deepin=new QAction;
    void install(int);
 private slots:
    void on_pushButton_install_clicked();
--- a/icons.qrc
+++ b/icons.qrc
@@ -31,4 +31,7 @@
        <file>icons/category_active_dark.svg</file>
        <file>icons/category_active.svg</file>
    </qresource>
+    <qresource prefix="/">
+        <file>Logo-Spark.png</file>
+    </qresource>
 </RCC>
--- a/main.cpp
+++ b/main.cpp
@@ -2,22 +2,33 @@
 #include <DWidgetUtil>  //Dtk::Widget::moveToCenter(&w); 要调用它，就得引用DWidgetUtil
 #include <QDesktopWidget>
 #include <widget.h>
+#include <QTranslator>
+#include <DAboutDialog>
 DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
    DApplication::loadDXcbPlugin();  //让bar处在标题栏中
    DApplication a(argc, argv);
+    DAboutDialog dialog;
    a.setAttribute(Qt::AA_UseHighDpiPixmaps);
    a.loadTranslator();
-
-    a.setOrganizationName("spark-union");
-    a.setApplicationVersion(DApplication::buildVersion("1.0-beta7"));
+    a.setAboutDialog(&dialog);
+    dialog.setLicense("本程序按GPL第三版开源");
+    dialog.setVersion(DApplication::buildVersion("2.0+1"));
+    dialog.setAcknowledgementVisible(true);
+    dialog.setAcknowledgementLink("https://gitee.com/deepin-community-store/spark-store");
    a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
-    a.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
-
-    a.setProductName("Spark应用商店");
-    a.setApplicationDescription("深度社区驱动的一款为deepin打造的第三方商店");
-    a.setApplicationName("Spark应用商店"); //只有在这儿修改窗口标题才有效
+    dialog.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
+    dialog.setProductName(QLabel::tr("Spark应用商店"));
+    //dialog.setDescription(QLabel::tr("社区驱动的一款第三方应用商店，为改变而生\n We born for change"));
+    dialog.setDescription(
+        "<span style=' font-size:10pt;font-weight:60;'>社区驱动的一款第三方应用商店</span><br/>"
+        "<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
+        "<span style=' font-size:12pt;'>Spark developers</span>");
+    dialog.setProductName(QLabel::tr("Spark应用商店"));
+    dialog.setCompanyLogo(QPixmap(":/Logo-Spark.png"));
+    dialog.setWebsiteName("The Spark Project");
+    dialog.setWebsiteLink("https://gitee.com/deepin-community-store");
    Widget w;
    QDesktopWidget *s=DApplication::desktop();
    int d_w=s->width();
--- a/progressload.cpp
+++ b/progressload.cpp
@@ -0,0 +1,37 @@
+#include "progressload.h"
+
+ProgressLoad::ProgressLoad(QWidget *parent) : QWidget(parent)
+{
+    m_progess=new QWidget(this);
+    m_progess->move(0,0);
+    m_progess->show();
+    timer=new QTimer;
+    value=0;
+    timer->setInterval(10);
+    timer->start();
+    connect(timer,&QTimer::timeout,[=](){
+        m_progess->setFixedWidth(width()/100*value);
+        m_progess->setFixedHeight(height());
+    });
+}
+
+void ProgressLoad::setValue(int v)
+{
+    value=v;
+    m_progess->setFixedWidth(width()/100*value);
+}
+
+void ProgressLoad::setTheme(bool dark, QColor color)
+{
+    if(dark){
+        plt.setColor(QPalette::Background,QColor(28,28,28));
+        setAutoFillBackground(true);
+        setPalette(plt);
+
+    }else {
+        plt.setColor(QPalette::Background,QColor(255,255,255));
+        setAutoFillBackground(true);
+        setPalette(plt);
+    }
+    m_progess->setStyleSheet("background-color:"+color.name());
+}
--- a/progressload.h
+++ b/progressload.h
@@ -0,0 +1,24 @@
+#ifndef PROGRESSLOAD_H
+#define PROGRESSLOAD_H
+
+#include <QWidget>
+#include <QTimer>
+#include <QPalette>
+class ProgressLoad : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit ProgressLoad(QWidget *parent = nullptr);
+    void setValue(int v);
+    void setTheme(bool dark,QColor color);
+signals:
+
+public slots:
+private:
+    QWidget *m_progess;
+    int value;
+    QTimer *timer;
+    QPalette plt;
+};
+
+#endif // PROGRESSLOAD_H
--- a/spark-store.pro
+++ b/spark-store.pro
@@ -4,9 +4,14 @@
 #
 #-------------------------------------------------

-QT       += core gui webkitwidgets network concurrent
+QT       += core gui network concurrent webenginewidgets

 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+TRANSLATIONS = ./trans/lang_English.ts \
+               ./trans/lang_Chinses.ts
+
+CONFIG += link_pkgconfig
+PKGCONFIG += dtkwidget

 TARGET = spark-store
 TEMPLATE = app
@@ -27,16 +32,17 @@ SOURCES += main.cpp\
    widget.cpp \
    downloadlist.cpp \
    image_show.cpp \
-    big_image.cpp
+    big_image.cpp \
+    progressload.cpp

 HEADERS  += \
    widget.h \
    downloadlist.h \
    image_show.h \
-    big_image.h
+    big_image.h \
+    progressload.h
+

-CONFIG += link_pkgconfig
-PKGCONFIG += dtkwidget

 CONFIG += c++11

--- a/spark-store.pro.user
+++ b/spark-store.pro.user
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.8.2, 2020-08-10T12:35:10. -->
-<qtcreator>
- <data>
-  <variable>EnvironmentId</variable>
-  <value type="QByteArray">{2b2d2f1a-6483-4add-a570-55e1f0a2e40a}</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
-   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
-   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
-    <value type="QString" key="language">Cpp</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
-    </valuemap>
-   </valuemap>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
-    <value type="QString" key="language">QmlJS</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
-    </valuemap>
-   </valuemap>
-   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
-   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
-   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">4</value>
-   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
-   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
-   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
-   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
-   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
-   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
-   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
-   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
-   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
-   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
-   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
-   <value type="int" key="EditorConfiguration.TabSize">8</value>
-   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
-   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
-   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
-   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
-   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
-   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.PluginSettings</variable>
-  <valuemap type="QVariantMap">
-   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
-   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.0</variable>
-  <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">桌面</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">桌面</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{a42d4e65-62ab-4574-9a07-1c933c50ac5d}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/maicss/git/spark/build-spark-store-unknown-Debug</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
-      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/maicss/git/spark/build-spark-store-unknown-Release</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
-      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/maicss/git/spark/build-spark-store-unknown-Profile</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
-      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">true</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">true</value>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
-     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Profile</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
-    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
-    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
-    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
-    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
-    <value type="QString" key="RunConfiguration.Arguments"></value>
-    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
-    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">20</value>
- </data>
- <data>
-  <variable>Version</variable>
-  <value type="int">20</value>
- </data>
-</qtcreator>
--- a/trans/lang_Chinses.qm
+++ b/trans/lang_Chinses.qm
@@ -0,0 +1 @@
+<<3C>d<18><EFBFBD>!<1C>`<60><><EFBFBD>
--- a/trans/lang_Chinses.ts
+++ b/trans/lang_Chinses.ts
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+<context>
+    <name>QLabel</name>
+    <message>
+        <location filename="../main.cpp" line="19"/>
+        <location filename="../main.cpp" line="21"/>
+        <source>Spark应用商店</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="20"/>
+        <source>社区驱动的一款为第三方应用商店，为改变而生
+本程序按GPL第三版开源</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="../widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="52"/>
+        <source>background-color:#FFFFFF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="67"/>
+        <source>视频播放</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="74"/>
+        <source>下载列表</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="81"/>
+        <source>系统工具</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="88"/>
+        <source>主题美化</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="95"/>
+        <source>音乐欣赏</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="114"/>
+        <source>icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="153"/>
+        <source>编程开发</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="177"/>
+        <source>办公学习</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="197"/>
+        <source>阅读翻译</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="204"/>
+        <source>其他应用</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="214"/>
+        <source>商店首页</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="221"/>
+        <source>图形图像</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="228"/>
+        <source>游戏娱乐</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="235"/>
+        <source>社交沟通</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="242"/>
+        <source>网络应用</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="313"/>
+        <source>about:blank</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="354"/>
+        <source>当前下载列表为空</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="386"/>
+        <source>打开文件夹</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="486"/>
+        <source>安装</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="522"/>
+        <source>卸载</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="551"/>
+        <source>官网</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="580"/>
+        <source>软件名</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="592"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="636"/>
+        <source>图标</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="649"/>
+        <source>分享</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="683"/>
+        <location filename="../widget.ui" line="696"/>
+        <location filename="../widget.ui" line="709"/>
+        <location filename="../widget.ui" line="722"/>
+        <location filename="../widget.ui" line="735"/>
+        <location filename="../widget.ui" line="748"/>
+        <location filename="../widget.ui" line="761"/>
+        <location filename="../widget.ui" line="774"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="808"/>
+        <source>详细介绍</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="815"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;由社区爱好者开发的软件商店&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="854"/>
+        <source>软件截图</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1017"/>
+        <source>线路设置</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1033"/>
+        <source>线路选择：</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1056"/>
+        <source>刷新</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1069"/>
+        <source> 重启商店后生效</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1098"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1108"/>
+        <source>更新源</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1115"/>
+        <source>更新源服务器：</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1135"/>
+        <source>服务器</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1156"/>
+        <source>缓存目录</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1179"/>
+        <source>清空</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1189"/>
+        <source>因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1202"/>
+        <source>目录大小：</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1209"/>
+        <source>0B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1216"/>
+        <source>目录位置：/tmp/spark-store</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1237"/>
+        <source>关于我们</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1244"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&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;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>downloadlist</name>
+    <message>
+        <location filename="../downloadlist.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="50"/>
+        <source>icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="82"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="106"/>
+        <source>名称</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="189"/>
+        <source>等待开始下载</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="240"/>
+        <source>安装</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="259"/>
+        <source>取消</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="278"/>
+        <source>详情</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
--- a/trans/lang_English.qm
+++ b/trans/lang_English.qm
--- a/trans/lang_English.ts
+++ b/trans/lang_English.ts
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+<context>
+    <name>QLabel</name>
+    <message>
+        <location filename="../main.cpp" line="19"/>
+        <location filename="../main.cpp" line="21"/>
+        <source>Spark应用商店</source>
+        <translation>Spark Store</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="20"/>
+        <source>社区驱动的一款为第三方应用商店，为改变而生
+本程序按GPL第三版开源</source>
+        <translation>A 3-rd party app store powered by deepin community
+Spark Store is published under GPL V3
+We born for change.</translation>
+    </message>
+</context>
+<context>
+    <name>Widget</name>
+    <message>
+        <location filename="../widget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="52"/>
+        <source>background-color:#FFFFFF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="67"/>
+        <source>视频播放</source>
+        <translatorcomment>Video Players and Video Makers</translatorcomment>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="74"/>
+        <source>下载列表</source>
+        <translation>Download list</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="81"/>
+        <source>系统工具</source>
+        <translation>Tools</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="88"/>
+        <source>主题美化</source>
+        <translatorcomment>Icon theme and other </translatorcomment>
+        <translation>Themes</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="95"/>
+        <source>音乐欣赏</source>
+        <translation>Music</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="114"/>
+        <source>icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="153"/>
+        <source>编程开发</source>
+        <translation>Development</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="177"/>
+        <source>办公学习</source>
+        <translation>Office</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="197"/>
+        <source>阅读翻译</source>
+        <translation>Translate</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="204"/>
+        <source>其他应用</source>
+        <translation>Others</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="214"/>
+        <source>商店首页</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="221"/>
+        <source>图形图像</source>
+        <translation>Images</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="228"/>
+        <source>游戏娱乐</source>
+        <translation>Games</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="235"/>
+        <source>社交沟通</source>
+        <translation>Chat</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="242"/>
+        <source>网络应用</source>
+        <translation type="unfinished">Network</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="313"/>
+        <source>about:blank</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="354"/>
+        <source>当前下载列表为空</source>
+        <translation>The Download list is empty</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="386"/>
+        <source>打开文件夹</source>
+        <translation>Open in File Manager</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="486"/>
+        <source>安装</source>
+        <translation>Install</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="522"/>
+        <source>卸载</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="551"/>
+        <source>官网</source>
+        <translation>Site</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="580"/>
+        <source>软件名</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="592"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="636"/>
+        <source>图标</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="649"/>
+        <source>分享</source>
+        <translation>Share</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="683"/>
+        <location filename="../widget.ui" line="696"/>
+        <location filename="../widget.ui" line="709"/>
+        <location filename="../widget.ui" line="722"/>
+        <location filename="../widget.ui" line="735"/>
+        <location filename="../widget.ui" line="748"/>
+        <location filename="../widget.ui" line="761"/>
+        <location filename="../widget.ui" line="774"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="808"/>
+        <source>详细介绍</source>
+        <translation type="unfinished">Details</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="815"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;由社区爱好者开发的软件商店&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;software store developed by community enthusiasts&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="854"/>
+        <source>软件截图</source>
+        <translation>Screen Shots</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1017"/>
+        <source>线路设置</source>
+        <translation>Line Settings</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1033"/>
+        <source>线路选择：</source>
+        <translation type="unfinished">Choose</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1056"/>
+        <source>刷新</source>
+        <translation>Update</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1069"/>
+        <source> 重启商店后生效</source>
+        <translation>Restart to take effect</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1098"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1108"/>
+        <source>更新源</source>
+        <translation>Update APT Source</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1115"/>
+        <source>更新源服务器：</source>
+        <translation type="unfinished">APT Source</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1135"/>
+        <source>服务器</source>
+        <translation type="unfinished">server</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1156"/>
+        <source>缓存目录</source>
+        <translation>Temp</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1179"/>
+        <source>清空</source>
+        <translation>Clean</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1189"/>
+        <source>因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。</source>
+        <translation>Since the dictionary is at /tmp,It would be cleaned automatically when  system reboot.</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1202"/>
+        <source>目录大小：</source>
+        <translation type="unfinished">Size: </translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1209"/>
+        <source>0B</source>
+        <translation type="unfinished">0B</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1216"/>
+        <source>目录位置：/tmp/spark-store</source>
+        <translation type="unfinished">Location:/tmp/spark-store</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1237"/>
+        <source>关于我们</source>
+        <translation type="unfinished">About us</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="1244"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&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;</source>
+        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We are not the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the "Spark Store"! ", 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't make a profit from this, all developers and maintainers don't get paid, and we rely on the community'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'd like to get involved with us too, whether you'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;</translation>
+    </message>
+</context>
+<context>
+    <name>downloadlist</name>
+    <message>
+        <location filename="../downloadlist.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="50"/>
+        <source>icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="82"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="106"/>
+        <source>名称</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="189"/>
+        <source>等待开始下载</source>
+        <translatorcomment>Wait to download</translatorcomment>
+        <translation>Wait to download</translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="240"/>
+        <source>安装</source>
+        <translation>Install</translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="259"/>
+        <source>取消</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <location filename="../downloadlist.ui" line="278"/>
+        <source>详情</source>
+        <translation>Detail</translation>
+    </message>
+</context>
+</TS>
--- a/widget.cpp
+++ b/widget.cpp
@@ -13,10 +13,9 @@
 #include <QJsonObject>
 #include <QByteArray>
 #include <QPixmap>
-#include <QtConcurrent> //并发
+#include <QtConcurrent> // 并发
 #include <QSettings>
 #include <QIcon>
-#include <QWebFrame>
 #include <QGraphicsOpacityEffect>
 #include <QDesktopServices>
 #include <DSettings>
@@ -37,6 +36,8 @@ Widget::Widget(DBlurEffectWidget *parent) :
    initUI();
    initConfig();
    manager = new QNetworkAccessManager(this);//下载管理
+    m_loadweb=ui->progressload;
+    m_loadweb->show();

    connect(ui->menu_main,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(0);});
    connect(ui->menu_network,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(1);});
@@ -52,10 +53,9 @@ Widget::Widget(DBlurEffectWidget *parent) :
    connect(ui->menu_theme,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(11);});
    connect(ui->menu_other,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(12);});
    connect(ui->menu_download,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(13);});
-//    connect((ui->titlebar))
+    // connect((ui->titlebar))

-
-    //搜索事件
+    // 搜索事件
    connect(searchEdit,&DSearchEdit::editingFinished,this,[=](){
        QString searchtext=searchEdit->text();
        if(searchtext!=""){
@@ -65,6 +65,7 @@ Widget::Widget(DBlurEffectWidget *parent) :
        searchEdit->clearEdit();

    });
+
    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType) {
        QColor main_color;
        main_color=DGuiApplicationHelper::instance()->applicationPalette().highlight().color();
@@ -77,7 +78,7 @@ Widget::Widget(DBlurEffectWidget *parent) :
        }
    });

-    //计算显示下载速度
+    // 计算显示下载速度
    download_speed.setInterval(1000);
    download_speed.start();
    connect(&download_speed,&QTimer::timeout,[=](){
@@ -99,18 +100,20 @@ Widget::Widget(DBlurEffectWidget *parent) :
            size2=download_size;
        }
    });
-}


+}
+
 Widget::~Widget()
 {
    delete ui;
    qDebug()<<"exit";
    DApplication::quit();
 }
+
 void Widget::initUI()
 {
-    //ui初始化
+    // ui初始化
    setMaskAlpha(220);
    ui->webfoot->setFixedHeight(0);
    ui->stackedWidget->setCurrentIndex(0);
@@ -121,41 +124,37 @@ void Widget::initUI()
    ui->icon->setPixmap(QIcon::fromTheme("spark-store").pixmap(36,36));
    ui->titlebar->setFixedHeight(50);

-
-
-    //初始化分界线
+    // 初始化分界线
    QGraphicsOpacityEffect *opacityEffect_1=new QGraphicsOpacityEffect;
    opacityEffect_1->setOpacity(0.1);
    ui->line1_widget->setGraphicsEffect(opacityEffect_1);

-
-
-    //搜索框
+    // 搜索框
    QWidget *w_titlebar=new QWidget;
    QHBoxLayout *ly_titlebar=new QHBoxLayout;
    w_titlebar->setLayout(ly_titlebar);
-//    ly_titlebar->addWidget(ui->pushButton_return);
+    // ly_titlebar->addWidget(ui->pushButton_return);
    ly_titlebar->addStretch();
    ly_titlebar->addSpacing(50);
    ly_titlebar->addWidget(searchEdit);
    ly_titlebar->addStretch();
    titlebar=ui->titlebar;
    titlebar->setCustomWidget(w_titlebar);
-//    titlebar->setIcon(QIcon::fromTheme("spark-store"));
+    // titlebar->setIcon(QIcon::fromTheme("spark-store"));
    titlebar->setTitle("星火应用商店");
    searchEdit->setPlaceholderText("搜索或打开链接");
    searchEdit->setFixedWidth(300);
    titlebar->setSeparatorVisible(false);
-//    titlebar->setAutoHideOnFullscreen(true);
+    // titlebar->setAutoHideOnFullscreen(true);

-    //添加菜单项
+    // 添加菜单项
    QAction *setting=new QAction("设置");
    QMenu *menu=new QMenu;
    menu->addAction(setting);
    titlebar->setMenu(menu);
    connect(setting,&QAction::triggered,this,&Widget::opensetting);

-    //初始化菜单数组
+    // 初始化菜单数组
    left_list[0]=ui->menu_main;
    left_list[1]=ui->menu_network;
    left_list[2]=ui->menu_chat;
@@ -172,28 +171,13 @@ void Widget::initUI()
    left_list[13]=ui->menu_download;


-    //初始化web加载动画
-    QHBoxLayout *m_weblayout=new QHBoxLayout;
-    m_weblayout->addWidget(m_loadweb);
-    m_weblayout->addWidget(m_loaderror);
-    m_loadweb->hide();
-    m_loaderror->hide();
-    m_loadweb->start();
-    m_loadweb->setMaximumSize(50,50);
-    m_loadweb->setMinimumSize(50,50);
-    m_loadweb->setTextVisible(false);
-    m_loaderror->setPixmap(QIcon::fromTheme("dialog-error").pixmap(50,50));
-    m_loaderror->setAlignment(Qt::AlignCenter);
-
-    ui->webView->setLayout(m_weblayout);
-//    ui->stackedWidget->setLayout(m_weblayout);
    ui->label_show->hide();

 }

 void Widget::initConfig()
 {
-    //读取服务器列表并初始化
+    // 读取服务器列表并初始化
    std::fstream serverList;
    serverList.open(QDir::homePath().toUtf8()+"/.config/spark-store/server.list",std::ios::in);
    std::string lineTmp;
@@ -202,22 +186,20 @@ void Widget::initConfig()
            ui->comboBox_server->addItem(QString::fromStdString(lineTmp));
        }
    }else {
-        ui->comboBox_server->addItem("http://store.jerrywang.top/");
+        ui->comboBox_server->addItem("http://sucdn.jerrywang.top/");
    }

-
-
-    //读取服务器URL并初始化菜单项的链接
+    // 读取服务器URL并初始化菜单项的链接
    QSettings readConfig(QDir::homePath()+"/.config/spark-store/config.ini",QSettings::IniFormat);
    if(readConfig.value("server/choose").toString()!=""){
        ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString());
        serverUrl=readConfig.value("server/choose").toString();
    }else {
-        serverUrl="http://store.jerrywang.top/";//默认URL
+        serverUrl="http://sucdn.jerrywang.top/";  // 默认URL
    }
-    configCanSave=true;   //防止出发保存配置信号
+    configCanSave=true;   //　防止触发保存配置信号
    menuUrl[0]=serverUrl + "store/#/";
-//    menuUrl[0]="http://127.0.0.1:8000/#/darkprogramming";
+    // menuUrl[0]="http://127.0.0.1:8000/#/darkprogramming";
    menuUrl[1]=serverUrl + "store/#/network";
    menuUrl[2]=serverUrl + "store/#/relations";
    menuUrl[3]=serverUrl + "store/#/musicandsound";
@@ -233,20 +215,20 @@ void Widget::initConfig()


    //web控件初始化
-    ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);   //用来激活接受linkClicked信号
-    ui->webView->page()->settings()->setAttribute(QWebSettings::JavascriptEnabled,true);
+//    ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);   //用来激活接受linkClicked信号
+//    ui->webView->page()->settings()->setAttribute(QWebSettings::JavascriptEnabled,true);
    ui->webfoot->hide();

    //初始化首页
-    ui->webView->setUrl(menuUrl[0]);
-    chooseLeftMenu(0);
+    ui->webEngineView->setUrl(menuUrl[0]);
+//    ui->webEngineView->setUrl(menuUrl[1]);

    //给下载列表赋值到数组，方便调用
    for (int i =0; i<LIST_MAX;i++){
        download_list[i].num=i;
    }

-    //初始化apt源显示
+    // 初始化apt源显示
    QFile aptserver("/etc/apt/sources.list.d/sparkstore.list");
    aptserver.open(QIODevice::ReadOnly);
    if(aptserver.isOpen()){
@@ -256,39 +238,37 @@ void Widget::initConfig()
    }
    aptserver.close();

-    //新建临时文件夹
+    // 新建临时文件夹
    QDir dir("/tmp");
    dir.mkdir("spark-store");
 }
+
 void Widget::setTheme(bool isDark,QColor color)
 {
+    // 菜单图标
    if(isDark){
-        //黑色模式
+        // 黑色模式
        themeIsDark=true;
-        ui->webView->setStyleSheet("background-color:#282828");
+        ui->webEngineView->setStyleSheet("background-color:#282828");
        ui->btn_openDir->setStyleSheet("color:#8B91A1;background-color:#2E2F30;border:0px");
        ui->webfoot->setStyleSheet("background-color:#252525");
        ui->label->setStyleSheet("background-color:#252525");
-        ui->scrollArea->setStyleSheet("#scrollArea{background-color:#252525}");
+//        ui->scrollArea->setStyleSheet("background-color:#252525");
        ui->label_show->setStyleSheet("background-color:#252525");
        ui->pushButton_return->setIcon(QIcon(":/icons/icons/category_active_dark.svg"));
-        //菜单图标
-
-
    }else {
-        //亮色模式
+        // 亮色模式
        themeIsDark=false;
-        ui->webView->setStyleSheet("background-color:#FFFFFF");
+        ui->webEngineView->setStyleSheet("background-color:#FFFFFF");
        ui->webfoot->setStyleSheet("background-color:#FFFFFF");
        ui->btn_openDir->setStyleSheet("color:#505050;background-color:#FBFBFB;border:0px");
        ui->label->setStyleSheet("background-color:#FFFFFF");
-        ui->scrollArea->setStyleSheet("#scrollArea{background-color:#F8F8F8}");
+//        ui->scrollArea->setStyleSheet("background-color:#F8F8F8");
        ui->label_show->setStyleSheet("background-color:#F8F8F8");
        ui->pushButton_return->setIcon(QIcon(":/icons/icons/category_active.svg"));
-
    }
    main_color=color;
-
+    m_loadweb->setTheme(themeIsDark,color);
    updateUI();
    if(ui->stackedWidget->currentIndex()==0){
        chooseLeftMenu(nowMenu);
@@ -301,34 +281,6 @@ DTitlebar* Widget::getTitlebar()
    return ui->titlebar;
 }

-void Widget::on_webView_loadStarted()
-{
-    m_loadweb->setValue(0);
-    m_loadweb->show();
-    m_loaderror->hide();
-    ui->label_show->hide();
-
-    //分析出服务器中的分类名称
-    QUrl arg1=ui->webView->page()->mainFrame()->requestedUrl().toString();
-    QStringList url_=arg1.path().split("/");
-    if(url_.size()>3){
-        type_name=url_[2];
-    }
-    //如果是app.json就打开详情页
-    if(arg1.path().right(8)=="app.json"){
-        load.cancel();//打开并发加载线程前关闭正在执行的线程
-
-        ui->label_more->setText("");//清空详情介绍
-        ui->label_info->setText("");
-        ui->label_appname->setText("");
-        ui->pushButton_download->setEnabled(false);
-        ui->stackedWidget->setCurrentIndex(2);
-        load.cancel();//打开并发加载线程前关闭正在执行的线程
-        load = QtConcurrent::run([=](){
-            loadappinfo(arg1);
-        });
-    }
-}
 void Widget::updateUI()
 {
    if(themeIsDark){
@@ -371,6 +323,7 @@ void Widget::updateUI()
            left_list[i]->setStyleSheet("color:#252525;border:0px");
        }
    }
+
    left_list[nowMenu]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
    switch (nowMenu) {
    case 0:
@@ -417,14 +370,11 @@ void Widget::updateUI()
        break;
    }
 }
-//菜单切换逻辑

+// 菜单切换逻辑
 void Widget::chooseLeftMenu(int index)
 {
-
    nowMenu=index;
-//    setfoot();
-//    updatefoot();

    updateUI();
    left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
@@ -437,17 +387,18 @@ void Widget::chooseLeftMenu(int index)
                darkurl+=tmp[i]+"/";
            }
            darkurl+="dark"+tmp[tmp.size()-1];
-            ui->webView->setUrl(darkurl);
+            ui->webEngineView->setUrl(darkurl);
            qDebug()<<darkurl;
+
        }else {
-            ui->webView->setUrl(menuUrl[index]);
+            ui->webEngineView->setUrl(menuUrl[index]);
+
        }

        ui->stackedWidget->setCurrentIndex(0);
    }else if (index==13) {
        ui->stackedWidget->setCurrentIndex(1);
    }
-
 }

 void Widget::setfoot(int h)
@@ -461,22 +412,29 @@ void Widget::updatefoot()
    ui->webfoot->setFixedHeight(allh-foot);
 }

-
 void Widget::loadappinfo(QUrl arg1)
 {
-
    if(arg1.isEmpty()){
        return;
    }

-    //先隐藏详情页负责显示截图的label
+    //　先隐藏详情页负责显示截图的label
    ui->screen_0->hide();
    ui->screen_1->hide();
    ui->screen_2->hide();
    ui->screen_3->hide();
    ui->screen_4->hide();
+    ui->label_appicon->clear();
+    ui->tag_community->hide();
+    ui->tag_ubuntu->hide();
+    ui->tag_deepin->hide();
+    ui->tag_uos->hide();
+    ui->tag_dtk5->hide();
+    ui->tag_dwine2->hide();
+    ui->tag_dwine5->hide();
+    ui->tag_a2d->hide();

-    //置UI状态
+    //　重置UI状态
    ui->pushButton_uninstall->hide();
    ui->label_show->setText("正在加载，请稍候");
    ui->label_show->show();
@@ -491,22 +449,22 @@ void Widget::loadappinfo(QUrl arg1)
    get_json.waitForFinished();
    QFile app_json("app.json");
    if(app_json.open(QIODevice::ReadOnly)){
-        //        //成功得到json文件
+        // 成功得到json文件
        QByteArray json_array=app_json.readAll();
-        //将路径转化为相应源的下载路径
+        // 将路径转化为相应源的下载路径
        urladdress=arg1.toString().left(arg1.toString().length()-8);
        QStringList downloadurl=urladdress.split("/");
        urladdress=ui->comboBox_server->currentText();
        QString deburl=urladdress;
        deburl=deburl.left(urladdress.length()-1);
-        urladdress="http://img.shenmo.tech:38324/";//使用图片专用服务器请保留这行，删除后将使用源服务器
+        urladdress="https://cdn.jsdelivr.net/gh/Jerrywang959/jsonpng@master/"; // 使用图片专用服务器请保留这行，删除后将使用源服务器
        urladdress=urladdress.left(urladdress.length()-1);

        for (int i=3;i<downloadurl.size();i++) {
            urladdress+="/"+downloadurl[i];
            deburl+="/"+downloadurl[i];
        }
-        //路径转化完成
+        // 路径转化完成
        QJsonObject json= QJsonDocument::fromJson(json_array).object();
        appName = json["Name"].toString();
        url=deburl + json["Filename"].toString();
@@ -514,9 +472,9 @@ void Widget::loadappinfo(QUrl arg1)
        ui->label_appname->setText(appName);
        system("rm -r *.png");
        ui->label_show->show();
-        //软件信息加载
+        // 软件信息加载
        QString info;
-        info="包名： "+json["Pkgname"].toString()+"\n";
+        info= "包名： "+json["Pkgname"].toString()+"\n";
        info+="版本号： "+json["Version"].toString()+"\n";
        if(json["Author"].toString()!="" && json["Author"].toString()!=" "){
            info+="作者： "+json["Author"].toString()+"\n";
@@ -544,14 +502,36 @@ void Widget::loadappinfo(QUrl arg1)
        }else {
            ui->pushButton_download->setText("安装");
        }
-        //图标加载
+        //tag加载
+        QString tags=json["Tags"].toString();
+        QStringList tagList=tags.split(";");
+        for (int i=0;i<tagList.size();i++) {
+            if(tagList[i]=="community")
+                ui->tag_community->show();
+            if(tagList[i]=="ubuntu")
+                ui->tag_ubuntu->show();
+            if(tagList[i]=="deepin")
+                ui->tag_deepin->show();
+            if(tagList[i]=="uos")
+                ui->tag_uos->show();
+            if(tagList[i]=="dtk5")
+                ui->tag_dtk5->show();
+            if(tagList[i]=="dwine2")
+                ui->tag_dwine2->show();
+            if(tagList[i]=="dwine5")
+                ui->tag_dwine5->show();
+            if(tagList[i]=="a2d")
+                ui->tag_a2d->show();
+        }
+        // 图标加载
        get_json.start("curl -o icon.png "+urladdress+"icon.png");
        get_json.waitForFinished();
        QPixmap appicon(QString::fromUtf8(TMP_PATH)+"/icon.png");
        ui->label_appicon->setPixmap(appicon);
        ui->pushButton_download->setEnabled(true);
-        //截图展示加载

+
+        // 截图展示加载
        image_show *label_screen[5];
        label_screen[0]=ui->screen_0;
        label_screen[1]=ui->screen_1;
@@ -564,7 +544,7 @@ void Widget::loadappinfo(QUrl arg1)
            if(screen[i].load("screen_"+QString::number(i+1)+".png")){
                label_screen[i]->setImage(screen[i]);
                label_screen[i]->show();
-                switch(i){ //故意为之，为了清除多余截图
+                switch(i){  // 故意为之，为了清除多余截图
                case 0:
                    label_screen[1]->hide();
                case 1:
@@ -581,20 +561,15 @@ void Widget::loadappinfo(QUrl arg1)
        }
        ui->label_show->setText("");
        ui->label_show->hide();
-
    }
-
 }

-
-
-
 void Widget::on_pushButton_download_clicked()
 {
    chooseLeftMenu(13);
    allDownload+=1;
    QFileInfo info(url.path());
-    QString fileName(info.fileName());  //获取文件名
+    QString fileName(info.fileName());  // 获取文件名
    download_list[allDownload-1].pkgName=pkgName;
    if(fileName.isEmpty())
    {
@@ -621,7 +596,7 @@ void Widget::on_pushButton_download_clicked()
            return ;
        }
        nowDownload+=1;
-        startRequest(urList.at(nowDownload-1)); //进行链接请求
+        startRequest(urList.at(nowDownload-1)); // 进行链接请求
    }
    if(ui->pushButton_download->text()=="重新安装"){
        download_list[allDownload-1].reinstall=true;
@@ -639,7 +614,6 @@ void Widget::startRequest(QUrl url)
    connect(reply,SIGNAL(finished()),this,SLOT(httpFinished()));
    connect(reply,SIGNAL(readyRead()),this,SLOT(httpReadyRead()));
    connect(reply,SIGNAL(downloadProgress(qint64,qint64)),this,SLOT(updateDataReadProgress(qint64,qint64)));
-
 }

 void Widget::searchApp(QString text)
@@ -648,14 +622,11 @@ void Widget::searchApp(QString text)
        openUrl(text);
    }else {
        system("notify-send 目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！ --icon=spark-store");
-//        ui->webView->setUrl(QUrl("http://www.baidu.com/s?wd="+text));
-//        ui->stackedWidget->setCurrentIndex(0);
-
+        // ui->webView->setUrl(QUrl("http://www.baidu.com/s?wd="+text));
+        // ui->stackedWidget->setCurrentIndex(0);
    }
-
 }

-
 void Widget::httpReadyRead()
 {
    if(file)
@@ -663,20 +634,20 @@ void Widget::httpReadyRead()
        file->write(reply->readAll());
    }
 }
+
 void Widget::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes)
 {
-    download_list[nowDownload-1].setMax(10000); //最大值
-    download_list[nowDownload-1].setValue((bytesRead*10000)/totalBytes); //当前值
+    download_list[nowDownload-1].setMax(10000); // 最大值
+    download_list[nowDownload-1].setValue((bytesRead*10000)/totalBytes);    // 当前值
    download_size=bytesRead;
-    if(download_list[nowDownload-1].close){ //随时检测下载是否被取消
+    if(download_list[nowDownload-1].close){ // 随时检测下载是否被取消
        download_list[nowDownload-1].closeDownload();
        httpFinished();
    }
 }

-void Widget::httpFinished() //完成下载
+void Widget::httpFinished() // 完成下载
 {
-
    file->flush();
    file->close();
    reply->deleteLater();
@@ -687,7 +658,7 @@ void Widget::httpFinished() //完成下载
    isBusy=false;
    download_list[nowDownload-1].readyInstall();
    download_list[nowDownload-1].free=true;
-    if(nowDownload<allDownload){ //如果有排队则下载下一个
+    if(nowDownload<allDownload){    // 如果有排队则下载下一个
        nowDownload+=1;
        while (download_list[nowDownload-1].close) {
            nowDownload+=1;
@@ -704,29 +675,27 @@ void Widget::httpFinished() //完成下载
    }
 }

-
-
 void Widget::on_pushButton_return_clicked()
 {
-//    ui->stackedWidget->setCurrentIndex(0);
-//    if(nowMenu==13){
-//        chooseLeftMenu(13);
-//        return;
-//    }
+    // ui->stackedWidget->setCurrentIndex(0);
+    // if(nowMenu==13){
+    // chooseLeftMenu(13);
+    //     return;
+    // }
    chooseLeftMenu(nowMenu);
-//    if(themeIsDark){
-//        QString darkurl=menuUrl[nowMenu].toString();
-//        QStringList tmp=darkurl.split("/");
-//        darkurl.clear();
-//        for (int i=0;i<tmp.size()-1;i++) {
-//            darkurl+=tmp[i]+"/";
-//        }
-//        darkurl+="dark"+tmp[tmp.size()-1];
-//        ui->webView->setUrl(darkurl);
-//        qDebug()<<darkurl;
-//    }else {
-//        ui->webView->setUrl(menuUrl[nowMenu]);
-//    }
+    // if(themeIsDark){
+    //     QString darkurl=menuUrl[nowMenu].toString();
+    //     QStringList tmp=darkurl.split("/");
+    //     darkurl.clear();
+    //     for (int i=0;i<tmp.size()-1;i++) {
+    //         darkurl+=tmp[i]+"/";
+    //     }
+    //     darkurl+="dark"+tmp[tmp.size()-1];
+    //     ui->webView->setUrl(darkurl);
+    //     qDebug()<<darkurl;
+    // }else {
+    //     ui->webView->setUrl(menuUrl[nowMenu]);
+    // }
 }

 void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1)
@@ -737,6 +706,7 @@ void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1)
        setConfig->setValue("server/choose",arg1);
    }
 }
+
 void Widget::on_pushButton_updateServer_clicked()
 {
    QtConcurrent::run([=](){
@@ -752,7 +722,7 @@ void Widget::on_pushButton_updateServer_clicked()
                ui->comboBox_server->addItem(QString::fromStdString(lineTmp));
            }
        }else {
-            ui->comboBox_server->addItem("http://store.jerrywang.top/");
+            ui->comboBox_server->addItem("http://sucdn.jerrywang.top/");
        }
        ui->pushButton_updateServer->setEnabled(true);
        ui->comboBox_server->setCurrentIndex(0);
@@ -819,7 +789,7 @@ void Widget::on_pushButton_uninstall_clicked()
    });
 }

-void Widget::on_pushButton_clear_clicked()//清空临时缓存目录
+void Widget::on_pushButton_clear_clicked()  // 清空临时缓存目录
 {
    QtConcurrent::run([=](){
        ui->pushButton_clear->setEnabled(false);
@@ -839,16 +809,16 @@ quint64 Widget::dirFileSize(const QString &path)
 {
    QDir dir(path);
    quint64 size = 0;
-    //dir.entryInfoList(QDir::Files)返回文件信息
+    // dir.entryInfoList(QDir::Files)返回文件信息
    foreach(QFileInfo fileInfo, dir.entryInfoList(QDir::Files))
    {
-        //计算文件大小
+        // 计算文件大小
        size += quint64(fileInfo.size());
    }
-    //dir.entryList(QDir::Dirs|QDir::NoDotAndDotDot)返回所有子目录，并进行过滤
+    // dir.entryList(QDir::Dirs|QDir::NoDotAndDotDot)返回所有子目录，并进行过滤
    foreach(QString subDir, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
    {
-        //若存在子目录，则递归调用dirFileSize()函数
+        // 若存在子目录，则递归调用dirFileSize()函数
        size += dirFileSize(path + QDir::separator() + subDir);
    }
    return size;
@@ -856,13 +826,13 @@ quint64 Widget::dirFileSize(const QString &path)

 void Widget::opensetting()
 {
-    //防止下载时文件被删除
+    // 防止下载时文件被删除
    if(isdownload){
        ui->pushButton_clear->setEnabled(false);
    }else {
        ui->pushButton_clear->setEnabled(true);
    }
-    //显示缓存占用空间
+    // 显示缓存占用空间
    quint64 tmp_size=dirFileSize(QString::fromUtf8(TMP_PATH));
    QString tmp_size_str;
    if(tmp_size<1024){
@@ -881,36 +851,14 @@ void Widget::opensetting()
 void Widget::openUrl(QUrl u)
 {
    QString app=serverUrl + "store"+u.path()+"/app.json";
-    ui->webView->setUrl(app);
+    ui->webEngineView->setUrl(app);
 }

-
-
 void Widget::on_pushButton_website_clicked()
 {
    QDesktopServices::openUrl(QUrl(appweb));
 }

-
-void Widget::on_webView_loadFinished(bool arg1)
-{
-    if(arg1){
-         m_loadweb->hide();
-    }else {
-        m_loadweb->hide();
-        m_loaderror->show();
-    }
-
-}
-
-void Widget::on_webView_loadProgress(int progress)
-{
-    m_loadweb->setValue(progress);
-    if(progress>=90){
-        m_loadweb->hide();
-    }
-}
-
 void Widget::on_pushButton_clicked()
 {
    QString share_url;
@@ -923,7 +871,6 @@ void Widget::on_pushButton_clicked()

 void Widget::on_btn_openDir_clicked()
 {
-
    QDesktopServices::openUrl(QUrl("file:///tmp/spark-store", QUrl::TolerantMode));
 }

@@ -936,3 +883,57 @@ void Widget::on_stackedWidget_currentChanged(int arg1)
        ui->pushButton_return->setEnabled(true);
    }
 }
+
+void Widget::on_webEngineView_urlChanged(const QUrl &arg1)
+{
+    //分析出服务器中的分类名称
+    QStringList url_=arg1.path().split("/");
+    QString pname;
+    if(url_.size()>3){
+        type_name=url_[2];
+        pname=url_[3];
+    }
+    //如果是app.json就打开详情页
+    if(arg1.path().right(8)=="app.json"){
+        load.cancel();//打开并发加载线程前关闭正在执行的线程
+        m_loadweb->setValue(0);
+        ui->label_more->setText("");//清空详情介绍
+        ui->label_info->setText("");
+        ui->label_appname->setText("");
+        ui->pushButton_download->setEnabled(false);
+        ui->stackedWidget->setCurrentIndex(2);
+        qDebug()<<"https://demo-one-vert.vercel.app/"+type_name+"/"+pname;
+        load.cancel();//打开并发加载线程前关闭正在执行的线程
+        load = QtConcurrent::run([=](){
+
+            loadappinfo(arg1);
+        });
+    }
+}
+
+void Widget::on_webEngineView_loadStarted()
+{
+    m_loadweb->setValue(0);
+    m_loadweb->show();
+    m_loaderror->hide();
+    ui->label_show->hide();
+}
+
+void Widget::on_webEngineView_loadProgress(int progress)
+{
+    m_loadweb->setValue(progress);
+    if(progress>=90){
+        m_loadweb->setValue(0);
+    }
+}
+
+void Widget::on_webEngineView_loadFinished(bool arg1)
+{
+    if(arg1){
+         m_loadweb->setValue(0);
+    }else {
+        m_loadweb->setValue(0);
+        m_loaderror->show();
+    }
+
+}
--- a/widget.h
+++ b/widget.h
@@ -19,6 +19,7 @@
 #include <QLabel>
 #include <DTitlebar>
 #include <DSearchEdit>
+#include <progressload.h>
 #define LIST_MAX 99 //一次最多下载数量
 #define TMP_PATH "/tmp/spark-store"

@@ -53,15 +54,12 @@ private slots:
    void updateDataReadProgress(qint64,qint64);
    void on_pushButton_download_clicked();
    void on_pushButton_return_clicked();
-    void on_webView_loadStarted();
    void on_comboBox_server_currentIndexChanged(const QString &arg1);
    void on_pushButton_updateServer_clicked();
    void on_pushButton_updateApt_clicked();
    void on_pushButton_uninstall_clicked();
    void on_pushButton_clear_clicked();
    void on_pushButton_website_clicked();
-    void on_webView_loadFinished(bool arg1);
-    void on_webView_loadProgress(int progress);

    void on_pushButton_clicked();

@@ -69,6 +67,14 @@ private slots:

    void on_stackedWidget_currentChanged(int arg1);

+    void on_webEngineView_urlChanged(const QUrl &arg1);
+
+    void on_webEngineView_loadStarted();
+
+    void on_webEngineView_loadProgress(int progress);
+
+    void on_webEngineView_loadFinished(bool arg1);
+
 public:

    QUrl url;
@@ -101,7 +107,7 @@ private:
 private:
    QPushButton * left_list[15];
    QUrl menuUrl[13];
-    DWaterProgress *m_loadweb=new DWaterProgress;
+    ProgressLoad *m_loadweb;
    QLabel *m_loaderror=new QLabel;
    QString serverUrl;
    bool configCanSave=false;
--- a/widget.ui
+++ b/widget.ui
@@ -29,7 +29,7 @@
   <property name="spacing">
    <number>0</number>
   </property>
-   <item row="0" column="0" rowspan="3">
+   <item row="0" column="0" rowspan="4">
    <widget class="QWidget" name="widget_menuList" native="true">
     <property name="minimumSize">
      <size>
@@ -147,6 +147,13 @@
        </property>
       </spacer>
      </item>
+      <item row="11" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_dev">
+        <property name="text">
+         <string>编程开发</string>
+        </property>
+       </widget>
+      </item>
      <item row="0" column="3">
       <widget class="QPushButton" name="pushButton_return">
        <property name="maximumSize">
@@ -164,13 +171,6 @@
        </property>
       </widget>
      </item>
-      <item row="11" column="0" colspan="5">
-       <widget class="QPushButton" name="menu_dev">
-        <property name="text">
-         <string>编程开发</string>
-        </property>
-       </widget>
-      </item>
      <item row="9" column="0" colspan="5">
       <widget class="QPushButton" name="menu_office">
        <property name="text">
@@ -278,7 +278,7 @@
     </layout>
    </widget>
   </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
    <widget class="QStackedWidget" name="stackedWidget">
     <property name="styleSheet">
      <string notr="true"/>
@@ -287,7 +287,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">
@@ -307,263 +307,10 @@
        <number>0</number>
       </property>
       <item>
-        <widget class="QWebView" name="webView">
-         <property name="palette">
-          <palette>
-           <active>
-            <colorrole role="WindowText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>65</red>
-               <green>77</green>
-               <blue>104</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Light">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>3</red>
-               <green>3</green>
-               <blue>3</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Dark">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>46</red>
-               <green>46</green>
-               <blue>46</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Text">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>65</red>
-               <green>77</green>
-               <blue>104</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="ButtonText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>65</red>
-               <green>77</green>
-               <blue>104</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Base">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Window">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="HighlightedText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>28</red>
-               <green>28</green>
-               <blue>28</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="NoRole">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-           </active>
-           <inactive>
-            <colorrole role="WindowText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>138</red>
-               <green>145</green>
-               <blue>161</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Light">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>3</red>
-               <green>3</green>
-               <blue>3</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Dark">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>46</red>
-               <green>46</green>
-               <blue>46</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Text">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>138</red>
-               <green>145</green>
-               <blue>161</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="ButtonText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>138</red>
-               <green>145</green>
-               <blue>161</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Base">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Window">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="HighlightedText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>28</red>
-               <green>28</green>
-               <blue>28</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="NoRole">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-           </inactive>
-           <disabled>
-            <colorrole role="WindowText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>46</red>
-               <green>46</green>
-               <blue>46</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Light">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>3</red>
-               <green>3</green>
-               <blue>3</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Dark">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>46</red>
-               <green>46</green>
-               <blue>46</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Text">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>46</red>
-               <green>46</green>
-               <blue>46</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="ButtonText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>46</red>
-               <green>46</green>
-               <blue>46</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Base">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="Window">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="HighlightedText">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>28</red>
-               <green>28</green>
-               <blue>28</blue>
-              </color>
-             </brush>
-            </colorrole>
-            <colorrole role="NoRole">
-             <brush brushstyle="SolidPattern">
-              <color alpha="255">
-               <red>0</red>
-               <green>0</green>
-               <blue>0</blue>
-              </color>
-             </brush>
-            </colorrole>
-           </disabled>
-          </palette>
-         </property>
+        <widget class="QWebEngineView" name="webEngineView">
         <property name="url">
          <url>
-           <string>http://0.0.0.1/</string>
+           <string>about:blank</string>
          </url>
         </property>
        </widget>
@@ -664,6 +411,12 @@
         <property name="styleSheet">
          <string notr="true"/>
         </property>
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
         <property name="lineWidth">
          <number>0</number>
         </property>
@@ -675,8 +428,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-            <width>901</width>
-            <height>849</height>
+            <width>889</width>
+            <height>854</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_17">
@@ -691,8 +444,11 @@
               <height>350</height>
              </size>
             </property>
+             <property name="autoFillBackground">
+              <bool>true</bool>
+             </property>
             <layout class="QGridLayout" name="gridLayout">
-              <item row="2" column="2">
+              <item row="3" column="2">
               <spacer name="horizontalSpacer_2">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
@@ -708,7 +464,7 @@
                </property>
               </spacer>
              </item>
-              <item row="2" column="0">
+              <item row="3" column="0">
               <spacer name="horizontalSpacer">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
@@ -724,14 +480,14 @@
                </property>
               </spacer>
              </item>
-              <item row="4" column="1">
+              <item row="5" column="1">
               <widget class="QPushButton" name="pushButton_download">
                <property name="text">
                 <string>安装</string>
                </property>
               </widget>
              </item>
-              <item row="6" column="1" rowspan="2">
+              <item row="7" column="1" rowspan="2">
               <spacer name="verticalSpacer_2">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
@@ -744,7 +500,7 @@
                </property>
               </spacer>
              </item>
-              <item row="3" column="1">
+              <item row="4" column="1">
               <spacer name="verticalSpacer_3">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
@@ -760,7 +516,7 @@
                </property>
               </spacer>
              </item>
-              <item row="5" column="1">
+              <item row="6" column="1">
               <widget class="QPushButton" name="pushButton_uninstall">
                <property name="text">
                 <string>卸载</string>
@@ -825,7 +581,7 @@
                </property>
               </widget>
              </item>
-              <item row="2" column="3" rowspan="5" colspan="6">
+              <item row="3" column="3" rowspan="5" colspan="6">
               <widget class="QLabel" name="label_info">
                <property name="font">
                 <font>
@@ -843,7 +599,7 @@
                </property>
               </widget>
              </item>
-              <item row="1" column="3">
+              <item row="2" column="3">
               <spacer name="verticalSpacer_6">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
@@ -859,7 +615,7 @@
                </property>
               </spacer>
              </item>
-              <item row="2" column="1">
+              <item row="3" column="1">
               <widget class="QLabel" name="label_appicon">
                <property name="minimumSize">
                 <size>
@@ -894,6 +650,147 @@
                </property>
               </widget>
              </item>
+              <item row="1" column="3" colspan="6">
+               <widget class="QWidget" name="widget" native="true">
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>30</height>
+                 </size>
+                </property>
+                <layout class="QHBoxLayout" name="horizontalLayout_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="QLabel" name="tag_community">
+                   <property name="maximumSize">
+                    <size>
+                     <width>30</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>TextLabel</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="tag_ubuntu">
+                   <property name="maximumSize">
+                    <size>
+                     <width>30</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>TextLabel</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="tag_deepin">
+                   <property name="maximumSize">
+                    <size>
+                     <width>30</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>TextLabel</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="tag_uos">
+                   <property name="maximumSize">
+                    <size>
+                     <width>30</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>TextLabel</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="tag_dtk5">
+                   <property name="maximumSize">
+                    <size>
+                     <width>30</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>TextLabel</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="tag_dwine2">
+                   <property name="maximumSize">
+                    <size>
+                     <width>30</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>TextLabel</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="tag_dwine5">
+                   <property name="maximumSize">
+                    <size>
+                     <width>30</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>TextLabel</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="tag_a2d">
+                   <property name="maximumSize">
+                    <size>
+                     <width>30</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>TextLabel</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <spacer name="horizontalSpacer_10">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>40</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                </layout>
+               </widget>
+              </item>
             </layout>
            </widget>
           </item>
@@ -971,8 +868,8 @@
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                   <width>867</width>
-                   <height>325</height>
+                   <width>851</width>
+                   <height>323</height>
                  </rect>
                 </property>
                 <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -1101,8 +998,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-            <width>903</width>
-            <height>786</height>
+            <width>692</width>
+            <height>994</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1198,7 +1095,7 @@
                    <string notr="true">color:#808080</string>
                   </property>
                   <property name="text">
-                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源。虽然它可能偶尔有些慢。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
                   <property name="wordWrap">
                    <bool>true</bool>
@@ -1385,13 +1282,35 @@
     </property>
    </widget>
   </item>
+   <item row="1" column="1">
+    <widget class="ProgressLoad" name="progressload" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>3</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>3</height>
+      </size>
+     </property>
+     <property name="toolTipDuration">
+      <number>-1</number>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+    </widget>
+   </item>
  </layout>
 </widget>
 <customwidgets>
  <customwidget>
-   <class>QWebView</class>
+   <class>QWebEngineView</class>
   <extends>QWidget</extends>
-   <header>QtWebKitWidgets/QWebView</header>
+   <header location="global">QtWebEngineWidgets/QWebEngineView</header>
  </customwidget>
  <customwidget>
   <class>image_show</class>
@@ -1405,6 +1324,12 @@
   <header location="global">dtitlebar.h</header>
   <container>1</container>
  </customwidget>
+  <customwidget>
+   <class>ProgressLoad</class>
+   <extends>QWidget</extends>
+   <header location="global">progressload.h</header>
+   <container>1</container>
+  </customwidget>
 </customwidgets>
 <resources>
  <include location="icons.qrc"/>
Author	SHA1	Message	Date
shenmo	2be0e1b523	2.0+1发布	2020-09-23 17:32:26 +08:00
shenmo	eacc56eaf3	完全改好了	2020-09-23 17:30:46 +08:00
shenmo	9458bbf2c9	更新DAboutDialog	2020-09-23 16:08:44 +08:00
moshengren	e472ba76f1	!6 Update of english translations Merge pull request !6 from alvarosamudio/master	2020-09-19 10:20:37 +08:00
alvarosamudio	74bd3ae018	update trans/lang_English.ts.	2020-09-18 23:57:40 +08:00
Jerry	ccc2bb8898	更新README	2020-09-18 15:46:43 +08:00
shenmo	a59e2e0527	fanyi	2020-09-18 12:36:42 +08:00
shenmo	2c205bf5db	翻译	2020-09-17 16:49:23 +08:00
shenmo	efc6c50f88	微调DAboutDialogue内容	2020-09-12 13:36:37 +08:00
shenmo	ce263c3cb4	更新翻译	2020-09-12 13:29:34 +08:00
shenmo	78ac339629	翻译更新	2020-09-11 13:36:29 +08:00
神末	58359aa63a	!5 更新了图片服务器线路说明转移到服务端上 Merge pull request !5 from Jerry/master	2020-09-08 17:20:58 +08:00
jerry	e839f7836f	不在客户端现实线路说明, 线路说明写到server.list中	2020-09-08 15:31:55 +08:00
jerry	b34c50d2e0	图片服务器使用jsdelivr cdn	2020-09-08 14:19:47 +08:00
jerry	4d4e3e3e3a	更新图片服务器	2020-09-05 18:20:14 +08:00
jerry	10741a1d92	更新了线路说明, 更具有普适性	2020-09-03 18:40:04 +08:00
maicss	b78ca0e103	新增软件标签	2020-09-03 10:05:48 +08:00
maicss	3a0ed16a21	Merge branch 'master' of https://gitee.com/deepin-community-store/spark-store	2020-09-02 14:28:52 +08:00
maicss	0a3d583d76	优化UI细节	2020-09-02 14:28:09 +08:00
张天怿	f5121a0405	Delete .pro.user files Delete useless .pro.user files.	2020-09-01 11:03:20 +08:00
Maicss	e568ddafba	更新文档 Merge pull request !2 from Jerry/master	2020-08-29 07:42:02 +08:00
jerry	111174a46f	update	2020-08-29 00:43:36 +08:00
jerry	6de25a299f	update readme	2020-08-29 00:41:23 +08:00
jerry	cbd57a3e25	增加线路说明, 如何编译的说明	2020-08-29 00:27:02 +08:00
maicss	6e083f295b	新增深度安装器安装选项	2020-08-28 15:03:10 +08:00
maicss	b82a821d01	修复UI细节问题	2020-08-28 14:45:39 +08:00
Maicss	6578af935e	优化UI	2020-08-26 19:58:42 +08:00
Maicss	fe4143a3f7	修改 web控件	2020-08-26 09:39:55 +08:00
Maicss	8952be33c4	修改 web控件	2020-08-26 09:27:34 +08:00
Maicss	4e4f55995e	修改 web控件	2020-08-26 09:26:59 +08:00
张天怿	7af2af64d8	Update image server Change image server.	2020-08-24 12:44:03 +08:00
张天怿	e7276662f4	Add new server Change default serverURL for better usage exxperience.	2020-08-23 20:11:02 +08:00
shenmo	4138c5d634	bug	2020-08-22 09:38:49 +08:00
shenmo	2bb4feec43	7+2——更改源服务器	2020-08-21 17:29:05 +08:00