rename cursor

Author: 892768447

Test/TestMainwindowStyle.py

@@ -29,7 +29,7 @@ def __init__(self, *args, **kwargs):
         self.setupUi(self)
         ThemeManager.loadTheme()
         ThemeManager.loadCursor(self)
-        ThemeManager.loadCursor(self.buttonHead, 'pointer.png')
+        ThemeManager.loadCursor(self.buttonHead, ThemeManager.CursorPointer)
 
 
 if __name__ == '__main__':

Utils/ThemeManager.py

@@ -71,6 +71,10 @@ class ThemeManager:
     ThemeDir = 'Resources/Themes'
     ThemeName = 'Default'
 
+    # 鼠标
+    CursorDefault = 'default.png'
+    CursorPointer = 'pointer.png'
+
     @classmethod
     def loadTheme(cls):
         """根据配置加载主题
@@ -150,7 +154,7 @@ def loadCursor(cls, widget, name='default.png'):
     def cursorPath(cls, name='default.png'):
         """
         :param cls:
-        :return: 主题中 default.png 的绝对路径
+        :return: 主题中 鼠标图片 的绝对路径
         """
         return os.path.abspath(os.path.join(cls.ThemeDir, cls.ThemeName, 'cursor', name)).replace('\\', '/')
 
@@ -160,7 +164,7 @@ def setPointerCursors(cls, widgets):
         :param cls:
         """
         path = os.path.abspath(os.path.join(
-            cls.ThemeDir, cls.ThemeName, 'cursor', 'pointer.png')).replace('\\', '/')
+            cls.ThemeDir, cls.ThemeName, 'cursor', cls.CursorPointer)).replace('\\', '/')
         if os.path.exists(path):
             cursor = QCursor(QPixmap(path), 0, 0)
             for w in widgets:

Widgets/Dialogs/DonateDialog.py

@@ -12,9 +12,9 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QPixmap
 
-from Widgets.Dialogs.MoveDialog import MoveDialog
 from UiFiles.Ui_DonateDialog import Ui_FormDonateDialog
 from Utils.ThemeManager import ThemeManager
+from Widgets.Dialogs.MoveDialog import MoveDialog
 
 
 __Author__ = "Irony"
@@ -36,7 +36,8 @@ def __init__(self, alipayImg, wechatImg, *args, **kwargs):
         ThemeManager.loadCursor(self)
         # 加载鼠标样式
         ThemeManager.loadCursor(self.labelAlipayImg)
-        ThemeManager.loadCursor(self.labelWechatImg, 'pointer.png')
+        ThemeManager.loadCursor(self.labelWechatImg,
+                                ThemeManager.CursorPointer)
         # 加载图片
         self.labelAlipayImg.setPixmap(QPixmap(alipayImg).scaled(
             300, 300, Qt.IgnoreAspectRatio, Qt.SmoothTransformation))

Widgets/Dialogs/LoginDialog.py

@@ -15,13 +15,13 @@
 from PyQt5.QtCore import Qt, pyqtSlot, QVariant, QTimer
 from PyQt5.QtWidgets import QCompleter
 
-from Widgets.Dialogs.MoveDialog import MoveDialog
-from Widgets.Dialogs.TwinkleDialog import TwinkleDialog
 from UiFiles.Ui_LoginDialog import Ui_FormLoginDialog
 from Utils import Constants
 from Utils.CommonUtil import AppLog, Setting, Signals
 from Utils.GitThread import LoginThread
 from Utils.ThemeManager import ThemeManager
+from Widgets.Dialogs.MoveDialog import MoveDialog
+from Widgets.Dialogs.TwinkleDialog import TwinkleDialog
 
 
 __Author__ = """By: Irony
@@ -47,7 +47,7 @@ def __init__(self, *args, **kwargs):
         # 加载鼠标样式
         ThemeManager.loadCursor(self)
         # 加载鼠标样式
-        ThemeManager.loadCursor(self.buttonHead, 'pointer.png')
+        ThemeManager.loadCursor(self.buttonHead, ThemeManager.CursorPointer)
         # 是否正在登录
         self._isLogin = False
         Signals.loginErrored.connect(self.onLoginErrored)

Widgets/Skins/ColourfulWidget.py

@@ -32,7 +32,7 @@ class ColourfulItemWidget(QWidget):
     def __init__(self, name, color, *args, **kwargs):
         super(ColourfulItemWidget, self).__init__(*args, **kwargs)
         # 加载鼠标样式
-        ThemeManager.loadCursor(self, 'pointer.png')
+        ThemeManager.loadCursor(self, ThemeManager.CursorPointer)
         self.name = name
         self.color = color
         self.hovered = False
@@ -115,7 +115,7 @@ def onColourfulItemAddFinished(self):
         self.buttonAdd = QPushButton(
             '+', self, objectName='buttonAdd', clicked=self.onAddNewColor)
         # 加载鼠标样式
-        ThemeManager.loadCursor(self.buttonAdd, 'pointer.png')
+        ThemeManager.loadCursor(self.buttonAdd, ThemeManager.CursorPointer)
         if self.lastCol == 4:
             self.lastCol = 0
             self.lastRow += 1