Delete .pro.user files

Delete useless .pro.user files.

README.md

@@ -9,8 +9,10 @@ web页面部分正在开发当中，详情请见[web仓库](https://gitee.com/de
 当前服务器线路列表（项目中包含）：
 
 ```
-http://dcstore.shenmo.tech/
+http://cdn.jerrywang.top/
+http://sucdn.jerrywang.top/
 http://store.jerrywang.top/
+http://dcstore.shenmo.tech/
 ```
 
 #### 参数
@@ -25,7 +27,7 @@ http://store.jerrywang.top/
 
 可选的web分类：
 
-| 分类名称 | web分类        |
+| 分类名称 | web分类   　    |
 | -------- | -------------- |
 | 网络应用 | network        |
 | 社交沟通 | chat           |
@@ -48,6 +50,25 @@ http://store.jerrywang.top/
 
 线路文件：新版的线路文件被放置于源服务器中，可随时刷新更新源列表
 
+#### 如何编译
+
+Deepin/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 本仓库

downloadlist.cpp

@@ -22,10 +22,23 @@ 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");
+    ssinstall.open(QIODevice::ReadOnly);
+    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);
+    }
+
 }
 
 downloadlist::~downloadlist()
@@ -109,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;
                 }
@@ -170,77 +192,8 @@ void downloadlist::install(int t)
 void downloadlist::on_pushButton_install_clicked()
 {
     //弹出菜单
-//    menu_install->show();
     menu_install->exec(cursor().pos());
 }
