Icons: Remove remnants of colored "active" state of mode icons

In Qt Creator 14, the mode icon graphics were updated. Due to their
"line style", the effect of individually coloring their active state was
disabled. The feature was not completely removed, though.

This change removes all traces of this feature. Upcoming "UI face lift
changes" will add new ways of handling the "active" state of mode icons.

Amends: b599edb9b7ed186066eef04bf06a054bc183751b

Change-Id: Ib1ffd2c7e3a0c45fdfacdad65377dbb676be80b6
Reviewed-by: Marcus Tillmanns <[email protected]>

22 files changed, 8 insertions, 94 deletions

diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 463204fd513..7744fe1067a 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -325,13 +325,6 @@ IconsDebugColor=ffb8c6ff
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffdd7710
 IconsBuildHammerHeadColor=ff989898
-IconsModeWelcomeActiveColor=ff80c342
-IconsModeEditActiveColor=ff99aaef
-IconsModeDesignActiveColor=ffbb6000
-IconsModeDebugActiveColor=ff99aaef
-IconsModeProjectActiveColor=ff80c342
-IconsModeAnalyzeActiveColor=ff43adee
-IconsModeHelpActiveColor=fff4be04
 IconsCodeModelKeywordColor=ffaaaaaa
 IconsCodeModelClassColor=ffc0b550
 IconsCodeModelStructColor=ff53b053
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index e6cdab1bc30..d83b1690d8e 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -317,13 +317,6 @@ IconsDebugColor=ffdcdcdc
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffdd7710
 IconsBuildHammerHeadColor=ff989898
-IconsModeWelcomeActiveColor=ffffffff
-IconsModeEditActiveColor=ffffffff
-IconsModeDesignActiveColor=ffffffff
-IconsModeDebugActiveColor=ffffffff
-IconsModeProjectActiveColor=ffffffff
-IconsModeAnalyzeActiveColor=ffffffff
-IconsModeHelpActiveColor=ffffffff
 IconsCodeModelKeywordColor=ff777777
 IconsCodeModelClassColor=ffc0b550
 IconsCodeModelStructColor=ff53b053
diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme
index 5271d5fc57a..504bf128bfb 100644
--- a/share/qtcreator/themes/design-light.creatortheme
+++ b/share/qtcreator/themes/design-light.creatortheme
@@ -329,13 +329,6 @@ IconsDebugColor=toolBarItem
 IconsNavigationArrowsColor=ff3dabe6
 IconsBuildHammerHandleColor=ffc26b14
 IconsBuildHammerHeadColor=ff868687
-IconsModeWelcomeActiveColor=ff5caa15
-IconsModeEditActiveColor=ff6a6add
-IconsModeDesignActiveColor=ffbb6000
-IconsModeDebugActiveColor=ff6a6add
-IconsModeProjectActiveColor=ff5caa15
-IconsModeAnalyzeActiveColor=ff43adee
-IconsModeHelpActiveColor=fffaa838
 IconsCodeModelKeywordColor=ff777777
 IconsCodeModelClassColor=ffc0b550
 IconsCodeModelStructColor=ff53b053
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 874c5116e03..04859f2d316 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -333,13 +333,6 @@ IconsDebugColor=toolBarItem
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffb06112
 IconsBuildHammerHeadColor=ff828384
-IconsModeWelcomeActiveColor=ff1f6c97
-IconsModeEditActiveColor=ff99aaef
-IconsModeDesignActiveColor=ffbb6000
-IconsModeDebugActiveColor=ff99aaef
-IconsModeProjectActiveColor=ff1f6c97
-IconsModeAnalyzeActiveColor=ff43adee
-IconsModeHelpActiveColor=fff4be04
 IconsCodeModelKeywordColor=ff777777
 IconsCodeModelClassColor=ffc0b550
 IconsCodeModelStructColor=ff53b053
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index bdf46614b05..a9ee8fabb4d 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -329,13 +329,6 @@ IconsDebugColor=toolBarItem
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffb06112
 IconsBuildHammerHeadColor=ff828384
-IconsModeWelcomeActiveColor=ff80c342
-IconsModeEditActiveColor=ff99aaef
-IconsModeDesignActiveColor=ffbb6000
-IconsModeDebugActiveColor=ff99aaef
-IconsModeProjectActiveColor=ff80c342
-IconsModeAnalyzeActiveColor=ff43adee
-IconsModeHelpActiveColor=fff4be04
 IconsCodeModelKeywordColor=ff777777
 IconsCodeModelClassColor=ffc0b550
 IconsCodeModelStructColor=ff53b053
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index a85d3654d88..6b72eb3ad9f 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -329,13 +329,6 @@ IconsDebugColor=toolBarItem
 IconsNavigationArrowsColor=ff3dabe6
 IconsBuildHammerHandleColor=ffc26b14
 IconsBuildHammerHeadColor=ff868687
