From 7c51d4a868148365ce04e0d19f19867759e0ccd5 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Wed, 24 Aug 2022 13:16:45 -0500 Subject: [PATCH] bounds for presentation arrows and service items --- src/qml/presenter/LeftDock.qml | 13 ++++++++++++- src/qml/presenter/MainWindow.qml | 1 + src/qml/presenter/Presentation.qml | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/qml/presenter/LeftDock.qml b/src/qml/presenter/LeftDock.qml index e1b8728..7a953c4 100644 --- a/src/qml/presenter/LeftDock.qml +++ b/src/qml/presenter/LeftDock.qml @@ -238,7 +238,7 @@ ColumnLayout { y: mouseHandler.mouseY + 10 Kirigami.Action { text: "delete" - onTriggered: serviceItemModel.removeItem(index) + onTriggered: removeItem(index); } } @@ -268,6 +268,15 @@ ColumnLayout { } } + Component.onCompleted: { + totalServiceItems = serviceItemList.count; + print("THE TOTAL SERVICE ITEMS: " + totalServiceItems); + } + + function removeItem(index) { + serviceItemModel.removeItem(index); + totalServiceItems--; + } function addItem(index, name, type, background, backgroundType, text, itemID) { @@ -276,6 +285,7 @@ ColumnLayout { serviceItemModel.insertItem(index, name, type, background, backgroundType, newtext); + totalServiceItems++; } function appendItem(name, type, background, backgroundType, text, itemID) { @@ -292,6 +302,7 @@ ColumnLayout { serviceItemModel.addItem(name, type, background, backgroundType, lyrics); + totalServiceItems++; } function changeItem() { diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml index 865116b..0d2f95b 100644 --- a/src/qml/presenter/MainWindow.qml +++ b/src/qml/presenter/MainWindow.qml @@ -17,6 +17,7 @@ Controls.Page { property url videoBackground: presentation.vidBackground property string currentText: presentation.text property int blurRadius: 0 + property int totalServiceItems /* property var video */ diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml index f27e01f..2bda831 100644 --- a/src/qml/presenter/Presentation.qml +++ b/src/qml/presenter/Presentation.qml @@ -158,6 +158,8 @@ Item { } function nextSlideAction() { + if (currentServiceItem === totalServiceItems) + return; const nextServiceItemIndex = currentServiceItem + 1; const nextItem = serviceItemModel.getItem(nextServiceItemIndex); print("currentServiceItem " + currentServiceItem); @@ -178,6 +180,9 @@ Item { } function previousSlideAction() { + if (currentServiceItem === 0) { + return; + }; const prevServiceItemIndex = currentServiceItem - 1; const prevItem = serviceItemModel.getItem(prevServiceItemIndex); print("currentServiceItem " + currentServiceItem);