重构

Author: Cheukfung

.gitignore

@@ -74,5 +74,5 @@ fabric.properties
 config.json
 logs
 resource_rc.py
-view/ui_login_window.py
+ui_view/ui_login_window.py
 view/ui_main_window.py

README.md

@@ -9,30 +9,28 @@
 ## 简介
 
 本项目基于[PyQt-Fluent-Widgets](https://github.com/zhiyiYo/PyQt-Fluent-Widgets/), 为了方便像我这样的新手使用，将其封装成了一个模板，带有日志记录模块，
-密码保存、简单实现了登录界面和主界面的切换，多线程的操作，可以直接使用qt designer进行界面设计，然后专注写业务代码。
+密码保存、简单实现了登录界面和主界面的切换，异步操作，可以直接使用qt designer进行界面设计，然后专注写业务代码。
 
-<strong>注意：由于本人仅仅为编程爱好者，并非职业程序员，代码水平不高，此项目仅做参考。</strong>
+<strong>注意：由于本人仅仅为编程爱好者，并非职业程序员，代码质量很差，此项目仅做参考。</strong>
 
 ## 登录界面
 
-<img src="https://github.com/Cheukfung/pyqt-fluent-widgets-template/blob/pyqt5/example%20image/login.png?raw=true">
+<img src="https://github.com/Cheukfung/pyqt-fluent-widgets-template/blob/pyside6/screen_shot/login.png?raw=true">
 
 ## 主界面
-<img src="https://github.com/Cheukfung/pyqt-fluent-widgets-template/blob/pyqt5/example%20image/main_window.png?raw=true">
-<img src="https://github.com/Cheukfung/pyqt-fluent-widgets-template/blob/pyqt5/example%20image/main_dark.png?raw=true">
+<img src="https://github.com/Cheukfung/pyqt-fluent-widgets-template/blob/pyside6/screen_shot/main_window.png?raw=true">
+<img src="https://github.com/Cheukfung/pyqt-fluent-widgets-template/blob/pyside6/screen_shot/main_dark.png?raw=true">
 
-## 实现
-
-由ui文件生成py文件，然后main_window.py文件中导入界面类，为界面添加标题栏和侧边栏。
 
 ## 使用方法
-
+### ui编辑
 <img src="https://github.com/Cheukfung/pyqt-fluent-widgets-template/blob/pyqt5/example%20image/qt%20desinger.png?raw=true">
-clone项目到本地，使用qt-designer打开view/main_window.ui文件，主界面由stackedwidget组成，默认有3个页面，分别是page1、page2和setting_page,使用时只需要把相应的控件添加到对应的页面即可。
-
-## 添加stackedwidget页面
+clone项目到本地，打开ui_page目录，里面共有2个页面，使用qt-designer打开，使用时只需要把相应的控件添加到对应的页面即可。
+### 绑定控件事件
+参考 view/pages/page_one.py和view/pages/page_one_handler.py, 在page_one_handler.py中添加对应的事件处理函数，然后在page_one.py中绑定对应的控件事件。
 
-如果需要添加stackedwidget页面，先在qtdesigner里面添加页面，然后在navigation_interface.py文件中参照原有代码添加对应的导航按钮即可。
+## 添加页面
+如果需要添加页面，在ui_page添加页面，然后在view/pages/中参考page_one.py添加对应的页面、参考page_one_handler.py中添加对应的事件处理函数。
 
 ## 修改样式文件
 

api/api.py

@@ -0,0 +1,20 @@
+import time
+
+
+class DemoApi:
+
+    def get_captcha(self):
+        time.sleep(1)
+        b64_data = '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'
+        return {'data': b64_data}
+
+    def login(self, username, password, captcha, sms_code):
+        print('登录测试:', username, password, captcha, sms_code)
+        time.sleep(1)
+        return True
+
+    def sleep(self, seconds):
+        time.sleep(seconds)
+
+
+demo_api = DemoApi()

common/public.py

@@ -0,0 +1,49 @@
+from enum import Enum
+
+from PySide6.QtGui import QDesktopServices
+from PySide6.QtWidgets import QLabel
+from qfluentwidgets import Theme, Dialog, StyleSheetBase, qconfig
+
+
+class StyleSheet(StyleSheetBase, Enum):
+    """ Style sheet  """
+
+    WINDOW = "main_window"
+    LOGIN = "login_window"
+    SETTINGS = "setting_interface"
+
+    def path(self, theme=Theme.AUTO):
+        theme = qconfig.theme if theme == Theme.AUTO else theme
+        return f":/resource/qss/{theme.value.lower()}/{self.value}.qss"
+
+
+def show_dialog(parent, content, title='提示', url=None, callback=None):
+    w = Dialog(title, content, parent)
+    w.contentLabel.setOpenExternalLinks(True)
+    if url:
+        w.contentLabel.mousePressEvent = lambda e: QDesktopServices.openUrl(url)
+    max_height = 400
+    if parent:
+        max_height = parent.screen().availableGeometry().height() * 0.5
+    w.contentLabel.setMaximumHeight(max_height * 0.5)
+    # w.contentLabel.setMinimumWidth(240)
+    w.windowTitleLabel.hide()
+    if not callback:
+        w.yesButton.hide()
+        w.cancelButton.setText('确定')
+        w.buttonLayout.insertWidget(0, QLabel(''))
+        w.buttonLayout.setStretch(0, 1)
+        w.buttonLayout.setStretch(1, 1)
+    if w.exec():
+        if callback:
+            callback()
+    else:
+        pass
+
+
+def set_window_center(window):
+    """ set window center """
+    qr = window.frameGeometry()
+    cp = window.screen().availableGeometry().center()
+    qr.moveCenter(cp)
+    window.move(qr.topLeft())

common/threads.py

@@ -0,0 +1,38 @@
+from PySide6.QtCore import Qt, QPoint
+from qfluentwidgets import InfoBar, FluentIcon, IndeterminateProgressRing, InfoBarIcon, FluentStyleSheet, InfoBarManager
+
+
+@InfoBarManager.register('Custom')
+class CustomInfoBarManager(InfoBarManager):
+    def _pos(self, infoBar: InfoBar, parentSize=None):
+        p = infoBar.parent()
+        parentSize = parentSize or p.size()
+        x = (parentSize.width() - infoBar.width()) // 2
+        y = 40
+        return QPoint(x, y)
+
+    def _slideStartPos(self, infoBar: InfoBar):
+        pos = self._pos(infoBar)
+        return QPoint(pos.x(), pos.y() - 16)
+
+
+class ProgressInfoBar(InfoBar):
+    def __init__(self, title, content, parent):
+        super().__init__(icon=FluentIcon.SYNC,
+                         title=title,
+                         content=content,
+                         orient=Qt.Horizontal,
+                         isClosable=True,
+                         position='Custom',
+                         duration=-1, parent=parent)
+
+        self.spinner = IndeterminateProgressRing()
+        self.spinner.setFixedSize(22, 22)
+        self.spinner.setStrokeWidth(3)
+        self.hBoxLayout.setContentsMargins(12, 8, 8, 8)
+        self.hBoxLayout.setSpacing(8)
+        self.textLayout.setSpacing(0)
+        self.iconWidget.deleteLater()
+        self.hBoxLayout.insertWidget(0, self.spinner)
+        self.setProperty('type', InfoBarIcon.SUCCESS.value)
+        FluentStyleSheet.INFO_BAR.apply(self)