merged #2 and fixed conflicts

Author: CreeperIsASpy

.gitignore

@@ -16,4 +16,4 @@ Plain_Craft_Launcher_2/data/*.log
 **/.minecraft/
 **/dist/*
 nuitka-crash-report.xml
-icon/
+icon/

Plain_Craft_Launcher_2/Application.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from PyQt5.QtWidgets import *
+from PyQt5.QtWidgets import QApplication
 import sys
 
 from FormMain import FormMain

Plain_Craft_Launcher_2/Controls/RoundShadow.py

@@ -3,14 +3,14 @@
 from PyQt5.QtCore import Qt, QRectF
 from PyQt5.QtGui import QPainter, QPainterPath, QBrush, QColor, QPaintEvent
 
-from Modules.Base.ModSetup import ModSetup as Setup
+from Modules.Base.ModSetup import mod_setup as setup
 
 class RoundShadow(QWidget):
     """圆角边框类"""
 
     def __init__(self):
         super().__init__()
-        self.border_width = Setup().get_settings('corner_radius')  # 从设置中获取圆角值
+        self.border_width = setup.CORNER_RADIUS # 从设置中获取圆角值
         # 设置 窗口无边框和背景透明 *必须
         self.setAttribute(Qt.WA_TranslucentBackground)
         # 修改窗口标志，添加系统菜单和最小化按钮标志

Plain_Craft_Launcher_2/FormMain.py

@@ -2,7 +2,7 @@
 import sys
 import os
 from PyQt5.QtWidgets import QApplication, QWidget
-from PyQt5.QtGui import QResizeEvent
+from PyQt5.QtGui import QResizeEvent, QMouseEvent
 from PyQt5.QtCore import Qt, QPropertyAnimation, QEasingCurve, QRect
 
 from Modules.Base.ModLogging import ModLogging, LoggingType as LT
@@ -21,40 +21,44 @@ def __init__(self):
         super().__init__()
         # 初始化日志
         self.logger = ModLogging(module_name="FormMain")
-        
+
         # 设置窗口标志，确保最小化时显示在任务栏
-        self.setWindowFlags(Qt.FramelessWindowHint | Qt.Window | Qt.WindowSystemMenuHint | Qt.WindowMinimizeButtonHint)
-        
+        self.setWindowFlags(
+            Qt.FramelessWindowHint
+            | Qt.Window
+            | Qt.WindowSystemMenuHint
+            | Qt.WindowMinimizeButtonHint
+        )
+
         # 窗口加载第一步：基础
         # 设置窗口大小
-        self.resize(900, 550)
+        self.resize(*mod_setup.SIZE)
         self.logger.write("窗口加载第一步完成", LT.INFO)
-        
+
         # 窗口加载第二步：加载 UI 控件
         # 创建一个容器widget
         self.container = QWidget(self)
         self.container.setGeometry(9, 9, self.width() - 18, self.height() - 18)
-        
+
         # 设置UI
         self.ui = Ui_FormMain()
         self.ui.setupUi(self.container)
-        
 
         self.logger.write("窗口加载第二步完成", LT.INFO)
 
         # 窗口加载第三步：链接信号/槽（真的不用设置无边框）
         # 连接按钮事件
         self.ui.BtnExit.clicked.connect(self.close_window)
         self.ui.BtnMin.clicked.connect(self.minimize_window)
-        
+
         # 记录窗口是否最大化
         self.is_maximized = False
         # 记录窗口正常状态下的位置和大小
         self.normal_geometry = self.geometry()
-        
+
         # 初始化拖动相关变量
         self._drag_start_pos = None
-        
+
         # 设置标题栏鼠标追踪
         self.ui.PanTitle.setMouseTracking(True)
         self.ui.PanTitle.mousePressEvent = self.PanTitle_mousePressEvent
@@ -65,23 +69,23 @@ def __init__(self):
 
         self.logger.write("FormMain 加载完成", LT.INFO)
 
-    def PanTitle_mousePressEvent(self, event):
+    def PanTitle_mousePressEvent(self, a0: QMouseEvent):
         """处理标题栏鼠标按下事件"""
-        if event.button() == Qt.LeftButton:
-            self._drag_start_pos = event.globalPos() - self.pos()
-            event.accept()
+        if a0.button() == Qt.LeftButton:
+            self._drag_start_pos = a0.globalPos() - self.pos()
+            a0.accept()
 
-    def PanTitle_mouseMoveEvent(self, event):
+    def PanTitle_mouseMoveEvent(self, a0: QMouseEvent):
         """处理标题栏鼠标移动事件"""
         if self._drag_start_pos is not None:
-            self.move(event.globalPos() - self._drag_start_pos)
-            event.accept()
+            self.move(a0.globalPos() - self._drag_start_pos)
+            a0.accept()
 
-    def PanTitle_mouseReleaseEvent(self, event):
+    def PanTitle_mouseReleaseEvent(self, a0: QMouseEvent):
         """处理标题栏鼠标释放事件"""
-        if event.button() == Qt.LeftButton:
+        if a0.button() == Qt.LeftButton:
             self._drag_start_pos = None
-            event.accept()
+            a0.accept()
 
     def resizeEvent(self, a0: QResizeEvent):
         """处理窗口大小变化"""
@@ -116,23 +120,21 @@ def minimize_window(self):
         """跨平台最小化窗口"""
         self.logger.write("按下按钮：BtnMin，正在尝试最小化窗口", LT.INFO)
         self.showMinimized()
-    
+
     def toggle_maximize_window(self):
         """切换窗口最大化/还原状态"""
         if self.isMaximized():
             self.restore_window()
         else:
             self.maximize_window()
-    
+
     def maximize_window(self):
         """跨平台最大化窗口"""
         self.logger.write("按下按钮：BtnMax，正在尝试最大化窗口", LT.INFO)
         # 保存当前窗口位置和大小（如果需要）
         self.showMaximized()
-    
+
     def restore_window(self):
         """跨平台还原窗口"""
         self.logger.write("按下按钮：BtnMax，正在尝试还原窗口", LT.INFO)
         self.showNormal()
-
-

Plain_Craft_Launcher_2/FormMain.ui

@@ -13,22 +13,25 @@
 from Pages.PageLaunch.PageLaunch import PageLaunch
 
 class Ui_FormMain(object):
+
     def setupUi(self, FormMain: QtWidgets.QWidget):
         # 获取所有需要的设置项
-        setup = Setup()
-        size = setup.get_settings('size')
-        corner_radius = setup.get_settings('corner_radius')
-        bg_color = setup.get_settings('ColorBrush5')
-        fg_color = setup.get_settings('ColorBrush2')
-        
+        size = setup.SIZE
+
+        corner_radius = setup.CORNER_RADIUS
+        bg_color = setup.color_brush_5
+        fg_color = setup.color_brush_2
+
         FormMain.setObjectName("FormMain")
         FormMain.resize(*size)
         FormMain.setBaseSize(QtCore.QSize(*size))
         FormMain.setStyleSheet(f"background-color: transparent; ")
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/.ico/icon.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(
+            QtGui.QPixmap(":/.ico/icon.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off
+        )
         FormMain.setWindowIcon(icon)
-        
+
         # 标题栏 Panel
         self.PanTitle = QtWidgets.QFrame(FormMain)
         title_height = 48 
@@ -42,9 +45,10 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
                 border-top-right-radius: {corner_radius}px;
                 border-bottom: none;
             }}
-        """)
-        self.PanTitle.setFrameShape(QtWidgets.QFrame.NoFrame) 
-        self.PanTitle.setFrameShadow(QtWidgets.QFrame.Plain)  
+        """
+        )
+        self.PanTitle.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.PanTitle.setFrameShadow(QtWidgets.QFrame.Plain)
         self.PanTitle.setObjectName("PanTitle")
 
         # 主 Panel
@@ -57,25 +61,34 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
                 border-bottom-left-radius: {corner_radius}px;
                 border-bottom-right-radius: {corner_radius}px;
             }}
-        """)
-        self.PanMain.setFrameShape(QtWidgets.QFrame.NoFrame) 
-        self.PanMain.setFrameShadow(QtWidgets.QFrame.Plain)  
+        """
+        )
+        self.PanMain.setFrameShape(QtWidgets.QFrame.NoFrame)
+        self.PanMain.setFrameShadow(QtWidgets.QFrame.Plain)
         self.PanMain.setObjectName("PanMain")
 
         # 标题栏按钮 -- 退出
-        self.BtnExit = MyRoundButton(self.PanTitle, svg_path="Images/BtnTitleExit.svg", size=(36, 36), tooltip="Exit")
-        self.BtnExit.setGeometry(QtCore.QRect((size[0] - 72), 8, 36, 36)) 
+        self.BtnExit = MyRoundButton(
+            self.PanTitle,
+            svg_path="Images/BtnTitleClose.svg",
+            size=(14, 14),
+            tooltip="Exit",
+            padding=(7, 7, -10, -10),
+        )
+        self.BtnExit.setGeometry(QtCore.QRect((size[0] - 50), 15, 14, 14))
         self.BtnExit.setObjectName("BtnExit")
 
         # 标题栏按钮 -- 最小化
-        self.BtnMin = MyRoundButton(self.PanTitle, svg_path="Images/BtnTitleMin.svg", size=(36, 36), tooltip="Minisize")
-        self.BtnMin.setGeometry(QtCore.QRect((size[0] - 120), 8, 36, 36)) 
+        self.BtnMin = QtWidgets.QPushButton(self.PanTitle)
+        self.BtnMin.setGeometry(QtCore.QRect((size[0] - 98), 2, 40, 40))
+        self.BtnMin.setStyleSheet("background-color: transparent;")
+        self.BtnMin.setText("—")
         self.BtnMin.setObjectName("BtnMin")
 
         # 标题栏标签 -- 标题
         self.SVGTitle = QSvgWidget(self.PanTitle)
         self.SVGTitle.load("Images/svgtitle.svg")
-        self.SVGTitle.setGeometry(QtCore.QRect(8, 8, 120, 40))  # 缩小尺寸
+        self.SVGTitle.setGeometry(QtCore.QRect(2, 14, 76, 24))
         self.SVGTitle.setStyleSheet("background-color: transparent;")
         self.SVGTitle.setObjectName("SVGTitle")
 
@@ -91,4 +104,5 @@ def retranslateUi(self, FormMain: QtWidgets.QWidget):
         _translate = QtCore.QCoreApplication.translate
         FormMain.setWindowTitle(_translate("FormMain", "Plain Craft Launcher 2"))
 
+
 from Resources import *

Plain_Craft_Launcher_2/FormMain_ui.py

@@ -3,22 +3,15 @@
 from typing import Any
 from .ModLogging import ModLogging, LoggingType as LT
 
+
 class ModSetup:
     """写入/读取设置相关的类"""
-    _instance = None
-    
-    def __new__(cls):
-        """单例模式"""
-        if cls._instance is None:
-            cls._instance = super(ModSetup, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-    
+    # 常量（不随主题变化）
+    CORNER_RADIUS = 8
+    SIZE: tuple[int, int] = (850, 500)
+    TITLE_BAR_H: int = 48
+
     def __init__(self):
-        if self._initialized:
-            return
-        self._initialized = True
-        
         self.logger = ModLogging(module_name="ModSetup")
         self.load_settings()
         self.logger.write("ModSetup 加载完成", LT.INFO)
@@ -42,7 +35,7 @@ def setup_settings(self):
 
         self.logger.write("设置初始化完成", LT.INFO)
 
-    def load_settings(self, file_path:str="./data/Config.json"):
+    def load_settings(self, file_path: str = "./data/Config.json"):
         """读取已经存储的设置"""
         try:
             with open(file_path, "r") as f:
@@ -53,29 +46,15 @@ def load_settings(self, file_path:str="./data/Config.json"):
             self.logger.write("设置文件读取成功", LT.INFO)
         except FileNotFoundError:
             self.logger.write("设置文件未找到，进行初始化", LT.INFO)
-            self.setup_settings()           
+            self.setup_settings()
 
-    def save_settings(self, file_path:str="./data/Config.json"):
+    def save_settings(self, file_path: str = "./data/Config.json"):
         """保存设置"""
         settings = self.__dict__
         with open(file_path, "w") as f:
             json.dump(settings, f)
 
         self.logger.write("设置文件保存成功", LT.INFO)
 
-    def get_settings(self, setting: str):
-        """获取设置"""
-        return getattr(self, setting, None)
-    
-    def set_settings(self, setting: str, value: Any) -> None:
-        """设置设置"""
-        setattr(self, setting, value)
-        self.save_settings()
-
-    def __getitem__(self, key: str) -> Any:
-        """重载 [] 运算符"""
-        return self.get_settings(key)
 
-    def __setitem__(self, key: str, value: Any) -> None:
-        """重载 [] 运算符"""
-        self.set_settings(key, value)
+mod_setup = ModSetup()