From d82a0ac503eb7a0a698fb4fa2d2464c9da1cbdc7 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 11 Oct 2023 09:35:24 -0500
Subject: [PATCH] Tweaking verse_order in the songEditor.qml so it shows up

---
 src/qml/presenter/SongEditor.qml          | 8 ++++++--
 src/qml/presenter/SongEditorSlideList.qml | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml
index c927df8..3dff434 100644
--- a/src/qml/presenter/SongEditor.qml
+++ b/src/qml/presenter/SongEditor.qml
@@ -297,7 +297,7 @@ Item {
                     Layout.rightMargin: 20
 
                     placeholderText: "verse order..."
-                    text: song.vorder
+                    text: song.verseOrder
                     padding: 10
                     onEditingFinished: updateVerseOrder(text);
                     background: Presenter.TextBackground {
@@ -447,6 +447,10 @@ Item {
                     id: songList
                     imageBackground: songEditorModel.backgroundType === "image" ? songEditor.background : ""
                     videoBackground: songEditorModel.backgroundType === "video" ? songEditor.background : ""
+                    font: songEditorModel.font
+                    fontSize: songEditorModel.fontSize
+                    /* hTextAlignment: songEditorModel.horizontalTextAlignment */
+                    /* vTextAlignment: songEditorModel.verticalTextAlignment */
                     Layout.preferredWidth: 500
                     Layout.fillWidth: true
                     Layout.fillHeight: true
@@ -554,9 +558,9 @@ Item {
     }
 
     function updateVerseOrder(vorder) {
+        songProxyModel.songModel.updateVerseOrder(songIndex, vorder)
         songEditorModel.verseOrder = vorder;
         songEditorModel.checkVerseOrder();
-        songProxyModel.songModel.updateVerseOrder(songIndex, vorder)
     }
 
     function updateAudioFile() {
diff --git a/src/qml/presenter/SongEditorSlideList.qml b/src/qml/presenter/SongEditorSlideList.qml
index f492879..4652aca 100644
--- a/src/qml/presenter/SongEditorSlideList.qml
+++ b/src/qml/presenter/SongEditorSlideList.qml
@@ -74,8 +74,8 @@ Item {
                 videoSource: root.videoBackground
                 hTextAlignment: root.hTextAlignment
                 vTextAlignment: root.vTextAlignment
-                chosenFont: font
-                textSize: fontSize
+                chosenFont: root.font
+                textSize: root.fontSize
                 preview: true
                 text: verse
                 implicitWidth: slideList.width
@@ -163,13 +163,13 @@ Item {
     }
 
     function loadVideo() {
-        showPassiveNotification("I'm loading the videos");
+        console.log("I'm loading the videos");
         for (var i = 0; i < slideList.count; ++i) {
             slideList.currentIndex = i;
             slideList.currentItem.representation.loadVideo();
             console.log(slideList.currentItem);
         }
-        showPassiveNotification("I loaded the videos");
+        console.log("I loaded the videos");
     }
 
     function clear() {