git.iko.soy/unity8
on xenial help sign in
Adapt to api changes
8b72bb0Albert Astals
qml/Dash/DashDepartments.qml+5−5
compare with xenial
unifiedsplit
@@ -27,7 +27,7 @@ AbstractButton {
27
27
28 property bool showList: false
28 property bool showList: false
29
29
30− readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartment) : null
30+ readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartmentId) : null
31
31
32 // Are we drilling down the tree or up?
32 // Are we drilling down the tree or up?
33 property bool isGoingBack: false
33 property bool isGoingBack: false
@@ -128,7 +128,7 @@ AbstractButton {
128 }
128 }
129 }
129 }
130 onGoBackToParentClicked: {
130 onGoBackToParentClicked: {
131− scope.loadDepartment(department.parentId);
131+ scope.loadDepartment(department.parentDepartmentId);
132 isGoingBack = true;
132 isGoingBack = true;
133 departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", false);
133 departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", false);
134 departmentListView.currentIndex--;
134 departmentListView.currentIndex--;
@@ -137,7 +137,7 @@ AbstractButton {
137 showList = false;
137 showList = false;
138 if (root.currentDepartment.count == 0) {
138 if (root.currentDepartment.count == 0) {
139 // For leaves we have to go to the parent too
139 // For leaves we have to go to the parent too
140− scope.loadDepartment(root.currentDepartment.parentId);
140+ scope.loadDepartment(root.currentDepartment.parentDepartmentId);
141 }
141 }
142 }
142 }
143 }
143 }
@@ -161,7 +161,7 @@ AbstractButton {
161 onScopeChanged: {
161 onScopeChanged: {
162 departmentModel.clear();
162 departmentModel.clear();
163 if (scope && scope.hasDepartments) {
163 if (scope && scope.hasDepartments) {
164− departmentModel.append({"departmentId": scope.currentDepartment, "nullifyDepartment": false});
164+ departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});
165 }
165 }
166 }
166 }
167
167
@@ -169,7 +169,7 @@ AbstractButton {
169 target: scope
169 target: scope
170 onHasDepartmentsChanged: {
170 onHasDepartmentsChanged: {
171 if (scope.hasDepartments) {
171 if (scope.hasDepartments) {
172− departmentModel.append({"departmentId": scope.currentDepartment, "nullifyDepartment": false});
172+ departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});
173 } else {
173 } else {
174 departmentModel.clear();
174 departmentModel.clear();
175 }
175 }
qml/Dash/DashDepartmentsList.qml+2−2
@@ -61,7 +61,7 @@ Item {
61 id: backButton
61 id: backButton
62 objectName: "backButton"
62 objectName: "backButton"
63 width: parent.width
63 width: parent.width
64− visible: department && !department.isRoot
64+ visible: department && !department.isRoot || false
65 height: visible ? itemHeight : 0
65 height: visible ? itemHeight : 0
66
66
67 onClicked: root.goBackToParentClicked();
67 onClicked: root.goBackToParentClicked();
@@ -101,7 +101,7 @@ Item {
101 objectName: "allButton"
101 objectName: "allButton"
102 anchors.top: backButton.bottom
102 anchors.top: backButton.bottom
103 width: parent.width
103 width: parent.width
104− visible: department && (!department.isRoot || (root.currentDepartment && !root.currentDepartment.isRoot && root.currentDepartment.parentId == department.departmentId))
104+ visible: department && (!department.isRoot || (root.currentDepartment && !root.currentDepartment.isRoot && root.currentDepartment.parentDepartmentId == department.departmentId)) || false
105 height: itemHeight
105 height: itemHeight
106
106
107 Label {
107 Label {
tests/mocks/Unity/fake_department.cpp+2−2
@@ -48,7 +48,7 @@ QString Department::allLabel() const
48 return m_allLabel;
48 return m_allLabel;
49}
49}
50
50
51−QString Department::parentId() const
51+QString Department::parentDepartmentId() const
52{
52{
53 return m_parentId;
53 return m_parentId;
54}
54}
@@ -113,7 +113,7 @@ QVariant Department::data(const QModelIndex &index, int role) const
113 return m_departmentId == "root" && index.row() != 3;
113 return m_departmentId == "root" && index.row() != 3;
114 break;
114 break;
115 case RoleIsActive:
115 case RoleIsActive:
116− return m_scope->currentDepartment() == data(index, RoleDepartmentId);
116+ return m_scope->currentDepartmentId() == data(index, RoleDepartmentId);
117 break;
117 break;
118 }
118 }
119 return QVariant();
119 return QVariant();
tests/mocks/Unity/fake_department.h+1−1
@@ -31,7 +31,7 @@ public:
31 QString departmentId() const override;
31 QString departmentId() const override;
32 QString label() const override;
32 QString label() const override;
33 QString allLabel() const override;
33 QString allLabel() const override;
34− QString parentId() const override;
34+ QString parentDepartmentId() const override;
35 QString parentLabel() const override;
35 QString parentLabel() const override;
36 bool loaded() const override;
36 bool loaded() const override;
37 int count() const override;
37 int count() const override;
tests/mocks/Unity/fake_scope.cpp+2−2
@@ -145,7 +145,7 @@ void Scope::closeScope(unity::shell::scopes::ScopeInterface* /*scope*/)
145 qFatal("Scope::closeScope is not implemented");
145 qFatal("Scope::closeScope is not implemented");
146}
146}
147
147
148−QString Scope::currentDepartment() const
148+QString Scope::currentDepartmentId() const
149{
149{
150 return m_currentDeparment;
150 return m_currentDeparment;
151}
151}
@@ -175,5 +175,5 @@ unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& i
175void Scope::loadDepartment(const QString& id)
175void Scope::loadDepartment(const QString& id)
176{
176{
177 m_currentDeparment = id;
177 m_currentDeparment = id;
178− Q_EMIT currentDepartmentChanged();
178+ Q_EMIT currentDepartmentIdChanged();
179}
179}
tests/mocks/Unity/fake_scope.h+1−1
@@ -59,7 +59,7 @@ public:
59 Q_INVOKABLE void cancelActivation() override;
59 Q_INVOKABLE void cancelActivation() override;
60 Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
60 Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
61
61
62− QString currentDepartment() const override;
62+ QString currentDepartmentId() const override;
63 bool hasDepartments() const override;
63 bool hasDepartments() const override;
64 Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;
64 Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;
65 Q_INVOKABLE void loadDepartment(const QString& id) override;
65 Q_INVOKABLE void loadDepartment(const QString& id) override;