[CalendarModel] Move DateListModel to CalendarModel

rpm/qtquickcontrols-nemo.spec

@@ -63,6 +63,7 @@ desktop-file-install --delete-original       \
 
 %files
 %defattr(-,root,root,-)
+%{_libdir}/qt5/qml/org/nemomobile/models/
 %{_libdir}/qt5/qml/QtQuick/Controls/Nemo
 %{_libdir}/qt5/qml/QtQuick/Controls/Styles/Nemo
 

src/controls/controls.pro

@@ -39,8 +39,7 @@ HEADERS += \
     themedaemon/mlocalthemedaemonclient.h \
     themedaemon/mabstractthemedaemonclient.h \
     sizing.h \
-    theme.h \
-    datelistmodel.h
+    theme.h
 
 SOURCES += \
     qquicknemocontrolsextensionplugin.cpp \
@@ -52,8 +51,7 @@ SOURCES += \
     themedaemon/mlocalthemedaemonclient.cpp \
     themedaemon/mabstractthemedaemonclient.cpp \
     sizing.cpp \
-    theme.cpp \
-    datelistmodel.cpp
+    theme.cpp
 
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 

src/controls/qquicknemocontrolsextensionplugin.cpp

@@ -27,7 +27,6 @@
 #include "nemoimageprovider.h"
 #include "sizing.h"
 #include "theme.h"
-#include "datelistmodel.h"
 
 QQuickNemoControlsExtensionPlugin::QQuickNemoControlsExtensionPlugin(QObject *parent) :
     QQmlExtensionPlugin(parent)
@@ -47,7 +46,6 @@ void QQuickNemoControlsExtensionPlugin::registerTypes(const char *uri)
     qmlRegisterType<NemoWindow>(uri, 1, 0, "NemoWindow");
     qmlRegisterType<NemoPage>(uri, 1, 0, "NemoPage");
     qmlRegisterType<QQuickFilteringMouseArea>(uri, 1, 0, "FilteringMouseArea");
-    qmlRegisterType<DateListModel>(uri, 1, 0, "NemoDateListModel");
 }
 
 void QQuickNemoControlsExtensionPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

src/controls/datelistmodel.cpp → src/models/calendarmodel.cpp

@@ -29,9 +29,9 @@
 **
 ****************************************************************************************/
 
-#include "datelistmodel.h"
+#include "calendarmodel.h"
 
-DateListModel::DateListModel(QObject *parent) :
+CalendarModel::CalendarModel(QObject *parent) :
     QAbstractListModel(parent)
 {
 
@@ -49,13 +49,13 @@ DateListModel::DateListModel(QObject *parent) :
     fill();
 }
 
-int DateListModel::rowCount(const QModelIndex &parent) const
+int CalendarModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     return m_dateList.count();
 }
 
-QVariant DateListModel::data(const QModelIndex &index, int role) const
+QVariant CalendarModel::data(const QModelIndex &index, int role) const
 {
     Q_UNUSED(role);
     if(!index.isValid())
@@ -86,7 +86,7 @@ QVariant DateListModel::data(const QModelIndex &index, int role) const
     }
 }
 
-QVariant DateListModel::get(const int idx)
+QVariant CalendarModel::get(const int idx)
 {
     if(idx >= m_dateList.size())
     {
@@ -105,7 +105,7 @@ QVariant DateListModel::get(const int idx)
     return QVariant(itemData);
 }
 
-void DateListModel::setSelectedDate(QDate date)
+void CalendarModel::setSelectedDate(QDate date)
 {
     if(m_selectedDate != date)
     {
@@ -114,7 +114,7 @@ void DateListModel::setSelectedDate(QDate date)
     }
 }
 
-void DateListModel::setMonth(int month)
+void CalendarModel::setMonth(int month)
 {
     if(m_month != month && month > 0 && month < 13)
     {
@@ -124,7 +124,7 @@ void DateListModel::setMonth(int month)
     }
 }
 
-void DateListModel::setYear(int year)
+void CalendarModel::setYear(int year)
 {
     if(m_year != year)
     {
@@ -134,7 +134,7 @@ void DateListModel::setYear(int year)
     }
 }
 
-void DateListModel::fill()
+void CalendarModel::fill()
 {
 
 }

src/controls/datelistmodel.h → src/models/calendarmodel.h

@@ -35,7 +35,7 @@
 #include <QAbstractListModel>
 #include <QDate>
 
-class DateListModel : public QAbstractListModel
+class CalendarModel : public QAbstractListModel
 {
     Q_OBJECT
     struct dateItem{
@@ -52,7 +52,7 @@ class DateListModel : public QAbstractListModel
     Q_PROPERTY(QDate selectedDate READ selectedDate WRITE setSelectedDate NOTIFY selectedDateChanged)
 
 public:
-    explicit DateListModel(QObject *parent = 0);
+    explicit CalendarModel(QObject *parent = 0);
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant data(const QModelIndex &index, int role) const;
     QHash<int, QByteArray> roleNames() const {return m_hash;}

src/models/models.pro

+TEMPLATE = lib
+TARGET = nemomodelsplugin
+
+QT += qml
+CONFIG += qt plugin hide_symbols
+
+SOURCES += \
+    calendarmodel.cpp \
+    plugin.cpp
+
+HEADERS += \
+    calendarmodel.h
+
+target.path = /usr/lib/qt5/qml/org/nemomobile/models/
+
+INSTALLS += target
+
+DISTFILES += \
+    qmldir

src/models/plugin.cpp

+/*
+ * Copyright (C) 2017 Chupligin Sergey <neochapay@gmail.com>
+ *
+ * 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.
+ */
+
+#include "calendarmodel.h"
+
+#include <QtQml>
+#include <QtGlobal>
+#include <QQmlEngine>
+#include <QQmlExtensionPlugin>
+
+class Q_DECL_EXPORT NemoSettingsPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.nemomobile.models")
+public:
+    virtual ~NemoSettingsPlugin() { }
+
+    void initializeEngine(QQmlEngine *, const char *uri)
+    {
+        Q_ASSERT(uri == QLatin1String("org.nemomobile.models"));
+    }
+
+    void registerTypes(const char *uri)
+    {
+        Q_ASSERT(uri == QLatin1String("org.nemomobile.models"));
+        qmlRegisterType<CalendarModel>(uri, 1, 0, "CalendarModel");
+    }
+};
+
+#include "plugin.moc"

src/models/qmldir

+module org.nemomobile.models
+plugin nemomodels

src/src.pro

@@ -2,3 +2,4 @@ TEMPLATE = subdirs
  
 SUBDIRS += controls
 SUBDIRS += styles
+SUBDIRS += models
\ No newline at end of file