p53209761
/
qt5-ukui-platformtheme
forked from openkylin/qt5-ukui-platformtheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

将button里之前一些转换来的颜色提取到配置文件

This commit is contained in:
tanjing 2024-01-09 16:45:49 +08:00
parent fb43970942
commit d6b765e21c
9 changed files with 364 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
ukui-styles/qt5-config-style-ukui/themeconfig/classical.json
View File

@ -74,12 +74,14 @@
"PushButton":{ "PushButton":{
"DefaultPushButton":{ "DefaultPushButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "187, 187, 187", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_iat", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "NoRole_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -90,7 +92,8 @@
"ClickPen" : {"value": "161, 0, 12", "type": "color"}, "ClickPen" : {"value": "161, 0, 12", "type": "color"},
"FocusPen" : {"value": "207, 20, 34", "type": "color"}, "FocusPen" : {"value": "207, 20, 34", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -98,45 +101,54 @@
"DisableBrush" : {"value": "Button_iat", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "187, 187, 187", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_at", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "NoRole_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "187, 187, 187", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_at", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "NoRole_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "187, 187, 187", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_iat", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "NoRole_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"ToolButton":{ "ToolButton":{
"DefaultToolButton":{ "DefaultToolButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "187, 187, 187", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_iat", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "NoRole_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -147,7 +159,8 @@
"ClickPen" : {"value": "161, 0, 12", "type": "color"}, "ClickPen" : {"value": "161, 0, 12", "type": "color"},
"FocusPen" : {"value": "207, 20, 34", "type": "color"}, "FocusPen" : {"value": "207, 20, 34", "type": "color"},
"TextColor" : {"value": "HighLightText_at", "type": "paletterole"}, "TextColor" : {"value": "HighLightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "HighLightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "HighLightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -155,34 +168,41 @@
"DisableBrush" : {"value": "Button_iat", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "187, 187, 187", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_at", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "NoRole_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "187, 187, 187", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_at", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "NoRole_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "187, 187, 187", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_iat", "type": "paletterole"}, "DisableBrush" : {"value": "Button_iat", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "NoRole_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"LineEdit":{ "LineEdit":{
@ -477,12 +497,14 @@
"PushButton":{ "PushButton":{
"DefaultPushButton":{ "DefaultPushButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "89, 89, 89", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "89, 89, 89", "type": "color"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -493,7 +515,8 @@
"ClickPen" : {"value": "161, 0, 12", "type": "color"}, "ClickPen" : {"value": "161, 0, 12", "type": "color"},
"FocusPen" : {"value": "161, 0, 12", "type": "color"}, "FocusPen" : {"value": "161, 0, 12", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -501,45 +524,54 @@
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "89, 89, 89", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "89, 89, 89", "type": "color"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "89, 89, 89", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "89, 89, 89", "type": "color"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "89, 89, 89", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "89, 89, 89", "type": "color"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"ToolButton":{ "ToolButton":{
"DefaultToolButton":{ "DefaultToolButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "89, 89, 89", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "89, 89, 89", "type": "color"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -550,7 +582,8 @@
"ClickPen" : {"value": "161, 0, 12", "type": "color"}, "ClickPen" : {"value": "161, 0, 12", "type": "color"},
"FocusPen" : {"value": "161, 0, 12", "type": "color"}, "FocusPen" : {"value": "161, 0, 12", "type": "color"},
"TextColor" : {"value": "AlternateBase_at", "type": "paletterole"}, "TextColor" : {"value": "AlternateBase_at", "type": "paletterole"},
"TextHoverColor" : {"value": "AlternateBase_at", "type": "paletterole"} "TextHoverColor" : {"value": "AlternateBase_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -558,25 +591,30 @@
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "89, 89, 89", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "89, 89, 89", "type": "color"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"DefaultPen" : {"value": "89, 89, 89", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"DisablePen" : {"value": "Button_dis", "type": "paletterole"}, "DisablePen" : {"value": "89, 89, 89", "type": "color"},
"FocusPen" : {"value": "HighLight_iat", "type": "paletterole"}, "FocusPen" : {"value": "HighLight_iat", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"LineEdit":{ "LineEdit":{

96
ukui-styles/qt5-config-style-ukui/themeconfig/default.json
View File

@ -77,7 +77,8 @@
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -85,7 +86,8 @@
"ClickBrush" : {"value": "204, 18, 34", "type": "color"}, "ClickBrush" : {"value": "204, 18, 34", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -93,27 +95,33 @@
"ClickBrush" : {"value": "0, 0, 0, 0.15", "type": "color"}, "ClickBrush" : {"value": "0, 0, 0, 0.15", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"value": "Midlight_at", "type": "paletterole"},
"ClickBrush" : {"value": "184, 184, 184", "type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "Base_at", "type": "paletterole"}, "TextColor" : {"value": "Base_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0.1", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0.1", "type": "color"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"value": "0, 0, 0, 0.16", "type": "color"},
"ClickBrush" : {"value": "0, 0, 0, 0.20", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"ToolButton":{ "ToolButton":{
@ -122,7 +130,8 @@
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -130,7 +139,8 @@
"ClickBrush" : {"value": "204, 18, 34", "type": "color"}, "ClickBrush" : {"value": "204, 18, 34", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -138,27 +148,33 @@
"ClickBrush" : {"value": "0, 0, 0, 0.15", "type": "color"}, "ClickBrush" : {"value": "0, 0, 0, 0.15", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"value": "Midlight_at", "type": "paletterole"},
"ClickBrush" : {"value": "184, 184, 184", "type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "Base_at", "type": "paletterole"}, "TextColor" : {"value": "Base_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0.1", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0.1", "type": "color"},
"HoverBrush" : { "type": "color"}, "HoverBrush" : {"value": "0, 0, 0, 0.16", "type": "color"},
"ClickBrush" : {"value": "0, 0, 0, 0.20", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"LineEdit":{ "LineEdit":{
@ -497,7 +513,8 @@
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -505,7 +522,8 @@
"ClickBrush" : {"value": "204, 18, 34", "type": "color"}, "ClickBrush" : {"value": "204, 18, 34", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"}, "DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
@ -513,27 +531,33 @@
"ClickBrush" : {"value": "255, 255, 255, 0.10", "type": "color"}, "ClickBrush" : {"value": "255, 255, 255, 0.10", "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"}, "DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"value": "95, 95, 95", "type": "color"},
"ClickBrush" : {"value": "65, 65, 65", "type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "255, 255, 255, 0.1", "type": "color"}, "DefaultBrush" : {"value": "255, 255, 255, 0.1", "type": "color"},
"HoverBrush" : { "type": "color"}, "HoverBrush" : {"value": "255, 255, 255, 0.2", "type": "color"},
"ClickBrush" : {"value": "255, 255, 255, 0.3", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"ToolButton":{ "ToolButton":{
@ -542,7 +566,8 @@
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -550,7 +575,8 @@
"ClickBrush" : {"value": "204, 18, 34", "type": "color"}, "ClickBrush" : {"value": "204, 18, 34", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"}, "DefaultBrush" : {"value": "255, 255, 255, 0", "type": "color"},
@ -558,27 +584,33 @@
"ClickBrush" : {"value": "255, 255, 255, 0.10", "type": "color"}, "ClickBrush" : {"value": "255, 255, 255, 0.10", "type": "color"},
"DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"}, "DisableBrush" : {"value": "255, 255, 255, 0", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"value": "95, 95, 95", "type": "color"},
"ClickBrush" : {"value": "65, 65, 65", "type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"HoverBrush" : {"type": "color"}, "HoverBrush" : {"type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "255, 255, 255, 0.1", "type": "color"}, "DefaultBrush" : {"value": "255, 255, 255, 0.1", "type": "color"},
"HoverBrush" : { "type": "color"}, "HoverBrush" : {"value": "255, 255, 255, 0.2", "type": "color"},
"ClickBrush" : {"value": "255, 255, 255, 0.3", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"LineEdit":{ "LineEdit":{

92
ukui-styles/qt5-config-style-ukui/themeconfig/fashion.json
View File

@ -77,7 +77,8 @@
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -85,7 +86,8 @@
"ClickBrush" : {"value": "198, 42, 63", "type": "color"}, "ClickBrush" : {"value": "198, 42, 63", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -93,27 +95,35 @@
"ClickBrush" : {"value": "191, 191, 191", "type": "color"}, "ClickBrush" : {"value": "191, 191, 191", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"value": "218, 218, 218 ~ 184, 184, 184", "type": "gradient"},
"ClickBrush" : {"value": "191, 191, 191", "type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "Base_at", "type": "paletterole"}, "TextColor" : {"value": "Base_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "38, 38, 38, 0.10", "type": "color"}, "DefaultBrush" : {"value": "115, 115, 115, 0.2", "type": "color"},
"HoverBrush" : { "type": "gradient"}, "HoverBrush" : {"value": "115, 115, 115, 0.2 ~ 77, 77, 77, 0.2", "type": "gradient"},
"ClickBrush" : {"value": "77, 77, 77, 0.3", "type": "color"},
"DisableBrush" : {"value": "38, 38, 38, 0.1", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"ToolButton":{ "ToolButton":{
@ -122,7 +132,8 @@
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -130,7 +141,8 @@
"ClickBrush" : {"value": "198, 42, 63", "type": "color"}, "ClickBrush" : {"value": "198, 42, 63", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -138,27 +150,34 @@
"ClickBrush" : {"value": "191, 191, 191", "type": "color"}, "ClickBrush" : {"value": "191, 191, 191", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"value": "218, 218, 218 ~ 184, 184, 184", "type": "gradient"},
"ClickBrush" : {"value": "191, 191, 191", "type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "ButtonText_at", "type": "paletterole"}, "TextColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"} "TextHoverColor" : {"value": "ButtonText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "Base_at", "type": "paletterole"}, "TextColor" : {"value": "Base_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "38, 38, 38, 0.10", "type": "color"}, "DefaultBrush" : {"value": "38, 38, 38, 0.10", "type": "color"},
"HoverBrush" : { "type": "gradient"}, "HoverBrush" : {"value": "115, 115, 115, 0.2 ~ 77, 77, 77, 0.2", "type": "gradient"},
"ClickBrush" : {"value": "77, 77, 77, 0.3", "type": "color"},
"DisableBrush" : {"value": "38, 38, 38, 0.1", "type": "color"},
"TextColor" : {"value": "Base_at", "type": "paletterole"}, "TextColor" : {"value": "Base_at", "type": "paletterole"},
"TextHoverColor" : {"value": "Base_at", "type": "paletterole"} "TextHoverColor" : {"value": "Base_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"LineEdit":{ "LineEdit":{
@ -490,7 +509,8 @@
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -498,7 +518,8 @@
"ClickBrush" : {"value": "198, 42, 63", "type": "color"}, "ClickBrush" : {"value": "198, 42, 63", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -506,21 +527,25 @@
"ClickBrush" : {"value": "95, 95, 95", "type": "color"}, "ClickBrush" : {"value": "95, 95, 95", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"value": "95, 95, 95 ~ 65, 65, 65", "type": "gradient"},
"ClickBrush" : {"value": "95, 95, 95", "type": "color"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "217, 217, 217, 0.15", "type": "color"}, "DefaultBrush" : {"value": "217, 217, 217, 0.15", "type": "color"},
@ -528,7 +553,8 @@
"ClickBrush" : {"value": "255, 255, 255, 0.3", "type": "color"}, "ClickBrush" : {"value": "255, 255, 255, 0.3", "type": "color"},
"DisableBrush" : {"value": "217, 217, 217, 0.15", "type": "color"}, "DisableBrush" : {"value": "217, 217, 217, 0.15", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"ToolButton":{ "ToolButton":{
@ -537,7 +563,8 @@
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowCloseButton":{ "WindowCloseButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -545,7 +572,8 @@
"ClickBrush" : {"value": "198, 42, 63", "type": "color"}, "ClickBrush" : {"value": "198, 42, 63", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"WindowButton":{ "WindowButton":{
"DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DefaultBrush" : {"value": "0, 0, 0, 0", "type": "color"},
@ -553,21 +581,24 @@
"ClickBrush" : {"value": "95, 95, 95", "type": "color"}, "ClickBrush" : {"value": "95, 95, 95", "type": "color"},
"DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"}, "DisableBrush" : {"value": "0, 0, 0, 0", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"UseButtonPalette":{ "UseButtonPalette":{
"DefaultBrush" : {"value": "Button_at", "type": "paletterole"}, "DefaultBrush" : {"value": "Button_at", "type": "paletterole"},
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"ImportButton":{ "ImportButton":{
"DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"}, "DefaultBrush" : {"value": "HighLight_at", "type": "paletterole"},
"HoverBrush" : {"type": "gradient"}, "HoverBrush" : {"type": "gradient"},
"DisableBrush" : {"value": "Button_dis", "type": "paletterole"}, "DisableBrush" : {"value": "Button_dis", "type": "paletterole"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
}, },
"TranslucentButton":{ "TranslucentButton":{
"DefaultBrush" : {"value": "217, 217, 217, 0.15", "type": "color"}, "DefaultBrush" : {"value": "217, 217, 217, 0.15", "type": "color"},
@ -575,7 +606,8 @@
"ClickBrush" : {"value": "255, 255, 255, 0.3", "type": "color"}, "ClickBrush" : {"value": "255, 255, 255, 0.3", "type": "color"},
"DisableBrush" : {"value": "217, 217, 217, 0.15", "type": "color"}, "DisableBrush" : {"value": "217, 217, 217, 0.15", "type": "color"},
"TextColor" : {"value": "BrightText_at", "type": "paletterole"}, "TextColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"} "TextHoverColor" : {"value": "BrightText_at", "type": "paletterole"},
"TextDisableColor" : {"value": "ButtonText_dis", "type": "paletterole"}
} }
}, },
"LineEdit":{ "LineEdit":{

280
ukui-styles/qt5-config-style-ukui/ukui-config-style-parameters.cpp
View File

@ -678,6 +678,8 @@ void UKUIConfigStyleParameters::initConfigPushButtonBevelParameters(bool isDark,
bool useButtonPalette = false; bool useButtonPalette = false;
bool needTranslucent = false; bool needTranslucent = false;
qDebug() << "aaaaaaaaaaaa";
UKUIColorTheme::ButtonColorCfg buttonColorCfg = readCfg()->buttonColorCfg(option->palette); UKUIColorTheme::ButtonColorCfg buttonColorCfg = readCfg()->buttonColorCfg(option->palette);
if (widget) { if (widget) {
@ -726,6 +728,7 @@ void UKUIConfigStyleParameters::initConfigPushButtonBevelParameters(bool isDark,
QLinearGradient linearGradient; QLinearGradient linearGradient;
linearGradient.setStart(option->rect.topLeft()); linearGradient.setStart(option->rect.topLeft());
linearGradient.setFinalStop(option->rect.bottomLeft()); linearGradient.setFinalStop(option->rect.bottomLeft());
qDebug() << "bbbbbbbbbbbbb";
QColor highlight = option->palette.color(QPalette::Active, QPalette::Highlight); QColor highlight = option->palette.color(QPalette::Active, QPalette::Highlight);
@ -754,34 +757,23 @@ void UKUIConfigStyleParameters::initConfigPushButtonBevelParameters(bool isDark,
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
disablePen = QPen(QBrush(buttonColorCfg.disablePen), (buttonColorCfg.disablePen == Qt::NoPen || buttonColorCfg.disablePen.alpha() == 0) disablePen = QPen(QBrush(buttonColorCfg.disablePen), (buttonColorCfg.disablePen == Qt::NoPen || buttonColorCfg.disablePen.alpha() == 0)
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
qDebug() << "ccccccccccccccccccc";
if (isWindowColoseButton) { if (isWindowColoseButton) {
if (buttonColorCfg.hoverType == Obj_Color_Type) { if (buttonColorCfg.hoverType == Obj_Gradient_Type){
hoverBrush = buttonColorCfg.hoverBrush;
} else if (buttonColorCfg.hoverType == Obj_Gradient_Type){
linearGradient.setColorAt(0, buttonColorCfg.hoverGradientList.value(0)); linearGradient.setColorAt(0, buttonColorCfg.hoverGradientList.value(0));
linearGradient.setColorAt(1, buttonColorCfg.hoverGradientList.value(1)); linearGradient.setColorAt(1, buttonColorCfg.hoverGradientList.value(1));
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
} }
else
hoverBrush = buttonColorCfg.hoverBrush;
clickBrush = buttonColorCfg.clickBrush; clickBrush = buttonColorCfg.clickBrush;
focusPen = QPen(QBrush(clickBrush), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); focusPen = QPen(QBrush(clickBrush), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
} else { } else {
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB:{ case AdjustColorRules::DefaultRGB:{
if (buttonColorCfg.hoverType == Obj_Color_Type) { if (buttonColorCfg.hoverType == Obj_Gradient_Type) {
if (isDark) {
hoverBrush = QBrush(configMixColor(highlight, mix, 0.2));
} else {
hoverBrush = QBrush(configMixColor(highlight, mix, 0.05));
}
if (isDark) {
clickBrush = QBrush(configMixColor(highlight, mix, 0.05));
} else {
clickBrush = QBrush(configMixColor(highlight, mix, 0.2));
}
} else {
if (isDark) { if (isDark) {
startColor = configMixColor(highlight, QColor(Qt::white), 0.2); startColor = configMixColor(highlight, QColor(Qt::white), 0.2);
endColor = configMixColor(highlight, QColor(Qt::black), 0.05); endColor = configMixColor(highlight, QColor(Qt::black), 0.05);
@ -793,9 +785,21 @@ void UKUIConfigStyleParameters::initConfigPushButtonBevelParameters(bool isDark,
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
clickBrush = QBrush(configMixColor(highlight, mix, 0.1)); clickBrush = QBrush(configMixColor(highlight, mix, 0.1));
} else {
if (isDark) {
hoverBrush = QBrush(configMixColor(highlight, mix, 0.2));
} else {
hoverBrush = QBrush(configMixColor(highlight, mix, 0.05));
} }
if (isWindowButton && useTransparentButtonList().contains(qAppName())) { if (isDark) {
clickBrush = QBrush(configMixColor(highlight, mix, 0.05));
} else {
clickBrush = QBrush(configMixColor(highlight, mix, 0.2));
}
}
if (isWindowButton && useTransparentButtonList().contains(qAppName())) {//特殊三联应用
if (isDark) { if (isDark) {
mix.setAlphaF(0.28); mix.setAlphaF(0.28);
hoverBrush = QBrush(mix); hoverBrush = QBrush(mix);
@ -808,66 +812,16 @@ void UKUIConfigStyleParameters::initConfigPushButtonBevelParameters(bool isDark,
clickBrush = QBrush(mix); clickBrush = QBrush(mix);
} }
} else if (useButtonPalette || isWindowButton) { } else if (useButtonPalette || isWindowButton) {
if (buttonColorCfg.hoverType == Obj_Color_Type) { if(buttonColorCfg.hoverType == Obj_Gradient_Type){
if (needTranslucent) { startColor = buttonColorCfg.hoverGradientList.value(0);
QColor hoverColor = option->palette.color(QPalette::Active, QPalette::BrightText); endColor = buttonColorCfg.hoverGradientList.value(1);
hoverColor.setAlphaF(isDark ? 0.20 : 0.16);
hoverBrush.setColor(hoverColor);
QColor clickColor = option->palette.color(QPalette::Active, QPalette::BrightText);
clickColor.setAlphaF(isDark ? 0.30 : 0.21);
clickBrush.setColor(clickColor);
} else {
QColor button = option->palette.color(QPalette::Active, QPalette::Button);
if (isDark) {
hoverBrush = QBrush(configMixColor(button, mix, 0.2));
clickBrush = QBrush(configMixColor(button, mix, 0.05));
} else {
hoverBrush = QBrush(configMixColor(button, mix, 0.05));
clickBrush = QBrush(configMixColor(button, mix, 0.2));
}
}
} else {
if(needTranslucent) {
if (isDark) {
startColor = option->palette.color(QPalette::Active, QPalette::Light);
endColor = option->palette.color(QPalette::Active, QPalette::Text);
startColor.setAlphaF(0.2);
endColor.setAlphaF(0.2);
} else {
startColor = option->palette.color(QPalette::Active, QPalette::Mid);
endColor = option->palette.color(QPalette::Active, QPalette::Dark);
startColor.setAlphaF(0.2);
endColor.setAlphaF(0.2);
}
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
clickBrush = buttonColorCfg.clickBrush;
QColor clickColor = option->palette.color(QPalette::Active, QPalette::Dark);
if(isDark)
clickColor = option->palette.color(QPalette::Active, QPalette::Light);
clickColor.setAlphaF(isDark ? 0.30 : 0.30);
clickBrush.setColor(clickColor);
} else { } else {
QColor button = option->palette.color(QPalette::Active, QPalette::Button); hoverBrush = buttonColorCfg.hoverBrush;
clickBrush = buttonColorCfg.clickBrush;
//hover
if (isDark) {
startColor = configMixColor(button, QColor(Qt::white), 0.2);
endColor = configMixColor(button, QColor(Qt::white), 0.05);
} else {
startColor = configMixColor(button, QColor(Qt::black), 0.05);
endColor = configMixColor(button, QColor(Qt::black), 0.2);
}
linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient);
//click
clickBrush = QBrush(configMixColor(button, mix, 0.2));
}
} }
} }
@ -878,7 +832,7 @@ void UKUIConfigStyleParameters::initConfigPushButtonBevelParameters(bool isDark,
if (buttonColorCfg.focusPen != Qt::NoPen) if (buttonColorCfg.focusPen != Qt::NoPen)
focusPen = QPen(QBrush(buttonColorCfg.focusPen), (buttonColorCfg.focusPen == Qt::NoPen || buttonColorCfg.focusPen.alpha() == 0) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); focusPen = QPen(QBrush(buttonColorCfg.focusPen), (buttonColorCfg.focusPen == Qt::NoPen || buttonColorCfg.focusPen.alpha() == 0) ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
if (isWindowButton && useTransparentButtonList().contains(qAppName())) { if (isWindowButton && useTransparentButtonList().contains(qAppName())) {//特殊窗口三联
QColor p = QColor(255, 255, 255); QColor p = QColor(255, 255, 255);
p.setAlphaF(0.4); p.setAlphaF(0.4);
defaultPen = QPen(QColor(Qt::NoPen), 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); defaultPen = QPen(QColor(Qt::NoPen), 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
@ -901,6 +855,11 @@ void UKUIConfigStyleParameters::initConfigPushButtonBevelParameters(bool isDark,
focusPen = QPen(option->palette.brush(QPalette::Inactive, QPalette::Highlight), focusPen = QPen(option->palette.brush(QPalette::Inactive, QPalette::Highlight),
(buttonColorCfg.focusPen == Qt::NoPen || buttonColorCfg.focusPen.alpha() == 0) ? (buttonColorCfg.focusPen == Qt::NoPen || buttonColorCfg.focusPen.alpha() == 0) ?
0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
defaultPen = QPen(QBrush(buttonColorCfg.defaultPen), (buttonColorCfg.defaultPen == Qt::NoPen || buttonColorCfg.defaultPen.alpha() == 0)
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
disablePen = QPen(QBrush(buttonColorCfg.disablePen), (buttonColorCfg.disablePen == Qt::NoPen || buttonColorCfg.disablePen.alpha() == 0)
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
} else { } else {
clickBrush = QBrush(buttonColorCfg.clickBrush); clickBrush = QBrush(buttonColorCfg.clickBrush);
hoverBrush = QBrush(buttonColorCfg.hoverBrush); hoverBrush = QBrush(buttonColorCfg.hoverBrush);
@ -1001,7 +960,6 @@ void UKUIConfigStyleParameters::initConfigPushButtonBevelParameters(bool isDark,
} }
} }
m_PushButtonParameters.radius = radius; m_PushButtonParameters.radius = radius;
m_PushButtonParameters.pushButtonDefaultBrush = defaultBrush; m_PushButtonParameters.pushButtonDefaultBrush = defaultBrush;
m_PushButtonParameters.pushButtonClickBrush = clickBrush; m_PushButtonParameters.pushButtonClickBrush = clickBrush;
@ -1070,7 +1028,9 @@ void UKUIConfigStyleParameters::initConfigPushButtonLabelParameters(bool isDark,
if (isImportant) if (isImportant)
buttonColorCfg = readCfg()->buttonColorCfg(option->palette, C_Button_ImportButton); buttonColorCfg = readCfg()->buttonColorCfg(option->palette, C_Button_ImportButton);
QColor textColor = buttonColorCfg.textColor; QColor textDefaultColor = buttonColorCfg.textDefaultColor;
QColor textHoverColor = buttonColorCfg.textHoverColor;
QColor textDisableColor = buttonColorCfg.textDisableColor;
//icon //icon
if ((isWindowButton || useButtonPalette) && !(button->state & QStyle::State_On)) { if ((isWindowButton || useButtonPalette) && !(button->state & QStyle::State_On)) {
@ -1082,24 +1042,19 @@ void UKUIConfigStyleParameters::initConfigPushButtonLabelParameters(bool isDark,
if(m_adjustColorRules == AdjustColorRules::HSL) if(m_adjustColorRules == AdjustColorRules::HSL)
iconHighlight = false; iconHighlight = false;
//text
bool hover = option->state & QStyle::State_MouseOver;
bool click = option->state & (QStyle::State_On | QStyle::State_Sunken);
if(hover || click){
textColor = buttonColorCfg.textHoverColor;
}
auto *w = const_cast<QWidget *>(widget); auto *w = const_cast<QWidget *>(widget);
if (w) { if (w) {
w->setProperty("iconHighlight", iconHighlight); w->setProperty("iconHighlight", iconHighlight);
w->setProperty("textHighlight", textHighlight); w->setProperty("textHighlight", textHighlight);
w->setProperty("textColor", textColor); w->setProperty("textDefaultColor", textDefaultColor);
w->setProperty("textHoverColor", textHoverColor);
w->setProperty("textDisableColor", textDisableColor);
} }
if (widget) { if (widget) {
if(!widget->isEnabled()) // if(!widget->isEnabled())
textColor = option->palette.color(QPalette::Disabled, QPalette::ButtonText); // textColor = option->palette.color(QPalette::Disabled, QPalette::ButtonText);
if (widget->property("setIconHoverClickHighlight").isValid() && widget->property("setIconHoverClickHighlight").canConvert<bool>()) { if (widget->property("setIconHoverClickHighlight").isValid() && widget->property("setIconHoverClickHighlight").canConvert<bool>()) {
iconHighlight = widget->property("setIconHoverClickHighlight").value<bool>(); iconHighlight = widget->property("setIconHoverClickHighlight").value<bool>();
@ -1107,14 +1062,22 @@ void UKUIConfigStyleParameters::initConfigPushButtonLabelParameters(bool isDark,
if (widget->property("setTextHoverClickHighlight").isValid() && widget->property("setTextHoverClickHighlight").canConvert<bool>()) { if (widget->property("setTextHoverClickHighlight").isValid() && widget->property("setTextHoverClickHighlight").canConvert<bool>()) {
textHighlight = widget->property("setTextHoverClickHighlight").value<bool>(); textHighlight = widget->property("setTextHoverClickHighlight").value<bool>();
} }
if (widget->property("setTextColor").isValid() && widget->property("setTextColor").canConvert<QColor>()) { if (widget->property("setTextDefaultColor").isValid() && widget->property("setTextDefaultColor").canConvert<QColor>()) {
textColor = widget->property("setTextColor").value<QColor>(); textDefaultColor = widget->property("setTextDefaultColor").value<QColor>();
}
if (widget->property("setTextHoverColor").isValid() && widget->property("setTextHoverColor").canConvert<QColor>()) {
textHoverColor = widget->property("setTextHoverColor").value<QColor>();
}
if (widget->property("setTextDisableColor").isValid() && widget->property("setTextDisableColor").canConvert<QColor>()) {
textDisableColor = widget->property("setTextDisableColor").value<QColor>();
} }
} }
m_PushButtonParameters.iconHoverClickHighlight = iconHighlight; m_PushButtonParameters.iconHoverClickHighlight = iconHighlight;
m_PushButtonParameters.textHoverClickHighlight = textHighlight; m_PushButtonParameters.textHoverClickHighlight = textHighlight;
m_PushButtonParameters.textColor = textColor; m_PushButtonParameters.textDefaultColor = textDefaultColor;
m_PushButtonParameters.textHoverColor = textHoverColor;
m_PushButtonParameters.textDisableColor = textDisableColor;
} }
void UKUIConfigStyleParameters::initConfigToolButtonPanelParameters(bool isDark, const QStyleOption *option, const QWidget *widget) void UKUIConfigStyleParameters::initConfigToolButtonPanelParameters(bool isDark, const QStyleOption *option, const QWidget *widget)
@ -1200,31 +1163,19 @@ void UKUIConfigStyleParameters::initConfigToolButtonPanelParameters(bool isDark,
0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
if (isWindowColoseButton){ if (isWindowColoseButton){
if (buttonColorCfg.hoverType == Obj_Color_Type) { if (buttonColorCfg.hoverType == Obj_Gradient_Type) {
hoverBrush = buttonColorCfg.hoverBrush;
} else if (buttonColorCfg.hoverType == Obj_Gradient_Type) {
linearGradient.setColorAt(0, buttonColorCfg.hoverGradientList.value(0)); linearGradient.setColorAt(0, buttonColorCfg.hoverGradientList.value(0));
linearGradient.setColorAt(1, buttonColorCfg.hoverGradientList.value(1)); linearGradient.setColorAt(1, buttonColorCfg.hoverGradientList.value(1));
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
} else {
hoverBrush = buttonColorCfg.hoverBrush;
} }
clickBrush = buttonColorCfg.clickBrush; clickBrush = buttonColorCfg.clickBrush;
focusPen = QPen(QBrush(clickBrush), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); focusPen = QPen(QBrush(clickBrush), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
} else { } else {
switch (m_adjustColorRules) { switch (m_adjustColorRules) {
case AdjustColorRules::DefaultRGB:{ case AdjustColorRules::DefaultRGB:{
if (buttonColorCfg.hoverType == Obj_Gradient_Type) {
if(buttonColorCfg.hoverType == Obj_Color_Type){
if (isDark) {
hoverBrush = QBrush(configMixColor(highlight, mix, 0.2));
} else {
hoverBrush = QBrush(configMixColor(highlight, mix, 0.05));
}
if (isDark) {
clickBrush = QBrush(configMixColor(highlight, mix, 0.05));
} else {
clickBrush = QBrush(configMixColor(highlight, mix, 0.2));
}
} else {
if (isDark) { if (isDark) {
startColor = configMixColor(highlight, QColor(Qt::white), 0.2); startColor = configMixColor(highlight, QColor(Qt::white), 0.2);
endColor = configMixColor(highlight, QColor(Qt::black), 0.05); endColor = configMixColor(highlight, QColor(Qt::black), 0.05);
@ -1236,10 +1187,21 @@ void UKUIConfigStyleParameters::initConfigToolButtonPanelParameters(bool isDark,
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
clickBrush = QBrush(configMixColor(highlight, mix, 0.1)); clickBrush = QBrush(configMixColor(highlight, mix, 0.1));
}
else {
if (isDark) {
hoverBrush = QBrush(configMixColor(highlight, mix, 0.2));
} else {
hoverBrush = QBrush(configMixColor(highlight, mix, 0.05));
}
if (isDark) {
clickBrush = QBrush(configMixColor(highlight, mix, 0.05));
} else {
clickBrush = QBrush(configMixColor(highlight, mix, 0.2));
}
} }
if (isWindowButton && useTransparentButtonList().contains(qAppName())) { if (isWindowButton && useTransparentButtonList().contains(qAppName())) {//特殊三联应用
if (isDark) { if (isDark) {
mix.setAlphaF(0.28); mix.setAlphaF(0.28);
hoverBrush = QBrush(mix); hoverBrush = QBrush(mix);
@ -1252,66 +1214,16 @@ void UKUIConfigStyleParameters::initConfigToolButtonPanelParameters(bool isDark,
clickBrush = QBrush(mix); clickBrush = QBrush(mix);
} }
} else if (useButtonPalette || isWindowButton) { } else if (useButtonPalette || isWindowButton) {
if(buttonColorCfg.hoverType == Obj_Color_Type){ if(buttonColorCfg.hoverType == Obj_Gradient_Type){
if (needTranslucent) { startColor = buttonColorCfg.hoverGradientList.value(0);
QColor hoverColor = option->palette.color(QPalette::Active, QPalette::BrightText); endColor = buttonColorCfg.hoverGradientList.value(1);
hoverColor.setAlphaF(isDark ? 0.20 : 0.16);
hoverBrush.setColor(hoverColor);
QColor clickColor = option->palette.color(QPalette::Active, QPalette::BrightText);
clickColor.setAlphaF(isDark ? 0.30 : 0.21);
clickBrush.setColor(clickColor);
} else {
QColor button = option->palette.color(QPalette::Active, QPalette::Button);
if (isDark) {
hoverBrush = QBrush(configMixColor(button, mix, 0.2));
clickBrush = QBrush(configMixColor(button, mix, 0.05));
} else {
hoverBrush = QBrush(configMixColor(button, mix, 0.05));
clickBrush = QBrush(configMixColor(button, mix, 0.2));
}
}
} else {
if(needTranslucent) {
if (isDark) {
startColor = option->palette.color(QPalette::Active, QPalette::Light);
endColor = option->palette.color(QPalette::Active, QPalette::Text);
startColor.setAlphaF(0.2);
endColor.setAlphaF(0.2);
} else {
startColor = option->palette.color(QPalette::Active, QPalette::Mid);
endColor = option->palette.color(QPalette::Active, QPalette::Dark);
startColor.setAlphaF(0.2);
endColor.setAlphaF(0.2);
}
linearGradient.setColorAt(0, startColor); linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor); linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient); hoverBrush = QBrush(linearGradient);
clickBrush = buttonColorCfg.clickBrush;
QColor clickColor = option->palette.color(QPalette::Active, QPalette::Dark);
if(isDark)
clickColor = option->palette.color(QPalette::Active, QPalette::Light);
clickColor.setAlphaF(isDark ? 0.30 : 0.30);
clickBrush.setColor(clickColor);
} else { } else {
QColor button = option->palette.color(QPalette::Active, QPalette::Button); hoverBrush = buttonColorCfg.hoverBrush;
clickBrush = buttonColorCfg.clickBrush;
//hover
if (isDark) {
startColor = configMixColor(button, QColor(Qt::white), 0.2);
endColor = configMixColor(button, QColor(Qt::white), 0.05);
} else {
startColor = configMixColor(button, QColor(Qt::black), 0.05);
endColor = configMixColor(button, QColor(Qt::black), 0.2);
}
linearGradient.setColorAt(0, startColor);
linearGradient.setColorAt(1, endColor);
hoverBrush = QBrush(linearGradient);
//click
clickBrush = QBrush(configMixColor(button, mix, 0.2));
}
} }
} }
@ -1323,7 +1235,7 @@ void UKUIConfigStyleParameters::initConfigToolButtonPanelParameters(bool isDark,
focusPen = QPen(QBrush(buttonColorCfg.focusPen), (buttonColorCfg.focusPen == Qt::NoPen || buttonColorCfg.focusPen.alpha() == 0) focusPen = QPen(QBrush(buttonColorCfg.focusPen), (buttonColorCfg.focusPen == Qt::NoPen || buttonColorCfg.focusPen.alpha() == 0)
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); ? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
if (isWindowButton && useTransparentButtonList().contains(qAppName())) { if (isWindowButton && useTransparentButtonList().contains(qAppName())) {//特殊窗口三联
QColor p = QColor(255, 255, 255); QColor p = QColor(255, 255, 255);
p.setAlphaF(0.4); p.setAlphaF(0.4);
defaultPen = QPen(QColor(Qt::NoPen), 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); defaultPen = QPen(QColor(Qt::NoPen), 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
@ -1346,6 +1258,10 @@ void UKUIConfigStyleParameters::initConfigToolButtonPanelParameters(bool isDark,
focusPen = QPen(option->palette.brush(QPalette::Inactive, QPalette::Highlight), focusPen = QPen(option->palette.brush(QPalette::Inactive, QPalette::Highlight),
(buttonColorCfg.focusPen == Qt::NoPen || buttonColorCfg.focusPen.alpha() == 0) ? (buttonColorCfg.focusPen == Qt::NoPen || buttonColorCfg.focusPen.alpha() == 0) ?
0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
defaultPen = QPen(QBrush(buttonColorCfg.defaultPen), (buttonColorCfg.defaultPen == Qt::NoPen || buttonColorCfg.defaultPen.alpha() == 0)
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
disablePen = QPen(QBrush(buttonColorCfg.disablePen), (buttonColorCfg.disablePen == Qt::NoPen || buttonColorCfg.disablePen.alpha() == 0)
? 0 : 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
} else { } else {
clickBrush = QBrush(buttonColorCfg.clickBrush); clickBrush = QBrush(buttonColorCfg.clickBrush);
hoverBrush = QBrush(buttonColorCfg.hoverBrush); hoverBrush = QBrush(buttonColorCfg.hoverBrush);
@ -1513,7 +1429,9 @@ void UKUIConfigStyleParameters::initConfigToolButtonLabelParameters(bool isDark,
if (isImportant) if (isImportant)
buttonColorCfg = readCfg()->toolButtonColorCfg(option->palette, C_Button_ImportButton); buttonColorCfg = readCfg()->toolButtonColorCfg(option->palette, C_Button_ImportButton);
QColor textColor = buttonColorCfg.textColor; QColor textDefaultColor = buttonColorCfg.textDefaultColor;
QColor textHoverColor = buttonColorCfg.textHoverColor;
QColor textDisableColor = buttonColorCfg.textDisableColor;
//icon //icon
if ((isWindowButton || useButtonPalette) && !(button->state & QStyle::State_On)) { if ((isWindowButton || useButtonPalette) && !(button->state & QStyle::State_On)) {
@ -1525,23 +1443,17 @@ void UKUIConfigStyleParameters::initConfigToolButtonLabelParameters(bool isDark,
if(m_adjustColorRules == AdjustColorRules::HSL) if(m_adjustColorRules == AdjustColorRules::HSL)
iconHighlight = false; iconHighlight = false;
//text
bool hover = option->state & QStyle::State_MouseOver;
bool click = option->state & (QStyle::State_On | QStyle::State_Sunken);
if(hover || click){
textColor = buttonColorCfg.textHoverColor;
}
auto *w = const_cast<QWidget *>(widget); auto *w = const_cast<QWidget *>(widget);
if (w) { if (w) {
w->setProperty("iconHighlight", iconHighlight); w->setProperty("iconHighlight", iconHighlight);
w->setProperty("textHighlight", textHighlight); w->setProperty("textHighlight", textHighlight);
w->setProperty("textColor", textColor); w->setProperty("textDefaultColor", textDefaultColor);
w->setProperty("textHoverColor", textHoverColor);
w->setProperty("textDisableColor", textDisableColor);
} }
if (widget) { if (widget) {
if(!widget->isEnabled()) // if(!widget->isEnabled())
textColor = option->palette.color(QPalette::Disabled, QPalette::ButtonText); // textColor = option->palette.color(QPalette::Disabled, QPalette::ButtonText);
if (widget->property("setIconHoverClickHighlight").isValid() && widget->property("setIconHoverClickHighlight").canConvert<bool>()) { if (widget->property("setIconHoverClickHighlight").isValid() && widget->property("setIconHoverClickHighlight").canConvert<bool>()) {
iconHighlight = widget->property("setIconHoverClickHighlight").value<bool>(); iconHighlight = widget->property("setIconHoverClickHighlight").value<bool>();
@ -1549,14 +1461,22 @@ void UKUIConfigStyleParameters::initConfigToolButtonLabelParameters(bool isDark,
if (widget->property("setTextHoverClickHighlight").isValid() && widget->property("setTextHoverClickHighlight").canConvert<bool>()) { if (widget->property("setTextHoverClickHighlight").isValid() && widget->property("setTextHoverClickHighlight").canConvert<bool>()) {
textHighlight = widget->property("setTextHoverClickHighlight").value<bool>(); textHighlight = widget->property("setTextHoverClickHighlight").value<bool>();
} }
if (widget->property("setTextColor").isValid() && widget->property("setTextColor").canConvert<bool>()) { if (widget->property("setTextDefaultColor").isValid() && widget->property("setTextDefaultColor").canConvert<QColor>()) {
textColor = widget->property("setTextColor").value<bool>(); textDefaultColor = widget->property("setTextDefaultColor").value<QColor>();
}
if (widget->property("setTextHoverColor").isValid() && widget->property("setTextHoverColor").canConvert<QColor>()) {
textHoverColor = widget->property("setTextHoverColor").value<QColor>();
}
if (widget->property("setTextDisableColor").isValid() && widget->property("setTextDisableColor").canConvert<QColor>()) {
textDisableColor = widget->property("setTextDisableColor").value<QColor>();
} }
} }
m_ToolButtonParameters.iconHoverClickHighlight = iconHighlight; m_ToolButtonParameters.iconHoverClickHighlight = iconHighlight;
m_ToolButtonParameters.textHoverClickHighlight = textHighlight; m_ToolButtonParameters.textHoverClickHighlight = textHighlight;
m_ToolButtonParameters.textColor = textColor; m_ToolButtonParameters.textDefaultColor = textDefaultColor;
m_ToolButtonParameters.textHoverColor = textHoverColor;
m_ToolButtonParameters.textDisableColor = textDisableColor;
} }
void UKUIConfigStyleParameters::initConfigLineEditParameters(bool isDark, const QStyleOption *option, const QWidget *widget) void UKUIConfigStyleParameters::initConfigLineEditParameters(bool isDark, const QStyleOption *option, const QWidget *widget)

16
ukui-styles/qt5-config-style-ukui/ukui-config-style.cpp
View File

@ -4811,8 +4811,14 @@ void UKUIConfigStyle::drawControl(QStyle::ControlElement element, const QStyleOp
// } else { // } else {
// proxy()->drawItemText(painter, textRect, tf, button->palette, false, button->text, QPalette::ButtonText); // proxy()->drawItemText(painter, textRect, tf, button->palette, false, button->text, QPalette::ButtonText);
// } // }
QColor penColor = sp->m_PushButtonParameters.textDefaultColor;
if(!enable)
penColor = sp->m_PushButtonParameters.textDisableColor;
else if(button->state & QStyle::State_MouseOver || button->state & QStyle::State_Sunken)
penColor = sp->m_PushButtonParameters.textHoverColor;
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
painter->setPen(QPen(sp->m_PushButtonParameters.textColor)); painter->setPen(QPen(penColor));
painter->drawText(textRect, button->text, QTextOption(Qt::AlignAbsolute | Qt::AlignHCenter | Qt::AlignVCenter)); painter->drawText(textRect, button->text, QTextOption(Qt::AlignAbsolute | Qt::AlignHCenter | Qt::AlignVCenter));
// proxy()->drawItemText(painter, textRect, tf, button->palette, false, button->text, sp->m_PushButtonParameters.textColor); // proxy()->drawItemText(painter, textRect, tf, button->palette, false, button->text, sp->m_PushButtonParameters.textColor);
@ -4937,8 +4943,14 @@ void UKUIConfigStyle::drawControl(QStyle::ControlElement element, const QStyleOp
// } else { // } else {
// proxy()->drawItemText(painter, textRect, alignment, tb->palette, false, tb->text, QPalette::ButtonText); // proxy()->drawItemText(painter, textRect, alignment, tb->palette, false, tb->text, QPalette::ButtonText);
// } // }
QColor penColor = sp->m_ToolButtonParameters.textDefaultColor;
if(!enable)
penColor = sp->m_ToolButtonParameters.textDisableColor;
else if(tb->state & QStyle::State_MouseOver || tb->state & QStyle::State_Sunken)
penColor = sp->m_ToolButtonParameters.textHoverColor;
painter->setBrush(Qt::NoBrush); painter->setBrush(Qt::NoBrush);
painter->setPen(QPen(sp->m_ToolButtonParameters.textColor)); painter->setPen(QPen(penColor));
painter->drawText(textRect, tb->text, QTextOption(Qt::AlignAbsolute | Qt::AlignHCenter | Qt::AlignVCenter)); painter->drawText(textRect, tb->text, QTextOption(Qt::AlignAbsolute | Qt::AlignHCenter | Qt::AlignVCenter));
} }

5
ukui-styles/qt5-config-style-ukui/widget-parameters/config-pushbutton-parameters.h
View File

@ -39,7 +39,10 @@ public:
bool iconHoverClickHighlight; bool iconHoverClickHighlight;
bool textHoverClickHighlight; bool textHoverClickHighlight;
QColor textColor; QColor textDefaultColor;
QColor textHoverColor;
QColor textDisableColor;
QBrush pushButtonDefaultBrush; QBrush pushButtonDefaultBrush;
QBrush pushButtonHoverBrush; QBrush pushButtonHoverBrush;

4
ukui-styles/qt5-config-style-ukui/widget-parameters/config-toolbutton-parameters.h
View File

@ -58,7 +58,9 @@ public:
QPen toolButtonCheckDisablePen; QPen toolButtonCheckDisablePen;
QPen toolButtonFocusPen; QPen toolButtonFocusPen;
QColor textColor; QColor textDefaultColor;
QColor textHoverColor ;
QColor textDisableColor;
}; };
} }
#endif // TOOLBUTTONPARAMETERS_H #endif // TOOLBUTTONPARAMETERS_H

6
ukui-styles/readconfig.cpp
View File

@ -621,8 +621,9 @@ UKUIColorTheme::ButtonColorCfg ReadThemeConfig::buttonColorCfg(const QPalette pa
m_readConfig->getColorValue(buttonCfg.clickPen , m_theme, UKUIPushButton, property, C_Button_ClickPen ); m_readConfig->getColorValue(buttonCfg.clickPen , m_theme, UKUIPushButton, property, C_Button_ClickPen );
m_readConfig->getColorValue(buttonCfg.disablePen , m_theme, UKUIPushButton, property, C_Button_DisablePen ); m_readConfig->getColorValue(buttonCfg.disablePen , m_theme, UKUIPushButton, property, C_Button_DisablePen );
m_readConfig->getColorValue(buttonCfg.focusPen , m_theme, UKUIPushButton, property, C_Button_FocusPen ); m_readConfig->getColorValue(buttonCfg.focusPen , m_theme, UKUIPushButton, property, C_Button_FocusPen );
m_readConfig->getColorValue(buttonCfg.textColor , m_theme, UKUIPushButton, property, C_Button_TextColor ); m_readConfig->getColorValue(buttonCfg.textDefaultColor, m_theme, UKUIPushButton, property, C_Button_TextColor );
m_readConfig->getColorValue(buttonCfg.textHoverColor , m_theme, UKUIPushButton, property, C_Button_TextHoverColor ); m_readConfig->getColorValue(buttonCfg.textHoverColor , m_theme, UKUIPushButton, property, C_Button_TextHoverColor );
m_readConfig->getColorValue(buttonCfg.textDisableColor , m_theme, UKUIPushButton, property, C_Button_TextDisableColor );
m_buttonColorCfg = buttonCfg; m_buttonColorCfg = buttonCfg;
return m_buttonColorCfg; return m_buttonColorCfg;
@ -653,8 +654,9 @@ UKUIColorTheme::ToolButtonColorCfg ReadThemeConfig::toolButtonColorCfg(const QPa
m_readConfig->getColorValue(tbcfg.clickPen , m_theme, UKUIToolButton, property, C_Button_ClickPen ); m_readConfig->getColorValue(tbcfg.clickPen , m_theme, UKUIToolButton, property, C_Button_ClickPen );
m_readConfig->getColorValue(tbcfg.disablePen , m_theme, UKUIToolButton, property, C_Button_DisablePen ); m_readConfig->getColorValue(tbcfg.disablePen , m_theme, UKUIToolButton, property, C_Button_DisablePen );
m_readConfig->getColorValue(tbcfg.focusPen , m_theme, UKUIToolButton, property, C_Button_FocusPen ); m_readConfig->getColorValue(tbcfg.focusPen , m_theme, UKUIToolButton, property, C_Button_FocusPen );
m_readConfig->getColorValue(tbcfg.textColor , m_theme, UKUIToolButton, property, C_Button_TextColor ); m_readConfig->getColorValue(tbcfg.textDefaultColor, m_theme, UKUIToolButton, property, C_Button_TextColor );
m_readConfig->getColorValue(tbcfg.textHoverColor , m_theme, UKUIToolButton, property, C_Button_TextHoverColor ); m_readConfig->getColorValue(tbcfg.textHoverColor , m_theme, UKUIToolButton, property, C_Button_TextHoverColor );
m_readConfig->getColorValue(tbcfg.textDisableColor , m_theme, UKUIToolButton, property, C_Button_TextDisableColor );
m_toolButtonColorCfg = tbcfg; m_toolButtonColorCfg = tbcfg;
return m_toolButtonColorCfg; return m_toolButtonColorCfg;

9
ukui-styles/themeinformation.h
View File

@ -72,6 +72,7 @@
#define C_Button_FocusPen "FocusPen" #define C_Button_FocusPen "FocusPen"
#define C_Button_TextColor "TextColor" #define C_Button_TextColor "TextColor"
#define C_Button_TextHoverColor "TextHoverColor" #define C_Button_TextHoverColor "TextHoverColor"
#define C_Button_TextDisableColor "TextDisableColor"
#define C_Button_ClickBrush "ClickBrush" #define C_Button_ClickBrush "ClickBrush"
#define C_Button_DisableBrush "DisableBrush" #define C_Button_DisableBrush "DisableBrush"
@ -531,8 +532,9 @@ typedef struct ButtonColorStruct
QColor disablePen = Qt::NoPen; QColor disablePen = Qt::NoPen;
QColor focusPen = Qt::NoPen; QColor focusPen = Qt::NoPen;
QColor textColor = QColor(38, 38, 38); QColor textDefaultColor = QColor(38, 38, 38);
QColor textHoverColor = QColor(38, 38, 38); QColor textHoverColor = QColor(38, 38, 38);
QColor textDisableColor = QColor(38, 38, 38);
QList<QColor> hoverGradientList; QList<QColor> hoverGradientList;
QString hoverType = "color"; QString hoverType = "color";
@ -554,8 +556,9 @@ typedef struct ToolButtonColorStruct
QColor disablePen = Qt::NoPen; QColor disablePen = Qt::NoPen;
QColor focusPen = Qt::NoPen; QColor focusPen = Qt::NoPen;
QColor textColor = Qt::NoPen; QColor textDefaultColor = QColor(38, 38, 38);
QColor textHoverColor = Qt::NoPen; QColor textHoverColor = QColor(38, 38, 38);
QColor textDisableColor = QColor(38, 38, 38);
}ToolButtonColorCfg; }ToolButtonColorCfg;