Compare commits

..

28 Commits
4.8.0 ... 4.3.1

Author SHA1 Message Date
42cafb7487 !293 431
Merge pull request !293 from shenmo/dev
2024-10-14 06:23:34 +00:00
fd7fa2da30 !290 43f5
Merge pull request !290 from shenmo/dev
2024-09-23 05:04:07 +00:00
102f35b0cf !286 430
Merge pull request !286 from shenmo/dev
2024-08-19 08:33:46 +00:00
7a25c3c542 !279 4.3
Merge pull request !279 from shenmo/dev
2024-08-17 06:16:52 +00:00
c6aea69d86 !274 4213
Merge pull request !274 from shenmo/dev
2024-06-23 07:50:19 +00:00
132c2cf35f !272 readme
Merge pull request !272 from shenmo/dev
2024-06-20 04:06:15 +00:00
3da39f1276 !269 4213
Merge pull request !269 from shenmo/dev
2024-06-20 04:03:00 +00:00
e08c7a37bd !266 LICENSE sync
Merge pull request !266 from shenmo/dev
2024-04-28 15:07:24 +00:00
c55529aa8c !261 4212
Merge pull request !261 from shenmo/dev
2024-04-27 11:12:57 +00:00
5cbc41f1ce !256 4.2.11
Merge pull request !256 from shenmo/dev
2024-04-17 08:57:35 +00:00
6c108aecca !253 4210 x86
Merge pull request !253 from shenmo/dev
2024-01-11 15:29:45 +00:00
7cd2977032 !250 429
Merge pull request !250 from shenmo/dev
2023-11-15 10:17:51 +00:00
94a6532509 !244 4281
Merge pull request !244 from shenmo/dev
2023-11-02 14:41:03 +00:00
9acf7cc8d4 !242 428
Merge pull request !242 from shenmo/dev
2023-10-31 14:35:54 +00:00
75b73088b4 !238 4273
Merge pull request !238 from shenmo/dev
2023-09-17 00:49:44 +00:00
dd0629bc8d !235 4272
Merge pull request !235 from shenmo/dev
2023-09-13 10:25:17 +00:00
39be4cdf6f !233 4271+1
Merge pull request !233 from shenmo/dev
2023-09-01 14:59:52 +00:00
fc58de0325 !230 4271
Merge pull request !230 from shenmo/dev
2023-08-31 14:58:24 +00:00
ba00b208f0 !228 4.2.7
Merge pull request !228 from shenmo/dev
2023-08-14 04:38:46 +00:00
2cca83a34b !226 4266
Merge pull request !226 from shenmo/dev
2023-08-02 03:41:43 +00:00
ea7baa9ab0 !224 4265
Merge pull request !224 from shenmo/dev
2023-07-24 08:03:03 +00:00
c228706144 !222 4264 社群入口修复
Merge pull request !222 from shenmo/dev
2023-07-13 03:01:38 +00:00
c030bf9e6e !220 4263
Merge pull request !220 from shenmo/dev
2023-07-05 03:59:36 +00:00
9ac0c67a25 !216 4262
Merge pull request !216 from shenmo/dev
2023-04-25 14:07:41 +00:00
fd4b52e384 !214 426
Merge pull request !214 from shenmo/dev
2023-04-22 05:58:34 +00:00
db79a59fb6 !212 4251
Merge pull request !212 from shenmo/dev
2023-04-20 12:46:27 +00:00
6891fc5b87 !211 4.2.5
Merge pull request !211 from shenmo/dev
2023-04-12 05:20:09 +00:00
62f52451b7 !210 424
Merge pull request !210 from shenmo/dev
2023-03-23 06:25:48 +00:00
120 changed files with 2550 additions and 4148 deletions

View File

@@ -7,7 +7,7 @@ import json
sha = os.getenv("GIT_COMMIT")
# sha = '48fed26c51a8c42554e45f72f43e49703e04c97f'
#get sha from environment
url = "https://gitee.com/api/v5/repos/spark-store-project/spark-store/commits/{}/comments".format(sha)
url = "https://gitee.com/api/v5/repos/deepin-community-store/spark-store/commits/{}/comments".format(sha)
token = os.getenv("gitee_token")

View File

@@ -1,13 +0,0 @@
name: Building Program
run-name: Building ${{ GITHUB.REPOSITORY }}
on:
workflow_dispatch:
push:
tags:
- "*"
jobs:
call:
uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master
secrets: inherit

2
.gitignore vendored
View File

