From 7e8694eca2bd5356feb91fab2996f064f328928c Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 29 Mar 2023 15:10:04 -0500
Subject: [PATCH] mapping slide_model.rs to serviceItems better

---
 src/rust/slide_model.rs | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/rust/slide_model.rs b/src/rust/slide_model.rs
index 9bea029..9da06e3 100644
--- a/src/rust/slide_model.rs
+++ b/src/rust/slide_model.rs
@@ -250,7 +250,7 @@ mod slide_model {
         #[qinvokable]
         pub fn add_item_from_service(
             mut self: Pin<&mut Self>,
-            _index: i32,
+            index: i32,
             service_item: &QMap_QString_QVariant,
         ) {
             println!("add rust slide");
@@ -297,42 +297,38 @@ mod slide_model {
                     .value()
                     .unwrap_or(QString::from("")),
                 video_background: service_item
-                    .get(&QString::from("imageBackground"))
+                    .get(&QString::from("videoBackground"))
                     .unwrap_or(QVariant::from(&QString::from("")))
                     .value()
                     .unwrap_or(QString::from("")),
                 audio: service_item
-                    .get(&QString::from("imageBackground"))
+                    .get(&QString::from("audio"))
                     .unwrap_or(QVariant::from(&QString::from("")))
                     .value()
                     .unwrap_or(QString::from("")),
                 font: service_item
-                    .get(&QString::from("imageBackground"))
+                    .get(&QString::from("font"))
                     .unwrap_or(QVariant::from(&QString::from("")))
                     .value()
                     .unwrap_or(QString::from("")),
                 font_size: service_item
-                    .get(&QString::from("imageBackground"))
+                    .get(&QString::from("fontSize"))
                     .unwrap_or(QVariant::from(&50))
                     .value()
                     .unwrap_or(50),
                 htext_alignment: service_item
-                    .get(&QString::from("imageBackground"))
+                    .get(&QString::from("vtextAlignment"))
                     .unwrap_or(QVariant::from(&QString::from("center")))
                     .value()
                     .unwrap_or(QString::from("center")),
                 vtext_alignment: service_item
-                    .get(&QString::from("imageBackground"))
+                    .get(&QString::from("vtextAlignment"))
                     .unwrap_or(QVariant::from(&QString::from("center")))
                     .value()
                     .unwrap_or(QString::from("center")),
-                service_item_id: service_item
-                    .get(&QString::from("imageBackground"))
-                    .unwrap_or(QVariant::from(&0))
-                    .value()
-                    .unwrap_or(0),
+                service_item_id: index,
                 slide_id: service_item
-                    .get(&QString::from("slide"))
+                    .get(&QString::from("slideNumber"))
                     .unwrap_or(QVariant::from(&0))
                     .value()
                     .unwrap_or(0),