Merge lp:~aacid/unity8/new-scopes-scope-activation into lp:~unity-team/unity8/new-scopes

[Albert Astals Cid]

Scope activation support

Unmerged revisions

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-01-09 09:05:57 +0000
+++ qml/Dash/Dash.qml	2014-02-18 15:14:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013, 2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,10 +62,19 @@
     DashContent {
         id: dashContent
         objectName: "dashContent"
-        anchors.fill: parent
+        width: parent.width
+        height: parent.height
         model: filteredScopes
         scopes: scopes
         searchHistory: dash.searchHistory
+        visible: x != -width
+        onGotoScope: {
+            dash.setCurrentScope(scopeId, true, false);
+        }
+        onOpenScope: {
+            scopeItem.scope = scope;
+            x = -width;
+        }
         onScopeLoaded: {
             if (scopeId == dash.showScopeOnLoaded) {
                 dash.setCurrentScope(scopeId, false, false)
@@ -74,5 +83,38 @@
         }
         scale: dash.contentScale
         clip: scale != 1.0
+        Behavior on x {
+            UbuntuNumberAnimation {
+                onStopped: {
+                    if (dashContent.x == 0) {
+                        dashContent.closeScope(scopeItem.scope);
+                        scopeItem.scope = null;
+                    }
+                }
+            }
+        }
+    }
+
+    ScopeItem {
+        id: scopeItem
+        anchors.left: dashContent.right
+        width: parent.width
+        height: parent.height
+        searchHistory: dash.searchHistory
+        scale: dash.contentScale
+        clip: scale != 1.0
+        visible: scope != null
+        onBack: {
+            dashContent.x = 0;
+        }
+        onGotoScope: {
+            // TODO
+            console.log("gotoScope from an openScope scope is not implemented");
+        }
+        onOpenScope: {
+            // TODO
+            console.log("openScope from an openScope scope is not implemented");
+        }
+
     }
 }
 
=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-02-14 15:36:43 +0000
+++ qml/Dash/DashContent.qml	2014-02-18 15:14:40 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013, 2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +36,8 @@
     signal contentEndReached()
     signal scopeLoaded(string scopeId)
     signal positionedAtBeginning()
+    signal gotoScope(string scopeId)
+    signal openScope(var scope)
 
     // If we set the current scope index before the scopes have been added,
     // then we need to wait until the loaded signals gets emitted from the scopes
@@ -80,6 +82,10 @@
         }
     }
 
+    function closeScope(scope) {
+        dashContentList.currentItem.theScope.closeScope(scope)
+    }
+
     Item {
         id: dashContentListHolder
         anchors.fill: parent
@@ -136,8 +142,8 @@
                     onLoaded: {
                         item.scope = Qt.binding(function() { return scope })
                         item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
-                        item.tabBarHeight = pageHeader.implicitHeight;
-                        item.pageHeader = pageHeader;
+                        item.tabBarHeight = dashPageHeader.implicitHeight;
+                        item.pageHeader = dashPageHeader;
                         item.openEffect = openEffect;
                         item.previewListView = previewListView;
                         dashContentList.movementStarted.connect(item.movementStarted)
@@ -149,13 +155,23 @@
                         ignoreUnknownSignals: true
                         onEndReached: contentEndReached()
                     }
+                    Connections {
+                        target: isCurrent ? scope : null
+                        onGotoScope: {
+                            // Note here scopeId is the signal parameter and not the loader property
+                            dashContent.gotoScope(scopeId);
+                        }
+                        onOpenScope: {
+                            dashContent.openScope(scope);
+                        }
+                    }
 
                     Component.onDestruction: active = false
                 }
         }
 
         PageHeader {
-            id: pageHeader
+            id: dashPageHeader
             objectName: "pageHeader"
             width: parent.width
             searchEntryEnabled: true
@@ -218,6 +234,7 @@
         openEffect: openEffect
         categoryView: dashContentList.currentItem ? dashContentList.currentItem.categoryView : null
         scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
+        pageHeader: dashPageHeader
         anchors.fill: parent
     }
 }
 
=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-02-14 13:10:46 +0000
+++ qml/Dash/PreviewListView.qml	2014-02-18 15:14:40 +0000
@@ -26,6 +26,7 @@
     property OpenEffect openEffect: null
     property ScopeListView categoryView: null
     property Scope scope: null
+    property var pageHeader: null
 
     property alias open: previewListView.open
     property alias onScreen: previewListView.onScreen
 
=== added file 'qml/Dash/ScopeItem.qml'
--- qml/Dash/ScopeItem.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/ScopeItem.qml	2014-02-18 15:14:40 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Unity 0.2
+import "../Components"
+
+Item {
+    id: root
+
+    property alias scope: scopeView.scope
+
+    property ListModel searchHistory
+
+    signal back
+    signal gotoScope(string scopeId)
+    signal openScope(var scope)
+
+    Item {
+        id: scopeViewHolder
+        anchors.fill: parent
+
+        GenericScopeView {
+            id: scopeView
+            width: parent.width
+            height: parent.height
+            isCurrent: scope != null
+            tabBarHeight: scopeItemPageHeader.implicitHeight
+            pageHeader: scopeItemPageHeader
+            openEffect: openEffect
+            previewListView: previewListView
+
+            Connections {
+                target: isCurrent ? scope : null
+                onGotoScope: root.gotoScope(scopeId);
+                onOpenScope: root.openScope(scope);
+            }
+        }
+
+        PageHeader {
+            id: scopeItemPageHeader
+            width: parent.width
+            searchEntryEnabled: true
+            searchHistory: root.searchHistory
+            scope: root.scope
+            height: units.gu(7)
+
+            childItem: Row {
+                anchors {
+                    fill: parent
+                    leftMargin: units.gu(2)
+                }
+                spacing: units.gu(1)
+                Image {
+                    anchors.verticalCenter: parent.verticalCenter
+                    source: "graphics/dashback.png"
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: root.back();
+                    }
+                }
+                Label {
+                    id: label
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    text: scope ? scope.name : ""
+                    color: "grey"
+                    font.family: "Ubuntu"
+                    font.weight: Font.Light
+                    fontSize: "x-large"
+                    elide: Text.ElideRight
+                    style: Text.Raised
+                    styleColor: "black"
+                }
+            }
+        }
+    }
+
+    DashContentOpenEffect {
+        id: openEffect
+        anchors {
+            fill: parent
+            bottomMargin: -bottomOverflow
+        }
+        sourceItem: scopeViewHolder
+        previewListView: previewListView
+    }
+
+    PreviewListView {
+        id: previewListView
+        openEffect: openEffect
+        categoryView: scopeView.categoryView
+        pageHeader: scopeItemPageHeader
+        scope: root.scope
+        anchors.fill: parent
+    }
+}
 
=== added file 'qml/Dash/graphics/[e-mail]'
 Binary files qml/Dash/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and qml/Dash/graphics/[e-mail]	2014-02-18 15:14:40 +0000 differ