!181 4.2.1

Merge pull request !181 from shenmo/dev
!180 4.2 正式
2025-12-15 21:32:05 +08:00 · 2023-01-27 09:51:15 +00:00 · 2023-01-16 09:11:11 +00:00 · 2023-01-06 09:43:45 +00:00 · 2022-12-25 07:45:19 +00:00 · 2022-12-25 04:46:51 +00:00
33 changed files with 818 additions and 1579 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,32 +1,10 @@
-spark-store (4.2.3~test1) stable; urgency=medium
-
-  * 修复：因判断安装状态错误创建多个相同任务的bug
-  * 测试中：尝试修复安装结束的闪退问题 https://gitee.com/deepin-community-store/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
-
+ --shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800

 spark-store (4.2) stable; urgency=medium

@@ -35,8 +13,7 @@ spark-store (4.2) stable; urgency=medium
  * 调整：dwine5标签的文案改为：Wine应用
  * 新增：更新软件时弹窗会显示正在更新的软件包名

- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
-
+ --shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800

 spark-store (4.2~test3) stable; urgency=medium

@@ -44,7 +21,6 @@ spark-store (4.2~test3) stable; urgency=medium

 -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800

-
 spark-store (4.2~test2) stable; urgency=medium

  * 修复: 420t1版本中ssinstall有时会重新下载软件包的问题
@@ -52,10 +28,8 @@ spark-store (4.2~test2) stable; urgency=medium
  * 调整: 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支持显示报错
@@ -64,7 +38,6 @@ spark-store (4.2~test1) stable; urgency=medium

 -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800

-
 spark-store (4.1.2) stable; urgency=medium

  * feat: 初步的wayland支持
@@ -97,9 +70,10 @@ spark-store (4.1.2) stable; urgency=medium
  * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数
  * chore: 更新翻译文件，去除已经不存在的翻译

- -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800


+ -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800
+
 spark-store (4.1.2~test2) stable; urgency=medium

  * feat: ssinstall支持从单独文件夹中校验软件包
@@ -108,7 +82,6 @@ spark-store (4.1.2~test2) stable; urgency=medium

 -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800

-
 spark-store (4.1.2~test1) stable; urgency=medium

  * feat: 初步的wayland支持
@@ -138,6 +111,7 @@ spark-store (4.1.2~test1) stable; urgency=medium
  * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数
  * chore: 更新翻译文件，去除已经不存在的翻译

+
 -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800


@@ -222,7 +196,6 @@ spark-store (3.3.3~test3) stable; urgency=medium

 -- shenmo <shenmo@spark-app.store>  Fri, 30 Jan 2022 00:00:00 +0800

-
 spark-store (3.3.3~test2) stable; urgency=medium

  * bug fix: 更新和检查更新出错时不报错.此更新需要一个推送
--- a/patchs/README.md
+++ b/patchs/README.md
@@ -1,44 +0,0 @@
-# 补丁操作说明
-
- 克隆与构建本项目
-
-    > 用于 zinface-community-cmake-build-system.patch 补丁化构建方式
-
-    ```shell
-    git clone https://gitee.com/deepin-community-store/spark-store
-    cd spark-store
-    git am < patchs/zinface-community-cmake-build-system.patch
-    make package
-    sudo dpkg -i build/*.deb
-    ```
-
-
- 在应用补丁时，并对补丁进行的更新操作
-
-    ```shell
-    # 切换到一个新的分支，即可开始进行补丁内的更新提交
-    git checkout -b cmake-build-system
-    
-    # origin/dev 表示本仓库的 dev 开发分支
-    # 在应用过补丁，并产生了新的提交，即可在当前所在补丁更新分支内
-    # 相对基于 origin/dev 为参考，目前所包含的所有最新提交内容将生成为一个补丁文件(其中尾部为增量更新)
-    git format-patch --stdout origin/dev > patchs/zinface-community-cmake-build-system.patch
-
-    # 最后，回到你的原 dev 分支，将被改变的补丁文件进行提交
-    # 在推送完成后，即可放弃你在 cmake-build-system 分支中所有产生的内容(因为都已经进入补丁)
-    ```
-
- 一些注意事项
-
-    ```shell
-    # 在不了解补丁时，你需要认识一下补丁，但补丁与补丁之间有着不同的用法
-    # 本 patchs/zinface-community-cmake-build-system.patch 补丁为 cmake 化构建
-    
-    # 关于补丁的一些方面
-    # 1. 首先你需要了解 git 是什么，以及简单的使用
-    # 2. 你需要了解补丁是什么，以及简单的使用(应用补丁)
-    # 3. 你需要了解如何创建一个补丁，最基本的就是相对于旧目标分支，将本分区新增的提交进行导出为补丁
-    # 4. 你可能只会将单个提交、或多个提交导出为补丁，但这还不够，你需要具有绝对的对于补丁的理解
-    # 5. 对于不同的目的补丁，应该是多个 patch 文件存在的形式
-    # 6. 最后，不管在什么时候，你在应用补丁前，你应该考虑是否应用到当前分支？为什么不切换到一个新的分支呢？
-    ```
--- a/patchs/zinface-community-cmake-build-system.patch
+++ b/patchs/zinface-community-cmake-build-system.patch
@@ -1,7 +1,7 @@
-From 2d49950909e0327b0ad72e008cb82ac97b7bae0e Mon Sep 17 00:00:00 2001
+From 9d1714ec7ceb3748bd151af059389ed10d37e676 Mon Sep 17 00:00:00 2001
 From: zinface <zinface@163.com>
 Date: Sun, 11 Dec 2022 22:27:23 +0800
-Subject: [PATCH 01/11] =?UTF-8?q?repo:=20=E4=B8=80=E6=AC=A1=E6=80=A7?=
+Subject: [PATCH 1/5] =?UTF-8?q?repo:=20=E4=B8=80=E6=AC=A1=E6=80=A7?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=20spark=20=E9=AA=A8=E6=9E=B6=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=98=E4=B8=BA=20cmake=20=E6=9E=84=E5=BB=BA?=
 MIME-Version: 1.0
@@ -1789,10 +1789,10 @@ index 0000000..0fa070b
 2.20.1


-From d2524f967848e6ba0d2c8a097183264d0d197d68 Mon Sep 17 00:00:00 2001
+From 1e1cb19995536d74626960ae863bf4c5cd9e3a4b Mon Sep 17 00:00:00 2001
 From: zinface <zinface@163.com>
 Date: Sun, 11 Dec 2022 22:37:26 +0800
-Subject: [PATCH 02/11] =?UTF-8?q?repo:=20=E5=A4=84=E7=90=86=20deb=20?=
+Subject: [PATCH 2/5] =?UTF-8?q?repo:=20=E5=A4=84=E7=90=86=20deb=20?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=20cmake=20=E5=8C=96=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA?=
@@ -1856,10 +1856,10 @@ index 2ab24e7..38ad2d7 100644
 2.20.1


-From 7cd97a939b63143921936b9db3978d14f18a4f33 Mon Sep 17 00:00:00 2001
+From 4f07b34bc268bc3c49ef1c51c524d50ccbbf6d07 Mon Sep 17 00:00:00 2001
 From: zinface <zinface@163.com>
 Date: Mon, 12 Dec 2022 00:50:01 +0800
-Subject: [PATCH 03/11] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=20Spark=20?=
+Subject: [PATCH 3/5] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=20Spark=20?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=20=E4=B8=8E=20CMake=20=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=A2=84=E8=A7=88=E6=96=87=E6=A1=A3?=
 MIME-Version: 1.0
@@ -2184,10 +2184,10 @@ index 0000000..a807009
 2.20.1


-From bb128568ab7d1463c0002ffff470ad5c93364c99 Mon Sep 17 00:00:00 2001
+From cb59139fcfd74b530a14f2a987aa38d28d403225 Mon Sep 17 00:00:00 2001
 From: zinface <zinface@163.com>
 Date: Thu, 15 Dec 2022 19:59:46 +0800
-Subject: [PATCH 04/11] =?UTF-8?q?repo:=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
+Subject: [PATCH 4/5] =?UTF-8?q?repo:=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=20Qt5=20Svg=20=E4=BE=9D=E8=B5=96=E7=9A=84=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E5=86=85=E5=AE=B9?=
 MIME-Version: 1.0
@@ -2236,10 +2236,10 @@ index b56399f..67e29b6 100644
 2.20.1


-From 877a52f4b753f55e087a6c58794d690fabb6ddbb Mon Sep 17 00:00:00 2001
+From 72e5ca47cef718cdbd4ea45134d574874fb43ba9 Mon Sep 17 00:00:00 2001
 From: zinface <zinface@163.com>
 Date: Mon, 19 Dec 2022 02:58:17 +0800
-Subject: [PATCH 05/11] =?UTF-8?q?repo:=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
+Subject: [PATCH 5/5] =?UTF-8?q?repo:=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E6=94=AF=E6=8C=81=20BaseWidgetOpacity=20=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E7=B1=BB=E7=9A=84=E6=9E=84=E5=BB=BA?=
 MIME-Version: 1.0
@@ -2282,348 +2282,3 @@ index 14530e1..b5e32d8 100644
 -- 
 2.20.1

