fix: Use svg icon to fix https://gitee.com/spark-store-project/spark-store/issues/IDAWEQ

修复：在存在空格时无法正确创建desktop
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2025-12-15 05:12:04 +08:00 · 2025-12-05 15:44:22 +08:00 · 2025-11-28 14:00:38 +00:00 · 2025-11-27 07:14:36 +00:00 · 2025-11-21 00:39:23 +00:00 · 2025-11-20 05:53:07 +00:00
393 changed files with 29098 additions and 12684 deletions
--- a/.gitee/Dockerfile
+++ b/.gitee/Dockerfile
@@ -1,2 +1,4 @@
-FROM python:3
-RUN pip3 install requests 
+FROM shenmo7192/uos-21-dtk5.4:1.0
+ADD . /root/workdir
+WORKDIR /root/workdir
+RUN dpkg-buildpackage
--- a/.gitee/callback.py
+++ b/.gitee/callback.py
@@ -7,7 +7,7 @@ import json
 sha = os.getenv("GIT_COMMIT")
 # sha = '48fed26c51a8c42554e45f72f43e49703e04c97f'
 #get sha from environment 
-url = "https://gitee.com/api/v5/repos/deepin-community-store/spark-store/commits/{}/comments".format(sha)
+url = "https://gitee.com/api/v5/repos/spark-store-project/spark-store/commits/{}/comments".format(sha)

 token = os.getenv("gitee_token")

--- a/.github/workflows/program-builder.yml
+++ b/.github/workflows/program-builder.yml
@@ -0,0 +1,13 @@
+name: Building Program
+run-name: Building ${{ GITHUB.REPOSITORY }}
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  call:
+    uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
+    secrets: inherit
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,56 @@
-*.pro.user*
-build/
-.vscode/
-Lib/
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+
+# Qt unit tests
+target_wrapper.*
+
+# Qt qm files
+translations/*.qm
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+build
+
+# Debian dpkg-buildpackage
+debian/*.debhelper*
+debian/files
+debian/*.substvars
+debian/spark-store
+
+.vscode/*
+obj-*
--- a/.workflow/dtk-build-commit-20220425.yml
+++ b/.workflow/dtk-build-commit-20220425.yml
@@ -0,0 +1,39 @@
+version: '1.0'
+name: dtk-build-commit-20220425
+displayName: dtk-build-commit
+triggers:
+  trigger: auto
+  pr:
+    branches:
+      prefix:
+        - ''
+stages:
+  - name: stage-4e566164
+    displayName: build
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: 基于镜像的脚本执行
+        certificate: ''
+        image: docker.io/debian:buster
+        command:
+          - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+          - '# 换源'
+          - apt update
+          - export DEBIAN_FRONTEND=noninteractive
+          - echo "安装git devscripts equivs ..."
+          - apt install git devscripts equivs curl -y >/dev/null 2>&1
+          - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
+          - cd dtk-old-bundle
+          - apt install ./*.deb -y
+          - cd ..
+          - rm -rf dtk-old-bundle
+          - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
+          - dpkg-buildpackage -j2 -b -us -uc
+          - cd ..
+          - ls -all
+          - pwd
+        strategy: {}
--- a/.workflow/dtk-build-release-tag-20220425.yml
+++ b/.workflow/dtk-build-release-tag-20220425.yml
@@ -0,0 +1,72 @@
+version: '1.0'
+name: dtk-build-release-tag-20220425
+displayName: dtk-build-release-tag
+triggers:
+  trigger: manual
+  push:
+    tags:
+      prefix:
+        - ''
+stages:
+  - name: stage-4e566164
+    displayName: build
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: 基于镜像的DTK构建
+        certificate: ''
+        image: docker.jianmuhub.com/library/debian:buster
+        command:
+          - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+          - '# 换源'
+          - apt update
+          - export DEBIAN_FRONTEND=noninteractive
+          - echo "安装依赖..."
+          - 'apt install libgsettings-qt-dev -y '
+          - 'apt install debhelper git curl fakeroot qtbase5-dev zlib1g-dev qt5-default  -y '
+          - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
+          - cd dtk-old-bundle
+          - apt install ./*.deb -y
+          - cd ..
+          - rm -rf dtk-old-bundle
+          - ''
+          - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes  -y" '
+          - apt build-dep . -y
+          - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
+          - uname -a
+          - sed -i 's/dh \$@ --parallel/dh \$@/' debian/rules
+          - '# Gitee的配置太低了'
+          - dpkg-buildpackage  -b -us -uc
+          - cd ..
+          - ls -all
+          - pwd
+          - ''
+          - 'mkdir target '
+          - for f in $(find . -type f -name "*.deb")
+          - do
+          - '    mv $f target'
+          - done
+        artifacts:
+          - name: BUILD_ARTIFACT
+            path:
+              - ../target
+        notify: []
+        strategy:
+          retry: '0'
+  - name: stage-29f3ffbb
+    displayName: 上传
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        dependArtifact: BUILD_ARTIFACT
+        artifactName: output
+        notify: []
+        strategy:
+          retry: '0'
--- a/.workflow/pipeline-dtk-build-aarch64.yml
+++ b/.workflow/pipeline-dtk-build-aarch64.yml
@@ -0,0 +1,48 @@
+version: '1.0'
+name: pipeline-dtk-build-aarch64
+displayName: dtk-build-aarch64
+triggers:
+  trigger: manual
+  push:
+    tags:
+      prefix:
+        - ''
+stages:
+  - name: stage-2c12cce1
+    displayName: 编译
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: execute@docker
+        name: execute_by_docker
+        displayName: 基于镜像的脚本执行
+        certificate: ''
+        image: docker.io/debian:buster
+        command:
+          - '# 请在此输入您想执行的脚本'
+          - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
+          - apt update
+          - export DEBIAN_FRONTEND=noninteractive
+          - echo "安装wget qemu-user-static"
+          - apt install git wget qemu-user-static xz-utils binfmt-support -y
+          - mkdir ../spark-store-git
+          - mv * ../spark-store-git
+          - git clone https://gitlink.org.cn/shenmo7192/debian-container-aarch64.git
+          - mv debian-container-aarch64/DEBIANARM.tar.xz .
+          - rm -rf debian-container-aarch64
+          - tar -xf DEBIANARM.tar.xz
+          - mkdir -p DEBIAN/root/build-spark
+          - mv ../spark-store-git DEBIAN/root/build-spark/spark-store
+          - wget https://gitee.com/spark-store-project/repo_auto_update_script/raw/master/spark-build-aarch64.sh && mv spark-build-aarch64.sh DEBIAN/root
+          - mv /usr/bin/qemu-aarch64-static DEBIAN/
+          - chroot DEBIAN /qemu-aarch64-static /bin/bash /root/spark-build-aarch64.sh
+          - ''
+          - ''
+        artifacts:
+          - name: BUILD_ARTIFACT
+            path:
+              - ./DEBIAN/root/build-spark/target
+        notify: []
+        strategy:
+          retry: '0'
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,143 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(spark_store)
-set(EXECUTABLE_NAME spark-store)
-
-# Begin Compilation Options
-
-# When set to ON, DTK Plugin for DDE platform will be built.
-# Note that only machines with DTK and dev packages installed can build the plugin.
-set(SPARK_BUILD_DTK_PLUGIN ON)
-
-# When set to ON, store will transmit telemetry even in Debug builds.
-set(SPARK_FORCE_TELEMETRY OFF)
-
-# End Compilation Options
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-#set(CMAKE_AUTOUIC ON)
-
-set(QT_VERSION 5)
-set(REQUIRED_LIBS
-    Core
-    Gui
-    Widgets
-    Network
-    Concurrent
-    LinguistTools)
-set(REQUIRED_LIBS_QUALIFIED
-    Qt5::Core
-    Qt5::Gui
-    Qt5::Widgets
-    Qt5::Network
-    Qt5::Concurrent)
-
-include_directories(inc)
-include_directories(plugin)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(PRE_CONFIGURE_FILE "src/gitver.cpp.in")
-set(POST_CONFIGURE_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/gitver.cpp")
-include(cmake/git_watcher.cmake)
-add_library(gitver STATIC ${POST_CONFIGURE_FILE})
-#target_include_directories(gitver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-add_dependencies(gitver check_git)
-
-set(SOURCE_FILES
-    src/main.cpp
-
-    resource/resource.qrc
-
-    gui/page/ui/settings.ui
-    gui/page/ui/homepage.ui
-    ${WRAPPED_UI_FILES}
-
-    inc/gitver.h
-    inc/deepinplatform.h
-    inc/dtk/spkdtkplugin.h
-    inc/spkutils.h src/spkutils.cpp
-    inc/telemetry/collectid.h
-    inc/spkqsshelper.h gui/spkqsshelper.cpp
-
-    inc/qt/elidedlabel.h gui/qt/elidedlabel.cpp
-
-    inc/spkwindow.h gui/spkwindow.cpp
-    inc/spktitlebar.h gui/spktitlebar.cpp
-    inc/spkiconbutton.h gui/spkiconbutton.cpp
-    inc/spkui_general.h gui/spkui_general.cpp
-    inc/spkmainwindow.h gui/spkmainwindow.cpp
-    inc/spkmsgbox.h gui/spkmsgbox.cpp
-    inc/spkdialog.h gui/spkdialog.cpp
-    inc/spkabout.h gui/spkabout.cpp
-    inc/spkloading.h gui/spkloading.cpp
-    inc/spksidebartree.h gui/spksidebartree.cpp
-    inc/spkappitem.h gui/spkappitem.cpp
-    inc/spkdownloadentry.h gui/spkdownloadentry.cpp
-    inc/spkpopup.h gui/spkpopup.cpp
-    inc/spkstretchlayout.h gui/spkstretchlayout.cpp
-    inc/spkfocuslineedit.h
-    inc/spknotifydot.h gui/spknotifydot.cpp
-    inc/spkimgviewer.h gui/spkimgviewer.cpp
-
-    inc/page/spkpagebase.h gui/page/spkpagebase.cpp
-    inc/page/spkpagehome.h gui/page/spkpagehome.cpp
-    inc/page/spkpageuitest.h gui/page/spkpageuitest.cpp
-    inc/page/spkpageapplist.h gui/page/spkpageapplist.cpp
-    inc/page/spkpageappdetails.h gui/page/spkpageappdetails.cpp
-    inc/page/spkpagedownloads.h gui/page/spkpagedownloads.cpp
-    inc/page/spkpagesettings.h gui/page/spkpagesettings.cpp
-
-    inc/pkgs/spkpkgmgrbase.h
-    inc/pkgs/spkpkgmgrpacman.h src/pkgs/spkpkgmgrpacman.cpp
-    inc/pkgs/spkpkgmgrapt.h src/pkgs/spkpkgmgrapt.cpp
-
-    inc/spkstore.h src/spkstore.cpp
-    inc/spkuimsg.h src/spkuimsg.cpp
-    inc/spklogging.h src/spklogging.cpp
-    inc/spkresource.h src/spkresource.cpp
-    inc/spkdownload.h src/spkdownload.cpp
-    inc/spkconfig.h src/spkconfig.cpp
-    )
-
-include(cmake/FindLibNotify.cmake)
-include(cmake/FindGlib.cmake)
-include(cmake/FindGdk3.cmake)
-
-include_directories(${GLIB_INCLUDE_DIRS})
-include_directories(${GDK3_INCLUDE_DIRS})
-set(LIBLINKING ${LIBLINKING}
-    gitver
-    ${LIBNOTIFY_LIBRARIES}
-    ${GLIB_LIBRARIES}
-    ${GDK3_LIBRARIES}
-    ${CMAKE_DL_LIBS})
-
-# Required for a good backtrace
-add_compile_options(-g)
-add_link_options(-rdynamic)
-
-# Find Qt before adding other build targets
-find_package(Qt${QT_VERSION} COMPONENTS ${REQUIRED_LIBS} REQUIRED)
-
-QT5_WRAP_UI(WRAPPED_UI_FILES
-            gui/page/ui/settings.ui
-            gui/page/ui/homepage.ui)
-
-add_custom_target(run_lupdate
-                  COMMAND lupdate . -ts lang/zh.ts
-                  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-
-qt5_add_translation(QM_FILES lang/zh.ts)
-
-add_executable(${EXECUTABLE_NAME} ${SOURCE_FILES} ${QM_FILES})
-
-if(SPARK_BUILD_DTK_PLUGIN)
-    add_subdirectory(plugin/dtkplugin)
-    add_dependencies(${EXECUTABLE_NAME} spkdtkplugin)
-endif()
-
-target_link_libraries(${EXECUTABLE_NAME} ${REQUIRED_LIBS_QUALIFIED} ${LIBLINKING})
-
-install(TARGETS ${EXECUTABLE_NAME} RUNTIME DESTINATION bin)
--- a/resource/stylesheets/titlebar_default_buttons.css
+++ b/resource/stylesheets/titlebar_default_buttons.css
--- a/DOCS/json-api-doc.md
+++ b/DOCS/json-api-doc.md
@@ -0,0 +1,48 @@
+# 基本格式
+0. 应用信息
+
+例子：https://cdn.d.store.deepinos.org.cn/store/tools/spark-store/app.json
+
+```json
+{
+    "Name": "星火应用商店",
+    "Version": "4.2.7.1",
+    "Filename": "spark-store_4.2.7.1_amd64.deb",
+    "Torrent_address": "spark-store_4.2.7.1_amd64.deb.torrent",
+    "Pkgname": "spark-store",
+    "Author": "shenmo <shenmo@spark-app.store>",
+    "Contributor": "shenmo <jifengshenmo@outlook.com>",
+    "Website": "https://www.spark-app.store/",
+    "Update": "2023-09-01 23:22:23",
+    "Size": "590.5 KB",
+    "More": "* 修复：aptss加锁失败现在会正常报错\n  * 新增：在aptss的特定操作时添加了提示\n  * 新增：在aptss提示加粗\n  * 调整：ssinstall验证支持使用cdn.d.获取",
+    "Tags": "community;ubuntu;deepin;uos;dtk5",
+    "img_urls": "[\"https://examine-spark.oss-cn-shanghai.aliyuncs.com/images/2023/09/01/411c32fd691544bb985ecba87d151ea0.png\",\"https://examine-spark.oss-cn-shanghai.aliyuncs.com/images/2023/09/01/f44b3c2242c045e28f1161980d805e0d.png\",\"https://examine-spark.oss-cn-shanghai.aliyuncs.com/images/2023/09/01/00263ba857894667bd99240558bec69c.png\",\"https://examine-spark.oss-cn-shanghai.aliyuncs.com/images/2023/09/01/6fd248ad9eea4ef18c9c4acc2a9d372d.png\"]",
+    "icons": "https://examine-spark.oss-cn-shanghai.aliyuncs.com/icons/2023/09/01/a88dd18cc1734396a02e7e3c6be59718.png"
+}
+```
+
+*注意：img_urls和icons的信息不保证有效！大部分是有效的，少部分app.json可能缺失此项目！*
+
+**对于icon和截图的获取需求请参考第三点**
+
+1. 对于某分类下的所有应用信息
+`{SOURCE_URL}/{ARCH}/{CATOGARY}/applist.json`
+说明：SOURCE_URL：线路链接，目前推荐 https://cdn.d.store.deepinos.org.cn，你也可以使用其他的星火线路
+ARCH：架构文件夹 x86是store或amd64-store，arm是aarch64-store。特别的，如果你使用非https://cdn.d.store.deepinos.org.cn的线路，你可能会发现amd64-store会返回404，因为不是所有的服务器都支持软连接
+CATOGARY：分类目录。参考 https://gitee.com/spark-store-project/spark-store/blob/dev/DOCS/spk-doc.md 中 store 直达的对应关系
+
+例子：https://cdn.d.store.deepinos.org.cn/aarch64-store/tools/applist.json
+
+2. 对于单个应用的应用信息
+`{SOURCE_URL}/{ARCH}/{CATOGARY}/{Package Name}/app.json`
+Package Name是包名。可从上级的applist.json读取
+
+例子：https://cdn.d.store.deepinos.org.cn/store/tools/spark-store/app.json
+
+3. 对应用截图和icon的获取
+
+`{SOURCE_URL}/{ARCH}/{CATOGARY}/{Package Name}/icon.png`
+`{SOURCE_URL}/{ARCH}/{CATOGARY}/{Package Name}/screen_n.png`(n=1-5)(至少为1，不是所有的都有到5. 404是正常的）
+
+
--- a/DOCS/spk-doc.md
+++ b/DOCS/spk-doc.md
@@ -0,0 +1,34 @@
+#### 调用参数(spk规则)
+
+* store直达
+
+该url应当遵循这种格式：`spk://store/web分类/包名`
+
+
+
+例如:
+
+[spk://store/games/store.spark-app.hmcl](spk://store/games/store.spark-app.hmcl)
+
+
+可选的web分类：
+
+| 分类名称 | web分类   　    |
+| -------- | -------------- |
+| 网络 | network        |
+| 社交 | chat           |
+| 音乐 | music          |
+| 视频 | video          |
+| 图像 | image_graphics       |
+| 游戏 | games          |
+| 办公 | office         |
+| 阅读 | reading        |
+| 开发 | development    |
+| 工具 | tools          |
+| 主题 | themes       |
+| 其他 | others         |
+
+
+* search搜索
+
+spk://search/pkgname
--- a/DOCS/write-preview-skeleton.md
+++ b/DOCS/write-preview-skeleton.md
@@ -0,0 +1,82 @@
+# 关于编写 "描述主体结构预览说明" 的规范
+
+1. 主体结构预览
+
+    一般以 `tree` 命令进行获取目录结构进行展示所需要描述的预览内容。
+
+2. 对主体结构中的内容单独说明
+    
+    并使用所用语言进行非侵入式独立描述，而不是在代码中填充说明与注释。
+    
+    在单行描述中，尽量不超过您认为最大的字符数量宽度，可以收缩内容的重要性。
+
+    在此种说明文档中，尽量使用您所描述的对象支持的代码注释，而不是以白底黑字进行描述。
+
+    对于规范的全部：主体结构 + 单独内容中进行简单(而不是简少)的说明。
+
+一个简单的例子，例如: 有关项目源代码结构的预览说明
+
+- 项目结构预览
+
+    ```
+    .
+    ├── assets
+    ├── debian
+    ├── DOCS
+    ├── patchs
+    ├── src
+    ├── tool
+    └── translations
+
+    10 directories, 9 files
+    ```
+
+- 来自 debian 目录的说明
+
+    ```shell
+    # 将此项目进行 debian 的标志，基于 debian 系列的发行版可对包含
+    # 此种目录的开源项目进行构建 deb 软件包。
+
+    # 1. 构建软件包(打包)
+    # 执行 dpkg-buildpackage 命令以尝试构建此软件包
+    dpkg-buildpackage
+    # 如果构建将会在上级目录中产生一个 deb，而源代码目录不会有任何变化。
+    
+    # 如果出现以下内容可忽视，仅需要查看是否已成功构建软件包:
+        # gpg: 已跳过 ""： 无效的用户ID 
+        # gpg: ...: clear-sign failed: 无效的用户ID
+        # dpkg-buildpackage: error: failed to sign .dsc file
+    ```
+
+- 来自 patchs 目录的说明
+
+    ```shell
+    # 一种用于可扩展的补丁，主要目的是为项目提供可选的应用方案，而不是直接堆砌到
+    # 当前项目的分支中。您可以认为所有分支都是主线分支。
+    # 例如:
+        # 主线稳定分支: master
+        # 主线开发分支: dev
+        # 主线其它:    ...
+
+    # 注意:
+    #   当您认为您所提交的内容并不会为主线带来 bug fix 之类的内容，请使用补丁。
+    #   当您所提交的内容会带来不可预知的问题的时候，或会改变目前主线的开发模式时，
+    #   此种方式可确保您提交的方案可被任意时间被弃用，而不是由其它维护者耗费精力
+    #   去试图移除您提交的内容，而不是等待由提交者进行新的维护。
+    ```
+
+- 来自其它的内容...可随时由任何人进行补充
+
+
+- 一些在关此种预览描述的文档
+
+    ```shell
+    # 此种描述还将出现在 `src/README.md` 的描述中。
+    # 当然，我预期会由其它维护者进行移动到 `DOCS` 之下。
+    
+    # 另外在 `patchs/zinface-community-cmake-build-system.patch` 补丁文件中，
+    # 也随附过一个简要的文档内容，而它是记录了 `Spark` 为名的构建模式。
+    
+    # 在未应用此补丁时，将不会出现在任何地方。
+    ```
+    
--- a/DOCS/内网部署.md
+++ b/DOCS/内网部署.md
@@ -0,0 +1,7 @@
+需要修改的内容：商店默认源位置，aptss获取apt-fast.conf和sparkstore.list的地址，ssinstall做安装检查的源位置
+
+服务器使用update.sh进行同步。
+
+为方便使用（其实是早期屎山使然），请将仓库放置于 `/home/ftp/spark-store`
+
+仓库管理相关代码请移步 [这里](https://gitee.com/spark-store-project/repo_auto_update_script)，update.sh请联系 @shenmo 获取
--- a/41
+++ b/41
@@ -0,0 +1,41 @@
+星火开源软件协议（Spark Opensource LICENSE）
+
+版权所有 (C) 2023 星火社区
+
+根据 GNU 通用公共许可证第三版（GPL v3），本软件是自由软件，您可以修改和再发布它。但是，为了维护原作者的权益并保护社区用户的权益，请遵守以下条款：
+
+1. 对本仓库下的所有文件生效：本许可证适用于本仓库（或项目）下的所有文件。任何使用、修改或再发布本软件的个人或组织都必须遵守本许可证。
+2. 版权声明和许可证文件：您不得移除、隐藏或更改本软件中包含的原作者的版权声明和许可证文件。保留原作者的权益信息对于维护开源软件生态系统至关重要。
+3. 版本标注： 如果您对本软件做出修改并再发布，您必须在醒目位置标注此版本并非星火社区官方提供。这样可以避免误导使用者认为该软件为星火社区官方提供的版本。此软件仅授权用于个人非盈利用途，任何将其用于商业目的或在盈利性组织中使用的行为均需事先获得星火社区的书面许可。
+4. 商标使用：您不得在再发布版本中使用“星火应用商店”、“Spark Store”或星火应用商店的Logo等可能误导使用者此软件由星火社区官方提供的信息。
+5. 服务条款：您使用星火商店软件的行为将被视为您同意星火在不侵犯您隐私的前提下搜集版本、日志等信息，以便于星火社区更好地为您提供服务。
+6. 仓库版权条款：为了更好的提供持续性服务，星火仅对个人用户免费开放服务仓库，如您或您的组织需要提供商业服务或者您的组织为盈利性组织，请联系星火社区获取商业授权。
+7. 禁止恶意行为和批量爬取： 用户或组织在使用本软件时，严禁进行任何形式的恶意行为，包括但不限于恶意攻击、滥用、破坏、批量爬取软件仓库等。恶意行为的定义由星火社区自行判断，违反者将被追究法律责任。
+8. 分发与再分发权利： 星火社区保留对其制作的软件包的分发权利。未经明确授权，禁止任何个人或组织将星火社区软件包用于商业目的或在未获得星火社区许可的情况下进行再分发。此条款旨在确保开源精神的同时，维护星火社区的知识产权。
+9. 商业应用限制：您不得使用本软件的代码开发商业应用，也不得在商业应用中使用本软件的代码，除非获得星火社区和火穗（沈阳）计算机软件开发有限公司的书面许可。
+10. 其他条款：除上述约定外，若您使用了星火商店的主程序或其部分代码，您应遵守 GPL v3 的所有其他条款和要求。若本协议条款的内容与GPL V3中的内容不同的，以本协议条款为准
+11. 其他约定：本许可以简体中文版本为最准确释义
+
+GPLV3许可证的完整文本可以在以下链接找到：https://www.gnu.org/licenses/gpl-3.0.html
+
+---------------------------------------------------------------------------------------------------------------------------------
+
+Spark Opensource LICENSE
+
+Copyright (C) 2023 The Spark Community
+
+This software is free software; you can modify and redistribute it under the terms of the GNU General Public License version 3 (GPL v3). However, to protect the rights of the original authors and the interests of the community users, please adhere to the following terms:
+
+1. Applicability to all files in this repository: This license applies to all files in this repository (or project). Any individuals or organizations that use, modify, or redistribute this software must comply with this license.
+2. Copyright notice and license files: You must not remove, hide, or modify the copyright notice and license files of the original authors included in this software. Preserving the rights information of the original authors is essential for maintaining the open-source software ecosystem.
+3. Version annotation: If you modify and redistribute this software, you must mark in a prominent position that this version is not officially provided by the Spark community. This avoids misleading users into thinking that the software is an official version provided by the Spark community. This software is licensed for personal, non-profit use only, and any use of it for commercial purposes or in for-profit organizations requires the prior written permission of the Spark Community.
+4. Trademark usage: You are not allowed to use terms such as "Spark App Store," "Spark Store," or the logo of Spark App Store in redistributed versions, as they may mislead users into believing that the software is provided by the official Spark community.
+5. Terms of Service: Your use of the software of Spark Store will be deemed as your consent to collect version, log and other information on the premise of not violating your privacy, so as to facilitate the Spark community to provide you with better services.
+6. Warehouse copyright terms: In order to better provide continuous services, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact Spark community to obtain commercial authorization.
+7. Prohibited malicious behavior and mass crawling: Users or organizations are strictly prohibited to engage in any form of malicious behavior when using the software, including but not limited to malicious attacks, abuse, destruction, and mass crawling of software warehouses. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible.
+8. Distribution and redistribution rights: Spark Community reserves the right to distribute the software packages it produces. Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community.
+9. Business Application Restriction: You are not permitted to utilize the code of this software for developing commercial applications, nor are you allowed to integrate the code of this software into commercial applications without obtaining written consent from both the Spark Community and Flamescion (Shenyang) Computer Software Development Co., Ltd.
+10. Other Terms: In addition to the above provisions, if you use the main program or any part of the code of Spark Store, you must comply with all other terms and requirements of GPL v3. In case of any inconsistency between the terms of this agreement and those of GPL v3, the terms of this agreement shall prevail.
+11. Additional Agreements: This license shall be interpreted most accurately in its Simplified Chinese version.
+
+You can find the full text of GPLV3 license at: https://www.gnu.org/licenses/gpl-3.0.html
--- a/FAQ.md
+++ b/FAQ.md
@@ -0,0 +1,91 @@
+# FAQ
+## Spark Store FAQ and Support Guide
+
+### Introduction
+The Spark Store is an application store designed for Linux users, supporting various Linux distributions. Below are some frequently asked questions and their solutions. Please note that this document primarily targets ordinary users unfamiliar with Linux and the `apt` package management system.
+
+---
+
+### Communication and Feedback
+**Q: How can I participate in discussions?**  
+**A:** You can click [this link](https://bbs.spark-app.store/)  to enter the Spark Forum for communication.  
+> 📣 You can also join our QQ Discussion Groups: 872690351 and 865927727.
+
+---
+
+### Difference Between arm64 and amd64
+
+#### arm64
+
+* Full Name: Advanced RISC Machine 64-bit  
+* Primary Use: Mainly applied to mobile devices, embedded systems, and some new servers and desktop computers  
+* Advantages: Low power consumption, high efficiency, suitable for battery-powered and heat-sensitive devices  
+* Major Manufacturers: Apple, Qualcomm, HiSilicon, Phytium, etc.
+
+#### amd64
+
+* Full Name: AMD 64-bit, also known as x86_64  
+* Primary Use: Mainly applied to desktop computers, laptops, and servers  
+* Advantages: High performance, suitable for compute-intensive applications  
+* Major Manufacturers: Intel and AMD
+
+The main difference between the two lies in their instruction sets and application scenarios. amd64 is typically used for high-performance computers and servers, while arm64 is more commonly used in environments with strict power consumption requirements.
+
+#### How to Check:
+
+- Open the Linux terminal  
+- Enter the command `uname -m` or `arch` and press `Enter`  
+- You will see your computer's processor architecture (e.g., x86_64, aarch64)
+
+---
+
+### Domestic Architecture Support
+**Q: My computer uses a domestic architecture. How can I obtain the Spark Store?**  
+**A:** Currently, the Spark Store supports **ARM** architecture and **LoongArch New World** architecture. You can download deb packages (software installation packages) for arm64 and loong64 architectures.  
+> ⚠️ Please note that this support is experimental. If you encounter issues, please report them to us via the Spark Forum or QQ Discussion Group.
+
+---
+
+### Dependency Installation Issues
+**Q: What if dependency package installation fails?**  
+**A:** If you are using UOS or deepin, do not install dependencies. Only some Linux distributions require dependency packages. For unsupported distributions, you may need to compile manually. See the [Spark Store Introduction](https://gitee.com/spark-store-project/spark-store/blob/dev/README.md).   
+> 💡 When errors occur, run `sudo apt update` first and try again. If the issue persists, refer to the above and seek help via communication platforms.
+
+---
+
+### Software Submission and Updates
+**Q: Where can I submit software?**  
+**A:** You can find the "Submit Application" option in the top-right menu of the app store interface. We provide two submission methods: **Submission Tools** and **Online Platform**.
+
+---
+
+### Support for Non-deepin/UOS Users
+**Q: Can I use Spark Store if I am not a deepin/UOS user?**  
+**A:** It can be installed normally on Debian-based distributions. For example, if you use Ubuntu 22.04, install directly. For Ubuntu 20.04 / Debian 10 / Debian 11, install dependencies first. Additionally, experience may not be guaranteed if installed on non-Debian Linux distributions.
+
+---
+
+### Installation Methods
+**Q: Can I install using `dpkg -i`?**  
+**A:** We **strongly advise against this**. In the directory where the package is saved, use `sudo apt install ./spark-store*.deb` or a graphical installer like Gdebi.  
+> ⚠️ Direct use of `dpkg` generally does not handle software dependencies, potentially causing installation failures or damaging the system's dependency environment.
+
+---
+
+### System Updates
+**Q: Will Spark Store affect normal system updates?**  
+**A:** No. The current version of Spark Store has decoupled its application sources from system sources and will not affect normal system updates.
+
+---
+
+### Reporting Issues and Application Removal
+**Q: Some applications are outdated or invalid. I want them removed.**  
+**A:** You can [report issues here](https://gitee.com/spark-store-project/software_-issue). 
+
+---
+
+### Installing Spark Store
+If you need to install Spark Store, visit the [Release Page](https://gitee.com/spark-store-project/spark-store/releases),  find the latest version, and download the installer suitable for your system.  
+
+> ⚠️ Special Note: If you are using Debian 10 / Debian 11 or Ubuntu 20.04, you need to download the dependency supplementary package additionally. After downloading, extract multiple times until dependency instructions are visible, then follow steps to install dependencies. For Ubuntu 22.04 and later, no dependency package is required. Follow the above instructions to install the main program directly.
+---
--- a/FAQ.zh.md
+++ b/FAQ.zh.md
@@ -0,0 +1,91 @@
+# FAQ
+## 星火应用商店 FAQ 与支持指南
+
+### 简介
+星火应用商店是一个面向 Linux 用户的应用商店，支持多种不同的 Linux 发行版。以下是一些常见问题及解决方案。请注意，该文档主要面向对 Linux 和 `apt` 软件包管理系统不熟悉的普通用户。
+
+---
+
+### 交流与反馈
+**Q: 如何参与交流讨论？**  
+**A:** 您可以点击[此链接](https://bbs.spark-app.store/)进入星火社区论坛进行交流。  
+> 📣 您还可以加入我们的 QQ 交流群，群号是 872690351 和 865927727。
+
+---
+
+### arm64 与 amd64 的区别
+
+#### arm64
+
+* 全称: Advanced RISC Machine 64-bit；
+* 主要用途: 主要应用于移动设备、嵌入式系统以及一些新型的服务器和桌面计算机；
+* 优势: 低功耗、高效率，适合用在电池驱动和热敏感的设备；
+* 主要生产商: 苹果、高通、海思、飞腾等。
+
+#### amd64
+
+* 全称: AMD 64-bit, 也被称为 x86_64；
+* 主要用途: 主要应用于桌面计算机、笔记本以及服务器；
+* 优势: 高性能，适用于计算密集型应用；
+* 主要生产商: Intel 和 AMD。
+
+两者最主要的不同在于指令集和应用场景。amd64 通常用于高性能需求的计算机和服务器，而arm64则更多应用于功耗要求更严格的场合。
+
+#### 查看方法：
+
+- 打开 Linux 终端；
+- 输入命令 `uname -m` 或 `arch` 并按 `Enter` 键执行；
+- 您将看到您计算机的处理器架构（可能是 x86_64, aarch64 等）。
+---
+
+### 国产架构支持
+**Q: 我的计算机属于国产架构，如何获取星火应用商店？**  
+**A:** 目前，星火商店支持 **ARM** 架构和**龙芯·新世界**架构的国产芯片。您可以下载适用于 arm64 架构和 loong64 架构的 deb 包（软件安装包）。  
+> ⚠️ 请注意，这项支持是实验性的。若遇到问题，请在星火社区论坛或 QQ 交流群向我们反馈。
+
+---
+
+### 安装依赖问题
+**Q: 安装依赖包出现错误，怎么办？**  
+**A:** 如果您使用 UOS 或 deepin，请不要安装依赖包。仅有部分 Linux 发行版需要安装依赖包，此外对于不在支持列表中的发行版可能需要您自行编译安装，详见[星火应用商店简介](https://gitee.com/spark-store-project/spark-store/blob/dev/README.zh.md)。
+> 💡 出现错误时，请运行 `sudo apt update` 后再尝试安装。如果问题仍然存在，请参考上文，进入交流平台寻求帮助。
+
+---
+
+### 投稿与应用更新
+**Q: 在哪里可以投稿软件？**  
+**A:** 您可以在应用商店界面的右上角菜单找到“投递应用”的选项，我们提供了**投递工具**和**在线平台**两种投稿方案。
+
+---
+
+### 非 deepin/UOS 用户支持
+**Q: 我不是 deepin/UOS 用户，可以使用星火应用商店吗？**  
+**A:** 在 Debian 系发行版可正常安装使用。例如，如果您使用 Ubuntu 22.04，请直接安装；对于 Ubuntu 20.04 / Debian 10 / Debian 11，请先安装依赖包。此外，如果您在非 Debian 系 Linux 发行版安装使用星火应用商店，软件的体验可能无法得到保证。
+
+---
+
+### 安装方法
+**Q: 我可以用 `dpkg -i` 安装吗？**  
+**A:** 我们**极不建议您这样做**。请在安装包保存目录下，使用 `sudo apt install ./spark-store*.deb` 安装，或使用 Gdebi 等图形化安装器。  
+> ⚠️ 直接使用 `dpkg` 一般不会处理软件依赖，可能致使安装失败、破坏系统依赖环境。
+
+---
+
+### 系统更新
+**Q: 星火应用商店会影响系统正常更新吗？**  
+**A:** 不会，当前版本的星火应用商店已将应用源与系统源解耦合，不会影响系统的正常更新。
+
+---
+
+### 报告问题和应用下架
+**Q: 有些应用已经过时或者失效了，我想让它下架。**  
+**A:** 您可以[前往这里](https://gitee.com/spark-store-project/software_-issue)报告问题。
+
+---
+
+### 安装星火应用商店
+如果您需要安装星火应用商店，请打开 [Release 页面](https://gitee.com/spark-store-project/spark-store/releases)，找到最新版本，并选择适用于当前系统的安装包下载。
+
+> ⚠️ 特别提示: 如果您在使用 Debian 10 / Debian 11 或 Ubuntu 20.04，则需要额外下载依赖补充包；您需要在下载完依赖包后，解压多次直至内部的依赖包使用说明可见，按照步骤安装依赖。对于 Ubuntu 22.04 以后的操作系统版本，您无需安装依赖包，按照上面的操作直接安装本体程序即可。
+
+---
--- a/6
+++ b/6
@@ -4,12 +4,12 @@ pipeline {
    stage('build') {
      agent {
        docker {
-          image 'jerry979/dtke:5.11'
+          image 'jerry979/dtke:5.11.1'
        }

      }
      steps {
-        sh 'mkdir build && cd build && cmake .. && make -j'
+        sh 'mkdir build && cd build && qmake .. && make '
        archiveArtifacts(artifacts: 'build/src/spark-store', allowEmptyArchive: true, defaultExcludes: true)
      }
    }
@@ -30,4 +30,4 @@ pipeline {
    }

  }
-}
+}
--- a/1348
+++ b/1348
--- a/Logo-Spark.png
+++ b/Logo-Spark.png
--- a/Logo-Spark.png.bak
+++ b/Logo-Spark.png.bak
--- a/README.md
+++ b/README.md
@@ -1,73 +1,179 @@
-#  星火应用商店
+# Spark Store
+[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers)  [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members)
+![star](https://gitcode.com/spark-store-project/spark-store/star/badge.svg)


-众所周知，国内的Linux应用比较少，wine应用难以获取，优质工具分散在民间各大论坛，无法形成合力，难以改善生态
+## Introduction  

-生态构建需要的不是某一方的单打独斗，而是人人行动起来，汇聚星火，产生燎原之势
+Welcome to the **Spark Store**! This is an application store designed for Linux platform users, aiming to address the issues of fragmented and difficult-to-obtain software within the Linux ecosystem. Regardless of your Linux distribution, you may find suitable software packages here.

-我们创建了这个应用商店，广泛收录大家需要的软件包，搜集优质小工具，主动适配wine应用，存放到储存库供大家获取
+The number of Linux applications is relatively limited, and obtaining Wine software can also be challenging. Excellent development kits and tool resources are scattered across various communities and forums, making it difficult for the entire ecosystem to achieve comprehensive improvement.

-我们支持：Deepin 20 ; Ubuntu 20.04 LTS ; UOS Home 20
+Ecosystem construction does not rely on isolated individual efforts but requires full community participation. Only when everyone's "spark" gathers in one place can it ignite a prairie fire.

-希望看到这里的人也可以加入我们的队伍，开发或者投递应用都很欢迎，共同构建Linux应用生态
+To improve this situation, we have launched the Spark Store. The Spark Community extensively collects software packages for various user needs, aggregates high-quality small tools, and proactively adapts Wine applications. All resources are stored in our repository, allowing users to conveniently access these applications.

-### [在这里投稿](http://upload.spark-app.store)
+**Currently supported Linux distributions include (but are not limited to):**

-web页面部分正在开发当中，详情请见[web仓库](https://gitee.com/deepin-community-store/DCSAPP_WEB)
+- **amd64 Architecture:** deepin 20 / deepin 23 / Ubuntu 20.04 / Ubuntu 22.04 / UOS Home Edition 20 / Debian 11+
+- **arm64 Architecture:** UOS Professional Edition 1060 / Ubuntu 22.04 / deepin 23
+- **loong64 Architecture:** deepin 23
+
+> Special Note: Spark Store also supports all Ubuntu OS versions newer than Ubuntu 22.04, such as Ubuntu 22.10, 23.04, 23.10, etc. Additionally, Spark Store may adapt to other Linux distributions beyond the listed platforms; you may conduct installation tests accordingly.
+
+**Important Notice:** This software cannot guarantee continuous availability, uninterrupted operation, or meeting specific performance requirements. The Spark community makes no commitment to the functional completeness, stability, or error-free operation of this software. For example, if you plan to use it on UOS Professional Edition (or other similar specific platforms), please ensure you understand and enable the "Developer Mode" features. Basic troubleshooting capabilities are required. It is important to note that the Spark community cannot conduct extensive testing on some special platforms. Therefore, using the Spark Store client on these platforms may lead to various issues such as system update failures or data loss. Using this software indicates your understanding and acceptance that all risks must be borne by the user.
+
+## About Team Collaboration
+
+Organization Repository Links:
+
+https://gitee.com/spark-store-project/spark-store  
+
+https://gitcode.com/spark-store-project/spark-store   
+
+https://github.com/spark-store-project/spark-store  
+
+Refer to [this link](https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo) for detailed documentation on branch management.  
+
+We warmly welcome you to join our development team. Whether you wish to participate in development or plan to submit applications, you can find your place here to jointly promote the development of the Linux application ecosystem.
+
+You can track our Issue processing status in real-time via the [Issue Board](https://gitee.com/spark-store-project/spark-store/board).  
+
+If you have software packages to submit, please [click here to contribute](https://wiki.spark-app.store/#/Submit/Submit).  
+
+## Table of Contents
+
+- [Read the Copyright Notice](#read-the-copyright-notice)
+- [Determine Your System Architecture](#determine-your-system-architecture)
+- [System Support and Installation Instructions](#system-support-and-installation-instructions)
+  - [For deepin Users](#for-deepin-users)
+  - [For Ubuntu Users](#for-ubuntu-users)
+  - [For Debian Users](#for-debian-users)
+- [Frequently Asked Questions (FAQ)](#frequently-asked-questions-faq)
+- [Contact and Feedback](#contact-and-feedback)
+
+---
+
+## Read the [Copyright Notice](LICENSE)


-#### 说明
+## Determine Your System Architecture

-当前服务器线路列表（项目中包含）：
+Before installing any software, you need to know which architecture your computer is running on (e.g., x86_64/amd64 or aarch64/arm64), which also applies to the Spark Store.

-```
-https://d.store.deepinos.org.cn/
-https://store.deepinos.org.cn/
-```
+**How to Check:**

-#### 调用参数(spk规则)
+1. Open the Linux terminal.
+2. Enter the command `uname -m` or `arch` and press `Enter`.

-参数只有一个Url，该url应当遵循这种格式：`spk://<任意合法字符>/web分类/包名`
+You will see the terminal output result, which helps determine your system architecture. Examples:

-例如:
+- If you see `x86_64`, your system is amd64 architecture.
+- If you see `aarch64`, your system is arm64 architecture.

-[spk://abcdefg/games/store.spark-app.hmcl](spk://abcdefg/games/store.spark-app.hmcl)
+Based on this result, you need to download the corresponding version of the Spark Store installer to use it properly.

+---

-可选的web分类：
+## System Support and Installation Instructions

-| 分类名称 | web分类   　    |
-| -------- | -------------- |
-| 网络应用 | network        |
-| 社交沟通 | chat           |
-| 音乐欣赏 | music          |
-| 视频播放 | video          |
-| 图形图像 | graphics       |
-| 游戏娱乐 | games          |
-| 办公学习 | office         |
-| 阅读翻译 | reading        |
-| 编程开发 | development    |
-| 系统工具 | tools          |
-| 主题美化 | beautify       |
-| 其他应用 | others         |
+Based on your Linux distribution and system architecture, here are detailed steps to install Spark Store.

+### For deepin Users

+#### For deepin Users

-#### 如何编译
+1. **Download and Install**

-Deepin V20/UOS 系统下, 安装依赖
+   You can directly search for `Spark Store` in the deepin App Store for installation, or copy this link to your browser address bar to jump to the deepin App Store installation page.

-```shell
-sudo apt install qt5-default libdtkcore-dev libdtkwidget-dev qtwebengine5-dev libnotify-dev
-```
+   > appstore://deepin-home-appstore-client?app_detail_info/spark-store

-```shell
-git clone https://gitee.com/deepin-community-store/spark-store.git
-cd spark-store
-mkdir build
-cd build
-qmake ..
-make -j
-```
+   Versions published in the deepin App Store may not be the latest. To use the latest version, visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) and download the latest version for deepin, then install it.

-./build文件下的spark-store即为可执行文件
+   Assuming you downloaded the installer to the Downloads folder under your home directory, we recommend using the `apt` tool for installation to avoid potential dependency issues:
+
+   ```shell
+   cd ~/Downloads
+   sudo apt install ./spark-store*.deb
+   ```
+
+### For Ubuntu Users
+
+#### For Ubuntu 20.04 Users
+
+1. **Download Dependencies**
+   * Visit the [Spark Store Dependency Package Download Page](https://gitee.com/spark-store-project/spark-store-dependencies/releases) to download the latest dependency package;
+   * Extract the dependency package multiple times until you see numerous `.deb` installation packages;
+   * Follow the instructions inside the dependency package to install all dependencies at once.
+
+2. **Download and Install**
+
+   Visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) to download and install the installer matching your computer's architecture.
+
+   Assuming you downloaded the installer to the Downloads folder under your home directory, we recommend using the `apt` tool for installation to avoid potential dependency issues:
+
+   ```shell
+   cd ~/Downloads
+   sudo apt install ./spark-store*.deb
+   ```
+
+#### For Ubuntu 22.04 and Newer Ubuntu Versions
+1. **No Dependency Package Required**
+
+2. **Download and Install**
+
+   Visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) to download and install the installer matching your computer's architecture.
+
+   Assuming you downloaded the installer to the Downloads folder under your home directory, we recommend using the `apt` tool for installation to avoid potential dependency issues:
+
+   ```shell
+   cd ~/Downloads
+   sudo apt install ./spark-store*.deb
+   ```
+
+### For Debian Users
+
+#### For Debian 11 Users
+
+1. **Download Dependencies**
+   * Visit the [Spark Store Dependency Package Download Page](https://gitee.com/spark-store-project/spark-store-dependencies/releases) to download the latest dependency package;
+   * Extract the dependency package multiple times until you see numerous `.deb` installation packages;
+   * Follow the instructions inside the dependency package to install all dependencies at once.
+
+2. **Download and Install**
+
+   Visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) to download and install the installer.
+
+#### For Debian 12+ Users
+
+1. **No Dependency Package Required**
+
+2. **Download and Install**
+
+   Visit the Spark Store [Gitee Release Page](https://gitee.com/spark-store-project/spark-store/releases) or [Gitcode Release Page](https://gitcode.com/spark-store-project/spark-store/releases) to download and install the installer matching your computer's architecture.
+
+   Assuming you downloaded the installer to the Downloads folder under your home directory, we recommend using the `apt` tool for installation to avoid potential dependency issues:
+
+   ```shell
+   cd ~/Downloads
+   sudo apt install ./spark-store*.deb
+   ```
+
+---
+
+## Frequently Asked Questions (FAQ)
+
+Please refer to the [Spark Store FAQ and Support Guide](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md);  
+For advanced users requiring custom aptss config configuration, please refer to the [aptss Repository](https://gitee.com/GXDE-OS/aptss).
+
+---
+
+## Contact and Feedback
+
+- If you have any questions or suggestions, please submit issues via email or the [Issue Page](https://gitee.com/spark-store-project/spark-store/issues);
+- If you want to follow our development progress, visit the [Spark Store Board](https://gitee.com/spark-store-project/spark-store/board) for more information;
+- Welcome to visit the [Spark Community Forum](https://bbs.spark-app.store/) to join discussions;
+- Our QQ Discussion Group: 872690351 and 865927727;
+- If you or your organization requires commercial support, please leave a message for consultation.
+---
--- a/README.zh.md
+++ b/README.zh.md
@@ -0,0 +1,204 @@
+#  星火应用商店
+[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers)  [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members)
+![star](https://gitcode.com/spark-store-project/spark-store/star/badge.svg)
+
+
+## 简介
+
+欢迎来到**星火应用商店**！这是一个为 Linux 平台用户设计的应用商店，旨在解决 Linux 生态下应用分散、难以获取的问题。无论您使用什么类型的 Linux 发行版，在这里都有可能找到适合您的软件包。
+
+Linux 应用的数量相对有限，Wine 软件的可获取性也颇为困难。优秀的开发套件和工具资源散布在各大社区和论坛之间，这种分散化让整个生态系统难以得到全面的提升。
+
+生态系统的构建并非依赖个体的孤立努力，而需要全社区共同参与。只有当大家的“星火”聚集一处，方可引发“燎原之势”。
+
+为了改善这一现状，我们推出了星火应用商店。星火社区广泛地收录了各种用户需求的软件包，汇集了高质量的小工具，并主动对 Wine 应用进行了适配，一切都储存在我们的软件库中，使得用户可以方便地获取这些应用。
+
+**当前支持的 Linux 发行版包括（但不限于）：**
+
+- **amd64 架构：** deepin 20 / deepin 23 / Ubuntu 20.04 / Ubuntu 22.04 / UOS 家庭版 20 / Debian 11＋
+- **arm64 架构：** UOS 专业版 1060 / Ubuntu 22.04 / deepin 23
+- **loong64 架构：** deepin 23
+
+> 特别说明：星火应用商店还支持所有版本高于 Ubuntu 22.04 的 Ubuntu 操作系统，例如 Ubuntu 22.10、23.04、23.10 等。此外星火应用商店也可能适配除上述平台的其他 Linux 发行版，您可自行进行安装测试。
+
+**重要须知：** 本软件无法保证持续可用、无中断运行或满足特定性能要求。星火社区对其功能完整性、稳定性及无错误运行不作任何承诺。例如，若您计划在 UOS 专业版（或其他类似特定平台）上使用，请务必了解并启用“开发者模式”相关功能。请确保您具备基础的故障排查能力。需要明确的是，星火社区无法在部分特殊平台上进行广泛测试。因此，在这些平台上使用星火应用商店客户端可能会导致一系列问题，如系统更新失败、数据丢失等；使用该软件，即代表您理解并同意所有风险需由用户自行承担。
+
+
+
+## 关于团队协作
+
+组织仓库链接：
+
+https://gitee.com/spark-store-project/spark-store
+
+https://gitcode.com/spark-store-project/spark-store 
+
+https://github.com/spark-store-project/spark-store
+
+参见[此链接](https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo)以获取分支管理相关的详细文档。
+
+我们热忱欢迎您加入我们的开发团队。无论您是希望参与开发，还是计划提交应用，都能在这里找到属于您的一席之地，共同推动 Linux 应用生态的发展。
+
+您可以通过以下链接，实时跟踪我们的 Issue 处理状态：[Issue 看板](https://gitee.com/spark-store-project/spark-store/board)。
+
+若您有软件包需要提交，敬请[点击此处进行投稿](https://wiki.spark-app.store/#/Submit/Submit)。
+
+
+
+
+## 目录
+
+- [星火应用商店](#星火应用商店)
+  - [简介](#简介)
+  - [关于团队协作](#关于团队协作)
+  - [目录](#目录)
+  - [阅读版权声明](#阅读版权声明)
+  - [确定你的系统架构](#确定你的系统架构)
+  - [系统支持与安装指引](#系统支持与安装指引)
+    - [对于 deepin 用户](#对于-deepin-用户)
+      - [对于 deepin 用户](#对于-deepin-用户-1)
+    - [对于 Ubuntu 用户](#对于-ubuntu-用户)
+      - [对于 Ubuntu 20.04 用户](#对于-ubuntu-2004-用户)
+      - [对于 Ubuntu 22.04 及更高版本的 Ubuntu 用户](#对于-ubuntu-2204-及更高版本的-ubuntu-用户)
+    - [对于 Debian 用户](#对于-debian-用户)
+      - [对于 Debian 11 用户](#对于-debian-11-用户)
+      - [对于 Debian 12+ 用户](#对于-debian-12-用户)
+  - [常见问题（FAQ）](#常见问题faq)
+  - [联系与反馈](#联系与反馈)
+
+---
+
+## 阅读[版权声明](LICENSE)
+
+
+## 确定你的系统架构
+
+在安装任何软件之前，您需要知道你的计算机运行在何种架构之上（如 x86_64/amd64 或 aarch64/arm64），对于星火应用商店亦是如此。
+
+**如何检查：**
+
+1. 打开 Linux 终端。
+2. 输入命令 `uname -m` 或 `arch` 并按 `Enter` 键执行。
+
+您会看到终端输出结果，借此您可判断计算机的系统架构。举例：
+
+- 如果您看到 `x86_64`，说明您的系统为 amd64 架构。
+- 如果您看到 `aarch64`，说明您的系统为 arm64 架构。
+
+根据这一结果，您需要下载对应版本的星火应用商店安装包以正常使用。
+
+---
+
+## 系统支持与安装指引
+
+根据您的 Linux 发行版和系统架构，以下是安装星火应用商店的详细步骤。
+
+### 对于 deepin 用户
+
+#### 对于 deepin 用户
+
+1.  **下载并安装**
+
+    您可直接在深度应用商店搜索 `星火应用商店` 安装，或复制此链接到浏览器地址栏，跳转至深度应用商店安装。 
+
+    > appstore://deepin-home-appstore-client?app_detail_info/spark-store
+
+
+    深度应用商店发布的版本可能不是最新的。若要使用最新版本，请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)并下载适用于 deepin 的最新版本，安装后即可使用。
+
+    假设您将安装包下载至用户目录下的 Downloads 文件夹，我们推荐您使用 `apt` 工具进行安装以避免潜在的依赖问题：
+
+    ```shell
+    cd ~/Downloads
+    sudo apt install ./spark-store*.deb
+    ```
+2. **使用更新器**
+    您可以在应用商店左下角找到更新按钮，点击即可查看更新列表。
+
+
+### 对于 Ubuntu 用户
+
+#### 对于 Ubuntu 20.04 用户
+
+1. **下载依赖包**
+* 请访问[星火应用商店依赖包下载页面](https://gitee.com/spark-store-project/spark-store-dependencies/releases)，下载最新的依赖包；
+* 请多次解压依赖包，直至您可以看到诸多以 deb 结尾的安装包；
+* 依据依赖包内的说明，一次性安装所有的依赖包。
+
+
+2. **下载并安装**
+
+    请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+
+    假设您将安装包下载至用户目录下的 Downloads 文件夹，我们推荐您使用 `apt` 工具进行安装以避免潜在的依赖问题：
+
+    ```shell
+    cd ~/Downloads
+    sudo apt install ./spark-store*.deb
+    ```
+
+#### 对于 Ubuntu 22.04 及更高版本的 Ubuntu 用户
+1. **无需安装依赖包**
+
+
+2. **下载并安装**
+
+    请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+
+    假设您将安装包下载至用户目录下的 Downloads 文件夹，我们推荐您使用 `apt` 工具进行安装以避免潜在的依赖问题：
+
+    ```shell
+    cd ~/Downloads
+    sudo apt install ./spark-store*.deb
+    ```
+
+### 对于 Debian 用户
+
+#### 对于 Debian 11 用户
+
+1. **下载依赖包**
+* 请访问[星火应用商店依赖包下载页面](https://gitee.com/spark-store-project/spark-store-dependencies/releases)， 下载最新的依赖包；
+* 请多次解压依赖包，直到您可以看到诸多以 deb 结尾的安装包；
+* 依据依赖包内的说明，一次性安装所有的依赖包。
+
+2. **下载并安装**
+
+    请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)并下载，安装后即可使用。
+
+
+#### 对于 Debian 12+ 用户
+
+1. **无需安装依赖包**
+
+
+2. **下载并安装**
+
+    请访问星火应用商店 [Gitee 的 Release 页面](https://gitee.com/spark-store-project/spark-store/releases)或 [Gitcode 的 Release 页面](https://gitcode.com/spark-store-project/spark-store/releases)，下载和您电脑相同架构的安装包并安装。
+
+    假设您将安装包下载至用户目录下的 Downloads 文件夹，我们推荐您使用 `apt` 工具进行安装以避免潜在的依赖问题：
+
+    ```shell
+    cd ~/Downloads
+    sudo apt install ./spark-store*.deb
+    ```
+---
+
+## 常见问题（FAQ）
+
+请参见[星火应用商店 FAQ 与支持指南](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md)；
+
+对于高级用户，如需自定义配置 aptss config，请参阅 [aptss 软件仓库](https://gitee.com/GXDE-OS/aptss)。
+
+
+
+---
+
+## 联系与反馈
+
+- 如果您有任何问题或建议，请通过邮件或在 [Issue 页面](https://gitee.com/spark-store-project/spark-store/issues)上提交问题；
+- 如果你想关注我们的开发进度，可以跳转至[星火应用商店 Board](https://gitee.com/spark-store-project/spark-store/board) 获取更多信息；
+- 欢迎访问[星火社区论坛](https://bbs.spark-app.store/)加入讨论；
+- 我们的 QQ 交流群号：872690351 和 865927727；
+- 若您和您的组织需要寻求商业支持，请留言咨询。
+
+---
--- a/build_and_install.sh
+++ b/build_and_install.sh
@@ -0,0 +1,24 @@
+
+# Deepin V20/UOS 21 系统下, 安装依赖
+
+# ```shell
+# sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin
+
+# ```
+
+# Ubuntu 22.04 系统下, 安装依赖
+# ```shell
+# sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools
+
+# ```
+
+echo "Deepin V20/UOS 21 系统下, 安装依赖"
+echo "sudo apt install git qt5-default debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev fakeroot qtwayland5 qtwayland5-dev-tools dde-qt5wayland-plugin"
+
+echo "Ubuntu 22.04 系统下, 安装依赖"
+echo "sudo apt install git qtbase5-dev debhelper pkg-config qtchooser libqt5core5a libqt5gui5 libqt5widgets5 libqt5network5 libqt5concurrent5 libdtkcore-dev libdtkgui-dev  libdtkwidget-dev qttools5-private-dev libnotify-dev qtwebengine5-dev qtwayland5 qtwayland5-dev-tools"
+
+dpkg-buildpackage -j$(cat /proc/cpuinfo | grep processor | wc -l)
+sudo apt reinstall ../spark-store_*.deb
+
+rm ../spark-store_*
--- a/cmake/FindGdk3.cmake
+++ b/cmake/FindGdk3.cmake
@@ -1,52 +0,0 @@
-# - Try to find GDK 3
-# Once done, this will define
-#
-#  GDK3_FOUND - system has GDK 3
-#  GDK3_INCLUDE_DIRS - the GDK 3 include directories
-#  GDK3_LIBRARIES - link these to use GDK 3
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
-# Copyright (C) 2013 Igalia S.L.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Source from:
-# https://sources.debian.org/src/qtwebkit-opensource-src/5.212.0%7Ealpha2-21/Source/cmake/FindGDK3.cmake/
-
-find_package(PkgConfig)
-pkg_check_modules(GDK3 gdk-3.0)
-
-set(VERSION_OK TRUE)
-if (GDK3_VERSION)
-    if (GDK3_FIND_VERSION_EXACT)
-        if (NOT("${GDK3_FIND_VERSION}" VERSION_EQUAL "${GDK3_VERSION}"))
-            set(VERSION_OK FALSE)
-        endif ()
-    else ()
-        if ("${GDK3_VERSION}" VERSION_LESS "${GDK3_FIND_VERSION}")
-            set(VERSION_OK FALSE)
-        endif ()
-    endif ()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDK3 DEFAULT_MSG GDK3_INCLUDE_DIRS GDK3_LIBRARIES VERSION_OK)
--- a/cmake/FindGlib.cmake
+++ b/cmake/FindGlib.cmake
@@ -1,125 +0,0 @@
-# - Try to find Glib and its components (gio, gobject etc)
-# Once done, this will define
-#
-#  GLIB_FOUND - system has Glib
-#  GLIB_INCLUDE_DIRS - the Glib include directories
-#  GLIB_LIBRARIES - link these to use Glib
-#
-# Optionally, the COMPONENTS keyword can be passed to find_package()
-# and Glib components can be looked for.  Currently, the following
-# components can be used, and they define the following variables if
-# found:
-#
-#  gio:             GLIB_GIO_LIBRARIES
-#  gobject:         GLIB_GOBJECT_LIBRARIES
-#  gmodule:         GLIB_GMODULE_LIBRARIES
-#  gthread:         GLIB_GTHREAD_LIBRARIES
-#
-# Note that the respective _INCLUDE_DIR variables are not set, since
-# all headers are in the same directory as GLIB_INCLUDE_DIRS.
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Source from:
-# https://sources.debian.org/src/qtwebkit-opensource-src/5.212.0%7Ealpha2-21/Source/cmake/FindGLIB.cmake/
-
-find_package(PkgConfig)
-pkg_check_modules(PC_GLIB QUIET glib-2.0)
-
-find_library(GLIB_LIBRARIES
-             NAMES glib-2.0
-             HINTS ${PC_GLIB_LIBDIR}
-             ${PC_GLIB_LIBRARY_DIRS}
-             )
-
-# Files in glib's main include path may include glibconfig.h, which,
-# for some odd reason, is normally in $LIBDIR/glib-2.0/include.
-get_filename_component(_GLIB_LIBRARY_DIR ${GLIB_LIBRARIES} PATH)
-find_path(GLIBCONFIG_INCLUDE_DIR
-          NAMES glibconfig.h
-          HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${_GLIB_LIBRARY_DIR}
-          ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS}
-          PATH_SUFFIXES glib-2.0/include
-          )
-
-find_path(GLIB_INCLUDE_DIR
-          NAMES glib.h
-          HINTS ${PC_GLIB_INCLUDEDIR}
-          ${PC_GLIB_INCLUDE_DIRS}
-          PATH_SUFFIXES glib-2.0
-          )
-
-set(GLIB_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR})
-
-# Version detection
-if (EXISTS "${GLIBCONFIG_INCLUDE_DIR}/glibconfig.h")
-    file(READ "${GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" GLIBCONFIG_H_CONTENTS)
-    string(REGEX MATCH "#define GLIB_MAJOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-    set(GLIB_VERSION_MAJOR "${CMAKE_MATCH_1}")
-    string(REGEX MATCH "#define GLIB_MINOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-    set(GLIB_VERSION_MINOR "${CMAKE_MATCH_1}")
-    string(REGEX MATCH "#define GLIB_MICRO_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
-    set(GLIB_VERSION_MICRO "${CMAKE_MATCH_1}")
-    set(GLIB_VERSION "${GLIB_VERSION_MAJOR}.${GLIB_VERSION_MINOR}.${GLIB_VERSION_MICRO}")
-endif ()
-
-# Additional Glib components.  We only look for libraries, as not all of them
-# have corresponding headers and all headers are installed alongside the main
-# glib ones.
-foreach (_component ${GLIB_FIND_COMPONENTS})
-    if (${_component} STREQUAL "gio")
-        find_library(GLIB_GIO_LIBRARIES NAMES gio-2.0 HINTS ${_GLIB_LIBRARY_DIR})
-        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GIO_LIBRARIES)
-    elseif (${_component} STREQUAL "gobject")
-        find_library(GLIB_GOBJECT_LIBRARIES NAMES gobject-2.0 HINTS ${_GLIB_LIBRARY_DIR})
-        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GOBJECT_LIBRARIES)
-    elseif (${_component} STREQUAL "gmodule")
-        find_library(GLIB_GMODULE_LIBRARIES NAMES gmodule-2.0 HINTS ${_GLIB_LIBRARY_DIR})
-        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GMODULE_LIBRARIES)
-    elseif (${_component} STREQUAL "gthread")
-        find_library(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR})
-        set(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES)
-    elseif (${_component} STREQUAL "gio-unix")
-        # gio-unix is compiled as part of the gio library, but the include paths
-        # are separate from the shared glib ones. Since this is currently only used
-        # by WebKitGTK+ we don't go to extraordinary measures beyond pkg-config.
-        pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
-    endif ()
-endforeach ()
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLIB REQUIRED_VARS GLIB_INCLUDE_DIRS GLIB_LIBRARIES ${ADDITIONAL_REQUIRED_VARS}
-                                  VERSION_VAR   GLIB_VERSION)
-
-mark_as_advanced(
-        GLIBCONFIG_INCLUDE_DIR
-        GLIB_GIO_LIBRARIES
-        GLIB_GIO_UNIX_LIBRARIES
-        GLIB_GMODULE_LIBRARIES
-        GLIB_GOBJECT_LIBRARIES
-        GLIB_GTHREAD_LIBRARIES
-        GLIB_INCLUDE_DIR
-        GLIB_INCLUDE_DIRS
-        GLIB_LIBRARIES
-)
--- a/cmake/FindLibNotify.cmake
+++ b/cmake/FindLibNotify.cmake
@@ -1,58 +0,0 @@
-# - Try to find LibNotify
-# This module defines the following variables:
-#
-#  LIBNOTIFY_FOUND - LibNotify was found
-#  LIBNOTIFY_INCLUDE_DIRS - the LibNotify include directories
-#  LIBNOTIFY_LIBRARIES - link these to use LibNotify
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
-# Copyright (C) 2014 Collabora Ltd.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Source from:
-# https://sources.debian.org/src/qtwebkit-opensource-src/5.212.0~alpha2-21/Source/cmake/FindLibNotify.cmake/
-
-find_package(PkgConfig)
-pkg_check_modules(LIBNOTIFY QUIET libnotify)
-
-find_path(LIBNOTIFY_INCLUDE_DIRS
-          NAMES notify.h
-          HINTS ${LIBNOTIFY_INCLUDEDIR}
-          ${LIBNOTIFY_INCLUDE_DIRS}
-          PATH_SUFFIXES libnotify
-          )
-
-find_library(LIBNOTIFY_LIBRARIES
-             NAMES notify
-             HINTS ${LIBNOTIFY_LIBDIR}
-             ${LIBNOTIFY_LIBRARY_DIRS}
-             )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibNotify REQUIRED_VARS LIBNOTIFY_INCLUDE_DIRS LIBNOTIFY_LIBRARIES
-                                  VERSION_VAR   LIBNOTIFY_VERSION)
-
-mark_as_advanced(
-        LIBNOTIFY_INCLUDE_DIRS
-        LIBNOTIFY_LIBRARIES
-)
--- a/cmake/FindXCB.cmake
+++ b/cmake/FindXCB.cmake
@@ -1,51 +0,0 @@
-# - FindXCB
-#
-# Copyright 2015 Valve Coporation
-
-find_package(PkgConfig)
-
-if(NOT XCB_FIND_COMPONENTS)
-    set(XCB_FIND_COMPONENTS xcb)
-endif()
-
-include(FindPackageHandleStandardArgs)
-set(XCB_FOUND true)
-set(XCB_INCLUDE_DIRS "")
-set(XCB_LIBRARIES "")
-foreach(comp ${XCB_FIND_COMPONENTS})
-    # component name
-    string(TOUPPER ${comp} compname)
-    string(REPLACE "-" "_" compname ${compname})
-    # header name
-    string(REPLACE "xcb-" "" headername xcb/${comp}.h)
-    # library name
-    set(libname ${comp})
-
-    pkg_check_modules(PC_${comp} QUIET ${comp})
-
-    find_path(${compname}_INCLUDE_DIR NAMES ${headername}
-        HINTS
-        ${PC_${comp}_INCLUDEDIR}
-        ${PC_${comp}_INCLUDE_DIRS}
-        )
-
-    find_library(${compname}_LIBRARY NAMES ${libname}
-        HINTS
-        ${PC_${comp}_LIBDIR}
-        ${PC_${comp}_LIBRARY_DIRS}
-        )
-
-    find_package_handle_standard_args(${comp}
-        FOUND_VAR ${comp}_FOUND
-        REQUIRED_VARS ${compname}_INCLUDE_DIR ${compname}_LIBRARY)
-    mark_as_advanced(${compname}_INCLUDE_DIR ${compname}_LIBRARY)
-
-    list(APPEND XCB_INCLUDE_DIRS ${${compname}_INCLUDE_DIR})
-    list(APPEND XCB_LIBRARIES ${${compname}_LIBRARY})
-
-    if(NOT ${comp}_FOUND)
-        set(XCB_FOUND false)
-    endif()
-endforeach()
-
-list(REMOVE_DUPLICATES XCB_INCLUDE_DIRS)
--- a/cmake/git_watcher.cmake
+++ b/cmake/git_watcher.cmake
@@ -1,335 +0,0 @@
-# git_watcher.cmake
-# https://raw.githubusercontent.com/andrew-hardin/cmake-git-version-tracking/master/git_watcher.cmake
-#
-# Released under the MIT License.
-# https://raw.githubusercontent.com/andrew-hardin/cmake-git-version-tracking/master/LICENSE
-
-
-# This file defines a target that monitors the state of a git repo.
-# If the state changes (e.g. a commit is made), then a file gets reconfigured.
-# Here are the primary variables that control script behavior:
-#
-#   PRE_CONFIGURE_FILE (REQUIRED)
-#   -- The path to the file that'll be configured.
-#
-#   POST_CONFIGURE_FILE (REQUIRED)
-#   -- The path to the configured PRE_CONFIGURE_FILE.
-#
-#   GIT_STATE_FILE (OPTIONAL)
-#   -- The path to the file used to store the previous build's git state.
-#      Defaults to the current binary directory.
-#
-#   GIT_WORKING_DIR (OPTIONAL)
-#   -- The directory from which git commands will be run.
-#      Defaults to the directory with the top level CMakeLists.txt.
-#
-#   GIT_EXECUTABLE (OPTIONAL)
-#   -- The path to the git executable. It'll automatically be set if the
-#      user doesn't supply a path.
-#
-#   GIT_FAIL_IF_NONZERO_EXIT (optional)
-#   -- Raise a FATAL_ERROR if any of the git commands return a non-zero
-#      exit code. This is set to TRUE by default. You can set this to FALSE
-#      if you'd like the build to continue even if a git command fails.
-#
-# DESIGN
-#   - This script was designed similar to a Python application
-#     with a Main() function. I wanted to keep it compact to
-#     simplify "copy + paste" usage.
-#
-#   - This script is invoked under two CMake contexts:
-#       1. Configure time (when build files are created).
-#       2. Build time (called via CMake -P).
-#     The first invocation is what registers the script to
-#     be executed at build time.
-#
-# MODIFICATIONS
-#   You may wish to track other git properties like when the last
-#   commit was made. There are two sections you need to modify,
-#   and they're tagged with a ">>>" header.
-
-# Short hand for converting paths to absolute.
-macro(PATH_TO_ABSOLUTE var_name)
-    get_filename_component(${var_name} "${${var_name}}" ABSOLUTE)
-endmacro()
-
-# Check that a required variable is set.
-macro(CHECK_REQUIRED_VARIABLE var_name)
-    if(NOT DEFINED ${var_name})
-        message(FATAL_ERROR "The \"${var_name}\" variable must be defined.")
-    endif()
-    PATH_TO_ABSOLUTE(${var_name})
-endmacro()
-
-# Check that an optional variable is set, or, set it to a default value.
-macro(CHECK_OPTIONAL_VARIABLE_NOPATH var_name default_value)
-    if(NOT DEFINED ${var_name})
-        set(${var_name} ${default_value})
-    endif()
-endmacro()
-
-# Check that an optional variable is set, or, set it to a default value.
-# Also converts that path to an abspath.
-macro(CHECK_OPTIONAL_VARIABLE var_name default_value)
-    CHECK_OPTIONAL_VARIABLE_NOPATH(${var_name} ${default_value})
-    PATH_TO_ABSOLUTE(${var_name})
-endmacro()
-
-CHECK_REQUIRED_VARIABLE(PRE_CONFIGURE_FILE)
-CHECK_REQUIRED_VARIABLE(POST_CONFIGURE_FILE)
-CHECK_OPTIONAL_VARIABLE(GIT_STATE_FILE "${CMAKE_BINARY_DIR}/git-state-hash")
-CHECK_OPTIONAL_VARIABLE(GIT_WORKING_DIR "${CMAKE_SOURCE_DIR}")
-CHECK_OPTIONAL_VARIABLE_NOPATH(GIT_FAIL_IF_NONZERO_EXIT TRUE)
-
-# Check the optional git variable.
-# If it's not set, we'll try to find it using the CMake packaging system.
-if(NOT DEFINED GIT_EXECUTABLE)
-    find_package(Git QUIET REQUIRED)
-endif()
-CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE)
-
-
-set(_state_variable_names
-    GIT_RETRIEVED_STATE
-    GIT_HEAD_SHA1
-    GIT_IS_DIRTY
-    GIT_AUTHOR_NAME
-    GIT_AUTHOR_EMAIL
-    GIT_COMMIT_DATE_ISO8601
-    GIT_COMMIT_SUBJECT
-    GIT_COMMIT_BODY
-    GIT_DESCRIBE
-    # >>>
-    # 1. Add the name of the additional git variable you're interested in monitoring
-    #    to this list.
-)
-
-
-
-# Macro: RunGitCommand
-# Description: short-hand macro for calling a git function. Outputs are the
-#              "exit_code" and "output" variables.
-macro(RunGitCommand)
-    execute_process(COMMAND
-        "${GIT_EXECUTABLE}" ${ARGV}
-        WORKING_DIRECTORY "${_working_dir}"
-        RESULT_VARIABLE exit_code
-        OUTPUT_VARIABLE output
-        ERROR_VARIABLE stderr
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT exit_code EQUAL 0)
-        set(ENV{GIT_RETRIEVED_STATE} "false")
-
-        # Issue 26: git info not properly set
-        #
-        # Check if we should fail if any of the exit codes are non-zero.
-        if(GIT_FAIL_IF_NONZERO_EXIT)
-            string(REPLACE ";" " " args_with_spaces "${ARGV}")
-            message(FATAL_ERROR "${stderr} (${GIT_EXECUTABLE} ${args_with_spaces})")
-        endif()
-    endif()
-endmacro()
-
-
-
-# Function: GetGitState
-# Description: gets the current state of the git repo.
-# Args:
-#   _working_dir (in)  string; the directory from which git commands will be executed.
-function(GetGitState _working_dir)
-
-    # This is an error code that'll be set to FALSE if the
-    # RunGitCommand ever returns a non-zero exit code.
-    set(ENV{GIT_RETRIEVED_STATE} "true")
-
-    # Get whether or not the working tree is dirty.
-    RunGitCommand(status --porcelain)
-    if(NOT exit_code EQUAL 0)
-        set(ENV{GIT_IS_DIRTY} "false")
-    else()
-        if(NOT "${output}" STREQUAL "")
-            set(ENV{GIT_IS_DIRTY} "true")
-        else()
-            set(ENV{GIT_IS_DIRTY} "false")
-        endif()
-    endif()
-
-    # There's a long list of attributes grabbed from git show.
-    set(object HEAD)
-    RunGitCommand(show -s "--format=%H" ${object})
-    if(exit_code EQUAL 0)
-        set(ENV{GIT_HEAD_SHA1} ${output})
-    endif()
-
-    RunGitCommand(show -s "--format=%an" ${object})
-    if(exit_code EQUAL 0)
-        set(ENV{GIT_AUTHOR_NAME} "${output}")
-    endif()
-
-    RunGitCommand(show -s "--format=%ae" ${object})
-    if(exit_code EQUAL 0)
-        set(ENV{GIT_AUTHOR_EMAIL} "${output}")
-    endif()
-
-    RunGitCommand(show -s "--format=%ci" ${object})
-    if(exit_code EQUAL 0)
-        set(ENV{GIT_COMMIT_DATE_ISO8601} "${output}")
-    endif()
-
-    RunGitCommand(show -s "--format=%s" ${object})
-    if(exit_code EQUAL 0)
-        # Escape quotes
-        string(REPLACE "\"" "\\\"" output "${output}")
-        set(ENV{GIT_COMMIT_SUBJECT} "${output}")
-    endif()
-
-    RunGitCommand(show -s "--format=%b" ${object})
-    if(exit_code EQUAL 0)
-        if(output)
-            # Escape quotes
-            string(REPLACE "\"" "\\\"" output "${output}")
-            # Escape line breaks in the commit message.
-            string(REPLACE "\r\n" "\\r\\n\\\r\n" safe "${output}")
-            if(safe STREQUAL output)
-                # Didn't have windows lines - try unix lines.
-                string(REPLACE "\n" "\\n\\\n" safe "${output}")
-            endif()
-        else()
-            # There was no commit body - set the safe string to empty.
-            set(safe "")
-        endif()
-        set(ENV{GIT_COMMIT_BODY} "\"${safe}\"")
-    else()
-        set(ENV{GIT_COMMIT_BODY} "\"\"") # empty string.
-    endif()
-
-    # Get output of git describe
-    RunGitCommand(describe --tags ${object})
-    if(NOT exit_code EQUAL 0)
-        set(ENV{GIT_DESCRIBE} "unknown")
-    else()
-        set(ENV{GIT_DESCRIBE} "${output}")
-    endif()
-
-    # >>>
-    # 2. Additional git properties can be added here via the
-    #    "execute_process()" command. Be sure to set them in
-    #    the environment using the same variable name you added
-    #    to the "_state_variable_names" list.
-
-endfunction()
-
-
-
-# Function: GitStateChangedAction
-# Description: this function is executed when the state of the git
-#              repository changes (e.g. a commit is made).
-function(GitStateChangedAction)
-    foreach(var_name ${_state_variable_names})
-        set(${var_name} $ENV{${var_name}})
-    endforeach()
-    configure_file("${PRE_CONFIGURE_FILE}" "${POST_CONFIGURE_FILE}" @ONLY)
-endfunction()
-
-
-
-# Function: HashGitState
-# Description: loop through the git state variables and compute a unique hash.
-# Args:
-#   _state (out)  string; a hash computed from the current git state.
-function(HashGitState _state)
-    set(ans "")
-    foreach(var_name ${_state_variable_names})
-        string(SHA256 ans "${ans}$ENV{${var_name}}")
-    endforeach()
-    set(${_state} ${ans} PARENT_SCOPE)
-endfunction()
-
-
-
-# Function: CheckGit
-# Description: check if the git repo has changed. If so, update the state file.
-# Args:
-#   _working_dir    (in)  string; the directory from which git commands will be ran.
-#   _state_changed (out)    bool; whether or no the state of the repo has changed.
-function(CheckGit _working_dir _state_changed)
-
-    # Get the current state of the repo.
-    GetGitState("${_working_dir}")
-
-    # Convert that state into a hash that we can compare against
-    # the hash stored on-disk.
-    HashGitState(state)
-
-    # Issue 14: post-configure file isn't being regenerated.
-    #
-    # Update the state to include the SHA256 for the pre-configure file.
-    # This forces the post-configure file to be regenerated if the
-    # pre-configure file has changed.
-    file(SHA256 ${PRE_CONFIGURE_FILE} preconfig_hash)
-    string(SHA256 state "${preconfig_hash}${state}")
-
-    # Check if the state has changed compared to the backup on disk.
-    if(EXISTS "${GIT_STATE_FILE}")
-        file(READ "${GIT_STATE_FILE}" OLD_HEAD_CONTENTS)
-        if(OLD_HEAD_CONTENTS STREQUAL "${state}")
-            # State didn't change.
-            set(${_state_changed} "false" PARENT_SCOPE)
-            return()
-        endif()
-    endif()
-
-    # The state has changed.
-    # We need to update the state file on disk.
-    # Future builds will compare their state to this file.
-    file(WRITE "${GIT_STATE_FILE}" "${state}")
-    set(${_state_changed} "true" PARENT_SCOPE)
-endfunction()
-
-
-
-# Function: SetupGitMonitoring
-# Description: this function sets up custom commands that make the build system
-#              check the state of git before every build. If the state has
-#              changed, then a file is configured.
-function(SetupGitMonitoring)
-    add_custom_target(check_git
-        ALL
-        DEPENDS ${PRE_CONFIGURE_FILE}
-        BYPRODUCTS
-            ${POST_CONFIGURE_FILE}
-            ${GIT_STATE_FILE}
-        COMMENT "Checking the git repository for changes..."
-        COMMAND
-            ${CMAKE_COMMAND}
-            -D_BUILD_TIME_CHECK_GIT=TRUE
-            -DGIT_WORKING_DIR=${GIT_WORKING_DIR}
-            -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
-            -DGIT_STATE_FILE=${GIT_STATE_FILE}
-            -DPRE_CONFIGURE_FILE=${PRE_CONFIGURE_FILE}
-            -DPOST_CONFIGURE_FILE=${POST_CONFIGURE_FILE}
-            -DGIT_FAIL_IF_NONZERO_EXIT=${GIT_FAIL_IF_NONZERO_EXIT}
-            -P "${CMAKE_CURRENT_LIST_FILE}")
-endfunction()
-
-
-
-# Function: Main
-# Description: primary entry-point to the script. Functions are selected based
-#              on whether it's configure or build time.
-function(Main)
-    if(_BUILD_TIME_CHECK_GIT)
-        # Check if the repo has changed.
-        # If so, run the change action.
-        CheckGit("${GIT_WORKING_DIR}" changed)
-        if(changed OR NOT EXISTS "${POST_CONFIGURE_FILE}")
-            GitStateChangedAction()
-        endif()
-    else()
-        # >> Executes at configure time.
-        SetupGitMonitoring()
-    endif()
-endfunction()
-
-# And off we go...
-Main()
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,820 @@
+spark-store (4.8.3) UNRELEASED; urgency=medium
+
+  * 更新软件主图标
+  * 软件更新器更新成功后删除软件包
+  * 修复：首次安装ACE环境情况下无法正确配置ACE中aptss的问题
+  * 修复：使用aptss后在/tmp下留下垃圾的问题
+  * aptss 更新，支持在APM下使用
+  
+ -- momen <vmomenv@gmail.com>  Tue, 28 Aug 2025 01:03:08 +0800
+
+
+
+spark-store (4.8.1-1) UNRELEASED; urgency=medium
+
+  * 修复更新器安装软件完成后仍然显示下载完成的问题
+  * 修复一些aptss锁定失败bug
+  
+ -- momen <vmomenv@gmail.com>  Tue, 28 Aug 2025 01:03:08 +0800
+
+spark-store (4.8.1~test1) UNRELEASED; urgency=medium
+
+  * 添加全新的更新器
+  * 替换了新版更新器的polkit policy
+  
+ -- momen <vmomenv@gmail.com>  Tue, 15 Jul 2025 01:03:08 +0800
+
+spark-store (4.8.0) UNRELEASED; urgency=medium
+
+  * ssinstall重写，支持安装到ACE和自动安装到ACE，支持只允许安装到本地
+  * 商店支持展示ACE标识，支持识别 native amber-ce-bookworm amber-ce-trixie amber-ce-sid amber-ce-deepin23
+  * 投稿器支持新版spec
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.5.2) UNRELEASED; urgency=medium
+
+  * 支持安装到 ACE Bookworm 
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+ 
+ spark-store (4.5.1) UNRELEASED; urgency=medium
+
+  * 修复 aptss 部分报错
+  * 重新设计了 Tag 区的展示方式
+  * 新增 Fish 补全
+  
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.5.0) UNRELEASED; urgency=medium
+
+  * 支持从商店中直接启动应用
+  * ssinstall 修复安装时不再指定版本号以避免出现问题
+  * aptss支持fish补全
+  * 修复: distrobox下无法正常校验应用hash
+  * aptss 4.5.0
+  * 应用更新新增进度条
+  * 支持识别Debian
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.3.2) UNRELEASED; urgency=medium
+
+  * 提升升级工具体验，不再反复弹窗
+  * 提升aptss使用体验，汇报目前所在阶段而不是卡住不动
+  * 修复debian sid 无法卸载
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.3.1) UNRELEASED; urgency=medium
+
+  * 修复点击更新需要输入密码的问题
+  * 修复安装速度下降的问题
+  * 修复闪退问题
+  * 修复错误地展示已安装
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.2.0) UNRELEASED; urgency=medium
+
+  * 后续更新请从4.3.2.0版本号开始，4.3.2版本仅用于GXDE测试
+  * 支持dummyapps 安装包安装
+  * 支持紧凑模式
+  * 修复部分情况下升级安装失败的问题
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.2) UNRELEASED; urgency=medium
+
+  * ssinstall支持安装conflict包
+  * 支持紧凑模式
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.1) UNRELEASED; urgency=medium
+
+  * 修复自提权更新问题
+  * 提升aptss稳定性
+
+ -- shenmo <shenmo@spark-app.store>  Tue, 24 Sep 2024 11:27:08 +0800
+
+spark-store (4.3.0-fix5) stable; urgency=medium
+
+* 支持GXDE,重启空链接清理
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+
+
+spark-store (4.3.0-fix4) stable; urgency=medium
+
+* 修复：安装失败时仍然锁定
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.3.0-fix3) stable; urgency=medium
+
+* 修复：创建快捷方式失效
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+
+spark-store (4.3.0-fix2) stable; urgency=medium
+
+* aptss配置调整
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+
+spark-store (4.3.0-fix1) stable; urgency=medium
+
+* 上游改为d.spark-app.store
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.3) stable; urgency=medium
+
+* 修复客户端不支持301跳转的问题
+* 修复UOS下错误地提示开发者模式未启动
+* 现在会记住上次的窗口大小
+* 删除无用依赖，修复Debian 13依赖问题
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.14) stable; urgency=medium
+
+
+* 上游改为d.spark-app.store
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+spark-store (4.3.0) stable; urgency=medium
+
+* 修复部分客户端启动白屏
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+spark-store (4.3) stable; urgency=medium
+
+* 修复客户端不支持301跳转的问题
+* 修复UOS下错误地提示开发者模式未启动
+* 现在会记住上次的窗口大小
+* 删除无用依赖，修复Debian 13依赖问题
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+spark-store (4.2.13) stable; urgency=medium
+
+* 未经测试文案修改
+* 龙芯平台并入主线
+* 修复：更新过程中中断无法再次启动更新检查
+* 调整：提高超时时长，适应较差的网络环境
+
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+spark-store (4.2.12.1) stable; urgency=medium
+
+  * 修复：龙芯自动--no-sandbox
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.12) stable; urgency=medium
+
+  * 修复：飞腾部分设备上白屏的问题
+  * 修复：下载开始时长时等待（降低链接超时时长）
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.11) stable; urgency=medium
+
+  * 修复：判断是否安装状态错误
+  * 修改：部分组件重构提升清晰度
+  * 修复：v23下部分应用图标失效
+  
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.10) stable; urgency=medium
+
+  * 修复：部分发行版上无法启动自动创建的桌面图标
+  * 修复：发行版统计信息
+  * 修复：Gitee反馈链接错误
+  * 修复：ACE下无法安装,支持ACE下软件更新
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.9) stable; urgency=medium
+
+  * 修复：软件详情图片排序调整为服务器排序，而不是按加载顺序排序 
+  * 修复: build error on Deepin V23
+  * 修复：容器内无限等待
+  * 新增：高分屏截图支持
+  * 新增：更新界面支持显示软件名称
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.8.1) stable; urgency=medium
+
+  * 修复：A2D应用释放无效的Desktop到桌面上
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.8) stable; urgency=medium
+
+  * 修复：在aptss上锁时支持等待释放锁而不是直接报错退出
+  * 调整：下载安装按钮文案修改
+  * 优化 KDE 深色模式支持实现方式 
+  * 新增：ssinstall现在会自动创建desktop文件
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+spark-store (4.2.7.3) stable; urgency=medium
+
+  * 修复：aptss现在会正确地透传错误码而不是exit 0
+  * 修复：下载时如果卡0%(无法下载metalink)，会在超时后报错中断而不是一直傻等
+  * 修复：排队下载时CPU占满单核的bug https://gitee.com/spark-store-project/spark-store/issues/I7B91V
+  * 修复：在终端中打开的icon过大导致无法投稿到UOS
+  * 修复：v23下编译出错
+  * 薪怎：支持崩溃日志收集系统
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+
+spark-store (4.2.7.2) stable; urgency=medium
+
+  * 新增：内置在终端打开功能
+  * 调整：散列验证更改为使用sha512
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+
+spark-store (4.2.7.1) stable; urgency=medium
+
+  * 修复：aptss加锁失败现在会正常报错
+  * 新增：在aptss的特定操作时添加了提示
+  * 新增：在aptss提示加粗
+  * 调整：ssinstall验证支持使用cdn.d.获取
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.7) stable; urgency=medium
+
+  * 修复：更新星火商店后禁止更新提醒的配置失效
+  * 新增：支持在设置中关闭平台不兼容提示
+  * 调整：更改了下载量统计的方式，减少漏数
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.6.6) stable; urgency=medium
+
+  * 调整：文案修改：安装失败后引导查看详情而不是重新安装
+  * 修复：dpkg阻塞出现漏掉的安装失败，现在在安装后检测是否安装
+  * 修复：UOS专业版上安装成功仍然显示失败的问题：方式：忽略E:等消息，仅检查脚本报错
+  * 调整：卸载应用时采用autopurge以一并卸载依赖
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.6.5) stable; urgency=medium
+
+  * 调整：ssaudit安装结束时会提示安装结束
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.6.4) stable; urgency=medium
+
+  * 修复：关于页面的入口过时
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.6.3) stable; urgency=medium
+
+  * 修复：部分下载统计线路失效
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.6.2) stable; urgency=medium
+
+  * 新增：支持arm架构搜索
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.6.1) stable; urgency=medium
+
+  * 修复：mint下更新检测不正常
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.6) stable; urgency=medium
+
+  * 修复：截图加载失败时点击闪退
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.5.1) stable; urgency=medium
+
+  * 调整：重写了spark-dstore-patch，速度提升，尤其对机械硬盘下
+  * 调整：优化了aptss源文件同步策略
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.5) stable; urgency=medium
+
+  * 修复：ssinstall在文件不存在时仍然报安装成功
+  * 修复：删除不再需要的依赖：libc6-dev
+  * 在aarch64架构安装时也启用32位支持
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.4) stable; urgency=medium
+
+  * 修复：ssinstall校验失败的时候仍然提示安装成功
+  * 新增：ssinstall可以自动刷新ssupdate以防止仓库更新中导致的安装校验失败
+  * 修复：在不受支持的平台安装应用时弹出提示不正确
+  
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.3.3) stable; urgency=medium
+
+  * aptss 不再使用bwrap，去除依赖，支持容器中启动
+  * aptss 支持非root模式启动
+  * aptss 添加transhell支持
+  * 关于界面自动获取分支名称
+  * 现在安装成功则自动删除安装包
+  * 完成 arm 架构大部分功能适配
+  * 修复依赖不完整的问题
+  * 4.3 roadmap 实现，在浏览不支持的应用时会出现提示
+  * 4.3 roadmap 实现，在下载文件夹没有读写权限时会出现提示
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.3.2~Reason10) stable; urgency=medium
+
+  * 完成除web外大部分功能适配
+  * 修复依赖不完整的问题
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.3.2~Reason9) stable; urgency=medium
+
+  * sender-d.sh
+  * ssinstall和ssaudit的安装测试转到upgrade-worker
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.3.2~Reason8) stable; urgency=medium
+
+  * sender-d改用cpp重写，在aarch64上稳定运行
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.3.2~Reason7) stable; urgency=medium
+  * ssinstall发现无法验证时尝试update而不是ssupdate
+  * 启动每日aptss update
+  * ssinstall在发现无法安装后尝试先进行下aptss update
+  * 修复：安装商店后首次启动无法安装任何软件
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.3.2~Reason5) stable; urgency=medium
+
+  * aptss 不再使用bwrap，去除依赖，支持容器中启动
+  * aptss 支持非root模式启动
+  * aptss 添加transhell支持
+  * 关于界面自动获取分支名称
+  * 现在安装成功则自动删除安装包
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.3.2~Reason3) stable; urgency=medium
+
+  * 现在可在x86上编译，使用同一套代码
+  * 暂时在aarch64上使用旧web----等待柚子
+  * 空间，疾疫，现在是静谧
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 5 Mar 2022 11:45:14 +0800
+
+
+spark-store (4.2.3.2~only-for-test1) stable; urgency=medium
+
+  * 注意！！！！！！ 此版本仅为启动测试，还需要进一步完善——hardcode需要改善——关于web界面的调用方式需要在柚子做好之后修改成新的
+  * fix: hardcode
+  * fix: sender-d
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.3.1) stable; urgency=medium
+  * 修复: ssinstall验证签名出错
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.3) stable; urgency=medium
+  * 修复: 编译依赖不全
+  * 修复： prerm导致的dpkg崩溃
+  * 新增： aptss 检查package配置增加sdu，store
+  * 新增： 一键编译并安装脚本
+  * 新增： 后台安装结束后退出任务栏驻留
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.3~test4) stable; urgency=medium
+
+  * 修复: aptss 无法安装
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.3~test3) stable; urgency=medium
+
+  * 调整：打包时从 debian/changelog 自动获取构建版本号并写入关于窗口保证与deb一致
+  * 新增：支持 DTK 5.6.4 关于对话框“版本特性”显示功能。目前只在deepin编译安装时开启
+  * 修复：修复下载列表对话框中，点击某个 item 取消下载按钮后下载列表无法再次显示的问题
+  * 修复：多个应用安装可能会出现某一个应用没有安装
+  * 修复：修复下载按钮点击/双击/拖动时，主窗口动作与下载管理对话框动作同时触发问题 
+  * aptss 获取线路信息 转到从 d. 服务器获取
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.3~test2) stable; urgency=medium
+
+  * 调整：开启安装包加固
+  * 添加：zh_TW翻译
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.3~test1) stable; urgency=medium
+
+  * 修复：因判断安装状态错误创建多个相同任务的bug
+  * 测试中：尝试修复安装结束的闪退问题 https://gitee.com/spark-store-project/spark-store/commit/cb093dcc2bb0a193db89aa0ce5f20ea9cc5d56eb
+  * 修复：Deepin 显示开发者模式未开启
+  * 修复：从托盘打开主窗口时透明度动画不流畅
+  * 修复：主窗口关闭后，从托盘打开关于窗口会被主窗口遮挡
+
+ -- shenmo <shenmo@spark-app.store>  Sun, 05 Feb 2023 23:00:00 +0800
+
+
+spark-store (4.2.2) stable; urgency=medium
+
+  * 调整：脚本应用的transhell支持转为source导入
+  * 修复：ssinstall弹窗支持wayland
+  * 新增：应用托盘，下载时候可以放心关闭窗口了
+  * 新增：支持spk://search/内容 格式链接
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2.1) stable; urgency=medium
+
+  * 调整：支持在安装前进行测试（ss-do-upgrade-worker）,但是未实装到appinfo
+  * 修复：因依赖不完全导致在LinuxMint下无法下载统计
+  * 新增：脚本系列应用支持英文
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2) stable; urgency=medium
+
+  * 调整：UOS开发者模式提示现在不会那么挤了
+  * 修复：wayland下可正常弹出更新提示
+  * 调整：dwine5标签的文案改为：Wine应用
+  * 新增：更新软件时弹窗会显示正在更新的软件包名
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2~test3) stable; urgency=medium
+
+  * 修复: aptss ssupdates
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2~test2) stable; urgency=medium
+
+  * 修复: 420t1版本中ssinstall有时会重新下载软件包的问题
+  * 新增: 安装前会对软件包安装进行dry run以判断是否能正确安装
+  * 调整: aptss在进行任何操作前均检测是否存在Packages文件，若存在，则不进行ssupdate
+  * 调整: 修改apt-fast源代码以指定conf位置为/tmp/apt-fast,这部分不再使用bwrap模拟
+  * 新增: aptss检测Package文件支持分目录（目前指定为store）
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.2~test1) stable; urgency=medium
+
+  * 新增: aptss支持显示报错
+  * 新增: aptss部分提示汉化
+  * 修复: 修复部分情况下ssinstall实际未安装但是错误显示
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.2) stable; urgency=medium
+
+  * feat: 初步的wayland支持
+  * feat: UOS下检测开发者模式是否开启，若未开启则拒绝安装
+  * fix: 首页的捐赠页面在中文环境下显示中文
+  * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。
+  * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit
+  * fix: Ubuntu下下载列表无法关闭
+  * fix: 修复进入详情页时焦点默认在分享链接按钮上的问题
+  * fix: 修复特定情况下的内存泄漏问题
+  * fix: 适配c11代码规范，消除qt编译警告
+  * fix: 默认服务器域名指向cdn域名
+  * fix: 消除内部函数的无用变量，限制作用域
+  * feat: aptss 除ssupdate外的操作时候如果检测到存在源文件存在则不再重复获取
+  * fix: 修复在apt list锁被锁定的时候异常弹出有更新可用
+  * chore: 去除安装依赖:g++
+  * fix: 修复下载列表中进度提示文字显示不完整的问题
+  * feat: ssinstall支持从单独文件夹中校验软件包
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/spark-store-project/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 ，不过shenmo是自由的
+
+
+  * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
+  * chore: 添加 setOrganizationName 操作，设置组织名称为 spark-union，与 SWRT 保持一致
+  * chore: 设置组织名称后，QStandardPaths::AppConfigLocation 等路径相应改变，修改所有配置文件和缓存文件路径
+  * chore: 关于对话框设置父对象后，对话框背景色受主窗口样式表影响，移动部分控件样式表设置方式与位置
+  * chore: 去除 .pro 文件中无效的更新翻译文件脚本调用，整理 .pro 文件，添加编译时更新 ts 文件脚本调用
+  * chore: 继续修复偶现关闭客户端时崩溃问题（疑似 aria2c 进程未启动，pid 未初始化为随机值，执行 kill 操作时未判断导致）
+  * chore: 新增编译依赖，测试安装时不会出现报错
+  * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数
+  * chore: 更新翻译文件，去除已经不存在的翻译
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.2~test2) stable; urgency=medium
+
+  * feat: ssinstall支持从单独文件夹中校验软件包
+  * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/spark-store-project/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
+  * info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准，参见 https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo ，不过shenmo是自由的
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.2~test1) stable; urgency=medium
+
+  * feat: 初步的wayland支持
+  * feat: UOS下检测开发者模式是否开启，若未开启则拒绝安装
+  * fix: 首页的捐赠页面在中文环境下显示中文
+  * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。
+  * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit
+  * fix: Ubuntu下下载列表无法关闭
+  * fix: 修复进入详情页时焦点默认在分享链接按钮上的问题
+  * fix: 修复特定情况下的内存泄漏问题
+  * fix: 适配c11代码规范，消除qt编译警告
+  * fix: 默认服务器域名指向cdn域名
+  * fix: 消除内部函数的无用变量，限制作用域
+  * feat: aptss 除ssupdate外的操作时候如果检测到存在源文件存在则不再重复获取
+  * fix: 修复在apt list锁被锁定的时候异常弹出有更新可用
+  * chore: 去除安装依赖:g++
+  * fix: 修复下载列表中进度提示文字显示不完整的问题
+
+
+  * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
+  * chore: 添加 setOrganizationName 操作，设置组织名称为 spark-union，与 SWRT 保持一致
+  * chore: 设置组织名称后，QStandardPaths::AppConfigLocation 等路径相应改变，修改所有配置文件和缓存文件路径
+  * chore: 关于对话框设置父对象后，对话框背景色受主窗口样式表影响，移动部分控件样式表设置方式与位置
+  * chore: 去除 .pro 文件中无效的更新翻译文件脚本调用，整理 .pro 文件，添加编译时更新 ts 文件脚本调用
+  * chore: 继续修复偶现关闭客户端时崩溃问题（疑似 aria2c 进程未启动，pid 未初始化为随机值，执行 kill 操作时未判断导致）
+  * chore: 新增编译依赖，测试安装时不会出现报错
+  * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数
+  * chore: 更新翻译文件，去除已经不存在的翻译
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.1) stable; urgency=medium
+
+  * fix:更新失效
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.1.0) stable; urgency=medium
+
+  * feat: 现在可以支持UOS签名包问题了
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.0.1) stable; urgency=medium
+
+  * feat: 提升Ubuntu下的显示效果
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.0.0) stable; urgency=medium
+
+  * feat: 修复了成吨的bug后开始正式版
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.0.0~test2) stable; urgency=medium
+
+  * feat: 修复了成吨的bug后开始公测
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (4.0.0~test1) stable; urgency=medium
+
+  * feat: 柚子过来补充一下啦
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.4~test1) stable; urgency=medium
+
+  * feat: aptss不再尝试安装apt-fast，转而自带
+  * chore:  删除password-check模块
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.3) stable; urgency=medium
+
+  * feat: 首页链接调用浏览器打开 
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.3~test5) stable; urgency=medium
+
+  * 修复可能的内存泄漏问题
+  * 修复应用搜索为空但仍显示上一次搜索结果的问题
+  * 修复动画加载延后的问题
+  * 修复统计下载量卡主渲染线程的问题
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.3~test4) stable; urgency=medium
+
+  * Enable i386 arch support by default
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.3~test3) stable; urgency=medium
+
+  * Now use ss-apt-fast instead of apt-fast
+  * 修复：右上角 更新和安装设置 菜单中进入更新列表失效
+
+-- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.3~test2) stable; urgency=medium
+
+  * bug fix: 更新和检查更新出错时不报错.此更新需要一个推送
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.3~test1) stable; urgency=medium
+
+  * 3.3.3将会是修复大部分bug后的最终版本
+  * 图形环境中所有root权限的组件剥离到cli(可用于deepin 23 daily，只保证商店本体正常运作，不处理安装依赖不满足)
+  * 文案更改：更新检查-->检查更新
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.1~test1) stable; urgency=medium
+
+  * 安装时不再需要联网
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.0.4) stable; urgency=medium
+
+  * 为减轻服务器压力，不再单独更新某一个应用，而是作为整体更新
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.0.3) stable; urgency=medium
+
+  * 回滚 更新中行为到进度条而不是实时输出
+  * 更新应用时显示正在更新哪个应用
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.0.2) stable; urgency=medium
+
+  * 修复 pkexec未执行
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3.0.1) stable; urgency=medium
+
+  * 修复 检查更新的更新进程未实际运行
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3) stable; urgency=medium
+
+  * 修复 检查更新 未刷新软件源
+  * 把检查更新单独拿出作为左列
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3~test3) stable; urgency=medium
+
+  * 把检查更新加入免密码
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3~test2) stable; urgency=medium
+
+  * 更新检测功能全部更改到zenity
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.3~test1) stable; urgency=medium
+
+  * zenity，选择可更新应用
+  * 自动更新检测现在会跳过hold
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.2.4) stable; urgency=medium
+
+  * 修改tag相关的文案内容：wine相关环境已可自动配置了
+  * 准备发版
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.2.4~test4) stable; urgency=medium
+
+  * 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/spark-store-project/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.2.4~test3) stable; urgency=medium
+
+  * 发版，合入到master
+  * 翻译完毕
+  * 合入先前的各项改动，为：客户端集成投稿器入口和支持，修复：安装依赖时间较长时错误地返回“安装完毕”结果，现在客户端版本更新时不关闭免密码登录，UOS安装进程合并正常aptss中
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.2.4~test2) stable; urgency=medium
+
+  * 客户端集成投稿器入口和支持
+  * 修复：安装依赖时间较长时错误地返回“安装完毕”结果
+
+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
+
+spark-store (3.2.4~test1) stable; urgency=medium
+
+  * 客户端更新时不关闭免密码登录
+  * U
+  
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+11
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,36 @@
+Source: spark-store
+Maintainer: shenmo <shenmo@spark-app.store>
+Section: utils
+Priority: optional
+Build-Depends:
+ debhelper (>= 9),
+ pkg-config,
+ qtchooser (>= 55-gc9562a1-1~) | qt5-default,
+ qtbase5-dev,
+ libqt5svg5-dev,
+ qttools5-dev-tools,
+ qtwebengine5-dev,
+ libdtkcore-dev (>= 5.0),
+ libdtkgui-dev (>= 5.0),
+ libdtkwidget-dev (>= 5.0)
+Standards-Version: 4.1.7
+Homepage: https://www.spark-app.store/
+
+Package: spark-store
+Architecture: any
+Provides: spark-store-console-in-container
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ dde-qt5integration,
+ curl,
+ openssl,
+ aria2,
+ gnupg,
+ zenity,
+ policykit-1 | pkexec,
+ libnotify-bin,
+ qtwayland5,
+ desktop-file-utils,
+ dpkg-dev,
+ lsb-release,
+Description: Spark Store
+ A community powered app store, based on DTK.
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,22 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: spark-store
+Source: https://gitee.com/spark-store-project/spark-store
+
+Files: *
+Copyright: The Spark Project Developers
+ 
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+
+export QT_SELECT = qt5
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/default.mk
+
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# Use realtime timestamp instead of the latest entry in debian/changelog
+SOURCE_DATE_EPOCH := $(shell date +%s)
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE = 1
+
+%:
+	dh $@ --parallel
+
+override_dh_auto_clean:
+	rm -rf $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
+
+override_dh_auto_configure:
+	mkdir -p $(CURDIR)/build-$(DEB_HOST_MULTIARCH)
+
+	qmake BUILD_VERSION=$(DEB_VERSION_UPSTREAM) spark-store-project.pro \
+	-spec linux-g++ CONFIG+=force_debug_info \
+	-o $(CURDIR)/build-$(DEB_HOST_MULTIARCH)/
+
+override_dh_auto_build:
+	make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) -j$(JOBS)
+
+override_dh_auto_install:
+	make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) install \
+	INSTALL_ROOT=$(CURDIR)/debian/spark-store
+
+# Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
+# Qt Mutidedia lib will ref to network libraray.
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0 --exclude=opt/durapps/spark-store/bin/ss-feedback/
+override_dh_strip:
+	dh_strip --exclude=opt/durapps/spark-store/bin/ss-feedback/
--- a/debian/source/format
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
--- a/debian/spark-store.postinst
+++ b/debian/spark-store.postinst
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+case "$1" in
+	configure)
+
+		case `arch` in
+   			x86_64)
+				echo "Enabling i386 arch..."
+				dpkg --add-architecture i386
+			;;
+
+        		aarch64)
+        			echo "Will not enable armhf since 4271"
+			;;
+            loongarch64)
+				echo "Nope we DO NOT WANT ABI1 now"
+				dpkg --remove-architecture loongarch64
+			;;
+
+ 			*)
+				echo "Unknown architecture, skip enable 32-bit arch"
+			;;
+		esac
+
+		mkdir -p /var/lib/aptss/lists
+
+		#  Remove the sources.list file
+		rm -f /etc/apt/sources.list.d/sparkstore.list
+        rm -f /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list
+
+		# Check if /usr/local/bin existed
+		mkdir -p /usr/local/bin
+		## I hate /usr/local/bin. We will abandon them later
+		# Create symbol links for binary files
+		ln -s -f /opt/durapps/spark-store/bin/spark-store /usr/local/bin/spark-store
+		ln -s -f /opt/durapps/spark-store/bin/ssinstall /usr/local/bin/ssinstall
+		ln -s -f /opt/durapps/spark-store/bin/ssaudit /usr/local/bin/ssaudit
+		ln -s -f /opt/durapps/spark-store/bin/ssinstall /usr/bin/ssinstall
+		ln -s -f /opt/durapps/spark-store/bin/ssaudit /usr/bin/ssaudit
+		ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/local/bin/spark-dstore-patch
+		ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/bin/spark-dstore-patch
+		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast
+
+		ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss
+		ln -sf /usr/lib/qt5/bin/spark-update-tool /usr/bin/spark-update-tool
+
+
+		# Install key
+		mkdir -p /tmp/spark-store-install/
+		cp -f /opt/durapps/spark-store/bin/spark-store.asc /tmp/spark-store-install/spark-store.asc
+		gpg --dearmor /tmp/spark-store-install/spark-store.asc
+		cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg
+
+
+
+		# Start upgrade detect service
+		systemctl daemon-reload
+		systemctl enable spark-update-notifier
+		systemctl start spark-update-notifier
+
+
+		# Update certain caches
+		update-icon-caches /usr/share/icons/hicolor || true
+		update-desktop-database /usr/share/applications || true
+		xdg-mime default spark-store.desktop x-scheme-handler/spk
+		update-mime-database /usr/share/mime || true
+
+		# Send email for statistics
+		#/tmp/spark-store-install/feedback.sh
+
+		# Remove temp dir
+		rm -rf /tmp/spark-store-install
+	;;
+
+	triggered)
+			spark-dstore-patch
+
+	;;
+esac
--- a/debian/spark-store.postrm
+++ b/debian/spark-store.postrm
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Update certain caches
+update-icon-caches /usr/share/icons/hicolor || true
+update-desktop-database /usr/share/applications || true
+update-mime-database /usr/share/mime || true
--- a/debian/spark-store.preinst
+++ b/debian/spark-store.preinst
@@ -0,0 +1,28 @@
+#!/bin/bash
+#检测网络链接畅通
+function network-check()
+{
+    #超时时间
+    local timeout=15
+
+    #目标网站
+    local target=www.baidu.com
+
+    #获取响应状态码
+    local ret_code=`curl -I -s --connect-timeout ${timeout} ${target} -w %{http_code} | tail -n1`
+
+    if [ "x$ret_code" = "x200" ]; then
+        echo "Network Checked successful ! Continue..."
+	 echo "网络通畅，继续安装"
+    else
+        #网络不畅通
+	echo "Network failed ! Cancel the installation"
+	echo "网络不畅，终止安装"
+	exit -1
+    fi
+
+}
+
+
+#network-check
+echo "不再检测网络"
--- a/debian/spark-store.prerm
+++ b/debian/spark-store.prerm
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+function notify-send()
+{
+    # Detect the user using such display
+    local user=$(who | awk '{print $1}' | head -n 1)
+
+    # Detect the id of the user
+    local uid=$(id -u $user)
+
+    sudo -u $user DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus notify-send "$@"
+}
+
+if [ "$1" = "remove" -o "$1" = "purge" ] ; then
+	echo "$1"
+	echo "卸载操作，进行配置清理"
+
+	# Remove residual symbol links
+	unlink /usr/local/bin/spark-store
+	unlink /usr/local/bin/ssinstall
+	unlink /usr/local/bin/ssaudit
+	unlink /usr/bin/ssinstall
+	unlink /usr/bin/ssaudit
+	unlink /usr/local/bin/spark-dstore-patch
+	unlink /usr/bin/spark-dstore-patch
+	unlink /usr/local/bin/ss-apt-fast
+	unlink /usr/bin/aptss
+
+	rm -rf /etc/aptss/
+	rm -rf /var/lib/aptss/
+
+	# Remove residual symbol links to stop upgrade detect
+	rm -f /etc/xdg/autostart/spark-update-notifier.desktop
+	# Remove config files
+for username in `ls /home`      
+    do
+      echo /home/$username
+        if [ -d /home/$username/.config/spark-union/spark-store ]
+        then
+        rm -rf /home/$username/.config/spark-union/spark-store
+        fi
+    done
+
+
+	# Shutdown services
+	systemctl stop spark-update-notifier
+	# Stop update detect service
+	systemctl disable spark-update-notifier
+
+
+
+	# Remove gpg key file
+	rm -f /etc/apt/trusted.gpg.d/spark-store.gpg
+	apt-key del '9D9A A859 F750 24B1 A1EC  E16E 0E41 D354 A29A 440C' || true
+else
+	
+	if [ ! -z "`pidof spark-store`" ] ; then
+		echo "关闭已有 spark-store.."
+		notify-send "正在升级星火商店" "请在升级结束后重启星火商店" -i spark-store
+		killall spark-store
+	fi
+fi
+
+
--- a/debian/spark-store.triggers
+++ b/debian/spark-store.triggers
@@ -0,0 +1,2 @@
+interest-noawait /opt/apps
+
--- a/docs/structure_and_naming.md
+++ b/docs/structure_and_naming.md
@@ -1,52 +0,0 @@
-# 项目结构和命名规范
-
-## 文件夹结构
-
-### cmake
-
-主要用于 CMake 配置时需要用到的 CMake 模块脚本。
-
-### gui
-
-主要用于显示界面的 C++ 代码文件（即包含 Qt Widgets 代码），无论包含多少与其他组件的联系，都在这个目录内。
-这包括 SpkUi 的自定义界面组件、商店主界面自身的 Page 类等等。
-
-### inc
-
-项目中所有以 `#include "xxx.h"` 方式包含到代码中的标头文件，全部放入此目录。
-标头文件并不强求目录结构明确，文件用途或来源特殊的除外。
-
-### src
-
-商店主体逻辑。包含基础的 `SpkStore` 类、`main.cpp` 等核心逻辑。
-新加入的逻辑如单个功能多于一个cpp文件，则必须分装到一个目录内。
-
-### plugin
-
-适配 Deepin 以及其他平台的平台相关插件。
-
-## 命名规范
-
-### 通用规范
-
-类名、成员、方法名一律采用大驼峰形式。例如，`SpkTitleBar::SetTitle` 方法。
-C++ 规范要求的和第三方库有较大差异的除外。例如，`SpkUiMessage::_notify`成员。
-临时变量采用小驼峰形式或全小写。
-
-名称要对功能要有基础的描述，例如，`SpkUi::SpkCategorySelector` 类。抽象核心逻辑除外。
-
-### 类名
-
-如非第三方代码，一般以 `Spk` 前缀标明。
-实现 UI 的类都应归于 `SpkUi` 命名空间。
-
-## 类定义
-
-### 一般规则
-
-Qt 类的 `Q_OBJECT` 应置于类定义最顶端。
-`public` ，`protected` 和 `private` 等标签中只应该包含一类成员，
-如单个 `public` 标签内只能包含方法，或成员。
-信号、槽等不得与普通方法混合。
-
-<!--TODO-->
--- a/docs/translating.md
+++ b/docs/translating.md
@@ -1,6 +0,0 @@
-
-# 翻译
-
-由于CMake和Qt的稀烂集成，我们不能使用CMake自动lupdate更新翻译。
-
-如果需要更新翻译，请使用`make run_lupdate`目标进行。qm文件的编译无需其他操作，只需build即可。
--- a/gui/page/spkpageappdetails.cpp
+++ b/gui/page/spkpageappdetails.cpp
@@ -1,314 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-
-#include "page/spkpageappdetails.h"
-#include "spkutils.h"
-#include "spkappitem.h"
-
-namespace SpkUi
-{
-  constexpr QSize SpkPageAppDetails::IconSize;
-
-  void SpkPageAppDetails::LoadAppResources(QString aPkgName, QString aIcon, QStringList aScreenshots,
-                                           QStringList aTags)
-  {
-    QPixmap pic;
-
-    // Load icon
-    auto res = RES->RequestResource(0, aPkgName, SpkResource::ResourceType::AppIcon, aIcon);
-    if(res.status == SpkResource::ResourceStatus::Ready)
-    {
-      if(pic.loadFromData(res.data))
-        mAppIcon->setPixmap(pic.scaled(IconSize,
-                                       Qt::IgnoreAspectRatio,
-                                       Qt::SmoothTransformation));
-      else
-      {
-        mAppIcon->setPixmap(mBrokenImg);
-        RES->PurgeCachedResource(aPkgName, SpkResource::ResourceType::AppIcon, 0);
-      }
-    }
-
-    // Load screenshots. Screenshots have id starting with 1.
-    if(aScreenshots.isEmpty())
-      return;
-    else
-    {
-      auto count = aScreenshots.size();
-      mImgViewer->SetImageTotal(count);
-      if(count > mScreenshotPreviews.size())
-      {
-        auto from = mScreenshotPreviews.size(), to = count - mScreenshotPreviews.size();
-        for(int i = 0; i <= to; i++)
-        {
-          auto wid = new SpkClickLabel;
-          wid->setProperty("shotId", from + i + 1);
-          wid->setFixedHeight(200);
-          wid->setCursor(Qt::PointingHandCursor);
-          connect(wid, &SpkClickLabel::Pressed, this, &SpkPageAppDetails::ImageClicked);
-          mScreenshotPreviews.append(wid);
-          mScreenshotLay->addWidget(wid);
-        }
-      }
-    }
-
-    int shotId = 0;
-    for(auto &i : aScreenshots)
-    {
-      shotId++;
-      res = RES->RequestResource(shotId, aPkgName, SpkResource::ResourceType::AppScreenshot, i,
-                                 shotId);
-      auto preview = mScreenshotPreviews[shotId - 1];
-      preview->setVisible(true);
-      if(res.status == SpkResource::ResourceStatus::Ready)
-      {
-        if(pic.loadFromData(res.data))
-        {
-          mAppImages[shotId] = pic;
-          mImgViewer->SetPixmap(shotId, &mAppImages[shotId]);
-          preview->setPixmap(pic.scaledToHeight(200, Qt::SmoothTransformation));
-        }
-        else
-        {
-          mAppImages[shotId] = mBrokenImg;
-          RES->PurgeCachedResource(aPkgName, SpkResource::ResourceType::AppScreenshot, 0);
-        }
-      }
-      else
-      {
-        preview->setPixmap(mIconLoading);
-      }
-    }
-
-    // TODO: tags
-  }
-
-  void SpkPageAppDetails::SetWebsiteLink(QString url)
-  {
-    mWebsite->setText(QString("<a href=\"%1\">%2</a>").arg(url, tr("Website link")));
-  }
-
-  void SpkPageAppDetails::SetPackagePath(QString url)
-  {
-    mPkgPath = url;
-  }
-
-  SpkPageAppDetails::SpkPageAppDetails(QWidget *parent) : SpkPageBase(parent),
-    mBrokenImg(QIcon(":/icons/broken-icon.svg").pixmap(SpkAppItem::IconSize_)),
-    mIconLoading(QIcon(":/icons/loading-icon.svg").pixmap(SpkAppItem::IconSize_))
-  {
-    mMainArea = new QScrollArea;
-    mMainArea->setWidgetResizable(true);
-    mMainArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
-    mMainLay = new QVBoxLayout(this);
-    mMainLay->addWidget(mMainArea);
-
-    mBottomBar = new QWidget;
-    mMainLay->addWidget(mBottomBar);
-
-    mDetailsLay = new QVBoxLayout(mMainArea);
-    mDetailsLay->setSizeConstraint(QLayout::SetMinAndMaxSize);
-
-    mAppIcon = new QLabel;
-
-    mAppTitle = new QLabel;
-    mAppTitle->setObjectName("styDetTitle");
-    mAppTitle->setWordWrap(true);
-
-    mAppDescription = new QLabel;
-    mAppDescription->setObjectName("styDetDesc");
-    mAppDescription->setWordWrap(true);
-    mAppShortDesc = new QLabel;
-    mAppShortDesc->setObjectName("styDetDesc");
-    mAppShortDesc->setWordWrap(true);
-    // NOTE: Seems Qt have trouble dealing with wrapped text here. Removing the following operations
-    // to mAppShortDesc will result in broken layout. Very possible that it's a Qt bug.
-    mAppShortDesc->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
-    mAppShortDesc->setMinimumWidth(100);
-    mVersion = new QLabel;
-    mVersion->setWordWrap(true);
-    mWebsite = new QLabel;
-    mPkgName = new QLabel;
-    mPkgName->setObjectName("styDetPkg");
-    mPkgName->setWordWrap(true);
-
-    mTitleLay = new QVBoxLayout;
-    mTitleLay->setAlignment(Qt::AlignTop);
-    mTitleLay->addWidget(mAppTitle);
-    mTitleLay->addWidget(mVersion);
-    mTitleLay->addWidget(mAppShortDesc);
-    mTitleLay->addWidget(mPkgName);
-    mTitleLay->addWidget(mWebsite);
-    mTitleLay->setSpacing(0);
-
-    mIconTitleLay = new QHBoxLayout;
-    mIconTitleLay->setAlignment(Qt::AlignLeft);
-    mIconTitleLay->addWidget(mAppIcon);
-    mIconTitleLay->addSpacing(15);
-    mIconTitleLay->addLayout(mTitleLay);
-
-    mIconTitleWidget = new QWidget;
-    mIconTitleWidget->setLayout(mIconTitleLay);
-
-    mAuthor = new SpkDetailEntry;
-    mAuthor->SetTitle(tr("Author"));
-    mContributor = new SpkDetailEntry;
-    mContributor->SetTitle(tr("Contributor"));
-//    mSite = new SpkDetailEntry;
-//    mSite->SetTitle(tr("Website"));
-    mArch = new SpkDetailEntry;
-    mArch->SetTitle(tr("Architecture"));
-    mSize = new SpkDetailEntry;
-    mSize->SetTitle(tr("Size"));
-
-    mDetailLay = new SpkStretchLayout;
-    mDetailLay->setSpacing(12);
-    mDetailLay->addWidget(mAuthor);
-    mDetailLay->addWidget(mContributor);
-    mDetailLay->addWidget(mSize);
-    mDetailLay->addWidget(mArch);
-//    mDetailLay->addWidget(mSite);
-
-//    mDetailWidget = new QWidget;
-//    mDetailWidget->setLayout(mDetailLay);
-//    mDetailWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
-
-    mDetailsLay->setAlignment(Qt::AlignTop);
-    mDetailsLay->addWidget(mIconTitleWidget);
-    mDetailsLay->addLayout(mDetailLay);
-    mDetailsLay->addWidget(mAppDescription);
-//    mMainLay->addStretch();
-
-    mScreenshotLay = new QHBoxLayout;
-    mScreenshotArea = new QScrollArea;
-    mWid4ShotArea = new QWidget;
-    mWid4ShotArea->setLayout(mScreenshotLay);
-    mScreenshotArea->setWidget(mWid4ShotArea);
-    mScreenshotArea->setWidgetResizable(true);
-    mScreenshotArea->setFixedHeight(230);
-    mScreenshotArea->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-
-    mDetailsLay->addWidget(mScreenshotArea);
-
-    mWid4MainArea = new QWidget;
-    mWid4MainArea->setLayout(mDetailsLay);
-
-    mMainArea->setWidget(mWid4MainArea);
-
-    mWebsite->setTextFormat(Qt::RichText);
-    mWebsite->setOpenExternalLinks(true);
-
-    // Bottom bar buttons
-    mBottomBarLay = new QHBoxLayout;
-    mBottomBar->setLayout(mBottomBarLay);
-
-    mBtnDownload = new QPushButton;
-    mBtnDownload->setText(tr("Download"));
-
-//    mBtnInstall = new QPushButton;
-//    mBtnInstall->setText(tr("Install"));
-
-    mBtnUninstall = new QPushButton;
-    mBtnUninstall->setText(tr("Uninstall"));
-
-    mBtnRequestUpdate = new QPushButton;
-    mBtnRequestUpdate->setText(tr("Request Update"));
-
-    mBtnReport = new QPushButton;
-    mBtnReport->setText(tr("Report"));
-
-    mBottomBarLay->addStretch();
-    mBottomBarLay->addWidget(mBtnDownload);
-//    mBottomBarLay->addWidget(mBtnInstall);
-    mBottomBarLay->addWidget(mBtnUninstall);
-    mBottomBarLay->addWidget(mBtnRequestUpdate);
-    mBottomBarLay->addWidget(mBtnReport);
-
-    mImgViewer = new SpkImgViewer;
-    mImgViewer->setVisible(false);
-
-    connect(mBtnDownload, &QPushButton::clicked,
-            [=](){ emit RequestDownload(mAppTitle->text(), mPkgName->text(),
-                                        "/store/reading/youdao-dict/youdao-dict_6.0.0-0~ubuntu_amd64.deb");
-    });
-  }
-
-  SpkPageAppDetails::~SpkPageAppDetails()
-  {
-    delete mImgViewer;
-  }
-
-  void SpkPageAppDetails::ResourceAcquisitionFinished(int id, ResourceResult result)
-  {
-    QPixmap img;
-//    qDebug() << "PageAppDetails: Resource" << id << "acquired";
-    if(!id)
-    {
-      // id == 0, icon
-      if(result.status == SpkResource::ResourceStatus::Ready)
-      {
-        if(img.loadFromData(result.data))
-          mAppIcon->setPixmap(img.scaled(SpkAppItem::IconSize_,
-                                          Qt::IgnoreAspectRatio,
-                                          Qt::SmoothTransformation));
-        else
-          mAppIcon->setPixmap(mBrokenImg);
-      }
-      else if(result.status == SpkResource::ResourceStatus::Failed)
-      {
-        mAppIcon->setPixmap(mBrokenImg);
-        RES->PurgeCachedResource(mPkgName->text(), SpkResource::ResourceType::AppIcon, 0);
-      }
-    }
-    else
-    {
-      auto preview = mScreenshotPreviews[id - 1];
-      preview->setVisible(true);
-      if(result.status == SpkResource::ResourceStatus::Ready)
-      {
-        if(img.loadFromData(result.data))
-        {
-          mAppImages[id] = img;
-          mImgViewer->SetPixmap(id, &mAppImages[id]);
-          mScreenshotPreviews[id - 1]->setPixmap(img.scaledToHeight(200, Qt::SmoothTransformation));
-        }
-        else
-        {
-          mImgViewer->SetPixmap(id, &mBrokenImg);
-          mScreenshotPreviews[id - 1]->setPixmap(mBrokenImg);
-        }
-      }
-      else if(result.status == SpkResource::ResourceStatus::Failed)
-      {
-        mImgViewer->SetPixmap(id, &mBrokenImg);
-        mScreenshotPreviews[id - 1]->setPixmap(mBrokenImg);
-        RES->PurgeCachedResource(mPkgName->text(), SpkResource::ResourceType::AppIcon, 0);
-      }
-    }
-  }
-
-  void SpkPageAppDetails::Activated()
-  {
-    RES->Acquire(this, false);
-    for(auto &i : mScreenshotPreviews)
-      i->setVisible(false);
-    mImgViewer->Clear();
-  }
-
-  void SpkPageAppDetails::ImageClicked()
-  {
-    mImgViewer->ShowWithImage(sender()->property("shotId").toInt());
-  }
-
-  SpkDetailEntry::SpkDetailEntry(QWidget *parent) : QWidget(parent)
-  {
-    setLayout(&mLay);
-    mLay.addWidget(&mTitle);
-    mLay.addWidget(&mField);
-    mTitle.setAlignment(Qt::AlignLeft);
-    mField.setAlignment(Qt::AlignRight);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    setMinimumWidth(300);
-    setAutoFillBackground(true);
-  }
-}
--- a/gui/page/spkpageapplist.cpp
+++ b/gui/page/spkpageapplist.cpp
@@ -1,181 +0,0 @@
-
-#include "page/spkpageapplist.h"
-#include "spkutils.h"
-#include "spkuimsg.h"
-
-namespace SpkUi
-{
-  SpkPageAppList::SpkPageAppList(QWidget *parent) : SpkPageBase(parent)
-  {
-    mLoadingIcon = new QPixmap(QIcon(":/icons/loading-icon.svg").pixmap(SpkAppItem::IconSize_));
-    mBrokenIcon = new QPixmap(QIcon(":/icons/broken-icon.svg").pixmap(SpkAppItem::IconSize_));
-
-    mAppsWidget = new QWidget;
-    mAppsArea = new QScrollArea(this);
-    mMainLay = new QVBoxLayout(this);
-    mItemLay = new SpkStretchLayout(mAppsWidget);
-
-    mPageSwitchWidget = new QWidget;
-    mPageSwitchLay = new QHBoxLayout(mPageSwitchWidget);
-    mBtnPgUp = new QPushButton;
-    mBtnPgDown = new QPushButton;
-    mBtnGotoPage = new QPushButton;
-    mPageInput = new QLineEdit;
-    mPageValidator = new QIntValidator(mPageInput);
-    mPageIndicator = new QLabel;
-
-    mPageValidator->setRange(1, 99);
-    mPageInput->setFixedWidth(50);
-    mPageInput->setValidator(mPageValidator);
-    mBtnGotoPage->setText(tr("Goto"));
-    mBtnPgUp->setText(tr("Previous"));
-    mBtnPgDown->setText(tr("Next"));
-    mBtnGotoPage->setFocusPolicy(Qt::NoFocus);
-    mBtnPgDown->setFocusPolicy(Qt::NoFocus);
-    mBtnPgUp->setFocusPolicy(Qt::NoFocus);
-
-    mPageSwitchLay->addWidget(mPageIndicator);
-    mPageSwitchLay->addStretch();
-    mPageSwitchLay->addWidget(mPageInput);
-    mPageSwitchLay->addWidget(mBtnGotoPage);
-    mPageSwitchLay->addWidget(mBtnPgUp);
-    mPageSwitchLay->addWidget(mBtnPgDown);
-
-    mAppsArea->setWidget(mAppsWidget);
-    mAppsArea->setWidgetResizable(true);
-
-    mMainLay->addWidget(mAppsArea);
-    mMainLay->addWidget(mPageSwitchWidget);
-    setLayout(mMainLay);
-
-    connect(mBtnPgUp, &QPushButton::clicked, this, &SpkPageAppList::PageUp);
-    connect(mBtnPgDown, &QPushButton::clicked, this, &SpkPageAppList::PageDown);
-    connect(mBtnGotoPage, &QPushButton::clicked, this, &SpkPageAppList::GotoPage);
-  }
-
-  void SpkPageAppList::AddApplicationEntry(QString name, QString pkgName, QString description,
-                                           QString iconUrl, int appId)
-  {
-    auto item = new SpkAppItem(appId, this);
-    auto id = mAppItemList.size();
-
-    connect(item, &SpkAppItem::clicked, this, &SpkPageAppList::ApplicationClicked);
-    item->SetTitle(name);
-    item->SetDescription(description);
-    item->setProperty("pkg_name", pkgName);
-
-    auto iconRes = RES->RequestResource(id, pkgName, SpkResource::ResourceType::AppIcon,
-                                        iconUrl, 0);
-    QPixmap icon;
-    if(iconRes.status == SpkResource::ResourceStatus::Ready)
-    {
-      if(icon.loadFromData(iconRes.data))
-        item->SetIcon(icon.scaled(SpkAppItem::IconSize_,
-                                     Qt::IgnoreAspectRatio,
-                                     Qt::SmoothTransformation));
-      else
-      {
-        item->SetIcon(*mBrokenIcon);
-        RES->PurgeCachedResource(pkgName, SpkResource::ResourceType::AppIcon, 0);
-      }
-    }
-    else
-      item->SetIcon(*mLoadingIcon);
-
-    mAppItemList.append(item);
-    mItemLay->addWidget(item);
-  }
-
-  void SpkPageAppList::ClearAll()
-  {
-    QWidget *itm;
-    QLayoutItem *layitm;
-    while((layitm = mItemLay->takeAt(0)))
-    {
-      itm = layitm->widget();
-      itm->hide();
-      itm->deleteLater();
-    }
-    mAppItemList.clear();
-    mAppsArea->verticalScrollBar()->setValue(0);
-  }
-
-  void SpkPageAppList::ResourceAcquisitionFinished(int id, ResourceResult result)
-  {
-    QPixmap icon;
-//    qDebug() << "PageAppList: Resource" << id << "acquired";
-    auto item = mAppItemList[id];
-    if(result.status == SpkResource::ResourceStatus::Ready)
-    {
-      if(icon.loadFromData(result.data))
-        item->SetIcon(icon.scaled(SpkAppItem::IconSize_,
-                                     Qt::IgnoreAspectRatio,
-                                     Qt::SmoothTransformation));
-      else
-        item->SetIcon(*mBrokenIcon);
-    }
-    else if(result.status == SpkResource::ResourceStatus::Failed)
-    {
-      item->SetIcon(*mBrokenIcon);
-      RES->PurgeCachedResource(item->property("pkg_name").toString(),
-                               SpkResource::ResourceType::AppIcon, 0);
-    }
-  }
-
-  void SpkPageAppList::SetPageStatus(int total, int current, int itemCount, QString &keyword)
-  {
-    mCurrentPage = current;
-    mKeyword = keyword;
-    mPageIndicator->setText(tr("Page %1 / %2, %3 apps in total")
-                            .arg(current).arg(total).arg(itemCount));
-    mBtnPgUp->setDisabled(current == 1);
-    mBtnPgDown->setDisabled(total == current || total == 1);
-    mBtnGotoPage->setDisabled(total == 1);
-    mPageValidator->setTop(total);
-  }
-
-  void SpkPageAppList::DisablePageSwitchers()
-  {
-    mBtnPgDown->setDisabled(true);
-    mBtnPgUp->setDisabled(true);
-    mBtnGotoPage->setDisabled(true);
-  }
-
-  void SpkPageAppList::PageUp()
-  {
-    DisablePageSwitchers();
-    if(mKeyword.isEmpty())
-      emit SwitchListPage(mCategoryId, mCurrentPage - 1);
-    else
-      emit SwitchSearchPage(mKeyword, mCurrentPage - 1);
-  }
-
-  void SpkPageAppList::PageDown()
-  {
-    DisablePageSwitchers();
-    if(mKeyword.isEmpty())
-      emit SwitchListPage(mCategoryId, mCurrentPage + 1);
-    else
-      emit SwitchSearchPage(mKeyword, mCurrentPage + 1);
-  }
-
-  void SpkPageAppList::GotoPage()
-  {
-    if(mPageInput->text().isEmpty())
-      return SpkUiMessage::SendStoreNotification(tr("Please enter page number to go to!"));
-    int page = mPageInput->text().toInt();
-    if(page > mPageValidator->top())
-      return SpkUiMessage::SendStoreNotification(tr("Page %1 is not a valid page number!")
-                                                 .arg(page));
-    DisablePageSwitchers();
-    if(mKeyword.isEmpty())
-      emit SwitchListPage(mCategoryId, page);
-    else
-      emit SwitchSearchPage(mKeyword, page);
-  }
-
-  void SpkPageAppList::Activated()
-  {
-    RES->Acquire(this, false);
-  }
-}
--- a/gui/page/spkpagebase.cpp
+++ b/gui/page/spkpagebase.cpp
@@ -1,41 +0,0 @@
-
-#include "page/spkpagebase.h"
-
-/*
- * Documentation on
- * How to Add a New Page to Main Window Side Bar
- *
- * 1. Derive your page widget class from SpkPageBase (reference implementation
- *    in SpkPageSettings) and add them to CMakeLists
- *
- * 2. Add the ID for the page in enum SpkUi::SpkStackedPages (in spkmainwindow.h)
- *    and add it as a resource context if needed
- *
- * 3. Include the page's header file in spkmainwindow.h and add a pointer to it in
- *    SpkUi::SpkMainWidget
- *
- * 4. Add a tree item or icon button for the corresponding page inside
- *    SpkUi::SpkMainWidget, and initialize it in SpkUi::SpkMainWidget::SpkMainWidget.
- *    Take references of existing entries, and write similar code close to each other
- *    to make the source look nice. Don't forget to add the item to the UI.
- *
- * 5. Make the linkage between the page and the sidebar item at the end of
- *    SpkUi::SpkMainWidget::SpkMainWidget().
- *
- */
-
-SpkPageBase::SpkPageBase(QWidget *parent) : QWidget(parent)
-{
-
-}
-
-void SpkPageBase::ResourceAcquisitionFinished(int id, ResourceResult result)
-{
-  Q_UNUSED(id);
-  Q_UNUSED(result);
-}
-
-void SpkPageBase::Activated()
-{
-  ; // Do nothing
-}
--- a/gui/page/spkpagedownloads.cpp
+++ b/gui/page/spkpagedownloads.cpp
@@ -1,214 +0,0 @@
-
-
-#include "page/spkpagedownloads.h"
-#include "pkgs/spkpkgmgrbase.h"
-#include "spkuimsg.h"
-#include "spkutils.h"
-
-SpkUi::SpkPageDownloads::SpkPageDownloads(QWidget *parent) :
-  SpkPageBase(parent)
-{
-  mMainLay = new QVBoxLayout(this);
-  mLayEntries = new QVBoxLayout;
-  mScrollWidget = new QWidget;
-  mScrollArea = new QScrollArea(this);
-
-  mLayEntries->setAlignment(Qt::AlignTop);
-  mScrollWidget->setLayout(mLayEntries);
-  mScrollArea->setWidget(mScrollWidget);
-  mScrollArea->setWidgetResizable(true);
-  mMainLay->addWidget(mScrollArea);
-  setLayout(mMainLay);
-
-  mDownloadMgr = new SpkDownloadMgr(this);
-  connect(mDownloadMgr, &SpkDownloadMgr::DownloadProgressed,
-          this, &SpkPageDownloads::DownloadProgress);
-
-  mNextDownloadId = 0;
-  mCurrentStatus = Idle;
-
-  connect(mDownloadMgr, &SpkDownloadMgr::DownloadStopped,
-          this, &SpkPageDownloads::DownloadStopped, Qt::QueuedConnection);
-  connect(PKG, &SpkPkgMgrBase::ReportInstallResult,
-          this, &SpkPageDownloads::InstallationEnded);
-}
-
-SpkUi::SpkPageDownloads::~SpkPageDownloads()
-{
-  // TODO
-}
-
-void SpkUi::SpkPageDownloads::DownloadProgress(qint64 downloadedBytes, qint64 totalBytes, int id)
-{
-  if(!totalBytes)
-    return;
-
-  if(mCurrentStatus == Waiting && totalBytes)
-  {
-    mCurrentStatus = Downloading;
-    mEntries[id]->SetTotalBytes(totalBytes);
-    mEntries[id]->SetStatus(SpkDownloadEntry::Downloading);
-  }
-  mEntries[id]->Progress(downloadedBytes);
-}
-
-void SpkUi::SpkPageDownloads::AddDownloadTask(QString name, QString pkgName, QString path)
-{
-  // Add a new download entry into the UI
-  auto entry = new SpkDownloadEntry;
-  auto iconData = RES->CacheLookup(pkgName, SpkResource::ResourceType::AppIcon, 0);
-  auto id = mNextDownloadId;
-  QPixmap icon;
-  if(iconData.status != SpkResource::ResourceStatus::Ready || !icon.loadFromData(iconData.data))
-    icon.load(":/icons/broken-icon.svg");
-  entry->SetBasicInfo(name, icon, mDownloadMgr->GetDestFilePath(path));
-  entry->SetStatus(SpkDownloadEntry::Waiting);
-  entry->setProperty("entryId", id);
-  entry->setProperty("path", path);
-
-  mNextDownloadId++;
-
-  mEntries[id] = entry;
-  mLayEntries->addWidget(entry);
-
-  connect(entry, &SpkDownloadEntry::Action,
-          this, &SpkPageDownloads::EntryAction);
-
-  NewDownloadTask(id, path);
-}
-
-void SpkUi::SpkPageDownloads::DownloadStopped(SpkDownloadMgr::TaskResult status, int id)
-{
-  switch(status)
-  {
-    case SpkDownloadMgr::Success:
-      mEntries[id]->SetStatus(SpkDownloadEntry::ToBeInstalled);
-      break;
-
-    case SpkDownloadMgr::FailCannotCreateFile:
-      mEntries[id]->SetStatus(SpkDownloadEntry::DownloadFailed,
-                              tr("Cannot create download file. Download failed."));
-      break;
-
-    case SpkDownloadMgr::FailNoVaibleServer:
-      mEntries[id]->SetStatus(SpkDownloadEntry::DownloadFailed,
-                              tr("Connection unstable or server failure. Download failed."));
-      break;
-
-    case SpkDownloadMgr::FailCancel:
-      mEntries[id]->SetStatus(SpkDownloadEntry::DownloadFailed,
-                              tr("This download was cancelled."));
-      break;
-
-    case SpkDownloadMgr::Fail:
-      mEntries[id]->SetStatus(SpkDownloadEntry::DownloadFailed,
-                              tr("Unknown error. Download failed."));
-      break;
-  }
-
-  if(status == SpkDownloadMgr::Success)
-    SpkUiMessage::SendDesktopNotification(
-          tr("App \"%1\" downloaded, and ready to install.").arg(mEntries[id]->GetTaskName()));
-  else if(status != SpkDownloadMgr::FailCancel)
-    SpkUiMessage::SendDesktopNotification(
-          tr("Error occurred downloading \"%1\".").arg(mEntries[id]->GetTaskName()));
-
-
-  // Continue next download task
-  if(!mWaitingDownloads.isEmpty())
-  {
-    auto nextTask = mWaitingDownloads.dequeue();
-    auto nextEntry = mEntries[nextTask.first];
-    nextEntry->SetStatus(SpkDownloadEntry::Starting);
-    mDownloadMgr->StartNewDownload(nextTask.second, nextTask.first);
-    mCurrentStatus = Waiting;
-  }
-  else
-  {
-    mCurrentStatus = Idle;
-  }
-}
-
-void SpkUi::SpkPageDownloads::EntryAction(SpkDownloadEntry::EntryAction act)
-{
-  SpkDownloadEntry *entry = static_cast<SpkDownloadEntry*>(sender());
-  auto id = entry->property("entryId").toInt();
-  switch(act)
-  {
-    case SpkDownloadEntry::AbortDownload:
-      mDownloadMgr->CancelCurrentDownload(); // Only one task at a time so simply abort download
-      break;
-
-    case SpkDownloadEntry::RetryDownload:
-      mLayEntries->removeWidget(entry); // Move to list tail
-      mLayEntries->addWidget(entry);
-      NewDownloadTask(id, entry->property("path").toString());
-      entry->SetStatus(SpkDownloadEntry::Waiting);
-      break;
-
-    case SpkDownloadEntry::StartInstall:
-      switch(PKG->ExecuteInstallation(entry->GetFilePath(), id))
-      {
-        case SpkPkgMgrBase::Succeeded:
-          entry->SetStatus(SpkDownloadEntry::Installing);
-          break;
-
-        case SpkPkgMgrBase::Failed:
-          entry->SetStatus(SpkDownloadEntry::InstallFailed,
-                           tr("Failed to start installation."));
-          break;
-
-        default: break;
-      }
-
-      break;
-
-    case SpkDownloadEntry::RemoveEntry:
-      mLayEntries->removeWidget(entry);
-      mEntries.remove(id);
-      for(auto i = mWaitingDownloads.begin(); i != mWaitingDownloads.end(); i++)
-      {
-        if(i->first == id)
-        {
-          mWaitingDownloads.erase(i);
-          break;
-        }
-      }
-      entry->setVisible(false);
-      entry->deleteLater();
-      break;
-  }
-}
-
-void SpkUi::SpkPageDownloads::InstallationEnded(int id,
-                                                SpkPkgMgrBase::PkgInstallResult result,
-                                                int exitCode)
-{
-  if(result == SpkPkgMgrBase::Succeeded)
-  {
-    mEntries[id]->SetStatus(SpkDownloadEntry::Installed);
-  }
-  else
-  {
-    mEntries[id]->SetStatus(SpkDownloadEntry::InstallFailed,
-                            tr("Install failed, exit code: %1.").arg(exitCode));
-  }
-}
-
-void SpkUi::SpkPageDownloads::NewDownloadTask(int id, QString downloadPath)
-{
-  if(mCurrentStatus != Idle)
-    mWaitingDownloads.enqueue({ id, downloadPath }); // Queue download task for future
-  else
-  {
-    auto nextEntry = mEntries[id];
-    nextEntry->SetStatus(SpkDownloadEntry::Starting);
-    mCurrentStatus = Waiting;
-    if(!mDownloadMgr->StartNewDownload(downloadPath, id)) // Initiate a download task when idle
-    {
-      // If fails to start then try next one. Emitting this signal causes
-      // SpkPageDownloads::DownloadStopped to be activated and thus tries next item in queue
-      emit mDownloadMgr->DownloadStopped(SpkDownloadMgr::FailNoVaibleServer, id);
-    }
-  }
-}
--- a/gui/page/spkpagehome.cpp
+++ b/gui/page/spkpagehome.cpp
@@ -1,50 +0,0 @@
-
-#include <QDesktopServices>
-
-#include "page/spkpagehome.h"
-#include "spkabout.h"
-#include "gitver.h"
-
-SpkUi::SpkPageHome::SpkPageHome(QWidget *parent) :
-  SpkPageBase(parent)
-{
-  ui = new Ui::SpkHomepage;
-  ui->setupUi(this);
-
-  SetupUi();
-}
-
-void SpkUi::SpkPageHome::LinkActivated(QString s)
-{
-  QDesktopServices::openUrl(QUrl(s));
-}
-
-void SpkUi::SpkPageHome::SetupUi()
-{
-  ui->lblIcon->setPixmap(QIcon(":/icons/spark-store.svg").pixmap(QSize(128, 128)));
-
-  ui->hlayTitle->setAlignment(Qt::AlignHCenter);
-
-  ui->lblVersion->setText(ui->lblVersion->text().arg(GitVer::DescribeTags()));
-
-  ui->lblNewAnnouncement->setVisible(false);
-
-  // Click event will propagate to the main window and cause the window to move when
-  // mouse enters the zoom & move detection area. Disable mouse event propagation.
-  ui->lblAuthor->setAttribute(Qt::WA_NoMousePropagation, true);
-
-  ui->widReloadCategory->setVisible(false);
-  ui->widReloadCategory->setAttribute(Qt::WA_StyledBackground);
-  ui->lblCategoryErrIcon->setPixmap(QIcon::fromTheme("dialog-error").pixmap(QSize(32, 32)));
-
-  connect(ui->lblAuthor, &QLabel::linkActivated,
-          this, &SpkPageHome::LinkActivated);
-  connect(ui->btnSubmit, &QPushButton::clicked,
-          [&](){ LinkActivated("https://upload.deepinos.org"); });
-  connect(ui->btnFeedback, &QPushButton::clicked,
-          [&](){ LinkActivated("https://www.deepinos.org/t/spark-feedback"); });
-  connect(ui->btnDonation, &QPushButton::clicked,
-          [&](){ LinkActivated("https://spark.deepinos.org.cn/"); });
-  connect(ui->btnAbout, &QPushButton::clicked,
-          [&](){ SpkAbout::Show(); });
-}
--- a/gui/page/spkpagesettings.cpp
+++ b/gui/page/spkpagesettings.cpp
@@ -1,225 +0,0 @@
-
-#include <QtConcurrent/QtConcurrentRun>
-#include <QMutexLocker>
-#include <QFutureWatcher>
-#include "spkutils.h"
-#include "page/spkpagesettings.h"
-#include "spkmsgbox.h"
-
-namespace SpkUi
-{
-  SpkPageSettings::SpkPageSettings(QWidget *parent) :
-    SpkPageBase(parent)
-  {
-    mMainArea = new QScrollArea();
-    mMainLay = new QVBoxLayout(this);
-    mSettingsWidget = new QWidget(this);
-    ui = new Ui::SpkUiSettings;
-
-    ui->setupUi(mSettingsWidget);
-
-    mMainLay->addWidget(mMainArea);
-
-    mMainArea->setWidget(mSettingsWidget);
-    mMainArea->setWidgetResizable(true);
-
-    CFG->BindField("url/repo", &this->mRepoListUrl,
-                   "https://d.store.deepinos.org.cn/store/server.list");
-
-    mBytesDownloads = mBytesResource = -1;
-
-    connect(&mFwResourceClean, &QFutureWatcher<void>::finished,
-            this, &SpkPageSettings::CleanedResource);
-    connect(&mFwResourceCount, &QFutureWatcher<void>::finished,
-            this, &SpkPageSettings::CountFinishResource);
-    connect(&mFwDownloadClean, &QFutureWatcher<void>::finished,
-            this, &SpkPageSettings::CleanedDownload);
-    connect(&mFwDownloadCount, &QFutureWatcher<void>::finished,
-            this, &SpkPageSettings::CountFinishDownload);
-    connect(ui->btnViewDownloadedContent, &QPushButton::clicked,
-            this, &SpkPageSettings::on_btnViewDownloadedContent_clicked);
-    connect(ui->btnViewResourceCache, &QPushButton::clicked,
-            this, &SpkPageSettings::on_btnViewResourceCache_clicked);
-    connect(ui->btnCleanDownloadedContent, &QPushButton::clicked,
-            this, &SpkPageSettings::on_btnCleanDownloadedContent_clicked);
-    connect(ui->btnCleanResourceCache, &QPushButton::clicked,
-            this, &SpkPageSettings::on_btnCleanResourceCache_clicked);
-
-    SetupUi();
-  }
-
-  SpkPageSettings::~SpkPageSettings()
-  {
-    delete mSettingsWidget;
-  }
-
-  void SpkPageSettings::SetupUi()
-  {
-    ui->lblSettingsTitle->setObjectName("styConfTitle");
-    ui->lblCleanup->setObjectName("styConfTitle");
-    ui->lblAdvanced->setObjectName("styConfTitle");
-
-    connect(ui->btnSave, &QPushButton::clicked,
-            this, &SpkPageSettings::SaveConfiguration);
-  }
-
-  void SpkPageSettings::ReadConfiguration()
-  {
-    ui->spnConcurrentResDownloads->setValue(CFG->ReadField("resource/concurrent", 5).toInt());
-    ui->edtApiUrl->setText(CFG->ReadField("url/api", "").toString());
-    ui->edtResourceUrl->setText(CFG->ReadField("url/res", "").toString());
-    ui->edtResourceCachePath->setText(CFG->ReadField("dirs/cache", "").toString());
-    ui->edtDownloadPath->setText(CFG->ReadField("dirs/download", "").toString());
-    ui->edtDownloadServers->setPlainText(CFG->ReadField("download/servers", "").toString());
-    ui->edtQssPath->setText(CFG->ReadField("internal/qss_path", "").toString());
-    ui->edtRepoListUrl->setText(CFG->ReadField("url/repo", "").toString());
-    ui->cmbLightDarkTheme->setCurrentIndex(CFG->ReadField("ui/theme", 0).toInt());
-  }
-
-  void SpkPageSettings::SaveConfiguration()
-  {
-    CFG->SetSettings("resource/concurrent", ui->spnConcurrentResDownloads->value());
-    CFG->SetField("url/api", ui->edtApiUrl->text());
-    CFG->SetField("url/res", ui->edtResourceUrl->text());
-    CFG->SetSettings("dirs/cache", ui->edtResourceCachePath->text());
-    CFG->SetField("dirs/download", ui->edtDownloadPath->text());
-    CFG->SetSettings("internal/qss_path", ui->edtQssPath->text());
-    CFG->SetField("url/repo", ui->edtRepoListUrl->text());
-    if(!CFG->SetField("download/servers", ui->edtDownloadServers->toPlainText()))
-      SpkMsgBox::StaticExec(tr("Cannot change distribution servers.\n"
-                               "There's probably still downloads going on."),
-                            tr("Cannot set distribution server"),
-                            QMessageBox::Warning);
-
-    if(!CFG->SetField("ui/theme", ui->cmbLightDarkTheme->currentIndex()))
-      SpkMsgBox::StaticExec(tr("Auto mode can only be used when DDE plugin is loaded.\n"
-                               "Option change is not applied."),
-                            tr("Cannot set theme mode"),
-                            QMessageBox::Warning);
-  }
-
-  void SpkPageSettings::CountCleaning()
-  {
-    ui->lblSizeDownloadedContent->setText(tr("Counting..."));
-    ui->lblSizeResourceCache->setText(tr("Counting..."));
-    auto futureDownload = QtConcurrent::run([&]()
-      {
-        QDirIterator itr(ui->edtDownloadPath->text().replace('*', QDir::homePath()),
-                         QDirIterator::Subdirectories);
-        if(mMutDownload.tryLock(0))
-        {
-          int64_t size = 0;
-          while(itr.hasNext())
-          {
-            QFile f(itr.next());
-            size += f.size();
-          }
-          mBytesDownloads = size;
-          mMutDownload.unlock();
-        }
-      });
-    auto futureResource = QtConcurrent::run([&]()
-    {
-      QDirIterator itr(ui->edtResourceCachePath->text().replace('*', QDir::homePath()),
-                       QDirIterator::Subdirectories);
-      if(mMutResource.tryLock((0)))
-      {
-        int64_t size = 0;
-        while(itr.hasNext())
-        {
-          QFile f(itr.next());
-          size += f.size();
-        }
-        mBytesResource = size;
-        mMutResource.unlock();
-      }
-    });
-    mFwDownloadCount.setFuture(futureDownload);
-    mFwResourceCount.setFuture(futureResource);
-  }
-
-  void SpkPageSettings::CleanedResource()
-  {
-    ui->lblSizeResourceCache->setText(tr("Cleaned"));
-  }
-
-  void SpkPageSettings::CleanedDownload()
-  {
-    ui->lblSizeDownloadedContent->setText(tr("Cleaned"));
-  }
-
-  void SpkPageSettings::Activated()
-  {
-    ReadConfiguration();
-    CountCleaning();
-  }
-
-  void SpkPageSettings::CountFinishResource()
-  {
-    if(mBytesResource >= 0)
-      ui->lblSizeResourceCache->setText(SpkUtils::BytesToSize(mBytesResource));
-  }
-
-  void SpkPageSettings::CountFinishDownload()
-  {
-    if(mBytesDownloads >= 0)
-      ui->lblSizeDownloadedContent->setText(SpkUtils::BytesToSize(mBytesDownloads));
-  }
-
-  void SpkPageSettings::on_btnViewResourceCache_clicked()
-  {
-    QDesktopServices::openUrl(ui->edtResourceCachePath->text().replace('*', QDir::homePath()));
-  }
-
-  void SpkPageSettings::on_btnViewDownloadedContent_clicked()
-  {
-    QDesktopServices::openUrl(ui->edtDownloadPath->text().replace('*', QDir::homePath()));
-  }
-
-
-void SpkPageSettings::on_btnCleanResourceCache_clicked()
-{
-  ui->lblSizeResourceCache->setText(tr("Cleaning..."));
-  auto future = QtConcurrent::run([&]()
-    {
-      QDirIterator itr(ui->edtResourceCachePath->text().replace('*', QDir::homePath()),
-                       QDirIterator::Subdirectories);
-      if(mMutDownload.tryLock(0))
-      {
-        int64_t size = 0;
-        while(itr.hasNext())
-        {
-          QFile f(itr.next());
-          f.remove();
-        }
-        mBytesDownloads = size;
-        mMutDownload.unlock();
-      }
-    });
-  mFwResourceClean.setFuture(future);
-}
-
-
-void SpkPageSettings::on_btnCleanDownloadedContent_clicked()
-{
-  ui->lblSizeDownloadedContent->setText(tr("Cleaning..."));
-  auto futureDownload = QtConcurrent::run([&]()
-    {
-      QDirIterator itr(ui->edtDownloadPath->text().replace('*', QDir::homePath()),
-                       QDirIterator::Subdirectories);
-      if(mMutDownload.tryLock(0))
-      {
-        int64_t size = 0;
-        while(itr.hasNext())
-        {
-          QFile f(itr.next());
-          f.remove();
-        }
-        mBytesDownloads = size;
-        mMutDownload.unlock();
-      }
-    });
-  mFwDownloadClean.setFuture(futureDownload);
-}
-
-}
--- a/gui/page/spkpageuitest.cpp
+++ b/gui/page/spkpageuitest.cpp
@@ -1,165 +0,0 @@
-
-#include <QApplication>
-#include "spkabout.h"
-#include "inc/page/spkpageuitest.h"
-#include "spkpopup.h"
-#include "spkui_general.h"
-#include "pkgs/spkpkgmgrbase.h"
-
-SpkUi::SpkPageUiTest::SpkPageUiTest(QWidget *parent) : QSplitter(parent)
-{
-  setObjectName("spk_pg_qsstest");
-
-  TextStylesheet = new QTextEdit(this);
-  TextStylesheet->setObjectName("spk_pg_qsstest_qsstext");
-  TextStylesheet->setPlainText(SpkUi::CurrentStylesheet);
-
-  BtnApply = new QPushButton(this);
-  BtnApply->setObjectName("spk_pg_qsstest_btnapply");
-  BtnApply->setText("Apply");
-  connect(BtnApply, &QPushButton::pressed, this, &SpkPageUiTest::SetStylesheet);
-
-  BtnFetch = new QPushButton(this);
-  BtnFetch->setObjectName("spk_pg_qsstest_btnfetch");
-  BtnFetch->setText("Fetch Stylesheet");
-  connect(BtnFetch, &QPushButton::pressed, this, &SpkPageUiTest::FetchStylesheet);
-
-  HLayInputBtns = new QHBoxLayout;
-  HLayInputBtns->setObjectName("spk_pg_qsstest_hlay_inputbtns");
-  HLayInputBtns->addWidget(BtnFetch);
-  HLayInputBtns->addWidget(BtnApply);
-
-  Btn = new QPushButton(this);
-  Btn->setObjectName("spk_pg_qsstest_button");
-  Btn->setText("TestButton");
-
-  Chk = new QCheckBox(this);
-  Chk->setObjectName("spk_pg_qsstest_checkbox");
-  Chk->setText("CheckBox");
-
-  Rad = new QRadioButton(this);
-  Rad->setObjectName("spk_pg_qsstest_radiobtn");
-  Rad->setText("RadioButton");
-
-  Loading = new SpkLoading(this);
-  Loading->setObjectName("spk_pg_qsstest_loading");
-  Loading->start();
-
-  Prog = new QProgressBar(this);
-  Prog->setObjectName("spk_pg_qsstest_prog");
-  Prog->setValue(65);
-  Prog->setRange(0, 100);
-
-  AppItem = new SpkAppItem(0, this);
-  AppItem->setObjectName("spk_pg_qsstest_appitem");
-  AppItem->SetTitle("Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
-  AppItem->SetDescription("Nam vehicula lacus vitae leo fermentum efficitur. "
-                          "Phasellus finibus risus id aliquam pulvinar.");
-  AppItem->SetIcon(QIcon::fromTheme("dialog-information").pixmap(72, 72));
-
-  Detail1 = new SpkDetailEntry; Detail1->SetTitle("Foo"); Detail1->SetValue("1");
-  Detail2 = new SpkDetailEntry; Detail2->SetTitle("Foo"); Detail2->SetValue("1");
-  Detail3 = new SpkDetailEntry; Detail3->SetTitle("Foo"); Detail3->SetValue("1");
-
-  DetailsLay = new SpkStretchLayout;
-  DetailsLay->addWidget(Detail1);
-  DetailsLay->addWidget(Detail2);
-  DetailsLay->addWidget(Detail3);
-
-  DetailsWidget = new QWidget;
-  DetailsWidget->setLayout(DetailsLay);
-
-  PopupText = new QLineEdit(this);
-  PopupText->setObjectName("spk_pg_qsstest_poptext");
-  PopupText->setText("Hello, world");
-
-  ShowPopup = new QPushButton(this);
-  ShowPopup->setText("Show Popup");
-  connect(ShowPopup, &QPushButton::clicked, this, &SpkPageUiTest::ShowPopupSlot);
-
-  ShowAbout = new QPushButton(this);
-  ShowAbout->setText("Show About Dialog");
-  connect(ShowAbout, &QPushButton::clicked, [](){ SpkAbout::Show(); });
-
-  ShowPkgmgr = new QPushButton(this);
-  ShowPkgmgr->setText("Show Install Menu");
-  connect(ShowPkgmgr, &QPushButton::clicked, [=](){ SpkPkgMgrBase::Instance()->ExecuteInstallation(PopupText->text(), 0); });
-
-  SlideV = new QSlider(this);
-  SlideV->setObjectName("spk_pg_qsstest_slider_v");
-  SlideV->setOrientation(Qt::Vertical);
-  SlideV->setMaximum(1000);
-  SlideV->setMinimum(0);
-
-  SlideH = new QSlider(this);
-  SlideH->setObjectName("spk_pg_qsstest_slider_h");
-  SlideH->setOrientation(Qt::Horizontal);
-  SlideH->setMaximum(1000);
-  SlideH->setMinimum(0);
-
-  IconBtn = new SpkIconButton(this);
-  IconBtn->setObjectName("spk_pg_qsstest_iconbtn");
-  IconBtn->SetIcon(QIcon(":/icons/settings.svg"), QSize{ 16, 16 });
-
-  VLayTestWidgets = new QVBoxLayout;
-  VLayTestWidgets->setObjectName("spk_pg_qsstest_vlay_btn");
-  VLayTestWidgets->addWidget(Btn);
-  VLayTestWidgets->addWidget(Chk);
-  VLayTestWidgets->addWidget(Rad);
-  VLayTestWidgets->addWidget(IconBtn);
-  VLayTestWidgets->addWidget(Loading);
-  VLayTestWidgets->addWidget(PopupText);
-  VLayTestWidgets->addWidget(ShowPopup);
-  VLayTestWidgets->addWidget(ShowAbout);
-  VLayTestWidgets->addWidget(ShowPkgmgr);
-  VLayTestWidgets->addWidget(AppItem);
-  VLayTestWidgets->addWidget(DetailsWidget);
-
-  Group = new QGroupBox(this);
-  Group->setObjectName("spk_pg_qsstest_groupbox");
-  Group->setTitle("GroupBox");
-  Group->setLayout(VLayTestWidgets);
-
-  VLayInput = new QVBoxLayout;
-  VLayInput->setObjectName("spk_pg_qsstest_inputlay");
-  VLayInput->addWidget(TextStylesheet);
-  VLayInput->addLayout(HLayInputBtns);
-
-  VLayWidgets = new QVBoxLayout;
-  VLayWidgets->setObjectName("spk_pg_qsstest_widgetlay");
-  VLayWidgets->addWidget(Group);
-  VLayWidgets->addWidget(SlideH);
-  VLayWidgets->addWidget(Prog);
-
-  HLay4Slider = new QHBoxLayout;
-  HLay4Slider->setObjectName("spk_pg_qsstest_hlay_for_slider");
-  HLay4Slider->addLayout(VLayWidgets);
-  HLay4Slider->addWidget(SlideV);
-
-  WidL = new QWidget(this);
-  WidL->setObjectName("spk_pg_qsstest_widleft");
-  WidL->setLayout(HLay4Slider);
-  WidL->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
-
-  WidR = new QWidget(this);
-  WidR->setObjectName("spk_pg_qsstest_widright");
-  WidR->setLayout(VLayInput);
-
-  addWidget(WidL);
-  addWidget(WidR);
-}
-
-void SpkUi::SpkPageUiTest::SetStylesheet()
-{
-  qApp->setStyleSheet(TextStylesheet->toPlainText());
-}
-
-void SpkUi::SpkPageUiTest::FetchStylesheet()
-{
-  TextStylesheet->setPlainText(SpkUi::CurrentStylesheet);
-}
-
-void SpkUi::SpkPageUiTest::ShowPopupSlot()
-{
-  SpkUi::Popup->Show(PopupText->text());
-}
--- a/gui/page/ui/homepage.ui
+++ b/gui/page/ui/homepage.ui
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SpkHomepage</class>
- <widget class="QWidget" name="SpkHomepage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>648</width>
-    <height>554</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <spacer name="verticalSpacer">
-     <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>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="hlayTitle">
-     <item>
-      <widget class="QLabel" name="lblIcon">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>{spark-store-icon}</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="lblTitle">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <pointsize>40</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Spark Store</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblAuthor">
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Brought to you by &lt;a href=&quot;https://spark-app.store&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;Spark Project&lt;/span&gt;&lt;/a&gt;, an open source software project.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_3">
-     <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>50</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <layout class="QGridLayout" name="vlayBtns">
-       <item row="1" column="1">
-        <widget class="SpkNotifyDot" name="lblNewAnnouncement">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>0</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="lblAboutProject">
-         <property name="text">
-          <string>About this project...</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QPushButton" name="btnFeedback">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>150</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Feedback</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QPushButton" name="btnDonation">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>150</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Donation</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QPushButton" name="btnAnnouncements">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>150</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Announcements</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QPushButton" name="btnSubmit">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>150</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Submit Software</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QWidget" name="widReloadCategory" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <item>
-       <widget class="QLabel" name="lblCategoryErrIcon">
-        <property name="text">
-         <string>{error-icon}</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_4">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="lblCategoryErr">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Category failed to load. Click the button to retry.</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="btnReloadCategory">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Reload</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <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>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="lblVersion">
-       <property name="text">
-        <string>Version %1</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnAbout">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>About</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <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>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SpkNotifyDot</class>
-   <extends>QLabel</extends>
-   <header>spknotifydot.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
--- a/gui/page/ui/settings.ui
+++ b/gui/page/ui/settings.ui
@@ -1,472 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SpkUiSettings</class>
- <widget class="QWidget" name="SpkUiSettings">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>581</width>
-    <height>896</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="layTitle">
-     <item>
-      <widget class="QLabel" name="lblSettingsTitle">
-       <property name="text">
-        <string>Spark Store Settings</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="btnSave">
-       <property name="text">
-        <string>Apply</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="Line" name="lineTitle">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblRestartHint">
-     <property name="text">
-      <string>Configuration entries marked &quot;*&quot; will only take effect after restarting Spark Store.</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="laySettings">
-     <item row="5" column="0">
-      <widget class="QLabel" name="lblApiUrl">
-       <property name="text">
-        <string>Store API URL</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="lblResourceUrl">
-       <property name="text">
-        <string>Store resource URL</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="edtDownloadPath">
-       <property name="spkcfg_key" stdset="0">
-        <string notr="true">dirs/download</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="lblResourceCachePath">
-       <property name="text">
-        <string>Resource cache path*</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="lblAptRepo">
-       <property name="text">
-        <string>APT Repository</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="QLineEdit" name="edtResourceUrl">
-       <property name="spkcfg_key" stdset="0">
-        <string>url/res</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <layout class="QHBoxLayout" name="layAptRepo">
-       <property name="spacing">
-        <number>4</number>
-       </property>
-       <item>
-        <widget class="QComboBox" name="cmbAptRepo">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="spkcfg_key" stdset="0">
-          <string notr="true">pkgmgr/apt_repo</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnFetchAptRepo">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Fetch all</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="btnApplyAptRepo">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Apply</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="lblLightDarkTheme">
-       <property name="text">
-        <string>Light/dark theme</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QLineEdit" name="edtResourceCachePath">
-       <property name="spkcfg_key" stdset="0">
-        <string>dirs/cache</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QPlainTextEdit" name="edtDownloadServers">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>80</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>150</height>
-        </size>
-       </property>
-       <property name="baseSize">
-        <size>
-         <width>100</width>
-         <height>100</height>
-        </size>
-       </property>
-       <property name="spkcfg_key" stdset="0">
-        <string notr="true">download/servers</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="cmbLightDarkTheme">
-       <property name="currentIndex">
-        <number>3</number>
-       </property>
-       <property name="frame">
-        <bool>true</bool>
-       </property>
-       <property name="spkcfg_key" stdset="0">
-        <string notr="true">gui/theme</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>Auto (DDE only)</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Always Light</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Always Dark</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Manual</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="lblDownloadPath">
-       <property name="toolTip">
-        <string/>
-       </property>
-       <property name="toolTipDuration">
-        <number>-1</number>
-       </property>
-       <property name="text">
-        <string>Download path*</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="lblDownloadServers">
-       <property name="toolTip">
-        <string>Server addresses are separated with two semicolons (;;).</string>
-       </property>
-       <property name="toolTipDuration">
-        <number>1</number>
-       </property>
-       <property name="text">
-        <string>Download servers</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QLineEdit" name="edtApiUrl">
-       <property name="spkcfg_key" stdset="0">
-        <string>url/api</string>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="lblRepoListUrl">
-       <property name="text">
-        <string>APT Repository Source</string>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <widget class="QLineEdit" name="edtRepoListUrl"/>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblHomeNotice">
-     <property name="text">
-      <string>Note: character &quot;*&quot; in paths are replaced with the current user's home path.</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblCleanup">
-     <property name="text">
-      <string>Cache and Downloads cleanup</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblCleanupDescription">
-     <property name="text">
-      <string>Spark Store caches resources such as app icons and screenshots locally. If you want to free up space, you can clear them here or delete them manually.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="layCleanup">
-     <item row="1" column="3">
-      <widget class="QPushButton" name="btnCleanDownloadedContent">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Clear</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QPushButton" name="btnViewResourceCache">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>View</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2">
-      <widget class="QPushButton" name="btnViewDownloadedContent">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>View</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="lblDownloadedContent">
-       <property name="text">
-        <string>Downloaded content</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="lblResourceCache">
-       <property name="text">
-        <string>Resource cache</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="3">
-      <widget class="QPushButton" name="btnCleanResourceCache">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Clear</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="lblSizeResourceCache">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLabel" name="lblSizeDownloadedContent">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblAdvanced">
-     <property name="text">
-      <string>Advanced</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblAdvancedDescription">
-     <property name="text">
-      <string>Advanced settings are low-level configurations that can affect usability and are not meant to be modified by average users.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QGridLayout" name="layAdvanced">
-     <item row="0" column="0">
-      <widget class="QLabel" name="lblConcurrentResDownloads">
-       <property name="text">
-        <string>Concurrent resource downloads*</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QSpinBox" name="spnConcurrentResDownloads">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>50</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="minimum">
-        <number>1</number>
-       </property>
-       <property name="maximum">
-        <number>6</number>
-       </property>
-       <property name="value">
-        <number>5</number>
-       </property>
-       <property name="spkcfg_key" stdset="0">
-        <string>resource/concurrent</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="lblQssPath">
-       <property name="text">
-        <string>Default Qt Style Sheet template*</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="edtQssPath">
-       <property name="spkcfg_key" stdset="0">
-        <string>internal/qss_path</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/gui/qt/elidedlabel.cpp
+++ b/gui/qt/elidedlabel.cpp
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
- * Slight modifications has been done to the code to make it fit into the project.
- */
-
-#include "qt/elidedlabel.h"
-
-#include <QPainter>
-#include <QSizePolicy>
-#include <QTextLayout>
-
-//! [0]
-ElidedLabel::ElidedLabel(const QString &text, QWidget *parent)
-: QFrame(parent)
-, elided(false)
-, content(text)
-{
-  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-}
-//! [0]
-
-//! [1]
-void ElidedLabel::setText(const QString &newText)
-{
-  content = newText;
-  update();
-}
-//! [1]
-
-//! [2]
-void ElidedLabel::paintEvent(QPaintEvent *event)
-{
-  QFrame::paintEvent(event);
-
-  QPainter painter(this);
-  QFontMetrics fontMetrics = painter.fontMetrics();
-
-  bool didElide = false;
-  int lineSpacing = fontMetrics.lineSpacing();
-  int y = 0;
-
-  QTextLayout textLayout(content, painter.font());
-  textLayout.beginLayout();
-  forever {
-    QTextLine line = textLayout.createLine();
-
-    if (!line.isValid())
-      break;
-
-    line.setLineWidth(width());
-    int nextLineY = y + lineSpacing;
-
-    if (height() >= nextLineY + lineSpacing) {
-      line.draw(&painter, QPoint(0, y));
-      y = nextLineY;
-      //! [2]
-      //! [3]
-    } else {
-      QString lastLine = content.mid(line.textStart());
-      QString elidedLastLine = fontMetrics.elidedText(lastLine, Qt::ElideRight, width());
-      painter.drawText(QPoint(0, y + fontMetrics.ascent()), elidedLastLine);
-      line = textLayout.createLine();
-      didElide = line.isValid();
-      break;
-    }
-  }
-  textLayout.endLayout();
-  //! [3]
-
-  //! [4]
-  if (didElide != elided) {
-    elided = didElide;
-    emit elisionChanged(didElide);
-  }
-}
-
-ElidedLabel::ElidedLabel(QWidget *parent)
-: QFrame(parent)
-, elided(false)
-, content("")
-{
-  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-}
-//! [4]
--- a/gui/spkabout.cpp
+++ b/gui/spkabout.cpp
@@ -1,73 +0,0 @@
-
-#include <QDesktopServices>
-#include "spkabout.h"
-#include "gitver.h"
-
-SpkAbout::SpkAbout(QWidget *parent) : SpkDialog(parent)
-{
-  setWindowModality(Qt::ApplicationModal);
-
-//  mDialogWidget->setMaximumWidth(600);
-  mDialogWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
-  setFixedSize(550, 450);
-  SetResizable(false); // Do you like the dilemma of using self created widget?
-
-  mIconLay = new QHBoxLayout;
-
-  mSpkVersion = new QLabel;
-  mSpkVersion->setText(tr("<h1>Spark Store</h1>"
-                          "<h3>Version <a href=\"https://www.spark-app.store\">%1</a></h3>"
-                          "<t>Built on %2 %3</t>")
-                           .arg(GitVer::DescribeTags(),
-                                __DATE__, __TIME__));
-  connect(mSpkVersion, &QLabel::linkActivated,
-          [](const QString &link){ QDesktopServices::openUrl(link); });
-
-  mSpkIcon = new QLabel;
-  mSpkIcon->setPixmap(QIcon(":/icons/spark-store.svg").pixmap(QSize(128, 128)));
-
-  auto description = tr(
-      "Spark Store was started when Chinese home-grown Linux operating systems "
-      "had initially hit the market. Because the Linux desktop ecosystem is not "
-      "good enough at the time being, volunteers built this small App Store in "
-      "the hope that users can get useful applications faster.\n\n"
-      "Right now we are not just a Chinese group. We are discovering our way into "
-      "more Debian-based Linux OSes, and build a real community software repository "
-      "for users around the world.");
-  mDescriptionText = new QLabel;
-  mDescriptionText->setObjectName("spk_about_desc");
-  mDescriptionText->setWordWrap(true);
-  mDescriptionText->setText(description);
-
-  mIconLay->addStretch(3);
-  mIconLay->addWidget(mSpkIcon);
-  mIconLay->addStretch(1);
-  mIconLay->addWidget(mSpkVersion);
-  mIconLay->addStretch(3);
-  mIconLay->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
-
-  AddStretch();
-  AddLayout(mIconLay);
-  AddSpacing(18);
-  AddWidget(mDescriptionText);
-  AddStretch();
-  SetMargin(18, 0, 18, 18);
-
-  GetTitleBar()->SetOperationButton(SpkTitleBar::OperationButton::Close);
-  GetTitleBar()->SetTitle(tr("About Spark Store"));
-}
-
-SpkAbout::~SpkAbout()
-{
-  //  delete mIconLay;
-  //  delete mDescriptionText;
-}
-
-void SpkAbout::Show()
-{
-  SpkAbout *b = new SpkAbout;
-
-  b->Exec();
-  delete b;
-}
--- a/gui/spkappitem.cpp
+++ b/gui/spkappitem.cpp
@@ -1,63 +0,0 @@
-
-#include <QPainter>
-#include <QStyleOption>
-#include "spkappitem.h"
-#include "qt/elidedlabel.h"
-
-const QSize SpkAppItem::IconSize_;
-
-SpkAppItem::SpkAppItem(int appId, QWidget *parent) : QWidget(parent)
-{
-  mAppId = appId;
-
-  mMainLay = new QHBoxLayout(this);
-  mLayText = new QVBoxLayout;
-
-  mIcon = new QLabel;
-  mIcon->setFixedSize(IconSize, IconSize);
-  mIcon->setAutoFillBackground(false);
-
-  // NOTE: Make mTitle ElidedTitle too?
-  mTitle = new QLabel;
-  mTitle->setWordWrap(false);
-  mTitle->setObjectName("styAppItmTitle");
-  mTitle->setAutoFillBackground(true);
-  mDescription = new ElidedLabel;
-//  mDescription->setWordWrap(true); // Commented out since ElidedLabel lacks of these methods
-  mDescription->setObjectName("styAppItmDesc");
-  mDescription->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-//  mDescription->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-//  mDescription->setAutoFillBackground(true);
-  mLayText->addWidget(mTitle);
-  mLayText->addWidget(mDescription);
-  mLayText->setAlignment(Qt::AlignTop);
-
-  mMainLay->setMargin(5);
-  mMainLay->addWidget(mIcon);
-  mMainLay->addLayout(mLayText);
-
-  setMinimumHeight(82);
-  setMaximumHeight(82);
-  setMinimumWidth(300);
-}
-
-void SpkAppItem::paintEvent(QPaintEvent *e)
-{
-    Q_UNUSED(e)
-    QStyleOption opt;
-    opt.init(this);
-    QPainter p(this);
-    style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-}
-
-void SpkAppItem::mousePressEvent(QMouseEvent *e)
-{
-  mPressCond = true;
-}
-
-void SpkAppItem::mouseReleaseEvent(QMouseEvent *e)
-{
-  if(mPressCond)
-    emit clicked(mAppId);
-  mPressCond = false;
-}
--- a/gui/spkcategoryselector.cpp
+++ b/gui/spkcategoryselector.cpp
@@ -1,61 +0,0 @@
-
-#include "spkmainwindow.h"
-
-namespace SpkUi
-{
-  SpkCategorySelector::SpkCategorySelector(QWidget *parent) : QWidget(parent)
-  {
-    mBtnLayout = new QVBoxLayout(this);
-    mGroup = new QButtonGroup(this);
-  }
-
-  void SpkCategorySelector::AddButton(QString aBtnText, int aCategoryId, QPixmap *aBtnIcon)
-  {
-    auto btn = new SpkCategoryButton(this);
-    btn->SetText(aBtnText);
-    if(aBtnIcon)
-      btn->SetIcon(*aBtnIcon);
-    mBtnList.append(btn);
-    mGroup->addButton(btn, aCategoryId ? aCategoryId : -1);
-    mBtnLayout->addWidget(btn);
-  }
-
-  void SpkCategorySelector::DeleteAllButtons() // TODO: UNTESTED
-  {
-    foreach (auto i, mBtnList)
-    {
-      mBtnLayout->removeWidget(i);
-      mGroup->removeButton(i);
-      i->deleteLater();
-    }
-    mBtnList.clear();
-  }
-
-  SpkCategoryButton::SpkCategoryButton(QWidget *parent) : QPushButton(parent)
-  {
-    mIcon = new QLabel(this);
-    mIcon->setObjectName("spk_categorybtn_label");
-    mText = new QLabel(this);
-    mText->setObjectName("spk_categorybtn_text");
-    mLayout = new QHBoxLayout;
-    mLayout->setObjectName("spk_categorybtn_lay");
-    mLayout->addSpacing(Spacing);
-    mLayout->addWidget(mIcon);
-    mLayout->addSpacing(Spacing);
-    mLayout->addStretch();
-    mLayout->addWidget(mText);
-    mLayout->addStretch();
-    mLayout->addSpacing(Spacing);
-    setLayout(mLayout);
-  }
-
-  void SpkCategoryButton::SetIcon(QPixmap aImage)
-  {
-    mIcon->setPixmap(aImage);
-  }
-
-  void SpkCategoryButton::SetText(QString aText)
-  {
-    mText->setText(aText);
-  }
-}
--- a/gui/spkdialog.cpp
+++ b/gui/spkdialog.cpp
@@ -1,115 +0,0 @@
-
-#include "spkdialog.h"
-#include <QEventLoop>
-
-SpkDialog::SpkDialog(QWidget *parent) : SpkWindow(parent)
-{
-  mDialogWidget = new QWidget;
-  mMainVLay = new QVBoxLayout;
-  mWidgetsVLay = new QVBoxLayout();
-  mBtnLay = new QHBoxLayout();
-  mBtnGroup = new QButtonGroup(this);
-
-  mMainVLay->addLayout(mWidgetsVLay);
-  mMainVLay->addLayout(mBtnLay);
-
-  mBtnLay->setAlignment(Qt::AlignCenter);
-
-  SetCentralWidget(mDialogWidget);
-
-  mDialogWidget->setLayout(mMainVLay);
-
-  // idClicked is not available on platforms we support, shouldn't change it
-  connect(mBtnGroup, QOverload<int>::of(&QButtonGroup::buttonClicked),
-          this, &SpkDialog::ButtonPressed);
-  connect(this, &SpkWindow::Closed, this, &SpkDialog::ForceClose);
-}
-
-SpkDialog::~SpkDialog()
-{
-  auto itp = mParentsList.begin();
-  for(auto itw = mWidgetsList.begin(); itw != mWidgetsList.end(); itw++)
-  {
-    (*itw)->setParent(*(itp++));// We shall never take the ownership of these widgets
-  }
-  delete mDialogWidget;
-}
-
-void SpkDialog::AddButton(QString text, SpkUi::SpkButtonStyle style)
-{
-  auto b = new QPushButton();
-  b->setText(text);
-  b->setMinimumWidth(100);
-  b->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-  switch(style)
-  {
-
-    case SpkUi::SpkButtonStyle::Recommend:
-      b->setObjectName("sty_recommendbtn");
-      break;
-    case SpkUi::SpkButtonStyle::Warn:
-      b->setObjectName("sty_warnbtn");
-      break;
-    default:
-      break;
-  }
-  mBtnLay->addWidget(b);
-  mBtnGroup->addButton(b);
-}
-
-void SpkDialog::AddWidget(QWidget *w)
-{
-  // Adding a widget does not take the ownership.
-  mWidgetsVLay->addWidget(w);
-  mWidgetsList << w;
-  mParentsList << w->parentWidget();
-}
-
-void SpkDialog::AddLayout(QLayout *w)
-{
-  mWidgetsVLay->addLayout(w);
-  mWidgetsList << w;
-  mParentsList << w->parentWidget();
-}
-
-void SpkDialog::AddSpacing(int a)
-{
-  mWidgetsVLay->addSpacing(a);
-}
-
-void SpkDialog::AddStretch(int a)
-{
-  mWidgetsVLay->addStretch(a);
-}
-
-void SpkDialog::SetMargin(int a)
-{
-  mWidgetsVLay->setMargin(a);
-}
-
-int SpkDialog::Exec()
-{
-  QEventLoop loop;
-  connect(this, &SpkDialog::ExitEventLoop, &loop, &QEventLoop::exit);
-  connect(this, &SpkDialog::CloseWindow, this, &QMainWindow::close);
-  show();
-  return loop.exec();
-}
-
-void SpkDialog::ButtonPressed(int aBtnId)
-{
-  disconnect(this, &SpkWindow::Closed, this, &SpkDialog::ForceClose);
-  emit ExitEventLoop(-aBtnId - 2);
-  emit CloseWindow();
-}
-
-void SpkDialog::ForceClose()
-{
-  disconnect(this, &SpkDialog::CloseWindow, this, &QMainWindow::close);
-  emit ExitEventLoop(-1);
-}
-
-void SpkDialog::SetMargin(int left, int top, int right, int bottom)
-{
-  mWidgetsVLay->setContentsMargins(left, top, right, bottom);
-}
--- a/gui/spkdownloadentry.cpp
+++ b/gui/spkdownloadentry.cpp
@@ -1,201 +0,0 @@
-
-#include "spkdownloadentry.h"
-#include "spklogging.h"
-#include "spkutils.h"
-#include <QDebug>
-
-constexpr QSize SpkDownloadEntry::IconSize;
-
-SpkDownloadEntry::SpkDownloadEntry(QWidget *parent)
-{
-  mIcon = new QLabel;
-  mAppName = new ElidedLabel;
-  mMessage = new QLabel;
-  mProgress = new QProgressBar;
-  mLoading = new SpkLoading;
-  mBtnDelete = new QPushButton;
-  mBtnActions = new QPushButton;
-
-  mLayInfo = new QVBoxLayout;
-  mLayMsgs = new QHBoxLayout;
-  mLayMain = new QHBoxLayout;
-
-  mLoading->setVisible(false);
-  mIcon->setFixedSize(IconSize);
-  mProgress->setRange(0, 1000);
-
-  mLayMsgs->addWidget(mAppName);
-  mLayMsgs->addStretch();
-  mLayMsgs->addWidget(mMessage);
-
-  mLayInfo->addLayout(mLayMsgs);
-  mLayInfo->addWidget(mProgress);
-  mLayInfo->setAlignment(Qt::AlignVCenter);
-
-  mLayMain->addWidget(mIcon);
-  mLayMain->addLayout(mLayInfo);
-  mLayMain->addWidget(mLoading);
-  mLayMain->addWidget(mBtnActions);
-  mLayMain->addWidget(mBtnDelete);
-
-  setLayout(mLayMain);
-
-  connect(mBtnActions, &QPushButton::clicked, this, &SpkDownloadEntry::ActionButton);
-  connect(mBtnDelete, &QPushButton::clicked, this, &SpkDownloadEntry::DeleteButton);
-
-  mStatus = Invalid;
-
-  mLastReportTime = QTime::currentTime();
-}
-
-
-SpkDownloadEntry::~SpkDownloadEntry()
-{
-  // TODO
-}
-
-void SpkDownloadEntry::SetTotalBytes(qint64 total)
-{
-  mTotalBytes = total;
-  mReadableTotalSize = SpkUtils::BytesToSize(total);
-  mLastReportTime = QTime::currentTime();
-}
-
-void SpkDownloadEntry::SetBasicInfo(QString name, QPixmap icon, QString filePath)
-{
-  mAppName->setText(name);
-  mIcon->setPixmap(icon.scaled(IconSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-  mFilePath = filePath;
-}
-
-void SpkDownloadEntry::SetStatus(DownloadEntryStatus status, QString msg)
-{
-  mStatus = status;
-  switch(status)
-  {
-    case Waiting:
-      mMessage->setText(tr("Waiting for download"));
-      mProgress->setVisible(false);
-      mBtnActions->setVisible(false);
-      mBtnDelete->setVisible(true);
-      mBtnDelete->setText(tr("Cancel"));
-      break;
-
-    case Starting:
-      mMessage->setText(tr("Starting download"));
-      mBtnDelete->setVisible(false);
-      break;
-
-    case Downloading:
-      mMessage->setText(tr(""));
-      mProgress->setVisible(true);
-      mBtnActions->setVisible(false);
-      mBtnDelete->setVisible(true);
-      break;
-
-    case DownloadFailed:
-      mMessage->setText(msg);
-      mProgress->setVisible(false);
-      mBtnActions->setVisible(true);
-      mBtnActions->setText(tr("Retry"));
-
-      break;
-
-    case ToBeInstalled:
-      mMessage->setText(tr("Download Finished"));
-      mProgress->setVisible(false);
-      mBtnActions->setVisible(true);
-      mBtnDelete->setVisible(false);
-      mBtnActions->setText(tr("Install"));
-      break;
-
-    case Installing:
-      mMessage->setText("");
-      mProgress->setVisible(false);
-      mBtnActions->setVisible(false);
-      mBtnDelete->setVisible(false);
-      mLoading->setVisible(true);
-      mLoading->Begin();
-      break;
-
-    case Installed:
-      mMessage->setText(tr("Installed"));
-      mLoading->End();
-      mLoading->setVisible(false);
-      mBtnDelete->setVisible(true);
-      mBtnDelete->setText(tr("Delete"));
-      break;
-
-    case InstallFailed:
-      mMessage->setText(msg.isEmpty() ? tr("Install Failed") : msg);
-      mLoading->End();
-      mLoading->setVisible(false);
-      mBtnActions->setVisible(true);
-      mBtnActions->setText(tr("Install"));
-      mBtnDelete->setVisible(true);
-      mBtnDelete->setText(tr("Cancel"));
-      break;
-
-    case Invalid:
-      break;
-  }
-}
-
-void SpkDownloadEntry::Progress(qint64 bytes)
-{
-  auto now = QTime::currentTime();
-  auto msecDiff = mLastReportTime.msecsTo(now);
-
-  if(msecDiff != 0)
-  {
-    auto bytesPerSec = (bytes - mDownloadedBytes) / (msecDiff / 1000.0);
-    qDebug() << "Bytes" << bytes - mDownloadedBytes
-             << "MsDiff" << msecDiff / 1000.0
-             << "Bytes-Per-Seg" << bytesPerSec;
-    auto speedSize = SpkUtils::BytesToSize(static_cast<size_t>(bytesPerSec));
-    mMessage->setText(QString("%1/%2(%3/s)")
-                      .arg(SpkUtils::BytesToSize(bytes), mReadableTotalSize, speedSize));
-  }
-  mDownloadedBytes = bytes;
-  mProgress->setValue(static_cast<int>(((double)bytes) / mTotalBytes * 1000));
-  mLastReportTime = now;
-}
-
-void SpkDownloadEntry::ActionButton()
-{
-  switch(mStatus)
-  {
-    case DownloadFailed:
-      emit Action(RetryDownload);
-      break;
-
-    case ToBeInstalled:
-    case InstallFailed:
-      emit Action(StartInstall);
-      break;
-
-    default:
-      break;
-  }
-}
-
-void SpkDownloadEntry::DeleteButton()
-{
-  switch(mStatus)
-  {
-    case Waiting:
-    case DownloadFailed:
-    case Installed:
-    case InstallFailed:
-    case ToBeInstalled:
-      emit Action(RemoveEntry);
-      break;
-
-    case Downloading:
-      emit Action(AbortDownload);
-      break;
-
-    default:
-      break;
-  }
-}
--- a/gui/spkiconbutton.cpp
+++ b/gui/spkiconbutton.cpp
@@ -1,56 +0,0 @@
-
-#include <QMargins>
-#include <QPainter>
-#include <QVariant>
-#include <QDebug>
-#include "spkiconbutton.h"
-
-SpkIconButton::SpkIconButton(QWidget *parent) :
-  QPushButton(parent)
-{
-  setFocusPolicy(Qt::NoFocus);
-}
-
-void SpkIconButton::SetIcon(QIcon i, QSize s)
-{
-  mPmapPaintedIcon = i.pixmap(s);
-
-  setFixedSize((mPmapSize  = s.grownBy(QMargins(IconMargin, IconMargin, IconMargin, IconMargin))));
-}
-
-void SpkIconButton::SetIcon(QPixmap m)
-{
-  mPmapPaintedIcon = m;
-
-  setFixedSize((mPmapSize = m.size().grownBy(QMargins(IconMargin, IconMargin,
-                                                      IconMargin, IconMargin))));
-}
-
-void SpkIconButton::SetIconSize(QSize s)
-{
-  setFixedSize((mPmapSize = s.grownBy(QMargins(IconMargin, IconMargin, IconMargin, IconMargin))));
-}
-
-void SpkIconButton::paintEvent(QPaintEvent *e)
-{
-  QPushButton::paintEvent(e);
-
-  // Paint the icon mask
-  QPainter p(this), p1(&mPmapPaintedIcon);
-  QBrush b(Qt::SolidPattern);
-
-  p.drawPixmap(IconMargin, IconMargin, mPmapPaintedIcon);
-  if(isDown() || isChecked())
-  {
-    b.setColor(SpkUi::ColorBtnMaskSelected);
-  }
-  else
-  {
-    b.setColor(SpkUi::ColorBtnMaskUnselected);
-  }
-  p1.setCompositionMode(QPainter::CompositionMode_SourceIn);
-  p1.fillRect(0, 0, mPmapSize.width(), mPmapSize.height(), b);
-  p1.end();
-  p.drawPixmap(IconMargin, IconMargin, mPmapPaintedIcon);
-  p.end();
-}
--- a/gui/spkimgviewer.cpp
+++ b/gui/spkimgviewer.cpp
@@ -1,120 +0,0 @@
-
-#include "spktitlebar.h"
-#include "spkimgviewer.h"
-#include "spkui_general.h"
-#include <QDebug>
-#include <QFocusEvent>
-#include <QGuiApplication>
-#include <QScreen>
-
-SpkImgViewer::SpkImgViewer(QWidget *parent) :
-  SpkWindow(parent),
-  mIconLoading(QIcon(":/icons/loading-icon.svg").pixmap({ 72, 72 }))
-{
-  mImgIndict = new QLabel;
-  mImgIndict->setText("%1/%2");
-  mBtnPrev = new QPushButton;
-  mBtnPrev->setText("<");
-  mBtnNext = new QPushButton;
-  mBtnNext->setText(">");
-
-  auto titleBar = GetTitleBar();
-  titleBar->SetUseIcon(false);
-  titleBar->SetTitle(tr("Image Preview"));
-  titleBar->SetOperationButton(SpkTitleBar::OperationButton::Close);
-
-  auto lay = titleBar->GetUserSpace();
-  lay->setAlignment(Qt::AlignVCenter);
-  lay->addStretch();
-  lay->addWidget(mBtnPrev);
-  lay->addWidget(mImgIndict);
-  lay->addWidget(mBtnNext);
-  lay->addStretch();
-
-  mImgArea = new QScrollArea;
-  mImgArea->setWidgetResizable(true);
-  mImgArea->setContentsMargins(10, 10, 10, 10);
-
-  mImgShow = new ImgView;
-
-  mImgArea->setWidget(mImgShow);
-
-  auto w = new QWidget;
-  auto l = new QHBoxLayout;
-  l->setContentsMargins(10, 10, 10, 10);
-  l->addWidget(mImgArea);
-  w->setLayout(l);
-  SetCentralWidget(w);
-
-  connect(mBtnPrev, &QPushButton::clicked,
-          [&](){ if(mCurrentImg > 0) { SwitchToImage(--mCurrentImg); } });
-  connect(mBtnNext, &QPushButton::clicked,
-          [&](){ if(mCurrentImg < mTotalImg) { SwitchToImage(++mCurrentImg); } });
-}
-
-void SpkImgViewer::ShowWithImage(int idx)
-{
-  SwitchToImage(idx);
-  show();
-}
-
-void SpkImgViewer::Clear()
-{
-  mImgMap.clear();
-  mImgShow->SetPixmap(nullptr);
-  mCurrentImg = 1;
-}
-
-void SpkImgViewer::SetPixmap(int idx, QPixmap *img)
-{
-  mImgMap[idx] = img;
-  if(mCurrentImg == idx)
-  {
-    mImgShow->SetPixmap(img);
-  }
-  ResizeToFitImageSize(img->size());
-}
-
-void SpkImgViewer::SwitchToImage(int idx)
-{
-  auto img = mImgMap.value(idx, nullptr);
-  mCurrentImg = idx;
-  mImgShow->SetPixmap(img ? img : &mIconLoading);
-  if(img)
-    ResizeToFitImageSize(img->size());
-  if(idx == 1)
-  {
-    mBtnPrev->setEnabled(false);
-    mBtnNext->setEnabled(true);
-  }
-  else if(idx == mTotalImg)
-  {
-    mBtnPrev->setEnabled(true);
-    mBtnNext->setEnabled(false);
-  }
-  else
-  {
-    mBtnPrev->setEnabled(true);
-    mBtnNext->setEnabled(true);
-  }
-  mImgIndict->setText(QString("%1/%2").arg(mCurrentImg).arg(mTotalImg));
-}
-
-bool SpkImgViewer::event(QEvent *e)
-{
-  if(e->type() == QEvent::WindowDeactivate)
-    close();
-  return SpkWindow::event(e);
-}
-
-void SpkImgViewer::ResizeToFitImageSize(QSize s)
-{
-  auto targetSize = s;
-  targetSize.rheight() += SpkTitleBar::Height;
-  targetSize = s.grownBy(QMargins(10, 10, 10, 10));
-  targetSize = targetSize.boundedTo(SpkUi::PrimaryScreenSize * 0.8);
-  resize(targetSize);
-  targetSize /= 2;
-  auto targetPos = SpkUi::PrimaryScreenSize / 2 - targetSize;
-  move(targetPos.width(), targetPos.height());
-}
--- a/gui/spkloading.cpp
+++ b/gui/spkloading.cpp
@@ -1,79 +0,0 @@
-
-#include <QPaintEvent>
-#include <QPainter>
-#include "spkloading.h"
-#include "spkui_general.h"
-
-SpkLoading::SpkLoading(QWidget *parent) : QFrame(parent)
-{
-  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-  mAnimTimer = new QTimeLine(400, this);
-  mAnimTimer->setFrameRange(10, 30);
-  mAnimTimer->setEasingCurve(QEasingCurve::InCubic);
-  for(int i = 0; i < 5; i++)
-    mSizeList.append(20);
-  connect(mAnimTimer, &QTimeLine::frameChanged, this, &SpkLoading::timer);
-  connect(mAnimTimer, &QTimeLine::finished, this, &SpkLoading::loop);
-}
-
-void SpkLoading::paintEvent(QPaintEvent *e)
-{
-  QPainter p(this);
-  QPen pen(Qt::NoPen);
-  QBrush b(SpkUi::CurrentColorSet[SpkUi::Qss::AccentColor], Qt::SolidPattern);
-  p.setBrush(b);
-  p.setPen(pen);
-  p.setRenderHint(QPainter::Antialiasing);
-  dx = width() / 2 - dh * 2;
-  dy = height() / 2;
-
-  double r;
-  for(int i = 0; i < 5; i++)
-  {
-    r = dh * mSizeList[i] / 80;
-    p.drawEllipse({ dx, dy }, r, r);
-    dx += dh;
-  }
-  e->accept();
-}
-
-void SpkLoading::resizeEvent(QResizeEvent *e)
-{
-  // Calculate size of drawing space
-  if(mUserHeight != 0 && mUserHeight * 5 <= e->size().width())
-  {
-    dw = 5 * mUserHeight;
-    dh = mUserHeight;
-    return;
-  }
-  dh = e->size().height();
-  if(width() < dh * 5)
-  {
-    dw = e->size().width();
-    dh = dw / 5;
-  }
-  else
-    dw = dh * 5;
-}
-
-void SpkLoading::timer(int s)
-{
-  for(int i = 4; i > 0; i--)
-    mSizeList[i] = mSizeList[i - 1];
-  mSizeList[0] = s;
-  update();
-}
-
-void SpkLoading::loop()
-{
-  mAnimTimer->setDirection(mAnimTimer->direction() == QTimeLine::Forward ?
-                             QTimeLine::Backward : QTimeLine::Forward);
-  mAnimTimer->start();
-}
-
-void SpkLoading::reset()
-{
-  for(int i = 0; i < 5; i++)
-    mSizeList[i] = 20;
-  update();
-}
--- a/gui/spkmainwindow.cpp
+++ b/gui/spkmainwindow.cpp
@@ -1,570 +0,0 @@
-
-#include <QGuiApplication>
-#include <QScreen>
-#include <QJsonArray>
-#include "spkmsgbox.h"
-#include "spkmainwindow.h"
-#include "spklogging.h"
-#include "spkutils.h"
-#include "spkuimsg.h"
-
-SpkMainWindow::SpkMainWindow(QWidget *parent) : SpkWindow(parent)
-{
-  ui = new SpkUi::SpkMainWidget(this);
-  Initialize();
-
-  SetCentralWidget(ui);
-  RefreshCategoryData();
-  GetTitleBar()->SetTitle("");
-  GetTitleBar()->SetUseIcon(true);
-  GetTitleBar()->SetIcon(QIcon(":/icons/spark-store.svg").pixmap({ 40, 40 }));
-  GetTitleBar()->setObjectName("spk_mw_titlebar");
-  GetTitleBar()->setAttribute(Qt::WA_StyledBackground);
-
-  auto size = QGuiApplication::primaryScreen()->size() * 0.5;
-  size = size.expandedTo(QSize(900, 600));
-  resize(size);
-  auto pos = QGuiApplication::primaryScreen()->size() * 0.5 - size * 0.5;
-  move(pos.width(), pos.height());
-}
-
-void SpkMainWindow::SwitchDayNightTheme()
-{
-  if(SpkUi::CurrentStyle == SpkUi::Dark)
-    SpkUi::SetGlobalStyle(SpkUi::Light, true);
-  else
-    SpkUi::SetGlobalStyle(SpkUi::Dark, true);
-  ReloadThemedUiIcons();
-}
-
-void SpkMainWindow::SwitchToPage(SpkUi::SpkStackedPages page)
-{
-  if(mCurrentPage != page)
-  {
-    ui->Pager->setCurrentIndex(int(page));
-    mCurrentPage = page;
-    // If the page is a SpkPageBase (with a resource context), activate it for resource acquisition
-    auto tryActivate = qobject_cast<SpkPageBase *>(ui->Pager->currentWidget());
-    if(tryActivate)
-      tryActivate->Activated();
-
-    ui->BtnBack->setVisible(page == SpkUi::SpkStackedPages::PgAppDetails);
-    ui->BtnBack->setEnabled(true);
-  }
-}
-
-void SpkMainWindow::PopulateCategories(QJsonArray aCategoryData)
-{
-  using SpkUi::SpkSidebarSelector;
-  QTreeWidgetItem *catg;
-  if(ui->CategoryParentItem->childCount()) // Clear all existing children if there is any
-    foreach(auto &i, ui->CategoryParentItem->takeChildren())
-      delete i;
-
-  foreach(auto i, aCategoryData)
-  {
-    if(i.isObject())
-    {
-      auto j = i.toObject();
-      double typeId;
-      QString typeName;
-      if(j.contains("type_id") && j.value("type_id").isDouble())
-        typeId = j.value("type_id").toDouble();
-      else goto WRONG_CATEGORY;
-      if(j.contains("type_name") && j.value("type_name").isString())
-        typeName = j.value("type_name").toString();
-      else goto WRONG_CATEGORY;
-      catg = new QTreeWidgetItem(ui->CategoryParentItem, QStringList(typeName));
-      catg->setData(0, SpkSidebarSelector::RoleItemIsCategory, true);
-      catg->setData(0, SpkSidebarSelector::RoleItemCategoryPageId, typeId);
-      continue;
-WRONG_CATEGORY:;
-    }
-    ui->CategoryParentItem->setExpanded(true);
-  }
-}
-
-void SpkMainWindow::RefreshCategoryData()
-{
-  // Asynchronously call category API
-  using namespace SpkUtils;
-  VerifySingleRequest(mCategoryGetReply);
-  mCategoryGetReply = STORE->SendApiRequest("type/get_type_list");
-  DeleteReplyLater(mCategoryGetReply);
-  connect(mCategoryGetReply, &QNetworkReply::finished, this, &SpkMainWindow::CategoryDataReceived);
-}
-
-void SpkMainWindow::CategoryDataReceived()
-{
-  QJsonValue retval;
-  auto verify = SpkUtils::VerifyReplyJson(mCategoryGetReply, retval);
-  if(verify || !retval.isArray())
-  {
-    sErr(tr("Failed to load categories! Type=%1 Code=%2").arg(retval.type()).arg(verify));
-    sNotify(tr("Cannot load categories! Type: %1 Code: %2").arg(retval.type()).arg(verify));
-    ui->PageHome->ui->widReloadCategory->setVisible(true);
-    return;
-  }
-  ui->PageHome->ui->widReloadCategory->setVisible(false);
-  PopulateCategories(retval.toArray());
-}
-
-void SpkMainWindow::EnterCategoryList(int aCategoryId, int aPage)
-{
-  // Asynchronously call category API
-  using namespace SpkUtils;
-  VerifySingleRequest(mCategoryAppListGetReply);
-  QJsonObject reqData;
-  QJsonDocument reqDoc;
-  reqData.insert("type_id", QJsonValue(aCategoryId));
-  reqData.insert("page", QJsonValue(aPage));
-  reqDoc.setObject(reqData);
-  mCategoryAppListGetReply = STORE->SendApiRequest("application/get_application_list", reqDoc);
-  DeleteReplyLater(mCategoryAppListGetReply);
-  connect(mCategoryAppListGetReply, &QNetworkReply::finished,
-          this, &SpkMainWindow::CategoryListDataReceived);
-  setCursor(Qt::BusyCursor);
-  ui->PageAppList->SetCurrentCategory(aCategoryId); // AppList needs to remember current category
-}
-
-void SpkMainWindow::CategoryListDataReceived()
-{
-  QJsonValue retval;
-  setCursor(Qt::ArrowCursor);
-  int verify = SpkUtils::VerifyReplyJson(mCategoryAppListGetReply, retval);
-  if(verify || !retval.isObject())
-  {
-    sErr(tr("Failed to load app list of category! Type=%1 Code=%2").arg(retval.type()).arg(verify));
-    sNotify(tr("Failed to load app list of category! Type: %1 Code: %2").arg(retval.type()).arg(verify));
-    return;
-  }
-  SwitchToPage(SpkUi::PgAppList);
-  PopulateAppList(retval.toObject(), "");
-}
-
-void SpkMainWindow::SearchKeyword(QString aKeyword, int aPage)
-{
-  using namespace SpkUtils;
-  VerifySingleRequest(mCategoryAppListGetReply);
-  QJsonObject reqData;
-  QJsonDocument reqDoc;
-  reqData.insert("application_name", QJsonValue(aKeyword));
-  reqData.insert("page", QJsonValue(aPage));
-  reqDoc.setObject(reqData);
-  mCategoryAppListGetReply = STORE->SendApiRequest("application/get_application_list", reqDoc);
-  mCategoryAppListGetReply->setProperty("keyword", aKeyword);
-  DeleteReplyLater(mCategoryAppListGetReply);
-  connect(mCategoryAppListGetReply, &QNetworkReply::finished,
-          this, &SpkMainWindow::SearchDataReceived);
-  setCursor(Qt::BusyCursor);
-}
-
-void SpkMainWindow::SearchDataReceived()
-{
-  QJsonValue retval;
-  setCursor(Qt::ArrowCursor);
-  auto verify = SpkUtils::VerifyReplyJson(mCategoryAppListGetReply, retval);
-  if(verify || !retval.isObject())
-  {
-    sErr(tr("Failed to search keyword! Type=%1 Code=%2").arg(retval.type()).arg(verify));
-    sNotify(tr("Failed to search keyword! Type: %1 Code: %2").arg(retval.type()).arg(verify));
-    return;
-  }
-  SwitchToPage(SpkUi::PgAppList);
-  PopulateAppList(retval.toObject(), mCategoryAppListGetReply->property("keyword").toString());
-}
-
-void SpkMainWindow::PopulateAppList(QJsonObject appData, QString &&keyword)
-{
-  auto w = ui->PageAppList;
-  w->ClearAll();
-  static auto err =
-  [](){
-    sErr("Received invalid application list data!");
-    SpkUiMessage::SendStoreNotification(tr("Received an invalid response. Please try again!"));
-    return;
-  };
-  int pgCurrent, pgTotal, totalApps;
-
-  if(appData.contains("currentPage") && appData.value("currentPage").isDouble())
-    pgCurrent = appData.value("currentPage").toInt();
-  else return err();
-  if(appData.contains("totalPages") && appData.value("totalPages").isDouble())
-    pgTotal = appData.value("totalPages").toInt();
-  else return err();
-  if(appData.contains("count") && appData.value("count").isDouble())
-    totalApps = appData.value("count").toInt();
-  else return err();
-  w->SetPageStatus(pgTotal, pgCurrent, totalApps, keyword);
-
-  if(!appData.contains("data") || !appData.value("data").isArray())
-    return err();
-
-  auto apps = appData.value("data").toArray();
-
-  for(auto &&i : apps)
-  {
-    if(i.isObject())
-    {
-      auto j = i.toObject();
-      QString pkgName, displayName, description, iconPath;
-      int appid;
-      if(j.contains("package") && j.value("package").isString())
-        pkgName = j.value("package").toString();
-      else continue;
-      if(j.contains("application_name_zh") && j.value("application_name_zh").isString())
-        displayName = j.value("application_name_zh").toString();
-      else continue;
-      if(j.contains("description") && j.value("description").isString())
-        description = j.value("description").toString();
-      else continue;
-      if(j.contains("application_id") && j.value("application_id").isDouble())
-        appid = j.value("application_id").toInt();
-      else continue;
-      if(j.contains("icons") && j.value("icons").isString())
-        iconPath = j.value("icons").toString();
-      else continue;
-      
-      w->AddApplicationEntry(displayName, pkgName, description, iconPath, appid);
-    }
-  }
-}
-
-void SpkMainWindow::EnterAppDetails(int aAppId)
-{
-  using namespace SpkUtils;
-  VerifySingleRequest(mAppDetailsGetReply);
-  QJsonObject reqData;
-  QJsonDocument reqDoc;
-  reqData.insert("application_id", QJsonValue(aAppId));
-  reqDoc.setObject(reqData);
-  mAppDetailsGetReply = STORE->SendApiRequest("application/get_application_detail", reqDoc);
-  DeleteReplyLater(mAppDetailsGetReply);
-  connect(mAppDetailsGetReply, &QNetworkReply::finished,
-          this, &SpkMainWindow::AppDetailsDataReceived);
-  setCursor(Qt::BusyCursor);
-}
-
-void SpkMainWindow::AppDetailsDataReceived()
-{
-  QJsonValue retval;
-  setCursor(Qt::ArrowCursor);
-  auto verify = SpkUtils::VerifyReplyJson(mAppDetailsGetReply, retval);
-  if(verify || !retval.isObject())
-  {
-    sErr(tr("Failed to open app details page! Type=%1 Code=%2").arg(retval.type()).arg(verify));
-    sNotify(tr("Failed to open app details page! Type: %1 Code: %2").arg(retval.type()).arg(verify));
-    return;
-  }
-  SwitchToPage(SpkUi::PgAppList);
-  PopulateAppDetails(retval.toObject());
-}
-
-void SpkMainWindow::PopulateAppDetails(QJsonObject appDetails)
-{
-  QString pkgName, author, contributor, site, iconPath, arch, version, details, shortDesc, name,
-          pkgPath;
-  QStringList screenshots, tags;
-  int packageSize;
-  static auto err =
-  [](){
-    sErr("Received invalid application details!");
-    SpkUiMessage::SendStoreNotification(tr("Received an invalid response. Please try again!"));
-    return;
-  };
-
-  if(appDetails.contains("package") && appDetails.value("package").isString())
-    pkgName = appDetails.value("package").toString();
-  else return err();
-  if(appDetails.contains("application_name_zh") && appDetails.value("application_name_zh").isString())
-    name = appDetails.value("application_name_zh").toString();
-  else name = pkgName;
-  if(appDetails.contains("version") && appDetails.value("version").isString())
-    version = appDetails.value("version").toString();
-  else return err();
-  if(appDetails.contains("icons") && appDetails.value("icons").isString())
-    iconPath= appDetails.value("icons").toString();
-  if(appDetails.contains("author") && appDetails.value("author").isString())
-    author = appDetails.value("author").toString();
-  if(appDetails.contains("contributor") && appDetails.value("contributor").isString())
-    contributor = appDetails.value("contributor").toString();
-  if(appDetails.contains("website") && appDetails.value("website").isString())
-    site = appDetails.value("website").toString();
-  if(appDetails.contains("description") && appDetails.value("description").isString())
-    shortDesc = appDetails.value("description").toString();
-  if(appDetails.contains("more") && appDetails.value("more").isString())
-    details = appDetails.value("more").toString();
-  if(appDetails.contains("arch") && appDetails.value("arch").isString())
-    arch = appDetails.value("arch").toString();
-  if(appDetails.contains("size") && appDetails.value("size").isDouble())
-    packageSize = appDetails.value("size").toInt();
-  if(appDetails.contains("deb_url") && appDetails.value("deb_url").isString())
-    pkgPath = appDetails.value("deb_url").toString();
-
-  QJsonArray imgs;
-  if(appDetails.contains("img_urls") && appDetails.value("img_urls").isArray())
-    imgs = appDetails.value("img_urls").toArray();
-  if(!imgs.isEmpty())
-    for(auto &&i : imgs)
-      if(i.isString()) screenshots << i.toString();
-
-  QJsonArray tags_j;
-  if(appDetails.contains("tags") && appDetails.value("tags").isArray())
-    imgs = appDetails.value("tags").toArray();
-  if(!tags_j.isEmpty())
-    for(auto &&i : tags_j)
-      if(i.isString()) tags << i.toString();
-
-  // Details string has a strangely appended LF. IDK but still should remove it.
-  shortDesc = shortDesc.trimmed();
-
-  auto w = ui->PageAppDetails;
-  w->mPkgName->setText(pkgName);
-  w->mAppTitle->setText(name);
-  w->mAppShortDesc->setText(shortDesc);
-  w->mAppDescription->setText(details);
-  w->mAuthor->SetValue(author);
-  w->mContributor->SetValue(contributor);
-//  w->mSite->SetValue(site); // Doesn't look good, I disabled it temporarily. Better solution?
-  w->SetWebsiteLink(site);
-  w->mArch->SetValue(arch);
-  w->mSize->SetValue(SpkUtils::BytesToSize(packageSize));
-  w->mVersion->setText(version);
-  w->SetPackagePath(pkgPath);
-  SwitchToPage(SpkUi::PgAppDetails);
-  ui->AppDetailsItem->setHidden(false);
-  ui->CategoryWidget->setCurrentItem(ui->AppDetailsItem);
-  w->LoadAppResources(pkgName, iconPath, screenshots, tags);
-}
-
-void SpkMainWindow::ReloadThemedUiIcons()
-{
-  for(auto &i : mThemedUiIconReferences)
-    i.first->SetIcon(SpkUi::GetThemedIcon(i.second), QSize { 20, 20 });
-}
-
-// ==================== Main Window Initialization ====================
-
-void SpkMainWindow::Initialize()
-{
-  connect(ui->SidebarMgr, &SpkUi::SpkSidebarSelector::SwitchToPage,
-          this, &SpkMainWindow::SwitchToPage);
-  connect(ui->SidebarMgr, &SpkUi::SpkSidebarSelector::SwitchToCategory,
-          this, &SpkMainWindow::EnterCategoryList);
-  connect(ui->PageAppList, &SpkUi::SpkPageAppList::SwitchListPage,
-          this, &SpkMainWindow::EnterCategoryList);
-  connect(ui->PageAppList, &SpkUi::SpkPageAppList::SwitchSearchPage,
-          this, &SpkMainWindow::SearchKeyword);
-  connect(ui->SearchEdit, &QLineEdit::returnPressed,
-          [=](){ emit SearchKeyword(ui->SearchEdit->text(), 1); });
-  connect(ui->PageAppList, &SpkUi::SpkPageAppList::ApplicationClicked,
-          this, &SpkMainWindow::EnterAppDetails);
-  connect(ui->BtnDayNight, &QPushButton::clicked,
-          this, &SpkMainWindow::SwitchDayNightTheme);
-  if(SpkUi::States::IsUsingDtkPlugin)
-  {
-    connect(SpkUi::DtkPlugin, &SpkDtkPlugin::DarkLightThemeChanged,
-            this, &SpkMainWindow::ReloadThemedUiIcons);
-  }
-  connect(ui->PageAppDetails, &SpkUi::SpkPageAppDetails::RequestDownload,
-          ui->PageDownloads, &SpkUi::SpkPageDownloads::AddDownloadTask);
-  connect(ui->PageHome->ui->btnReloadCategory, &QPushButton::clicked,
-          this, &SpkMainWindow::RefreshCategoryData);
-
-  connect(&SpkUi::SpkUiMetaObject, &SpkUi::UiMetaObject::SetThemeButtonVisible,
-          [=](bool visible)
-          {
-            ui->BtnDayNight->setVisible(visible);
-            ReloadThemedUiIcons();
-          });
-
-  // Register themed button icons
-//  mThemedUiIconReferences.append({ ui->BtnSettings, "settings" });
-  mThemedUiIconReferences.append({ ui->BtnDayNight, "daynight" });
-
-  ReloadThemedUiIcons();
-}
-
-// ==================== Main Widget Initialization ====================
-
-SpkUi::SpkMainWidget::SpkMainWidget(QWidget *parent) : QFrame(parent)
-{
-  setObjectName("spk_mainwidget");
-
-  Pager = new QStackedWidget(this);
-  Pager->setObjectName("spk_mw_pager");
-  Pager->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
-  SidebarMgr = new SpkSidebarSelector(this);
-  SidebarMgr->setObjectName("spk_mw_sidebar_mgr");
-
-  BtnSettings = new SpkIconButton(this);
-  BtnSettings->setObjectName("styPlainChkBtn");
-  BtnSettings->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-  BtnSettings->setCheckable(true);
-  BtnSettings->setFixedSize({ 40, 40 });
-  BtnSettings->SetIcon(QIcon(":/icons/settings.svg"), QSize(20, 20));
-  BtnSettings->setProperty("spk_pageno", PgSettings);
-  SidebarMgr->BindPageSwitcherButton(BtnSettings);
-
-  BtnDayNight = new SpkIconButton(this);
-  BtnDayNight->setObjectName("styPlainChkBtn");
-  BtnDayNight->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-  BtnDayNight->setFixedSize({ 40, 40 });
-  BtnDayNight->SetIcon(QIcon(":/icons/daynight.svg"), QSize(20, 20));
-
-  BtnBack = new SpkIconButton(this);
-  BtnBack->setFixedSize({ 40, 40 });
-  BtnBack->SetIcon(QIcon(":/icons/back.svg"), QSize(20, 20));
-  BtnBack->setVisible(false);
-
-  using SpkUi::SpkSidebarSelector;
-  CategoryWidget = new SpkSidebarTree(this);
-  CategoryWidget->setObjectName("styMwCateg");
-  CategoryWidget->setAutoFillBackground(true);
-  CategoryWidget->setColumnCount(1);
-  CategoryWidget->setHeaderHidden(true);
-  CategoryWidget->setSelectionMode(QAbstractItemView::SelectionMode::SingleSelection);
-  CategoryWidget->setFixedWidth(200);
-
-  //============ Sidebar entries BEGIN ============
-  HomepageItem = new QTreeWidgetItem(QStringList(tr("Home")));
-  HomepageItem->setData(0, SpkSidebarSelector::RoleItemIsCategory, false);
-  HomepageItem->setData(0, SpkSidebarSelector::RoleItemCategoryPageId, SpkStackedPages::PgHomepage);
-
-  AppDetailsItem = new QTreeWidgetItem(QStringList(tr("App Details")));
-  AppDetailsItem->setData(0, SpkSidebarSelector::RoleItemIsCategory, false);
-  AppDetailsItem->setData(0, SpkSidebarSelector::RoleItemCategoryPageId, SpkStackedPages::PgAppDetails);
-
-  CategoryParentItem = new QTreeWidgetItem(QStringList(tr("Categories")));
-  CategoryParentItem->setFlags(CategoryParentItem->flags().setFlag(Qt::ItemIsSelectable, false));
-
-  DownloadsItem = new QTreeWidgetItem(QStringList(tr("Downloads")));
-  DownloadsItem->setData(0, SpkSidebarSelector::RoleItemIsCategory, false);
-  DownloadsItem->setData(0, SpkSidebarSelector::RoleItemCategoryPageId, SpkStackedPages::PgDownloads);
-#ifndef NDEBUG
-  UiTestItem = new QTreeWidgetItem(QStringList(tr("UI TEST")));
-  UiTestItem->setData(0, SpkSidebarSelector::RoleItemIsCategory, false);
-  UiTestItem->setData(0, SpkSidebarSelector::RoleItemCategoryPageId, SpkStackedPages::PgQssTest);
-#endif
-  //============ Sidebar entries END ============
-
-  CategoryWidget->addTopLevelItem(HomepageItem);
-  SidebarMgr->AddUnusableItem(CategoryParentItem);
-  CategoryWidget->addTopLevelItem(AppDetailsItem);
-  CategoryWidget->addTopLevelItem(CategoryParentItem);
-  CategoryWidget->addTopLevelItem(DownloadsItem);
-  CategoryWidget->addTopLevelItem(UiTestItem);
-
-  CategoryWidget->setFocusPolicy(Qt::NoFocus);
-
-  // Must be done after added into a view.
-  AppDetailsItem->setHidden(true); // Hide until we actually open up a Details page
-  CategoryParentItem->setExpanded(true);
-
-  // FIXMEIFPOSSIBLE: Fusion adds extra gradient.
-  // Details: https://forum.qt.io/topic/128190/fusion-style-kept-adding-an-extra-
-  // layer-of-gradient-to-my-selected-item-of-qtreewidget-even-with-qss
-  if(SpkUi::OldSystemStyle)
-    CategoryWidget->setStyle(SpkUi::OldSystemStyle);
-  SidebarMgr->BindCategoryWidget(CategoryWidget);
-
-  HorizontalDivide = new QHBoxLayout;
-  HorizontalDivide->setObjectName("spk_mw_divide_hlay");
-  HorizontalDivide->setSpacing(0);
-  HorizontalDivide->setContentsMargins(0, 0, 0, 0);
-  HorizontalDivide->setAlignment(Qt::AlignLeft);
-  if(!SpkUi::States::IsUsingDtkPlugin)
-    HorizontalDivide->addSpacing(SpkWindow::BorderWidth);
-  HorizontalDivide->addWidget(CategoryWidget);
-  HorizontalDivide->addWidget(Pager);
-
-  //============ Search Bar ============
-
-  SearchEdit = new SpkFocusLineEdit(this);
-  SearchEdit->setPlaceholderText(tr("Press Enter to search"));
-  SearchEdit->setFixedWidth(30);
-  SearchEdit->setFixedHeight(30);
-  SearchBarAnim = new QTimeLine(300, this);
-  SearchBarAnim->setDuration(300);
-  SearchBarAnim->setEasingCurve(QEasingCurve::OutExpo);
-  SearchBarAnim->setUpdateInterval(20);
-  ActClearSearchBar = SearchEdit->addAction(QIcon(":/icons/clear-input.svg"),
-                                            QLineEdit::TrailingPosition);
-  ActClearSearchBar->setVisible(false); // Invisible by default
-  ActSearchIcon = SearchEdit->addAction(QIcon(":/icons/search-mini.svg"), QLineEdit::LeadingPosition);
-  connect(SearchEdit, &SpkFocusLineEdit::focusGained,
-          [=](){
-    ActClearSearchBar->setVisible(true);
-    SearchBarAnim->setDirection(QTimeLine::Forward);
-    SearchBarAnim->start();
-  });
-  connect(SearchEdit, &SpkFocusLineEdit::focusLost,
-             [=](){
-    ActClearSearchBar->setVisible(false);
-    SearchBarAnim->setDirection(QTimeLine::Backward);
-    SearchBarAnim->start();
-  });
-  connect(SearchBarAnim, &QTimeLine::valueChanged,
-          [=](qreal v){
-    SearchEdit->setFixedWidth(static_cast<int>(250 * v) + 30);
-  });
-  connect(ActClearSearchBar, &QAction::triggered, [=](){ SearchEdit->clear(); });
-  connect(BtnBack, &QPushButton::clicked,
-          [=](){
-    SidebarMgr->GoBack();
-    BtnBack->setEnabled(false);
-  });
-
-  auto space = static_cast<SpkWindow*>(parent)->GetTitleBar()->GetUserSpace();
-
-  space->addSpacing(50);
-  space->addWidget(BtnDayNight);
-  space->addWidget(BtnSettings);
-  space->addWidget(BtnBack);
-  space->addWidget(SearchEdit);
-  space->addStretch();
-
-
-  //============ Pages =============
-
-  // Red-Black tree based map will be able to sort things. Just for convenience of ordering pages.
-  QMap<SpkStackedPages, QWidget*> sorter;
-
-  // Initialize pages
-  PageAppList = new SpkUi::SpkPageAppList(this);
-  PageAppList->setProperty("spk_pageid", SpkStackedPages::PgAppList);
-  sorter[PgAppList] = PageAppList;
-
-  PageAppDetails = new SpkUi::SpkPageAppDetails(this);
-  PageAppDetails->setProperty("spk_pageid", SpkStackedPages::PgAppDetails);
-  sorter[PgAppDetails] = PageAppDetails;
-
-  PageDownloads = new SpkUi::SpkPageDownloads(this);
-  PageDownloads->setProperty("spk_pageid", SpkStackedPages::PgDownloads);
-  sorter[PgDownloads] = PageDownloads;
-
-  PageSettings = new SpkUi::SpkPageSettings(this);
-  PageSettings->setProperty("spk_pageid", SpkStackedPages::PgSettings);
-  sorter[PgSettings] = PageSettings;
-
-  PageHome = new SpkUi::SpkPageHome(this);
-  PageSettings->setProperty("spk_pageid", SpkStackedPages::PgHomepage);
-  sorter[PgHomepage] = PageHome;
-
-#ifndef NDEBUG // If only in debug mode should we initialize QSS test page
-  PageQssTest = new SpkUi::SpkPageUiTest(this);
-  PageQssTest->setProperty("spk_pageid", SpkStackedPages::PgQssTest);
-  sorter[PgQssTest] = PageQssTest;
-#endif
-
-  for(auto i : sorter)
-    Pager->addWidget(i);
-
-  // Default page selection : homepage
-  HomepageItem->setSelected(true);
-  // Manually "activate" the default page item to make the sidebar tree know about default item
-  emit CategoryWidget->itemPressed(HomepageItem, 0);
-
-  setLayout(HorizontalDivide);
-}
--- a/gui/spkmsgbox.cpp
+++ b/gui/spkmsgbox.cpp
@@ -1,139 +0,0 @@
-
-#include <QScrollArea>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QScreen>
-#include "spkui_general.h"
-#include "spkmainwindow.h"
-#include "spkmsgbox.h"
-#include "spkstore.h"
-
-// Suppress unwanted Clazy check warnings
-// clazy:excludeall=connect-3arg-lambda,lambda-in-connect
-
-const QSize SpkMsgBox::IconSize; // I don't know why I need it, compiler wants that
-
-SpkMsgBox::SpkMsgBox(QWidget *parent)
-{
-  Q_UNUSED(parent);
-  setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
-}
-
-int SpkMsgBox::StaticExec(QString msg, QString title, QMessageBox::Icon icon,
-                          QMessageBox::StandardButtons buttons, QString extra, bool expanded)
-{
-  SpkMsgBox *b = new SpkMsgBox(SpkStore::Instance->GetRootWindow());
-  QWidget *wMsgWidget = new QWidget;
-  QHBoxLayout *wMsg = new QHBoxLayout(wMsgWidget);
-  QPushButton *wExpandBtn;
-  QScrollArea *wExtraArea;
-  QLabel *wMsgText = new QLabel,
-         *wExtraInfo,
-         *wIcon;
-  int InitialHeight;
-  bool hasextra = extra.length() != 0;
-
-  if(icon)
-  {
-    wIcon = new QLabel;
-    QIcon icon_;
-    switch(icon)
-    {
-      case QMessageBox::Critical:
-        icon_ = QIcon::fromTheme("dialog-error");
-        break;
-      case QMessageBox::Warning:
-        icon_ = QIcon::fromTheme("dialog-warning");
-        break;
-      case QMessageBox::Information:
-        icon_ = QIcon::fromTheme("dialog-information");
-        break;
-      case QMessageBox::Question:
-        icon_ = QIcon::fromTheme("dialog-question");
-        break;
-      case QMessageBox::NoIcon:
-        break;
-    }
-    if(icon)
-      wIcon->setPixmap(icon_.pixmap(IconSize));
-    wMsg->addWidget(wIcon);
-  }
-  wMsgText->setText(msg);
-  wMsgText->setAlignment(Qt::AlignLeft);
-  wMsg->addWidget(wMsgText);
-  wMsg->setSpacing(10);
-  wMsgWidget->setLayout(wMsg);
-  b->AddWidget(wMsgWidget);
-  b->GetTitleBar()->SetTitle(title);
-  b->GetTitleBar()->SetOperationButton(SpkTitleBar::OperationButton::Close);
-  b->SetResizable(false);
-  b->SetCentralMargin(Margin, Margin, Margin, Margin);
-  b->setMaximumSize(SpkUi::PrimaryScreenSize * 0.6);
-
-  if(hasextra)
-  {
-    wExpandBtn = new QPushButton;
-    wExtraInfo = new QLabel;
-    wExtraArea = new QScrollArea;
-    wExtraInfo->setText(extra);
-    wExtraArea->setWidget(wExtraInfo);
-    wExtraArea->setVisible(false);
-    wExtraArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    wExpandBtn->setText(tr("Details"));
-    wExpandBtn->setMaximumWidth(100);
-    wExpandBtn->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-    wExpandBtn->setCheckable(true);
-    wExpandBtn->setObjectName("styChkBtn");
-    connect(wExpandBtn, &QPushButton::clicked,
-            [&](){  // FIXME: hint doesn't change when visibility changes, this is a quirky hack
-                    wExtraArea->setVisible(wExpandBtn->isChecked());
-                    if(wExpandBtn->isChecked())
-                      b->setFixedHeight(b->sizeHint().height());
-                    else
-                      b->setFixedHeight(InitialHeight);
-                 });
-    b->mBtnLay->addWidget(wExpandBtn);
-    b->mBtnLay->addStretch();
-    b->AddWidget(wExtraArea);
-  }
-
-  b->AddSpacing(3);
-  AddButtons(b, buttons);
-  if(hasextra)
-  {
-    b->mBtnLay->addStretch(); // Keep conventional buttons centered
-    if(expanded)
-      emit wExpandBtn->clicked();
-  }
-  InitialHeight = b->minimumSizeHint().height();
-  auto pos = (SpkUi::PrimaryScreenSize - b->sizeHint()) / 2;
-  b->move(pos.width(), pos.height());
-  b->setWindowModality(Qt::ApplicationModal);
-  b->setFixedSize(b->sizeHint());
-
-  auto r = b->Exec();
-  if(r != -1)
-     r = b->mButtonList[r]; // Retrieve the correct button
-
-  delete b;
-  return r;
-}
-
-void SpkMsgBox::AddButtons(SpkMsgBox *me, QMessageBox::StandardButtons b)
-{
-  // If anyone can do it better, please let me know, I wrote this on the airplane
-  using btn = QMessageBox::StandardButton;
-  if(!b) return;
-  if(b.testFlag(btn::Ok)) { me->AddButton(tr("OK")); me->mButtonList << btn::Ok; };
-  if(b.testFlag(btn::Cancel)) { me->AddButton(tr("Cancel")); me->mButtonList << btn::Cancel; };
-  if(b.testFlag(btn::Yes)) { me->AddButton(tr("Yes")); me->mButtonList << btn::Yes; };
-  if(b.testFlag(btn::No)) { me->AddButton(tr("No")); me->mButtonList << btn::No; };
-  if(b.testFlag(btn::Apply)) { me->AddButton(tr("Apply")); me->mButtonList << btn::Apply; };
-  if(b.testFlag(btn::Reset)) { me->AddButton(tr("Reset")); me->mButtonList << btn::Reset; };
-  if(b.testFlag(btn::Abort)) { me->AddButton(tr("Abort")); me->mButtonList << btn::Abort; };
-  if(b.testFlag(btn::Retry)) { me->AddButton(tr("Retry")); me->mButtonList << btn::Retry; };
-  if(b.testFlag(btn::Ignore)) { me->AddButton(tr("Ignore")); me->mButtonList << btn::Ignore; };
-  if(b.testFlag(btn::Reset)) { me->AddButton(tr("Reset")); me->mButtonList << btn::Reset; };
-  if(b.testFlag(btn::Close)) { me->AddButton(tr("Close")); me->mButtonList << btn::Close; };
-  if(b.testFlag(btn::Open)) { me->AddButton(tr("Open")); me->mButtonList << btn::Open; };
-}
--- a/gui/spknotifydot.cpp
+++ b/gui/spknotifydot.cpp
@@ -1,35 +0,0 @@
-
-#include <QPaintEvent>
-#include <QPainter>
-#include <QBrush>
-#include "spknotifydot.h"
-#include "spkstore.h"
-
-/*
- * The font size and the actual geometry of this widget is hard coded
- * If you want to use this widget code please consider improving it
- */
-
-SpkNotifyDot::SpkNotifyDot(QWidget *parent) :
-  QLabel(parent)
-{
-
-}
-
-void SpkNotifyDot::paintEvent(QPaintEvent *e)
-{
-  QPainter p(this);
-
-  int h = height();
-
-  p.setRenderHint(QPainter::Antialiasing);
-  p.setBrush(QBrush(QColor(255, 70, 50)));
-  p.setPen(Qt::transparent);
-  p.drawEllipse(0, 0, h, h);
-  p.setBrush(QBrush(QColor(Qt::white)));
-  p.setPen(Qt::white);
-  p.setFont(QFont("sansserif", 10, 1000));
-  p.drawText(QRect(0, 0, h, h), Qt::AlignHCenter | Qt::AlignVCenter, text());
-
-  p.end();
-}
--- a/gui/spkpopup.cpp
+++ b/gui/spkpopup.cpp
@@ -1,82 +0,0 @@
-
-#include "spkpopup.h"
-#include <QDebug>
-
-namespace SpkUi
-{
-  SpkPopup::SpkPopup(QWidget *parent,  int aMillis) : QWidget(parent)
-  {
-    setAttribute(Qt::WA_TransparentForMouseEvents);
-    setAttribute(Qt::WA_TranslucentBackground);
-    setWindowFlags(Qt::FramelessWindowHint);
-    mText = new QLabel();
-    mText->setStyleSheet("border-radius: 11px;"
-                         "background-color: rgba(0,0,0,150);"
-                         "color: white;"
-                         "padding: 5px;");
-    mText->setText(tr("(No Text)"));
-    mBox = new QHBoxLayout(this);
-    mBox->addWidget(mText);
-    mBox->setContentsMargins(0, 0, 0, 0);
-    // The reason why we contain it in a widget is that, if we want a QLabel have rounded corners,
-    // then it must be able to be displayed with a translucent background. However, setting
-    // Qt::WA_TranslucentBackground will cause the entire background of QLabel transparent.
-    // Therefore we need a container (SpkPopup) with a transparent background as the canvas layer
-    // of the actual displayed text.
-    mAnim = new QSequentialAnimationGroup(this);
-
-    // Disabled as translucency doesn't work well on every platform :(
-//    mAnimFadeIn = new QPropertyAnimation(this, "windowOpacity");
-//    mAnimFadeOut = new QPropertyAnimation(this, "windowOpacity");
-//    mAnimFadeIn->setStartValue(0.0);
-//    mAnimFadeIn->setEndValue(1.0);
-//    mAnimFadeOut->setStartValue(1.0);
-//    mAnimFadeOut->setEndValue(0.0);
-    // Using moving animation instead
-    mAnimFadeIn = new QPropertyAnimation(this, "pos");
-    mAnimFadeOut = new QPropertyAnimation(this, "pos");
-    mAnimFadeIn->setDuration(250);
-    mAnimFadeOut->setDuration(250);
-    mAnimFadeIn->setEasingCurve(QEasingCurve::InQuad);
-    mAnimFadeOut->setEasingCurve(QEasingCurve::InQuad);
-
-    mAnim->addAnimation(mAnimFadeIn);
-    mAnim->addPause(aMillis);
-    mAnim->addAnimation(mAnimFadeOut);
-    setVisible(false);
-
-    connect(mAnim, &QAnimationGroup::stateChanged,
-            [=](QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
-    {
-//      qDebug() << "OldState" << oldState << "NewState" << newState;
-      if(newState == QAbstractAnimation::Stopped)
-        setVisible(false);
-    });
-  }
-
-  void SpkPopup::Show(QString aText)
-  {
-    if(mAnim->state() == QSequentialAnimationGroup::Running)
-      mAnim->stop();
-    QSize parentSize = parentWidget()->size();
-    mText->setText(aText);
-    adjustSize();
-    move(QPoint((parentSize.width() - width()) / 2, parentSize.height() - height() - 30)/* +
-         parentWidget()->pos()*/);
-    setMaximumWidth(parentSize.width() - 200);
-    setWindowOpacity(1);
-    show();
-
-    mAnimFadeIn->setStartValue(QPoint((parentSize.width() - width()) / 2,
-                                      parentSize.height() + height()));
-    mAnimFadeIn->setEndValue(QPoint((parentSize.width() - width()) / 2,
-                                    parentSize.height() - height() - 80));
-    mAnimFadeOut->setStartValue(QPoint((parentSize.width() - width()) / 2,
-                                       parentSize.height() - height() - 80));
-    mAnimFadeOut->setEndValue(QPoint((parentSize.width() - width()) / 2,
-                                     parentSize.height() + height()));
-
-    qDebug() << "Popup size " << size() << "position" << pos() << "parent size" << parentWidget()->size();
-    mAnim->start();
-  }
-}
--- a/gui/spkqsshelper.cpp
+++ b/gui/spkqsshelper.cpp
@@ -1,93 +0,0 @@
-
-#include "spkqsshelper.h"
-
-const std::list<SpkUi::Qss::ColorSetIndex> SpkUi::Qss::AccentColorExceptions
-{
-  AccentColor,
-  AccentColorHighlighted,
-  TextOnAccentColor,
-};
-
-const std::map<SpkUi::Qss::ColorSetIndex, const char *> SpkUi::Qss::ColorSet2Token
-{
-  { GlobalBgnd, "GBG_" },
-  { ControlsBgnd, "CBG_" },
-  { ControlsBgndHighlighted, "CBGH" },
-  { SelectionBgnd, "ACC_" },
-  { SelectionBgndHighlighted, "ACCH" },
-  { LightCtrlsGradLight, "LCTL1" },
-  { LightCtrlsGradDark, "LCTL2" },
-  { LightCtrlsGradDarker, "LCTL3" },
-  { LightCtrlsDisabledBackground, "LCTLD" },
-  { DarkCtrlsGradLight, "DCTL1" },
-  { DarkCtrlsGradDark, "DCTL2" },
-  { DarkCtrlsGradDarker, "DCTL3" },
-  { DarkCtrlsDisabledBackground, "DCTLD" },
-  { TextOnSelection, "TXACC" },
-  { TextOnGlobalBgnd, "TXGBG" },
-  { TextOnControlsBgnd, "TXCBG" },
-  { TextLighter, "TXL1" },
-  { TextEvenLighter, "TXL2" },
-  { TextDisabled, "TXD" },
-  { GlossyEdge, "GLS" },
-  { ShadesEdge, "SHD" },
-  { ScrollBarNorm, "SCBN" },
-  { ScrollBarHover, "SCBH" },
-  { DivideLine, "DVL" },
-};
-
-const std::map<SpkUi::Qss::ColorSetIndex, QColor> SpkUi::Qss::DarkColorSet
-{
-  { GlobalBgnd, 0x282828 },
-  { ControlsBgnd, 0x323232 },
-  { ControlsBgndHighlighted, 0xff0000 },
-  { SelectionBgnd, 0x0070ff },
-  { SelectionBgndHighlighted, QColor(0x0070ff).lighter(120) },
-  { LightCtrlsGradLight, 0x6b6b6b },
-  { LightCtrlsGradDark, 0x656565 },
-  { LightCtrlsGradDarker, 0x606060 },
-  { LightCtrlsDisabledBackground, 0x808080 },
-  { DarkCtrlsGradLight, 0x404040 },
-  { DarkCtrlsGradDark, 0x383838 },
-  { DarkCtrlsGradDarker, 0x323232 },
-  { DarkCtrlsDisabledBackground, 0x525252 },
-  { TextOnSelection, ColorTextOnBackground(0x0070ff) },
-  { TextOnGlobalBgnd, ColorTextOnBackground(0x282828) },
-  { TextOnControlsBgnd, ColorTextOnBackground(0x282828) },
-  { TextLighter, 0xd5d5d5 },
-  { TextEvenLighter, 0x505050 },
-  { TextDisabled, 0xbebebe },
-  { GlossyEdge, 0x656565 },
-  { ShadesEdge, 0x7b7b7b },
-  { ScrollBarNorm, 0x404040 },
-  { ScrollBarHover, 0x656565 },
-  { DivideLine, 0x424242 },
-};
-
-const std::map<SpkUi::Qss::ColorSetIndex, QColor> SpkUi::Qss::LightColorSet
-{
-  { GlobalBgnd, 0xf8f8f8 },
-  { ControlsBgnd, 0xf8f8f8 },
-  { ControlsBgndHighlighted, 0xff0000 },
-  { SelectionBgnd, 0x0070ff },
-  { SelectionBgndHighlighted, QColor(0x0070ff).lighter(120) },
-  { LightCtrlsGradLight, 0xfbfbfb },
-  { LightCtrlsGradDark, 0xf2f2f2 },
-  { LightCtrlsGradDarker, 0xebebeb },
-  { LightCtrlsDisabledBackground, 0xe0e0e0 },
-  { DarkCtrlsGradLight, 0xe4e4e4 },
-  { DarkCtrlsGradDark, 0xcecece },
-  { DarkCtrlsGradDarker, 0xb8b8b8 },
-  { DarkCtrlsDisabledBackground, 0xababab },
-  { TextOnSelection, ColorTextOnBackground(0x0070ff) },
-  { TextOnGlobalBgnd, ColorTextOnBackground(0xf8f8f8) },
-  { TextOnControlsBgnd, ColorTextOnBackground(0xf8f8f8) },
-  { TextLighter, 0x2a2a2a },
-  { TextEvenLighter, 0xa0a0a0 },
-  { TextDisabled, 0x8a8a8a },
-  { GlossyEdge, 0x9d9d9d },
-  { ShadesEdge, 0xc5c5c5 },
-  { ScrollBarNorm, 0xa0a0a0 },
-  { ScrollBarHover, 0x858585 },
-  { DivideLine, 0xd5d5d5 },
-};
--- a/gui/spksidebartree.cpp
+++ b/gui/spksidebartree.cpp
@@ -1,31 +0,0 @@
-
-#include <QMouseEvent>
-#include "spksidebartree.h"
-
-SpkUi::SpkSidebarTree::SpkSidebarTree(QWidget *parent) :
-  QTreeWidget(parent)
-{
-
-}
-
-void SpkUi::SpkSidebarTree::mouseMoveEvent(QMouseEvent *e)
-{
-  // This is solely for forcibly  disabling the view to change selection when dragging on the view
-  // and probably the only reason why this class began its existence
-  if((e->buttons() & Qt::LeftButton))
-    setState(NoState);
-  else
-    QTreeWidget::mouseMoveEvent(e);
-}
-
-void SpkUi::SpkSidebarTree::mousePressEvent(QMouseEvent *e)
-{
-  // Prevent anything being deselected
-  if(e->modifiers().testFlag(Qt::ControlModifier) && e->buttons().testFlag(Qt::LeftButton))
-  {
-    auto i = itemAt(e->pos());
-    if(i && i->isSelected())
-      return;
-  }
-  QTreeWidget::mousePressEvent(e);
-}
--- a/gui/spkstretchlayout.cpp
+++ b/gui/spkstretchlayout.cpp
@@ -1,92 +0,0 @@
-
-#include "spkstretchlayout.h"
-
-SpkStretchLayout::SpkStretchLayout(QWidget *parent) : QLayout(parent)
-{
-}
-
-SpkStretchLayout::~SpkStretchLayout()
-{
-  QLayoutItem *item;
-  while((item = takeAt(0)))
-    delete item;
-}
-
-void SpkStretchLayout::addItem(QLayoutItem *item)
-{
-  mItems.append(item);
-}
-
-QSize SpkStretchLayout::sizeHint() const
-{
-  if(mItems.isEmpty())
-    return { 300, 300 };
-  auto w = geometry().width() - spacing();
-  auto it = mItems.first();
-  int countPerLine = w / (it->minimumSize().width() + spacing());
-  int lines = ceil((double)mItems.size() / countPerLine);
-  auto h = static_cast<int>(it->minimumSize().height() * lines + spacing() * lines);
-  return { w, h };
-}
-
-QSize SpkStretchLayout::minimumSize() const
-{
-  // It works this way, but I honestly have no idea WHY IT WORKS
-  auto r = sizeHint();
-  r.setWidth(300);
-  return r;
-}
-
-int SpkStretchLayout::count() const
-{
-  return mItems.size();
-}
-
-QLayoutItem *SpkStretchLayout::itemAt(int i) const
-{
-  return mItems.value(i);
-}
-
-QLayoutItem *SpkStretchLayout::takeAt(int i)
-{
-  return i >= 0 && i < mItems.size() ? mItems.takeAt(i) : nullptr;
-}
-
-void SpkStretchLayout::setGeometry(const QRect &rect)
-{
-  QLayout::setGeometry(rect);
-  if(mItems.isEmpty())
-    return;
-
-  int spc = spacing(), w = rect.width() - spc;
-  QSize size;
-  auto itm = mItems.first();
-
-  // All items are considered the same, so we only calculate with the first item.
-  // Figure out how many at most can we squeeze into one line
-  int countPerLine = w / (itm->minimumSize().width() + spacing());
-
-  if(countPerLine < 1)
-    countPerLine = 1;
-
-  if(countPerLine >= mItems.size()) // All items fit in one line
-    size = itm->minimumSize();
-  // Won't fit in one line.
-  else // Stretch items.
-    size = QSize {(w / countPerLine - spc), itm->maximumSize().height() };
-
-  auto origin = geometry().topLeft();
-
-  QLayoutItem *o;
-  for(int i = 0; i < mItems.size(); i++)
-  {
-    o = mItems.at(i);
-    QRect geo;
-    geo.setSize(size);
-    geo.moveTo((i % countPerLine) * (size.width() + spc) + spc + origin.x(),
-               (i / countPerLine) * (size.height() + spacing()) + spc + origin.y());
-    o->setGeometry(geo);
-  }
-
-//  qDebug() << rect;
-}
--- a/gui/spktitlebar.cpp
+++ b/gui/spktitlebar.cpp
@@ -1,149 +0,0 @@
-
-#include <QEvent>
-#include <QMouseEvent>
-#include "spkwindow.h"
-#include "spkui_general.h"
-#include "spktitlebar.h"
-
-SpkTitleBar::SpkTitleBar(QWidget *parent) : QFrame(parent)
-{
-  mLinkedWindow = nullptr;
-
-  setFixedHeight(Height);
-  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-
-  mIcon = new QLabel(this);
-  mTitle = new QLabel(this);
-  mIcon->setFixedSize(40, 40);
-
-  mMainLayout = new QHBoxLayout(this);
-  mUserSpace = new QHBoxLayout();
-  mBtnGroup = new QHBoxLayout();
-  mBtnMin = new SpkTitleBarDefaultButton(this);
-  mBtnMaxRestore = new SpkTitleBarDefaultButton(this);
-  mBtnClose= new SpkTitleBarDefaultButton(this);
-  mMainLayout->setSpacing(8);
-  mBtnGroup->setSpacing(0);
-
-  mMainLayout->addSpacing(12);
-  mMainLayout->addWidget(mIcon);
-  mMainLayout->addWidget(mTitle);
-  mMainLayout->addLayout(mUserSpace);
-  mMainLayout->addLayout(mBtnGroup);
-  mBtnGroup->addWidget(mBtnMin);
-  mBtnGroup->addWidget(mBtnMaxRestore);
-  mBtnGroup->addWidget(mBtnClose);
-
-  mBtnMin->SetRole(OperationButton::Minimize);
-  mBtnMaxRestore->SetRole(OperationButton::MaximizeRestore);
-  mBtnClose->SetRole(OperationButton::Close);
-
-  mMainLayout->setContentsMargins(0, 0, 0, 1);
-
-  setLayout(mMainLayout);
-
-  connect(mBtnClose, &QPushButton::clicked, this, &SpkTitleBar::CloseWindow);
-  connect(mBtnMin, &QPushButton::clicked, this, &SpkTitleBar::MinimizeWindow);
-  connect(mBtnMaxRestore, &QPushButton::clicked, this, &SpkTitleBar::MaximizeRestoreWindow);
-}
-
-SpkTitleBar::~SpkTitleBar()
-{
-  //qDebug() << "Freed title bar!";
-}
-
-void SpkTitleBar::SetOperationButton(OperationButton type)
-{
-  mBtnClose->setVisible(type & OperationButton::Close);
-  mBtnMaxRestore->setVisible(type & OperationButton::MaximizeRestore);
-  mBtnMin->setVisible(type & OperationButton::Minimize);
-}
-
-bool SpkTitleBar::event(QEvent *evt)
-{
-  switch(evt->type())
-  {
-    case QEvent::MouseButtonDblClick:
-    {
-      if(static_cast<QMouseEvent*>(evt)->button())
-        emit mBtnMaxRestore->clicked();
-      break;
-    }
-    default:;
-  }
-  return QWidget::event(evt);
-}
-
-void SpkTitleBar::CloseWindow()
-{
-  if(mLinkedWindow)
-    mLinkedWindow->close();
-}
-
-void SpkTitleBar::MinimizeWindow()
-{
-  if(mLinkedWindow)
-    mLinkedWindow->setWindowState(Qt::WindowMinimized);
-}
-
-void SpkTitleBar::MaximizeRestoreWindow()
-{
-  if(mLinkedWindow)
-  {
-    if(mLinkedWindow->windowState().testFlag(Qt::WindowMaximized))
-      mLinkedWindow->setWindowState(mLinkedWindow->windowState() & ~Qt::WindowMaximized);
-    else
-      mLinkedWindow->setWindowState(Qt::WindowMaximized);
-  }
-}
-
-SpkTitleBarDefaultButton::SpkTitleBarDefaultButton(QWidget* parent) : QPushButton(parent)
-{
-  setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
-  setMaximumWidth(ButtonWidth);
-  setMinimumWidth(ButtonWidth);
-  setFocusPolicy(Qt::NoFocus);
-}
-
-void SpkTitleBarDefaultButton::paintEvent(QPaintEvent *e)
-{
-  QPushButton::paintEvent(e);
-  QPainter painter;
-  painter.begin(this);
-  PaintSymbol(painter);
-  painter.end();
-}
-
-void SpkTitleBarDefaultButton::PaintSymbol(QPainter &p)
-{
-  QPen pen(SpkUi::ColorLine);
-  p.setPen(pen);
-  auto mh = height() / 2, mw = width() / 2, h = height(), w = width();
-  constexpr int fr = 10;
-  switch(Role)
-  {
-    case Minimize:
-      p.drawLine(mw - w / fr, mh, mw + w / fr, mh);
-      break;
-    case MaximizeRestore:
-      p.drawRect(mw - w / fr, mh - h / fr,
-                 w / fr * 2, h / fr * 2);
-      break;
-    case Restore:
-      p.drawRect(mw - w / fr - 2, mh - w / fr + 2, w / fr * 2, h / fr * 2);
-      p.drawLine(mw - w / fr, mh - h / fr - 2, mw + w / fr, mh - h / fr - 2);
-      p.drawLine(mw + w / fr, mh - h / fr - 2, mw + w / fr, mh + h / fr - 2);
-      break;
-    case Close:
-      p.drawLine(mw - h / fr * 1.3, mh - h / fr * 1.3,
-                 mw + h / fr * 1.3, mh + h / fr * 1.3);
-      p.drawLine(mw - h / fr * 1.3, mh + h / fr * 1.3,
-                 mw + h / fr * 1.3, mh - h / fr * 1.3);
-      break;
-  }
-}
-
-void SpkTitleBarDefaultButton::SetRole(OperationButton role)
-{
-  Role = role;
-}
--- a/gui/spkui_general.cpp
+++ b/gui/spkui_general.cpp
@@ -1,332 +0,0 @@
-//
-// Created by rigoligo on 2021/5/8.
-//
-
-#include <QApplication>
-#include <QFile>
-#include <QTextStream>
-#include <QLibrary>
-#include <QDir>
-#include <QMessageBox>
-#include <QDateTime>
-#include <QDebug>
-#include <QScreen>
-#include <QPluginLoader>
-#include <QStyleFactory>
-#include <csignal>
-#include <execinfo.h>
-
-#include "spkui_general.h"
-#include "spkmsgbox.h"
-#include "spkpopup.h"
-#include "spklogging.h"
-#include "spkstore.h"
-#include "spkutils.h"
-
-namespace SpkUi
-{
-  UiMetaObject SpkUiMetaObject;
-  SpkUiStyle CurrentStyle;
-  QString StylesheetBase, CurrentStylesheet;
-  QColor ColorLine, ColorBack, ColorBtnMaskSelected, ColorBtnMaskUnselected;
-  QSize PrimaryScreenSize;
-  SpkDtkPlugin *DtkPlugin = nullptr;
-  QStyle *OldSystemStyle = nullptr;
-
-  std::map<Qss::ColorSetIndex, QColor> CurrentColorSet;
-
-  SpkPopup *Popup;
-
-  namespace States
-  {
-    bool IsDDE = false, IsUsingDtkPlugin = false;
-
-    bool DoRespondAutoTheme = false;
-    int LightDarkMode = 3; // Default to Manual
-
-    bool ThemeConfigCallback()
-    {
-      switch(LightDarkMode)
-      {
-        case 0:
-          if(!DtkPlugin) return false;
-          SpkUiMetaObject.SetDarkLightTheme(DtkPlugin->GetIsDarkTheme());
-          break;
-        case 1:
-          SetGlobalStyle(Light, true);
-          SpkUiMetaObject.SetThemeButtonVisible(false);
-          break;
-        case 2:
-          SetGlobalStyle(Dark,  true);
-          SpkUiMetaObject.SetThemeButtonVisible(false);
-          break;
-        case 3:
-          SpkUiMetaObject.SetThemeButtonVisible(true);
-          break;
-      }
-      return true;
-    }
-  }
-
-  namespace Priv
-  {
-    bool CrashHandlerActivated;
-  }
-
-  // ======================= Static Linkage Private Functions ========================
-
-  static void SetBtnMaskColor()
-  {
-    ColorBtnMaskUnselected = ColorTextOnBackground(CurrentColorSet[Qss::ControlsBgnd]);
-    ColorBtnMaskSelected = ColorTextOnBackground(CurrentColorSet[Qss::AccentColor]);
-  }
-
-  // ======================== Public Functions =========================
-
-  void Initialize()
-  {
-    // Obtain global stylesheets
-    QFile ObtainStylesheet;
-    ObtainStylesheet.setFileName(CFG->ReadField("internal/qss_path",
-                                                ":/stylesheet/stylesheet/default.css")
-                                 .toString());
-    ObtainStylesheet.open(QIODevice::ReadOnly);
-    StylesheetBase = ObtainStylesheet.readAll();
-    ObtainStylesheet.close();
-
-    CurrentStyle = SpkUiStyle::Invalid;
-
-#ifdef NDEBUG
-    SetGlobalStyle(Light, false);
-#else
-    SetGlobalStyle(qEnvironmentVariableIntValue("SPK_FORCE_DARK") ? Dark : Light, false);
-#endif
-
-    // Initalize crash handler
-    signal(SIGSEGV, SpkUi::CrashSignalHandler);
-    signal(SIGABRT, SpkUi::CrashSignalHandler);
-    signal(SIGFPE, SpkUi::CrashSignalHandler);
-
-    // Prepare theme following for DDE
-    if((States::IsDDE = CheckIsDeepinDesktop()))
-      PrepareForDeepinDesktop();
-
-    // Misc data initialization
-    PrimaryScreenSize = QGuiApplication::primaryScreen()->size();
-    CFG->BindField("ui/theme", &States::LightDarkMode, 3, States::ThemeConfigCallback);
-  }
-
-  void GuessAppropriateTheme()
-  {
-    // FIXME: Too difficult, not implementing it
-  }
-
-  bool CheckIsDeepinDesktop()
-  {
-    QString Desktop(getenv("XDG_CURRENT_DESKTOP"));
-    // This method of checking is from DTK source code.
-    if(Desktop.contains("deepin", Qt::CaseInsensitive) ||
-       Desktop.contains("tablet", Qt::CaseInsensitive))
-      return true;
-    else
-      return false;
-  }
-
-  void PrepareForDeepinDesktop()
-  {
-#ifndef NDEBUG
-    qApp->addLibraryPath(qApp->applicationDirPath() + "/plugin/dtkplugin");
-#else
-    // You must `make install' before these work in release mode
-    qApp->addLibraryPath("/usr/local/lib");
-    qApp->addLibraryPath("/usr/lib");
-#endif
-    if(!qEnvironmentVariableIntValue("SPARK_NO_DTK_PLUGIN"))
-    {
-      QPluginLoader p("libspkdtkplugin");
-      if(p.load())
-      {
-        auto i = qobject_cast<SpkDtkPlugin*>(p.instance());
-        if(i)
-        {
-          DtkPlugin = i;
-          States::IsUsingDtkPlugin = true;
-
-          i->Initialize();
-
-          SpkUiMetaObject.SetAccentColor(i->GetAccentColor()); // Match OS accent color
-          SpkUiMetaObject.SetDarkLightTheme(i->GetIsDarkTheme()); // Match OS dark theme type
-
-          QObject::connect(i, &SpkDtkPlugin::AccentColorChanged,
-                           &SpkUiMetaObject, &UiMetaObject::SetAccentColor);
-          QObject::connect(i, &SpkDtkPlugin::DarkLightThemeChanged,
-                           &SpkUiMetaObject, &UiMetaObject::SetDarkLightTheme);
-        }
-      }
-    }
-
-    // NOTE: Chameleon style kept adding unwanted blue focus indication border
-    // to widgets that shouldn't have borders.
-    // We need to eliminate this irritating problem.
-    if(qEnvironmentVariableIntValue("SPARK_NO_QSTYLE_CHANGE"))
-      return;
-    OldSystemStyle = QStyleFactory::create("chameleon"); // TreeWidget doesn't work well with Fusion
-    auto styles = QStyleFactory::keys();
-    styles.removeAll("chameleon");
-    if(styles.contains("Fusion"))
-    {
-      auto style = QStyleFactory::create("Fusion");
-      qApp->setStyle(style);
-    }
-    else if(styles.size()) // What? This shouldn't happen.
-      qApp->setStyle(QStyleFactory::create(styles[0]));
-    else // Duh...
-      sWarn(QObject::tr("Cannot find styles other than 'chameleon'! You may see widgets "
-                        "with unwanted blue borders."));
-  }
-
-  void SetGlobalStyle(const SpkUiStyle aStyle, const bool aPreserveAccentColor)
-  {
-    if(aStyle == CurrentStyle) // Don't waste precious CPU time parsing new style sheet!
-      return;
-    CurrentStyle = aStyle;
-    Qss::ColorSet tempset;
-    switch(aStyle)
-    {
-      case Invalid:
-      case Light:
-        tempset = Qss::LightColorSet;
-        ColorLine = Qt::black;
-        break;
-      case Dark:
-        tempset = Qss::DarkColorSet;
-        ColorLine = Qt::white;
-        break;
-    }
-    if(aPreserveAccentColor)
-    {
-      for(auto i : Qss::AccentColorExceptions)
-        tempset[i] = CurrentColorSet[i];
-    }
-    CurrentColorSet = tempset;
-    CurrentStylesheet = StylesheetFromColors(CurrentColorSet);
-    SetBtnMaskColor();
-    qApp->setStyleSheet(CurrentStylesheet);
-  }
-
-  QString WriteStackTrace(const QString &aStackTrace)
-  {
-    QString path = QDir::homePath() + "/.local/share/spark-store/crash/";
-    QFile StackTraceFile;
-    if(!QDir().exists(path))
-      if(!QDir().mkpath(path))
-        return QObject::tr("Stack trace directory %1 cannot be created. "
-                           "Stack trace wasn't saved.").arg(path);
-    path += QString::number(QDateTime::currentDateTimeUtc().toSecsSinceEpoch());
-    while(QFile::exists(path))
-      path += "_";
-    StackTraceFile.setFileName(path);
-    StackTraceFile.open(QIODevice::WriteOnly);
-    if(StackTraceFile.isOpen() && StackTraceFile.isWritable())
-    {
-      QTextStream StackTraceWriter;
-      StackTraceWriter.setDevice(&StackTraceFile);
-      StackTraceWriter << QDateTime::currentDateTime().toLocalTime().toString() << "\n\n";
-      StackTraceWriter << aStackTrace;
-      StackTraceFile.close();
-      return QObject::tr("Stack trace written to \"%1\".").arg(path);
-    }
-    return QObject::tr("Stack trace file %1 cannot be opened. "
-                       "Stack trace wasn't saved.").arg(path);
-  }
-
-  void CrashSignalHandler(int sig)
-  {
-    QString msg(QObject::tr("Program has received signal %1 during normal execution.\n\n")),
-            trace;
-    switch(sig)
-    {
-      case SIGSEGV:
-        msg = msg.arg(QObject::tr("\"SIGSEGV\" (Segmentation fault)"));
-        goto CRASH;
-      case SIGFPE:
-        msg = msg.arg(QObject::tr("\"SIGFPE\" (Arithmetic exception)"));
-        goto CRASH;
-      case SIGABRT:
-        msg = msg.arg(QObject::tr("\"SIGABRT\" (Abort)"));
-      CRASH:
-        {
-          if(Priv::CrashHandlerActivated) // If error occured in the handler...
-          {
-            signal(SIGABRT, SIG_DFL); // Return control flow to OS and give up
-            raise(SIGABRT);
-            exit(2);
-          }
-          Priv::CrashHandlerActivated = true;
-          void* TraceStack[StackTraceArraySize];
-          int StackTraceSize = backtrace(TraceStack, StackTraceArraySize);
-          auto TraceTextArray = backtrace_symbols(TraceStack, StackTraceArraySize);
-          trace = QString(QObject::tr("Stack trace:\n"));
-          for(int i = 0; i < StackTraceSize; i++)
-            trace += QString::number(i) + ">  " + QString(TraceTextArray[i]) + '\n';
-          msg += QObject::tr("Spark Store cannot continue.\n\n");
-          msg += WriteStackTrace(trace);
-          SpkMsgBox::StaticExec(msg, QObject::tr("Spark Store Crashed"), QMessageBox::Critical,
-                                QMessageBox::Ok, trace);
-          exit(2);
-        }
-      default:
-        sErrPop(QObject::tr("Unknown signal %1 received in crash handler. "
-                            "Program internals may be corrupted. Please decide if you want "
-                            "to continue execution.").arg(sig));
-    }
-  }
-
-  QIcon GetThemedIcon(QString name)
-  {
-    if(CurrentStyle == SpkUiStyle::Dark)
-      name += "-dark";
-    return QIcon(":/icons/" + name + ".svg");
-  }
-
-  QString StylesheetFromColors(Qss::ColorSet aColors)
-  {
-    QString ret = StylesheetBase;
-    foreach(auto &i, aColors)
-      ret = ret.replace(Qss::ColorSet2Token.at(i.first), i.second.name());
-    return ret;
-  }
-
-  QColor ColorTextOnBackground(QColor c)
-  {
-    // From https://github.com/feiyangqingyun/qtkaifajingyan
-    double gray = (0.299 * c.red() + 0.587 * c.green() + 0.114 * c.blue()) / 255;
-    return gray > 0.5 ? Qt::black : Qt::white;
-  }
-
-  // =================== UiMetaObject =======================
-  // UiMetaObject is the signal-slot receiver for DDE plugin, receiving the DDE system level
-  // notifications of UI theme changes
-  // Communications with UI widgets are also done here
-
-  void UiMetaObject::SetAccentColor(QColor aColor)
-  {
-    if(!SpkUi::States::DoRespondAutoTheme)
-      return;
-    CurrentColorSet[Qss::AccentColor] = aColor.lighter(90);
-    CurrentColorSet[Qss::AccentColorHighlighted] = aColor.lighter(105);
-    CurrentColorSet[Qss::TextOnAccentColor] = ColorTextOnBackground(aColor);
-    SetBtnMaskColor();
-    qApp->setStyleSheet(StylesheetFromColors(CurrentColorSet));
-  }
-
-  void UiMetaObject::SetDarkLightTheme(bool isDark)
-  {
-    if(!SpkUi::States::DoRespondAutoTheme)
-      return;
-    if(isDark)
-      SetGlobalStyle(Dark, true);
-    else
-      SetGlobalStyle(Light, true);
-  }
-}
--- a/gui/spkwindow.cpp
+++ b/gui/spkwindow.cpp
@@ -1,326 +0,0 @@
-
-#include <QVBoxLayout>
-#include <QApplication>
-#include <QStyleHints>
-#include <QPainterPath>
-#include <QFile>
-#include <QPushButton>
-#include <QMouseEvent>
-#include "spklogging.h"
-#include "spkwindow.h"
-#include "spkui_general.h"
-#include "spktitlebar.h"
-
-#include <QDebug>
-
-SpkWindow::SpkWindow(QWidget *parent) : QWidget(parent)
-{
-  mUseCustomEvents = SpkUi::DtkPlugin == nullptr; // Put to the front, to prevent warnings
-  if(SpkUi::DtkPlugin && !qEnvironmentVariableIntValue("SPARK_NO_DXCB"))
-    SpkUi::DtkPlugin->addWindow(this, parent); // Register window to DXcb so we got Deepin
-  else
-    setWindowFlags(Qt::FramelessWindowHint); // Remove default title bar
-  setAttribute(Qt::WA_Hover);
-  mCornerRadius = 5;
-  mUserCentralWidget = nullptr;
-  mResizable = true;
-  mMoving = mResizing = false;
-  mCloseHook = nullptr;
-  mMaximized = windowState().testFlag(Qt::WindowMaximized);
-  setMouseTracking(true);
-
-  PopulateUi();
-}
-
-SpkWindow::~SpkWindow()
-{
-
-}
-
-bool SpkWindow::event(QEvent *evt)
-{
-  // These custom events weren't useful for Deepin platform
-  if(!mUseCustomEvents)
-    return QWidget::event(evt);
-
-  switch(evt->type())
-  {
-    case QEvent::WindowStateChange:
-    {
-      mMaximized = windowState().testFlag(Qt::WindowMaximized);
-      if(mMaximized)
-        mTitleBarComponent->mBtnMaxRestore->SetRole(SpkTitleBarDefaultButton::Restore);
-      else
-        mTitleBarComponent->mBtnMaxRestore->SetRole(SpkTitleBarDefaultButton::MaximizeRestore);
-      break;
-    }
-    case QEvent::MouseButtonPress:
-    {
-//      if(!mResizable) break;
-      auto e = static_cast<QMouseEvent*>(evt);
-      if(e->button() != Qt::LeftButton) break;
-      auto edge = DetectEdgeOnThis(e->pos());
-      if(edge)
-      {
-        mResizing = true;
-        mEdgesBeingResized = edge;
-        return true;
-      }
-      else
-      {
-        if(!QWidget::event(evt) || 1) // Movable property is not implemented, let move anywhere
-        {
-          mMoveOffset = e->globalPos() - pos();
-          mMoving = true;
-          mResizing = false;
-        }
-        return true;
-      }
-      break;
-    }
-    case QEvent::MouseButtonRelease:
-    {
-//      if(!mResizable) break;
-      auto e = static_cast<QMouseEvent*>(evt);
-      if(e->button() != Qt::LeftButton) break;
-      mResizing = false;
-      mMoving = false;
-      unsetCursor();
-      return true;
-      break;
-    }
-    case QEvent::HoverMove:
-    {
-      if((mResizing || !mResizable) && !mMoving) break;
-      if(mMaximized)
-      {
-        unsetCursor();
-        break;
-      }
-      if(mResizable && !mMoving)
-      {
-        auto e = static_cast<QHoverEvent*>(evt);
-        auto edge = DetectEdgeOnThis(e->pos());
-        SetMouseCursor(edge);
-      }
-      break;
-    }
-    case QEvent::MouseMove:
-    {
-      if(mMaximized) break;
-      auto e = static_cast<QMouseEvent*>(evt);
-      if(mResizing && mResizable)
-      {
-        ResizeWindowByCursor(e->globalPos());
-        return true; // Intercept resize movements
-      }
-      else if(mMoving)
-      {
-        move(e->globalPos() - mMoveOffset);
-      }
-      break;
-    }
-    default:
-      ;
-  }
-  return QWidget::event(evt);
-}
-
-Qt::Edges SpkWindow::DetectEdgeOnThis(QPoint p)
-{
-  Qt::Edges edge;
-  if(p.x() < BorderWidth) edge |= Qt::LeftEdge;
-  if(p.x() > width() - BorderWidth) edge |= Qt::RightEdge;
-  if(p.y() < BorderWidth) edge |= Qt::TopEdge;
-  if(p.y() > height() - BorderWidth) edge |= Qt::BottomEdge;
-  return edge;
-}
-
-void SpkWindow::SetMouseCursor(Qt::Edges e)
-{
-  switch(e)
-  {
-    case Qt::TopEdge:
-    case Qt::BottomEdge:
-      setCursor(Qt::SizeVerCursor);
-      break;
-    case Qt::LeftEdge:
-    case Qt::RightEdge:
-      setCursor(Qt::SizeHorCursor);
-      break;
-    case Qt::TopEdge | Qt::LeftEdge:
-    case Qt::BottomEdge | Qt::RightEdge:
-      setCursor(Qt::SizeFDiagCursor);
-      break;
-    case Qt::TopEdge | Qt::RightEdge:
-    case Qt::BottomEdge | Qt::LeftEdge:
-      setCursor(Qt::SizeBDiagCursor);
-      break;
-    default:
-      unsetCursor();
-  }
-}
-
-void SpkWindow::ResizeWindowByCursor(QPoint p)
-{
-  auto r_ = geometry(), r = r_;
-  switch(mEdgesBeingResized)
-  {
-    case Qt::TopEdge | Qt::LeftEdge:
-      r.setLeft(p.x());
-      if(r.width() < minimumWidth()) // If smaller than minimum the window moves, so we stop it
-        r.setLeft(r_.left());
-    case Qt::TopEdge:
-      r.setTop(p.y());
-      if(r.height() < minimumHeight()) // Same
-        r.setTop(r_.top());
-      break;
-    case Qt::BottomEdge | Qt::LeftEdge:
-      r.setLeft(p.x());
-      if(r.width() < minimumWidth())
-        r.setLeft(r_.left());
-    case Qt::BottomEdge:
-      r.setBottom(p.y());
-      if(r.height() < minimumHeight())
-        r.setBottom(r_.bottom());
-      break;
-    case Qt::TopEdge | Qt::RightEdge:
-      r.setTop(p.y());
-      r.setRight(p.x());
-      if(r.height() < minimumHeight())
-        r.setTop(r_.top());
-      if(r.width() < minimumWidth())
-        r.setRight(r_.right());
-      break;
-    case Qt::BottomEdge | Qt::RightEdge:
-      r.setBottom(p.y());
-      if(r.height() < minimumHeight())
-        r.setBottom(r_.bottom());
-    case Qt::RightEdge:
-      r.setRight(p.x());
-      if(r.width() < minimumWidth())
-        r.setRight(r_.right());
-      break;
-    case Qt::LeftEdge:
-      r.setLeft(p.x());
-      if(r.width() < minimumWidth())
-        r.setLeft(r_.left());
-      break;
-    default:
-      return;
-  }
-
-  setGeometry(r);
-}
-
-void SpkWindow::closeEvent(QCloseEvent *e)
-{
-  if(mCloseHook)
-  {
-    if(mCloseHook())
-      e->accept();
-    else
-      e->ignore();
-    emit Closed();
-    return;
-  }
-  e->accept();
-  emit Closed();
-}
-
-void SpkWindow::paintEvent(QPaintEvent *e)
-{
-  QWidget::paintEvent(e);
-  if(!mUseCustomEvents)
-    return;
-
-  QPainter painter(this);
-  painter.setBrush(QBrush(Qt::NoBrush));
-  painter.setPen(QPen(SpkUi::ColorLine));
-  QRect rect = this->rect();
-  rect.adjust(0, 0, -1, -1);
-  painter.drawRect(rect);
-}
-
-void SpkWindow::SetCornerRadius(int radius)
-{
-  mCornerRadius = radius;
-}
-
-void SpkWindow::PopulateUi()
-{
-  mMainVLayout = new QVBoxLayout;
-  mTitleBarComponent = new SpkTitleBar(this);
-
-  setLayout(mMainVLayout);
-
-  mMainVLayout->addWidget(mTitleBarComponent);
-  mMainVLayout->setAlignment(Qt::AlignTop);
-  if(mUseCustomEvents)
-    mMainVLayout->setContentsMargins(1, 1, 1, 1);
-  else
-    mMainVLayout->setContentsMargins(0, 0, 0, 0);
-  mMainVLayout->setSpacing(0);
-
-  mTitleBarComponent->SetTitle(qAppName());
-  mTitleBarComponent->SetUseIcon(false);
-  mTitleBarComponent->SetLinkedWindow(this);
-  setWindowFlag(Qt::NoDropShadowWindowHint, false);
-}
-
-void SpkWindow::SetCentralWidget(QWidget *widget)
-{
-  if(mUserCentralWidget)
-    mMainVLayout->removeWidget(mUserCentralWidget);
-  mUserCentralWidget = widget;
-  mMainVLayout->addWidget(widget);
-}
-
-void SpkWindow::SetUseTitleBar(bool x)
-{
-  mTitleBarComponent->setVisible(x);
-}
-
-void SpkWindow::SetCentralMargin(int a, int b, int c, int d)
-{
-  if(mUserCentralWidget)
-    mUserCentralWidget->setContentsMargins(a, b, c, d);
-}
-
-void SpkWindow::SetCloseHook(bool (*f)())
-{
-  mCloseHook = f;
-}
-
-void SpkWindow::ClearCloseHook()
-{
-  mCloseHook = nullptr;
-}
-
-void SpkWindow::RecalculateSize()
-{
-  mMainVLayout->activate();
-}
-
-bool SpkWindow::GetUseTitleBar()
-{
-  return mTitleBarComponent->isVisible();
-}
-
-SpkTitleBar *SpkWindow::GetTitleBar()
-{
-  return mTitleBarComponent;
-}
-
-SpkTitleBar *SpkWindow::SetTitleBar(SpkTitleBar *bar, bool replace)
-{
-  if(!bar)
-    return nullptr;
-  auto ret = mTitleBarComponent;
-  mMainVLayout->removeWidget(mTitleBarComponent);
-  if(replace)
-    mMainVLayout->insertWidget(0, bar);
-  mTitleBarComponent = bar;
-  bar->SetLinkedWindow(this);
-  return ret;
-}
--- a/inc/deepinplatform.h
+++ b/inc/deepinplatform.h
@@ -1,9 +0,0 @@
-//
-// Created by rigoligo on 2021/5/8.
-//
-
-#pragma once
-
-// Stub
-
-#endif //_DEEPINPLATFORM_H_
--- a/inc/dtk/spkdtkplugin.h
+++ b/inc/dtk/spkdtkplugin.h
@@ -1,22 +0,0 @@
-
-#pragma once
-
-#include <QWidget>
-
-class SpkDtkPlugin : public QObject
-{
-    Q_OBJECT
-  public:
-    virtual ~SpkDtkPlugin() = default;
-    virtual void Initialize() = 0;
-    virtual void addWindow(QWidget* w, QObject* parent) = 0;
-    virtual QColor GetAccentColor() = 0;
-    virtual bool GetIsDarkTheme() = 0;
-
-  signals:
-    void AccentColorChanged(QColor);
-    void DarkLightThemeChanged(bool isDark);
-};
-QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(SpkDtkPlugin, "org.spark-store.client.dtkplugin")
-QT_END_NAMESPACE
--- a/inc/gitver.h
+++ b/inc/gitver.h
@@ -1,8 +0,0 @@
-
-#pragma once
-
-namespace GitVer
-{
-  const char *DescribeTags();
-  const char *CommitDate();
-}
--- a/inc/page/spkpageappdetails.h
+++ b/inc/page/spkpageappdetails.h
@@ -1,86 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-
-#pragma once
-
-#include <QLabel>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QFormLayout>
-#include "page/spkpagebase.h"
-#include "spkstretchlayout.h"
-#include "spkimgviewer.h"
-
-namespace SpkUi
-{
-  class SpkDetailEntry;
-
-  class SpkClickLabel : public QLabel
-  {
-      Q_OBJECT
-    protected:
-      virtual void mousePressEvent(QMouseEvent *e) override { emit Pressed(); }
-    signals:
-      void Pressed();
-  };
-
-  class SpkPageAppDetails : public SpkPageBase
-  {
-      Q_OBJECT
-    public:
-      SpkPageAppDetails(QWidget *parent = nullptr);
-      ~SpkPageAppDetails();
-
-      void LoadAppResources(QString pkgName, QString icon, QStringList screenshots, QStringList tags);
-      void SetWebsiteLink(QString url);
-      void SetPackagePath(QString url);
-
-    private:
-      QString mPkgPath;
-      QPixmap mBrokenImg, mIconLoading;
-
-    public slots:
-      void ResourceAcquisitionFinished(int id, ResourceResult result);
-      void Activated();
-
-    public:
-      static constexpr QSize IconSize { 144, 144 };
-
-      // Main Area
-      QScrollArea *mMainArea, *mScreenshotArea;
-      QWidget *mDetailWidget, *mIconTitleWidget, *mWid4MainArea, *mWid4ShotArea;
-      QLabel *mAppTitle, *mAppIcon, *mAppDescription, *mAppShortDesc, *mPkgName, *mVersion,
-             *mWebsite;
-      SpkDetailEntry *mAuthor, *mContributor, *mSite, *mArch, *mSize;
-      SpkStretchLayout *mDetailLay;
-      QVBoxLayout *mDetailsLay, *mTitleLay, *mMainLay;
-      QHBoxLayout *mIconTitleLay, *mScreenshotLay;
-      QList<SpkClickLabel*> mScreenshotPreviews;
-
-      QMap<int, QPixmap> mAppImages;
-      SpkImgViewer *mImgViewer;
-
-      // Bottom bar
-      QWidget *mBottomBar;
-      QPushButton *mBtnInstall, *mBtnDownload, *mBtnUninstall, *mBtnRequestUpdate, *mBtnReport;
-      QHBoxLayout *mBottomBarLay;
-
-    signals:
-      void RequestDownload(QString name, QString pkgName, QString path);
-
-    private slots:
-      void ImageClicked();
-  };
-
-  class SpkDetailEntry : public QWidget
-  {
-      Q_OBJECT
-    public:
-      SpkDetailEntry(QWidget *parent = nullptr);
-      void SetTitle(const QString &s) { mTitle.setText(s); }
-      void SetValue(const QString &s) { mField.setText(s); }
-
-    private:
-      QLabel mTitle, mField;
-      QHBoxLayout mLay;
-  };
-}
--- a/inc/page/spkpageapplist.h
+++ b/inc/page/spkpageapplist.h
@@ -1,63 +0,0 @@
-
-#pragma once
-
-#include <QtWidgets>
-#include "spkresource.h"
-#include "spkappitem.h"
-#include "page/spkpagebase.h"
-#include "spkstretchlayout.h"
-
-namespace SpkUi
-{
-  class SpkPageAppList : public SpkPageBase
-  {
-      Q_OBJECT
-    public:
-      SpkPageAppList(QWidget *parent = nullptr);
-
-      void AddApplicationEntry(QString name, QString pkgName, QString description, QString iconUrl,
-                               int appId);
-      void ClearAll();
-      void SetPageStatus(int total, int current, int itemCount, QString &keyword);
-      void SetCurrentCategory(int categoryId) { mCategoryId = categoryId; }
-
-    private:
-      void DisablePageSwitchers();
-
-    public:
-
-    private:
-      QVBoxLayout *mMainLay;
-      QHBoxLayout *mPageSwitchLay;
-      QPushButton *mBtnPgUp, *mBtnPgDown, *mBtnGotoPage;
-      QLineEdit *mPageInput;
-      QScrollArea *mAppsArea;
-      QLabel *mPageIndicator;
-      QWidget *mAppsWidget, *mPageSwitchWidget;
-      SpkStretchLayout *mItemLay;
-      QList<SpkAppItem *> mAppItemList;
-
-      // Cached icons
-      QPixmap *mLoadingIcon,
-              *mBrokenIcon;
-
-      QIntValidator *mPageValidator;
-
-      int mCategoryId, mCurrentPage;
-      QString mKeyword;
-
-    signals:
-      void ApplicationClicked(int appId);
-      void SwitchListPage(int categoryId, int page);
-      void SwitchSearchPage(QString keyword, int page);
-
-    public slots:
-      void ResourceAcquisitionFinished(int id, ResourceResult result);
-      void Activated();
-
-    private slots:
-      void PageUp();
-      void PageDown();
-      void GotoPage();
-  };
-}
--- a/inc/page/spkpagebase.h
+++ b/inc/page/spkpagebase.h
@@ -1,27 +0,0 @@
-
-#pragma once
-
-#include <QtWidgets>
-#include <spkresource.h>
-
-class SpkPageBase : public QWidget
-{
-    Q_OBJECT
-  public:
-    SpkPageBase(QWidget *parent = nullptr);
-
-  public slots:
-    /**
-     * @brief This signal is emitted by resource manager when a resource acquisition requested
-     *        has finished.
-     * @param id The request ID
-     * @param result The data retrieved
-     */
-    virtual void ResourceAcquisitionFinished(int id, ResourceResult result);
-
-    /**
-     * @brief This is an optional signal for Resource Context objects, mainly used for notifying the
-     *        context that it is now activated (therefore it needs to acquire the resource manager).
-     */
-    virtual void Activated();
-};
--- a/inc/page/spkpagedownloads.h
+++ b/inc/page/spkpagedownloads.h
@@ -1,45 +0,0 @@
-#ifndef SPKPAGEDOWNLOADS_H
-#define SPKPAGEDOWNLOADS_H
-
-#include "spkdownload.h"
-#include "spkdownloadentry.h"
-#include "page/spkpagebase.h"
-#include "pkgs/spkpkgmgrbase.h"
-
-namespace SpkUi
-{
-  class SpkPageDownloads : public SpkPageBase
-  {
-      Q_OBJECT
-    public:
-      SpkPageDownloads(QWidget *parent = nullptr);
-      ~SpkPageDownloads();
-
-    public slots:
-      void AddDownloadTask(QString name, QString pkgName, QString path);
-
-    private:
-      // Logic
-      SpkDownloadMgr *mDownloadMgr;
-      QMap<uint, SpkDownloadEntry*> mEntries;
-      uint mNextDownloadId;
-      QQueue<QPair<int, QString>> mWaitingDownloads;
-      enum { Idle, Waiting, Downloading } mCurrentStatus;
-
-      // UI
-      QVBoxLayout *mLayEntries, *mMainLay;
-      QWidget *mScrollWidget;
-      QScrollArea *mScrollArea;
-
-    private slots:
-      void DownloadProgress(qint64 downloadedBytes, qint64 totalBytes, int id);
-      void DownloadStopped(SpkDownloadMgr::TaskResult status, int id);
-      void EntryAction(SpkDownloadEntry::EntryAction);
-      void InstallationEnded(int id, SpkPkgMgrBase::PkgInstallResult, int exitCode);
-
-    private:
-      void NewDownloadTask(int id, QString downloadPath);
-  };
-}
-
-#endif // SPKPAGEDOWNLOADS_H
--- a/inc/page/spkpagehome.h
+++ b/inc/page/spkpagehome.h
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include <QVBoxLayout>
-#include "page/spkpagebase.h"
-#include "ui_homepage.h"
-
-namespace SpkUi
-{
-  class SpkPageHome : public SpkPageBase
-  {
-      Q_OBJECT
-    public:
-      SpkPageHome(QWidget *parent = nullptr);
-      ~SpkPageHome() { }
-
-      Ui::SpkHomepage *ui;
-
-    private slots:
-      void LinkActivated(QString);
-
-    private:
-      void SetupUi();
-  };
-}
--- a/inc/page/spkpagesettings.h
+++ b/inc/page/spkpagesettings.h
@@ -1,56 +0,0 @@
-
-#pragma once
-
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QFutureWatcher>
-#include <QMutex>
-#include "page/spkpagebase.h"
-#include "ui_settings.h"
-
-namespace SpkUi
-{
-  class SpkPageSettings : public SpkPageBase
-  {
-      Q_OBJECT
-
-    public:
-      SpkPageSettings(QWidget *parent = nullptr);
-      ~SpkPageSettings();
-
-      void SetupUi();
-      void ReadConfiguration();
-      void SaveConfiguration();
-
-      void CountCleaning();
-
-      virtual void Activated() override;
-
-    private slots:
-      void on_btnCleanDownloadedContent_clicked();
-      void on_btnCleanResourceCache_clicked();
-      void on_btnViewDownloadedContent_clicked();
-      void on_btnViewResourceCache_clicked();
-
-      void CountFinishResource();
-      void CountFinishDownload();
-      void CleanedResource();
-      void CleanedDownload();
-
-    private:
-      QScrollArea *mMainArea;
-      QVBoxLayout *mMainLay;
-      QWidget *mSettingsWidget;
-      Ui::SpkUiSettings *ui;
-
-      QString mRepoListUrl;
-
-      QFutureWatcher<void>  mFwResourceCount,
-                            mFwDownloadCount,
-                            mFwResourceClean,
-                            mFwDownloadClean;
-      QMutex mMutResource, mMutDownload;
-      int64_t mBytesResource, mBytesDownloads;
-
-  };
-}
--- a/inc/page/spkpageuitest.h
+++ b/inc/page/spkpageuitest.h
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <QWidget>
-#include <QSplitter>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QTextEdit>
-#include <QLineEdit>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QSlider>
-#include <QProgressBar>
-#include "spkappitem.h"
-#include "spkstretchlayout.h"
-#include "page/spkpageappdetails.h"
-#include "spkiconbutton.h"
-
-#include "spkloading.h"
-
-namespace SpkUi
-{
-  class SpkPageUiTest : public QSplitter
-  {
-      Q_OBJECT
-    public:
-      SpkPageUiTest(QWidget *parent = nullptr);
-      QWidget *WidL, *WidR;
-      QVBoxLayout *VLayWidgets,
-                  *VLayTestWidgets,
-                  *VLayInput;
-      QHBoxLayout *HLay4Slider,
-                  *HLayInputBtns;
-      QTextEdit *TextStylesheet;
-      QPushButton *BtnApply;
-      QPushButton *BtnFetch;
-
-      QPushButton *Btn;
-      QCheckBox *Chk;
-      QRadioButton *Rad;
-      QGroupBox *Group;
-      QSlider *SlideH;
-      QSlider *SlideV;
-      SpkIconButton *IconBtn;
-      QProgressBar *Prog;
-      SpkLoading *Loading;
-      SpkAppItem *AppItem;
-      SpkStretchLayout *DetailsLay;
-      SpkDetailEntry *Detail1, *Detail2, *Detail3;
-      QWidget *DetailsWidget;
-
-      QLineEdit *PopupText;
-      QPushButton *ShowPopup,
-                  *ShowAbout,
-                  *ShowPkgmgr;
-
-    public slots:
-      void SetStylesheet();
-      void FetchStylesheet();
-      void ShowPopupSlot();
-  };
-}
--- a/inc/pkgs/spkpkgmgrapt.h
+++ b/inc/pkgs/spkpkgmgrapt.h
@@ -1,36 +0,0 @@
-
-#pragma once
-
-#include "spkpkgmgrbase.h"
-#include <QProcess>
-
-class SpkPkgMgrApt final : public SpkPkgMgrBase
-{
-    Q_OBJECT
-
-  public:
-    SpkPkgMgrApt(QObject *parent = nullptr);
-
-    static bool DetectRequirements();
-
-    virtual PkgInstallResult ExecuteInstallation(QString pkgPath,
-                                                 int entryId) override;
-
-  // APT backend specific
-    bool ChangeServerRepository(QString content);
-
-  private:
-    void CheckInstallerAvailability();
-
-  private slots:
-    void InstallerExited(int, QProcess::ExitStatus);
-
-  private:
-    QAction *mActAptitudeTerm,
-            *mActAptTerm,
-            *mActGdebi,
-            *mActDeepinPkgInst;
-
-    QProcess mInstaller;
-
-};
--- a/inc/pkgs/spkpkgmgrbase.h
+++ b/inc/pkgs/spkpkgmgrbase.h
@@ -1,91 +0,0 @@
-
-#pragma once
-
-#include <QObject>
-#include <QMenu>
-#include <QAction>
-#include <QCursor>
-#include <QUrl>
-#include <QDesktopServices>
-
-#include "spkutils.h"
-
-class SpkPkgMgrBase : public QObject
-{
-    Q_OBJECT
-
-  public:
-    SpkPkgMgrBase(QObject *parent = nullptr) : QObject(parent)
-    {
-      Q_ASSERT(mInstance == nullptr);
-      mInstance = this;
-
-      mActOpen = new QAction(tr("Open package"), this);
-      mActOpenDir = new QAction(tr("Open containing directory"), this);
-      mMenu = new QMenu(tr("Package Actions"));
-      mMenu->addAction(mActOpen);
-      mMenu->addAction(mActOpenDir);
-      mMenu->setAttribute(Qt::WA_TranslucentBackground);
-      mMenu->setWindowFlags(Qt::Popup | Qt::FramelessWindowHint);
-    }
-
-    enum PkgInstallResult
-    {
-      Failed,
-      Succeeded,
-      Ignored ///< No installation action is taken, no messages be displayed
-    };
-
-    /**
-     * @brief Detects if this system qualified to use this kind of packaging
-     */
-    static bool DetectRequirements() { return true; }
-
-    /**
-     * @brief Popup a menu at cursor to select installation methods
-     *        and do installation accordingly
-     * @param pkgPath Path to the package file
-     * @param entryId ID of the download entry
-     */
-    virtual PkgInstallResult ExecuteInstallation(QString pkgPath, int entryId)
-    {
-      Q_UNUSED(entryId);
-      auto item = mMenu->exec(QCursor::pos());
-      if(item == mActOpenDir)
-        QDesktopServices::openUrl(QUrl(SpkUtils::CutPath(pkgPath)));
-      else if(item == mActOpen)
-        QDesktopServices::openUrl(QUrl(pkgPath));
-      return Ignored;
-    }
-
-    /**
-     * @brief Called when Spark Store installs a software when it's running
-     *        in CLI mode
-     * @param pkgPath Path to the package file
-     */
-    virtual PkgInstallResult CliInstall(QString pkgPath)
-    {
-      qInfo() << tr("Spark Store cannot install your package because no supported "
-                    "packaging system has been found. You shall decide what you "
-                    "want to do with the downloaded package.\n\n"
-                    "File path:")
-              << pkgPath;
-      return Ignored;
-    }
-
-  public:
-    static SpkPkgMgrBase *Instance() { return mInstance; }
-
-  protected:
-    QAction *mActOpenDir, *mActOpen, *mActDesc;
-    QMenu *mMenu;
-    int mCurrentItemId; ///< ID of currently installing download item
-
-  private:
-    static SpkPkgMgrBase *mInstance;
-
-  signals:
-    void ReportInstallResult(int entryId,
-                             SpkPkgMgrBase::PkgInstallResult result,
-                             int exitCode);
-};
--- a/inc/pkgs/spkpkgmgrpacman.h
+++ b/inc/pkgs/spkpkgmgrpacman.h
@@ -1,20 +0,0 @@
-
-#pragma once
-
-#include "spkpkgmgrbase.h"
-
-class SpkPkgMgrPacman final : public SpkPkgMgrBase
-{
-    Q_OBJECT
-
-  public:
-    SpkPkgMgrPacman(QObject *parent = nullptr);
-
-    static bool DetectRequirements();
-
-    virtual PkgInstallResult ExecuteInstallation(QString pkgPath,
-                                                 int entryId) override;
-
-
-
-};
--- a/inc/qt/elidedlabel.h
+++ b/inc/qt/elidedlabel.h
@@ -1,87 +0,0 @@
-
-#pragma once
-
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, you may use this file under the terms of the BSD license
-** as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*
- * Slight modifications has been done to the code to make it fit into the project.
- */
-
-#include <QFrame>
-#include <QString>
-
-//! [0]
-class ElidedLabel : public QFrame
-{
-    Q_OBJECT
-    Q_PROPERTY(QString text READ text WRITE setText)
-    Q_PROPERTY(bool isElided READ isElided)
-
-  public:
-    explicit ElidedLabel(const QString &text, QWidget *parent = nullptr);
-
-    explicit ElidedLabel(QWidget *parent = nullptr);
-
-    void setText(const QString &text);
-    const QString & text() const { return content; }
-    bool isElided() const { return elided; }
-
-  protected:
-    void paintEvent(QPaintEvent *event) override;
-
-  signals:
-    void elisionChanged(bool elided);
-
-  private:
-    bool elided;
-    QString content;
-};
-//! [0]
--- a/inc/spkabout.h
+++ b/inc/spkabout.h
@@ -1,23 +0,0 @@
-
-#pragma once
-
-#include <QLabel>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include "spkdialog.h"
-
-class SpkAbout : public SpkDialog
-{
-    Q_OBJECT
-
-  public:
-    SpkAbout(QWidget* parent = nullptr);
-    ~SpkAbout();
-    static void Show();
-
-  private:
-    QHBoxLayout *mIconLay;
-    QLabel *mSpkIcon;
-    QLabel *mSpkVersion;
-    QLabel *mDescriptionText;
-};
--- a/inc/spkappitem.h
+++ b/inc/spkappitem.h
@@ -1,41 +0,0 @@
-
-#pragma once
-
-#include <QLabel>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include "qt/elidedlabel.h"
-
-class SpkAppItem : public QWidget
-{
-    Q_OBJECT
-
-  public:
-    SpkAppItem(int appId, QWidget *parent = nullptr);
-    void SetIcon(QPixmap p) { mIcon->setPixmap(p); }
-    void SetTitle(QString s) { mTitle->setText(s); }
-    void SetDescription(QString s) { mDescription->setText(s); }
-
-  protected:
-    void paintEvent(QPaintEvent *e);
-    void mousePressEvent(QMouseEvent *e);
-    void mouseReleaseEvent(QMouseEvent *e);
-
-  public:
-    static constexpr int IconSize = 72;
-    static constexpr QSize IconSize_ = { IconSize, IconSize };
-
-  private:
-    QLabel *mIcon;
-    QLabel *mTitle;
-    ElidedLabel *mDescription;
-    int mAppId;
-
-    bool mPressCond;
-
-    QVBoxLayout *mLayText;
-    QHBoxLayout *mMainLay;
-
-  signals:
-    void clicked(int);
-};
--- a/inc/spkconfig.h
+++ b/inc/spkconfig.h
@@ -1,51 +0,0 @@
-#ifndef SPKCONFIG_H
-#define SPKCONFIG_H
-
-#include <QSettings>
-#include <QHash>
-#include <QPair>
-#include <functional>
-
-class SpkConfig : public QObject
-{
-    Q_OBJECT
-  public:
-    SpkConfig(QObject *parent, QString configPath);
-    ~SpkConfig();
-
-    /**
-     * @brief BindField If a variable is bound to the specified key, then future chanegs via SetField
-     *                  will modify the provided variable. A callback can also be specified to make
-     *                  sure the chanegs are acceptable.
-     * @param key
-     * @param value A pointer to the variable to be bound
-     * @param defaultValue
-     * @param callback When SetField is called to modify this specific key associated with a callback,
-     *                 the callback is called. If the callback returned false then the original value
-     *                 is restored to the value target, and changes won't be saved in mSettings, and
-     *                 SetField will return false too. It is used to ensure if the target can accept
-     *                 the changes.
-     * @return false when the key is already bound.
-     */
-    bool BindField(QString key, QString* value, QString defaultValue, std::function<bool(void)> callback = nullptr);
-    bool BindField(QString key, int* value, int defaultValue, std::function<bool(void)> callback = nullptr);
-
-    bool SetField(QString key, QString value);
-    bool SetField(QString key, int value);
-
-    // Wrapper of QSettings::value, used for "read once on startup" configurations
-    QVariant ReadField(QString key, QVariant defaultValue);
-    // Wrapper of QSettings::setValue, used for "set and restart to take effect" configurations
-    void SetSettings(QString key, QVariant value);
-    // Wrapper of QSettings::sync
-    void Sync();
-
-  private:
-    QSettings mSettings;
-
-    QHash<QString, QPair<QString*, std::function<bool(void)>>> mStringBindMap;
-    QHash<QString, QPair<int*,std::function<bool(void)>>> mIntBindMap;
-
-};
-
-#endif // SPKCONFIG_H
--- a/inc/spkdialog.h
+++ b/inc/spkdialog.h
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <QList>
-#include <QButtonGroup>
-#include "spkui_general.h"
-#include "spktitlebar.h"
-#include "spkwindow.h"
-
-class SpkDialog : public SpkWindow
-{
-    Q_OBJECT
-    friend class SpkMsgBox;
-  public:
-    SpkDialog(QWidget *parent = nullptr);
-    ~SpkDialog();
-    void AddButton(QString text, SpkUi::SpkButtonStyle style = SpkUi::SpkButtonStyle::Normal);
-    void AddWidget(QWidget*);
-    void AddLayout(QLayout*);
-    void AddSpacing(int);
-    void AddStretch(int a = 0);
-    void SetMargin(int);
-    void SetMargin(int, int, int, int);
-    int  Exec();
-
-  private slots:
-    void ButtonPressed(int);
-    void ForceClose();
-
-  signals:
-    void ExitEventLoop(int);
-    void CloseWindow();
-
-  protected:
-    QWidget *mDialogWidget;
-  private:
-    QVBoxLayout *mMainVLay, *mWidgetsVLay;
-    QHBoxLayout *mBtnLay;
-    QButtonGroup *mBtnGroup;
-    QList<QObject*> mWidgetsList, mParentsList;
-};
--- a/inc/spkdownload.h
+++ b/inc/spkdownload.h
@@ -1,125 +0,0 @@
-
-#pragma once
-
-#include "spkstore.h"
-#include <QTimer>
-
-/**
- * @note SpkDownloadMgr does NOT do download scheduling and other things; it's only a multithreaded
- *       downloader; it manages the threads that are downloading stuff from the Internet.
- *
- *       Because of this, SpkDownloadMgr does not support complex download queues, cannot handle
- *       pauses, and can only work on a sequential list of tasks.
- */
-
-class SpkDownloadMgr : public QObject
-{
-    Q_OBJECT
-  public:
-    SpkDownloadMgr(QObject *parent = nullptr);
-    ~SpkDownloadMgr();
-
-    static constexpr int MaximumThreadRetryCount = 3;
-
-    enum TaskResult
-    {
-      Success = 0,
-      FailCannotCreateFile, ///< Failed because destination file cannot be created
-      FailNoVaibleServer, ///< Failed because no server provides file size or download stalled on
-                          ///< all of them
-      FailCancel, ///< User has cancelled the task
-      Fail
-    };
-
-    /**
-     * @brief DownloadWorker is not a real worker but more of a worker-like structure. It holds
-     *        information about one download thread, such as offset, total bytes and received bytes.
-     *        Workers' scheduling is still done by SpkDownloadMgr synchronously, avoiding
-     *        unnecessary race conditions and data safety problems.
-     *        DownloadWorker is also used in mFailureRetryQueue to indicate the blocks that needed
-     *        to be retried on other servers.
-     *
-     *        Each worker has a watch dog value, incremented each time the download speed is
-     *        updated, and zeroed each time the worker has data ready. If the value exceeds a
-     *        preset maximum, then this worker is considered timed out and killed.
-     */
-    struct DownloadWorker
-    {
-      QNetworkReply *Reply; ///< Reply from the network
-      int Watchdog; ///< Watch dog value watching for a timed out worker
-      qint64 BeginOffset; ///< Where should a worker start downloading
-      qint64 BytesNeeded; ///< How many bytes a worker should fetch in total
-      qint64 BytesRecvd; ///< How many bytes a worker has received till now
-    };
-
-    constexpr static int WatchDogMaximum = 7;
-
-    struct RemoteFileInfo
-    {
-      qint64 Size = -1;
-      bool SupportPartialDownload = false; ///< Whether this file can be downloaded multithreaded
-      QByteArray Md5;
-    };
-
-    void SetNewServers(QList<QString> servers);
-
-    /**
-     * @note This function uses BLOCKING IO!
-     */
-    static RemoteFileInfo GetRemoteFileInfo(QUrl url);
-
-    QString GetDestFilePath(QString downloadPath);
-
-  private:
-    QList<QString> mServers; ///< Multithreaded download
-
-    QList<DownloadWorker> mScheduledWorkers;
-
-    // If one scheduled task fails a few times in a row, we must give it up on that server and put
-    // its responsible block onto this queue so we can try downloading the block from other servers
-    QQueue<DownloadWorker> mFailureRetryQueue;
-
-    QFile mDestFile;
-    QString mDestFolder, mCurrentRemotePath;
-    RemoteFileInfo mCurrentRemoteFileInfo;
-    QTimer mProgressEmitterTimer;
-    qint64 mDownloadedBytes;
-
-    int mCurrentDownloadId; ///< Indicates download status. -1 means no download going on.
-    int mActiveWorkerCount;
-
-    QString mBulkServerPaths; ///< Config string, modification are taken care of by callback.
-
-  public slots:
-    void SetDestinationFolder(QString path);
-
-    /**
-     * @brief StartNewDownload try to start new download task.
-     * @param path File path. Domain name excluded. No leading slashes.
-     * @param downloadId Emitted with progress, finish and error so the UI know whose status it is.
-     * @return true for success and false for failure.
-     */
-    bool StartNewDownload(QString path, int downloadId);
-    bool PauseCurrentDownload();
-    bool CancelCurrentDownload();
-
-  private slots:
-    void WorkerFinish();
-    void WorkerDownloadProgress(); ///< Be connected to ***QNetworkReply::readyRead***
-    void WorkerError(QNetworkReply::NetworkError);
-    void ProgressTimer();
-
-  private:
-    void ProcessWorkerError(DownloadWorker &, int id);
-    void LinkReplyWithMe(QNetworkReply*);
-    void TryScheduleFailureRetries();
-    void TryScheduleFailureRetries(int i); ///< Try schedule on a specific task slot.
-
-    bool ServerAddressesChangedCallback(); ///< Called by SpkConfig upon address changing
-
-  signals:
-    void DownloadProgressed(qint64 bytes, qint64 total, int id);
-    void DownloadStopped(TaskResult status, int id);
-
-
-};
--- a/inc/spkdownloadentry.h
+++ b/inc/spkdownloadentry.h
@@ -1,78 +0,0 @@
-
-#pragma once
-
-#include <QWidget>
-#include <QPushButton>
-#include <QLabel>
-#include "qt/elidedlabel.h"
-#include "spkloading.h"
-#include <QProgressBar>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QTime>
-
-class SpkDownloadEntry : public QWidget
-{
-    Q_OBJECT
-
-  public:
-    explicit SpkDownloadEntry(QWidget* parent = nullptr);
-    ~SpkDownloadEntry();
-
-    static constexpr QSize IconSize { 64, 64 };
-
-    enum DownloadEntryStatus
-    {
-      Invalid = -1,
-      Waiting,
-      Starting,
-      Downloading,
-      DownloadFailed,
-      ToBeInstalled,
-      Installing,
-      Installed,
-      InstallFailed
-    };
-
-    void SetTotalBytes(qint64 total);
-    void SetBasicInfo(QString name, QPixmap icon, QString filePath);
-    void SetStatus(DownloadEntryStatus status, QString msg = "");
-    void Progress(qint64 bytes);
-    QString GetTaskName() { return mAppName->text(); }
-    QString GetFilePath() { return mFilePath; }
-
-    enum EntryAction
-    {
-      AbortDownload,
-      RetryDownload,
-      StartInstall,
-      RemoveEntry
-    };
-
-  private slots:
-    void ActionButton();
-    void DeleteButton();
-
-  private:
-    QLabel *mIcon, *mMessage;
-    ElidedLabel *mAppName;
-    QProgressBar *mProgress;
-    QPushButton *mBtnDelete,
-                *mBtnActions; // Actions include Retry Pause Install etc, one status at a time
-    SpkLoading *mLoading;
-
-    QHBoxLayout *mLayMsgs, *mLayMain;
-    QVBoxLayout *mLayInfo;
-
-    // Download status data
-    qint64 mTotalBytes, mDownloadedBytes;
-    QTime mLastReportTime;
-    QString mReadableTotalSize;
-
-    QString mFilePath;
-
-    DownloadEntryStatus mStatus;
-
-  signals:
-    void Action(EntryAction);
-};
--- a/inc/spkfillwidget.h
+++ b/inc/spkfillwidget.h
@@ -1,4 +0,0 @@
-#ifndef SPKFILLWIDGET_H
-#define SPKFILLWIDGET_H
-
-#endif // SPKFILLWIDGET_H
--- a/inc/spkfocuslineedit.h
+++ b/inc/spkfocuslineedit.h
@@ -1,19 +0,0 @@
-
-#pragma once
-
-#include <QtWidgets/QLineEdit>
-
-class SpkFocusLineEdit final : public QLineEdit
-{
-    Q_OBJECT
-  public:
-    explicit SpkFocusLineEdit(QWidget *parent = nullptr) : QLineEdit(parent) {}
-
-  protected:
-    void focusInEvent(QFocusEvent *e) override { emit focusGained(); }
-    void focusOutEvent(QFocusEvent *e) override { emit focusLost(); }
-
-  signals:
-    void focusGained();
-    void focusLost();
-};
--- a/inc/spkiconbutton.h
+++ b/inc/spkiconbutton.h
@@ -1,30 +0,0 @@
-#ifndef SPKICONBUTTON_H
-#define SPKICONBUTTON_H
-
-#include <QPushButton>
-#include "spkui_general.h"
-
-class SpkIconButton : public QPushButton
-{
-    Q_OBJECT
-
-  public:
-    SpkIconButton(QWidget *parent = nullptr);
-    ~SpkIconButton() {};
-
-    void SetIcon(QIcon, QSize);
-    void SetIcon(QPixmap);
-    void SetIconSize(QSize);
-
-  protected:
-    void paintEvent(QPaintEvent *) override;
-
-  private:
-    static enum { Dark, Light } sCurrentTheme;
-    QPixmap mPmapPaintedIcon;
-    QSize mPmapSize;
-
-    static constexpr int IconMargin = 8; // shall we make it changable?
-};
-
-#endif // SPKICONBUTTON_H
--- a/inc/spkimgviewer.h
+++ b/inc/spkimgviewer.h
@@ -1,61 +0,0 @@
-
-#pragma once
-
-#include <QPainter>
-#include <QScrollArea>
-#include "spkwindow.h"
-
-class ImgView : public QWidget
-{
-    Q_OBJECT
-
-  public:
-    ImgView(QWidget *parent = nullptr) : QWidget(parent) { mPixmap = nullptr; }
-    void SetPixmap(QPixmap *p) { mPixmap = p; if(p) setFixedSize(p->size()); update(); }
-
-  protected:
-    void paintEvent(QPaintEvent *e)
-    {
-      QPainter p(this);
-      if(mPixmap)
-        p.drawPixmap(0, 0, *mPixmap);
-      p.end();
-      e->accept();
-    }
-
-  private:
-    QPixmap *mPixmap;
-};
-
-class SpkImgViewer : public SpkWindow
-{
-    Q_OBJECT
-
-  public:
-    SpkImgViewer(QWidget *parent = nullptr);
-    void ShowWithImage(int idx);
-    void SetImageTotal(int a) { mTotalImg = a; }
-
-  public slots:
-    void Clear();
-    void SetPixmap(int idx, QPixmap *img);
-
-  private slots:
-    void SwitchToImage(int idx);
-
-  protected:
-    bool event(QEvent*) override;
-
-  private:
-    void ResizeToFitImageSize(QSize);
-
-  private:
-    QPushButton *mBtnPrev, *mBtnNext;
-    QScrollArea *mImgArea;
-    QLabel *mImgIndict;
-    QMap<int, QPixmap*> mImgMap;
-    int mCurrentImg, mTotalImg;
-    QPixmap mIconLoading;
-
-    ImgView *mImgShow;
-};
--- a/inc/spkjsonapiconsumer.h
+++ b/inc/spkjsonapiconsumer.h
@@ -1,25 +0,0 @@
-#ifndef SPKJSONAPICONSUMER_H
-#define SPKJSONAPICONSUMER_H
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QtNetwork/QNetworkAccessManager>
-
-class SpkJsonApiConsumer: public QObject
-{
-    Q_OBJECT
-  public:
-    SpkJsonApiConsumer();
-
-  private:
-    QNetworkAccessManager mNet;
-
-  public slots:
-    void RequestUrl(QUrl);
-
-  signals:
-    void RequestFinish(QJsonDocument, int);
-};
-
-#endif // SPKJSONAPICONSUMER_H
--- a/inc/spkloading.h
+++ b/inc/spkloading.h
@@ -1,34 +0,0 @@
-
-#pragma once
-
-#include <QFrame>
-#include <QTimeLine>
-
-class SpkLoading : public QFrame
-{
-    Q_OBJECT
-  public:
-    explicit SpkLoading(QWidget *parent = nullptr);
-    virtual void paintEvent(QPaintEvent *e) override;
-    virtual void resizeEvent(QResizeEvent *e) override;
-
-  private:
-    QTimeLine *mAnimTimer;
-    QList<int> mSizeList;
-    int mUserHeight = 0;
-    int dw, dh;
-    double dx, dy;
-
-  public slots:
-    void start() { mAnimTimer->start(); }
-    void stop() { mAnimTimer->stop(); }
-    void Begin() { start(); setVisible(true); }
-    void End() { stop(); setVisible(false); }
-    void setHeight(int h) { mUserHeight = h; }
-    void reset();
-
-  private slots:
-    void timer(int s);
-    void loop();
-};
-
--- a/inc/spklogging.h
+++ b/inc/spklogging.h
@@ -1,44 +0,0 @@
-
-/**
- * @brief Simple logging for Spark Store
- */
-
-#pragma once
-
-#pragma push_macro("signals")
-#undef signals
-#include <libnotify/notify.h>
-#define signals DUMMY
-#pragma pop_macro("signals")
-#include <QString>
-#include <QStringListModel>
-#include <QTextStream>
-#include <QFile>
-
-class SpkLogger
-{
-    QStringListModel mLogData;
-    QString mLogPath;
-    QFile mLogFile;
-    QTextStream mLogWriter;
-    static SpkLogger *Instance;
-    void Initialize(QString suggestPath = "");
-    bool NotifyViable = false;
-
-  public:
-    SpkLogger(QString suggestPath = "");
-    ~SpkLogger();
-    static SpkLogger *GetInstance() { return Instance; };
-    void Log(QString message);
-    void Warning(QString message);
-    void Error(QString message, bool pop = false);
-    void Critical(QString message);
-    void Notify(QString);
-};
-
-#define sLog(X) SpkLogger::GetInstance()->Log(X)
-#define sWarn(X) SpkLogger::GetInstance()->Warning(X)
-#define sErr(X) SpkLogger::GetInstance()->Error(X)
-#define sErrPop(X) SpkLogger::GetInstance()->Error(X,true)
-#define sCritical(X) SpkLogger::GetInstance()->Critical(X)
-#define sNotify(X) SpkLogger::GetInstance()->Notify(X)
--- a/inc/spkmainwindow.h
+++ b/inc/spkmainwindow.h
@@ -1,236 +0,0 @@
-//
-// Created by rigoligo on 2021/5/9.
-//
-
-#pragma once
-
-#include "spkwindow.h"
-#include <vector>
-#include <QTextEdit>
-#include <QStackedWidget>
-#include <QButtonGroup>
-#include <QJsonObject>
-#include "spksidebartree.h" // In place of #include <QTreeWidget>
-#include <QPointer>
-#include <QTimeLine>
-#include <QQueue>
-#include "spkfocuslineedit.h"
-#include "spkiconbutton.h"
-#include "page/spkpageuitest.h"
-#include "page/spkpagehome.h"
-#include "page/spkpageapplist.h"
-#include "page/spkpageappdetails.h"
-#include "page/spkpagedownloads.h"
-#include "page/spkpagesettings.h"
-
-class QNetworkReply;
-
-namespace SpkUi
-{
-  enum SpkStackedPages
-  {
-    PgInvalid = -1,
-    PgHomepage,
-    PgAppList,
-    PgAppDetails,
-    PgDownloads,
-    PgSettings,
-    PgQssTest // Must be at last
-  };
-
-  const std::vector<SpkStackedPages> ResourceContexts
-  {
-    PgAppList
-  };
-
-  class SpkSidebarSelector : public QObject
-  {
-      Q_OBJECT
-    private:
-      QPushButton *mLastCheckedBtn;
-      QTreeWidgetItem *mLastSelectedItem;
-      QTreeWidget *mCategoryWidget;
-      QVector<QTreeWidgetItem *> mUnusableItems; // Unselectable top level items; never changes
-
-      QTreeWidgetItem* mLastCategoryItem;
-      int mLastCategoryPage;
-
-    public:
-      SpkSidebarSelector(QObject *parent = nullptr) : QObject(parent)
-      {
-        mLastCheckedBtn = nullptr;
-        mLastSelectedItem = nullptr;
-      }
-      // Tree item can either represent a page or a category, data of special roles
-      // help identify them; Buttons instead can only represent a page
-      constexpr static int RoleItemIsCategory = Qt::UserRole + 1;
-      constexpr static int RoleItemCategoryPageId= Qt::UserRole + 2;
-      void BindPageSwitcherButton(QAbstractButton* w)
-      {
-        connect(w, &QAbstractButton::toggled,
-                this, &SpkSidebarSelector::ButtonToggled);
-        connect(w, &QAbstractButton::pressed,
-                this, &SpkSidebarSelector::ButtonPressed);
-      }
-      void BindCategoryWidget(QTreeWidget* w)
-      {
-        mCategoryWidget = w;
-        connect(w, &QTreeWidget::itemPressed, this,
-                &SpkSidebarSelector::TreeItemSelected);
-      }
-      void AddUnusableItem(QTreeWidgetItem *i) { mUnusableItems.append(i); }
-      void GoBack()
-      {
-        emit SwitchToCategory(mLastCategoryPage, 0);
-        mCategoryWidget->currentItem()->setSelected(false);
-        mLastCategoryItem->setSelected(true);
-      }
-
-    private slots:
-      // We assume the objects in interest all have the correct properties
-      void ButtonToggled(bool aBtnState)
-      {
-        auto b = qobject_cast<QPushButton*>(sender());
-        if(mLastCheckedBtn)
-        {
-          if(mLastCheckedBtn != b)
-          {
-            mLastCheckedBtn->setChecked(false);
-            mLastCheckedBtn = nullptr;
-          }
-        }
-        else if(mLastSelectedItem)
-        {
-          mLastSelectedItem->setSelected(false);
-          mLastSelectedItem = nullptr;
-        }
-        mLastCheckedBtn = b;
-        auto id = b->property("spk_pageno").toInt();
-        emit SwitchToPage(static_cast<SpkStackedPages>(id));
-      }
-      void ButtonPressed()
-      { // Prevent a selected button from being deselected by clicking on it
-        auto b = qobject_cast<QPushButton*>(sender());
-        if(mLastCheckedBtn == b)
-          b->setChecked(false);
-      }
-      void TreeItemSelected(QTreeWidgetItem *item, int column)
-      {
-        if(mUnusableItems.contains(item))
-        {
-          UnusableItemSelected(item); return;
-        }
-        if(mLastCheckedBtn)
-        {
-          mLastCheckedBtn->setChecked(false);
-          mLastCheckedBtn = nullptr;
-        }
-        mLastSelectedItem = item;
-        auto id = item->data(column, RoleItemCategoryPageId).toInt();
-        if(item->data(column, RoleItemIsCategory).toBool())
-          emit SwitchToCategory(id, 0), mLastCategoryPage = id, mLastCategoryItem = item;
-        else
-          emit SwitchToPage(static_cast<SpkStackedPages>(id));
-      }
-      void UnusableItemSelected(QTreeWidgetItem *i)
-      {
-        i->setSelected(false);
-        if(mLastSelectedItem)
-        {
-          mLastSelectedItem->setSelected(true);
-        }
-        else if(mLastCheckedBtn)
-        {
-          mLastCheckedBtn->setChecked(true);
-        }
-      }
-
-    signals:
-      void SwitchToCategory(int aCategoryId, int aPage);
-      void SwitchToPage(SpkStackedPages aPageId);
-  };
-
-  class SpkMainWidget : public QFrame
-  {
-      Q_OBJECT
-
-    public:
-      SpkMainWidget(QWidget *parent = nullptr);
-
-      QHBoxLayout *HorizontalDivide;
-
-      QStackedWidget *Pager;
-
-      // Category widget is for switching pages
-      SpkIconButton *BtnSettings, *BtnFeedback, *BtnLogs, *BtnDayNight, *BtnBack;
-      SpkSidebarTree *CategoryWidget;
-      QMap<int, QTreeWidgetItem> *CategoryItemMap;
-      SpkSidebarSelector *SidebarMgr;
-
-      QTreeWidgetItem *HomepageItem,
-                      *CategoryParentItem,
-                      *AppDetailsItem,
-                      *DownloadsItem,
-                      *UiTestItem;
-
-      // Title bar search bar
-      SpkFocusLineEdit *SearchEdit;
-      QAction *ActClearSearchBar, *ActSearchIcon;
-      QTimeLine *SearchBarAnim;
-
-      //Pages
-      SpkPageUiTest *PageQssTest;
-
-      SpkPageHome *PageHome;
-      SpkPageAppList *PageAppList;
-      SpkPageAppDetails *PageAppDetails;
-      SpkPageDownloads *PageDownloads;
-      SpkPageSettings *PageSettings;
-  };
-}
-
-class SpkMainWindow : public SpkWindow
-{
-    Q_OBJECT
-  private:
-    SpkUi::SpkMainWidget *ui;
-
-  public:
-    SpkMainWindow(QWidget *parent = nullptr);
-    
-    void PopulateCategories(QJsonArray);
-
-  private:
-    void Initialize();
-
-  private:
-    QPointer<QNetworkReply> mCategoryGetReply,
-                            mCategoryAppListGetReply,
-                            mAppDetailsGetReply;
-    SpkUi::SpkStackedPages mCurrentPage = SpkUi::PgInvalid;
-    QList<QPair<SpkIconButton*, QString>> mThemedUiIconReferences;
-
-  public slots:
-    void ReloadThemedUiIcons();
-    void RefreshCategoryData();
-
-  private slots:
-    void SwitchDayNightTheme();
-
-    void SwitchToPage(SpkUi::SpkStackedPages page);
-
-    void CategoryDataReceived();
-    // Enter a category (and switch pages)
-    void EnterCategoryList(int aCategoryId, int aPage);
-    void CategoryListDataReceived();
-    // Search a keyword (and switch pages)
-    void SearchKeyword(QString aKeyword, int aPage);
-    void SearchDataReceived();
-    // Enter the details page of an application (and switch pages)
-    void EnterAppDetails(int aAppId);
-    void AppDetailsDataReceived();
-
-  private:
-    void PopulateAppList(QJsonObject appData, QString &&keyword);
-    void PopulateAppDetails(QJsonObject appDetails);
-};
--- a/inc/spkmsgbox.h
+++ b/inc/spkmsgbox.h
@@ -1,20 +0,0 @@
-#pragma once
-
-#include <QStyle>
-#include <QMessageBox>
-#include "spkdialog.h"
-
-class SpkMsgBox : public SpkDialog
-{
-    Q_OBJECT
-  public:
-    SpkMsgBox(QWidget *parent = nullptr);
-    static int StaticExec(QString msg, QString title, QMessageBox::Icon = QMessageBox::NoIcon,
-                          QMessageBox::StandardButtons = QMessageBox::Ok, QString extra = "",
-                          bool expanded = false);
-  private:
-    static void AddButtons(SpkMsgBox *me, QMessageBox::StandardButtons b);
-    QList<QMessageBox::StandardButton> mButtonList;
-    static constexpr QSize IconSize {48, 48};
-    static constexpr int Margin = 10;
-};
--- a/inc/spknotifydot.h
+++ b/inc/spknotifydot.h
@@ -1,17 +0,0 @@
-
-#pragma once
-
-#include <QLabel>
-
-class SpkNotifyDot : public QLabel
-{
-    Q_OBJECT
-
-  public:
-    SpkNotifyDot(QWidget *parent = nullptr);
-    ~SpkNotifyDot() {}
-
-  protected:
-    virtual void paintEvent(QPaintEvent *) override;
-//    virtual int widthForHeight(int h) override;
-};
--- a/inc/spkpopup.h
+++ b/inc/spkpopup.h
@@ -1,30 +0,0 @@
-
-#pragma once
-
-#include <QLabel>
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QPropertyAnimation>
-#include <QSequentialAnimationGroup>
-
-class SpkMainWindow;
-
-namespace SpkUi
-{
-  class SpkPopup : public QWidget
-  {
-      Q_OBJECT
-    public:
-      SpkPopup(QWidget *parent, int aMillis = 3000);
-
-    public slots:
-      void Show(QString aText);
-
-    private:
-      QPoint MoveOffset;
-      QLabel *mText;
-      QHBoxLayout *mBox;
-      QPropertyAnimation *mAnimFadeIn, *mAnimFadeOut;
-      QSequentialAnimationGroup *mAnim;
-  };
-}
--- a/Show More
+++ b/Show More