[qtquickcontrols-nemo] Initial import of a C++ based theme

This commit imports work done for having C++ based
theming, exporting a C++ Theme singleton object,
and C++ object for each component, starting with
the button.

It also includes the new theming system, using JSON,
and a tool to generate new components based on a
description file.

.gitignore

+*.pro.user
+*.pyc 

examples/touch/content/ButtonPage.qml

@@ -51,11 +51,15 @@ Item {
         anchors.centerIn: parent
 
         Button {
+            property bool isGlacier: Theme.name == "Glacier"
             anchors.margins: 20
-            text: (Theme.themeName == NemoControls.themes[0]) ? "Set Ugly Theme"
-                                                              : "Set Nice Theme"
-            onClicked: NemoControls.setTheme((Theme.themeName == NemoControls.themes[0]) ? NemoControls.themes[1]
-                                                                                            : NemoControls.themes[0])
+            text: isGlacier ? "Set Ugly Theme" : "Set Nice Theme"
+            onClicked: isGlacier ? Theme.loadFromFile("ugly.json")
+                                 : Theme.loadFromFile("glacier.json")
+
+
+//                NemoControls.setTheme((Theme.themeName == NemoControls.themes[0]) ? NemoControls.themes[1]
+//                                                                                            : NemoControls.themes[0])
         }
 
         Button {

examples/touch/resources.qrc

-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/">
-  <file>main.qml</file>
-  <file>content/AndroidDelegate.qml</file>
-  <file>content/ButtonPage.qml</file>
-  <file>content/ProgressBarPage.qml</file>
-  <file>content/SliderPage.qml</file>
-  <file>content/TabBarPage.qml</file>
-  <file>content/TextInputPage.qml</file>
-  <file>images/button_default.png</file>
-  <file>images/button_pressed.png</file>
-  <file>images/navigation_next_item.png</file>
-  <file>images/navigation_previous_item.png</file>
-  <file>images/tab_selected.png</file>
-  <file>images/tabs_standard.png</file>
-  <file>images/textinput.png</file>
-  <file>images/toolbar.png</file>
-</qresource>
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+        <file>content/AndroidDelegate.qml</file>
+        <file>content/ButtonPage.qml</file>
+        <file>content/ProgressBarPage.qml</file>
+        <file>content/SliderPage.qml</file>
+        <file>content/TabBarPage.qml</file>
+        <file>content/TextInputPage.qml</file>
+        <file>images/button_default.png</file>
+        <file>images/button_pressed.png</file>
+        <file>images/navigation_next_item.png</file>
+        <file>images/navigation_previous_item.png</file>
+        <file>images/tab_selected.png</file>
+        <file>images/tabs_standard.png</file>
+        <file>images/textinput.png</file>
+        <file>images/toolbar.png</file>
+    </qresource>
 </RCC>

src/controls/controls.pro

@@ -3,17 +3,13 @@ CONFIG += qt plugin
 QT += qml quick
 TARGET=nemocontrolsplugin
 PLUGIN_IMPORT_PATH = QtQuick/Controls/Nemo
+THEME_IMPORT_PATH = QtQuick/Controls/Styles/Nemo/themes
 
 # Added/Reimplemented Controls
 QML_FILES += \
     Button.qml
 
-# Private files
-QML_FILES += \
-    private/NemoControls.qml
-
-OTHER_FILES += qmldir \
-    $$QML_FILES
+OTHER_FILES += qmldir
 
 HEADERS += \
     qquicknemocontrolsextensionplugin.h \
@@ -29,10 +25,4 @@ qmlfiles.files = $$_PRO_FILE_PWD_/*.qml
 qmlfiles.files += $$_PRO_FILE_PWD_/qmldir
 qmlfiles.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 
-privatefiles.files = $$_PRO_FILE_PWD_/private/*.qml
-privatefiles.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH/private
-
-INSTALLS += target privatefiles qmlfiles
-
-#RESOURCES += \
-#    internal_resources.qrc
+INSTALLS += target qmlfiles

src/controls/internal_resources.qrc

-<RCC>
-    <qresource prefix="/QtQuick/Controls/Nemo">
-        <file>private/NemoControls.qml</file>
-    </qresource>
-</RCC>
-

src/controls/qquicknemocontrolsextensionplugin.cpp

@@ -27,24 +27,6 @@ QQuickNemoControlsExtensionPlugin::QQuickNemoControlsExtensionPlugin(QObject *pa
 {
 }
 
-
-static QObject *nemo_controls_singletontype_provider(QQmlEngine *engine, QJSEngine */*scriptEngine*/)
-{
-    QObject *ret = 0;
-
-    QQmlComponent c(engine,QUrl("/usr/lib/qt5/qml/QtQuick/Controls/Nemo/private/NemoControls.qml"),QQmlComponent::PreferSynchronous);
-    if (c.status() == QQmlComponent::Ready) {
-        ret = c.create();
-        if (!ret) {
-            qWarning() << "Can't create NemoControls Singleton Object:"<<c.errorString();
-        }
-    } else {
-        qWarning() << "NemoControls Singleton Component not Ready:"<<c.errorString();
-    }
-
-    return ret;
-}
-
 static QObject *nemo_hacks_singletontype_provider(QQmlEngine *engine, QJSEngine */*scriptEngine*/)
 {
     QObject *ret = new Hacks(engine);
@@ -54,7 +36,6 @@ static QObject *nemo_hacks_singletontype_provider(QQmlEngine *engine, QJSEngine
 void QQuickNemoControlsExtensionPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("QtQuick.Controls.Nemo"));
-    qmlRegisterSingletonType<QObject>(uri, 1, 0, "NemoControls", nemo_controls_singletontype_provider);
     qmlRegisterSingletonType<QObject>(uri, 1, 0, "NemoHacks", nemo_hacks_singletontype_provider);
 
 }

src/styles/ButtonStyle.qml

@@ -33,8 +33,8 @@ ButtonStyle {
         implicitWidth: 240
         implicitHeight: 50
         clip: true
-        color: control.primary ? Theme.primaryButton.backgroundColor
-                               : Theme.button.backgroundColor
+        color: control.primary ? Theme.primaryButton.background
+                               : Theme.button.background
         Image {
             id: disabledImg
             anchors.fill: parent

src/styles/nemotheme.h

+/*
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
+
+#ifndef NEMOTHEME_H
+#define NEMOTHEME_H
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include "nemothemebutton.h"
+
+class NemoTheme: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
+    Q_PROPERTY(NemoThemeButton * button READ button CONSTANT)
+    Q_PROPERTY(NemoThemeButton * primaryButton READ primaryButton CONSTANT)
+    Q_PROPERTY(QString fontFamily READ fontFamily CONSTANT)
+public:
+    explicit NemoTheme(QObject *parent = 0);
+    QString name() const;
+    void setName(QString name);
+    QString description() const;
+    void setDescription(QString description);
+    NemoThemeButton * button() const;
+    NemoThemeButton * primaryButton() const;
+    QString fontFamily() const;
+public Q_SLOTS:
+    void loadFromFile(const QString &fileName);
+Q_SIGNALS:
+    void nameChanged();
+    void descriptionChanged();
+private:
+    QString m_name;
+    QString m_description;
+    NemoThemeButton * m_button;
+    NemoThemeButton * m_primaryButton;
+    QString m_fontFamily;
+};
+
+#endif //NEMOTHEME_H

src/styles/nemothemebutton.cpp

+/*
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
+
+#include "nemothemebutton.h"
+
+NemoThemeButton::NemoThemeButton(QObject *parent)
+    : QObject(parent)
+    , m_text(new NemoThemeButtonText(this))
+    , m_pressedGradient(new NemoThemeButtonPressedGradient(this))
+{
+}
+
+QColor NemoThemeButton::background() const
+{
+    return m_background;
+}
+
+void NemoThemeButton::setBackground(QColor background)
+{
+    if (m_background != background) {
+        m_background = background;
+        emit backgroundChanged();
+    }
+}
+
+NemoThemeButtonText * NemoThemeButton::text() const
+{
+    return m_text;
+}
+
+NemoThemeButtonPressedGradient * NemoThemeButton::pressedGradient() const
+{
+    return m_pressedGradient;
+}

src/styles/nemothemebutton.h

+/*
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
+
+#ifndef NEMOTHEMEBUTTON_H
+#define NEMOTHEMEBUTTON_H
+
+#include <QtCore/QObject>
+#include <QtGui/QColor>
+#include "nemothemebuttontext.h"
+#include "nemothemebuttonpressedgradient.h"
+
+class NemoThemeButton: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QColor background READ background NOTIFY backgroundChanged)
+    Q_PROPERTY(NemoThemeButtonText * text READ text CONSTANT)
+    Q_PROPERTY(NemoThemeButtonPressedGradient * pressedGradient READ pressedGradient CONSTANT)
+public:
+    explicit NemoThemeButton(QObject *parent = 0);
+    QColor background() const;
+    void setBackground(QColor background);
+    NemoThemeButtonText * text() const;
+    NemoThemeButtonPressedGradient * pressedGradient() const;
+Q_SIGNALS:
+    void backgroundChanged();
+private:
+    QColor m_background;
+    NemoThemeButtonText * m_text;
+    NemoThemeButtonPressedGradient * m_pressedGradient;
+};
+
+#endif //NEMOTHEMEBUTTON_H

src/styles/nemothemebuttonpressedgradient.cpp

+/*
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
+
+#include "nemothemebuttonpressedgradient.h"
+
+NemoThemeButtonPressedGradient::NemoThemeButtonPressedGradient(QObject *parent)
+    : QObject(parent)
+    , m_width(240)
+    , m_height(240)
+    , m_center(0.29)
+    , m_edge(0.5)
+{
+}
+
+QColor NemoThemeButtonPressedGradient::centerColor() const
+{
+    return m_centerColor;
+}
+
+void NemoThemeButtonPressedGradient::setCenterColor(QColor centerColor)
+{
+    if (m_centerColor != centerColor) {
+        m_centerColor = centerColor;
+        emit centerColorChanged();
+    }
+}
+
+QColor NemoThemeButtonPressedGradient::edgeColor() const
+{
+    return m_edgeColor;
+}
+
+void NemoThemeButtonPressedGradient::setEdgeColor(QColor edgeColor)
+{
+    if (m_edgeColor != edgeColor) {
+        m_edgeColor = edgeColor;
+        emit edgeColorChanged();
+    }
+}
+
+int NemoThemeButtonPressedGradient::width() const
+{
+    return m_width;
+}
+
+void NemoThemeButtonPressedGradient::setWidth(const int &width)
+{
+    if (m_width != width) {
+        m_width = width;
+        emit widthChanged();
+    }
+}
+
+int NemoThemeButtonPressedGradient::height() const
+{
+    return m_height;
+}
+
+void NemoThemeButtonPressedGradient::setHeight(const int &height)
+{
+    if (m_height != height) {
+        m_height = height;
+        emit heightChanged();
+    }
+}
+
+double NemoThemeButtonPressedGradient::center() const
+{
+    return m_center;
+}
+
+void NemoThemeButtonPressedGradient::setCenter(const double &center)
+{
+    if (m_center != center) {
+        m_center = center;
+        emit centerChanged();
+    }
+}
+
+double NemoThemeButtonPressedGradient::edge() const
+{
+    return m_edge;
+}
+
+void NemoThemeButtonPressedGradient::setEdge(const double &edge)
+{
+    if (m_edge != edge) {
+        m_edge = edge;
+        emit edgeChanged();
+    }
+}

src/styles/nemothemebuttonpressedgradient.h

+/*
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
+
+#ifndef NEMOTHEMEBUTTONPRESSEDGRADIENT_H
+#define NEMOTHEMEBUTTONPRESSEDGRADIENT_H
+
+#include <QtCore/QObject>
+#include <QtGui/QColor>
+
+class NemoThemeButtonPressedGradient: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QColor centerColor READ centerColor NOTIFY centerColorChanged)
+    Q_PROPERTY(QColor edgeColor READ edgeColor NOTIFY edgeColorChanged)
+    Q_PROPERTY(int width READ width NOTIFY widthChanged)
+    Q_PROPERTY(int height READ height NOTIFY heightChanged)
+    Q_PROPERTY(double center READ center NOTIFY centerChanged)
+    Q_PROPERTY(double edge READ edge NOTIFY edgeChanged)
+public:
+    explicit NemoThemeButtonPressedGradient(QObject *parent = 0);
+    QColor centerColor() const;
+    void setCenterColor(QColor centerColor);
+    QColor edgeColor() const;
+    void setEdgeColor(QColor edgeColor);
+    int width() const;
+    void setWidth(const int &width);
+    int height() const;
+    void setHeight(const int &height);
+    double center() const;
+    void setCenter(const double &center);
+    double edge() const;
+    void setEdge(const double &edge);
+Q_SIGNALS:
+    void centerColorChanged();
+    void edgeColorChanged();
+    void widthChanged();
+    void heightChanged();
+    void centerChanged();
+    void edgeChanged();
+private:
+    QColor m_centerColor;
+    QColor m_edgeColor;
+    int m_width;
+    int m_height;
+    double m_center;
+    double m_edge;
+};
+
+#endif //NEMOTHEMEBUTTONPRESSEDGRADIENT_H

src/styles/nemothemebuttontext.cpp

+/*
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
+
+#include "nemothemebuttontext.h"
+
+NemoThemeButtonText::NemoThemeButtonText(QObject *parent)
+    : QObject(parent)
+    , m_font(new NemoThemeFont(this))
+{
+}
+
+QColor NemoThemeButtonText::color() const
+{
+    return m_color;
+}
+
+void NemoThemeButtonText::setColor(QColor color)
+{
+    if (m_color != color) {
+        m_color = color;
+        emit colorChanged();
+    }
+}
+
+NemoThemeFont * NemoThemeButtonText::font() const
+{
+    return m_font;
+}

src/styles/nemothemebuttontext.h

+/*
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
+
+#ifndef NEMOTHEMEBUTTONTEXT_H
+#define NEMOTHEMEBUTTONTEXT_H
+
+#include <QtCore/QObject>
+#include <QtGui/QColor>
+#include "nemothemefont.h"
+
+class NemoThemeButtonText: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QColor color READ color NOTIFY colorChanged)
+    Q_PROPERTY(NemoThemeFont * font READ font CONSTANT)
+public:
+    explicit NemoThemeButtonText(QObject *parent = 0);
+    QColor color() const;
+    void setColor(QColor color);
+    NemoThemeFont * font() const;
+Q_SIGNALS:
+    void colorChanged();
+private:
+    QColor m_color;
+    NemoThemeFont * m_font;
+};
+
+#endif //NEMOTHEMEBUTTONTEXT_H

src/controls/private/NemoControls.qml → src/styles/nemothemefont.cpp

 /*
- * Copyright (C) 2013 Andrea Bernabei <and.bernabei@gmail.com>
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -17,40 +17,40 @@
  * Boston, MA 02110-1301, USA.
  */
 
-import QtQml 2.1
-import "../../Styles/Nemo/themes/Theme1.js" as Theme1
-import "../../Styles/Nemo/themes/Theme2.js" as Theme2
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
 
-QtObject {
-    readonly property var themes: [Theme1.themeName, Theme2.themeName]
+#include "nemothemefont.h"
 
-    //THIS IS WHAT IS RESPONSIBLE FOR THE THEME CHANGE, changing this will change all the rest
-    //THEME CONFIG IS THE REFERENCE TO THE .JS FILE HOLDING THE THEME CONFIGS
-    property var currentThemeConfig: Theme1
+NemoThemeFont::NemoThemeFont(QObject *parent)
+    : QObject(parent)
+    , m_pointSize(24)
+    , m_weight(25)
+{
+}
 
-    function setTheme(theme) {
-        if (themes.indexOf(theme) >= 0) {
-            var newThemeConfig = getThemeConfigOf(theme)
-            if (newThemeConfig !== undefined) {
-                currentThemeConfig = newThemeConfig
-            } else {
-                console.log("Theme config not handled, the theme was not changed")
-            }
-        } else {
-            console.log("Theme " + theme + " is not handled");
-        }
-    }
+int NemoThemeFont::pointSize() const
+{
+    return m_pointSize;
+}
 
-    function getThemeConfigOf(theme) {
-        switch (theme) {
-        case Theme1.themeName:
-            return Theme1
-        case Theme2.themeName:
-            return Theme2
-        default:
-            console.log("There is no theme config for the theme " + theme)
-            return undefined
-        }
+void NemoThemeFont::setPointSize(const int &pointSize)
+{
+    if (m_pointSize != pointSize) {
+        m_pointSize = pointSize;
+        emit pointSizeChanged();
     }
 }
 
+int NemoThemeFont::weight() const
+{
+    return m_weight;
+}
+
+void NemoThemeFont::setWeight(const int &weight)
+{
+    if (m_weight != weight) {
+        m_weight = weight;
+        emit weightChanged();
+    }
+}

src/styles/nemothemefont.h

+/*
+ * Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+// This class is autogenerated using themehelper.py
+// Any modification done in this file will be overridden
+
+#ifndef NEMOTHEMEFONT_H
+#define NEMOTHEMEFONT_H
+
+#include <QtCore/QObject>
+
+class NemoThemeFont: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int pointSize READ pointSize NOTIFY pointSizeChanged)
+    Q_PROPERTY(int weight READ weight NOTIFY weightChanged)
+public:
+    explicit NemoThemeFont(QObject *parent = 0);
+    int pointSize() const;
+    void setPointSize(const int &pointSize);
+    int weight() const;
+    void setWeight(const int &weight);
+Q_SIGNALS:
+    void pointSizeChanged();
+    void weightChanged();
+private:
+    int m_pointSize;
+    int m_weight;
+};
+
+#endif //NEMOTHEMEFONT_H

src/styles/qquicknemostyleextensionplugin.cpp

@@ -20,36 +20,30 @@
 
 #include "qquicknemostyleextensionplugin.h"
 #include <QtQml>
+#include "nemotheme.h"
 
 QQuickNemoStyleExtensionPlugin::QQuickNemoStyleExtensionPlugin(QObject *parent) :
     QQmlExtensionPlugin(parent)
 {
 }
 
-static QObject *nemo_style_singletontype_provider(QQmlEngine *engine, QJSEngine */*scriptEngine*/)
+static QObject * nemo_theme_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
-    QObject *ret = 0;
-
-    qWarning() << QFileInfo("private/ControlsStyleConfig.qml").absoluteFilePath();
-    qWarning() << QDir::currentPath();
-    QQmlComponent c(engine,QUrl::fromLocalFile("/usr/lib/qt5/qml/QtQuick/Controls/Styles/Nemo/private/ControlsStyleConfig.qml"),QQmlComponent::PreferSynchronous);
-    if (c.status() == QQmlComponent::Ready) {
-        ret = c.create();
-        if (!ret) {
-            qWarning() << "Can't create Controls Style Config Singleton Object:"<<c.errorString();
-        }
-    } else {
-
-        qWarning() << "Controls Style Config Component not Ready:"<<c.errorString();
-    }
-
-    return ret;
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new NemoTheme();
 }
 
 void QQuickNemoStyleExtensionPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("QtQuick.Controls.Styles.Nemo"));
-    qmlRegisterSingletonType<QObject>(uri,1,0,"Theme",nemo_style_singletontype_provider);
+    QString reason = QString("Cannot be created");
+    qmlRegisterUncreatableType<NemoTheme>(uri, 1, 0, "NemoTheme", reason);
+    qmlRegisterUncreatableType<NemoThemeButton>(uri, 1, 0, "NemoThemeButton", reason);
+    qmlRegisterUncreatableType<NemoThemeButtonPressedGradient>(uri, 1, 0, "NemoThemeButtonPressedGradient", reason);
+    qmlRegisterUncreatableType<NemoThemeButtonText>(uri, 1, 0, "NemoThemeButtonText", reason);
+    qmlRegisterUncreatableType<NemoThemeFont>(uri, 1, 0, "NemoThemeFont", reason);
+    qmlRegisterSingletonType<QObject>(uri, 1, 0, "Theme", nemo_theme_provider);
 }
 
 void QQuickNemoStyleExtensionPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

src/styles/qquicknemostyleextensionplugin.h

@@ -23,6 +23,9 @@
 
 #include <QtQml/QQmlExtensionPlugin>
 
+class QQmlEngine;
+class QJSEngine;
+class NemoThemeGlobal;
 class QQuickNemoStyleExtensionPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT

src/styles/styles.pro

@@ -28,10 +28,6 @@ QML_FILES = \
     ToolBarStyle.qml \
     ToolButtonStyle.qml
 
-# Private files
-QML_FILES += \
-    private/ControlsStyleConfig.qml
-
 # Images
 #QML_FILES += \
 #    images/480x854/*.png 
@@ -64,6 +60,8 @@ QML_FILES += \
 OTHER_FILES += qmldir \
     themes/Theme1.js \
     themes/Theme2.js \
+    themes/glacier.json \
+    themes/ugly.json \
     $$QML_FILES
 
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
@@ -72,23 +70,29 @@ qmlfiles.files = $$_PRO_FILE_PWD_/*.qml
 qmlfiles.files += $$_PRO_FILE_PWD_/qmldir
 qmlfiles.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 
-privatefiles.files = $$_PRO_FILE_PWD_/private/*.qml
-privatefiles.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH/private
-
-themes.files = $$_PRO_FILE_PWD_/themes/*.js
+themes.files = $$_PRO_FILE_PWD_/themes/*.json
 themes.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH/themes
 
 images.files = $$_PRO_FILE_PWD_/images
 images.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 
 HEADERS += \
-    qquicknemostyleextensionplugin.h
+    qquicknemostyleextensionplugin.h \
+    nemothemebutton.h \
+    nemothemebuttonpressedgradient.h \
+    nemothemebuttontext.h \
+    nemothemefont.h \
+    nemotheme.h
 
 SOURCES += \
-    qquicknemostyleextensionplugin.cpp
+    qquicknemostyleextensionplugin.cpp \
+    nemothemebutton.cpp \
+    nemothemebuttonpressedgradient.cpp \
+    nemothemebuttontext.cpp \
+    nemothemefont.cpp \
+    nemotheme.cpp
 
-INSTALLS += target images qmlfiles themes privatefiles
+INSTALLS += target images qmlfiles themes
 
-# RESOURCES += \
-#     rsc.qrc
+DEFINES += 'THEME_DIR=\'\"$$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH/themes"\''
 

src/styles/themes/glacier.json

+{
+    "name": "Glacier",
+    "description": "Glacier theme",
+    "defines": {
+        "accentColor": "#0091e5",
+        "fillColor": "#474747"
+    },
+    "styles": {
+        "button": {
+            "background": "fillColor",
+            "text": {
+                "color": "white"
+            },
+            "pressedGradient": {
+                "centerColor": "accentColor",
+                "edgeColor": "transparent"
+            }
+        },
+        "primaryButton": {
+            "background": "accentColor",
+            "text": {
+                "color": "white",
+                "font": {
+                    "weight": 63
+                }
+            },
+            "pressedGradient": {
+                "centerColor": "white",
+                "edgeColor": "accentColor"
+            }
+        }
+    }
+}

src/styles/themes/ugly.json

+{
+    "name": "Ugly",
+    "description": "Ugly test theme",
+    "defines": {
+        "accentColor": "#FF7F00",
+        "fillColor": "#474747"
+    },
+    "styles": {
+        "button": {
+            "background": "fillColor",
+            "text": {
+                "color": "blue"
+            },
+            "pressedGradient": {
+                "centerColor": "accentColor",
+                "edgeColor": "transparent"
+            }
+        },
+        "primaryButton": {
+            "background": "accentColor",
+            "text": {
+                "color": "blue",
+                "font": {
+                    "weight": 63
+                }
+            },
+            "pressedGradient": {
+                "centerColor": "white",
+                "edgeColor": "accentColor"
+            }
+        }
+    }
+}

tools/themehelper/components.json

+{
+    "components": [
+        {
+            "name": "Button",
+            "properties": [
+                {
+                    "name": "background",
+                    "type": "QColor"
+                },
+                {
+                    "name": "text",
+                    "object": "ButtonText"
+                },
+                {
+                    "name": "pressedGradient",
+                    "object": "ButtonPressedGradient"
+                }
+            ]
+        },
+        {
+            "name": "ButtonPressedGradient",
+            "properties": [
+                {
+                    "name": "centerColor",
+                    "type": "QColor"
+                },
+                {
+                    "name": "edgeColor",
+                    "type": "QColor"
+                },
+                {
+                    "name": "width",
+                    "type": "int",
+                    "default": 240
+                },
+                {
+                    "name": "height",
+                    "type": "int",
+                    "default": 240
+                },
+                {
+                    "name": "center",
+                    "type": "double",
+                    "default": 0.29
+                },
+                {
+                    "name": "edge",
+                    "type": "double",
+                    "default": 0.5
+                }
+            ]
+        },
+        {
+            "name": "ButtonText",
+            "properties": [
+                {
+                    "name": "color",
+                    "type": "QColor"
+                },
+                {
+                    "name": "font",
+                    "object": "Font"
+                }
+            ]
+        },
+        {
+            "name": "Font",
+            "properties": [
+                {
+                    "name": "pointSize",
+                    "type": "int",
+                    "default": 24
+                },
+                {
+                    "name": "weight",
+                    "type": "int",
+                    "default": 25
+                }
+            ]
+        }
+    ],
+    "properties": [
+        {
+            "name": "button",
+            "object": "Button"
+        },
+        {
+            "name": "primaryButton",
+            "object": "Button"
+        }
+    ],
+    "font": "/usr/share/fonts/google-opensans/OpenSans-Regular.ttf"
+}
+ 

tools/themehelper/formattingtools.py

+# Copyright (C) 2013 Jolla Ltd. <chris.adams@jollamobile.com>
+#
+# You may use this file under the terms of the BSD license as follows:
+#
+# "Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#   * Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in
+#     the documentation and/or other materials provided with the
+#     distribution.
+#   * Neither the name of Nemo Mobile nor the names of its contributors
+#     may be used to endorse or promote products derived from this
+#     software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+
+def includeGuard(name):
+    return name.replace("_", "").upper() + "_H"
+
+def upperCamelCase(name):
+    camelCased = camelCase(split(name))
+    return camelCased[0].upper() + camelCased[1:]
+
+def camelCase(name):
+    splitted = split(name)
+    newSplitted = []
+    for splittedWord in splitted:
+        splittedWord = splittedWord.lower()
+        splittedWord = splittedWord[0].upper() + splittedWord[1:]
+        newSplitted.append(splittedWord)
+    camelCase = "".join(newSplitted)
+    camelCase = camelCase[0].lower() + camelCase[1:]
+    return camelCase
+
+def split(name):
+    return name.split("_")
+
+def addSpaces(string, size):
+    spacesToAdd = max(size - len(string), 0)
+    return string + (" " * spacesToAdd)

tools/themehelper/generate.sh

+#!/bin/bash
+# Copyright (C) 2013 Lucien Xu <sfietkonstantin@free.fr>
+#
+# You may use this file under the terms of the BSD license as follows:
+#
+# "Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#   * Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in
+#     the documentation and/or other materials provided with the
+#     distribution.
+#   * Neither the name of Nemo Mobile nor the names of its contributors
+#     may be used to endorse or promote products derived from this
+#     software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+
+themehelper.py components.json
\ No newline at end of file

tools/themehelper/themehelper.py

+#!/usr/bin/python
+# Copyright (C) 2013 Lucien Xu. <sfietkonstantin@free.fr>
+#
+# You may use this file under the terms of the BSD license as follows:
+#
+# "Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#   * Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in
+#     the documentation and/or other materials provided with the
+#     distribution.
+#   * Neither the name of Nemo Mobile nor the names of its contributors
+#     may be used to endorse or promote products derived from this
+#     software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." 
+
+import json
+import classgenerator
+import argparse
+
+def generate(descriptionFile):
+    # First, we try to open JSON description file
+    try:
+        f = open(descriptionFile)
+    except:
+        print "Failed to open " + descriptionFile
+        return
+    
+   
+    data = json.load(f)
+    classgenerator.generate(data, True)
+    
+    for componentData in data["components"]:
+        classgenerator.generate(componentData)
+
+# Main
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Theme helper')
+    parser.add_argument('description_file', metavar='description_file', type=str,
+                        help="""Input description file (JSON)""")
+    args = parser.parse_args()
+    description_file = args.description_file
+    
+    generate(description_file)
\ No newline at end of file