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

initial port to cxx_qt 6.0

Browse source
This commit is contained in:
Chris Cochrun 2023-11-27 11:07:55 -06:00
parent 62daf316a3
commit 744481587f
31 changed files with 1992 additions and 1860 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,8 +15,8 @@ Controls.Page {
// properties passed around for the slides
property int currentServiceItem
property int currentSlide
property int totalServiceItems: ServiceItemModel.rowCount()
property int totalSlides: SlideMod.count()
property int totalServiceItems: ServiceItemModel.rowCount
property int totalSlides: SlideModel.count
property url imageBackground: presentation.imageBackground
property url videoBackground: presentation.vidBackground
property url webSource
@ -184,9 +184,9 @@ Controls.Page {
console.log("change-service-item: " + index);
const item = ServiceItemC.getRust(index, ServiceItemModel);
currentServiceItem = index;
const slideId = SlideMod.getSlideFromService(index);
const slideId = SlideModel.getSlideFromService(index);
currentSlide = slideId;
const slide = SlideModel.getItemRust(slideId, SlideMod);
const slide = SlideMod.getItemRust(slideId, SlideModel);
console.log("index grabbed: " + index);
console.log(slideId);
console.log("Time to start changing");
@ -217,8 +217,8 @@ Controls.Page {
function changeSlide(index) {
console.log("index grabbed: " + index);
const currentItem = SlideModel.getItemRust(currentServiceItem, SlideMod);
const item = SlideModel.getItemRust(index, SlideMod);
const currentItem = SlideMod.getItemRust(currentServiceItem, SlideModel);
const item = SlideMod.getItemRust(index, SlideModel);
const isMoveDown = currentSlide < index;
console.log(item + " " + currentItem);
currentSlide = index;
@ -250,7 +250,7 @@ Controls.Page {
ServiceItemModel.activate(currentServiceItem);
/* SlideObject.changeSlide(slide, slideId); */
slideHelper.chngSlide(item, index, SlideObject);
/* SlideMod.activate(index); */
/* SlideModel.activate(index); */
presentation.textIndex = 0;
console.log("Slide changed to: ", item.imageBackground);
activeServiceItem = ServiceItemC.getRust(currentServiceItem, ServiceItemModel).name;