Merge branch 'main' into schnacke

This commit is contained in:
2025-05-08 11:47:47 +02:00
70 changed files with 1154 additions and 1096 deletions

View File

@@ -5,9 +5,11 @@ import Qt.labs.qmlmodels
ColumnLayout
{
property var availableFilters: [""]
anchors.fill: parent
spacing: Dimensions.l
function viewCriterion(criterion)
{
business_model.viewCriterion(criterion.text);
@@ -21,7 +23,7 @@ ColumnLayout
Component.onCompleted:
{
contact_model.objectContactAdded.connect(onObjectContactAdded)
objectsStack.pop()
contentStack.pop()
}
RowLayout
{
@@ -65,7 +67,7 @@ ColumnLayout
icon.source: "qrc:/images/PlusCircle.svg"
text: qsTr("Objekt Hinzufügen")
Layout.alignment: Qt.AlignRight
onClicked: appLoader.source = "AddObject.qml"
onClicked: contentStack.push("AddObject.qml")
}
}
@@ -167,7 +169,7 @@ ColumnLayout
hoverEnabled: true
onDoubleClicked:
{
objectsStack.push("ObjectDetails.qml", {selectedObject: row});
contentStack.push("ObjectDetails.qml", {selectedObject: row});
}
onEntered:
{