ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve rules editor

Browse Source 
Fixes: #1037
This commit is contained in:
Michael Zanetti 2023-05-30 23:42:30 +02:00
parent b9c60f5411
commit 840f60ed3b
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnymea-app/types/calendaritems.cpp
View File

@ -66,6 +66,7 @@ void CalendarItems::removeCalendarItem(int index)
beginRemoveRows(QModelIndex(), index, index);
m_list.takeAt(index)->deleteLater();
endRemoveRows();
emit countChanged();
}
CalendarItem *CalendarItems::createNewCalendarItem() const

14
nymea-app/ui/magic/EditRulePage.qml
View File

@ -100,11 +100,18 @@ Page {
addEventDescriptor(true);
}
function selectEventDescriptorData(eventDescriptor) {
function selectEventDescriptorData(eventDescriptor, destroyOnCancel) {
if (destroyOnCancel == undefined) {
destroyOnCancel = true
}
var eventPage = pageStack.push(Qt.resolvedUrl("SelectEventDescriptorPage.qml"), {text: "Select event", eventDescriptor: eventDescriptor});
eventPage.onBackPressed.connect(function() {
eventPage.StackView.onRemoved.connect(function() {
eventDescriptor.destroy();
if (destroyOnCancel) {
print("destroying event descriptor")
eventDescriptor.destroy();
}
});
pageStack.pop();
})
@ -482,6 +489,9 @@ Page {
implicitWidth: parent.width
eventDescriptor: root.rule.eventDescriptors.get(index)
onRemoveEventDescriptor: root.rule.eventDescriptors.removeEventDescriptor(index)
onClicked: {
selectEventDescriptorData(eventDescriptor, false)
}
}
}

26
nymea-app/ui/magic/StateEvaluatorDelegate.qml
View File

@ -37,7 +37,7 @@ import "../components"
ItemDelegate {
id: root
property var stateEvaluator: null
property StateEvaluator stateEvaluator: null
readonly property Thing thing: stateEvaluator ? engine.thingManager.things.getThing(stateEvaluator.stateDescriptor.thingId) : null
readonly property StateType stateType: thing ? thing.thingClass.stateTypes.getStateType(stateEvaluator.stateDescriptor.stateTypeId) : null
@ -56,12 +56,20 @@ ItemDelegate {
page.thingSelected.connect(function(thing) {
root.stateEvaluator.stateDescriptor.interfaceName = "";
root.stateEvaluator.stateDescriptor.thingId = thing.id;
selectStateDescriptorData()
var statePage = selectStateDescriptorData()
statePage.done.connect(function() {
pageStack.pop(StackView.Immediate)
pageStack.pop()
})
});
page.interfaceSelected.connect(function(interfaceName) {
root.stateEvaluator.stateDescriptor.thingId = "";
root.stateEvaluator.stateDescriptor.interfaceName = interfaceName;
selectStateDescriptorData();
var statePage = selectStateDescriptorData();
statePage.done.connect(function() {
pageStack.pop(StackView.Immediate)
pageStack.pop()
})
});
}
function editInterfaceStateDescriptor() {
@ -73,10 +81,11 @@ ItemDelegate {
pageStack.pop();
})
statePage.done.connect(function() {
pageStack.pop(statePage, StackView.Immediate);
pageStack.pop();
pageStack.pop();
pageStack.pop();
// pageStack.pop();
})
return statePage
}
contentItem: ColumnLayout {
@ -85,7 +94,12 @@ ItemDelegate {
stateEvaluator: root.stateEvaluator
swipe.enabled: root.canDelete
onClicked: {
var page = pageStack.push(stateQuestionPageComponent);
print("opening editor:", root.stateEvaluator.stateDescriptor.thingId)
if (root.stateEvaluator.stateDescriptor.thingId.toString() !== "{00000000-0000-0000-0000-000000000000}") {
selectStateDescriptorData()
} else {
var page = pageStack.push(stateQuestionPageComponent);
}
}
onDeleteClicked: {
root.deleteClicked()