From 38ae7c985057c1821f55d9cd1eadf01532da952d Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 19 May 2023 09:18:34 -0500 Subject: [PATCH] switching back until I finish upgrading to 0.5.3 cxx-qt This is where they made sure QVariantMap maps to QMap_QString_QVariant in Rust. --- src/qml/presenter/ImageEditor.qml | 2 +- src/qml/presenter/Library.qml | 18 +++++++++--------- src/qml/presenter/PresentationEditor.qml | 2 +- src/qml/presenter/SongEditor.qml | 4 ++-- src/qml/presenter/VideoEditor.qml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/qml/presenter/ImageEditor.qml b/src/qml/presenter/ImageEditor.qml index d02390e..e49552e 100644 --- a/src/qml/presenter/ImageEditor.qml +++ b/src/qml/presenter/ImageEditor.qml @@ -120,7 +120,7 @@ Item { } function changeImage(index) { - let img = imageProxyModel.imageModel.getItem(index); + let img = imageProxyModel.getImage(index); root.image = img; console.log(img.filePath.toString()); } diff --git a/src/qml/presenter/Library.qml b/src/qml/presenter/Library.qml index f05239f..cdb4504 100644 --- a/src/qml/presenter/Library.qml +++ b/src/qml/presenter/Library.qml @@ -306,15 +306,15 @@ Item { id: pdf } - WebEngineView { - id: web - height: 0 - width: 0 - onLoadingChanged: { - if (loadRequest.status == 2) - addHtml(url); - } - } + /* WebEngineView { */ + /* id: web */ + /* height: 0 */ + /* width: 0 */ + /* onLoadingChanged: { */ + /* if (loadRequest.status == 2) */ + /* addHtml(url); */ + /* } */ + /* } */ } function addVideo(url) { diff --git a/src/qml/presenter/PresentationEditor.qml b/src/qml/presenter/PresentationEditor.qml index d52631b..9c3ab96 100644 --- a/src/qml/presenter/PresentationEditor.qml +++ b/src/qml/presenter/PresentationEditor.qml @@ -183,7 +183,7 @@ Item { } function changePresentation(index) { - let pres = presProxyModel.presentationModel.getItem(index); + let pres = presProxyModel.getPresentation(index); root.presentation = pres; console.log(pres.filePath.toString()); updatePageCount(presentationPreview.frameCount); diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml index 518b445..7d75979 100644 --- a/src/qml/presenter/SongEditor.qml +++ b/src/qml/presenter/SongEditor.qml @@ -411,7 +411,7 @@ Item { function newSong(index) { clearSlides(); - song = songProxyModel.songModel.getItem(index); + song = songProxyModel.getSong(index); console.log(song.lyrics); songIndex = song.id; @@ -435,7 +435,7 @@ Item { function changeSong(index) { clearSlides(); console.log(index); - song = songProxyModel.songMode.getItem(index); + song = songProxyModel.getSong(index); console.log(song.lyrics); songIndex = song.id; console.log(song.id); diff --git a/src/qml/presenter/VideoEditor.qml b/src/qml/presenter/VideoEditor.qml index bc749e7..15a296c 100644 --- a/src/qml/presenter/VideoEditor.qml +++ b/src/qml/presenter/VideoEditor.qml @@ -237,7 +237,7 @@ Item { } function changeVideo(index) { - let vid = videoProxyModel.videoModel.getItem(index); + let vid = videoProxyModel.getVideo(index); root.video = vid; console.log(video.startTime); console.log(video.endTime);