diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index d668277..4a228cf 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -217,10 +217,6 @@ Page { contentHeight: itemColumn.height + 2 * Theme.paddingMedium menu: ContextMenu { - MenuItem { - text: orderItem.delivered ? page.tr("new_order") : page.tr("ready_delivery") - onClicked: page.toggleDelivered(index) - } MenuItem { text: page.tr("edit_order") onClicked: page.openOrder(index) @@ -235,7 +231,8 @@ Page { id: itemColumn x: Theme.horizontalPageMargin y: Theme.paddingMedium - width: parent.width - 2 * Theme.horizontalPageMargin - statusLabel.width + width: parent.width - 2 * Theme.horizontalPageMargin - deliveredSwitch.width + - Theme.paddingMedium Label { width: parent.width @@ -258,22 +255,21 @@ Page { width: parent.width truncationMode: TruncationMode.Fade font.pixelSize: Theme.fontSizeExtraSmall - color: Theme.secondaryColor - text: page.tr("delivery") + ": " + model.delivery + color: model.late ? Theme.errorColor : Theme.secondaryColor + text: page.tr("delivery") + ": " + model.delivery + " " + model.status } } - Label { - id: statusLabel + // interruttore "consegnato": in Silica un Switch senza testo + Switch { + id: deliveredSwitch anchors { right: parent.right rightMargin: Theme.horizontalPageMargin verticalCenter: parent.verticalCenter } - text: model.status - font.pixelSize: Theme.fontSizeExtraSmall - color: model.late ? Theme.errorColor - : (model.delivered ? Theme.secondaryColor : Theme.highlightColor) + checked: model.delivered + onClicked: page.toggleDelivered(index) } }