From 60b89a84d7d62cc9c7eec85bf2253fb9614c73ee Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 16 Jan 2024 13:54:09 -0600 Subject: [PATCH] using getItem directly since QVariantMaps work now in 0.6 of cxxqt --- src/qml/presenter/Library.qml | 5 ++++- src/qml/presenter/PresentationEditor.qml | 2 +- src/qml/presenter/ServiceList.qml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qml/presenter/Library.qml b/src/qml/presenter/Library.qml index a380e79..642766e 100644 --- a/src/qml/presenter/Library.qml +++ b/src/qml/presenter/Library.qml @@ -351,9 +351,12 @@ Item { presProxyModel.presentationModel.newItem(url, pageCount); selectedLibrary = "presentation"; presentationLibrary.libraryList.currentIndex = presProxyModel.presentationModel.count - 1; + let presId = presentationLibrary.libraryList.currentIndex + 1; + let pres = presProxyModel.presentationModel.getItem(presId); + console.log(pres.id); if (!editMode) editMode = true; - editSwitch(presentationLibrary.libraryList.currentIndex, "presentation"); + editSwitch(presId, "presentation"); pdf.source = ""; } diff --git a/src/qml/presenter/PresentationEditor.qml b/src/qml/presenter/PresentationEditor.qml index 3f98828..a1391ea 100644 --- a/src/qml/presenter/PresentationEditor.qml +++ b/src/qml/presenter/PresentationEditor.qml @@ -205,7 +205,7 @@ Item { } function changePresentation(index) { - let pres = presProxyModel.getPresentation(index); + let pres = presProxyModel.presentationModel.getItem(index); root.presentation = pres; console.log(pres.filePath.toString()); updatePageCount(presentationPreview.frameCount); diff --git a/src/qml/presenter/ServiceList.qml b/src/qml/presenter/ServiceList.qml index e1d0f22..6337894 100644 --- a/src/qml/presenter/ServiceList.qml +++ b/src/qml/presenter/ServiceList.qml @@ -609,7 +609,7 @@ Item { return; } case 'presentation': { - const pres = presProxyModel.getPresentation(itemIndex); + const pres = presProxyModel.presentationModel.getItem(itemIndex); console.log("adding: " + pres.title + " of type " + type + " with " + pres.pageCount + " slides"); @@ -663,7 +663,7 @@ Item { return; } case 'presentation': { - const pres = presProxyModel.getPresentation(itemIndex); + const pres = presProxyModel.presentationModel.getItem(itemIndex); console.log("adding: " + pres.title + " of type " + type + " with " + pres.pageCount + " slides");