diff --git a/DOCS/spk-doc.md b/DOCS/spk-doc.md index a3c4e6d..5f4c7d3 100644 --- a/DOCS/spk-doc.md +++ b/DOCS/spk-doc.md @@ -2,6 +2,8 @@ 参数只有一个Url，该url应当遵循这种格式：`spk://<任意合法字符>/web分类/包名` +目前第一字段不进行处理，以后可能会对此识别。在目前阶段，这个字段可以填写任意合法字符 + 例如: [spk://abcdefg/games/store.spark-app.hmcl](spk://abcdefg/games/store.spark-app.hmcl) @@ -15,11 +17,11 @@ | 社交沟通 | chat | | 音乐欣赏 | music | | 视频播放 | video | -| 图形图像 | graphics | +| 图形图像 | image_graphics | | 游戏娱乐 | games | | 办公学习 | office | | 阅读翻译 | reading | | 编程开发 | development | | 系统工具 | tools | -| 主题美化 | beautify | +| 主题美化 | themes | | 其他应用 | others | diff --git a/debian/changelog b/debian/changelog index 92bb217..8b93b8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,76 +2,148 @@ spark-store (4.1.2) stable; urgency=medium * feat: 初步的wayland支持 * fix: 首页的捐赠页面在中文环境下显示中文 - * chore: 新增编译依赖，测试安装时不会出现报错 * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。 + * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit + * fix: Ubuntu下下载列表无法关闭 + * fix: 修复进入详情页时焦点默认在分享链接按钮上的问题 + * fix: 修复特定情况下的内存泄漏问题 + * fix: 适配c11代码规范，消除qt编译警告 + * fix: 默认服务器域名指向cdn域名 + * fix: 消除内部函数的无用变量，限制作用域 + * feat: aptss 除ssupdate外的操作时候如果检测到存在源文件存在则不再重复获取 + * fix: 修复在apt list锁被锁定的时候异常弹出有更新可用 + * chore: 去除安装依赖:g++ + * fix: 修复下载列表中进度提示文字显示不完整的问题 + * feat: ssinstall支持从单独文件夹中校验软件包 + * feat： 支持分单文件夹下载。具体内容参见：https://gitee.com/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是自由的 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + + * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行 + * chore: 添加 setOrganizationName 操作，设置组织名称为 spark-union，与 SWRT 保持一致 + * chore: 设置组织名称后，QStandardPaths::AppConfigLocation 等路径相应改变，修改所有配置文件和缓存文件路径 + * chore: 关于对话框设置父对象后，对话框背景色受主窗口样式表影响，移动部分控件样式表设置方式与位置 + * chore: 去除 .pro 文件中无效的更新翻译文件脚本调用，整理 .pro 文件，添加编译时更新 ts 文件脚本调用 + * chore: 继续修复偶现关闭客户端时崩溃问题（疑似 aria2c 进程未启动，pid 未初始化为随机值，执行 kill 操作时未判断导致） + * chore: 新增编译依赖，测试安装时不会出现报错 + * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数 + * chore: 更新翻译文件，去除已经不存在的翻译 + + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + +spark-store (4.1.2~test2) stable; urgency=medium + + * feat: ssinstall支持从单独文件夹中校验软件包 + * 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 Fri, 30 Jan 2022 00:00:00 +0800 + +spark-store (4.1.2~test1) stable; urgency=medium + + * feat: 初步的wayland支持 + * fix: 首页的捐赠页面在中文环境下显示中文 + * fix: 更新检测模块在aptss ssupdate操作失败后现在会正确地移除锁而不是错误的残留锁。 + * chore: ssinstall现在拒绝安装验证失败的包，审核操作现在需要改用ssaudit + * fix: Ubuntu下下载列表无法关闭 + * fix: 修复进入详情页时焦点默认在分享链接按钮上的问题 + * fix: 修复特定情况下的内存泄漏问题 + * fix: 适配c11代码规范，消除qt编译警告 + * fix: 默认服务器域名指向cdn域名 + * fix: 消除内部函数的无用变量，限制作用域 + * feat: aptss 除ssupdate外的操作时候如果检测到存在源文件存在则不再重复获取 + * fix: 修复在apt list锁被锁定的时候异常弹出有更新可用 + * chore: 去除安装依赖:g++ + * fix: 修复下载列表中进度提示文字显示不完整的问题 + + + * chore: 添加 Application 类，继承 DApplication，将 main 函数中设置属性、关于信息等操作移至 Application 构造函数中进行 + * chore: 添加 setOrganizationName 操作，设置组织名称为 spark-union，与 SWRT 保持一致 + * chore: 设置组织名称后，QStandardPaths::AppConfigLocation 等路径相应改变，修改所有配置文件和缓存文件路径 + * chore: 关于对话框设置父对象后，对话框背景色受主窗口样式表影响，移动部分控件样式表设置方式与位置 + * chore: 去除 .pro 文件中无效的更新翻译文件脚本调用，整理 .pro 文件，添加编译时更新 ts 文件脚本调用 + * chore: 继续修复偶现关闭客户端时崩溃问题（疑似 aria2c 进程未启动，pid 未初始化为随机值，执行 kill 操作时未判断导致） + * chore: 新增编译依赖，测试安装时不会出现报错 + * chore: 暂时去除没有意义的 DBus 接口，使用 DGuiApplicationHelper::newProcessInstance 获取新进程的启动参数 + * chore: 更新翻译文件，去除已经不存在的翻译 + + + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (4.1.1) stable; urgency=medium * fix:更新失效 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.1.0) stable; urgency=medium * feat: 现在可以支持UOS签名包问题了 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.0.1) stable; urgency=medium * feat: 提升Ubuntu下的显示效果 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.0.0) stable; urgency=medium * feat: 修复了成吨的bug后开始正式版 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.0.0~test2) stable; urgency=medium * feat: 修复了成吨的bug后开始公测 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (4.0.0~test1) stable; urgency=medium * feat: 柚子过来补充一下啦 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.4~test1) stable; urgency=medium * feat: aptss不再尝试安装apt-fast，转而自带 * chore: 删除password-check模块 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3.3) stable; urgency=medium * feat: 首页链接调用浏览器打开 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 -0spark-store (3.3.3~test5) stable; urgency=medium + +spark-store (3.3.3~test5) stable; urgency=medium * 修复可能的内存泄漏问题 * 修复应用搜索为空但仍显示上一次搜索结果的问题 * 修复动画加载延后的问题 * 修复统计下载量卡主渲染线程的问题 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.3.3~test4) stable; urgency=medium * Enable i386 arch support by default --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3.3~test3) stable; urgency=medium @@ -84,7 +156,8 @@ spark-store (3.3.3~test2) stable; urgency=medium * bug fix: 更新和检查更新出错时不报错.此更新需要一个推送 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3.3~test1) stable; urgency=medium @@ -92,132 +165,137 @@ spark-store (3.3.3~test1) stable; urgency=medium * 图形环境中所有root权限的组件剥离到cli(可用于deepin 23 daily，只保证商店本体正常运作，不处理安装依赖不满足) * 文案更改：更新检查-->检查更新 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3.1~test1) stable; urgency=medium * 安装时不再需要联网 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3.0.4) stable; urgency=medium * 为减轻服务器压力，不再单独更新某一个应用，而是作为整体更新 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.3.0.3) stable; urgency=medium * 回滚 更新中行为到进度条而不是实时输出 * 更新应用时显示正在更新哪个应用 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.3.0.2) stable; urgency=medium * 修复 pkexec未执行 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.3.0.1) stable; urgency=medium * 修复 检查更新的更新进程未实际运行 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.3) stable; urgency=medium * 修复 检查更新 未刷新软件源 * 把检查更新单独拿出作为左列 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3~test3) stable; urgency=medium * 把检查更新加入免密码 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3~test2) stable; urgency=medium * 更新检测功能全部更改到zenity --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.3~test1) stable; urgency=medium * zenity，选择可更新应用 * 自动更新检测现在会跳过hold --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.4) stable; urgency=medium * 修改tag相关的文案内容：wine相关环境已可自动配置了 * 准备发版 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.4~test4) stable; urgency=medium * 现在在商店启动后点击spk链接仍会正常启动 https://gitee.com/deepin-community-store/spark-store/commit/dd6780d636042bf12d77414e6f1552cc7d1ed24c - + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 - spark-store (3.2.4~test3) stable; urgency=medium * 发版，合入到master * 翻译完毕 * 合入先前的各项改动，为：客户端集成投稿器入口和支持，修复：安装依赖时间较长时错误地返回“安装完毕”结果，现在客户端版本更新时不关闭免密码登录，UOS安装进程合并正常aptss中 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 - spark-store (3.2.4~test2) stable; urgency=medium * 客户端集成投稿器入口和支持 * 修复：安装依赖时间较长时错误地返回“安装完毕”结果 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 - spark-store (3.2.4~test1) stable; urgency=medium * 客户端更新时不关闭免密码登录 * UOS合并正常aptss中 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.2.3) stable; urgency=medium * 客户端异常退出时仍然占用资源问题修复 * 降低dtk依赖版本，Debian 11 stable可直接安装 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.2) stable; urgency=medium * aptss will now refresh the system source before doing install, policy....etc * 启动客户端GPU加速支持 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.2.1) stable; urgency=medium * 更改刷新系统源的功能 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.2) stable; urgency=medium @@ -230,20 +308,22 @@ spark-store (3.2) stable; urgency=medium * 修复 在更新检测设置中的是否开启自动更新检测设置项的显示不随开启或关闭状态改变 * 修复 在检测更新时临时降低优先级到100，防止系统中有且版本一致的包被反复来回更新 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.6) stable; urgency=medium * 修复部分情况下无法选中正确的镜像源的问题 * 合入3.1.5以来的各项修改 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.5-5) stable; urgency=medium * 从所有镜像源中选取最快镜像源高速下载 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.1.5-4) stable; urgency=medium @@ -253,53 +333,54 @@ spark-store (3.1.5-4) stable; urgency=medium * 更新检测服务优化：从分体改为一体 * aptss 支持自动补全 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.5-3) stable; urgency=medium * 包内自带密钥 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.1.5-2) stable; urgency=medium * 下载软件时跳过获取大小，修复部分软件无法下载的问题 * 修复 获取key时出错，指定使用http1.1 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.1.5-1) stable; urgency=medium * 改变更新策略，UOS也下载加速，但是安装不加速 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 - spark-store (3.1.5) stable; urgency=medium * 改变更新策略，现在支持应用在更新时引入新依赖 * ss-apt-fast现在默认允许降级，以与apt使用体验一致 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.1.4-2) stable; urgency=medium * 客户端下载使用metalink来支持bt下载加速 * 修复使用更新和安装设置更新商店本体时出错 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 spark-store (3.1.4-1) stable; urgency=medium * 安装脚本和检测更新脚本检查网络时间超时时间延长至5s * 修复：ssinstall在没有安装apt-fast的情况下首次安装需要依赖的软件时安装失败 --- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.4) stable; urgency=medium @@ -312,6 +393,7 @@ spark-store (3.1.4) stable; urgency=medium -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.3-2) stable; urgency=medium * 调整 现在与系统更新分开，不再导致更新失败 @@ -320,17 +402,17 @@ spark-store (3.1.3-2) stable; urgency=medium * 修改ss-apt-fast的策略，现在除了安装，下载和更新都改用apt * ssinstall 现在也会在不适用ss-apt-fast的时候模拟源了（针对UOS） - -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.3-1) stable; urgency=medium * 修复 下载提前退出 * 移除 下载量显示 - -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.3) stable; urgency=medium * Now uses aria2 to download softwares form all mirrors @@ -342,6 +424,7 @@ spark-store (3.1.3) stable; urgency=medium -- shenmo Fri, 30 Jan 2022 00:00:00 +0800 + spark-store (3.1.2) stable; urgency=medium * Now let apt-fast method support all mirrors @@ -350,8 +433,6 @@ spark-store (3.1.2) stable; urgency=medium -- shenmo Mon, 17 Jan 2022 00:00:00 +0800 - - spark-store (3.1.1) stable; urgency=medium * Now will delete the link of policy file after uninstall or upgrade @@ -360,8 +441,6 @@ spark-store (3.1.1) stable; urgency=medium -- shenmo Mon, 17 Jan 2022 00:00:00 +0800 - - spark-store (3.1.0) stable; urgency=medium * Add pkexec policy: ssinstall. Only will be enabled after permitted. @@ -370,7 +449,6 @@ spark-store (3.1.0) stable; urgency=medium -- shenmo Mon, 17 Jan 2022 00:00:00 +0800 - spark-store (3.0.3-13) stable; urgency=medium * Update the ssinstall script. Now support apt-fast and will temporarily increase the spark store source priority to 500 to make depends install correctly @@ -380,7 +458,6 @@ spark-store (3.0.3-13) stable; urgency=medium -- shenmo Mon, 17 Jan 2022 00:00:00 +0800 - spark-store (3.0.3-12) stable; urgency=medium * Rollback to use DApplication::loadDXcbPlugin() to make titlebar behave normally in ubuntu @@ -390,8 +467,6 @@ spark-store (3.0.3-12) stable; urgency=medium -- shenmo Mon, 17 Jan 2022 00:00:00 +0800 - - spark-store (3.0.3-11) stable; urgency=medium * Now support autoupdate @@ -399,8 +474,6 @@ spark-store (3.0.3-11) stable; urgency=medium -- shenmo Mon, 17 Jan 2022 00:00:00 +0800 - - spark-store (3.0.3-10) stable; urgency=medium * Now also compile dstore patch @@ -413,3 +486,4 @@ spark-store (3.0.3-9) stable; urgency=medium * Support dpkg-buildpackage -- shenmo Mon, 17 Jan 2022 00:00:00 +0800 + diff --git a/debian/control b/debian/control index 64f2f14..eff633e 100644 --- a/debian/control +++ b/debian/control @@ -20,10 +20,9 @@ Build-Depends: qtwayland5-dev-tools, gcc, g++ + Standards-Version: 3.0 Homepage: https://www.spark-app.store/ - - Package: spark-store Architecture: any Depends:${shlibs:Depends}, ${misc:Depends}, @@ -42,8 +41,6 @@ Depends:${shlibs:Depends}, ${misc:Depends}, bubblewrap, aria2, gcc, - g++, zenity Description: Spark Store A community powered app store, based on DTK. -Recommends: apt-fast diff --git a/debian/spark-store.postinst b/debian/spark-store.postinst index 4c8e896..fc6bcba 100755 --- a/debian/spark-store.postinst +++ b/debian/spark-store.postinst @@ -25,6 +25,7 @@ case "$1" in ln -s -f /opt/durapps/spark-store/bin/ussremove /usr/local/bin/ussremove ln -s -f /opt/durapps/spark-store/bin/spark-store /usr/local/bin/spark-store ln -s -f /opt/durapps/spark-store/bin/ssinstall /usr/local/bin/ssinstall + ln -s -f /opt/durapps/spark-store/bin/ssaudit /usr/local/bin/ssaudit ln -s -f /opt/durapps/spark-store/bin/spark-dstore-patch /usr/local/bin/spark-dstore-patch ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast diff --git a/debian/spark-store.prerm b/debian/spark-store.prerm index 8c44924..e0a1457 100755 --- a/debian/spark-store.prerm +++ b/debian/spark-store.prerm @@ -4,6 +4,7 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ];then # Remove residual symbol links rm /usr/local/bin/spark-store rm /usr/local/bin/ssinstall +rm /usr/local/bin/ssaudit rm /usr/local/bin/spark-dstore-patch rm /usr/local/bin/ussinstall rm /usr/local/bin/ussremove diff --git a/spark-store-project.pro b/spark-store-project.pro index 1975041..f0e92dd 100644 --- a/spark-store-project.pro +++ b/spark-store-project.pro @@ -14,13 +14,11 @@ SUBDIRS += \ src/spark-dstore-patch \ src/spark-store.pro -#TRANSLATIONS += \ -# translations/spark-store_fr.ts \ -# translations/spark-store_en.ts \ -# translations/spark-store_zh_CN.ts - # Update translation files -CONFIG(release, debug|release): system(bash $${PWD}/translate_generation.sh) +CONFIG(release, debug|release) { + system(bash $${PWD}/translate_update.sh) + system(bash $${PWD}/translate_generation.sh) +} # Rules for deployment tool.files += tool/* @@ -64,4 +62,4 @@ INSTALLS += \ service \ bash_completion \ polkit-1 -# 暂时不添加 \ No newline at end of file +# 暂时不添加 diff --git a/src/application.cpp b/src/application.cpp new file mode 100644 index 0000000..9bf7cd4 --- /dev/null +++ b/src/application.cpp @@ -0,0 +1,103 @@ +#include "application.h" + +#include +#include +#include +#include + +#include +#include + +DCORE_USE_NAMESPACE + +Application::Application(int &argc, char **argv) + : DApplication(argc, argv) +{ + // Wayland 环境下使用，防止子控件 Native 化 + if (!DPlatformWindowHandle::pluginVersion().isEmpty()) { + setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true); + } + setAttribute(Qt::AA_UseHighDpiPixmaps); + + loadTranslator(); // 载入翻译 + + setOrganizationName("spark-union"); + setApplicationName("spark-store"); // 影响 ~/.config/spark-union ~/.local/share/spark-union 下文件夹名称 + setApplicationDisplayName(QObject::tr("Spark Store")); // 设置窗口显示标题 (Wayland 下会显示 Qt 原生标题栏) + setProductName(QObject::tr("Spark Store")); + setProductIcon(QIcon::fromTheme("spark-store")); + setApplicationHomePage("https://gitee.com/deepin-community-store"); + setApplicationDescription( + QObject::tr( + "An appstore powered by community
" + "https://www.spark-app.store
" + "Spark developers")); + setApplicationLicense(" GPLv3 "); + + // 检查 ~/.config/spark-union/spark-store 文件夹是否存在 + checkAppConfigLocation(); + + // 初始化日志模块 (默认日志位置 ~/.cache/spark-union/spark-store) + DLogManager::registerConsoleAppender(); + DLogManager::registerFileAppender(); +} + +void Application::handleAboutAction() +{ + if (aboutDialog()) { + DApplication::handleAboutAction(); + return; + } + + initAboutDialog(); + DApplication::handleAboutAction(); +} + +void Application::checkAppConfigLocation() +{ + QDir dir(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation)); + if (!dir.exists()) { + qWarning() << "AppConfigLocation not existed, creating..."; + dir.mkpath(dir.absolutePath()); + } +} + +void Application::setVersionAndBuildDateTime(const QString &version, const QString &buildDateTime) +{ + m_version = version; + m_buildDateTime = buildDateTime; + + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + if (config.value("build/version").toString() != m_version) { + qDebug() << "Spark Store has been updated!"; + + config.setValue("build/version", m_version); + config.setValue("build/time", m_buildDateTime); + config.sync(); + } + + setApplicationVersion(DApplication::buildVersion(config.value("build/version").toString() + "-" + "Flamescion" + "-" + config.value("build/time").toString())); +} + +void Application::initAboutDialog() +{ + // 自定义 DAboutDialog + DAboutDialog *dialog = new DAboutDialog(activeWindow()); + dialog->setProductName(productName()); + dialog->setProductIcon(productIcon()); + dialog->setVersion(translate("DAboutDialog", "Version: %1").arg(applicationVersion())); + // 根据 shenmo 要求，不显示组织 Logo + // dialog->setCompanyLogo(QPixmap(":/icon/Logo-Spark.png")); + dialog->setCompanyLogo(QPixmap()); + dialog->setWebsiteName(QObject::tr("Spark Project")); + dialog->setWebsiteLink(applicationHomePage()); + dialog->setDescription(applicationDescription()); + dialog->setLicense(translate("DAboutDialog", "%1 is released under %2").arg(productName()).arg(applicationLicense())); + + setAboutDialog(dialog); + connect(aboutDialog(), &DAboutDialog::destroyed, this, [=] { + setAboutDialog(nullptr); + }); + + dialog->hide(); +} diff --git a/src/application.h b/src/application.h new file mode 100644 index 0000000..223f533 --- /dev/null +++ b/src/application.h @@ -0,0 +1,28 @@ +#ifndef APPLICATION_H +#define APPLICATION_H + +#include + +DWIDGET_USE_NAMESPACE + +class Application : public DApplication +{ + Q_OBJECT + +public: + Application(int &argc, char **argv); + void handleAboutAction() override; + + static void checkAppConfigLocation(); + + void setVersionAndBuildDateTime(const QString &version, const QString &buildDateTime); + +private: + void initAboutDialog(); + +private: + QString m_version; + QString m_buildDateTime; +}; + +#endif // APPLICATION_H diff --git a/src/assets/assets.qrc b/src/assets/assets.qrc index c8d1f97..ef4b248 100644 --- a/src/assets/assets.qrc +++ b/src/assets/assets.qrc @@ -1,64 +1,65 @@ - - - icon/logo.svg - tags/a2d-small.png - tags/a2d.png - tags/community-small.png - tags/community.png - tags/community.svg - tags/deepin-small.png - tags/deepin.svg - tags/dtk-small.png - tags/dwine2-small.png - tags/dwine5-small.png - tags/dwine5.svg - tags/logo_icon.svg - tags/ubuntu-small.png - tags/ubuntu.png - tags/uos-authorize.svg - tags/uos-small.png - tags/uos.svg - icon/light/back.svg - icon/light/download.svg - icon/light/leftbutton_0.svg - icon/light/leftbutton_1.svg - icon/light/leftbutton_2.svg - icon/light/leftbutton_3.svg - icon/light/leftbutton_4.svg - icon/light/leftbutton_5.svg - icon/light/leftbutton_6.svg - icon/light/leftbutton_7.svg - icon/light/leftbutton_8.svg - icon/light/leftbutton_9.svg - icon/light/leftbutton_10.svg - icon/light/leftbutton_11.svg - icon/light/leftbutton_12.svg - icon/light/box.svg - icon/light/calendar.svg - icon/light/globe.svg - icon/light/folder.svg - icon/light/text.svg - icon/dark/back.svg - icon/dark/box.svg - icon/dark/calendar.svg - icon/dark/download.svg - icon/dark/folder.svg - icon/dark/globe.svg - icon/dark/leftbutton_0.svg - icon/dark/leftbutton_1.svg - icon/dark/leftbutton_2.svg - icon/dark/leftbutton_3.svg - icon/dark/leftbutton_4.svg - icon/dark/leftbutton_5.svg - icon/dark/leftbutton_6.svg - icon/dark/leftbutton_7.svg - icon/dark/leftbutton_8.svg - icon/dark/leftbutton_9.svg - icon/dark/leftbutton_10.svg - icon/dark/leftbutton_11.svg - icon/dark/leftbutton_12.svg - icon/dark/text.svg - icon/light/update.svg - icon/dark/update.svg - - + + + icon/Logo-Spark.png + icon/dark/back.svg + icon/dark/box.svg + icon/dark/calendar.svg + icon/dark/download.svg + icon/dark/folder.svg + icon/dark/globe.svg + icon/dark/leftbutton_0.svg + icon/dark/leftbutton_1.svg + icon/dark/leftbutton_2.svg + icon/dark/leftbutton_3.svg + icon/dark/leftbutton_4.svg + icon/dark/leftbutton_5.svg + icon/dark/leftbutton_6.svg + icon/dark/leftbutton_7.svg + icon/dark/leftbutton_8.svg + icon/dark/leftbutton_9.svg + icon/dark/leftbutton_10.svg + icon/dark/leftbutton_11.svg + icon/dark/leftbutton_12.svg + icon/dark/text.svg + icon/dark/update.svg + icon/light/back.svg + icon/light/download.svg + icon/light/leftbutton_0.svg + icon/light/leftbutton_1.svg + icon/light/leftbutton_2.svg + icon/light/leftbutton_3.svg + icon/light/leftbutton_4.svg + icon/light/leftbutton_5.svg + icon/light/leftbutton_6.svg + icon/light/leftbutton_7.svg + icon/light/leftbutton_8.svg + icon/light/leftbutton_9.svg + icon/light/leftbutton_10.svg + icon/light/leftbutton_11.svg + icon/light/leftbutton_12.svg + icon/light/box.svg + icon/light/calendar.svg + icon/light/globe.svg + icon/light/folder.svg + icon/light/text.svg + icon/light/update.svg + icon/logo.svg + tags/a2d-small.png + tags/a2d.png + tags/community-small.png + tags/community.png + tags/community.svg + tags/deepin-small.png + tags/deepin.svg + tags/dtk-small.png + tags/dwine2-small.png + tags/dwine5-small.png + tags/dwine5.svg + tags/logo_icon.svg + tags/ubuntu-small.png + tags/ubuntu.png + tags/uos-authorize.svg + tags/uos-small.png + tags/uos.svg + + diff --git a/src/assets/icon/Logo-Spark.png b/src/assets/icon/Logo-Spark.png index 941a4a6..905224c 100644 Binary files a/src/assets/icon/Logo-Spark.png and b/src/assets/icon/Logo-Spark.png differ diff --git a/src/backend/downloadworker.cpp b/src/backend/downloadworker.cpp index 0895d43..a3003a0 100644 --- a/src/backend/downloadworker.cpp +++ b/src/backend/downloadworker.cpp @@ -1,9 +1,11 @@ #include "downloadworker.h" + #include #include #include #include #include +#include DownloadController::DownloadController(QObject *parent) { @@ -48,7 +50,7 @@ bool checkMeatlink(QString metaUrl) void gennerateDomain(QVector &domains) { - QFile serverList(QDir::homePath().toUtf8() + "/.config/spark-store/server.list"); + QFile serverList(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list"); if (serverList.open(QFile::ReadOnly)) { QStringList list = QString(serverList.readAll()).trimmed().split("\n"); @@ -87,14 +89,17 @@ void DownloadController::startDownload(const QString &url) } QtConcurrent::run([=]() - { + { QString metaUrl = url + ".metalink"; qDebug() << "metalink" << metaUrl; bool useMetalink = false; - if (checkMeatlink(metaUrl)){ + if (checkMeatlink(metaUrl)) + { useMetalink = true; qDebug() << "useMetalink:" << useMetalink; - }else{ + } + else + { gennerateDomain(domains); // qDebug() << domains << domains.size(); } @@ -111,10 +116,12 @@ void DownloadController::startDownload(const QString &url) QString aria2ConnectionMax = "--max-concurrent-downloads=16"; QString aria2DNSCommand = "--async-dns-server=119.29.29.29,223.5.5.5"; - if (useMetalink){ + if (useMetalink) + { command.append(metaUrl.toUtf8()); } - else{ + else + { for (int i = 0; i < domains.size(); i++) { command.append(replaceDomain(url, domains.at(i)).replace("+","%2B").toUtf8()); //对+进行转译，避免oss出错 @@ -133,7 +140,8 @@ void DownloadController::startDownload(const QString &url) command.append(aria2ConnectionPerServer.toUtf8()); command.append(aria2ConnectionMax.toUtf8()); command.append(aria2DNSCommand.toUtf8()); - if (useMetalink){ + if (useMetalink) + { command.append(aria2NoSeeds.toUtf8()); } qDebug() << command; @@ -144,8 +152,7 @@ void DownloadController::startDownload(const QString &url) cmd->start(); cmd->waitForStarted(); //等待启动完成 - QObject::connect(cmd, &QProcess::readyReadStandardOutput, - [&]() + QObject::connect(cmd, &QProcess::readyReadStandardOutput, [&]() { //通过读取输出计算下载速度 QString message = cmd->readAllStandardOutput().data(); @@ -188,8 +195,7 @@ void DownloadController::startDownload(const QString &url) emit downloadProcess(speedInfo, downloadSizeRecord, fileSize); } }); - QObject::connect(cmd, &QProcess::readyReadStandardError, - [&]() + QObject::connect(cmd, &QProcess::readyReadStandardError, [&]() { emit errorOccur(cmd->readAllStandardError().data()); return; @@ -209,7 +215,7 @@ void DownloadController::startDownload(const QString &url) * HD 70642 is a star with an exoplanetary companion in the southern constellation of Puppis. */ QProcess mailProcess; - mailProcess.start(SenderdPath.toUtf8() + " " + metaUrl.toUtf8() + " " + "HD70642"); + mailProcess.start(SenderdPath.toUtf8(), QStringList() << metaUrl << "HD70642"); mailProcess.waitForStarted(); mailProcess.waitForFinished(3000); mailProcess.deleteLater(); @@ -222,15 +228,22 @@ void DownloadController::startDownload(const QString &url) */ void DownloadController::stopDownload() { + if (pidNumber < 0) + { + return; + } + // 实现下载进程退出 QString killCmd = QString("kill -9 %1").arg(pidNumber); system(killCmd.toUtf8()); qDebug() << "kill aria2!"; + pidNumber = -1; } qint64 DownloadController::getFileSize(const QString &url) { // 已经无需使用 qtnetwork 再获取 filesize，完全交给 aria2 来计算进度。 为保证兼容性，故保留此函数。 + qDebug() << "Begin download:" << url; qint64 fileSize = 10000; return fileSize; } diff --git a/src/backend/downloadworker.h b/src/backend/downloadworker.h index d04290b..5aeb353 100644 --- a/src/backend/downloadworker.h +++ b/src/backend/downloadworker.h @@ -21,7 +21,7 @@ public: private: int threadNum; - int pidNumber; + int pidNumber = -1; QString filename; qint64 fileSize; QVector> ranges; diff --git a/src/backend/sparkapi.cpp b/src/backend/sparkapi.cpp index 8a2a4f5..e2f841b 100644 --- a/src/backend/sparkapi.cpp +++ b/src/backend/sparkapi.cpp @@ -1,39 +1,45 @@ #include "sparkapi.h" +#include +#include #include QString SparkAPI::serverUrl = ""; SparkAPI::SparkAPI(QObject *parent) : QObject(parent) { - QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); - if (!readConfig.value("server/choose").toString().isEmpty() && readConfig.value("server/updated").toString() == "TRUE") + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + if (!config.value("server/choose").toString().isEmpty() && config.value("server/updated").toBool()) { - SparkAPI::setServerUrl(readConfig.value("server/choose").toString()); + SparkAPI::setServerUrl(config.value("server/choose").toString()); } } + void SparkAPI::get(QUrl url) { QNetworkRequest request; HttpRequest *httprequest = new HttpRequest; request.setUrl(QUrl(url.toString().replace("+", "%2B"))); connect(httprequest, &HttpRequest::finished, [=](QString data) - { + { QByteArray arr = data.toUtf8(); - //解析Json - QJsonParseError error; - if(QJsonDocument::fromJson(arr,&error).isArray()) - { - auto doc = QJsonDocument::fromJson(arr,&error).array(); - emit finished(doc); - }else { - auto doc = QJsonDocument::fromJson(arr,&error).object(); - emit finishedObject(doc); - } + // 解析 Json + QJsonParseError error; + if(QJsonDocument::fromJson(arr,&error).isArray()) + { + auto doc = QJsonDocument::fromJson(arr,&error).array(); + emit finished(doc); + } else { + auto doc = QJsonDocument::fromJson(arr,&error).object(); + emit finishedObject(doc); + } + + httprequest->deleteLater(); + }); - httprequest->deleteLater(); }); httprequest->getRequest(request); } + void SparkAPI::getRAW(QUrl url) { QNetworkRequest request; @@ -45,30 +51,37 @@ void SparkAPI::getRAW(QUrl url) httprequest->deleteLater(); }); httprequest->getRequest(request); } + void SparkAPI::getAppList(QString type) { get(QUrl(getServerUrl() + "store/" + type + "/applist.json")); } + void SparkAPI::getSearchList(QString keyword) { get(QUrl("https://search.deepinos.org.cn/appinfo/search?keyword=" + keyword)); } + void SparkAPI::getAppInfo(QUrl spk) { get(QUrl(getServerUrl() + "store" + spk.path().replace("+", "%2B") + "/app.json")); } + void SparkAPI::getAppDownloadTimes(QUrl spk) { getRAW(QUrl(getServerUrl() + "store" + spk.path().replace("+", "%2B") + "/download-times.txt")); } + QString SparkAPI::getServerUrl() { return SparkAPI::serverUrl; } + QString SparkAPI::getImgServerUrl() { return SparkAPI::serverUrl; } + void SparkAPI::setServerUrl(QString url) { SparkAPI::serverUrl = url; diff --git a/src/backend/sparkapi.h b/src/backend/sparkapi.h index 1780e7c..56451b2 100644 --- a/src/backend/sparkapi.h +++ b/src/backend/sparkapi.h @@ -1,16 +1,21 @@ #ifndef SPARKAPI_H #define SPARKAPI_H + +#include "utils/httprequest.h" + #include #include #include #include -#include "utils/httprequest.h" -#include #include + class SparkAPI : public QObject { Q_OBJECT + public: + explicit SparkAPI(QObject *parent = nullptr); + static QString getServerUrl(); static QString getImgServerUrl(); static void setServerUrl(QString url); @@ -20,17 +25,14 @@ public: void getRAW(QUrl url); void getAppList(QString type); void getAppInfo(QUrl spk); - explicit SparkAPI(QObject *parent = nullptr); - -private: - static QString serverUrl; signals: void finished(QJsonArray); void finishedRAW(QString); void finishedObject(QJsonObject); -public slots: +private: + static QString serverUrl; }; #endif // SPARKAPI_H diff --git a/src/main.cpp b/src/main.cpp index e8f9393..9846a35 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,52 +1,58 @@ +#include "application.h" #include "mainwindow-dtk.h" -#include -#include -#include -#include -#include -#include -#include #include +#include +#include + +#include 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 = "Version 4.1.2"; + static const QString version = "4.1.2"; 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"); - QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); - QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); + 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")) { - setenv("XDG_CURRENT_DESKTOP", "Deepin", 1); + 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; } - setConfig->setValue("build/isWayland", isWayland); - setConfig->setValue("build/isDeepinOS", isDeepinOS); + // NOTE: 提前设置组织名称和应用名称，避免配置文件位置错误 + DApplication::setOrganizationName("spark-union"); + DApplication::setApplicationName("spark-store"); + Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在 + + 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 (!readConfig.contains("build/useWayland")) + if (!config.contains("build/useWayland")) { - setConfig->setValue("build/useWayland", true); + config.setValue("build/useWayland", true); } + config.sync(); // 写入更改至 config.ini，并同步最新内容 - bool useWayland = readConfig.value("build/useWayland").toBool(); + bool useWayland = config.value("build/useWayland").toBool(); qDebug() << "System Wayland enabled:" << isWayland << ". Spark Wayland enabled:" << useWayland; // Set display backend @@ -62,107 +68,78 @@ int main(int argc, char *argv[]) { 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"); +// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-features=UseModernMediaControls"); +// qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--disable-web-security"); + // 浏览器开启 GPU 支持 +#ifdef __sw_64__ + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode --no-sandbox"); +#else + qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode"); +#endif + DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // 开启 Hidpi 支持 - // 浏览器开启 GPU 支持 - qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--ignore-gpu-blocklist --enable-gpu-rasterization --enable-native-gpu-memory-buffers --enable-accelerated-video-decode"); - + // 强制使用 DTK 平台插件 QVector fakeArgs(argc + 2); fakeArgs[0] = argv[0]; - QString fakeArgs1 = "-platformtheme"; - QByteArray fakeArgsTemp = fakeArgs1.toLatin1(); // must - fakeArgs[1] = fakeArgsTemp.data(); - fakeArgs1 = "deepin"; - fakeArgsTemp = fakeArgs1.toLatin1(); // must - fakeArgs[2] = fakeArgsTemp.data(); - + fakeArgs[1] = const_cast("-platformtheme"); + fakeArgs[2] = const_cast("deepin"); for (int i = 1; i < argc; i++) + { fakeArgs[i + 2] = argv[i]; - int fakeArgc = argc + 2; // DApplication的argc要用引用，避免c++编译器优化 - DApplication a(fakeArgc, fakeArgs.data()); - - // 初始化日志模块 (默认日志位置 ~/.cache/deepin/spark-store) - DLogManager::registerConsoleAppender(); - DLogManager::registerFileAppender(); - - // Wayland 环境下使用，防止子控件 Native 化 - if (!DPlatformWindowHandle::pluginVersion().isEmpty()) - { - a.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true); } - a.setAttribute(Qt::AA_UseHighDpiPixmaps); - a.setApplicationDisplayName("Spark Store"); + int fakeArgc = argc + 2; // QCoreApplication 的 argc 要用引用，避免 c++ 编译器优化 + Application a(fakeArgc, fakeArgs.data()); + // 设置版本和构建时间 + a.setVersionAndBuildDateTime(version, buildDateTime); - a.loadTranslator(); // 载入翻译 - - if (readConfig.value("build/version").toString() != version) - { - qDebug() << "Spark Store has been updated!"; - setConfig->setValue("build/version", version); - setConfig->setValue("build/time", buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString()); - } - setConfig->deleteLater(); - - // Customized DAboutDialog - - DAboutDialog dialog; - a.setAboutDialog(&dialog); - dialog.setLicense(QObject::tr("We publish this program under GPL V3")); - dialog.setVersion(DApplication::buildVersion(readConfig.value("build/version").toString() + "-" + "Flamescion" + "-" + readConfig.value("build/time").toString())); - dialog.setProductIcon(QIcon::fromTheme("spark-store")); // 设置Logo - dialog.setProductName(QLabel::tr("Spark Store")); - dialog.setDescription( - QObject::tr( - "An appstore powered by community
" - "https://www.spark-app.store
" - "Spark developers")); - - dialog.setProductName(QLabel::tr("Spark Store")); - dialog.setCompanyLogo(QPixmap(":/spark-store.png")); - dialog.setWebsiteName(QObject::tr("The Spark Project")); - dialog.setWebsiteLink("https://gitee.com/deepin-community-store"); - - a.setOrganizationName("spark-union"); - a.setProductName(QObject::tr("Spark Store")); - a.setApplicationName("Spark Store"); // 不用翻译，影响 ~/.local/share/spark-union 下文件夹名称 - a.setApplicationDisplayName(QObject::tr("Spark Store")); // 设置窗口显示标题 (Wayland 下会显示 Qt 原生标题栏) - a.setWindowIcon(QIcon::fromTheme("spark-store")); - a.setApplicationDescription( - QObject::tr( - "An appstore powered by deepin community
" - "https://www.spark-app.store
" - "Spark developers

" - "Published under GPL V3")); // 限制单实例运行 if (!a.setSingleInstance("spark-store")) { - qDebug() << "The application is already running!"; - QDBusInterface iface("com.gitee.spark.store", - "/com/gitee/spark/store", - "com.gitee.spark.store", - QDBusConnection::sessionBus()); - - QString arg1 = argv[1]; - - iface.asyncCall("activeWindow", arg1); - + qWarning() << "Another instance has already started, activating..."; return -1; } DGuiApplicationHelper::instance()->setPaletteType(DGuiApplicationHelper::LightType); // 固定主题为浅色主题 - DApplicationSettings settings; // 定义 DApplicationSettings，自动保存主题设置 + DApplicationSettings settings; // 定义 DApplicationSettings，自动保存主题设置 MainWindow w; // 让打开时界面显示在正中 Dtk::Widget::moveToCenter(&w); - QString arg1 = argv[1]; - if (arg1.startsWith("spk://")) + if (argc > 1) { - w.openUrl(QUrl(argv[1])); + QString arg1 = argv[1]; + if (arg1.trimmed().startsWith("spk://")) + { + w.openUrl(QUrl(argv[1])); + } } w.show(); - w.setWindowTitle("Spark Store"); return a.exec(); } diff --git a/src/mainwindow-dtk.cpp b/src/mainwindow-dtk.cpp index 8df18ec..cfed349 100644 --- a/src/mainwindow-dtk.cpp +++ b/src/mainwindow-dtk.cpp @@ -13,16 +13,24 @@ #define WaylandSearchCenter 1 #define OtherSearchCenter 2 #define RightSearchSpace 1 +#define UploadServerUrl "https://upload.deepinos.org/" MainWindow::MainWindow(QWidget *parent) : BaseWidgetOpacity(parent), ui(new Ui::MainWindow) { ui->setupUi(this); + setWindowTitle(QObject::tr("Spark Store")); initConfig(); - moveToCenter(this); // 让窗口居中显示 - WidgetAnimation::widgetOpacity(this, true); + // 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); downloadlistwidget = new DownloadListWidget; downloadButton = new ProgressButton(ui->titlebar); backButtom = new QPushButton(ui->titlebar); @@ -46,13 +54,13 @@ MainWindow::MainWindow(QWidget *parent) ui->titlebar->setMenu(menu); connect(actionSubmission, &QAction::triggered, this, [=] - { QDesktopServices::openUrl(QUrl("https://upload.deepinos.org/")); }); + { QDesktopServices::openUrl(QUrl(UploadServerUrl)); }); connect(setting, &QAction::triggered, this, [=] { switchPage(AppPageSettings); ui->settingspage->updateUI(); }); connect(upgrade, &QAction::triggered, this, [=] - { QProcess::startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh"); }); + { QProcess::startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-update-controler.sh", QStringList()); }); // 投稿器 connect(actionSubmissionWithClient, &QAction::triggered, this, [=] { @@ -61,7 +69,7 @@ MainWindow::MainWindow(QWidget *parent) if (actionSubmissionClientStatus.exists()) { qDebug() << "投稿器存在"; - QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter"); + QProcess::startDetached("/opt/spark-store-submitter/bin/spark-store-submitter", QStringList()); } else { @@ -75,9 +83,6 @@ MainWindow::MainWindow(QWidget *parent) if (themeType == DGuiApplicationHelper::DarkType) { //深色模式 setMaskColor(QColor("#2a2b2b")); - this->setStyleSheet("#mainpage{background-color: transparent;border-radius:14px;}\ - QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color:#FFFFFF}\ - "); backButtom->setIcon(QIcon(":/icon/dark/back.svg")); downloadButton->setIcon(":/icon/dark/download.svg"); downloadButton->setBackgroundColor(QColor("#444444")); @@ -98,9 +103,6 @@ MainWindow::MainWindow(QWidget *parent) } else { //亮色模式 setMaskColor(QColor("#f3f7f8")); - this->setStyleSheet("#mainpage{background-color: transparent;border-radius:14px;}\ - QLabel#cardtitle,QLabel#title,QLabel#title_1,QLabel#title_2,QLabel#title_3 {color:#000000}\ - "); backButtom->setIcon(QIcon(":/icon/light/back.svg")); downloadButton->setBackgroundColor(QColor("#e3e4e4")); downloadButton->setColor(QColor("#66CCFF")); @@ -153,18 +155,17 @@ MainWindow::MainWindow(QWidget *parent) backButtom->hide(); ui->titlebar->setIcon(QIcon::fromTheme(":/icon/logo.svg")); - // Check wayland configs - QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); - QWidget *w_titlebar = new QWidget(ui->titlebar); QHBoxLayout *ly_titlebar = new QHBoxLayout(w_titlebar); - QLabel *title = new QLabel(this); + 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); - if (!readConfig.value("build/isDeepinOS").toBool() && readConfig.value("build/useWayland").toBool()) + // 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); @@ -219,14 +220,17 @@ MainWindow::MainWindow(QWidget *parent) { openUrl(spk); }); emit DGuiApplicationHelper::instance()->themeTypeChanged(DGuiApplicationHelper::instance()->themeType()); - initDbus(); + connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::newProcessInstance, this, &MainWindow::onNewProcessInstance); } MainWindow::~MainWindow() { - delete searchEdit; - delete downloadlistwidget; delete ui; + + if (downloadlistwidget) + { + downloadlistwidget->deleteLater(); + } } void MainWindow::initDbus() @@ -240,13 +244,23 @@ void MainWindow::initDbus() void MainWindow::onGetUrl(const QString &url) { - if (url.left(6) == "spk://") + 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://")) @@ -279,6 +293,7 @@ void MainWindow::switchPage(int now) // 临时方案，回家后修改 backButtom->hide(); } ui->stackedWidget->setCurrentIndex(now); + ui->stackedWidget->currentWidget()->setFocus(); pageHistory << now; } @@ -307,15 +322,36 @@ void MainWindow::updateUi(int now) void MainWindow::on_pushButton_14_clicked() { - QFile upgradeStatus("/tmp/spark-store/upgradeStatus.txt"); - if (!upgradeStatus.exists()) + // Check UOS + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + if (config.contains("UOS/EnableDeveloperMode") && !config.value("UOS/EnableDeveloperMode").toBool()) { + qDebug() << "UOS Developer Mode has not been enabled!"; QtConcurrent::run([=] { auto upgradeP = new QProcess(); - upgradeP->startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh"); + upgradeP->startDetached("zenity", QStringList() << "--info" + << "--text" + << "UOS开发者模式未开启，相关功能被禁用" + << "--title" + << "功能禁用提示" + ); + upgradeP->waitForStarted(); + upgradeP->waitForFinished(30); + upgradeP->deleteLater(); }); + } + else + { + QFile upgradeStatus("/tmp/spark-store/upgradeStatus.txt"); + if (!upgradeStatus.exists()) + { + QtConcurrent::run([=] + { + auto upgradeP = new QProcess(); + upgradeP->startDetached("/opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade.sh", QStringList()); upgradeP->waitForStarted(); upgradeP->waitForFinished(-1); upgradeP->deleteLater(); }); - } + } + } } diff --git a/src/mainwindow-dtk.h b/src/mainwindow-dtk.h index 1b2ea82..3eab079 100644 --- a/src/mainwindow-dtk.h +++ b/src/mainwindow-dtk.h @@ -39,20 +39,20 @@ private: void switchPage(int now); void updateUi(int now); -private: - QList pageHistory; - - DownloadListWidget *downloadlistwidget; - ProgressButton *downloadButton; - QPushButton *backButtom; - DSearchEdit *searchEdit = new DSearchEdit; - Ui::MainWindow *ui; - private slots: //接受来自dbus的url void onGetUrl(const QString &url); + void onNewProcessInstance(qint64 pid, const QStringList &arguments); void on_pushButton_14_clicked(); +private: + QList pageHistory; + + Ui::MainWindow *ui; + DownloadListWidget *downloadlistwidget; + ProgressButton *downloadButton; + QPushButton *backButtom; + DSearchEdit *searchEdit; }; #endif // MAINWINDOWDTK_H diff --git a/src/mainwindow-dtk.ui b/src/mainwindow-dtk.ui index 5399dbd..ccccf14 100644 --- a/src/mainwindow-dtk.ui +++ b/src/mainwindow-dtk.ui @@ -7,7 +7,7 @@ 0 0 1190 - 651 + 656 @@ -34,6 +34,12 @@ true + + .QWidget#mainpage { + background: transparent; + border-radius: 14px; +} + 0 diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index 6d4e075..344bfaa 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -32,7 +32,7 @@ void AppIntoPage::clear() ui->author->clear(); ui->label_2->clear(); ui->downloadButton->hide(); - ui->downloadButton->setEnabled(true); + ui->downloadButton->setEnabled(false); ui->pushButton_3->hide(); int n = ui->listWidget->count(); for (int i = 0; i < n; i++) @@ -63,9 +63,8 @@ void AppIntoPage::openUrl(QUrl url) info = appinfo; // qDebug()<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"); @@ -89,89 +88,105 @@ void AppIntoPage::openUrl(QUrl url) ui->d_contributor->setText(info["Contributor"].toString()); ui->label_2->setText(info["More"].toString()); - QProcess isInstall; - bool isInstalled; - bool isUpdated; - QString packagename = info["Pkgname"].toString(); - isInstall.start("dpkg -s " + info["Pkgname"].toString()); - qDebug()<downloadButton->setText(tr("Developer Mode Disabled")); + ui->downloadButton->setEnabled(false); + ui->downloadButton->show(); + } + else // 非 UOS 或 UOS 已经开启开发者模式 { - isInstalled = true; + QProcess isInstall; + bool isInstalled; + bool isUpdated; + QString packagename = info["Pkgname"].toString(); + isInstall.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString()); + qDebug() << info["Pkgname"].toString(); + isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟 + int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length(); + if (error == 0) + { + isInstalled = true; - QProcess isUpdate; - isUpdate.start("dpkg-query --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 --compare-versions " + localVersion + " ge " + info["Version"].toString()); - isUpdate.waitForFinished(180*1000); // 默认超时 3 分钟 - if(!isUpdate.exitCode()) + isUpdate.start("dpkg", QStringList() << "--compare-versions" << localVersion << "ge" << info["Version"].toString()); + isUpdate.waitForFinished(180 * 1000); // 默认超时 3 分钟 + if (!isUpdate.exitCode()) + { + isUpdated = true; + } + else + { + isUpdated = false; + } + } + else + { + isInstalled = false; + isUpdated = false; + } + + QObject::connect(naManager, &QNetworkAccessManager::finished, [=]() + { + + if (isInstalled) + { + if (isUpdated) { - isUpdated = true; + ui->downloadButton->setText(tr("Reinstall")); + ui->downloadButton->setEnabled(true); + ui->downloadButton->show(); + ui->pushButton_3->show(); } else { - isUpdated = false; + ui->downloadButton->setText(tr("Upgrade")); + ui->downloadButton->setEnabled(true); + ui->downloadButton->show(); + ui->pushButton_3->show(); } } else { - isInstalled = false; - isUpdated = false; - } - - if(isInstalled) - { - 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("Download")); - isDownloading(SparkAPI::getServerUrl()+"store"+spk.path()+"/"+info["Filename"].toString()); - ui->downloadButton->setEnabled(true); - ui->downloadButton->show(); + ui->downloadButton->setText(tr("Download")); + ui->downloadButton->setEnabled(true); + isDownloading(SparkAPI::getServerUrl() + "store" + spk.path() + "/" + info["Filename"].toString()); + ui->downloadButton->show(); + } }); } QStringList taglist = info["Tags"].toString().split(";"); QString tmp=info["img_urls"].toString(); - qDebug()<get(request); - QObject::connect(naManager,&QNetworkAccessManager::finished,[=](QNetworkReply *reply){ + iconNaManager->get(request); + QObject::connect(iconNaManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) + { QByteArray jpegData = reply->readAll(); QPixmap pixmap; pixmap.loadFromData(jpegData); @@ -272,7 +287,8 @@ 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);}"; + 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); @@ -284,11 +300,10 @@ void AppIntoPage::setTheme(bool dark) 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);}"; + }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); @@ -336,29 +351,30 @@ void AppIntoPage::on_downloadButton_clicked() void AppIntoPage::on_pushButton_3_clicked() { QtConcurrent::run([=]() - { - ui->downloadButton->setEnabled(false); - ui->pushButton_3->setEnabled(false); + { + ui->downloadButton->setEnabled(false); + ui->pushButton_3->setEnabled(false); - QProcess uninstall; - uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << info["Pkgname"].toString().toLower()); - uninstall.waitForFinished(-1); + QProcess uninstall; + uninstall.start("pkexec", QStringList() << "apt" << "purge" << "-y" << info["Pkgname"].toString().toLower()); + uninstall.waitForFinished(-1); - QProcess check; - check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower()); - check.waitForFinished(10*1000); + QProcess check; + check.start("dpkg", QStringList() << "-s" << info["Pkgname"].toString().toLower()); + check.waitForFinished(10*1000); - if (check.readAllStandardOutput().isEmpty()) - { - ui->downloadButton->setText(tr("Install")); - ui->pushButton_3->hide(); + if (check.readAllStandardOutput().isEmpty()) + { + ui->downloadButton->setText(tr("Download")); + ui->pushButton_3->hide(); - updatesEnabled(); - Utils::sendNotification("spark-store",tr("Spark Store"),tr("Uninstall succeeded")); - } + updatesEnabled(); + Utils::sendNotification("spark-store",tr("Spark Store"),tr("Uninstall succeeded")); + } - ui->downloadButton->setEnabled(true); - ui->pushButton_3->setEnabled(true); }); + ui->downloadButton->setEnabled(true); + ui->pushButton_3->setEnabled(true); + }); } void AppIntoPage::on_shareButton_clicked() @@ -372,11 +388,11 @@ void AppIntoPage::on_shareButton_clicked() void AppIntoPage::on_updateButton_clicked() { QString feedbackSpk = "spk://store/chat/store.spark-app.feedback"; - QFile actionSubmissionClientStatus("/opt/durapps/store.spark-app.feedback"); - if (actionSubmissionClientStatus.exists()) + QFileInfo actionSubmissionClientStatus("/opt/durapps/store.spark-app.feedback"); + if (actionSubmissionClientStatus.exists() && actionSubmissionClientStatus.isDir()) { qDebug() << "反馈器存在"; - QProcess::startDetached("sh /opt/durapps/store.spark-app.feedback/launch.sh"); + QProcess::startDetached("sh", QStringList() << "/opt/durapps/store.spark-app.feedback/launch.sh"); } else { diff --git a/src/pages/applistpage.cpp b/src/pages/applistpage.cpp index 913db5b..43d56b5 100644 --- a/src/pages/applistpage.cpp +++ b/src/pages/applistpage.cpp @@ -53,6 +53,7 @@ void AppListPage::getAppList(QString type) } ui->webEngineView->setUrl(url); + delete api; } void AppListPage::getSearchList(QString keyword) @@ -72,6 +73,7 @@ void AppListPage::getSearchList(QString keyword) } url = api->getServerUrl() + "store/#/flamescion/search?keywords=" + keyword + "&" + theme; ui->webEngineView->setUrl(url); + delete api; } AppListPage::~AppListPage() diff --git a/src/pages/settingspage.cpp b/src/pages/settingspage.cpp index 1a17213..8012772 100644 --- a/src/pages/settingspage.cpp +++ b/src/pages/settingspage.cpp @@ -1,10 +1,24 @@ #include "settingspage.h" #include "ui_settingspage.h" +#include "../backend/sparkapi.h" +#include "utils/utils.h" + +#include +#include +#include + +#define TMP_PATH "/tmp/spark-store" +#define DEFAULT_SERVER_URL "https://cdn.d.store.deepinos.org.cn/" +#define DEFAULT_CHECK_DOMAIN "deepinos" + bool SettingsPage::isdownload = false; -SettingsPage::SettingsPage(QWidget *parent) : QWidget(parent), - ui(new Ui::SettingsPage) + +SettingsPage::SettingsPage(QWidget *parent) + : QWidget(parent) + , ui(new Ui::SettingsPage) { ui->setupUi(this); + configCanSave = false; initConfig(); } @@ -25,22 +39,28 @@ void SettingsPage::setTheme(bool dark) void SettingsPage::readServerList() { // 读取服务器列表并初始化 - QFile file(QDir::homePath().toUtf8() + "/.config/spark-store/server.list"); + QFile file(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list"); // 判断文件是否存在 if (!file.exists()) { - ui->comboBox_server->addItem("https://d.store.deepinos.org.cn/"); + ui->comboBox_server->addItem(DEFAULT_SERVER_URL); + return; } if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - qDebug() << "无法读取server.list"; + qWarning() << "无法读取 server.list"; + return; } - // 创建QTextStream对象 + // 创建 QTextStream 对象 QTextStream textStream(&file); - + if (!textStream.readAll().contains(DEFAULT_CHECK_DOMAIN)) // 校验配置文件有效性 + { + return; + } + textStream.seek(0); // 回到开头 QString lineData = textStream.readLine(); // 读取文件的第一行 ui->comboBox_server->addItem(lineData); while (!lineData.isNull()) @@ -71,12 +91,12 @@ void SettingsPage::initConfig() readServerList(); // 读取服务器URL并初始化菜单项的链接 - QSettings readConfig(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); - if (!readConfig.value("server/choose").toString().isEmpty() && readConfig.value("server/updated").toString() == "TRUE") + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + if (!config.value("server/choose").toString().isEmpty() && config.value("server/updated").toBool()) { - qDebug() << readConfig.value("server/choose").toString(); - ui->comboBox_server->setCurrentText(readConfig.value("server/choose").toString()); - SparkAPI::setServerUrl(readConfig.value("server/choose").toString()); + qDebug() << config.value("server/choose").toString(); + ui->comboBox_server->setCurrentText(config.value("server/choose").toString()); + SparkAPI::setServerUrl(config.value("server/choose").toString()); } configCanSave = true; // 　防止触发保存配置信号 } @@ -91,11 +111,23 @@ void SettingsPage::on_pushButton_updateServer_clicked() QtConcurrent::run([=]() { ui->pushButton_updateServer->setEnabled(false); + + + QFile::remove(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list"); + auto updateSuccess = system("curl -o " + QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation).toUtf8() + "/server.list https://d.store.deepinos.org.cn/store/server-and-mirror.list"); + qDebug() << "Update serverlist status:" << updateSuccess; + if (updateSuccess != 0) // 更新失败不换服务器配置 + { + QFile file(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/server.list"); + if (file.exists()) + { + file.remove(); + } + // FIXME: 向用户提示更新失败 + ui->pushButton_updateServer->setEnabled(true); + return; + } ui->comboBox_server->clear(); - - QFile::remove(QDir::homePath().toUtf8() + "/.config/spark-store/server.list"); - system("curl -o " + QDir::homePath().toUtf8() + "/.config/spark-store/server.list https://d.store.deepinos.org.cn/store/server-and-mirror.list"); - ui->pushButton_updateServer->setEnabled(true); readServerList(); ui->comboBox_server->setCurrentIndex(0); }); @@ -105,14 +137,14 @@ void SettingsPage::on_comboBox_server_currentIndexChanged(const QString &arg1) { SparkAPI::setServerUrl(arg1); // 服务器信息更新 qDebug() << arg1; - const QString updatedInfo = "TRUE"; - if (configCanSave) + bool updatedInfo = true; + if(configCanSave) { // ui->label_setting1->show(); - QSettings *setConfig = new QSettings(QDir::homePath() + "/.config/spark-store/config.ini", QSettings::IniFormat); - setConfig->setValue("server/choose", arg1); - setConfig->setValue("server/updated", updatedInfo); - setConfig->deleteLater(); + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + config.setValue("server/choose", arg1); + config.setValue("server/updated", updatedInfo); + config.sync(); } } @@ -183,7 +215,8 @@ void SettingsPage::on_pushButton_updateApt_clicked() emit openUrl(QUrl("spk://store/tools/spark-store")); ui->label_aptserver->setText(tr("")); - ui->pushButton_updateApt->setEnabled(true); }); + ui->pushButton_updateApt->setEnabled(true); + }); } void SettingsPage::on_pushButton_clear_clicked() @@ -192,7 +225,7 @@ void SettingsPage::on_pushButton_clear_clicked() { ui->pushButton_clear->setEnabled(false); - QDir tmpdir("/tmp/spark-store"); + QDir tmpdir(QString::fromUtf8(TMP_PATH)); tmpdir.setFilter(QDir::Files); int quantity = int(tmpdir.count()); for(int i = 0; i < quantity; i++) @@ -207,13 +240,15 @@ void SettingsPage::on_pushButton_clear_clicked() void SettingsPage::on_pushButton_clearWebCache_clicked() { QtConcurrent::run([=]() - { - QString dataLocal = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation); - qDebug() << dataLocal; - QDir dataDir(dataLocal); + { + QString localDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/QtWebEngine"; + qDebug() << localDataLocation; + QDir dataDir(localDataLocation); dataDir.removeRecursively(); - dataLocal = QStandardPaths::writableLocation(QStandardPaths::TempLocation); - qDebug() << dataLocal; - QDir cacheDir(dataLocal); - cacheDir.removeRecursively(); }); + + QString cacheLocation = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/QtWebEngine"; + qDebug() << cacheLocation; + QDir cacheDir(cacheLocation); + cacheDir.removeRecursively(); + }); } diff --git a/src/pages/settingspage.h b/src/pages/settingspage.h index 6294283..f65347f 100644 --- a/src/pages/settingspage.h +++ b/src/pages/settingspage.h @@ -2,14 +2,7 @@ #define SETTINGSPAGE_H #include -#include -#include -#include -#include -#include -#include "../backend/sparkapi.h" -#include "utils/utils.h" -#define TMP_PATH "/tmp/spark-store" +#include namespace Ui { class SettingsPage; diff --git a/src/spark-store.pro b/src/spark-store.pro index d01287b..1d10d00 100644 --- a/src/spark-store.pro +++ b/src/spark-store.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui network concurrent webenginewidgets dbus svg +QT += core gui concurrent dbus network svg webenginewidgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -22,78 +22,75 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -DEFINES += QT_APP_DEBUG +# Disable qWarning / qDebug output in Release +# CONFIG(release, debug|release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT CONFIG += c++11 link_pkgconfig PKGCONFIG += dtkcore dtkgui dtkwidget -# Disable qWarning / qDebug output in Release -CONFIG(release, debug|release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT - -# Update translation files -CONFIG(release, debug|release): system(bash $${PWD}/translate_generation.sh) - -TRANSLATIONS += \ - ../translations/spark-store_en.ts \ - ../translations/spark-store_fr.ts \ - ../translations/spark-store_zh_CN.ts - SOURCES += \ - dbus/dbussparkstoreservice.cpp \ - main.cpp \ - mainwindow-dtk.cpp \ + backend/downloadworker.cpp \ + backend/image_show.cpp \ backend/sparkapi.cpp \ + dbus/dbussparkstoreservice.cpp \ + pages/appintopage.cpp \ + pages/applistpage.cpp \ pages/settingspage.cpp \ + utils/httprequest.cpp \ utils/utils.cpp \ utils/widgetanimation.cpp \ - widgets/common/progressbutton.cpp \ - widgets/common/webenginepage.cpp \ - widgets/common/webengineview.cpp \ - widgets/downloadlistwidget.cpp \ + widgets/base/basewidgetopacity.cpp \ widgets/common/downloaditem.cpp \ + widgets/common/progressbutton.cpp \ widgets/common/smoothlistwidget.cpp \ widgets/common/smoothscrollbar.cpp \ - utils/httprequest.cpp \ - pages/applistpage.cpp \ - backend/downloadworker.cpp \ - pages/appintopage.cpp \ + widgets/common/webenginepage.cpp \ + widgets/common/webengineview.cpp \ widgets/big_image.cpp \ - backend/image_show.cpp \ - widgets/base/basewidgetopacity.cpp + widgets/downloadlistwidget.cpp \ + application.cpp \ + main.cpp \ + mainwindow-dtk.cpp HEADERS += \ - dbus/dbussparkstoreservice.h \ - mainwindow-dtk.h \ + backend/downloadworker.h \ + backend/image_show.h \ backend/sparkapi.h \ + dbus/dbussparkstoreservice.h \ + pages/appintopage.h \ + pages/applistpage.h \ pages/settingspage.h \ + utils/httprequest.h \ utils/utils.h \ utils/widgetanimation.h \ - widgets/common/progressbutton.h \ - widgets/common/webenginepage.h \ - widgets/common/webengineview.h \ - widgets/downloadlistwidget.h \ + widgets/base/basewidgetopacity.h \ widgets/common/downloaditem.h \ + widgets/common/progressbutton.h \ widgets/common/smoothlistwidget.h \ widgets/common/smoothscrollbar.h \ - utils/httprequest.h \ - pages/applistpage.h \ - backend/downloadworker.h \ - pages/appintopage.h \ + widgets/common/webenginepage.h \ + widgets/common/webengineview.h \ widgets/big_image.h \ - backend/image_show.h \ - widgets/base/basewidgetopacity.h + widgets/downloadlistwidget.h \ + application.h \ + mainwindow-dtk.h FORMS += \ - mainwindow-dtk.ui \ - pages/settingspage.ui \ - widgets/downloadlistwidget.ui \ - widgets/common/downloaditem.ui \ + pages/appintopage.ui \ pages/applistpage.ui \ - pages/appintopage.ui + pages/settingspage.ui \ + widgets/common/downloaditem.ui \ + widgets/downloadlistwidget.ui \ + mainwindow-dtk.ui RESOURCES += \ assets/assets.qrc +TRANSLATIONS += \ + ../translations/spark-store_en.ts \ + ../translations/spark-store_fr.ts \ + ../translations/spark-store_zh_CN.ts + # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/durapps/$${TARGET}/bin diff --git a/src/widgets/base/basewidgetopacity.cpp b/src/widgets/base/basewidgetopacity.cpp index fcff23f..dfb0492 100644 --- a/src/widgets/base/basewidgetopacity.cpp +++ b/src/widgets/base/basewidgetopacity.cpp @@ -1,6 +1,8 @@ #include "basewidgetopacity.h" #include +#include +#include #include BaseWidgetOpacity::BaseWidgetOpacity(QWidget *parent) : DBlurEffectWidget(parent) @@ -12,6 +14,14 @@ BaseWidgetOpacity::BaseWidgetOpacity(QWidget *parent) : DBlurEffectWidget(parent /// @param event void BaseWidgetOpacity::closeEvent(QCloseEvent *event) { + // FIXME: wayland 不支持直接设置窗口透明度，需要调用 wayland 相关库（考虑抄控制中心“窗口移动时启用透明特效”代码？） + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + bool isWayland = config.value("build/isWayland").toBool(); + if(isWayland) + { + return DBlurEffectWidget::closeEvent(event); + } + if (!closeWindowAnimation) { closeWindowAnimation = true; diff --git a/src/widgets/common/downloaditem.cpp b/src/widgets/common/downloaditem.cpp index 538942f..2161690 100644 --- a/src/widgets/common/downloaditem.cpp +++ b/src/widgets/common/downloaditem.cpp @@ -22,6 +22,9 @@ DownloadItem::DownloadItem(QWidget *parent) : QWidget(parent), ui->pushButton_3->hide(); ui->widget_spinner->start(); ui->widget_spinner->hide(); + + ui->label->setElideMode(Qt::TextElideMode::ElideRight); + ui->label_2->setElideMode(Qt::TextElideMode::ElideRight); } DownloadItem::~DownloadItem() @@ -33,10 +36,12 @@ void DownloadItem::setValue(qint64 value) { ui->progressBar->setValue(qint32(value)); ui->label_2->setText(QString::number(double(value) / 100) + "% (" + speed + ")"); + ui->label_2->setToolTip(QString::number(double(value) / 100) + "% (" + speed + ")"); if (ui->label_2->text().left(4) == "100%") { download = 1; ui->label_2->setText(tr("Download Complete.")); + ui->label_2->setToolTip(tr("Download Complete.")); } } @@ -48,6 +53,7 @@ void DownloadItem::setMax(qint64 max) void DownloadItem::setName(QString name) { ui->label->setText(name); + ui->label->setToolTip(name); } QString DownloadItem::getName() @@ -96,6 +102,7 @@ void DownloadItem::install(int t) ui->widget_spinner->show(); qDebug() << "/tmp/spark-store/" + ui->label_filename->text().toUtf8(); ui->label_2->setText(tr("Installing")); + ui->label_2->setToolTip(tr("Installing")); QtConcurrent::run([=]() { @@ -119,7 +126,7 @@ void DownloadItem::install(int t) out = installer.readAllStandardOutput(); QStringList everyOut = out.split("\n"); - for(int i=0;ipushButton_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(); } @@ -150,13 +158,15 @@ void DownloadItem::install(int t) 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) + 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(); } @@ -177,6 +187,7 @@ void DownloadItem::on_pushButton_install_clicked() void DownloadItem::on_pushButton_2_clicked() { ui->label_2->setText(tr("Download canceled")); + ui->label_2->setToolTip(tr("Download canceled")); download = 2; ui->pushButton_2->setEnabled(false); ui->progressBar->hide(); diff --git a/src/widgets/common/downloaditem.ui b/src/widgets/common/downloaditem.ui index 2d57cf3..476f609 100644 --- a/src/widgets/common/downloaditem.ui +++ b/src/widgets/common/downloaditem.ui @@ -7,13 +7,25 @@ 0 0 666 - 54 + 56 + + + 0 + 0 + + + + + 0 + 56 + + 16777215 - 54 + 56 @@ -40,10 +52,22 @@ + + + 0 + 0 + + + + + 48 + 48 + + 48 - 16777215 + 48 @@ -52,6 +76,9 @@ true + + Qt::AlignCenter + @@ -70,6 +97,31 @@ + + + + + 0 + 0 + + + + + 120 + 48 + + + + + 120 + 48 + + + + Name + + + @@ -83,33 +135,6 @@ - - - - - 80 - 0 - - - - - 16777215 - 16777215 - - - - - 13 - - - - Name - - - true - - - @@ -153,11 +178,14 @@ 0 + + 8 + 0 - 0 + 8 @@ -188,7 +216,7 @@ - + 9 @@ -297,6 +325,11 @@
dspinner.h
1 + + DLabel + QLabel +
dlabel.h
+ diff --git a/src/widgets/common/smoothlistwidget.cpp b/src/widgets/common/smoothlistwidget.cpp index 3cba1b4..6e96ee2 100644 --- a/src/widgets/common/smoothlistwidget.cpp +++ b/src/widgets/common/smoothlistwidget.cpp @@ -16,7 +16,6 @@ void SmoothListWidget::wheelEvent(QWheelEvent *e) } void SmoothListWidget::onSliderChanged(int p) { - int startRow = count(); if (p == vScrollBar->maximum()) { emit reachedBottom(); // 1 diff --git a/src/widgets/downloadlistwidget.cpp b/src/widgets/downloadlistwidget.cpp index 6c61115..28a31f3 100644 --- a/src/widgets/downloadlistwidget.cpp +++ b/src/widgets/downloadlistwidget.cpp @@ -7,7 +7,7 @@ DownloadListWidget::DownloadListWidget(QWidget *parent) : DBlurEffectWidget(pare ui(new Ui::DownloadListWidget) { ui->setupUi(this); - setWindowTitle("Download list"); + setWindowTitle(QObject::tr("Download list")); installEventFilter(this); this->setAttribute(Qt::WA_Hover, true); setFocus(); @@ -55,7 +55,6 @@ DownloadListWidget::~DownloadListWidget() if (downloadController) { downloadController->stopDownload(); - downloadController->deleteLater(); } delete ui; @@ -92,7 +91,7 @@ void DownloadListWidget::addItem(QString name, QString fileName, QString pkgName di->pkgName = pkgName; di->seticon(icon); QListWidgetItem *pItem = new QListWidgetItem(); - pItem->setSizeHint(QSize(240, 50)); + pItem->setSizeHint(QSize(240, 56)); // ui 中单个 downloaditem 高度固定 56px（上下 margin 8px，图片固定 48x48） ui->listWidget->addItem(pItem); ui->listWidget->setItemWidget(pItem, di); if (!isBusy) diff --git a/src/widgets/downloadlistwidget.ui b/src/widgets/downloadlistwidget.ui index 16cb680..e46a655 100644 --- a/src/widgets/downloadlistwidget.ui +++ b/src/widgets/downloadlistwidget.ui @@ -85,7 +85,7 @@ QListWidget::item::selected } - QFrame::StyledPanel + QFrame::NoFrame Qt::ScrollBarAsNeeded @@ -99,9 +99,15 @@ QListWidget::item::selected 10 + + QAbstractItemView::NoEditTriggers + QListView::Fixed + + 4 + diff --git a/tool/aptss b/tool/aptss index 1a2b761..563c40f 100755 --- a/tool/aptss +++ b/tool/aptss @@ -18,8 +18,10 @@ fi if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" = "full-upgrade" ] ; then - -sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0" +if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then +echo "接收星火仓库软件信息中..." +aptss ssupdate +fi ###执行 bwrap --dev-bind / / \ @@ -38,13 +40,18 @@ bwrap --dev-bind / / \ elif [ "$1" = "policy" ] || [ "$1" = "search" ];then -sudo bwrap --dev-bind / / --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list apt update -o Dir::Etc::sourcelist="sources.list.d/sparkstore.list" -o Dir::etc::sourceparts="-" -o APT::Get::List-Cleanup="0" + + +if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then +echo "接收星火仓库软件信息中..." +aptss ssupdate +fi ###执行 bwrap --dev-bind / / \ --bind '/tmp/aptss-conf/apt-fast.conf' /etc/apt-fast.conf \ --bind '/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list' /etc/apt/sources.list.d/sparkstore.list \ - apt "$@" --allow-downgrades + apt "$@" elif [ "$1" = "ssupdate" ];then diff --git a/tool/ssaudit b/tool/ssaudit new file mode 100755 index 0000000..4402e21 --- /dev/null +++ b/tool/ssaudit @@ -0,0 +1,33 @@ +#!/bin/bash + +echo "Spark Store Audit script.星火商店审核脚本" + + +#################检测文件是否存在 +if [ $# -eq 0 ];then +echo "没有接收到参数，退出" +echo "用法：$0 deb路径" +exit +fi + +if [ ! -f "$1" ] +then + echo "文件不存在" + exit 1 +fi + +if [ "$(id -u)" != "0" ];then +#############################无root权限时 +echo "请使用root启动ssaudit" +exit 1 +fi + +### + + +DEBPATH=`realpath $1` + +echo ---------------------------------------------------------------------------------- +dpkg -i "$DEBPATH" || aptss install -yf + + diff --git a/tool/ssinstall b/tool/ssinstall index 3ca5516..2ff14a8 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -52,16 +52,28 @@ fi DEBPATH=`realpath $1` -if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ];then +if [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" ] && [ ! -e "/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" ];then echo "接收星火仓库软件信息中..." aptss ssupdate fi +### 选择包信息位置 + +if [ -e "/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" ];then +PACKAGES_DATA_PATH="/var/lib/apt/lists/d.store.deepinos.org.cn_store_Packages" +echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是单目录仓库配置" +else +PACKAGES_DATA_PATH="/var/lib/apt/lists/d.store.deepinos.org.cn_Packages" +echo "星火仓库的Packages位置为 $PACKAGES_DATA_PATH，是根目录仓库配置" +fi + + + echo "正在计算hash并与星火仓库匹配..." DEB_MD5SUM=`md5sum "$DEBPATH" | cut -c -32` -IS_MD5SUM_CHECKD=`cat /var/lib/apt/lists/d.store.deepinos.org.cn_Packages | grep $DEB_MD5SUM` +IS_MD5SUM_CHECKD=`cat $PACKAGES_DATA_PATH | grep $DEB_MD5SUM` if [ ! -z "$IS_MD5SUM_CHECKD" ];then echo "校验成功，开始安装" @@ -71,13 +83,13 @@ dpkg -i "$DEBPATH" || aptss install -yf else -zenity --info --icon-name=spark-store --height 270 --width 500 --text "软件包校验失败！这不应该发生！\n可能是因为软件包已损坏，星火仓库未同步，或者最坏的情况：恶意软件尝试利用自动安装来入侵系统！\n如果你不清楚发生了什么，请在接下来的认证窗口中选择取消认证\n执行 sudo aptss ssupdate 后再尝试安装。\n如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！\n\n如果你是审核人员，这是正常现象，在审核通过前星火仓库不会保存相关信息。请在接下来的弹窗中进行认证即可" +zenity --info --icon-name=spark-store --height 270 --width 500 --text "软件包校验失败！这不应该发生！\n可能是因为软件包已损坏，星火仓库未同步，或者最坏的情况：恶意软件尝试利用自动安装来入侵系统！\n如果你不清楚发生了什么，请在接下来的认证窗口中选择取消认证\n执行 sudo aptss ssupdate 后再尝试安装。\n如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！\n\n 如果你是审核人员，请使用 ssaudit来替代ssinstall进行审核工作，因为现在ssinstall已经被用于免密安装。\n如果你正在尝试安装已经下架的星火应用，也可用ssaudit来替代ssinstall" echo "软件包校验失败！这不应该发生！" echo "执行 sudo aptss ssupdate 后再尝试安装。" echo "如果问题仍然存在，请在应用信息界面点击 应用反馈 来提交反馈给我们！" -echo "如果你是审核人员，这是正常现象，在审核通过前星火仓库不会保存相关信息。请在接下来的弹窗中进行认证即可" +echo "如果你是审核人员，请使用 ssaudit来替代ssinstall进行审核工作，因为现在ssinstall已经被用于免密安装" +echo "如果你正在尝试安装已经下架的星火应用，也可用ssaudit来替代ssinstall" -pkexec_as_current_user bash -c "dpkg -i "$DEBPATH" || aptss install -yf " fi diff --git a/tool/update-upgrade/ss-update-notifier.sh b/tool/update-upgrade/ss-update-notifier.sh index 14698a6..271ea9c 100755 --- a/tool/update-upgrade/ss-update-notifier.sh +++ b/tool/update-upgrade/ss-update-notifier.sh @@ -47,7 +47,19 @@ fi # 每日更新星火源文件 curl --progress-bar -o /opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list "https://gitee.com/deepin-community-store/repo_auto_update_script/raw/master/mirror-list-for-apt-fast/sources.list.d/sparkstore.list" -updatetext=`aptss ssupdate` + + +updatetext=`aptss ssupdate 2>&1` + +until [ "`echo $updatetext | grep E: `" = "" ];do +echo "更新出现异常状况，等待十五秒" +sleep 15 +updatetext=`aptss ssupdate 2>&1` + + + +done + isupdate=`echo ${updatetext: -5}` if [ "$isupdate" = "date." ] ; then exit 0 diff --git a/translate_generation.sh b/translate_generation.sh index 9304a50..f64e4ca 100755 --- a/translate_generation.sh +++ b/translate_generation.sh @@ -1,10 +1,6 @@ #!/bin/bash # this file is used to auto-generate .qm file from .ts file. -ts_list=(`ls ./translations/*.ts`) +cd $(dirname $0) -for ts in "${ts_list[@]}" -do - printf "\nprocess ${ts}\n" - lrelease "${ts}" -done +lrelease ./src/spark-store.pro diff --git a/translate_update.sh b/translate_update.sh new file mode 100755 index 0000000..6c9b030 --- /dev/null +++ b/translate_update.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# this file is used to auto-update .ts file. + +cd $(dirname $0) + +lupdate ./src/spark-store.pro -no-obsolete diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 25a689a..4a0c526 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -10,8 +10,9 @@ - - + + + Download @@ -174,47 +175,51 @@ - + Click Open - - - + + Developer Mode Disabled + + + + + + Reinstall - + Upgrade - - - + + Install - + Installing - - + + Spark Store - + Uninstall succeeded - + The URL has been copied to the clipboard @@ -232,102 +237,121 @@ + + DAboutDialog + + + Version: %1 + + + + + %1 is released under %2 + + + DownloadItem - + Form - + icon - + TextLabel - + Name - + Waiting to download - + Install - + Cancel - + Info - + + Download Complete. - - + + Spark Store - + + Installing - + Installation complete. - + + Finish - + Retry - + Error happened in dpkg progress , you can try it again. - + + Error happened in dpkg progress , you can try it again - + dpkg progress had been aborted，you can retry installation. - + + dpkg progress had been aborted，you can retry installation - + + Download canceled @@ -345,7 +369,7 @@ - + Open download directory @@ -358,141 +382,128 @@ - + Home - + Network - + Chat - + Music - + Video - + Picture - + Game - + Office - + Reading - + Development - + Tool - + Theme - + Other - + APP Upgrade - + Submit App - + Submit App with client(Recommanded) - + Settings - + APP Upgrade and Install Settings - + Spark Store - + Search or enter spk:// - - QLabel - - - - Spark Store - - - QObject - - We publish this program under GPL V3 - - - - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - - - - - The Spark Project - - - - - + + + Spark Store - - <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>Spark developers</span><br/><br/>Published under GPL V3 + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> + + + + + Spark Project + + + + + Download list @@ -584,30 +595,19 @@ - + Updating, please wait... - + Spark Store - + Temporary cache was cleaned - - Widget - - Share - Spk share link - - - 0B - 0B - - diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index ea99fdd..72c7f15 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -10,8 +10,9 @@ - - + + + Download @@ -174,47 +175,51 @@ - + Click Open - - - + + Developer Mode Disabled + + + + + + Reinstall - + Upgrade - - - + + Install - + Installing - - + + Spark Store - + Uninstall succeeded - + The URL has been copied to the clipboard @@ -232,102 +237,121 @@ + + DAboutDialog + + + Version: %1 + + + + + %1 is released under %2 + + + DownloadItem - + Form - + icon - + TextLabel - + Name - + Waiting to download - + Install - + Cancel - + Info - + + Download Complete. - - + + Spark Store - + + Installing - + Installation complete. - + + Finish - + Retry - + Error happened in dpkg progress , you can try it again. - + + Error happened in dpkg progress , you can try it again - + dpkg progress had been aborted，you can retry installation. - + + dpkg progress had been aborted，you can retry installation - + + Download canceled @@ -345,7 +369,7 @@ - + Open download directory @@ -358,152 +382,128 @@ - + Home - + Network - + Chat - + Music - + Video - + Picture - + Game - + Office - + Reading - + Development - + Tool - + Theme - + Other - + APP Upgrade - + Submit App - + Submit App with client(Recommanded) - + Settings - + APP Upgrade and Install Settings - + Spark Store - + Search or enter spk:// - - QLabel - - Spark应用商店 - Spark Store - - - 社区驱动的一款为第三方应用商店，为改变而生 -本程序按GPL第三版开源 - Un app store tier alimenté par la communauté Deepin -Spark Store est publié sous licence GPL V3 -Nous sommes nés pour le changement. - - - - - Spark Store - - - QObject - - We publish this program under GPL V3 - - - - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - - - - - The Spark Project - - - - - + + + Spark Store - - <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>Spark developers</span><br/><br/>Published under GPL V3 + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> + + + + + Spark Project + + + + + Download list @@ -595,212 +595,19 @@ Nous sommes nés pour le changement. - + Updating, please wait... - + Spark Store - + Temporary cache was cleaned - - Widget - - 视频播放 - Lecteurs vidéo et créateurs vidéo - Vidéo - - - 下载列表 - Liste de téléchargement - - - 系统工具 - Outils - - - 主题美化 - Thème des icônes et autres - Thèmes - - - 音乐欣赏 - Musique - - - 编程开发 - Développement - - - 办公学习 - Bureau - - - 阅读翻译 - Traduire - - - 其他应用 - Autres - - - 商店首页 - Accueil - - - 图形图像 - Images - - - 游戏娱乐 - Jeux - - - 社交沟通 - Chat - - - 网络应用 - Réseau - - - 当前下载列表为空 - La liste de téléchargement est vide - - - 打开文件夹 - Ouvrir dans le gestionnaire de fichiers - - - 安装 - Installer - - - 卸载 - Supprimer - - - 官网 - Site - - - 软件名 - Nom - - - 图标 - Icon - - - 分享 - Partager - - - 详细介绍 - Détails - - - <html><head/><body><p>由社区爱好者开发的软件商店</p></body></html> - <html><head/><body><p>magasin de logiciels développé par des passionnés de la communauté</p></body></html> - - - 软件截图 - Captures d'écran - - - 线路设置 - Line Settings - - - 线路选择： - Choisissez: - - - 刷新 - Mise à jour - - - 重启商店后生效 - Redémarrez pour prendre effet - - - <html><head/><body><p>源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。</p></body></html> - <html><head/><body><p>Le rôle du serveur source est de s'assurer que le logiciel est mis à jour et prend en charge l'utilisation de l'outil apt pour obtenir le logiciel. Nous préférons généralement que vous utilisiez la première ligne comme source de mise à jour, qui est généralement la plus stable. </p></body></html> - - - 更新源 - Mettre à jour la source APT - - - 更新源服务器： - Source APT: - - - 服务器 - serveur - - - 缓存目录 - Temp - - - 清空 - Nettoyer - - - 因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。 - Étant donné que ce répertoire se trouve sous /tmp, même si vous ne l'effacez pas manuellement, il sera effacé automatiquement au redémarrage du système. - - - 目录大小： - Taille: - - - 0B - 0B - - - 目录位置：/tmp/spark-store - Emplacement:/tmp/spark-store - - - 关于我们 - À propos de nous - - - <html><head/><body><p>我们并不是官方团队，和你一样，我们也只是众多Linux/deepin系统爱好者和用户之中的一员，我们开发并且运营这个“Spark应用商店”，是为了让社区的朋友们一起分享好用的软件，或者一起参与开发，让大家都用到最新的，最优秀的软件。</p><p>我们并没有因此盈利，所有开发和维护人员都不会获得报酬，我们的主要支出大部分依赖于社区对我们的捐助，很感谢大家，这部分捐助让我们并不需要耗费太多精力去担心资金问题。</p><p>我们的服务和开发的软件都是免费供给大家使用，交流，学习的，但是在您的使用过程中一定要遵守当地的法律法规，否则出现任何问题和我们无关。</p><p>如果商店中任何一部分有侵犯您权益的行为，请告知我们&lt;jifengshenmo@outlook.com&gt;，我们会第一时间删除侵权内容。</p><p>如果你也想参与我们，不管是参与开发，设计，投递还是投稿作品，我们都欢迎你的加入。</p><p>QQ群：872690351<br/></p></body></html> - <html><head/><body><p>Nous ne sommes pas l'équipe officielle, tout comme vous, nous ne sommes qu'un des nombreux passionnés et utilisateurs de systèmes Linux / deepin, nous développons et gérons le "Spark Store"! ", est de rassembler la communauté pour partager des logiciels utiles, ou pour participer au développement ensemble, afin que nous utilisions tous les derniers et meilleurs logiciels. </p><p> Nous n'en tirons aucun profit, tous les développeurs et mainteneurs ne sont pas payés, et nous comptons sur les dons de la communauté pour la plupart de nos dépenses, dont nous sommes reconnaissants et qui nous permettent de ne pas dépenser trop d'énergie se soucier du financement. </p><p>Notre service et nos logiciels sont gratuits pour tout le monde à utiliser, à communiquer et à apprendre, mais vous devez vous conformer aux lois et réglementations locales dans le processus de votre utilisation, sinon tout problème n'a rien à voir avec nous. </p><p>Si une partie du magasin enfreint vos droits, veuillez nous en informer &lt;jifengshenmo@outlook.com&gt; nous retirerons le contenu en infraction dès que possible. </p><p>Si vous souhaitez également vous impliquer avec nous, que vous soyez impliqué dans le développement, la conception, le pitching ou la soumission de travaux, nous vous invitons à nous rejoindre. </p><p>QQ group:872690351<br/></p></body></html> - - - - downloadlist - - 名称 - Nom - - - 等待开始下载 - Attendez pour téléchargerd - Attendez pour télécharger - - - 安装 - Installer - - - 取消 - Annuler - - - 详情 - Détail - - diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 3e548d0..9065d35 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -10,8 +10,9 @@ - - + + + Download 下载 @@ -63,10 +64,6 @@ <html><head/><body><p><img src=":/tags/uos-small.png"/></p></body></html> - - <html><head/><body><p>A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.</p></body></html> - <html><head/><body><p>这是一款 deepin-wine2 应用，如果你并没有在使用深度系列发行版（比如您在使用ubuntu），你需要自行配置 deepin-wine2 环境</p></body></html> - @@ -111,10 +108,6 @@ <html><head/><body><p><img src=":/tags/a2d-small.png"/></p></body></html> - - <html><head/><body><p>A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.</p></body></html> - <html><head/><body><p>这是一款deepin-wine5应用，如果你并没有在使用深度系列发行版（比如您在使用ubuntu），你需要自行配置deepin-wine5环境</p></body></html> - @@ -182,55 +175,51 @@ 软件官网 - + Click Open 点击跳转 - - - + + Developer Mode Disabled + 开发者模式未开启 + + + + + Reinstall 重新安装 - + Upgrade 升级 - Downloading - 下载中 - - - Downloaded - 下载完成 - - - - - + + Install 安装 - + Installing - 正在安装 + 正在安装 - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板 @@ -248,126 +237,121 @@ + + DAboutDialog + + + Version: %1 + 版本：%1 + + + + %1 is released under %2 + %1遵循%2协议发布 + + DownloadItem - + Form - + icon - + TextLabel - + Name 软件名 - + Waiting to download 正在等待下载 - + Install 安装 - + Cancel 取消 - + Info 详情 - Spark Store App Installer - 星火内置安装器 - - - deepin deb installer - 深度软件包安装器 - - - gdebi - gdebi - - - Downloaded, waiting to install - 已完成，等待安装 - - - Download Failed，Check Your Connection - 下载失败，请检查网络连接 - - - Downloaded. Open APP Upgrade and Install Settings to enable password-free installation - 打开 APP 升级和安装设置以启用无密码安装 - - - + + Download Complete. 下载完成. - - + + Spark Store 星火应用商店 - + + Installing 正在安装 - + Installation complete. 安装完成. - + + Finish 完成 - + Retry 重试 - + Error happened in dpkg progress , you can try it again. 安装被中止，可重新安装。 - + + Error happened in dpkg progress , you can try it again dpkg出现错误，可重新安装 - + dpkg progress had been aborted，you can retry installation. dpkg进程被中断，您可重试安装。 - + + dpkg progress had been aborted，you can retry installation 安装被中止，可重新安装 - + + Download canceled 下载已取消 @@ -385,18 +369,10 @@ 当前下载列表为空。去下载些软件吧！ - + Open download directory 打开下载文件夹 - - Spark Store - 星火应用商店 - - - The download is complete. Please click the download button on the title Bar to open the download list for installation - 下载已完成，请点击标题栏上的下载按钮打开下载列表进行安装 - MainWindow @@ -406,154 +382,129 @@ - + Home 主页 - + Network 网络 - + Chat 社交 - + Music 音乐 - + Video 视频 - + Picture 图像 - + Game 游戏 - + Office 办公 - + Reading 阅读 - + Development 开发 - + Tool 工具 - + Theme 主题 - + Other 其他 - + APP Upgrade 更新 - + Submit App 投递应用 - + Submit App with client(Recommanded) 使用本地投稿器投递应用（推荐） - + Settings 设置 - + APP Upgrade and Install Settings 应用更新和安装设置 - + Spark Store 星火应用商店 - + Search or enter spk:// 搜索或打开链接 - - QLabel - - - - Spark Store - Spark 应用商店 - - QObject - - We publish this program under GPL V3 - 本程序按GPL V3开源 + + + + Spark Store + 星火应用商店 - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> + <span style=' font-size:10pt;font-weight:60;'>一款由社区提供的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span> - Version 2.0+2 - 版本： 2.0+2 - - - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - <span style=' font-size:10pt;font-weight:60;'>deepin 社区驱动的一款第三方应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span> - - - - The Spark Project + + Spark Project 星火计划 - <span style=' font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>Spark developers</span><br/>We publish this program under GPL V3 - <span style=' font-size:10pt;font-weight:60;'>一款由 深度社区 出品的应用商店</span><br/>""<a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/>""<span style=' font-size:12pt;'>星火开发者联盟</span><br/>本程序遵循 GPL V3 协议发布 - - - - <span style='font-size:10pt;font-weight:60;'>An appstore powered by deepin community</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>Spark developers</span><br/><br/>Published under GPL V3 - <span style='font-size:10pt;font-weight:60;'>由 Deepin 社区出品的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style='font-size:12pt;'>星火商店开发组</span><br/><br/>遵循 GPL V3 协议发布 - - - - - Spark Store - 星火应用商店 + + Download list + 下载列表 @@ -644,539 +595,19 @@ <html><head/><body><p>我们并<span style=" font-weight:600;">不是</span>官方团队，和你一样，我们也只是众多Linux/deepin系统爱好者和用户之中的一员，我们开发并且运营这个“Spark应用商店”，是为了让社区的朋友们一起分享好用的软件，或者一起参与开发，让大家都用到最新的，最优秀的软件。</p><p>我们并没有因此盈利，所有开发和维护人员都不会获得报酬，我们的主要支出大部分依赖于社区对我们的捐助，很感谢大家，这部分捐助让我们并不需要耗费太多精力去担心资金问题。</p><p>我们的服务和开发的软件都是免费供给大家使用，交流，学习的，但是在您的使用过程中一定要遵守当地的法律法规，否则出现任何问题和我们无关。</p><p>如果商店中任何一部分有侵犯您权益的行为，请告知我们 &lt;jifengshenmo@outlook.com&gt; ，我们会第一时间删除侵权内容。</p><p>如果你也想参与我们，不管是参与开发，设计，投递还是投稿作品，我们都欢迎你的加入。</p><p>在 Spark IM 联系我们:<a href="https://chat.shenmo.tech"><span style=" text-decoration: underline; color:#0000ff;">https://chat.shenmo.tech<br/></span></a>QQ 群：872690351</p></body></html> - <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us &lt;jifengshenmo@outlook.com&gt; we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p>Connect us on Spark IM: https://chat.shenmo.tech<br/></p></body></html> - &lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;我们并&lt;span style=&quot; font-weight:600;&quot;&gt;不是&lt;/span&gt;官方团队，和你一样，我们也只是众多Linux/deepin系统爱好者和用户之中的一员，我们开发并且运营这个“Spark应用商店”，是为了让社区的朋友们一起分享好用的软件，或者一起参与开发，让大家都用到最新的，最优秀的软件。&lt;/p&gt;&lt;p&gt;我们并没有因此盈利，所有开发和维护人员都不会获得报酬，我们的主要支出大部分依赖于社区对我们的捐助，很感谢大家，这部分捐助让我们并不需要耗费太多精力去担心资金问题。&lt;/p&gt;&lt;p&gt;我们的服务和开发的软件都是免费供给大家使用，交流，学习的，但是在您的使用过程中一定要遵守当地的法律法规，否则出现任何问题和我们无关。&lt;/p&gt;&lt;p&gt;如果商店中任何一部分有侵犯您权益的行为，请告知我们 &amp;lt;jifengshenmo@outlook.com&amp;gt;，我们会第一时间删除侵权内容。&lt;/p&gt;&lt;p&gt;如果你也想参与我们，不管是参与开发，设计，投递还是投稿作品，我们都欢迎你的加入。&lt;/p&gt;&lt;p&gt;在 Spark IM 联系我们: https://chat.shenmo.tech&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; - - - + Updating, please wait... 正在更新，请稍候…… - + Spark Store 星火应用商店 - + Temporary cache was cleaned 缓存目录已清空 - - SpkAppInfoLoaderThread - - Failed to download app info. Please check internet connection. - 下载应用程序详细信息失败，请检查网络连接。 - - - PkgName: - 包名： - - - Version: - 版本： - - - Author: - 作者： - - - Official Site: - 官网： - - - Contributor: - 投稿者： - - - Update Time: - 更新时间： - - - Installed Size: - 大小： - - - Failed to load application icon. - 加载应用程序图标失败。 - - - - Widget - - Videos - 视频播放 - - - Download List - 下载列表 - - - Tools - 系统工具 - - - Beautify - 主题美化 - - - Music - 音乐欣赏 - - - Coding - 编程开发 - - - Office - 办公学习 - - - Translate - 阅读翻译 - - - Others - 其他应用 - - - FrontPage - 商店首页 - - - Images - 图形图像 - - - Games - 游戏娱乐 - - - Chatting - 社交沟通 - - - Network - 网络应用 - - - The list is currently empty. Go and download some softwares! - 当前下载列表为空。去下载些软件吧！ - - - Open download directory - 打开下载文件夹 - - - Name - 软件名 - - - Install - 安装 - - - Video - 视频播放 - - - Download - 下载列表 - - - Reading - 阅读翻译 - - - Chat - 社交沟通 - - - Uninstall - 卸载 - - - Site - 官网 - - - <html><head/><body><p>This app is developed by community user,we give this tag to honor those who contribute to the Linux Ecology</p></body></html> - <html><head/><body><p>这款应用是社区开发者开发的，我们为社区开发者颁发这款勋章以表彰他们对Linux生态的贡献</p></body></html> - - - <html><head/><body><p>Capable to Ubuntu 20.04</p></body></html> - <html><head/><body><p>支持Ubuntu 20.04</p></body></html> - - - <html><head/><body><p>Capable to deepin 20</p></body></html> - <html><head/><body><p>支持deepin 20</p></body></html> - - - <html><head/><body><p>Capable to UOS home 20</p></body></html> - <html><head/><body><p>支持UOS家庭版 20</p></body></html> - - - <html><head/><body><p>This is a DTK5 app,which means it would have better effect on Deepin Desktop Environment</p></body></html> - <html><head/><body><p>这是一款DTK5应用，请使用深度桌面环境来获得最完美的体验</p></body></html> - - - <html><head/><body><p>A deepin-wine5 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine5 by your self.</p></body></html> - <html><head/><body><p>这是一款deepin-wine5应用，如果你并没有在使用深度系列发行版（比如您在使用ubuntu），你需要自行配置deepin-wine5环境</p></body></html> - - - <html><head/><body><p>An Appimage to deb app.</p></body></html> - <html><head/><body><p>这是一款Appimage转制应用.</p></body></html> - - - Share - Spk分享链接 - - - Development - 编程开发 - - - Home - 商店首页 - - - Graphics - 图形图像 - - - Communication - 社交沟通 - - - <html><head/><body><p>A deepin-wine2 app.If you are using ubuntu or other non-deepin distro,you should deploy deepin-wine2 by your self.</p></body></html> - <html><head/><body><p>这是一款 deepin-wine2 应用，如果你并没有在使用深度系列发行版（比如您在使用ubuntu），你需要自行配置 deepin-wine2 环境</p></body></html> - - - Contribute translation - 贡献翻译/应用反馈 - - - Info - 详细 - - - <html><head/><body><p>An app store developed by community enthusiasts</p></body></html> - <html><head/><body><p>由社区爱好者开发的一款应用商店</p></body></html> - - - Screenshots - 屏幕截图 - - - Line Settings - 线路设置 - - - Choose Line: - 线路选择： - - - Refresh - 刷新 - - - Take effect when restart - 重启商店后生效 - - - <html><head/><body><p>The role of the source server is to ensure that the software is updated, and supports the use of the apt tool to get the software. We usually prefer that you use the first line as the update source, which is generally the most stable. </p></body></html> - <html><head/><body><p>源服务器的作用是保证软件更新，并且支持使用apt工具获取软件。通常我们更建议你使用第一个线路作为更新源，一般是最稳定的。</p></body></html> - - - Update - 更新源 - - - Source Server - 更新源服务器 - - - Temp - 缓存目录 - - - Clean - 清空 - - - Since the dictionary is at /tmp,It would be cleaned automatically when system reboot. - 因为这个目录位于/tmp下，所以即使你不手动清空的话，其也将在系统重启时自动清空。 - - - Size: - 目录大小： - - - Location：/tmp/spark-store - 目录位置：/tmp/spark-store - - - About us - 关于我们 - - - <html><head/><body><p>We are <span style=" font-weight:600;">NOT</span> the official team, just like you, we are just one of the many Linux/deepin system enthusiasts and users, we develop and run the &quot;Spark Store&quot;! &quot;, is to bring the community together to share useful software, or to participate in development together, so that we all use the latest and greatest software. </p><p>We don't make a profit from this, all developers and maintainers don't get paid, and we rely on the community's donations to us for most of our expenses, which we are grateful for and which allow us not to spend too much energy worrying about funding. </p><p>Our service and software are free for everyone to use, communicate, and learn, but you must comply with local laws and regulations in the process of your use, otherwise any problems have nothing to do with us. </p><p>If any part of the store infringes your rights, please tell us &lt;jifengshenmo@outlook.com&gt; we will remove the infringing content as soon as possible. </p><p>If you'd like to get involved with us too, whether you're involved in development, design, pitching or submitting work, we welcome you to join us. </p><p>QQ group:872690351<br/></p></body></html> - <html><head/><body><p>我们并<span style=" font-weight:600;">不是</span>官方团队，和你一样，我们也只是众多Linux/deepin系统爱好者和用户之中的一员，我们开发并且运营这个“Spark应用商店”，是为了让社区的朋友们一起分享好用的软件，或者一起参与开发，让大家都用到最新的，最优秀的软件。</p><p>我们并没有因此盈利，所有开发和维护人员都不会获得报酬，我们的主要支出大部分依赖于社区对我们的捐助，很感谢大家，这部分捐助让我们并不需要耗费太多精力去担心资金问题。</p><p>我们的服务和开发的软件都是免费供给大家使用，交流，学习的，但是在您的使用过程中一定要遵守当地的法律法规，否则出现任何问题和我们无关。</p><p>如果商店中任何一部分有侵犯您权益的行为，请告知我们 &lt;jifengshenmo@outlook.com&gt;，我们会第一时间删除侵权内容。</p><p>如果你也想参与我们，不管是参与开发，设计，投递还是投稿作品，我们都欢迎你的加入。</p><p>QQ 群：872690351<br/></p></body></html> - - - Back to category - 返回分类 - - - Home - 商店首页 - - - Reload - 刷新 - - - Take effect when restart - 重启商店后生效 - - - Spark Store - Spark 应用商店 - - - Search or enter spk:// - 搜索或打开链接 - - - Submit App - 投递应用 - - - Settings - 设置 - - - Not Exist - 不存在 - - - Spark\ Store - 星火应用商店 - - - Failed to download app info. Please check internet connection. - 下载应用程序详细信息失败，请检查网络连接。 - - - PkgName: - 包名： - - - Version: - 版本： - - - Author: - 作者： - - - Official Site: - 官网： - - - Contributor: - 投稿者： - - - Update Time: - 更新时间： - - - Installed Size: - 大小： - - - Reinstall - 重新安装 - - - Failed to load application icon. - 加载应用程序图标失败。 - - - Failed to get the name to the file to be downloaded. - 获取安装包文件名失败。 - - - Relative apps Not Found! - 相关应用未找到！ - - - Request Error: %1 - 请求错误：%1 - - - Spark store could only process spk:// links for now. The search feature is coming soon! - 目前仅支持商店专用链接的打开，搜索功能正在开发，请期待以后的版本！ - - - Upgrade - 升级 - - - Updating, please wait... - 正在更新，请稍候…… - - - Apt has reported an error. Please use apt update in terminal to locate the problem. - 更新中发生错误，请在终端使用apt update来查看错误原因。 - - - Unknown error! - 未知错误！ - - - Yes - 是 - - - No - 否 - - - Information for Contributors - 贡献者须知 - - - Currently the translation contribution is limited to English, -and you will be redirected to our Gitee repository at which you are -supposed to be creating pull requests to contribute app info -translations. -Tips:You can simply click the file to edit to create a flat pull request without create a full pull request -Tips:You can use github account to login to Gitee -Click yes to continue. - 目前商店仅支持应用程序英文详细信息的贡献。 -在你确认后你会被导向到我们的 Gitee 页面， -请在此创建 Pull Request 以进行翻译贡献。 -备注：你可以直接在页面编辑以快速创建轻量级pr -你也可以使用github账户直接登陆Gitee - -单击“是”以继续。 - - - Currently the translation contribution is limited to English, -and you will be redirected to our Gitee repository at which you are -supposed to be creating pull requests to contribute app info -translations. - -Click yes to continue. - 目前商店仅支持应用程序英文详细信息的贡献。 -在你确认后你会被导向到我们的 Gitee 页面， -请在此创建 Pull Request 以进行翻译贡献。 -备注：你可以直接在页面编辑以快速创建轻量级pr -你也可以使用github账户直接登陆Gitee - -单击“是”以继续。. - - - Unknown server error! - 服务器未知错误 - - - Uninstall succeeded - 卸载成功 - - - Temporary cache was cleaned - 缓存目录已清空 - - - The URL has been copied to the clipboard - 链接已复制到剪贴板 - - - - downloadlist - - Name - 软件名 - - - Waiting to download - 正在等待下载 - - - Install - 安装 - - - Cancel - 取消 - - - Info - 详情 - - - dpkg - dpkg - - - Spark Store App Installer - 星火内置安装器 - - - gdebi - gdebi - - - deepin deb installer - 深度软件包安装器 - - - Downloaded, waiting to install - 已完成，等待安装 - - - Failed to download %1 - 下载 %1 失败 - - - Download Failed，Check Your Connection - 下载失败，请检查网络连接 - - - Finished downloading %1, awaiting to install - %1 下载完成，等待安装 - - - Installing - 正在安装 - - - Installing... - 正在安装 - - - Finish - 完成 - - - Retry - 重试 - - - Error happened in dpkg progress , you can try it again - dpkg出现错误，可重新安装 - - - dpkg progress had been aborted，you can retry installation - 安装被中止，可重新安装 - - - Download canceled - 下载已取消 - -