configs名称更改

使用新的单项设置组件
优化设置保存GUI代码

Author: hite4044

Gui/ServerListGui.py

@@ -226,7 +226,7 @@ def __init__(self, master: Misc, logger: Logger):
         self.server_filter = ServerFilter(self)  # 服务器筛选器
         self.sep = Separator(self, orient=HORIZONTAL)  # 分割线
         self.servers_frame = ScrolledFrame(self, autohide=True)  # 装服务器的容器
-        self.empty_tip = Label(self, text="没有服务器", font=(Vars.user_settings_loader.configs['font'], 25))  # 提示
+        self.empty_tip = Label(self, text="没有服务器", font=(Vars.user_settings_loader.configs['global_font'], 25))  # 提示
         self.record_bar = RecordBar(self, self)  # 保存加载功能
         self.servers_info = ServerInfoFrame(self.record_bar)  # 服务器数量信息
 
@@ -332,7 +332,7 @@ def __init__(self, master: Misc, data: ServerInfo):
 
         self.favicon = Label(self)
         self.MOTD = MOTD(self)
-        self.base_info = Label(self, font=(Vars.user_settings_loader.configs['font'], 9))
+        self.base_info = Label(self, font=(Vars.user_settings_loader.configs['global_font'], 9))
 
         self.events_add()
         self.pack_weights()

Gui/SettingsFrame.py

@@ -1,4 +1,5 @@
 import sys
+import ttkbootstrap
 
 from ttkbootstrap.scrolled import ScrolledFrame
 
@@ -17,6 +18,9 @@ def __init__(self, master: Misc, text: str, name: str, value: Any):
         elif isinstance(value, str):
             self.variable = StringVar(self, value=value, name=name)
             self.widget = Entry(self, textvariable=self.variable)
+        elif isinstance(value, int):
+            self.variable = IntVar(self, value=value, name=name)
+            self.widget = ttkbootstrap.Spinbox(self, textvariable=self.variable, to=sys.maxsize)
         self.label.pack(side=LEFT)
         self.widget.pack(side=LEFT, padx=5)
 
@@ -35,9 +39,9 @@ def __init__(self, master: Misc):
             "if_version_name_shown_as_label": "将 VersionName 显示为纯文本格式",
             "theme_name": "主题 ( 不建议在此处修改 )",
             "ping_before_scan": "扫描之前先检测连通性",
-            "use_legacy_font": "使用原先的旧版字体 ( 任何渲染问题开发者没有义务修复 )",
-            "font": "字体",
-            "max_thread_number": "扫描时允许的最大线程数"
+            "global_font": "字体",
+            "max_thread_number": "扫描时允许的最大线程数",
+            "MOTD_use_unicode_font": "MOTD全部使用Unifont字体显示"
         }
 
         self.config_frame = ScrolledFrame(self)
@@ -56,10 +60,6 @@ def pack_widgets(self):
         for sitting_frame in self.configs.values():
             sitting_frame.grid(row=row, column=0, sticky=W)
             row += 1
-        for i in range(len(self.int_settings_spinbox)):
-            self.int_settings_spinbox[i].grid(column=1, row=row, sticky=W)
-            self.int_settings_label[i].grid(column=0, row=row, sticky=W)
-            row += 1
         self.confirm_button.pack(anchor=SE, side=RIGHT)
         self.update_button.pack(anchor=SE, side=RIGHT, padx=5)
 

Gui/UserInterface.py

@@ -10,24 +10,14 @@
 
 
 def set_default_font():
-    font.nametofont("TkDefaultFont").config(family=Vars.user_settings_loader.configs['font'], size=10)
-
-
-def load_unifont():
-    from Libs.FontLoader import add_font
-
-    try:
-        add_font("assets/Unifont.otf")
-    except FileNotFoundError:  # 若字体文件不存在则退出
-        print("Unifont字体文件丢失", file=stderr)
-        return
+    font.nametofont("TkDefaultFont").config(family=Vars.user_settings_loader.configs['global_font'], size=10)
 
 
 class Title(Label):
     def __init__(self, master: Misc):
         super(Title, self).__init__(master)
         self.configure(text="Minecraft服务器扫描器")
-        self.configure(font=(Vars.user_settings_loader.configs['font'], 24))
+        self.configure(font=(Vars.user_settings_loader.configs['global_font'], 24))
 
 
 class TitleBar(Frame):

Gui/Widgets.py

@@ -71,7 +71,7 @@ def return_font():
         Notes:
             有概率会引发 RuntimeError, 原因未知
         """
-        if Vars.user_settings_loader.configs['use_legacy_font']:
+        if Vars.user_settings_loader.configs['MOTD_use_unicode_font']:
             if "Unifont" not in font.families():
                 custom_font = Font(file="assets/Unifont.otf", family="Unifont")
             else:

Libs/FontLoader.py

@@ -129,6 +129,9 @@ def read_config_file_list():
         global server_addresses
 
         try:
+            if not exists(UserAddressOperator.user_address_json):
+                with open(UserAddressOperator.user_address_json, "w+", encoding="utf-8") as f:
+                    f.write("{\n\t\"address_list\": []\n}")
             with open(UserAddressOperator.user_address_json, "r", encoding="utf-8") as rfp:
                 json_data: dict = json.loads(rfp.read())
                 address_list: List[str] = json_data.get('address_list')
@@ -194,11 +197,22 @@ def __init__(self):
             return
         with open(self.config_path, "r", encoding="utf-8") as f:
             self.configs = {**self.configs, **json.load(f)}  # 酷炫就完事了 实际含义是拼接两个字典 并且有重复时遵从后者
+        for name, value in self.configs.items():  # 旧版适配防报错
+            if name == "font":
+                self.configs.pop(name)
+                self.configs["global_font"] = value
+            elif name == "use_legacy_font":
+                self.configs.pop(name)
+                self.configs["MOTD_use_unicode_font"] = value
 
     @staticmethod
     def defaults() -> Dict:
-        return {'if_version_name_shown_as_label': False, 'theme_name': "darkly", 'ping_before_scan': True,
-                'use_legacy_font': False, "font": "微软雅黑", "max_thread_number": 256}
+        return {'if_version_name_shown_as_label': False,
+                'theme_name': "darkly",
+                'ping_before_scan': True,
+                "global_font": "微软雅黑",
+                "max_thread_number": 256,
+                "MOTD_use_unicode_font": True}
 
 
 class UserSettingsSaver: