apply theme

Author: 892768447

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

@@ -9,6 +9,7 @@ encoding//Test/TestColorThief.py=utf-8
 encoding//Test/TestDownProgress.py=utf-8
 encoding//Test/TestGitTree.py=utf-8
 encoding//Test/TestGradientUtils.py=utf-8
+encoding//Test/TestLoadGradientFile.py=utf-8
 encoding//Test/TestMainwindowStyle.py=utf-8
 encoding//Test/TestPreviewWidget.py=utf-8
 encoding//Test/TestPropertyAnimation.py=utf-8

Resources/Themes/Default/style.qss

@@ -86,7 +86,7 @@ QLineEdit {
     max-width: 130px;
     max-height: 130px;
     background: transparent;
-    qproperty-shadowColor: rgba(33, 33, 33, 255);
+    qproperty-shadowColor: rgba(255, 255, 255, 255);
     qproperty-image: "Resources/Images/Avatars/avatar.png";
 }
 

Test/TestLoadGradientFile.py

@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Created on 2019年2月1日
+@author: Irony
+@site: https://pyqt5.com https://github.com/892768447
+@email: 892768447@qq.com
+@file: Test.TestLoadGradientFile
+@description: 
+"""
+from PyQt5.QtCore import QSettings, Qt
+from PyQt5.QtGui import QLinearGradient
+from PyQt5.QtWidgets import QWidget
+
+from Utils.GradientUtils import GradientUtils
+
+
+__Author__ = 'Irony'
+__Copyright__ = 'Copyright (c) 2019'
+
+
+class Window(QWidget):
+
+    def __init__(self, *args, **kwargs):
+        super(Window, self).__init__(*args, **kwargs)
+        self.setAttribute(Qt.WA_StyledBackground, True)
+
+        setting = QSettings('gradient.ini', QSettings.IniFormat)
+        setting.setIniCodec('UTF-8')
+
+        gradient = setting.value('gradient')
+        print(gradient)
+        if gradient:
+            gradient = GradientUtils.toGradient(gradient)
+            print(gradient)
+            gradient = GradientUtils.styleSheetCode(gradient)
+            print(gradient)
+            self.setStyleSheet('background: {};'.format(gradient))
+
+        gradient = QLinearGradient(0, 0, 1, 1)
+        gradient.setColorAt(0, Qt.red)
+        gradient.setColorAt(0.5, Qt.green)
+        gradient.setColorAt(1, Qt.blue)
+
+        gradient = GradientUtils.toJson(gradient)
+        print(gradient)
+        setting.setValue('gradient', gradient)
+        setting.sync()
+
+
+if __name__ == '__main__':
+    import sys
+    from PyQt5.QtWidgets import QApplication
+    app = QApplication(sys.argv)
+    w = Window()
+    w.show()
+    sys.exit(app.exec_())

Test/gradient.ini

@@ -0,0 +1,2 @@
+[General]
+gradient=@Variant(\0\0\0\b\0\0\0\x5\0\0\0\b\0t\0y\0p\0\x65\0\0\0\x2\0\0\0\0\0\0\0\n\0s\0t\0o\0p\0s\0\0\0\t\0\0\0\x3\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\0V\x80\x3G\0\0\0\0\0\0\0\0\x63sip\n_unpickle_type\nq\0X\v\0\0\0PyQt5.QtGuiq\x1X\x6\0\0\0QColorq\x2(K\xffK\0K\0K\xfftq\x3\x87q\x4Rq\x5\x86q\x6.\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\0V\x80\x3G?\xe0\0\0\0\0\0\0\x63sip\n_unpickle_type\nq\0X\v\0\0\0PyQt5.QtGuiq\x1X\x6\0\0\0QColorq\x2(K\0K\xffK\0K\xfftq\x3\x87q\x4Rq\x5\x86q\x6.\0\0\0\x7f\0\0\0\xePyQt_PyObject\0\0\0\0V\x80\x3G?\xf0\0\0\0\0\0\0\x63sip\n_unpickle_type\nq\0X\v\0\0\0PyQt5.QtGuiq\x1X\x6\0\0\0QColorq\x2(K\0K\0K\xffK\xfftq\x3\x87q\x4Rq\x5\x86q\x6.\0\0\0\n\0s\0t\0\x61\0r\0t\0\0\0\x1a\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\f\0s\0p\0r\0\x65\0\x61\0\x64\0\0\0\x2\0\0\0\0\0\0\0\x12\0\x66\0i\0n\0\x61\0l\0S\0t\0o\0p\0\0\0\x1a?\xf0\0\0\0\0\0\0?\xf0\0\0\0\0\0\0)

Utils/GradientUtils.py

@@ -9,7 +9,9 @@
 @file: Utils.GradientUtils
 @description: 渐变颜色工具类
 """
-from PyQt5.QtGui import QGradient, QColor
+from PyQt5.QtCore import QPointF
+from PyQt5.QtGui import QGradient, QColor, QLinearGradient, QRadialGradient,\
+    QConicalGradient
 
 
 __Author__ = 'Irony'
@@ -98,6 +100,44 @@ def _styleSheetFillName(cls, gradient):
                   gradient.type(), ' not supported!')
             return ''
 
