diff --git a/DefaultSetting.py b/DefaultSetting.py
new file mode 100644
index 0000000..905256d
--- /dev/null
+++ b/DefaultSetting.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# 读取设置单独用一个 py 文件
+import os
+import json
+import PyQt5.QtGui as QtGui
+
+# 获取用户主目录
+def get_home():
+ return os.path.expanduser('~')
+
+# 读取文本文档
+def readtxt(path):
+ f = open(path, "r") # 设置文件对象
+ str = f.read() # 获取内容
+ f.close() # 关闭文本对象
+ return str # 返回结果
+
+defultProgramList = {
+ "Architecture": "Auto",
+ "Debug": True,
+ "DefultWine": "deepin-wine6 stable",
+ "DefultBotton" : get_home() + "/.wine",
+ "TerminalOpen": False,
+ "WineOption": "",
+ "WineBottonDifferent": False,
+ "CenterWindow": False,
+ "Theme": "",
+ "MonoGeckoInstaller": False,
+ "AutoWine": True,
+ "RuntimeCache": True,
+ "MustRead": False,
+ "BuildByBottleName": False,
+ "AutoPath": False,
+ "QemuUnMountHome": False,
+ "Chinese": True,
+ "FontSize": 1
+}
+
+def SetFont(app):
+ defaultFont = app.font()
+ size = setting["FontSize"]
+ font = QtGui.QFont(defaultFont)
+ if size == 1:
+ app.setFont(defaultFont)
+ return
+ font.setPixelSize(int(defaultFont.pixelSize() / size))
+ font.setPointSize(int(defaultFont.pointSize() / size))
+ app.setFont(font)
+
+try:
+ setting = json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/WineSetting.json"))
+except:
+ setting = defultProgramList
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 63dc14a..9efaf78 100755
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ package:
cp -rv AllInstall.py deb/opt/apps/deepin-wine-runner
cp -rv ShellList deb/opt/apps/deepin-wine-runner
cp -rv QemuDownload.py deb/opt/apps/deepin-wine-runner
+ cp -rv DefaultSetting.py deb/opt/apps/deepin-wine-runner
cp -rv QemuRun.py deb/opt/apps/deepin-wine-runner
cp -rv kill.sh deb/opt/apps/deepin-wine-runner
cp -rv updatekiller.py deb/opt/apps/deepin-wine-runner
diff --git a/deepin-wine-easy-packager.py b/deepin-wine-easy-packager.py
index 6683ad1..0de606f 100755
--- a/deepin-wine-easy-packager.py
+++ b/deepin-wine-easy-packager.py
@@ -11,6 +11,7 @@ import subprocess
import PyQt5.QtGui as QtGui
import PyQt5.QtCore as QtCore
import PyQt5.QtWidgets as QtWidgets
+from DefaultSetting import *
def ShowText(text: str):
if text.replace(" ", "").replace("\n", "") == "":
@@ -682,4 +683,6 @@ if __name__ == "__main__":
pass
window.resize(int(window.frameGeometry().width() * 1.2), int(window.frameGeometry().height() * 1.1))
window.show()
+ # 设置字体
+ SetFont(app)
sys.exit(app.exec_())
\ No newline at end of file
diff --git a/deepin-wine-packager.py b/deepin-wine-packager.py
index e33d19c..82a9916 100755
--- a/deepin-wine-packager.py
+++ b/deepin-wine-packager.py
@@ -25,6 +25,7 @@ import PyQt5.QtGui as QtGui
import PyQt5.QtCore as QtCore
import PyQt5.QtWidgets as QtWidgets
from trans import *
+from DefaultSetting import *
#################
# 程序所需事件
@@ -2160,16 +2161,6 @@ def LockBottleName():
def get_now_lang()->"获取当前语言":
return os.getenv('LANG')
-def SetFont(size):
- font = QtGui.QFont(defaultFont)
- if size == 1:
- app.setFont(defaultFont)
- return
- font.setPixelSize(int(defaultFont.pixelSize() / size))
- font.setPointSize(int(defaultFont.pointSize() / size))
- app.setFont(font)
-
-
bottleNameLock = False
###############
# 程序信息
@@ -2429,16 +2420,14 @@ videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space
videoHelp.addAction(videoHelpAction)
openFile.triggered.connect(OpenConfigFile)
saveFile.triggered.connect(SaveConfigList)
-setMiniFont.triggered.connect(lambda: SetFont(1.2))
-setDefaultFont.triggered.connect(lambda: SetFont(1))
hideShowText.triggered.connect(lambda: textbox1.setHidden(hideShowText.isChecked()))
exit.triggered.connect(window.close)
tip.triggered.connect(helps)
programmenu.addAction(openFile)
programmenu.addAction(saveFile)
-programmenu.addSeparator()
-programmenu.addAction(setMiniFont)
-programmenu.addAction(setDefaultFont)
+#programmenu.addSeparator()
+#programmenu.addAction(setMiniFont)
+#programmenu.addAction(setDefaultFont)
programmenu.addAction(hideShowText)
programmenu.addSeparator()
programmenu.addAction(exit)
@@ -2535,6 +2524,8 @@ allInfoList = {
"DebArch": ["Co", debArch],
"SparkHelperConfigPath": ["Str-SparkHelperConfigPath", helperConfigPath]
}
+# 设置字体
+SetFont(app)
#window.setWindowFlag(QtGui.Qt)
window.show()
sys.exit(app.exec_())
diff --git a/deepin-wine-runner-update-bug b/deepin-wine-runner-update-bug
index 370a53a..0e1986d 100755
--- a/deepin-wine-runner-update-bug
+++ b/deepin-wine-runner-update-bug
@@ -9,6 +9,7 @@ import webbrowser
import urllib.parse as parse
import PyQt5.QtGui as QtGui
import PyQt5.QtWidgets as QtWidgets
+from DefaultSetting import *
# 读取文本文档
def readtxt(path: "路径")->"读取文本文档":
@@ -90,9 +91,18 @@ widgetLayout.addWidget(updateButton, 3, 5, 1, 1)
giteeButton.clicked.connect(OpenGiteeIssues)
githubButton.clicked.connect(OpenGithubIssues)
updateButton.clicked.connect(UpdateButtonClick)
+# 禁用 bug 提交，引导到 Gitee 提交 bug
+nameThings.setDisabled(True)
+contactThings.setDisabled(True)
+starMenu.setDisabled(True)
+updateThings.setDisabled(True)
+updateButton.setDisabled(True)
+updateThings.setText("请移步到 Gitee 或 Github 提交 Bug（推荐使用 Gitee）")
widget.setLayout(widgetLayout)
window.setCentralWidget(widget)
window.setWindowTitle(f"Wine 运行器 {version} 问题/建议反馈")
window.setWindowIcon(QtGui.QIcon(iconPath))
window.show()
+# 设置字体
+SetFont(app)
sys.exit(app.exec_())
\ No newline at end of file
diff --git a/mainwindow.py b/mainwindow.py
index aa0eb5c..55091d1 100755
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -37,6 +37,7 @@ except:
bad = True
from trans import *
from Model import *
+from DefaultSetting import *
def PythonLower():
app = QtWidgets.QApplication(sys.argv)
@@ -2235,26 +2236,7 @@ def TransLog():
###########################
# 加载配置
###########################
-defultProgramList = {
- "Architecture": "Auto",
- "Debug": True,
- "DefultWine": "deepin-wine6 stable",
- "DefultBotton" : get_home() + "/.wine",
- "TerminalOpen": False,
- "WineOption": "",
- "WineBottonDifferent": False,
- "CenterWindow": False,
- "Theme": "",
- "MonoGeckoInstaller": False,
- "AutoWine": True,
- "RuntimeCache": True,
- "MustRead": False,
- "BuildByBottleName": False,
- "AutoPath": False,
- "QemuUnMountHome": False,
- "Chinese": True,
- "FontSize": 1
-}
+
if not os.path.exists(get_home() + "/.config/"): # 如果没有配置文件夹
os.mkdir(get_home() + "/.config/") # 创建配置文件夹
if not os.path.exists(get_home() + "/.config/deepin-wine-runner"): # 如果没有配置文件夹
@@ -2654,7 +2636,7 @@ except:
# Qt 窗口
app = QtWidgets.QApplication(sys.argv)
window = QtWidgets.QMainWindow()
-defaultFont = window.font()
+defaultFont = app.font()
window.setWindowTitle(title)
widget = QtWidgets.QWidget()
window.setCentralWidget(widget)
diff --git a/package-script/DefaultSetting.py b/package-script/DefaultSetting.py
new file mode 100644
index 0000000..905256d
--- /dev/null
+++ b/package-script/DefaultSetting.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+# 读取设置单独用一个 py 文件
+import os
+import json
+import PyQt5.QtGui as QtGui
+
+# 获取用户主目录
+def get_home():
+ return os.path.expanduser('~')
+
+# 读取文本文档
+def readtxt(path):
+ f = open(path, "r") # 设置文件对象
+ str = f.read() # 获取内容
+ f.close() # 关闭文本对象
+ return str # 返回结果
+
+defultProgramList = {
+ "Architecture": "Auto",
+ "Debug": True,
+ "DefultWine": "deepin-wine6 stable",
+ "DefultBotton" : get_home() + "/.wine",
+ "TerminalOpen": False,
+ "WineOption": "",
+ "WineBottonDifferent": False,
+ "CenterWindow": False,
+ "Theme": "",
+ "MonoGeckoInstaller": False,
+ "AutoWine": True,
+ "RuntimeCache": True,
+ "MustRead": False,
+ "BuildByBottleName": False,
+ "AutoPath": False,
+ "QemuUnMountHome": False,
+ "Chinese": True,
+ "FontSize": 1
+}
+
+def SetFont(app):
+ defaultFont = app.font()
+ size = setting["FontSize"]
+ font = QtGui.QFont(defaultFont)
+ if size == 1:
+ app.setFont(defaultFont)
+ return
+ font.setPixelSize(int(defaultFont.pixelSize() / size))
+ font.setPointSize(int(defaultFont.pointSize() / size))
+ app.setFont(font)
+
+try:
+ setting = json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/WineSetting.json"))
+except:
+ setting = defultProgramList
\ No newline at end of file
diff --git a/package-script/package.py b/package-script/package.py
index 547962c..c4c5c02 100755
--- a/package-script/package.py
+++ b/package-script/package.py
@@ -20,6 +20,7 @@ import PyQt5.QtGui as QtGui
import PyQt5.QtCore as QtCore
import PyQt5.QtWidgets as QtWidgets
from trans import *
+from DefaultSetting import *
###################
# 程序所需事件
@@ -286,4 +287,6 @@ windowFrameInputValueList = [
packageName,
versionName
]
+# 设置字体
+SetFont(app)
sys.exit(app.exec_())
\ No newline at end of file