diff --git a/.github/workflows/program-builder.yml b/.github/workflows/program-builder.yml deleted file mode 100644 index 664aba241599a649ec0869a04684e375c3b13064..0000000000000000000000000000000000000000 --- a/.github/workflows/program-builder.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Building Program -run-name: Building ${{ GITHUB.REPOSITORY }} - -on: - workflow_dispatch: - push: - tags: - - "*" - -jobs: - call: - uses: GXDE-OS/GXDE/.github/workflows/building-deb.yml@master - secrets: inherit diff --git a/.gitignore b/.gitignore index b65abfdec275c3565e6e0f9fd5852f2898df2be6..709ed4d9d80aee932cb1d1fe684dc6a7ab47881c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *.la *.lai *.so +*.so.* *.dll *.dylib @@ -28,13 +29,12 @@ ui_*.h *.jsc Makefile* *build-* +*.qm +*.prl # Qt unit tests target_wrapper.* -# Qt qm files -translations/*.qm - # QtCreator *.autosave @@ -44,13 +44,23 @@ translations/*.qm # QtCreator CMake CMakeLists.txt.user* -build -# Debian dpkg-buildpackage +# QtCreator 4.8< compilation database +compile_commands.json + +# QtCreator local machine specific files for imported projects +*creator.user* + +*_qmlcache.qrc + +# debian debian/*.debhelper* debian/files debian/*.substvars debian/spark-store -.vscode/* +# Others +build obj-* +.vscode +.cache \ No newline at end of file diff --git a/.workflow/dtk-build-release-tag-20220425.yml b/.workflow/dtk-build-release-tag-20220425.yml index a6e0bc20e0d7696331dc40ae3525cbea50affa66..e7631b1027cd954b5f6c7b5132d657493eeeb603 100644 --- a/.workflow/dtk-build-release-tag-20220425.yml +++ b/.workflow/dtk-build-release-tag-20220425.yml @@ -18,28 +18,22 @@ stages: name: execute_by_docker displayName: 基于镜像的DTK构建 certificate: '' - image: docker.jianmuhub.com/library/debian:buster + image: docker.io/debian:buster command: - sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list - '# 换源' - apt update - export DEBIAN_FRONTEND=noninteractive - - echo "安装依赖..." - - 'apt install libgsettings-qt-dev -y ' - - 'apt install debhelper git curl fakeroot qtbase5-dev zlib1g-dev qt5-default -y ' + - echo "安装git devscripts equivs curl..." + - 'apt install git devscripts equivs curl -y ' - git clone https://gitlink.org.cn/shenmo7192/dtk-old-bundle.git - cd dtk-old-bundle - apt install ./*.deb -y - cd .. - rm -rf dtk-old-bundle - '' - - '#mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" ' - - apt build-dep . -y - - strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 - - uname -a - - sed -i 's/dh \$@ --parallel/dh \$@/' debian/rules - - '# Gitee的配置太低了' - - dpkg-buildpackage -b -us -uc + - 'mk-build-deps --install --tool "apt-get -o Debug::pkgProblemResolver=yes -y" ' + - dpkg-buildpackage -j2 -b -us -uc - cd .. - ls -all - pwd diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..fbaa5532a90cb564f33cc02f5e7f27e8dbf2ca71 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 3.12) + +project(spark-store) + +if(NOT DEFINED VERSION) + set(VERSION 4.0.0) +endif() +add_compile_definitions(APP_VERSION="${VERSION}") + +execute_process( + COMMAND git symbolic-ref --short -q HEAD + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE BRANCH +) +string(STRIP "${BRANCH}" BRANCH) +add_compile_definitions(APP_BRANCH="${BRANCH}") + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(AUTOMOC_COMPILER_PREDEFINES ON) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall") +if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "sw_64") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mieee") +endif () +if (NOT ${CMAKE_BUILD_TYPE} MATCHES "Debug") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") +endif () + +add_compile_definitions(QT_MESSAGELOGCONTEXT) + +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX /usr) +endif() + +find_package(Qt5 REQUIRED COMPONENTS Core Widgets Network Concurrent) + +include(GNUInstallDirs) + +add_subdirectory(src) +add_subdirectory(translations) +add_subdirectory(spark-update-tool) \ No newline at end of file diff --git a/EULA b/EULA deleted file mode 100644 index 7ed453065f53b91a331edafa15a637cbbf29b541..0000000000000000000000000000000000000000 --- a/EULA +++ /dev/null @@ -1,41 +0,0 @@ -星火开源软件协议(Spark Opensource LICENSE) - -版权所有 (C) 2023 星火社区 - -根据 GNU 通用公共许可证第三版(GPL v3),本软件是自由软件,您可以修改和再发布它。但是,为了维护原作者的权益并保护社区用户的权益,请遵守以下条款: - -1. 对本仓库下的所有文件生效:本许可证适用于本仓库(或项目)下的所有文件。任何使用、修改或再发布本软件的个人或组织都必须遵守本许可证。 -2. 版权声明和许可证文件:您不得移除、隐藏或更改本软件中包含的原作者的版权声明和许可证文件。保留原作者的权益信息对于维护开源软件生态系统至关重要。 -3. 版本标注: 如果您对本软件做出修改并再发布,您必须在醒目位置标注此版本并非星火社区官方提供。这样可以避免误导使用者认为该软件为星火社区官方提供的版本。此软件仅授权用于个人非盈利用途,任何将其用于商业目的或在盈利性组织中使用的行为均需事先获得星火社区的书面许可。 -4. 商标使用:您不得在再发布版本中使用“星火应用商店”、“Spark Store”或星火应用商店的Logo等可能误导使用者此软件由星火社区官方提供的信息。 -5. 服务条款:您使用星火商店软件的行为将被视为您同意星火在不侵犯您隐私的前提下搜集版本、日志等信息,以便于星火社区更好地为您提供服务。 -6. 仓库版权条款:为了更好的提供持续性服务,星火仅对个人用户免费开放服务仓库,如您或您的组织需要提供商业服务或者您的组织为盈利性组织,请联系星火社区获取商业授权。 -7. 禁止恶意行为和批量爬取: 用户或组织在使用本软件时,严禁进行任何形式的恶意行为,包括但不限于恶意攻击、滥用、破坏、批量爬取软件仓库等。恶意行为的定义由星火社区自行判断,违反者将被追究法律责任。 -8. 分发与再分发权利: 星火社区保留对其制作的软件包的分发权利。未经明确授权,禁止任何个人或组织将星火社区软件包用于商业目的或在未获得星火社区许可的情况下进行再分发。此条款旨在确保开源精神的同时,维护星火社区的知识产权。 -9. 商业应用限制:您不得使用本软件的代码开发商业应用,也不得在商业应用中使用本软件的代码,除非获得星火社区和火穗(沈阳)计算机软件开发有限公司的书面许可。 -10. 其他条款:除上述约定外,若您使用了星火商店的主程序或其部分代码,您应遵守 GPL v3 的所有其他条款和要求。若本协议条款的内容与GPL V3中的内容不同的,以本协议条款为准 -11. 其他约定:本许可以简体中文版本为最准确释义 - -GPLV3许可证的完整文本可以在以下链接找到:https://www.gnu.org/licenses/gpl-3.0.html - ---------------------------------------------------------------------------------------------------------------------------------- - -Spark Opensource LICENSE - -Copyright (C) 2023 The Spark Community - -This software is free software; you can modify and redistribute it under the terms of the GNU General Public License version 3 (GPL v3). However, to protect the rights of the original authors and the interests of the community users, please adhere to the following terms: - -1. Applicability to all files in this repository: This license applies to all files in this repository (or project). Any individuals or organizations that use, modify, or redistribute this software must comply with this license. -2. Copyright notice and license files: You must not remove, hide, or modify the copyright notice and license files of the original authors included in this software. Preserving the rights information of the original authors is essential for maintaining the open-source software ecosystem. -3. Version annotation: If you modify and redistribute this software, you must mark in a prominent position that this version is not officially provided by the Spark community. This avoids misleading users into thinking that the software is an official version provided by the Spark community. This software is licensed for personal, non-profit use only, and any use of it for commercial purposes or in for-profit organizations requires the prior written permission of the Spark Community. -4. Trademark usage: You are not allowed to use terms such as "Spark App Store," "Spark Store," or the logo of Spark App Store in redistributed versions, as they may mislead users into believing that the software is provided by the official Spark community. -5. Terms of Service: Your use of the software of Spark Store will be deemed as your consent to collect version, log and other information on the premise of not violating your privacy, so as to facilitate the Spark community to provide you with better services. -6. Warehouse copyright terms: In order to better provide continuous services, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact Spark community to obtain commercial authorization. -7. Prohibited malicious behavior and mass crawling: Users or organizations are strictly prohibited to engage in any form of malicious behavior when using the software, including but not limited to malicious attacks, abuse, destruction, and mass crawling of software warehouses. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. -8. Distribution and redistribution rights: Spark Community reserves the right to distribute the software packages it produces. Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. -9. Business Application Restriction: You are not permitted to utilize the code of this software for developing commercial applications, nor are you allowed to integrate the code of this software into commercial applications without obtaining written consent from both the Spark Community and Flamescion (Shenyang) Computer Software Development Co., Ltd. -10. Other Terms: In addition to the above provisions, if you use the main program or any part of the code of Spark Store, you must comply with all other terms and requirements of GPL v3. In case of any inconsistency between the terms of this agreement and those of GPL v3, the terms of this agreement shall prevail. -11. Additional Agreements: This license shall be interpreted most accurately in its Simplified Chinese version. - -You can find the full text of GPLV3 license at: https://www.gnu.org/licenses/gpl-3.0.html \ No newline at end of file diff --git a/LICENSE b/LICENSE index 818433ecc0e094a4db1023c68b33f24344643ad8..7ed453065f53b91a331edafa15a637cbbf29b541 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,41 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +星火开源软件协议(Spark Opensource LICENSE) - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +版权所有 (C) 2023 星火社区 - Preamble +根据 GNU 通用公共许可证第三版(GPL v3),本软件是自由软件,您可以修改和再发布它。但是,为了维护原作者的权益并保护社区用户的权益,请遵守以下条款: - The GNU General Public License is a free, copyleft license for -software and other kinds of works. +1. 对本仓库下的所有文件生效:本许可证适用于本仓库(或项目)下的所有文件。任何使用、修改或再发布本软件的个人或组织都必须遵守本许可证。 +2. 版权声明和许可证文件:您不得移除、隐藏或更改本软件中包含的原作者的版权声明和许可证文件。保留原作者的权益信息对于维护开源软件生态系统至关重要。 +3. 版本标注: 如果您对本软件做出修改并再发布,您必须在醒目位置标注此版本并非星火社区官方提供。这样可以避免误导使用者认为该软件为星火社区官方提供的版本。此软件仅授权用于个人非盈利用途,任何将其用于商业目的或在盈利性组织中使用的行为均需事先获得星火社区的书面许可。 +4. 商标使用:您不得在再发布版本中使用“星火应用商店”、“Spark Store”或星火应用商店的Logo等可能误导使用者此软件由星火社区官方提供的信息。 +5. 服务条款:您使用星火商店软件的行为将被视为您同意星火在不侵犯您隐私的前提下搜集版本、日志等信息,以便于星火社区更好地为您提供服务。 +6. 仓库版权条款:为了更好的提供持续性服务,星火仅对个人用户免费开放服务仓库,如您或您的组织需要提供商业服务或者您的组织为盈利性组织,请联系星火社区获取商业授权。 +7. 禁止恶意行为和批量爬取: 用户或组织在使用本软件时,严禁进行任何形式的恶意行为,包括但不限于恶意攻击、滥用、破坏、批量爬取软件仓库等。恶意行为的定义由星火社区自行判断,违反者将被追究法律责任。 +8. 分发与再分发权利: 星火社区保留对其制作的软件包的分发权利。未经明确授权,禁止任何个人或组织将星火社区软件包用于商业目的或在未获得星火社区许可的情况下进行再分发。此条款旨在确保开源精神的同时,维护星火社区的知识产权。 +9. 商业应用限制:您不得使用本软件的代码开发商业应用,也不得在商业应用中使用本软件的代码,除非获得星火社区和火穗(沈阳)计算机软件开发有限公司的书面许可。 +10. 其他条款:除上述约定外,若您使用了星火商店的主程序或其部分代码,您应遵守 GPL v3 的所有其他条款和要求。若本协议条款的内容与GPL V3中的内容不同的,以本协议条款为准 +11. 其他约定:本许可以简体中文版本为最准确释义 - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +GPLV3许可证的完整文本可以在以下链接找到:https://www.gnu.org/licenses/gpl-3.0.html - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. +--------------------------------------------------------------------------------------------------------------------------------- - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. +Spark Opensource LICENSE - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. +Copyright (C) 2023 The Spark Community - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. +This software is free software; you can modify and redistribute it under the terms of the GNU General Public License version 3 (GPL v3). However, to protect the rights of the original authors and the interests of the community users, please adhere to the following terms: - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. +1. Applicability to all files in this repository: This license applies to all files in this repository (or project). Any individuals or organizations that use, modify, or redistribute this software must comply with this license. +2. Copyright notice and license files: You must not remove, hide, or modify the copyright notice and license files of the original authors included in this software. Preserving the rights information of the original authors is essential for maintaining the open-source software ecosystem. +3. Version annotation: If you modify and redistribute this software, you must mark in a prominent position that this version is not officially provided by the Spark community. This avoids misleading users into thinking that the software is an official version provided by the Spark community. This software is licensed for personal, non-profit use only, and any use of it for commercial purposes or in for-profit organizations requires the prior written permission of the Spark Community. +4. Trademark usage: You are not allowed to use terms such as "Spark App Store," "Spark Store," or the logo of Spark App Store in redistributed versions, as they may mislead users into believing that the software is provided by the official Spark community. +5. Terms of Service: Your use of the software of Spark Store will be deemed as your consent to collect version, log and other information on the premise of not violating your privacy, so as to facilitate the Spark community to provide you with better services. +6. Warehouse copyright terms: In order to better provide continuous services, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact Spark community to obtain commercial authorization. +7. Prohibited malicious behavior and mass crawling: Users or organizations are strictly prohibited to engage in any form of malicious behavior when using the software, including but not limited to malicious attacks, abuse, destruction, and mass crawling of software warehouses. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. +8. Distribution and redistribution rights: Spark Community reserves the right to distribute the software packages it produces. Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. +9. Business Application Restriction: You are not permitted to utilize the code of this software for developing commercial applications, nor are you allowed to integrate the code of this software into commercial applications without obtaining written consent from both the Spark Community and Flamescion (Shenyang) Computer Software Development Co., Ltd. +10. Other Terms: In addition to the above provisions, if you use the main program or any part of the code of Spark Store, you must comply with all other terms and requirements of GPL v3. In case of any inconsistency between the terms of this agreement and those of GPL v3, the terms of this agreement shall prevail. +11. Additional Agreements: This license shall be interpreted most accurately in its Simplified Chinese version. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +You can find the full text of GPLV3 license at: https://www.gnu.org/licenses/gpl-3.0.html \ No newline at end of file diff --git a/LICENSE-GPL3 b/LICENSE-GPL3 new file mode 100644 index 0000000000000000000000000000000000000000..818433ecc0e094a4db1023c68b33f24344643ad8 --- /dev/null +++ b/LICENSE-GPL3 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index 822e122916b93547c24cdfc685d03c27ce7bddbe..6e081ceead9bc6f05164305556a6dff3e885f670 100644 --- a/README.md +++ b/README.md @@ -43,14 +43,23 @@ If you have software packages to submit, please [click here to contribute](https ## Table of Contents -- [Read the Copyright Notice](#read-the-copyright-notice) -- [Determine Your System Architecture](#determine-your-system-architecture) -- [System Support and Installation Instructions](#system-support-and-installation-instructions) - - [For deepin Users](#for-deepin-users) - - [For Ubuntu Users](#for-ubuntu-users) - - [For Debian Users](#for-debian-users) -- [Frequently Asked Questions (FAQ)](#frequently-asked-questions-faq) -- [Contact and Feedback](#contact-and-feedback) +- [Spark Store](#spark-store) + - [Introduction](#introduction) + - [About Team Collaboration](#about-team-collaboration) + - [Table of Contents](#table-of-contents) + - [Read the Copyright Notice](#read-the-copyright-notice) + - [Determine Your System Architecture](#determine-your-system-architecture) + - [System Support and Installation Instructions](#system-support-and-installation-instructions) + - [For deepin Users](#for-deepin-users) + - [For deepin Users](#for-deepin-users-1) + - [For Ubuntu Users](#for-ubuntu-users) + - [For Ubuntu 20.04 Users](#for-ubuntu-2004-users) + - [For Ubuntu 22.04 and Newer Ubuntu Versions](#for-ubuntu-2204-and-newer-ubuntu-versions) + - [For Debian Users](#for-debian-users) + - [For Debian 11 Users](#for-debian-11-users) + - [For Debian 12+ Users](#for-debian-12-users) + - [Frequently Asked Questions (FAQ)](#frequently-asked-questions-faq) + - [Contact and Feedback](#contact-and-feedback) --- diff --git a/README.zh.md b/README.zh.md index 847286112fa535aa195a88d4867478b0c7919bd4..ca1f1d9581c40ca8b73a88b15553704e003ee1f7 100644 --- a/README.zh.md +++ b/README.zh.md @@ -112,9 +112,6 @@ https://github.com/spark-store-project/spark-store cd ~/Downloads sudo apt install ./spark-store*.deb ``` -2. **使用更新器** - 您可以在应用商店左下角找到更新按钮,点击即可查看更新列表。 - ### 对于 Ubuntu 用户 @@ -189,6 +186,7 @@ https://github.com/spark-store-project/spark-store 对于高级用户,如需自定义配置 aptss config,请参阅 [aptss 软件仓库](https://gitee.com/GXDE-OS/aptss)。 +对于星火更新器,请参阅[Spark-Update-Tool](https://gitee.com/spark-store-project/Spark-Update-Tool) --- diff --git a/debian/changelog b/debian/changelog index 40066787982261e6641675ee51a2fdafb13b8e37..98b87756d8b2636a90faeb89e10248ff09bbe2d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +spark-store (4.8.3) UNRELEASED; urgency=medium + + * 更新软件主图标 + * 软件更新器更新成功后删除软件包 + * 修复:首次安装ACE环境情况下无法正确配置ACE中aptss的问题 + * 修复:使用aptss后在/tmp下留下垃圾的问题 + * aptss 更新,支持在APM下使用 + * 更新器添加忽略功能 + * 修复:更新器在更新完成后删除软件包时,未删除软件包的问题 + * 修复:更新器初始化窗口过大的问题 + + -- momen Tue, 28 Aug 2025 01:03:08 +0800 + spark-store (4.8.3-1) UNRELEASED; urgency=medium * 更新软件主图标 @@ -12,18 +25,16 @@ spark-store (4.8.3-1) UNRELEASED; urgency=medium spark-store (4.8.1-1) UNRELEASED; urgency=medium - * 修复更新器安装软件完成后仍然显示下载完成的问题 - * 修复一些aptss锁定失败bug - - -- momen Tue, 28 Aug 2025 01:03:08 +0800 + * 修复了更新器安装完成后显示下载完成的bug + -- momen Fri, 29 Aug 2025 01:03:08 +0800 + spark-store (4.8.1~test1) UNRELEASED; urgency=medium * 添加全新的更新器 * 替换了新版更新器的polkit policy - -- momen Tue, 15 Jul 2025 01:03:08 +0800 - + spark-store (4.8.0) UNRELEASED; urgency=medium * ssinstall重写,支持安装到ACE和自动安装到ACE,支持只允许安装到本地 diff --git a/debian/control b/debian/control index f89814bcb5ea615a2496dd94a9872ff20789f131..4eb6ee6add0706b82d3cffad702e9ebec03b8e66 100644 --- a/debian/control +++ b/debian/control @@ -3,16 +3,17 @@ Maintainer: shenmo Section: utils Priority: optional Build-Depends: - debhelper (>= 9), + cmake, + debhelper (>= 11), pkg-config, - qtchooser (>= 55-gc9562a1-1~) | qt5-default, + qtchooser (>= 55-gc9562a1-1~), qtbase5-dev, - libqt5svg5-dev, - qttools5-dev-tools, - qtwebengine5-dev, - libdtkcore-dev (>= 5.0), - libdtkgui-dev (>= 5.0), - libdtkwidget-dev (>= 5.0) + libqt5webengine5, + libqt5webenginewidgets5, + libdtkcommon-dev, + libdtkcore-dev, + libdtkgui-dev, + libdtkwidget-dev Standards-Version: 4.1.7 Homepage: https://www.spark-app.store/ @@ -24,13 +25,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, curl, openssl, aria2, + qtwayland5, gnupg, zenity, policykit-1 | pkexec, libnotify-bin, - qtwayland5, desktop-file-utils, dpkg-dev, lsb-release, Description: Spark Store - A community powered app store, based on DTK. + A community powered app store, based on DTK. \ No newline at end of file diff --git a/debian/rules b/debian/rules index 29221457cb264d782f31e396dda59d1f27726858..e2af6fcb245f9c3e68da406d8a4ecbf1ec70e93b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,14 @@ #!/usr/bin/make -f -export QT_SELECT = qt5 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all include /usr/share/dpkg/default.mk +export QT_SELECT = qt6 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +DEB_CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS) +DEB_CPPFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) +DEB_CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS) + DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -16,25 +21,15 @@ SOURCE_DATE_EPOCH := $(shell date +%s) %: dh $@ --parallel -override_dh_auto_clean: - rm -rf $(CURDIR)/build-$(DEB_HOST_MULTIARCH) - override_dh_auto_configure: - mkdir -p $(CURDIR)/build-$(DEB_HOST_MULTIARCH) - - qmake BUILD_VERSION=$(DEB_VERSION_UPSTREAM) spark-store-project.pro \ - -spec linux-g++ CONFIG+=force_debug_info \ - -o $(CURDIR)/build-$(DEB_HOST_MULTIARCH)/ - -override_dh_auto_build: - make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) -j$(JOBS) - -override_dh_auto_install: - make -C $(CURDIR)/build-$(DEB_HOST_MULTIARCH) install \ - INSTALL_ROOT=$(CURDIR)/debian/spark-store - -# Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols) -# Qt Mutidedia lib will ref to network libraray. + dh_auto_configure -- \ + -DVERSION=$(DEB_VERSION_UPSTREAM) \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="$(DEB_CFLAGS) $(DEB_CPPFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(DEB_CXXFLAGS) $(DEB_CPPFLAGS)" + +#Ignore the dpkg-shlibdeps: warning (it uses none of the library's symbols) +#Qt Mutidedia lib will ref to network libraray. override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--warnings=0 --exclude=opt/durapps/spark-store/bin/ss-feedback/ override_dh_strip: diff --git a/debian/spark-store.postinst b/debian/spark-store.postinst index d00f560ea85ad67407a5a0d8a82b0f21891c8f31..2f9e066d29d0d757811f27af2f29b4c4b1599c66 100755 --- a/debian/spark-store.postinst +++ b/debian/spark-store.postinst @@ -42,7 +42,7 @@ case "$1" in ln -s -f /opt/durapps/spark-store/bin/aptss /usr/local/bin/ss-apt-fast ln -s -f /opt/durapps/spark-store/bin/aptss /usr/bin/aptss - ln -sf /usr/lib/qt5/bin/spark-update-tool /usr/bin/spark-update-tool + # Install key diff --git a/debian/spark-store.triggers b/debian/spark-store.triggers index e27213ccf118ab8835afe244fde084928b6a9494..96a1351ffbab14a0a598127ca1ced8c058e01e08 100644 --- a/debian/spark-store.triggers +++ b/debian/spark-store.triggers @@ -1,2 +1 @@ interest-noawait /opt/apps - diff --git a/pkg/etc/apt/sources.list.d/sparkstore.list b/pkg/etc/apt/sources.list.d/sparkstore.list deleted file mode 100644 index 05637729b625d022351acd2fa4a5ca3ec7d5a3b2..0000000000000000000000000000000000000000 --- a/pkg/etc/apt/sources.list.d/sparkstore.list +++ /dev/null @@ -1 +0,0 @@ -deb [by-hash=force] https://d.store.deepinos.org.cn / diff --git a/pkg/usr/lib/systemd/system/spark-update-notifier.service b/pkg/lib/systemd/system/spark-update-notifier.service similarity index 55% rename from pkg/usr/lib/systemd/system/spark-update-notifier.service rename to pkg/lib/systemd/system/spark-update-notifier.service index 62263a135ad558c32d7fcc853ea947797c11a062..de8f8fa92559e23233e16d376f67ecbb7030458b 100644 --- a/pkg/usr/lib/systemd/system/spark-update-notifier.service +++ b/pkg/lib/systemd/system/spark-update-notifier.service @@ -2,14 +2,13 @@ Description=Spark Store update notifier After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service + [Service] Type=simple -RemainAfterExit=yes +RemainAfterExit=yes ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh Restart=on-failure -RestartSec=15 # 可以设置为更长的重试间隔,比如 15 秒或 30 秒 -StartLimitIntervalSec=1h # 设置为 1 小时的时间窗口 -StartLimitBurst=3 # 最大允许失败次数为 3 次 +RestartSec=10 [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/usr/share/icons/hicolor/scalable/apps/open-me-in-terminal.png b/pkg/usr/share/icons/hicolor/512x512/apps/open-me-in-terminal.png similarity index 100% rename from pkg/usr/share/icons/hicolor/scalable/apps/open-me-in-terminal.png rename to pkg/usr/share/icons/hicolor/512x512/apps/open-me-in-terminal.png diff --git a/spark-store-project.pro b/spark-store-project.pro deleted file mode 100644 index b0cbbc78e8f6052dca0e0d2582191524bf49c5b9..0000000000000000000000000000000000000000 --- a/spark-store-project.pro +++ /dev/null @@ -1,88 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2022-01-12T04:00:00 -# -#------------------------------------------------- - -TARGET = spark-store -TEMPLATE = subdirs - -CONFIG += ordered - -SUBDIRS += \ - src/spark-store.pro - -# https://wiki.debian.org/Hardening -QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS) -QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS) -QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS) -QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS) - -# Update translation files -CONFIG(release, debug | release) { - system(bash $${PWD}/translate_update.sh) - system(bash $${PWD}/translate_generation.sh) -} - -# Rules for deployment -tool.files += tool/* -tool.path = /opt/durapps/$${TARGET}/bin - -qm.files += translations/*.qm -qm.path = /usr/share/spark-store/translations - -#preferences.files += pkg/etc/apt/preferences.d/sparkstore -#preferences.path = /etc/apt/preferences.d - -#sourceslist.files += pkg/etc/apt/sources.list.d/sparkstore.list -#sourceslist.path = /etc/apt/sources.list.d - -bash_completion.files += pkg/usr/share/bash-completion/completions/aptss -bash_completion.path = /usr/share/bash-completion/completions - -fish_completion.files += pkg/usr/share/fish/completions/aptss.fish -fish_completion.path = /usr/share/fish/completions/ - -desktop.files += pkg/usr/share/applications/*.desktop -desktop.path = /usr/share/applications - -service.files += pkg/usr/lib/systemd/system/spark-update-notifier.service -service.path = /usr/lib/systemd/system/ - -polkit-1.files += pkg/usr/share/polkit-1/actions/* -polkit-1.path = /usr/share/polkit-1/actions/ - -icon.files += pkg/usr/share/icons/hicolor/scalable/apps/*.svg -icon.files += pkg/usr/share/icons/hicolor/scalable/apps/*.png -icon.path = /usr/share/icons/hicolor/scalable/apps - -ssinstall-transhell.files += pkg/usr/share/ssinstall/transhell -ssinstall-transhell.path = /usr/share/ssinstall/ - -aptss-transhell.files += pkg/usr/share/aptss/transhell -aptss-transhell.path = /usr/share/aptss/ - -tmp.files += pkg/tmp/spark-store-install/feedback.sh -tmp.path = /tmp/spark-store-install - -INSTALLS += \ - tool \ - qm \ - desktop \ - icon \ - ssinstall-transhell \ - aptss-transhell \ -# sourceslist \ - tmp \ - service \ - bash_completion \ - fish_completion \ - polkit-1 -# 暂时不添加 - -SUBDIRS += src/spark-update-tool - -spark-update-tool.subdir = src/spark-update-tool -spark-update-tool.file = src/spark-update-tool/spark-update-tool.pro -spark-update-tool.target = spark-update-tool -spark-update-tool.depends = spark-store diff --git a/src/spark-update-tool/.gitignore b/spark-update-tool/.gitignore similarity index 100% rename from src/spark-update-tool/.gitignore rename to spark-update-tool/.gitignore diff --git a/src/spark-update-tool/CMakeLists.txt b/spark-update-tool/CMakeLists.txt similarity index 42% rename from src/spark-update-tool/CMakeLists.txt rename to spark-update-tool/CMakeLists.txt index 49a4d5ebb3d890a26a0dabed15290610c182e360..a76b1e2eca9736f8731ecb3d97911f226b6138e5 100644 --- a/src/spark-update-tool/CMakeLists.txt +++ b/spark-update-tool/CMakeLists.txt @@ -9,44 +9,46 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) - find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent) - -find_package(Qt5 REQUIRED COMPONENTS Widgets Network Concurrent Core Gui) - -# 定义所有项目源文件,现在无需条件判断 set(PROJECT_SOURCES - src/main.cpp - src/mainwindow.cpp - src/mainwindow.h - src/mainwindow.ui - src/aptssupdater.h src/aptssupdater.cpp - src/icons.qrc - src/appdelegate.h src/appdelegate.cpp - src/applistmodel.h src/applistmodel.cpp - src/downloadmanager.h src/downloadmanager.cpp -) - - -add_executable(spark-update-tool - ${PROJECT_SOURCES} + src/main.cpp + src/mainwindow.cpp + src/mainwindow.h + src/mainwindow.ui + src/aptssupdater.h + src/aptssupdater.cpp + src/icons.qrc + src/appdelegate.h + src/appdelegate.cpp + src/applistmodel.h + src/applistmodel.cpp + src/downloadmanager.h + src/downloadmanager.cpp + src/ignoreconfig.h + src/ignoreconfig.cpp ) -target_link_libraries(spark-update-tool PRIVATE - Qt5::Widgets - Qt5::Network - Qt5::Concurrent - Qt5::Core - Qt5::Gui -) +if(ANDROID) + add_library(spark-update-tool SHARED + ${PROJECT_SOURCES} + ) +# Define properties for Android with Qt 5 after find_package() calls as: +# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") +else() + add_executable(spark-update-tool + ${PROJECT_SOURCES} + ) +endif() +target_link_libraries(spark-update-tool PRIVATE Qt5::Widgets Qt5::Network Qt5::Concurrent) set_target_properties(spark-update-tool PROPERTIES - # ${BUNDLE_ID_OPTION} # 如果上面取消注释,这里也取消注释 + MACOSX_BUNDLE_GUI_IDENTIFIER com.example.spark-update-tool MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} - + MACOSX_BUNDLE TRUE + WIN32_EXECUTABLE TRUE ) include(GNUInstallDirs) @@ -54,5 +56,4 @@ install(TARGETS spark-update-tool BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -) - +) \ No newline at end of file diff --git a/src/spark-update-tool/LICENSE b/spark-update-tool/LICENSE similarity index 100% rename from src/spark-update-tool/LICENSE rename to spark-update-tool/LICENSE diff --git a/src/spark-update-tool/README.md b/spark-update-tool/README.md similarity index 37% rename from src/spark-update-tool/README.md rename to spark-update-tool/README.md index e5728804bff18b174c5f522486d3f81028dc5363..778029c221a0805c9647f56e8c7b83d71322b8ff 100644 --- a/src/spark-update-tool/README.md +++ b/spark-update-tool/README.md @@ -1,21 +1,15 @@ -### Spark Software Updater - +### Spark Update Tool #### Introduction -Welcome to Spark Software Updater! This tool helps you conveniently update various applications on your Linux system. - -This version is specifically designed for Linux distributions with Qt5 support. -**Please run with root privileges (recommended to use `sudo`).** - +Welcome to Spark Software Updater. Use this tool to update applications on your Linux system. +This version is specifically designed for Linux distributions with Qt6 support. +Please run under root privileges (recommended: use `sudo`). #### Currently Supported Linux Distributions - - [x] GXDE OS - [x] Ubuntu - [x] deepin - [ ] Kylin -// ... existing Chinese feature table ... #### Contact & Feedback - -For any issues or suggestions, please contact: momen@momen.world +momen@momen.world diff --git a/src/spark-update-tool/README.zh.md b/spark-update-tool/README.zh.md similarity index 72% rename from src/spark-update-tool/README.zh.md rename to spark-update-tool/README.zh.md index 3e30de3235088bf94329210cf3e157e9b95d30b4..c597ce448be3bab03e01bc2a09b74b9a3c3525e7 100644 --- a/src/spark-update-tool/README.zh.md +++ b/spark-update-tool/README.zh.md @@ -1,14 +1,10 @@ ### 星火软件更新器 - #### 简介 -欢迎使用星火软件更新器!本工具可帮助您便捷地更新 Linux 计算机上的各类程序。 - -本版本专为仅包含 Qt5 的 Linux 发行版设计。 -**请在 root 权限下运行本程序。** - +欢迎使用星火软件更新器,您可以使用此更新器更新位于您 Linux 计算机的程序。 +此版本专为有qt6的Linux发行版所使用。 +请在root环境下运行。 #### 当前支持的 Linux 发行版 - - [x] GXDE OS - [x] Ubuntu - [x] deepin @@ -26,5 +22,4 @@ 如您已安装星火应用商店,则会附带本程序。 #### 联系与反馈 - -如有问题或建议,欢迎联系:momen@momen.world \ No newline at end of file +momen@momen.world \ No newline at end of file diff --git a/spark-update-tool/debian/changelog b/spark-update-tool/debian/changelog new file mode 100644 index 0000000000000000000000000000000000000000..01eb32ded21abc520c4e7cfd209c9bab9c1fd224 --- /dev/null +++ b/spark-update-tool/debian/changelog @@ -0,0 +1,23 @@ +spark-update-tool (1.0.3) unstable; urgency=low + + * 修复默认图标加载失败的问题 + * 修复更新器在安装阶段强制关闭窗口后再次更新无法安装软件包的问题。 + + -- momen Fri, 17 Oct 2025 00:00:00 +0000 +spark-update-tool (1.0.2) unstable; urgency=low + + * 添加复选框,选择多个包更新 + * 修复缩放问题 + * 添加忽略应用功能 + + -- momen Mon, 29 Sep 2025 00:00:00 +0000 +spark-update-tool (1.0.1) unstable; urgency=low + + * 修复窗口调整大小时的错误 + + -- momen Wed, 18 Jun 2025 00:00:00 +0000 +spark-update-tool (1.0.0) unstable; urgency=low + + * Initial release. + + -- momen Wed, 18 Jun 2025 00:00:00 +0000 \ No newline at end of file diff --git a/spark-update-tool/debian/compat b/spark-update-tool/debian/compat new file mode 100644 index 0000000000000000000000000000000000000000..ca7bf83ac53a27a2a914bed25e1a07478dd8ef47 --- /dev/null +++ b/spark-update-tool/debian/compat @@ -0,0 +1 @@ +13 \ No newline at end of file diff --git a/src/spark-update-tool/debian/control b/spark-update-tool/debian/control similarity index 100% rename from src/spark-update-tool/debian/control rename to spark-update-tool/debian/control diff --git a/src/spark-update-tool/debian/copyright b/spark-update-tool/debian/copyright similarity index 100% rename from src/spark-update-tool/debian/copyright rename to spark-update-tool/debian/copyright diff --git a/src/spark-update-tool/debian/install b/spark-update-tool/debian/install similarity index 100% rename from src/spark-update-tool/debian/install rename to spark-update-tool/debian/install diff --git a/src/spark-update-tool/debian/postrm b/spark-update-tool/debian/postrm similarity index 100% rename from src/spark-update-tool/debian/postrm rename to spark-update-tool/debian/postrm diff --git a/spark-update-tool/debian/rules b/spark-update-tool/debian/rules new file mode 100755 index 0000000000000000000000000000000000000000..d9cedc7678dbb7076ae29fe2ac521fef21d0877f --- /dev/null +++ b/spark-update-tool/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f + +# 声明兼容性级别 +export DH_VERBOSE=1 + +%: + dh $@ --buildsystem=cmake + +# 确保使用CMake进行配置 +override_dh_auto_configure: + dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr + +# 确保使用CMake进行构建 +override_dh_auto_build: + dh_auto_build + +# 确保使用CMake进行安装 +override_dh_auto_install: + dh_auto_install + +# 确保使用CMake进行清理 +override_dh_auto_clean: + dh_auto_clean + +# 确保使用CMake进行依赖解析 +override_dh_shlibdeps: + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info \ No newline at end of file diff --git a/src/spark-update-tool/debian/source/format b/spark-update-tool/debian/source/format similarity index 100% rename from src/spark-update-tool/debian/source/format rename to spark-update-tool/debian/source/format diff --git a/src/spark-update-tool/debian/spark-update-tool.desktop b/spark-update-tool/debian/spark-update-tool.desktop similarity index 100% rename from src/spark-update-tool/debian/spark-update-tool.desktop rename to spark-update-tool/debian/spark-update-tool.desktop diff --git a/src/spark-update-tool/resources/128*128/spark-update-tool.png b/spark-update-tool/resources/128*128/spark-update-tool.png similarity index 100% rename from src/spark-update-tool/resources/128*128/spark-update-tool.png rename to spark-update-tool/resources/128*128/spark-update-tool.png diff --git a/spark-update-tool/resources/default_icon.png b/spark-update-tool/resources/default_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bffa3792fe5a1fa3ac39f465d2e3ca18732ede1d Binary files /dev/null and b/spark-update-tool/resources/default_icon.png differ diff --git a/src/spark-update-tool/resources/default_icon.svg b/spark-update-tool/resources/default_icon.svg similarity index 100% rename from src/spark-update-tool/resources/default_icon.svg rename to spark-update-tool/resources/default_icon.svg diff --git a/src/spark-update-tool/resources/down_arrow.svg b/spark-update-tool/resources/down_arrow.svg similarity index 100% rename from src/spark-update-tool/resources/down_arrow.svg rename to spark-update-tool/resources/down_arrow.svg diff --git a/src/spark-update-tool/resources/spark-update-tool.svg b/spark-update-tool/resources/spark-update-tool.svg similarity index 100% rename from src/spark-update-tool/resources/spark-update-tool.svg rename to spark-update-tool/resources/spark-update-tool.svg diff --git a/src/spark-update-tool/src/appdelegate.cpp b/spark-update-tool/src/appdelegate.cpp similarity index 49% rename from src/spark-update-tool/src/appdelegate.cpp rename to spark-update-tool/src/appdelegate.cpp index 7db37ffa52a9716e496640ade759c95a4049e0fa..792c2499739f3f86c249400046b2f4fabcf3991f 100644 --- a/src/spark-update-tool/src/appdelegate.cpp +++ b/spark-update-tool/src/appdelegate.cpp @@ -7,19 +7,21 @@ #include #include #include +#include AppDelegate::AppDelegate(QObject *parent) : QStyledItemDelegate(parent), m_downloadManager(new DownloadManager(this)), m_installProcess(nullptr) { connect(m_downloadManager, &DownloadManager::downloadFinished, this, [this](const QString &packageName, bool success) { - if (m_downloads.contains(packageName)) { - m_downloads[packageName].isDownloading = false; - emit updateDisplay(packageName); - qDebug() << (success ? "下载完成:" : "下载失败:") << packageName; - if (success) { - enqueueInstall(packageName); - } - } + if (m_downloads.contains(packageName)) { + m_downloads[packageName].isDownloading = false; + // 不要提前设置 isInstalled + emit updateDisplay(packageName); + qDebug() << (success ? "下载完成:" : "下载失败:") << packageName; + if (success) { + enqueueInstall(packageName); // 安装完成后再设置 isInstalled + } + } }); connect(m_downloadManager, &DownloadManager::downloadProgress, this, @@ -30,7 +32,11 @@ AppDelegate::AppDelegate(QObject *parent) emit updateDisplay(packageName); // 实时刷新进度条 } }); - m_spinnerTimer.start(); + // m_spinnerTimer.start(); // 移除这行 + + // 新增:初始化和连接 QTimer + m_spinnerUpdateTimer.setInterval(20); // 刷新间隔,可以调整 + connect(&m_spinnerUpdateTimer, &QTimer::timeout, this, &AppDelegate::updateSpinner); } void AppDelegate::setModel(QAbstractItemModel *model) { @@ -40,11 +46,33 @@ void AppDelegate::setModel(QAbstractItemModel *model) { void AppDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { painter->save(); + // 检查是否为忽略状态 + bool isIgnored = index.data(Qt::UserRole + 8).toBool(); + if (option.state & QStyle::State_Selected) painter->fillRect(option.rect, option.palette.highlight()); else painter->fillRect(option.rect, QColor("#F3F4F6")); + // 绘制复选框 + QString packageName = index.data(Qt::UserRole + 1).toString(); + bool isSelected = m_selectedPackages.contains(packageName); + + QRect checkboxRect(option.rect.left() + 10, option.rect.top() + (option.rect.height() - 20) / 2, 20, 20); + + // 绘制复选框边框 + QColor checkboxColor = isIgnored ? QColor("#CCCCCC") : QColor("#888888"); + painter->setPen(checkboxColor); + painter->setBrush(Qt::NoBrush); + painter->drawRect(checkboxRect); + + // 如果选中,绘制勾选标记 + if (isSelected && !isIgnored) { + painter->setPen(QPen(QColor("#2563EB"), 2)); + painter->setBrush(QColor("#2563EB")); + painter->drawRect(checkboxRect.adjusted(4, 4, -4, -4)); + } + QFont boldFont = option.font; boldFont.setBold(true); QFont normalFont = option.font; @@ -59,36 +87,68 @@ void AppDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, c QRect rect = option.rect; int margin = 10, spacing = 6, iconSize = 40; - QRect iconRect(rect.left() + margin, rect.top() + (rect.height() - iconSize) / 2, iconSize, iconSize); - QIcon(iconPath).paint(painter, iconRect); + // 调整图标位置,为复选框留出空间 + QRect iconRect(rect.left() + 40, rect.top() + (rect.height() - iconSize) / 2, iconSize, iconSize); + + + // 如果是忽略状态,绘制灰色图标 + if (isIgnored) { + // 创建灰度效果 + QPixmap originalPixmap = QIcon(iconPath).pixmap(iconSize, iconSize); + QPixmap grayPixmap(originalPixmap.size()); + grayPixmap.fill(Qt::transparent); + QPainter grayPainter(&grayPixmap); + grayPainter.setOpacity(0.3); // 设置透明度使其变灰 + grayPainter.drawPixmap(0, 0, originalPixmap); + grayPainter.end(); + painter->drawPixmap(iconRect, grayPixmap); + } else { + QIcon(iconPath).paint(painter, iconRect); + } int textX = iconRect.right() + margin; int textWidth = rect.width() - textX - 100; QRect nameRect(textX, rect.top() + margin, textWidth, 20); painter->setFont(boldFont); - painter->setPen(QColor("#333333")); + QColor nameColor = isIgnored ? QColor("#999999") : QColor("#333333"); + painter->setPen(nameColor); painter->drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter, name); QRect versionRect(textX, nameRect.bottom() + spacing, textWidth, 20); painter->setFont(normalFont); - painter->setPen(QColor("#888888")); + QColor versionColor = isIgnored ? QColor("#AAAAAA") : QColor("#888888"); + painter->setPen(versionColor); painter->drawText(versionRect, Qt::AlignLeft | Qt::AlignVCenter, QString("当前版本: %1 → 新版本: %2").arg(currentVersion, newVersion)); QRect descRect(textX, versionRect.bottom() + spacing, textWidth, 40); painter->setFont(normalFont); - painter->setPen(QColor("#AAAAAA")); + QColor descColor = isIgnored ? QColor("#CCCCCC") : QColor("#AAAAAA"); + painter->setPen(descColor); painter->drawText(descRect, Qt::TextWordWrap, QString("包大小:%1 MB").arg(QString::number(size.toDouble() / (1024 * 1024), 'f', 2))); - QString packageName = index.data(Qt::UserRole + 1).toString(); bool isDownloading = m_downloads.contains(packageName) && m_downloads[packageName].isDownloading; int progress = m_downloads.value(packageName, DownloadInfo{0, false}).progress; bool isInstalled = m_downloads.value(packageName).isInstalled; bool isInstalling = m_downloads.value(packageName).isInstalling; - if (isDownloading) { + // 如果是忽略状态,显示"已忽略"文本和"取消忽略"按钮 + if (isIgnored) { + QRect ignoredTextRect(rect.right() - 170, rect.top() + (rect.height() - 30) / 2, 80, 30); + painter->setPen(QColor("#999999")); + painter->setFont(option.font); + painter->drawText(ignoredTextRect, Qt::AlignCenter, "已忽略"); + + // 绘制取消忽略按钮 + QRect unignoreButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); + painter->setPen(Qt::NoPen); + painter->setBrush(QColor("#F3F4F6")); + painter->drawRoundedRect(unignoreButtonRect, 4, 4); + painter->setPen(QColor("#6B7280")); + painter->drawText(unignoreButtonRect, Qt::AlignCenter, "取消忽略"); + } else if (isDownloading) { QRect progressRect(rect.right() - 270, rect.top() + (rect.height() - 20) / 2, 150, 20); QStyleOptionProgressBar progressBarOption; progressBarOption.rect = progressRect; @@ -99,49 +159,55 @@ void AppDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, c progressBarOption.textVisible = true; QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter); - // 修改后的取消按钮绘制代码 - QRect buttonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); + QRect cancelButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); painter->setPen(Qt::NoPen); - painter->setBrush(QColor("#ff4444")); // 红色背景 - painter->drawRoundedRect(buttonRect, 4, 4); // 圆角矩形 + painter->setBrush(QColor("#ff4444")); + painter->drawRoundedRect(cancelButtonRect, 4, 4); - painter->setPen(Qt::white); // 白色文字 + painter->setPen(Qt::white); painter->setFont(option.font); - painter->drawText(buttonRect, Qt::AlignCenter, "取消"); + painter->drawText(cancelButtonRect, Qt::AlignCenter, "取消"); } else if (isInstalling) { - // 安装中:显示转圈和文字 QRect spinnerRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 30, 30); - int angle = (m_spinnerTimer.elapsed() / 10) % 360; + + // 修改:使用 m_spinnerAngle QPen pen(QColor("#2563EB"), 3); painter->setPen(pen); painter->setRenderHint(QPainter::Antialiasing, true); QRectF arcRect = spinnerRect.adjusted(3, 3, -3, -3); - painter->drawArc(arcRect, angle * 16, 120 * 16); // 120度弧 + painter->drawArc(arcRect, m_spinnerAngle * 16, 120 * 16); // 120度弧 QRect textRect(option.rect.right() - 120, option.rect.top() + (option.rect.height() - 30) / 2, 110, 30); painter->setPen(QColor("#2563EB")); painter->setFont(option.font); painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, "正在安装中"); } else { - QRect buttonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30); + // 绘制忽略按钮 + QRect ignoreButtonRect(option.rect.right() - 160, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30); + painter->setPen(Qt::NoPen); + painter->setBrush(QColor("#F3F4F6")); + painter->drawRoundedRect(ignoreButtonRect, 4, 4); + painter->setPen(QColor("#6B7280")); + painter->drawText(ignoreButtonRect, Qt::AlignCenter, "忽略"); + + // 绘制更新按钮 + QRect updateButtonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30); painter->setPen(Qt::NoPen); if (isInstalled) { painter->setBrush(QColor("#10B981")); - painter->drawRoundedRect(buttonRect, 4, 4); + painter->drawRoundedRect(updateButtonRect, 4, 4); painter->setPen(Qt::white); - painter->drawText(buttonRect, Qt::AlignCenter, "已安装"); + painter->drawText(updateButtonRect, Qt::AlignCenter, "已安装"); } else if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) { - // 下载完成,按钮绿色,样式不变 painter->setBrush(QColor("#10B981")); - painter->drawRoundedRect(buttonRect, 4, 4); + painter->drawRoundedRect(updateButtonRect, 4, 4); painter->setPen(Qt::white); - painter->drawText(buttonRect, Qt::AlignCenter, "下载完成"); - // 不需要特殊处理样式,交互在 editorEvent 控制 + painter->drawText(updateButtonRect, Qt::AlignCenter, "下载完成"); } else { painter->setBrush(QColor("#e9effd")); - painter->drawRoundedRect(buttonRect, 4, 4); + painter->drawRoundedRect(updateButtonRect, 4, 4); painter->setPen(QColor("#2563EB")); - painter->drawText(buttonRect, Qt::AlignCenter, "更新"); + painter->drawText(updateButtonRect, Qt::AlignCenter, "更新"); } } @@ -158,6 +224,30 @@ bool AppDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, QMouseEvent *mouseEvent = static_cast(event); QRect rect = option.rect; QString packageName = index.data(Qt::UserRole + 1).toString(); + + // 检查是否为忽略状态,如果是则只允许取消忽略按钮的交互 + bool isIgnored = index.data(Qt::UserRole + 8).toBool(); + if (isIgnored) { + QRect unignoreButtonRect(option.rect.right() - 80, option.rect.top() + (option.rect.height() - 30) / 2, 70, 30); + if (unignoreButtonRect.contains(mouseEvent->pos())) { + // 发送取消忽略信号 + emit unignoreApp(packageName); + return true; + } + return true; // 消耗其他事件,不允许其他交互 + } + + // 检查是否点击了复选框 + QRect checkboxRect(rect.left() + 10, rect.top() + (rect.height() - 20) / 2, 20, 20); + if (checkboxRect.contains(mouseEvent->pos())) { + if (m_selectedPackages.contains(packageName)) { + m_selectedPackages.remove(packageName); + } else { + m_selectedPackages.insert(packageName); + } + emit updateDisplay(packageName); + return true; + } if (m_downloads.contains(packageName) && m_downloads[packageName].isDownloading) { QRect cancelButtonRect(rect.right() - 70, rect.top() + (rect.height() - 20) / 2, 60, 20); @@ -168,19 +258,47 @@ bool AppDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, return true; } } else { - QRect buttonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); - if (buttonRect.contains(mouseEvent->pos())) { - // 判断是否为“下载完成”状态,如果是则不响应点击 + // 检查是否点击了忽略按钮 + QRect ignoreButtonRect(rect.right() - 160, rect.top() + (rect.height() - 30) / 2, 70, 30); + if (ignoreButtonRect.contains(mouseEvent->pos())) { + QString currentVersion = index.data(Qt::UserRole + 2).toString(); + emit ignoreApp(packageName, currentVersion); + return true; + } + + // 检查是否点击了更新按钮 + QRect updateButtonRect(rect.right() - 80, rect.top() + (rect.height() - 30) / 2, 70, 30); + if (updateButtonRect.contains(mouseEvent->pos())) { if (m_downloads.contains(packageName) && !m_downloads[packageName].isDownloading) { - // “下载完成”状态,按钮失效,点击无效 return false; } - QString downloadUrl = index.data(Qt::UserRole + 7).toString(); - QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); + + // 检查/tmp目录下是否已经存在deb包 + QDir tempDir(QDir::tempPath()); + QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName), QDir::Files); + QString debPath; + if (!debs.isEmpty()) { + debPath = tempDir.absoluteFilePath(debs.first()); + } else { + debs = tempDir.entryList(QStringList() << QString("%1*.deb").arg(packageName), QDir::Files); + if (!debs.isEmpty()) { + debPath = tempDir.absoluteFilePath(debs.first()); + } + } + + // 如果存在deb包,直接进行安装 + if (!debPath.isEmpty() && QFile::exists(debPath)) { + qDebug() << "发现已存在的deb包,直接进行安装:" << debPath; + enqueueInstall(packageName); + } else { + // 否则触发下载流程 + QString downloadUrl = index.data(Qt::UserRole + 7).toString(); + QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); - m_downloads[packageName] = {0, true}; - m_downloadManager->startDownload(packageName, downloadUrl, outputPath); - emit updateDisplay(packageName); + m_downloads[packageName] = {0, true}; + m_downloadManager->startDownload(packageName, downloadUrl, outputPath); + emit updateDisplay(packageName); + } return true; } } @@ -195,7 +313,7 @@ void AppDelegate::startDownloadForAll() { QModelIndex index = m_model->index(row, 0); QString packageName = index.data(Qt::UserRole + 1).toString(); if (m_downloads.contains(packageName) && (m_downloads[packageName].isDownloading || m_downloads[packageName].isInstalled)) - continue; // 跳过正在下载或已安装的 + continue; QString downloadUrl = index.data(Qt::UserRole + 7).toString(); QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); m_downloads[packageName] = {0, true, false}; @@ -204,7 +322,6 @@ void AppDelegate::startDownloadForAll() { } } -// 新增:安装队列相关实现 void AppDelegate::enqueueInstall(const QString &packageName) { m_installQueue.enqueue(packageName); if (!m_isInstalling) { @@ -216,15 +333,16 @@ void AppDelegate::startNextInstall() { if (m_installQueue.isEmpty()) { m_isInstalling = false; m_installingPackage.clear(); + m_spinnerUpdateTimer.stop(); // 新增:停止定时器 return; } m_isInstalling = true; QString packageName = m_installQueue.dequeue(); m_installingPackage = packageName; m_downloads[packageName].isInstalling = true; + m_spinnerUpdateTimer.start(); // 新增:启动定时器 emit updateDisplay(packageName); - // 查找 /tmp 下以包名开头的 .deb 文件 QDir tempDir(QDir::tempPath()); QStringList debs = tempDir.entryList(QStringList() << QString("%1_*.deb").arg(packageName), QDir::Files); QString debPath; @@ -248,11 +366,9 @@ void AppDelegate::startNextInstall() { m_installProcess = new QProcess(this); - // 新增:准备安装日志文件 QString logPath = QString("/tmp/%1_install.log").arg(packageName); QFile *logFile = new QFile(logPath, m_installProcess); if (logFile->open(QIODevice::Append | QIODevice::Text)) { - // 设置权限为777 QFile::setPermissions(logPath, QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner | QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther); @@ -262,7 +378,6 @@ void AppDelegate::startNextInstall() { logFile->flush(); QString text = QString::fromLocal8Bit(out); qDebug().noquote() << text; - // 检查“软件包已安装”关键字 if (text.contains(QStringLiteral("软件包已安装"))) { m_downloads[packageName].isInstalling = false; m_downloads[packageName].isInstalled = true; @@ -276,28 +391,45 @@ void AppDelegate::startNextInstall() { qDebug().noquote() << QString::fromLocal8Bit(err); }); connect(m_installProcess, QOverload::of(&QProcess::finished), - this, [this, packageName, logFile](int exitCode, QProcess::ExitStatus status) { - if (logFile) logFile->close(); - m_downloads[packageName].isInstalling = false; - if (exitCode == 0) { - m_downloads[packageName].isInstalled = true; // 安装成功 + this, [this, packageName, logFile, debPath](int exitCode, QProcess::ExitStatus status) { + if (logFile) logFile->close(); + m_downloads[packageName].isInstalling = false; + if (exitCode == 0) { + m_downloads[packageName].isInstalled = true; + + // 安装成功后删除deb包 + if (QFile::exists(debPath)) { + if (QFile::remove(debPath)) { + qDebug() << "已删除deb包:" << debPath; + } else { + qWarning() << "删除deb包失败:" << debPath; } - emit updateDisplay(packageName); - m_installProcess->deleteLater(); - m_installProcess = nullptr; - m_installingPackage.clear(); - startNextInstall(); - }); - + } + } + emit updateDisplay(packageName); + m_installProcess->deleteLater(); + m_installProcess = nullptr; + m_installingPackage.clear(); + startNextInstall(); + }); } else { - // 日志文件无法打开时,仍然要连接原有信号 - connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName]() { + connect(m_installProcess, &QProcess::readyReadStandardOutput, this, [this, packageName, debPath]() { QByteArray out = m_installProcess->readAllStandardOutput(); QString text = QString::fromLocal8Bit(out); qDebug().noquote() << text; if (text.contains(QStringLiteral("软件包已安装"))) { m_downloads[packageName].isInstalling = false; m_downloads[packageName].isInstalled = true; + + // 安装成功后删除deb包 + if (QFile::exists(debPath)) { + if (QFile::remove(debPath)) { + qDebug() << "已删除deb包:" << debPath; + } else { + qWarning() << "删除deb包失败:" << debPath; + } + } + emit updateDisplay(packageName); } }); @@ -306,7 +438,16 @@ void AppDelegate::startNextInstall() { qDebug().noquote() << QString::fromLocal8Bit(err); }); connect(m_installProcess, QOverload::of(&QProcess::finished), - this, [this, packageName](int /*exitCode*/, QProcess::ExitStatus /*status*/) { + this, [this, packageName, debPath](int exitCode, QProcess::ExitStatus /*status*/) { + // 如果通过退出码判断安装成功,也删除deb包 + if (exitCode == 0 && QFile::exists(debPath)) { + if (QFile::remove(debPath)) { + qDebug() << "已删除deb包:" << debPath; + } else { + qWarning() << "删除deb包失败:" << debPath; + } + } + emit updateDisplay(packageName); m_installProcess->deleteLater(); m_installProcess = nullptr; @@ -315,8 +456,51 @@ void AppDelegate::startNextInstall() { }); } - // 注意参数顺序:deb路径在前,--no-create-desktop-entry在后 QStringList args; args << debPath << "--no-create-desktop-entry" << "--delete-after-install"; m_installProcess->start("ssinstall", args); } + +// 新增槽函数,用于更新旋转角度并触发刷新 +void AppDelegate::updateSpinner() { + m_spinnerAngle = (m_spinnerAngle + 10) % 360; // 每次增加10度 + emit updateDisplay(m_installingPackage); // 仅刷新当前正在安装的项 +} + +// 新增:更新选中应用的方法 +void AppDelegate::startDownloadForSelected() { + if (!m_model) return; + for (int row = 0; row < m_model->rowCount(); ++row) { + QModelIndex index = m_model->index(row, 0); + QString packageName = index.data(Qt::UserRole + 1).toString(); + + // 只下载选中的应用 + if (m_selectedPackages.contains(packageName)) { + if (m_downloads.contains(packageName) && (m_downloads[packageName].isDownloading || m_downloads[packageName].isInstalled)) + continue; + QString downloadUrl = index.data(Qt::UserRole + 7).toString(); + QString outputPath = QString("%1/%2.metalink").arg(QDir::tempPath(), packageName); + m_downloads[packageName] = {0, true, false}; + m_downloadManager->startDownload(packageName, downloadUrl, outputPath); + emit updateDisplay(packageName); + } + } +} + +// 复选框相关方法实现 +void AppDelegate::setSelectedPackages(const QSet &selected) { + m_selectedPackages = selected; +} + +QSet AppDelegate::getSelectedPackages() const { + return m_selectedPackages; +} + +void AppDelegate::clearSelection() { + m_selectedPackages.clear(); +} + +// 实现获取下载状态信息的方法 +const QHash& AppDelegate::getDownloads() const { + return m_downloads; +} \ No newline at end of file diff --git a/src/spark-update-tool/src/appdelegate.h b/spark-update-tool/src/appdelegate.h similarity index 56% rename from src/spark-update-tool/src/appdelegate.h rename to spark-update-tool/src/appdelegate.h index 0545155ea6e51146bef81eefcebd7a5857065776..25ea3373c6c1fcffddb10bdab4d56fe357a04f7f 100644 --- a/src/spark-update-tool/src/appdelegate.h +++ b/spark-update-tool/src/appdelegate.h @@ -5,13 +5,16 @@ #include #include #include +#include +#include + #include "downloadmanager.h" struct DownloadInfo { int progress = 0; bool isDownloading = false; bool isInstalled = false; - bool isInstalling = false; // 新增:标记是否正在安装 + bool isInstalling = false; }; class AppDelegate : public QStyledItemDelegate { @@ -26,21 +29,43 @@ public: bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override; void startDownloadForAll(); + void startDownloadForSelected(); + + // 复选框相关方法 + void setSelectedPackages(const QSet &selected); + QSet getSelectedPackages() const; + void clearSelection(); + + // 获取下载状态信息 + const QHash& getDownloads() const; + signals: void updateDisplay(const QString &packageName); + void updateFinished(bool success); //传递是否完成更新 + void ignoreApp(const QString &packageName, const QString &version); // 新增:忽略应用信号 + void unignoreApp(const QString &packageName); // 新增:取消忽略应用信号 + +private slots: + void updateSpinner(); // 新增槽函数 private: DownloadManager *m_downloadManager; QHash m_downloads; QAbstractItemModel *m_model = nullptr; + + // 复选框相关成员变量 + QSet m_selectedPackages; QQueue m_installQueue; bool m_isInstalling = false; QProcess *m_installProcess = nullptr; - QString m_installingPackage; // 当前正在安装的包名 - QElapsedTimer m_spinnerTimer; // 用于转圈动画 + QString m_installingPackage; + QElapsedTimer m_spinnerTimer; + + QTimer m_spinnerUpdateTimer; // 新增定时器 + int m_spinnerAngle = 0; // 新增角度变量 void enqueueInstall(const QString &packageName); void startNextInstall(); -}; +}; \ No newline at end of file diff --git a/src/spark-update-tool/src/applistmodel.cpp b/spark-update-tool/src/applistmodel.cpp similarity index 82% rename from src/spark-update-tool/src/applistmodel.cpp rename to spark-update-tool/src/applistmodel.cpp index e5acd963e312de33f7e788c968e511efee5638f5..9d7c83df19369f322d64cd90564b86638efd720c 100644 --- a/src/spark-update-tool/src/applistmodel.cpp +++ b/spark-update-tool/src/applistmodel.cpp @@ -1,5 +1,4 @@ #include "applistmodel.h" -#include AppListModel::AppListModel(QObject *parent) : QAbstractListModel(parent) {} @@ -33,6 +32,8 @@ QVariant AppListModel::data(const QModelIndex &index, int role) const return map.value("description"); case Qt::UserRole + 7: // 下载 URL return map.value("download_url"); // 返回下载 URL + case Qt::UserRole + 8: // 忽略状态 + return map.value("ignored"); default: return QVariant(); } @@ -53,11 +54,21 @@ void AppListModel::setUpdateData(const QJsonArray &updateInfo) map["icon"] = obj["icon"].toString(); map["size"] = obj["size"].toString(); map["download_url"] = obj["download_url"].toString(); // 确保设置下载 URL + map["ignored"] = obj["ignored"].toBool(); // 设置忽略状态 m_data.append(map); // 添加到 QList - qDebug() << "设置到模型的包名:" << map["package"].toString(); + qDebug() << "设置到模型的包名:" << map["package"].toString() << "忽略状态:" << map["ignored"].toBool(); qDebug() << "设置到模型的下载 URL:" << map["download_url"].toString(); // 检查设置的数据 } endResetModel(); } + +bool AppListModel::isAppIgnored(const QModelIndex &index) const +{ + if (!index.isValid() || index.row() >= m_data.size()) + return false; + + const QVariantMap &map = m_data.at(index.row()); + return map.value("ignored").toBool(); +} \ No newline at end of file diff --git a/src/spark-update-tool/src/applistmodel.h b/spark-update-tool/src/applistmodel.h similarity index 82% rename from src/spark-update-tool/src/applistmodel.h rename to spark-update-tool/src/applistmodel.h index 2fb36c0d5f6e28d9002c71d4f1ab4d496a849a27..d3f304dad89d42d1f170b0ce1b32730499c7d576 100644 --- a/src/spark-update-tool/src/applistmodel.h +++ b/spark-update-tool/src/applistmodel.h @@ -5,7 +5,7 @@ #include // 添加 QJsonObject 头文件 #include - +#include class AppListModel : public QAbstractListModel { Q_OBJECT @@ -18,9 +18,12 @@ public: // 设置更新数据 void setUpdateData(const QJsonArray &data); + + // 获取忽略状态 + bool isAppIgnored(const QModelIndex &index) const; private: QList m_data; // 修改类型为 QList }; -#endif // APPLISTMODEL_H +#endif // APPLISTMODEL_H \ No newline at end of file diff --git a/src/spark-update-tool/src/aptssupdater.cpp b/spark-update-tool/src/aptssupdater.cpp similarity index 89% rename from src/spark-update-tool/src/aptssupdater.cpp rename to spark-update-tool/src/aptssupdater.cpp index 71dc533a3ecb13727c7921a617ad0c301c90757c..8dcde5398174b677d5cf347e1d830271887b3404 100644 --- a/src/spark-update-tool/src/aptssupdater.cpp +++ b/spark-update-tool/src/aptssupdater.cpp @@ -18,13 +18,14 @@ QStringList aptssUpdater::getUpdateablePackages() QString command = R"(env LANGUAGE=en_US /usr/bin/apt -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf list --upgradable -o Dir::Etc::sourcelist="/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list" -o Dir::Etc::sourceparts="/dev/null" -o APT::Get::List-Cleanup="0" | awk 'NR>1')"; process.start("bash", QStringList() << "-c" << command); - if (!process.waitForFinished()) { - qWarning() << "Process failed to finish."; + if (!process.waitForFinished(30000)) { // 30秒超时 + qWarning() << "Process failed to finish within 30 seconds."; + process.kill(); return packageDetails; } QString output = process.readAllStandardOutput(); - QStringList lines = output.split('\n', QString::SkipEmptyParts); + QStringList lines = output.split('\n', Qt::SkipEmptyParts); // 创建临时文件 QTemporaryFile tempFile; @@ -68,7 +69,6 @@ QStringList aptssUpdater::getUpdateablePackages() QStringList aptssUpdater::getPackageSizes() { QStringList packageDetails; - QProcess process; // 获取可更新包名列表 QStringList updateablePackages; @@ -77,14 +77,17 @@ QStringList aptssUpdater::getPackageSizes() } foreach (const QString &packageName, updateablePackages) { + QProcess process; // 在循环内部创建新的QProcess实例 + // 构建新命令(包含包名参数) QString command = QString("/usr/bin/apt download %1 --print-uris -c /opt/durapps/spark-store/bin/apt-fast-conf/aptss-apt.conf " "-o Dir::Etc::sourcelist=\"/opt/durapps/spark-store/bin/apt-fast-conf/sources.list.d/sparkstore.list\" " "-o Dir::Etc::sourceparts=\"/dev/null\"").arg(packageName); process.start("bash", QStringList() << "-c" << command); - if (!process.waitForFinished()) { - qWarning() << "获取包信息失败:" << packageName; + if (!process.waitForFinished(30000)) { // 30秒超时 + qWarning() << "获取包信息失败:" << packageName << "(超时)"; + process.kill(); continue; } @@ -116,7 +119,6 @@ QStringList aptssUpdater::getPackageSizes() QStringList aptssUpdater::getDesktopAppNames() { QStringList appNames; - QProcess dpkgProcess; // 获取当前系统语言环境 QString lang = QLocale().name().replace("_", "-"); @@ -125,13 +127,19 @@ QStringList aptssUpdater::getDesktopAppNames() QStringList packages = packageName; foreach (const QString &package, packages) { + QProcess dpkgProcess; // 在循环内部创建新的QProcess实例 + QString packageName = package.split(":")[0]; QString finalName = packageName; // 默认使用包名 // 获取包文件列表 dpkgProcess.start("dpkg", QStringList() << "-L" << packageName); - dpkgProcess.waitForFinished(); - QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', QString::SkipEmptyParts); + if (!dpkgProcess.waitForFinished(30000)) { // 30秒超时 + qWarning() << "获取包文件列表失败:" << packageName << "(超时)"; + dpkgProcess.kill(); + continue; + } + QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts); // 先检查常规应用目录 QStringList regularDesktopFiles = files.filter("/usr/share/applications/"); @@ -225,19 +233,25 @@ bool aptssUpdater::checkDesktopFiles(const QStringList &desktopFiles, QString &a QStringList aptssUpdater::getPackageIcons() { QStringList packageIcons; - QProcess dpkgProcess; // 遍历所有可更新包 QStringList packages = packageName; foreach (const QString &package, packages) { + QProcess dpkgProcess; // 在循环内部创建新的QProcess实例 + QString packageName = package.split(":")[0]; - QString iconPath = ":/resources/default_icon.svg"; // 默认图标 + QString iconPath = ":/resources/default_icon.png"; // 默认图标 // 获取包文件列表 dpkgProcess.start("dpkg", QStringList() << "-L" << packageName); - dpkgProcess.waitForFinished(); - QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', QString::SkipEmptyParts); + if (!dpkgProcess.waitForFinished(30000)) { // 30秒超时 + qWarning() << "获取包文件列表失败:" << packageName << "(超时)"; + dpkgProcess.kill(); + packageIcons << QString("%1: %2").arg(packageName, iconPath); + continue; + } + QStringList files = QString(dpkgProcess.readAllStandardOutput()).split('\n', Qt::SkipEmptyParts); // 查找.desktop文件 QStringList desktopFiles = files.filter(QRegularExpression("/(usr/share|opt/apps)/.*\\.desktop$")); @@ -265,6 +279,7 @@ QStringList aptssUpdater::getPackageIcons() foreach (const QString &path, iconPaths) { if (QFile::exists(path)) { iconPath = path; + qDebug() << "找到图标文件:" << path; break; } } @@ -272,6 +287,7 @@ QStringList aptssUpdater::getPackageIcons() // 已经是绝对路径 if (QFile::exists(iconName)) { iconPath = iconName; + qDebug() << "使用绝对路径图标文件:" << iconName; } } break; @@ -282,10 +298,14 @@ QStringList aptssUpdater::getPackageIcons() } // 如果.desktop中没有找到图标,尝试直接查找包中的图标文件 - if (iconPath == ":/resources/default_icon.svg") { + if (iconPath == ":/resources/default_icon.png") { + qDebug() << "未在.desktop文件中找到图标,尝试直接查找包中的图标文件"; QStringList iconFiles = files.filter(QRegularExpression("/(usr/share/pixmaps|usr/share/icons|opt/apps/.*/entries/icons)/.*\\.(png|svg)$")); if (!iconFiles.isEmpty()) { iconPath = iconFiles.first(); + qDebug() << "从包中找到图标文件:" << iconPath; + } else { + qDebug() << "未在包中找到图标文件,使用默认图标"; } } @@ -393,6 +413,4 @@ QJsonArray aptssUpdater::getUpdateInfoAsJson() } qDebug()<../resources/default_icon.svg ../resources/spark-update-tool.svg ../resources/128*128/spark-update-tool.png + ../resources/default_icon.png diff --git a/spark-update-tool/src/ignoreconfig.cpp b/spark-update-tool/src/ignoreconfig.cpp new file mode 100644 index 0000000000000000000000000000000000000000..32089cd517aa1af9c054914a4a3a3655f80503ca --- /dev/null +++ b/spark-update-tool/src/ignoreconfig.cpp @@ -0,0 +1,148 @@ +#include "ignoreconfig.h" +#include +#include +#include +#include +#include +#include // for geteuid + +IgnoreConfig::IgnoreConfig(QObject *parent) + : QObject(parent) +{ + // 设置配置文件路径 + QString configDir; + + // 检查是否以 root 权限运行 + if (geteuid() == 0) { + // 首先检查是否有 SUDO_USER_HOME 环境变量(表示是通过 pkexec 提权的普通用户) + QByteArray sudoUserHomeEnv = qgetenv("SUDO_USER_HOME"); + if (!sudoUserHomeEnv.isEmpty()) { + // 通过 pkexec 提权的普通用户,使用原用户的配置目录 + QString sudoUserHomePath = QString::fromLocal8Bit(sudoUserHomeEnv); + configDir = sudoUserHomePath + "/.config"; + } else { + // 获取实际的 HOME 目录来判断是真正的 root 用户还是其他方式提权的用户 + QByteArray homeEnv = qgetenv("HOME"); + QString homePath = QString::fromLocal8Bit(homeEnv); + + if (homePath == "/root") { + // 真正的 root 用户,使用 /root/.config + configDir = "/root/.config"; + } else { + // 其他方式提权的用户,使用 HOME 目录下的配置 + configDir = homePath + "/.config"; + } + } + } else { + // 普通用户,使用标准配置目录 + configDir = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); + } + + QDir dir(configDir); + if (!dir.exists()) { + dir.mkpath("."); + } + m_configFilePath = dir.filePath("spark-update-tool/ignored_apps.conf"); + + // 确保目录存在 + QFileInfo fileInfo(m_configFilePath); + QDir configDirPath = fileInfo.dir(); + if (!configDirPath.exists()) { + configDirPath.mkpath("."); + } + + // 加载现有配置 + loadConfig(); + + // 输出忽略列表到 qDebug + printIgnoredApps(); +} + +void IgnoreConfig::addIgnoredApp(const QString &packageName, const QString &version) +{ + m_ignoredApps.insert(qMakePair(packageName, version)); + saveConfig(); +} + +void IgnoreConfig::removeIgnoredApp(const QString &packageName) +{ + // 移除所有该包名的版本 + auto it = m_ignoredApps.begin(); + while (it != m_ignoredApps.end()) { + if (it->first == packageName) { + it = m_ignoredApps.erase(it); + } else { + ++it; + } + } + saveConfig(); +} + +bool IgnoreConfig::isAppIgnored(const QString &packageName, const QString &version) const +{ + return m_ignoredApps.contains(qMakePair(packageName, version)); +} + +QSet> IgnoreConfig::getIgnoredApps() const +{ + return m_ignoredApps; +} + +void IgnoreConfig::printIgnoredApps() const +{ + qDebug() << "=== 忽略的应用列表 ==="; + qDebug() << "配置文件路径:" << m_configFilePath; + + if (m_ignoredApps.isEmpty()) { + qDebug() << "没有忽略的应用"; + } else { + for (const auto &app : m_ignoredApps) { + qDebug() << "忽略的应用:" << app.first << "版本:" << app.second; + } + } + qDebug() << "===================="; +} + +bool IgnoreConfig::saveConfig() +{ + QFile file(m_configFilePath); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + qDebug() << "无法打开配置文件进行写入:" << m_configFilePath; + return false; + } + + QTextStream out(&file); + for (const auto &app : m_ignoredApps) { + out << app.first << "|" << app.second << "\n"; + } + file.close(); + return true; +} + +bool IgnoreConfig::loadConfig() +{ + QFile file(m_configFilePath); + if (!file.exists()) { + // 配置文件不存在,这是正常的,返回true表示没有错误 + return true; + } + + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { + qDebug() << "无法打开配置文件进行读取:" << m_configFilePath; + return false; + } + + m_ignoredApps.clear(); + QTextStream in(&file); + while (!in.atEnd()) { + QString line = in.readLine().trimmed(); + if (!line.isEmpty()) { + QStringList parts = line.split('|'); + if (parts.size() == 2) { + m_ignoredApps.insert(qMakePair(parts[0], parts[1])); + } + } + } + file.close(); + return true; +} \ No newline at end of file diff --git a/spark-update-tool/src/ignoreconfig.h b/spark-update-tool/src/ignoreconfig.h new file mode 100644 index 0000000000000000000000000000000000000000..2952eca25700d616c65415bc15369a556aca21af --- /dev/null +++ b/spark-update-tool/src/ignoreconfig.h @@ -0,0 +1,42 @@ +#ifndef IGNORECONFIG_H +#define IGNORECONFIG_H + +#include +#include +#include +#include + +class IgnoreConfig : public QObject +{ + Q_OBJECT + +public: + explicit IgnoreConfig(QObject *parent = nullptr); + + // 添加忽略的应用(包名和版本号) + void addIgnoredApp(const QString &packageName, const QString &version); + + // 移除忽略的应用 + void removeIgnoredApp(const QString &packageName); + + // 检查应用是否被忽略 + bool isAppIgnored(const QString &packageName, const QString &version) const; + + // 获取所有被忽略的应用 + QSet> getIgnoredApps() const; + + // 输出所有被忽略的应用到 qDebug + void printIgnoredApps() const; + + // 保存配置到文件 + bool saveConfig(); + + // 从文件加载配置 + bool loadConfig(); + +private: + QSet> m_ignoredApps; + QString m_configFilePath; +}; + +#endif // IGNORECONFIG_H \ No newline at end of file diff --git a/src/spark-update-tool/src/main.cpp b/spark-update-tool/src/main.cpp similarity index 95% rename from src/spark-update-tool/src/main.cpp rename to spark-update-tool/src/main.cpp index a3df5a4312ec4aa1ab077ce7d200b51a928e7f71..f70a913eacba046ac53510a3955516e06b761eb9 100644 --- a/src/spark-update-tool/src/main.cpp +++ b/spark-update-tool/src/main.cpp @@ -16,11 +16,13 @@ bool elevateToRoot() { QByteArray display = qgetenv("DISPLAY"); QByteArray xauthority = qgetenv("XAUTHORITY"); + QByteArray home = qgetenv("HOME"); // 获取原始用户的 HOME 目境变量 QStringList args; args << "env" << "DISPLAY=" + display << "XAUTHORITY=" + xauthority + << "SUDO_USER_HOME=" + home // 传递原始用户的 HOME 路径 << program; QProcess process; diff --git a/src/spark-update-tool/src/mainwindow.cpp b/spark-update-tool/src/mainwindow.cpp similarity index 53% rename from src/spark-update-tool/src/mainwindow.cpp rename to spark-update-tool/src/mainwindow.cpp index 54f064cafd0a6bfd8050846d53eba45d6c3c198c..c93f09a76beaae62040ffdc1abde3c19babb6439 100644 --- a/src/spark-update-tool/src/mainwindow.cpp +++ b/spark-update-tool/src/mainwindow.cpp @@ -7,11 +7,13 @@ #include // 新增 #include #include +#include // for geteuid MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) , m_model(new AppListModel(this)) , m_delegate(new AppDelegate(this)) + , m_ignoreConfig(new IgnoreConfig(this)) { QIcon icon(":/resources/128*128/spark-update-tool.png"); setWindowIcon(icon); @@ -53,11 +55,26 @@ MainWindow::MainWindow(QWidget *parent) } }); + // 连接应用委托的信号 + connect(m_delegate, &AppDelegate::ignoreApp, this, &MainWindow::onIgnoreApp); + connect(m_delegate, &AppDelegate::unignoreApp, this, &MainWindow::onUnignoreApp); + // 新增:点击“更新全部”按钮批量下载 connect(ui->updatePushButton, &QPushButton::clicked, this, [=](){ - qDebug()<<"更新全部按钮被点击"; - m_delegate->startDownloadForAll(); + qDebug()<<"更新按钮被点击"; + if (m_delegate->getSelectedPackages().isEmpty()) { + // 没有选中任何应用,更新全部 + m_delegate->startDownloadForAll(); + } else { + // 有选中应用,更新选中 + m_delegate->startDownloadForSelected(); + m_delegate->clearSelection(); + updateButtonText(); + } }); + + // 新增:监听选择变化 + connect(m_delegate, &AppDelegate::updateDisplay, this, &MainWindow::handleSelectionChanged); checkUpdates(); // 新增:监听搜索框文本变化 @@ -75,6 +92,12 @@ MainWindow::MainWindow(QWidget *parent) watcher->setFuture(QtConcurrent::run([this](){ runAptssUpgrade(); })); + QScreen *screen = QGuiApplication::screenAt(QCursor::pos()); + if (!screen) screen = QGuiApplication::primaryScreen(); + QRect screenGeometry = screen->geometry(); + int x = screenGeometry.x() + (screenGeometry.width() - this->width()) / 2; + int y = screenGeometry.y() + (screenGeometry.height() - this->height()) / 2; + this->move(x, y); } //初始化控件样式 void MainWindow::initStyle() @@ -207,12 +230,42 @@ void MainWindow::checkUpdates() { aptssUpdater updater; QJsonArray updateInfo = updater.getUpdateInfoAsJson(); - m_allApps = updateInfo; // 保存所有应用数据 - m_model->setUpdateData(updateInfo); - + + // 分离正常应用和忽略应用 + QJsonArray normalApps; + QJsonArray ignoredApps; + for (const auto &item : updateInfo) { QJsonObject obj = item.toObject(); - qDebug() << "模型设置的包名:" << obj["package"].toString(); + QString packageName = obj["package"].toString(); + QString currentVersion = obj["current_version"].toString(); + + // 检查应用是否被忽略 + if (m_ignoreConfig->isAppIgnored(packageName, currentVersion)) { + // 标记为忽略状态 + obj["ignored"] = true; + ignoredApps.append(obj); + } else { + obj["ignored"] = false; + normalApps.append(obj); + } + } + + // 合并数组:正常应用在前,忽略应用在后 + QJsonArray finalApps; + for (const auto &item : normalApps) { + finalApps.append(item); + } + for (const auto &item : ignoredApps) { + finalApps.append(item); + } + + m_allApps = finalApps; // 保存所有应用数据 + m_model->setUpdateData(finalApps); + + for (const auto &item : finalApps) { + QJsonObject obj = item.toObject(); + qDebug() << "模型设置的包名:" << obj["package"].toString() << "忽略状态:" << obj["ignored"].toBool(); qDebug() << "模型设置的下载 URL:" << obj["download_url"].toString(); // 检查模型数据 } } @@ -224,7 +277,11 @@ void MainWindow::filterAppsByKeyword(const QString &keyword) m_model->setUpdateData(m_allApps); return; } - QJsonArray filtered; + + // 分离正常应用和忽略应用 + QJsonArray normalApps; + QJsonArray ignoredApps; + for (const auto &item : m_allApps) { QJsonObject obj = item.toObject(); // 可根据需要匹配更多字段 @@ -232,31 +289,157 @@ void MainWindow::filterAppsByKeyword(const QString &keyword) QString package = obj.value("package").toString(); if (name.contains(keyword, Qt::CaseInsensitive) || package.contains(keyword, Qt::CaseInsensitive)) { - filtered.append(item); + + // 检查是否为忽略状态 + if (obj.value("ignored").toBool()) { + ignoredApps.append(item); + } else { + normalApps.append(item); + } } } + + // 合并数组:正常应用在前,忽略应用在后 + QJsonArray filtered; + for (const auto &item : normalApps) { + filtered.append(item); + } + for (const auto &item : ignoredApps) { + filtered.append(item); + } + m_model->setUpdateData(filtered); } void MainWindow::runAptssUpgrade() { QProcess process; - QStringList args; - args << "sudo" <<"aptss" << "ssupdate"; - process.start("sudo", args); + + // 检查是否已经是root用户,如果是则直接执行命令,否则使用sudo + if (geteuid() == 0) { + // root用户直接执行 + process.start("aptss", QStringList() << "ssupdate"); + } else { + // 非root用户使用sudo + process.start("sudo", QStringList() << "aptss" << "ssupdate"); + } + if (!process.waitForStarted(5000)) { - QMessageBox::warning(this, "升级失败", "无法启动 sudo aptss ssupdate"); + QMessageBox::warning(this, "升级失败", "无法启动 aptss ssupdate"); return; } process.write("n\n"); process.closeWriteChannel(); - process.waitForFinished(-1); + + // 设置超时时间,避免无限等待 + if (!process.waitForFinished(30000)) { // 30秒超时 + qDebug() << "aptss ssupdate 执行超时"; + process.kill(); // 强制终止进程 + return; + } + if (process.exitCode() != 0) { - QMessageBox::warning(this, "升级失败", "执行 sudo aptss ssupdate 失败,请检查系统环境。"); + QMessageBox::warning(this, "升级失败", "执行 aptss ssupdate 失败,请检查系统环境或稍后再试。"); } } +void MainWindow::closeEvent(QCloseEvent *event) +{ + // 检查是否正在进行更新 + bool isUpdating = false; + + // 通过AppDelegate检查是否有正在下载或安装的应用 + const QHash& downloads = m_delegate->getDownloads(); + for (auto it = downloads.constBegin(); it != downloads.constEnd(); ++it) { + if (it.value().isDownloading || it.value().isInstalling) { + isUpdating = true; + break; + } + } + + // 如果正在更新,才显示确认对话框 + if (isUpdating) { + QMessageBox::StandardButton reply = QMessageBox::question(this, "确认关闭", "正在更新,是否确认关闭窗口?", QMessageBox::Yes | QMessageBox::No); + + if (reply == QMessageBox::Yes) { + event->accept(); + } else { + event->ignore(); + } + } else { + // 如果没有更新,直接关闭窗口 + event->accept(); + } +} +void MainWindow::handleUpdateFinished(bool success) +{ + if (success) { + // 更新成功时的处理逻辑 + QMessageBox::information(this, "更新完成", "软件更新已成功完成!"); + } else { + // 更新失败时的处理逻辑 + QMessageBox::warning(this, "更新失败", "软件更新过程中出现错误,请稍后再试。"); + } + + // 刷新应用列表 + checkUpdates(); +} MainWindow::~MainWindow() { delete ui; } + +// 新增:更新按钮文本 +void MainWindow::updateButtonText() { + int selectedCount = m_delegate->getSelectedPackages().size(); + if (selectedCount > 0) { + ui->updatePushButton->setText(QString("更新选中(%1)").arg(selectedCount)); + } else { + ui->updatePushButton->setText("更新全部"); + } +} + +// 新增:处理选择变化 +void MainWindow::handleSelectionChanged() { + updateButtonText(); +} + +// 新增:处理忽略应用的槽函数 +void MainWindow::onIgnoreApp(const QString &packageName, const QString &version) { + // 将应用添加到忽略配置中 + m_ignoreConfig->addIgnoredApp(packageName, version); + + // 更新模型中应用的状态,而不是移除 + QJsonArray updatedApps; + for (const auto &item : m_allApps) { + QJsonObject obj = item.toObject(); + if (obj["package"].toString() == packageName) { + obj["ignored"] = true; // 标记为忽略状态 + } + updatedApps.append(obj); + } + m_allApps = updatedApps; + + // 重新排序:正常应用在前,忽略应用在后 + checkUpdates(); +} + +// 新增:处理取消忽略应用的槽函数 +void MainWindow::onUnignoreApp(const QString &packageName) { + // 从忽略配置中移除应用 + m_ignoreConfig->removeIgnoredApp(packageName); + + // 更新模型中应用的状态 + QJsonArray updatedApps; + for (const auto &item : m_allApps) { + QJsonObject obj = item.toObject(); + if (obj["package"].toString() == packageName) { + obj["ignored"] = false; // 标记为非忽略状态 + } + updatedApps.append(obj); + } + m_allApps = updatedApps; + + // 重新排序:正常应用在前,忽略应用在后 + checkUpdates(); +} \ No newline at end of file diff --git a/src/spark-update-tool/src/mainwindow.h b/spark-update-tool/src/mainwindow.h similarity index 54% rename from src/spark-update-tool/src/mainwindow.h rename to spark-update-tool/src/mainwindow.h index bc7f9d72b40c29fb3ed279dd204efaaf4271c4d7..5bf2f0a587d36f1c4842cdd8fc70ea1d77b864e5 100644 --- a/src/spark-update-tool/src/mainwindow.h +++ b/spark-update-tool/src/mainwindow.h @@ -5,9 +5,10 @@ #include "aptssupdater.h" #include "applistmodel.h" #include "appdelegate.h" +#include "ignoreconfig.h" #include #include // 添加头文件 - +#include QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; @@ -22,6 +23,9 @@ public: MainWindow(QWidget *parent = nullptr); ~MainWindow(); +protected: + void closeEvent(QCloseEvent *event) override; + private: Ui::MainWindow *ui; void checkUpdates(); @@ -29,8 +33,16 @@ private: void runAptssUpgrade(); AppListModel *m_model; AppDelegate *m_delegate; + IgnoreConfig *m_ignoreConfig; // 新增:忽略配置管理 QListView *listView; // 声明 QListView 指针 QJsonArray m_allApps; // 新增:保存所有应用数据 void filterAppsByKeyword(const QString &keyword); // 新增:搜索过滤函数声明 + void updateButtonText(); // 新增:更新按钮文本 + +private slots: + void handleUpdateFinished(bool success); // 新增:处理更新完成的槽函数 + void handleSelectionChanged(); // 新增:处理选择变化的槽函数 + void onIgnoreApp(const QString &packageName, const QString &version); // 新增:处理忽略应用的槽函数 + void onUnignoreApp(const QString &packageName); // 新增:处理取消忽略应用 }; -#endif // MAINWINDOW_H +#endif // MAINWINDOW_H \ No newline at end of file diff --git a/src/spark-update-tool/src/mainwindow.ui b/spark-update-tool/src/mainwindow.ui similarity index 99% rename from src/spark-update-tool/src/mainwindow.ui rename to spark-update-tool/src/mainwindow.ui index a53a4b880806e0cccf10b3171ce49914123211fa..8c2b025e752447221531af7bff4ea735343947f1 100644 --- a/src/spark-update-tool/src/mainwindow.ui +++ b/spark-update-tool/src/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 1440 - 858 + 800 + 600 @@ -253,4 +253,4 @@ - + \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..f917f788cee62083cc6f5f21c6664411b7fcc2a5 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,31 @@ +find_package(Qt5 REQUIRED COMPONENTS Core Widgets Network WebEngineWidgets Concurrent Svg) +find_package(Dtk REQUIRED COMPONENTS Core Gui Widget) + +# 添加构建时间宏 +string(TIMESTAMP BUILD_DATE "%Y.%m.%d" UTC) +string(TIMESTAMP BUILD_TIME "%H:%M:%S" UTC) +add_definitions(-DBUILD_DATE="${BUILD_DATE}") +add_definitions(-DBUILD_TIME="${BUILD_TIME}") + +include(src.cmake) + +add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES} ${QRC_FILE}) + +target_link_libraries(${PROJECT_NAME} PRIVATE + Qt5::Core + Qt5::Widgets + Qt5::Network + Qt5::WebEngineWidgets + Qt5::Concurrent + Qt5::Svg + Dtk::Core + Dtk::Gui + Dtk::Widget +) + +install(TARGETS ${PROJECT_NAME} DESTINATION /opt/durapps/${PROJECT_NAME}/bin) + +install(DIRECTORY ${CMAKE_SOURCE_DIR}/tool/ DESTINATION /opt/durapps/${PROJECT_NAME}/bin USE_SOURCE_PERMISSIONS) +install(DIRECTORY ${CMAKE_SOURCE_DIR}/pkg/lib/ DESTINATION /lib USE_SOURCE_PERMISSIONS) +install(DIRECTORY ${CMAKE_SOURCE_DIR}/pkg/tmp/ DESTINATION /tmp USE_SOURCE_PERMISSIONS) +install(DIRECTORY ${CMAKE_SOURCE_DIR}/pkg/usr/ DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS) \ No newline at end of file diff --git a/src/application.cpp b/src/application.cpp index 4a919f2e6d71cf09bb1686b34ac1f560eb461144..89a68210296ac2ee5e3da8ee4ec725dacd95de46 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -25,7 +25,6 @@ Application::Application(int &argc, char **argv) if (!DPlatformWindowHandle::pluginVersion().isEmpty()) { setAttribute(Qt::AA_DontCreateNativeWidgetSiblings, true); } - setAttribute(Qt::AA_UseHighDpiPixmaps); setQuitOnLastWindowClosed(false); // 启用托盘图标时,关闭窗口程序仍然运行 @@ -177,7 +176,10 @@ void Application::loadTranslator() if (QLocale::system().language() == QLocale::Chinese) { QTranslator *webengineTranslator = new QTranslator(this); - webengineTranslator->load(QLocale(QLocale::Chinese), "qtwebengine", "_", ":/translations"); + bool loaded = webengineTranslator->load(QLocale(QLocale::Chinese), "qtwebengine", "_", ":/translations"); + if (!loaded) { + qWarning() << "Failed to load webengine translator"; + } installTranslator(webengineTranslator); } } diff --git a/src/backend/downloadworker.cpp b/src/backend/downloadworker.cpp index d7e5f5afd3f1e4e6464b53fd63a7df1e6935fe3a..720f35b794d15b121d581ae88d56d6b7e8357918 100644 --- a/src/backend/downloadworker.cpp +++ b/src/backend/downloadworker.cpp @@ -41,7 +41,7 @@ bool checkMeatlink(QString metaUrl) metaStatus.remove(); } QString cmd = QString("curl -I -s --connect-timeout 5 %1 -w %{http_code} |tail -n1 > /tmp/spark-store/metaStatus.txt").arg(metaUrl); - system(cmd.toUtf8().data()); + [[maybe_unused]] int ret = system(cmd.toUtf8().data());//不这样写就会-Wunused-variable 警告导致无法打包 if (metaStatus.open(QFile::ReadOnly) && QString(metaStatus.readAll()).toUtf8() == "200") { metaStatus.remove(); @@ -94,7 +94,7 @@ void DownloadController::startDownload(const QString &url) return; } - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { QString metaUrl = url + ".metalink"; qDebug() << "metalink" << metaUrl; @@ -272,7 +272,7 @@ void DownloadController::stopDownload() // 实现下载进程退出 QString killCmd = QString("kill -9 %1").arg(pidNumber); - system(killCmd.toUtf8()); + [[maybe_unused]] int ret = system(killCmd.toUtf8()); qDebug() << "kill aria2!"; pidNumber = -1; } diff --git a/src/backend/sparkapi.cpp b/src/backend/sparkapi.cpp index 2947108cce366c332516b4f532bc9bbceb0c1d32..8c64d1c9b6b110eda40bee6acf385e7d5cfd32b7 100644 --- a/src/backend/sparkapi.cpp +++ b/src/backend/sparkapi.cpp @@ -28,7 +28,6 @@ void SparkAPI::get(QUrl url) QNetworkRequest request; HttpRequest *httprequest = new HttpRequest; request.setUrl(QUrl(url.toString().replace("+", "%2B"))); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); connect(httprequest, &HttpRequest::finished, [=](QString data) { QByteArray arr = data.toUtf8(); @@ -54,7 +53,6 @@ void SparkAPI::getRAW(QUrl url) QNetworkRequest request; HttpRequest *httprequest = new HttpRequest; request.setUrl(QUrl(url.toString().replace("+", "%2B"))); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); connect(httprequest, &HttpRequest::finished, [=](QString data) { emit finishedRAW(data); diff --git a/src/main.cpp b/src/main.cpp index 9573282bc4d7fac4588f98a5cce095a56133b353..ea7e4523cd7c15b43102b5e9be9efd42a19881cd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -109,17 +108,18 @@ int main(int argc, char *argv[]) { // 崩溃处理 signal(SIGSEGV, crashHandler); // 注册SIGSEGV处理函数 - - - // Get build time - 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"); - buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss"); - - - // NOTE: 提前设置组织名称和应用名称,避免配置文件位置错误 - DApplication::setOrganizationName("spark-union"); - DApplication::setApplicationName("spark-store"); + + // 初始化日志系统 + Utils::initLogger(); + Utils::writeLog("INFO", "Application starting..."); + + // // Get build time + // 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"); + // buildDateTime = buildDate.toString("yyyy.MM.dd") + "-" + buildTime.toString("hh:mm:ss"); + + //在cmakelist.txt中设置 buildDateTime + QString buildDateTime = QString("%1-%2").arg(QString(BUILD_DATE)).arg(QString(BUILD_TIME)); Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在 // 初始化 config.ini 配置文件 @@ -129,9 +129,11 @@ int main(int argc, char *argv[]) DataCollectorAndUploader uploader; QObject::connect(&uploader, &DataCollectorAndUploader::uploadSuccessful, [](){ qDebug() << "Data uploaded successfully"; + Utils::writeLog("INFO", "Data uploaded successfully"); }); QObject::connect(&uploader, &DataCollectorAndUploader::uploadFailed, [](QString error){ qDebug() << "Upload failed with error: " << error; + Utils::writeLog("ERROR", QString("Upload failed with error: %1").arg(error)); }); uploader.collectAndUploadData(); @@ -152,6 +154,10 @@ int main(int argc, char *argv[]) #if defined __sw_64__ || __loongarch__ chromium_flags.append("--no-sandbox"); #endif + // 如果配置文件中设置了关闭沙箱,则添加no-sandbox标志 + if (Utils::shouldDisableWebEngineSandbox()) { + chromium_flags.append("--no-sandbox"); + } qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromium_flags.join(" ").toUtf8()); /** @@ -163,13 +169,6 @@ int main(int argc, char *argv[]) DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL); } -#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) - // 开启 Hidpi 支持 - qDebug() << "Enable HiDPI Support."; - DApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - DApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -#endif - // 强制使用 DTK 平台插件 QVector fakeArgs(argc + 2); fakeArgs[0] = argv[0]; @@ -191,8 +190,6 @@ int main(int argc, char *argv[]) return -1; } - DApplicationSettings settings; // 定义 DApplicationSettings,自动保存主题设置 - MainWindow w; a.setMainWindow(&w); // 设置应用程序主窗口,用于初始化关于对话框 @@ -206,5 +203,10 @@ int main(int argc, char *argv[]) } w.show(); + // 在程序结束前关闭日志文件 - 修复变量名并移到return前 + QObject::connect(&a, &QApplication::aboutToQuit, []() { + Utils::writeLog("INFO", "Application shutting down"); + }); + return a.exec(); } diff --git a/src/mainwindow-dtk.cpp b/src/mainwindow-dtk.cpp index 5baca0edc0a78dc3555a2335807726c26c2621e1..2a4c037fbc3db99f35844d97fe63985565abdb09 100755 --- a/src/mainwindow-dtk.cpp +++ b/src/mainwindow-dtk.cpp @@ -14,6 +14,9 @@ #include #include #include +#include +#include +#include #include #include @@ -345,7 +348,7 @@ void MainWindow::refreshTheme(bool isDarkMode) ui->applistpage->setTheme(isDarkMode); ui->applistpage_1->setTheme(isDarkMode); ui->appintopage->setTheme(isDarkMode); - ui->settingspage->setTheme(isDarkMode); + ui->settingspage->setTheme(isDarkMode); } void MainWindow::initConnections() @@ -434,7 +437,7 @@ void MainWindow::initTmpDir() if (info.isWritable() == false) { - QtConcurrent::run([=] + auto future = QtConcurrent::run([=] { sleep(3); auto upgradeP = new QProcess(); @@ -522,72 +525,36 @@ void MainWindow::notify(QObject *receiver, QEvent *event) void MainWindow::on_pushButton_14_clicked() { - /** - * NOTE: No need to judget developmode status - */ - // Check UOS - // QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); - // if (config.contains("UOS/EnableDeveloperMode") && !config.value("UOS/EnableDeveloperMode").toBool()) - if (false) - { - qDebug() << "UOS Developer Mode has not been enabled!"; - QtConcurrent::run([=] - { - auto upgradeP = new QProcess(); - upgradeP->startDetached("zenity", QStringList() << "--info" - << "--text" - << "UOS开发者模式未开启,相关功能被禁用" - << "--title" - << "功能禁用提示" - << "--width" - << "360" - ); - upgradeP->waitForStarted(); - upgradeP->waitForFinished(30); - upgradeP->deleteLater(); }); - } - else - { - QFile upgradeStatus("/tmp/spark-store/upgradeStatus.txt"); - if (!upgradeStatus.exists()) - { - QString appPath; - - // 判断路径:开发环境 vs 安装后 - #ifdef QT_DEBUG - appPath = QCoreApplication::applicationDirPath() + - "/spark-update-tool/spark-update-tool"; - #else - appPath = QStandardPaths::findExecutable("spark-update-tool"); - #endif - - if (appPath.isEmpty()) { - qWarning() << "spark-update-tool not found!"; - return; - } - - QProcess *process = new QProcess(this); - - #ifdef QT_DEBUG - // 开发模式:直接运行本地构建的更新器 - process->start(appPath, {"--silent"}); - #else - // 安装模式:使用 pkexec 提权运行系统路径下的 spark-update-tool - QString program = "pkexec"; - QStringList arguments; - arguments << appPath << "--silent"; - process->start(program, arguments); - #endif - - QObject::connect(process, QOverload::of(&QProcess::finished), - [process](int exitCode) { - if (exitCode == 0) { - qDebug() << "Update check successful"; - } else { - qWarning() << "Update check failed with exit code:" << exitCode; - } - process->deleteLater(); - }); - } - } -} + QString appPath; + // #ifdef QT_DEBUG + // appPath = QCoreApplication::applicationDirPath() ; + // QDir dir(appPath); + // dir.cdUp(); + // appPath = dir.absolutePath()+"/spark-update-tool/spark-update-tool"; + // qDebug() << "Spark Update Tool Path: " << appPath; + // if(appPath.isEmpty()) + // { + // qWarning() << "Spark Update Tool not found!"; + // return; + // } + // QProcess *process = new QProcess(this); + // QStringList arguments; + // arguments << appPath <<"--silent"; + // process->start(appPath, {"--silent"}); + // #else + // appPath = QStandardPaths::findExecutable("spark-update-tool"); + // QString program = "pkexec"; + // QStringList arguments; + // arguments << appPath; + // QProcess *process = new QProcess(this); + // process->start(program, arguments); + // #endif + appPath = QStandardPaths::findExecutable("spark-update-tool"); + qDebug() << "Spark Update Tool Path: " << appPath; + QString program = "pkexec"; + QStringList arguments; + arguments << appPath; + QProcess *process = new QProcess(this); + process->start(program, arguments); + +} \ No newline at end of file diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index c67b0d1d18aede392445662ae1ad5c3b5a0cd103..37a5a3ae2ef3e974b0b63f884b01103d66b1cbff 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -73,7 +73,7 @@ void AppIntoPage::openUrl(const QUrl &url) iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png")); iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); - iconRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); + iconManager->get(iconRequest); QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) @@ -97,7 +97,6 @@ void AppIntoPage::openUrl(const QUrl &url) request.setUrl(QUrl(imgUrl)); request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); manager->get(request); QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) { @@ -617,7 +616,7 @@ void AppIntoPage::on_downloadButton_clicked() void AppIntoPage::on_pushButton_3_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { ui->downloadButton->setEnabled(false); ui->pushButton_3->setEnabled(false); @@ -659,3 +658,4 @@ void AppIntoPage::on_updateButton_clicked() QString feedbackURL = "https://bbs.spark-app.store/"; QProcess::startDetached("xdg-open", QStringList{feedbackURL}); } + diff --git a/src/pages/settingspage.cpp b/src/pages/settingspage.cpp index fad913aa9663380ec4f6823bd2982cc34a59b3e7..c40607cebb69c4aa0a980ca2078528aff6d7b341 100644 --- a/src/pages/settingspage.cpp +++ b/src/pages/settingspage.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #define TMP_PATH "/tmp/spark-store" #define DEFAULT_SERVER_URL "https://cdn-d.spark-app.store/" @@ -22,6 +23,9 @@ SettingsPage::SettingsPage(QWidget *parent) configCanSave = false; initConfig(); + + // 移除了手动连接导出日志按钮的点击信号 + // connect(ui->pushButton_exportLog, &QPushButton::clicked, this, &SettingsPage::on_pushButton_exportLog_clicked); } void SettingsPage::setTheme(bool dark) @@ -32,7 +36,7 @@ void SettingsPage::setTheme(bool dark) } else { - // 亮色模式 + // ���色模式 this->setStyleSheet("#frame{background-color: #ffffff;border-radius:14px;border:1px solid rgb(229,229,229);}"); } } @@ -98,8 +102,14 @@ void SettingsPage::initConfig() } configCanSave = true; //  防止触发保存配置信号 + // 在现有代码后添加初始化checkBox_disableSandbox的状态 needUncompatibleNotification = config.value("other/uncompatibleNotification", needUncompatibleNotification).toBool(); ui->checkBox->setChecked(needUncompatibleNotification); + + // 新增:从config.ini读取webengine/noSandbox配置并设置复选框状态 + bool disableSandbox = config.value("webengine/noSandbox", false).toBool(); + ui->checkBox_disableSandbox->setChecked(disableSandbox); + } SettingsPage::~SettingsPage() @@ -109,7 +119,7 @@ SettingsPage::~SettingsPage() void SettingsPage::on_pushButton_updateServer_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { ui->pushButton_updateServer->setEnabled(false); @@ -134,7 +144,7 @@ void SettingsPage::on_pushButton_updateServer_clicked() ui->comboBox_server->setCurrentIndex(0); }); } -void SettingsPage::on_comboBox_server_currentIndexChanged(const QString &arg1) +void SettingsPage::on_comboBox_server_currentTextChanged(const QString &arg1) { SparkAPI::setServerUrl(arg1); // 服务器信息更新 qDebug() << arg1; @@ -208,7 +218,7 @@ quint64 SettingsPage::dirFileSize(const QString &path) void SettingsPage::on_pushButton_updateApt_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { ui->pushButton_updateApt->setEnabled(false); ui->label_aptserver->setText(tr("Updating, please wait...")); @@ -222,7 +232,7 @@ void SettingsPage::on_pushButton_updateApt_clicked() void SettingsPage::on_pushButton_clear_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { ui->pushButton_clear->setEnabled(false); @@ -240,7 +250,7 @@ void SettingsPage::on_pushButton_clear_clicked() void SettingsPage::on_pushButton_clearWebCache_clicked() { - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { QString localDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/QtWebEngine"; qDebug() << localDataLocation; @@ -261,3 +271,37 @@ void SettingsPage::on_checkBox_clicked(bool checked) config.setValue("other/uncompatibleNotification", needUncompatibleNotification); config.sync(); } + +// 添加checkBox_disableSandbox的点击事件处理函数 +void SettingsPage::on_checkBox_disableSandbox_clicked(bool checked) +{ + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + config.setValue("webengine/noSandbox", checked); + config.sync(); +} + +// 修改导出日志按钮的点击事件处理函数 +void SettingsPage::on_pushButton_exportLog_clicked() +{ + // 禁用按钮防止重复点击 + ui->pushButton_exportLog->setEnabled(false); + + QString targetPath = QString::fromUtf8(TMP_PATH); + bool success = Utils::exportLogs(targetPath); + + // 显示导出结果通知 + QString message; + if (success) { + message = tr("Logs exported successfully to: %1").arg(targetPath); + Utils::writeLog("INFO", "User exported logs via settings page"); + } else { + message = tr("Failed to export logs"); + Utils::writeLog("ERROR", "User failed to export logs via settings page"); + } + + // 只发送一次系统通知 + Utils::sendNotification("spark-store", tr("Export Logs"), message); + + // 重新启用按钮 + ui->pushButton_exportLog->setEnabled(true); +} \ No newline at end of file diff --git a/src/pages/settingspage.h b/src/pages/settingspage.h index d1e926727e2e1c75fa91f78cc53247bd7c2f60da..c2b14fe39b71e4ea7876e57bf7b03d325b64f7b1 100644 --- a/src/pages/settingspage.h +++ b/src/pages/settingspage.h @@ -22,7 +22,7 @@ public: private slots: void on_pushButton_updateServer_clicked(); - void on_comboBox_server_currentIndexChanged(const QString &arg1); + void on_comboBox_server_currentTextChanged(const QString &arg1); void on_pushButton_updateApt_clicked(); @@ -32,6 +32,11 @@ private slots: void on_checkBox_clicked(bool checked); + void on_checkBox_disableSandbox_clicked(bool checked); + + // 添加导出日志按钮的槽函数声明 + void on_pushButton_exportLog_clicked(); + public: static bool needUncompatibleNotification; @@ -47,4 +52,4 @@ signals: void openUrl(QUrl spk); }; -#endif // SETTINGSPAGE_H +#endif // SETTINGSPAGE_H \ No newline at end of file diff --git a/src/pages/settingspage.ui b/src/pages/settingspage.ui index 28609ae299d5ec96390e03f0697682ceb092583a..af0c20f9ece7b26c96ea3b2edb2e37ba3ccb93a9 100644 --- a/src/pages/settingspage.ui +++ b/src/pages/settingspage.ui @@ -32,10 +32,10 @@ - QFrame::StyledPanel + QFrame::Shape::StyledPanel - QFrame::Raised + QFrame::Shadow::Raised @@ -59,7 +59,7 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame 0 @@ -71,9 +71,9 @@ 0 - 0 - 688 - 940 + -434 + 666 + 1270 @@ -147,7 +147,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -166,7 +166,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -295,7 +295,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -338,6 +338,109 @@ + + + + + + + + 18 + false + + + + Log + + + + + + + + + + Export Logs:/tmp/spark-store + + + + + + + Export + + + + + + + Qt::Orientation::Horizontal + + + + 351 + 20 + + + + + + + + + + + + + + + + + + 18 + + + + Disable Safe Mode + + + + + + + + + + Disable the webEngine sandbox feature. + + + + + + + Disable + + + + + + + Qt::Orientation::Horizontal + + + + 424 + 20 + + + + + + + + + + @@ -372,7 +475,7 @@ - Qt::Vertical + Qt::Orientation::Vertical diff --git a/src/spark-store.pro b/src/spark-store.pro index db84c7c2657bfbe84672edd2937340f26b5e2015..a2551689d34d76d32993e10cb5a2b77a6b157fe5 100644 --- a/src/spark-store.pro +++ b/src/spark-store.pro @@ -27,8 +27,8 @@ VERSION = $$BUILD_VERSION isEmpty(VERSION): VERSION = 4.0.0 DEFINES += APP_VERSION=\\\"'$${VERSION}'\\\" DEFINES += APP_BRANCH=\\\"'$$system(git symbolic-ref --short -q HEAD)'\\\" -# Disable qWarning / qDebug output in Release -#CONFIG(release, debug | release): DEFINES += QT_NO_WARNING_OUTPUT QT_NO_DEBUG_OUTPUT +# Enable all log outputs in both Debug and Release modes +# We want to capture all logs (INFO, DEBUG, WARNING, ERROR) for export to /tmp/spark-store CONFIG += c++11 link_pkgconfig PKGCONFIG += dtkcore dtkgui dtkwidget @@ -47,7 +47,6 @@ SOURCES += \ utils/utils.cpp \ utils/widgetanimation.cpp \ widgets/base/basewidgetopacity.cpp \ - widgets/common/customlabel.cpp \ widgets/common/downloaditem.cpp \ widgets/common/progressbutton.cpp \ widgets/common/smoothlistwidget.cpp \ @@ -74,7 +73,6 @@ HEADERS += \ utils/utils.h \ utils/widgetanimation.h \ widgets/base/basewidgetopacity.h \ - widgets/common/customlabel.h \ widgets/common/downloaditem.h \ widgets/common/progressbutton.h \ widgets/common/smoothlistwidget.h \ @@ -109,4 +107,4 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/durapps/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -DISTFILES += +DISTFILES += \ No newline at end of file diff --git a/src/spark-update-tool/debian/changelog b/src/spark-update-tool/debian/changelog deleted file mode 100644 index b414feaa62fe2af76faad258dcb2e6256d7b272c..0000000000000000000000000000000000000000 --- a/src/spark-update-tool/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -spark-update-tool (1.0.0) unstable; urgency=low - - * Initial release. - - -- momen Wed, 18 Jun 2025 00:00:00 +0000 \ No newline at end of file diff --git a/src/spark-update-tool/debian/compat b/src/spark-update-tool/debian/compat deleted file mode 100644 index f11c82a4cb6cc2e8f3bdf52b5cdeaad4d5bb214e..0000000000000000000000000000000000000000 --- a/src/spark-update-tool/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 \ No newline at end of file diff --git a/src/spark-update-tool/debian/rules b/src/spark-update-tool/debian/rules deleted file mode 100755 index 1159ac4f0b7d8abe9203098f7b5da03c42c24257..0000000000000000000000000000000000000000 --- a/src/spark-update-tool/debian/rules +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ - -override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr diff --git a/src/spark-update-tool/spark-update-tool.pro b/src/spark-update-tool/spark-update-tool.pro deleted file mode 100644 index 69dc5007c8e47da19184ed40c13a6f656defca24..0000000000000000000000000000000000000000 --- a/src/spark-update-tool/spark-update-tool.pro +++ /dev/null @@ -1,48 +0,0 @@ -# spark-update-tool.pro -QT += core gui widgets network concurrent -TARGET = spark-update-tool -TEMPLATE = app - -# Set C++ standard to C++17 -CONFIG += c++17 - -# Enable auto features (uic, moc, rcc) -CONFIG += qt warn_on release -QT_CONFIG += no-pkg-config - -# Version info (replace with your actual version) -VERSION = 0.1.0 -DEFINES += APP_VERSION=\\\"$$VERSION\\\" - -# Source files -SOURCES += \ - src/main.cpp \ - src/mainwindow.cpp \ - src/aptssupdater.cpp \ - src/appdelegate.cpp \ - src/applistmodel.cpp \ - src/downloadmanager.cpp - -HEADERS += \ - src/mainwindow.h \ - src/aptssupdater.h \ - src/appdelegate.h \ - src/applistmodel.h \ - src/downloadmanager.h - -FORMS += \ - src/mainwindow.ui - -RESOURCES += \ - src/icons.qrc - -# macOS bundle properties (optional) -macx { - QMAKE_INFO_PLIST = Info.plist - ICON = resources/spark-update-tool.icns - BUNDLE_IDENTIFIER = org.spark.store.update-tool -} - -# Installation paths (matches CMake install) -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target \ No newline at end of file diff --git a/src/src.cmake b/src/src.cmake new file mode 100644 index 0000000000000000000000000000000000000000..caf962c828624e9a1d890e88b2ec714cb53220c5 --- /dev/null +++ b/src/src.cmake @@ -0,0 +1,18 @@ +include_directories(backend) +include_directories(dbus) +include_directories(pages) +include_directories(utils) +include_directories(widgets) + +# https://cmake.org/cmake/help/v3.12/command/file.html#glob-recurse +file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/*.h" + "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp" +) + +file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS + "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/*.ui" +) + +qt5_add_resources(QRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets.qrc) \ No newline at end of file diff --git a/src/utils/httprequest.cpp b/src/utils/httprequest.cpp index b64e0958db115ebbfaba93aec2b996561bf79fb1..8baf92a88c761b4e55e042340da5dc1f4ce182db 100644 --- a/src/utils/httprequest.cpp +++ b/src/utils/httprequest.cpp @@ -41,8 +41,7 @@ QString HttpRequest::postRequest(QString url, QString jsondata) QEventLoop eventLoop; connect(naManager, SIGNAL(finished(QNetworkReply *)), &eventLoop, SLOT(quit())); eventLoop.exec(); - QTextCodec *codec = QTextCodec::codecForName("utf8"); - QString strReply = codec->toUnicode(reply->readAll()); + QString strReply(reply->readAll()); reply->deleteLater(); return strReply; } diff --git a/src/utils/httprequest.h b/src/utils/httprequest.h index e6ad7f1baba465c1e360a7d6ac8c14e956864daf..c55bc52c45e6698486014511f9c768d9e13dd3a9 100644 --- a/src/utils/httprequest.h +++ b/src/utils/httprequest.h @@ -6,7 +6,6 @@ #include #include #include -#include class HttpRequest : public QObject { Q_OBJECT diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp index 7d2705444449cb2d6637057b71edd347db7f0405..e034a14ff7f2a05625bfc84137d999c1a06909f7 100644 --- a/src/utils/utils.cpp +++ b/src/utils/utils.cpp @@ -10,6 +10,10 @@ #include #include #include +#include +#include +#include +#include #define UOSDeveloperModeFile "/var/lib/deepin/developer-mode/enabled" @@ -261,3 +265,183 @@ QJsonObject Utils::parseFeatureJsonFile() return jsonDoc.object(); } + +/** + * @brief Utils::shouldDisableWebEngineSandbox 检查是否应关闭webengine沙箱 + * @return bool true: 配置文件中设置了关闭沙箱 false: 未设置或设置为false + */ +bool Utils::shouldDisableWebEngineSandbox() +{ + // WARNING: 请在 组织名称 和 应用程序名称 初始化完成后调用 + QSettings config(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini", QSettings::IniFormat); + + // 检查配置文件中[webengine]部分的noSandbox配置项 + // 如果配置存在且值为true,则返回true;否则返回false + qDebug()<<"shaxiang"<open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) { + qWarning() << "Failed to open log file:" << logFilePath; + delete logFile; + logFile = nullptr; + return; + } + + // 安装自定义消息处理器,捕获所有Qt日志输出 + qInstallMessageHandler(customMessageHandler); + + // 写入日志头信息 + writeLog("INFO", "Logger initialized"); + writeLog("INFO", QString("Application started at %1").arg( + QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"))); +} + +// 写入日志 +void Utils::writeLog(const QString &level, const QString &message) +{ + if (!logFile || !logFile->isOpen()) { + return; + } + + QString timestamp = QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz"); + QString logEntry = QString("[%1] [%2] %3\n").arg(timestamp).arg(level).arg(message); + + QTextStream out(logFile); + out << logEntry; + logFile->flush(); + + // 同时输出到控制台,便于调试 + if (level == "ERROR") { + qCritical() << logEntry.trimmed(); + } else if (level == "WARNING") { + qWarning() << logEntry.trimmed(); + } else { + qDebug() << logEntry.trimmed(); + } +} + +// 导出日志 +bool Utils::exportLogs(const QString &targetPath) +{ + QString exportPath = targetPath; + if (exportPath.isEmpty()) { + exportPath = "/tmp/spark-store"; + } + + // 确保目标目录存在 + QDir dir; + if (!dir.exists(exportPath)) { + if (!dir.mkpath(exportPath)) { + writeLog("ERROR", QString("Failed to create target directory: %1").arg(exportPath)); + return false; + } + } + + // 关闭当前日志文件,便于复制 + if (logFile && logFile->isOpen()) { + logFile->close(); + } + + // 复制日志文件到目标位置 + QString timestamp = QDateTime::currentDateTime().toString("yyyyMMdd_HHmmss"); + QString targetLogPath = exportPath + QString("/spark-store_full_log_%1.log").arg(timestamp); + + bool success = QFile::copy(logFilePath, targetLogPath); + + // 额外检查:即使QFile::copy返回false,也要检查目标文件是否实际存在且大小合理 + if (!success) { + QFileInfo targetFileInfo(targetLogPath); + if (targetFileInfo.exists() && targetFileInfo.size() > 0) { + success = true; + } + } + + if (success) { + writeLog("INFO", QString("All logs (INFO, DEBUG, WARNING, ERROR) exported to: %1").arg(targetLogPath)); + + // 同时创建一个简单的导出报告 + QString reportPath = exportPath + QString("/export_report_%1.txt").arg(timestamp); + QFile reportFile(reportPath); + if (reportFile.open(QIODevice::WriteOnly | QIODevice::Text)) { + QTextStream out(&reportFile); + out << "Spark Store Log Export Report\n"; + out << "================================\n"; + out << "Export Time: " << QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") << "\n"; + out << "Target Directory: " << exportPath << "\n"; + out << "Log File: " << targetLogPath << "\n"; + out << "Original Log: " << logFilePath << "\n"; + out << "Log Levels: INFO, DEBUG, WARNING, ERROR, FATAL\n"; + out << "Status: SUCCESS\n"; + reportFile.close(); + } + } else { + writeLog("ERROR", QString("Failed to export logs to: %1").arg(targetLogPath)); + } + + // 重新打开日志文件继续记录 + if (logFile && !logFile->isOpen()) { + logFile->open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text); + } + + return success; +} + +// 获取日志文件路径 +QString Utils::getLogFilePath() +{ + return logFilePath; +} \ No newline at end of file diff --git a/src/utils/utils.h b/src/utils/utils.h index a85d64ac9916aae4e48d143e9441e73109ffa105..9d780b96a35a25f50bedd7eaa06a2591a6cc2090 100644 --- a/src/utils/utils.h +++ b/src/utils/utils.h @@ -3,6 +3,9 @@ #include #include +#include +#include +#include class Utils { @@ -18,6 +21,13 @@ public: static void setQPAPlatform(); static void checkUOSDeveloperMode(); static QJsonObject parseFeatureJsonFile(); + static bool shouldDisableWebEngineSandbox(); // 新增函数声明 + + // 日志相关函数 + static void initLogger(); // 初始化日志系统 + static void writeLog(const QString &level, const QString &message); // 写入日志 + static bool exportLogs(const QString &targetPath = "/tmp/spark-store"); // 导出日志 + static QString getLogFilePath(); // 获取日志文件路径 }; -#endif // UTILS_H +#endif // UTILS_H \ No newline at end of file diff --git a/src/widgets/big_image.cpp b/src/widgets/big_image.cpp index 562051835f4ac4f8700eb7d2bc2af16d25c03e81..e3bcf988680c00f7ad50e42109a355848783ca40 100644 --- a/src/widgets/big_image.cpp +++ b/src/widgets/big_image.cpp @@ -17,7 +17,7 @@ big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent), QHBoxLayout *layout = new QHBoxLayout; setLayout(layout); layout->addWidget(m_image); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); // Make sure the image has a parent so that it will be freed. m_image->setParent(this); diff --git a/src/widgets/common/customlabel.cpp b/src/widgets/common/customlabel.cpp index 26f912328b6d212189185c30d56d33b4c897bea1..f70f9540c2a1d04fbc8930f41b3a4de84ebee154 100644 --- a/src/widgets/common/customlabel.cpp +++ b/src/widgets/common/customlabel.cpp @@ -1,14 +1,16 @@ #include "customlabel.h" + #include -CustomLabel::CustomLabel(QWidget *parent, Qt::WindowFlags f) +CustomLabel::CustomLabel(QWidget *parent, + Qt::WindowFlags f) : QLabel(parent, f) { } QPixmap CustomLabel::pixmap() const { - const QPixmap *p = QLabel::pixmap(); + const QPixmap* p = QLabel::pixmap(); return p ? *p : QPixmap(); } @@ -21,4 +23,4 @@ void CustomLabel::setPixmap(const QPixmap &pixmap) Qt::SmoothTransformation); QLabel::setPixmap(_pixmap); -} +} \ No newline at end of file diff --git a/src/widgets/common/downloaditem.cpp b/src/widgets/common/downloaditem.cpp index 45cdc54268279561cf68fc4bb558de6897273d88..3a25ab8f2f8c63491d012a678874119e7c08db3e 100644 --- a/src/widgets/common/downloaditem.cpp +++ b/src/widgets/common/downloaditem.cpp @@ -125,7 +125,7 @@ void DownloadItem::install(int t) ui->label_2->setText(tr("Installing")); ui->label_2->setToolTip(tr("Installing")); - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { slotAsyncInstall(t); }); @@ -158,7 +158,7 @@ void DownloadItem::on_pushButton_3_clicked() output_w->setMinimumHeight(600); output_w->setAttribute(Qt::WA_TranslucentBackground); output_w->setTitle(ui->label->text()); - output_w->layout()->setMargin(20); + output_w->layout()->setContentsMargins(20, 20, 20, 20); output_w->layout()->addWidget(textbrowser); output_w->show(); } @@ -216,7 +216,7 @@ void DownloadItem::slotAsyncInstall(int t) } } - // QProcess isInstall; + QProcess isInstall; // isInstall.start("dpkg", QStringList() << "-s" << pkgName); // isInstall.waitForFinished(180 * 1000); // 默认超时 3 分钟 // int error = QString::fromStdString(isInstall.readAllStandardError().toStdString()).length(); diff --git a/src/widgets/downloadlistwidget.cpp b/src/widgets/downloadlistwidget.cpp index 413477a6ef99b2f327916d4604d449dae211f902..b4b19fc3f591d5179697922329eae6a16a50fa5c 100644 --- a/src/widgets/downloadlistwidget.cpp +++ b/src/widgets/downloadlistwidget.cpp @@ -168,7 +168,7 @@ void DownloadListWidget::httpFinished() // 完成下载 isdownload = false; isBusy = false; - QtConcurrent::run([=]() + auto future = QtConcurrent::run([=]() { while (downloaditemlist[nowDownload - 1]->readyInstall() == -1) // 安装当前应用,堵塞安装,后面的下载suspend { diff --git a/tool/apt-fast-conf/apt-fast.conf b/tool/apt-fast-conf/apt-fast.conf new file mode 100644 index 0000000000000000000000000000000000000000..328a7e2a9fa598b3c801fbf6d89ab86fa54b76c6 --- /dev/null +++ b/tool/apt-fast-conf/apt-fast.conf @@ -0,0 +1,169 @@ +################################################################### +# CONFIGURATION OPTIONS +################################################################### +# Every item has a default value besides MIRRORS (which is unset). + +# Use aptitude, apt-get, or apt? +# Note that apt-get is used as a fallback for outputting the +# package URI list for e.g. aptitude, which can't do this +# Optionally add the FULLPATH to apt-get or apt-rpm or aptitude +# e.g. /usr/bin/aptitude +# +# Default: apt-get +# +_APTMGR=apt-get + +if [ -x "$(command -v apt)" ]; then +_APTMGR=apt +fi + + +if grep -Eqi "linuxmint" /etc/os-release;then +_APTMGR=apt-get +fi + +if [ -x "$(command -v oyo)" ]; then +_APTMGR=/usr/bin/apt +fi + +#### +# +# UOS sources auth config +# +# +if grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release;then +AUTH_UOS_USER="uos-https://license.chinauos.com-apt" +AUTH_UOS_PASSWD="`cat /etc/apt/auth.conf.d/uos.conf | grep home-packages.chinauos.com`" +AUTH_UOS_PASSWD=`echo ${AUTH_UOS_PASSWD#*password }` + +fi +##### UOS自动读取账号密码以实现使用aptss来加速下载 + +# Enable DOWNLOADBEFORE to suppress apt-fast confirmation dialog and download +# packages directly. +# +# Default: dialog enabled +# +DOWNLOADBEFORE=true + + +# Choose mirror list to speed up downloads from same archive. To select some +# mirrors take a look at your distribution's archive mirror lists. +# Debian: http://www.debian.org/mirror/list +# Ubuntu: https://launchpad.net/ubuntu/+archivemirrors +# +# It is required to add mirrors in the sources.list to this array as well, so +# apt-fast can destinguish between different distributions. +# +# Examples: +# +# Different distributions (as in operating systems): +# +# sources.list: +# deb http://deb.debian.org/debian/ unstable main non-free contrib +# deb http://de.archive.ubuntu.com/ubuntu/ bionic main universe +# +# apt-fast.conf: +# MIRRORS=( 'http://deb.debian.org/debian','http://ftp.debian.org/debian,http://ftp2.de.debian.org/debian,http://ftp.de.debian.org/debian,ftp://ftp.uni-kl.de/debian' +# 'http://archive.ubuntu.com/ubuntu,http://de.archive.ubuntu.com/ubuntu,http://ftp.halifax.rwth-aachen.de/ubuntu,http://ftp.uni-kl.de/pub/linux/ubuntu,http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/' ) +# +# +# Single distribution: +# +# sources.list: +# deb http://fr.archive.ubuntu.com/ubuntu/ bionic main +# deb http://fr.archive.ubuntu.com/ubuntu/ artful main +# +# apt-fast.conf: +# MIRRORS=( 'http://fr.archive.ubuntu.com/ubuntu,http://bouyguestelecom.ubuntu.lafibre.info/ubuntu,http://mirror.ovh.net/ubuntu,http://ubuntu-archive.mirrors.proxad.net/ubuntu' ) +# +# Default: disabled +# +MIRRORS=( 'https://d.store.deepinos.org.cn/,https://zunyun01.store.deepinos.org.cn/,https://mirrors.sdu.edu.cn/spark-store-repository/,http://cdn.dl.uniartisan.com:9000/deepinos/,https://d1.store.deepinos.org.cn/,https://d2.store.deepinos.org.cn/,https://d3.store.deepinos.org.cn/,https://d4.store.deepinos.org.cn/,https://d5.store.deepinos.org.cn/' ) + + +# Maximum number of connections +# You can use this value in _DOWNLOADER command. Escape with ${}: ${_MAXNUM} +# +# Default: 5 +# +_MAXNUM=16 + + +# Maximum number of connections per server +# Default: 10 +# +_MAXCONPERSRV=1 + + + + + +# Split size i.e. size of each piece +# Possible Values: 1M-1024M +# +_MINSPLITSZ=1M + + +# Piece selection algorithm to use +# Available values are: default, inorder, geom +# default: selects piece so that it reduces the number of establishing connection, reasonable for most cases +# inorder: selects pieces in sequential order starting from first piece +# geom: selects piece which has minimum index like inorder, but it exponentially increasingly keeps space from previously selected pieces +# +_PIECEALGO=default + + + +# Downloadmanager listfile +# You can use this value in _DOWNLOADER command. Escape with ${}: ${DLLIST} +# +# Default: /tmp/apt-fast.list +# +DLLIST='/tmp/apt-fast.list' + + +# Download command to use. Temporary download list is designed for aria2. But +# you can choose another download command or download manager. It has to +# support following input file syntax (\t is tab character): +# +# # Comment +# MIRROR1\tMIRROR2\tMIRROR3... +# out=FILENAME1 +# MIRROR1\tMIRROR2\tMIRROR3... +# out=FILENAME2 +# ... +# +# Examples: +# aria2c with a proxy (set username, proxy, ip and password!) +# _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} --http-proxy=http://username:password@proxy_ip:proxy_port -i ${DLLIST}' +# +# Default: _DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} -s ${_SPLITCON} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0' +# +_DOWNLOADER='aria2c --no-conf -c -j ${_MAXNUM} -x ${_MAXCONPERSRV} --min-split-size=${_MINSPLITSZ} --stream-piece-selector=${_PIECEALGO} -i ${DLLIST} --connect-timeout=600 --timeout=600 -m0 --http-user ${AUTH_UOS_USER} --http-passwd ${AUTH_UOS_PASSWD}' + + +# Download temp folder for Downloadmanager +# example /tmp/apt-fast. Standard is /var/cache/apt-fast +# +# Default: /var/cache/apt/apt-fast +# +DLDIR='/var/cache/apt/apt-fast' + + +# APT archives cache directory +# +# Default /var/cache/apt/archives +# (APT configuration items Dir::Cache and Dir::Cache::archives) +# +APTCACHE='/var/cache/apt/archives' + + +# apt-fast colors +# Colors are disabled when not using a terminal. +# +# Default colors are: +# cGreen='\e[0;32m' +# cRed='\e[0;31m' +# cBlue='\e[0;34m' +# endColor='\e[0m' diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..1ef9296767d360ef45ce0cd4e8eb5d2f40a4d3f1 --- /dev/null +++ b/translations/CMakeLists.txt @@ -0,0 +1,19 @@ +# Have to disable cleaning for this folder because cmake deletes .ts files upon clean +# Not sure what else wont clean up / dirty workaround of Qt bug +# @ref https://bugreports.qt.io/browse/QTBUG-41736 +# @ref https://stackoverflow.com/a/24245615/1917249 +set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM TRUE) + +find_package(Qt6 REQUIRED COMPONENTS LinguistTools) + +# Update ts files and release qm files only in Release build +file(GLOB TS_FILES "*.ts") +if (NOT ${CMAKE_BUILD_TYPE} MATCHES "Debug") + set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}) + qt6_create_translation(QM_FILES ${CMAKE_SOURCE_DIR}/src ${TS_FILES} OPTIONS -no-obsolete) + # https://stackoverflow.com/questions/70665191/cmake-does-not-generate-ts-files + add_custom_target(${PROJECT_NAME}_translations DEPENDS ${TS_FILES} ${QM_FILES}) + add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_translations) +endif () + +install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/translations) \ No newline at end of file diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index e14fb49748467fc57d158174fb1cb16f663230ce..170f180c7a7e5794aa6e13428baa07257395f7c5 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -24,120 +24,150 @@ - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> - - + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + + + + + <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>Capable to UOS home 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</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>An Appimage to deb app.</p></body></html> - + Share Spk share link - + APP Feedback - + Introduction - + Description - + Screen capture - - - + + + Download and Install - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> - + Update - + Contributor - + Pkgname - + Author - + Size - + Website @@ -147,21 +177,21 @@ - + Developer Mode Disabled - - + + Reinstall - - + + Launch @@ -171,63 +201,63 @@ - - + + Install - + Installing - - - - - + + + + + Warning - + The current application does not support or tested on deepin, there may be problems - + The current application does not support or tested on UOS, there may be problems - + The current application does not support or tested on Ubuntu, there may be problems - + The current application does not support or tested on Debian, there may be problems - + The current application does not support or tested on current platform, there may be problems - - + + Spark Store - + Uninstall succeeded - + The URL has been copied to the clipboard @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 - + %1 is released under %2 @@ -460,33 +490,33 @@ - + Submit App - + Submit App with client(Recommanded) - + Settings - + APP Upgrade and Install Settings - - + + Spark Store - + Search or enter spk:// @@ -494,19 +524,19 @@ QObject + - - + 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/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> - + Spark Project @@ -516,7 +546,7 @@ - + Show MainWindow @@ -609,40 +639,85 @@ - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> 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><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + Updating, please wait... - + Spark Store - + Temporary cache was cleaned + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About - + Exit diff --git a/translations/spark-store_es.ts b/translations/spark-store_es.ts index d41cefef90f232bb627cb926c4b90ae7eb48d6c8..5cd43cb590ebfd35c595a62297724a1ccbc01085 100644 --- a/translations/spark-store_es.ts +++ b/translations/spark-store_es.ts @@ -24,120 +24,150 @@ Número de descargas - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> - <html><head/><body><p>Capaz de deepin 20</p></body></html> {23<?} + + + + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + - - + + <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>Esta aplicación fue desarrollada por usuarios de la comunidad y la Etiquetamos en honor a aquellos que contribuyeron a la ecología de linux.</p></body></html> - - + + <html><head/><body><p>Capable to UOS home 20</p></body></html> <html><head/><body><p>Capaz de UOS home 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> <html><head/><body><p>A deepin-wine2 app. La tienda Spark le configurará automáticamente un traje de vino.</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>Esta es una aplicación dtk5, lo que significa que funcionará mejor en un entorno de escritorio profundo.</p></body></html> - - + + <html><head/><body><p>An Appimage to deb app.</p></body></html> <html><head/><body><p>Appimage de la aplicación deb.</p></body></html> - + Share Comunión - + APP Feedback Comentarios de la app - + Introduction Introducción - + Description Descripción - + Screen capture Captura de pantalla - - - + + + Download and Install Descargar e instalar - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p>Capaz de Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> <html><head/><body><p>La aplicación wine. Spark Store configurará automáticamente el kit Wine para usted</p></body></html> - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> - + Update Modernizar - + Contributor Contribuyentes - + Pkgname Nombre del embalaje - + Author Autor - + Size Tamaño - + Website Sitio web @@ -147,21 +177,21 @@ Haga clic en "abrir" - + Developer Mode Disabled Se ha desactivado el modo desarrollador - - + + Reinstall Reinstalación - - + + Launch @@ -171,63 +201,63 @@ Actualización - - + + Install Instalación - + Installing Se está instalando - - - - - + + + + + Warning Aviso - + The current application does not support or tested on deepin, there may be problems - + The current application does not support or tested on UOS, there may be problems - + The current application does not support or tested on Ubuntu, there may be problems - + The current application does not support or tested on Debian, there may be problems - + The current application does not support or tested on current platform, there may be problems - - + + Spark Store SPARK Store - + Uninstall succeeded Desinstalación exitosa - + The URL has been copied to the clipboard La URL ha sido copiada al portapapeles @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 Versión %1 - + %1 is released under %2 %1 publicado bajo %2 @@ -460,33 +490,33 @@ Actualización de app - + Submit App Presentación de la aplicación - + Submit App with client(Recommanded) Enviar la aplicación al cliente (recomendación) - + Settings Configuración - + APP Upgrade and Install Settings Actualización e instalación de app - - + + Spark Store SPARK Store - + Search or enter spk:// Buscar o introducir spk: /% @@ -494,19 +524,19 @@ QObject + - - + Spark Store 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;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> + - + Spark Project Proyecto spark @@ -516,7 +546,7 @@ Descargar lista - + Show MainWindow Mostrar la ventana principal @@ -609,40 +639,85 @@ Borrar la caché web - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us Sobre nosotros - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> 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><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + Updating, please wait... Se está actualizando, por favor Espere... - + Spark Store SPARK Store - + Temporary cache was cleaned Se ha limpiado la caché temporal + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About Sobre - + Exit Exportaciones diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 5c08721f58c52efc0874b86f5c2ac0a90f10431c..846a7c42df07ce53dd0ca55d69405f6cd42b9494 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -24,120 +24,150 @@ Nombre de téléchargements - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> - <html><head/><body><p>Capable de la deepin 20</p></body></html> {23<?} + + + + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + - - + + <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>Cette application a été développée par des utilisateurs de la communauté et nous avons donné ce label à ceux qui ont contribué à l'écologie de Linux</p></body></html> - - + + <html><head/><body><p>Capable to UOS home 20</p></body></html> <html><head/><body><p>Capable de la home UOS 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> <html><head/><body><p>Une application deepin-wine2. Le Spark Store configure automatiquement votre pack de vins.</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>C'est une application dtk5, ce qui signifie qu'elle fonctionnera mieux dans un environnement de bureau profond.</p></body></html> - - + + <html><head/><body><p>An Appimage to deb app.</p></body></html> <html><head/><body><p>Appimage pour l'application DEB</p></body></html> - + Share Au total - + APP Feedback App feedback - + Introduction Présentation - + Description Description - + Screen capture Captures d'écran - - - + + + Download and Install Télécharger et installer - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p>Capable de la Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> <html><head/><body><p>L'application wine. Spark Store configure automatiquement le kit Wine pour vous</p></body></html> - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> - + Update Moderniser - + Contributor Contributeurs - + Pkgname Nom de l'emballage - + Author Auteur - + Size Taille - + Website Site Web @@ -147,21 +177,21 @@ Cliquez sur Ouvrir - + Developer Mode Disabled Mode développeur désactivé - - + + Reinstall Réinstaller - - + + Launch @@ -171,63 +201,63 @@ Mise à niveau - - + + Install Installation - + Installing Installation en cours - - - - - + + + + + Warning Avertissement - + The current application does not support or tested on deepin, there may be problems - + The current application does not support or tested on UOS, there may be problems - + The current application does not support or tested on Ubuntu, there may be problems - + The current application does not support or tested on Debian, there may be problems - + The current application does not support or tested on current platform, there may be problems - - + + Spark Store Le Spark store - + Uninstall succeeded Désinstallation réussie - + The URL has been copied to the clipboard L'URL a été copiée dans le presse - papiers @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 Version: %1 - + %1 is released under %2 %1 publié sous %2 @@ -460,33 +490,33 @@ Mise à niveau app - + Submit App Soumettre une application - + Submit App with client(Recommanded) Soumettre une demande au client (recommandé) - + Settings Paramètres - + APP Upgrade and Install Settings Paramètres de mise à niveau et d'installation de l'app - - + + Spark Store Le Spark store - + Search or enter spk:// Rechercher ou entrer SPK / @@ -494,19 +524,19 @@ QObject + - - + Spark Store Le 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;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> + - + Spark Project Le projet Spark @@ -516,7 +546,7 @@ Télécharger la Liste - + Show MainWindow Afficher la fenêtre principale @@ -609,40 +639,85 @@ Effacer le cache Web - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us À propos de nous - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> 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><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> - + Updating, please wait... Mise à jour en cours, veuillez patienter... - + Spark Store Le Spark store - + Temporary cache was cleaned Cache temporaire nettoyé + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About À propos - + Exit Exportations diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index fae7ea27596abee2c594cc166214ffc756fea8e3..83f471c55643566bf62c40f2dca4d237b7b8901b 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -24,120 +24,150 @@ 下载量 - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> - <html><head/><body><p>支持deepin 20</p></body></html> {23<?} + - - + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + + + + + <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 UOS home 20</p></body></html> <html><head/><body><p>支持UOS家庭版 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> 这是一款 deepin-wine2 应用。星火商店会为你自动配置wine环境 - - + + <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>An Appimage to deb app.</p></body></html> <html><head/><body><p>这是一款Appimage转制应用.</p></body></html> - + Share Spk分享链接 - + APP Feedback 应用反馈 - + Description 描述 - + Screen capture 屏幕截图 - - - + + + Download and Install 下载并安装 - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p>支持Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> 这是一款 Wine 应用。星火商店会为你自动配置wine环境 - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> <html><head/><body><p>支持Debian Stable</p></body></html> - + Introduction 介绍 - + Update 更新时间 - + Contributor 投稿用户 - + Pkgname 软件包名 - + Author 软件作者 - + Size 软件大小 - + Website 软件官网 @@ -147,21 +177,21 @@ 点击跳转 - + Developer Mode Disabled 开发者模式未开启 - - + + Reinstall 重新安装 - - + + Launch 启动应用 @@ -171,63 +201,63 @@ 升级 - - + + Install 安装 - + Installing 正在安装 - - - - - + + + + + Warning 警告 - + The current application does not support or tested on deepin, there may be problems 当前应用不支持或未在deepin上测试过,安装后可能会出现问题 - + The current application does not support or tested on UOS, there may be problems 当前应用不支持或未在UOS上测试过,安装后可能会出现问题 - + The current application does not support or tested on Ubuntu, there may be problems 当前应用不支持或未在Ubuntu上测试过,安装后可能会出现问题 - + The current application does not support or tested on Debian, there may be problems 当前应用不支持或未在Debian上测试过,安装后可能会出现问题 - + The current application does not support or tested on current platform, there may be problems 当前应用不支持或未在您的平台上测试过,安装后可能会出现问题 - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板 @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 版本:%1 - + %1 is released under %2 %1遵循%2协议发布 @@ -460,33 +490,33 @@ 更新 - + Submit App 投递应用 - + Submit App with client(Recommanded) 使用本地投稿器投递应用(推荐) - + Settings 设置 - + APP Upgrade and Install Settings 应用更新和安装设置 - - + + Spark Store 星火应用商店 - + Search or enter spk:// 搜索或打开链接 @@ -494,19 +524,19 @@ QObject + - - + 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;'>一款由社区提供的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span> + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> + - + Spark Project 星火计划 @@ -516,7 +546,7 @@ 下载列表 - + Show MainWindow 显示主窗口 @@ -609,40 +639,87 @@ 清理网页缓存 - + + Log + 导出日志 + + + + Export Logs:/tmp/spark-store + 导出日志到:/tmp/spark-store + 导出日志到:/tmp/spark-store + + + + Export + 导出 + 导出 + + + + Disable Safe Mode + 禁用安全模式 + + + + Disable the webEngine sandbox feature. + 禁用WebEngine沙箱功能。 + + + + Disable + 禁用 + + + About us 关于我们 - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> 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><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> <html><head/><body><p>我们的服务和软件免费供个人和非营利组织使用、交流和学习,但您在使用过程中必须遵守当地的法律法规,否则出现的任何问题与我们无关。</p><p>我们不从社区版本商店中获利,我们的大部分运营费用依靠社区的捐赠,我们很感激这让我们可以花更少的精力担心钱。但是,为了更好地提供持续的服务,Spark只对个人用户免费开放服务仓库,如果您或您的组织需要提供商业服务或者您的组织是营利性组织,请联系我们获取商业授权。</p><p>严禁用户或组织在使用本软件时从事任何形式的恶意行为,包括但不限于恶意攻击、滥用、破坏、批量抓取软件仓库等。恶意行为的定义由Spark社区判断,违规者将承担法律责任。Spark Community保留发布其生成的软件包的权利。</p><p>未经Spark Community明确授权,禁止任何个人或组织将Spark Community软件包用于商业目的或重新分发。该条款旨在确保开源精神,同时保护Spark社区的知识产权。除此之外,如果您使用Spark Store主程序或其部分代码,则必须遵守GPL v3的所有其他条款和要求。<span style=" font - family:宋体;" <span style=" font - family:宋体;color:#0082fa;">jifengshenmo@outlook.com</span></a>我们会尽快删除侵权内容。</p><p>如果你也想加入我们,无论你是参与开发、设计、推销还是提交作品,我们都欢迎你加入我们。<br/></span>我们的联系方法可以在<a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">找到</span></a></p></body></html> - + Updating, please wait... 正在更新,请稍候…… - + Spark Store 星火应用商店 - + Temporary cache was cleaned 缓存目录已清空 + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About 关于 - + Exit 退出 diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index 6d84644e9371035328669ef76405e944606b41f3..85ecb3adc7c51e14f73dcc261cae4f5fbdc9ea65 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -24,120 +24,150 @@ 下載次數 - - + + <html><head/><body><p>Capable to deepin 23</p></body></html> - <html><head/><body><p>支持deepin 20</p></body></html> {23<?} + + + + + + <html><head/><body><p>This app can only be installed natively</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian12 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian13 ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to debian SID ACE</p></body></html> + + + + + + <html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html> + - - + + <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 UOS home 20</p></body></html> <html><head/><body><p>支持UOS家庭版 20</p></body></html> - - + + <html><head/><body><p>A deepin-wine2 app. Spark Store will automatically configure the wine kit for you.</p></body></html> 这是一款 deepin-wine2 应用。星火商店会为你自动配置wine环境 - - + + <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>An Appimage to deb app.</p></body></html> <html><head/><body><p>这是一款Appimage转制应用.</p></body></html> - + Share Spk共享链接 - + APP Feedback 軟件錯誤回報 - + Description 軟體詳細資料 - + Screen capture 軟體演示 - - - + + + Download and Install 下載並安裝 - - + + <html><head/><body><p>Capable to Ubuntu 22.04</p></body></html> <html><head/><body><p>支持Ubuntu 22.04</p></body></html> - - + + <html><head/><body><p>A Wine app.Spark Store will automatically configure the wine kit for you</p></body></html> 这是一款 Wine 应用。星火商店会为你自动配置wine环境 - - + + <html><head/><body><p>Capable to Debian Stable</p></body></html> - + Introduction 軟體介紹 - + Update 更新时间 - + Contributor 投稿用户 - + Pkgname 软件包名 - + Author 软件作者 - + Size 软件大小 - + Website 软件官网 @@ -147,21 +177,21 @@ 点击跳转 - + Developer Mode Disabled 开发者模式未开启 - - + + Reinstall 重新安裝 - - + + Launch @@ -171,63 +201,63 @@ 升级 - - + + Install 安装 - + Installing 正在安装 - - - - - + + + + + Warning - + The current application does not support or tested on deepin, there may be problems - + The current application does not support or tested on UOS, there may be problems - + The current application does not support or tested on Ubuntu, there may be problems - + The current application does not support or tested on Debian, there may be problems - + The current application does not support or tested on current platform, there may be problems - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板 @@ -248,12 +278,12 @@ DAboutDialog - + Version: %1 版本:%1 - + %1 is released under %2 %1遵循%2协议发布 @@ -460,33 +490,33 @@ 軟體更新 - + Submit App 上傳軟體 - + Submit App with client(Recommanded) 從客戶端上傳軟體(推薦的) - + Settings 設定 - + APP Upgrade and Install Settings 軟體升級 和 安裝設定 - - + + Spark Store 星火应用商店 - + Search or enter spk:// 搜索或打开链接 @@ -494,19 +524,19 @@ QObject + - - + 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;'>一款由社区提供的应用商店</span><br/><a href='https://www.spark-app.store/'>https://www.spark-app.store</a><br/><span style=' font-size:12pt;'>星火计划开发者</span> + + <span style=' font-size:10pt;font-weight:60;'>An appstore powered by community</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky is our mascot, designed by <a href='https://tai3.cn/'>Tyson Tan</a></span><br/> + - + Spark Project 星火计划 @@ -516,7 +546,7 @@ 下载列表 - + Show MainWindow 显示主窗口 @@ -609,40 +639,85 @@ 清理网页缓存 - + + Log + + + + + Export Logs:/tmp/spark-store + + + + + Export + + + + + Disable Safe Mode + + + + + Disable the webEngine sandbox feature. + + + + + Disable + + + + About us 关于我们 - + <html><head/><body><p>Our services and software are free for individuals and non-profit organizations to use, communicate and learn, but you must comply with local laws and regulations in the process of use, otherwise any problems have nothing to do with us. </p><p>We don't make a profit from the Community version store, we rely on donations from the community for most of our operating expenses, and we appreciate that this allows us to spend less energy worrying about money. However, in order to better provide continuous service, Spark is only free for individual users to open the service warehouse, if you or your organization needs to provide commercial services or your organization is a for-profit organization, please contact us to obtain commercial authorization. </p><p>When using the Software, users or organizations are strictly forbidden to engage in any form of malicious behavior, including but not limited to malicious attacks, abuse, destruction, bulk crawling of the software warehouse, etc. The definition of malicious behavior is judged by the Spark community, and violators will be held legally responsible. Spark Community reserves the right to distribute the software packages it produces. </p><p>Any person or organization is prohibited from using the Spark Community software package for commercial purposes or redistributing it without the express authorization of the Spark Community. This clause is intended to ensure the spirit of open source while safeguarding the intellectual property rights of the Spark community. In addition to the above, if you use the Spark Store main program or part of its code, you are subject to all other terms and requirements of the GPL v3.</p><p>If any part of the store infringes your rights, please tell us <a href="mailto:jifengshenmo@outlook.com"><span style=" text-decoration: underline; color:#0082fa;">jifengshenmo@outlook.com</span></a> 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><span style=" text-decoration: underline; color:#0000ff;"><br/></span>Our contact method can be found at <a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">Here</span></a></p></body></html> <html><head/><body><p>我们的服务和软件免费供个人和非营利组织使用、交流和学习,但您在使用过程中必须遵守当地的法律法规,否则出现的任何问题与我们无关。</p><p>我们不从社区版本商店中获利,我们的大部分运营费用依靠社区的捐赠,我们很感激这让我们可以花更少的精力担心钱。但是,为了更好地提供持续的服务,Spark只对个人用户免费开放服务仓库,如果您或您的组织需要提供商业服务或者您的组织是营利性组织,请联系我们获取商业授权。</p><p>严禁用户或组织在使用本软件时从事任何形式的恶意行为,包括但不限于恶意攻击、滥用、破坏、批量抓取软件仓库等。恶意行为的定义由Spark社区判断,违规者将承担法律责任。Spark Community保留发布其生成的软件包的权利。</p><p>未经Spark Community明确授权,禁止任何个人或组织将Spark Community软件包用于商业目的或重新分发。该条款旨在确保开源精神,同时保护Spark社区的知识产权。除此之外,如果您使用Spark Store主程序或其部分代码,则必须遵守GPL v3的所有其他条款和要求。<span style=" font - family:宋体;" <span style=" font - family:宋体;color:#0082fa;">jifengshenmo@outlook.com</span></a>我们会尽快删除侵权内容。</p><p>如果你也想加入我们,无论你是参与开发、设计、推销还是提交作品,我们都欢迎你加入我们。<br/></span>我们的联系方法可以在<a href="https://blog.shenmo.tech/post/%E6%95%85%E9%9A%9C%E5%85%AC%E5%91%8A/"><span style=" text-decoration: underline; color:#0082fa;">找到</span></a></p></body></html> - + Updating, please wait... 正在更新,请稍候…… - + Spark Store 星火应用商店 - + Temporary cache was cleaned 缓存目录已清空 + + + Logs exported successfully to: %1 + + + + + Failed to export logs + + + + + Export Logs + + TitleBarMenu - + About 关于 - + Exit 退出