Flat and themeable side bar icons

This patch adds flat side bar icons according to
http://blog.qt.io/blog/author/didesous/

The flat icons are supposed to be opt-in, via the theme flag
"FlatSideBarIcons=true". It is false by default for the default
theme for now.

Change-Id: I1cbe69d4e138d5d23c0172a374933ac7a4ce8a5b
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

5 files changed, 13 insertions, 1 deletions

diff --git a/src/plugins/welcome/images/mode_edit_mask.png b/src/plugins/welcome/images/mode_edit_mask.png
new file mode 100644
index 00000000000..221f4915193
--- /dev/null
+++ b/src/plugins/welcome/images/mode_edit_mask.png
diff --git a/src/plugins/welcome/images/mode_welcome_mask.png b/src/plugins/welcome/images/mode_welcome_mask.png
new file mode 100644
index 00000000000..d0183d3e79f
--- /dev/null
+++ b/src/plugins/welcome/images/mode_welcome_mask.png
diff --git a/src/plugins/welcome/images/mode_welcome_mask@2x.png b/src/plugins/welcome/images/mode_welcome_mask@2x.png
new file mode 100644
index 00000000000..b9189b3efb4
--- /dev/null
+++ b/src/plugins/welcome/images/mode_welcome_mask@2x.png
diff --git a/src/plugins/welcome/welcome.qrc b/src/plugins/welcome/welcome.qrc
index 05531f04b1d..3d8bff335f2 100644
--- a/src/plugins/welcome/welcome.qrc
+++ b/src/plugins/welcome/welcome.qrc
@@ -2,5 +2,7 @@
     <qresource prefix="/welcome">
         <file>images/mode_welcome.png</file>
         <file>images/mode_welcome@2x.png</file>
+        <file>images/mode_welcome_mask.png</file>
+        <file>images/mode_welcome_mask@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 7a64fde5beb..26b0aed55d5 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -40,6 +40,7 @@
 #include <coreplugin/modemanager.h>
 
 #include <utils/algorithm.h>
+#include <utils/icon.h>
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
@@ -130,7 +131,16 @@ WelcomeMode::WelcomeMode()
     : m_activePlugin(0)
 {
     setDisplayName(tr("Welcome"));
-    setIcon(QIcon(QLatin1String(":/welcome/images/mode_welcome.png")));
+
+    const Utils::Icon MODE_WELCOME_CLASSIC(
+            QLatin1String(":/welcome/images/mode_welcome.png"));
+    const Utils::Icon MODE_WELCOME_FLAT({
+            {QLatin1String(":/welcome/images/mode_welcome_mask.png"), Utils::Theme::IconsBaseColor}});
+    const Utils::Icon MODE_WELCOME_FLAT_ACTIVE({
+            {QLatin1String(":/welcome/images/mode_welcome_mask.png"), Utils::Theme::IconsModeWelcomeActiveColor}});
+
+    setIcon(Utils::Icon::modeIcon(MODE_WELCOME_CLASSIC,
+                                  MODE_WELCOME_FLAT, MODE_WELCOME_FLAT_ACTIVE));
     setPriority(Constants::P_MODE_WELCOME);
     setId(Constants::MODE_WELCOME);
     setContextHelpId(QLatin1String("Qt Creator Manual"));