Skip to content
This repository was archived by the owner on Jun 28, 2025. It is now read-only.

Commit d025d66

Browse files
committed
refactor: 删除ModSetup没用的单例模式和设置函数
1 parent e739f5d commit d025d66

3 files changed

Lines changed: 9 additions & 37 deletions

File tree

Plain_Craft_Launcher_2/Controls/RoundShadow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
from PyQt5.QtCore import Qt, QRectF
44
from PyQt5.QtGui import QPainter, QPainterPath, QBrush, QColor, QPaintEvent
55

6-
from Modules.Base.ModSetup import ModSetup as Setup
6+
from Modules.Base.ModSetup import mod_setup as setup
77

88
class RoundShadow(QWidget):
99
"""圆角边框类"""
1010

1111
def __init__(self):
1212
super().__init__()
13-
self.border_width = Setup().get_settings('corner_radius') # 从设置中获取圆角值
13+
self.border_width = setup.corner_radius # 从设置中获取圆角值
1414
# 设置 窗口无边框和背景透明 *必须
1515
self.setAttribute(Qt.WA_TranslucentBackground)
1616
# 修改窗口标志,添加系统菜单和最小化按钮标志

Plain_Craft_Launcher_2/FormMain_ui.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@
99
from PyQt5.QtCore import Qt
1010

1111
from Controls.MyRoundButton import MyRoundButton
12-
from Modules.Base.ModSetup import ModSetup as Setup
12+
from Modules.Base.ModSetup import mod_setup as setup
1313

1414

1515
class Ui_FormMain(object):
1616

1717
def setupUi(self, FormMain: QtWidgets.QWidget):
1818
# 获取所有需要的设置项
19-
setup = Setup()
2019
size = setup.size
2120

22-
corner_radius = setup.get_settings("corner_radius")
23-
bg_color = setup.get_settings("ColorBrush5")
24-
fg_color = setup.get_settings("ColorBrush2")
21+
corner_radius = setup.corner_radius
22+
bg_color = setup.color_brush_5
23+
fg_color = setup.color_brush_2
2524

2625
FormMain.setObjectName("FormMain")
2726
FormMain.resize(*size)

Plain_Craft_Launcher_2/Modules/Base/ModSetup.py

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,18 @@
77
class ModSetup:
88
"""写入/读取设置相关的类"""
99

10-
_instance = None
11-
12-
def __new__(cls):
13-
"""单例模式"""
14-
if cls._instance is None:
15-
cls._instance = super(ModSetup, cls).__new__(cls)
16-
cls._instance._initialized = False
17-
return cls._instance
18-
1910
def __init__(self):
20-
if self._initialized:
21-
return
22-
self._initialized = True
23-
2411
self.logger = ModLogging(module_name="ModSetup")
2512
self.load_settings()
2613
self.logger.write("ModSetup 加载完成", LT.INFO)
2714

2815
def setup_settings(self):
2916
"""初始化设置项"""
3017
self.ColorBrush1 = "#343d4a"
31-
self.ColorBrush2 = "#0F6FCD"
18+
self.color_brush_2 = "#0F6FCD"
3219
self.ColorBrush3 = "#1370f3"
3320
self.ColorBrush4 = "#4890f5"
34-
self.ColorBrush5 = "#96c0f9"
21+
self.color_brush_5 = "#96c0f9"
3522
self.ColorBrush6 = "#d5e6fd"
3623
self.ColorBrush7 = "#e0eafd"
3724
self.ColorBrush8 = "#eaf2fe"
@@ -63,19 +50,5 @@ def save_settings(self, file_path: str = "./data/Config.json"):
6350

6451
self.logger.write("设置文件保存成功", LT.INFO)
6552

66-
def get_settings(self, setting: str) -> Any:
67-
"""获取设置"""
68-
return getattr(self, setting, None)
69-
70-
def set_settings(self, setting: str, value: Any) -> None:
71-
"""设置设置"""
72-
setattr(self, setting, value)
73-
self.save_settings()
74-
75-
def __getitem__(self, key: str) -> Any:
76-
"""重载 [] 运算符"""
77-
return self.get_settings(key)
7853

79-
def __setitem__(self, key: str, value: Any) -> None:
80-
"""重载 [] 运算符"""
81-
self.set_settings(key, value)
54+
mod_setup = ModSetup()

0 commit comments

Comments
 (0)