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

fixing a lot of plumbing code to use pure rust models

Browse source
This commit is contained in:
Chris Cochrun 2024-09-14 06:29:00 -05:00
parent 433ccf345b
commit 146f2df0c3
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/qml/presenter/MainWindow.qml
View file

@ -217,11 +217,11 @@ Controls.Page {
function changeServiceItem(index) { function changeServiceItem(index) {
console.log("change-service-item: " + index); console.log("change-service-item: " + index);
const item = ServiceItemC.getRust(index, ServiceItemModel); const item = ServiceItemModel.getItem(index);
currentServiceItem = index; currentServiceItem = index;
const slideId = SlideModel.getSlideFromService(index); const slideId = SlideModel.getSlideFromService(index);
currentSlide = slideId; currentSlide = slideId;
const slide = SlideMod.getItemRust(slideId, SlideModel); const slide = SlideModel.getItem(slideId);
console.log("index grabbed: " + index); console.log("index grabbed: " + index);
console.log(slideId); console.log(slideId);
console.log("Time to start changing"); console.log("Time to start changing");
@ -233,8 +233,8 @@ Controls.Page {
ServiceItemModel.activate(index); ServiceItemModel.activate(index);
console.log("%%%%%%%%%"); console.log("%%%%%%%%%");
console.log(slideId); console.log(slideId);
/* SlideObject.changeSlide(slide, slideId); */ SlideObject.changeSlide(slide, slideId);
slideHelper.chngSlide(slide, slideId, SlideObject); /* slideHelper.chngSlide(slide, slideId, SlideObject); */
console.log("%%%%%%%%%"); console.log("%%%%%%%%%");
/* SlideObject.changeSlide(slide, slideId); */ /* SlideObject.changeSlide(slide, slideId); */
@ -252,8 +252,8 @@ Controls.Page {
function changeSlide(index) { function changeSlide(index) {
console.log("index grabbed: " + index); console.log("index grabbed: " + index);
const currentItem = SlideMod.getItemRust(currentServiceItem, SlideModel); const currentItem = SlideModel.getItem(currentServiceItem);
const item = SlideMod.getItemRust(index, SlideModel); const item = SlideModel.getItem(index);
const isMoveDown = currentSlide < index; const isMoveDown = currentSlide < index;
console.log(item + " " + currentItem); console.log(item + " " + currentItem);
currentSlide = index; currentSlide = index;
@ -283,8 +283,8 @@ Controls.Page {
console.log("Time to start changing"); console.log("Time to start changing");
ServiceItemModel.activate(currentServiceItem); ServiceItemModel.activate(currentServiceItem);
/* SlideObject.changeSlide(slide, slideId); */ SlideObject.changeSlide(item, index);
slideHelper.chngSlide(item, index, SlideObject); /* slideHelper.chngSlide(item, index, SlideObject); */
/* SlideModel.activate(index); */ /* SlideModel.activate(index); */
presentation.textIndex = 0; presentation.textIndex = 0;
console.log("Slide changed to: ", item.imageBackground); console.log("Slide changed to: ", item.imageBackground);