-void downloadlist::on_pushButton_maninst_clicked()
-{
-    if(!isInstall)
-    {
-        isInstall = true;
-        ui->pushButton_install->hide();
-        ui->widget_spinner->show();
-        qDebug() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8();
-        ui->label_2->setText("正在安装，请稍候");
-        QtConcurrent::run([=]()
-        {
-            QProcess installer;
-            if(reinstall)
-            {
-                installer.start("pkexec apt reinstall /tmp/spark-store/" + ui->label_filename->text().toUtf8());
-            }
-            else
-            {
-                installer.start("pkexec apt install /tmp/spark-store/" + ui->label_filename->text().toUtf8());
-            }
-            installer.waitForFinished();
-            out = installer.readAllStandardOutput();
-            installer.close();
-            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;
-                }
-                if(everyOut[i].right(14) == "Not authorized")
-                {
-                    notRoot = true;
-                }
-            }
-            QProcess isInstall;
-            isInstall.start("dpkg -s " + pkgName);
-            isInstall.waitForFinished();
-            int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
-            isInstall.close();
-            if(error == 0)
-            {
-                ui->pushButton_install->hide();
-                ui->label_2->setText("安装完成");
-                ui->pushButton_3->show();
-            }
-            else
-            {
-                ui->pushButton_install->show();
-                ui->pushButton_install->setText("重装");
-                ui->label_2->setText("安装出现错误，可重新安装");
-                ui->pushButton_3->show();
-            }
-            if(notRoot)
-            {
-                ui->label_2->setText("安装被终止，可重新安装");
-                ui->pushButton_install->show();
-                ui->pushButton_3->hide();
-            }
-            ui->widget_spinner->hide();
-            downloadlist::isInstall = false;
-        });
-        qDebug() << ui->label_filename->text().toUtf8();
-    }
-}
 
 void downloadlist::on_pushButton_2_clicked()
 {

downloadlist.h

@@ -38,10 +38,11 @@ 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();
-    void on_pushButton_maninst_clicked();
+//    void on_pushButton_maninst_clicked();
     void on_pushButton_2_clicked();
     void on_pushButton_3_clicked();
 

downloadlist.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>776</width>
+    <width>666</width>
     <height>54</height>
    </rect>
   </property>

icons.qrc

@@ -0,0 +1,34 @@
+<RCC>
+    <qresource prefix="/icons">
+        <file>icons/category_chat_dark.svg</file>
+        <file>icons/category_chat.svg</file>
+        <file>icons/category_develop_dark.svg</file>
+        <file>icons/category_develop.svg</file>
+        <file>icons/category_game_dark.svg</file>
+        <file>icons/category_game.svg</file>
+        <file>icons/category_graphic_dark.svg</file>
+        <file>icons/category_graphic.svg</file>
+        <file>icons/category_music_dark.svg</file>
+        <file>icons/category_music.svg</file>
+        <file>icons/category_network_dark.svg</file>
+        <file>icons/category_network.svg</file>
+        <file>icons/category_office_dark.svg</file>
+        <file>icons/category_office.svg</file>
+        <file>icons/category_others_dark.svg</file>
+        <file>icons/category_others.svg</file>
+        <file>icons/category_reading_dark.svg</file>
+        <file>icons/category_reading.svg</file>
+        <file>icons/category_system_dark.svg</file>
+        <file>icons/category_system.svg</file>
+        <file>icons/category_video_dark.svg</file>
+        <file>icons/category_video.svg</file>
+        <file>icons/downloads-symbolic_dark.svg</file>
+        <file>icons/downloads-symbolic.svg</file>
+        <file>icons/theme-symbolic_dark.svg</file>
+        <file>icons/theme-symbolic.svg</file>
+        <file>icons/homepage.svg</file>
+        <file>icons/homepage_dark.svg</file>
+        <file>icons/category_active_dark.svg</file>
+        <file>icons/category_active.svg</file>
+    </qresource>
+</RCC>

icons/category_active.svg

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg22"
+   sodipodi:docname="category_active_16px_l.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata26">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>category_active_16px</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="987"
+     id="namedview24"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-4"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg22" />
+  <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title2">category_active_16px</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     style="fill:#000000;fill-opacity:0.94999999">
+    <g
+       id="category_active_16px"
+       style="fill:#000000;fill-opacity:0.94999999">
+      <rect
+         id="Rectangle-1-Copy-44"
+         fill="#747568"
+         opacity="0"
+         x="0"
+         y="0"
+         width="16"
+         height="16"
+         style="fill:#000000;fill-opacity:0.94999999" />
+      <g
+         id="Group-2"
+         transform="translate(2.000000, 2.000000)"
+         fill="#FFFFFF"
+         style="fill:#000000;fill-opacity:0.94999999">
+        <rect
+           id="Rectangle-94"
+           x="0"
+           y="0"
+           width="2"
+           height="2"
+           style="fill:#000000;fill-opacity:0.94999999" />
+        <rect
+           id="Rectangle-97"
+           x="3"
+           y="0"
+           width="9"
+           height="2"
+           style="fill:#000000;fill-opacity:0.94999999" />
+        <rect
+           id="rect11"
+           x="0"
+           y="5"
+           width="2"
+           height="2"
+           style="fill:#000000;fill-opacity:0.94999999" />
+        <rect
+           id="rect13"
+           x="3"
+           y="5"
+           width="9"
+           height="2"
+           style="fill:#000000;fill-opacity:0.94999999" />
+        <rect
+           id="rect15"
+           x="0"
+           y="10"
+           width="2"
+           height="2"
+           style="fill:#000000;fill-opacity:0.94999999" />
+        <rect
+           id="rect17"
+           x="3"
+           y="10"
+           width="9"
+           height="2"
+           style="fill:#000000;fill-opacity:0.94999999" />
+      </g>
+    </g>
+  </g>
+</svg>

icons/category_active_dark.svg

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg22"
+   sodipodi:docname="category_active_16px.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata26">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="987"
+     id="namedview24"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg22" />
+  <!-- Generator: Sketch 3.6.1 (26313) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title2">category_active_16px</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <defs
+     id="defs6" />
+  <g
+     id="Page-1"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     style="fill:#ffffff;fill-opacity:0.60000002">
+    <g
+       id="category_active_16px"
+       style="fill:#ffffff;fill-opacity:0.60000002">
+      <rect
+         id="Rectangle-1-Copy-44"
+         fill="#747568"
+         opacity="0"
+         x="0"
+         y="0"
+         width="16"
+         height="16"
+         style="fill:#ffffff;fill-opacity:0.60000002" />
+      <g
+         id="Group-2"
+         transform="translate(2.000000, 2.000000)"
+         fill="#FFFFFF"
+         style="fill:#ffffff;fill-opacity:0.60000002">
+        <rect
+           id="Rectangle-94"
+           x="0"
+           y="0"
+           width="2"
+           height="2"
+           style="fill:#ffffff;fill-opacity:0.60000002" />
+        <rect
+           id="Rectangle-97"
+           x="3"
+           y="0"
+           width="9"
+           height="2"
+           style="fill:#ffffff;fill-opacity:0.60000002" />
+        <rect
+           id="rect11"
+           x="0"
+           y="5"
+           width="2"
+           height="2"
+           style="fill:#ffffff;fill-opacity:0.60000002" />
+        <rect
+           id="rect13"
+           x="3"
+           y="5"
+           width="9"
+           height="2"
+           style="fill:#ffffff;fill-opacity:0.60000002" />
+        <rect
+           id="rect15"
+           x="0"
+           y="10"
+           width="2"
+           height="2"
+           style="fill:#ffffff;fill-opacity:0.60000002" />
+        <rect
+           id="rect17"
+           x="3"
+           y="10"
+           width="9"
+           height="2"
+           style="fill:#ffffff;fill-opacity:0.60000002" />
+      </g>
+    </g>
+  </g>
+</svg>

icons/category_chat.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M0.09791679,7.31479943 C0.09791679,3.53173257 3.65198565,0.5 8,0.5 C12.3485596,0.5 15.9020832,3.53150012 15.9020832,7.31479943 C15.9020832,11.0972813 12.3485704,14.127954 8,14.127954 C7.06316558,14.127954 6.1471898,13.9862478 5.28311727,13.7134084 L2.55321759,15.327403 C2.15529088,15.5626687 1.67860204,15.1782665 1.82419813,14.7395213 L2.62951677,12.3127412 C1.03368368,11.0385392 0.09791679,9.24513974 0.09791679,7.31479943 Z M4.7455,6.9148 C4.7455,6.2248 4.1855,5.6648 3.4955,5.6648 C2.8055,5.6648 2.2455,6.2248 2.2455,6.9148 C2.2455,7.6048 2.8055,8.1648 3.4955,8.1648 C4.1855,8.1648 4.7455,7.6048 4.7455,6.9148 Z M9.2504,6.9148 C9.2504,6.2248 8.6904,5.6648 8.0004,5.6648 C7.3104,5.6648 6.7504,6.2248 6.7504,6.9148 C6.7504,7.6048 7.3104,8.1648 8.0004,8.1648 C8.6904,8.1648 9.2504,7.6048 9.2504,6.9148 Z M13.766,6.9148 C13.766,6.2248 13.206,5.6648 12.516,5.6648 C11.826,5.6648 11.266,6.2248 11.266,6.9148 C11.266,7.6048 11.826,8.1648 12.516,8.1648 C13.206,8.1648 13.766,7.6048 13.766,6.9148 Z"/>
+</svg>

icons/category_chat_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M0.09791679,7.31479943 C0.09791679,3.53173257 3.65198565,0.5 8,0.5 C12.3485596,0.5 15.9020832,3.53150012 15.9020832,7.31479943 C15.9020832,11.0972813 12.3485704,14.127954 8,14.127954 C7.06316558,14.127954 6.1471898,13.9862478 5.28311727,13.7134084 L2.55321759,15.327403 C2.15529088,15.5626687 1.67860204,15.1782665 1.82419813,14.7395213 L2.62951677,12.3127412 C1.03368368,11.0385392 0.09791679,9.24513974 0.09791679,7.31479943 Z M4.7455,6.9148 C4.7455,6.2248 4.1855,5.6648 3.4955,5.6648 C2.8055,5.6648 2.2455,6.2248 2.2455,6.9148 C2.2455,7.6048 2.8055,8.1648 3.4955,8.1648 C4.1855,8.1648 4.7455,7.6048 4.7455,6.9148 Z M9.2504,6.9148 C9.2504,6.2248 8.6904,5.6648 8.0004,5.6648 C7.3104,5.6648 6.7504,6.2248 6.7504,6.9148 C6.7504,7.6048 7.3104,8.1648 8.0004,8.1648 C8.6904,8.1648 9.2504,7.6048 9.2504,6.9148 Z M13.766,6.9148 C13.766,6.2248 13.206,5.6648 12.516,5.6648 C11.826,5.6648 11.266,6.2248 11.266,6.9148 C11.266,7.6048 11.826,8.1648 12.516,8.1648 C13.206,8.1648 13.766,7.6048 13.766,6.9148 Z"/>
+</svg>

icons/category_develop.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M3,2 L13,2 C14.1045695,2 15,2.8954305 15,4 L15,12 C15,13.1045695 14.1045695,14 13,14 L3,14 C1.8954305,14 1,13.1045695 1,12 L1,4 C1,2.8954305 1.8954305,2 3,2 Z M3.76776695,5.35355339 L6.03553391,7.62132034 L3.76776695,9.8890873 L4.47487373,10.5961941 L7.44974747,7.62132034 L4.47487373,4.64644661 L3.76776695,5.35355339 Z M5.91666667,12 L11.0833333,12 L11.0833333,11 L5.91666667,11 L5.91666667,12 Z"/>
+</svg>

icons/category_develop_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M3,2 L13,2 C14.1045695,2 15,2.8954305 15,4 L15,12 C15,13.1045695 14.1045695,14 13,14 L3,14 C1.8954305,14 1,13.1045695 1,12 L1,4 C1,2.8954305 1.8954305,2 3,2 Z M3.76776695,5.35355339 L6.03553391,7.62132034 L3.76776695,9.8890873 L4.47487373,10.5961941 L7.44974747,7.62132034 L4.47487373,4.64644661 L3.76776695,5.35355339 Z M5.91666667,12 L11.0833333,12 L11.0833333,11 L5.91666667,11 L5.91666667,12 Z"/>
+</svg>

icons/category_game.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M11.3114315,3 C13.357501,3 15.0067163,5.17017281 15.7133188,8.05794777 C16.4086522,10.8996678 15.9150863,13.3535714 14.0872428,13.3535714 C13.3629901,13.3535714 12.7141246,13.0969142 11.9239825,12.5819693 C11.7832522,12.4902536 11.638281,12.3909224 11.461347,12.2660165 C11.3686071,12.200547 11.0517692,11.9743261 11.0062924,11.9420563 C9.76649639,11.0623107 9.01108239,10.715 8.00430016,10.715 C6.77138366,10.715 5.99921712,11.0762729 4.96661589,11.9397238 C4.93060093,11.9698391 4.48571222,12.3483964 4.35343872,12.4563717 C3.49008067,13.1611339 2.80601727,13.4628505 1.87123269,13.3869162 C0.0836355556,13.241098 -0.391076934,10.7851693 0.309935396,7.98500253 C1.02394135,5.13293317 2.67988585,3 4.7263796,3 C5.07581055,3 5.40379038,3.09122326 5.76942208,3.26509058 C5.87841375,3.31691894 5.98930228,3.37514875 6.12219409,3.44909841 C6.19628024,3.49032478 6.44963239,3.6346061 6.45727206,3.63892075 C7.10277068,4.00347855 7.50182674,4.14857143 8.01851079,4.14857143 C8.51588602,4.14857143 8.90120605,4.00650828 9.55466919,3.63859493 C9.69986269,3.55637602 9.78224829,3.50972827 9.84835639,3.47295723 C9.96412339,3.40856473 10.0609743,3.35696675 10.1556729,3.31001061 C10.567507,3.10580322 10.9247171,3 11.3114315,3 Z M5.07357978,10.107 C6.56572905,10.107 7.78410609,8.9267355 7.78410609,7.46414286 C7.78410609,6.00155021 6.56572905,4.82128571 5.07357978,4.82128571 C3.57990894,4.82128571 2.36305346,6.00089051 2.36305346,7.46414286 C2.36305346,8.9273952 3.57990894,10.107 5.07357978,10.107 Z M5.07357978,9.107 C4.12535588,9.107 3.36305346,8.36803337 3.36305346,7.46414286 C3.36305346,6.56025235 4.12535588,5.82128571 5.07357978,5.82128571 C6.02043115,5.82128571 6.78410609,6.56107184 6.78410609,7.46414286 C6.78410609,8.36721388 6.02043115,9.107 5.07357978,9.107 Z M5.03983241,8.37864286 C5.54751662,8.37864286 5.9601482,7.97792857 5.9601482,7.48935714 C5.9601482,6.99292857 5.54751662,6.59364286 5.03983241,6.59364286 C4.53067452,6.59364286 4.11804294,6.99292857 4.11804294,7.48935714 C4.11804294,7.97792857 4.53067452,8.37864286 5.03983241,8.37864286 Z M9.65408509,8.38564286 C10.1617693,8.38564286 10.5744008,7.9835 10.5744008,7.49135714 C10.5744008,6.99135714 10.1617693,6.58992857 9.65408509,6.58992857 C9.14492719,6.58992857 8.73229557,6.99135714 8.73229557,7.49135714 C8.73229557,7.9835 9.14492719,8.38564286 9.65408509,8.38564286 Z M11.3288535,9.99071429 C11.8365377,9.99071429 12.2491693,9.58928571 12.2491693,9.09214286 C12.2491693,8.59571429 11.8365377,8.19357143 11.3288535,8.19357143 C10.8196956,8.19357143 10.407064,8.59571429 10.407064,9.09214286 C10.407064,9.58928571 10.8196956,9.99071429 11.3288535,9.99071429 Z M11.3281166,6.77357143 C11.8372745,6.77357143 12.2491693,6.37142857 12.2491693,5.87357143 C12.2491693,5.37714286 11.8372745,4.97428571 11.3281166,4.97428571 C10.8174851,4.97428571 10.407064,5.37714286 10.407064,5.87357143 C10.407064,6.37142857 10.8174851,6.77357143 11.3281166,6.77357143 Z M12.9731166,8.38421429 C13.4852219,8.38421429 13.8971166,7.98135714 13.8971166,7.48921429 C13.8971166,6.98992857 13.4852219,6.5885 12.9731166,6.5885 C12.4676429,6.5885 12.0550114,6.98992857 12.0550114,7.48921429 C12.0550114,7.98135714 12.4676429,8.38421429 12.9731166,8.38421429 Z"/>
+</svg>

icons/category_game_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M11.3114315,3 C13.357501,3 15.0067163,5.17017281 15.7133188,8.05794777 C16.4086522,10.8996678 15.9150863,13.3535714 14.0872428,13.3535714 C13.3629901,13.3535714 12.7141246,13.0969142 11.9239825,12.5819693 C11.7832522,12.4902536 11.638281,12.3909224 11.461347,12.2660165 C11.3686071,12.200547 11.0517692,11.9743261 11.0062924,11.9420563 C9.76649639,11.0623107 9.01108239,10.715 8.00430016,10.715 C6.77138366,10.715 5.99921712,11.0762729 4.96661589,11.9397238 C4.93060093,11.9698391 4.48571222,12.3483964 4.35343872,12.4563717 C3.49008067,13.1611339 2.80601727,13.4628505 1.87123269,13.3869162 C0.0836355556,13.241098 -0.391076934,10.7851693 0.309935396,7.98500253 C1.02394135,5.13293317 2.67988585,3 4.7263796,3 C5.07581055,3 5.40379038,3.09122326 5.76942208,3.26509058 C5.87841375,3.31691894 5.98930228,3.37514875 6.12219409,3.44909841 C6.19628024,3.49032478 6.44963239,3.6346061 6.45727206,3.63892075 C7.10277068,4.00347855 7.50182674,4.14857143 8.01851079,4.14857143 C8.51588602,4.14857143 8.90120605,4.00650828 9.55466919,3.63859493 C9.69986269,3.55637602 9.78224829,3.50972827 9.84835639,3.47295723 C9.96412339,3.40856473 10.0609743,3.35696675 10.1556729,3.31001061 C10.567507,3.10580322 10.9247171,3 11.3114315,3 Z M5.07357978,10.107 C6.56572905,10.107 7.78410609,8.9267355 7.78410609,7.46414286 C7.78410609,6.00155021 6.56572905,4.82128571 5.07357978,4.82128571 C3.57990894,4.82128571 2.36305346,6.00089051 2.36305346,7.46414286 C2.36305346,8.9273952 3.57990894,10.107 5.07357978,10.107 Z M5.07357978,9.107 C4.12535588,9.107 3.36305346,8.36803337 3.36305346,7.46414286 C3.36305346,6.56025235 4.12535588,5.82128571 5.07357978,5.82128571 C6.02043115,5.82128571 6.78410609,6.56107184 6.78410609,7.46414286 C6.78410609,8.36721388 6.02043115,9.107 5.07357978,9.107 Z M5.03983241,8.37864286 C5.54751662,8.37864286 5.9601482,7.97792857 5.9601482,7.48935714 C5.9601482,6.99292857 5.54751662,6.59364286 5.03983241,6.59364286 C4.53067452,6.59364286 4.11804294,6.99292857 4.11804294,7.48935714 C4.11804294,7.97792857 4.53067452,8.37864286 5.03983241,8.37864286 Z M9.65408509,8.38564286 C10.1617693,8.38564286 10.5744008,7.9835 10.5744008,7.49135714 C10.5744008,6.99135714 10.1617693,6.58992857 9.65408509,6.58992857 C9.14492719,6.58992857 8.73229557,6.99135714 8.73229557,7.49135714 C8.73229557,7.9835 9.14492719,8.38564286 9.65408509,8.38564286 Z M11.3288535,9.99071429 C11.8365377,9.99071429 12.2491693,9.58928571 12.2491693,9.09214286 C12.2491693,8.59571429 11.8365377,8.19357143 11.3288535,8.19357143 C10.8196956,8.19357143 10.407064,8.59571429 10.407064,9.09214286 C10.407064,9.58928571 10.8196956,9.99071429 11.3288535,9.99071429 Z M11.3281166,6.77357143 C11.8372745,6.77357143 12.2491693,6.37142857 12.2491693,5.87357143 C12.2491693,5.37714286 11.8372745,4.97428571 11.3281166,4.97428571 C10.8174851,4.97428571 10.407064,5.37714286 10.407064,5.87357143 C10.407064,6.37142857 10.8174851,6.77357143 11.3281166,6.77357143 Z M12.9731166,8.38421429 C13.4852219,8.38421429 13.8971166,7.98135714 13.8971166,7.48921429 C13.8971166,6.98992857 13.4852219,6.5885 12.9731166,6.5885 C12.4676429,6.5885 12.0550114,6.98992857 12.0550114,7.48921429 C12.0550114,7.98135714 12.4676429,8.38421429 12.9731166,8.38421429 Z"/>
+</svg>

icons/category_graphic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M13,2 C14.1045695,2 15,2.8954305 15,4 L15,12 C15,13.1045695 14.1045695,14 13,14 L3,14 C1.8954305,14 1,13.1045695 1,12 L1,4 C1,2.8954305 1.8954305,2 3,2 L13,2 Z M9.38816736,7.22265239 L7.95626236,10.0443009 C7.82854357,10.2959779 7.59618367,10.3016397 7.44581474,10.0701011 L6.5212474,8.6464491 C6.2918509,8.42797452 5.91137533,8.45796439 5.72281255,8.70938339 L3.09783322,12.2093834 C2.84963451,12.5403176 3.0980227,13 3.52503993,13 L12.9749655,13 C13.3830419,13 13.6350993,12.5760169 13.4251458,12.2427546 L10.2751706,7.24275461 C10.0768804,6.92800582 9.60195261,6.91724249 9.38816736,7.22265239 Z M4.5,4 C3.67157288,4 3,4.67157288 3,5.5 C3,6.32842712 3.67157288,7 4.5,7 C5.32842712,7 6,6.32842712 6,5.5 C6,4.67157288 5.32842712,4 4.5,4 Z"/>
+</svg>

icons/category_graphic_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M13,2 C14.1045695,2 15,2.8954305 15,4 L15,12 C15,13.1045695 14.1045695,14 13,14 L3,14 C1.8954305,14 1,13.1045695 1,12 L1,4 C1,2.8954305 1.8954305,2 3,2 L13,2 Z M9.38816736,7.22265239 L7.95626236,10.0443009 C7.82854357,10.2959779 7.59618367,10.3016397 7.44581474,10.0701011 L6.5212474,8.6464491 C6.2918509,8.42797452 5.91137533,8.45796439 5.72281255,8.70938339 L3.09783322,12.2093834 C2.84963451,12.5403176 3.0980227,13 3.52503993,13 L12.9749655,13 C13.3830419,13 13.6350993,12.5760169 13.4251458,12.2427546 L10.2751706,7.24275461 C10.0768804,6.92800582 9.60195261,6.91724249 9.38816736,7.22265239 Z M4.5,4 C3.67157288,4 3,4.67157288 3,5.5 C3,6.32842712 3.67157288,7 4.5,7 C5.32842712,7 6,6.32842712 6,5.5 C6,4.67157288 5.32842712,4 4.5,4 Z"/>
+</svg>

icons/category_music.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M13.9529472,2.53458892 C13.9842218,2.67532449 14,2.81906015 14,2.9632288 L14,11.5 C14,12.6045695 13.1045695,13.5 12,13.5 C10.8954305,13.5 10,12.6045695 10,11.5 C10,10.3954305 10.8954305,9.5 12,9.5 C12.364732,9.5 12.7066608,9.5976323 13.0010775,9.76818814 L13,3.81473429 C13,3.45097522 12.705115,3.15609023 12.3413559,3.15609023 C12.2949677,3.15609023 12.2487093,3.16099086 12.2033508,3.17071053 L6.52063898,4.38843451 C6.21695744,4.45350912 6,4.7218827 6,5.03245826 L6,13.5 C6,14.6045695 5.1045695,15.5 4,15.5 C2.8954305,15.5 2,14.6045695 2,13.5 C2,12.3954305 2.8954305,11.5 4,11.5 C4.364732,11.5 4.70666076,11.5976323 5.0010775,11.7681881 L5,4.08503671 C5,3.15891996 5.64322914,2.35706019 6.54729233,2.15615726 L11.5954279,1.03434935 C12.6607186,0.797618084 13.716216,1.46929822 13.9529472,2.53458892 Z"/>
+</svg>

icons/category_music_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M13.9529472,2.53458892 C13.9842218,2.67532449 14,2.81906015 14,2.9632288 L14,11.5 C14,12.6045695 13.1045695,13.5 12,13.5 C10.8954305,13.5 10,12.6045695 10,11.5 C10,10.3954305 10.8954305,9.5 12,9.5 C12.364732,9.5 12.7066608,9.5976323 13.0010775,9.76818814 L13,3.81473429 C13,3.45097522 12.705115,3.15609023 12.3413559,3.15609023 C12.2949677,3.15609023 12.2487093,3.16099086 12.2033508,3.17071053 L6.52063898,4.38843451 C6.21695744,4.45350912 6,4.7218827 6,5.03245826 L6,13.5 C6,14.6045695 5.1045695,15.5 4,15.5 C2.8954305,15.5 2,14.6045695 2,13.5 C2,12.3954305 2.8954305,11.5 4,11.5 C4.364732,11.5 4.70666076,11.5976323 5.0010775,11.7681881 L5,4.08503671 C5,3.15891996 5.64322914,2.35706019 6.54729233,2.15615726 L11.5954279,1.03434935 C12.6607186,0.797618084 13.716216,1.46929822 13.9529472,2.53458892 Z"/>
+</svg>

icons/category_network.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M7.99960993,0.9998 C11.8598496,0.9998 15,4.13995046 15,7.99940993 C15,11.8596496 11.8598496,14.9998 7.99960993,14.9998 C4.14015046,14.9998 1,11.8596496 1,7.99940993 C1,4.13995046 4.14015046,0.9998 7.99960993,0.9998 Z M8.86971986,11.9145 C8.56971986,12.747 8.22071986,13.122 7.99971986,13.122 C7.78521986,13.122 7.44971986,12.768 7.15571986,11.9845 C6.86571986,12.132 6.61521986,12.2485 6.36971986,12.354 C6.75321986,13.3495 7.29871986,14 7.99971986,14 C8.71921986,14 9.27521986,13.314 9.66021986,12.274 C9.41771986,12.1735 9.16171986,12.0585 8.86971986,11.9145 Z M12.0962199,3.61 C10.8027199,3.61 9.05121986,4.5085 7.94421986,5.19 C6.85371986,4.547 5.16021986,3.717 3.90321986,3.717 C3.19571986,3.717 2.85321986,4 2.69121986,4.238 C2.46021986,4.576 2.34571986,5.1655 2.90071986,6.1455 C2.82221986,6.286 2.77771986,6.448 2.77771986,6.6205 C2.77771986,7.154 3.20271986,7.5865 3.72621986,7.5865 C4.24971986,7.5865 4.67471986,7.154 4.67471986,6.6205 C4.67471986,6.087 4.25021986,5.6545 3.72621986,5.6545 L3.72621986,5.6545 L3.62121986,5.6605 C3.32971986,5.131 3.33321986,4.8355 3.39871986,4.7395 C3.46021986,4.6485 3.64921986,4.595 3.90321986,4.595 C4.30121986,4.595 4.82071986,4.7155 5.41071986,4.9325 C5.98671986,5.145 6.57721986,5.43 7.11871986,5.728 C5.99421986,6.502 5.13171986,7.25 4.36621986,8.027 C4.02471986,8.379 3.68871986,8.7615 3.39771986,9.1515 C2.30221986,10.6215 2.40671986,11.433 2.68771986,11.8555 C3.25671986,12.71 4.68721986,12.3665 5.64571986,12.014 C7.99371986,11.151 11.0597199,8.9165 12.6017199,6.848 C13.6972199,5.3785 13.5927199,4.567 13.3117199,4.1445 C13.1492199,3.9005 12.8067199,3.61 12.0962199,3.61 Z M12.2647199,8.445 C11.7407199,8.445 11.3162199,8.8775 11.3162199,9.411 C11.3162199,9.9445 11.7407199,10.377 12.2647199,10.377 L12.3937199,10.368 C12.6702199,10.88 12.6657199,11.167 12.6012199,11.2615 C12.5392199,11.352 12.3507199,11.4055 12.0967199,11.4055 C11.2957199,11.4055 10.1802199,10.933 9.46171986,10.5765 C9.22171986,10.7475 8.92321986,10.9505 8.63221986,11.136 C9.59521986,11.6545 11.0112199,12.2835 12.0967199,12.2835 C12.8042199,12.2835 13.1467199,12.0005 13.3087199,11.7625 C13.5392199,11.4255 13.6537199,10.8375 13.1032199,9.8625 C13.1737199,9.7275 13.2132199,9.574 13.2132199,9.411 C13.2132199,8.8775 12.7887199,8.445 12.2647199,8.445 Z M12.0962199,4.4875 C12.3517199,4.4875 12.5347199,4.542 12.5977199,4.6365 C12.6907199,4.776 12.6677199,5.3075 11.9147199,6.317 C10.9462199,7.6165 9.40121986,8.8925 8.04671986,9.7805 C6.94321986,10.504 5.07821986,11.5125 3.90321986,11.5125 C3.64771986,11.5125 3.46471986,11.458 3.40171986,11.3635 C3.21521986,11.083 3.61221986,10.04 5.02121986,8.601 C5.54371986,9.0665 6.10721986,9.5115 6.67921986,9.917 L6.67921986,9.917 C6.98671986,9.7555 7.25071986,9.597 7.51171986,9.4315 C6.82921986,8.9695 6.18871986,8.4705 5.65121986,7.995 C6.36621986,7.3465 7.16221986,6.738 7.95271986,6.2195 C8.64121986,6.6515 9.30521986,7.133 9.90271986,7.625 C10.1212199,7.429 10.3347199,7.226 10.5382199,7.0195 C9.99971986,6.5705 9.40971986,6.1295 8.77721986,5.711 C9.63321986,5.217 11.1197199,4.4875 12.0962199,4.4875 Z M7.99971986,2 C7.28021986,2 6.72421986,2.686 6.33921986,3.726 C6.58321986,3.827 6.83971986,3.9425 7.12971986,4.0855 C7.42971986,3.253 7.77871986,2.878 7.99971986,2.878 C8.21471986,2.878 8.54971986,3.232 8.84371986,4.0155 C9.13071986,3.8695 9.38371986,3.7515 9.62971986,3.646 C9.24671986,2.6505 8.70071986,2 7.99971986,2 Z"/>
+</svg>

icons/category_network_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M7.99960993,0.9998 C11.8598496,0.9998 15,4.13995046 15,7.99940993 C15,11.8596496 11.8598496,14.9998 7.99960993,14.9998 C4.14015046,14.9998 1,11.8596496 1,7.99940993 C1,4.13995046 4.14015046,0.9998 7.99960993,0.9998 Z M8.86971986,11.9145 C8.56971986,12.747 8.22071986,13.122 7.99971986,13.122 C7.78521986,13.122 7.44971986,12.768 7.15571986,11.9845 C6.86571986,12.132 6.61521986,12.2485 6.36971986,12.354 C6.75321986,13.3495 7.29871986,14 7.99971986,14 C8.71921986,14 9.27521986,13.314 9.66021986,12.274 C9.41771986,12.1735 9.16171986,12.0585 8.86971986,11.9145 Z M12.0962199,3.61 C10.8027199,3.61 9.05121986,4.5085 7.94421986,5.19 C6.85371986,4.547 5.16021986,3.717 3.90321986,3.717 C3.19571986,3.717 2.85321986,4 2.69121986,4.238 C2.46021986,4.576 2.34571986,5.1655 2.90071986,6.1455 C2.82221986,6.286 2.77771986,6.448 2.77771986,6.6205 C2.77771986,7.154 3.20271986,7.5865 3.72621986,7.5865 C4.24971986,7.5865 4.67471986,7.154 4.67471986,6.6205 C4.67471986,6.087 4.25021986,5.6545 3.72621986,5.6545 L3.72621986,5.6545 L3.62121986,5.6605 C3.32971986,5.131 3.33321986,4.8355 3.39871986,4.7395 C3.46021986,4.6485 3.64921986,4.595 3.90321986,4.595 C4.30121986,4.595 4.82071986,4.7155 5.41071986,4.9325 C5.98671986,5.145 6.57721986,5.43 7.11871986,5.728 C5.99421986,6.502 5.13171986,7.25 4.36621986,8.027 C4.02471986,8.379 3.68871986,8.7615 3.39771986,9.1515 C2.30221986,10.6215 2.40671986,11.433 2.68771986,11.8555 C3.25671986,12.71 4.68721986,12.3665 5.64571986,12.014 C7.99371986,11.151 11.0597199,8.9165 12.6017199,6.848 C13.6972199,5.3785 13.5927199,4.567 13.3117199,4.1445 C13.1492199,3.9005 12.8067199,3.61 12.0962199,3.61 Z M12.2647199,8.445 C11.7407199,8.445 11.3162199,8.8775 11.3162199,9.411 C11.3162199,9.9445 11.7407199,10.377 12.2647199,10.377 L12.3937199,10.368 C12.6702199,10.88 12.6657199,11.167 12.6012199,11.2615 C12.5392199,11.352 12.3507199,11.4055 12.0967199,11.4055 C11.2957199,11.4055 10.1802199,10.933 9.46171986,10.5765 C9.22171986,10.7475 8.92321986,10.9505 8.63221986,11.136 C9.59521986,11.6545 11.0112199,12.2835 12.0967199,12.2835 C12.8042199,12.2835 13.1467199,12.0005 13.3087199,11.7625 C13.5392199,11.4255 13.6537199,10.8375 13.1032199,9.8625 C13.1737199,9.7275 13.2132199,9.574 13.2132199,9.411 C13.2132199,8.8775 12.7887199,8.445 12.2647199,8.445 Z M12.0962199,4.4875 C12.3517199,4.4875 12.5347199,4.542 12.5977199,4.6365 C12.6907199,4.776 12.6677199,5.3075 11.9147199,6.317 C10.9462199,7.6165 9.40121986,8.8925 8.04671986,9.7805 C6.94321986,10.504 5.07821986,11.5125 3.90321986,11.5125 C3.64771986,11.5125 3.46471986,11.458 3.40171986,11.3635 C3.21521986,11.083 3.61221986,10.04 5.02121986,8.601 C5.54371986,9.0665 6.10721986,9.5115 6.67921986,9.917 L6.67921986,9.917 C6.98671986,9.7555 7.25071986,9.597 7.51171986,9.4315 C6.82921986,8.9695 6.18871986,8.4705 5.65121986,7.995 C6.36621986,7.3465 7.16221986,6.738 7.95271986,6.2195 C8.64121986,6.6515 9.30521986,7.133 9.90271986,7.625 C10.1212199,7.429 10.3347199,7.226 10.5382199,7.0195 C9.99971986,6.5705 9.40971986,6.1295 8.77721986,5.711 C9.63321986,5.217 11.1197199,4.4875 12.0962199,4.4875 Z M7.99971986,2 C7.28021986,2 6.72421986,2.686 6.33921986,3.726 C6.58321986,3.827 6.83971986,3.9425 7.12971986,4.0855 C7.42971986,3.253 7.77871986,2.878 7.99971986,2.878 C8.21471986,2.878 8.54971986,3.232 8.84371986,4.0155 C9.13071986,3.8695 9.38371986,3.7515 9.62971986,3.646 C9.24671986,2.6505 8.70071986,2 7.99971986,2 Z"/>
+</svg>

icons/category_office.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M14.6796875,1 C15.1667188,1 15.5,1.316 15.5,1.66666667 L15.5,2.33333333 C15.5,2.684 15.1667188,3 14.6796875,3 L14,3 L14,9.0952381 C14,10.147209 13.1045695,11 12,11 L10.223,11 L12.2674534,13.0443466 C12.4627155,13.2396088 12.4627155,13.5561912 12.2674534,13.7514534 C12.0721912,13.9467155 11.7556088,13.9467155 11.5603466,13.7514534 L8.9995,11.1905 L9,14.5 C9,14.7761424 8.77614237,15 8.5,15 C8.24358208,15 8.03224642,14.8069799 8.00336387,14.5583106 L8,14.5 L7.9995,11.191 L5.43965339,13.7514534 C5.25941141,13.9316954 4.97579588,13.9455601 4.77965028,13.7930477 L4.73254661,13.7514534 C4.55230463,13.5712114 4.53843986,13.2875959 4.69095231,13.0914503 L4.73254661,13.0443466 L6.776,11 L4,11 C2.8954305,11 2,10.147209 2,9.0952381 L2,3 L1.3203125,3 C0.83328125,3 0.5,2.684 0.5,2.33333333 L0.5,1.66666667 C0.5,1.316 0.83328125,1 1.3203125,1 L14.6796875,1 Z M13,3 L3,3 L3,9.05882353 C3,9.57862094 3.44771525,10 4,10 L12,10 C12.5522847,10 13,9.57862094 13,9.05882353 L13,3 Z M8,4.5 L8,6.5 L10,6.5 C10,7.6045695 9.1045695,8.5 8,8.5 C6.8954305,8.5 6,7.6045695 6,6.5 C6,5.3954305 6.8954305,4.5 8,4.5 Z M9,3.5 C10.1045695,3.5 11,4.3954305 11,5.5 L9,5.5 L9,3.5 Z"/>
+</svg>

icons/category_office_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M14.6796875,1 C15.1667188,1 15.5,1.316 15.5,1.66666667 L15.5,2.33333333 C15.5,2.684 15.1667188,3 14.6796875,3 L14,3 L14,9.0952381 C14,10.147209 13.1045695,11 12,11 L10.223,11 L12.2674534,13.0443466 C12.4627155,13.2396088 12.4627155,13.5561912 12.2674534,13.7514534 C12.0721912,13.9467155 11.7556088,13.9467155 11.5603466,13.7514534 L8.9995,11.1905 L9,14.5 C9,14.7761424 8.77614237,15 8.5,15 C8.24358208,15 8.03224642,14.8069799 8.00336387,14.5583106 L8,14.5 L7.9995,11.191 L5.43965339,13.7514534 C5.25941141,13.9316954 4.97579588,13.9455601 4.77965028,13.7930477 L4.73254661,13.7514534 C4.55230463,13.5712114 4.53843986,13.2875959 4.69095231,13.0914503 L4.73254661,13.0443466 L6.776,11 L4,11 C2.8954305,11 2,10.147209 2,9.0952381 L2,3 L1.3203125,3 C0.83328125,3 0.5,2.684 0.5,2.33333333 L0.5,1.66666667 C0.5,1.316 0.83328125,1 1.3203125,1 L14.6796875,1 Z M13,3 L3,3 L3,9.05882353 C3,9.57862094 3.44771525,10 4,10 L12,10 C12.5522847,10 13,9.57862094 13,9.05882353 L13,3 Z M8,4.5 L8,6.5 L10,6.5 C10,7.6045695 9.1045695,8.5 8,8.5 C6.8954305,8.5 6,7.6045695 6,6.5 C6,5.3954305 6.8954305,4.5 8,4.5 Z M9,3.5 C10.1045695,3.5 11,4.3954305 11,5.5 L9,5.5 L9,3.5 Z"/>
+</svg>

icons/category_others.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M8.00031808,0.99950155 C11.8603458,0.99950155 14.9999738,4.1390565 14.9999738,7.99950155 C14.9999738,11.8599466 11.8603458,14.9995015 8.00031808,14.9995015 C4.13971544,14.9995015 0.999973754,11.8600603 0.999973754,7.99950155 C0.999973754,4.13894278 4.13971544,0.99950155 8.00031808,0.99950155 Z M11.4999738,8.99950155 C12.0526404,8.99950155 12.4999738,8.55150155 12.4999738,7.99950155 C12.4999738,7.44683488 12.0526404,6.99950155 11.4999738,6.99950155 C10.9473071,6.99950155 10.4999738,7.44683488 10.4999738,7.99950155 C10.4999738,8.55150155 10.9473071,8.99950155 11.4999738,8.99950155 Z M7.99997375,8.99950155 C8.55264042,8.99950155 8.99997375,8.55150155 8.99997375,7.99950155 C8.99997375,7.44683488 8.55264042,6.99950155 7.99997375,6.99950155 C7.44797375,6.99950155 6.99997375,7.44683488 6.99997375,7.99950155 C6.99997375,8.55150155 7.44797375,8.99950155 7.99997375,8.99950155 Z M4.49997375,8.99950155 C5.05264042,8.99950155 5.49997375,8.55150155 5.49997375,7.99950155 C5.49997375,7.44683488 5.05264042,6.99950155 4.49997375,6.99950155 C3.94797375,6.99950155 3.49997375,7.44683488 3.49997375,7.99950155 C3.49997375,8.55150155 3.94797375,8.99950155 4.49997375,8.99950155 Z"/>
+</svg>

icons/category_others_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M8.00031808,0.99950155 C11.8603458,0.99950155 14.9999738,4.1390565 14.9999738,7.99950155 C14.9999738,11.8599466 11.8603458,14.9995015 8.00031808,14.9995015 C4.13971544,14.9995015 0.999973754,11.8600603 0.999973754,7.99950155 C0.999973754,4.13894278 4.13971544,0.99950155 8.00031808,0.99950155 Z M11.4999738,8.99950155 C12.0526404,8.99950155 12.4999738,8.55150155 12.4999738,7.99950155 C12.4999738,7.44683488 12.0526404,6.99950155 11.4999738,6.99950155 C10.9473071,6.99950155 10.4999738,7.44683488 10.4999738,7.99950155 C10.4999738,8.55150155 10.9473071,8.99950155 11.4999738,8.99950155 Z M7.99997375,8.99950155 C8.55264042,8.99950155 8.99997375,8.55150155 8.99997375,7.99950155 C8.99997375,7.44683488 8.55264042,6.99950155 7.99997375,6.99950155 C7.44797375,6.99950155 6.99997375,7.44683488 6.99997375,7.99950155 C6.99997375,8.55150155 7.44797375,8.99950155 7.99997375,8.99950155 Z M4.49997375,8.99950155 C5.05264042,8.99950155 5.49997375,8.55150155 5.49997375,7.99950155 C5.49997375,7.44683488 5.05264042,6.99950155 4.49997375,6.99950155 C3.94797375,6.99950155 3.49997375,7.44683488 3.49997375,7.99950155 C3.49997375,8.55150155 3.94797375,8.99950155 4.49997375,8.99950155 Z"/>
+</svg>

icons/category_reading.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#000" d="M1.85789238,2.64258737 C4.86313703,2.21112969 6.5771729,2.75883866 7,4.28571429 L7,13.7857143 C6.27058294,12.8374721 4.43450345,12.3388115 1.49176152,12.2897326 C1.2188519,12.2852804 1,12.062748 1,11.7898021 L1,3.63241367 C1.00002467,3.13504017 1.36556687,2.71326968 1.85789238,2.64258737 Z"/>
+    <path fill="#000" d="M9.85789238,2.64258737 C12.863137,2.21112969 14.5771729,2.75883866 15,4.28571429 L15,13.7857143 C14.2705829,12.8374721 12.4345034,12.3388115 9.49176152,12.2897326 C9.2188519,12.2852804 9,12.062748 9,11.7898021 L9,3.63241367 C9.00002467,3.13504017 9.36556687,2.71326968 9.85789238,2.64258737 Z" transform="matrix(-1 0 0 1 24 0)"/>
+  </g>
+</svg>

icons/category_reading_dark.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-opacity=".6" fill-rule="evenodd">
+    <path fill="#FFF" d="M1.85789238,2.64258737 C4.86313703,2.21112969 6.5771729,2.75883866 7,4.28571429 L7,13.7857143 C6.27058294,12.8374721 4.43450345,12.3388115 1.49176152,12.2897326 C1.2188519,12.2852804 1,12.062748 1,11.7898021 L1,3.63241367 C1.00002467,3.13504017 1.36556687,2.71326968 1.85789238,2.64258737 Z"/>
+    <path fill="#FFF" d="M9.85789238,2.64258737 C12.863137,2.21112969 14.5771729,2.75883866 15,4.28571429 L15,13.7857143 C14.2705829,12.8374721 12.4345034,12.3388115 9.49176152,12.2897326 C9.2188519,12.2852804 9,12.062748 9,11.7898021 L9,3.63241367 C9.00002467,3.13504017 9.36556687,2.71326968 9.85789238,2.64258737 Z" transform="matrix(-1 0 0 1 24 0)"/>
+  </g>
+</svg>

icons/category_system.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M3,14 C1.8954305,14 1,13.1045695 1,12 L1,4 C1,2.8954305 1.8954305,2 3,2 L13,2 C14.1045695,2 15,2.8954305 15,4 L15,12 C15,13.0543618 14.1841222,13.9181651 13.1492623,13.9945143 L13,14 L13,14 L3,14 Z M14,5 L2,5 L2,12 C2,12.5522847 2.44771525,13 3,13 L8.01233301,13.0001639 C8.01943442,12.9772458 8.02824971,12.9546419 8.0388094,12.9325301 L8.30383017,12.3775926 C8.34459502,12.2912196 8.34695846,12.1917404 8.30983658,12.1028011 C8.27399122,12.0159757 8.20318605,11.9486684 8.11444707,11.9170901 L7.53244707,11.7100901 C7.33313205,11.6391997 7.19999981,11.4505463 7.19999981,11.2389998 L7.19999981,10.1609998 C7.19999981,9.9491733 7.33347927,9.7603339 7.53316619,9.6896543 L8.11249002,9.4846101 C8.20258302,9.4521442 8.27390085,9.3842428 8.31058669,9.2953916 C8.34695846,9.2082592 8.34459502,9.10878 8.3048094,9.0244696 L8.0388094,8.46746956 C7.94749917,8.2762673 7.98662009,8.04827275 8.13644642,7.89844642 L8.89844642,7.13644642 C9.04827275,6.98662009 9.2762673,6.94749917 9.46746956,7.0388094 L10.022407,7.30383017 C10.10878,7.34459502 10.2082592,7.34695846 10.2971985,7.30983658 C10.3842159,7.27391194 10.4518724,7.202745 10.4837447,7.11391109 L10.6897447,6.53291109 C10.7604992,6.33335606 10.9492726,6.19999981 11.1609998,6.19999981 L12.2389998,6.19999981 C12.450727,6.19999981 12.6395004,6.33335606 12.7102549,6.53291109 L12.9156316,7.11216331 C12.9481272,7.202745 13.0157837,7.27391194 13.104608,7.31058669 C13.1917404,7.34695846 13.2912196,7.34459502 13.3755301,7.3048094 L13.9325301,7.0388094 L14,7.013 L14,5 Z M11.6999998,9.1999998 C10.8729998,9.1999998 10.1999998,9.8729998 10.1999998,10.6999998 C10.1999998,11.5269998 10.8729998,12.1999998 11.6999998,12.1999998 C12.5269998,12.1999998 13.1999998,11.5269998 13.1999998,10.6999998 C13.1999998,9.8729998 12.5269998,9.1999998 11.6999998,9.1999998 Z M13,3 L12,3 L12,4 L13,4 L13,3 Z M9,3 L8,3 L8,4 L9,4 L9,3 Z M11,3 L10,3 L10,4 L11,4 L11,3 Z"/>
+</svg>

icons/category_system_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M3,14 C1.8954305,14 1,13.1045695 1,12 L1,4 C1,2.8954305 1.8954305,2 3,2 L13,2 C14.1045695,2 15,2.8954305 15,4 L15,12 C15,13.0543618 14.1841222,13.9181651 13.1492623,13.9945143 L13,14 L13,14 L3,14 Z M14,5 L2,5 L2,12 C2,12.5522847 2.44771525,13 3,13 L8.01233301,13.0001639 C8.01943442,12.9772458 8.02824971,12.9546419 8.0388094,12.9325301 L8.30383017,12.3775926 C8.34459502,12.2912196 8.34695846,12.1917404 8.30983658,12.1028011 C8.27399122,12.0159757 8.20318605,11.9486684 8.11444707,11.9170901 L7.53244707,11.7100901 C7.33313205,11.6391997 7.19999981,11.4505463 7.19999981,11.2389998 L7.19999981,10.1609998 C7.19999981,9.9491733 7.33347927,9.7603339 7.53316619,9.6896543 L8.11249002,9.4846101 C8.20258302,9.4521442 8.27390085,9.3842428 8.31058669,9.2953916 C8.34695846,9.2082592 8.34459502,9.10878 8.3048094,9.0244696 L8.0388094,8.46746956 C7.94749917,8.2762673 7.98662009,8.04827275 8.13644642,7.89844642 L8.89844642,7.13644642 C9.04827275,6.98662009 9.2762673,6.94749917 9.46746956,7.0388094 L10.022407,7.30383017 C10.10878,7.34459502 10.2082592,7.34695846 10.2971985,7.30983658 C10.3842159,7.27391194 10.4518724,7.202745 10.4837447,7.11391109 L10.6897447,6.53291109 C10.7604992,6.33335606 10.9492726,6.19999981 11.1609998,6.19999981 L12.2389998,6.19999981 C12.450727,6.19999981 12.6395004,6.33335606 12.7102549,6.53291109 L12.9156316,7.11216331 C12.9481272,7.202745 13.0157837,7.27391194 13.104608,7.31058669 C13.1917404,7.34695846 13.2912196,7.34459502 13.3755301,7.3048094 L13.9325301,7.0388094 L14,7.013 L14,5 Z M11.6999998,9.1999998 C10.8729998,9.1999998 10.1999998,9.8729998 10.1999998,10.6999998 C10.1999998,11.5269998 10.8729998,12.1999998 11.6999998,12.1999998 C12.5269998,12.1999998 13.1999998,11.5269998 13.1999998,10.6999998 C13.1999998,9.8729998 12.5269998,9.1999998 11.6999998,9.1999998 Z M13,3 L12,3 L12,4 L13,4 L13,3 Z M9,3 L8,3 L8,4 L9,4 L9,3 Z M11,3 L10,3 L10,4 L11,4 L11,3 Z"/>
+</svg>

icons/category_video.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M12,2 C13.1045695,2 14,2.8954305 14,4 L14,13 C14,14.1045695 13.1045695,15 12,15 L4,15 C2.8954305,15 2,14.1045695 2,13 L2,4 C2,2.8954305 2.8954305,2 4,2 L12,2 Z M4.5,12 L3.5,12 C3.22385763,12 3,12.2238576 3,12.5 L3,12.5 L3,13 C3,13.5522847 3.44771525,14 4,14 L4,14 L4.5,14 C4.77614237,14 5,13.7761424 5,13.5 L5,13.5 L5,12.5 C5,12.2238576 4.77614237,12 4.5,12 L4.5,12 Z M12.5,12 L11.5,12 C11.2238576,12 11,12.2238576 11,12.5 L11,12.5 L11,13.5 C11,13.7761424 11.2238576,14 11.5,14 L11.5,14 L12,14 C12.5522847,14 13,13.5522847 13,13 L13,13 L13,12.5 C13,12.2238576 12.7761424,12 12.5,12 L12.5,12 Z M4.5,9 L3.5,9 C3.22385763,9 3,9.22385763 3,9.5 L3,9.5 L3,10.5 C3,10.7761424 3.22385763,11 3.5,11 L3.5,11 L4.5,11 C4.77614237,11 5,10.7761424 5,10.5 L5,10.5 L5,9.5 C5,9.22385763 4.77614237,9 4.5,9 L4.5,9 Z M12.5,9 L11.5,9 C11.2238576,9 11,9.22385763 11,9.5 L11,9.5 L11,10.5 C11,10.7761424 11.2238576,11 11.5,11 L11.5,11 L12.5,11 C12.7761424,11 13,10.7761424 13,10.5 L13,10.5 L13,9.5 C13,9.22385763 12.7761424,9 12.5,9 L12.5,9 Z M4.5,6 L3.5,6 C3.22385763,6 3,6.22385763 3,6.5 L3,6.5 L3,7.5 C3,7.77614237 3.22385763,8 3.5,8 L3.5,8 L4.5,8 C4.77614237,8 5,7.77614237 5,7.5 L5,7.5 L5,6.5 C5,6.22385763 4.77614237,6 4.5,6 L4.5,6 Z M12.5,6 L11.5,6 C11.2238576,6 11,6.22385763 11,6.5 L11,6.5 L11,7.5 C11,7.77614237 11.2238576,8 11.5,8 L11.5,8 L12.5,8 C12.7761424,8 13,7.77614237 13,7.5 L13,7.5 L13,6.5 C13,6.22385763 12.7761424,6 12.5,6 L12.5,6 Z M4.5,3 L4,3 C3.44771525,3 3,3.44771525 3,4 L3,4 L3,4.5 C3,4.77614237 3.22385763,5 3.5,5 L3.5,5 L4.5,5 C4.77614237,5 5,4.77614237 5,4.5 L5,4.5 L5,3.5 C5,3.22385763 4.77614237,3 4.5,3 L4.5,3 Z M12,3 L11.5,3 C11.2238576,3 11,3.22385763 11,3.5 L11,3.5 L11,4.5 C11,4.77614237 11.2238576,5 11.5,5 L11.5,5 L12.5,5 C12.7761424,5 13,4.77614237 13,4.5 L13,4.5 L13,4 C13,3.44771525 12.5522847,3 12,3 L12,3 Z"/>
+</svg>

icons/category_video_dark.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#FFF" fill-opacity=".6" fill-rule="evenodd" d="M12,2 C13.1045695,2 14,2.8954305 14,4 L14,13 C14,14.1045695 13.1045695,15 12,15 L4,15 C2.8954305,15 2,14.1045695 2,13 L2,4 C2,2.8954305 2.8954305,2 4,2 L12,2 Z M4.5,12 L3.5,12 C3.22385763,12 3,12.2238576 3,12.5 L3,12.5 L3,13 C3,13.5522847 3.44771525,14 4,14 L4,14 L4.5,14 C4.77614237,14 5,13.7761424 5,13.5 L5,13.5 L5,12.5 C5,12.2238576 4.77614237,12 4.5,12 L4.5,12 Z M12.5,12 L11.5,12 C11.2238576,12 11,12.2238576 11,12.5 L11,12.5 L11,13.5 C11,13.7761424 11.2238576,14 11.5,14 L11.5,14 L12,14 C12.5522847,14 13,13.5522847 13,13 L13,13 L13,12.5 C13,12.2238576 12.7761424,12 12.5,12 L12.5,12 Z M4.5,9 L3.5,9 C3.22385763,9 3,9.22385763 3,9.5 L3,9.5 L3,10.5 C3,10.7761424 3.22385763,11 3.5,11 L3.5,11 L4.5,11 C4.77614237,11 5,10.7761424 5,10.5 L5,10.5 L5,9.5 C5,9.22385763 4.77614237,9 4.5,9 L4.5,9 Z M12.5,9 L11.5,9 C11.2238576,9 11,9.22385763 11,9.5 L11,9.5 L11,10.5 C11,10.7761424 11.2238576,11 11.5,11 L11.5,11 L12.5,11 C12.7761424,11 13,10.7761424 13,10.5 L13,10.5 L13,9.5 C13,9.22385763 12.7761424,9 12.5,9 L12.5,9 Z M4.5,6 L3.5,6 C3.22385763,6 3,6.22385763 3,6.5 L3,6.5 L3,7.5 C3,7.77614237 3.22385763,8 3.5,8 L3.5,8 L4.5,8 C4.77614237,8 5,7.77614237 5,7.5 L5,7.5 L5,6.5 C5,6.22385763 4.77614237,6 4.5,6 L4.5,6 Z M12.5,6 L11.5,6 C11.2238576,6 11,6.22385763 11,6.5 L11,6.5 L11,7.5 C11,7.77614237 11.2238576,8 11.5,8 L11.5,8 L12.5,8 C12.7761424,8 13,7.77614237 13,7.5 L13,7.5 L13,6.5 C13,6.22385763 12.7761424,6 12.5,6 L12.5,6 Z M4.5,3 L4,3 C3.44771525,3 3,3.44771525 3,4 L3,4 L3,4.5 C3,4.77614237 3.22385763,5 3.5,5 L3.5,5 L4.5,5 C4.77614237,5 5,4.77614237 5,4.5 L5,4.5 L5,3.5 C5,3.22385763 4.77614237,3 4.5,3 L4.5,3 Z M12,3 L11.5,3 C11.2238576,3 11,3.22385763 11,3.5 L11,3.5 L11,4.5 C11,4.77614237 11.2238576,5 11.5,5 L11.5,5 L12.5,5 C12.7761424,5 13,4.77614237 13,4.5 L13,4.5 L13,4 C13,3.44771525 12.5522847,3 12,3 L12,3 Z"/>
+</svg>

icons/downloads-symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M8,1 C11.8659932,1 15,4.13400675 15,8 C15,11.8659932 11.8659932,15 8,15 C4.13400675,15 1,11.8659932 1,8 C1,4.13400675 4.13400675,1 8,1 Z M9.5,8 L6.5,8 C6.22385763,8 6,8.22385763 6,8.5 C6,8.77614237 5.77614237,9 5.5,9 L5.5,9 L5,9 C4.89014373,9 4.78478689,9.04364023 4.70710678,9.12132034 C4.54534632,9.2830808 4.54534632,9.54534632 4.70710678,9.70710678 L4.70710678,9.70710678 L7.64644661,12.6464466 C7.84170876,12.8417088 8.15829124,12.8417088 8.35355339,12.6464466 L8.35355339,12.6464466 L11.2928932,9.70710678 C11.3705733,9.62942667 11.4142136,9.52406983 11.4142136,9.41421356 C11.4142136,9.18544973 11.2287638,9 11,9 L11,9 L10.5,9 C10.2238576,9 10,8.77614237 10,8.5 C10,8.22385763 9.77614237,8 9.5,8 L9.5,8 Z M9.5,6 L6.5,6 C6.22385763,6 6,6.22385763 6,6.5 C6,6.77614237 6.22385763,7 6.5,7 L6.5,7 L9.5,7 C9.77614237,7 10,6.77614237 10,6.5 C10,6.22385763 9.77614237,6 9.5,6 L9.5,6 Z M9.5,4 L6.5,4 C6.22385763,4 6,4.22385763 6,4.5 C6,4.77614237 6.22385763,5 6.5,5 L6.5,5 L9.5,5 C9.77614237,5 10,4.77614237 10,4.5 C10,4.22385763 9.77614237,4 9.5,4 L9.5,4 Z"/>
+</svg>

icons/downloads-symbolic_dark.svg

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="downloads-symbolic_dark.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="982"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     fill="#FFF"
+     fill-opacity=".8"
+     fill-rule="evenodd"
+     d="M8,1 C11.8659932,1 15,4.13400675 15,8 C15,11.8659932 11.8659932,15 8,15 C4.13400675,15 1,11.8659932 1,8 C1,4.13400675 4.13400675,1 8,1 Z M9.5,8 L6.5,8 C6.22385763,8 6,8.22385763 6,8.5 C6,8.77614237 5.77614237,9 5.5,9 L5.5,9 L5,9 C4.89014373,9 4.78478689,9.04364023 4.70710678,9.12132034 C4.54534632,9.2830808 4.54534632,9.54534632 4.70710678,9.70710678 L4.70710678,9.70710678 L7.64644661,12.6464466 C7.84170876,12.8417088 8.15829124,12.8417088 8.35355339,12.6464466 L8.35355339,12.6464466 L11.2928932,9.70710678 C11.3705733,9.62942667 11.4142136,9.52406983 11.4142136,9.41421356 C11.4142136,9.18544973 11.2287638,9 11,9 L11,9 L10.5,9 C10.2238576,9 10,8.77614237 10,8.5 C10,8.22385763 9.77614237,8 9.5,8 L9.5,8 Z M9.5,6 L6.5,6 C6.22385763,6 6,6.22385763 6,6.5 C6,6.77614237 6.22385763,7 6.5,7 L6.5,7 L9.5,7 C9.77614237,7 10,6.77614237 10,6.5 C10,6.22385763 9.77614237,6 9.5,6 L9.5,6 Z M9.5,4 L6.5,4 C6.22385763,4 6,4.22385763 6,4.5 C6,4.77614237 6.22385763,5 6.5,5 L6.5,5 L9.5,5 C9.77614237,5 10,4.77614237 10,4.5 C10,4.22385763 9.77614237,4 9.5,4 L9.5,4 Z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:0.60000002" />
+</svg>

icons/homepage.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="homepage.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="982"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
+  <title
+     id="title2">category_recommend</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <g
+     id="category_recommend"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     style="fill:#000000;fill-opacity:0.86666667">
+    <path
+       d="M8,12.6085145 L4.54924088,14.5160472 C4.06572729,14.783327 3.74708518,14.5504931 3.83503048,14.0113448 L4.5,9.93475242 L1.69148737,7.05624503 C1.30958944,6.6648293 1.44637232,6.27932454 1.97881505,6.19797453 L5.83688104,5.60851449 L7.5726373,1.91049416 C7.8086632,1.40764212 8.19196238,1.40897492 8.4273627,1.91049416 L10.163119,5.60851449 L14.0211849,6.19797453 C14.5617696,6.28056851 14.6893983,6.66586674 14.3085126,7.05624503 L11.5,9.93475242 L12.1649695,14.0113448 C12.2540356,14.557364 11.9269904,14.7793014 11.4507591,14.5160472 L8,12.6085145 Z"
+       id="Star"
+       fill="#536076"
+       style="fill:#000000;fill-opacity:0.86666667" />
+  </g>
+</svg>

icons/homepage_dark.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="homepage_dark.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="982"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-15.932203"
+     inkscape:cy="2.5762712"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
+  <title
+     id="title2">category_recommend</title>
+  <desc
+     id="desc4">Created with Sketch.</desc>
+  <g
+     id="category_recommend"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd"
+     style="fill:#ffffff;fill-opacity:0.60000002">
+    <path
+       d="M8,12.6085145 L4.54924088,14.5160472 C4.06572729,14.783327 3.74708518,14.5504931 3.83503048,14.0113448 L4.5,9.93475242 L1.69148737,7.05624503 C1.30958944,6.6648293 1.44637232,6.27932454 1.97881505,6.19797453 L5.83688104,5.60851449 L7.5726373,1.91049416 C7.8086632,1.40764212 8.19196238,1.40897492 8.4273627,1.91049416 L10.163119,5.60851449 L14.0211849,6.19797453 C14.5617696,6.28056851 14.6893983,6.66586674 14.3085126,7.05624503 L11.5,9.93475242 L12.1649695,14.0113448 C12.2540356,14.557364 11.9269904,14.7793014 11.4507591,14.5160472 L8,12.6085145 Z"
+       id="Star"
+       fill="#C5CFE0"
+       style="fill:#ffffff;fill-opacity:0.60000002" />
+  </g>
+</svg>

icons/theme-symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M3.5,14 C3.22385763,14 3,13.7761424 3,13.5 C3,13.2238576 3.22385763,13 3.5,13 L7,13 L7,12 L2,12 C1.44771525,12 1,11.5522847 1,11 L15,11 C15,11.5522847 14.5522847,12 14,12 L9,12 L9,13 L12.5,13 C12.7761424,13 13,13.2238576 13,13.5 C13,13.7761424 12.7761424,14 12.5,14 L3.5,14 Z M13,2 C14.1045695,2 15,2.8954305 15,4 L15,10 L1,10 L1,4 C1,2.8954305 1.8954305,2 3,2 L13,2 Z"/>
+</svg>

icons/theme-symbolic_dark.svg

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="theme-symbolic_dark.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="982"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     fill="#FFF"
+     fill-opacity=".8"
+     fill-rule="evenodd"
+     d="M3.5,14 C3.22385763,14 3,13.7761424 3,13.5 C3,13.2238576 3.22385763,13 3.5,13 L7,13 L7,12 L2,12 C1.44771525,12 1,11.5522847 1,11 L15,11 C15,11.5522847 14.5522847,12 14,12 L9,12 L9,13 L12.5,13 C12.7761424,13 13,13.2238576 13,13.5 C13,13.7761424 12.7761424,14 12.5,14 L3.5,14 Z M13,2 C14.1045695,2 15,2.8954305 15,4 L15,10 L1,10 L1,4 C1,2.8954305 1.8954305,2 3,2 L13,2 Z"
+     id="path2"
+     style="opacity:1;fill:#ffffff;fill-opacity:0.60000002" />
+</svg>

image_show.cpp

@@ -24,22 +24,14 @@ void image_show::setImage(QPixmap image)
 //    QPainter painter(&screen0);
     QImage re_screen1;
     QImage re_screen0=screen0.scaled(QSize(400,300),Qt::KeepAspectRatio,Qt::SmoothTransformation);
-    int desktop_w=DApplication::desktop()->width();
-    int desktop_h=DApplication::desktop()->height();
+    desktop_w=DApplication::desktop()->width();
+    desktop_h=DApplication::desktop()->height();
     if(screen0.width()>(desktop_w-20) || screen0.height()>(desktop_h-20)){
          re_screen1=screen0.scaled(QSize(desktop_w-20,desktop_h-20),Qt::KeepAspectRatio,Qt::SmoothTransformation);
          m_image=QPixmap::fromImage(re_screen1);
     }else {
         m_image=image;
     }
-    //防止图片尺寸过大导致窗口覆盖整个屏幕
-//    if(screen0.width()>1024 || screen0.height()>768){
-//        re_screen1=screen0.scaled(QSize(1024,768),Qt::KeepAspectRatio,Qt::SmoothTransformation);
-//    }else {
-//        re_screen1=screen0;
-
-//    }
-//    m_image=QPixmap::fromImage(re_screen1);
 
     m_label->setPixmap(QPixmap::fromImage(re_screen0));
 }
