made the leftdock follow the presentation arrows
This commit is contained in:
parent
2f0ce840be
commit
af6f5678e4
3 changed files with 10 additions and 1 deletions
4
TODO.org
4
TODO.org
|
@ -4,7 +4,7 @@
|
||||||
:END:
|
:END:
|
||||||
|
|
||||||
* Inbox
|
* 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 {]]
|
[[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.
|
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.'
|
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:
|
** 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]]
|
[[file:~/dev/church-presenter/src/songsqlmodel.cpp:://TODO make sure to split empty line in verse into two slides]]
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ import QtMultimedia 5.15
|
||||||
/* import QtAudioEngine 1.15 */
|
/* import QtAudioEngine 1.15 */
|
||||||
import org.kde.kirigami 2.13 as Kirigami
|
import org.kde.kirigami 2.13 as Kirigami
|
||||||
import "./" as Presenter
|
import "./" as Presenter
|
||||||
|
import org.presenter 1.0
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
@ -292,4 +293,8 @@ ColumnLayout {
|
||||||
serviceItemModel.addItem(name, type, background,
|
serviceItemModel.addItem(name, type, background,
|
||||||
backgroundType, lyrics);
|
backgroundType, lyrics);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function changeItem() {
|
||||||
|
serviceItemList.currentIndex = currentServiceItem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -168,6 +168,7 @@ Item {
|
||||||
if (changed) {
|
if (changed) {
|
||||||
currentServiceItem++;
|
currentServiceItem++;
|
||||||
loadVideo();
|
loadVideo();
|
||||||
|
leftDock.changeItem();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -187,6 +188,7 @@ Item {
|
||||||
if (changed) {
|
if (changed) {
|
||||||
currentServiceItem--;
|
currentServiceItem--;
|
||||||
loadVideo();
|
loadVideo();
|
||||||
|
leftDock.changeItem();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue