git.iko.soy/unity8
on xenial help sign in
renamed menuItem->menuData
commit86d8183d2e305a0901051a374476e7b8ffc59bff authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 11 Dec 2013, 16:28 (13 years ago) parentb984f95
3 files changed+46−46
compare with xenial
unifiedsplit
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+5−5 plugins/Unity/Indicators/qml/IndicatorPage.qml+2−2 plugins/Unity/Indicators/qml/MenuItemFactory.qml+39−39
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+5−5
@@ -26,10 +26,10 @@ import QMenuModel 0.1 as QMenuModel
2626Indicators.BaseMenuItem {
2727 id: messageFactoryItem
2828 property var menuModel: null
29− property QtObject menuItem: null
29+ property QtObject menuData: null
3030 property var menuIndex: undefined
3131
32− property var extAttrib: menuItem && menuItem.ext ? menuItem.ext : undefined
32+ property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
3333 property var actionsDescription: extAttrib && extAttrib.hasOwnProperty("xCanonicalMessageActions") ? extAttrib.xCanonicalMessageActions : undefined
3434
3535 onMenuModelChanged: {
@@ -61,7 +61,7 @@ Indicators.BaseMenuItem {
6161 id: simpleTextMessage
6262 SimpleTextMessage {
6363 // text
64− title: menuItem && menuItem.label ? menuItem.label : ""
64+ title: menuData && menuData.label ? menuData.label : ""
6565 time: extAttrib && extAttrib.hasOwnProperty("xCanonicalTime") ? extAttrib.xCanonicalTime : 0
6666 message: extAttrib && extAttrib.hasOwnProperty("xCanonicalText") ? extAttrib.xCanonicalText : ""
6767 // icons
@@ -93,7 +93,7 @@ Indicators.BaseMenuItem {
9393 }
9494
9595 // text
96− title: menuItem && menuItem.label ? menuItem.label : ""
96+ title: menuData && menuData.label ? menuData.label : ""
9797 time: extAttrib && extAttrib.hasOwnProperty("xCanonicalTime") ? extAttrib.xCanonicalTime : 0
9898 message: extAttrib && extAttrib.hasOwnProperty("xCanonicalText") ? extAttrib.xCanonicalText : ""
9999 replyButtonText: replyActionDescription !== undefined && replyActionDescription.hasOwnProperty("label") ? replyActionDescription.label : "Send"
@@ -137,7 +137,7 @@ Indicators.BaseMenuItem {
137137 }
138138
139139 // text
140− title: menuItem && menuItem.label ? menuItem.label : ""
140+ title: menuData && menuData.label ? menuData.label : ""
141141 time: extAttrib && extAttrib.hasOwnProperty("xCanonicalTime") ? extAttrib.xCanonicalTime : ""
142142 message: extAttrib && extAttrib.hasOwnProperty("xCanonicalText") ? extAttrib.xCanonicalText : ""
143143 actionButtonText: activateActionDescription !== undefined && activateActionDescription.hasOwnProperty("label") ? activateActionDescription.label : "Call back"
plugins/Unity/Indicators/qml/IndicatorPage.qml+2−2
@@ -144,8 +144,8 @@ IndicatorBase {
144144 item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });
145145 item.deselectMenu.connect(function() { mainMenu.selectedIndex = -1; });
146146 }
147− if (item.hasOwnProperty("menuItem")) {
148− item.menuItem = Qt.binding(function() { return model; });
147+ if (item.hasOwnProperty("menuData")) {
148+ item.menuData = Qt.binding(function() { return model; });
149149 }
150150 if (item.hasOwnProperty("menuIndex")) {
151151 item.menuIndex = Qt.binding(function() { return modelIndex; });
plugins/Unity/Indicators/qml/MenuItemFactory.qml+39−39
@@ -55,13 +55,13 @@ Item {
5555 Component {
5656 id: sliderMenu;
5757 Indicators.SliderMenuItem {
58− property QtObject menuItem: null
58+ property QtObject menuData: null
5959 property var menuModel: menuFactory.menuModel
6060 property var menuIndex: undefined
61− property var extAttrib: menuItem && menuItem.ext ? menuItem.ext : undefined
61+ property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
6262
63− text: menuItem && menuItem.label ? menuItem.label : ""
64− icon: menuItem && menuItem.icon ? menuItem.icon : ""
63+ text: menuData && menuData.label ? menuData.label : ""
64+ icon: menuData && menuData.icon ? menuData.icon : ""
6565 minIcon: extAttrib && extAttrib.hasOwnProperty("minIcon") ? extAttrib.minIcon : ""
6666 maxIcon: extAttrib && extAttrib.hasOwnProperty("maxIcon") ? extAttrib.maxIcon : ""
6767
@@ -73,8 +73,8 @@ Item {
7373 }
7474 return maximum;
7575 }
76− value: menuItem ? menuItem.actionState : 0.0
77− enabled: menuItem ? menuItem.sensitive : false
76+ value: menuData ? menuData.actionState : 0.0
77+ enabled: menuData ? menuData.sensitive : false
7878
7979 onMenuModelChanged: {
8080 loadAttributes();
@@ -99,12 +99,12 @@ Item {
9999 Component {
100100 id: buttonMenu;
101101 Indicators.ButtonMenuItem {
102− property QtObject menuItem: null
102+ property QtObject menuData: null
103103 property var menuModel: menuFactory.menuModel
104104 property var menuIndex: undefined
105105
106− text: menuItem && menuItem.label ? menuItem.label : ""
107− enabled: menuItem ? menuItem.sensitive : false
106+ text: menuData && menuData.label ? menuData.label : ""
107+ enabled: menuData ? menuData.sensitive : false
108108
109109 onActivate: {
110110 menuModel.activate(menuIndex);
@@ -115,37 +115,37 @@ Item {
115115 Component {
116116 id: sectionMenu;
117117 Indicators.SectionMenuItem {
118− property QtObject menuItem: null
118+ property QtObject menuData: null
119119 property var menuIndex: undefined
120120
121− text: menuItem && menuItem.label ? menuItem.label : ""
121+ text: menuData && menuData.label ? menuData.label : ""
122122 }
123123 }
124124
125125 Component {
126126 id: progressMenu;
127127 Indicators.ProgressMenuItem {
128− property QtObject menuItem: null
128+ property QtObject menuData: null
129129 property var menuIndex: undefined
130130
131− text: menuItem && menuItem.label ? menuItem.label : ""
132− icon: menuItem ? menuItem.icon : ""
133− value : menuItem ? menuItem.actionState : 0.0
134− enabled: menuItem ? menuItem.sensitive : false
131+ text: menuData && menuData.label ? menuData.label : ""
132+ icon: menuData ? menuData.icon : ""
133+ value : menuData ? menuData.actionState : 0.0
134+ enabled: menuData ? menuData.sensitive : false
135135 }
136136 }
137137
138138 Component {
139139 id: standardMenu;
140140 Indicators.StandardMenuItem {
141− property QtObject menuItem: null
141+ property QtObject menuData: null
142142 property var menuIndex: undefined
143143
144− text: menuItem && menuItem.label ? menuItem.label : ""
145− icon: menuItem && menuItem.icon ? menuItem.icon : ""
146− checkable: menuItem ? (menuItem.isCheck || menuItem.isRadio) : false
147− checked: checkable ? menuItem.isToggled : false
148− enabled: menuItem ? menuItem.sensitive : false
144+ text: menuData && menuData.label ? menuData.label : ""
145+ icon: menuData && menuData.icon ? menuData.icon : ""
146+ checkable: menuData ? (menuData.isCheck || menuData.isRadio) : false
147+ checked: checkable ? menuData.isToggled : false
148+ enabled: menuData ? menuData.sensitive : false
149149
150150 onActivate: {
151151 menuModel.activate(menuIndex);
@@ -157,13 +157,13 @@ Item {
157157 Component {
158158 id: switchMenu;
159159 Indicators.SwitchMenuItem {
160− property QtObject menuItem: null
160+ property QtObject menuData: null
161161 property var menuIndex: undefined
162162
163− text: menuItem && menuItem.label ? menuItem.label : ""
164− icon: menuItem && menuItem.icon ? menuItem.icon : ""
165− checked: menuItem ? menuItem.isToggled : false
166− enabled: menuItem ? menuItem.sensitive : false
163+ text: menuData && menuData.label ? menuData.label : ""
164+ icon: menuData && menuData.icon ? menuData.icon : ""
165+ checked: menuData ? menuData.isToggled : false
166+ enabled: menuData ? menuData.sensitive : false
167167
168168 onActivate: {
169169 menuModel.activate(menuIndex);
@@ -175,12 +175,12 @@ Item {
175175 Component {
176176 id: wifiSection;
177177 Indicators.SectionMenuItem {
178− property QtObject menuItem: null
178+ property QtObject menuData: null
179179 property var menuModel: menuFactory.menuModel
180180 property var menuIndex: undefined
181− property var extAttrib: menuItem && menuItem.ext ? menuItem.ext : undefined
181+ property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
182182
183− text: menuItem && menuItem.label ? menuItem.label : ""
183+ text: menuData && menuData.label ? menuData.label : ""
184184 busy: extAttrib && extAttrib.hasOwnProperty("xCanonicalBusyAction") ? extAttrib.xCanonicalBusyAction : false
185185
186186 onMenuModelChanged: {
@@ -200,10 +200,10 @@ Item {
200200 Component {
201201 id: accessPoint;
202202 ICNetwork.AccessPoint {
203− property QtObject menuItem: null
203+ property QtObject menuData: null
204204 property var menuModel: menuFactory.menuModel
205205 property var menuIndex: undefined
206− property var extAttrib: menuItem && menuItem.ext ? menuItem.ext : undefined
206+ property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
207207
208208 property var strengthAction: QMenuModel.UnityMenuAction {
209209 model: menuModel
@@ -211,12 +211,12 @@ Item {
211211 name: extAttrib && extAttrib.hasOwnProperty("xCanonicalWifiApStrengthAction") ? extAttrib.xCanonicalWifiApStrengthAction : ""
212212 }
213213
214− text: menuItem && menuItem.label ? menuItem.label : ""
214+ text: menuData && menuData.label ? menuData.label : ""
215215 secure: extAttrib && extAttrib.hasOwnProperty("xCanonicalWifiApIsSecure") ? extAttrib.xCanonicalWifiApIsSecure : false
216216 adHoc: extAttrib && extAttrib.hasOwnProperty("xCanonicalWifiApIsAdhoc") ? extAttrib.xCanonicalWifiApIsAdhoc : false
217− checked: menuItem ? menuItem.isToggled : false
217+ checked: menuData ? menuData.isToggled : false
218218 signalStrength: strengthAction.valid ? strengthAction.state : 0
219− enabled: menuItem ? menuItem.sensitive : false
219+ enabled: menuData ? menuData.sensitive : false
220220
221221 onMenuModelChanged: {
222222 loadAttributes();
@@ -248,13 +248,13 @@ Item {
248248 Component {
249249 id: groupedMessage
250250 ICMessaging.GroupedMessage {
251− property QtObject menuItem: null
251+ property QtObject menuData: null
252252 property var menuModel: menuFactory.menuModel
253253 property var menuIndex: undefined
254− property var extAttrib: menuItem && menuItem.ext ? menuItem.ext : undefined
254+ property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
255255
256− title: menuItem && menuItem.label ? menuItem.label : ""
257− count: menuItem && menuItem.actionState.length > 0 ? menuItem.actionState[0] : "0"
256+ title: menuData && menuData.label ? menuData.label : ""
257+ count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
258258 appIcon: extAttrib && extAttrib.hasOwnProperty("icon") ? extAttrib.icon : "qrc:/indicators/artwork/messaging/default_app.svg"
259259
260260 onMenuModelChanged: {