33c4228 · unity8 · git.iko.soy

debian/control−2

compare with xenial

unifiedsplit

@@ -141,7 +141,6 @@ Depends: dmz-cursor-theme,

141Recommends: indicator-keyboard,

142 indicator-session,

143 unity-greeter-session-broadcast,

144− unity-scope-click,

145Suggests: unity-scope-mediascanner2,

144Suggests: unity-scope-mediascanner2,

146Breaks: indicator-network (<< 0.5.1+14.10.20141014),

145Breaks: indicator-network (<< 0.5.1+14.10.20141014),

147 ubuntu-touch-session (<< 0.107),

146 ubuntu-touch-session (<< 0.107),

@@ -191,7 +190,6 @@ Depends: autopilot-qt5 (>= 1.4),

191 python3-gi,

190 python3-gi,

192 qttestability-autopilot (>= 1.4),

191 qttestability-autopilot (>= 1.4),

193 ubuntu-ui-toolkit-autopilot (>= 1.3.2030),

192 ubuntu-ui-toolkit-autopilot (>= 1.3.2030),

194− unity-scope-click,

195 unity8 (= ${source:Version}),

193 unity8 (= ${source:Version}),

196 unity8-tests (= ${source:Version}),

194 unity8-tests (= ${source:Version}),

197 url-dispatcher-tools,

195 url-dispatcher-tools,

qml/Dash/CardGrid.qml+2−3

@@ -25,8 +25,7 @@ DashRenderer {

25 return cardTool.template["collapsed-rows"];

26 }

27

28− // ↓ This is the ubuntu store icon

29− readonly property string backgroundShapeStyle: cardTool.isAppLikeScope && !cardTool.isAppLikeScopeAppCategory ? "shadow" : "flat"

28+ readonly property string backgroundShapeStyle: "flat"

30

29

31 expandedHeight: grid.totalContentHeight

30 expandedHeight: grid.totalContentHeight

32 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)

31 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)