@@ -48,6 +40,8 @@ void image_show::mousePressEvent(QMouseEvent *)
 {
    m_dialog->setimage(m_image);
    m_dialog->showFullScreen();
-   moveToCenter(m_dialog);
+   m_dialog->setFixedSize(desktop_w,desktop_h);
+   m_dialog->move(0,0);/*
+   moveToCenter(m_dialog);*/
 
 }

image_show.h

@@ -16,6 +16,8 @@ public:
     explicit image_show(QWidget *parent = nullptr);
 
     void setImage(QPixmap);
+    int desktop_w;
+    int desktop_h;
 private:
     QLabel *m_label=new QLabel;
     QPixmap m_image;

main.cpp

@@ -1,7 +1,7 @@
-#include "mainwindow.h"
 #include <DApplication>
 #include <DWidgetUtil>  //Dtk::Widget::moveToCenter(&w); 要调用它，就得引用DWidgetUtil
 #include <QDesktopWidget>
+#include <widget.h>
 DWIDGET_USE_NAMESPACE
 int main(int argc, char *argv[])
 {
@@ -9,38 +9,40 @@ int main(int argc, char *argv[])
     DApplication a(argc, argv);
     a.setAttribute(Qt::AA_UseHighDpiPixmaps);
     a.loadTranslator();
+
     a.setOrganizationName("spark-union");
-    a.setApplicationVersion(DApplication::buildVersion("1.0-beta5.6"));
+    a.setApplicationVersion(DApplication::buildVersion("1.0-beta7"));
     a.setApplicationAcknowledgementPage("https://gitee.com/deepin-community-store/spark-store");
     a.setProductIcon(QIcon::fromTheme("spark-store"));  //设置Logo
 
     a.setProductName("Spark应用商店");
-    a.setApplicationDescription("深度社区驱动的一款为deepin打造的第三方商店");
+    a.setApplicationDescription("社区驱动的一款为第三方应用商店，为改变而生");
     a.setApplicationName("Spark应用商店"); //只有在这儿修改窗口标题才有效
-    MainWindow w;
+    Widget w;
     QDesktopWidget *s=DApplication::desktop();
     int d_w=s->width();
     int d_h=s->height();
     if(d_w<=1366){
-        w.setMinimumWidth(820);
-        w.resize(820,640);
+        w.setMinimumWidth(925);
+        w.resize(925,650);
     }else if(d_w<=1920){
-        w.setMinimumWidth(1140);
-        w.resize(1140,760);
+        w.setMinimumWidth(1180);
+        w.resize(1180,760);
     }else {
-        w.setMinimumWidth(1140);
-        w.resize(1140,760);
+        w.setMinimumWidth(1180);
+        w.resize(1180,760);
     }
     if(d_h<=768){
-        w.setMinimumHeight(640);
-        w.resize(820,640);
+        w.setMinimumHeight(650);
+        w.resize(925,650);
     }else if(d_h<=1080){
         w.setMinimumHeight(760);
-        w.resize(1140,760);
+        w.resize(1180,760);
     }else {
         w.setMinimumHeight(760);
-        w.resize(1140,760);
+        w.resize(1180,760);
     }
+//    w.resize(925,650);
 
     w.show();
     QString arg1=argv[1];

mainwindow.cpp

@@ -1,79 +0,0 @@
-#include "mainwindow.h"
-
-#include <DMainWindow>
-#include <QDesktopWidget>
-#include <DTitlebar>
-#include <QHBoxLayout>
-#include <QDebug>
-#include <DFileServices>
-#include <DApplicationHelper>
-DWIDGET_USE_NAMESPACE
-
-MainWindow::MainWindow(QWidget *parent)
-    : DMainWindow(parent)
-{
-    w = new Widget;
-
-    resize(w->size()); //设置窗口大小
-    setCentralWidget(w);
-
-    //添加搜索框
-    DMainWindow::titlebar()->addWidget(searchEdit);
-    DMainWindow::titlebar()->setIcon(QIcon::fromTheme("spark-store"));
-    DMainWindow::titlebar()->setTitle("星火应用商店");
-    searchEdit->setPlaceholderText("搜索或打开链接");
-    searchEdit->setMaximumWidth(300);
-
-    //添加菜单项
-    QAction *setting=new QAction("设置");
-    QMenu *menu=new QMenu;
-    menu->addAction(setting);
-    DMainWindow::titlebar()->setMenu(menu);
-
-
-
-//    connect(DGuiApplicationHelper::instance(),&DGuiApplicationHelper::instance()->applicationPalette().highlight().color()::)
-
-
-    //链接信号和槽
-
-    //设置活动颜色和明暗模式
-    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType) {
-        QColor main_color;
-        main_color=DGuiApplicationHelper::instance()->applicationPalette().highlight().color();
-        if(themeType==DGuiApplicationHelper::DarkType){
-            qDebug()<<"Dark";
-            w->setTheme(true,main_color);
-        }else {
-            qDebug()<<"White";
-            w->setTheme(false,main_color);
-        }
-    });
-    //设置菜单
-    connect(setting,&QAction::triggered,w,&Widget::opensetting);
-    //搜索事件
-    connect(searchEdit,&DSearchEdit::editingFinished,this,[=](){
-        QString searchtext=searchEdit->text();
-        if(searchtext!=""){
-            qDebug()<<searchEdit->text();
-            w->searchApp(searchtext);
-        }
-        searchEdit->clearEdit();
-
-    });
-
-
-
-}
-
-MainWindow::~MainWindow()
-{
-
-}
-
-void MainWindow::openUrl(QUrl url)
-{
-    w->openUrl(url);
-
-}
-