-
-From f89bb6a145f2a77fa0e1b55b3ad17ade69c53a69 Mon Sep 17 00:00:00 2001
-From: zinface <zinface@163.com>
-Date: Mon, 30 Jan 2023 20:48:25 +0800
-Subject: [PATCH 06/11] =?UTF-8?q?spark:=20=E5=88=9B=E5=BB=BA=E6=96=B0?=
- =?UTF-8?q?=E7=9A=84=E6=A8=A1=E5=9D=97=E7=94=A8=E4=BA=8E=20debian/changelo?=
- =?UTF-8?q?g=20=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7=E9=87=8D=E5=86=99?=
- =?UTF-8?q?=E8=A7=84=E5=88=99?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-1. SparkDebianChangelogVersion.cmake
-    在此文件中提供 spark_debian_changelog_override_version 宏：
-    基于指定的 debian/changelog 文件并用于读取最新版本号并覆盖到项目版本
-
-@Since: v4.0.0
---
- CMakeLists.txt                          |  4 ++
- cmake/SparkDebianChangelogVersion.cmake | 58 +++++++++++++++++++++++++
- 2 files changed, 62 insertions(+)
- create mode 100644 cmake/SparkDebianChangelogVersion.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b5e32d8..73221bc 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,10 @@ include(cmake/SparkFindDtkConfig.cmake)         # 提供了 target_link_dtk 用
- include(cmake/SparkTranslatorConfig.cmake)      # 提供了 qt5 ts转qm 的操作，最终生成 SPARK_QM_TRANSLATIONS 变量用于构建可执行文件时参与编译
- include(cmake/SparkMacrosExtendConfig.cmake)    # 使用了 spark_ 宏基于已提供的宏参数自动展开构建可执行目标文件
- include(cmake/SparkInstallMacrosConfig.cmake)   # 提供了 spark_install 开头的 macro 宏用于安装 target、file、program、directory、changelog 等内容
-+include(cmake/SparkDebianChangelogVersion.cmake)# 提供了 spark_debian_ 开头的宏进行进行覆盖 PROJECT_VERSION
-+
-+# 在开始之前，使用项目中提供的 debian/changelog 进行重写本构建系统的 PROJECT_VERSION
-+spark_debian_changelog_override_version(debian/changelog) 
- 
- # 资源文件路径
- set(QRC_SOURCES "src/assets/assets.qrc")
-diff --git a/cmake/SparkDebianChangelogVersion.cmake b/cmake/SparkDebianChangelogVersion.cmake
-new file mode 100644
-index 0000000..9d8bca2
--- /dev/null
-+++ b/cmake/SparkDebianChangelogVersion.cmake
-@@ -0,0 +1,58 @@
-+# SparkDebianChangelogVersion
-+
-+# 尝试读取 debian/changelog 文件的第一行数据，并查找
-+# spark-store (4.2.2) stable; urgency=medium
-+# 将 (version) 信息应用用于 PROJECT_VERSION
-+
-+
-+macro(spark_debian_changelog_override_version _CHANGELOG_FILE_PATH)
-+    set(CHANGELOG_FILE_PATH ${_CHANGELOG_FILE_PATH})
-+    set(CHANGELOG_FILE_EXISTS FALSE)
-+
-+    # 首次判断，如果判断文件不存在，将尽可能的判断文件是存在的
-+    if(NOT EXISTS ${CHANGELOG_FILE_PATH})
-+        
-+        # 在 CMake v3.19 起，可以使用 file(REAL_PATH <path> <out-var>) 进行获取 path 的绝对路径
-+        if(CMAKE_VERSION GREATER_EQUAL 3.19)
-+            file(REAL_PATH ${CHANGELOG_FILE_PATH} CHANGELOG_FILE_ABSOLUTE_PATH)
-+            if(EXISTS ${CHANGELOG_FILE_ABSOLUTE_PATH})
-+                set(CHANGELOG_FILE_EXISTS TRUE)
-+                set(CHANGELOG_FILE_PATH ${CHANGELOG_FILE_ABSOLUTE_PATH})
-+            endif(EXISTS ${CHANGELOG_FILE_ABSOLUTE_PATH})
-+        endif(CMAKE_VERSION GREATER_EQUAL 3.19)
-+
-+        # 第二次判断与处理 使用 file(SIZE) 方式
-+        if(NOT CHANGELOG_FILE_EXISTS)
-+            file(SIZE ${CHANGELOG_FILE_PATH} CHANGELOG_FILE_SIZE)
-+            if(CHANGELOG_FILE_SIZE GREATER 0)
-+                set(CHANGELOG_FILE_EXISTS TRUE)
-+            endif(CHANGELOG_FILE_SIZE GREATER 0)
-+        endif(NOT CHANGELOG_FILE_EXISTS)
-+
-+        # 第三次判断与处理 使用路径拼接方式
-+        if(NOT CHANGELOG_FILE_EXISTS)
-+            if(EXISTS ${CMAKE_SOURCE_DIR}/${CHANGELOG_FILE_PATH})
-+                set(CHANGELOG_FILE_PATH ${CMAKE_SOURCE_DIR}/${CHANGELOG_FILE_PATH})
-+                set(CHANGELOG_FILE_EXISTS TRUE)
-+            endif(EXISTS ${CMAKE_SOURCE_DIR}/${CHANGELOG_FILE_PATH})
-+        endif(NOT CHANGELOG_FILE_EXISTS)
-+    endif(NOT EXISTS ${CHANGELOG_FILE_PATH})
-+
-+    message("> V = ${CHANGELOG_FILE_PATH}")
-+    if(CHANGELOG_FILE_EXISTS)
-+        file(READ ${CHANGELOG_FILE_PATH} CHANGELOG_CONTENT LIMIT 20)
-+
-+        string(FIND ${CHANGELOG_CONTENT} "(" V_PRE) # +1 to V_BEGIN
-+        string(FIND ${CHANGELOG_CONTENT} ")" V_END)
-+
-+        math(EXPR V_BEGIN  "${V_PRE}+1")
-+        math(EXPR V_LENGTH "${V_END}-${V_BEGIN}")
-+
-+        string(SUBSTRING ${CHANGELOG_CONTENT} ${V_BEGIN} ${V_LENGTH} V)
-+
-+        message("> V = ${CHANGELOG_CONTENT}")
-+        message("> V = [${V}]")
-+
-+        set(PROJECT_VERSION ${V})
-+    endif(CHANGELOG_FILE_EXISTS)
-+endmacro(spark_debian_changelog_override_version _CHANGELOG_FILE_PATH)
-- 
-2.20.1
-
-
-From b26bac7572ab7477ab4b94174fbdece759be8bc7 Mon Sep 17 00:00:00 2001
-From: zinface <zinface@163.com>
-Date: Mon, 30 Jan 2023 21:23:15 +0800
-Subject: [PATCH 07/11] =?UTF-8?q?spark:=20=E5=AF=B9=20SparkDebianChangelog?=
- =?UTF-8?q?Version.cmake=20=E6=A8=A1=E5=9D=97=E7=9A=84=E6=89=A9=E5=B1=95?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-1. 增加 SPARK_OVERRIDE_VERSION 的文件输出
-    以解决 Makefile 中无法明确多个 deb 包时无法确定最新版本的情况
---
- Makefile                                | 15 +++++++++++++--
- cmake/SparkDebianChangelogVersion.cmake |  1 +
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c673c76..81ca078 100644
--- a/Makefile
-+++ b/Makefile
-@@ -8,6 +8,17 @@ SUFFIX=_$(OSID)$(OSRELEASE)
- endif
- 
- PROJECT_NAME=spark-store
-+PROJECT_VERSION=*
-+
-+ifneq ($(wildcard build/SPARK_OVERRIDE_VERSION),)
-+SPARK_OVERRIDE_VERSION=`cat build/SPARK_OVERRIDE_VERSION`
-+.PHONY: override-version
-+override-version:
-+	@echo $(SPARK_OVERRIDE_VERSION)
-+	@echo "wildcard - good: $(wildcard build/SPARK_OVERRIDE_VERSION)"
-+	@echo "wildcard - bad.: $(wildcard build/SPARK_OVERRIDE_VERSIONS)"
-+PROJECT_VERSION=$(SPARK_OVERRIDE_VERSION)-
-+endif
- 
- all:
- 	mkdir -p build
-@@ -44,7 +55,7 @@ debian-build-scripts:
- package: release debian-build-scripts
- 	cd build && make package
- 	tree build/_CPack_Packages/Linux/DEB/$(PROJECT_NAME)-*
-	dpkg-deb --contents build/$(PROJECT_NAME)_*$(CALENDAR)*$(SUFFIX).deb
-+	dpkg-deb --contents build/$(PROJECT_NAME)_$(PROJECT_VERSION)$(CALENDAR)*$(SUFFIX).deb
- 	# cd build/_CPack_Packages/Linux/DEB/$(PROJECT_NAME)_*$(CALENDAR)*$(SUFFIX).deb && find .
- 
- builddeps:
-@@ -54,7 +65,7 @@ cpus:
- 	@echo "CPU数量: $(CPUS)"
- 
- copytosource:package
-	cp build/$(PROJECT_NAME)_*$(CALENDAR)*.deb .
-+	cp build/$(PROJECT_NAME)_$(PROJECT_VERSION)$(CALENDAR)*.deb .
- 
- # 进入 qdebug 模式，在 deepin 中默认被禁用，可 env | grep QT 查看，并在 /etc/X11/Xsession.d/00deepin-dde-env 配置中已定义
- # 1. 禁止 qt 的 debug 打印: qt.*.debug=false
-diff --git a/cmake/SparkDebianChangelogVersion.cmake b/cmake/SparkDebianChangelogVersion.cmake
-index 9d8bca2..65e1c16 100644
--- a/cmake/SparkDebianChangelogVersion.cmake
-+++ b/cmake/SparkDebianChangelogVersion.cmake
-@@ -54,5 +54,6 @@ macro(spark_debian_changelog_override_version _CHANGELOG_FILE_PATH)
-         message("> V = [${V}]")
- 
-         set(PROJECT_VERSION ${V})
-+        file(WRITE ${CMAKE_BINARY_DIR}/SPARK_OVERRIDE_VERSION ${V})
-     endif(CHANGELOG_FILE_EXISTS)
- endmacro(spark_debian_changelog_override_version _CHANGELOG_FILE_PATH)
-- 
-2.20.1
-
-
-From 26f00f79a2b8613477059beb6c2f492bc24a7bb5 Mon Sep 17 00:00:00 2001
-From: zinface <zinface@163.com>
-Date: Mon, 30 Jan 2023 23:17:24 +0800
-Subject: [PATCH 08/11] =?UTF-8?q?repo:=20=E5=A4=84=E7=90=86=20v4.2.2=20?=
- =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=97=B6=E6=9C=9F=E6=96=B0=E5=A2=9E=E7=9A=84?=
- =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=96=87=E4=BB=B6?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-pkg/usr/share/ssinstall/transhell
-  -> /usr/share/ssinstall
---
- CMakeLists.txt                       | 5 +++++
- cmake/SparkInstallMacrosConfig.cmake | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 73221bc..22a788d 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -86,6 +86,11 @@ spark_install_file(/usr/share/icons/hicolor/scalable/apps
- spark_install_program(/tmp/spark-store-install
-     pkg/tmp/spark-store-install/feedback.sh)
- 
-+# 安装什么翻译？ Since: v4.2.2
-+spark_install_directory(/usr/share/ssinstall
-+    pkg/usr/share/ssinstall/transhell
-+)
-+
- # 安装 qm 文件?
- spark_install_file(/usr/share/spark-store/translations
-     ${SPARK_QM_TRANSLATIONS})
-diff --git a/cmake/SparkInstallMacrosConfig.cmake b/cmake/SparkInstallMacrosConfig.cmake
-index bbb958a..c7ea53b 100644
--- a/cmake/SparkInstallMacrosConfig.cmake
-+++ b/cmake/SparkInstallMacrosConfig.cmake
-@@ -79,7 +79,7 @@ macro(spark_install_directory INSTALL_DIRECTORY_DIR INSTALL_DIRECOTRY)
-         # message(FATAL_ERROR " directory: ${INSTALL_DIRECTORY_FIND_INDEX_SUBSTRING_FILE_GLOB_LIST_LENGTH}")
- 
-     else()
-        message(FATAL_ERROR "install： ${INSTALL_DIRECTORY_DIR}")
-+        # message(FATAL_ERROR "install： ${INSTALL_DIRECTORY_DIR}")
- 
-         install(DIRECTORY
-             ${INSTALL_DIRECOTRY} ${ARGN}
-- 
-2.20.1
-
-
-From e4401b16037cb3b1b10c59f4c7a0fa3c2cd563b3 Mon Sep 17 00:00:00 2001
-From: zinface <zinface@163.com>
-Date: Mon, 30 Jan 2023 23:18:44 +0800
-Subject: [PATCH 09/11] =?UTF-8?q?spark:=20=E5=AF=B9=20SparkTranslatorConfi?=
- =?UTF-8?q?g.cmake=20=E6=A8=A1=E5=9D=97=E7=9A=84=E6=89=A9=E5=B1=95?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-1. 增加 SPARK_QM_TRANSLATIONS 的文件输出
-     无任何其它变动
---
- cmake/SparkTranslatorConfig.cmake | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/cmake/SparkTranslatorConfig.cmake b/cmake/SparkTranslatorConfig.cmake
-index 272dd9d..689e70d 100644
--- a/cmake/SparkTranslatorConfig.cmake
-+++ b/cmake/SparkTranslatorConfig.cmake
-@@ -12,6 +12,11 @@ endforeach(item IN LISTS SPARK_TRANSLATIONS)
- qt5_add_translation(SPARK_QM_TRANSLATIONS 
-     ${SPARK_TRANSLATIONS})
- 
-+file(WRITE ${CMAKE_BINARY_DIR}/SPARK_QM_TRANSLATIONS "")
-+foreach(item IN LISTS SPARK_QM_TRANSLATIONS)
-+    file(APPEND ${CMAKE_BINARY_DIR}/SPARK_QM_TRANSLATIONS "${item}\n")
-+endforeach(item IN LISTS SPARK_QM_TRANSLATIONS)
-+
- message("translator(ts -> qm):")
- foreach(item IN LISTS SPARK_QM_TRANSLATIONS)
-     message("-> ${item}")
-- 
-2.20.1
-
-
-From 2d8046099776e3909359ce49818ae28378af930c Mon Sep 17 00:00:00 2001
-From: zinface <zinface@163.com>
-Date: Mon, 30 Jan 2023 23:20:12 +0800
-Subject: [PATCH 10/11] =?UTF-8?q?make:=20=E5=A4=84=E7=90=86=E9=BB=98?=
- =?UTF-8?q?=E8=AE=A4=20make=20=E7=9B=AE=E6=A0=87=E4=B8=BA=20override-versi?=
- =?UTF-8?q?on=20=E7=9A=84=E9=97=AE=E9=A2=98?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
---
- Makefile | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 81ca078..076502c 100644
--- a/Makefile
-+++ b/Makefile
-@@ -12,11 +12,6 @@ PROJECT_VERSION=*
- 
- ifneq ($(wildcard build/SPARK_OVERRIDE_VERSION),)
- SPARK_OVERRIDE_VERSION=`cat build/SPARK_OVERRIDE_VERSION`
-.PHONY: override-version
-override-version:
-	@echo $(SPARK_OVERRIDE_VERSION)
-	@echo "wildcard - good: $(wildcard build/SPARK_OVERRIDE_VERSION)"
-	@echo "wildcard - bad.: $(wildcard build/SPARK_OVERRIDE_VERSIONS)"
- PROJECT_VERSION=$(SPARK_OVERRIDE_VERSION)-
- endif
- 
-@@ -82,4 +77,13 @@ copytosource:package
- enter-qdebug-mode:
- 	# 进入新的 bash 环境
- 	@# export QT_LOGGING_RULES=".debug=true; qt.*.debug=false; dtk.*.debug=false; dde.*.debug=false; qtc*=false; " && bash
-	export QT_LOGGING_RULES=".debug=true" && bash
-\ No newline at end of file
-+	export QT_LOGGING_RULES=".debug=true" && bash
-+
-+
-+ifneq ($(wildcard build/SPARK_OVERRIDE_VERSION),)
-+.PHONY: override-version
-+override-version:
-+	@echo $(SPARK_OVERRIDE_VERSION)
-+	@echo "wildcard - good: $(wildcard build/SPARK_OVERRIDE_VERSION)"
-+	@echo "wildcard - bad.: $(wildcard build/SPARK_OVERRIDE_VERSIONS)"
-+endif
-\ No newline at end of file
-- 
-2.20.1
-
-
-From 043e6fb78e2bcb1a6fecefe2ba9aceb9df84e96e Mon Sep 17 00:00:00 2001
-From: zinface <zinface@163.com>
-Date: Sun, 5 Feb 2023 16:09:40 +0800
-Subject: [PATCH 11/11] =?UTF-8?q?spark:=20=E5=A4=84=E7=90=86=E7=89=88?=
- =?UTF-8?q?=E6=9C=AC=E5=8F=B7=204.2.3~test1=20=E6=97=B6=E9=BB=98=E8=AE=A4?=
- =?UTF-8?q?=E7=9A=84=E6=88=AA=E5=8F=96=E5=AD=97=E7=AC=A6=E6=95=B0=E8=BF=87?=
- =?UTF-8?q?=E7=9F=AD=E9=97=AE=E9=A2=98?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
---
- cmake/SparkDebianChangelogVersion.cmake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/SparkDebianChangelogVersion.cmake b/cmake/SparkDebianChangelogVersion.cmake
-index 65e1c16..3ed5fa2 100644
--- a/cmake/SparkDebianChangelogVersion.cmake
-+++ b/cmake/SparkDebianChangelogVersion.cmake
-@@ -40,7 +40,8 @@ macro(spark_debian_changelog_override_version _CHANGELOG_FILE_PATH)
- 
-     message("> V = ${CHANGELOG_FILE_PATH}")
-     if(CHANGELOG_FILE_EXISTS)
-        file(READ ${CHANGELOG_FILE_PATH} CHANGELOG_CONTENT LIMIT 20)
-+        file(READ ${CHANGELOG_FILE_PATH} CHANGELOG_CONTENT LIMIT 30)
-+        # fix: spark-store (4.2.3~test1) 已经超过 20 字符位，所以使用 30 进行保守计算
- 
-         string(FIND ${CHANGELOG_CONTENT} "(" V_PRE) # +1 to V_BEGIN
-         string(FIND ${CHANGELOG_CONTENT} ")" V_END)
-- 
-2.20.1
-
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -1,5 +1,4 @@
 #include "application.h"
-#include "mainwindow-dtk.h"

 #include <DPlatformWindowHandle>
 #include <DLog>
@@ -20,8 +19,6 @@ Application::Application(int &argc, char **argv)
    }
    setAttribute(Qt::AA_UseHighDpiPixmaps);

-    setQuitOnLastWindowClosed(false); // 启用托盘图标时，关闭窗口程序仍然运行
-
    loadTranslator(); // 载入翻译

    setOrganizationName("spark-union");
@@ -47,7 +44,7 @@ Application::Application(int &argc, char **argv)

 void Application::handleAboutAction()
 {
-    if (aboutDialog() && aboutDialog()->parent() == m_mainWindow) {
+    if (aboutDialog()) {
        DApplication::handleAboutAction();
        return;
    }
@@ -82,30 +79,10 @@ void Application::setVersionAndBuildDateTime(const QString &version, const QStri
    setApplicationVersion(DApplication::buildVersion(config.value("build/version").toString() + "-" + "Flamescion" + "-" + config.value("build/time").toString()));
 }

-void Application::setMainWindow(MainWindow *window)
-{
-    m_mainWindow = window;
-    if (aboutDialog() == nullptr || aboutDialog()->parent() != m_mainWindow)
-    {
-        initAboutDialog();
-    }
-}
-
 void Application::initAboutDialog()
 {
-    if (m_mainWindow == nullptr)
-    {
-        return;
-    }
-
-    if (aboutDialog())
-    {
-        aboutDialog()->deleteLater();
-        setAboutDialog(nullptr);
-    }
-
    // 自定义 DAboutDialog
-    DAboutDialog *dialog = new DAboutDialog(m_mainWindow);
+    DAboutDialog *dialog = new DAboutDialog(activeWindow());
    dialog->setProductName(productName());
    dialog->setProductIcon(productIcon());
    dialog->setVersion(translate("DAboutDialog", "Version: %1").arg(applicationVersion()));
--- a/src/application.h
+++ b/src/application.h
@@ -5,7 +5,6 @@

 DWIDGET_USE_NAMESPACE

-class MainWindow;
 class Application : public DApplication
 {
    Q_OBJECT
@@ -17,7 +16,6 @@ public:
    static void checkAppConfigLocation();

    void setVersionAndBuildDateTime(const QString &version, const QString &buildDateTime);
-    void setMainWindow(MainWindow *window);

 private:
    void initAboutDialog();
@@ -25,8 +23,6 @@ private:
 private:
    QString m_version;
    QString m_buildDateTime;
-
-    MainWindow *m_mainWindow = nullptr;
 };

 #endif // APPLICATION_H
--- a/src/backend/downloadworker.cpp
+++ b/src/backend/downloadworker.cpp
@@ -145,19 +145,17 @@ void DownloadController::startDownload(const QString &url)
            command.append(aria2NoSeeds.toUtf8());
        }
        qDebug() << command;
+        auto cmd = new QProcess(this);
+        cmd->setProcessChannelMode(QProcess::MergedChannels);
+        cmd->setProgram("aria2c");
+        cmd->setArguments(command);
+        cmd->start();
+        cmd->waitForStarted(); //等待启动完成

-        bool downloadSuccess = true;
-        QProcess cmd;
-        cmd.setProcessChannelMode(QProcess::MergedChannels);
-        cmd.setProgram("aria2c");
-        cmd.setArguments(command);
-        cmd.start();
-        cmd.waitForStarted(-1); //等待启动完成
-
-        connect(&cmd, &QProcess::readyReadStandardOutput, [&]()
+        QObject::connect(cmd, &QProcess::readyReadStandardOutput, [&]()
        {
            //通过读取输出计算下载速度
-            QString message = cmd.readAllStandardOutput().data();
+            QString message = cmd->readAllStandardOutput().data();
            // qDebug() << message;
            message = message.replace(" ", "");
            QStringList list;
@@ -197,21 +195,17 @@ void DownloadController::startDownload(const QString &url)
                emit downloadProcess(speedInfo, downloadSizeRecord, fileSize);
            }
        });
-        connect(&cmd, &QProcess::readyReadStandardError, [&]()
+        QObject::connect(cmd, &QProcess::readyReadStandardError, [&]()
        {
-            emit errorOccur(cmd.readAllStandardError().data());
-            downloadSuccess = false;
-            cmd.close();
+            emit errorOccur(cmd->readAllStandardError().data());
+            return;
        });

-        pidNumber = cmd.processId();
-
-        cmd.waitForFinished(-1);
-        cmd.close();
-
-        if(!downloadSuccess)
+        auto pidNumber = cmd->processId();
+        this->pidNumber = pidNumber;
+        while (cmd->waitForFinished(-1))
        {
-            return;
+            continue;
        }

        // 统计下载量
@@ -224,7 +218,7 @@ void DownloadController::startDownload(const QString &url)
        mailProcess.start(SenderdPath.toUtf8(), QStringList() << metaUrl << "HD70642");
        mailProcess.waitForStarted();
        mailProcess.waitForFinished(3000);
-        mailProcess.close();
+        mailProcess.deleteLater();

        emit downloadFinished(); });
 }
--- a/src/backend/downloadworker.h
+++ b/src/backend/downloadworker.h
@@ -21,7 +21,7 @@ public:

 private:
    int threadNum;
-    qint64 pidNumber = -1;
+    int pidNumber = -1;
    QString filename;
    qint64 fileSize;
    QVector<QPair<qint64, qint64>> ranges;
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,38 +1,94 @@
 #include "application.h"
 #include "mainwindow-dtk.h"
-#include "utils/utils.h"

 #include <DSysInfo>
 #include <DApplicationSettings>
 #include <DWidgetUtil>

-#include <QDate>
-#include <QProcessEnvironment>
-#include <QSettings>
-#include <QFile>
 #include <QStandardPaths>

 DCORE_USE_NAMESPACE
 DWIDGET_USE_NAMESPACE

+#define UOSCheckFile "/var/lib/deepin/developer-mode/enabled"
+
 int main(int argc, char *argv[])
 {
    // Get build time
-    static const QString version = "4.2.3";
+    static const QString version = "4.2.1";
    static const QDate buildDate = QLocale(QLocale::English).toDate(QString(__DATE__).replace("  ", " 0"), "MMM dd yyyy");
    static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");
    static const QString buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss");

+    // 设置桌面环境环境变量
+    bool isDeepinOS = true;
+    if (!QString(qgetenv("XDG_CURRENT_DESKTOP")).toLower().startsWith("deepin"))
+    {
+        qputenv("XDG_CURRENT_DESKTOP", "Deepin");
+        isDeepinOS = false;
+    }
+
+    bool isWayland = false;
+    auto e = QProcessEnvironment::systemEnvironment();
+    QString XDG_SESSION_TYPE = e.value(QStringLiteral("XDG_SESSION_TYPE"));
+    QString WAYLAND_DISPLAY = e.value(QStringLiteral("WAYLAND_DISPLAY"));
+    if (XDG_SESSION_TYPE == QLatin1String("wayland") || WAYLAND_DISPLAY.contains(QLatin1String("wayland"), Qt::CaseInsensitive))
+    {
+        isWayland = true;
+    }
+
    // NOTE: 提前设置组织名称和应用名称，避免配置文件位置错误
    DApplication::setOrganizationName("spark-union");
    DApplication::setApplicationName("spark-store");
    Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在

-    // 初始化 config.ini 配置文件
-    Utils::initConfig();
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    config.setValue("build/isWayland", isWayland);
+    config.setValue("build/isDeepinOS", isDeepinOS);
+    // Check config file, if there is no wayland config, then set it to default, which means use wayland if possible.
+    if (!config.contains("build/useWayland"))
+    {
+        config.setValue("build/useWayland", true);
+    }
+    config.sync(); // 写入更改至 config.ini，并同步最新内容
+
+    bool useWayland = config.value("build/useWayland").toBool();
+    qDebug() << "System Wayland enabled:" << isWayland << ". Spark Wayland enabled:" << useWayland;

    // Set display backend
-    Utils::setQPAPlatform();
+    if (isWayland && useWayland && !(Dtk::Core::DSysInfo::isDDE() || isDeepinOS))
+    {
+        qputenv("QT_QPA_PLATFORM", "wayland");
+    }
+    else if (isWayland && useWayland && (Dtk::Core::DSysInfo::isDDE() && isDeepinOS))
+    {
+        qputenv("QT_QPA_PLATFORM", "dwayland");
+    }
+    else
+    {
+        qputenv("QT_QPA_PLATFORM", "dxcb");
+    }
+
+    // Check UOS developer mode.
+    QFile UOSDevelopFile(UOSCheckFile);
+    if (isDeepinOS && UOSDevelopFile.exists() && UOSDevelopFile.open(QFile::ReadOnly | QFile::Text))
+    {
+        config.setValue("UOS/isUOS", true);
+        QString lineData = UOSDevelopFile.readLine();
+        bool devmode = lineData.trimmed().toInt();
+        qDebug() << "UOS Developer Mode Status:" << devmode;
+        config.setValue("UOS/EnableDeveloperMode", devmode);
+    }
+    else
+    {
+        if (config.contains("UOS/isUOS"))
+        {
+            config.remove("UOS/isUOS");
+            config.remove("UOS/EnableDeveloperMode");
+        }
+    }
+    UOSDevelopFile.close();
+    config.sync(); // 写入更改至 config.ini，并同步最新内容

    // 龙芯机器配置,使得 DApplication 能正确加载 QTWEBENGINE
    qputenv("DTK_FORCE_RASTER_WIDGETS", "FALSE");
@@ -68,10 +124,10 @@ int main(int argc, char *argv[])
        return -1;
    }

+    DGuiApplicationHelper::instance()->setPaletteType(DGuiApplicationHelper::LightType); // 固定主题为浅色主题
    DApplicationSettings settings; // 定义 DApplicationSettings，自动保存主题设置

    MainWindow w;
-    a.setMainWindow(&w); // 设置应用程序主窗口，用于初始化关于对话框
    // 让打开时界面显示在正中
    Dtk::Widget::moveToCenter(&w);

@@ -80,7 +136,7 @@ int main(int argc, char *argv[])
        QString arg1 = argv[1];
        if (arg1.trimmed().startsWith("spk://"))
        {
-            w.openUrl(arg1);
+            w.openUrl(QUrl(argv[1]));
        }
    }
    w.show();
