update README.md.

Fix a bug that dirname in ~/.local/share/spark-union/ is translated into
Chinese.

.gitignore

@@ -1 +1,3 @@
 spark-store.pro.user*
+build/
+.vscode/

README.md

@@ -1,4 +1,5 @@
-#  星火应用商店
+[![Fork me on Gitee](https://gitee.com/deepin-community-store/spark-store/widgets/widget_5.svg?color=undefined)](https://gitee.com/deepin-community-store/spark-store)
+#  星火应用商店[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=dark)](https://gitee.com/deepin-community-store/spark-store/stargazers)
 
 
 众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
@@ -7,7 +8,7 @@
 
 我们创建了这个应用商店，广泛收录大家需要的软件包，搜集优质小工具，主动适配wine应用，存放到储存库供大家获取
 
-我们支持：deepin 20 ; ubuntu 20.04LTS ;UOS Home 20
+我们支持：Deepin 20 ; Ubuntu 20.04 LTS ; UOS Home 20
 
 希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
 
@@ -43,13 +44,13 @@ http://dcstore.spark-app.store/
 | 社交沟通 | chat           |
 | 音乐欣赏 | music          |
 | 视频播放 | video          |
-| 图形图像 | image_graphics |
+| 图形图像 | graphics       |
 | 游戏娱乐 | games          |
 | 办公学习 | office         |
 | 阅读翻译 | reading        |
 | 编程开发 | development    |
 | 系统工具 | tools          |
-| 主题美化 | themes         |
+| 主题美化 | beautify       |
 | 其他应用 | others         |
 
 
@@ -133,6 +134,32 @@ void Widget::openUrl(QUrl u)
 }
 
 ```
+## Tags处理方式
+
+**Tags处理方式**
+```cpp
+// widget.cpp
+QString tags=json["Tags"].toString(); //Read the Tags
+        QStringList tagList=tags.split(";");
+        for (int i=0;i<tagList.size();i++) {
+            if(tagList[i]=="community")
+                ui->tag_community->show();//Tags icon shows like this
+            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();
+        }
+```
 
 **Widget 初始化**
 ```cpp
@@ -224,7 +251,7 @@ void SpkAppInfoLoaderThread::run()
 ```
 
 
-**应用下载**
+**应用下载**		
 Widget::on_pushButton_download_clicked() 是点击下载的安装方法。     
 最终使用的是 `QNetwrokAccessManager` 进行GET请求获取数据写入文件。             
 ```cpp
@@ -360,7 +387,3 @@ void Widget::sendNotification(const QString &message, const int msTimeout, const
     notify_notification_show(_notify, nullptr);
 }
 ```
-
-
-
-

downloadlist.cpp

@@ -122,7 +122,7 @@ void downloadlist::install(int t)
         ui->pushButton_install->hide();
         ui->widget_spinner->show();
         qDebug()<<"/tmp/spark-store/"+ui->label_filename->text().toUtf8();
-        ui->label_2->setText(tr("Installing..."));
+        ui->label_2->setText(tr("Installing"));
         QtConcurrent::run([=](){
             QProcess installer;
             if(!reinstall){

icons.qrc

@@ -50,7 +50,7 @@
         <file>tags/community.svg</file>
         <file>tags/deepin.svg</file>
         <file>tags/logo_icon.svg</file>
-        <file>tags/uos.svg</file>
+        <file>tags/uos-authorize.svg</file>
         <file>tags/a2d-small.png</file>
         <file>tags/community-small.png</file>
         <file>tags/deepin-small.png</file>
@@ -63,4 +63,7 @@
         <file>tags/dwine5.svg</file>
         <file>tags/dwine2-small.png</file>
     </qresource>
+    <qresource prefix="/fonts">
+        <file>fonts/华康少女字体.ttf</file>
+    </qresource>
 </RCC>

main.cpp

@@ -3,50 +3,56 @@
 #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");
+    /* Customized DAboutDialog (Can't work on other distro like Ubuntu...)
-    a.setApplicationVersion(DApplication::buildVersion("2.0.2.4"));
+     *
-    a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
+     * DAboutDialog dialog;
-    a.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
+     * a.setAboutDialog(&dialog);
+     * dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
+     * dialog.setVersion(DApplication::buildVersion("Version 2.0.2.5"));
+     * dialog.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
+     * dialog.setProductName(QLabel::tr("Spark Store"));
+     * dialog.setDescription(
+     *             QObject::tr(
+     *                 "<span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</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 Store"));
+     * dialog.setCompanyLogo(QPixmap(":/Logo-Spark.png"));
+     * dialog.setWebsiteName(QObject::tr("The Spark Project"));
+     * dialog.setWebsiteLink("https://gitee.com/deepin-community-store");
+     */
 
     a.setProductName(QLabel::tr("Spark Store"));
-    a.setApplicationDescription(QObject::tr("<span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/>""<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>""<span style=' font-size:12pt;'>Spark developers</span><br/>We publish this program under GPL V3"));
+    a.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
-    a.setApplicationName("Spark应用商店"); //只有在这儿修改窗口标题才有效
+    a.setOrganizationName("spark-union");
-    Widget w;
+    a.setOrganizationDomain("https://www.deepinos.org/");
-    QDesktopWidget *s=DApplication::desktop();
+    a.setApplicationName("Spark Store");    //不需要翻译，否则 ~/.local/share/ 下文件夹名称也被翻译为中文
-/*
+    a.setApplicationVersion(DApplication::buildVersion("2.0.2.5"));
-	a.setAboutDialog(&dialog);
+    a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
-    dialog.setLicense(QObject::tr("We publish this program under GPL V3"));
+    a.setApplicationDescription(
-    dialog.setVersion(DApplication::buildVersion("Version 2.0.2.3"));
+                QObject::tr(
-    dialog.setAcknowledgementVisible(true);
+                    "<span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/>"
-    dialog.setAcknowledgementLink(QObject::tr("https://gitee.com/deepin-community-store/spark-store"));
+                    "<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
-    //a.setApplicationAcknowledgementPage(QObject::tr("https://gitee.com/deepin-community-store/spark-store"));
+                    "<span style='font-size:12pt;'>Spark developers</span><br/><br/>"
-    dialog.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
+                    "Published under GPL V3"
-    dialog.setProductName(QLabel::tr("Spark Store"));
+                    )
-    //dialog.setDescription(QLabel::tr("An appstore powered by deepin community\n We born for change"));
+                );
-    dialog.setDescription(QObject::tr(
-        "<span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</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 Store"));
-    dialog.setCompanyLogo(QPixmap(":/Logo-Spark.png"));
-    dialog.setWebsiteName(QObject::tr("The Spark Project"));
-    dialog.setWebsiteLink("https://gitee.com/deepin-community-store");
 
     Widget w;
     QDesktopWidget *s=DApplication::desktop();
-  */
+    int d_w=s->width();
-	int d_w=s->width();
     int d_h=s->height();
     if(d_w<=1366){
         w.setMinimumWidth(925);
@@ -68,9 +74,7 @@ int main(int argc, char *argv[])
         w.setMinimumHeight(760);
         w.resize(1180,760);
     }
-//    w.resize(925,650);
 
-    w.show();
     QString arg1=argv[1];
     if(arg1.left(6)=="spk://"){
         w.openUrl(QUrl(argv[1]));
@@ -78,5 +82,7 @@ int main(int argc, char *argv[])
     //让打开时界面显示在正中
     Dtk::Widget::moveToCenter(&w);
 
+    w.show();
+
     return a.exec();
 }

spark-store.pro

@@ -7,11 +7,8 @@
 QT       += core gui network concurrent webenginewidgets
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-TRANSLATIONS = ./trans/spark-store_en.ts \
-               ./trans/spark-store_zh_CN.ts
-               ./trans/spark-store_fr.ts\
 
-CONFIG += link_pkgconfig
+CONFIG += c++11 link_pkgconfig
 PKGCONFIG += dtkwidget glib-2.0 gdk-pixbuf-2.0 libnotify
 
 TARGET = spark-store
@@ -28,7 +25,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-
 SOURCES += main.cpp\
     widget.cpp \
     downloadlist.cpp \
@@ -45,10 +41,6 @@ HEADERS  += \
     progressload.h \
     workerthreads.h
 
-
-
-CONFIG += c++11
-
 FORMS += \
     widget.ui \
     downloadlist.ui
@@ -70,3 +62,7 @@ DISTFILES += \
     tags/deepin.svg \
     tags/logo_icon.svg \
     tags/uos.svg
+
+TRANSLATIONS = ./trans/spark-store_en.ts \
+               ./trans/spark-store_zh_CN.ts \
+               ./trans/spark-store_fr.ts

trans/spark-store_en.ts

@@ -4,8 +4,7 @@
 <context>
     <name>QLabel</name>
     <message>
-        <location filename="../main.cpp" line="22"/>
+        <location filename="../main.cpp" line="37"/>
-        <location filename="../main.cpp" line="30"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13,24 +12,56 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../main.cpp" line="16"/>
+        <location filename="../main.cpp" line="45"/>
-        <source>We publish this program under GPL V3</source>
+        <source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SpkAppInfoLoaderThread</name>
+    <message>
+        <location filename="../workerthreads.cpp" line="25"/>
+        <source>Failed to download app info. Please check internet connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="19"/>
+        <location filename="../workerthreads.cpp" line="53"/>
-        <location filename="../main.cpp" line="20"/>
+        <source>PkgName: </source>
-        <source>https://gitee.com/deepin-community-store/spark-store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="24"/>
+        <location filename="../workerthreads.cpp" line="54"/>
-        <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
+        <source>Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="32"/>
+        <location filename="../workerthreads.cpp" line="56"/>
-        <source>The Spark Project</source>
+        <source>Author: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="60"/>
+        <source>Official Site: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="64"/>
+        <source>Contributor: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="65"/>
+        <source>Update Time: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="66"/>
+        <source>Installed Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="95"/>
+        <source>Failed to load application icon.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -46,16 +77,6 @@
         <source>background-color:#FFFFFF</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../widget.ui" line="67"/>
-        <source>Videos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../widget.ui" line="74"/>
-        <source>Download List</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../widget.ui" line="81"/>
         <source>Tools</source>
@@ -76,11 +97,6 @@
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../widget.ui" line="200"/>
-        <source>Translate</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../widget.ui" line="207"/>
         <source>Others</source>
@@ -91,11 +107,6 @@
         <source>Games</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../widget.ui" line="248"/>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../widget.ui" line="528"/>
         <source>Name</source>
@@ -108,7 +119,8 @@
     </message>
     <message>
         <location filename="../widget.ui" line="515"/>
-        <location filename="../widget.cpp" line="536"/>
+        <location filename="../widget.cpp" line="586"/>
+        <location filename="../widget.cpp" line="808"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
@@ -155,11 +167,31 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget.ui" line="67"/>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="74"/>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../widget.ui" line="173"/>
         <source>Back to category</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget.ui" line="200"/>
+        <source>Reading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="241"/>
+        <source>Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../widget.ui" line="293"/>
         <source>Reload</source>
@@ -217,7 +249,7 @@
     <message>
         <location filename="../widget.ui" line="678"/>
         <source>Share</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Spk share link</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="153"/>
@@ -226,7 +258,7 @@
     </message>
     <message>
         <location filename="../widget.ui" line="217"/>
-        <source>Home  </source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -235,8 +267,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="241"/>
+        <location filename="../widget.ui" line="248"/>
-        <source>Communication</source>
+        <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -290,11 +322,6 @@
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../widget.ui" line="1153"/>
-        <source>Take effect when restart </source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../widget.ui" line="1182"/>
         <source>&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;</source>
@@ -365,135 +392,144 @@
         <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="1153"/>
+        <source>Take effect when restart</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../widget.ui" line="1293"/>
         <source>0B</source>
         <translation type="unfinished">0B</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="146"/>
+        <location filename="../widget.cpp" line="157"/>
         <source>Spark Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="147"/>
+        <location filename="../widget.cpp" line="158"/>
         <source>Search or enter spk://</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="153"/>
+        <location filename="../widget.cpp" line="164"/>
         <source>Submit App</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="154"/>
+        <location filename="../widget.cpp" line="165"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="245"/>
+        <location filename="../widget.cpp" line="264"/>
         <source>Not Exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="297"/>
+        <location filename="../widget.cpp" line="113"/>
-        <location filename="../widget.cpp" line="305"/>
+        <location filename="../widget.cpp" line="319"/>
+        <location filename="../widget.cpp" line="323"/>
+        <location filename="../widget.cpp" line="332"/>
+        <location filename="../widget.cpp" line="336"/>
         <source>Spark\ Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="480"/>
+        <location filename="../widget.cpp" line="530"/>
         <source>Failed to download app info. Please check internet connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="510"/>
+        <location filename="../widget.cpp" line="560"/>
         <source>PkgName: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="511"/>
+        <location filename="../widget.cpp" line="561"/>
         <source>Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="513"/>
+        <location filename="../widget.cpp" line="563"/>
         <source>Author: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="517"/>
+        <location filename="../widget.cpp" line="567"/>
         <source>Official Site: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="521"/>
+        <location filename="../widget.cpp" line="571"/>
         <source>Contributor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="522"/>
+        <location filename="../widget.cpp" line="572"/>
         <source>Update Time: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="523"/>
+        <location filename="../widget.cpp" line="573"/>
         <source>Installed Size: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="532"/>
+        <location filename="../widget.cpp" line="582"/>
-        <location filename="../widget.cpp" line="645"/>
+        <location filename="../widget.cpp" line="693"/>
+        <location filename="../widget.cpp" line="805"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="571"/>
+        <location filename="../widget.cpp" line="621"/>
         <source>Failed to load application icon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="620"/>
+        <location filename="../widget.cpp" line="668"/>
         <source>Failed to get the name to the file to be downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="668"/>
+        <location filename="../widget.cpp" line="716"/>
         <source>Spark store could only process spk:// links for now. The search feature is coming soon!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="789"/>
+        <location filename="../widget.cpp" line="944"/>
         <source>Updating, please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="842"/>
+        <location filename="../widget.cpp" line="997"/>
         <source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="848"/>
+        <location filename="../widget.cpp" line="1003"/>
         <source>Unknown error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="1024"/>
+        <location filename="../widget.cpp" line="1185"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="1024"/>
+        <location filename="../widget.cpp" line="1185"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="1025"/>
+        <location filename="../widget.cpp" line="1186"/>
         <source>Information for Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="1026"/>
+        <location filename="../widget.cpp" line="1187"/>
         <source>Currently the translation contribution is limited to English,
 and you will be redirected to our Gitee repository at which you are
 supposed to be creating pull requests to contribute app info
@@ -504,17 +540,17 @@ Click yes to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="868"/>
+        <location filename="../widget.cpp" line="1023"/>
         <source>Uninstall succeeded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="882"/>
+        <location filename="../widget.cpp" line="1037"/>
         <source>Temporary cache was cleaned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="949"/>
+        <location filename="../widget.cpp" line="1104"/>
         <source>The URL has been copied to the clipboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -598,7 +634,7 @@ Click yes to continue.</source>
     </message>
     <message>
         <location filename="../downloadlist.cpp" line="125"/>
-        <source>Installing...</source>
+        <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

trans/spark-store_zh_CN.ts

@@ -4,8 +4,7 @@
 <context>
     <name>QLabel</name>
     <message>
-        <location filename="../main.cpp" line="22"/>
+        <location filename="../main.cpp" line="37"/>
-        <location filename="../main.cpp" line="30"/>
         <source>Spark Store</source>
         <translation>Spark 应用商店</translation>
     </message>
@@ -13,29 +12,77 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../main.cpp" line="16"/>
         <source>We publish this program under GPL V3</source>
-        <translation>本程序按GPL V3开源</translation>
+        <translation type="vanished">本程序按GPL V3开源</translation>
     </message>
     <message>
         <source>Version 2.0+2</source>
         <translation type="vanished">版本： 2.0+2</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="19"/>
-        <location filename="../main.cpp" line="20"/>
-        <source>https://gitee.com/deepin-community-store/spark-store</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../main.cpp" line="24"/>
         <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;deepin 社区驱动的一款第三方应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</translation>
+        <translation type="vanished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;deepin 社区驱动的一款第三方应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="32"/>
         <source>The Spark Project</source>
-        <translation>星火项目组</translation>
+        <translation type="vanished">星火项目组</translation>
+    </message>
+    <message>
+        <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;We publish this program under GPL V3</source>
+        <translation type="vanished">&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;一款由 深度社区 出品的应用商店&lt;/span&gt;&lt;br/&gt;&quot;&quot;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&quot;&quot;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火开发者联盟&lt;/span&gt;&lt;br/&gt;本程序遵循 GPL V3 协议发布</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="45"/>
+        <source>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by deepin community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;Published under GPL V3</source>
+        <translation>&lt;span style=&apos;font-size:10pt;font-weight:60;&apos;&gt;由 Deepin 社区出品的应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos;font-size:12pt;&apos;&gt;星火商店开发组&lt;/span&gt;&lt;br/&gt;&lt;br/&gt;遵循 GPL V3 协议发布</translation>
+    </message>
+</context>
+<context>
+    <name>SpkAppInfoLoaderThread</name>
+    <message>
+        <location filename="../workerthreads.cpp" line="25"/>
+        <source>Failed to download app info. Please check internet connection.</source>
+        <translation>下载应用程序详细信息失败，请检查网络连接。</translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="53"/>
+        <source>PkgName: </source>
+        <translation>包名： </translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="54"/>
+        <source>Version: </source>
+        <translation>版本： </translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="56"/>
+        <source>Author: </source>
+        <translation>作者： </translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="60"/>
+        <source>Official Site: </source>
+        <translation>官网： </translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="64"/>
+        <source>Contributor: </source>
+        <translation>投稿者： </translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="65"/>
+        <source>Update Time: </source>
+        <translation>更新时间： </translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="66"/>
+        <source>Installed Size: </source>
+        <translation>大小： </translation>
+    </message>
+    <message>
+        <location filename="../workerthreads.cpp" line="95"/>
+        <source>Failed to load application icon.</source>
+        <translation>加载应用程序图标失败。</translation>
     </message>
 </context>
 <context>
@@ -51,14 +98,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="67"/>
         <source>Videos</source>
-        <translation>视频播放</translation>
+        <translation type="vanished">视频播放</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="74"/>
         <source>Download List</source>
-        <translation>下载列表</translation>
+        <translation type="vanished">下载列表</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="81"/>
@@ -85,9 +130,8 @@
         <translation>办公学习</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="200"/>
         <source>Translate</source>
-        <translation>阅读翻译</translation>
+        <translation type="vanished">阅读翻译</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="207"/>
@@ -119,7 +163,7 @@
     <message>
         <location filename="../widget.ui" line="383"/>
         <source>The list is currently empty. Go and download some softwares!</source>
-        <translation>当前下载列表为空</translation>
+        <translation>当前下载列表为空。去下载些软件吧！</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="415"/>
@@ -138,10 +182,31 @@
     </message>
     <message>
         <location filename="../widget.ui" line="515"/>
-        <location filename="../widget.cpp" line="536"/>
+        <location filename="../widget.cpp" line="586"/>
+        <location filename="../widget.cpp" line="808"/>
         <source>Install</source>
         <translation>安装</translation>
     </message>
+    <message>
+        <location filename="../widget.ui" line="67"/>
+        <source>Video</source>
+        <translation>视频播放</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="74"/>
+        <source>Download</source>
+        <translation>下载列表</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="200"/>
+        <source>Reading</source>
+        <translation>阅读翻译</translation>
+    </message>
+    <message>
+        <location filename="../widget.ui" line="241"/>
+        <source>Chat</source>
+        <translation>社交沟通</translation>
+    </message>
     <message>
         <location filename="../widget.ui" line="623"/>
         <source>Uninstall</source>
@@ -217,7 +282,7 @@
     <message>
         <location filename="../widget.ui" line="678"/>
         <source>Share</source>
-        <translation>分享</translation>
+        <translation>Spk分享链接</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="153"/>
@@ -225,9 +290,8 @@
         <translation>编程开发</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="217"/>
         <source>Home  </source>
-        <translation>商店首页</translation>
+        <translation type="vanished">商店首页</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="227"/>
@@ -235,15 +299,14 @@
         <translation>图形图像</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="241"/>
         <source>Communication</source>
-        <translation>社交沟通</translation>
+        <translation type="vanished">社交沟通</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="807"/>
         <location filename="../widget.ui" line="810"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这是一款deepin-wine5应用，如果你并没有在使用深度系列发行版（比如您在使用ubuntu），你需要自行配置deepin-wine5环境&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {2 ?} {2 ?}</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;这是一款 deepin-wine2 应用，如果你并没有在使用深度系列发行版（比如您在使用ubuntu），你需要自行配置 deepin-wine2 环境&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="813"/>
@@ -258,7 +321,7 @@
     <message>
         <location filename="../widget.ui" line="874"/>
         <source>Contribute translation</source>
-        <translation type="unfinished">贡献翻译</translation>
+        <translation>贡献翻译/应用反馈</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="892"/>
@@ -268,7 +331,7 @@
     <message>
         <location filename="../widget.ui" line="899"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An app store developed by community enthusiasts&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;社区爱好者开发的一款应用商店&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;由社区爱好者开发的一款应用商店&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="938"/>
@@ -291,9 +354,8 @@
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="../widget.ui" line="1153"/>
         <source>Take effect when restart </source>
-        <translation>重启商店后生效</translation>
+        <translation type="vanished">重启商店后生效</translation>
     </message>
     <message>
         <location filename="../widget.ui" line="1182"/>
@@ -360,6 +422,11 @@
         <source>Back to category</source>
         <translation>返回分类</translation>
     </message>
+    <message>
+        <location filename="../widget.ui" line="217"/>
+        <source>Home</source>
+        <translation>商店首页</translation>
+    </message>
     <message>
         <location filename="../widget.ui" line="293"/>
         <source>Reload</source>
@@ -385,135 +452,144 @@
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/uos-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../widget.ui" line="1153"/>
+        <source>Take effect when restart</source>
+        <translation>重启商店后生效</translation>
+    </message>
     <message>
         <location filename="../widget.ui" line="1293"/>
         <source>0B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="146"/>
+        <location filename="../widget.cpp" line="157"/>
         <source>Spark Store</source>
         <translation>Spark 应用商店</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="147"/>
+        <location filename="../widget.cpp" line="158"/>
         <source>Search or enter spk://</source>
         <translation>搜索或打开链接</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="153"/>
+        <location filename="../widget.cpp" line="164"/>
         <source>Submit App</source>
         <translation>投递应用</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="154"/>
+        <location filename="../widget.cpp" line="165"/>
         <source>Settings</source>
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="245"/>
+        <location filename="../widget.cpp" line="264"/>
         <source>Not Exist</source>
         <translation>不存在</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="297"/>
+        <location filename="../widget.cpp" line="113"/>
-        <location filename="../widget.cpp" line="305"/>
+        <location filename="../widget.cpp" line="319"/>
+        <location filename="../widget.cpp" line="323"/>
+        <location filename="../widget.cpp" line="332"/>
+        <location filename="../widget.cpp" line="336"/>
         <source>Spark\ Store</source>
         <translation>星火应用商店</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="480"/>
+        <location filename="../widget.cpp" line="530"/>
         <source>Failed to download app info. Please check internet connection.</source>
-        <translation>下载应用程序详细信息失败，请检查网络连接</translation>
+        <translation>下载应用程序详细信息失败，请检查网络连接。</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="510"/>
+        <location filename="../widget.cpp" line="560"/>
         <source>PkgName: </source>
-        <translation>包名：</translation>
+        <translation>包名： </translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="511"/>
+        <location filename="../widget.cpp" line="561"/>
         <source>Version: </source>
-        <translation>版本：</translation>
+        <translation>版本： </translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="513"/>
+        <location filename="../widget.cpp" line="563"/>
         <source>Author: </source>
-        <translation>作者：</translation>
+        <translation>作者： </translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="517"/>
+        <location filename="../widget.cpp" line="567"/>
         <source>Official Site: </source>
-        <translation>官网：</translation>
+        <translation>官网： </translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="521"/>
+        <location filename="../widget.cpp" line="571"/>
         <source>Contributor: </source>
-        <translation>投稿者：</translation>
+        <translation>投稿者： </translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="522"/>
+        <location filename="../widget.cpp" line="572"/>
         <source>Update Time: </source>
-        <translation>更新时间：</translation>
+        <translation>更新时间： </translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="523"/>
+        <location filename="../widget.cpp" line="573"/>
         <source>Installed Size: </source>
-        <translation>大小：</translation>
+        <translation>大小： </translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="532"/>
+        <location filename="../widget.cpp" line="582"/>
-        <location filename="../widget.cpp" line="645"/>
+        <location filename="../widget.cpp" line="693"/>
+        <location filename="../widget.cpp" line="805"/>
         <source>Reinstall</source>
         <translation>重新安装</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="571"/>
+        <location filename="../widget.cpp" line="621"/>
         <source>Failed to load application icon.</source>
-        <translation>加载应用程序图标失败</translation>
+        <translation>加载应用程序图标失败。</translation>
-    </message>
-    <message>
-        <location filename="../widget.cpp" line="620"/>
-        <source>Failed to get the name to the file to be downloaded.</source>
-        <translation>获取安装包文件名失败</translation>
     </message>
     <message>
         <location filename="../widget.cpp" line="668"/>
+        <source>Failed to get the name to the file to be downloaded.</source>
+        <translation>获取安装包文件名失败。</translation>
+    </message>
+    <message>
+        <location filename="../widget.cpp" line="716"/>
         <source>Spark store could only process spk:// links for now. The search feature is coming soon!</source>
         <translation>目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="789"/>
+        <location filename="../widget.cpp" line="944"/>
         <source>Updating, please wait...</source>
         <translation>正在更新，请稍候……</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="842"/>
+        <location filename="../widget.cpp" line="997"/>
         <source>Apt has reported an error. Please use apt update in terminal to locate the problem.</source>
-        <translation>更新中发生错误，请在终端使用apt update来查看错误原因</translation>
+        <translation>更新中发生错误，请在终端使用apt update来查看错误原因。</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="848"/>
+        <location filename="../widget.cpp" line="1003"/>
         <source>Unknown error!</source>
         <translation>未知错误！</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="1024"/>
+        <location filename="../widget.cpp" line="1185"/>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="1024"/>
+        <location filename="../widget.cpp" line="1185"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="1025"/>
+        <location filename="../widget.cpp" line="1186"/>
         <source>Information for Contributors</source>
         <translation>贡献者须知</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="1026"/>
+        <location filename="../widget.cpp" line="1187"/>
         <source>Currently the translation contribution is limited to English,
 and you will be redirected to our Gitee repository at which you are
 supposed to be creating pull requests to contribute app info
@@ -521,13 +597,13 @@ translations.
 Tips:You can simply click the file to edit to create a flat pull request without create a full pull request
 Tips:You can use github account to login to Gitee
 Click yes to continue.</source>
-        <translation type="unfinished">目前商店仅支持应用程序英文详细信息的贡献。
+        <translation>目前商店仅支持应用程序英文详细信息的贡献。
 在你确认后你会被导向到我们的 Gitee 页面，
 请在此创建 Pull Request 以进行翻译贡献。
 备注：你可以直接在页面编辑以快速创建轻量级pr
 你也可以使用github账户直接登陆Gitee
 
-单击“是”以继续。.</translation>
+单击“是”以继续。</translation>
     </message>
     <message>
         <source>Currently the translation contribution is limited to English,
@@ -549,17 +625,17 @@ Click yes to continue.</source>
         <translation type="vanished">服务器未知错误</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="868"/>
+        <location filename="../widget.cpp" line="1023"/>
         <source>Uninstall succeeded</source>
         <translation>卸载成功</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="882"/>
+        <location filename="../widget.cpp" line="1037"/>
         <source>Temporary cache was cleaned</source>
         <translation>缓存目录已清空</translation>
     </message>
     <message>
-        <location filename="../widget.cpp" line="949"/>
+        <location filename="../widget.cpp" line="1104"/>
         <source>The URL has been copied to the clipboard</source>
         <translation>链接已复制到剪贴板</translation>
     </message>
@@ -643,9 +719,13 @@ Click yes to continue.</source>
     </message>
     <message>
         <location filename="../downloadlist.cpp" line="125"/>
-        <source>Installing...</source>
+        <source>Installing</source>
         <translation>正在安装</translation>
     </message>
+    <message>
+        <source>Installing...</source>
+        <translation type="obsolete">正在安装</translation>
+    </message>
     <message>
         <location filename="../downloadlist.cpp" line="172"/>
         <source>Finish</source>

widget.cpp

@@ -28,7 +28,7 @@
 #include <QClipboard>
 #include <DApplication>
 #include <DGuiApplicationHelper>
-#include <DPushButton>
+#include <QPushButton>
 DWIDGET_USE_NAMESPACE
 
 Widget::Widget(DBlurEffectWidget *parent) :
@@ -42,20 +42,20 @@ Widget::Widget(DBlurEffectWidget *parent) :
     m_loadweb=ui->progressload;
     m_loadweb->show();
 
-    connect(ui->menu_main,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(0);});
+    connect(ui->menu_main,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(0);});
-    connect(ui->menu_network,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(1);});
+    connect(ui->menu_network,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(1);});
-    connect(ui->menu_chat,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(2);});
+    connect(ui->menu_chat,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(2);});
-    connect(ui->menu_music,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(3);});
+    connect(ui->menu_music,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(3);});
-    connect(ui->menu_video,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(4);});
+    connect(ui->menu_video,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(4);});
-    connect(ui->menu_photo,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(5);});
+    connect(ui->menu_photo,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(5);});
-    connect(ui->menu_game,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(6);});
+    connect(ui->menu_game,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(6);});
-    connect(ui->menu_office,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(7);});
+    connect(ui->menu_office,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(7);});
-    connect(ui->menu_read,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(8);});
+    connect(ui->menu_read,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(8);});
-    connect(ui->menu_dev,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(9);});
+    connect(ui->menu_dev,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(9);});
-    connect(ui->menu_system,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(10);});
+    connect(ui->menu_system,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(10);});
-    connect(ui->menu_theme,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(11);});
+    connect(ui->menu_theme,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(11);});
-    connect(ui->menu_other,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(12);});
+    connect(ui->menu_other,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(12);});
-    connect(ui->menu_download,&DPushButton::clicked,[=](){Widget::chooseLeftMenu(13);});
+    connect(ui->menu_download,&QPushButton::clicked,[=](){Widget::chooseLeftMenu(13);});
     // connect((ui->titlebar))
 
     connect(&appinfoLoadThread, SIGNAL(requestResetUi()), this, SLOT(sltAppinfoResetUi()), Qt::ConnectionType::BlockingQueuedConnection);
@@ -73,7 +73,6 @@ Widget::Widget(DBlurEffectWidget *parent) :
             searchApp(searchtext);
         }
         searchEdit->clearEdit();
-
     });
 
     connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType) {
@@ -138,7 +137,6 @@ void Widget::initUI()
 
     label_screen << ui->screen_0 << ui->screen_1 << ui->screen_2 << ui->screen_3 << ui->screen_4;
 
-
     // 初始化分界线
     QGraphicsOpacityEffect *opacityEffect_1=new QGraphicsOpacityEffect;
     opacityEffect_1->setOpacity(0.1);
@@ -171,9 +169,19 @@ void Widget::initUI()
     menu->addAction(setting);
     menu->addAction(actionSubmission);
     titlebar->setMenu(menu);
-    connect(actionSubmission, &QAction::triggered, this,
+    connect(actionSubmission, &QAction::triggered, this, [ = ] () {
-            [=](){QDesktopServices::openUrl(QUrl("https://upload.spark-app.store/"));});
+        QDesktopServices::openUrl(QUrl("https://upload.spark-app.store/"));
-    connect(setting,&QAction::triggered,this,&Widget::opensetting);
+    });
+    connect(setting, &QAction::triggered, this, &Widget::opensetting);
+
+    // 载入自定义字体
+    int loadedFontID = QFontDatabase::addApplicationFont(":/fonts/fonts/华康少女字体.ttf");
+    QStringList loadedFontFamilies = QFontDatabase::applicationFontFamilies(loadedFontID);
+    if(!loadedFontFamilies.isEmpty())
+        font = loadedFontFamilies.at(0);
+    /* 全局字体设置
+     * DApplication::setFont(font);
+     */
 
     // 初始化菜单数组
     left_list[0]=ui->menu_main;
@@ -191,9 +199,7 @@ void Widget::initUI()
     left_list[12]=ui->menu_other;
     left_list[13]=ui->menu_download;
 
-
     ui->label_show->hide();
-
 }
 
 void Widget::initConfig()
@@ -274,7 +280,7 @@ void Widget::setTheme(bool isDark,QColor color)
         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("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"));
         ui->pushButton_refresh->setIcon(QIcon(":/icons/icons/refresh-page-dark.svg"));
@@ -285,7 +291,7 @@ void Widget::setTheme(bool isDark,QColor color)
         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("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"));
         ui->pushButton_refresh->setIcon(QIcon(":/icons/icons/refresh-page.svg"));
@@ -366,16 +372,32 @@ void Widget::updateUI()
         left_list[13]->setIcon(QIcon(":/icons/icons/downloads-symbolic.svg"));
     }
     for (int i=0;i<14;i++) {
-        left_list[i]->setFont(QFont("",11));
+
+        /* 设置左侧菜单字体
+         * QFont temp = font;
+         * temp.setPixelSize(15);
+         * left_list[i]->setFont(temp);
+         */
+
         left_list[i]->setFixedHeight(38);
         if(themeIsDark){
-            left_list[i]->setStyleSheet("color:#FFFFFF;border:0px");
+            // 中文环境菜单文字居中，其他则左对齐
+            if(QLocale::system().name() == "zh_CN")
+                left_list[i]->setStyleSheet("color:#FFFFFF;border:0px;");
+            else
+                left_list[i]->setStyleSheet("color:#FFFFFF;border:0px;text-align:left;padding-left:15px;");
         }else {
-            left_list[i]->setStyleSheet("color:#252525;border:0px");
+            if(QLocale::system().name() == "zh_CN")
+                left_list[i]->setStyleSheet("color:#252525;border:0px;");
+            else
+                left_list[i]->setStyleSheet("color:#252525;border:0px;text-align:left;padding-left:15px;");
         }
     }
 
-    left_list[nowMenu]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
+    if(QLocale::system().name() == "zh_CN")
+        left_list[nowMenu]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px;");
+    else
+        left_list[nowMenu]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px;text-align:left;padding-left:15px;");
     switch (nowMenu) {
     case 0:
         left_list[0]->setIcon(QIcon(":/icons/icons/homepage_dark.svg"));
@@ -428,7 +450,10 @@ void Widget::chooseLeftMenu(int index)
     nowMenu=index;
 
     updateUI();
-    left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
+    if(QLocale::system().name() == "zh_CN")
+        left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px;");
+    else
+        left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px;text-align:left;padding-left:15px;");
     if(index<=12){
         if(themeIsDark){
             QString darkurl=menuUrl[index].toString();
@@ -988,7 +1013,7 @@ void Widget::on_pushButton_uninstall_clicked()
         ui->pushButton_download->setEnabled(false);
         ui->pushButton_uninstall->setEnabled(false);
         QProcess uninstall;
-        uninstall.start("pkexec apt purge -y "+pkgName);
+        uninstall.start("pkexec apt purge -y "+pkgName.toLower());
         uninstall.waitForFinished();
         ui->pushButton_download->setEnabled(true);
         ui->pushButton_download->setText("Install");

widget.h

@@ -13,6 +13,9 @@
 #include <QFutureWatcher>
 #include <QToolButton>
 #include <QTimer>
+
+#include <QFontDatabase>
+
 #include <DSettings>
 #include <DBlurEffectWidget>
 #include <DSpinner>
@@ -104,7 +107,7 @@ public:
     QString appweb;
     bool themeIsDark;
 
-
+    QFont font;
 
 private:
     void initUI();

widget.ui

@@ -64,14 +64,14 @@
       <item row="6" column="0" colspan="6">
        <widget class="QPushButton" name="menu_video">
         <property name="text">
-         <string>Videos</string>
+         <string>Video</string>
         </property>
        </widget>
       </item>
       <item row="16" column="0" colspan="6">
        <widget class="QPushButton" name="menu_download">
         <property name="text">
-         <string>Download List</string>
+         <string>Download</string>
         </property>
        </widget>
       </item>
@@ -197,7 +197,7 @@
       <item row="10" column="0" colspan="6">
        <widget class="QPushButton" name="menu_read">
         <property name="text">
-         <string>Translate</string>
+         <string>Reading</string>
         </property>
        </widget>
       </item>
@@ -211,10 +211,10 @@
       <item row="2" column="0" colspan="6">
        <widget class="QPushButton" name="menu_main">
         <property name="styleSheet">
-         <string notr="true"/>
+         <string notr="true">font: 11pt &quot;Zeniq&quot;;</string>
         </property>
         <property name="text">
-         <string>Home  </string>
+         <string>Home</string>
         </property>
         <property name="flat">
          <bool>false</bool>
@@ -238,7 +238,7 @@
       <item row="4" column="0" colspan="6">
        <widget class="QPushButton" name="menu_chat">
         <property name="text">
-         <string>Communication</string>
+         <string>Chat</string>
         </property>
        </widget>
       </item>
@@ -313,7 +313,7 @@
       <number>0</number>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -457,7 +457,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>903</width>
+            <width>889</width>
             <height>849</height>
            </rect>
           </property>
@@ -952,8 +952,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>869</width>
+                   <width>851</width>
-                   <height>325</height>
+                   <height>326</height>
                   </rect>
                  </property>
                  <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -1082,8 +1082,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>738</width>
+            <width>889</width>
-            <height>896</height>
+            <height>812</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1150,7 +1150,7 @@
                     </size>
                    </property>
                    <property name="text">
-                    <string>Take effect when restart </string>
+                    <string>Take effect when restart</string>
                    </property>
                   </widget>
                  </item>