From 84d298e085c9431c2e2137cf91ecce566dd675af Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 17 Oct 2016 23:53:37 +0200 Subject: [PATCH] TextEditor: Unify error/warning icon and textmark colors In most themes, the color of the warning and error icons differ from the color of the corresponding textmarks (on the scroll bars). This patch makes sure that they are the same. Also the progress bar error color is now the same. Change-Id: Ibce536bed1a9f43d242c2eddf9f94cc6277b2f64 Reviewed-by: Nikolai Kosjar Reviewed-by: David Schulz --- share/qtcreator/themes/dark.creatortheme | 15 ++++++++------- share/qtcreator/themes/default.creatortheme | 16 +++++++++------- share/qtcreator/themes/flat-dark.creatortheme | 17 +++++++++-------- share/qtcreator/themes/flat-light.creatortheme | 16 +++++++++------- share/qtcreator/themes/flat.creatortheme | 17 +++++++++-------- 5 files changed, 44 insertions(+), 37 deletions(-) diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index d565d6c878e..2e7f5f7000f 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -11,7 +11,8 @@ hoverBackground=18ffffff selectedBackground=66000000 normalBackground=ff333333 alternateBackground=ff515151 -error=ffff0000 +error=ffd84044 +warning=ffe0b716 textColorLink=ff007af4 textColorLinkVisited=ffa57aff backgroundColorDisabled=ff444444 @@ -56,9 +57,9 @@ IconsBaseColor=ffdcdcdc IconsDisabledColor=textDisabled IconsInfoColor=ff3099dc IconsInfoToolBarColor=ff3099dc -IconsWarningColor=ffe0b716 +IconsWarningColor=warning IconsWarningToolBarColor=ffe0b716 -IconsErrorColor=ffd84044 +IconsErrorColor=error IconsErrorToolBarColor=ffd84044 IconsRunColor=ff7fc341 IconsRunToolBarColor=ff7fc341 @@ -184,11 +185,11 @@ Bookmarks_TextMarkColor=ff8080ff TextEditor_SearchResult_ScrollBarColor=ff00c000 TextEditor_CurrentLine_ScrollBarColor=ffffffff -ProjectExplorer_TaskError_TextMarkColor=ffff4040 -ProjectExplorer_TaskWarn_TextMarkColor=ffffff40 +ProjectExplorer_TaskError_TextMarkColor=error +ProjectExplorer_TaskWarn_TextMarkColor=warning -ClangCodeModel_Error_TextMarkColor=ffff882f -ClangCodeModel_Warning_TextMarkColor=ffceff40 +ClangCodeModel_Error_TextMarkColor=error +ClangCodeModel_Warning_TextMarkColor=warning PaletteWindow=normalBackground PaletteWindowText=text diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index d27a55c2348..816c5987871 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -6,6 +6,8 @@ PreferredStyles= brightText=ffffffff darkText=ff000000 textDisabled=88a0a0a0 +error=ffdf4f4f +warning=ffecbc1c [Colors] BackgroundColorAlternate=ff3d3d3d @@ -47,9 +49,9 @@ IconsBaseColor=ffdcdcdc IconsDisabledColor=textDisabled IconsInfoColor=ff3099dc IconsInfoToolBarColor=ff71b2db -IconsWarningColor=ffecbc1c +IconsWarningColor=warning IconsWarningToolBarColor=fff2d76e -IconsErrorColor=ffdf4f4f +IconsErrorColor=error IconsErrorToolBarColor=ffdb6f71 IconsRunColor=ff6da838 IconsRunToolBarColor=ffa4d576 @@ -97,7 +99,7 @@ PanelsWidgetSeparatorLineColor=ffbfbcb8 PanelTextColorDark=darkText PanelTextColorMid=ff909090 PanelTextColorLight=brightText -ProgressBarColorError=d2ff3c00 +ProgressBarColorError=error ProgressBarColorFinished=ff5aaa3c ProgressBarColorNormal=b4ffffff ProgressBarTitleColor=ffffffff @@ -175,11 +177,11 @@ Bookmarks_TextMarkColor=ffa0a0ff TextEditor_SearchResult_ScrollBarColor=ff00c000 TextEditor_CurrentLine_ScrollBarColor=ff404040 -ProjectExplorer_TaskError_TextMarkColor=ffff0000 -ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 +ProjectExplorer_TaskError_TextMarkColor=error +ProjectExplorer_TaskWarn_TextMarkColor=warning -ClangCodeModel_Error_TextMarkColor=ffff882f -ClangCodeModel_Warning_TextMarkColor=ffc6c132 +ClangCodeModel_Error_TextMarkColor=error +ClangCodeModel_Warning_TextMarkColor=warning QmlDesigner_BackgroundColor=ff4c4e50 QmlDesigner_HighlightColor=ff46a2da diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme index 83105732bfc..bf3b181a28f 100644 --- a/share/qtcreator/themes/flat-dark.creatortheme +++ b/share/qtcreator/themes/flat-dark.creatortheme @@ -15,7 +15,8 @@ hoverBackground=22ffffff selectedBackground=66000000 normalBackground=ff2E2F30 alternateBackground=ff353637 -error=ffe41e25 +error=ffdf4f4f +warning=ffecbc1c splitter=ff06080A textColorLink=ff007af4 textColorLinkVisited=ffa57aff @@ -61,9 +62,9 @@ IconsBaseColor=toolBarItem IconsDisabledColor=toolBarItemDisabled IconsInfoColor=ff3099dc IconsInfoToolBarColor=ff71b2db -IconsWarningColor=ffecbc1c +IconsWarningColor=warning IconsWarningToolBarColor=fff2d76e -IconsErrorColor=ffdf4f4f +IconsErrorColor=error IconsErrorToolBarColor=ffdb6f71 IconsRunColor=ff6da838 IconsRunToolBarColor=ff93be6c @@ -111,7 +112,7 @@ PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text PanelTextColorMid=ffa0a0a0 PanelTextColorLight=text -ProgressBarColorError=ffdb6f71 +ProgressBarColorError=error ProgressBarColorFinished=dda4d576 ProgressBarColorNormal=ff999999 ProgressBarTitleColor=fancyBarsBoldTextColor @@ -189,11 +190,11 @@ Bookmarks_TextMarkColor=ff8080ff TextEditor_SearchResult_ScrollBarColor=ff00c000 TextEditor_CurrentLine_ScrollBarColor=ffffffff -ProjectExplorer_TaskError_TextMarkColor=ffff4040 -ProjectExplorer_TaskWarn_TextMarkColor=ffffff40 +ProjectExplorer_TaskError_TextMarkColor=error +ProjectExplorer_TaskWarn_TextMarkColor=warning -ClangCodeModel_Error_TextMarkColor=ffff882f -ClangCodeModel_Warning_TextMarkColor=ffceff40 +ClangCodeModel_Error_TextMarkColor=error +ClangCodeModel_Warning_TextMarkColor=warning QmlDesigner_BackgroundColor=ff4c4e50 QmlDesigner_HighlightColor=ff3f91c4 diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme index 6e7994a73f6..ae978557363 100644 --- a/share/qtcreator/themes/flat-light.creatortheme +++ b/share/qtcreator/themes/flat-light.creatortheme @@ -17,6 +17,8 @@ alternateBackground=ff515151 stop_error=ffec7373 run_success=ff52c23b splitter=ffbdbebf +error=ffdf4f4f +warning=ffecbc1c [Colors] BackgroundColorAlternate=alternateBackground @@ -58,9 +60,9 @@ IconsBaseColor=toolBarItem IconsDisabledColor=toolBarItemDisabled IconsInfoColor=ff3099dc IconsInfoToolBarColor=ff3099dc -IconsWarningColor=ffecbc1c +IconsWarningColor=warning IconsWarningToolBarColor=ffecbc1c -IconsErrorColor=ffdf4f4f +IconsErrorColor=error IconsErrorToolBarColor=ffdf4f4f IconsRunColor=run_success IconsRunToolBarColor=run_success @@ -108,7 +110,7 @@ PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text PanelTextColorMid=ff666666 PanelTextColorLight=fancyBarsNormalTextColor -ProgressBarColorError=stop_error +ProgressBarColorError=error ProgressBarColorFinished=run_success ProgressBarColorNormal=ff888888 ProgressBarTitleColor=fancyBarsBoldTextColor @@ -186,11 +188,11 @@ Bookmarks_TextMarkColor=ffa0a0ff TextEditor_SearchResult_ScrollBarColor=ff00c000 TextEditor_CurrentLine_ScrollBarColor=ff404040 -ProjectExplorer_TaskError_TextMarkColor=ffff0000 -ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 +ProjectExplorer_TaskError_TextMarkColor=error +ProjectExplorer_TaskWarn_TextMarkColor=warning -ClangCodeModel_Error_TextMarkColor=ffff882f -ClangCodeModel_Warning_TextMarkColor=ffc6c132 +ClangCodeModel_Error_TextMarkColor=error +ClangCodeModel_Warning_TextMarkColor=warning QmlDesigner_BackgroundColor=fff8f8f8 QmlDesigner_HighlightColor=ff46a2da diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index e8dd1b3048f..a4790bbbcc4 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -14,7 +14,8 @@ hoverBackground=22ffffff selectedBackground=66000000 normalBackground=ffffffff alternateBackground=ff515151 -error=ffe41e25 +error=ffdf4f4f +warning=ffecbc1c splitter=ff313131 [Colors] @@ -57,9 +58,9 @@ IconsBaseColor=toolBarItem IconsDisabledColor=toolBarItemDisabled IconsInfoColor=ff3099dc IconsInfoToolBarColor=ff71b2db -IconsWarningColor=ffecbc1c +IconsWarningColor=warning IconsWarningToolBarColor=fff2d76e -IconsErrorColor=ffdf4f4f +IconsErrorColor=error IconsErrorToolBarColor=ffdb6f71 IconsRunColor=ff6da838 IconsRunToolBarColor=ff93be6c @@ -107,7 +108,7 @@ PanelsWidgetSeparatorLineColor=0 PanelTextColorDark=text PanelTextColorMid=ff666666 PanelTextColorLight=fancyBarsNormalTextColor -ProgressBarColorError=ffdb6f71 +ProgressBarColorError=error ProgressBarColorFinished=dda4d576 ProgressBarColorNormal=ff999999 ProgressBarTitleColor=fancyBarsBoldTextColor @@ -185,11 +186,11 @@ Bookmarks_TextMarkColor=ffa0a0ff TextEditor_SearchResult_ScrollBarColor=ff00c000 TextEditor_CurrentLine_ScrollBarColor=ff404040 -ProjectExplorer_TaskError_TextMarkColor=ffff0000 -ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 +ProjectExplorer_TaskError_TextMarkColor=error +ProjectExplorer_TaskWarn_TextMarkColor=warning -ClangCodeModel_Error_TextMarkColor=ffff882f -ClangCodeModel_Warning_TextMarkColor=ffc6c132 +ClangCodeModel_Error_TextMarkColor=error +ClangCodeModel_Warning_TextMarkColor=warning QmlDesigner_BackgroundColor=ff4c4e50 QmlDesigner_HighlightColor=ff46a2da