diff --git a/TODO.org b/TODO.org index 6bfde19..92185d6 100644 --- a/TODO.org +++ b/TODO.org @@ -4,7 +4,7 @@ :END: * Inbox -** PROJ [#A] Make Presentation Window follow the presenter component :core: +** DONE [#A] Make Presentation Window follow the presenter component :core: [[file:~/dev/church-presenter/src/qml/presenter/MainWindow.qml::Presenter.Slide {]] Starting this by creating a slide singleton that will carry the variables for the current visible slide in the presentation. @@ -13,6 +13,8 @@ May need to think about making this a slide class for all possible slides and a The left dock doesn't carry the change from the arrow buttons and the video on the actual presentation doesn't load.' +All pieces working now + ** TODO Need to make =getLyricList= give back the verses with empty lines as separate slides :core: [[file:~/dev/church-presenter/src/songsqlmodel.cpp:://TODO make sure to split empty line in verse into two slides]] diff --git a/src/qml/presenter/LeftDock.qml b/src/qml/presenter/LeftDock.qml index 00981fe..e1b8728 100644 --- a/src/qml/presenter/LeftDock.qml +++ b/src/qml/presenter/LeftDock.qml @@ -8,6 +8,7 @@ import QtMultimedia 5.15 /* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter +import org.presenter 1.0 ColumnLayout { id: root @@ -292,4 +293,8 @@ ColumnLayout { serviceItemModel.addItem(name, type, background, backgroundType, lyrics); } + + function changeItem() { + serviceItemList.currentIndex = currentServiceItem; + } } diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml index 85f4bcc..f27e01f 100644 --- a/src/qml/presenter/Presentation.qml +++ b/src/qml/presenter/Presentation.qml @@ -168,6 +168,7 @@ Item { if (changed) { currentServiceItem++; loadVideo(); + leftDock.changeItem(); } } @@ -187,6 +188,7 @@ Item { if (changed) { currentServiceItem--; loadVideo(); + leftDock.changeItem(); } }