--- a/src/mainwindow-dtk.cpp
+++ b/src/mainwindow-dtk.cpp
@@ -1,17 +1,10 @@
 #include "mainwindow-dtk.h"
 #include "ui_mainwindow-dtk.h"
-#include "utils/widgetanimation.h"
-#include "widgets/common/progressbutton.h"
-#include "widgets/downloadlistwidget.h"
-#include "dbus/dbussparkstoreservice.h"
-#include "application.h"

-#include <DLabel>
 #include <DWidgetUtil>
 #include <DGuiApplicationHelper>
-
-#include <QAbstractButton>
-#include <QtConcurrent>
+#include <DApplicationSettings>
+#include <QSizePolicy>

 #define AppPageApplist 0
 #define AppPageSearchlist 1
@@ -23,157 +16,43 @@
 #define UploadServerUrl "https://upload.deepinos.org/"

 MainWindow::MainWindow(QWidget *parent)
-    : BaseWidgetOpacity(parent)
-    , ui(new Ui::MainWindow)
-    , downloadlistwidget(new DownloadListWidget)
-    , trayIcon(new QSystemTrayIcon(QIcon::fromTheme("spark-store"), this))
+    : BaseWidgetOpacity(parent), ui(new Ui::MainWindow)
 {
    ui->setupUi(this);
-
-    initTmpDir();
-
-    initUI();
-    initConnections();
-
-    ui->appintopage->setDownloadWidget(downloadlistwidget);
-
-    emit DGuiApplicationHelper::instance()->themeTypeChanged(DGuiApplicationHelper::instance()->themeType());
-}
-
-MainWindow::~MainWindow()
-{
-    delete ui;
-
-    downloadlistwidget->deleteLater();
-}
-
-void MainWindow::initDbus()
-{
-    DBusSparkStoreService *dbusInter = new DBusSparkStoreService(this);
-
-    QDBusConnection::sessionBus().registerService("com.gitee.spark.store");
-    QDBusConnection::sessionBus().registerObject("/com/gitee/spark/store", "com.gitee.spark.store", this);
-    connect(dbusInter, &DBusSparkStoreService::sigOpenUrl, this, &MainWindow::onGetUrl);
-}
-
-void MainWindow::onGetUrl(const QString &url)
-{
-    if (url.trimmed().startsWith("spk://"))
-    {
-        openUrl(url);
-    }
-
-    showWindowAnimation = false;
-    closeWindowAnimation = false;
-
-    setWindowState(windowState() & Qt::WindowActive);
-    activateWindow();
-    show();
-}
-
-void MainWindow::onNewProcessInstance(qint64 pid, const QStringList &arguments)
-{
-    Q_UNUSED(pid)
-
-    onGetUrl(arguments.value(1, ""));
-}
-
-void MainWindow::openUrl(const QString &url)
-{
-    if (url.startsWith("spk://search/"))
-    {
-        QString keyword = url.mid(13);
-        if (keyword == "%")
-        {
-            qWarning() << "keyword '%' is not valid, which will cause QtWebEngine crash.";
-            return;
-        }
-        ui->applistpage_1->getSearchList(keyword);
-        switchPage(AppPageSearchlist);
-    }
-    else if (url.startsWith("spk://"))
-    {
-        ui->appintopage->openUrl(QUrl::fromUserInput(url));
-        switchPage(AppPageAppdetail);
-    }
-    else
-    {
-        QDesktopServices::openUrl(QUrl::fromUserInput(url));
-    }
-}
-
-void MainWindow::initUI()
-{
    setWindowTitle(QObject::tr("Spark Store"));
-    setMaskAlpha(250);
+    initConfig();

-    initTitleBar();
-    initLeftMenu();
-
-    ui->stackedWidget->setCurrentIndex(0);
-    updateUi(0);
-
-    initTrayIcon();
-}
-
-void MainWindow::initTitleBar()
-{
-    ui->titlebar->setIcon(QIcon::fromTheme("spark-store"));
-    ui->titlebar->setBackgroundTransparent(true);
-    // ui->titlebar->setSwitchThemeMenuVisible(false); // 去除 dtk 标题栏主题切换菜单
-
-    // 初始化标题栏控件
-    DLabel *title = new DLabel(ui->titlebar);
-    title->setText(tr("Spark Store"));
-
-    backButton = new DPushButton(ui->titlebar);
+    // FIXME: wayland 不支持直接设置窗口透明度，需要调用 wayland 相关库（考虑抄控制中心“窗口移动时启用透明特效”代码？）
+    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    bool isWayland = config.value("build/isWayland").toBool();
+    if (!isWayland)
+    {
+        WidgetAnimation::widgetOpacity(this, true);
+    }

    searchEdit = new DSearchEdit(ui->titlebar);
-    searchEdit->setPlaceholderText(tr("Search or enter spk://"));
-
+    downloadlistwidget = new DownloadListWidget;
    downloadButton = new ProgressButton(ui->titlebar);
+    backButtom = new QPushButton(ui->titlebar);
+    ui->appintopage->setDownloadWidget(downloadlistwidget);
+    ui->stackedWidget->setCurrentIndex(0);
+    ui->titlebar->setBackgroundTransparent(true);
+    // ui->titlebar->setSwitchThemeMenuVisible(false); // 去除 dtk 标题栏主题切换菜单
+    setMaskAlpha(250);

-    QWidget *w_titlebar = new QWidget(ui->titlebar);
-    QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar);
-    ly_titlebar->addWidget(title);
-    ly_titlebar->addWidget(backButton);
-    // Check wayland configs
-    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    if (!config.value("runtime/isDDE").toBool() && config.value("runtime/useWayland").toBool())
-    {
-        // Wayland 搜索栏居中
-        ly_titlebar->addStretch(WaylandSearchCenter);
-    }
-    else
-    {
-        // dwayland dxcb 搜索栏顶部右侧居中
-        ly_titlebar->addStretch(OtherSearchCenter);
-    }
-    ly_titlebar->addWidget(searchEdit);
-    ly_titlebar->addWidget(downloadButton);
-    ly_titlebar->addStretch(RightSearchSpace);
-    ui->titlebar->setCustomWidget(w_titlebar);
+    updateUi(0);

-    initTitleBarMenu();
-
-    backButton->hide();
-    downloadlistwidget->hide();
-}
-
-void MainWindow::initTitleBarMenu()
-{
    QAction *actionSubmission = new QAction(tr("Submit App"), this);
    QAction *actionSubmissionWithClient = new QAction(tr("Submit App with client(Recommanded)"), this);
    QAction *setting = new QAction(tr("Settings"));
    QAction *upgrade = new QAction(tr("APP Upgrade and Install Settings"));
-    QMenu *menu = new QMenu(ui->titlebar);
+    QMenu *menu = new QMenu;
    menu->addAction(setting);
    menu->addAction(upgrade);
    menu->addAction(actionSubmission);
    menu->addAction(actionSubmissionWithClient);

    ui->titlebar->setMenu(menu);
-
    connect(actionSubmission, &QAction::triggered, this, [=]
            { QDesktopServices::openUrl(QUrl(UploadServerUrl)); });
    connect(setting, &QAction::triggered, this, [=]
@@ -197,63 +76,14 @@ void MainWindow::initTitleBarMenu()
                    qDebug() << "投稿器不存在，跳转页面";
                    openUrl(submitterSpk);
                } });
-}

