on xenial help sign in
Added modelIndex to UnityMenuAction
commitefa5c31e2ced6932c0cd802d29f17ecc52a076ca authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 4 Sep 2013, 09:44 (13 years ago) parent2a6f275
2 files changed+5−1
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+4−1 plugins/Unity/Indicators/qml/MenuItemFactory.qml+1
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+4−1
@@ -84,6 +84,7 @@ Indicators.BaseMenuItem {
8484 TextMessage {
8585 property var replyAction: QMenuModel.UnityMenuAction {
8686 model: menuItem.model
87+ index: modelIndex
8788 name: menu && actionsDescription[0].name ? actionsDescription[0].name : ""
8889 }
8990
@@ -114,10 +115,12 @@ Indicators.BaseMenuItem {
114115 SnapDecision {
115116 property var activateAction: QMenuModel.UnityMenuAction {
116117 model: menuItem.model
118+ index: modelIndex
117119 name: menu && actionsDescription[0].name ? actionsDescription[0].name : ""
118120 }
119121 property var replyAction: QMenuModel.UnityMenuAction {
120122 model: menuItem.model
123+ index: modelIndex
121124 name: menu && actionsDescription[1].name ? actionsDescription[1].name : ""
122125 }
123126
@@ -142,7 +145,7 @@ Indicators.BaseMenuItem {
142145 menuItem.model.activate(modelIndex, false);
143146 }
144147 onActivate: {
145− callbackAction.activate();
148+ activateAction.activate();
146149 }
147150 onReply: {
148151 replyAction.activate(value);
plugins/Unity/Indicators/qml/MenuItemFactory.qml+1
@@ -186,6 +186,7 @@ Item {
186186 property QtObject menu: null
187187 property var strenthAction: QMenuModel.UnityMenuAction {
188188 model: menuFactory.model ? menuFactory.model : null
189+ index: modelIndex
189190 name: menu ? menu.ext.xCanonicalWifiApStrengthAction : ""
190191 }
191192