-IconsModeWelcomeActiveColor=ff5caa15
-IconsModeEditActiveColor=ff6a6add
-IconsModeDesignActiveColor=ffbb6000
-IconsModeDebugActiveColor=ff6a6add
-IconsModeProjectActiveColor=ff5caa15
-IconsModeAnalyzeActiveColor=ff43adee
-IconsModeHelpActiveColor=fffaa838
 IconsCodeModelKeywordColor=ff777777
 IconsCodeModelClassColor=ffc0b550
 IconsCodeModelStructColor=ff53b053
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index 7fd222e168a..5db0d2ca3ae 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -327,13 +327,6 @@ IconsDebugColor=toolBarItem
 IconsNavigationArrowsColor=ffebc322
 IconsBuildHammerHandleColor=ffc26b14
 IconsBuildHammerHeadColor=ff868687
-IconsModeWelcomeActiveColor=ff80c342
-IconsModeEditActiveColor=ff99aaef
-IconsModeDesignActiveColor=ffbb6000
-IconsModeDebugActiveColor=ff99aaef
-IconsModeProjectActiveColor=ff80c342
-IconsModeAnalyzeActiveColor=ff43adee
-IconsModeHelpActiveColor=fff4be04
 IconsCodeModelKeywordColor=ff777777
 IconsCodeModelClassColor=ffc0b550
 IconsCodeModelStructColor=ff53b053
diff --git a/src/libs/utils/icon.cpp b/src/libs/utils/icon.cpp
index 073ec771531..c40314d6d75 100644
--- a/src/libs/utils/icon.cpp
+++ b/src/libs/utils/icon.cpp
@@ -210,13 +210,6 @@ QIcon Icon::sideBarIcon(const Icon &classic, const Icon &flat)
     return result;
 }
 
