Refactored Qml plugins into modules.

Separated C++ and Qml interfaces. All the UI's from plugins are moved to the settingsui folder.

Change-Id: Id6a6623346b18321357bc42d24121c4d9cdfd098
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>

4 files changed, 107 insertions, 0 deletions

diff --git a/src/imports/localesettings/locale.xml b/src/imports/localesettings/locale.xml
new file mode 100644
index 0000000..b722456
--- /dev/null
+++ b/src/imports/localesettings/locale.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<node name="/Service" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node>
+ <interface name="org.freedesktop.locale1">
+  <property name="Locale" type="as" access="read"/>
+  <method name="SetLocale">
+   <arg name="locale" type="as" direction="in"/>
+   <arg name="user_interaction" type="b" direction="in"/>
+  </method>
+ </interface>
+</node>
+
diff --git a/src/imports/localesettings/localesettings.pro b/src/imports/localesettings/localesettings.pro
new file mode 100644
index 0000000..891e4f8
--- /dev/null
+++ b/src/imports/localesettings/localesettings.pro
@@ -0,0 +1,18 @@
+TEMPLATE = lib
+CONFIG += plugin
+QT += qml localesettings
+
+uri = com.theqtcompany.settings.locale
+
+TARGET  = localesettingsplugin
+
+SOURCES += plugin.cpp
+
+pluginfiles.files += \
+    qmldir \
+
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+
+target.path = $$installPath
+pluginfiles.path += $$installPath
+INSTALLS += target pluginfiles
diff --git a/src/imports/localesettings/plugin.cpp b/src/imports/localesettings/plugin.cpp
new file mode 100644
index 0000000..7edd2c5
--- /dev/null
+++ b/src/imports/localesettings/plugin.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Device Utilities module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQml/QQmlExtensionPlugin>
+#include <QtQml/qqml.h>
+#include <qcoreapplication.h>
+#include <QQmlEngine>
+#include <QQmlContext>
+
+#include <systemlocale.h>
+#include <localemodel.h>
+#include <localefiltermodel.h>
+
+template <typename T>
+QObject *instance(QQmlEngine *engine, QJSEngine *) {
+    T *t = new T(engine);
+    t->setObjectName(T::staticMetaObject.className());
+    return t;
+}
+
+class LanguageSettingsQmlPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri)
+    {
+      qmlRegisterSingletonType<SystemLocale>(uri, 1, 0, "LocaleManager", &instance<SystemLocale>);
+    }
+
+    void initializeEngine(QQmlEngine * engine, const char * uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.locale"));
+        LocaleModel*localeModel = new LocaleModel(engine);
+        LocaleFilterModel* filter = new LocaleFilterModel(engine);
+        filter->setSourceModel(localeModel);
+        engine->rootContext()->setContextProperty("LocaleFilter", filter);
+    }
+};
+
+#include "plugin.moc"
diff --git a/src/imports/localesettings/qmldir b/src/imports/localesettings/qmldir
new file mode 100644
index 0000000..3c59bb0
--- /dev/null
+++ b/src/imports/localesettings/qmldir
@@ -0,0 +1,2 @@
+module com.theqtcompany.settings.locale
+plugin localesettingsplugin