git.iko.soy/unity8
on xenial help sign in
Removed Message menu enable comment
commitd2750558a59ce72641dfeb8926fe2a4619dcb6a6 authorNick Dedekind <nicholas.dedekind@gmail.com> dateMon 27 Jan 2014, 15:21 (13 years ago) parent79c6580
2 files changed+6−8
compare with xenial
unifiedsplit
plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml+3−3 tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+3−5
plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml+3−3
@@ -89,7 +89,7 @@ Item {
8989 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
9090 // actions
9191 // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
92−// enabled: menuData && menuData.sensitive || false
92+ enabled: menuData && menuData.sensitive || false
9393 removable: !selected
9494 selected: messageFactoryItem.selected
9595
@@ -138,7 +138,7 @@ Item {
138138 // actions
139139 replyEnabled: replyAction.valid && replyAction.enabled
140140 // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
141−// enabled: menuData && menuData.sensitive || false
141+ enabled: menuData && menuData.sensitive || false
142142 removable: !selected
143143 selected: messageFactoryItem.selected
144144
@@ -197,7 +197,7 @@ Item {
197197 // actions
198198 activateEnabled: activateAction.valid && activateAction.enabled
199199 replyEnabled: replyAction.valid && replyAction.enabled
200−// enabled: menuData && menuData.sensitive || false
200+ enabled: menuData && menuData.sensitive || false
201201 removable: !selected
202202 selected: messageFactoryItem.selected
203203
tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+3−5
@@ -99,7 +99,7 @@ Item {
9999 compare(loader.item.message, data.message, "Message does not match data");
100100 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
101101 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
102−// compare(loader.item.enabled, data.enabled, "Enabled does not match data");
102+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");
103103 }
104104
105105 function test_create_textmessage_data() {
@@ -137,8 +137,7 @@ Item {
137137 compare(loader.item.message, data.message, "Message does not match data");
138138 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
139139 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
140− // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
141−// compare(loader.item.enabled, data.enabled, "Enabled does not match data");
140+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");
142141 }
143142
144143
@@ -180,8 +179,7 @@ Item {
180179 compare(loader.item.message, data.message, "Message does not match data");
181180 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
182181 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
183− // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
184−// compare(loader.item.enabled, data.enabled, "Enabled does not match data");
182+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");
185183 }
186184
187185 }