+    @classmethod
+    def toJson(cls, gradient):
+        """把渐变转成字典
+        :param cls:
+        :param gradient:    渐变
+        """
+        return {
+            'type': gradient.type(),
+            'spread': gradient.spread(),
+            'start': gradient.start(),
+            'finalStop': QPointF(1, 1) if hasattr(gradient, 'ex') else gradient.finalStop(),
+            'stops': gradient.stops()
+        }
+
+    @classmethod
+    def toGradient(cls, data):
+        """把字典转成渐变
+        :param cls:
+        :param data:        字典数据
+        """
+        gtype = data.get('type', -1)
+        if gtype == QGradient.LinearGradient:
+            gradient = QLinearGradient()
+        elif gtype == QGradient.RadialGradient:
+            gradient = QRadialGradient()
+        elif gtype == QGradient.ConicalGradient:
+            gradient = QConicalGradient()
+        else:
+            gradient = QLinearGradient()
+        gradient.setSpread(data.get('spread', QGradient.PadSpread))
+        gradient.setStart(data.get('start', QPointF(0, 0)))
+        gradient.setFinalStop(data.get('finalStop', QPointF(1, 1)))
+        stops = data.get('stops', None)
+        if stops:
+            gradient.setStops(stops)
+
+        return gradient
+
     @classmethod
     def styleSheetCode(cls, colorgradient):
         """颜色或渐变转字符串

Utils/ThemeManager.py

@@ -48,7 +48,7 @@
 
 /*工具栏*/
 #widgetTools {{
-    background-color: rgba({0}, {1}, {2}, 20);
+    background-color: rgba({0}, {1}, {2}, 60);
 }}
 
 /*工具栏中的按钮*/
@@ -155,7 +155,7 @@
 
 /*工具栏*/
 #widgetTools {{
-    background-color: rgba({0}, {1}, {2}, 20);
+    background-color: rgba({0}, {1}, {2}, 60);
 }}
 
 /*工具栏中的按钮*/

Widgets/MainWindowBase.py

@@ -13,13 +13,16 @@
 import webbrowser
 
 from PyQt5.QtCore import pyqtSlot, QUrl
+from PyQt5.QtGui import QColor
 from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtWebKitWidgets import QWebPage
 
 from Utils import Constants
-from Utils.CommonUtil import Signals
+from Utils.CommonUtil import Signals, Setting, AppLog
+from Utils.GradientUtils import GradientUtils
 from Utils.NetworkAccessManager import NetworkAccessManager
 from Utils.ThemeManager import ThemeManager
+from Widgets.Dialogs.SkinDialog import SkinDialog
 from Widgets.ToolTip import ToolTip
 
 
@@ -36,8 +39,6 @@ def _initUi(self):
         self.buttonNormal.setVisible(False)
         # 隐藏目录树的滑动条
         self.treeViewCatalogs.verticalScrollBar().setVisible(False)
-        # 加载主题
-        ThemeManager.loadTheme()
         # 加载鼠标样式
         ThemeManager.loadCursor(self.widgetMain)
         ThemeManager.setPointerCursors([
@@ -56,6 +57,22 @@ def _initUi(self):
         ToolTip.bind(self.buttonHome)
         # 头像提示控件
         ToolTip.bind(self.buttonHead)
+        # 加载主题
+        colourful = Setting.value('colourful')
+        picture = Setting.value('picture', '', str)
+        AppLog.debug('colourful: %s', str(colourful))
+        AppLog.debug('picture: %s', picture)
+        if picture:
+            ThemeManager.loadPictureTheme(picture)
+        elif colourful:
+            if isinstance(picture, QColor):
+                ThemeManager.loadColourfulTheme(colourful)
+            else:
+                # json数据转渐变
+                ThemeManager.loadColourfulTheme(
+                    GradientUtils.toGradient(colourful))
+        else:
+            ThemeManager.loadTheme()
 
     def _initSignals(self):
         """初始化信号槽"""
@@ -94,7 +111,9 @@ def _initWebView(self):
     def on_buttonSkin_clicked(self):
         """选择主题样式
         """
-        pass
+        if not hasattr(self, 'skinDialog'):
+            self.skinDialog = SkinDialog(self)
+        self.skinDialog.exec_()
 
     @pyqtSlot()
     def on_buttonIssues_clicked(self):

Widgets/Skins/PreviewWidget.py

@@ -12,12 +12,13 @@
 import os
 
 from PyQt5.QtCore import Qt, pyqtSlot, QTimer
-from PyQt5.QtGui import QPixmap
+from PyQt5.QtGui import QPixmap, QColor
 from PyQt5.QtWidgets import QWidget, QGraphicsDropShadowEffect
 
 from UiFiles.Ui_MainWindow import Ui_FormMainWindow
 from UiFiles.Ui_PreviewWidget import Ui_FormPreviewWidget
 from Utils.CommonUtil import Setting
+from Utils.GradientUtils import GradientUtils
 from Utils.ThemeManager import ThemeManager
 
 
@@ -109,9 +110,17 @@ def on_buttonPreviewApply_clicked(self):
         if self._which == self.Theme:
             ThemeManager.loadUserTheme(
                 os.path.basename(os.path.dirname(self._poc)))
+            Setting.setValue('picture', None)
+            Setting.setValue('colourful', None)
         elif self._which == self.Color:
             ThemeManager.loadColourfulTheme(self._poc)
-            Setting.setValue('colourful', self._poc)
+            if isinstance(self._poc, QColor):
+                Setting.setValue('colourful', self._poc)
+            else:
+                # 渐变需要转成字典数据
+                Setting.setValue('colourful', GradientUtils.toJson(self._poc))
+            Setting.setValue('picture', None)
         elif self._which == self.Picture:
             ThemeManager.loadPictureTheme(self._poc)
-            Setting.setValue('picture', self._poc)
+            Setting.setValue('colourful', None)
+            Setting.setValue('picture', self._poc.replace('\\', '/'))