a394547 · unity8 · git.iko.soy

plugins/Unity/Indicators/qml/MessageMenuItemFactory.qml+2

compare with xenial

unifiedsplit

@@ -88,6 +88,7 @@ Item {

88 avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")

89 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")

90 // actions

91+ // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets

91// enabled: menuData && menuData.sensitive || false

92// enabled: menuData && menuData.sensitive || false

92 removable: !selected

93 removable: !selected

93 selected: messageFactoryItem.selected

94 selected: messageFactoryItem.selected

@@ -136,6 +137,7 @@ Item {

136 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")

137 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")

137 // actions

138 // actions

138 replyEnabled: replyAction.valid && replyAction.enabled

139 replyEnabled: replyAction.valid && replyAction.enabled

140+ // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets

139// enabled: menuData && menuData.sensitive || false

141// enabled: menuData && menuData.sensitive || false

140 removable: !selected

142 removable: !selected

141 selected: messageFactoryItem.selected

143 selected: messageFactoryItem.selected

tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml−4

@@ -129,14 +129,10 @@ Item {

129 function test_reloadData() {

130 var mainMenu = findChild(page, "mainMenu");

131

132− console.log("setting empty data");

133 page.menuModel.modelData = [];

132 page.menuModel.modelData = [];

134 tryCompare(mainMenu, "count", 0);

133 tryCompare(mainMenu, "count", 0);

135− console.log("set empty data");

136

134

137− console.log("setting full data");

138 page.menuModel.modelData = fullMenuData;

135 page.menuModel.modelData = fullMenuData;

139− console.log("set full data");

140 tryCompare(mainMenu, "count", 3);

136 tryCompare(mainMenu, "count", 3);

141

137

142 page.menuModel.modelData = [];

138 page.menuModel.modelData = [];

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1−1

@@ -157,13 +157,13 @@ Item {

157 menuData.type = "com.canonical.indicator.slider"

158 menuData.label = data.label;

159 menuData.sensitive = data.enabled;

160− menuData.actionState = data.value;

161 menuData.ext = {

160 menuData.ext = {

162 'minIcon': "file:///testMinIcon",

161 'minIcon': "file:///testMinIcon",

163 'maxIcon': "file:///testMaxIcon",

162 'maxIcon': "file:///testMaxIcon",

164 'minValue': data.minValue,

163 'minValue': data.minValue,

165 'maxValue': data.maxValue

164 'maxValue': data.maxValue

166 };

165 };

166+ menuData.actionState = data.value;

167

168 loader.data = menuData;

169 loader.sourceComponent = factory.load(menuData);

tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+2

@@ -137,6 +137,7 @@ Item {

137 compare(loader.item.message, data.message, "Message 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");

140+ // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets

140// compare(loader.item.enabled, data.enabled, "Enabled does not match data");

141// compare(loader.item.enabled, data.enabled, "Enabled does not match data");

141 }

142 }

142

143

@@ -179,6 +180,7 @@ Item {

179 compare(loader.item.message, data.message, "Message does not match data");

180 compare(loader.item.message, data.message, "Message does not match data");

180 compare(loader.item.avatar, data.avatar, "Avatar does not match data");

181 compare(loader.item.avatar, data.avatar, "Avatar does not match data");

181 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");

182 compare(loader.item.appIcon, data.appIcon, "App icon does not match data");

183+ // FIXME: Waiting for lp:~larsu/indicator-messages/set-targets

182// compare(loader.item.enabled, data.enabled, "Enabled does not match data");

184// compare(loader.item.enabled, data.enabled, "Enabled does not match data");

183 }

185 }

184

186