From 9c977dfc5daf71bddae3bda8e6b419be9190e70c Mon Sep 17 00:00:00 2001 From: Cloud Date: Mon, 6 Nov 2023 14:52:45 +0800 Subject: [PATCH 1/9] fix: build error on Deepin V23 fix build error on Deepin V23 check search edit width --- src/application.cpp | 1 + src/mainwindow-dtk.cpp | 2 ++ translations/spark-store_en.ts | 26 +++++++++++++------------- translations/spark-store_es.ts | 26 +++++++++++++------------- translations/spark-store_fr.ts | 26 +++++++++++++------------- translations/spark-store_zh_CN.ts | 26 +++++++++++++------------- translations/spark-store_zh_TW.ts | 26 +++++++++++++------------- 7 files changed, 68 insertions(+), 65 deletions(-) diff --git a/src/application.cpp b/src/application.cpp index 9aeea14..6cc09fa 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -14,6 +14,7 @@ #include #include +#include DCORE_USE_NAMESPACE diff --git a/src/mainwindow-dtk.cpp b/src/mainwindow-dtk.cpp index 151a758..2a88726 100755 --- a/src/mainwindow-dtk.cpp +++ b/src/mainwindow-dtk.cpp @@ -150,6 +150,8 @@ void MainWindow::initTitleBar() searchEdit = new DSearchEdit(ui->titlebar); searchEdit->setPlaceholderText(tr("Search or enter spk://")); + searchEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + searchEdit->lineEdit()->setFixedWidth(350); downloadButton = new ProgressButton(ui->titlebar); downloadButton->setDownloadListWidget(downloadlistwidget); diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index 2fe4e31..be1b781 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -268,12 +268,12 @@ DAboutDialog - + Version: %1 - + %1 is released under %2 @@ -480,28 +480,28 @@ - + Submit App - + Submit App with client(Recommanded) - + Settings - + APP Upgrade and Install Settings - + Spark Store @@ -514,19 +514,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> - + Spark Project @@ -536,7 +536,7 @@ - + Show MainWindow @@ -658,12 +658,12 @@ TitleBarMenu - + About - + Exit diff --git a/translations/spark-store_es.ts b/translations/spark-store_es.ts index 421c0e3..616d1e8 100644 --- a/translations/spark-store_es.ts +++ b/translations/spark-store_es.ts @@ -268,12 +268,12 @@ DAboutDialog - + Version: %1 Versión %1 - + %1 is released under %2 %1 publicado bajo %2 @@ -480,28 +480,28 @@ 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 @@ -514,19 +514,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> - + Spark Project Proyecto spark @@ -536,7 +536,7 @@ Descargar lista - + Show MainWindow Mostrar la ventana principal @@ -658,12 +658,12 @@ TitleBarMenu - + About Sobre - + Exit Exportaciones diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index 89dd7b8..e8f8a20 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -268,12 +268,12 @@ DAboutDialog - + Version: %1 Version: %1 - + %1 is released under %2 %1 publié sous %2 @@ -480,28 +480,28 @@ 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 @@ -514,19 +514,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> - + Spark Project Le projet Spark @@ -536,7 +536,7 @@ Télécharger la Liste - + Show MainWindow Afficher la fenêtre principale @@ -658,12 +658,12 @@ TitleBarMenu - + About À propos - + Exit Exportations diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index 1601d08..d0d5aeb 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -268,12 +268,12 @@ DAboutDialog - + Version: %1 版本：%1 - + %1 is released under %2 %1遵循%2协议发布 @@ -480,28 +480,28 @@ 更新 - + Submit App 投递应用 - + Submit App with client(Recommanded) 使用本地投稿器投递应用（推荐） - + Settings 设置 - + APP Upgrade and Install Settings 应用更新和安装设置 - + Spark Store 星火应用商店 @@ -514,19 +514,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> - + Spark Project 星火计划 @@ -536,7 +536,7 @@ 下载列表 - + Show MainWindow 显示主窗口 @@ -658,12 +658,12 @@ TitleBarMenu - + About 关于 - + Exit 退出 diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index d61447a..aa7e352 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -268,12 +268,12 @@ DAboutDialog - + Version: %1 版本：%1 - + %1 is released under %2 %1遵循%2协议发布 @@ -480,28 +480,28 @@ 軟體更新 - + Submit App 上傳軟體 - + Submit App with client(Recommanded) 從客戶端上傳軟體(推薦的) - + Settings 設定 - + APP Upgrade and Install Settings 軟體升級 和 安裝設定 - + Spark Store 星火应用商店 @@ -514,19 +514,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> - + Spark Project 星火计划 @@ -536,7 +536,7 @@ 下载列表 - + Show MainWindow 显示主窗口 @@ -658,12 +658,12 @@ TitleBarMenu - + About 关于 - + Exit 退出 From 99bdb1f958dbeb8f08a486336ac6f582083c831e Mon Sep 17 00:00:00 2001 From: Cloud Date: Tue, 7 Nov 2023 16:01:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E8=BD=AF=E4=BB=B6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=8E=92=E5=BA=8F=EF=BC=8C=E8=80=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=8C=89=E5=8A=A0=E8=BD=BD=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/appintopage.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/appintopage.cpp b/src/pages/appintopage.cpp index 73d8315..65627a6 100644 --- a/src/pages/appintopage.cpp +++ b/src/pages/appintopage.cpp @@ -76,7 +76,6 @@ void AppIntoPage::openUrl(const QUrl &url) manager->deleteLater(); }); // 获取截图 - for (int i = 0; i < 5 /* 魔法数字，最多五个截图 */; i++) { QString imgUrl = pkgUrlBase + "/screen_" + QString::number(i + 1) + ".png"; @@ -98,7 +97,7 @@ void AppIntoPage::openUrl(const QUrl &url) // img->setScaledContents(true); QListWidgetItem *pItem = new QListWidgetItem(); pItem->setSizeHint(QSize(280, 200)); - ui->listWidget->addItem(pItem); + ui->listWidget->insertItem(i, pItem); ui->listWidget->setItemWidget(pItem, img); qDebug() << imgUrl; } From 73e4bb1685f01ff172a33657973d33c3cb1ddcf7 Mon Sep 17 00:00:00 2001 From: shenmo Date: Tue, 7 Nov 2023 08:54:54 +0000 Subject: [PATCH 3/9] update debian/changelog. Signed-off-by: shenmo --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index f8c4589..4cf4991 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +spark-store (4.2.9) stable; urgency=medium + + * 修复：软件详情图片排序调整为服务器排序，而不是按加载顺序排序 + * 修复: build error on Deepin V23 + + -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 + spark-store (4.2.8.1) stable; urgency=medium * 修复：A2D应用释放无效的Desktop到桌面上 From 1d7fb7b0d02e20d1c73446fd7a5039aa9ab88aaa Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 9 Nov 2023 10:07:23 +0000 Subject: [PATCH 4/9] update README.md. Signed-off-by: shenmo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 489f185..bc21620 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Spark App Store -[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers) [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members) +[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers) [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members) ## Introduction From 0f7b79f49e5f8ea2e92933d325b5d0856afbcdc3 Mon Sep 17 00:00:00 2001 From: shenmo Date: Thu, 9 Nov 2023 10:07:44 +0000 Subject: [PATCH 5/9] update README.zh.md. Signed-off-by: shenmo --- README.zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.zh.md b/README.zh.md index 33af549..6e156f6 100644 --- a/README.zh.md +++ b/README.zh.md @@ -1,5 +1,5 @@ # 星火应用商店 -[![star](https://gitee.com/deepin-community-store/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/stargazers) [![fork](https://gitee.com/deepin-community-store/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/deepin-community-store/spark-store/members) +[![star](https://gitee.com/spark-store-project/spark-store/badge/star.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/stargazers) [![fork](https://gitee.com/spark-store-project/spark-store/badge/fork.svg?theme=gvp)](https://gitee.com/spark-store-project/spark-store/members) ## 简介 From 397d941f2f77eeeddc75b121a74650a05079acd3 Mon Sep 17 00:00:00 2001 From: shenmo Date: Sun, 12 Nov 2023 22:12:35 +0800 Subject: [PATCH 6/9] Feat: support ACE --- debian/changelog | 2 ++ tool/apt-fast/ss-apt-fast | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4cf4991..995a311 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ spark-store (4.2.9) stable; urgency=medium * 修复：软件详情图片排序调整为服务器排序，而不是按加载顺序排序 * 修复: build error on Deepin V23 + * 修复：容器内无限等待 + * 新增：高分屏截图支持 -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 diff --git a/tool/apt-fast/ss-apt-fast b/tool/apt-fast/ss-apt-fast index ee04c61..d1e49b3 100755 --- a/tool/apt-fast/ss-apt-fast +++ b/tool/apt-fast/ss-apt-fast @@ -114,7 +114,11 @@ fi # permissions. # We need lock for non-root commands too, because we only have one download # list file. -LCK_FILE="/tmp/apt-fast" +if [ "$IS_ACE_ENV" != "" ];then +LCK_FILE="/tmp/apt-fast-in-container.lock" +else +LCK_FILE="/tmp/apt-fast.lock" +fi LCK_FD=99 # Set default package manager, APT cache, temporary download dir, @@ -130,7 +134,11 @@ else fi # Currently not needed. eval "$(apt-config shell LISTDIR Dir::State::lists/d)" +if [ "$IS_ACE_ENV" != "" ];then +DLLIST="/tmp/apt-fast-in-container.list" +else DLLIST="/tmp/apt-fast.list" +fi _MAXNUM=5 _MAXCONPERSRV=10 _SPLITCON=8 From c5d3dadbbb648d0d868ffbf0660a46484a5a9106 Mon Sep 17 00:00:00 2001 From: zinface Date: Mon, 13 Nov 2023 13:16:48 +0000 Subject: [PATCH 7/9] =?UTF-8?q?!248=20=E5=AF=B9=E5=BA=94=E7=94=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=8B=E7=9A=84=E6=88=AA=E5=9B=BE=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20-=20=E9=AB=98=E5=88=86=E5=B1=8F=E7=89=88?= =?UTF-8?q?=20*=20feat:=20=E5=BA=94=E7=94=A8=E4=BF=A1=E6=81=AF=E6=88=AA?= =?UTF-8?q?=E5=9B=BE=E9=A2=84=E8=A7=88=E4=BC=98=E5=8C=96=E9=AB=98=E5=88=86?= =?UTF-8?q?=E5=B1=8F=E6=98=BE=E7=A4=BA(#I8FLJ1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widgets/big_image.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/widgets/big_image.cpp b/src/widgets/big_image.cpp index 95944e1..5620518 100644 --- a/src/widgets/big_image.cpp +++ b/src/widgets/big_image.cpp @@ -1,6 +1,8 @@ #include "big_image.h" +#include "qapplication.h" #include +#include #include big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent), @@ -25,6 +27,8 @@ big_image::big_image(DBlurEffectWidget *parent) : DBlurEffectWidget(parent), void big_image::setimage(QPixmap image) { + QScreen *screen = QApplication::primaryScreen(); + image.setDevicePixelRatio(screen->devicePixelRatio()); m_image->setPixmap(image); } From c2daaad86ccbd351142a5825f5e225d9b65e4aa2 Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 15 Nov 2023 17:47:26 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=95=8C=E9=9D=A2=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 1 + tool/ssinstall | 4 +- tool/update-upgrade/ss-do-upgrade.sh | 52 +++++++++++++++++-- .../ss-do-upgrade.sh_en_US.transhell | 3 +- .../ss-do-upgrade.sh_zh_CN.transhell | 1 + .../ss-do-upgrade.sh_zh_TW.transhell | 1 + 6 files changed, 54 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 995a311..ab286d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ spark-store (4.2.9) stable; urgency=medium * 修复: build error on Deepin V23 * 修复：容器内无限等待 * 新增：高分屏截图支持 + * 新增：更新界面支持显示软件名称 -- shenmo Sun, 5 Mar 2022 11:45:14 +0800 diff --git a/tool/ssinstall b/tool/ssinstall index 1fa1733..144acd2 100755 --- a/tool/ssinstall +++ b/tool/ssinstall @@ -30,13 +30,13 @@ function create_desktop_file() { function exec_create_desktop_file() { local user=$(who | awk '{print $1}' | head -n 1) for desktop_file_path in $(dpkg -L "$package_name" |grep /usr/share/applications/ | awk '/\.desktop$/ {print}'); do - if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then +if [ "$(grep -m 1 '^NoDisplay=' "$desktop_file_path" | cut -d '=' -f 2)" = "true" ] || [ "$(grep -m 1 '^NoDisplay=' "$desktop_file_path" | cut -d '=' -f 2)" = "True" ];then echo $desktop_file_path is checked and will be installed to desktop sudo -u "$user" cp "$desktop_file_path" "$(sudo -u "$user" xdg-user-dir DESKTOP)/" fi done for desktop_file_path in $(dpkg -L "$package_name" |grep /opt/apps/$package_name/entries/applications | awk '/\.desktop$/ {print}'); do - if [ "$(cat $desktop_file_path | grep NoDisplay=true)" = "" ];then + if [ "$(grep -m 1 '^NoDisplay=' "$desktop_file_path" | cut -d '=' -f 2)" = "true" ] || [ "$(grep -m 1 '^NoDisplay=' "$desktop_file_path" | cut -d '=' -f 2)" = "True" ];then echo $desktop_file_path is checked and will be installed to desktop sudo -u "$user" cp "$desktop_file_path" "$(sudo -u "$user" xdg-user-dir DESKTOP)/" fi diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index d9e000d..18c2f97 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -3,7 +3,46 @@ source /opt/durapps/spark-store/bin/bashimport/transhell.amber load_transhell_debug +function get_name_from_desktop_file() { + local app_name_in_desktop + local name_orig + local name_i18n + local package_name + package_name=$1 + for desktop_file_path in $(dpkg -L "$package_name" |grep /usr/share/applications/ | awk '/\.desktop$/ {print}'); do +if [ "$(grep -m 1 '^NoDisplay=' "$desktop_file_path" | cut -d '=' -f 2)" = "true" ] || [ "$(grep -m 1 '^NoDisplay=' "$desktop_file_path" | cut -d '=' -f 2)" = "True" ];then + continue + else + name_orig=$(grep -m 1 '^Name=' "$desktop_file_path" | cut -d '=' -f 2) + name_i18n=$(grep -m 1 "^Name\[${LANGUAGE}\]\=" "$desktop_file_path" | cut -d '=' -f 2) + if [ -z "$name_i18n" ] ;then + app_name_in_desktop=$name_orig + else + app_name_in_desktop=$name_i18n + fi + + fi + done + for desktop_file_path in $(dpkg -L "$package_name" |grep /opt/apps/$package_name/entries/applications | awk '/\.desktop$/ {print}'); do + if [ "$(grep -m 1 '^NoDisplay=' "$desktop_file_path" | cut -d '=' -f 2)" = "true" ] || [ "$(grep -m 1 '^NoDisplay=' "$desktop_file_path" | cut -d '=' -f 2)" = "True" ];then + continue + else + name_orig=$(grep -m 1 '^Name=' "$desktop_file_path" | cut -d '=' -f 2) + name_i18n=$(grep -m 1 "^Name\[${LANGUAGE}\]\=" "$desktop_file_path" | cut -d '=' -f 2) + if [ -z "$name_i18n" ] ;then + app_name_in_desktop=$name_orig + else + app_name_in_desktop=$name_i18n + fi + + fi + done +if [ -z "$app_name_in_desktop" ] ;then +app_name_in_desktop=${package_name} +fi +echo ${app_name_in_desktop} +} touch /tmp/spark-store/upgradeStatus.txt # 执行 apt update @@ -30,7 +69,7 @@ else IFS_OLD="$IFS" IFS=$'\n' - PKG_UPGRADE_LIST=`for line in $PKG_LIST ; do + PKG_UPGRADE_LIST=$(for line in $PKG_LIST ; do PKG_NAME=$(echo $line | awk -F ' ' '{print $1}') PKG_NEW_VER=$(echo $line | awk -F ' ' '{print $2}') PKG_CUR_VER=$(echo $line | awk -F ' ' '{print $3}') @@ -39,20 +78,23 @@ else if [ $? -eq 0 ] ; then continue fi + APP_NAME=$(get_name_from_desktop_file $PKG_NAME) #### 检测是否是 hold 状态 PKG_STA=$(dpkg-query -W -f='${db:Status-Want}' $PKG_NAME) if [ "$PKG_STA" != "hold" ] ; then echo "true" - echo "$PKG_NAME" + echo "$APP_NAME" echo "$PKG_NEW_VER" echo "$PKG_CUR_VER" + echo "$PKG_NAME" else echo "false" - echo "$PKG_NAME${TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD}" + echo "$APP_NAME${TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD}" echo "$PKG_NEW_VER" echo "$PKG_CUR_VER" + echo "$PKG_NAME" fi -done` +done) ### 还原分隔符 IFS="$IFS_OLD" @@ -61,7 +103,7 @@ done` if [ -z "$PKG_UPGRADE_LIST" ] ; then zenity --info --text "${TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg else - PKG_UPGRADE_LIST=$(echo "$PKG_UPGRADE_LIST" | zenity --list --text="${TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE}" --column="${TRANSHELL_CONTENT_CHOOSE}" --column="${TRANSHELL_CONTENT_PKG_NAME}" --column="${TRANSHELL_CONTENT_NEW_VERSION}" --column="${TRANSHELL_CONTENT_UPGRADE_FROM}" --separator=" " --checklist --multiple --print-column=2 --height 350 --width 550 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg) + PKG_UPGRADE_LIST=$(echo "$PKG_UPGRADE_LIST" | zenity --list --text="${TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE}" --column="${TRANSHELL_CONTENT_CHOOSE}" --column="${TRANSHELL_CONTENT_APP_NAME}" --column="${TRANSHELL_CONTENT_NEW_VERSION}" --column="${TRANSHELL_CONTENT_UPGRADE_FROM}" --column="${TRANSHELL_CONTENT_PKG_NAME}" --separator=" " --checklist --multiple --print-column=5 --height 350 --width 650 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg) ## 如果没有选择，则直接退出 if [ -z "$PKG_UPGRADE_LIST" ] ; then zenity --info --text "${TRANSHELL_CONTENT_NO_APP_IS_CHOSEN}" --title "${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --height 150 --width 300 --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell index 038af89..c349ef8 100644 --- a/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell @@ -8,7 +8,8 @@ TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="All APPs are up to date.\nBut you are not TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（Unable to upgrade: Being marked as hold）" TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="Choose the app you want to upgrade" TRANSHELL_CONTENT_CHOOSE="Choose" -TRANSHELL_CONTENT_PKG_NAME="Pkg name" +TRANSHELL_CONTENT_APP_NAME="APP name" +TRANSHELL_CONTENT_PKG_NAME="Package Name" TRANSHELL_CONTENT_NEW_VERSION="New version" TRANSHELL_CONTENT_UPGRADE_FROM="Upgrade from" TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="No app is chosen\nBut you are not at the top of the world" diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell index 1a56aff..5cef6d6 100644 --- a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell @@ -8,6 +8,7 @@ TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="没有软件需要更新\n但是你并没 TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）" TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用" TRANSHELL_CONTENT_CHOOSE="选择" +TRANSHELL_CONTENT_APP_NAME="应用名" TRANSHELL_CONTENT_PKG_NAME="包名" TRANSHELL_CONTENT_NEW_VERSION="新版本" TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新" diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell index 02b5497..0f89f2a 100644 --- a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell @@ -8,6 +8,7 @@ TRANSHELL_CONTENT_NO_NEED_TO_UPGRADE="沒有軟體需要更新\n但是你並沒 TRANSHELL_CONTENT_CAN_NOT_UPGRADE_FOR_BEING_HOLD="（无法更新：已被标记为保留）" TRANSHELL_CONTENT_CHOOSE_APP_TO_UPGRADE="选择你想更新的应用" TRANSHELL_CONTENT_CHOOSE="选择" +TRANSHELL_CONTENT_APP_NAME="应用名" TRANSHELL_CONTENT_PKG_NAME="包名" TRANSHELL_CONTENT_NEW_VERSION="新版本" TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新" From 63e6b0e6f66f7879eb85c9e33d5b4c737a851db7 Mon Sep 17 00:00:00 2001 From: shenmo Date: Wed, 15 Nov 2023 17:53:55 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E6=8F=90=E7=A4=BA=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tool/update-upgrade/ss-do-upgrade.sh | 1 + .../ss-do-upgrade.sh_en_US.transhell | 2 +- .../ss-do-upgrade.sh_zh_CN.transhell | 2 +- .../ss-do-upgrade.sh_zh_TW.transhell | 2 +- translations/spark-store_en.ts | 46 +++++++++---------- translations/spark-store_es.ts | 46 +++++++++---------- translations/spark-store_fr.ts | 46 +++++++++---------- translations/spark-store_zh_CN.ts | 46 +++++++++---------- translations/spark-store_zh_TW.ts | 46 +++++++++---------- 9 files changed, 119 insertions(+), 118 deletions(-) diff --git a/tool/update-upgrade/ss-do-upgrade.sh b/tool/update-upgrade/ss-do-upgrade.sh index 18c2f97..0cc9dd1 100755 --- a/tool/update-upgrade/ss-do-upgrade.sh +++ b/tool/update-upgrade/ss-do-upgrade.sh @@ -110,6 +110,7 @@ done) else ### 更新用户选择的应用 for PKG_UPGRADE in $PKG_UPGRADE_LIST;do + $APP_UPGRADE=$(get_name_from_desktop_file $PKG_UPGRADE) update_transhell pkexec /opt/durapps/spark-store/bin/update-upgrade/ss-do-upgrade-worker.sh upgrade-app $PKG_UPGRADE -y | zenity --progress --auto-close --no-cancel --pulsate --text="${TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT}" --height 70 --width 400 --title="${TRANSHELL_CONTENT_SPARK_STORE_UPGRADE_MODEL}" --window-icon=/usr/share/icons/hicolor/scalable/apps/spark-store.svg done diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell index c349ef8..3736299 100644 --- a/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_en_US.transhell @@ -13,6 +13,6 @@ TRANSHELL_CONTENT_PKG_NAME="Package Name" TRANSHELL_CONTENT_NEW_VERSION="New version" TRANSHELL_CONTENT_UPGRADE_FROM="Upgrade from" TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="No app is chosen\nBut you are not at the top of the world" -TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="Upgrading $PKG_UPGRADE , please wait..." +TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="Upgrading $APP_UPGRADE , please wait..." TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="The chosen app is upgraded" TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="Error occured when upgrading! Press Confirm to get the error log (Can be useful when feedback)" diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell index 5cef6d6..370970a 100644 --- a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_CN.transhell @@ -13,6 +13,6 @@ TRANSHELL_CONTENT_PKG_NAME="包名" TRANSHELL_CONTENT_NEW_VERSION="新版本" TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新" TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何软件\n但是你并没有站在世界之巅" -TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $PKG_UPGRADE ，请稍候..." +TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $APP_UPGRADE ，请稍候..." TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的软件已经更新完毕" TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈" diff --git a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell index 0f89f2a..148c3a2 100644 --- a/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell +++ b/tool/update-upgrade/transhell/ss-do-upgrade.sh_zh_TW.transhell @@ -13,6 +13,6 @@ TRANSHELL_CONTENT_PKG_NAME="包名" TRANSHELL_CONTENT_NEW_VERSION="新版本" TRANSHELL_CONTENT_UPGRADE_FROM="从该版本更新" TRANSHELL_CONTENT_NO_APP_IS_CHOSEN="没有选中任何軟體\n但是你並沒有站在世界之巔" -TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $PKG_UPGRADE ，请稍候..." +TRANSHELL_CONTENT_UPGRADING_PLEASE_WAIT="正在更新 $APP_UPGRADE ，请稍候..." TRANSHELL_CONTENT_CHOSEN_APP_UPGRADE_FINISHED="选中的軟體已经更新完毕" TRANSHELL_CONTENT_APP_UGRADE_PROCESS_ERROR_PRESS_CONFIRM_TO_CHECK="更新出现错误！按确定查看报错，可用于反馈" diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts index be1b781..036f0ca 100644 --- a/translations/spark-store_en.ts +++ b/translations/spark-store_en.ts @@ -126,9 +126,9 @@ - - - + + + Download and Install @@ -180,74 +180,74 @@ - + Developer Mode Disabled - - - + + + Reinstall - + Upgrade - - + + Install - + Installing - - - - + + + + Warning - + The current application does not support deepin, there may be problems - + The current application does not support UOS, there may be problems - + The current application does not support Ubuntu, there may be problems - + The current application does not support current platform, there may be problems - - + + Spark Store - + Uninstall succeeded - + The URL has been copied to the clipboard diff --git a/translations/spark-store_es.ts b/translations/spark-store_es.ts index 616d1e8..5dfcc95 100644 --- a/translations/spark-store_es.ts +++ b/translations/spark-store_es.ts @@ -126,9 +126,9 @@ - - - + + + Download and Install Descargar e instalar @@ -180,74 +180,74 @@ Haga clic en "abrir" - + Developer Mode Disabled Se ha desactivado el modo desarrollador - - - + + + Reinstall Reinstalación - + Upgrade Actualización - - + + Install Instalación - + Installing Se está instalando - - - - + + + + Warning Aviso - + The current application does not support deepin, there may be problems La aplicación actual no admite deepin, puede haber problemas - + The current application does not support UOS, there may be problems La aplicación actual no admite uos, puede haber problemas - + The current application does not support Ubuntu, there may be problems La aplicación actual no admite ubuntu, puede haber problemas - + The current application does not support current platform, there may be problems La aplicación actual no admite la Plataforma actual, puede haber problemas - - + + Spark Store SPARK Store - + Uninstall succeeded Desinstalación exitosa - + The URL has been copied to the clipboard La URL ha sido copiada al portapapeles diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts index e8f8a20..f58e6d5 100644 --- a/translations/spark-store_fr.ts +++ b/translations/spark-store_fr.ts @@ -126,9 +126,9 @@ - - - + + + Download and Install Télécharger et installer @@ -180,74 +180,74 @@ Cliquez sur Ouvrir - + Developer Mode Disabled Mode développeur désactivé - - - + + + Reinstall Réinstaller - + Upgrade Mise à niveau - - + + Install Installation - + Installing Installation en cours - - - - + + + + Warning Avertissement - + The current application does not support deepin, there may be problems L'application actuelle ne supporte pas deepin, il peut y avoir un problème - + The current application does not support UOS, there may be problems L'application actuelle ne prend pas en charge uos, il peut y avoir un problème - + The current application does not support Ubuntu, there may be problems L'application actuelle ne supporte pas Ubuntu, il peut y avoir un problème - + The current application does not support current platform, there may be problems L'application actuelle ne prend pas en charge la plate - forme actuelle, il peut y avoir un problème - - + + 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 diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts index d0d5aeb..7649050 100644 --- a/translations/spark-store_zh_CN.ts +++ b/translations/spark-store_zh_CN.ts @@ -121,9 +121,9 @@ - - - + + + Download and Install 下载并安装 @@ -180,74 +180,74 @@ 点击跳转 - + Developer Mode Disabled 开发者模式未开启 - - - + + + Reinstall 重新安装 - + Upgrade 升级 - - + + Install 安装 - + Installing 正在安装 - - - - + + + + Warning 警告 - + The current application does not support deepin, there may be problems 当前应用不支持deepin，安装后可能会出现问题 - + The current application does not support UOS, there may be problems 当前应用不支持UOS，安装后可能会出现问题 - + The current application does not support Ubuntu, there may be problems 当前应用不支持Ubuntu，安装后可能会出现问题 - + The current application does not support current platform, there may be problems 当前应用不支持平台，安装后可能会出现问题 - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板 diff --git a/translations/spark-store_zh_TW.ts b/translations/spark-store_zh_TW.ts index aa7e352..dd6b1a5 100644 --- a/translations/spark-store_zh_TW.ts +++ b/translations/spark-store_zh_TW.ts @@ -121,9 +121,9 @@ - - - + + + Download and Install 下載並安裝 @@ -180,74 +180,74 @@ 点击跳转 - + Developer Mode Disabled 开发者模式未开启 - - - + + + Reinstall 重新安裝 - + Upgrade 升级 - - + + Install 安装 - + Installing 正在安装 - - - - + + + + Warning - + The current application does not support deepin, there may be problems - + The current application does not support UOS, there may be problems - + The current application does not support Ubuntu, there may be problems - + The current application does not support current platform, there may be problems - - + + Spark Store 星火应用商店 - + Uninstall succeeded 卸载成功 - + The URL has been copied to the clipboard 链接已复制到剪贴板