Add winecfg shortcut to run.sh

Signed-off-by: Codist <countstarlight@gmail.com>

5 files changed, 37 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdea6247c1e6..385b13ab378f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,7 +25,7 @@ pkgbase = deepin-wine-qq
 	source = run.sh
 	md5sums = 5fdc20e614d945bd2ba5251420872479
 	md5sums = ff9d6afa4860c731623e81ef853603e2
-	md5sums = 118cd4afe9d2a4c64fd5b5da5f7c7968
+	md5sums = 5103965c2dcac58262ea35f029b2067e
 
 pkgname = deepin-wine-qq
 
diff --git a/.travis.yml b/.travis.yml
index 734ce5e3974f..e16d482fbeab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
-sudo: required
+arch: amd64
+os: linux
+dist: focal
 
 services:
 - docker
@@ -10,7 +12,7 @@ archlinux:
   - p7zip
   - wine
   - wine-mono
-  - wine_gecko
+  - wine-gecko
   - xorg-xwininfo
   - wqy-microhei
   - lib32-alsa-lib
@@ -30,7 +32,7 @@ deploy:
   provider: releases
   skip_cleanup: true
   overwrite: true
-  api_key: $GH_TOKEN
+  token: $GH_TOKEN
   file_glob: true
   file:
     - "deepin-wine-qq*.pkg*"
