在run.sh模板中新增ENABLE_DOT_NET相关设置 @gfd

Merge pull request !10 from gfdgd xi/master

spark-dwine-helper/build.sh

@@ -111,7 +111,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/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
-
+    # Unuse 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"

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/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有效）"