-void MainWindow::initLeftMenu()
-{
-    // 侧边栏按钮
-    foreach (QAbstractButton *button, ui->buttonGroup->buttons())
-    {
-        button->setStyleSheet("QPushButton{qproperty-icon: url(data/images/userMangaer/teacher.png);}");
-        connect(button, &QPushButton::toggled, [=](bool checked)
-                {
-            if (checked == true) {
-                searchEdit->clearEdit();
-                updateUi(ui->buttonGroup->buttons().indexOf(button));
-            } });
-    }
-}
-
-void MainWindow::initTrayIcon()
-{
-    trayIcon->setToolTip(tr("Spark Store"));
-
-    QMenu *menu = new QMenu(this);
-    QAction *showAction = new QAction(QObject::tr("Show MainWindow"), menu);
-    QAction *aboutAction = new QAction(qApp->translate("TitleBarMenu", "About"), menu);
-    QAction *exitAction = new QAction(qApp->translate("TitleBarMenu", "Exit"), menu);
-    menu->addAction(showAction);
-    menu->addAction(aboutAction);
-    menu->addAction(exitAction);
-    trayIcon->setContextMenu(menu);
-
-    connect(showAction, &QAction::triggered, this, [=]()
-            {
-        showWindowAnimation = false;
-        closeWindowAnimation = false;
-
-        setWindowState(windowState() & Qt::WindowActive);
-        activateWindow();
-        show(); });
-    connect(aboutAction, &QAction::triggered, this, [=]()
-            {
-        qobject_cast<Application *>(qApp)->handleAboutAction(); });
-    connect(exitAction, &QAction::triggered, this, [=]()
-            {
-        qobject_cast<Application *>(qApp)->quit(); });
-
-    trayIcon->show();
-}
-
-void MainWindow::initConnections()
-{
    // 主题切换
    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [=](DGuiApplicationHelper::ColorType themeType)
            {
        if (themeType == DGuiApplicationHelper::DarkType) {
            //深色模式
            setMaskColor(QColor("#2a2b2b"));
-            backButton->setIcon(QIcon(":/icon/dark/back.svg"));
+            backButtom->setIcon(QIcon(":/icon/dark/back.svg"));
            downloadButton->setIcon(":/icon/dark/download.svg");
            downloadButton->setBackgroundColor(QColor("#444444"));
            downloadButton->setColor(QColor("#66CCFF"));
@@ -273,7 +103,7 @@ void MainWindow::initConnections()
        } else {
            //亮色模式
            setMaskColor(QColor("#f3f7f8"));
-            backButton->setIcon(QIcon(":/icon/light/back.svg"));
+            backButtom->setIcon(QIcon(":/icon/light/back.svg"));
            downloadButton->setBackgroundColor(QColor("#e3e4e4"));
            downloadButton->setColor(QColor("#66CCFF"));
            downloadButton->setIcon(":/icon/light/download.svg");
@@ -297,6 +127,7 @@ void MainWindow::initConnections()
        ui->appintopage->setTheme(themeType == DGuiApplicationHelper::DarkType);
        ui->settingspage->setTheme(themeType == DGuiApplicationHelper::DarkType); });

+    // 初始化标题栏控件
    connect(downloadButton, &ProgressButton::clicked, [=]()
            {
        QPoint pos;
@@ -311,15 +142,57 @@ void MainWindow::initConnections()
                WidgetAnimation::widgetShake(downloadButton, 6); // 第一个参数是抖动的控件，第二个参数是抖动范围（像素）
            });

-    connect(backButton, &QPushButton::clicked, [=]()
+    connect(backButtom, &QPushButton::clicked, [=]()
            {
        ui->stackedWidget->setCurrentIndex(pageHistory.at(pageHistory.count() - 2));
        pageHistory.removeLast();
        if (pageHistory.count() > 1) {
-            backButton->show();
+            backButtom->show();
        } else {
-            backButton->hide();
+            backButtom->hide();
        } });
+    downloadlistwidget->hide();
+    backButtom->hide();
+    ui->titlebar->setIcon(QIcon::fromTheme(":/icon/logo.svg"));
+
+    QWidget *w_titlebar = new QWidget(ui->titlebar);
+    QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar);
+    QLabel *title = new QLabel(ui->titlebar);
+    title->setText(tr("Spark Store"));
+    searchEdit->setPlaceholderText(tr("Search or enter spk://"));
+    ly_titlebar->addWidget(title);
+    ly_titlebar->addWidget(backButtom);
+
+    // Check wayland configs
+    // QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
+    if (!config.value("build/isDeepinOS").toBool() && config.value("build/useWayland").toBool())
+    {
+        // Wayland 搜索栏居中
+        ly_titlebar->addStretch(WaylandSearchCenter);
+    }
+    else
+    {
+        // dwayland dxcb 搜索栏顶部右侧居中
+        ly_titlebar->addStretch(OtherSearchCenter);
+    }
+
+    ly_titlebar->addWidget(searchEdit);
+    ly_titlebar->addWidget(downloadButton);
+    ly_titlebar->addStretch(RightSearchSpace);
+    ui->titlebar->setCustomWidget(w_titlebar);
+    // 侧边栏按钮
+    int i = 0;
+    while (i < ui->buttonGroup->buttons().size())
+    {
+        ui->buttonGroup->buttons()[i]->setStyleSheet("QPushButton{qproperty-icon: url(data/images/userMangaer/teacher.png);}");
+        connect(ui->buttonGroup->buttons()[i], &QPushButton::toggled, [=](bool checked)
+                {
+            if (checked == true) {
+                searchEdit->clearEdit();
+                updateUi(i);
+            } });
+        i++;
+    }

    // 搜索事件
    connect(searchEdit, &DSearchEdit::returnPressed, this, [=]()
@@ -327,18 +200,11 @@ void MainWindow::initConnections()
        QString searchtext = searchEdit->text();
        if (!searchtext.isEmpty()) {
            if (searchtext.startsWith("spk://")) {
-                openUrl(searchtext);
+                openUrl(QUrl(searchtext));
                searchEdit->clearEdit();
            } else {
-                if (searchtext == "%")
-                {
-                    qWarning() << "keyword '%' matches too many results, which will cause QtWebEngine crash.";
-                }
-                else
-                {
-                    ui->applistpage_1->getSearchList(searchtext);
-                    switchPage(AppPageSearchlist);
-                }
+                ui->applistpage_1->getSearchList(searchtext);
+                switchPage(AppPageSearchlist);
            }
        }
        this->setFocus(); });
@@ -347,35 +213,68 @@ void MainWindow::initConnections()
            { downloadButton->setProgress(i); });
    // 列表点击事件
    connect(ui->applistpage, &AppListPage::clicked, this, [=](QUrl spk)
-            { openUrl(spk.toString()); });
+            { openUrl(spk); });
    connect(ui->applistpage_1, &AppListPage::clicked, this, [=](QUrl spk)
-            { openUrl(spk.toString()); });
+            { openUrl(spk); });
    connect(ui->settingspage, &SettingsPage::openUrl, this, [=](QUrl spk)
-            { openUrl(spk.toString()); });
-
-    // 托盘图标点击事件
-    connect(trayIcon, &QSystemTrayIcon::activated, this, [=](QSystemTrayIcon::ActivationReason reason)
-            {
-        switch (reason) {
-        case QSystemTrayIcon::Trigger:
-        {
-            showWindowAnimation = false;
-            closeWindowAnimation = false;
-
-            setWindowState(windowState() & Qt::WindowActive);
-            activateWindow();
-            show();
-
-            Q_FALLTHROUGH();
-        }
-        default:
-            break;
-        } });
+            { openUrl(spk); });
+    emit DGuiApplicationHelper::instance()->themeTypeChanged(DGuiApplicationHelper::instance()->themeType());

    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::newProcessInstance, this, &MainWindow::onNewProcessInstance);
 }

-void MainWindow::initTmpDir()
+MainWindow::~MainWindow()
+{
+    delete ui;
+
+    if (downloadlistwidget)
+    {
+        downloadlistwidget->deleteLater();
+    }
+}
+
+void MainWindow::initDbus()
+{
+    DBusSparkStoreService *dbusInter = new DBusSparkStoreService(this);
+
+    QDBusConnection::sessionBus().registerService("com.gitee.spark.store");
+    QDBusConnection::sessionBus().registerObject("/com/gitee/spark/store", "com.gitee.spark.store", this);
+    connect(dbusInter, &DBusSparkStoreService::sigOpenUrl, this, &MainWindow::onGetUrl);
+}
+
+void MainWindow::onGetUrl(const QString &url)
+{
+    if (url.trimmed().startsWith("spk://"))
+    {
+        openUrl(QUrl(url));
+    }
+    activateWindow();
+}
+
+void MainWindow::onNewProcessInstance(qint64 pid, const QStringList &arguments)
+{
+    Q_UNUSED(pid)
+
+    if (arguments.size() > 1)
+    {
+        onGetUrl(arguments.value(1));
+    }
+}
+
+void MainWindow::openUrl(QUrl url)
+{
+    if (url.toString().startsWith("spk://"))
+    {
+        ui->appintopage->openUrl(QUrl(url.toString().replace("+", "%2B")));
+        switchPage(AppPageAppdetail);
+    }
+    else
+    {
+        QDesktopServices::openUrl(QUrl(url.toString().replace("+", "%2B")));
+    }
+}
+
+void MainWindow::initConfig()
 {
    // 新建临时文件夹
    QDir dir;
@@ -387,11 +286,11 @@ void MainWindow::switchPage(int now) // 临时方案，回家后修改
    qDebug() << pageHistory.count();
    if (pageHistory.count() >= 1)
    {
-        backButton->show();
+        backButtom->show();
    }
    else
    {
-        backButton->hide();
+        backButtom->hide();
    }
    ui->stackedWidget->setCurrentIndex(now);
    ui->stackedWidget->currentWidget()->setFocus();
@@ -456,5 +355,5 @@ void MainWindow::on_pushButton_14_clicked()
            upgradeP->waitForFinished(-1);
            upgradeP->deleteLater(); });
        }
-    }
+    } 
 }
--- a/src/mainwindow-dtk.h
+++ b/src/mainwindow-dtk.h
@@ -1,15 +1,21 @@
 #ifndef MAINWINDOWDTK_H
 #define MAINWINDOWDTK_H

-#include "widgets/base/basewidgetopacity.h"
-
 #include <DMainWindow>
 #include <DTitlebar>
-#include <DPushButton>
 #include <DSearchEdit>
+#include <QGraphicsDropShadowEffect>
 #include <DGuiApplicationHelper>

-#include <QSystemTrayIcon>
+#include <QPushButton>
+#include <QDir>
+#include <QDesktopServices>
+
+#include "widgets/base/basewidgetopacity.h"
+#include "widgets/downloadlistwidget.h"
+#include "widgets/common/progressbutton.h"
+#include "utils/widgetanimation.h"
+#include "dbus/dbussparkstoreservice.h"

 DWIDGET_USE_NAMESPACE

@@ -17,8 +23,6 @@ namespace Ui {
 class MainWindow;
 }

-class ProgressButton;
-class DownloadListWidget;
 class MainWindow : public BaseWidgetOpacity
 {
    Q_OBJECT
@@ -27,17 +31,11 @@ public:
    explicit MainWindow(QWidget *parent = nullptr);
    ~MainWindow();

-    void openUrl(const QString &url);
+    void openUrl(QUrl);

 private:
-    void initUI();
-    void initTitleBar();
-    void initTitleBarMenu();
-    void initLeftMenu();
-    void initTrayIcon();
-    void initConnections();
    void initDbus();
-    void initTmpDir();
+    void initConfig();
    void switchPage(int now);
    void updateUi(int now);

@@ -48,16 +46,13 @@ private slots:
    void on_pushButton_14_clicked();

 private:
-    Ui::MainWindow *ui;
-
-    DPushButton *backButton;
-    DSearchEdit *searchEdit;
-    ProgressButton *downloadButton;
-    DownloadListWidget *downloadlistwidget;
-
-    QSystemTrayIcon *trayIcon = nullptr;
-
    QList<int> pageHistory;
+
+    Ui::MainWindow *ui;
+    DownloadListWidget *downloadlistwidget;
+    ProgressButton *downloadButton;
+    QPushButton *backButtom;
+    DSearchEdit *searchEdit;
 };

 #endif // MAINWINDOWDTK_H
--- a/src/pages/appintopage.cpp
+++ b/src/pages/appintopage.cpp
@@ -1,40 +1,82 @@
 #include "appintopage.h"
 #include "ui_appintopage.h"
