From 09b6370153eebecb0016e9a89a651bf2d23f329e Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 8 Apr 2022 16:50:32 -0500 Subject: [PATCH] fixed bug in duplicating last item after video or image item --- src/qml/presenter/MainWindow.qml | 3 ++- src/qml/presenter/Presentation.qml | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml index 80f9e4f..1605785 100644 --- a/src/qml/presenter/MainWindow.qml +++ b/src/qml/presenter/MainWindow.qml @@ -108,6 +108,7 @@ Controls.Page { function changeServiceItem(index) { const item = serviceItemModel.getItem(index); + print("index grabbed: " + index); presentation.stopVideo() presentation.itemType = item.type; @@ -128,7 +129,7 @@ Controls.Page { else presentation.text = item.text; presentation.textIndex = 0; - presentation.nextSlideAction(); + presentation.changeSlide(); print("Slide changed to: " + item.name); } diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml index 13c22f6..e028bcf 100644 --- a/src/qml/presenter/Presentation.qml +++ b/src/qml/presenter/Presentation.qml @@ -152,6 +152,19 @@ Item { } } + function changeSlide() { + if (itemType === "song") { + previewSlide.text = root.text[textIndex]; + print(root.text[textIndex]); + textIndex++; + } else if (itemType === "video") { + clearText(); + } + else if (itemType === "image") { + clearText(); + } + } + function nextSlide() { currentServiceItem++; changeServiceItem(currentServiceItem);