启动图标

.gitignore

@@ -0,0 +1 @@
+*.deb

spark-dwine-helper/build.sh

@@ -15,7 +15,7 @@ version="$1"
 ######################################################
 echo "build debian package"
 mkdir -p  pkg/DEBIAN
-cp -r ./s-wine-helper pkg/opt
+cp -r ./s-wine-helper/* pkg/
 SIZE=`du -s ./pkg`
 SIZE=`echo ${SIZE%%.*}`
 
@@ -25,10 +25,9 @@ Version: $version
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
-Depends: zenity, p7zip-legacy (>= 16.02+dfsg-8+Mejituu-2024022216) | p7zip-full (<< 16.02+transitional.1), fonts-noto-cjk, transhell, python3
+Depends: zenity, p7zip-legacy (>= 16.02+dfsg-8+Mejituu-2024022216) | p7zip-full (<< 16.02+transitional.1), fonts-noto-cjk, transhell, python3, wmctrl
 Section: utils
 Priority: extra
-Recommends: spark-dwine-helper-settings
 Multi-Arch: foreign
 Provides: store.spark-app.spark-dwine-helper(=$version)
 Replaces: store.spark-app.spark-dwine-helper(<=$version)
@@ -47,11 +46,9 @@ cd pkg && fakeroot dpkg-deb -Z xz -b . ../
 cd ..
 
 echo "普通deb包已经准备好，正在生成UOS deb包"
-rm -rf pkg/
 #################################################################
-mkdir -p pkg/DEBIAN
-cp -r uos-package-assets/opt pkg/
-cp -r s-wine-helper/* pkg/opt
+
+
 
 cat  << EOF >pkg/opt/apps/store.spark-app.spark-dwine-helper/info
 {
@@ -86,9 +83,9 @@ Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE
 Depends: zenity, p7zip-legacy (>= 16.02+dfsg-8+Mejituu-2024022216) | p7zip-full (<< 16.02+transitional.1), fonts-noto-cjk, transhell, python3
+Recommends: wmctrl
 Section: utils
 Priority: extra
-Recommends: spark-dwine-helper-settings
 Provides: spark-dwine-helper(=$version)
 Conflicts: spark-dwine-helper
 Replaces: spark-dwine-helper(<=$version)
@@ -104,31 +101,5 @@ cd ..
 
 echo "UOS deb包已经准备好"
 rm -rf pkg/
-########################################
-mkdir -p pkg/DEBIAN
-cp -r spark-dwine-helper-settings/* pkg/
-SIZE=`du -s ./pkg`
-SIZE=`echo ${SIZE%%.*}`
-
-cat  << EOF >pkg/DEBIAN/control
-Package: spark-dwine-helper-settings
-Version: 1.3.2
-Architecture: all
-Maintainer: shenmo <shenmo@spark-app.store>
-Installed-Size: $SIZE
-Depends: spark-dwine-helper(>=1.6),transhell,zenity
-Section: utils
-Priority: extra
-Multi-Arch: foreign
-Homepage: https://gitee.com/deepin-community-store/spark-wine
-Description: Spark Deepin Wine Helper
 
 
-
-EOF
-
-cd pkg && fakeroot dpkg-deb -Z xz -b . ../
-cd ..
-
-echo "helper deb包已经准备好"
-rm -rf pkg/

spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop

@@ -1,13 +1,13 @@
 [Desktop Entry]
 Categories=Utility;
 Encoding=UTF-8
-Exec=sh -c "/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"
+Exec=bash -c "/opt/durapps/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh"
 Icon=store.spark-app.spark-dwine-helper
 MimeType=
-Name=Spark Wine Helper Settings
-Name[zh_CN]=星火wine助手设置
+Name=Spark Wine App Launcher
+Name[zh_CN]=星火Wine应用启动器
 StartupWMClass=spark-dwine-helper-settings
 Terminal=False
 Type=Application
-NoDisplay=true
+NoDisplay=false
 X-Deepin-Vendor=user-custom

spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark-wine-banner

@@ -0,0 +1,44 @@
+#!/bin/bash
+if [ ! -z "$WAYLAND_DISPLAY" ]; then
+    echo "Wayland detected. Do not check wmclass"
+zenity --progress --title="星火Windows应用兼容助手" --text="正在为您启动以下应用：$WINE_APP_NAME" --pulsate --width=400 --auto-close --no-cancel --timeout=3
+    exit 
+fi
+
+if [  -z "$(which wmctrl)" ]; then
+    echo "No wmctrl installed. Do not check wmclass"
+zenity --progress --title="星火Windows应用兼容助手" --text="正在为您启动以下应用：$WINE_APP_NAME" --pulsate --width=400 --auto-close --no-cancel --timeout=3
+    exit 
+fi
+
+target_wmclass=$WINE_WMCLASS
+
+
+function check_window() {
+    # 使用 wmctrl 命令列出所有窗口，并使用 grep 过滤出特定的 WMCLASS
+    windows=$(wmctrl -lx | grep "$target_wmclass")
+    
+    # 如果窗口存在，则关闭提示
+    if [ -n "$windows" ]; then
+        # 提取窗口ID
+        window_id=$(echo "$windows" | awk '{print $1}')
+
+        echo "Window with WMCLASS '$target_wmclass' found"
+        exit
+    else
+        echo "Window with WMCLASS '$target_wmclass' not found."
+    fi
+}
+
+function check_wmclass(){
+# 递归检测窗口是否存在的函数
+
+# 每隔一段时间检测一次窗口是否存在
+while true; do
+    check_window
+    # 等待一段时间后再次检测
+    sleep 1
+done
+}
+
+ check_wmclass | zenity --progress --title="星火Windows应用兼容助手" --text="正在为您启动以下应用：$WINE_APP_NAME" --pulsate --width=400 --auto-close --no-cancel --timeout=10

spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/run_gl.sh

@@ -0,0 +1,17 @@
+#/bin/bash
+
+cd $(dirname $0)
+
+runtime_path=/opt/deepinwine/runtime-i386
+if [ -f "$runtime_path/init_runtime.sh" ];then
+    source "$runtime_path/init_runtime.sh"
+
+    init_runtime
+    init_32bit_config
+    echo "use deepinwine runtime"
+    "$WINELDPATH" ./gl-wine32
+    exit $?
+fi
+
+./gl-wine32
+exit $?

spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4.sh

@@ -13,7 +13,21 @@
 source /opt/durapps/transhell/transhell.sh
 load_transhell_debug
 source $(dirname $0)/log-function.bashimport
-
+#########Preload functions
+function get_app_name() {
+    local app_name_orig=$(grep -m 1 '^Name=' "/usr/share/applications/$1.desktop" | cut -d '=' -f 2)
+    local app_name_i18n=$(grep -m 1 "^Name\[$LANGUAGE\]\=" "/usr/share/applications/$1.desktop" | cut -d '=' -f 2)
+    local app_name=""
+    
+    if [ -z "$app_name_i18n" ]; then
+        app_name="$app_name_orig"
+    else
+        app_name="$app_name_i18n"
+    fi
+    
+    echo "$app_name"
+}
+######### Vars
 BOTTLENAME="$1"
 WINEPREFIX="$HOME/.deepinwine/$1"
 APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
@@ -21,10 +35,19 @@ APPVER=""
 APPTAR="files.7z"
 BOTTLENAME=""
 WINE_CMD="deepin-wine"
-#这里会被后续覆盖，似乎没啥用
+#这里会被后续覆盖
 LOG_FILE=$0
 PUBLIC_DIR="/var/public"
 
+export WINE_WMCLASS="$DEB_PACKAGE_NAME"
+export WINE_APP_NAME=$(get_app_name ${DEB_PACKAGE_NAME})
+if [ -z "$WINE_APP_NAME" ];then
+export WINE_APP_NAME=$BOTTLENAME
+fi
+
+
+
+
 if [ -e /opt/p7zip-legacy/bin/7z ];then
 log.debug "Using p7zip-legacy as unpacker"
 UNPACK_CMD=/opt/p7zip-legacy/bin/7z
@@ -41,7 +64,9 @@ fi
 if [ $APPRUN_CMD ]; then
     WINE_CMD=$APPRUN_CMD
 fi
+
 #####################
+
 if [ "$WINE_CMD" = "deepin-wine8-stable" ] && [ "$(arch)" != "x86_64" ];then
 
 WINE_CMD="/opt/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-wine8-stable"
@@ -54,20 +79,13 @@ if [ $SPECIFY_SHELL_DIR ]; then
     SHELL_DIR=$SPECIFY_SHELL_DIR
 fi
 
-# Check if some visual feedback is possible
-if command -v zenity >/dev/null 2>&1; then
+##################### Functions
 	progressbar()
 	{
 		WINDOWID="" zenity --progress --title="$1" --text="$2" --pulsate --width=400 --auto-close --no-cancel ||
 		WINDOWID="" zenity --progress --title="$1" --text="$2" --pulsate --width=400 --auto-close
 	}
 
-else
-	progressbar()
-	{
-		cat -
-	}
-fi
 
 _DeleteRegistry()
 {
@@ -132,8 +150,14 @@ FixLink()
 {
     if [ -d ${WINEPREFIX} ]; then
         CUR_DIR=$PWD
-        cd "${WINEPREFIX}/dosdevices"
-    # Link to Document
+	cd "${WINEPREFIX}/dosdevices"
+ 	check_link ../drive_c c:
+        check_link / z:
+        check_link $HOME y:
+        cd "../drive_c/users/$USER"
+        check_link "$HOME/Desktop" Desktop
+        check_link "$HOME/Downloads" Downloads
+        # Link to Document
 if [ -L "$WINEPREFIX/drive_c/users/$(whoami)/My Documents" ]; then
         env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ  /v Personal /d "%USERPROFILE%\My Documents" /f
 
@@ -141,10 +165,6 @@ else
         env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders' /t REG_EXPAND_SZ  /v Personal /d "%USERPROFILE%\Documents" /f
 
 fi
-        rm c: z: y:
-        ln -s -f ../drive_c c:
-        ln -s -f / z:
-        ln -s -f $HOME y:
         cd $CUR_DIR
         #ls -l "${WINEPREFIX}/dosdevices"
     fi
@@ -176,6 +196,29 @@ is_autostart()
     return 1
 }
 #########自动启动相关，等用到了再研究
+
+Test_GL_wine()
+{
+    gl_wine_path="/opt/deepinwine/tools/spark_gl-wine"
+
+    #如果不支持32的GLX,d3d改为gdi的实现
+    if [[ ! -f "${WINEPREFIX}/.init_d3d" ]];then
+        if [[ $WINE_CMD == *"deepin-wine8-stable"* ]];then
+            gl_wine="${gl_wine_path}/gl-wine64"
+        else
+            gl_wine="${gl_wine_path}/run_gl.sh"
+        fi
+
+        run_gl=`${gl_wine} 2>&1`
+
+        #如果opengl测试程序运行失败，所有进程的渲染方式改为gdi渲染模式
+        if [ $? != 0 ];then
+            WINEPREFIX="$WINEPREFIX" $WINE_CMD regedit /S "${gl_wine_path}/gdid3d.reg"
+        fi
+
+        touch "${WINEPREFIX}/.init_d3d"
+    fi
+}
 urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
 #######url转义
 
@@ -194,7 +237,11 @@ CallProcess()
     if [[ $autostart -ne 0 ]] && [[ "$1" != *"pluginloader.exe" ]];then
         $SHELL_DIR/spark_kill.sh "$BOTTLENAME" block
     fi
-
+	#run gl-wine for test opengl
+    get_arch=`uname -m`
+    if [[ $get_arch = "x86_64" ]];then
+        Test_GL_wine
+    fi
     #change current dir to excute path
     path=$(dirname "$path")
     cd "$path"
@@ -205,13 +252,13 @@ CallProcess()
         xdg-mime default "$DEB_PACKAGE_NAME".desktop "$MIME_TYPE"
     fi
     # Disable winemenubuilder
-    env WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe /f
+    env WINE_WMCLASS="$DEB_PACKAGE_NAME" WINEPREFIX="$WINEPREFIX" $WINE_CMD reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe /f
 
     
 
     
     
-    debug_log_to_file "Starting process $* ..."
+    debug_log "Starting process $* ..."
 
 	#############  WARNING: Here is the modified content: Now will run set-dwine-scale.sh
 	/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh "$WINEPREFIX"
@@ -249,7 +296,7 @@ CallApp()
 {
 
 
-    
+    $SHELL_DIR/spark-wine-banner &
     FixLink
     debug_log "CallApp $BOTTLENAME arg count $#: $*"
     if [ -f "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_run.sh" ];then
@@ -271,6 +318,8 @@ fi
 }
 ExtractApp()
 {
+
+
 local tmp_log=$(mktemp)
 	mkdir -p "$1"
 	(${UNPACK_CMD} x "$APPDIR/$APPTAR" -o"$1" -bsp1 -bb1 -bse2 | grep --line-buffered -oP "(\d+(\.\d+)?(?=%))" > $tmp_log)&
@@ -279,7 +328,7 @@ local tmp_log=$(mktemp)
 (while kill -0 $cmd_pid 2> /dev/null; do
         tail -n 1 "${tmp_log}"
         sleep 1
-    done)|  zenity --progress --title="${TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL}" --text="${TRANSHELL_CONTENT_UNPACKING} $BOTTLENAME..."  --width=600 --auto-close --no-cancel 
+    done)|  zenity --progress --title="${TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL}" --text="${TRANSHELL_CONTENT_UNPACKING} $WINE_APP_NAME..."  --width=600 --auto-close --no-cancel 
 rm $tmp_log
 
 
@@ -311,12 +360,13 @@ ResetApp()
 }
 UpdateApp()
 {
-	if [ -f "$WINEPREFIX/PACKAGE_VERSION" ] && [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" = "$APPVER" ]; then
-		return
-	fi
 	if [ -d "${WINEPREFIX}.tmpdir" ]; then
 		rm -rf "${WINEPREFIX}.tmpdir"
 	fi
+	if [ -f "$WINEPREFIX/PACKAGE_VERSION" ] && [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" = "$APPVER" ]; then
+		return
+	fi
+
     if [ -f "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_update.sh" ];then
         source "/opt/apps/${DEB_PACKAGE_NAME}/files/pre_update.sh"
         CallPreUpdate
@@ -341,14 +391,19 @@ UpdateApp()
 }
 RunApp()
 {
+
+
     progpid=$(ps -ef | grep "zenity --progress --title=${BOTTLENAME}" | grep -v grep)
     debug_log "run ${BOTTLENAME} progress pid $progpid"
     if [ -n "$progpid" ]; then
         debug_log "$BOTTLENAME is running"
         exit 0
     fi
+    	
  	if [ -d "$WINEPREFIX" ]; then
-        UpdateApp 
+        	    if [ ! -f "$WINEPREFIX/PACKAGE_VERSION" ] || [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" != "$APPVER" ]; then
+			UpdateApp
+	    fi
  	else
         DeployApp 
  	fi
@@ -359,7 +414,9 @@ RunApp()
 CreateBottle()
 {
     if [ -d "$WINEPREFIX" ]; then
-        UpdateApp
+	    if [ ! -f "$WINEPREFIX/PACKAGE_VERSION" ] || [ "$(cat "$WINEPREFIX/PACKAGE_VERSION")" != "$APPVER" ]; then
+            UpdateApp
+	    fi
     else
         DeployApp
     fi
@@ -380,7 +437,7 @@ ParseArgs()
     fi
 }
 
-init_log_file
+#init_log_file
 
 
 
@@ -392,9 +449,6 @@ if [ $# -lt 3 ]; then
     exit 0
 fi
 
-BOTTLENAME="$1"
-WINEPREFIX="$HOME/.deepinwine/$1"
-
 
 APPDIR="/opt/apps/${DEB_PACKAGE_NAME}/files"
 if [ -f "$APPDIR/files.md5sum" ];then
@@ -405,6 +459,7 @@ fi
 
 debug_log "Run $*"
 
+
 #执行lnk文件通过判断第5个参数是否是“/Unix”来判断
 if [ "$4" == "/Unix" ];then
     RunApp "$3" "$4" "$5"

spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell

@@ -1,3 +1,4 @@
 #!/bin/bash
 TRANSHELL_CONTENT_UNPACKING="正在为您准备以下应用："
 TRANSHELL_CONTENT_SPARK_WINDOWS_COMPATIBILITY_TOOL="星火Windows应用兼容助手"
+

spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh

@@ -47,7 +47,7 @@ fi
 
 
 Get_Dist_Name
-if [ "$DISTRO" = "Deepin" ] || [ "$DISTRO" = "UniontechOS" ];then
+if  [ "$DISTRO" = "UniontechOS" ];then
 echo 1.0 > $HOME/.config/spark-wine/scale.txt
 cat $HOME/.config/spark-wine/scale.txt > $CONTAINER_PATH/scale.txt
 #####就是1倍缩放

spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh

@@ -0,0 +1,147 @@
+#!/bin/bash
+
+# 函数：获取所有应用列表
+# 函数：获取所有应用列表
+get_apps_list() {
+    local apps_list=()
+    local app_dirs=($(find /opt/apps -mindepth 1 -maxdepth 1 -type d -exec test -f {}/files/run.sh \; -print))
+    
+    if [ ${#app_dirs[@]} -eq 0 ]; then
+        zenity --error --text="请至少在应用商店安装一个wine应用后启动" --width 200
+        exit 1
+    fi
+    
+    for app_dir in "${app_dirs[@]}"; do
+        local package_name=$(basename "$app_dir")
+        local run_script="$app_dir/files/run.sh"
+        local bottle_name="无法读取"
+        local version="无法读取"
+        local use_spark="否"
+        
+        if [ -f "$run_script" ]; then
+            bottle_name=$(grep -oP 'BOTTLENAME="\K[^"]+' "$run_script")
+            version=$(grep -oP 'APPVER="\K[^"]+' "$run_script")
+            
+            if [ -z "$version" ]; then
+                version="无法读取"
+            fi
+            
+            if grep -q "START_SHELL_PATH=\"/opt/deepinwine/tools/spark_run_v4.sh\"" "$run_script"; then
+                use_spark="是"
+            fi
+        fi
+        
+        local app_name=$(get_app_name "$package_name")
+        
+        apps_list+=("$app_name" "$package_name" "$bottle_name" "$version" "$use_spark")
+    done
+    
+    echo "${apps_list[@]}"
+}
+
+# 函数：获取应用名称
+get_app_name() {
+    local app_name_orig=$(grep -m 1 '^Name=' "/usr/share/applications/$1.desktop" | cut -d '=' -f 2)
+    local app_name_i18n=$(grep -m 1 "^Name\[$LANGUAGE\]\=" "/usr/share/applications/$1.desktop" | cut -d '=' -f 2)
+    local app_name=""
+    
+    if [ -z "$app_name_i18n" ]; then
+        app_name="$app_name_orig"
+    else
+        app_name="$app_name_i18n"
+    fi
+    
+    echo "$app_name"
+}
+
+# 函数：选择应用
+select_app() {
+    local apps_list=($(get_apps_list))
+    local app=$(zenity --print-column=2 --width=800 --height=600 --list --title="选择应用" --text="选择要执行的应用" --column="应用名" --column="包名" --column="容器名" --column="版本号" --column="是否使用星火wine助手" "${apps_list[@]}")
+    
+    if [ -n "$app" ]; then
+        local app_dir="/opt/apps/$app"
+        local run_script="$app_dir/files/run.sh"
+        local use_spark="否"
+            if grep -q "START_SHELL_PATH=\"/opt/deepinwine/tools/spark_run_v4.sh\"" "$run_script"; then
+                use_spark="是"
+            fi
+        if [ "$use_spark" == "是" ]; then
+            select_spark_action "$app" "$(get_app_name $app)"
+        else
+            select_non_spark_action "$app" "$(get_app_name $app)"
+        fi
+    fi
+}
+
+select_non_spark_action(){
+    local app="$1"
+    local app_name="$2"
+    local options=("在终端中打开")
+    local choice=$(zenity --width=800 --height=600 --list --title="选择操作" --text="选择要对$app_name执行的操作" --column="操作" "${options[@]}")
+        case "$choice" in
+        "在终端中打开")
+            local app_dir="/opt/apps/$app"
+            local run_script="$app_dir/files/run.sh"
+            x-terminal-emulator -e "$run_script"
+            ;;
+         esac
+}
+
+# 函数：选择星火wine助手操作
+select_spark_action() {
+    local app="$1"
+    local app_name="$2"
+    local options=("在终端中打开" "修改应用缩放" "修改全局缩放")
+    local choice=$(zenity --width=800 --height=600 --list --title="选择操作" --text="选择要对$app_name执行的操作" --column="操作" "${options[@]}")
+    
+    case "$choice" in
+        "在终端中打开")
+            local app_dir="/opt/apps/$app"
+            local run_script="$app_dir/files/run.sh"
+            x-terminal-emulator -e "$run_script"
+            ;;
+        "修改应用缩放")
+            select_scale_action "应用" "$app"
+            ;;
+        "修改全局缩放")
+            select_scale_action "全局" "$app"
+            ;;
+        *)
+            ;;
+    esac
+}
+
+# 函数：选择缩放操作
+select_scale_action() {
+    local scale_type="$1"
+    local app="$2"
+    local app_dir="/opt/apps/$app"
+    local run_script="$app_dir/files/run.sh"
+    local bottle_name=$(grep -oP 'BOTTLENAME="\K[^"]+' "$run_script")
+    local scale_factors=("1.0" "1.25" "1.5" "1.75" "2.0" "恢复默认")
+    local choice=$(zenity --width=800 --height=600 --list --title="选择缩放比例" --text="选择要设置的缩放比例" --column="比例" "${scale_factors[@]}")
+    
+    if [ -n "$choice" ]; then
+        local scale_factor="$choice"
+        
+        if [ "$scale_type" == "应用" ]; then
+		if [ "$scale_factor" == "恢复默认" ];then
+		rm $HOME/.deepinwine/$bottle_name/scale.txt
+		else
+            /opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s "$scale_factor" "$HOME/.deepinwine/$bottle_name"
+            	fi
+        elif [ "$scale_type" == "全局" ]; then
+            if [ "$scale_factor" == "恢复默认" ];then
+		rm $HOME/.config/spark-wine/scale.txt
+		else
+            echo "$scale_factor" > "$HOME/.config/spark-wine/scale.txt"
+            find "$HOME/.deepinwine/" -name "scale.txt" -type f -print -exec rm -rf {} \;
+            fi
+        fi
+    fi
+    zenity --info --width=300 --text="操作已完成，请重启Wine应用查看"
+}
+
+select_app
+

spark-dwine-helper/s-wine-helper/usr/share/applications/store.spark-app.spark-dwine-helper.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Categories=Utility;
+Encoding=UTF-8
+Exec=bash -c "/opt/durapps/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh"
+Icon=store.spark-app.spark-dwine-helper
+MimeType=
+Name=Spark Wine App Launcher
+Name[zh_CN]=星火Wine应用启动器
+StartupWMClass=spark-dwine-helper-settings
+Terminal=False
+Type=Application
+NoDisplay=false
+X-Deepin-Vendor=user-custom

spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh

@@ -1,109 +0,0 @@
-#/bin/bash
-
-source /opt/durapps/transhell/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_GLOBAL_SCALE}" \
-       "${TRANSHELL_CONTENT_SET_APP_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}")
-	zenity --info --text="${TRANSHELL_CONTENT_PLEASE_CHOOSE_WINE_BOTTLE_DIRECTORY}" --width=500 --height=150
-	CONTAINER_PATH=`zenity --file-selection --filename="$HOME/.deepinwine/" --directory`
-	
-	if [ ! -f "$CONTAINER_PATH/user.reg" ];then
-	zenity --info --text="${TRANSHELL_CONTENT_ERROR_NO_USER_REG_AS_NOT_A_WINE_BOTTLE}" --width=500 --height=150
-	
-	else
-	
-	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 \
-	${TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL} `
-
-case "$scale_factor" in 
-	"")
-	zenity --info --text="${TRANSHELL_CONTENT_1_SCALE_AS_DEFAULT}。" --width=500 --height=150
-	scale_factor="1.0"
-/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s $scale_factor $CONTAINER_PATH
-	;;
-	"${TRANSHELL_CONTENT_SYNC_SCALE_WITH_GLOBAL}")
-	zenity --info --text="${TRANSHELL_CONTENT_WILL_SYNC_SCALE_WITH_GLOBAL}" --width=500 --height=150
-	rm $CONTAINER_PATH/scale.txt
-	;;
-	*)
-zenity --info --text="${TRANSHELL_CONTENT_SCALE_IS} $scale_factor ${TRANSHELL_CONTENT_SAVED}" --width=500 --height=150
-/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh -s $scale_factor $CONTAINER_PATH
-	;;
-esac
-
-
-fi
-	;;
-	"${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

spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_en_US.transhell

@@ -1,18 +0,0 @@
-#!/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"

spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_zh_CN.transhell

@@ -1,18 +0,0 @@
-#!/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="以下容器中的应用的缩放设置已与全局设置同步"

spark-dwine-helper/spark-dwine-helper-settings/usr/share/applications/spark-dwine-helper-settings.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Categories=Utility;
-Encoding=UTF-8
-Exec=bash -c "/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"
-Icon=spark-dwine-helper-settings
-MimeType=
-Name=Spark Wine Helper Settings
-Name[zh_CN]=星火wine助手设置
-StartupWMClass=spark-dwine-helper-settings
-Terminal=False
-Type=Application
-NoDisplay=false
-X-Deepin-Vendor=user-custom