-#include "backend/sparkapi.h"
-#include "widgets/downloadlistwidget.h"
-#include "backend/image_show.h"
-#include "application.h"
-
-#include <QtConcurrent>
-#include <QClipboard>
-
-AppIntoPage::AppIntoPage(QWidget *parent)
-    : QWidget(parent)
-    , ui(new Ui::AppIntoPage)
-    , api(new SparkAPI(this))
+AppIntoPage::AppIntoPage(QWidget *parent) : QWidget(parent),
+                                            ui(new Ui::AppIntoPage)
 {
-    initUI();
-    initConnections();
-}
-
-AppIntoPage::~AppIntoPage()
-{
-    delete ui;
-}
-
-void AppIntoPage::openUrl(const QUrl &url)
-{
-    clear();
-
-    //    qDebug() << url;
-    spk = url;
-
-    SparkAPI *api1 = new SparkAPI(this);
-    connect(api1, &SparkAPI::finishedObject, [=](const QJsonObject &appinfo)
+    ui->setupUi(this);
+    ui->listWidget->setViewMode(QListView::IconMode);
+    ui->listWidget->setMovement(QListView::Static);
+    ui->listWidget->setMaximumHeight(200);
+    ui->listWidget->setFlow(QListView::TopToBottom);
+    api1 = new SparkAPI(this);
+    connect(api1, &SparkAPI::finishedRAW, [=](QString download_times)
            {
-        info = appinfo;
+        download_times.remove(QRegExp("\\n"));
+        ui->download_times->setText(download_times);
+        qDebug()<<"Download Times:"+download_times; });
+    clear();
+}

-        // 显示基本信息
+void AppIntoPage::clear()
+{
+    ui->tag_a2d->hide();
+    ui->tag_uos->hide();
+    ui->tag_dtk5->hide();
+    ui->tag_deepin->hide();
+    ui->tag_dwine2->hide();
+    ui->tag_dwine5->hide();
+    ui->tag_ubuntu->hide();
+    ui->tag_community->hide();
+    ui->icon->clear();
+    ui->title->clear();
+    ui->author->clear();
+    ui->label_2->clear();
+    ui->downloadButton->hide();
+    ui->downloadButton->setEnabled(false);
+    ui->pushButton_3->hide();
+    int n = ui->listWidget->count();
+    for (int i = 0; i < n; i++)
+    {
+        QListWidgetItem *item = ui->listWidget->takeItem(0);
+        QWidget *card = ui->listWidget->itemWidget(item);
+        delete card;
+        card = NULL;
+        delete item;
+        item = NULL;
+    }
+    ui->listWidget->clear();
+}
+void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
+{
+    dw = w;
+    connect(w, &DownloadListWidget::downloadFinished, [=]()
+            { isDownloading(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString()); });
+}
+void AppIntoPage::openUrl(QUrl url)
+{
+    spk = url;
+    SparkAPI *api = new SparkAPI(this);
+    clear();
+    connect(api, &SparkAPI::finishedObject, [=](QJsonObject appinfo)
+            {
+
+        info = appinfo;
+//        qDebug()<<url;
+        //获取图标
+        QNetworkRequest request;
+        QNetworkAccessManager *naManager = new QNetworkAccessManager(this);
+        qDebug()<<api->getImgServerUrl()+"store"+url.path().replace("+","%2B") + "/icon.png";
+        request.setUrl(QUrl(api->getImgServerUrl()+"store"+url.path().replace("+","%2B") + "/icon.png"));
+        request.setRawHeader("User-Agent", "Mozilla/5.0");
+        request.setRawHeader("Content-Type", "charset='utf-8'");
+        naManager->get(request);
+        QObject::connect(naManager,&QNetworkAccessManager::finished,[=](QNetworkReply *reply){
+                QByteArray jpegData = reply->readAll();
+                iconpixmap.loadFromData(jpegData);
+                iconpixmap.scaled(210, 200, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+                ui->icon->setPixmap(iconpixmap);
+                ui->icon->setScaledContents(true);
+            });
        ui->title->setText(info["Name"].toString());
        ui->version->setText(info["Version"].toString());
        ui->author->setText(info["Author"].toString());
@@ -42,66 +84,10 @@ void AppIntoPage::openUrl(const QUrl &url)
        ui->d_size->setText(info["Size"].toString());
        ui->d_update->setText(info["Update"].toString());
        ui->d_pkgname->setText(info["Pkgname"].toString());
-        ui->d_website->setText("<a href=\"" + info["Website"].toString() + "\">" + tr("Click Open"));
+        ui->d_website->setText("<a href=\""+info["Website"].toString()+"\">"+tr("Click Open"));
        ui->d_contributor->setText(info["Contributor"].toString());
        ui->label_2->setText(info["More"].toString());

-        // 显示 tags
-        QStringList taglist = info["Tags"].toString().split(";", QString::SkipEmptyParts);
-        setAppinfoTags(taglist);
-
-        // 获取图标
-        QNetworkRequest request;
-        QNetworkAccessManager *manager = new QNetworkAccessManager(this);
-        qDebug() << api->getImgServerUrl() + "store" + url.path() + "/icon.png";
-        request.setUrl(QUrl(api->getImgServerUrl() + "store" + url.path() + "/icon.png"));
-        request.setRawHeader("User-Agent", "Mozilla/5.0");
-        request.setRawHeader("Content-Type", "charset='utf-8'");
-        manager->get(request);
-        QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
-            {
-                QByteArray jpegData = reply->readAll();
-                iconpixmap.loadFromData(jpegData);
-                iconpixmap.scaled(210, 200, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-                ui->icon->setPixmap(iconpixmap);
-                ui->icon->setScaledContents(true);
-
-                manager->deleteLater(); });
-
-        // 获取截图
-        QJsonParseError error;
-        QJsonArray array = QJsonDocument::fromJson(info.value("img_urls").toString().toUtf8(), &error).array();
-        QStringList imglist;
-        foreach (const QJsonValue &value, array) {
-            QString imgUrl = value.toString();
-            imglist.append(imgUrl);
-        }
-        qDebug() << imglist;
-
-        for (int i = 0; i < imglist.size(); i++)
-        {
-            QNetworkRequest request;
-            QNetworkAccessManager *manager = new QNetworkAccessManager(this);
-            request.setUrl(QUrl(imglist.value(i)));
-            request.setRawHeader("User-Agent", "Mozilla/5.0");
-            request.setRawHeader("Content-Type", "charset='utf-8'");
-            manager->get(request);
-            QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
-                {
-                    QByteArray jpegData = reply->readAll();
-                    QPixmap pixmap;
-                    pixmap.loadFromData(jpegData);
-                    pixmap.scaled(100, 100, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-                    image_show *img=new image_show(this);
-                    img->setImage(pixmap);
-                    //img->setScaledContents(true);
-                    QListWidgetItem* pItem = new QListWidgetItem();
-                    pItem->setSizeHint(QSize(280, 200));
-                    ui->listWidget->addItem(pItem);
-                    ui->listWidget->setItemWidget(pItem, img);
-
-                    manager->deleteLater(); });
-        }

        // Check UOS
        QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
@@ -149,181 +135,108 @@ void AppIntoPage::openUrl(const QUrl &url)
                isUpdated = false;
            }

-            if (isInstalled)
-            {
-                if (isUpdated)
+            QObject::connect(naManager, &QNetworkAccessManager::finished, [=]()
+                             {
+
+                if (isInstalled)
                {
-                    ui->downloadButton->setText(tr("Reinstall"));
-                    ui->downloadButton->setEnabled(true);
-                    ui->downloadButton->show();
-                    ui->pushButton_3->show();
+                    if (isUpdated)
+                    {
+                        ui->downloadButton->setText(tr("Reinstall"));
+                        ui->downloadButton->setEnabled(true);
+                        ui->downloadButton->show();
+                        ui->pushButton_3->show();
+                    }
+                    else
+                    {
+                        ui->downloadButton->setText(tr("Upgrade"));
+                        ui->downloadButton->setEnabled(true);
+                        ui->downloadButton->show();
+                        ui->pushButton_3->show();
+                    }
                }
                else
                {
-                    ui->downloadButton->setText(tr("Upgrade"));
+                    ui->downloadButton->setText(tr("Download"));
                    ui->downloadButton->setEnabled(true);
+                    isDownloading(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString());
                    ui->downloadButton->show();
-                    ui->pushButton_3->show();
-                }
-            }
-            else
-            {
-                ui->downloadButton->setText(tr("Download"));
-                ui->downloadButton->setEnabled(true);
-                ui->downloadButton->show();
-            }
-
-            isDownloading(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString());
+                } });
        }

-        api1->disconnect();
-        api1->deleteLater(); });
-
-    api1->getAppInfo(url);
-
-    api->getAppDownloadTimes(url);
+        QStringList taglist = info["Tags"].toString().split(";");
+        QString tmp=info["img_urls"].toString();
+        qDebug() << tmp;
+        if (tmp.left(2) == "[\"")
+        {
+            tmp.remove(0, 2);
+        }
+        if (tmp.right(2) == "\"]")
+        {
+            tmp.remove(tmp.size() - 2, tmp.size());
+        }
+        QStringList imglist = tmp.split("\",\"");
+        qDebug() << imglist;
+        for (int i = 0; i < imglist.size(); i++)
+        {
+            QNetworkRequest request;
+            QNetworkAccessManager *iconNaManager = new QNetworkAccessManager(this);
+            request.setUrl(QUrl(imglist[i].replace("+", "%2B")));
+            request.setRawHeader("User-Agent", "Mozilla/5.0");
+            request.setRawHeader("Content-Type", "charset='utf-8'");
+            iconNaManager->get(request);
+            QObject::connect(iconNaManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
+                             {
+                    QByteArray jpegData = reply->readAll();
+                    QPixmap pixmap;
+                    pixmap.loadFromData(jpegData);
+                    pixmap.scaled(100, 100, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+                    image_show *img=new image_show(this);
+                    img->setImage(pixmap);
+                    //img->setScaledContents(true);
+                    QListWidgetItem* pItem = new QListWidgetItem();
+                    pItem->setSizeHint(QSize(280, 200));
+                    ui->listWidget->addItem(pItem);
+                    ui->listWidget->setItemWidget(pItem, img);
+                });
+        }
+        this->sltAppinfoTags(&taglist);
+        disconnect(api,&SparkAPI::finished,nullptr,nullptr);
+        api->deleteLater(); });
+    api->getAppInfo(url);
+    api1->getAppDownloadTimes(url);
 }

