Skip to content

P
PyQt Fluent Widgets

k54kdk / PyQt Fluent Widgets

通知 1
Star 0
Fork 0
P
PyQt Fluent Widgets
提交 47da1c47 编写于 作者: 之一Yo's avatar 之一Yo
浏览文件
操作

添加更换主题色的组件 `CustomColorSettingCard`

上级 9e4c096b
展开全部 显示空白变更内容
内联 并排
Showing with 24158 addition and 23904 deletion
examples/settings/resource/i18n/qfluentwidgets_hk.ts
浏览文件 @ 47da1c47
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="zh_HK">
<!-- The translation of components in PyQt-Fluent-Widgets -->
<context>
<TS version="2.1" language="zh_CN">
<!-- The translation of components in PyQt-Fluent-Widgets -->
<context>
<name>ColorDialog</name>
<message>
<source>OK</source>
......@@ -28,8 +28,8 @@
<source>Green</source>
<translation>綠色</translation>
</message>
</context>
<context>
</context>
<context>
<name>MessageDialog</name>
<message>
<source>OK</source>
......@@ -39,8 +39,8 @@
<source>Cancel</source>
<translation>取消</translation>
</message>
</context>
<context>
</context>
<context>
<name>Dialog</name>
<message>
<source>OK</source>
......@@ -50,8 +50,8 @@
<source>Cancel</source>
<translation>取消</translation>
</message>
</context>
<context>
</context>
<context>
<name>FolderListDialog</name>
<message>
<source>Done</source>
......@@ -70,11 +70,12 @@
<translation>如果將 </translation>
</message>
<message>
<source> folder and remove it from the list, the folder will no longer appear in the list, but will not be deleted.</source>
<source> folder and remove it from the list, the folder will no longer appear in the
list, but will not be deleted.</source>
<translation> 文件夾從列表中移除，則該文件夾不會再出現在列表中，但不會被刪除。</translation>
</message>
</context>
<context>
</context>
<context>
<name>SwitchSettingCard</name>
<message>
<source>Off</source>
......@@ -84,15 +85,30 @@
<source>On</source>
<translation>開</translation>
</message>
</context>
<context>
</context>
<context>
<name>CustomColorSettingCard</name>
<message>
<source>Custom color</source>
<translation>自定義顏色</translation>
</message>
<message>
<source>Default color</source>
<translation>默認顏色</translation>
</message>
<message>
<source>Choose color</source>
<translation>選擇顏色</translation>
</message>
</context>
<context>
<name>ColorPickerButton</name>
<message>
<source>Choose </source>
<translation>選擇</translation>
</message>
</context>
<context>
</context>
<context>
<name>FolderListSettingCard</name>
<message>
<source>Add folder</source>
......@@ -111,13 +127,14 @@
<translation>如果將 </translation>
</message>
<message>
<source> folder and remove it from the list, the folder will no longer appear in the list, but will not be deleted.</source>
<source> folder and remove it from the list, the folder will no longer appear in the
list, but will not be deleted.</source>
<translation> 文件夾從列表中移除，則該文件夾不會再出現在列表中，但不會被刪除。</translation>
</message>
</context>
</context>
<!-- Put the translation of your interface below -->
<context>
<!-- Put the translation of your interface below -->
<context>
<name>SettingInterface</name>
<message>
<source>Settings</source>
......@@ -145,16 +162,25 @@
</message>
<message>
<source>Use Acrylic effect</source>
<translation>啓用亞克力效果</translation>
<translation>啟用亞克力效果</translation>
</message>
<message>
<source>Acrylic effect has better visual experience, but it may cause the window to become stuck</source>
<source>Acrylic effect has better visual experience, but it may cause the window to
become stuck</source>
<translation>亞克力效果的視覺體驗更好，但可能導致窗口卡頓</translation>
</message>
<message>
<source>Application theme</source>
<translation>應用主題</translation>
</message>
<message>
<source>Theme color</source>
<translation>主題色</translation>
</message>
<message>
<source>Change the theme color of you application</source>
<translation>調整你的應用主題顏色</translation>
</message>
<message>
<source>Change the appearance of your application</source>
<translation>調整你的應用外觀</translation>
......@@ -292,17 +318,17 @@
<translation>PyQt-Fluent-Widgets 將在後臺繼續運行</translation>
</message>
<message>
<location filename="../../View/setting_interface/setting_interface.py" line="156"/>
<location filename="../../View/setting_interface/setting_interface.py" line="156" />
<source>Software update</source>
<translation>軟件更新</translation>
</message>
<message>
<source>Check for updates when the application starts</source>
<translation>在應用程序啓動時檢查更新</translation>
<translation>在應用程序啟動時檢查更新</translation>
</message>
<message>
<source>The new version will be more stable and have more features</source>
<translation>新版本將更加穩定並擁有更多功能（建議啓用此選項）</translation>
<translation>新版本將更加穩定並擁有更多功能（建議啟用此選項）</translation>
</message>
<message>
<source>About</source>
......@@ -314,7 +340,7 @@
</message>
<message>
<source>Discover new features and learn useful tips about PyQt-Fluent-Widgets</source>
<translation>發現新功能並瞭解有關 PyQt-Fluent-Widgets 的使用技巧</translation>
<translation>發現新功能並了解有關 PyQt-Fluent-Widgets 的使用技巧</translation>
</message>
<message>
<source>Provide feedback</source>
......@@ -342,7 +368,7 @@
</message>
<message>
<source>Configuration takes effect after restart</source>
<translation>配置在重啓軟件後生效</translation>
<translation>配置在重啟軟件後生效</translation>
</message>
</context>
</context>
</TS>
\ No newline at end of file
examples/settings/resource/i18n/qfluentwidgets_zh.ts
浏览文件 @ 47da1c47
......@@ -85,6 +85,21 @@
<translation>开</translation>
</message>
</context>
<context>
<name>CustomColorSettingCard</name>
<message>
<source>Custom color</source>
<translation>自定义颜色</translation>
</message>
<message>
<source>Default color</source>
<translation>默认颜色</translation>
</message>
<message>
<source>Choose color</source>
<translation>选择颜色</translation>
</message>
</context>
<context>
<name>ColorPickerButton</name>
<message>
......@@ -155,6 +170,14 @@
<source>Application theme</source>
<translation>应用主题</translation>
</message>
<message>
<source>Theme color</source>
<translation>主题色</translation>
</message>
<message>
<source>Change the theme color of you application</source>
<translation>调整你的应用主题颜色</translation>
</message>
<message>
<source>Change the appearance of your application</source>
<translation>调整你的应用外观</translation>
......
examples/settings/setting_interface.py
浏览文件 @ 47da1c47
......@@ -3,7 +3,8 @@ from config import cfg, HELP_URL, FEEDBACK_URL, AUTHOR, VERSION, YEAR
from qfluentwidgets import (SettingCardGroup, SwitchSettingCard, FolderListSettingCard,
OptionsSettingCard, RangeSettingCard, PushSettingCard,
ColorSettingCard, HyperlinkCard, PrimaryPushSettingCard, ScrollArea,
ComboBoxSettingCard, ExpandLayout, Theme, ToastToolTip, setTheme, setThemeColor)
ComboBoxSettingCard, ExpandLayout, Theme, ToastToolTip, CustomColorSettingCard,
setTheme, setThemeColor)
from qfluentwidgets import FluentIcon as FIF
from PyQt5.QtCore import Qt, pyqtSignal, QUrl, QStandardPaths
from PyQt5.QtGui import QDesktopServices
......@@ -64,6 +65,13 @@ class SettingInterface(ScrollArea):
],
parent=self.personalGroup
)
self.themeColorCard=CustomColorSettingCard(
cfg.themeColor,
FIF.PALETTE,
self.tr('Theme color'),
self.tr('Change the theme color of you application'),
self.personalGroup
)
self.zoomCard = OptionsSettingCard(
cfg.dpiScale,
FIF.ZOOM,
......@@ -221,6 +229,7 @@ class SettingInterface(ScrollArea):
self.personalGroup.addSettingCard(self.enableAcrylicCard)
self.personalGroup.addSettingCard(self.themeCard)
self.personalGroup.addSettingCard(self.themeColorCard)
self.personalGroup.addSettingCard(self.zoomCard)
self.personalGroup.addSettingCard(self.languageCard)
......@@ -309,6 +318,7 @@ class SettingInterface(ScrollArea):
# personalization
self.enableAcrylicCard.checkedChanged.connect(
self.acrylicEnableChanged)
self.themeColorCard.colorChanged.connect(setThemeColor)
# playing interface
self.deskLyricFontCard.clicked.connect(self.__onDeskLyricFontCardClicked)
......
qfluentwidgets/_rc/qss/dark/expand_setting_card.qss
浏览文件 @ 47da1c47
......@@ -63,6 +63,12 @@ QPushButton:pressed {
color: rgba(255, 255, 255, 0.63);
}
QPushButton:disabled {
color: rgb(102, 102, 102);
background: rgb(59, 59, 59);
border: 1px solid rgb(80, 80, 80);
}
/* Tool button */
ToolButton {
......@@ -150,3 +156,7 @@ QRadioButton::indicator:disabled {
border: 2px solid #646464;
background-color: transparent;
}
#chooseColorButton {
padding: 5px 17px 5px 17px;
}
\ No newline at end of file
qfluentwidgets/_rc/qss/light/expand_setting_card.qss
浏览文件 @ 47da1c47
......@@ -63,6 +63,12 @@ QPushButton:pressed {
color: rgba(0, 0, 0, 0.63);
}
QPushButton:disabled {
color: rgb(162, 162, 162);
background: rgb(252, 252, 252);
border: 1px solid rgb(223, 223, 223);
}
/* Tool button */
ToolButton {
......@@ -150,3 +156,7 @@ QRadioButton::indicator:disabled {
border: 2px solid #bbbbbb;
background-color: rgba(0, 0, 0, 0);
}
#chooseColorButton {
padding: 5px 17px 5px 17px;
}
qfluentwidgets/_rc/resource.py
浏览文件 @ 47da1c47
此差异已折叠。
qfluentwidgets/common/config.py
浏览文件 @ 47da1c47
......@@ -187,6 +187,7 @@ class ConfigItem:
self.__value = default
self.value = default
self.restart = restart
self.defaultValue = self.validator.correct(default)
@property
def value(self):
......
qfluentwidgets/components/settings/__init__.py
浏览文件 @ 47da1c47
from .setting_card import (SettingCard, SwitchSettingCard, RangeSettingCard,
PushSettingCard, ColorSettingCard, HyperlinkCard,
PrimaryPushSettingCard, ColorPickerButton, ComboBoxSettingCard)
from .expand_setting_card import ExpandSettingCard
from .expand_setting_card import ExpandSettingCard, ExpandGroupSettingCard
from .folder_list_setting_card import FolderListSettingCard
from .options_setting_card import OptionsSettingCard
from .custom_color_setting_card import CustomColorSettingCard
from .setting_card_group import SettingCardGroup
\ No newline at end of file
qfluentwidgets/components/settings/custom_color_setting_card.py 0 → 100644
浏览文件 @ 47da1c47
# coding:utf-8
from typing import Union
from PyQt5.QtCore import Qt, pyqtSignal
from PyQt5.QtGui import QIcon, QColor
from PyQt5.QtWidgets import (QWidget, QRadioButton, QLabel, QButtonGroup,
QVBoxLayout, QPushButton, QHBoxLayout)
from ..dialog_box import ColorDialog
from .expand_setting_card import ExpandGroupSettingCard
from ...common.config import qconfig, ColorConfigItem
from ...common.icon import FluentIconBase
class CustomColorSettingCard(ExpandGroupSettingCard):
""" Custom color setting card """
colorChanged = pyqtSignal(QColor)
def __init__(self, configItem: ColorConfigItem, icon: Union[str, QIcon, FluentIconBase], title: str,
content=None, parent=None):
"""
Parameters
----------
configItem: ColorConfigItem
options config item
icon: str | QIcon | FluentIconBase
the icon to be drawn
title: str
the title of setting card
content: str
the content of setting card
parent: QWidget
parent window
"""
super().__init__(icon, title, content, parent=parent)
self.configItem = configItem
self.defaultColor = QColor(configItem.defaultValue)
self.customColor = QColor(qconfig.get(configItem))
self.choiceLabel = QLabel(self)
self.radioWidget = QWidget(self.view)
self.radioLayout = QVBoxLayout(self.radioWidget)
self.defaultRadioButton = QRadioButton(
self.tr('Default color'), self.radioWidget)
self.customRadioButton = QRadioButton(
self.tr('Custom color'), self.radioWidget)
self.buttonGroup = QButtonGroup(self)
self.customColorWidget = QWidget(self.view)
self.customColorLayout = QHBoxLayout(self.customColorWidget)
self.customLabel = QLabel(
self.tr('Custom color'), self.customColorWidget)
self.chooseColorButton = QPushButton(
self.tr('Choose color'), self.customColorWidget)
self.__initWidget()
def __initWidget(self):
self.__initLayout()
if self.defaultColor != self.customColor:
self.customRadioButton.setChecked(True)
self.chooseColorButton.setEnabled(True)
else:
self.defaultRadioButton.setChecked(True)
self.chooseColorButton.setEnabled(False)
self.choiceLabel.setText(self.buttonGroup.checkedButton().text())
self.choiceLabel.adjustSize()
self.chooseColorButton.setObjectName('chooseColorButton')
self.buttonGroup.buttonClicked.connect(self.__onRadioButtonClicked)
self.chooseColorButton.clicked.connect(self.__showColorDialog)
def __initLayout(self):
self.addWidget(self.choiceLabel)
self.radioLayout.setSpacing(19)
self.radioLayout.setAlignment(Qt.AlignTop)
self.radioLayout.setContentsMargins(48, 18, 0, 18)
self.buttonGroup.addButton(self.customRadioButton)
self.buttonGroup.addButton(self.defaultRadioButton)
self.radioLayout.addWidget(self.customRadioButton)
self.radioLayout.addWidget(self.defaultRadioButton)
self.radioLayout.setSizeConstraint(QVBoxLayout.SetMinimumSize)
self.customColorLayout.setContentsMargins(48, 18, 44, 18)
self.customColorLayout.addWidget(self.customLabel, 0, Qt.AlignLeft)
self.customColorLayout.addWidget(self.chooseColorButton, 0, Qt.AlignRight)
self.customColorLayout.setSizeConstraint(QHBoxLayout.SetMinimumSize)
self.viewLayout.setSpacing(0)
self.viewLayout.setContentsMargins(0, 0, 0, 0)
self.addGroupWidget(self.radioWidget)
self.addGroupWidget(self.customColorWidget)
self._adjustViewSize()
def __onRadioButtonClicked(self, button: QRadioButton):
""" radio button clicked slot """
if button.text() == self.choiceLabel.text():
return
self.choiceLabel.setText(button.text())
self.choiceLabel.adjustSize()
if button is self.defaultRadioButton:
self.chooseColorButton.setDisabled(True)
qconfig.set(self.configItem, self.defaultColor)
if self.defaultColor != self.customColor:
self.colorChanged.emit(self.defaultColor)
else:
self.chooseColorButton.setDisabled(False)
qconfig.set(self.configItem, self.customColor)
if self.defaultColor != self.customColor:
self.colorChanged.emit(self.customColor)
def __showColorDialog(self):
""" show color dialog """
w = ColorDialog(qconfig.get(self.configItem),
self.tr('Choose color'), self.window())
w.updateStyle()
w.colorChanged.connect(self.__onCustomColorChanged)
w.exec()
def __onCustomColorChanged(self, color):
""" custom color changed slot """
qconfig.set(self.configItem, color)
self.customColor = QColor(color)
self.colorChanged.emit(color)
qfluentwidgets/components/settings/expand_setting_card.py
浏览文件 @ 47da1c47
......@@ -198,3 +198,34 @@ class ExpandSettingCard(QFrame):
if self.view.isVisible():
self.resize(self.width(), h + self.card.height())
class GroupSeparator(QWidget):
""" group separator """
def __init__(self, parent=None):
super().__init__(parent=parent)
self.setFixedHeight(3)
def paintEvent(self, e):
painter = QPainter(self)
c = 35 if isDarkTheme() else 230
painter.setPen(QColor(c, c, c))
painter.drawLine(0, 1, self.width(), 1)
class ExpandGroupSettingCard(ExpandSettingCard):
""" Expand group setting card """
def addGroupWidget(self, widget: QWidget):
""" add widget to group """
if widget in self.viewLayout.widgets:
return
# add separator
if self.viewLayout.count() >= 1:
self.viewLayout.addWidget(GroupSeparator(self.view))
widget.setParent(self.view)
self.viewLayout.addWidget(widget)
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或