mainwindow.h

@@ -1,29 +0,0 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <DMainWindow>
-#include "widget.h"
-#include <QThread>
-#include <DSearchEdit>
-#include <DBlurEffectWidget>
-#include <DTitlebar>
-DWIDGET_USE_NAMESPACE
-
-class MainWindow : public DMainWindow
-{
-    Q_OBJECT
-
-
-public:
-    MainWindow(QWidget *parent = nullptr);
-    ~MainWindow();
-    DSearchEdit *searchEdit=new DSearchEdit;
-    DTitlebar *titlebar=new DTitlebar;
-    void openUrl(QUrl);
-
-private:
-
-    Widget *w;
-};
-
-#endif // MAINWINDOW_H

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

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

spark-store.pro

@@ -4,10 +4,13 @@
 #
 #-------------------------------------------------
 
-QT       += core gui webkitwidgets network concurrent
+QT       += core gui network concurrent webenginewidgets
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+CONFIG += link_pkgconfig
+PKGCONFIG += dtkwidget
+
 TARGET = spark-store
 TEMPLATE = app
 
@@ -24,23 +27,26 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 
 SOURCES += main.cpp\
-        mainwindow.cpp \
     widget.cpp \
     downloadlist.cpp \
     image_show.cpp \
-    big_image.cpp
+    big_image.cpp \
+    progressload.cpp
 
