diff --git a/spark-dwine-helper/build.sh b/spark-dwine-helper/build.sh index 9fbaa9a..edea177 100755 --- a/spark-dwine-helper/build.sh +++ b/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%%.*}` @@ -28,7 +28,6 @@ Installed-Size: $SIZE Depends: zenity, p7zip-legacy (>= 16.02+dfsg-8+Mejituu-2024022216) | p7zip-full (<< 16.02+transitional.1), fonts-noto-cjk, transhell, python3 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 { @@ -88,7 +85,6 @@ Installed-Size: $SIZE Depends: zenity, p7zip-legacy (>= 16.02+dfsg-8+Mejituu-2024022216) | p7zip-full (<< 16.02+transitional.1), fonts-noto-cjk, transhell, python3 Section: utils Priority: extra -Recommends: spark-dwine-helper-settings Provides: spark-dwine-helper(=$version) Conflicts: spark-dwine-helper Replaces: spark-dwine-helper(<=$version) @@ -110,25 +106,4 @@ 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 -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/ diff --git a/spark-dwine-helper/uos-package-assets/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 similarity index 54% rename from spark-dwine-helper/uos-package-assets/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop rename to spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/applications/store.spark-app.spark-dwine-helper.desktop index 524d6fc..3c5f110 100644 --- a/spark-dwine-helper/uos-package-assets/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,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 diff --git a/spark-dwine-helper/uos-package-assets/opt/apps/store.spark-app.spark-dwine-helper/entries/icons/hicolor/scalable/apps/store.spark-app.spark-dwine-helper.png b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/icons/hicolor/scalable/apps/store.spark-app.spark-dwine-helper.png similarity index 100% rename from spark-dwine-helper/uos-package-assets/opt/apps/store.spark-app.spark-dwine-helper/entries/icons/hicolor/scalable/apps/store.spark-app.spark-dwine-helper.png rename to spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/entries/icons/hicolor/scalable/apps/store.spark-app.spark-dwine-helper.png diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/log-function.bashimport b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/log-function.bashimport similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/log-function.bashimport rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/log-function.bashimport diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_get_tray_window b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_get_tray_window similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_get_tray_window rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_get_tray_window diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gdid3d.reg b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/gdid3d.reg similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gdid3d.reg rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/gdid3d.reg diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gl-wine32 b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/gl-wine32 similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gl-wine32 rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/gl-wine32 diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gl-wine64 b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/gl-wine64 similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/gl-wine64 rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/gl-wine64 diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/run_gl.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/run_gl.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_gl-wine/run_gl.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_gl-wine/run_gl.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_kill.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_kill.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_kill.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_kill.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-CS6.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-CS6.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-CS6.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-CS6.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Dding.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-Dding.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Dding.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-Dding.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Evernote.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-Evernote.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Evernote.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-Evernote.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-FastReadPDF.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-FastReadPDF.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-FastReadPDF.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-FastReadPDF.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Foxmail.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-Foxmail.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-Foxmail.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-Foxmail.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-MTXX.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-MTXX.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-MTXX.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-MTXX.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ-Spark.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ-Spark.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ-Spark.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ-Spark.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQ.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQBydr.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQBydr.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQBydr.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQBydr.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQGame.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQGame.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQGame.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQGame.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQHlddz.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQHlddz.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQHlddz.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQHlddz.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQMnsj.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQMnsj.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQMnsj.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQMnsj.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQSszb.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQSszb.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQSszb.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-QQSszb.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-THS.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-THS.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-THS.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-THS.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-TIM.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-TIM.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-TIM.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-TIM.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-TencentVideo.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-TencentVideo.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-TencentVideo.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-TencentVideo.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WXWork.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-WXWork.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WXWork.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-WXWork.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WangWang.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-WangWang.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WangWang.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-WangWang.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WeChat.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-WeChat.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-WeChat.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-WeChat.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-ZhuMu.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-ZhuMu.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Deepin-ZhuMu.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Deepin-ZhuMu.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/IE8.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/IE8.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/IE8.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/IE8.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-CloudMusic.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-CloudMusic.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-CloudMusic.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-CloudMusic.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-MailMaster.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-MailMaster.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-MailMaster.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-MailMaster.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-MuBu.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-MuBu.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-MuBu.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-MuBu.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-QQ.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-QQ.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-QQ.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-QQ.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-QQMusic.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-QQMusic.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-QQMusic.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-QQMusic.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-TIM.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-TIM.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-TIM.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-TIM.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-WeCom.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-WeCom.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-WeCom.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-WeCom.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-douyin.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-douyin.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-douyin.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-douyin.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-ecloud.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-ecloud.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-ecloud.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-ecloud.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-flyele.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-flyele.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-flyele.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-flyele.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-weixin.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-weixin.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Spark-weixin.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Spark-weixin.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Wine-QQ.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Wine-QQ.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/Wine-QQ.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/Wine-QQ.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/wxwork-spark-uk.sh b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/wxwork-spark-uk.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_run_v4_app_configs/wxwork-spark-uk.sh rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_run_v4_app_configs/wxwork-spark-uk.sh diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_updater b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_updater similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/spark_updater rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/spark_updater diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/transhell/spark_run_v4.sh_en_US.transhell diff --git a/spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell b/spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell similarity index 100% rename from spark-dwine-helper/s-wine-helper/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell rename to spark-dwine-helper/s-wine-helper/opt/deepinwine/tools/transhell/spark_run_v4.sh_zh_CN.transhell diff --git a/spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-wine8-stable b/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-wine8-stable similarity index 100% rename from spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-wine8-stable rename to spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/deepin-wine8-stable diff --git a/spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/log-function.bashimport b/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/log-function.bashimport similarity index 100% rename from spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/log-function.bashimport rename to spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/deepin-wine8-stable-wrapper/log-function.bashimport diff --git a/spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/bunny.txt b/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/bunny.txt similarity index 100% rename from spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/bunny.txt rename to spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/bunny.txt diff --git a/spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh b/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh similarity index 97% rename from spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh rename to spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh index 5f048d1..06a6412 100755 --- a/spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/get-scale.sh +++ b/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倍缩放 diff --git a/spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh b/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh similarity index 100% rename from spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh rename to spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/set-wine-scale.sh diff --git a/spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_en_US.transhell b/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_en_US.transhell similarity index 100% rename from spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_en_US.transhell rename to spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_en_US.transhell diff --git a/spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_zh_CN.transhell b/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_zh_CN.transhell similarity index 100% rename from spark-dwine-helper/s-wine-helper/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_zh_CN.transhell rename to spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/scale-set-helper/transhell/get-scale.sh_zh_CN.transhell diff --git a/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh b/spark-dwine-helper/s-wine-helper/opt/durapps/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh new file mode 100755 index 0000000..8169e60 --- /dev/null +++ b/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 + diff --git a/spark-dwine-helper/s-wine-helper/usr/share/applications/store.spark-app.spark-dwine-helper.desktop b/spark-dwine-helper/s-wine-helper/usr/share/applications/store.spark-app.spark-dwine-helper.desktop new file mode 100644 index 0000000..3c5f110 --- /dev/null +++ b/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 diff --git a/spark-dwine-helper/spark-dwine-helper-settings/usr/share/icons/hicolor/scalable/apps/spark-dwine-helper-settings.png b/spark-dwine-helper/s-wine-helper/usr/share/icons/hicolor/scalable/apps/store.spark-app.spark-dwine-helper.png similarity index 100% rename from spark-dwine-helper/spark-dwine-helper-settings/usr/share/icons/hicolor/scalable/apps/spark-dwine-helper-settings.png rename to spark-dwine-helper/s-wine-helper/usr/share/icons/hicolor/scalable/apps/store.spark-app.spark-dwine-helper.png diff --git a/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh b/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh deleted file mode 100755 index 3ef94cb..0000000 --- a/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh +++ /dev/null @@ -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 diff --git a/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_en_US.transhell b/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_en_US.transhell deleted file mode 100644 index 61e7d28..0000000 --- a/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_en_US.transhell +++ /dev/null @@ -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" diff --git a/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_zh_CN.transhell b/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_zh_CN.transhell deleted file mode 100644 index 6532643..0000000 --- a/spark-dwine-helper/spark-dwine-helper-settings/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/transhell/settings.sh_zh_CN.transhell +++ /dev/null @@ -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="以下容器中的应用的缩放设置已与全局设置同步" diff --git a/spark-dwine-helper/spark-dwine-helper-settings/usr/share/applications/spark-dwine-helper-settings.desktop b/spark-dwine-helper/spark-dwine-helper-settings/usr/share/applications/spark-dwine-helper-settings.desktop deleted file mode 100644 index e07183e..0000000 --- a/spark-dwine-helper/spark-dwine-helper-settings/usr/share/applications/spark-dwine-helper-settings.desktop +++ /dev/null @@ -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