git.iko.soy/unity8
on xenial help sign in
Adapt to API changes
72c5da9Albert Astals
qml/Dash/DashNavigation.qml+3−3
compare with xenial
unifiedsplit
@@ -141,7 +141,7 @@ AbstractButton {
141 navigation: (nullifyNavigation || !scope) ? null : scope.getNavigation(navigationId)
141 navigation: (nullifyNavigation || !scope) ? null : scope.getNavigation(navigationId)
142 currentNavigation: root.currentNavigation
142 currentNavigation: root.currentNavigation
143 onEnterNavigation: {
143 onEnterNavigation: {
144− scope.performQuery(navigationQuery);
144+ scope.setNavigationState(newNavigationId, false);
145 // We only need to add a new item to the model
145 // We only need to add a new item to the model
146 // if we have children, otherwise just load it
146 // if we have children, otherwise just load it
147 if (hasChildren) {
147 if (hasChildren) {
@@ -153,7 +153,7 @@ AbstractButton {
153 }
153 }
154 }
154 }
155 onGoBackToParentClicked: {
155 onGoBackToParentClicked: {
156− scope.performQuery(navigation.parentQuery);
156+ scope.setNavigationState(navigation.parentNavigationId, false);
157 isGoingBack = true;
157 isGoingBack = true;
158 navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
158 navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
159 navigationListView.currentIndex--;
159 navigationListView.currentIndex--;
@@ -162,7 +162,7 @@ AbstractButton {
162 showList = false;
162 showList = false;
163 if (root.currentNavigation.parentNavigationId == navigation.navigationId) {
163 if (root.currentNavigation.parentNavigationId == navigation.navigationId) {
164 // For leaves we have to go to the parent too
164 // For leaves we have to go to the parent too
165− scope.performQuery(root.currentNavigation.parentQuery);
165+ scope.setNavigationState(root.currentNavigation.parentNavigationId, false);
166 }
166 }
167 }
167 }
168 }
168 }
qml/Dash/DashNavigationList.qml+2−2
@@ -22,7 +22,7 @@ Item {
22 property var navigation: null
22 property var navigation: null
23 property var currentNavigation: null
23 property var currentNavigation: null
24 property var scopeStyle: 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()
26 signal goBackToParentClicked()
27 signal allNavigationClicked()
27 signal allNavigationClicked()
28
28
@@ -152,7 +152,7 @@ Item {
152 height: root.itemHeight
152 height: root.itemHeight
153 width: root.width
153 width: root.width
154
154
155− onClicked: root.enterNavigation(navigationId, query, hasChildren)
155+ onClicked: root.enterNavigation(navigationId, hasChildren)
156
156
157 Label {
157 Label {
158 anchors {
158 anchors {
qml/Dash/GenericScopeView.qml−10
@@ -39,16 +39,6 @@ FocusScope {
39
39
40 signal backClicked()
40 signal backClicked()
41
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
@@ -39,11 +39,6 @@ QString Navigation::navigationId() const
39 return m_navigationId;
39 return m_navigationId;
40}
40}
41
41
42−QString Navigation::query() const
43−{
44− return "navigation:/" + m_navigationId;
45−}
46−
47QString Navigation::label() const
42QString Navigation::label() const
48{
43{
49 return m_label;
44 return m_label;
@@ -59,11 +54,6 @@ QString Navigation::parentNavigationId() const
59 return m_parentId;
54 return m_parentId;
60}
55}
61
56
62−QString Navigation::parentQuery() const
63−{
64− return "navigation:/" + m_parentId;
65−}
66−
67QString Navigation::parentLabel() const
57QString Navigation::parentLabel() const
68{
58{
69 return m_parentLabel;
59 return m_parentLabel;
@@ -106,8 +96,6 @@ int Navigation::rowCount(const QModelIndex & /*parent*/) const
106QVariant Navigation::data(const QModelIndex &index, int role) const
96QVariant Navigation::data(const QModelIndex &index, int role) const
107{
97{
108 switch (role) {
98 switch (role) {
109− case RoleQuery:
110− return QString("navigation:/%1").arg(data(index, RoleNavigationId).toString());
111 case RoleNavigationId:
99 case RoleNavigationId:
112 if (m_navigationId == "root")
100 if (m_navigationId == "root")
113 return QString("middle%1").arg(index.row());
101 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);
29 Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);
30
30
31 QString navigationId() const override;
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
@@ -251,17 +251,13 @@ unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const
251 return new Navigation(id, id, "all"+id, parentId, parentLabel, this);
251 return new Navigation(id, id, "all"+id, parentId, parentLabel, this);
252}
252}
253
253
254−void Scope::performQuery(const QString& query)
254+void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)
255−{
255+{
256− if (query.startsWith("navigation:/")) {
256+ if (isAltNavigation) {
257− QString navigationId = query;
258− navigationId.remove(0, QString("navigation:/").length());
259− if (navigationId.startsWith("alt")) {
260− m_currentAltNavigationId = navigationId;
257+ m_currentAltNavigationId = navigationId;
261− Q_EMIT currentAltNavigationIdChanged();
258+ Q_EMIT currentAltNavigationIdChanged();
262− } else {
259+ } else {
263− m_currentNavigationId = navigationId;
260+ m_currentNavigationId = navigationId;
264− Q_EMIT currentNavigationIdChanged();
261+ Q_EMIT currentNavigationIdChanged();
265− }
266 }
262 }
267}
263}
tests/mocks/Unity/fake_scope.h+2−1
@@ -67,7 +67,8 @@ public:
67 bool hasAltNavigation() const override;
67 bool hasAltNavigation() const override;
68 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) 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;
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;