From 146f2df0c31f52809a1b5ab704bcc51fee85c496 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Sat, 14 Sep 2024 06:29:00 -0500 Subject: [PATCH] fixing a lot of plumbing code to use pure rust models --- src/qml/presenter/MainWindow.qml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml index 087ca31..831fdff 100644 --- a/src/qml/presenter/MainWindow.qml +++ b/src/qml/presenter/MainWindow.qml @@ -217,11 +217,11 @@ Controls.Page { function changeServiceItem(index) { console.log("change-service-item: " + index); - const item = ServiceItemC.getRust(index, ServiceItemModel); + const item = ServiceItemModel.getItem(index); currentServiceItem = index; const slideId = SlideModel.getSlideFromService(index); currentSlide = slideId; - const slide = SlideMod.getItemRust(slideId, SlideModel); + const slide = SlideModel.getItem(slideId); console.log("index grabbed: " + index); console.log(slideId); console.log("Time to start changing"); @@ -233,8 +233,8 @@ Controls.Page { ServiceItemModel.activate(index); console.log("%%%%%%%%%"); console.log(slideId); - /* SlideObject.changeSlide(slide, slideId); */ - slideHelper.chngSlide(slide, slideId, SlideObject); + SlideObject.changeSlide(slide, slideId); + /* slideHelper.chngSlide(slide, slideId, SlideObject); */ console.log("%%%%%%%%%"); /* SlideObject.changeSlide(slide, slideId); */ @@ -252,8 +252,8 @@ Controls.Page { function changeSlide(index) { console.log("index grabbed: " + index); - const currentItem = SlideMod.getItemRust(currentServiceItem, SlideModel); - const item = SlideMod.getItemRust(index, SlideModel); + const currentItem = SlideModel.getItem(currentServiceItem); + const item = SlideModel.getItem(index); const isMoveDown = currentSlide < index; console.log(item + " " + currentItem); currentSlide = index; @@ -283,8 +283,8 @@ Controls.Page { console.log("Time to start changing"); ServiceItemModel.activate(currentServiceItem); - /* SlideObject.changeSlide(slide, slideId); */ - slideHelper.chngSlide(item, index, SlideObject); + SlideObject.changeSlide(item, index); + /* slideHelper.chngSlide(item, index, SlideObject); */ /* SlideModel.activate(index); */ presentation.textIndex = 0; console.log("Slide changed to: ", item.imageBackground);