-HEADERS  += mainwindow.h \
+HEADERS  += \
     widget.h \
     downloadlist.h \
     image_show.h \
-    big_image.h
+    big_image.h \
+    progressload.h
+
 
-CONFIG += link_pkgconfig
-PKGCONFIG += dtkwidget
 
 CONFIG += c++11
 
 FORMS += \
     widget.ui \
     downloadlist.ui
+
+RESOURCES += \
+    icons.qrc

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>
@@ -25,17 +24,20 @@
 #include "image_show.h"
 #include <DBlurEffectWidget>
 #include <QClipboard>
+#include <DApplication>
 #include <DGuiApplicationHelper>
 DWIDGET_USE_NAMESPACE
 
-Widget::Widget(QWidget *parent) :
-    QWidget(parent),
+Widget::Widget(DBlurEffectWidget *parent) :
+    DBlurEffectWidget(parent),
     ui(new Ui::Widget)
 {
     ui->setupUi(this);
     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);});
@@ -51,8 +53,32 @@ Widget::Widget(QWidget *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(searchEdit,&DSearchEdit::editingFinished,this,[=](){
+        QString searchtext=searchEdit->text();
+        if(searchtext!=""){
+            qDebug()<<searchEdit->text();
+            searchApp(searchtext);
+        }
+        searchEdit->clearEdit();
+
+    });
+
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType) {
+        QColor main_color;
+        main_color=DGuiApplicationHelper::instance()->applicationPalette().highlight().color();
+        if(themeType==DGuiApplicationHelper::DarkType){
+            qDebug()<<"Dark";
+            setTheme(true,main_color);
+        }else {
+            qDebug()<<"White";
+            setTheme(false,main_color);
+        }
+    });
+
+    // 计算显示下载速度
     download_speed.setInterval(1000);
     download_speed.start();
     connect(&download_speed,&QTimer::timeout,[=](){
@@ -74,37 +100,61 @@ Widget::Widget(QWidget *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);
     ui->listWidget->hide();
     ui->label_setting1->hide();
     ui->pushButton_uninstall->hide();
     ui->line1_widget->setStyleSheet("background-color:#808080");
-    ui->line2_widget->setStyleSheet("background-color:#808080");
+    ui->icon->setPixmap(QIcon::fromTheme("spark-store").pixmap(36,36));
+    ui->titlebar->setFixedHeight(50);
 
-
-    //初始化分界线
+    // 初始化分界线
     QGraphicsOpacityEffect *opacityEffect_1=new QGraphicsOpacityEffect;
-    QGraphicsOpacityEffect *opacityEffect_2=new QGraphicsOpacityEffect;
     opacityEffect_1->setOpacity(0.1);
-    opacityEffect_2->setOpacity(0.1);
     ui->line1_widget->setGraphicsEffect(opacityEffect_1);
-    ui->line2_widget->setGraphicsEffect(opacityEffect_2);
 
+    // 搜索框
+    QWidget *w_titlebar=new QWidget;
+    QHBoxLayout *ly_titlebar=new QHBoxLayout;
+    w_titlebar->setLayout(ly_titlebar);
+    // 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->setTitle("星火应用商店");
+    searchEdit->setPlaceholderText("搜索或打开链接");
+    searchEdit->setFixedWidth(300);
+    titlebar->setSeparatorVisible(false);
+    // 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;
@@ -121,26 +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->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;
@@ -149,23 +186,21 @@ 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;   //防止出发保存配置信号
-//    ui->
-//    menuUrl[0]="https://mp.weixin.qq.com/s/1OmCgJ13yVDSRebdgtW9fg";
-    menuUrl[0]=serverUrl + "store/#";
+    // by shenmo 在这里换成路径为{cdn/dc}/store/#
+    configCanSave=true;   //　防止触发保存配置信号
+    menuUrl[0]=serverUrl + "store/#/";
+    // menuUrl[0]="http://127.0.0.1:8000/#/darkprogramming";
     menuUrl[1]=serverUrl + "store/#/network";
     menuUrl[2]=serverUrl + "store/#/relations";
     menuUrl[3]=serverUrl + "store/#/musicandsound";
@@ -181,20 +216,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()){
@@ -204,92 +239,195 @@ void Widget::initConfig()
     }
     aptserver.close();
 
-    //新建临时文件夹
+    // 新建临时文件夹
     QDir dir("/tmp");
     dir.mkdir("spark-store");
 }
