diff --git a/src/cpp/serviceitemmodel.cpp b/src/cpp/serviceitemmodel.cpp index 96b43e6..f4f1bb2 100644 --- a/src/cpp/serviceitemmodel.cpp +++ b/src/cpp/serviceitemmodel.cpp @@ -25,6 +25,7 @@ #include #include "cxx-qt-gen/slide_model.cxxqt.h" +#include "cxx-qt-gen/service_item_model.cxxqt.h" ServiceItemModel::ServiceItemModel(QObject *parent) : QAbstractListModel(parent) { @@ -393,6 +394,11 @@ bool ServiceItemModel::moveUp(int id) { return false; } +QVariantMap ServiceItemModel::getRust(int index, ServiceItemMod *rustModel) const { + QVariantMap item = rustModel->getItem(index); + return item; +} + QVariantMap ServiceItemModel::getItem(int index) const { QVariantMap data; const QModelIndex idx = this->index(index,0); diff --git a/src/cpp/serviceitemmodel.h b/src/cpp/serviceitemmodel.h index f8b122b..a4ded54 100644 --- a/src/cpp/serviceitemmodel.h +++ b/src/cpp/serviceitemmodel.h @@ -9,6 +9,8 @@ #include #include +#include "cxx-qt-gen/service_item_model.cxxqt.h" + class ServiceItemModel : public QAbstractListModel { Q_OBJECT @@ -49,47 +51,12 @@ public: // Helper methods void addItem(ServiceItem *item); void insertItem(const int &index, ServiceItem *item); - // Q_INVOKABLE void addItem(const QString &name, const QString &type); - // // Q_INVOKABLE void addItem(const QString &name, const QString &type, - // // const QString &background); - // Q_INVOKABLE void addItem(const QString &name, const QString &type, - // const QString &background, - // const QString &backgroundType); - // Q_INVOKABLE void addItem(const QString &name, const QString &type, - // const QString &background, - // const QString &backgroundType, - // const QStringList &text); - // Q_INVOKABLE void addItem(const QString &name, const QString &type, - // const QString &background, - // const QString &backgroundType, - // const QStringList &text, const QString &audio); - // Q_INVOKABLE void addItem(const QString &name, const QString &type, - // const QString &background, - // const QString &backgroundType, - // const QStringList &text, const QString &audio, - // const QString &font, const int &fontSize); Q_INVOKABLE void addItem(const QString &name, const QString &type, const QString &background, const QString &backgroundType, const QStringList &text, const QString &audio, const QString &font, const int &fontSize, const int &slideNumber, const bool &loop); - // Q_INVOKABLE void insertItem(const int &index, const QString &name, - // const QString &type); - // Q_INVOKABLE void insertItem(const int &index, const QString &name, - // const QString &type, const QString &background, - // const QString &backgroundType); - // Q_INVOKABLE void insertItem(const int &index, const QString &name, - // const QString &type, const QString &background, - // const QString &backgroundType, const QStringList &text); - // Q_INVOKABLE void insertItem(const int &index, const QString &name, - // const QString &type, const QString &background, - // const QString &backgroundType, const QStringList &text, - // const QString &audio); - // Q_INVOKABLE void insertItem(const int &index, const QString &name, - // const QString &type, const QString &background, - // const QString &backgroundType, const QStringList &text, - // const QString &audio, const QString &font, const int &fontSize); Q_INVOKABLE void insertItem(const int &index, const QString &name, const QString &type, const QString &background, const QString &backgroundType, const QStringList &text, @@ -106,6 +73,7 @@ public: Q_INVOKABLE bool activate(int id); Q_INVOKABLE bool deactivate(int id); Q_INVOKABLE QVariantMap getItem(int index) const; + Q_INVOKABLE QVariantMap getRust(int index, ServiceItemMod *rustModel) const; Q_INVOKABLE QVariantList getItems(); Q_INVOKABLE void clearAll(); diff --git a/src/main.cpp b/src/main.cpp index 29cee92..7c2e9e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -97,6 +97,7 @@ static void connectToDatabase() { qFatal("Cannot open database: %s", qPrintable(db.lastError().text())); QFile::remove(dbName); } + qDebug() << "Finished connecting to db"; } @@ -149,6 +150,7 @@ int main(int argc, char *argv[]) QScopedPointer filemanager(new File); // QScopedPointer preswin(new QQuickView); QScopedPointer serviceItemModel(new ServiceItemMod); + QScopedPointer serviceItemC(new ServiceItemModel); QScopedPointer slideobject(new SlideObj); Settings *settings = new Settings; @@ -225,6 +227,8 @@ int main(int argc, char *argv[]) qmlRegisterType("org.presenter", 1, 0, "SlideHelper"); qmlRegisterSingletonInstance("org.presenter", 1, 0, "ServiceItemModel", serviceItemModel.get()); + qmlRegisterSingletonInstance("org.presenter", 1, 0, + "ServiceItemC", serviceItemC.get()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideModel", slideModel.get()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideMod", slideMod.get()); qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slideobject.get()); @@ -237,10 +241,13 @@ int main(int argc, char *argv[]) connectToDatabase(); + qDebug() << "Starting engine"; QQmlApplicationEngine engine; + qDebug() << app.allWindows(); engine.rootContext()->setContextObject(new KLocalizedContext(&engine)); engine.load(QUrl(QStringLiteral("qrc:qml/main.qml"))); + qDebug() << "Engine loaded"; // engine.load(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml"))); qDebug() << app.topLevelWindows();