From 2f67ec63ebf5cafc313e61c5cc4452d5d9ebb2c8 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 21 Oct 2024 18:09:44 +0200 Subject: [PATCH] New themes: Use more token colors Fixes the dock widget splitter color in Debugger. Uses more toke colors. Change-Id: I38a52f48a049d36898eeffaaa32033c343ec2c05 Reviewed-by: Marcus Tillmanns --- share/qtcreator/themes/broccoli-dark.creatortheme | 8 -------- share/qtcreator/themes/broccoli-light.creatortheme | 8 -------- share/qtcreator/themes/broccoli.tokenmapping | 7 +++++++ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/share/qtcreator/themes/broccoli-dark.creatortheme b/share/qtcreator/themes/broccoli-dark.creatortheme index 51f4c9ebafc..21f09f2c82b 100644 --- a/share/qtcreator/themes/broccoli-dark.creatortheme +++ b/share/qtcreator/themes/broccoli-dark.creatortheme @@ -272,7 +272,6 @@ DStoolbarBackground=midnightGrey ;DS controls theme END DetailsWidgetBackgroundColor=18ffffff -DockWidgetResizeHandleColor=splitter IconsCodeModelKeywordColor=ff777777 IconsCodeModelClassColor=ffc0b550 IconsCodeModelStructColor=ff53b053 @@ -285,9 +284,6 @@ IconsCodeModelUniformColor=ff994899 IconsCodeModelVaryingColor=ffa08833 IconsCodeModelOverlayBackgroundColor=70000000 IconsCodeModelOverlayForegroundColor=ffd0d0d0 -InfoBarBackground=ff505000 -MiniProjectTargetSelectorBackgroundColor=shadowBackground -MiniProjectTargetSelectorBorderColor=shadowBackground TextColorHighlightBackground=7a6f1c OutputPanes_DebugTextColor=text @@ -305,7 +301,6 @@ OutputPanes_TestSkipTextColor=ff828282 OutputPanes_TestWarnTextColor=ffc8c800 OutputPanes_TestFatalTextColor=ffc82828 OutputPanes_TestDebugTextColor=ff329696 -OutputPaneButtonFlashColor=error Debugger_LogWindow_LogInput=ff00acac Debugger_LogWindow_LogStatus=ff00875a @@ -335,9 +330,6 @@ VcsBase_FileUnmerged_TextColor=ffff4040 Bookmarks_TextMarkColor=ff8080ff -CodeModel_Error_TextMarkColor=error -CodeModel_Warning_TextMarkColor=warning - QmlDesigner_BackgroundColor=qmlDesignerButtonColor QmlDesigner_HighlightColor=ff1d545c QmlDesigner_FormEditorSelectionColor=ff4ba2ff diff --git a/share/qtcreator/themes/broccoli-light.creatortheme b/share/qtcreator/themes/broccoli-light.creatortheme index a58c4a48395..c6e635ad8cf 100644 --- a/share/qtcreator/themes/broccoli-light.creatortheme +++ b/share/qtcreator/themes/broccoli-light.creatortheme @@ -271,7 +271,6 @@ DSBackgroundColorNormal=ffd8d8d8 ;DS controls theme END DetailsWidgetBackgroundColor=28ffffff -DockWidgetResizeHandleColor=splitter IconsCodeModelKeywordColor=ff777777 IconsCodeModelClassColor=ffc0b550 IconsCodeModelStructColor=ff53b053 @@ -284,9 +283,6 @@ IconsCodeModelUniformColor=ff994899 IconsCodeModelVaryingColor=ffa08833 IconsCodeModelOverlayBackgroundColor=70ffffff IconsCodeModelOverlayForegroundColor=ff232425 -InfoBarBackground=ffffffe1 -MiniProjectTargetSelectorBackgroundColor=shadowBackground -MiniProjectTargetSelectorBorderColor=shadowBackground TextColorHighlightBackground=ffef0b OutputPanes_DebugTextColor=text @@ -304,7 +300,6 @@ OutputPanes_TestSkipTextColor=ff787878 OutputPanes_TestWarnTextColor=ffd0bb00 OutputPanes_TestFatalTextColor=ff640000 OutputPanes_TestDebugTextColor=ff329696 -OutputPaneButtonFlashColor=ffff0000 Debugger_LogWindow_LogInput=ff00acac Debugger_LogWindow_LogStatus=ff00875a @@ -334,9 +329,6 @@ VcsBase_FileUnmerged_TextColor=ffee0000 Bookmarks_TextMarkColor=ffa0a0ff -CodeModel_Error_TextMarkColor=error -CodeModel_Warning_TextMarkColor=warning - QmlDesigner_BackgroundColor=qmlDesignerButtonColor QmlDesigner_HighlightColor=ff46a2da QmlDesigner_FormEditorSelectionColor=ff4ba2ff diff --git a/share/qtcreator/themes/broccoli.tokenmapping b/share/qtcreator/themes/broccoli.tokenmapping index 933f1762427..3c7636e3234 100644 --- a/share/qtcreator/themes/broccoli.tokenmapping +++ b/share/qtcreator/themes/broccoli.tokenmapping @@ -9,7 +9,10 @@ BadgeLabelBackgroundColorChecked=Token_Background_Default BadgeLabelBackgroundColorUnchecked=Token_Foreground_Muted BadgeLabelTextColorChecked=Token_Text_Default BadgeLabelTextColorUnchecked=Token_Text_Default +CodeModel_Error_TextMarkColor=error +CodeModel_Warning_TextMarkColor=warning ComboBoxTextColor=Token_Text_Muted +DockWidgetResizeHandleColor=Token_Stroke_Subtle EditorPlaceholderColor=Token_Background_Muted FancyTabBarSelectedBackgroundColor=Token_Background_Muted FancyTabWidgetDisabledSelectedTextColor=Token_Text_Subtle @@ -39,12 +42,16 @@ IconsStopColor=Token_Notification_Danger_Default IconsStopToolBarColor=Token_Notification_Danger_Default IconsWarningColor=Token_Notification_Alert_Default IconsWarningToolBarColor=Token_Notification_Alert_Default +InfoBarBackground=Token_Notification_Alert_Subtle InfoBarText=Token_Text_Default MenuBarItemTextColorDisabled=Token_Text_Subtle MenuBarItemTextColorNormal=Token_Text_Default MenuItemTextColorDisabled=Token_Text_Subtle MenuItemTextColorNormal=Token_Text_Default +MiniProjectTargetSelectorBackgroundColor=Token_Background_Muted +MiniProjectTargetSelectorBorderColor=Token_Stroke_Subtle MiniProjectTargetSelectorTextColor=Token_Text_Muted +OutputPaneButtonFlashColor=Token_Notification_Danger_Default OutputPaneToggleButtonTextColorChecked=Token_Text_Muted OutputPaneToggleButtonTextColorUnchecked=Token_Text_Muted PaletteAccent=Token_Accent_Default