Welcome: Implement part of Diana's design

Removing font variations, colors, roundings and gaps.
And it is now better themable.

The examlpes and tutorial selection still needs to be done.

Change-Id: I520814ba9e8ce4fa1d1ca7ec14329955e8a0609a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

20 files changed, 59 insertions, 0 deletions

diff --git a/src/plugins/welcome/images/blogs.png b/src/plugins/welcome/images/blogs.png
new file mode 100644
index 0000000000..4e0bf112f3
--- /dev/null
+++ b/src/plugins/welcome/images/blogs.png
diff --git a/src/plugins/welcome/images/blogs@2x.png b/src/plugins/welcome/images/blogs@2x.png
new file mode 100644
index 0000000000..48c93a9253
--- /dev/null
+++ b/src/plugins/welcome/images/blogs@2x.png
diff --git a/src/plugins/welcome/images/community.png b/src/plugins/welcome/images/community.png
new file mode 100644
index 0000000000..865a21a7ce
--- /dev/null
+++ b/src/plugins/welcome/images/community.png
diff --git a/src/plugins/welcome/images/community@2x.png b/src/plugins/welcome/images/community@2x.png
new file mode 100644
index 0000000000..f632f3b9cb
--- /dev/null
+++ b/src/plugins/welcome/images/community@2x.png
diff --git a/src/plugins/welcome/images/expandarrow.png b/src/plugins/welcome/images/expandarrow.png
new file mode 100644
index 0000000000..1c80e4eaac
--- /dev/null
+++ b/src/plugins/welcome/images/expandarrow.png
diff --git a/src/plugins/welcome/images/expandarrow@2x.png b/src/plugins/welcome/images/expandarrow@2x.png
new file mode 100644
index 0000000000..30b7d23aed
--- /dev/null
+++ b/src/plugins/welcome/images/expandarrow@2x.png
diff --git a/src/plugins/welcome/images/new.png b/src/plugins/welcome/images/new.png
new file mode 100644
index 0000000000..80ccee5d7b
--- /dev/null
+++ b/src/plugins/welcome/images/new.png
diff --git a/src/plugins/welcome/images/new@2x.png b/src/plugins/welcome/images/new@2x.png
new file mode 100644
index 0000000000..3fca87e14c
--- /dev/null
+++ b/src/plugins/welcome/images/new@2x.png
diff --git a/src/plugins/welcome/images/open.png b/src/plugins/welcome/images/open.png
new file mode 100644
index 0000000000..938f1a3332
--- /dev/null
+++ b/src/plugins/welcome/images/open.png
diff --git a/src/plugins/welcome/images/open@2x.png b/src/plugins/welcome/images/open@2x.png
new file mode 100644
index 0000000000..d0cfd25559
--- /dev/null
+++ b/src/plugins/welcome/images/open@2x.png
diff --git a/src/plugins/welcome/images/project.png b/src/plugins/welcome/images/project.png
new file mode 100644
index 0000000000..1fd5370e7e
--- /dev/null
+++ b/src/plugins/welcome/images/project.png
diff --git a/src/plugins/welcome/images/project@2x.png b/src/plugins/welcome/images/project@2x.png
new file mode 100644
index 0000000000..df357dfa95
--- /dev/null
+++ b/src/plugins/welcome/images/project@2x.png
diff --git a/src/plugins/welcome/images/qtaccount.png b/src/plugins/welcome/images/qtaccount.png
new file mode 100644
index 0000000000..40eb4a5f10
--- /dev/null
+++ b/src/plugins/welcome/images/qtaccount.png
diff --git a/src/plugins/welcome/images/qtaccount@2x.png b/src/plugins/welcome/images/qtaccount@2x.png
new file mode 100644
index 0000000000..96693c8195
--- /dev/null
+++ b/src/plugins/welcome/images/qtaccount@2x.png
diff --git a/src/plugins/welcome/images/session.png b/src/plugins/welcome/images/session.png
new file mode 100644
index 0000000000..7a1e2c51d2
--- /dev/null
+++ b/src/plugins/welcome/images/session.png
diff --git a/src/plugins/welcome/images/session@2x.png b/src/plugins/welcome/images/session@2x.png
new file mode 100644
index 0000000000..d146a1a3e9
--- /dev/null
+++ b/src/plugins/welcome/images/session@2x.png
diff --git a/src/plugins/welcome/images/userguide.png b/src/plugins/welcome/images/userguide.png
new file mode 100644
index 0000000000..e23a4c8918
--- /dev/null
+++ b/src/plugins/welcome/images/userguide.png
diff --git a/src/plugins/welcome/images/userguide@2x.png b/src/plugins/welcome/images/userguide@2x.png
new file mode 100644
index 0000000000..709e79d5a1
--- /dev/null
+++ b/src/plugins/welcome/images/userguide@2x.png
diff --git a/src/plugins/welcome/welcome.qrc b/src/plugins/welcome/welcome.qrc
index 3d8bff335f..5321c6ebd4 100644
--- a/src/plugins/welcome/welcome.qrc
+++ b/src/plugins/welcome/welcome.qrc
@@ -4,5 +4,24 @@
         <file>images/mode_welcome@2x.png</file>
         <file>images/mode_welcome_mask.png</file>
         <file>images/mode_welcome_mask@2x.png</file>
