From dbc6b5e33a69993f885dc363ddd738ad0de4ee78 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 15 Jul 2022 08:19:42 -0500 Subject: [PATCH] trying to make services available to slide class --- src/main.cpp | 1 + src/qml/presenter/MainWindow.qml | 2 +- src/slide.cpp | 20 ++++++++++++++++++++ src/slide.h | 4 ++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2de6405..908eb2e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -94,6 +94,7 @@ int main(int argc, char *argv[]) qDebug() << QIcon::themeName(); //Need to instantiate our slide + ServiceItemModel services(); QScopedPointer slide(new Slide("", "", "", "", "", "", "", 0)); // apparently mpv needs this class set diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml index 7a7fcd8..487692d 100644 --- a/src/qml/presenter/MainWindow.qml +++ b/src/qml/presenter/MainWindow.qml @@ -144,7 +144,7 @@ Controls.Page { SlideObject.setText(""); } else - SlideObject.setText(item.text); + SlideObject.setText(item.text[0]); presentation.textIndex = 0; presentation.changeSlide(); diff --git a/src/slide.cpp b/src/slide.cpp index 5275e71..b8e192d 100644 --- a/src/slide.cpp +++ b/src/slide.cpp @@ -1,4 +1,5 @@ #include "slide.h" +#include "serviceitemmodel.h" #include @@ -132,3 +133,22 @@ void Slide::setFontSize(int fontSize) m_fontSize = fontSize; emit fontSizeChanged(m_fontSize); } + +void Slide::changeSlide(int index) +{ + QVariantMap item = services.getItem(index); + if (item.backgroundType == "image") { + setImageBackground(item.background); + setVideoBackground(""); + } else { + setVideoBackground(item.background); + setImageBackground(""); + } + if (item.text.length < 1) + setText(item.text[0]); +} + +void Slide::nextSlide() +{ + +} diff --git a/src/slide.h b/src/slide.h index b14b626..4f7b952 100644 --- a/src/slide.h +++ b/src/slide.h @@ -45,8 +45,8 @@ public: Q_INVOKABLE void setFont(QString font); Q_INVOKABLE void setFontSize(int fontSize); - // Q_INVOKABLE void changeSlide(int index); - // Q_INVOKABLE void nextSlide(); + Q_INVOKABLE void changeSlide(int index); + Q_INVOKABLE void nextSlide(); signals: Q_INVOKABLE void textChanged(QString text);