-void AppIntoPage::clear()
+void AppIntoPage::isDownloading(QUrl url)
 {
-    ui->tag_a2d->hide();
-    ui->tag_uos->hide();
-    ui->tag_dtk5->hide();
-    ui->tag_deepin->hide();
-    ui->tag_dwine2->hide();
-    ui->tag_dwine5->hide();
-    ui->tag_ubuntu->hide();
-    ui->tag_community->hide();
-    ui->icon->clear();
-    ui->title->clear();
-    ui->author->clear();
-    ui->label_2->clear();
-    ui->downloadButton->hide();
-    ui->downloadButton->setEnabled(false);
-    ui->pushButton_3->hide();
-
-    //    QListWidgetItem *item = nullptr;
-    //    while ((item = ui->listWidget->takeItem(0)) != nullptr)
-    //    {
-    //        QWidget *card = ui->listWidget->itemWidget(item);
-    //        if (card)
-    //        {
-    //            card->deleteLater();
-    //            card = nullptr;
-    //        }
-    //        delete item;
-    //        item = nullptr;
-    //    }
-
-    ui->listWidget->clear(); // NOTE: QListWidget::clear() 会析构所有 items
-}
-
-void AppIntoPage::setTheme(bool dark)
-{
-    if (dark)
+    if (dw->getUrlList().lastIndexOf(url) == -1)
    {
-        QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4 {background-color: #252525; border-radius: 14px; border: 1px solid rgb(64, 64, 64);}\
-                                  QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color: #FFFFFF}";
-        ui->frame->setStyleSheet(frameStyleSheet);
-        ui->frame_2->setStyleSheet(frameStyleSheet);
-        ui->frame_3->setStyleSheet(frameStyleSheet);
-        ui->frame_4->setStyleSheet(frameStyleSheet);
-
-        ui->icon_1->setPixmap(QPixmap(":/icon/dark/box.svg"));
-        ui->icon_2->setPixmap(QPixmap(":/icon/dark/box.svg"));
-        ui->icon_3->setPixmap(QPixmap(":/icon/dark/calendar.svg"));
-        ui->icon_4->setPixmap(QPixmap(":/icon/dark/text.svg"));
-        ui->icon_5->setPixmap(QPixmap(":/icon/dark/folder.svg"));
-        ui->icon_6->setPixmap(QPixmap(":/icon/dark/globe.svg"));
+        ui->downloadButton->setEnabled(true);
+        return;
    }
    else
    {
-        //亮色模式
-        QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4 {background-color: #fbfbfb; border-radius: 14px; border: 1px solid rgb(229,229,229);}\
-                                  QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color: #000000}";
-        ui->frame->setStyleSheet(frameStyleSheet);
-        ui->frame_2->setStyleSheet(frameStyleSheet);
-        ui->frame_3->setStyleSheet(frameStyleSheet);
-        ui->frame_4->setStyleSheet(frameStyleSheet);
-
-        ui->icon_1->setPixmap(QPixmap(":/icon/light/box.svg"));
-        ui->icon_2->setPixmap(QPixmap(":/icon/light/box.svg"));
-        ui->icon_3->setPixmap(QPixmap(":/icon/light/calendar.svg"));
-        ui->icon_4->setPixmap(QPixmap(":/icon/light/text.svg"));
-        ui->icon_5->setPixmap(QPixmap(":/icon/light/folder.svg"));
-        ui->icon_6->setPixmap(QPixmap(":/icon/light/globe.svg"));
-    }
-}
-
-void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
-{
-    if (dw)
-    {
-        dw->deleteLater();
-        dw = nullptr;
+        ui->downloadButton->setEnabled(false);
    }

-    dw = w;
-    connect(w, &DownloadListWidget::downloadFinished, [=]()
-    { isDownloading(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString()); });
-}
-
-void AppIntoPage::initUI()
-{
-    ui->setupUi(this);
-
-    ui->listWidget->setViewMode(QListView::IconMode);
-    ui->listWidget->setFlow(QListView::TopToBottom);
-    ui->listWidget->setMovement(QListView::Static);
-    ui->listWidget->setMaximumHeight(200);
-
-    clear();
-}
-
-void AppIntoPage::initConnections()
-{
-    connect(api, &SparkAPI::finishedRAW, [=](QString download_times)
-            {
-        download_times = download_times.trimmed();
-        qDebug() << "Download Times:" + download_times;
-        ui->download_times->setText(download_times); });
-}
-
-void AppIntoPage::isDownloading(const QUrl &url)
-{
-    int index = dw->getUrlList().lastIndexOf(url);
-    if (index == -1)
-    {
-        ui->downloadButton->setEnabled(true);
-        return;
-    }
-
-    DownloadItem *item = dw->getDIList().at(index);
-    if (item == nullptr)
-    {
-        ui->downloadButton->setEnabled(true);
-        return;
-    }
-
-    ui->downloadButton->setEnabled(false);
    ui->pushButton_3->hide();
-    if (item->download == 2)
+    if (dw->getDIList()[dw->getUrlList().lastIndexOf(url)]->download == 2)
    {
        ui->downloadButton->setEnabled(true);
        ui->downloadButton->setText(tr("Download"));
    }
-    if (item->download == 1)
+    if (dw->getDIList()[dw->getUrlList().lastIndexOf(url)]->download == 1)
    {
        ui->downloadButton->setEnabled(true);
        ui->downloadButton->setText(tr("Install"));
    }
-    if (item->isInstall)
+    if (dw->getDIList()[dw->getUrlList().lastIndexOf(url)]->isInstall)
    {
        ui->downloadButton->setEnabled(false);
        ui->downloadButton->setText(tr("Installing"));
        return;
    }
-    if (item->download == 3)
+    if (dw->getDIList()[dw->getUrlList().lastIndexOf(url)]->download == 3)
    {
        ui->downloadButton->setEnabled(true);
        ui->downloadButton->setText(tr("Reinstall"));
@@ -332,9 +245,9 @@ void AppIntoPage::isDownloading(const QUrl &url)
    }
 }

-void AppIntoPage::setAppinfoTags(const QStringList &tagList)
+void AppIntoPage::sltAppinfoTags(QStringList *tagList)
 {
-    foreach (const QString &tag, tagList)
+    foreach (const QString &tag, *tagList)
    {
        if (tag == "community")
        {
@@ -370,42 +283,69 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList)
        }
    }
 }
+void AppIntoPage::setTheme(bool dark)
+{
+    if (dark)
+    {
+        QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4 {background-color: #252525; border-radius: 14px; border: 1px solid rgb(64, 64, 64);}\
+                                  QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color: #FFFFFF}";
+        ui->frame->setStyleSheet(frameStyleSheet);
+        ui->frame_2->setStyleSheet(frameStyleSheet);
+        ui->frame_3->setStyleSheet(frameStyleSheet);
+        ui->frame_4->setStyleSheet(frameStyleSheet);
+
+        ui->icon_1->setPixmap(QPixmap(":/icon/dark/box.svg"));
+        ui->icon_2->setPixmap(QPixmap(":/icon/dark/box.svg"));
+        ui->icon_3->setPixmap(QPixmap(":/icon/dark/calendar.svg"));
+        ui->icon_4->setPixmap(QPixmap(":/icon/dark/text.svg"));
+        ui->icon_5->setPixmap(QPixmap(":/icon/dark/folder.svg"));
+        ui->icon_6->setPixmap(QPixmap(":/icon/dark/globe.svg"));
+    }else {
+        //亮色模式
+        QString frameStyleSheet ="#frame,#frame_2,#frame_3,#frame_4 {background-color: #fbfbfb; border-radius: 14px; border: 1px solid rgb(229,229,229);}\
+                                  QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color: #000000}";
+        ui->frame->setStyleSheet(frameStyleSheet);
+        ui->frame_2->setStyleSheet(frameStyleSheet);
+        ui->frame_3->setStyleSheet(frameStyleSheet);
+        ui->frame_4->setStyleSheet(frameStyleSheet);
+
+        ui->icon_1->setPixmap(QPixmap(":/icon/light/box.svg"));
+        ui->icon_2->setPixmap(QPixmap(":/icon/light/box.svg"));
+        ui->icon_3->setPixmap(QPixmap(":/icon/light/calendar.svg"));
+        ui->icon_4->setPixmap(QPixmap(":/icon/light/text.svg"));
+        ui->icon_5->setPixmap(QPixmap(":/icon/light/folder.svg"));
+        ui->icon_6->setPixmap(QPixmap(":/icon/light/globe.svg"));
+    }
+}
+AppIntoPage::~AppIntoPage()
+{
+    delete ui;
+}

 void AppIntoPage::on_downloadButton_clicked()
 {
-    QString downloadUrl = SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString();
    if (ui->downloadButton->text() == tr("Install"))
    {
-        DownloadItem *item = dw->getDIList()[dw->getUrlList().lastIndexOf(downloadUrl)];
-        if (item == nullptr)
-        {
-            return;
-        }
-
-        connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
-
-        item->install(0);
-        isDownloading(downloadUrl);
-
+        dw->getDIList()[dw->getUrlList().lastIndexOf(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString())]->install(0);
+        isDownloading(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString());
+        QObject::connect(dw->getDIList()[dw->getUrlList().lastIndexOf(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString())], &DownloadItem::finished, [=]()
+                         {
+            isDownloading(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString());
+            disconnect(dw->getDIList()[dw->getUrlList().lastIndexOf(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString())],&DownloadItem::finished,nullptr,nullptr); });
        return;
    }
-
    emit clickedDownloadBtn();
-
-    DownloadItem *item = dw->addItem(info["Name"].toString(), info["Filename"].toString(), info["Pkgname"].toString(), iconpixmap, downloadUrl);
-    if (item == nullptr)
-    {
-        return;
-    }
-
+    dw->addItem(info["Name"].toString(), info["Filename"].toString(), info["Pkgname"].toString(), iconpixmap, SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString());
    if (ui->downloadButton->text() == tr("Reinstall"))
    {
-        item->reinstall = true;
+        dw->getDIList()[dw->allDownload - 1]->reinstall = true;
    }
    ui->downloadButton->setEnabled(false);
-    connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
-
-    isDownloading(downloadUrl);
+    QObject::connect(dw->getDIList()[dw->getUrlList().lastIndexOf(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString())], &DownloadItem::finished, [=]()
+                     {
+        isDownloading(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString());
+        disconnect(dw->getDIList()[dw->getUrlList().lastIndexOf(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString())],&DownloadItem::finished,nullptr,nullptr); });
+    isDownloading(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString());
 }

 void AppIntoPage::on_pushButton_3_clicked()
@@ -440,9 +380,9 @@ void AppIntoPage::on_pushButton_3_clicked()
 void AppIntoPage::on_shareButton_clicked()
 {
    qDebug() << "Share" << spk;
-    Application::clipboard()->setText(spk.toString());
-
    Utils::sendNotification("spark-store", tr("Spark Store"), tr("The URL has been copied to the clipboard"));
+    QClipboard *clipboard = QApplication::clipboard();
+    clipboard->setText(spk.toString());
 }

 void AppIntoPage::on_updateButton_clicked()
--- a/src/pages/appintopage.h
+++ b/src/pages/appintopage.h
@@ -1,55 +1,52 @@
 #ifndef APPINTOPAGE_H
 #define APPINTOPAGE_H

-#include "utils/utils.h"
-
 #include <QWidget>
-#include <QJsonObject>
 #include <QUrl>
-
+#include <QString>
+#include <QtConcurrent>
+#include <QClipboard>
+#include "backend/sparkapi.h"
+#include "backend/image_show.h"
+#include "widgets/downloadlistwidget.h"
+#include "utils/utils.h"
 namespace Ui {
 class AppIntoPage;
 }

-class SparkAPI;
-class DownloadListWidget;
 class AppIntoPage : public QWidget
 {
    Q_OBJECT

 public:
-    explicit AppIntoPage(QWidget *parent = nullptr);
-    ~AppIntoPage() override;
-
-    void openUrl(const QUrl &url);
    void clear();
-    void setTheme(bool dark);
    void setDownloadWidget(DownloadListWidget *w);
-
-private:
-    void initUI();
-    void initConnections();
-    void isDownloading(const QUrl &url);
-    void setAppinfoTags(const QStringList &tagList);
-
-signals:
-    void clickedDownloadBtn();
+    void setTheme(bool dark);
+    void openUrl(QUrl url);
+    explicit AppIntoPage(QWidget *parent = nullptr);
+    ~AppIntoPage();

 private slots:
    void on_downloadButton_clicked();
+
    void on_pushButton_3_clicked();
+
    void on_shareButton_clicked();
+
    void on_updateButton_clicked();

 private:
-    Ui::AppIntoPage *ui;
-
-    SparkAPI *api;
-    DownloadListWidget *dw = nullptr;
-
+    SparkAPI *api1;
    QJsonObject info;
    QPixmap iconpixmap;
    QUrl spk;
+    void isDownloading(QUrl url);
+    void sltAppinfoTags(QStringList *tagList);
+    DownloadListWidget *dw;
+    Ui::AppIntoPage *ui;
+
+signals:
+    void clickedDownloadBtn();
 };

 #endif // APPINTOPAGE_H
--- a/src/pages/applistpage.cpp
+++ b/src/pages/applistpage.cpp
@@ -56,7 +56,7 @@ void AppListPage::getAppList(QString type)
    delete api;
 }

-void AppListPage::getSearchList(const QString &keyword)
+void AppListPage::getSearchList(QString keyword)
 {
    isSearch = true;
    nowType = keyword;
@@ -71,7 +71,7 @@ void AppListPage::getSearchList(const QString &keyword)
    {
        theme = "theme=light";
    }
-    url = api->getServerUrl() + "store/#/flamescion/search?keywords=" + QUrl::toPercentEncoding(keyword) + "&" + theme;
+    url = api->getServerUrl() + "store/#/flamescion/search?keywords=" + keyword + "&" + theme;
    ui->webEngineView->setUrl(url);
    delete api;
 }
--- a/src/pages/applistpage.h
+++ b/src/pages/applistpage.h
@@ -14,7 +14,7 @@ class AppListPage : public QWidget

 public:
    void setTheme(bool dark);
-    void getSearchList(const QString &keyword);
+    void getSearchList(QString keyword);
    void getAppList(QString type);
    explicit AppListPage(QWidget *parent = nullptr);
    ~AppListPage();
--- a/src/utils/utils.cpp
+++ b/src/utils/utils.cpp
@@ -1,184 +1,25 @@
 #include "utils.h"
-#include "application.h"

-#include <DSysInfo>
-
-#include <QDBusInterface>
-#include <QProcessEnvironment>
-#include <QSettings>
-#include <QStandardPaths>
-#include <QFile>
-
-#define UOSDeveloperModeFile "/var/lib/deepin/developer-mode/enabled"
-
-/**
- * @author chatGPT
- * @brief Utils::sendNotification 发送系统通知
- * @param icon 图标名称
- * @param title 通知标题
- * @param body 通知内容
- */
-void Utils::sendNotification(const QString &icon, const QString &title, const QString &body)
+Utils::Utils()
 {
-    QDBusInterface interface("org.freedesktop.Notifications",
-                             "/org/freedesktop/Notifications",
-                             "org.freedesktop.Notifications");
+}
+
+// Author: chatGPT
+void Utils::sendNotification(QString icon, QString title, QString body)
+{
+    QDBusInterface iface("org.freedesktop.Notifications",
+                         "/org/freedesktop/Notifications",
+                         "org.freedesktop.Notifications");

    QVariantList args;
-    args << Application::applicationName() // the name of the application
-         << static_cast<quint32>(0)        // replaces the previous notification with the same ID
-         << icon                           // the application icon of the notification
-         << title                          // the title of the notification
-         << body                           // the body of the notification
-         << QStringList()                  // no actions
-         << QVariantMap()                  // no hints
-         << -1;                            // no timeout
+    args << QCoreApplication::applicationName() // the name of the application
+         << (uint)0                             // replaces the previous notification with the same ID
+         << icon                                // the application icon of the notification
+         << title                               // the title of the notification
+         << body                                // the body of the notification
+         << QStringList()                       // no actions
+         << QVariantMap()                       // no hints
+         << -1;                                 // no timeout

-    interface.callWithArgumentList(QDBus::AutoDetect, "Notify", args);
-}
-
-/**
- * @brief Utils::isDDE 判断是否使用 DDE 桌面环境
- * @return
- */
-bool Utils::isDDE()
-{
-    bool isDDE = true;
-    if (!QString::fromUtf8(qgetenv("XDG_CURRENT_DESKTOP")).toLower().startsWith("deepin"))
-    {
-        qputenv("XDG_CURRENT_DESKTOP", "Deepin");
-        isDDE = false;
-    }
-
-    return isDDE;
-}
-
-/**
- * @brief Utils::isWayland 判断是否使用 wayland 显示协议
- * @return bool true: 使用 wayland 显示协议 false: 使用 x11 显示协议
- */
-bool Utils::isWayland()
-{
-    bool isWayland = false;
-    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    QString XDG_SESSION_TYPE = env.value(QStringLiteral("XDG_SESSION_TYPE"));
-    QString WAYLAND_DISPLAY = env.value(QStringLiteral("WAYLAND_DISPLAY"));
-    if (XDG_SESSION_TYPE == QLatin1String("wayland") || WAYLAND_DISPLAY.contains(QLatin1String("wayland"), Qt::CaseInsensitive))
-    {
-        isWayland = true;
-    }
-
-    return isWayland;
-}
-
-/**
- * @brief Utils::initConfig 初始化 config.ini 配置文件，去除废弃字段
- */
-void Utils::initConfig()
-{
-    // WARNING: 请在 组织名称 和 应用程序名称 初始化完成后调用
-    bool useWayland = true;
-
-    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    if (config.contains("build/useWayland"))
-    {
-        useWayland = config.value("build/useWayland").toBool();
-    }
-    config.remove("build/isDeepinOS");
-    config.remove("build/isWayland");
-    config.remove("build/useWayland");
-
-    config.setValue("runtime/isDDE", isDDE());
-    config.setValue("runtime/isWayland", isWayland());
-    // Check config file, if there is no wayland config, then set it to default, which means use wayland if possible.
-    if (!config.contains("runtime/useWayland"))
-    {
-        config.setValue("runtime/useWayland", useWayland);
-    }
-    config.sync(); // 写入更改至 config.ini，并同步最新内容
-
-    checkUOSDeveloperMode(); // Check UOS developer mode
-}
-
-/**
- * @brief Utils::isUOS 判断是否为 UOS 操作系统
- * @return bool true: UOS 操作系统 false: 非 UOS 操作系统
- */
-bool Utils::isUOS()
-{
-    // WARNING: 请在 组织名称 和 应用程序名称 初始化完成后调用
-    bool isUOS = false;
-
-    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    if (Dtk::Core::DSysInfo::productType() == Dtk::Core::DSysInfo::Uos)
-    {
-        isUOS = true;
-        config.setValue("UOS/isUOS", true);
-    }
-    else
-    {
-        isUOS = false;
-        config.remove("UOS");
-    }
-    config.sync(); // 写入更改至 config.ini，并同步最新内容
-
-    return isUOS;
-}
-
-/**
- * @brief Utils::setQPAPlatform Set display backend
- */
-void Utils::setQPAPlatform()
-{
-    // WARNING: 请在 initConfig() 执行后调用
-    bool isDDE = Utils::isDDE(); // WARNING: 只能执行一次，后续执行时环境变量已经被覆盖，导致判断错误
-    bool isWayland = Utils::isWayland();
-
-    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    bool useWayland = config.value("runtime/useWayland").toBool();
-
-    qDebug() << "System Wayland enabled:" << isWayland << "Spark Wayland enabled:" << useWayland;
-
-    if (isWayland && useWayland && !(Dtk::Core::DSysInfo::isDeepin() || isDDE))
-    {
-        qputenv("QT_QPA_PLATFORM", "wayland");
-    }
-    else if (isWayland && useWayland && (Dtk::Core::DSysInfo::isDeepin() && isDDE))
-    {
-        qputenv("QT_QPA_PLATFORM", "dwayland");
-    }
-    else
-    {
-        qputenv("QT_QPA_PLATFORM", "dxcb");
-    }
-}
-
-/**
- * @brief Utils::checkUOSDeveloperMode Check UOS developer mode
- */
-void Utils::checkUOSDeveloperMode()
-{
-    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-
-    QFile file(UOSDeveloperModeFile);
-    if (Utils::isUOS() && file.exists() && file.open(QFile::ReadOnly | QFile::Text))
-    {
-        QString lineData = QString::fromUtf8(file.readLine());
-        bool devmode = lineData.trimmed().toInt();
-        qDebug() << "UOS Developer Mode Status:" << devmode;
-        config.setValue("UOS/EnableDeveloperMode", devmode);
-    }
-    else
-    {
-        /**
-         * NOTE: Utils::isUOS() 中，判断为非 UOS 时已经从 config 中删除 UOS 组，
-         * 此处若包含该字段则一定是 UOS，直接写入开发者模式开关状态即可
-         */
-        if (config.contains("UOS/EnableDeveloperMode"))
-        {
-            config.setValue("UOS/EnableDeveloperMode", false);
-        }
-    }
-    file.close();
-    config.sync(); // 写入更改至 config.ini，并同步最新内容
+    iface.callWithArgumentList(QDBus::AutoDetect, "Notify", args);
 }
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@@ -2,17 +2,13 @@
 #define UTILS_H

 #include <QObject>
+#include <QtDBus>

 class Utils
 {
 public:
-    static void sendNotification(const QString &icon, const QString &title, const QString &body);
-    static bool isDDE();
-    static bool isWayland();
-    static void initConfig();
-    static bool isUOS();
-    static void setQPAPlatform();
-    static void checkUOSDeveloperMode();
+    Utils();
+    static void sendNotification(QString icon,QString title,QString body);
 };

 #endif // UTILS_H
--- a/src/utils/widgetanimation.cpp
+++ b/src/utils/widgetanimation.cpp
@@ -1,5 +1,8 @@
 #include "widgetanimation.h"
-#include "widgets/base/basewidgetopacity.h"
+
+WidgetAnimation::WidgetAnimation()
+{
+}

 void WidgetAnimation::widgetShake(QWidget *pWidget, int nRange)
 {
@@ -25,35 +28,27 @@ void WidgetAnimation::widgetShake(QWidget *pWidget, int nRange)
 QPropertyAnimation *WidgetAnimation::createWidgetOpacity(QWidget *pWidget, bool isAppear)
 {
    QPropertyAnimation *animation = new QPropertyAnimation(pWidget, "windowOpacity", pWidget);
+    // 设置动画效果
+    animation->setEasingCurve(QEasingCurve::Linear);
    // 设置动画时间（单位：毫秒）
    animation->setDuration(500);
+    // 设置动画步长值，以及在该位置时显示的透明度
    if (isAppear)
    {
-        // 设置动画效果
-        animation->setEasingCurve(QEasingCurve::Linear);
-        // 设置动画步长值，以及在该位置时显示的透明度（即动画关键帧）
-        animation->setKeyValueAt(0.0, 0.0);
-        animation->setKeyValueAt(1.0, 1.0);
+        animation->setKeyValueAt(0, 0);
+        // m_animation->setKeyValueAt(0.5, 0);
+        animation->setKeyValueAt(1, 1);
    }
    else
    {
-        animation->setEasingCurve(QEasingCurve::OutQuart);
-        animation->setKeyValueAt(0.0, 1.0);
-        animation->setKeyValueAt(1.0, 0.0);
-
-        QObject::connect(animation, &QPropertyAnimation::finished, pWidget, [=]() { pWidget->close(); });
+        animation->setKeyValueAt(0, 1);
+        animation->setKeyValueAt(1, 0);
    }
-
-    QObject::connect(animation, &QPropertyAnimation::valueChanged, pWidget, [=]()
-            {
-                pWidget->update(); // NOTE: 保证窗口透明度动画平滑
-            });
-
    return animation;
 }

 void WidgetAnimation::widgetOpacity(QWidget *pWidget, bool isAppear)
 {
-    // 启动/关闭动画
-    createWidgetOpacity(pWidget, isAppear)->start(QPropertyAnimation::DeleteWhenStopped);
+    // 开始动画
+    createWidgetOpacity(pWidget, isAppear)->start();
 }
--- a/src/utils/widgetanimation.h
+++ b/src/utils/widgetanimation.h
@@ -1,12 +1,14 @@
 #ifndef WIDGETANIMATION_H
 #define WIDGETANIMATION_H

+#include <QObject>
 #include <QWidget>
 #include <QPropertyAnimation>

 class WidgetAnimation
 {
 public:
+    WidgetAnimation();
    static void widgetShake(QWidget *pWidget, int nRange);

    static QPropertyAnimation* createWidgetOpacity(QWidget *pWidget, bool isAppear);
--- a/src/widgets/base/basewidgetopacity.cpp
+++ b/src/widgets/base/basewidgetopacity.cpp
@@ -1,47 +1,23 @@
 #include "basewidgetopacity.h"
-#include "utils/widgetanimation.h"
-#include "utils/utils.h"

+#include <QCloseEvent>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QPropertyAnimation>
-#include <QCloseEvent>

 BaseWidgetOpacity::BaseWidgetOpacity(QWidget *parent) : DBlurEffectWidget(parent)
 {
+    //    WidgetAnimation::widgetOpacity(this,true);
 }

-/**
- * @brief 窗口显示事件
- * @param event
- */
-void BaseWidgetOpacity::showEvent(QShowEvent *event)
-{
-    // FIXME: wayland 不支持直接设置窗口透明度，需要调用 wayland 相关库（考虑抄控制中心“窗口移动时启用透明特效”代码？）
-    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    bool isWayland = Utils::isWayland();
-    if (!isWayland)
-    {
-        if (!showWindowAnimation)
-        {
-            showWindowAnimation = true;
-            WidgetAnimation::widgetOpacity(this, true);
-        }
-    }
-
-    DBlurEffectWidget::showEvent(event);
-}
-
-/**
- * @brief 窗口关闭事件
- * @param event
- */
+/// @brief 窗口关闭事件
+/// @param event
 void BaseWidgetOpacity::closeEvent(QCloseEvent *event)
 {
    // FIXME: wayland 不支持直接设置窗口透明度，需要调用 wayland 相关库（考虑抄控制中心“窗口移动时启用透明特效”代码？）
    QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
-    bool isWayland = Utils::isWayland();
-    if (isWayland)
+    bool isWayland = config.value("build/isWayland").toBool();
+    if(isWayland)
    {
        return DBlurEffectWidget::closeEvent(event);
    }
@@ -49,8 +25,23 @@ void BaseWidgetOpacity::closeEvent(QCloseEvent *event)
    if (!closeWindowAnimation)
    {
        closeWindowAnimation = true;
-        WidgetAnimation::widgetOpacity(this, false);

+        QPropertyAnimation *animation = new QPropertyAnimation(this, "windowOpacity");
+        animation->setEasingCurve(QEasingCurve::OutQuart);
+        animation->setDuration(500);
+        animation->setStartValue(1.0);
+        animation->setEndValue(0.0);
+
+        QObject::connect(animation, &QPropertyAnimation::valueChanged, this, [=](const QVariant &value)
+                         {
+                             this->update();
+                             // setWindowTitle(QString("ヾ(⌒∇⌒*)See You♪ - %1%").arg(int(value.toFloat() * 100)));
+                         });
+
+        QObject::connect(animation, &QPropertyAnimation::finished, this, [=]()
+                         { this->close(); });
+
+        animation->start();
        event->ignore();
    }
    else
--- a/src/widgets/base/basewidgetopacity.h
+++ b/src/widgets/base/basewidgetopacity.h
@@ -8,17 +8,17 @@ DWIDGET_USE_NAMESPACE
 class BaseWidgetOpacity : public DBlurEffectWidget
 {
    Q_OBJECT
-
 public:
    explicit BaseWidgetOpacity(QWidget *parent = nullptr);

-protected:
-    void showEvent(QShowEvent *event) override;
-    void closeEvent(QCloseEvent *event) override;
+signals:

+public slots:
+
+    // QWidget interface
 protected:
-    bool showWindowAnimation = false;
    bool closeWindowAnimation = false;
+    void closeEvent(QCloseEvent *event) override;
 };

 #endif // BASEWIDGETOPACITY_H
--- a/src/widgets/common/downloaditem.cpp
+++ b/src/widgets/common/downloaditem.cpp
@@ -105,10 +105,76 @@ void DownloadItem::install(int t)
        ui->label_2->setToolTip(tr("Installing"));

        QtConcurrent::run([=]()
-        {
-            slotAsyncInstall(t);
-        });
+                          {
+            QProcess installer;
+            switch(t)
+            {
+            case 0:
+                installer.start("pkexec", QStringList() << "ssinstall" << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
+                break;
+            case 1:
+                installer.start("deepin-deb-installer", QStringList() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
+                break;
+            case 2:
+                installer.start("pkexec", QStringList() << "gdebi" << "-n" << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
+                break;
+            }

+            bool haveError = false;
+            bool notRoot = false;
+            installer.waitForFinished(-1); // 不设置超时
+            out = installer.readAllStandardOutput();
+
+            QStringList everyOut = out.split("\n");
+            for (int i = 0; i < everyOut.size(); i++)
+            {
+                if(everyOut[i].left(2) == "E:")
+                {
+                    haveError = true;
+                }
+                if(everyOut[i].right(14) == "Not authorized")
+                {
+                    notRoot = true;
+                }
+            }
+
+            QProcess isInstall;
+            isInstall.start("dpkg", QStringList() << "-s" << pkgName);
+            isInstall.waitForFinished(180*1000); // 默认超时 3 分钟
+            int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
+            if (error == 0 && !haveError)
+            {
+                ui->pushButton_install->hide();
+                Utils::sendNotification("spark-store",tr("Spark Store"),ui->label->text() + " " + tr("Installation complete."));
+                ui->label_2->setText(tr("Finish"));
+                ui->label_2->setToolTip(tr("Finish"));
+                download = 3;
+                ui->pushButton_3->show();
+            }
+            else
+            {
+                ui->pushButton_install->show();
+                ui->pushButton_install->setText(tr("Retry"));
+                download = 1;
+                Utils::sendNotification("spark-store",tr("Spark Store"),tr("Error happened in dpkg progress , you can try it again."));
+                ui->label_2->setText(tr("Error happened in dpkg progress , you can try it again"));
+                ui->label_2->setToolTip(tr("Error happened in dpkg progress , you can try it again"));
+                ui->pushButton_3->show();
+            }
+
+            if (notRoot)
+            {
+                Utils::sendNotification("spark-store",tr("Spark Store"),tr("dpkg progress had been aborted，you can retry installation."));
+                ui->label_2->setText(tr("dpkg progress had been aborted，you can retry installation"));
+                ui->label_2->setToolTip(tr("dpkg progress had been aborted，you can retry installation"));
+                ui->pushButton_install->show();
+                ui->pushButton_3->hide();
+            }
+
+            ui->widget_spinner->hide();
+            DownloadItem::isInstall = false;
+            emit finished(); });
+        //        emit finished();
        qDebug() << ui->label_filename->text().toUtf8();
    }
 }
@@ -141,75 +207,3 @@ void DownloadItem::on_pushButton_3_clicked()
    output_w->layout()->addWidget(textbrowser);
    output_w->show();
 }
-
-void DownloadItem::slotAsyncInstall(int t)
-{
-    QProcess installer;
-    switch(t)
-    {
-    case 0:
-        installer.start("pkexec", QStringList() << "ssinstall" << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
-        break;
-    case 1:
-        installer.start("deepin-deb-installer", QStringList() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
-        break;
-    case 2:
-        installer.start("pkexec", QStringList() << "gdebi" << "-n" << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
-        break;
-    }
-
-    bool haveError = false;
-    bool notRoot = false;
-    installer.waitForFinished(-1); // 不设置超时
-    out = installer.readAllStandardOutput();
-
-    QStringList everyOut = out.split("\n");
-    for (int i = 0; i < everyOut.size(); i++)
-    {
-        if(everyOut[i].left(2) == "E:")
-        {
-            haveError = true;
-        }
-        if(everyOut[i].right(14) == "Not authorized")
-        {
-            notRoot = true;
-        }
-    }
-
-    QProcess isInstall;
-    isInstall.start("dpkg", QStringList() << "-s" << pkgName);
-    isInstall.waitForFinished(180*1000); // 默认超时 3 分钟
-    int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
-    if (error == 0 && !haveError)
-    {
-        ui->pushButton_install->hide();
-        Utils::sendNotification("spark-store",tr("Spark Store"),ui->label->text() + " " + tr("Installation complete."));
-        ui->label_2->setText(tr("Finish"));
-        ui->label_2->setToolTip(tr("Finish"));
-        download = 3;
-        ui->pushButton_3->show();
-    }
-    else
-    {
-        ui->pushButton_install->show();
-        ui->pushButton_install->setText(tr("Retry"));
-        download = 1;
-        Utils::sendNotification("spark-store",tr("Spark Store"),tr("Error happened in dpkg progress , you can try it again."));
-        ui->label_2->setText(tr("Error happened in dpkg progress , you can try it again"));
-        ui->label_2->setToolTip(tr("Error happened in dpkg progress , you can try it again"));
-        ui->pushButton_3->show();
-    }
-
-    if (notRoot)
-    {
-        Utils::sendNotification("spark-store",tr("Spark Store"),tr("dpkg progress had been aborted，you can retry installation."));
-        ui->label_2->setText(tr("dpkg progress had been aborted，you can retry installation"));
-        ui->label_2->setToolTip(tr("dpkg progress had been aborted，you can retry installation"));
-        ui->pushButton_install->show();
-        ui->pushButton_3->hide();
-    }
-
-    ui->widget_spinner->hide();
-    DownloadItem::isInstall = false;
-    emit finished();
-}
--- a/src/widgets/common/downloaditem.h
+++ b/src/widgets/common/downloaditem.h
@@ -59,8 +59,6 @@ private slots:
    void on_pushButton_2_clicked();
    void on_pushButton_3_clicked();

-    void slotAsyncInstall(int t);
-
 signals:
    void finished();
 };
--- a/src/widgets/downloadlistwidget.cpp
+++ b/src/widgets/downloadlistwidget.cpp
@@ -54,42 +54,36 @@ DownloadListWidget::~DownloadListWidget()
 {
    if (downloadController)
    {
-        downloadController->disconnect();
        downloadController->stopDownload();
-        downloadController->deleteLater();
    }

-    clearItem();
    delete ui;
 }

 void DownloadListWidget::clearItem()
 {
-    //    QListWidgetItem *item = nullptr;
-    //    while ((item = ui->listWidget->takeItem(0)) != nullptr)
-    //    {
-    //        QWidget *card = ui->listWidget->itemWidget(item);
-    //        if (card)
-    //        {
-    //            card->deleteLater();
-    //            card = nullptr;
-    //        }
-    //        delete item;
-    //        item = nullptr;
-    //    }
-
-    //    ui->listWidget->vScrollBar->scrollTop();
+    ui->listWidget->vScrollBar->scrollTop();
+    int n = ui->listWidget->count();
+    for (int i = 0; i < n; i++)
+    {
+        QListWidgetItem *item = ui->listWidget->takeItem(0);
+        QWidget *card = ui->listWidget->itemWidget(item);
+        delete card;
+        card = NULL;
+        delete item;
+        item = NULL;
+    }
    ui->listWidget->clear();
 }
-DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl)
+void DownloadListWidget::addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl)
 {
    if (fileName.isEmpty())
    {
-        return nullptr;
+        return;
    }
    urList.append(downloadurl);
    allDownload += 1;
-    DownloadItem *di = new DownloadItem;
+    DownloadItem *di = new DownloadItem(this);
    dlist << downloadurl;
    downloaditemlist << di;
    di->setName(name);
@@ -105,8 +99,6 @@ DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QStrin
        nowDownload += 1;
        startRequest(urList.at(nowDownload - 1), fileName); // 进行链接请求
    }
-
-    return di;
 }

 QList<DownloadItem *> DownloadListWidget::getDIList()
@@ -127,13 +119,7 @@ void DownloadListWidget::startRequest(QUrl url, QString fileName)
    isdownload = true;
    downloaditemlist[allDownload - 1]->free = false;

-    if (downloadController)
-    {
-        downloadController->disconnect();
-        downloadController->stopDownload();
-        downloadController->deleteLater();
-    }
-    downloadController = new DownloadController; // 并发下载，在点击下载按钮的时候才会初始化
+    downloadController = new DownloadController(this); // 并发下载，在点击下载按钮的时候才会初始化
    connect(downloadController, &DownloadController::downloadProcess, this, &DownloadListWidget::updateDataReadProgress);
    connect(downloadController, &DownloadController::downloadFinished, this, &DownloadListWidget::httpFinished);
    // connect(downloadController, &DownloadController::errorOccur, this, [=](QString msg){this->sendNotification(msg);});
--- a/src/widgets/downloadlistwidget.h
+++ b/src/widgets/downloadlistwidget.h
@@ -20,7 +20,7 @@ class DownloadListWidget : public DBlurEffectWidget
    Q_OBJECT

 public:
-    DownloadItem *addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl);
+    void addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl);
    int nowDownload = 0;
    int allDownload = 0;
    QList<DownloadItem *> getDIList();
