From 6218d5f12df459fc1eb4c15401bcf9dc672cb335 Mon Sep 17 00:00:00 2001 From: shenmo Date: Mon, 4 Nov 2024 23:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6settings=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=94=B9=E5=96=84=E7=94=A8=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...store.spark-app.spark-dwine-helper.desktop | 2 +- .../wine-app-launcher/settings.sh | 72 +++++++++++++++++++ .../transhell/settings.sh_en_US.transhell | 18 +++++ .../transhell/settings.sh_zh_CN.transhell | 18 +++++ .../wine-app-launcher/wine-app-launcher.sh | 6 +- 5 files changed, 112 insertions(+), 4 deletions(-) create mode 100755 spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/settings.sh create mode 100644 spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/transhell/settings.sh_en_US.transhell create mode 100644 spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/transhell/settings.sh_zh_CN.transhell diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop index f26f096..b751b44 100644 --- a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop +++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Utility; Encoding=UTF-8 -Exec=bash -c "/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh" +Exec=bash -c "/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/settings.sh" Icon=store.spark-app.spark-dwine-helper MimeType= Name=Spark Wine App Launcher diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/settings.sh b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/settings.sh new file mode 100755 index 0000000..8eb79f2 --- /dev/null +++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/settings.sh @@ -0,0 +1,72 @@ +#/bin/bash +SHELL_DIR=$(dirname $(realpath $0)) + +source /opt/bashimport/transhell.sh +load_transhell_debug + +until [ "$IS_CLOSE" = "1" ];do + +CHOSEN_SETTINGS=`zenity --list \ + --width=700 \ + --height=350 \ + --title="${TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN}" \ + --column="${TRANSHELL_CONTENT_OPTION}" \ + "${TRANSHELL_CONTENT_SET_APP_SCALE}" \ + "${TRANSHELL_CONTENT_SET_GLOBAL_SCALE}" \ + "${TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL}" \ + "${TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP}" ` + +echo "$CHOSEN_SETTINGS" +case "$CHOSEN_SETTINGS" in + "${TRANSHELL_CONTENT_SET_GLOBAL_SCALE}") +######## + zenity --info --text="${TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST}" --width=500 --height=150 + +dimensions=`xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/'` +scale_factor=`zenity --list \ + --width=700 \ + --height=350 \ + --title="${TRANSHELL_CONTENT_YOUR_DIMENSION_IS} $dimensions ${TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW}" \ + --column="${TRANSHELL_CONTENT_OPTION}" \ + 1.0 \ + 1.25 \ + 1.5 \ + 1.75 \ + 2.0` + +case "$scale_factor" in + "") + zenity --info --text="${TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT}" --width=500 --height=150 + scale_factor="1.0" + ;; + *) +zenity --info --text="${TRANSHELL_CONTENT_SCALE_IS} $scale_factor ${TRANSHELL_CONTENT_SAVED}" --width=500 --height=150 + ;; +esac +echo "$scale_factor" > $HOME/.config/spark-wine/scale.txt + + + ;; +######## + + + + + "${TRANSHELL_CONTENT_SET_APP_SCALE}") + bash "${SHELL_DIR}/wine-app-launcher.sh" + ;; + "${TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL}") + find ${HOME}/.deepinwine/ -name "scale.txt" -type f -print -exec rm -rf {} \; + zenity --info --text="${TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL}：\n`cd ${HOME}/.deepinwine/ && ls`" --width=500 --height=150 + ;; + "${TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP}") + + ;; + + *) + IS_CLOSE="1" + ;; + + +esac +done diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/transhell/settings.sh_en_US.transhell b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/transhell/settings.sh_en_US.transhell new file mode 100644 index 0000000..61e7d28 --- /dev/null +++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/transhell/settings.sh_en_US.transhell @@ -0,0 +1,18 @@ +#!/bin/bash +TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="Welcome to spark wine helper settings，Please choose one option below to excute" +TRANSHELL_CONTENT_OPTION="Options" +TRANSHELL_CONTENT_SET_GLOBAL_SCALE="Set global scale" +TRANSHELL_CONTENT_SET_APP_SCALE="Set app scale" +TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL="Sync all the wine app scale with global scale in one key" +TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP="Note: The options above only take effect on spark-dwine-helper apps" +TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST="Note：This option is invalid in deepin/UOS,for the script will read deepin/UOS scale settings first" +TRANSHELL_CONTENT_YOUR_DIMENSION_IS="Your dimension is ：" +TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="Please choose one option below" +TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="Setting 1.0 scale as default" +TRANSHELL_CONTENT_SCALE_IS="Scale multiple is " +TRANSHELL_CONTENT_SAVED="saved." +TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY="Please choose the directory the app you want to adjust in（Please choose DIRECTORY instead of file）" +TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE="E：user.reg can not be found.This is not a wine bottle" +TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL="Sync with global scale settings" +TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL="Will sync with global scale settings" +TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL="The scale settings of apps in bottle below is already syncd with global scale settings" diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/transhell/settings.sh_zh_CN.transhell b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/transhell/settings.sh_zh_CN.transhell new file mode 100644 index 0000000..6532643 --- /dev/null +++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/transhell/settings.sh_zh_CN.transhell @@ -0,0 +1,18 @@ +#!/bin/bash +TRANSHELL_CONTENT_WELCOME_AND_CHOOSE_ONE_TO_RUN="欢迎使用星火wine助手控制中心，请在以下选项中选择一个执行！" +TRANSHELL_CONTENT_OPTION="选项" +TRANSHELL_CONTENT_SET_GLOBAL_SCALE="设置全局缩放" +TRANSHELL_CONTENT_SET_APP_SCALE="设置单独应用缩放" +TRANSHELL_CONTENT_SYNC_APP_SCALE_WITH_GLOBAL="一键将所有已安装应用的缩放设置改为与全局缩放一致" +TRANSHELL_CONTENT_ONLY_AVAILABLE_TO_SPARK_DWINE_HELPER_APP="备注：以上操作仅对使用了spark-dwine-helper的应用生效" +TRANSHELL_CONTENT_THIS_WILL_NOT_TAKE_EFFECT_IN_DEEPIN_BECAUSE_READ_ENVIRONMENT_FIRST="请注意：此选项对deepin/UOS无效，会优先读取deepin/UOS的缩放设置进行缩放" +TRANSHELL_CONTENT_YOUR_DIMENSION_IS="您的分辨率是：" +TRANSHELL_CONTENT_PLEASE_CHOOSE_ONE_BELOW="请在以下选项中选择一个" +TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT="默认为1倍缩放。" +TRANSHELL_CONTENT_SCALE_IS="缩放倍数为" +TRANSHELL_CONTENT_SAVED="已保存" +TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY="请在接下来的文件选择框选中所需的应用所在的容器文件夹（注意要选择文件夹）" +TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE="错误：找不到user.reg.这不是一个wine容器" +TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL="与全局设置同步" +TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL="将会与全局设置同步" +TRANSHELL_CONTENT_BOTTLES_BELOW_HAVE_SYNCED_SCALE_WITH_GLOBAL="以下容器中的应用的缩放设置已与全局设置同步" diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh index 57f06b2..73df82a 100755 --- a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh +++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh @@ -151,9 +151,9 @@ select_spark_action() { "修改应用缩放") select_scale_action "应用" "$app" ;; - "修改全局缩放") - select_scale_action "全局" "$app" - ;; +# "修改全局缩放") +# select_scale_action "全局" "$app" +# ;; "更多操作") if [ -e /usr/bin/deepin-wine-runner ];then /usr/bin/deepin-wine-runner