Rename action() signal in clipboard menu

The base class for this has an action property in Qt 6.
wilder-5.26
Volker Krause 4 years ago
parent 57de3bf16e
commit 5d59321253
  1. 2
      applets/clipboard/contents/ui/ClipboardItemDelegate.qml
  2. 2
      applets/clipboard/contents/ui/ClipboardPage.qml
  3. 2
      applets/clipboard/contents/ui/DelegateToolButtons.qml
  4. 4
      applets/clipboard/contents/ui/Menu.qml

@ -30,7 +30,7 @@ PlasmaComponents.ItemDelegate {
signal remove(string uuid) signal remove(string uuid)
signal edit(string uuid) signal edit(string uuid)
signal barcode(string text) signal barcode(string text)
signal action(string uuid) signal triggerAction(string uuid)
// the 1.6 comes from ToolButton's default height // the 1.6 comes from ToolButton's default height
height: Math.max(label.height, Math.round(PlasmaCore.Units.gridUnit * 1.6)) + 2 * PlasmaCore.Units.smallSpacing height: Math.max(label.height, Math.round(PlasmaCore.Units.gridUnit * 1.6)) + 2 * PlasmaCore.Units.smallSpacing

@ -160,7 +160,7 @@ Menu {
text: text text: text
}); });
} }
onAction: clipboardSource.service(uuid, "action") onTriggerAction: clipboardSource.service(uuid, "action")
Component.onCompleted: { Component.onCompleted: {
// Intercept up/down key to prevent ListView from accepting the key event. // Intercept up/down key to prevent ListView from accepting the key event.

@ -22,7 +22,7 @@ RowLayout {
display: PlasmaComponents3.AbstractButton.IconOnly display: PlasmaComponents3.AbstractButton.IconOnly
text: i18n("Invoke action") text: i18n("Invoke action")
onClicked: menuItem.action(UuidRole) onClicked: menuItem.triggerAction(UuidRole)
PlasmaComponents3.ToolTip { PlasmaComponents3.ToolTip {
text: parent.text text: parent.text

@ -25,7 +25,7 @@ PlasmaComponents3.ScrollView {
signal remove(string uuid) signal remove(string uuid)
signal edit(string uuid) signal edit(string uuid)
signal barcode(string text) signal barcode(string text)
signal action(string uuid) signal triggerAction(string uuid)
// HACK: workaround for https://bugreports.qt.io/browse/QTBUG-83890 // HACK: workaround for https://bugreports.qt.io/browse/QTBUG-83890
PlasmaComponents3.ScrollBar.horizontal.policy: PlasmaComponents3.ScrollBar.AlwaysOff PlasmaComponents3.ScrollBar.horizontal.policy: PlasmaComponents3.ScrollBar.AlwaysOff
@ -58,7 +58,7 @@ PlasmaComponents3.ScrollView {
onRemove: menu.remove(uuid) onRemove: menu.remove(uuid)
onEdit: menu.edit(uuid) onEdit: menu.edit(uuid)
onBarcode: menu.barcode(text) onBarcode: menu.barcode(text)
onAction: menu.action(uuid) onTriggerAction: menu.triggerAction(uuid)
Binding { Binding {
target: menuListView; when: hovered target: menuListView; when: hovered

Loading…
Cancel
Save