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

changed all serviceItemModel to singleton ServiceItemModel

Browse source
This commit is contained in:
Chris Cochrun 2023-01-20 07:06:25 -06:00
parent f503622287
commit 453c67f237
5 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ Controls.Page {
property var song
property var draggedLibraryItem
property var serviceItems: serviceItemModel
property var serviceItems: ServiceItemModel
property bool songDragged: false
@ -50,7 +50,7 @@ Controls.Page {
Component.onCompleted: {
changeServiceItem(0);
presentation.forceActiveFocus();
/* const loaded = serviceItemModel.loadLastSaved(); */
/* const loaded = ServiceItemModel.loadLastSaved(); */
/* if (!loaded) */
/* showPassiveNotification("Failed loading last file"); */
}
@ -146,16 +146,12 @@ Controls.Page {
id: pressqlmodel
}
ServiceItemModel {
id: serviceItemModel
}
ServiceThing {
id: serviceThing
}
function changeServiceItem(index) {
const item = serviceItemModel.getItem(index);
const item = ServiceItemModel.getItem(index);
currentServiceItem = index;
console.log("index grabbed: " + index);
console.log(item);
@ -165,7 +161,7 @@ Controls.Page {
/* presentation.itemType = item.type; */
console.log("Time to start changing");
serviceItemModel.activate(index);
ServiceItemModel.activate(index);
SlideObject.changeSlide(item);
/* if (item.backgroundType === "video") */
@ -174,7 +170,7 @@ Controls.Page {
/* } */
presentation.textIndex = 0;
/* serviceItemModel.select(index); */
/* ServiceItemModel.select(index); */
/* presentation.changeSlide(); */
console.log("Slide changed to: " + item.name);