麒麟企业微信优化段加入

Signed-off-by: shenmo <jifengshenmo@outlook.com>

spark-dwine-helper/build.sh

@@ -30,6 +30,7 @@ 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)
 Homepage: https://gitee.com/deepin-community-store/spark-wine
 Description: Spark Deepin Wine Helper
@@ -111,7 +112,7 @@ SIZE=`echo ${SIZE%%.*}`
 
 cat  << EOF >pkg/DEBIAN/control
 Package: spark-dwine-helper-settings
-Version: 1.1
+Version: 1.2
 Architecture: all
 Maintainer: shenmo <shenmo@spark-app.store>
 Installed-Size: $SIZE

spark-dwine-helper/postrm

@@ -1,3 +1,4 @@
+#!/bin/bash
 if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
 
 echo "清理卸载残留"

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

@@ -142,7 +142,8 @@ CallProcess()
     if [ -n "$MIME_TYPE" ]; then
         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
     debug_log_to_file "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"
@@ -390,6 +391,8 @@ CallQQGameV2()
     CallProcess "$1" -action:force_download -appid:${2} -pid:8 -bin_version:1.1.2.4 -loginuin: 
 }
 
+
+
 CallPsCs6()
 {
     #get file full path
@@ -416,13 +419,30 @@ CallPsCs6()
     CallProcess "$@"
 }
 
+CallIE8()
+{
+    rm -f "$WINEPREFIX/system.reg"
+    cp $APPDIR/system.reg "$WINEPREFIX/system.reg"
+    CallProcess "$@"
+}
+
 #####专属优化段结束
 
+UnixUriToDosPath()
+{
+    OPEN_FILE="$1"
+    if [ -f "$OPEN_FILE" ]; then
+        OPEN_FILE=$(realpath "$OPEN_FILE")
+        OPEN_FILE="z:$OPEN_FILE"
+        OPEN_FILE=$(echo $OPEN_FILE | sed -e 's/\//\\\\/g')
+    fi
+    echo $OPEN_FILE
+}
+
 #arg 1: exec file path
 #arg 2: autostart ,or exec arg 1
 #arg 3: exec arg 2
 
-
 #### CallApp段，根据容器名找专属优化，没有就走通用启动
 CallApp()
 {
@@ -436,10 +456,10 @@ CallApp()
         "Deepin-ZhuMu")
             CallZhuMu "$@"
             ;;
-        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ")
+        "Deepin-QQ"|"Wine-QQ"|"Spark-QQ"|"Deepin-QQ-Spark")
             CallQQ "$@"
             ;;
-        "Deepin-TIM")
+        "Deepin-TIM"|"Spark-TIM")
             CallTIM "$@"
             ;;
         "Deepin-QQGame"*)
@@ -451,7 +471,7 @@ CallApp()
         "Deepin-WeChat")
             CallWeChat "$@"
             ;;
-        "Deepin-WXWork"|"Spark-WeCom")
+        "Deepin-WXWork"|"Spark-WeCom"|"wxwork-spark-uk")
             CallWXWork "$@"
             ;;
         "Deepin-Dding")
@@ -499,6 +519,9 @@ CallApp()
 	    "Spark-douyin")
             CallDouyin "$@"
             ;;
+	    "IE8")
+            CallIE8 "$@"
+            ;;
         *)
             CallProcess "$@"
             ;;
@@ -588,10 +611,14 @@ ParseArgs()
 {
     if [ $# -eq 4 ];then
 	    RunApp "$3"
-    elif [ $# -eq 5 ];then
-	    RunApp "$3" "$5"
+    elif [ -f "$5" ];then
+	    if [ -n "$MIME_EXEC" ];then
+		    RunApp "$MIME_EXEC" "$(UnixUriToDosPath "$5")" "${@:6}"
+	    else
+		    RunApp "$3" "$(UnixUriToDosPath "$5")" "${@:6}"
+	    fi
     else
-	    RunApp "$3" "$5" "$6"
+	    RunApp "$3" "${@:5}"
     fi
 }
 

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

@@ -10,6 +10,7 @@ CHOSEN_SETTINGS=`zenity --list \
        --column="操作" \
 	设置全局缩放 \
        设置单独应用缩放 \
+	一键将所有已安装应用的缩放设置改为与全局缩放一致 \
 	备注：以上操作仅对使用了spark-dwine-helper的应用生效 `
 
 echo "$CHOSEN_SETTINGS"
@@ -88,6 +89,10 @@ esac
 
 
 fi
+	;;
+	"一键将所有已安装应用的缩放设置改为与全局缩放一致")
+	find ${HOME}/.deepinwine/ -name "scale.txt" -type f -print -exec rm -rf {} \;
+	zenity --info --text="以下容器中的应用的缩放设置已与全局设置同步：\n`cd ${HOME}/.deepinwine/ && ls`" --width=500 --height=150
 	;;
 	"以上操作仅对使用了spark-dwine-helper的应用生效")
 	

spark-dwine-launch/postrm_template

@@ -0,0 +1,27 @@
+#!/bin/bash
+if [ "$1" = "remove" ] || [ "$1" = "purge" ];then
+
+echo "清理卸载残留"
+CONTAINER_NAME=""
+
+if [ -z $CONTAINER_NAME ];then
+echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine/ 下删除"
+exit
+fi
+
+if [ -e /opt/deepinwine/tools/kill.sh ];then
+/opt/deepinwine/tools/kill.sh $CONTAINER_NAME
+###这里注意，如果没写CONTAINER_NAME,会把QQ杀了
+fi
+
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d /home/$username/.deepinwine/$CONTAINER_NAME ]  
+        then
+        rm -rf /home/$username/.deepinwine/$CONTAINER_NAME
+        fi
+    done
+else
+echo "非卸载，跳过清理"
+fi

spark-dwine-launch/run-template_v1.sh

@@ -39,14 +39,16 @@ APPVER="版本号"
 EXEC_PATH="启动路径"
 ##### 软件在wine中的启动路径
 START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+ENABLE_DOT_NET=""
+####若使用spark-wine7-devel时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE=""
-#####没什么用
+
 export DEB_PACKAGE_NAME="包名"
 ####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
 export APPRUN_CMD="deepin-wine6-stable"
 #####wine启动指令，建议
 #EXPORT_ENVS="wine的动态链接库路径"
-##例如我的wine应用是使用的dwine6的32位元容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
+##例如我的wine应用是使用的dwine6的32位容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
 ## 如果用不到就不填，不要删除前面的注释用的#
 
 export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
@@ -65,7 +67,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
 
 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
-#此功能实现参见结尾函数段
+#此功能实现参见开头函数段
 if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
@@ -77,7 +79,7 @@ fi
 
 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] && [ -z "$ENABLE_DOT_NET"];then
 
 export WINEDLLOVERRIDES="mscoree,mshtml="
 #### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"