+
 void Widget::setTheme(bool isDark,QColor color)
 {
+    // 菜单图标
     if(isDark){
-        //黑色模式
-        ui->widget_menuList->setStyleSheet("background-color:#282828");
-        ui->webView->setStyleSheet("background-color:#282828");
+        // 黑色模式
+        themeIsDark=true;
+        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->label_show->setStyleSheet("background-color:#252525");
+        ui->pushButton_return->setIcon(QIcon(":/icons/icons/category_active_dark.svg"));
     }else {
-        //亮色模式
-        ui->widget_menuList->setStyleSheet("background-color:#FFFFFF");
-        ui->webView->setStyleSheet("background-color:#FFFFFF");
+        // 亮色模式
+        themeIsDark=false;
+        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->label_show->setStyleSheet("background-color:#F8F8F8");
+        ui->pushButton_return->setIcon(QIcon(":/icons/icons/category_active.svg"));
     }
     main_color=color;
-    left_list[nowMenu]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
+    m_loadweb->setTheme(themeIsDark,color);
+    updateUI();
+    if(ui->stackedWidget->currentIndex()==0){
+        chooseLeftMenu(nowMenu);
+    }
+
 }
 
-void Widget::on_webView_loadStarted()
+DTitlebar* Widget::getTitlebar()
 {
+    return ui->titlebar;
+}
 
