diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml index 5a09393..6bba834 100644 --- a/src/qml/presenter/SongEditor.qml +++ b/src/qml/presenter/SongEditor.qml @@ -497,31 +497,19 @@ Item { clearSlides(); const updatedSong = songModel.getItem(index); Utils.dbg(updatedSong.vorder + " " + updatedSong.title + " " + updatedSong.audio); - /* songEditorModel.title = updatedSong.title; */ - /* songEditorModel.lyrics = updatedSong.lyrics; */ - /* songEditorModel.author = updatedSong.author; */ - /* songEditorModel.ccli = updatedSong.ccli; */ - /* songEditorModel.audio = updatedSong.audio; */ - /* songEditorModel.verseOrder = updatedSong.vorder; */ - /* songEditorModel.background = updatedSong.background; */ - /* songEditorModel.backgroundType = updatedSong.backgroundType; */ - /* songEditorModel.horizontalTextAlignment = updatedSong.horizontalTextAlignment; */ - /* songEditorModel.verticalTextAlignment = updatedSong.verticalTextAlignment; */ - /* songEditorModel.font = updatedSong.font; */ - /* songEditorModel.fontSize = updatedSong.fontSize; */ songEditorModel.loadSong(index); songEditorModel.checkVerseOrder(); songEditorModel.checkFiles(); songID = updatedSong.id; - changeSlideHAlignment(song.horizontalTextAlignment); - changeSlideVAlignment(song.verticalTextAlignment); - changeSlideFont(song.font, true); - changeSlideFontSize(song.fontSize, true) + changeSlideHAlignment(songEditorModel.horizontalTextAlignment); + changeSlideVAlignment(songEditorModel.verticalTextAlignment); + changeSlideFont(songEditorModel.font, true); + changeSlideFontSize(songEditorModel.fontSize, true) changeSlideText(index); - Utils.dbg("Changing to song: " + song.title + " with ID: " + songID); + Utils.dbg("Changing to song: " + songEditorModel.title + " with ID: " + songID); footerFirstText = "Song: "; - footerSecondText = song.title; + footerSecondText = songEditorModel.title; songList.loadVideo(); } diff --git a/src/rust/songs/song_editor.rs b/src/rust/songs/song_editor.rs index adba538..8930995 100644 --- a/src/rust/songs/song_editor.rs +++ b/src/rust/songs/song_editor.rs @@ -100,14 +100,6 @@ impl Default for SongEditorRust { } impl song_editor::SongEditor { - fn idk(self: Pin<&mut Self>) { - if let Some(model) = unsafe { self.song_model().as_mut() } { - let pinned_model = unsafe { Pin::new_unchecked(model) }; - pinned_model.update_ccli(0, QString::from("idk")); - } - todo!(); - } - fn load_song(mut self: Pin<&mut Self>, song_index: i32) { if let Some(model) = unsafe { self.song_model().as_ref() } { let pinned_model = unsafe { Pin::new_unchecked(model) };