git.iko.soy/unity8
on xenial help sign in
Open Pre-populated scope when click favourite scopes from Manage Dash
commit66160ebf1b3d8d5f67bfe8a9186363f74de53f75 authorhandsome_feng <445865575@qq.com> dateFri 24 Apr 2015, 15:33 (12 years ago) parente1fdd20
3 files changed+12−1
compare with xenial
unifiedsplit
qml/Dash/Dash.qml+5 qml/Dash/ScopesList.qml+2 qml/Dash/ScopesListCategory.qml+5−1
qml/Dash/Dash.qml+5
@@ -187,6 +187,11 @@ Showable {
187187 onRequestFavoriteMoveTo: {
188188 scopes.moveFavoriteTo(scopeId, index);
189189 }
190+ onRequestRestore: {
191+ bottomEdgeController.enableAnimation = true;
192+ bottomEdgeController.progress = 0;
193+ dash.setCurrentScope(scopeId, false, false);
194+ }
190195
191196 Binding {
192197 target: scopesList.scope
qml/Dash/ScopesList.qml+2
@@ -31,6 +31,7 @@ Item {
3131 signal storeClicked()
3232 signal requestFavorite(string scopeId, bool favorite)
3333 signal requestFavoriteMoveTo(string scopeId, int index)
34+ signal requestRestore(string scopeId)
3435
3536 state: "browse"
3637
@@ -124,6 +125,7 @@ Item {
124125 onRequestEditMode: root.state = "edit";
125126 onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
126127 onRequestActivate: root.scope.activate(result);
128+ onRequestRestore: root.requestRestore(scopeId);
127129 }
128130 }
129131 }
qml/Dash/ScopesListCategory.qml+5−1
@@ -35,6 +35,7 @@ Item {
3535 signal requestEditMode()
3636 signal requestScopeMoveTo(string scopeId, int index)
3737 signal requestActivate(var result)
38+ signal requestRestore(string scopeId)
3839
3940 implicitHeight: visible ? childrenRect.height : 0
4041
@@ -93,7 +94,10 @@ Item {
9394
9495 onClicked: {
9596 if (!editMode) {
96− root.requestActivate(result);
97+ if (root.isFavoritesFeed)
98+ root.requestRestore(model.scopeId);
99+ else
100+ root.requestActivate(result);
97101 }
98102 }
99103 onPressAndHold: {