git.iko.soy/unity8
on xenial help sign in
Adapt to API changes
commit72c5da96f0f632bc4d9067a502d5c9189676b7e8 authorAlbert Astals <albert.astals@canonical.com> dateMon 4 Aug 2014, 16:29 (12 years ago) parent01fdd16
7 files changed+15−42
compare with xenial
unifiedsplit
qml/Dash/DashNavigation.qml+3−3 qml/Dash/DashNavigationList.qml+2−2 qml/Dash/GenericScopeView.qml−10 tests/mocks/Unity/fake_navigation.cpp−12 tests/mocks/Unity/fake_navigation.h−2 tests/mocks/Unity/fake_scope.cpp+8−12 tests/mocks/Unity/fake_scope.h+2−1
qml/Dash/DashNavigation.qml+3−3
@@ -141,7 +141,7 @@ AbstractButton {
141141 navigation: (nullifyNavigation || !scope) ? null : scope.getNavigation(navigationId)
142142 currentNavigation: root.currentNavigation
143143 onEnterNavigation: {
144− scope.performQuery(navigationQuery);
144+ scope.setNavigationState(newNavigationId, false);
145145 // We only need to add a new item to the model
146146 // if we have children, otherwise just load it
147147 if (hasChildren) {
@@ -153,7 +153,7 @@ AbstractButton {
153153 }
154154 }
155155 onGoBackToParentClicked: {
156− scope.performQuery(navigation.parentQuery);
156+ scope.setNavigationState(navigation.parentNavigationId, false);
157157 isGoingBack = true;
158158 navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
159159 navigationListView.currentIndex--;
@@ -162,7 +162,7 @@ AbstractButton {
162162 showList = false;
163163 if (root.currentNavigation.parentNavigationId == navigation.navigationId) {
164164 // For leaves we have to go to the parent too
165− scope.performQuery(root.currentNavigation.parentQuery);
165+ scope.setNavigationState(root.currentNavigation.parentNavigationId, false);
166166 }
167167 }
168168 }
qml/Dash/DashNavigationList.qml+2−2
@@ -22,7 +22,7 @@ Item {
2222 property var navigation: null
2323 property var currentNavigation: null
2424 property var scopeStyle: null
25− signal enterNavigation(var newNavigationId, var navigationQuery, bool hasChildren)
25+ signal enterNavigation(var newNavigationId, bool hasChildren)
2626 signal goBackToParentClicked()
2727 signal allNavigationClicked()
2828
@@ -152,7 +152,7 @@ Item {
152152 height: root.itemHeight
153153 width: root.width
154154
155− onClicked: root.enterNavigation(navigationId, query, hasChildren)
155+ onClicked: root.enterNavigation(navigationId, hasChildren)
156156
157157 Label {
158158 anchors {
qml/Dash/GenericScopeView.qml−10
@@ -39,16 +39,6 @@ FocusScope {
3939
4040 signal backClicked()
4141
42− onScopeChanged: {
43− if (scope) {
44− scope.activateApplication.connect(activateApp);
45− }
46− }
47−
48− function activateApp(appId) {
49− shell.activateApplication(appId);
50− }
51−
5242 function positionAtBeginning() {
5343 categoryView.positionAtBeginning()
5444 }
tests/mocks/Unity/fake_navigation.cpp−12
@@ -39,11 +39,6 @@ QString Navigation::navigationId() const
3939 return m_navigationId;
4040}
4141
42−QString Navigation::query() const
43−{
44− return "navigation:/" + m_navigationId;
45−}
46−
4742QString Navigation::label() const
4843{
4944 return m_label;
@@ -59,11 +54,6 @@ QString Navigation::parentNavigationId() const
5954 return m_parentId;
6055}
6156
62−QString Navigation::parentQuery() const
63−{
64− return "navigation:/" + m_parentId;
65−}
66−
6757QString Navigation::parentLabel() const
6858{
6959 return m_parentLabel;
@@ -106,8 +96,6 @@ int Navigation::rowCount(const QModelIndex & /*parent*/) const
10696QVariant Navigation::data(const QModelIndex &index, int role) const
10797{
10898 switch (role) {
109− case RoleQuery:
110− return QString("navigation:/%1").arg(data(index, RoleNavigationId).toString());
11199 case RoleNavigationId:
112100 if (m_navigationId == "root")
113101 return QString("middle%1").arg(index.row());
tests/mocks/Unity/fake_navigation.h−2
@@ -29,11 +29,9 @@ public:
2929 Navigation(const QString& navigationId, const QString& label, const QString& allLabel, const QString& parentId, const QString& parentLabel, Scope* scope);
3030
3131 QString navigationId() const override;
32− QString query() const override;
3332 QString label() const override;
3433 QString allLabel() const override;
3534 QString parentNavigationId() const override;
36− QString parentQuery() const override;
3735 QString parentLabel() const override;
3836 bool loaded() const override;
3937 bool isRoot() const override;
tests/mocks/Unity/fake_scope.cpp+8−12
@@ -251,17 +251,13 @@ unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const
251251 return new Navigation(id, id, "all"+id, parentId, parentLabel, this);
252252}
253253
254−void Scope::performQuery(const QString& query)
255−{
256− if (query.startsWith("navigation:/")) {
257− QString navigationId = query;
258− navigationId.remove(0, QString("navigation:/").length());
259− if (navigationId.startsWith("alt")) {
260− m_currentAltNavigationId = navigationId;
261− Q_EMIT currentAltNavigationIdChanged();
262− } else {
263− m_currentNavigationId = navigationId;
264− Q_EMIT currentNavigationIdChanged();
265− }
254+void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)
255+{
256+ if (isAltNavigation) {
257+ m_currentAltNavigationId = navigationId;
258+ Q_EMIT currentAltNavigationIdChanged();
259+ } else {
260+ m_currentNavigationId = navigationId;
261+ Q_EMIT currentNavigationIdChanged();
266262 }
267263}
tests/mocks/Unity/fake_scope.h+2−1
@@ -67,7 +67,8 @@ public:
6767 bool hasAltNavigation() const override;
6868 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;
6969 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& altNavigationId) override;
70− Q_INVOKABLE void performQuery(const QString& query) override;
70+ Q_INVOKABLE void setNavigationState(const QString &navigationId, bool isAltNavigation) override;
71+ Q_SIGNAL void performQuery(const QString& query) override;
7172
7273 Status status() const override;
7374 QVariantMap customizations() const override;