@@ -53,4 +53,4 @@ debian/*.substvars
debian/spark-store
.vscode/*
obj-*
src/spark-store

View File

@@ -18,28 +18,22 @@ stages:
name: execute_by_docker
displayName: 基于镜像的DTK构建
certificate: ''
image: docker.jianmuhub.com/library/debian:buster
image: docker.io/debian:buster
command:
- sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list
- '# 换源'
- apt update
- export DEBIAN_FRONTEND=noninteractive
- echo "安装依赖..."
- 'apt install libgsettings-qt-dev -y '
- 'apt install debhelper git curl fakeroot qtbase5-dev zlib1g-dev qt5-default -y '
- echo "安装git devscripts equivs curl..."
- 'apt install git devscripts equivs curl -y '
- git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git
- cd dtk-old-bundle
- apt install ./*.deb -y
- cd ..
- rm -rf dtk-old-bundle
- ''
- '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" '
- apt build-dep . -y
- strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5
- uname -a
- sed -i 's/dh \$@ --parallel/dh \$@/' debian/rules
- '# Gitee的配置太低了'
- dpkg-buildpackage -b -us -uc
- 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" '
- dpkg-buildpackage -j2 -b -us -uc
- cd ..
- ls -all
- pwd

View File

@@ -34,7 +34,7 @@ stages:
- tar -xf DEBIANARM.tar.xz
- mkdir -p DEBIAN/root/build-spark
- mv ../spark-store-git DEBIAN/root/build-spark/spark-store
- wget https://gitee.com/spark-store-project/repo_auto_update_script/raw/master/spark-build-aarch64.sh && mv spark-build-aarch64.sh DEBIAN/root
- wget https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/spark-build-aarch64.sh && mv spark-build-aarch64.sh DEBIAN/root
- mv /usr/bin/qemu-aarch64-static DEBIAN/
- chroot DEBIAN /qemu-aarch64-static /bin/bash /root/spark-build-aarch64.sh
- ''

View File

@@ -30,7 +30,7 @@
`{SOURCE_URL}/{ARCH}/{CATOGARY}/applist.json`
说明SOURCE_URL线路链接目前推荐 https://cdn.d.store.deepinos.org.cn你也可以使用其他的星火线路
ARCH架构文件夹 x86是store或amd64-storearm是aarch64-store。特别的如果你使用非https://cdn.d.store.deepinos.org.cn的线路你可能会发现amd64-store会返回404因为不是所有的服务器都支持软连接
CATOGARY分类目录。参考 https://gitee.com/spark-store-project/spark-store/blob/dev/DOCS/spk-doc.md 中 store 直达的对应关系
CATOGARY分类目录。参考 https://gitee.com/deepin-community-store/spark-store/blob/dev/DOCS/spk-doc.md 中 store 直达的对应关系
例子https://cdn.d.store.deepinos.org.cn/aarch64-store/tools/applist.json

View File

@@ -4,4 +4,4 @@
为方便使用(其实是早期屎山使然),请将仓库放置于 `/home/ftp/spark-store`
仓库管理相关代码请移步 [这里](https://gitee.com/spark-store-project/repo_auto_update_script)update.sh请联系 @shenmo 获取
仓库管理相关代码请移步 [这里](https://gitee.com/deepin-community-store/repo_auto_update_script)update.sh请联系 @shenmo 获取

6
FAQ.md
View File

@@ -8,7 +8,7 @@ The Spark App Store is an application store aimed at Linux users and supports mu
### Communication and Feedback
**Q: Where can I join the community group?**
**A:** You can click [here](https://bbs.spark-app.store/) to enter the main communication platform of the Spark Store.
**A:** You can click [here](https://www.deepinos.org/) to enter the main communication platform of the Spark Store.
> ⚠️ If the above link doesn't work, you can also join our QQ groups as an alternative. The group numbers are 872690351 and 865927727. We also offer forums for communication.
#### Differences Between arm64 and amd64
@@ -79,12 +79,12 @@ Linux:
### Reporting Issues and Removing Apps
**Q: Some apps are outdated or inactive, and I want them removed**
**A:** You can report issues [here](https://gitee.com/spark-store-project/software_-issue).
**A:** You can report issues [here](https://gitee.com/deepin-community-store/software_-issue).
---
### Installing Spark App Store
If you wish to install the Spark App Store, please visit the [Release page](https://gitee.com/spark-store-project/spark-store/releases), find the latest version, and choose the package suitable for your current system.
If you wish to install the Spark App Store, please visit the [Release page](https://gitee.com/deepin-community-store/spark-store/releases), find the latest version, and choose the package suitable for your current system.
> ⚠️ Special Note: If you are using Debian10/Debian11 or Ubuntu 20.04, you may need to download additional dependency packages. After downloading, unzip multiple times until you see the software user guide. For operating systems later than Ubuntu 22.04, you do not need to install dependency packages. Just follow the steps above to install the main program directly.

View File

@@ -8,7 +8,7 @@
### 交流与反馈
**Q: 在哪进交流群?**
**A:** 你可以点击[这里](https://bbs.spark-app.store/)进入星火商店的主交流平台。
**A:** 你可以点击[这里](https://www.deepinos.org/)进入星火商店的主交流平台。
> ⚠️ 如果上面的链接无法使用,你还可以加入我们的 QQ 群作为备选方案,群号是 872690351 和 865927727。我们还提供论坛作为交流平台。
arm64与amd64的区别
@@ -78,12 +78,12 @@ Linux
### 报告问题和应用下架
**Q: 有些应用已经过时或者失效了,我想让他下架**
**A:** 你可以前往 [这里](https://gitee.com/spark-store-project/software_-issue) 报告问题。
**A:** 你可以前往 [这里](https://gitee.com/deepin-community-store/software_-issue) 报告问题。
---
### 安装星火应用商店
如果你想安装星火应用商店,请打开[Release页面](https://gitee.com/spark-store-project/spark-store/releases),找到最新版本,并选择适用于当前系统的安装包下载。
如果你想安装星火应用商店,请打开[Release页面](https://gitee.com/deepin-community-store/spark-store/releases),找到最新版本,并选择适用于当前系统的安装包下载。
> ⚠️ 特别提示: 如果你在使用 Debian10/Debian11 或 Ubuntu 20.04,你可能额外下载依赖补充包。您需要在下载完依赖包后,解压多次一直到看到内部的软件使用说明,对于 Ubuntu22.04 以后的操作系统版本,您无需安装依赖包,您需要按照上面的操作直接安装本体程序。

View File

@@ -25,7 +25,7 @@ To improve this situation, we have launched this app store. We have broadly incl
We warmly welcome you to join our development team. Whether you want to participate in development or submit applications, you can find your place here to jointly promote the development of the Linux application ecosystem.
You can track our Issue handling status in real-time through the following link: [Issue Board](https://gitee.com/spark-store-project/spark-store/board).
You can track our Issue handling status in real-time through the following link: [Gitee Issue Board](https://gitee.com/spark-store-project/spark-store/board).
If you have a software package you'd like to submit, please [click here to submit](https://upload.deepinos.org.cn/index).
@@ -152,13 +152,13 @@ You will see an output, and that's your system architecture.
Please refer to the [Spark App Store FAQ and Support Guide](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md).
To customly configure aptss, refer to [aptss](https://gitee.com/GXDE-OS/aptss)
You can also check the [Chinese version](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md) here.
---
## Contact and Feedback
- If you have any questions or suggestions, please submit them via email or on our [Issue Page](https://gitee.com/spark-store-project/spark-store/issues).
- If you have any questions or suggestions, please submit them via email or on our [Gitee page](https://gitee.com/spark-store-project/spark-store/issues).
- If you want to follow our development progress, you can go to the [Spark App Store Board](https://gitee.com/spark-store-project/spark-store/board) for more information.
- Our [Forum](https://bbs.spark-app.store/)
- Our [QQ Group](https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/)

View File

@@ -1,6 +1,6 @@
# 星火应用商店
[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers) [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members)
![star](https://gitcode.com/spark-store-project/spark-store/star/badge.svg)
## 简介
@@ -39,7 +39,7 @@ https://github.com/spark-store-project/spark-store
我们热忱欢迎您加入我们的开发团队。无论您是想参与开发还是想提交应用都能在这里找到属于您的一席之地共同推动Linux应用生态的发展。
您可以通过以下链接实时跟踪我们的Issue处理状态[Issue看板](https://gitee.com/spark-store-project/spark-store/board)。
您可以通过以下链接实时跟踪我们的Issue处理状态[Gitee Issue看板](https://gitee.com/spark-store-project/spark-store/board)。
若您有软件包想要提交,敬请 [点击此处进行投稿](https://wiki.spark-app.store/#/Submit/Submit)。
@@ -171,17 +171,15 @@ https://github.com/spark-store-project/spark-store
## 常见问题FAQ
请参见[星火应用商店FAQ与支持指南](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md)。
自定义配置 aptss config 请参阅 [aptss](https://gitee.com/GXDE-OS/aptss)
请参见[星火应用商店FAQ与支持指南](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.md)。
在这里可以查阅[中文版本](https://gitee.com/spark-store-project/spark-store/blob/dev/FAQ.zh.md)。
---
## 联系与反馈
- 如果您有任何问题或建议,请通过邮件或在[Issue 页面](https://gitee.com/spark-store-project/spark-store/issues)上提交问题。
- 如果您有任何问题或建议,请通过邮件或在[Gitee页面](https://gitee.com/spark-store-project/spark-store/issues)上提交问题。
- 如果你想关注我们的开发进度,可以跳转[星火应用商店Board](https://gitee.com/spark-store-project/spark-store/board)获取更多信息。
- 我们的[论坛](https://bbs.spark-app.store/)
- 我们的QQ群 872690351

81
debian/changelog vendored
View File

@@ -1,70 +1,3 @@
spark-store (4.8.0) UNRELEASED; urgency=medium
* ssinstall重写支持安装到ACE和自动安装到ACE支持只允许安装到本地
* 商店支持展示ACE标识支持识别 native amber-ce-bookworm amber-ce-trixie amber-ce-sid amber-ce-deepin23
* 投稿器支持新版spec
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.5.2) UNRELEASED; urgency=medium
* 支持安装到 ACE Bookworm
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.5.1) UNRELEASED; urgency=medium
* 修复 aptss 部分报错
* 重新设计了 Tag 区的展示方式
* 新增 Fish 补全
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.5.0) UNRELEASED; urgency=medium
* 支持从商店中直接启动应用
* ssinstall 修复安装时不再指定版本号以避免出现问题
* aptss支持fish补全
* 修复: distrobox下无法正常校验应用hash
* aptss 4.5.0
* 应用更新新增进度条
* 支持识别Debian
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.3.3.2) UNRELEASED; urgency=medium
* 提升升级工具体验,不再反复弹窗
* 提升aptss使用体验汇报目前所在阶段而不是卡住不动
* 修复debian sid 无法卸载
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.3.3.1) UNRELEASED; urgency=medium
* 修复点击更新需要输入密码的问题
* 修复安装速度下降的问题
* 修复闪退问题
* 修复错误地展示已安装
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.3.2.0) UNRELEASED; urgency=medium
* 后续更新请从4.3.2.0版本号开始4.3.2版本仅用于GXDE测试
* 支持dummyapps 安装包安装
* 支持紧凑模式
* 修复部分情况下升级安装失败的问题
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.3.2) UNRELEASED; urgency=medium
* ssinstall支持安装conflict包
* 支持紧凑模式
-- shenmo <shenmo@spark-app.store> Tue, 24 Sep 2024 11:27:08 +0800
spark-store (4.3.1) UNRELEASED; urgency=medium
* 修复自提权更新问题
@@ -214,7 +147,7 @@ spark-store (4.2.7.3) stable; urgency=medium
* 修复aptss现在会正确地透传错误码而不是exit 0
* 修复下载时如果卡0%(无法下载metalink),会在超时后报错中断而不是一直傻等
* 修复排队下载时CPU占满单核的bug https://gitee.com/spark-store-project/spark-store/issues/I7B91V
* 修复排队下载时CPU占满单核的bug https://gitee.com/deepin-community-store/spark-store/issues/I7B91V
* 修复在终端中打开的icon过大导致无法投稿到UOS
* 修复v23下编译出错
* 薪怎:支持崩溃日志收集系统
@@ -451,7 +384,7 @@ spark-store (4.2.3~test2) stable; urgency=medium
spark-store (4.2.3~test1) stable; urgency=medium
* 修复因判断安装状态错误创建多个相同任务的bug
* 测试中:尝试修复安装结束的闪退问题 https://gitee.com/spark-store-project/spark-store/commit/cb093dcc2bb0a193db89aa0ce5f20ea9cc5d56eb
* 测试中:尝试修复安装结束的闪退问题 https://gitee.com/deepin-community-store/spark-store/commit/cb093dcc2bb0a193db89aa0ce5f20ea9cc5d56eb
* 修复Deepin 显示开发者模式未开启
* 修复:从托盘打开主窗口时透明度动画不流畅
* 修复:主窗口关闭后,从托盘打开关于窗口会被主窗口遮挡
@@ -533,8 +466,8 @@ spark-store (4.1.2) stable; urgency=medium
* chore: 去除安装依赖:g++
* fix: 修复下载列表中进度提示文字显示不完整的问题
* feat: ssinstall支持从单独文件夹中校验软件包
* feat 支持分单文件夹下载。具体内容参见https://gitee.com/spark-store-project/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
* info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准,参见 https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 不过shenmo是自由的
* feat 支持分单文件夹下载。具体内容参见https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
* info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准,参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo?id=%e6%9b%b4%e6%96%b0%e6%97%a5%e5%bf%97%e8%a7%84%e5%88%99 不过shenmo是自由的
* chore: 添加 Application 类,继承 DApplication将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行
@@ -553,8 +486,8 @@ spark-store (4.1.2) stable; urgency=medium
spark-store (4.1.2~test2) stable; urgency=medium
* feat: ssinstall支持从单独文件夹中校验软件包
* feat 支持分单文件夹下载。具体内容参见https://gitee.com/spark-store-project/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
* info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准,参见 https://wiki.spark-app.store/#/Dev/Spark-Store-Git-Repo 不过shenmo是自由的
* feat 支持分单文件夹下载。具体内容参见https://gitee.com/deepin-community-store/repo_auto_update_script/blob/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list
* info: 非常感谢 @jwyh 对星火商店代码仓库设计了很多标准,参见 https://deepin-community-store.gitee.io/spark-wiki/#/Dev/Spark-Store-Git-Repo 不过shenmo是自由的
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800
@@ -765,7 +698,7 @@ spark-store (3.2.4) stable; urgency=medium
spark-store (3.2.4~test4) stable; urgency=medium
* 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/spark-store-project/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
* 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/deepin-community-store/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c
-- shenmo <shenmo@spark-app.store> Fri, 30 Jan 2022 00:00:00 +0800

3
debian/control vendored
View File

@@ -30,7 +30,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
libnotify-bin,
qtwayland5,
desktop-file-utils,
dpkg-dev,
lsb-release,
dpkg-dev
Description: Spark Store
A community powered app store, based on DTK.

2
debian/copyright vendored
View File

@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: spark-store
Source: https://gitee.com/spark-store-project/spark-store
Source: https://gitee.com/deepin-community-store/spark-store
Files: *
Copyright: The Spark Project Developers

4
debian/rules vendored
View File

@@ -36,6 +36,4 @@ override_dh_auto_install:
# Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols)
# Qt Mutidedia lib will ref to network libraray.
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0 --exclude=opt/durapps/spark-store/bin/ss-feedback/
override_dh_strip:
dh_strip --exclude=opt/durapps/spark-store/bin/ss-feedback/
dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0

View File

@@ -1 +1 @@
3.0 (native)
1.0

View File

@@ -51,7 +51,7 @@ for username in `ls /home`
# Remove gpg key file
rm -f /etc/apt/trusted.gpg.d/spark-store.gpg
apt-key del '9D9A A859 F750 24B1 A1EC E16E 0E41 D354 A29A 440C' || true
apt-key del '9D9A A859 F750 24B1 A1EC E16E 0E41 D354 A29A 440C'
else
if [ ! -z "`pidof spark-store`" ] ; then

View File

@@ -5,7 +5,7 @@
> 用于 zinface-community-cmake-build-system.patch 补丁化构建方式
```shell
git clone https://gitee.com/spark-store-project/spark-store
git clone https://gitee.com/deepin-community-store/spark-store
cd spark-store
git am < patchs/zinface-community-cmake-build-system.patch
make package

View File

@@ -2,14 +2,13 @@
Description=Spark Store update notifier
After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
[Service]
Type=simple
RemainAfterExit=yes
RemainAfterExit=yes
ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
Restart=on-failure
RestartSec=15 # 可以设置为更长的重试间隔,比如 15 秒或 30 秒
StartLimitIntervalSec=1h # 设置为 1 小时的时间窗口
StartLimitBurst=3 # 最大允许失败次数为 3 次
RestartSec=10
[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target

View File

@@ -40,7 +40,7 @@ _aptss()
"list"
"search"
"show" "showsrc"
"install" "remove" "purge" "autoremove" "autopurge"
"install" "remove" "purge" "autoremove"
"update"
"upgrade" "full-upgrade" "dist-upgrade"
"edit-sources"

View File

@@ -1,242 +0,0 @@
# 清除已有的 aptss 补全(如果有的话)
complete -c aptss -e
# 禁用默认的文件补全(避免显示当前目录文件)
complete -c aptss -f
########################################################################
# aptss Fish 补全脚本(中文说明版,软件包补全显示简介)
#
# 说明:
# 1. 子命令和选项的说明采用中文显示。
# 2. 软件包补全部分不再调用 apt-cache而是解析 aptss 自有的软件源索引文件,
# 从 /var/lib/aptss/lists/*Packages或 *Sources中提取软件包名称及简介信息。
#
# 注意:如果你的 aptss 软件源索引文件位置或格式有变化,请相应修改下面的 awk 命令。
########################################################################
### 辅助函数
# 解析 /var/lib/aptss/lists/*Packages 文件,输出符合当前输入前缀的“软件包<TAB>简介”
function __fish_aptss_print_packages
set cur (commandline -ct)
# 将所有匹配的 Packages 文件拼接后,用 awk 分段解析RS="" 表示以空行为分段)
awk -v cur="$cur" '
BEGIN { RS=""; FS="\n" }
{
pkg = ""; desc = "";
for(i=1; i<=NF; i++){
if($i ~ /^Package: /) { pkg = substr($i, 10) } # “Package: ”共9个字符
else if($i ~ /^Description: /) { desc = substr($i, 14) } # “Description: ”共13个字符
}
if(pkg != "" && (cur == "" || pkg ~ ("^" cur))) {
print pkg "\t" desc
}
}
' /var/lib/aptss/lists/*Packages 2>/dev/null
end
# 解析已安装软件包(这里仍使用 dpkg-query如果需要使用 aptss 数据,可另外构造)
function __fish_aptss_print_installed_packages
set cur (commandline -ct)
dpkg-query -W -f='${Package}\t${Description}\n' 2>/dev/null | grep -i "^$cur"
end
# 解析 /var/lib/aptss/lists/*Sources 文件,输出源代码包信息(如果存在)
function __fish_aptss_print_source_packages
set cur (commandline -ct)
awk -v cur="$cur" '
BEGIN { RS=""; FS="\n" }
{
pkg = ""; desc = "";
for(i=1; i<=NF; i++){
if($i ~ /^Package: /) { pkg = substr($i, 10) }
else if($i ~ /^Description: /) { desc = substr($i, 14) }
}
if(pkg != "" && (cur == "" || pkg ~ ("^" cur))) {
print pkg "\t" desc
}
}
' /var/lib/aptss/lists/*Sources 2>/dev/null
end
# 翻译子命令为中文说明(用于补全时显示在括号内)
function __fish_translate_aptss_cmd
switch $argv[1]
case ssupdate
echo "更新软件源"
case list
echo "列出软件包"
case search
echo "搜索软件包"
case show
echo "显示软件包信息"
case showsrc
echo "显示源包信息"
case install
echo "安装软件包"
case remove
echo "移除软件包"
case purge
echo "彻底移除软件包"
case autoremove
echo "自动移除不必要的软件包"
case update
echo "更新软件包列表"
case upgrade
echo "升级软件包"
case full-upgrade
echo "完全升级(可能移除其他软件包)"
case dist-upgrade
echo "发行版升级"
case edit-sources
echo "编辑软件源列表"
case help
echo "显示帮助信息"
case source
echo "下载源代码包"
case build-dep
echo "安装构建依赖"
case clean
echo "清除软件包缓存"
case autoclean
echo "自动清理旧缓存"
case download
echo "下载软件包"
case changelog
echo "显示更新日志"
case moo
echo "彩蛋"
case depends
echo "显示软件包依赖"
case rdepends
echo "显示软件包逆向依赖"
case policy
echo "显示软件包策略"
case '*'
echo $argv[1]
end
end
### 定义各类子命令组
# 所有子命令列表
set -g __aptss_commands ssupdate list search show showsrc install remove purge autoremove update upgrade full-upgrade dist-upgrade edit-sources help source build-dep clean autoclean download changelog moo depends rdepends policy
# 需要补全二进制软件包名称的子命令(例如 install、show、search、download、changelog、depends、rdepends
set -l __aptss_pkg_subcmds install show search download changelog depends rdepends
# 需要补全已安装软件包的子命令(例如 remove、purge、autoremove
set -l __aptss_installed_pkg_subcmds remove purge autoremove
# 需要补全源代码包的子命令(例如 source、build-dep、showsrc、policy
set -l __aptss_src_pkg_subcmds source build-dep showsrc policy
### 子命令补全
# 未输入子命令时,显示所有候选子命令,并在括号中显示中文说明
for cmd in $__aptss_commands
set desc (__fish_translate_aptss_cmd $cmd)
complete -c aptss -a $cmd -d "$desc" -n "not __fish_seen_subcommand_from $__aptss_commands"
end
### 公共选项(适用于一组子命令)
set -l group1 "install remove purge upgrade dist-upgrade full-upgrade autoremove"
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l show-progress -d '显示进度'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-broken -d '修复损坏的依赖'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l purge -d '清除配置文件'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l verbose-versions -d '显示详细版本'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l auto-remove -d '自动移除依赖'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -s s -l simulate -d '模拟/试运行'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l download -d '下载软件包'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-missing -d '修复丢失文件'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l fix-policy -d '修复策略'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l ignore-hold -d '忽略锁定'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l force-yes -d '强制确认'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l trivial-only -d '仅处理简单情况'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l reinstall -d '重新安装'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l solver -d '使用求解器'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -s t -l target-release -d '目标版本'
# 附加的 GENERIC 选项
complete -c aptss -n "__fish_seen_subcommand_from $group1" -s d -l download-only -d '仅下载'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -s y -l assume-yes -d '默认确认'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -l assume-no -d '默认否定'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -s u -l show-upgraded -d '显示升级情况'
complete -c aptss -n "__fish_seen_subcommand_from $group1" -s m -l ignore-missing -d '忽略缺失'
### 针对各个子命令的专用选项
# update 命令
complete -c aptss -n "__fish_seen_subcommand_from update" -l list-cleanup -d '清理列表'
complete -c aptss -n "__fish_seen_subcommand_from update" -l print-uris -d '显示 URI'
complete -c aptss -n "__fish_seen_subcommand_from update" -l allow-insecure-repositories -d '允许不安全的仓库'
# list 命令
complete -c aptss -n "__fish_seen_subcommand_from list" -l installed -d '已安装的软件包'
complete -c aptss -n "__fish_seen_subcommand_from list" -l upgradable -d '可升级的软件包'
complete -c aptss -n "__fish_seen_subcommand_from list" -l manual-installed -d '手动安装的软件包'
complete -c aptss -n "__fish_seen_subcommand_from list" -s v -l verbose -d '详细模式'
complete -c aptss -n "__fish_seen_subcommand_from list" -s a -l all-versions -d '显示所有版本'
complete -c aptss -n "__fish_seen_subcommand_from list" -s t -l target-release -d '目标版本'
# show 命令
complete -c aptss -n "__fish_seen_subcommand_from show" -s a -l all-versions -d '显示所有版本'
# depends 和 rdepends 命令(逐项添加各选项)
for opt in i important installed pre-depends depends recommends suggests replaces breaks conflicts enhances recurse implicit
complete -c aptss -n "__fish_seen_subcommand_from depends rdepends" -l $opt -d $opt
end
complete -c aptss -n "__fish_seen_subcommand_from depends rdepends" -s i -d '选项 -i'
# search 命令
complete -c aptss -n "__fish_seen_subcommand_from search" -s n -l names-only -d '仅匹配名称'
complete -c aptss -n "__fish_seen_subcommand_from search" -s f -l full -d '全文搜索'
# showsrc 命令
complete -c aptss -n "__fish_seen_subcommand_from showsrc" -l only-source -d '仅显示源代码'
# source 命令
complete -c aptss -n "__fish_seen_subcommand_from source" -s s -l simulate -d '模拟'
complete -c aptss -n "__fish_seen_subcommand_from source" -s b -l compile -d '编译/构建'
complete -c aptss -n "__fish_seen_subcommand_from source" -s P -l build-profiles -d '构建配置'
complete -c aptss -n "__fish_seen_subcommand_from source" -l diff-only -d '仅显示差异'
complete -c aptss -n "__fish_seen_subcommand_from source" -l debian-only -d '仅限 Debian'
complete -c aptss -n "__fish_seen_subcommand_from source" -l tar-only -d '仅打包 tar'
complete -c aptss -n "__fish_seen_subcommand_from source" -l dsc-only -d '仅下载 DSC'
complete -c aptss -n "__fish_seen_subcommand_from source" -s t -l target-release -d '目标版本'
# build-dep 命令
complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s a -l host-architecture -d '主机架构'
complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s s -l simulate -d '模拟'
complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s P -l build-profiles -d '构建配置'
complete -c aptss -n "__fish_seen_subcommand_from build-dep" -s t -l target-release -d '目标版本'
complete -c aptss -n "__fish_seen_subcommand_from build-dep" -l purge -d '清除'
complete -c aptss -n "__fish_seen_subcommand_from build-dep" -l solver -d '求解依赖'
# moo 命令
complete -c aptss -n "__fish_seen_subcommand_from moo" -l color -d '彩蛋模式'
# clean 和 autoclean 命令
complete -c aptss -n "__fish_seen_subcommand_from clean autoclean" -s s -l simulate -d '模拟'
### 针对 -t/--target-release 的特殊补全
complete -c aptss -n '
begin
set -l prev (commandline -poc | string trim)
test "$prev" = "-t" -o "$prev" = "--target-release"
end
' -a '(__fish_aptss_target_release)' -d '目标版本'
### 软件包补全
# 对于需要二进制软件包名称的子命令,调用 __fish_aptss_print_packages
# 输出的每一行格式为 "包名<TAB>简介"Fish 会将 TAB 后内容显示为注释。
complete -c aptss -n "__fish_seen_subcommand_from $__aptss_pkg_subcmds" -a '(__fish_aptss_print_packages)'
# 对于 remove、purge、autoremove 命令,补全已安装的软件包(使用 dpkg-query 输出)
complete -c aptss -n "__fish_seen_subcommand_from $__aptss_installed_pkg_subcmds" -a '(__fish_aptss_print_installed_packages)' -d '已安装软件包'
# 对于 source、build-dep、showsrc、policy 命令,补全源代码包,
# 如果存在对应的 Sources 索引文件,则调用 __fish_aptss_print_source_packages
# 否则可考虑默认使用二进制包的索引。
complete -c aptss -n "__fish_seen_subcommand_from $__aptss_src_pkg_subcmds" -a '(__fish_aptss_print_source_packages)' -d '源代码包'

View File

@@ -1,6 +0,0 @@
#!/bin/bash
TRANSHELL_CONTENT_HASH_CHECK_FAILED="Failed in checking package hash! \nPossibly reason can be the package is broken, laggy in sync of Spark Store repository, or, there is a malware attempt to attack. \nIf you don't know what happend, please try install again after execute the command below\n sudo aptss update\n\nIf the problem still happen, please click APP Feedback button in the APP information page to feedback to us.\n\n If you are in the Audition GroupPlease use ssaudit instead of ssinstall to audit APPsfor ssinstall is used for password-free install now.\nIf you want to install an app that is removed from Spark Store repositoryyou can also use ssaudit."
TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="Please run ssinstall as root"
TRANSHELL_CONTENT_FILE_NOT_EXIST="File not exist"
TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB="No delete after install option given, will not delete the deb"
TRANSHELL_CONTENT_DEB_IS_DELETED="--delete-after-install option is given and the installation is succeeded, delete the deb file."

View File

@@ -1,6 +0,0 @@
#!/bin/bash
TRANSHELL_CONTENT_HASH_CHECK_FAILED="软件包校验失败!这不应该发生!\n可能是因为软件包已损坏星火仓库未同步或者最坏的情况恶意软件尝试利用自动安装来入侵系统\n如果你不清楚发生了什么请执行 sudo aptss update 后再尝试安装。\n如果问题仍然存在请在应用信息界面点击 应用反馈 来提交反馈给我们!\n\n 如果你是审核人员,请使用 ssaudit来替代ssinstall进行审核工作因为现在ssinstall已经被用于免密安装。\n如果你正在尝试安装已经下架的星火应用也可用ssaudit来替代ssinstall"
TRANSHELL_CONTENT_PLEASE_RUN_AS_ROOT="请使用root启动ssinstall"
TRANSHELL_CONTENT_FILE_NOT_EXIST="文件不存在"
TRANSHELL_CONTENT_WILL_NOT_DELETE_DEB="未指定安装后删除或安装出错不删除deb包"
TRANSHELL_CONTENT_DEB_IS_DELETED="使用了--delete-after-install选项且安装未出错删除deb包"

View File

@@ -40,9 +40,6 @@ qm.path = /usr/share/spark-store/translations
bash_completion.files += pkg/usr/share/bash-completion/completions/aptss
bash_completion.path = /usr/share/bash-completion/completions
fish_completion.files += pkg/usr/share/fish/completions/aptss.fish
fish_completion.path = /usr/share/fish/completions/
desktop.files += pkg/usr/share/applications/*.desktop
desktop.path = /usr/share/applications
@@ -76,6 +73,5 @@ INSTALLS += \
tmp \
service \
bash_completion \
fish_completion \
polkit-1
# 暂时不添加

View File

@@ -35,13 +35,14 @@ Application::Application(int &argc, char **argv)
setApplicationName("spark-store"); // 影响 ~/.config/spark-union ~/.local/share/spark-union 下文件夹名称
setApplicationDisplayName(QObject::tr("Spark Store")); // 设置窗口显示标题 (Wayland 下会显示 Qt 原生标题栏)
setProductName(QObject::tr("Spark Store"));
setProductIcon(QIcon(":/icon/sparky.png"));
setProductIcon(QIcon::fromTheme("spark-store"));
setApplicationHomePage("https://gitee.com/spark-store-project");
setApplicationDescription(
QObject::tr(
"<span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/>"
"<span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/>"));
setApplicationLicense(" <a href='https://gitee.com/spark-store-project/spark-store/blob/Flamescion/LICENSE'>GPL V3</a> ");
"<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>"
"<span style=' font-size:12pt;'>Spark developers</span>"));
setApplicationLicense(" <a href='https://gitee.com/spark-store-project/spark-store/blob/Flamescion/LICENSE'>Spark Opensource License</a> ");
// 检查 ~/.config/spark-union/spark-store 文件夹是否存在
checkAppConfigLocation();

View File

@@ -44,50 +44,24 @@
<file>icon/light/text.svg</file>
<file>icon/light/update.svg</file>
<file>icon/logo.svg</file>
<file>icon/sparky.png</file>
<file>json/features.json</file>
<file>tags/a2d_full.svg</file>
<file>tags/a2d-small.png</file>
<file>tags/a2d.png</file>
<file>tags/a2d.svg</file>
<file>tags/community_full.svg</file>
<file>tags/community-small.png</file>
<file>tags/community.png</file>
<file>tags/community.svg</file>
<file>tags/debian_full.svg</file>
<file>tags/debian.png</file>
<file>tags/debian.svg</file>
<file>tags/deepin_full.svg</file>
<file>tags/deepin.png</file>
<file>tags/deepin-small.png</file>
<file>tags/deepin.svg</file>
<file>tags/dtk_full.svg</file>
<file>tags/dtk.png</file>
<file>tags/dtk.svg</file>
<file>tags/dwine2_full.svg</file>
<file>tags/dwine2.png</file>
<file>tags/dwine2.svg</file>
<file>tags/dwine5_full.svg</file>
<file>tags/dwine5.png</file>
<file>tags/dtk-small.png</file>
<file>tags/dwine2-small.png</file>
<file>tags/dwine5-small.png</file>
<file>tags/dwine5.svg</file>
<file>tags/ubuntu_full.svg</file>
<file>tags/logo_icon.svg</file>
<file>tags/ubuntu-small.png</file>
<file>tags/ubuntu.png</file>
<file>tags/ubuntu.svg</file>
<file>tags/uos_full.svg</file>
<file>tags/uos.png</file>
<file>tags/uos-authorize.svg</file>
<file>tags/uos-small.png</file>
<file>tags/uos.svg</file>
<file>tags/amber-ce-bookworm_full.svg</file>
<file>tags/amber-ce-bookworm.png</file>
<file>tags/amber-ce-bookworm.svg</file>
<file>tags/amber-ce-sid_full.svg</file>
<file>tags/amber-ce-sid.png</file>
<file>tags/amber-ce-sid.svg</file>
<file>tags/amber-ce-trixie_full.svg</file>
<file>tags/amber-ce-trixie.png</file>
<file>tags/amber-ce-trixie.svg</file>
<file>tags/native_full.svg</file>
<file>tags/native.png</file>
<file>tags/native.svg</file>
<file>translations/qtwebengine_zh.qm</file>
<file>tags/amber-ce-deepin_full.svg</file>
<file>tags/amber-ce-deepin.svg</file>
<file>tags/amber-ce-deepin.png</file>
</qresource>
</RCC>

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 401 KiB

View File

@@ -20,6 +20,6 @@
"description": "Fix 1 detailed description..."
}
],
"linkUrl": "https://gitee.com/spark-store-project/spark-store/releases/",
"linkUrl": "https://gitee.com/deepin-community-store/spark-store/releases/",
"linkButtonVisible": true
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 248 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 22 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 32 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 178 KiB

After

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 738 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 26 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 954 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 16 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>logo icon</title>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#00F1FF" offset="0%"></stop>
<stop stop-color="#008AFF" offset="100%"></stop>
</linearGradient>
</defs>
<g id="light" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="1" transform="translate(-460.000000, -159.000000)">
<g id="tittlebar" transform="translate(450.000000, 150.000000)">
<g id="logo-icon" transform="translate(10.000000, 9.000000)">
<g>
<rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="32" height="32" rx="8"></rect>
<path d="M23,25 L23,24.0002278 C21.6666667,24.0002278 21,24.0002278 21,24.0002278 L21,20 L22,20 L22,19 L21,19 L21,17 L20,17.5 L20,19 L19,19 L19,20 L20,20 L20,24.0002278 C20,24.0002278 20,24.0002278 20,24.0002278 C20,24.5523868 20.4476132,25 20.9997722,25 C20.9998481,25 20.9999241,25 21,25 L23,25 Z M24.0210414,23.9789586 L24.0210414,22.2215556 L24.0210414,22.2215556 L24.6565969,21.6226667 L27.2207674,25 L29.0052118,25 L25.6099302,20.7304444 L28.4678057,18.0074755 L26.6711391,18.0074755 L24.0210414,20.6204444 L24,15.5 L23,15 L23,25 C23.5639056,25 24.0210414,24.5428642 24.0210414,23.9789586 Z" id="tk" fill="#FFFFFF" fill-rule="nonzero"></path>
<path d="M10.275,24 C13.175,24 15.35,23.2 16.85,21.6 C18.275,20.075 19,17.825 19,15 C19,12.15 18.275,10.05 16.85,8.55 C15.35,6.95 13.175,6 10.275,6 L4,6 L4,24 L10.275,24 Z M9.725,21 L7,21 L7,9 L9.725,9 C11.95,9 13.575,9.15 14.6,10.175 C15.6,11.175 16,12.75 16,15 C16,17.2 15.6,18.9 14.6,19.95 C13.575,20.975 11.95,21 9.725,21 Z" id="D" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 83 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 19 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 31 KiB

View File

@@ -0,0 +1,13 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<defs>
<linearGradient id="uos-托盘1-a" x1="15.968%" x2="100%" y1="14.224%" y2="60.554%">
<stop offset="0%" stop-color="#0071FF"/>
<stop offset="48.72%" stop-color="#00E8FC"/>
<stop offset="100%" stop-color="#00A2FF"/>
</linearGradient>
</defs>
<g fill="none" transform="translate(1 1)">
<circle cx="9" cy="9" r="9" fill="url(#uos-托盘1-a)"/>
<path fill="#FFF" d="M13,4.5 C13.5128358,4.5 13.9355072,4.88604019 13.9932723,5.38337887 L14,5.5 L14,9.5 C14,12.5 12,14.5 9,14.5 C6,14.5 4,12.5 4.0043492,9.70016408 L4,9.5 L4,5.5 C4,4.94771525 4.44771525,4.5 5,4.5 C5.51283584,4.5 5.93550716,4.88604019 5.99327227,5.38337887 L6,5.5 L6,9.5 C6,11.5 7.5,12.5 9,12.5 C10.5,12.5 12,11.5 12,9.5 L12,5.5 C12,4.94771525 12.4477153,4.5 13,4.5 Z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 873 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 873 B

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 18 KiB

View File

@@ -8,8 +8,6 @@
#include <QSettings>
#include <QProcess>
#include <QDebug>
#include <QFile>
#include <QTextStream>
DataCollectorAndUploader::DataCollectorAndUploader(QObject *parent) : QObject(parent)
{
@@ -25,26 +23,25 @@ void DataCollectorAndUploader::collectData()
QString distributor_id;
QString release;
QString architecture;
QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
QString version = config.value("build/version").toString();
QString uuid = config.value("info/uuid").toString();
// Read /etc/os-release file
QFile osReleaseFile("/etc/os-release");
if (osReleaseFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&osReleaseFile);
while (!in.atEnd()) {
QString line = in.readLine();
if (line.startsWith("ID=")) {
distributor_id = line.mid(3).remove('"').trimmed();
} else if (line.startsWith("VERSION_ID=")) {
release = line.mid(11).remove('"').trimmed();
}
// Execute lsb_release --all and capture the output
QProcess lsbProcess;
lsbProcess.start("lsb_release", QStringList() << "--all");
lsbProcess.waitForFinished();
QString lsbOutput = lsbProcess.readAllStandardOutput();
QStringList lines = lsbOutput.split('\n');
for (const QString &line : lines) {
if (line.contains("Distributor ID:")) {
distributor_id = line.split(":").last().trimmed();
} else if (line.contains("Release:")) {
release = line.split(":").last().trimmed();
}
osReleaseFile.close();
} else {
qWarning() << "Could not open /etc/os-release file";
}
// Execute uname -m to get the architecture
@@ -61,6 +58,8 @@ void DataCollectorAndUploader::collectData()
json.insert("Store_Version", version);
json.insert("UUID", uuid);
// Convert to byte array
QJsonDocument doc(json);
QByteArray jsonData = doc.toJson();

View File

@@ -142,18 +142,18 @@ int main(int argc, char *argv[])
// 龙芯机器配置,使得 DApplication 能正确加载 QtWebEngine
qputenv("DTK_FORCE_RASTER_WIDGETS", "FALSE");
// 设置 QtWebEngine 环境变量
QStringList chromium_flags;
// 浏览器开启 GPU 支持
// chromium_flags.append("--disable-features=UseModernMediaControls");
// chromium_flags.append("--disable-web-security");
// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls");
// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security");
// 全平台软件渲染Webkit
chromium_flags.append("--disable-gpu");
#if defined __sw_64__ || __loongarch__
chromium_flags.append("--no-sandbox");
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-gpu");
#ifdef __sw_64__
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
#endif
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromium_flags.join(" ").toUtf8());
#ifdef __loongarch__
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--no-sandbox");
#endif
/**
* NOTE: https://zhuanlan.zhihu.com/p/550285855
* 避免 wayland 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
@@ -163,6 +163,8 @@ int main(int argc, char *argv[])
DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
}
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
// 开启 Hidpi 支持
qDebug() << "Enable HiDPI Support.";

View File

@@ -22,6 +22,9 @@
#define AppPageSearchlist 1
#define AppPageAppdetail 2
#define AppPageSettings 3
#define WaylandSearchCenter 1
#define OtherSearchCenter 2
#define RightSearchSpace 1
#define UploadServerUrl "https://upload.deepinos.org.cn/"
MainWindow::MainWindow(QWidget *parent)
@@ -123,16 +126,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
BaseWidgetOpacity::closeEvent(event);
}
void MainWindow::changeEvent(QEvent *event)
{
if (event->type() != QEvent::StyleChange) {
return BaseWidgetOpacity::changeEvent(event);
}
BaseWidgetOpacity::changeEvent(event);
downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
}
void MainWindow::initUI()
{
QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat);
@@ -166,9 +159,8 @@ void MainWindow::initTitleBar()
ui->titlebar->setBackgroundTransparent(true);
// 初始化标题栏控件
DLabel *titleLabel = new DLabel(ui->titlebar);
titleLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
titleLabel->setText(tr("Spark Store"));
DLabel *title = new DLabel(ui->titlebar);
title->setText(tr("Spark Store"));
backButton = new DPushButton(ui->titlebar);
@@ -178,37 +170,34 @@ void MainWindow::initTitleBar()
searchEdit->lineEdit()->setFixedWidth(350);
downloadButton = new ProgressButton(ui->titlebar);
downloadButton->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
downloadButton->setDownloadListWidget(downloadlistwidget);
downloadButton->setFocusPolicy(Qt::FocusPolicy::ClickFocus);
downloadButton->setFixedSize(searchEdit->sizeHint().height(), searchEdit->sizeHint().height());
downloadlistwidget->setFocusProxy(downloadButton);
QWidget *customWidget = new QWidget(ui->titlebar);
customWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
ui->titlebar->setCustomWidget(customWidget);
QHBoxLayout *customWidgetLayout = new QHBoxLayout(customWidget);
customWidgetLayout->setContentsMargins(8, 0, 0, 0);
customWidgetLayout->setSpacing(0);
customWidgetLayout->addWidget(titleLabel, 0, Qt::AlignLeft);
customWidgetLayout->addSpacing(8);
customWidgetLayout->addWidget(backButton, 0, Qt::AlignLeft);
QWidget *centralWidget = new QWidget(customWidget);
centralWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
customWidgetLayout->addWidget(centralWidget, 1, Qt::AlignHCenter);
QHBoxLayout *centralLayout = new QHBoxLayout(centralWidget);
centralLayout->setContentsMargins(20, 0, 10, 0);
centralLayout->setSpacing(0);
centralLayout->addWidget(searchEdit, 0, Qt::AlignHCenter);
centralLayout->addSpacing(10);
centralLayout->addWidget(downloadButton, 0, Qt::AlignHCenter);
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);
initTitleBarMenu();
backButton->setDisabled(true);
backButton->hide();
downloadlistwidget->hide();
}
@@ -364,9 +353,9 @@ void MainWindow::initConnections()
ui->stackedWidget->setCurrentIndex(pageHistory.at(pageHistory.count() - 2));
pageHistory.removeLast();
if (pageHistory.count() > 1) {
backButton->setEnabled(true);
backButton->show();
} else {
backButton->setDisabled(true);
backButton->hide();
} });
// 搜索事件
@@ -457,11 +446,11 @@ void MainWindow::switchPage(int now) // 临时方案,回家后修改
qDebug() << pageHistory.count();
if (pageHistory.count() >= 1)
{
backButton->setEnabled(true);
backButton->show();
}
else
{
backButton->setDisabled(true);
backButton->hide();
}
ui->stackedWidget->setCurrentIndex(now);
ui->stackedWidget->currentWidget()->setFocus();

View File

@@ -34,7 +34,6 @@ public:
protected:
void closeEvent(QCloseEvent *event) override;
void changeEvent(QEvent *event) override;
private:
void initUI();

File diff suppressed because it is too large Load Diff

View File

@@ -151,25 +151,24 @@ void AppIntoPage::openUrl(const QUrl &url)
{
isInstalled = true;
// QProcess isUpdate;
// isUpdate.start("dpkg-query", QStringList() << "--showformat='${Version}'"
// << "--show" << info["Pkgname"].toString());
// isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
// QString localVersion = isUpdate.readAllStandardOutput();
// localVersion.replace("'", "");
QProcess isUpdate;
isUpdate.start("dpkg-query", QStringList() << "--showformat='${Version}'"
<< "--show" << info["Pkgname"].toString());
isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
QString localVersion = isUpdate.readAllStandardOutput();
localVersion.replace("'", "");
// isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString());
// isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
// if (isUpdate.exitCode() == 0 && isUpdate.exitStatus() == QProcess::NormalExit)
// {
// isUpdated = true;
// }
// else
// {
// isUpdated = false;
// }
// isUpdate.close();
isUpdated = true; //去掉直接点击升级的功能
isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString());
isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟
if (isUpdate.exitCode() == 0 && isUpdate.exitStatus() == QProcess::NormalExit)
{
isUpdated = true;
}
else
{
isUpdated = false;
}
isUpdate.close();
}
else
{
@@ -181,19 +180,7 @@ void AppIntoPage::openUrl(const QUrl &url)
{
if (isUpdated)
{
QProcess process;
QStringList arguments;
arguments << "check" << info["Pkgname"].toString();
process.start("/opt/durapps/spark-store/bin/store-helper/ss-launcher", arguments);
if (process.waitForFinished()) {
exitCode = process.exitCode();
exitStatus = process.exitStatus();
if (exitCode != 0){
ui->downloadButton->setText(tr("Reinstall"));
}else{
ui->downloadButton->setText(tr("Launch"));
}
}
ui->downloadButton->setText(tr("Reinstall"));
ui->downloadButton->setEnabled(true);
ui->downloadButton->show();
ui->pushButton_3->show();
@@ -232,15 +219,8 @@ void AppIntoPage::clear()
ui->tag_deepin->hide();
ui->tag_dwine2->hide();
ui->tag_dwine5->hide();
ui->tag_debian->hide();
ui->tag_ubuntu->hide();
ui->tag_community->hide();
ui->tag_native->hide();
ui->tag_amber_ce_bookworm->hide();
ui->tag_amber_ce_trixie->hide();
ui->tag_amber_ce_sid->hide();
ui->tag_amber_ce_deepin23->hide();
ui->icon->clear();
ui->title->clear();
ui->version->clear();
@@ -307,10 +287,8 @@ void AppIntoPage::setDownloadWidget(DownloadListWidget *w)
}
dw = w;
connect(w, &DownloadListWidget::downloadFinished, this, [=]() {
isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString());
},
Qt::QueuedConnection);
connect(w, &DownloadListWidget::downloadFinished, [=]()
{ isDownloading(SparkAPI::getServerUrl() + SparkAPI::getArchDir() + spk.path() + "/" + info["Filename"].toString()); });
}
void AppIntoPage::initUI()
@@ -377,25 +355,14 @@ void AppIntoPage::isDownloading(const QUrl &url)
int exitCode = process.exitCode();
QProcess::ExitStatus exitStatus = process.exitStatus();
process.close();
if (exitCode == 0 && exitStatus == QProcess::NormalExit)
{
QStringList arguments;
arguments << "check" << info["Pkgname"].toString();
process.start("/opt/durapps/spark-store/bin/store-helper/ss-launcher", arguments);
if (process.waitForFinished()) {
exitCode = process.exitCode();
exitStatus = process.exitStatus();
if (exitCode != 0){
ui->downloadButton->setText(tr("Reinstall"));
}else{
ui->downloadButton->setText(tr("Launch"));
}
}
ui->downloadButton->setEnabled(true);
ui->downloadButton->setText(tr("Reinstall"));
ui->downloadButton->show();
ui->pushButton_3->show();
process.close();
}
else
{
@@ -410,89 +377,49 @@ void AppIntoPage::setAppinfoTags(const QStringList &tagList)
bool ubuntuSupport = false;
bool deepinSupport = false;
bool uosSupport = false;
bool debianSupport = false;
bool hasAmberTag = false;
// First pass: Check if any Amber tags exist
foreach (const QString &tag, tagList)
{
if (tag.startsWith("amber-ce-"))
if (tag == "community")
{
hasAmberTag = true;
break; // No need to continue checking
}
}
// Second pass: Apply tags based on whether we have Amber tags
foreach (const QString &tag, tagList)
{
if (tag.isEmpty())
continue;
if (tag == "native")
ui->tag_native->show();
else if (tag == "community")
ui->tag_community->show();
else if (tag == "dtk5")
ui->tag_dtk5->show();
else if (tag == "dwine2")
ui->tag_dwine2->show();
else if (tag == "dwine5")
ui->tag_dwine5->show();
else if (tag == "a2d")
ui->tag_a2d->show();
else if (tag == "amber-ce-bookworm")
ui->tag_amber_ce_bookworm->show();
else if (tag == "amber-ce-trixie")
ui->tag_amber_ce_trixie->show();
else if (tag == "amber-ce-deepin23")
ui->tag_amber_ce_deepin23->show();
else if (tag == "amber-ce-sid")
ui->tag_amber_ce_sid->show();
// Only process distro tags if there are no Amber tags
else if (!hasAmberTag)
}
else if (tag == "ubuntu")
{
if (tag == "debian")
{
ui->tag_debian->show();
debianSupport = true;
}
else if (tag == "ubuntu")
{
ui->tag_ubuntu->show();
ubuntuSupport = true;
}
else if (tag == "deepin")
{
ui->tag_deepin->show();
deepinSupport = true;
}
else if (tag == "uos")
{
ui->tag_uos->show();
uosSupport = true;
}
ui->tag_ubuntu->show();
ubuntuSupport = true;
}
else if (tag == "deepin")
{
ui->tag_deepin->show();
deepinSupport = true;
}
else if (tag == "uos")
{
ui->tag_uos->show();
uosSupport = true;
}
else if (tag == "dtk5")
{
ui->tag_dtk5->show();
}
else if (tag == "dwine2")
{
ui->tag_dwine2->show();
}
else if (tag == "dwine5")
{
ui->tag_dwine5->show();
}
else if (tag == "a2d")
{
ui->tag_a2d->show();
}
}
if (!hasAmberTag)
notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport, debianSupport);
notifyUserUnsupportedTags(ubuntuSupport, deepinSupport, uosSupport);
}
void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport, bool debianSupport)
void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport)
{
if (!SettingsPage::needUncompatibleNotification) {
return;
@@ -503,21 +430,30 @@ void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSuppo
bool checkdeepin = (isDeepin && !deepinSupport);
bool checkuos = (isUOS && !uosSupport);
bool isUbuntu = false;
bool isDebian = false;
if (!checkdeepin && !checkuos)
{
// 使用更可靠的/etc/os-release检测
QFile osRelease("/etc/os-release");
if (osRelease.open(QIODevice::ReadOnly)) {
QString content = osRelease.readAll();
isUbuntu = content.contains("ID=ubuntu");
isDebian = content.contains("ID=debian") || content.contains("ID_LIKE=debian"); // 合并Debian系检测
osRelease.close();
// 检查是否为 ubuntu 系统
QFile lsb("/etc/lsb-release");
if (!lsb.open(QIODevice::ReadOnly))
{
qDebug() << "打开 /etc/lsb-release 失败";
}
else {
QString lsbInfo = lsb.readAll(); // 因为使用 readAll 读取后会默认跳转到文件末尾导致读出的数据为空,所以用单独一个 string 存储
if (lsbInfo.contains("Ubuntu"))
{
isUbuntu = true;
lsb.close();
}
else if (lsbInfo.contains("GXDE"))
{
// GXDE 使用 Ubuntu 的 tag
isUbuntu = true;
lsb.close();
}
}
}
bool checkubuntu = (isUbuntu && !ubuntuSupport);
bool checkdebian = (isDebian && !debianSupport);
if (checkdeepin)
{
@@ -531,17 +467,12 @@ void AppIntoPage::notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSuppo
{
Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on Ubuntu, there may be problems"));
}
else if (checkdebian)
{
Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on Debian, there may be problems"));
}
if (!isUbuntu && !isDeepin && !isUOS && !isDebian)
else if (!isUbuntu && !isDeepin && !isUOS)
{
Utils::sendNotification("spark-store", tr("Warning"), tr("The current application does not support or tested on current platform, there may be problems"));
}
return;
}
void AppIntoPage::on_downloadButton_clicked()
@@ -555,62 +486,28 @@ void AppIntoPage::on_downloadButton_clicked()
return;
}
connect(item, &DownloadItem::finished, this, [=]() {
isDownloading(downloadUrl);
},
Qt::QueuedConnection);
connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
item->install(0);
isDownloading(downloadUrl);
return;
}
else if (ui->downloadButton->text() == tr("Launch"))
{
QString scriptPath = "/opt/durapps/spark-store/bin/store-helper/ss-launcher";
QStringList arguments;
arguments << "launch" << info["Pkgname"].toString();
QProcess process;
process.startDetached(scriptPath, arguments);
return;
}
emit clickedDownloadBtn();
// 处理 tags设置 installExtraArg
QString installExtraArg;
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
QStringList taglist = info["Tags"].toString().split(";", Qt::SkipEmptyParts);
#else
QStringList taglist = info["Tags"].toString().split(";", QString::SkipEmptyParts);
#endif
if (taglist.contains("native")) {
installExtraArg = "--native";
} else if (taglist.contains("amber-ce-bookworm")) {
installExtraArg = "--amber-ce-bookworm";
} else if (taglist.contains("amber-ce-trixie")) {
installExtraArg = "--amber-ce-trixie";
} else if (taglist.contains("amber-ce-sid")) {
installExtraArg = "--amber-ce-sid";
} else if (taglist.contains("amber-ce-deepin23")) {
installExtraArg = "--amber-ce-deepin23";
}
DownloadItem *item = dw->addItem(info["Name"].toString(), info["Filename"].toString(), info["Pkgname"].toString(),
iconpixmap, downloadUrl, installExtraArg);
DownloadItem *item = dw->addItem(info["Name"].toString(), info["Filename"].toString(), info["Pkgname"].toString(), iconpixmap, downloadUrl);
if (item == nullptr)
{
return;
}
if (ui->downloadButton->text() == tr("Reinstall"))
{
item->reinstall = true;
}
ui->downloadButton->setEnabled(false);
connect(item, &DownloadItem::finished, this, [=]() {
isDownloading(downloadUrl);
},
Qt::QueuedConnection);
connect(item, &DownloadItem::finished, [=]() { isDownloading(downloadUrl); });
isDownloading(downloadUrl);
}
@@ -623,15 +520,15 @@ void AppIntoPage::on_pushButton_3_clicked()
ui->pushButton_3->setEnabled(false);
QProcess uninstall;
uninstall.start("pkexec", QStringList() << "/opt/durapps/spark-store/bin/store-helper/uninstaller" << info["Pkgname"].toString().toLower());
uninstall.start("pkexec", QStringList() << "apt" << "autopurge" << "-y" << info["Pkgname"].toString().toLower());
uninstall.waitForFinished(-1);
uninstall.close();
// QProcess check;
// check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower());
// check.waitForFinished(-1);
QProcess check;
check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower());
check.waitForFinished(-1);
if (uninstall.exitCode() != 0 || uninstall.exitStatus() != QProcess::NormalExit)
if (check.exitCode() != 0 || check.exitStatus() != QProcess::NormalExit)
{
ui->downloadButton->setText(tr("Download and Install"));
ui->pushButton_3->hide();
@@ -642,7 +539,7 @@ void AppIntoPage::on_pushButton_3_clicked()
ui->downloadButton->setEnabled(true);
ui->pushButton_3->setEnabled(true);
// check.close();
check.close();
});
}
@@ -656,6 +553,16 @@ void AppIntoPage::on_shareButton_clicked()
void AppIntoPage::on_updateButton_clicked()
{
QString feedbackURL = "https://bbs.spark-app.store/";
QProcess::startDetached("xdg-open", QStringList{feedbackURL});
QString feedbackSpk = "spk://store/chat/store.spark-app.feedback";
QFileInfo actionSubmissionClientStatus("/opt/durapps/store.spark-app.feedback");
if (actionSubmissionClientStatus.exists() && actionSubmissionClientStatus.isDir())
{
qDebug() << "反馈器存在";
QProcess::startDetached("sh", QStringList() << "/opt/durapps/store.spark-app.feedback/launch.sh");
}
else
{
qDebug() << "反馈器不存在,跳转页面";
openUrl(feedbackSpk);
}
}

View File

@@ -29,7 +29,7 @@ private:
void initConnections();
void isDownloading(const QUrl &url);
void setAppinfoTags(const QStringList &tagList);
void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport, bool debianSupport);
void notifyUserUnsupportedTags(bool ubuntuSupport, bool deepinSupport, bool uosSupport);
signals:
void clickedDownloadBtn();

View File

@@ -160,6 +160,7 @@
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -368,273 +369,24 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>13</width>
<height>37</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="CustomLabel" name="tag_ubuntu">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&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;</string>
</property>
<property name="whatsThis">
<string>&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;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/ubuntu.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_uos">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/uos.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_deepin">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 23&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 23&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/deepin.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_debian">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Debian Stable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to Debian Stable&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/debian.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_native">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app can only be installed natively&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app can only be installed natively&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/native.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_amber_ce_bookworm">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian12 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian12 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/amber-ce-bookworm.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_amber_ce_trixie">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian13 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian13 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/amber-ce-trixie.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_amber_ce_sid">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian SID ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to debian SID ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/amber-ce-sid.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_amber_ce_deepin23">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to deepin23 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app will be installed to deepin23 ACE&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/amber-ce-deepin.png</pixmap>
</property>
</widget>
</item>
<property name="topMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>18</width>
<height>37</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -647,42 +399,11 @@
</spacer>
</item>
<item>
<widget class="CustomLabel" name="tag_a2d">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<widget class="QLabel" name="tag_community">
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/a2d.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_community">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
@@ -691,48 +412,55 @@
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/community.png</pixmap>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/community-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_dtk5">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<widget class="QLabel" name="tag_ubuntu">
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&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;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&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;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/dtk.png</pixmap>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/ubuntu-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_dwine2">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<widget class="QLabel" name="tag_uos">
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to UOS home 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/uos-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="tag_dwine2">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
@@ -741,23 +469,74 @@
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/dwine2.png</pixmap>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine2-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="CustomLabel" name="tag_dwine5">
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<widget class="QLabel" name="tag_dtk5">
<property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dtk-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="tag_deepin">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Capable to deepin 20&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/deepin-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="tag_a2d">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;An Appimage to deb app.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/a2d-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="tag_dwine5">
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
@@ -766,13 +545,13 @@
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A Wine app.Spark Store will automatically configure the wine kit for you&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="pixmap">
<pixmap resource="../assets/assets.qrc">:/tags/dwine5.png</pixmap>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;img src=&quot;:/tags/dwine5-small.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_14">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -978,6 +757,7 @@
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -1115,6 +895,7 @@
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -1279,6 +1060,7 @@ QListWidget::item::selected
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
@@ -1631,15 +1413,6 @@ QListWidget::item::selected
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>CustomLabel</class>
<extends>QLabel</extends>
<header>widgets/common/customlabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../assets/assets.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

View File

@@ -47,7 +47,6 @@ SOURCES += \
utils/utils.cpp \
utils/widgetanimation.cpp \
widgets/base/basewidgetopacity.cpp \
widgets/common/customlabel.cpp \
widgets/common/downloaditem.cpp \
widgets/common/progressbutton.cpp \
widgets/common/smoothlistwidget.cpp \
@@ -74,7 +73,6 @@ HEADERS += \
utils/utils.h \
utils/widgetanimation.h \
widgets/base/basewidgetopacity.h \
widgets/common/customlabel.h \
widgets/common/downloaditem.h \
widgets/common/progressbutton.h \
widgets/common/smoothlistwidget.h \
@@ -108,5 +106,3 @@ TRANSLATIONS += \
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/durapps/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
DISTFILES +=

View File

@@ -198,7 +198,7 @@ void Utils::setQPAPlatform()
// }
else
{
qputenv("QT_QPA_PLATFORM", "dxcb;xcb");
qputenv("QT_QPA_PLATFORM", "dxcb");
}
}

View File

@@ -1,24 +0,0 @@
#include "customlabel.h"
#include <QGuiApplication>
CustomLabel::CustomLabel(QWidget *parent, Qt::WindowFlags f)
: QLabel(parent, f)
{
}
QPixmap CustomLabel::pixmap() const
{
const QPixmap *p = QLabel::pixmap();
return p ? *p : QPixmap();
}
void CustomLabel::setPixmap(const QPixmap &pixmap)
{
QPixmap _pixmap = pixmap;
_pixmap.setDevicePixelRatio(qApp->devicePixelRatio());
_pixmap = _pixmap.scaled(size() * _pixmap.devicePixelRatio(),
Qt::KeepAspectRatio,
Qt::SmoothTransformation);
QLabel::setPixmap(_pixmap);
}

View File

@@ -1,19 +0,0 @@
#ifndef CUSTOMLABEL_H
#define CUSTOMLABEL_H
#include <QLabel>
class CustomLabel : public QLabel
{
Q_OBJECT
Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
public:
explicit CustomLabel(QWidget *parent = nullptr,
Qt::WindowFlags f = Qt::WindowFlags());
virtual QPixmap pixmap() const;
virtual void setPixmap(const QPixmap &pixmap);
};
#endif // CUSTOMLABEL_H

View File

@@ -175,16 +175,8 @@ void DownloadItem::slotAsyncInstall(int t)
switch (t)
{
case 0:
{
QStringList args;
args << "/usr/local/bin/ssinstall"
<< "/tmp/spark-store/" + ui->label_filename->text().toUtf8();
if (!installExtraArg.isEmpty()) {
args << installExtraArg;
}
args << "--delete-after-install";
installer.start("pkexec", args);
}
installer.start("pkexec", QStringList() << "/usr/local/bin/ssinstall"
<< "/tmp/spark-store/" + ui->label_filename->text().toUtf8() << "--delete-after-install");
break;
case 1:
installer.start("deepin-deb-installer", QStringList() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8());
@@ -216,11 +208,11 @@ void DownloadItem::slotAsyncInstall(int t)
}
}
// QProcess isInstall;
// isInstall.start("dpkg", QStringList() << "-s" << pkgName);
// isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟
// int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length();
if ( !haveError)
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."));
@@ -252,5 +244,8 @@ void DownloadItem::slotAsyncInstall(int t)
ui->widget_spinner->hide();
DownloadItem::isInstall = false;
emit finished(!haveError && !notRoot);
installer.deleteLater();
isInstall.deleteLater();
emit finished(error == 0 && !haveError && !notRoot);
}

View File

@@ -43,9 +43,6 @@ public:
void install(int);
// 新增:安装时额外参数
QString installExtraArg;
private:
Ui::DownloadItem *ui;

View File

@@ -9,6 +9,10 @@
ProgressButton::ProgressButton(QWidget *parent)
: QWidget{parent}
{
// this->setWindowFlags(Qt::FramelessWindowHint);
// this->setAttribute(Qt::WA_TranslucentBackground, true);
setMinimumSize(36, 36);
svgPath = "";
backColor = Qt::transparent;
@@ -33,7 +37,7 @@ void ProgressButton::setProgress(int progress)
buttonState = state::closeProgress;
update();
WaterDrop *waterDrop = new WaterDrop(parentWidget());
waterDrop->move(QRectF(geometry()).center());
waterDrop->move(geometry().center());
waterDrop->show();
}
repaint();
@@ -73,9 +77,12 @@ void ProgressButton::mousePressEvent(QMouseEvent *event)
void ProgressButton::mouseReleaseEvent(QMouseEvent *event)
{
if (buttonState == state::hover
|| buttonState == state::normal
|| buttonState == state::closeProgress)
if (buttonState == state::hover || buttonState == state::normal)
{
widthChangeValue = (this->width() - 6) / 2;
update();
}
else if (buttonState == state::closeProgress)
{
update();
}
@@ -124,15 +131,19 @@ void ProgressButton::paintEvent(QPaintEvent *event)
{
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing, true);
QRectF rect = this->rect();
QRect rect = event->rect();
if (buttonState == state::normal || buttonState == state::hover)
{
qreal radius = rect.height() / 2;
int radius = (rect.height() - 6) / 2;
painter.translate(rect.center());
painter.setPen(Qt::transparent);
painter.setBrush(QColor(buttonState == state::normal ? color : color.darker()));
// painter.drawEllipse(QPoint(0, 0), radius, radius);
// radiu -= 3;
painter.setBrush(backColor);
painter.drawEllipse(QPointF(0, 0), radius, radius);
painter.drawEllipse(QPoint(0, 0), radius, radius);
QSvgRenderer m_svgRender;
m_svgRender.load(svgPath);
@@ -140,34 +151,42 @@ void ProgressButton::paintEvent(QPaintEvent *event)
}
else if (buttonState == state::openProgress)
{
qreal radius = rect.height() / 2 - 1;
painter.translate(rect.center());
painter.setPen(QPen(backColor.darker(), 2));
int radius = (rect.height() - 6) / 2 - 3;
painter.setBrush(backColor);
painter.drawEllipse(QPointF(0, 0), radius, radius);
painter.setPen(QPen(backColor, 3));
painter.drawEllipse(QPoint(0, 0), radius, radius);
QRectF rectF = QRectF(-radius, -radius, radius * 2, radius * 2);
painter.setPen(QPen(color.darker(100), 2));
qreal angle = progress * 360 / 100 * 1.0;
painter.drawArc(rectF, 90 * 16, -qIntCast(angle * 16));
painter.setPen(QPen(backColor, 3));
QSvgRenderer m_svgRender;
m_svgRender.load(svgPath);
m_svgRender.render(&painter, QRectF(-radius / 2, -radius / 2, radius, radius));
QRect rect = QRect(-radius, -radius,
radius * 2, radius * 2);
painter.setPen(QPen(color.darker(100), 3));
qreal angle = progress * 360 / 100 * 1.0;
painter.drawArc(rect.adjusted(-3, -3, 3, 3), 90 * 16, -qIntCast(angle * 16));
}
else if (buttonState == state::closeProgress)
{
qreal radius = rect.height() / 2 - 1;
auto radius = (rect.height() - 6) / 2;
painter.translate(rect.center());
painter.setPen(QPen(color.darker(100), 2));
painter.setBrush(backColor);
painter.drawEllipse(QPointF(0, 0), radius, radius);
painter.setPen(Qt::transparent);
painter.setBrush(QColor(0, 0, 0, 63));
painter.drawEllipse(QPoint(0, 0), radius, radius);
painter.setPen(QPen(color, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
painter.drawLine(QPointF(-radius / 3, 0),
QPointF(-radius / 5, radius / 3));
painter.drawLine(QPointF(-radius / 5, radius / 3),
QPointF(radius / 4, -radius / 4));
radius -= 3;
painter.setBrush(backColor);
painter.drawEllipse(QPoint(0, 0), radius, radius);
painter.setPen(QPen(color, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
painter.drawLine(QPoint(-radius / 3, 0),
QPoint(-radius / 5, radius / 3));
painter.drawLine(QPoint(-radius / 5, radius / 3),
QPoint(radius / 4, -radius / 4));
}
QWidget::paintEvent(event);
}
@@ -176,7 +195,7 @@ void ProgressButton::operationProcessing()
{
}
const int RADIUS = 30;
const int RADIUS = 60;
WaterDrop::WaterDrop(QWidget *parent)
: QWidget(parent)
, m_waterDropAnimation(new QVariantAnimation(this))
@@ -191,20 +210,20 @@ WaterDrop::WaterDrop(QWidget *parent)
}
// 把鼠标点击的点转换为圆心点坐标
void WaterDrop::move(const QPointF &point)
void WaterDrop::move(const QPoint &point)
{
QPointF translatePoint = point - QRectF(rect()).center();
QWidget::move(qRound(translatePoint.x()), qRound(translatePoint.y()));
QPoint translatePoint = point - QPoint(RADIUS, RADIUS);
QWidget::move(translatePoint);
}
void WaterDrop::show()
{
m_waterDropAnimation->setStartValue(0);
m_waterDropAnimation->setEndValue(RADIUS - 2);
m_waterDropAnimation->setEndValue(RADIUS);
m_waterDropAnimation->setDuration(350);
connect(m_waterDropAnimation, &QVariantAnimation::valueChanged, this, &WaterDrop::onRadiusChanged);
connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::deleteLater);
connect(m_waterDropAnimation, &QVariantAnimation::finished, this, &WaterDrop::close);
m_waterDropAnimation->start(QVariantAnimation::DeleteWhenStopped);
QWidget::show();
}
@@ -213,9 +232,10 @@ void WaterDrop::paintEvent(QPaintEvent *event)
{
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPen pen(QBrush(QColor("#ffff80")), 4.0);
QPen pen(QBrush(QColor("#ffff80")), 5.0);
pen.setWidth(5);
painter.setPen(pen);
painter.drawEllipse(QRectF(rect()).center(), m_animationRadius, m_animationRadius);
painter.drawEllipse(event->rect().center(), m_animationRadius, m_animationRadius);
QWidget::paintEvent(event);
}

View File

@@ -52,6 +52,7 @@ private:
QColor backColor;
QColor color;
QString svgPath;
int widthChangeValue{0};
int progress{0};//处理百分比
bool m_mouseMoved = false;
@@ -65,7 +66,7 @@ class WaterDrop : public QWidget
public:
explicit WaterDrop(QWidget *parent = nullptr);
void show();
void move(const QPointF &point);
void move(const QPoint &point);
protected:
void paintEvent(QPaintEvent *event);

View File

@@ -85,9 +85,7 @@ void DownloadListWidget::clearItem()
ui->listWidget->clear();
}
DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QString pkgName,
const QPixmap icon, QString downloadurl,
const QString &installExtraArg)
DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl)
{
if (fileName.isEmpty())
{
@@ -106,7 +104,6 @@ DownloadItem* DownloadListWidget::addItem(QString name, QString fileName, QStrin
di->setName(name);
di->setFileName(fileName);
di->pkgName = pkgName;
di->installExtraArg = installExtraArg;
di->seticon(icon);
QListWidgetItem *pItem = new QListWidgetItem();
pItem->setSizeHint(QSize(240, 56)); // ui 中单个 downloaditem 高度固定 56px上下 margin 8px图片固定 48x48

View File

@@ -19,9 +19,7 @@ class DownloadListWidget : public DBlurEffectWidget
Q_OBJECT
public:
DownloadItem *addItem(QString name, QString fileName, QString pkgName,
const QPixmap icon, QString downloadurl,
const QString &installExtraArg);
DownloadItem *addItem(QString name, QString fileName, QString pkgName, const QPixmap icon, QString downloadurl);
int nowDownload = 0;
int allDownload = 0;
int toDownload = 0;

View File

@@ -7,8 +7,6 @@ Dir::State::lists "/var/lib/aptss/lists/";
APT::Get::Fix-Broken true;
APT::Get::List-Cleanup="0";
Acquire::GzipIndexes "false";
#clear APT::Update::Post-Invoke-Success;
#clear DPkg::Post-Invoke;

Some files were not shown because too many files have changed in this diff Show More