-    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];
+void Widget::updateUI()
+{
+    if(themeIsDark){
+        left_list[0]->setIcon(QIcon(":/icons/icons/homepage_dark.svg"));
+        left_list[1]->setIcon(QIcon(":/icons/icons/category_network_dark.svg"));
+        left_list[2]->setIcon(QIcon(":/icons/icons/category_chat_dark.svg"));
+        left_list[3]->setIcon(QIcon(":/icons/icons/category_music_dark.svg"));
+        left_list[4]->setIcon(QIcon(":/icons/icons/category_video_dark.svg"));
+        left_list[5]->setIcon(QIcon(":/icons/icons/category_graphic_dark.svg"));
+        left_list[6]->setIcon(QIcon(":/icons/icons/category_game_dark.svg"));
+        left_list[7]->setIcon(QIcon(":/icons/icons/category_office_dark.svg"));
+        left_list[8]->setIcon(QIcon(":/icons/icons/category_reading_dark.svg"));
+        left_list[9]->setIcon(QIcon(":/icons/icons/category_develop_dark.svg"));
+        left_list[10]->setIcon(QIcon(":/icons/icons/category_system_dark.svg"));
+        left_list[11]->setIcon(QIcon(":/icons/icons/theme-symbolic_dark.svg"));
+        left_list[12]->setIcon(QIcon(":/icons/icons/category_others_dark.svg"));
+        left_list[13]->setIcon(QIcon(":/icons/icons/downloads-symbolic_dark.svg"));
+    }else {
+        left_list[0]->setIcon(QIcon(":/icons/icons/homepage.svg"));
+        left_list[1]->setIcon(QIcon(":/icons/icons/category_network.svg"));
+        left_list[2]->setIcon(QIcon(":/icons/icons/category_chat.svg"));
+        left_list[3]->setIcon(QIcon(":/icons/icons/category_music.svg"));
+        left_list[4]->setIcon(QIcon(":/icons/icons/category_video.svg"));
+        left_list[5]->setIcon(QIcon(":/icons/icons/category_graphic.svg"));
+        left_list[6]->setIcon(QIcon(":/icons/icons/category_game.svg"));
+        left_list[7]->setIcon(QIcon(":/icons/icons/category_office.svg"));
+        left_list[8]->setIcon(QIcon(":/icons/icons/category_reading.svg"));
+        left_list[9]->setIcon(QIcon(":/icons/icons/category_develop.svg"));
+        left_list[10]->setIcon(QIcon(":/icons/icons/category_system.svg"));
+        left_list[11]->setIcon(QIcon(":/icons/icons/theme-symbolic.svg"));
+        left_list[12]->setIcon(QIcon(":/icons/icons/category_others.svg"));
+        left_list[13]->setIcon(QIcon(":/icons/icons/downloads-symbolic.svg"));
     }
-    //如果是app.json就打开详情页
-    if(arg1.path().right(8)=="app.json"){
-        load.cancel();//打开并发加载线程前关闭正在执行的线程
-        QPixmap pixmap_null;//一个空的图片，用来清空现有内容
-        ui->label_appicon->setPixmap(pixmap_null);
-        ui->screen_0->setImage(pixmap_null);
-        ui->screen_1->setImage(pixmap_null);
-        ui->screen_2->setImage(pixmap_null);
-        ui->screen_3->setImage(pixmap_null);
-        ui->screen_4->setImage(pixmap_null);
-        //先隐藏详情页负责显示截图的label
+    for (int i=0;i<14;i++) {
+        left_list[i]->setFont(QFont("",11));
+        left_list[i]->setFixedHeight(38);
+        if(themeIsDark){
+            left_list[i]->setStyleSheet("color:#FFFFFF;border:0px");
+        }else {
+            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:
+        left_list[0]->setIcon(QIcon(":/icons/icons/homepage_dark.svg"));
+        break;
+    case 1:
+        left_list[1]->setIcon(QIcon(":/icons/icons/category_network_dark.svg"));
+        break;
+    case 2:
+        left_list[2]->setIcon(QIcon(":/icons/icons/category_chat_dark.svg"));
+        break;
+    case 3:
+        left_list[3]->setIcon(QIcon(":/icons/icons/category_music_dark.svg"));
+        break;
+    case 4:
+        left_list[4]->setIcon(QIcon(":/icons/icons/category_video_dark.svg"));
+        break;
+    case 5:
+        left_list[5]->setIcon(QIcon(":/icons/icons/category_graphic_dark.svg"));
+        break;
+    case 6:
+        left_list[6]->setIcon(QIcon(":/icons/icons/category_game_dark.svg"));
+        break;
+    case 7:
+        left_list[7]->setIcon(QIcon(":/icons/icons/category_office_dark.svg"));
+        break;
+    case 8:
+        left_list[8]->setIcon(QIcon(":/icons/icons/category_reading_dark.svg"));
+        break;
+    case 9:
+        left_list[9]->setIcon(QIcon(":/icons/icons/category_develop_dark.svg"));
+        break;
+    case 10:
+        left_list[10]->setIcon(QIcon(":/icons/icons/category_system_dark.svg"));
+        break;
+    case 11:
+        left_list[11]->setIcon(QIcon(":/icons/icons/theme-symbolic_dark.svg"));
+        break;
+    case 12:
+        left_list[12]->setIcon(QIcon(":/icons/icons/category_others_dark.svg"));
+        break;
+    case 13:
+        left_list[13]->setIcon(QIcon(":/icons/icons/downloads-symbolic_dark.svg"));
+        break;
+    }
+}
+
+// 菜单切换逻辑
+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(index<=12){
+        if(themeIsDark){
+            QString darkurl=menuUrl[index].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->webEngineView->setUrl(darkurl);
+            qDebug()<<darkurl;
+
+        }else {
+            ui->webEngineView->setUrl(menuUrl[index]);
+
+        }
+
+        ui->stackedWidget->setCurrentIndex(0);
+    }else if (index==13) {
+        ui->stackedWidget->setCurrentIndex(1);
+    }
+}
+
+void Widget::setfoot(int h)
+{
+    foot=h;
+}
+
+void Widget::updatefoot()
+{
+    int allh=ui->stackedWidget->height();
+    ui->webfoot->setFixedHeight(allh-foot);
+}
+
+void Widget::loadappinfo(QUrl arg1)
+{
+    if(arg1.isEmpty()){
+        return;
+    }
+
+    //　先隐藏详情页负责显示截图的label
     ui->screen_0->hide();
     ui->screen_1->hide();
     ui->screen_2->hide();
     ui->screen_3->hide();
     ui->screen_4->hide();
-        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);
-        });
-    }
-}
-//菜单切换逻辑
+    ui->label_appicon->clear();
 
-void Widget::chooseLeftMenu(int index)
-{
-
-    nowMenu=index;
-    for (int i=0;i<14;i++) {
-        left_list[i]->setStyleSheet("border:0px");
-        left_list[i]->setFont(QFont("",11));
-        left_list[i]->setMinimumHeight(30);
-    }
-    left_list[index]->setStyleSheet("color:#FFFFFF;background-color:"+main_color.name()+";border-radius:8;border:0px");
-    if(index<=12){
-        ui->webView->setUrl(menuUrl[index]);
-        ui->stackedWidget->setCurrentIndex(0);
-    }else if (index==13) {
-        ui->stackedWidget->setCurrentIndex(1);
-    }
-
-}
-void Widget::loadappinfo(QUrl arg1)
-{
-    //置UI状态
+    //　重置UI状态
     ui->pushButton_uninstall->hide();
     ui->label_show->setText("正在加载，请稍候");
     ui->label_show->show();
@@ -299,24 +437,27 @@ void Widget::loadappinfo(QUrl arg1)
     QDir dir("/tmp");
     dir.mkdir("spark-store");
     QDir::setCurrent("/tmp/spark-store");
+
     get_json.start("curl -o app.json "+arg1.toString());
     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;
-        urladdress="http://img.shenmo.tech:38324/";//使用图片专用服务器请保留这行，删除后将使用源服务器
+        deburl=deburl.left(urladdress.length()-1);
+        urladdress="http://img.jerrywang.top/"; // 使用图片专用服务器请保留这行，删除后将使用源服务器
+        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();
@@ -324,7 +465,7 @@ 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["Version"].toString()+"\n";
@@ -354,31 +495,27 @@ void Widget::loadappinfo(QUrl arg1)
         }else {
             ui->pushButton_download->setText("安装");
         }