@@ -35,7 +35,7 @@ private:
    QStringList dlist;
    QList<QUrl> urList;
    QList<DownloadItem *> downloaditemlist;
-    DownloadController *downloadController = nullptr;
+    DownloadController *downloadController;
    int nowdownload = 0;
    QString theSpeed;
    QTimer download_speed;
--- a/tool/apt-fast-conf/apt-fast.conf
+++ b/tool/apt-fast-conf/apt-fast.conf
@@ -11,20 +11,12 @@
 #
 # Default: apt-get
 #
-_APTMGR=apt-get
-
-if [ -x "$(command -v apt)" ]; then
 _APTMGR=apt
-fi
-

 if grep -Eqi "linuxmint" /etc/os-release;then
 _APTMGR=apt-get
 fi

-if [ -x "$(command -v oyo)" ]; then
-_APTMGR=/usr/bin/apt
-fi

 ####
 #
--- a/tool/bashimport/transhell.amber
+++ b/tool/bashimport/transhell.amber
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-##load transhell
-function load_transhell_debug()
-{
-local WORK_PATH="$(cd "$(dirname "${0}")"  && pwd)"
-local CURRENT_LANG="$(echo ${LANG%.*})"
-if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi
-if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
-if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi
-if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
-
-echo "-----------------------------------------------------------------------------"
-}
-
-function load_transhell()
-{
-local WORK_PATH="$(cd "$(dirname "${0}")"  && pwd)"
-local CURRENT_LANG="$(echo ${LANG%.*})"
-if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi
-if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
-if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi
-if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
-
-}
-
-function update_transhell()
-{
-load_transhell $@
-}
-
--- a/tool/ssinstall
+++ b/tool/ssinstall
@@ -1,7 +1,30 @@
 #!/bin/bash

-source /opt/durapps/spark-store/bin/bashimport/transhell.amber
-load_transhell_debug
+##load transhell
+function load_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+
+echo "-----------------------------------------------------------------------------"
+}
+
+function update_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+
+}
+
+load_transhell



@@ -17,19 +40,19 @@ function pkexec_as_current_user() {
    sudo -u $user  DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus pkexec "$@"
 }

-function zenity()
-{
-
+function zenity() {
+    #Detect the name of the display in use
+    local display=":$(ls /tmp/.X11-unix/* | sed 's#/tmp/.X11-unix/X##' | head -n 1)"

    #Detect the user using such display
-    local user=$(who  | awk '{print $1}' | head -n 1)
+    local user=$(who | grep '('$display')' | 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 zenity "$@"
+    sudo -u $user DISPLAY=$display DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus zenity "$@"
 }
+
 #################检测文件是否存在
 if [ $# -eq 0 ];then
 echo "没有接收到参数，退出"
--- a/tool/update-upgrade/ss-do-upgrade.sh
+++ b/tool/update-upgrade/ss-do-upgrade.sh
@@ -1,8 +1,30 @@
 #!/bin/bash

-source /opt/durapps/spark-store/bin/bashimport/transhell.amber
-load_transhell_debug
+##load transhell
+function load_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi

+echo "-----------------------------------------------------------------------------"
+}
+
+function update_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+
+}
+
+load_transhell

 touch /tmp/spark-store/upgradeStatus.txt

--- a/tool/update-upgrade/ss-update-controler.sh
+++ b/tool/update-upgrade/ss-update-controler.sh
@@ -1,7 +1,30 @@
 #!/bin/bash

-source /opt/durapps/spark-store/bin/bashimport/transhell.amber
-load_transhell_debug
+##load transhell
+function load_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+
+echo "-----------------------------------------------------------------------------"
+}
+
+function update_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+
+}
+
+load_transhell

 endloop=0

--- a/tool/update-upgrade/ss-update-notifier.sh
+++ b/tool/update-upgrade/ss-update-notifier.sh
@@ -1,8 +1,31 @@
 #!/bin/bash
 LANGUAGE=en_US

