nextSlideAction triggers nextslide on last item in list

This commit is contained in:
Chris Cochrun 2022-04-02 14:58:24 -05:00
parent 2e72a01c6f
commit 62e1b07ec1
4 changed files with 12 additions and 3 deletions

View file

@ -1,5 +1,7 @@
#+TITLE: Todo List #+TITLE: Todo List
* Inbox * Inbox
** TODO Make sure the video gets changed in a proper manner to not have left over video showing from previous items
[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::currentServiceItem++;]]
** TODO Fix possible bug in arrangingItems in draghandler ** TODO Fix possible bug in arrangingItems in draghandler
[[file:~/dev/church-presenter/src/qml/presenter/DragHandle.qml::function arrangeItem() {]] [[file:~/dev/church-presenter/src/qml/presenter/DragHandle.qml::function arrangeItem() {]]
** TODO [#A] Make Presentation Window follow the presenter component ** TODO [#A] Make Presentation Window follow the presenter component
@ -14,12 +16,11 @@
** TODO Find a way to maths the textsize ** TODO Find a way to maths the textsize
[[file:~/dev/church-presenter/src/qml/presenter/Slide.qml::property real textSize: 50]] [[file:~/dev/church-presenter/src/qml/presenter/Slide.qml::property real textSize: 50]]
** TODO Make nextSlideText a nextAction function to incorporate other types of items
[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlideText() {]]
** TODO Create a nextslide function to be used after the end of the list of slides ** TODO Create a nextslide function to be used after the end of the list of slides
[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlide() {]] [[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlide() {]]
- [ ] Check to make sure this works in all conditions but I believe it works ok.
** TODO Fix broken append when importing River song ** TODO Fix broken append when importing River song
[[file:~/dev/church-presenter/src/qml/presenter/LeftDock.qml::function appendItem(name, type, background, backgroundType, text, itemID) {]] [[file:~/dev/church-presenter/src/qml/presenter/LeftDock.qml::function appendItem(name, type, background, backgroundType, text, itemID) {]]
@ -30,6 +31,9 @@
** DONE Parse Lyrics to create a list of strings for slides ** DONE Parse Lyrics to create a list of strings for slides
SCHEDULED: <2022-03-23 Wed 10:00> SCHEDULED: <2022-03-23 Wed 10:00>
** DONE Make nextSlideText a nextAction function to incorporate other types of items
[[file:~/dev/church-presenter/src/qml/presenter/Presentation.qml::function nextSlideText() {]]
** DONE Fix file dialog using basic QT theme ** DONE Fix file dialog using basic QT theme
[[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::FileDialog {]] [[file:~/dev/church-presenter/src/qml/presenter/SongEditor.qml::FileDialog {]]

View file

@ -116,6 +116,7 @@ ColumnLayout {
} }
onClicked: { onClicked: {
serviceItemList.currentIndex = index; serviceItemList.currentIndex = index;
currentServiceItem = index;
changeServiceItem(index); changeServiceItem(index);
} }
onRightClicked: rightClickMenu.popup() onRightClicked: rightClickMenu.popup()

View file

@ -12,6 +12,7 @@ Controls.Page {
padding: 0 padding: 0
// properties passed around for the slides // properties passed around for the slides
property int currentServiceItem
property url imageBackground: "" property url imageBackground: ""
property url videoBackground: "" property url videoBackground: ""
property int blurRadius: 0 property int blurRadius: 0

View file

@ -135,6 +135,7 @@ Item {
} else { } else {
print("Next slide time"); print("Next slide time");
textIndex = 0; textIndex = 0;
previewSlide.text = "";
nextSlide(); nextSlide();
} }
} else if (itemType === "video") } else if (itemType === "video")
@ -144,6 +145,8 @@ Item {
} }
function nextSlide() { function nextSlide() {
currentServiceItem++;
changeServiceItem(currentServiceItem);
print(slideItem); print(slideItem);
} }
} }