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

removing some cruft

Browse source
This commit is contained in:
Chris Cochrun 2024-09-17 10:07:36 -05:00
parent 50fc745335
commit e0bcce3f72
2 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -497,31 +497,19 @@ Item {
clearSlides(); clearSlides();
const updatedSong = songModel.getItem(index); const updatedSong = songModel.getItem(index);
Utils.dbg(updatedSong.vorder + " " + updatedSong.title + " " + updatedSong.audio); 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.loadSong(index);
songEditorModel.checkVerseOrder(); songEditorModel.checkVerseOrder();
songEditorModel.checkFiles(); songEditorModel.checkFiles();
songID = updatedSong.id; songID = updatedSong.id;
changeSlideHAlignment(song.horizontalTextAlignment); changeSlideHAlignment(songEditorModel.horizontalTextAlignment);
changeSlideVAlignment(song.verticalTextAlignment); changeSlideVAlignment(songEditorModel.verticalTextAlignment);
changeSlideFont(song.font, true); changeSlideFont(songEditorModel.font, true);
changeSlideFontSize(song.fontSize, true) changeSlideFontSize(songEditorModel.fontSize, true)
changeSlideText(index); changeSlideText(index);
Utils.dbg("Changing to song: " + song.title + " with ID: " + songID); Utils.dbg("Changing to song: " + songEditorModel.title + " with ID: " + songID);
footerFirstText = "Song: "; footerFirstText = "Song: ";
footerSecondText = song.title; footerSecondText = songEditorModel.title;
songList.loadVideo(); songList.loadVideo();
} }

8
src/rust/songs/song_editor.rs
View file

@ -100,14 +100,6 @@ impl Default for SongEditorRust {
} }
impl song_editor::SongEditor { 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) { fn load_song(mut self: Pin<&mut Self>, song_index: i32) {
if let Some(model) = unsafe { self.song_model().as_ref() } { if let Some(model) = unsafe { self.song_model().as_ref() } {
let pinned_model = unsafe { Pin::new_unchecked(model) }; let pinned_model = unsafe { Pin::new_unchecked(model) };