From 46856f4869175e5a7a644a29b3d8fda47c576790 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 21 Nov 2024 17:38:58 +0100 Subject: [PATCH] "2024" themes: Use more Token_* colors ...and less custom #rgb colors Change-Id: I38d4117755cfeb33d0e7e01f3044c3b5ef6a23ce Reviewed-by: Cristian Adam --- share/qtcreator/themes/2024.tokenmapping | 20 ++++++- share/qtcreator/themes/dark-2024.creatortheme | 57 ++++--------------- .../qtcreator/themes/light-2024.creatortheme | 41 ++----------- 3 files changed, 35 insertions(+), 83 deletions(-) diff --git a/share/qtcreator/themes/2024.tokenmapping b/share/qtcreator/themes/2024.tokenmapping index ab1d4a9ba7b..761883e2b05 100644 --- a/share/qtcreator/themes/2024.tokenmapping +++ b/share/qtcreator/themes/2024.tokenmapping @@ -9,10 +9,15 @@ BadgeLabelBackgroundColorChecked=Token_Background_Default BadgeLabelBackgroundColorUnchecked=Token_Foreground_Muted BadgeLabelTextColorChecked=Token_Text_Default BadgeLabelTextColorUnchecked=Token_Text_Default -CodeModel_Error_TextMarkColor=error -CodeModel_Warning_TextMarkColor=warning -CodeModel_Info_TextMarkColor=info +Bookmarks_TextMarkColor=Token_Notification_Neutral_Muted +CodeModel_Error_TextMarkColor=Token_Notification_Danger_Default +CodeModel_Info_TextMarkColor=Token_Notification_Neutral_Default +CodeModel_Warning_TextMarkColor=Token_Notification_Alert_Default ComboBoxTextColor=Token_Text_Muted +Debugger_Breakpoint_TextMarkColor=Token_Notification_Danger_Default +Debugger_WatchItem_ValueChanged=Token_Notification_Danger_Muted +Debugger_WatchItem_ValueInvalid=Token_Background_Subtle +Debugger_WatchItem_ValueNormal=Token_Text_Default DockWidgetResizeHandleColor=Token_Stroke_Subtle EditorPlaceholderColor=Token_Background_Muted FancyTabBarSelectedBackgroundColor=Token_Background_Muted @@ -61,6 +66,7 @@ PaletteAlternateBase=Token_Background_Muted PaletteAlternateBaseDisabled=Token_Background_Subtle PaletteBase=Token_Background_Default PaletteBaseDisabled=Token_Background_Subtle +PaletteBrightText=Token_Notification_Danger_Default PaletteBrightText=Token_Text_Default PaletteBrightTextDisabled=Token_Text_Subtle PaletteButton=Token_Background_Default @@ -115,3 +121,11 @@ TextEditor_CurrentLine_ScrollBarColor=Token_Foreground_Muted TextEditor_SearchResult_ScrollBarColor=Token_Notification_Alert_Default TextEditor_Selection_ScrollBarColor=Token_Foreground_Subtle Timeline_BackgroundColor1=Token_Background_Default +Timeline_BackgroundColor2=Token_Background_Muted +Timeline_DividerColor=Token_Stroke_Subtle +Timeline_HandleColor=Token_Text_Subtle +Timeline_HighlightColor=Token_Text_Default +Timeline_PanelBackgroundColor=Token_Background_Muted +Timeline_PanelHeaderColor=Token_Background_Muted +Timeline_RangeColor=Token_Text_Subtle +Timeline_TextColor=Token_Text_Default diff --git a/share/qtcreator/themes/dark-2024.creatortheme b/share/qtcreator/themes/dark-2024.creatortheme index 459f18e1bdd..f1a9ca352b8 100644 --- a/share/qtcreator/themes/dark-2024.creatortheme +++ b/share/qtcreator/themes/dark-2024.creatortheme @@ -6,20 +6,6 @@ DefaultTextEditorColorScheme=dark-2024.xml DefaultToolbarStyle=Relaxed [Palette] -shadowBackground=ff404142 -text=ffd0d0d0 -textDisabled=60a4a6a8 -textHighlighted=fff0f0f0 -selectedBackground=7a000000 -selectedBackgroundText=ff1d545c -normalBackground=ff2E2F30 -alternateBackground=ff353637 -error=ffdf4f4f -warning=ffecbc1c -splitter=ff06080A -textColorLinkVisited=ffa57aff -backgroundColorDisabled=ff444444 -qmlDesignerButtonColor=ff4c4e50 ;DS Theme Palette START ;greyscale @@ -130,7 +116,7 @@ DSredLight=ffff0401 DSinteraction=highlightBlue DSerrorColor=ffdf3a3a -DSwarningColor=warning +DSwarningColor=ffecbc1c DSdisabledColor=ff707070 DSinteractionHover=ff74cbfc @@ -264,8 +250,8 @@ DStoolTipText=ffdadada DSUnimportedModuleColor=ffe33c2e -DSBackgroundColorAlternate=alternateBackground -DSBackgroundColorNormal=normalBackground +DSBackgroundColorAlternate=ff353637 +DSBackgroundColorNormal=ff2E2F30 DStoolbarBackground=midnightGrey @@ -286,12 +272,12 @@ IconsCodeModelOverlayBackgroundColor=70000000 IconsCodeModelOverlayForegroundColor=ffd0d0d0 TextColorHighlightBackground=7a6f1c -OutputPanes_DebugTextColor=text +OutputPanes_DebugTextColor=Token_Text_Default OutputPanes_ErrorMessageTextColor=ffff6c6c OutputPanes_MessageOutput=ff008787 OutputPanes_NormalMessageTextColor=ff008787 OutputPanes_StdErrTextColor=ffff6666 -OutputPanes_StdOutTextColor=text +OutputPanes_StdOutTextColor=Token_Text_Default OutputPanes_WarningMessageTextColor=fff3c300 OutputPanes_TestPassTextColor=ff00b400 OutputPanes_TestFailTextColor=ffcf4848 @@ -306,46 +292,27 @@ Debugger_LogWindow_LogInput=ff00acac Debugger_LogWindow_LogStatus=ff00875a Debugger_LogWindow_LogTime=ffbf0303 -Debugger_WatchItem_ValueNormal=text -Debugger_WatchItem_ValueInvalid=textDisabled -Debugger_WatchItem_ValueChanged=ffff6666 - -Debugger_Breakpoint_TextMarkColor=ffff4040 - -Timeline_TextColor=text -Timeline_BackgroundColor2=ff444444 -Timeline_DividerColor=ff555555 -Timeline_HighlightColor=ff3099dc -Timeline_PanelBackgroundColor=ff808080 -Timeline_PanelHeaderColor=alternateBackground -Timeline_HandleColor=alternateBackground -Timeline_RangeColor=selectedBackground - -VcsBase_FileStatusUnknown_TextColor=text +VcsBase_FileStatusUnknown_TextColor=Token_Text_Default VcsBase_FileAdded_TextColor=ff00ff00 VcsBase_FileModified_TextColor=ff8ee0ff VcsBase_FileDeleted_TextColor=fffff6c6c VcsBase_FileRenamed_TextColor=ffffa500 VcsBase_FileUnmerged_TextColor=ffff4040 -Bookmarks_TextMarkColor=ff8080ff - -QmlDesigner_BackgroundColor=qmlDesignerButtonColor +QmlDesigner_BackgroundColor=ff4c4e50 QmlDesigner_HighlightColor=ff1d545c QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorForegroundColor=ffffffff QmlDesigner_BackgroundColorDarkAlternate=dawnGrey QmlDesigner_BackgroundColorDarker=ff262728 -QmlDesigner_BorderColor=splitter +QmlDesigner_BorderColor=ff06080A QmlDesigner_ButtonColor=ff595b5c -QmlDesigner_TabDark=shadowBackground -QmlDesigner_TabLight=text -QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor -QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor +QmlDesigner_TabDark=ff404142 +QmlDesigner_TabLight=Token_Text_Default +QmlDesigner_FormeditorBackgroundColor=ff4c4e50 +QmlDesigner_AlternateBackgroundColor=ff4c4e50 QmlDesigner_ScrollBarHandleColor=ff595b5c -PaletteBrightText=ffff3333 - TerminalForeground=ffffff TerminalSelection=3fd1d1d1 TerminalFindMatch=7fffff00 diff --git a/share/qtcreator/themes/light-2024.creatortheme b/share/qtcreator/themes/light-2024.creatortheme index dacf51d6317..88d3e820674 100644 --- a/share/qtcreator/themes/light-2024.creatortheme +++ b/share/qtcreator/themes/light-2024.creatortheme @@ -6,18 +6,6 @@ DefaultTextEditorColorScheme=light-2024.xml DefaultToolbarStyle=Relaxed [Palette] -shadowBackground=PaletteDark -text=PaletteWindowText -textDisabled=PaletteTextDisabled -selectedBackground=a8ffffff -alternateBackground=PaletteAlternateBase -stop_error=ffec7373 -splitter=ffbdbebf -error=ffdf4f4f -warning=ffecbc1c -textColorLinkVisited=PaletteLinkVisited -backgroundColorDisabled=PaletteWindowDisabled -qmlDesignerButtonColor=fff8f8f8 ;DS Theme Palette START ;greyscale @@ -132,7 +120,7 @@ DSredLight=ffff0401 DSinteraction=highlightBlue DSerrorColor=ffdf3a3a -DSwarningColor=warning +DSwarningColor=ffecbc1c DSdisabledColor=ff8e8e8e DSinteractionHover=highlightHover @@ -285,7 +273,7 @@ IconsCodeModelOverlayBackgroundColor=70ffffff IconsCodeModelOverlayForegroundColor=ff232425 TextColorHighlightBackground=ffef0b -OutputPanes_DebugTextColor=text +OutputPanes_DebugTextColor=Token_Text_Default OutputPanes_ErrorMessageTextColor=ffaa0000 OutputPanes_MessageOutput=ff0000aa OutputPanes_NormalMessageTextColor=ff0000aa @@ -305,21 +293,6 @@ Debugger_LogWindow_LogInput=ff00acac Debugger_LogWindow_LogStatus=ff00875a Debugger_LogWindow_LogTime=ffbf0303 -Debugger_WatchItem_ValueNormal=text -Debugger_WatchItem_ValueInvalid=textDisabled -Debugger_WatchItem_ValueChanged=ffbf0303 - -Debugger_Breakpoint_TextMarkColor=ffff4040 - -Timeline_TextColor=text -Timeline_BackgroundColor2=fff6f6f6 -Timeline_DividerColor=ffd6d6d6 -Timeline_HighlightColor=ff3099dc -Timeline_PanelBackgroundColor=ffd6d6d6 -Timeline_PanelHeaderColor=ff888888 -Timeline_HandleColor=ff888888 -Timeline_RangeColor=selectedBackground - VcsBase_FileStatusUnknown_TextColor=ff000000 VcsBase_FileAdded_TextColor=ff00aa00 VcsBase_FileModified_TextColor=ff0000ee @@ -327,20 +300,18 @@ VcsBase_FileDeleted_TextColor=ff800000 VcsBase_FileRenamed_TextColor=ffd77d00 VcsBase_FileUnmerged_TextColor=ffee0000 -Bookmarks_TextMarkColor=ffa0a0ff - -QmlDesigner_BackgroundColor=qmlDesignerButtonColor +QmlDesigner_BackgroundColor=fff8f8f8 QmlDesigner_HighlightColor=ff46a2da QmlDesigner_FormEditorSelectionColor=ff4ba2ff QmlDesigner_FormEditorForegroundColor=ffffffff QmlDesigner_BackgroundColorDarkAlternate=ffeaeaea QmlDesigner_BackgroundColorDarker=fff5f5f5 -QmlDesigner_BorderColor=splitter +QmlDesigner_BorderColor=ffbdbebf QmlDesigner_ButtonColor=ffcccccc QmlDesigner_TabDark=ff585858 QmlDesigner_TabLight=ffd0d0d0 -QmlDesigner_FormeditorBackgroundColor=qmlDesignerButtonColor -QmlDesigner_AlternateBackgroundColor=qmlDesignerButtonColor +QmlDesigner_FormeditorBackgroundColor=fff8f8f8 +QmlDesigner_AlternateBackgroundColor=fff8f8f8 QmlDesigner_ScrollBarHandleColor=ffcccccc TerminalForeground=ff000000