974e2d6 · unity8 · git.iko.soy

plugins/Unity/DashCommunicator/DashCommunicator.qmltypes+2−2

compare with xenial

unifiedsplit

@@ -14,7 +14,7 @@ Module {

14 exportMetaObjectRevisions: [0]

15 Method {

16 name: "setCurrentScope"

17− Parameter { name: "scopeId"; type: "string" }

17+ Parameter { name: "index"; type: "int" }

18 Parameter { name: "animate"; type: "bool" }

19 Parameter { name: "isSwipe"; type: "bool" }

20 }

@@ -26,7 +26,7 @@ Module {

26 exportMetaObjectRevisions: [0]

27 Signal {

28 name: "setCurrentScopeRequested"

29− Parameter { name: "scopeId"; type: "string" }

29+ Parameter { name: "index"; type: "int" }

30 Parameter { name: "animate"; type: "bool" }

31 Parameter { name: "isSwipe"; type: "bool" }

32 }

plugins/Unity/DashCommunicator/dashcommunicator.cpp+2−2

@@ -27,12 +27,12 @@ DashCommunicator::DashCommunicator(QObject *parent):

27 start();

28}

29

30−void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)

30+void DashCommunicator::setCurrentScope(int index, bool animate, bool isSwipe)

31{

32 m_mutex.lock();

33 if (m_created) {

34 QMetaObject::invokeMethod(m_dashConnection, "setCurrentScope",

35− Q_ARG(QString, scopeId),

35+ Q_ARG(int, index),

36 Q_ARG(bool, animate),

37 Q_ARG(bool, isSwipe));

38 }

plugins/Unity/DashCommunicator/dashcommunicator.h+1−1

@@ -31,7 +31,7 @@ public:

31 ~DashCommunicator() = default;

32

33public Q_SLOTS:

34− void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);

34+ void setCurrentScope(int index, bool animate, bool isSwipe);

35

36protected:

37 void run() override;

plugins/Unity/DashCommunicator/dashcommunicatorservice.h+1−1

@@ -29,7 +29,7 @@ public:

29 ~DashCommunicatorService();

30

31Q_SIGNALS:

32− void setCurrentScopeRequested(const QString &scopeId, bool animate, bool isSwipe);

32+ void setCurrentScopeRequested(int index, bool animate, bool isSwipe);

33

34private:

35 DBusDashCommunicatorService *m_dbusService;

plugins/Unity/DashCommunicator/dashconnection.cpp+2−2

@@ -25,9 +25,9 @@ DashConnection::DashConnection(const QString &service, const QString &path, cons

25

26}

27

28−void DashConnection::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)

28+void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)

29{

30 if (dbusInterface()) {

31− dbusInterface()->asyncCall("SetCurrentScope", scopeId, animate, isSwipe);

31+ dbusInterface()->asyncCall("SetCurrentScope", index, animate, isSwipe);

32 }

33}

plugins/Unity/DashCommunicator/dashconnection.h+1−1

@@ -28,7 +28,7 @@ public:

28 DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent = 0);

29

30public Q_SLOTS:

31− void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);

31+ void setCurrentScope(int index, bool animate, bool isSwipe);

32};

33

34#endif

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp+2−2

@@ -29,7 +29,7 @@ DBusDashCommunicatorService::~DBusDashCommunicatorService()

29{

30}

31

32−void DBusDashCommunicatorService::SetCurrentScope(const QString &scopeId, bool animate, bool isSwipe)

32+void DBusDashCommunicatorService::SetCurrentScope(int index, bool animate, bool isSwipe)

33{

34− Q_EMIT setCurrentScopeRequested(scopeId, animate, isSwipe);

34+ Q_EMIT setCurrentScopeRequested(index, animate, isSwipe);

35}

plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h+2−2

@@ -29,10 +29,10 @@ public:

29 ~DBusDashCommunicatorService();

30

31Q_SIGNALS:

32− void setCurrentScopeRequested(const QString &scopeId, bool animate, bool isSwipe);

32+ void setCurrentScopeRequested(int index, bool animate, bool isSwipe);

33

34public Q_SLOTS:

35− Q_SCRIPTABLE void SetCurrentScope(const QString &scopeId, bool animate, bool isSwipe);

35+ Q_SCRIPTABLE void SetCurrentScope(int index, bool animate, bool isSwipe);

36

37};

38

qml/Dash/Dash.qml+1−9

