3d20f5f · unity8 · git.iko.soy

debian/control+1−1

compare with xenial

unifiedsplit

@@ -24,7 +24,7 @@ Build-Depends: cmake,

24 libpulse-dev,

25 libqmenumodel-dev (>= 0.2.8),

26 libqt5xmlpatterns5-dev,

27− libunity-api-dev (>= 7.87),

27+ libunity-api-dev (>= 7.88),

28 libusermetricsoutput1-dev,

29 libxcb1-dev,

30 pkg-config,

qml/Dash/DashNavigationButton.qml+3−3

@@ -113,7 +113,7 @@ AbstractButton {

113 navigation: (nullifyNavigation || !scope) ? null : getNavigation(navigationId)

114 currentNavigation: root.currentNavigation

115 onEnterNavigation: {

116− scope.performQuery(navigationQuery);

116+ scope.setNavigationState(newNavigationId, isAltNavigation);

117 // We only need to add a new item to the model

118 // if we have children, otherwise just load it

119 if (hasChildren) {

@@ -125,7 +125,7 @@ AbstractButton {

125 }

126 }

127 onGoBackToParentClicked: {

128− scope.performQuery(navigation.parentQuery);

128+ scope.setNavigationState(navigation.parentNavigationId, isAltNavigation);

129 isGoingBack = true;

130 navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);

131 navigationListView.currentIndex--;

@@ -134,7 +134,7 @@ AbstractButton {

134 showList = false;

135 if (root.currentNavigation.parentNavigationId == navigation.navigationId) {

136 // For leaves we have to go to the parent too

137− scope.performQuery(root.currentNavigation.parentQuery);

137+ scope.setNavigationState(root.currentNavigation.parentNavigationId, isAltNavigation);

138 }

139 }

140 }

qml/Dash/DashNavigationList.qml+2−2

@@ -22,7 +22,7 @@ Item {

22 property var navigation: null

23 property var currentNavigation: null

24 property var scopeStyle: null

25− signal enterNavigation(var newNavigationId, var navigationQuery, bool hasChildren)

25+ signal enterNavigation(var newNavigationId, bool hasChildren)

26 signal goBackToParentClicked()

27 signal allNavigationClicked()

28

@@ -152,7 +152,7 @@ Item {

152 height: root.itemHeight

153 width: root.width

154

155− onClicked: root.enterNavigation(navigationId, query, hasChildren)

155+ onClicked: root.enterNavigation(navigationId, hasChildren)

156

157 Label {

158 anchors {

qml/Dash/GenericScopeView.qml−10

@@ -39,16 +39,6 @@ FocusScope {

39

40 signal backClicked()

41

42− onScopeChanged: {

43− if (scope) {

44− scope.activateApplication.connect(activateApp);

45− }

46− }

47−

48− function activateApp(appId) {

49− shell.activateApplication(appId);

50− }

51−

52 function positionAtBeginning() {

42 function positionAtBeginning() {

53 categoryView.positionAtBeginning()

43 categoryView.positionAtBeginning()

54 }

44 }

tests/mocks/Unity/fake_navigation.cpp−12

@@ -40,11 +40,6 @@ QString Navigation::navigationId() const

40 return m_navigationId;

41}

42

43−QString Navigation::query() const

44−{

45− return "navigation:/" + m_navigationId;

46−}

47−

48QString Navigation::label() const

43QString Navigation::label() const

49{

44{

50 return m_label;

45 return m_label;

@@ -60,11 +55,6 @@ QString Navigation::parentNavigationId() const

60 return m_parentId;

55 return m_parentId;

61}

56}

62

57

63−QString Navigation::parentQuery() const

64−{

65− return "navigation:/" + m_parentId;

66−}

67−

68QString Navigation::parentLabel() const

58QString Navigation::parentLabel() const

69{

59{

70 return m_parentLabel;

60 return m_parentLabel;

@@ -107,8 +97,6 @@ int Navigation::rowCount(const QModelIndex & /*parent*/) const

107QVariant Navigation::data(const QModelIndex &index, int role) const

97QVariant Navigation::data(const QModelIndex &index, int role) const

108{

98{

109 switch (role) {

99 switch (role) {

110− case RoleQuery:

111− return QString("navigation:/%1").arg(data(index, RoleNavigationId).toString());

112 case RoleNavigationId:

100 case RoleNavigationId:

113 if (m_navigationId == "root")

101 if (m_navigationId == "root")

114 return QString("middle%1").arg(index.row());

102 return QString("middle%1").arg(index.row());

tests/mocks/Unity/fake_navigation.h−2

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

29 Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);

30

31 QString navigationId() const override;

32− QString query() const override;

33 QString label() const override;

32 QString label() const override;

34 QString allLabel() const override;

33 QString allLabel() const override;

35 QString parentNavigationId() const override;

34 QString parentNavigationId() const override;

36− QString parentQuery() const override;

37 QString parentLabel() const override;

35 QString parentLabel() const override;

38 bool loaded() const override;

36 bool loaded() const override;

39 bool isRoot() const override;

37 bool isRoot() const override;

tests/mocks/Unity/fake_scope.cpp+8−12

@@ -256,17 +256,13 @@ unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const

256 return result;

257}

258

259−void Scope::performQuery(const QString& query)

259+void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)

260−{

260+{

261− if (query.startsWith("navigation:/")) {

261+ if (isAltNavigation) {

262− QString navigationId = query;

263− navigationId.remove(0, QString("navigation:/").length());

264− if (navigationId.startsWith("alt")) {

265− m_currentAltNavigationId = navigationId;

262+ m_currentAltNavigationId = navigationId;

266− Q_EMIT currentAltNavigationIdChanged();

263+ Q_EMIT currentAltNavigationIdChanged();

267− } else {

264+ } else {

268− m_currentNavigationId = navigationId;

265+ m_currentNavigationId = navigationId;

269− Q_EMIT currentNavigationIdChanged();

266+ Q_EMIT currentNavigationIdChanged();

270− }

271 }

267 }

272}

268}

tests/mocks/Unity/fake_scope.h+2−1

@@ -67,7 +67,8 @@ public:

67 bool hasAltNavigation() const override;

68 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;

69 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;

70+ Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;

70− Q_INVOKABLE void performQuery(const QString& query) override;

71+ Q_SIGNAL void performQuery(const QString& query) override;

71

72

72 Status status() const override;

73 Status status() const override;

73 QVariantMap customizations() const override;

74 QVariantMap customizations() const override;