diff --git a/PKGBUILD b/PKGBUILD
index ee544d820110..e16f1cb90789 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ source=("$_mirror/appstore/pool/appstore/c/${debpkgname}/${debpkgname}_${debpkgv
   "run.sh")
 md5sums=('5fdc20e614d945bd2ba5251420872479'
   'ff9d6afa4860c731623e81ef853603e2'
-  '118cd4afe9d2a4c64fd5b5da5f7c7968')
+  '5103965c2dcac58262ea35f029b2067e')
 
 build() {
   msg "Extracting DPKG package ..."
diff --git a/README.md b/README.md
index c74ee989f135..41138dace10c 100644
--- a/README.md
+++ b/README.md
@@ -3,19 +3,19 @@
 
 <p align="center">
   <a href="https://travis-ci.org/countstarlight/deepin-wine-qq-arch">
-    <img src="https://travis-ci.org/countstarlight/deepin-wine-qq-arch.svg?branch=master" alt="Build Status">
+    <img src="https://img.shields.io/travis/countstarlight/deepin-wine-qq-arch?&logo=travis&style=flat-square" alt="Build Status">
   </a>
   <a href="https://im.qq.com/download/">
-    <img src="https://img.shields.io/badge/QQ-9.4.3.27712-blue.svg" alt="QQ Version">
+    <img src="https://img.shields.io/badge/QQ-9.4.3.27712-blue?style=flat-square&logo=tencent-qq" alt="QQ Version">
   </a>
   <a href="https://aur.archlinux.org/packages/deepin-wine-qq/">
-    <img src="https://img.shields.io/aur/version/deepin-wine-qq.svg" alt="AUR Version">
+    <img src="https://img.shields.io/aur/version/deepin-wine-qq?label=AUR&logo=arch-linux&style=flat-square" alt="AUR Version">
   </a>
   <a href="https://github.com/countstarlight/deepin-wine-qq-arch/releases">
-    <img src="https://img.shields.io/github/downloads/countstarlight/deepin-wine-qq-arch/total.svg" alt="GitHub Release">
+    <img src="https://img.shields.io/github/downloads/countstarlight/deepin-wine-qq-arch/total?logo=github&style=flat-square" alt="GitHub Release">
   </a>
   <a href="https://github.com/countstarlight/deepin-wine-qq-arch/issues">
-    <img src="https://img.shields.io/github/issues/countstarlight/deepin-wine-qq-arch.svg" alt="GitHub Issues">
+    <img src="https://img.shields.io/github/issues/countstarlight/deepin-wine-qq-arch?logo=github&style=flat-square" alt="GitHub Issues">
   </a>
 </p>
 
@@ -27,6 +27,7 @@ Deepin 打包的 QQ 容器移植到 Archlinux，不依赖 `deepin-wine5`，包�
     - [从AUR安装](#从aur安装)
     - [用安装包安装](#用安装包安装)
     - [本地打包安装](#本地打包安装)
+- [设置](#设置)
 - [兼容性记录](#兼容性记录)
 - [切换到 `deepin-wine`](#切换到-deepin-wine)
     - [自动切换(推荐)](#自动切换推荐)
@@ -109,6 +110,14 @@ EXEC_PATH="c:/Program Files/Tencent/QQ/Bin/QQ.exe"
 
 **NOTE: 前几次运行时可能会提示 "qq安全组件异常"，等一会再运行或重启一下系统**
 
+## 设置
+
+dpi，目录映射等可以在 `winecfg` 进行设置，打开 `winecfg` 的命令为：
+
+```bash
+/opt/apps/com.qq.im.deepin/files/run.sh winecfg
+```
+
 ## 兼容性记录
 
 |     QQ      |  wine  |   兼容性   |             备注             | deepin-wine | 兼容性 | 备注 |
@@ -136,7 +145,7 @@ EXEC_PATH="c:/Program Files/Tencent/QQ/Bin/QQ.exe"
 
 > 根据 [deepin-wine-wechat-arch#15](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/15#issuecomment-515455845)，[deepin-wine-wechat-arch#27](https://github.com/countstarlight/deepin-wine-wechat-arch/issues/27)，由 [@feileb](https://github.com/feileb), [@violetbobo](https://github.com/violetbobo), [@HE7086](https://github.com/HE7086)提供的方法
 
-原版 `wine` 在 [DDE(Deepin Desktop Environment)](https://www.deepin.org/dde/) 上，有托盘图标无法响应鼠标事件([deepin-wine-tim-arch#21](https://github.com/countstarlight/deepin-wine-tim-arch/issues/21))的问题，且原版 `wine` 尚不能实现保存登录密码等功能，可以选择切换到 `deepin-wine5`。
+原版 `wine` 在 [DDE(Deepin Desktop Environment)](https://www.deepin.org/dde/) 上，有托盘图标无法响应鼠标事件([deepin-wine-tim-arch#21](https://github.com/countstarlight/deepin-wine-tim-arch/issues/21))的问题，且原版 `wine` 尚不能实现保存登录密码等功能，可以选择切换到 `deepin-wine`。
 
 **注意：切换前先确保 `deepin-wine` 支持**
 
@@ -154,7 +163,7 @@ EXEC_PATH="c:/Program Files/Tencent/QQ/Bin/QQ.exe"
 切换回 `wine`：
 
 ```bash
-rm ~/.deepinwine/Deepin-QQ/deepin
+rm $HOME/.deepinwine/Deepin-QQ/deepin
 ```
 
 如果要卸载自动安装的依赖：
@@ -206,19 +215,7 @@ QQ在本地保存的数据不会被删除，如保存在用户文档下的数据
 
 ### 高分辨率屏幕支持
 
-在 `winecfg` 的Graphics选项卡中修改dpi，如 修改为`192`
-
-对于 `wine`：
-
-```bash
-env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" winecfg
-```
-
-对于 `deepin-wine` ：
-
-```bash
-env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine5 winecfg
-```
+参照[设置](#设置)打开 `winecfg` ，在选项卡 `Graphics` 中修改dpi，如 修改为`192`
 
 ### GNOME 桌面上的悬浮窗口问题
 
@@ -284,4 +281,3 @@ env WINEPREFIX="$HOME/.deepinwine/Deepin-QQ" deepin-wine5 winecfg
 * 2017-12-31 QQ-8.9.6
 
 </details>
-
diff --git a/run.sh b/run.sh
index 0f09bdd4f403..0df7e8db3ca5 100755
--- a/run.sh
+++ b/run.sh
@@ -87,6 +87,15 @@ SwitchToDeepinWine()
     exit 0
 }
 
+OpenWinecfg()
+{
+    if [ -f "$WINEPREFIX/deepin" ]; then
+        env WINEPREFIX=$WINEPREFIX deepin-wine5 winecfg
+    else
+        env WINEPREFIX=$WINEPREFIX winecfg
+    fi
+}
+
 Run()
 {
     extract_archive "$ARCHIVE_FILE_DIR/helper_archive.7z" "$ARCHIVE_FILE_DIR/helper_archive.md5sum" "$SPECIFY_SHELL_DIR"
@@ -110,6 +119,7 @@ Run()
 HelpApp()
 {
 	echo " Extra Commands:"
+	echo " winecfg        Open winecfg"
 	echo " -d/--deepin    Switch to 'deepin-wine'"
 	echo " -h/--help      Show program help info"
 }
@@ -130,6 +140,9 @@ if [ -z $1 ]; then
 	exit 0
 fi
 case $1 in
+	"winecfg")
+		OpenWinecfg
+		;;
 	"-d" | "--deepin")
 		SwitchToDeepinWine
 		;;