mirror of
https://gitee.com/spark-store-project/spark-store
synced 2025-12-13 20:32:05 +08:00
Merge remote-tracking branch 'upstream/Thunder' into Thunder
This commit is contained in:
@@ -120,11 +120,6 @@ int main(int argc, char *argv[])
|
||||
|
||||
//在cmakelist.txt中设置 buildDateTime
|
||||
QString buildDateTime = QString("%1-%2").arg(QString(BUILD_DATE)).arg(QString(BUILD_TIME));
|
||||
Utils::writeLog("INFO", QString("Build datetime: %1").arg(buildDateTime));
|
||||
|
||||
// NOTE: 提前设置组织名称和应用名称，避免配置文件位置错误
|
||||
DApplication::setOrganizationName("spark-union");
|
||||
DApplication::setApplicationName("spark-store");
|
||||
Application::checkAppConfigLocation(); // 检查 ~/.config/spark-union/spark-store 文件夹是否存在
|
||||
|
||||
// 初始化 config.ini 配置文件
|
||||
|
||||
@@ -458,7 +458,17 @@ get_uris(){
|
||||
msg "Failed to create tmp dir" "warning"
|
||||
msg "无法创建临时目录" "warning"
|
||||
exit 1
|
||||
|
||||
|
||||
}
|
||||
|
||||
cleanup_tmpdir() {
|
||||
if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then
|
||||
rm -rf "$tmpdir"
|
||||
fi
|
||||
}
|
||||
trap cleanup_tmpdir EXIT
|
||||
|
||||
## --print-uris format is:
|
||||
# 'fileurl' filename filesize checksum_hint:filechecksum
|
||||
# 修改：process_package函数增加第二个参数表示当前线程的临时输出文件
|
||||
@@ -580,6 +590,9 @@ get_uris(){
|
||||
rm -f "$thread_file"
|
||||
fi
|
||||
done
|
||||
# 清理临时目录
|
||||
cleanup_tmpdir
|
||||
trap - EXIT # 移除临时目录的陷阱
|
||||
|
||||
# 合并显示信息
|
||||
if [ -f "$tmpdir/display" ]; then
|
||||
|
||||
@@ -27,43 +27,37 @@
|
||||
<location filename="../src/pages/appintopage.ui" line="459"/>
|
||||
<location filename="../src/pages/appintopage.ui" line="462"/>
|
||||
<source><html><head/><body><p>Capable to deepin 23</p></body></html></source>
|
||||
<translatorcomment>兼容 Deepin 23</translatorcomment>
|
||||
<translation>兼容 Deepin 23</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/pages/appintopage.ui" line="509"/>
|
||||
<location filename="../src/pages/appintopage.ui" line="512"/>
|
||||
<source><html><head/><body><p>This app can only be installed natively</p></body></html></source>
|
||||
<translatorcomment>该应用只能在本机原生环境中安装</translatorcomment>
|
||||
<translation>该应用只能在本机原生环境中安装</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/pages/appintopage.ui" line="534"/>
|
||||
<location filename="../src/pages/appintopage.ui" line="537"/>
|
||||
<source><html><head/><body><p>This app will be installed to debian12 ACE</p></body></html></source>
|
||||
<translatorcomment>此应用将会被安装到ACE Debian12兼容环境</translatorcomment>
|
||||
<translation>此应用将会被安装到ACE Debian12兼容环境</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/pages/appintopage.ui" line="559"/>
|
||||
<location filename="../src/pages/appintopage.ui" line="562"/>
|
||||
<source><html><head/><body><p>This app will be installed to debian13 ACE</p></body></html></source>
|
||||
<translatorcomment>此应用将会被安装到ACE Debian13兼容环境</translatorcomment>
|
||||
<translation>此应用将会被安装到ACE Debian13兼容环境</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/pages/appintopage.ui" line="584"/>
|
||||
<location filename="../src/pages/appintopage.ui" line="587"/>
|
||||
<source><html><head/><body><p>This app will be installed to debian SID ACE</p></body></html></source>
|
||||
<translatorcomment>此应用将会被安装到ACE Debian SID兼容环境</translatorcomment>
|
||||
<translation>此应用将会被安装到ACE Debian SID兼容环境</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/pages/appintopage.ui" line="609"/>
|
||||
<location filename="../src/pages/appintopage.ui" line="612"/>
|
||||
<source><html><head/><body><p>This app will be installed to deepin23 ACE</p></body></html></source>
|
||||
<translatorcomment>此应用将会被安装到ACE Deepin 23兼容环境</translatorcomment>
|
||||
<translation>此应用将会被安装到ACE Deepin 23兼容环境</translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/pages/appintopage.ui" line="689"/>
|
||||
@@ -539,8 +533,7 @@
|
||||
<message>
|
||||
<location filename="../src/application.cpp" line="40"/>
|
||||
<source><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/></source>
|
||||
<translatorcomment><span style=' font-size:10pt;font-weight:60;'>由社区打造的应用商店</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky 是我们的吉祥物。设计源于 <a href='https://tai3.cn/'>Tyson Tan</a></span><br/></translatorcomment>
|
||||
<translation><span style=' font-size:10pt;font-weight:60;'>由社区打造的应用商店</span><br/><span style=' font-size:10pt;font-weight:60;'>Sparky 是我们的吉祥物。设计源于<a href='https://tai3.cn/'>Tyson Tan</a></span><br/></translation>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/application.cpp" line="147"/>
|
||||
|
||||
Reference in New Issue
Block a user