on xenial help sign in
use x-canonical-extra-label
commit841eb4f0da3a0e665b6c6af2d6c7b76d88f72147 authorNick Dedekind <nicholas.dedekind@gmail.com> dateFri 27 Jun 2014, 15:40 (12 years ago) parent1bc84fc
1 file changed+17−3
qml/Panel/Indicators/MenuItemFactory.qml+17−3
qml/Panel/Indicators/MenuItemFactory.qml+17−3
@@ -527,7 +527,7 @@ Item {
527527 }
528528
529529 property var transferState: {
530− if (actionGroup.transferStateAction !== null)
530+ if (actionGroup.transferStateAction === null)
531531 return undefined;
532532 return actionGroup.transferStateAction.valid ? actionGroup.transferStateAction.state : undefined
533533 }
@@ -608,14 +608,28 @@ Item {
608608 ListItems.Standard {
609609 objectName: "bulkTransferMenu"
610610 property QtObject menuData: null
611+ property var menuModel: menuFactory.menuModel
611612 property int menuIndex: -1
612− showDivider: false
613+ property var extendedData: menuData && menuData.ext || undefined
613614
614615 iconSource: menuData && menuData.icon || ""
615616 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+ }
616630
617631 control: Button {
618− text: menuData && menuData.label || ""
632+ text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
619633
620634 onClicked: {
621635 menuModel.activate(menuIndex);