-source /opt/durapps/spark-store/bin/bashimport/transhell.amber
-load_transhell_debug
+##load transhell
+function load_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell ..."; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; echo "Loading transhell from ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell ..."; fi
+
+echo "-----------------------------------------------------------------------------"
+}
+
+function update_transhell()
+{
+local WORK_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")"  && pwd)"
+local CURRENT_LANG="$(echo ${LANG%.*})"
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "/usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source /usr/share/$(basename $0)/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_en_US.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_en_US.transhell; fi
+if [ -e "${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell" ]; then source ${WORK_PATH}/transhell/$(basename $0)_$CURRENT_LANG.transhell; fi
+
+}
+
+load_transhell

 #############################################################

--- a/translations/spark-store_en.ts
+++ b/translations/spark-store_en.ts
@@ -10,9 +10,9 @@
    </message>
    <message>
        <location filename="../src/pages/appintopage.ui" line="244"/>
-        <location filename="../src/pages/appintopage.cpp" line="171"/>
-        <location filename="../src/pages/appintopage.cpp" line="308"/>
-        <location filename="../src/pages/appintopage.cpp" line="416"/>
+        <location filename="../src/pages/appintopage.cpp" line="160"/>
+        <location filename="../src/pages/appintopage.cpp" line="226"/>
+        <location filename="../src/pages/appintopage.cpp" line="368"/>
        <source>Download</source>
        <translation type="unfinished"></translation>
    </message>
@@ -175,51 +175,51 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="45"/>
+        <location filename="../src/pages/appintopage.cpp" line="87"/>
        <source>Click Open</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="110"/>
+        <location filename="../src/pages/appintopage.cpp" line="96"/>
        <source>Developer Mode Disabled</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="156"/>
-        <location filename="../src/pages/appintopage.cpp" line="324"/>
-        <location filename="../src/pages/appintopage.cpp" line="386"/>
+        <location filename="../src/pages/appintopage.cpp" line="145"/>
+        <location filename="../src/pages/appintopage.cpp" line="242"/>
+        <location filename="../src/pages/appintopage.cpp" line="339"/>
        <source>Reinstall</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="163"/>
+        <location filename="../src/pages/appintopage.cpp" line="152"/>
        <source>Upgrade</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="313"/>
-        <location filename="../src/pages/appintopage.cpp" line="371"/>
+        <location filename="../src/pages/appintopage.cpp" line="231"/>
+        <location filename="../src/pages/appintopage.cpp" line="327"/>
        <source>Install</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="318"/>
+        <location filename="../src/pages/appintopage.cpp" line="236"/>
        <source>Installing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="420"/>
-        <location filename="../src/pages/appintopage.cpp" line="433"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
+        <location filename="../src/pages/appintopage.cpp" line="383"/>
        <source>Spark Store</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="420"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
        <source>Uninstall succeeded</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="433"/>
+        <location filename="../src/pages/appintopage.cpp" line="383"/>
        <source>The URL has been copied to the clipboard</source>
        <translation type="unfinished"></translation>
    </message>
@@ -240,12 +240,12 @@
 <context>
    <name>DAboutDialog</name>
    <message>
-        <location filename="../src/application.cpp" line="90"/>
+        <location filename="../src/application.cpp" line="88"/>
        <source>Version: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="97"/>
+        <location filename="../src/application.cpp" line="95"/>
        <source>%1 is released under %2</source>
        <translation type="unfinished"></translation>
    </message>
@@ -452,32 +452,32 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="165"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="45"/>
        <source>Submit App</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="166"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="46"/>
        <source>Submit App with client(Recommanded)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="167"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="47"/>
        <source>Settings</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="48"/>
        <source>APP Upgrade and Install Settings</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="127"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="161"/>
        <source>Spark Store</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="132"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="162"/>
        <source>Search or enter spk://</source>
        <translation type="unfinished"></translation>
    </message>
@@ -485,19 +485,19 @@
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/application.cpp" line="28"/>
-        <location filename="../src/application.cpp" line="29"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="107"/>
+        <location filename="../src/application.cpp" line="26"/>
+        <location filename="../src/application.cpp" line="27"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="22"/>
        <source>Spark Store</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="33"/>
+        <location filename="../src/application.cpp" line="31"/>
        <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="94"/>
+        <location filename="../src/application.cpp" line="92"/>
        <source>Spark Project</source>
        <translation type="unfinished"></translation>
    </message>
@@ -506,11 +506,6 @@
        <source>Download list</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="221"/>
-        <source>Show MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
@@ -615,17 +610,4 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
-<context>
-    <name>TitleBarMenu</name>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="222"/>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="223"/>
-        <source>Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
--- a/translations/spark-store_fr.ts
+++ b/translations/spark-store_fr.ts
@@ -10,9 +10,9 @@
    </message>
    <message>
        <location filename="../src/pages/appintopage.ui" line="244"/>
-        <location filename="../src/pages/appintopage.cpp" line="171"/>
-        <location filename="../src/pages/appintopage.cpp" line="308"/>
-        <location filename="../src/pages/appintopage.cpp" line="416"/>
+        <location filename="../src/pages/appintopage.cpp" line="160"/>
+        <location filename="../src/pages/appintopage.cpp" line="226"/>
+        <location filename="../src/pages/appintopage.cpp" line="368"/>
        <source>Download</source>
        <translation type="unfinished"></translation>
    </message>
@@ -175,51 +175,51 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="45"/>
+        <location filename="../src/pages/appintopage.cpp" line="87"/>
        <source>Click Open</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="110"/>
+        <location filename="../src/pages/appintopage.cpp" line="96"/>
        <source>Developer Mode Disabled</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="156"/>
-        <location filename="../src/pages/appintopage.cpp" line="324"/>
-        <location filename="../src/pages/appintopage.cpp" line="386"/>
+        <location filename="../src/pages/appintopage.cpp" line="145"/>
+        <location filename="../src/pages/appintopage.cpp" line="242"/>
+        <location filename="../src/pages/appintopage.cpp" line="339"/>
        <source>Reinstall</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="163"/>
+        <location filename="../src/pages/appintopage.cpp" line="152"/>
        <source>Upgrade</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="313"/>
-        <location filename="../src/pages/appintopage.cpp" line="371"/>
+        <location filename="../src/pages/appintopage.cpp" line="231"/>
+        <location filename="../src/pages/appintopage.cpp" line="327"/>
        <source>Install</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="318"/>
+        <location filename="../src/pages/appintopage.cpp" line="236"/>
        <source>Installing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="420"/>
-        <location filename="../src/pages/appintopage.cpp" line="433"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
+        <location filename="../src/pages/appintopage.cpp" line="383"/>
        <source>Spark Store</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="420"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
        <source>Uninstall succeeded</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="433"/>
+        <location filename="../src/pages/appintopage.cpp" line="383"/>
        <source>The URL has been copied to the clipboard</source>
        <translation type="unfinished"></translation>
    </message>
@@ -240,12 +240,12 @@
 <context>
    <name>DAboutDialog</name>
    <message>
-        <location filename="../src/application.cpp" line="90"/>
+        <location filename="../src/application.cpp" line="88"/>
        <source>Version: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="97"/>
+        <location filename="../src/application.cpp" line="95"/>
        <source>%1 is released under %2</source>
        <translation type="unfinished"></translation>
    </message>
@@ -452,32 +452,32 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="165"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="45"/>
        <source>Submit App</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="166"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="46"/>
        <source>Submit App with client(Recommanded)</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="167"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="47"/>
        <source>Settings</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="48"/>
        <source>APP Upgrade and Install Settings</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="127"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="161"/>
        <source>Spark Store</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="132"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="162"/>
        <source>Search or enter spk://</source>
        <translation type="unfinished"></translation>
    </message>
@@ -485,19 +485,19 @@
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/application.cpp" line="28"/>
-        <location filename="../src/application.cpp" line="29"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="107"/>
+        <location filename="../src/application.cpp" line="26"/>
+        <location filename="../src/application.cpp" line="27"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="22"/>
        <source>Spark Store</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="33"/>
+        <location filename="../src/application.cpp" line="31"/>
        <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="94"/>
+        <location filename="../src/application.cpp" line="92"/>
        <source>Spark Project</source>
        <translation type="unfinished"></translation>
    </message>
@@ -506,11 +506,6 @@
        <source>Download list</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="221"/>
-        <source>Show MainWindow</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
@@ -615,17 +610,4 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
-<context>
-    <name>TitleBarMenu</name>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="222"/>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="223"/>
-        <source>Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
--- a/translations/spark-store_zh_CN.ts
+++ b/translations/spark-store_zh_CN.ts
@@ -10,9 +10,9 @@
    </message>
    <message>
        <location filename="../src/pages/appintopage.ui" line="244"/>
-        <location filename="../src/pages/appintopage.cpp" line="171"/>
-        <location filename="../src/pages/appintopage.cpp" line="308"/>
-        <location filename="../src/pages/appintopage.cpp" line="416"/>
+        <location filename="../src/pages/appintopage.cpp" line="160"/>
+        <location filename="../src/pages/appintopage.cpp" line="226"/>
+        <location filename="../src/pages/appintopage.cpp" line="368"/>
        <source>Download</source>
        <translation>下载</translation>
    </message>
@@ -131,7 +131,7 @@
        <location filename="../src/pages/appintopage.ui" line="429"/>
        <location filename="../src/pages/appintopage.ui" line="432"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;支持Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;支持Ubuntu 22.04&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
        <location filename="../src/pages/appintopage.ui" line="543"/>
@@ -175,51 +175,51 @@
        <translation>软件官网</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="45"/>
+        <location filename="../src/pages/appintopage.cpp" line="87"/>
        <source>Click Open</source>
        <translation>点击跳转</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="110"/>
+        <location filename="../src/pages/appintopage.cpp" line="96"/>
        <source>Developer Mode Disabled</source>
        <translation>开发者模式未开启</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="156"/>
-        <location filename="../src/pages/appintopage.cpp" line="324"/>
-        <location filename="../src/pages/appintopage.cpp" line="386"/>
+        <location filename="../src/pages/appintopage.cpp" line="145"/>
+        <location filename="../src/pages/appintopage.cpp" line="242"/>
+        <location filename="../src/pages/appintopage.cpp" line="339"/>
        <source>Reinstall</source>
        <translation>重新安装</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="163"/>
+        <location filename="../src/pages/appintopage.cpp" line="152"/>
        <source>Upgrade</source>
        <translation>升级</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="313"/>
-        <location filename="../src/pages/appintopage.cpp" line="371"/>
+        <location filename="../src/pages/appintopage.cpp" line="231"/>
+        <location filename="../src/pages/appintopage.cpp" line="327"/>
        <source>Install</source>
        <translation>安装</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="318"/>
+        <location filename="../src/pages/appintopage.cpp" line="236"/>
        <source>Installing</source>
        <translation>正在安装</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="420"/>
-        <location filename="../src/pages/appintopage.cpp" line="433"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
+        <location filename="../src/pages/appintopage.cpp" line="383"/>
        <source>Spark Store</source>
        <translation>星火应用商店</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="420"/>
+        <location filename="../src/pages/appintopage.cpp" line="372"/>
        <source>Uninstall succeeded</source>
        <translation>卸载成功</translation>
    </message>
    <message>
-        <location filename="../src/pages/appintopage.cpp" line="433"/>
+        <location filename="../src/pages/appintopage.cpp" line="383"/>
        <source>The URL has been copied to the clipboard</source>
        <translation>链接已复制到剪贴板</translation>
    </message>
@@ -240,12 +240,12 @@
 <context>
    <name>DAboutDialog</name>
    <message>
-        <location filename="../src/application.cpp" line="90"/>
+        <location filename="../src/application.cpp" line="88"/>
        <source>Version: %1</source>
        <translation>版本：%1</translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="97"/>
+        <location filename="../src/application.cpp" line="95"/>
        <source>%1 is released under %2</source>
        <translation>%1遵循%2协议发布</translation>
    </message>
@@ -452,32 +452,32 @@
        <translation>更新</translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="165"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="45"/>
        <source>Submit App</source>
        <translation>投递应用</translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="166"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="46"/>
        <source>Submit App with client(Recommanded)</source>
        <translation>使用本地投稿器投递应用（推荐）</translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="167"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="47"/>
        <source>Settings</source>
        <translation>设置</translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="168"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="48"/>
        <source>APP Upgrade and Install Settings</source>
        <translation>应用更新和安装设置</translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="127"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="161"/>
        <source>Spark Store</source>
        <translation>星火应用商店</translation>
    </message>
    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="132"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="162"/>
        <source>Search or enter spk://</source>
        <translation>搜索或打开链接</translation>
    </message>
@@ -485,19 +485,19 @@
 <context>
    <name>QObject</name>
    <message>
-        <location filename="../src/application.cpp" line="28"/>
-        <location filename="../src/application.cpp" line="29"/>
-        <location filename="../src/mainwindow-dtk.cpp" line="107"/>
+        <location filename="../src/application.cpp" line="26"/>
+        <location filename="../src/application.cpp" line="27"/>
+        <location filename="../src/mainwindow-dtk.cpp" line="22"/>
        <source>Spark Store</source>
        <translation>星火应用商店</translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="33"/>
+        <location filename="../src/application.cpp" line="31"/>
        <source>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;An appstore powered by community&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;Spark developers&lt;/span&gt;</source>
        <translation>&lt;span style=&apos; font-size:10pt;font-weight:60;&apos;&gt;一款由社区提供的应用商店&lt;/span&gt;&lt;br/&gt;&lt;a href=&apos;https://www.spark-app.store/&apos;&gt;https://www.spark-app.store&lt;/a&gt;&lt;br/&gt;&lt;span style=&apos; font-size:12pt;&apos;&gt;星火计划开发者&lt;/span&gt;</translation>
    </message>
    <message>
-        <location filename="../src/application.cpp" line="94"/>
+        <location filename="../src/application.cpp" line="92"/>
        <source>Spark Project</source>
        <translation>星火计划</translation>
    </message>
@@ -506,11 +506,6 @@
        <source>Download list</source>
        <translation>下载列表</translation>
    </message>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="221"/>
-        <source>Show MainWindow</source>
-        <translation>显示主窗口</translation>
-    </message>
 </context>
 <context>
    <name>SettingsPage</name>
@@ -615,17 +610,4 @@
        <translation>缓存目录已清空</translation>
    </message>
 </context>
-<context>
-    <name>TitleBarMenu</name>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="222"/>
-        <source>About</source>
-        <translation>关于</translation>
-    </message>
-    <message>
-        <location filename="../src/mainwindow-dtk.cpp" line="223"/>
-        <source>Exit</source>
-        <translation>退出</translation>
-    </message>
-</context>
 </TS>
Author	SHA1	Message	Date
shenmo	41a6a3fc04	!181 4.2.1 Merge pull request !181 from shenmo/dev	2023-01-27 09:51:15 +00:00
shenmo	682a6e38d6	!180 4.2 正式 Merge pull request !180 from shenmo/dev	2023-01-16 09:11:11 +00:00
shenmo	36d273dd5e	!179 4.1.2 正式版 Merge pull request !179 from shenmo/dev	2023-01-06 09:43:45 +00:00
shenmo	8850cfd4a3	update dtk-build-release-tag-20220425.yml	2022-12-25 07:45:19 +00:00
shenmo	bec8a14baf	!177 将默认的README改为英文 Merge pull request !177 from shenmo/dev	2022-12-25 04:46:51 +00:00
shenmo	8918e63484	!171 4.1.1-real Merge pull request !171 from shenmo/dev	2022-12-21 16:18:05 +00:00