-QIcon Icon::modeIcon(const Icon &classic, const Icon &flat,
-                     [[maybe_unused]] const Icon &flatActive)
-{
-    QIcon result = sideBarIcon(classic, flat);
-    return result;
-}
-
 QIcon Icon::combinedIcon(const QList<QIcon> &icons)
 {
     QIcon result;
diff --git a/src/libs/utils/icon.h b/src/libs/utils/icon.h
index d26668082bf..7e7f880be6a 100644
--- a/src/libs/utils/icon.h
+++ b/src/libs/utils/icon.h
@@ -54,8 +54,6 @@ public:
     // Returns either the classic or a themed icon depending on
     // the current Theme::FlatModeIcons flag.
     static QIcon sideBarIcon(const Icon &classic, const Icon &flat);
-    // Like sideBarIcon plus added action mode for the flat icon
-    static QIcon modeIcon(const Icon &classic, const Icon &flat, const Icon &flatActive);
 
     // Combined icon pixmaps in Normal and Disabled states from several Icons
     static QIcon combinedIcon(const QList<QIcon> &icons);
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index 8d7e922e79d..dbf39780ac2 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -165,13 +165,6 @@ public:
         IconsNavigationArrowsColor,
         IconsBuildHammerHandleColor,
         IconsBuildHammerHeadColor,
-        IconsModeWelcomeActiveColor,
-        IconsModeEditActiveColor,
-        IconsModeDesignActiveColor,
-        IconsModeDebugActiveColor,
-        IconsModeProjectActiveColor,
-        IconsModeAnalyzeActiveColor,
-        IconsModeHelpActiveColor,
 
         /* Code model Icons */
 
diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp
index b2524580a27..74ad6099b5b 100644
--- a/src/plugins/coreplugin/coreicons.cpp
+++ b/src/plugins/coreplugin/coreicons.cpp
@@ -25,14 +25,10 @@ const Icon MODE_EDIT_CLASSIC(
         ":/fancyactionbar/images/mode_Edit.png");
 const Icon MODE_EDIT_FLAT({
         {":/fancyactionbar/images/mode_edit_mask.png", Theme::IconsBaseColor}});
-const Icon MODE_EDIT_FLAT_ACTIVE({
-        {":/fancyactionbar/images/mode_edit_mask.png", Theme::IconsModeEditActiveColor}});
 const Icon MODE_DESIGN_CLASSIC(
         ":/fancyactionbar/images/mode_Design.png");
 const Icon MODE_DESIGN_FLAT({
         {":/fancyactionbar/images/mode_design_mask.png", Theme::IconsBaseColor}});
-const Icon MODE_DESIGN_FLAT_ACTIVE({
-        {":/fancyactionbar/images/mode_design_mask.png", Theme::IconsModeDesignActiveColor}});
 
 const Icon DESKTOP_DEVICE_SMALL({{":/utils/images/desktopdevicesmall.png",
                                   Theme::PanelTextColorDark}},
diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp
index f69e3d0e030..9560e187734 100644
--- a/src/plugins/coreplugin/designmode.cpp
+++ b/src/plugins/coreplugin/designmode.cpp
@@ -86,8 +86,7 @@ DesignMode::DesignMode()
     setContext(Context(Constants::C_DESIGN_MODE));
     setWidget(d->m_stackWidget);
     setDisplayName(Tr::tr("Design"));
-    setIcon(Utils::Icon::modeIcon(Icons::MODE_DESIGN_CLASSIC,
-                                  Icons::MODE_DESIGN_FLAT, Icons::MODE_DESIGN_FLAT_ACTIVE));
+    setIcon(Icon::sideBarIcon(Icons::MODE_DESIGN_CLASSIC, Icons::MODE_DESIGN_FLAT));
     setPriority(Constants::P_MODE_DESIGN);
     setId(Constants::MODE_DESIGN);
 
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index a6a0e6d35cc..0a2e309aab8 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -66,8 +66,7 @@ EditMode::EditMode()
 {
     setObjectName(QLatin1String("EditMode"));
     setDisplayName(Tr::tr("Edit"));
-    setIcon(Utils::Icon::modeIcon(Icons::MODE_EDIT_CLASSIC,
-                                  Icons::MODE_EDIT_FLAT, Icons::MODE_EDIT_FLAT_ACTIVE));
+    setIcon(Utils::Icon::sideBarIcon(Icons::MODE_EDIT_CLASSIC, Icons::MODE_EDIT_FLAT));
     setPriority(Constants::P_MODE_EDIT);
     setId(Constants::MODE_EDIT);
 
diff --git a/src/plugins/debugger/debuggericons.cpp b/src/plugins/debugger/debuggericons.cpp
index 2965934f291..fef65347492 100644
--- a/src/plugins/debugger/debuggericons.cpp
+++ b/src/plugins/debugger/debuggericons.cpp
@@ -118,8 +118,6 @@ const Icon MODE_DEBUGGER_CLASSIC(
         ":/debugger/images/mode_debug.png");
 const Icon MODE_DEBUGGER_FLAT({
         {":/debugger/images/mode_debug_mask.png", Theme::IconsBaseColor}});
-const Icon MODE_DEBUGGER_FLAT_ACTIVE({
-        {":/debugger/images/mode_debug_mask.png", Theme::IconsModeDebugActiveColor}});
 
 const Icon MACOS_TOUCHBAR_DEBUG(
         ":/debugger/images/macos_touchbar_debug.png");
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 315bf3dc7ff..d7ad2501612 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -500,8 +500,7 @@ public:
         setObjectName("DebugMode");
         setContext(Context(C_DEBUGMODE, CC::C_NAVIGATION_PANE));
         setDisplayName(Tr::tr("Debug"));
-        setIcon(Utils::Icon::modeIcon(Icons::MODE_DEBUGGER_CLASSIC,
-                                      Icons::MODE_DEBUGGER_FLAT, Icons::MODE_DEBUGGER_FLAT_ACTIVE));
+        setIcon(Icon::sideBarIcon(Icons::MODE_DEBUGGER_CLASSIC, Icons::MODE_DEBUGGER_FLAT));
         setPriority(85);
         setId(MODE_DEBUG);
 
diff --git a/src/plugins/extensionmanager/extensionmanagerplugin.cpp b/src/plugins/extensionmanager/extensionmanagerplugin.cpp
index ec7fbc47bdd..0b20803b7a5 100644
--- a/src/plugins/extensionmanager/extensionmanagerplugin.cpp
+++ b/src/plugins/extensionmanager/extensionmanagerplugin.cpp
@@ -37,9 +37,7 @@ public:
         setDisplayName(Tr::tr("Extensions"));
         const Icon FLAT({{":/extensionmanager/images/mode_extensionmanager_mask.png",
                           Theme::IconsBaseColor}});
-        const Icon FLAT_ACTIVE({{":/extensionmanager/images/mode_extensionmanager_mask.png",
-                                 Theme::IconsModeWelcomeActiveColor}});
-        setIcon(Icon::modeIcon(FLAT, FLAT, FLAT_ACTIVE));
+        setIcon(Icon::sideBarIcon(FLAT, FLAT));
         setPriority(72);
         setWidgetCreator(&createExtensionManagerWidget);
     }
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 18d76bb14c9..1b70196a20a 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -86,8 +86,7 @@ public:
     {
         setObjectName("HelpMode");
         setContext(Core::Context(Constants::C_MODE_HELP));
-        setIcon(Icon::modeIcon(Icons::MODE_HELP_CLASSIC,
-                               Icons::MODE_HELP_FLAT, Icons::MODE_HELP_FLAT_ACTIVE));
+        setIcon(Icon::sideBarIcon(Icons::MODE_HELP_CLASSIC, Icons::MODE_HELP_FLAT));
         setDisplayName(Tr::tr("Help"));
         setPriority(Constants::P_MODE_HELP);
         setId(Constants::ID_MODE_HELP);
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index d3d84551413..184c5cfd74a 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -363,8 +363,7 @@ public:
     {
         setContext(Context(Constants::C_PROJECTEXPLORER));
         setDisplayName(Tr::tr("Projects"));
-        setIcon(Icon::modeIcon(Icons::MODE_PROJECT_CLASSIC,
-                               Icons::MODE_PROJECT_FLAT, Icons::MODE_PROJECT_FLAT_ACTIVE));
+        setIcon(Icon::sideBarIcon(Icons::MODE_PROJECT_CLASSIC, Icons::MODE_PROJECT_FLAT));
         setPriority(Constants::P_MODE_SESSION);
         setId(Constants::MODE_SESSION);
     }
diff --git a/src/plugins/projectexplorer/projectexplorericons.cpp b/src/plugins/projectexplorer/projectexplorericons.cpp
index d1cf1aa697b..5732a60c951 100644
--- a/src/plugins/projectexplorer/projectexplorericons.cpp
+++ b/src/plugins/projectexplorer/projectexplorericons.cpp
@@ -80,8 +80,6 @@ const Icon DESKTOP_DEVICE({
 const Icon MODE_PROJECT_CLASSIC(":/projectexplorer/images/mode_project.png");
 const Icon MODE_PROJECT_FLAT({
         {":/projectexplorer/images/mode_project_mask.png", Theme::IconsBaseColor}});
-const Icon MODE_PROJECT_FLAT_ACTIVE({
-        {":/projectexplorer/images/mode_project_mask.png", Theme::IconsModeProjectActiveColor}});
 
 } // namespace Icons
 } // namespace ProjectExplorer
diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
index 13c0fc59915..42734452bb9 100644
--- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp
+++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp
@@ -748,9 +748,7 @@ WelcomeMode::WelcomeMode()
 
     const Utils::Icon FLAT({{":/studiowelcome/images/mode_welcome_mask.png",
                       Utils::Theme::IconsBaseColor}});
-    const Utils::Icon FLAT_ACTIVE({{":/studiowelcome/images/mode_welcome_mask.png",
-                             Utils::Theme::IconsModeWelcomeActiveColor}});
-    setIcon(Utils::Icon::modeIcon(FLAT, FLAT, FLAT_ACTIVE));
+    setIcon(Icon::sideBarIcon(FLAT, FLAT));
 
     setPriority(Core::Constants::P_MODE_WELCOME);
     setId(Core::Constants::MODE_WELCOME);
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 000c9888593..7944cc8ee21 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -353,9 +353,7 @@ public:
         const Icon CLASSIC(":/welcome/images/mode_welcome.png");
         const Icon FLAT({{":/welcome/images/mode_welcome_mask.png",
                           Theme::IconsBaseColor}});
-        const Icon FLAT_ACTIVE({{":/welcome/images/mode_welcome_mask.png",
-                                 Theme::IconsModeWelcomeActiveColor}});
-        setIcon(Icon::modeIcon(CLASSIC, FLAT, FLAT_ACTIVE));
+        setIcon(Icon::sideBarIcon(CLASSIC, FLAT));
 
         setPriority(Constants::P_MODE_WELCOME);
         setId(Constants::MODE_WELCOME);
diff --git a/src/shared/help/helpicons.h b/src/shared/help/helpicons.h
index be4a964e8f5..b7a69c626b8 100644
--- a/src/shared/help/helpicons.h
+++ b/src/shared/help/helpicons.h
@@ -12,8 +12,6 @@ const Utils::Icon MODE_HELP_CLASSIC(
         ":/help/images/mode_help.png");
 const Utils::Icon MODE_HELP_FLAT({
         {":/help/images/mode_help_mask.png", Utils::Theme::IconsBaseColor}});
-const Utils::Icon MODE_HELP_FLAT_ACTIVE({
-        {":/help/images/mode_help_mask.png", Utils::Theme::IconsModeHelpActiveColor}});
 const Utils::Icon MACOS_TOUCHBAR_HELP(
         ":/help/images/macos_touchbar_help.png");