+        <file>images/blogs.png</file>
+        <file>images/blogs@2x.png</file>
+        <file>images/community.png</file>
+        <file>images/community@2x.png</file>
+        <file>images/mode_edit_mask.png</file>
+        <file>images/open.png</file>
+        <file>images/open@2x.png</file>
+        <file>images/project.png</file>
+        <file>images/project@2x.png</file>
+        <file>images/qtaccount.png</file>
+        <file>images/qtaccount@2x.png</file>
+        <file>images/session.png</file>
+        <file>images/session@2x.png</file>
+        <file>images/userguide.png</file>
+        <file>images/userguide@2x.png</file>
+        <file>images/new.png</file>
+        <file>images/new@2x.png</file>
+        <file>images/expandarrow.png</file>
+        <file>images/expandarrow@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 3fd58e08cd..43f3df9352 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -48,6 +48,7 @@
 
 #include <QDir>
 #include <QQmlPropertyMap>
+#include <QQuickImageProvider>
 
 #ifdef USE_QUICK_WIDGET
     #include <QtQuickWidgets/QQuickWidget>
@@ -82,6 +83,44 @@ static QString resourcePath()
     return FileUtils::normalizePathName(ICore::resourcePath());
 }
 
+class WelcomeImageIconProvider : public QQuickImageProvider
+{
+public:
+    WelcomeImageIconProvider()
+        : QQuickImageProvider(Pixmap)
+    {
+    }
+
+    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override
+    {
+        Q_UNUSED(requestedSize)
+
+        QString maskFile;
+        Theme::Color themeColor = Theme::Welcome_ForegroundPrimaryColor;
+
+        const QStringList elements = id.split(QLatin1Char('/'));
+
+        if (!elements.empty())
+            maskFile = elements.first();
+
+        if (elements.count() >= 2) {
+            const static QMetaObject &m = Theme::staticMetaObject;
+            const static QMetaEnum e = m.enumerator(m.indexOfEnumerator("Color"));
+            bool success = false;
+            int value = e.keyToValue(elements.at(1).toLatin1(), &success);
+            if (success)
+                themeColor = Theme::Color(value);
+        }
+
+        const QString fileName = QString::fromLatin1(":/welcome/images/%1.png").arg(maskFile);
+        const Icon icon({{fileName, themeColor}}, Icon::Tint);
+        const QPixmap result = icon.pixmap();
+        if (size)
+            *size = result.size();
+        return result;
+    }
+};
+
 class WelcomeMode : public IMode
 {
     Q_OBJECT
@@ -202,6 +241,7 @@ void WelcomeMode::facilitateQml(QQmlEngine *engine)
     QStringList importPathList = engine->importPathList();
     importPathList << resourcePath() + QLatin1String("/welcomescreen");
     engine->setImportPathList(importPathList);
+    engine->addImageProvider(QLatin1String("icons"), new WelcomeImageIconProvider);
     if (!debug)
         engine->setOutputWarningsToStandardError(false);