@@ -28,14 +28,12 @@ Showable {

28

29 visible: shown

30

31− property string showScopeOnLoaded: "clickscope"

32−

33 DashCommunicatorService {

31 DashCommunicatorService {

34 objectName: "dashCommunicatorService"

32 objectName: "dashCommunicatorService"

35 onSetCurrentScopeRequested: {

33 onSetCurrentScopeRequested: {

36 if (!isSwipe || !window.active || overviewController.progress != 0) {

34 if (!isSwipe || !window.active || overviewController.progress != 0) {

37 if (overviewController.progress != 0 && window.active) animate = false;

35 if (overviewController.progress != 0 && window.active) animate = false;

38− dash.setCurrentScope(scopeId, animate, isSwipe)

36+ dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)

39 if (overviewController.progress != 0) {

37 if (overviewController.progress != 0) {

40 if (window.active) {

38 if (window.active) {

41 dashContentCache.scheduleUpdate();

39 dashContentCache.scheduleUpdate();

@@ -184,12 +182,6 @@ Showable {

184 scopesOverview.ensureAllScopeVisible(scope.id);

182 scopesOverview.ensureAllScopeVisible(scope.id);

185 x = -width;

183 x = -width;

186 }

184 }

187− onScopeLoaded: {

188− if (scopeId == dash.showScopeOnLoaded) {

189− dash.setCurrentScope(scopeId, false, false)

190− dash.showScopeOnLoaded = ""

191− }

192− }

193 clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0

185 clip: scale != 1.0 || scopeItem.visible || overviewController.progress != 0

194 Behavior on x {

186 Behavior on x {

195 UbuntuNumberAnimation {

187 UbuntuNumberAnimation {

qml/Dash/DashContent.qml+1−1

@@ -161,7 +161,7 @@ Item {

161 }

162 asynchronous: true

163 source: "GenericScopeView.qml"

164− objectName: scope.id + " loader"

164+ objectName: "scopeLoader" + index

165

166 readonly property bool moving: item ? item.moving : false

167 readonly property bool navigationShown: item ? item.navigationShown : false

qml/Shell.qml+2−2

@@ -624,7 +624,7 @@ Item {

624 }

625

626 var animate = !LightDM.Greeter.active && !stages.shown

627− dash.setCurrentScope("clickscope", animate, false)

627+ dash.setCurrentScope(0, animate, false)

628 ApplicationManager.requestFocusApplication("unity8-dash")

629 }

630

@@ -700,7 +700,7 @@ Item {

700 onDash: showDash()

701 onDashSwipeChanged: {

702 if (dashSwipe) {

703− dash.setCurrentScope("clickscope", false, true)

703+ dash.setCurrentScope(0, false, true)

704 }

705 }

706 onLauncherApplicationSelected: {

tests/autopilot/unity8/shell/emulators/dash.py+4

@@ -69,6 +69,10 @@ class Dash(emulators.UnityEmulatorBase):

69 return self.dash_content_list.wait_select_single(

70 'QQuickLoader', scopeId=scope_name)

71

72+ def get_scope_by_index(self, scope_index=0):

73+ return self.dash_content_list.wait_select_single(

74+ 'QQuickLoader', objectName=("scopeLoader%i" % scope_index))

75+

72 @autopilot_logging.log_action(logger.info)

76 @autopilot_logging.log_action(logger.info)

73 def open_scope(self, scope_id):

77 def open_scope(self, scope_id):

74 """Open a dash scope.

78 """Open a dash scope.

tests/autopilot/unity8/shell/tests/__init__.py+1−1

@@ -447,7 +447,7 @@ class DashBaseTestCase(AutopilotTestCase):

447 return launch_dash_app_fixture.application_proxy

448

449 def wait_for_dash(self):

450− home_scope = self.dash.get_scope('clickscope')

450+ home_scope = self.dash.get_scope_by_index(0)

451 # FIXME! There is a huge timeout here for when we're doing CI on

452 # VMs. See lp:1203715

453 self.assertThat(

tests/mocks/Unity/DashCommunicator/DashCommunicator.qmltypes+4−4

@@ -14,13 +14,13 @@ Module {

14 exportMetaObjectRevisions: [0]

15 Signal {

16 name: "setCurrentScopeCalled"

17− Parameter { name: "scopeId"; type: "string" }

17+ Parameter { name: "index"; type: "int" }

18 Parameter { name: "animate"; type: "bool" }

19 Parameter { name: "reset"; type: "bool" }

20 }

21 Method {

22 name: "setCurrentScope"

23− Parameter { name: "scopeId"; type: "string" }

23+ Parameter { name: "index"; type: "int" }

24 Parameter { name: "animate"; type: "bool" }

25 Parameter { name: "reset"; type: "bool" }

26 }

@@ -32,13 +32,13 @@ Module {

32 exportMetaObjectRevisions: [0]

33 Signal {

34 name: "setCurrentScopeRequested"

35− Parameter { name: "scopeId"; type: "string" }

35+ Parameter { name: "index"; type: "int" }

36 Parameter { name: "animate"; type: "bool" }

37 Parameter { name: "isSwipe"; type: "bool" }

38 }

39 Method {

40 name: "mockSetCurrentScope"

41− Parameter { name: "scopeId"; type: "string" }

41+ Parameter { name: "index"; type: "int" }

42 Parameter { name: "animate"; type: "bool" }

43 Parameter { name: "isSwipe"; type: "bool" }

44 }

tests/mocks/Unity/DashCommunicator/dashcommunicator.cpp+2−2

@@ -31,7 +31,7 @@ DashCommunicator::~DashCommunicator()

31}

32

33

34−void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool reset)

34+void DashCommunicator::setCurrentScope(int index, bool animate, bool reset)

35{

36− Q_EMIT setCurrentScopeCalled(scopeId, animate, reset);

36+ Q_EMIT setCurrentScopeCalled(index, animate, reset);

37}

tests/mocks/Unity/DashCommunicator/dashcommunicator.h+2−2

@@ -29,11 +29,11 @@ public:

29 ~DashCommunicator();

30

31public Q_SLOTS:

32− void setCurrentScope(const QString &scopeId, bool animate, bool reset);

32+ void setCurrentScope(int index, bool animate, bool reset);

33

34Q_SIGNALS:

35 // This mock just emits calls back to the QML api for the plugin to verify calls

36− void setCurrentScopeCalled(const QString &scopeId, bool animate, bool reset);

36+ void setCurrentScopeCalled(int index, bool animate, bool reset);

37};

38

39#endif

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp+2−2

@@ -27,7 +27,7 @@ DashCommunicatorService::~DashCommunicatorService()

27

28}

29

30−void DashCommunicatorService::mockSetCurrentScope(const QString &scopeId, bool animate, bool isSwipe)

30+void DashCommunicatorService::mockSetCurrentScope(int index, bool animate, bool isSwipe)

31{

32− Q_EMIT setCurrentScopeRequested(scopeId, animate, isSwipe);

32+ Q_EMIT setCurrentScopeRequested(index, animate, isSwipe);

33}

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.h+2−2

@@ -27,10 +27,10 @@ public:

27 ~DashCommunicatorService();

28

29Q_SIGNALS:

30− void setCurrentScopeRequested(const QString &scopeId, bool animate, bool isSwipe);

30+ void setCurrentScopeRequested(int index, bool animate, bool isSwipe);

31

32public Q_SLOTS:

33− void mockSetCurrentScope(const QString &scopeId, bool animate, bool isSwipe);

33+ void mockSetCurrentScope(int index, bool animate, bool isSwipe);

34};

35

36#endif // DBUSUNITYSESSIONSERVICE_H

tests/qmltests/Dash/tst_Dash.qml+6−26

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

36 Dash {

37 id: dash

38 anchors.fill: parent

39− showScopeOnLoaded: "MockScope2"

40 }

39 }

41

40

42 UT.UnityTestCase {

41 UT.UnityTestCase {

@@ -57,14 +56,14 @@ Item {

57 tryCompare(dashContentList, "count", 6);

56 tryCompare(dashContentList, "count", 6);

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

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

59 tryCompareFunction(function() {

58 tryCompareFunction(function() {

60− var mockScope1Loader = findChild(dash, "MockScope1 loader");

59+ var mockScope1Loader = findChild(dash, "scopeLoader0");

61 return mockScope1Loader && mockScope1Loader.item != null; },

60 return mockScope1Loader && mockScope1Loader.item != null; },

62 true, 15000);

61 true, 15000);

63 tryCompareFunction(function() {

62 tryCompareFunction(function() {

64− var mockScope1Loader = findChild(dash, "MockScope1 loader");

63+ var mockScope1Loader = findChild(dash, "scopeLoader0");

65 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },

64 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },

66 true, 15000);

65 true, 15000);

67− waitForRendering(findChild(dash, "MockScope1 loader").item);

66+ waitForRendering(findChild(dash, "scopeLoader0").item);

68 }

67 }

69

68

70 function get_scope_data() {

69 function get_scope_data() {

@@ -80,27 +79,6 @@ Item {

80 return get_scope_data()

79 return get_scope_data()

81 }

80 }

82

81

83− function test_show_scope_on_load(data) {

84− var dashContentList = findChild(dash, "dashContentList");

85−

86− dash.showScopeOnLoaded = data.tag

87− scopes.clear();

88− tryCompare(dashContentList, "count", 0);

89− scopes.load();

90− tryCompare(scopes, "loaded", true);

91− tryCompare(dashContentList, "count", 6);

92−

93− verify(dashContentList != undefined);

94− if (data.visualIndex == -1) {

95− tryCompare(dashContentList, "currentIndex", 0);

96− expectFail(data.tag, "non favorite scopes should not be visble in the scopes model");

97− compare(dashContentList.currentItem.scopeId, data.tag); // this should fail

98− } else {

99− tryCompare(dashContentList, "currentIndex", data.visualIndex);

100− compare(dashContentList.currentItem.scopeId, data.tag);

101− }

102− }

103−

104 function test_dash_overview_show_select_same_favorite() {

82 function test_dash_overview_show_select_same_favorite() {

105 // Show the overview

83 // Show the overview

106 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

84 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

@@ -314,7 +292,9 @@ Item {

314 mouseFlick(dash, startX, startY, stopX, stopY);

292 mouseFlick(dash, startX, startY, stopX, stopY);

315 compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");

293 compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");

316 var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");

294 var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");

317− dashCommunicatorService.mockSetCurrentScope("clickscope", true, false);

295+ dashCommunicatorService.mockSetCurrentScope(0, true, false);

296+ tryCompare(dashContentList, "currentIndex", 0)

297+ dashCommunicatorService.mockSetCurrentScope(1, true, false);

318 tryCompare(dashContentList, "currentIndex", 1)

298 tryCompare(dashContentList, "currentIndex", 1)

319 }

299 }

320

300

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

@@ -73,14 +73,14 @@ Item {

73 tryCompare(scopeLoadedSpy, "count", 6, 15000);

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

75 tryCompareFunction(function() {

76− var mockScope1Loader = findChild(shell, "MockScope1 loader");

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

77 return mockScope1Loader && mockScope1Loader.item != null; },

78 true, 15000);

79 tryCompareFunction(function() {

80− var mockScope1Loader = findChild(shell, "MockScope1 loader");

80+ var mockScope1Loader = findChild(shell, "scopeLoader0");

81 return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },

82 true, 15000);

83− waitForRendering(findChild(shell, "MockScope1 loader").item);

83+ waitForRendering(findChild(shell, "scopeLoader0").item);

84 }

85

86 function init() {

@@ -131,7 +131,7 @@ Item {

131 function test_show_header_on_list_movement() {

132 var dashContentList = findChild(dashContent, "dashContentList");

133 verify(dashContentList !== null);

134− var scope = findChild(dashContent, "MockScope1 loader");

134+ var scope = findChild(dashContent, "scopeLoader0");

135 waitForRendering(scope);

136

137 var categoryListView = findChild(scope, "categoryListView");

@@ -149,7 +149,7 @@ Item {

149 function test_set_current_scope_reset() {

150 var dashContentList = findChild(dashContent, "dashContentList");

151 verify(dashContentList, "Couldn't find dashContentList");

152− var scope = findChild(dashContent, "MockScope1 loader");

152+ var scope = findChild(dashContent, "scopeLoader0");

153

154 tryCompare(scope, "status", Loader.Ready);

155

@@ -261,7 +261,7 @@ Item {

261

262 function test_carouselAspectRatio() {

263 tryCompareFunction(function() {

264− var scope = findChild(dashContent, "MockScope1 loader");

264+ var scope = findChild(dashContent, "scopeLoader0");

265 if (scope != null) {

266 var dashCategory1 = findChild(scope, "dashCategory1");

267 if (dashCategory1 != null) {

@@ -273,7 +273,7 @@ Item {

273 },

274 true);

275

276− var scope = findChild(dashContent, "MockScope1 loader");

276+ var scope = findChild(dashContent, "scopeLoader0");

277 var dashCategory1 = findChild(scope, "dashCategory1");

278 var cardTool = findChild(dashCategory1, "cardTool");

279 var carouselLV = findChild(dashCategory1, "listView");

@@ -501,7 +501,7 @@ Item {

501 function test_searchHint() {

502 var dashContentList = findChild(dashContent, "dashContentList");

503 verify(dashContentList !== null);

504− var scope = findChild(dashContent, "MockScope1 loader");

504+ var scope = findChild(dashContent, "scopeLoader0");

505 waitForRendering(scope);

506

507 var categoryListView = findChild(scope, "categoryListView");

tests/qmltests/tst_Shell.qml+1−1

@@ -385,7 +385,7 @@ Item {

385 tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");

386

387 compare(dashCommunicatorSpy.count, 1);

388− compare(dashCommunicatorSpy.signalArguments[0][0], "clickscope");

388+ compare(dashCommunicatorSpy.signalArguments[0][0], 0);

389 }

390

391 function test_showInputMethod() {