diff --git a/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/opengl/DisabledOpengl.reg b/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/opengl/DisabledOpengl.reg new file mode 100644 index 0000000000000000000000000000000000000000..868bd2a0c92e2973c68f5f00a3085d2cc6bd9d5d Binary files /dev/null and b/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/opengl/DisabledOpengl.reg differ diff --git a/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/opengl/EnabledOpengl.reg b/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/opengl/EnabledOpengl.reg new file mode 100644 index 0000000000000000000000000000000000000000..3a0d3969e90ce0f6b391e3eb248e79d12296dbd1 Binary files /dev/null and b/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/opengl/EnabledOpengl.reg differ diff --git a/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh b/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh index 1415cbac7279666ced102638c5f38bc68970795d..571b78218998819624e8764202fcbc23131be6e9 100755 --- a/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh +++ b/spark-dwine-helper/package-source/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh @@ -10,6 +10,8 @@ CHOSEN_SETTINGS=`zenity --list \ --column="操作" \ 设置全局缩放 \ 设置单独应用缩放 \ + 开启OpenGL \ + 关闭OpenGL \ 以上操作仅对使用了spark-dwine-helper的应用生效 ` echo "$CHOSEN_SETTINGS" @@ -89,10 +91,38 @@ esac fi ;; +######## + "开启OpenGL") + zenity --info --text="请在接下来的文件选择框选中所需的应用所在的容器文件夹(注意要选择文件夹)" --width=500 --height=150 + CONTAINER_PATH=`zenity --file-selection --filename="$HOME/.deepinwine/" --directory` + + if [ ! -f "$CONTAINER_PATH/drive_c/windows/regedit.exe" ];then + zenity --info --text="错误:找不到regedit.exe.这不是一个wine容器" --width=500 --height=150 + else + WINEPREFIX="$CONTAINER_PATH" spark-wine7-devel regedit.exe /s /opt/durapps/spark-dwine-helper/opengl/EnabledOpengl.reg + zenity --info --text="已设置!" --width=500 --height=150 + fi + ;; + "以上操作仅对使用了spark-dwine-helper的应用生效") ;; +######## + "关闭OpenGL") + zenity --info --text="请在接下来的文件选择框选中所需的应用所在的容器文件夹(注意要选择文件夹)" --width=500 --height=150 + CONTAINER_PATH=`zenity --file-selection --filename="$HOME/.deepinwine/" --directory` + + if [ ! -f "$CONTAINER_PATH/drive_c/windows/regedit.exe" ];then + zenity --info --text="错误:找不到regedit.exe.这不是一个wine容器" --width=500 --height=150 + else + WINEPREFIX="$CONTAINER_PATH" spark-wine7-devel regedit.exe /s /opt/durapps/spark-dwine-helper/opengl/DisabledOpengl.reg + zenity --info --text="已设置!" --width=500 --height=150 + fi + ;; + "以上操作仅对使用了spark-dwine-helper的应用生效") + + ;; *) IS_CLOSE="1" ;; diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh index 60a3a265bb5fae4ab90aba7b783af96381ce18c3..0010ddc945dbef5acdfdfa1140b987c24b90990d 100755 --- a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh +++ b/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh @@ -72,6 +72,7 @@ HelpApp() echo " -r/--reset Reset app to fix errors" echo " -e/--remove Remove deployed app files" echo " -h/--help Show program help info" + echo " -o/--opengl Enabled Wine OpenGL" } #############帮助文件 FixLink() @@ -584,6 +585,10 @@ ParseArgs() fi } +EnabledOpenGL(){ + WINEPREFIX=$WINEPREFIX $WINE_CMD regedit.exe /s /opt/durapps/spark-dwine-helper/opengl/EnabledOpengl.reg +} + init_log_file # Check if some visual feedback is possible @@ -620,7 +625,9 @@ else fi debug_log "Run $*" - +if [ $WINEOPENGL == 1 ];then + EnabledOpenGL +fi #执行lnk文件通过判断第5个参数是否是“/Unix”来判断 if [ "$4" == "/Unix" ];then RunApp "$3" "$4" "$5"