@@ -46,7 +45,7 @@ DashRenderer {

46 ResponsiveGridView {

45 ResponsiveGridView {

47 id: grid

46 id: grid

48 anchors.fill: parent

47 anchors.fill: parent

49− minimumHorizontalSpacing: (cardTool.isAppLikeScopeAppCategory && cardTool.isWideView) ? units.gu(5) : units.gu(1)

48+ minimumHorizontalSpacing: cardTool.isWideView ? units.gu(5) : units.gu(1)

50 delegateWidth: cardTool.cardWidth

49 delegateWidth: cardTool.cardWidth

51 delegateHeight: cardTool.cardHeight

50 delegateHeight: cardTool.cardHeight

52 verticalSpacing: units.gu(1)

51 verticalSpacing: units.gu(1)

qml/Dash/CardTool.qml+2−26

@@ -77,16 +77,8 @@ Item {

77 return layout;

78 }

79

80− readonly property bool isAppLikeScope: scopeId === "clickscope" || scopeId === "libertine-scope.ubuntu_libertine-scope"

81− readonly property bool isAppLikeScopeAppCategory: ((scopeId === "clickscope" && (categoryId === "predefined" || categoryId === "local"))

82− || (scopeId === "libertine-scope.ubuntu_libertine-scope" && categoryId !== "hint"))

83−

84 readonly property string artShapeStyle: {

80 readonly property string artShapeStyle: {

85− if (isAppLikeScope) {

86− return isAppLikeScopeAppCategory ? "icon" : "flat";

87− } else {

88− return categoryLayout === "carousel" ? "shadow" : "flat"

81+ return categoryLayout === "carousel" ? "shadow" : "flat"

89− }

90 }

82 }

91

83

92 // FIXME ? This seems like it should not be needed, but on Qt 5.4 + phone

84 // FIXME ? This seems like it should not be needed, but on Qt 5.4 + phone

@@ -121,18 +113,6 @@ Item {

121 If -1, should use implicit width of the actual card.

113 If -1, should use implicit width of the actual card.

122 */

114 */

123 readonly property real cardWidth: {

115 readonly property real cardWidth: {

124− if (isAppLikeScopeAppCategory) {

125− if (!isNarrowView) {

126− if (isWideView) {

127− return units.gu(11);

128− } else {

129− return units.gu(10);

130− }

131− } else {

132− return units.gu(12);

133− }

134− }

135−

136 switch (categoryLayout) {

116 switch (categoryLayout) {

137 case "grid":

117 case "grid":

138 case "vertical-journal":

118 case "vertical-journal":

@@ -191,11 +171,7 @@ Item {

191 readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0

171 readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0

192

172

193 readonly property size artShapeSize: {

173 readonly property size artShapeSize: {

194− if (isAppLikeScopeAppCategory) {

195− return Qt.size(units.gu(8), units.gu(7.5));

196− } else {

197− return cardLoader.item ? cardLoader.item.artShapeSize : Qt.size(0, 0)

174+ return cardLoader.item ? cardLoader.item.artShapeSize : Qt.size(0, 0)

198− }

199 }

175 }

200

176

201 QtObject {

177 QtObject {

qml/Dash/GenericScopeView.qml+1−1

@@ -582,7 +582,7 @@ FocusScope {

582 showSignatureLine: !showBackButton

583 searchEntryEnabled: true

584 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false

585− favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"

585+ favoriteEnabled: scopeView.scope

586 favorite: scopeView.scope && scopeView.scope.favorite

587 navigationTag: scopeView.scope ? scopeView.scope.primaryNavigationTag : ""

588 scopeStyle: scopeView.scopeStyle

qml/Dash/ScopesListCategory.qml+1−1

@@ -89,7 +89,7 @@ Item {

89 icon: model.art || model.mascot || ""

90 text: model.title || ""

91 subtext: model.subtitle || ""

92− showStar: model.scopeId !== "clickscope" && (root.isFavoritesFeed || root.isAlsoInstalled)

92+ showStar: root.isFavoritesFeed || root.isAlsoInstalled

93 isFavorite: root.isFavoritesFeed

94

95 hideChildren: dragItem.loaderToShrink == loader

tests/autopilot/unity8/dash.py+1−17

@@ -48,23 +48,7 @@ class Dash(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

48 self.dash_content_list = self.wait_select_single(

49 'QQuickListView', objectName='dashContentList')

50

51− def get_applications_grid(self):

52− get_grid = self.get_scope('clickscope').wait_select_single(

53− 'CardGrid', objectName='local')

54− return get_grid

55−

56− def get_application_icon(self, text):

57− """Returns a 'Tile' icon that has the text 'text' from the application

58− grid.

59−

60− :param text: String containing the text of the icon to search for.

61−

62− """

63− app_grid = self.get_applications_grid()

64− resp_grid = app_grid.wait_select_single('ResponsiveGridView')

65− return resp_grid.select_single('Tile', text=text)

66−

67− def get_scope(self, scope_name='clickscope'):

51+ def get_scope(self, scope_name):

68 return self.dash_content_list.wait_select_single(

52 return self.dash_content_list.wait_select_single(

69 'QQuickLoader', scopeId=scope_name)

53 'QQuickLoader', scopeId=scope_name)

70

54

tests/autopilot/unity8/shell/tests/test_helpers.py−49

@@ -99,12 +99,6 @@ class DashHelperTestCase(tests.DashBaseTestCase):

99 self._assert_scope_is_opened(scope, scope_id)

100 self.assertIsInstance(scope, dash_helpers.GenericScopeView)

101

102− def test_open_applications_scope(self):

103− scope_id = 'clickscope'

104− scope = self.dash.open_scope(scope_id)

105− self._assert_scope_is_opened(scope, scope_id)

106− self.assertIsInstance(scope, dash_helpers.GenericScopeView)

107−

108

102

109class GenericScopeViewHelperTestCase(tests.DashBaseTestCase):

103class GenericScopeViewHelperTestCase(tests.DashBaseTestCase):

110

104

@@ -122,46 +116,3 @@ class GenericScopeViewHelperTestCase(tests.DashBaseTestCase):

122 """Open an item that requires swiping to make it visible."""

116 """Open an item that requires swiping to make it visible."""

123 preview = self.generic_scope.open_preview('2', 'Title.2.0')

117 preview = self.generic_scope.open_preview('2', 'Title.2.0')

124 self.assertIsInstance(preview, dash_helpers.Preview)

118 self.assertIsInstance(preview, dash_helpers.Preview)

125−

126−

127−class DashAppsHelperTestCase(tests.DashBaseTestCase):

128−

129− available_applications = [

130− 'Title.2.0', 'Title.2.1', 'Title.2.2', 'Title.2.3', 'Title.2.4',

131− 'Title.2.5', 'Title.2.6', 'Title.2.7', 'Title.2.8', 'Title.2.9',

132− 'Title.2.10', 'Title.2.11', 'Title.2.12', 'Title.2.13', 'Title.2.14',

133− 'Title.2.15', 'Title.2.16', 'Title.2.17', 'Title.2.18']

134−

135− def setUp(self):

136− # Set up the fake scopes before launching unity.

137− self.useFixture(fixture_setup.FakeScopes())

138− super().setUp()

139− self.applications_scope = self.dash.open_scope('clickscope')

140−

141− def test_get_applications_should_return_correct_applications(self):

142− category = '2'

143− category_element = self.applications_scope._get_category_element(

144− category)

145− list_view = self.dash.get_scope('clickscope')\

146− .select_single(dash_helpers.ListViewWithPageHeader)

147− expected_apps_count = self._get_number_of_application_slots(category)

148− expected_applications = self.available_applications[

149− :expected_apps_count]

150− x_center = list_view.globalRect.x + list_view.width / 2

151− y_center = list_view.globalRect.y + list_view.height / 2

152− y_diff = (

153− category_element.y - list_view.height + category_element.height

154− )

155− list_view._slow_drag(x_center, x_center, y_center, y_center - y_diff)

156− applications = self.applications_scope.get_applications(category)

157− self.assertEqual(expected_applications, applications)

158−

159− def _get_number_of_application_slots(self, category):

160− category_element = self.applications_scope._get_category_element(

161− category)

162− cardgrid = category_element.select_single('CardGrid')

163− if (category_element.expanded):

164− return cardgrid.select_single('QQuickGridView').count

165− else:

166− return cardgrid.collapsedRows \

167− * cardgrid.select_single('ResponsiveGridView').columns

tests/mocks/Unity/fake_scopes.cpp−1

@@ -60,7 +60,6 @@ void Scopes::updateScopes()

60 addScope(new Scope("MockScope7", "MS7", false, this));

61 addScope(new Scope("MockScope8", "MS8", false, this));

62 addScope(new Scope("MockScope9", "MS9", false, this));

63− addScope(new Scope("libertine-scope.ubuntu_libertine-scope", "Libertine", true, this));

64

63

65 Scope *longNavigationScope = new Scope(

64 Scope *longNavigationScope = new Scope(

66 "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,

65 "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,

tests/qmltests/Dash/tst_Dash.qml+1−48

@@ -58,7 +58,7 @@ Item {

58 tryCompare(dashContentList, "count", 0);

59 scopes.load();

60 tryCompare(dashContentList, "currentIndex", 0);

61− tryCompare(dashContentList, "count", 28);

61+ tryCompare(dashContentList, "count", 27);

62 tryCompare(scopes, "loaded", true);

63 tryCompareFunction(function() {

64 var mockScope1Loader = findChild(dash, "scopeLoader0");

@@ -192,24 +192,6 @@ Item {

192 tryCompare(expandingItem, "visible", false)

193 }

194

195− function test_manage_dash_clickscope_unfavoritable() {

196− open_manage_dash();

197−

198− // Click scope star area is not visible (i.e. can't be unfavorited)

199− var favScopesListCategoryList = findChild(findChild(dash, "scopesListCategoryfavorites"), "scopesListCategoryInnerList");

200− var clickScope = findChild(favScopesListCategoryList, "delegateclickscope");

201− var starArea = findChild(clickScope, "starArea");

202− compare(starArea.visible, false);

203−

204− // Go back

205− var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");

206− var scopesList = findChild(dash, "scopesList");

207− var scopesListPageHeader = findChild(scopesList, "pageHeader");

208− var backButton = findChild(scopesListPageHeader, "innerPageHeader").leadingActionBar;

209− mouseClick(backButton);

210− tryCompare(bottomEdgeController, "progress", 0);

211− }

212−

213 function test_manage_dash_select_same_favorite() {

195 function test_manage_dash_select_same_favorite() {

214 open_manage_dash();

196 open_manage_dash();

215

197

@@ -627,35 +609,6 @@ Item {

627 tryCompare(dashContent, "x", 0);

609 tryCompare(dashContent, "x", 0);

628 }

610 }

629

611

630− function test_cardIconStyle()

631− {

632− dash.setCurrentScope("clickscope");

633− var dashContent = findChild(dash, "dashContent");

634− tryCompare(dashContent.currentScope, "id", "clickscope");

635−

636− scrollToCategory("dashCategorypredefined");

637− tryCompareFunction(function() {

638− var tile = getCategoryDelegate("predefined", 2);

639− var proportionalShape = findChildsByType(tile, "UCProportionalShape");

640− return proportionalShape.length === 1;

641− },

642− true

643− );

644−

645− dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");

646− var dashContent = findChild(dash, "dashContent");

647− tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");

648−

649− scrollToCategory("dashCategory2");

650− tryCompareFunction(function() {

651− var tile = getCategoryDelegate("2", 2);

652− var proportionalShape = findChildsByType(tile, "UCProportionalShape");

653− return proportionalShape.length === 1;

654− },

655− true

656− );

657− }

658−

659 function test_tempScopeItemXOnResize()

612 function test_tempScopeItemXOnResize()

660 {

613 {

661 // Go to a temp scope

614 // Go to a temp scope

tests/qmltests/Dash/tst_DashContent.qml+3−3

@@ -70,7 +70,7 @@ Item {

70 function loadScopes() {

71 scopeLoadedSpy.clear();

72 scopesModel.load();

73− tryCompare(scopeLoadedSpy, "count", 28, 15000);

73+ tryCompare(scopeLoadedSpy, "count", 27, 15000);

74 tryCompare(scopesModel, "loaded", true);

75 tryCompareFunction(function() {

76 var mockScope1Loader = findChild(shell, "scopeLoader0");

@@ -120,11 +120,11 @@ Item {

120 scopesModel.clear();

121 compare(dashContentList.count, 0, "DashContent should have 0 items after clearing");

122 // pretend we're running after a model reset

123− dashContentList.currentIndex = 27;

123+ dashContentList.currentIndex = 26;

124

125 loadScopes();

126

127− compare(dashContentList.count, 28);

127+ compare(dashContentList.count, 27);

128 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);

129 }

130

tests/qmltests/Dash/tst_GenericScopeView.qml+5−21

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

84 genericScopeView.scope = scopes.getScope(2);

85 genericScopeView.isCurrent = true;

86 shell.width = units.gu(120);

87+ shell.height = units.gu(100);

87 genericScopeView.categoryView.positionAtBeginning();

88 genericScopeView.categoryView.positionAtBeginning();

88 waitForRendering(genericScopeView.categoryView);

89 waitForRendering(genericScopeView.categoryView);

89 }

90 }

@@ -195,6 +196,8 @@ Item {

195 }

196 }

196

197

197 function test_expand_collapse() {

198 function test_expand_collapse() {

199+ shell.height = units.gu(120);

200+

198 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0", 0 /* timeout */) != null; }, true);

201 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0", 0 /* timeout */) != null; }, true);

199

202

200 var category = findChild(genericScopeView, "dashCategory0")

203 var category = findChild(genericScopeView, "dashCategory0")

@@ -531,6 +534,8 @@ Item {

531 }

534 }

532

535

533 function test_seeAllTwoCategoriesScenario2() {

536 function test_seeAllTwoCategoriesScenario2() {

537+ shell.height = units.gu(120);

538+

534 mockScope.setId("mockScope");

539 mockScope.setId("mockScope");

535 mockScope.setName("Mock Scope");

540 mockScope.setName("Mock Scope");

536 mockScope.isActive = true;

541 mockScope.isActive = true;

@@ -587,7 +592,6 @@ Item {

587 var innerHeader = findChild(header, "innerPageHeader");

592 var innerHeader = findChild(header, "innerPageHeader");

588 verify(innerHeader, "Could not find the inner header");

593 verify(innerHeader, "Could not find the inner header");

589

594

590− expectFail("Apps", "Click scope should not have a favorite button");

591 var favoriteAction = findChild(innerHeader, "favorite_button");

595 var favoriteAction = findChild(innerHeader, "favorite_button");

592 verify(favoriteAction, "Could not find the favorite action.");

596 verify(favoriteAction, "Could not find the favorite action.");

593 mouseClick(favoriteAction);

597 mouseClick(favoriteAction);

@@ -697,26 +701,6 @@ Item {

697 var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");

701 var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");

698 compare(shape.borderSource, undefined);

702 compare(shape.borderSource, undefined);

699 }

703 }

700−

701− function test_clickScopeSizing() {

702− genericScopeView.scope = scopes.getScopeFromAll("clickscope");

703− waitForRendering(genericScopeView);

704−

705− var categoryListView = findChild(genericScopeView, "categoryListView");

706− waitForRendering(categoryListView);

707−

708− var categorypredefined = findChild(categoryListView, "dashCategorypredefined");

709− waitForRendering(categorypredefined);

710−

711− var cardTool = findChild(categorypredefined, "cardTool");

712−

713− compare(cardTool.cardWidth, units.gu(11));

714− shell.width = units.gu(46);

715− waitForRendering(genericScopeView);

716− compare(cardTool.cardWidth, units.gu(10));

717−

718− shell.width = units.gu(120)

719− }

720 }

704 }

721 }

705 }

722}

706}