git.iko.soy/unity8
on xenial help sign in
Removed Message menu enable comment
d275055Nick Dedekind
plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml+3−3
compare with xenial
unifiedsplit
@@ -89,7 +89,7 @@ Item {
89 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
89 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
90 // actions
90 // actions
91 // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
91 // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
92−// enabled: menuData && menuData.sensitive || false
92+ enabled: menuData && menuData.sensitive || false
93 removable: !selected
93 removable: !selected
94 selected: messageFactoryItem.selected
94 selected: messageFactoryItem.selected
95
95
@@ -138,7 +138,7 @@ Item {
138 // actions
138 // actions
139 replyEnabled: replyAction.valid && replyAction.enabled
139 replyEnabled: replyAction.valid && replyAction.enabled
140 // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
140 // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets
141−// enabled: menuData && menuData.sensitive || false
141+ enabled: menuData && menuData.sensitive || false
142 removable: !selected
142 removable: !selected
143 selected: messageFactoryItem.selected
143 selected: messageFactoryItem.selected
144
144
@@ -197,7 +197,7 @@ Item {
197 // actions
197 // actions
198 activateEnabled: activateAction.valid && activateAction.enabled
198 activateEnabled: activateAction.valid && activateAction.enabled
199 replyEnabled: replyAction.valid && replyAction.enabled
199 replyEnabled: replyAction.valid && replyAction.enabled
200−// enabled: menuData && menuData.sensitive || false
200+ enabled: menuData && menuData.sensitive || false
201 removable: !selected
201 removable: !selected
202 selected: messageFactoryItem.selected
202 selected: messageFactoryItem.selected
203
203
tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+3−5
@@ -99,7 +99,7 @@ Item {
99 compare(loader.item.message, data.message, "Message does not match data");
99 compare(loader.item.message, data.message, "Message does not match data");
100 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
100 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
101 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
101 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");
103 }
103 }
104
104
105 function test_create_textmessage_data() {
105 function test_create_textmessage_data() {
@@ -137,8 +137,7 @@ Item {
137 compare(loader.item.message, data.message, "Message does not match data");
137 compare(loader.item.message, data.message, "Message does not match data");
138 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
138 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
139 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
139 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");
142 }
141 }
143
142
144
143
@@ -180,8 +179,7 @@ Item {
180 compare(loader.item.message, data.message, "Message does not match data");
179 compare(loader.item.message, data.message, "Message does not match data");
181 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
180 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
182 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
181 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");
185 }
183 }
186
184
187 }
185 }