diff --git a/src/controls/ActionToolBar.qml b/src/controls/ActionToolBar.qml --- a/src/controls/ActionToolBar.qml +++ b/src/controls/ActionToolBar.qml @@ -182,7 +182,7 @@ } menu.itemDelegate: ActionMenuItem { - visible: !actionsLayout.isActionVisible(ourAction) && (ourAction.visible === undefined || ourAction.visible) + visible: !actionsLayout.isActionVisible(action) && (action.visible === undefined || action.visible) } } } diff --git a/src/controls/private/ActionMenuItem.qml b/src/controls/private/ActionMenuItem.qml --- a/src/controls/private/ActionMenuItem.qml +++ b/src/controls/private/ActionMenuItem.qml @@ -23,17 +23,7 @@ Controls.MenuItem { id: menuItem - property QtObject ourAction - - text: ourAction.text - visible: ourAction.visible !== undefined ? ourAction.visible : true - enabled: ourAction.enabled - checkable: ourAction.checkable - checked: ourAction.checked + visible: action.visible === undefined || action.visible height: visible ? implicitHeight : 0 - icon.name: ourAction.icon.name - autoExclusive: ourAction.Controls.ActionGroup && ourAction.Controls.ActionGroup.group && ourAction.Controls.ActionGroup.group.exclusive - onTriggered: { - ourAction.trigger() - } + autoExclusive: action.Controls.ActionGroup && action.Controls.ActionGroup.group && action.Controls.ActionGroup.group.exclusive } diff --git a/src/controls/private/ActionsMenu.qml b/src/controls/private/ActionsMenu.qml --- a/src/controls/private/ActionsMenu.qml +++ b/src/controls/private/ActionsMenu.qml @@ -51,7 +51,7 @@ item = theMenu.separatorDelegate.createObject(null, {}); } else { - item = theMenu.itemDelegate.createObject(null, { ourAction: action }); + item = theMenu.itemDelegate.createObject(null, { action: action }); } theMenu.addItem(item) } else if (theMenu.submenuComponent) {