git.iko.soy/unity8
on xenial help sign in
use x-canonical-extra-label
841eb4fNick Dedekind
qml/Panel/Indicators/MenuItemFactory.qml+17−3
compare with xenial
unifiedsplit
@@ -527,7 +527,7 @@ Item {
527 }
527 }
528
528
529 property var transferState: {
529 property var transferState: {
530− if (actionGroup.transferStateAction !== null)
530+ if (actionGroup.transferStateAction === null)
531 return undefined;
531 return undefined;
532 return actionGroup.transferStateAction.valid ? actionGroup.transferStateAction.state : undefined
532 return actionGroup.transferStateAction.valid ? actionGroup.transferStateAction.state : undefined
533 }
533 }
@@ -608,14 +608,28 @@ Item {
608 ListItems.Standard {
608 ListItems.Standard {
609 objectName: "bulkTransferMenu"
609 objectName: "bulkTransferMenu"
610 property QtObject menuData: null
610 property QtObject menuData: null
611+ property var menuModel: menuFactory.menuModel
611 property int menuIndex: -1
612 property int menuIndex: -1
612− showDivider: false
613+ property var extendedData: menuData && menuData.ext || undefined
613
614
614 iconSource: menuData && menuData.icon || ""
615 iconSource: menuData && menuData.icon || ""
615 enabled: menuData && menuData.sensitive || false
616 enabled: menuData && menuData.sensitive || false
617+ text: menuData && menuData.label || ""
618+ showDivider: false
619+
620+ onMenuModelChanged: {
621+ loadAttributes();
622+ }
623+ onMenuIndexChanged: {
624+ loadAttributes();
625+ }
626+ function loadAttributes() {
627+ if (!menuModel || menuIndex == -1) return;
628+ menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-extra-label': 'string'});
629+ }
616
630
617 control: Button {
631 control: Button {
618− text: menuData && menuData.label || ""
632+ text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
619
633
620 onClicked: {
634 onClicked: {
621 menuModel.activate(menuIndex);
635 menuModel.activate(menuIndex);