theme test

Author: 892768447

.settings/org.eclipse.core.resources.prefs

@@ -52,6 +52,7 @@ encoding//Widgets/MainWindow.py=utf-8
 encoding//Widgets/MainWindowBase.py=utf-8
 encoding//Widgets/Skins/ColourfulWidget.py=utf-8
 encoding//Widgets/Skins/PictureWidget.py=utf-8
+encoding//Widgets/Skins/SkinBaseWidget.py=utf-8
 encoding//Widgets/Skins/ThemeWidget.py=utf-8
 encoding//Widgets/ToolTip.py=utf-8
 encoding//Widgets/TreeView.py=utf-8

Resources/Themes/Dark/preview.png

@@ -31,22 +31,22 @@
    </property>
    <item>
     <widget class="QScrollArea" name="scrollArea">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
      <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAlwaysOff</enum>
      </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
      <widget class="QWidget" name="scrollAreaWidgetContents">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>898</width>
-        <height>610</height>
+        <width>900</width>
+        <height>612</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">

Resources/Themes/Default/preview.png

@@ -17,12 +17,12 @@ def setupUi(self, FormScrollArea):
         self.horizontalLayout.setSpacing(0)
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.scrollArea = QtWidgets.QScrollArea(FormScrollArea)
+        self.scrollArea.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.scrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.scrollArea.setWidgetResizable(True)
-        self.scrollArea.setAlignment(QtCore.Qt.AlignCenter)
         self.scrollArea.setObjectName("scrollArea")
         self.scrollAreaWidgetContents = QtWidgets.QWidget()
-        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 898, 610))
+        self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 900, 612))
         self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
         self.gridLayout = QtWidgets.QGridLayout(self.scrollAreaWidgetContents)
         self.gridLayout.setSizeConstraint(QtWidgets.QLayout.SetFixedSize)

UiFiles/ScrollArea.ui

@@ -144,11 +144,18 @@ class _Signals(QObject):
 
     # 添加多彩item
     colourfulItemAdded = pyqtSignal(int, int, str, object)
-    # 添加item完成
+    # 添加多彩item完成
     colourfulItemAddFinished = pyqtSignal()
     # 多彩item点击,色彩
     colourfulItemClicked = pyqtSignal(str, object)
 
+    # 添加主题item
+    themeItemAdded = pyqtSignal(int, int, str, object)
+    # 添加主题item完成
+    themeItemAddFinished = pyqtSignal()
+    # 主推item点击,路径
+    themeItemClicked = pyqtSignal(str, object)
+
 
 # 说白了就是全局信号定义
 Signals = _Signals()

UiFiles/Ui_ScrollArea.py

@@ -39,6 +39,7 @@
 LogFormatter = '[%(asctime)s %(name)s] %(levelname)-8s %(message)s'
 LogFile = 'Resources/Data/app.log'
 
+DirThemes = 'Resources/Themes'                   # 主题目录
 DirErrors = 'Resources/Data/Errors'              # 错误日志目录
 DirProject = 'Resources/Data/Projects'           # 本地项目目录
 DirProjects = 'Resources/Data/Projects/PyQt'     # 本地项目目录

Utils/CommonUtil.py

@@ -9,16 +9,24 @@
 @file: Utils.ThemeThread
 @description: 
 """
+from pathlib import Path
+
 from PyQt5.QtCore import QObject, QThread
 from PyQt5.QtGui import QLinearGradient, QColor
 
 from Utils.CommonUtil import AppLog, Signals
+from Utils.Constants import DirThemes
 
 
 __Author__ = "Irony"
 __Copyright__ = "Copyright (c) 2019"
 
 
+def splistList(src, length):
+    # 等分列表
+    return [src[i:i + length] for i in range(len(src)) if i % length == 0]
+
+
 class ColourfulThread(QObject):
     """获取所有的颜色方案
     """
@@ -65,7 +73,7 @@ def run(self):
         acolor.setColorAt(0, acolor.startColor)
         acolor.setColorAt(1, acolor.endColor)
 
-        defaults = self.splistList([
+        defaults = splistList([
             [self.tr('MidnightParis'), mcolor],             # 午夜巴黎
             [self.tr('PrimroseGreenOnion'), pcolor],        # 樱草青葱
             [self.tr('AutumnSun'), acolor],                 # 秋日暖阳
@@ -91,6 +99,45 @@ def run(self):
         Signals.colourfulItemAddFinished.emit()
         AppLog.info('colourful thread end')
 
-    def splistList(self, src, length):
-        # 等分列表
-        return [src[i:i + length] for i in range(len(src)) if i % length == 0]
+
+class ThemeThread(QObject):
+    """获取所有的主题（本地和云端）
+    """
+
+    def __init__(self, width, height, *args, **kwargs):
+        super(ThemeThread, self).__init__(*args, **kwargs)
+        self.width = width
+        self.height = height
+
+    @classmethod
+    def start(cls, width, height, parent=None):
+        """启动线程
+        :param cls:
+        :param width:        宽度
+        :param width:        高度
+        :param parent:
+        """
+        cls._thread = QThread(parent)
+        cls._worker = ThemeThread(width, height)
+        cls._worker.moveToThread(cls._thread)
+        cls._thread.started.connect(cls._worker.run)
+        cls._thread.finished.connect(cls._worker.deleteLater)
+        cls._thread.start()
+        AppLog.info('theme thread started')
+
+    def run(self):
+        AppLog.info('start get all theme')
+
+        defaults = [[p.parent.name, str(p)]
+                    for p in Path(DirThemes).rglob('style.qss')]
+
+        defaults = splistList(defaults, 5)
+
+        for row, default in enumerate(defaults):
+            for col, (name, path) in enumerate(default):
+                Signals.themeItemAdded.emit(row, col, name, path)
+                QThread.msleep(100)
+                QThread.yieldCurrentThread()
+
+        Signals.themeItemAddFinished.emit()
+        AppLog.info('theme thread end')

Utils/Constants.py

@@ -9,11 +9,10 @@
 @file: Dialogs.SkinDialog
 @description: 
 """
