From 8fad5cadb4deb4c8de60dcd11a103bd0c9045475 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sun, 22 Jan 2023 07:31:07 -0600 Subject: [PATCH] some connections to make active follow slideObject --- src/cpp/slidemodel.cpp | 2 +- src/cpp/slidemodel.h | 6 +++--- src/cpp/slideobject.h | 3 ++- src/main.cpp | 4 ++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/cpp/slidemodel.cpp b/src/cpp/slidemodel.cpp index 5917677..69bec44 100644 --- a/src/cpp/slidemodel.cpp +++ b/src/cpp/slidemodel.cpp @@ -444,7 +444,7 @@ bool SlideModel::activate(int id) { item->setActive(true); qDebug() << "################"; - qDebug() << "activated" << item->slideIndex(); + qDebug() << "slide activated" << item->slideIndex(); qDebug() << "################"; emit dataChanged(idx, idx, QVector() << ActiveRole); return true; diff --git a/src/cpp/slidemodel.h b/src/cpp/slidemodel.h index d857241..f4cf972 100644 --- a/src/cpp/slidemodel.h +++ b/src/cpp/slidemodel.h @@ -75,15 +75,15 @@ public: Q_INVOKABLE bool moveRows(int sourceIndex, int destIndex, int count); Q_INVOKABLE bool moveDown(int index); Q_INVOKABLE bool moveUp(int index); - Q_INVOKABLE bool select(int id); - Q_INVOKABLE bool activate(int id); - Q_INVOKABLE bool deactivate(int id); Q_INVOKABLE QVariantMap getItem(int index) const; Q_INVOKABLE QVariantList getItems(); Q_INVOKABLE void clearAll(); Q_INVOKABLE int findSlideIdFromServItm(int index); public slots: + Q_INVOKABLE bool select(int id); + Q_INVOKABLE bool activate(int id); + Q_INVOKABLE bool deactivate(int id); void addItemFromService(const int &index, const ServiceItem &item); void insertItemFromService(const int &index, const ServiceItem &item); diff --git a/src/cpp/slideobject.h b/src/cpp/slideobject.h index d762e7b..917b03e 100644 --- a/src/cpp/slideobject.h +++ b/src/cpp/slideobject.h @@ -30,7 +30,7 @@ public: int slideIndex() const; int slideSize() const; - Q_INVOKABLE void changeSlide(QVariantMap item); + Q_INVOKABLE void changeSlide(QVariantMap item, int index); Q_INVOKABLE void play(); Q_INVOKABLE void pause(); Q_INVOKABLE void playPause(); @@ -42,6 +42,7 @@ signals: Q_INVOKABLE void isPlayingChanged(bool isPlaying); Q_INVOKABLE void slideIndexChanged(int slideIndex); Q_INVOKABLE void slideSizeChanged(int slideSize); + Q_INVOKABLE void slideChanged(int slide); private: bool m_isPlaying; diff --git a/src/main.cpp b/src/main.cpp index 47dab03..271a78a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -147,6 +147,10 @@ int main(int argc, char *argv[]) SIGNAL(itemAdded(const int&, const ServiceItem&)), slideModel.get(), SLOT(addItemFromService(const int&, const ServiceItem&))); + QObject::connect(slideobject.get(), + SIGNAL(slideChanged(int)), + slideModel.get(), + SLOT(activate(int))); bool loading = serviceItemModel.get()->loadLastSaved();