chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweaking verse_order in the songEditor.qml so it shows up

Browse source
This commit is contained in:
Chris Cochrun 2023-10-11 09:35:24 -05:00
parent b83c8a7984
commit d82a0ac503
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/qml/presenter/SongEditor.qml
View file

@ -297,7 +297,7 @@ Item {
Layout.rightMargin: 20 Layout.rightMargin: 20
placeholderText: "verse order..." placeholderText: "verse order..."
text: song.vorder text: song.verseOrder
padding: 10 padding: 10
onEditingFinished: updateVerseOrder(text); onEditingFinished: updateVerseOrder(text);
background: Presenter.TextBackground { background: Presenter.TextBackground {
@ -447,6 +447,10 @@ Item {
id: songList id: songList
imageBackground: songEditorModel.backgroundType === "image" ? songEditor.background : "" imageBackground: songEditorModel.backgroundType === "image" ? songEditor.background : ""
videoBackground: songEditorModel.backgroundType === "video" ? songEditor.background : "" videoBackground: songEditorModel.backgroundType === "video" ? songEditor.background : ""
font: songEditorModel.font
fontSize: songEditorModel.fontSize
/* hTextAlignment: songEditorModel.horizontalTextAlignment */
/* vTextAlignment: songEditorModel.verticalTextAlignment */
Layout.preferredWidth: 500 Layout.preferredWidth: 500
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
@ -554,9 +558,9 @@ Item {
} }
function updateVerseOrder(vorder) { function updateVerseOrder(vorder) {
songProxyModel.songModel.updateVerseOrder(songIndex, vorder)
songEditorModel.verseOrder = vorder; songEditorModel.verseOrder = vorder;
songEditorModel.checkVerseOrder(); songEditorModel.checkVerseOrder();
songProxyModel.songModel.updateVerseOrder(songIndex, vorder)
} }
function updateAudioFile() { function updateAudioFile() {

8
src/qml/presenter/SongEditorSlideList.qml
View file

@ -74,8 +74,8 @@ Item {
videoSource: root.videoBackground videoSource: root.videoBackground
hTextAlignment: root.hTextAlignment hTextAlignment: root.hTextAlignment
vTextAlignment: root.vTextAlignment vTextAlignment: root.vTextAlignment
chosenFont: font chosenFont: root.font
textSize: fontSize textSize: root.fontSize
preview: true preview: true
text: verse text: verse
implicitWidth: slideList.width implicitWidth: slideList.width
@ -163,13 +163,13 @@ Item {
} }
function loadVideo() { function loadVideo() {
showPassiveNotification("I'm loading the videos"); console.log("I'm loading the videos");
for (var i = 0; i < slideList.count; ++i) { for (var i = 0; i < slideList.count; ++i) {
slideList.currentIndex = i; slideList.currentIndex = i;
slideList.currentItem.representation.loadVideo(); slideList.currentItem.representation.loadVideo();
console.log(slideList.currentItem); console.log(slideList.currentItem);
} }
showPassiveNotification("I loaded the videos"); console.log("I loaded the videos");
} }
function clear() { function clear() {