-from PyQt5.QtCore import Qt
 
-from Widgets.Dialogs.MoveDialog import MoveDialog
 from UiFiles.Ui_SkinDialog import Ui_FormSkinDialog
 from Utils.ThemeManager import ThemeManager
+from Widgets.Dialogs.MoveDialog import MoveDialog
 
 
 __Author__ = "Irony"
@@ -31,6 +30,7 @@ def __init__(self, *args, **kwargs):
 #         self.setWindowFlags(self.windowFlags() | Qt.FramelessWindowHint)
         # 加载鼠标样式
         ThemeManager.loadCursor(self)
+        self.on_tabWidget_currentChanged(0)
 
     def on_tabWidget_currentChanged(self, index):
         self.tabWidget.widget(index).init()

Utils/ThemeThread.py

@@ -7,95 +7,26 @@
 @site: https://pyqt5.com https://github.com/892768447
 @email: 892768447@qq.com
 @file: Widgets.Skins.ColourfulWidget
-@description: 
+@description: 多彩控件
 """
-from PyQt5.QtCore import QSize, Qt
-from PyQt5.QtGui import QPainter, QBrush, QColor
-from PyQt5.QtWidgets import QWidget, QPushButton
 
-from UiFiles.Ui_ScrollArea import Ui_FormScrollArea
+from PyQt5.QtWidgets import QPushButton
+
 from Utils.CommonUtil import Signals
 from Utils.ThemeManager import ThemeManager
 from Utils.ThemeThread import ColourfulThread
+from Widgets.Skins.SkinBaseWidget import SkinBaseWidget, SkinBaseItemWidget,\
+    PixmapWidth, PixmapHeight
 
 
 __Author__ = "Irony"
 __Copyright__ = "Copyright (c) 2019"
 
-PixmapWidth = 158
-PixmapHeight = 152              # 图片大小
-MarginBottom = 26               # 底部文字
-
-
-class ColourfulItemWidget(QWidget):
-
-    def __init__(self, name, color, *args, **kwargs):
-        super(ColourfulItemWidget, self).__init__(*args, **kwargs)
-        # 加载鼠标样式
-        ThemeManager.loadCursor(self, ThemeManager.CursorPointer)
-        self.name = name
-        self.color = color
-        self.hovered = False
-        self.colorHover = QColor(0, 0, 0, 40)
-        self.textColor = QColor(102, 102, 102)
-
-    def mousePressEvent(self, event):
-        super(ColourfulItemWidget, self).mousePressEvent(event)
-        self.hovered = True
-        self.textColor = QColor(18, 183, 245)
-        self.update()
-
-    def mouseReleaseEvent(self, event):
-        super(ColourfulItemWidget, self).mouseReleaseEvent(event)
-        self.hovered = False
-        self.textColor = QColor(102, 102, 102)
-        self.update()
-        Signals.colourfulItemClicked.emit(self.name, self.color)
-
-    def enterEvent(self, event):
-        super(ColourfulItemWidget, self).enterEvent(event)
-        self.hovered = True
-        self.textColor = QColor(Qt.black)
-        self.update()
-
-    def leaveEvent(self, event):
-        super(ColourfulItemWidget, self).leaveEvent(event)
-        self.hovered = False
-        self.textColor = QColor(102, 102, 102)
-        self.update()
-
-    def paintEvent(self, event):
-        super(ColourfulItemWidget, self).paintEvent(event)
-        painter = QPainter(self)
-        painter.setRenderHint(QPainter.SmoothPixmapTransform)
-        # 绘制颜色方块
-        painter.save()
-        painter.setPen(Qt.NoPen)
-        painter.setBrush(QBrush(self.color))
-        painter.drawRoundedRect(
-            0, 0, PixmapWidth, PixmapHeight, 2, 2)
-        if self.hovered:
-            # 绘制一层灰色
-            painter.setBrush(QBrush(self.colorHover))
-            painter.drawRoundedRect(
-                0, 0, PixmapWidth, PixmapHeight, 2, 2)
-        painter.restore()
-        # 绘制文字
-        painter.setPen(self.textColor)
-        painter.drawText(0, 0, PixmapWidth, PixmapHeight + MarginBottom,
-                         Qt.AlignHCenter | Qt.AlignBottom, self.name)
-        painter.end()
-
-    def sizeHint(self):
-        return QSize(PixmapWidth, PixmapHeight + MarginBottom)
-
 
-class ColourfulWidget(QWidget, Ui_FormScrollArea):
+class ColourfulWidget(SkinBaseWidget):
 
     def __init__(self, *args, **kwargs):
         super(ColourfulWidget, self).__init__(*args, **kwargs)
-        self.setupUi(self)
-        self.setAttribute(Qt.WA_StyledBackground, True)
         Signals.colourfulItemAdded.connect(self.onColourfulItemAdded)
         Signals.colourfulItemAddFinished.connect(
             self.onColourfulItemAddFinished)
@@ -137,4 +68,4 @@ def onColourfulItemAdded(self, row, col, name, color):
         self.lastRow = row
         self.lastCol = col
         self.gridLayout.addWidget(
-            ColourfulItemWidget(name, color, self), row, col)
+            SkinBaseItemWidget(name, color, Signals.colourfulItemClicked, self), row, col)