From f2f2ab27b96b76177b2311a6d41ff9fa1f63aab8 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 13 Sep 2023 14:58:44 -0500 Subject: [PATCH] fixing more inserting pieces --- src/qml/presenter/ServiceList.qml | 16 ++++++++-------- src/rust/slide_model.rs | 11 +++++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/qml/presenter/ServiceList.qml b/src/qml/presenter/ServiceList.qml index c1f4057..853370f 100644 --- a/src/qml/presenter/ServiceList.qml +++ b/src/qml/presenter/ServiceList.qml @@ -557,8 +557,8 @@ Item { const image = imageProxyModel.getImage(itemID); console.log("adding: " + image.title + " of type " + type); ServiceItemModel.insertItem(index, image.title, - type, image.filePath, - "image", "", "", + "", type, image.filePath, + "image", "", "", 0, 0, false, 0.0, 0.0); serviceItemList.forceLayout() return; @@ -567,8 +567,8 @@ Item { const video = videoProxyModel.getVideo(itemID); console.log("adding: " + video.title + " of type " + type); ServiceItemModel.insertItem(index, video.title, - type, video.filePath, - "video", "", "", + "", type, video.filePath, + "video", "", "", 0, 0, video.loop, video.startTime, video.endTime); serviceItemList.forceLayout() return; @@ -581,8 +581,8 @@ Item { " of type " + type + " with " + lyrics.length + " slides"); ServiceItemModel.insertItem(index, song.title, - type, song.background, - song.backgroundType, lyrics, + lyrics, type, song.background, + song.backgroundType, song.audio, song.font, song.fontSize, lyrics.length, true, 0.0, 0.0); serviceItemList.forceLayout() @@ -594,8 +594,8 @@ Item { " of type " + type + " with " + pres.pageCount + " slides"); ServiceItemModel.insertItem(index, pres.title, - type, pres.filePath, - "image", "", + "", type, pres.filePath, + "image", "", "", 0, pres.pageCount, false, 0.0, 0.0); serviceItemList.forceLayout() return; diff --git a/src/rust/slide_model.rs b/src/rust/slide_model.rs index 7432952..c69b2fa 100644 --- a/src/rust/slide_model.rs +++ b/src/rust/slide_model.rs @@ -260,6 +260,13 @@ mod slide_model { index: i32, service_item: &QMap_QString_QVariant, ) { + for (key, data) in service_item.iter() { + println!( + "{:?}: {:?}", + key, + data.value_or_default::() + ); + } let ty = service_item .get(&QString::from("ty")) .unwrap_or(QVariant::from(&QString::from(""))) @@ -386,7 +393,7 @@ mod slide_model { slide.video_background = QString::from(""); slide.slide_index = 0; self.as_mut().insert_slide(&slide, slide_index); - println!("Item added in rust model!"); + println!("Image added to slide model!"); } Some(ty) if ty == QString::from("song") => { let count = text_vec.len(); @@ -439,7 +446,7 @@ mod slide_model { _ => println!("It's somethign else!"), }; - println!("Item added in rust model!"); + println!("Item added in slide model!"); } #[qinvokable]