git.iko.soy/unity8
on xenial help sign in
Merge
commit3d20f5f5f476f8efe25012478ca4d2f0c2309c5e authorAlbert Astals <albert.astals@canonical.com> dateMon 4 Aug 2014, 16:32 (12 years ago) parent05cc69072c5da9
8 files changed+16−43
compare with xenial
unifiedsplit
debian/control+1−1 qml/Dash/DashNavigationButton.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
debian/control+1−1
@@ -24,7 +24,7 @@ Build-Depends: cmake,
2424 libpulse-dev,
2525 libqmenumodel-dev (>= 0.2.8),
2626 libqt5xmlpatterns5-dev,
27− libunity-api-dev (>= 7.87),
27+ libunity-api-dev (>= 7.88),
2828 libusermetricsoutput1-dev,
2929 libxcb1-dev,
3030 pkg-config,
qml/Dash/DashNavigationButton.qml+3−3
@@ -113,7 +113,7 @@ AbstractButton {
113113 navigation: (nullifyNavigation || !scope) ? null : getNavigation(navigationId)
114114 currentNavigation: root.currentNavigation
115115 onEnterNavigation: {
116− scope.performQuery(navigationQuery);
116+ scope.setNavigationState(newNavigationId, isAltNavigation);
117117 // We only need to add a new item to the model
118118 // if we have children, otherwise just load it
119119 if (hasChildren) {
@@ -125,7 +125,7 @@ AbstractButton {
125125 }
126126 }
127127 onGoBackToParentClicked: {
128− scope.performQuery(navigation.parentQuery);
128+ scope.setNavigationState(navigation.parentNavigationId, isAltNavigation);
129129 isGoingBack = true;
130130 navigationModel.setProperty(navigationListView.currentIndex - 1, "nullifyNavigation", false);
131131 navigationListView.currentIndex--;
@@ -134,7 +134,7 @@ AbstractButton {
134134 showList = false;
135135 if (root.currentNavigation.parentNavigationId == navigation.navigationId) {
136136 // For leaves we have to go to the parent too
137− scope.performQuery(root.currentNavigation.parentQuery);
137+ scope.setNavigationState(root.currentNavigation.parentNavigationId, isAltNavigation);
138138 }
139139 }
140140 }
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
@@ -40,11 +40,6 @@ QString Navigation::navigationId() const
4040 return m_navigationId;
4141}
4242
43−QString Navigation::query() const
44−{
45− return "navigation:/" + m_navigationId;
46−}
47−
4843QString Navigation::label() const
4944{
5045 return m_label;
@@ -60,11 +55,6 @@ QString Navigation::parentNavigationId() const
6055 return m_parentId;
6156}
6257
63−QString Navigation::parentQuery() const
64−{
65− return "navigation:/" + m_parentId;
66−}
67−
6858QString Navigation::parentLabel() const
6959{
7060 return m_parentLabel;
@@ -107,8 +97,6 @@ int Navigation::rowCount(const QModelIndex & /*parent*/) const
10797QVariant Navigation::data(const QModelIndex &index, int role) const
10898{
10999 switch (role) {
110− case RoleQuery:
111− return QString("navigation:/%1").arg(data(index, RoleNavigationId).toString());
112100 case RoleNavigationId:
113101 if (m_navigationId == "root")
114102 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
@@ -256,17 +256,13 @@ unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const
256256 return result;
257257}
258258
259−void Scope::performQuery(const QString& query)
260−{
261− if (query.startsWith("navigation:/")) {
262− QString navigationId = query;
263− navigationId.remove(0, QString("navigation:/").length());
264− if (navigationId.startsWith("alt")) {
265− m_currentAltNavigationId = navigationId;
266− Q_EMIT currentAltNavigationIdChanged();
267− } else {
268− m_currentNavigationId = navigationId;
269− Q_EMIT currentNavigationIdChanged();
270− }
259+void Scope::setNavigationState(const QString &navigationId, bool isAltNavigation)
260+{
261+ if (isAltNavigation) {
262+ m_currentAltNavigationId = navigationId;
263+ Q_EMIT currentAltNavigationIdChanged();
264+ } else {
265+ m_currentNavigationId = navigationId;
266+ Q_EMIT currentNavigationIdChanged();
271267 }
272268}
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;