-        //图标加载
+        // 图标加载
         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;
         label_screen[2]=ui->screen_2;
         label_screen[3]=ui->screen_3;
         label_screen[4]=ui->screen_4;
-        ui->screen_0->hide();
-        ui->screen_1->hide();
-        ui->screen_2->hide();
-        ui->screen_3->hide();
-        ui->screen_4->hide();
         for (int i=0;i<5;i++) {
-            get_json.start("curl -o screen_"+QString::number(i)+".png "+urladdress+"screen_"+QString::number(i)+".png");
+            get_json.start("curl -o screen_"+QString::number(i+1)+".png "+urladdress+"screen_"+QString::number(i+1)+".png");
             get_json.waitForFinished();
-            if(screen[i].load("screen_"+QString::number(i)+".png")){
+            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:
@@ -388,24 +525,22 @@ void Widget::loadappinfo(QUrl arg1)
                 case 3:
                     label_screen[4]->hide();
                 }
+            }else{
+                QFile::remove("screen_"+QString::number(i+1)+".png");
+                break;
             }
         }
         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())
     {
@@ -432,7 +567,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;
@@ -450,7 +585,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)
@@ -459,14 +593,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)
@@ -474,20 +605,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();
@@ -498,7 +629,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;
@@ -515,12 +646,27 @@ void Widget::httpFinished() //完成下载
     }
 }
 
-
-
 void Widget::on_pushButton_return_clicked()
 {
-    ui->webView->setUrl(menuUrl[nowMenu]);
-    ui->stackedWidget->setCurrentIndex(0);
+    // 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]);
+    // }
 }
 
 void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1)
@@ -531,6 +677,7 @@ void Widget::on_comboBox_server_currentIndexChanged(const QString &arg1)
         setConfig->setValue("server/choose",arg1);
     }
 }
+
 void Widget::on_pushButton_updateServer_clicked()
 {
     QtConcurrent::run([=](){
@@ -546,7 +693,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);
@@ -613,7 +760,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);
@@ -633,16 +780,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;
@@ -650,13 +797,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){
@@ -675,33 +822,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);
-}
-
 void Widget::on_pushButton_clicked()
 {
     QString share_url;
@@ -714,6 +842,69 @@ void Widget::on_pushButton_clicked()
 
 void Widget::on_btn_openDir_clicked()
 {
-
     QDesktopServices::openUrl(QUrl("file:///tmp/spark-store", QUrl::TolerantMode));
 }
+
+void Widget::on_stackedWidget_currentChanged(int arg1)
+{
+    qDebug()<<arg1;
+    if(arg1==0 || arg1==1){
+        ui->pushButton_return->setEnabled(false);
+    }else {
+        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();
+    }
+
+}

widget.h

@@ -17,6 +17,9 @@
 #include <DSpinner>
 #include <DWaterProgress>
 #include <QLabel>
+#include <DTitlebar>
+#include <DSearchEdit>
+#include <progressload.h>
 #define LIST_MAX 99 //一次最多下载数量
 #define TMP_PATH "/tmp/spark-store"
 
@@ -27,12 +30,12 @@ class Widget;
 
 
 
-class Widget : public QWidget
+class Widget : public DBlurEffectWidget
 {
 
     Q_OBJECT
 public:
-    explicit Widget(QWidget *parent = nullptr);
+    explicit Widget(DBlurEffectWidget *parent = nullptr);
     ~Widget();
     void startRequest(QUrl url);
     void searchApp(QString);
@@ -42,6 +45,7 @@ public:
     void opensetting(); //打开设置页面
     void openUrl(QUrl);
     void setTheme(bool,QColor);
+    DTitlebar* getTitlebar();
 
 private slots:
 
@@ -50,20 +54,27 @@ 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();
 
     void on_btn_openDir_clicked();
 
+    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;
@@ -78,18 +89,25 @@ public:
     QString urladdress;
     QString pkgName;
     QString appweb;
+    bool themeIsDark;
+
+
 
 private:
     void initUI();
     void initConfig();
     void loadappinfo(QUrl);
     void chooseLeftMenu(int index);
+    void setfoot(int);
+    void updatefoot();
+    void updateUI();
+
     quint64 dirFileSize(const QString &path);
 
 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;
@@ -103,6 +121,9 @@ private:
     QTimer download_speed;
     QString type_name;
     QColor main_color;
+    int foot;
+    DSearchEdit *searchEdit=new DSearchEdit;
+    DTitlebar *titlebar;
 
 };
 

widget.ui

@@ -29,7 +29,256 @@
    <property name="spacing">
     <number>0</number>
    </property>
+   <item row="0" column="0" rowspan="4">
+    <widget class="QWidget" name="widget_menuList" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>150</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>150</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
+     <property name="accessibleDescription">
+      <string>background-color:#FFFFFF</string>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_5">
+      <property name="leftMargin">
+       <number>5</number>
+      </property>
+      <property name="rightMargin">
+       <number>5</number>
+      </property>
+      <item row="6" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_video">
+        <property name="text">
+         <string>视频播放</string>
+        </property>
+       </widget>
+      </item>
+      <item row="16" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_download">
+        <property name="text">
+         <string>下载列表</string>
+        </property>
+       </widget>
+      </item>
+      <item row="12" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_system">
+        <property name="text">
+         <string>系统工具</string>
+        </property>
+       </widget>
+      </item>
+      <item row="13" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_theme">
+        <property name="text">
+         <string>主题美化</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_music">
+        <property name="text">
+         <string>音乐欣赏</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="icon">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>36</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>36</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>icon</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <spacer name="verticalSpacer_7">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="4">
+       <spacer name="horizontalSpacer_8">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>3</width>
+          <height>20</height>
+         </size>
+        </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">
+         <size>
+          <width>40</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="icons.qrc">
+          <normaloff>:/icons/icons/category_active.svg</normaloff>:/icons/icons/category_active.svg</iconset>
+        </property>
+       </widget>
+      </item>
+      <item row="9" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_office">
+        <property name="text">
+         <string>办公学习</string>
+        </property>
+       </widget>
+      </item>
+      <item row="17" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="10" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_read">
+        <property name="text">
+         <string>阅读翻译</string>
+        </property>
+       </widget>
+      </item>
+      <item row="14" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_other">
+        <property name="text">
+         <string>其他应用</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_main">
+        <property name="styleSheet">
+         <string notr="true"/>
+        </property>
+        <property name="text">
+         <string>商店首页</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_photo">
+        <property name="text">
+         <string>图形图像</string>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_game">
+        <property name="text">
+         <string>游戏娱乐</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_chat">
+        <property name="text">
+         <string>社交沟通</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="5">
+       <widget class="QPushButton" name="menu_network">
+        <property name="text">
+         <string>网络应用</string>
+        </property>
+       </widget>
+      </item>
+      <item row="15" column="0" colspan="5">
+       <widget class="QWidget" name="line1_widget" native="true">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>1</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>4</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">background-color:#808080</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="2">
+       <spacer name="horizontalSpacer_9">
+        <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>
+   <item row="2" column="1">
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="styleSheet">
       <string notr="true"/>
@@ -38,10 +287,13 @@
       <number>0</number>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <property name="leftMargin">
         <number>0</number>
        </property>
@@ -55,14 +307,17 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="QWebView" name="webView">
+        <widget class="QWebEngineView" name="webEngineView">
          <property name="url">
           <url>
-           <string>http://0.0.0.1/</string>
+           <string>about:blank</string>
           </url>
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QWidget" name="webfoot" native="true"/>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_2">
@@ -82,13 +337,6 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
-       <item>
-        <widget class="QListWidget" name="listWidget">
-         <property name="lineWidth">
-          <number>0</number>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QLabel" name="label">
          <property name="font">
@@ -99,6 +347,9 @@
          <property name="styleSheet">
           <string notr="true"/>
          </property>
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
          <property name="text">
           <string>当前下载列表为空</string>
          </property>
@@ -107,6 +358,19 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QListWidget" name="listWidget">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
+         </property>
+         <property name="lineWidth">
+          <number>0</number>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QPushButton" name="btn_openDir">
          <property name="maximumSize">
@@ -127,6 +391,9 @@
      </widget>
      <widget class="QWidget" name="page_3">
       <layout class="QVBoxLayout" name="verticalLayout_16">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <property name="leftMargin">
         <number>0</number>
        </property>
@@ -137,7 +404,7 @@
         <number>0</number>
        </property>
        <property name="bottomMargin">
-        <number>0</number>
+        <number>10</number>
        </property>
        <item>
         <widget class="QScrollArea" name="scrollArea">
@@ -155,11 +422,14 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>891</width>
-            <height>864</height>
+            <width>901</width>
+            <height>849</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_17">
+           <property name="spacing">
+            <number>0</number>
+           </property>
            <item>
             <widget class="QWidget" name="widget_3" native="true">
              <property name="maximumSize">
@@ -169,19 +439,6 @@
               </size>
              </property>
              <layout class="QGridLayout" name="gridLayout">
-              <item row="0" column="0">
-               <widget class="QPushButton" name="pushButton_return">
-                <property name="maximumSize">
-                 <size>
-                  <width>40</width>
-                  <height>16777215</height>
-                 </size>
-                </property>
-                <property name="text">
-                 <string>&lt;</string>
-                </property>
-               </widget>
-              </item>
               <item row="2" column="2">
                <spacer name="horizontalSpacer_2">
                 <property name="orientation">
@@ -461,7 +718,7 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>857</width>
+                   <width>867</width>
                    <height>325</height>
                   </rect>
                  </property>
@@ -577,6 +834,9 @@
          <property name="styleSheet">
           <string notr="true"/>
          </property>
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
          <property name="lineWidth">
           <number>0</number>
          </property>
@@ -588,8 +848,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>891</width>
-            <height>786</height>
+            <width>687</width>
+            <height>830</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -685,7 +945,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;p&gt;线路说明: &lt;/p&gt;&lt;p&gt;1. 国内推荐使用sucdn.jerrywang.top, cfcdn.jerrry.wang。前二者无法使用时，请切换到store.jerrywang.top&lt;/p&gt;&lt;p&gt;2. 国外推荐使用cfcdn.jerrry.wang, dcstore.spark-app.store&lt;/p&gt;&lt;p&gt;3. cdn.jerrywang.top尚在测试中&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                    </property>
                    <property name="wordWrap">
                     <bool>true</bool>
@@ -862,203 +1122,45 @@
      </widget>
     </widget>
    </item>
-   <item row="0" column="1" rowspan="2">
-    <widget class="QWidget" name="line2_widget" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>1</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>4</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-color:#808080</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" rowspan="2">
-    <widget class="QWidget" name="widget_menuList" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>11</pointsize>
-      </font>
-     </property>
-     <property name="accessibleDescription">
-      <string>background-color:#FFFFFF</string>
-     </property>
-     <property name="styleSheet">
-      <string notr="true"/>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_24">
-      <property name="spacing">
-       <number>2</number>
-      </property>
-      <property name="leftMargin">
-       <number>5</number>
-      </property>
-      <property name="rightMargin">
-       <number>5</number>
-      </property>
-      <item>
-       <widget class="QPushButton" name="menu_main">
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <property name="text">
-         <string>商店首页</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_network">
-        <property name="text">
-         <string>网络应用</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_chat">
-        <property name="text">
-         <string>社交沟通</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_music">
-        <property name="text">
-         <string>音乐欣赏</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_video">
-        <property name="text">
-         <string>视频播放</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_photo">
-        <property name="text">
-         <string>图形图像</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_game">
-        <property name="text">
-         <string>游戏娱乐</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_office">
-        <property name="text">
-         <string>办公学习</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_read">
-        <property name="text">
-         <string>阅读翻译</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_dev">
-        <property name="text">
-         <string>编程开发</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_system">
-        <property name="text">
-         <string>系统工具</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_theme">
-        <property name="text">
-         <string>主题美化</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="menu_other">
-        <property name="text">
-         <string>其他应用</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="line1_widget" native="true">
+   <item row="0" column="1">
+    <widget class="DTitlebar" name="titlebar" native="true">
      <property name="minimumSize">
       <size>
        <width>0</width>
-          <height>1</height>
+       <height>20</height>
+      </size>
+     </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>4</height>
+       <height>3</height>
       </size>
      </property>
+     <property name="toolTipDuration">
+      <number>-1</number>
+     </property>
      <property name="styleSheet">
-         <string notr="true">background-color:#808080</string>
+      <string notr="true"/>
      </property>
     </widget>
    </item>
-      <item>
-       <widget class="QPushButton" name="menu_download">
-        <property name="text">
-         <string>下载列表</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>219</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </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>
@@ -1066,7 +1168,21 @@
    <header location="global">image_show.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>DTitlebar</class>
+   <extends>QWidget</extends>
+   <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/>
+ <resources>
+  <include location="icons.qrc"/>
+ </resources>
  <connections/>
 </ui>