feat(ModPage): 页面切换又双叒叕改了; feat(FormMain_ui): 增加下载页面切换按钮

Author: CreeperIsASpy

Plain_Craft_Launcher_2/FormMain_ui.py

@@ -11,8 +11,8 @@
 from Controls.MyRoundButton import MyRoundButton
 from Controls.MyIconTextButton import MyIconTextButton
 from Modules.Base.ModSetup import ModSetup as Setup
-from Pages.PageLaunch.PageLaunch import PageLaunch
-from Modules.Base.ModPage import ModPage as Page
+from Modules.Base.ModPage import ModPagePanMain
+
 
 
 class Ui_FormMain(object):
@@ -21,9 +21,6 @@ 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')
-        self.page_manager = Page()
 
         FormMain.setObjectName("FormMain")
         FormMain.resize(*size)
@@ -63,39 +60,35 @@ def setupUi(self, FormMain: QtWidgets.QWidget):
             }}
         """)
         self.PanMain.setObjectName("PanMain")
+        self.page_manager = ModPagePanMain(self.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.setGeometry(QtCore.QRect((size[0] - 16), 8, 36, 36))
         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.setGeometry(QtCore.QRect((size[0] - 64), 8, 36, 36))
         self.BtnMin.setObjectName("BtnMin")
 
         # 标题栏按钮 -- 切换到下载页面
+        self.BtnPageDownload = MyIconTextButton(self.PanTitle, svg_path="Images/BtnTitlePageDownload.svg",
+                                              text="Download", command=lambda: self.page_manager.switch_page(1))
+        self.BtnPageDownload.setGeometry(QtCore.QRect(600, 8, 0, 0))                                
+        self.BtnPageDownload.setObjectName("BtnPageDownload")
         # 标题栏按钮 -- 切换到启动页面
         self.BtnPageLaunch = MyIconTextButton(self.PanTitle, svg_path="Images/BtnTitlePageLaunch.svg",
-                                              text="Launch", command=lambda: self.page_manager.switch_page(self.PanMain, 0))
-        self.BtnPageLaunch.setGeometry(QtCore.QRect(500, 8, 0, 0))                                
-        self.BtnPageLaunch.setObjectName("BtnPageDownload")
+                                              text="Launch", command=lambda: self.page_manager.switch_page(0))
+        self.BtnPageLaunch.setGeometry(QtCore.QRect(420, 8, 0, 0))                                
+        self.BtnPageLaunch.setObjectName("BtnPageLaunch")
 
         # 标题栏 Svg -- 标题
         self.SVGTitle = QSvgWidget(self.PanTitle)
         self.SVGTitle.load("Images/svgtitle.svg")
         self.SVGTitle.setGeometry(QtCore.QRect(8, 8, 120, 40))
         self.SVGTitle.setStyleSheet("background-color: transparent;")
         self.SVGTitle.setObjectName("SVGTitle")
-
-        # 添加页面到 QStackedWidget
-        self.page_launch = PageLaunch()
-        self.PanMain.addWidget(self.page_launch)
-        
-        # 如果有 PageDownload，也添加进来
-        from Pages.PageDownload.PageDownload import PageDownload
-        self.page_download = PageDownload()
-        self.PanMain.addWidget(self.page_download)
 
         # 默认显示第一个页面
         self.PanMain.setCurrentIndex(0)

Plain_Craft_Launcher_2/Images/BtnTitlePageDownload.svg

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# 不许做单例模式！！！！！！！！！！！！！！！
 from PyQt5.QtWidgets import QStackedWidget
 
 from Modules.Base.ModLogging import ModLogging, LoggingType as LT
@@ -11,22 +12,9 @@
 class ModPage:
     """页面管理模块，负责页面切换逻辑"""
 
-    _instance = None
-
-    def __new__(cls):
-        """单例模式"""
-        if cls._instance is None:
-            cls._instance = super(ModPage, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-
     def __init__(self):
-        if self._initialized:
-            return
-
         self.logger = ModLogging(module_name="ModPage")
         self.current_page_index = 0
-        self._initialized = True
 
     def switch_page(self, stack_widget: QStackedWidget, page_id: int) -> bool:
         """切换页面
@@ -60,3 +48,27 @@ def switch_page(self, stack_widget: QStackedWidget, page_id: int) -> bool:
         except Exception as e:
             self.logger.write(f"切换到页面索引 {page_id} 时发生错误: {e}", LT.ERROR)
             return False
+
+
+class ModPagePanMain(ModPage):
+    """主面板页面管理模块，负责将所有页面添加到主面板并管理切换"""
+    
+    def __init__(self, pan_main: QStackedWidget):
+        super().__init__()
+        self.pan_main = pan_main
+        
+        # 初始化所有页面
+        for page_class in PAGES:
+            page = page_class(self.pan_main)
+            self.pan_main.addWidget(page)
+    
+    def switch_page(self, page_id: int) -> bool:
+        """重写切换页面方法，简化调用方式
+        
+        Args:
+            page_id: 页面索引，如 0 表示 PageLaunch
+            
+        Returns:
+            bool: 切换是否成功
+        """
+        return super().switch_page(self.pan_main, page_id)