Merge lp:~boiko/phone-app/contact_editing_toolbar into lp:phone-app

[Gustavo Pichorim Boiko]

Add a temporary toolbar shown when editing contacts to make it easier to save or cancel the editing.

Add a temporary toolbar shown when editing contacts to make it easier to save or cancel the editing.

[lp:~boiko/phone-app/contact_editing_toolbar]

651. By Gustavo Pichorim Boiko on 2013-05-23

Remove leftover code.

652. By Gustavo Pichorim Boiko on 2013-05-23

Fix copyright.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:652
http://jenkins.qa.ubuntu.com/job/phone-app-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/115/rebuild

review: Approve (continuous-integration)

[lp:~boiko/phone-app/contact_editing_toolbar]

653. By Gustavo Pichorim Boiko on 2013-05-23

Move the buttons away from the border to avoid triggering the edge swipe when
clicking the button.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:653
http://jenkins.qa.ubuntu.com/job/phone-app-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/90

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/117/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good.

review: Approve

=== modified file 'src/qml/DetailViewContact/ContactDetails.qml'
--- src/qml/DetailViewContact/ContactDetails.qml	2013-05-20 20:54:07 +0000
+++ src/qml/DetailViewContact/ContactDetails.qml	2013-05-23 22:20:33 +0000
@@ -40,6 +40,7 @@
     title: "Contact Details"
 
     tools: ToolbarActions {
+        lock: editable
 
         Action {
             text: "Edit"
@@ -50,6 +51,7 @@
         }
 
         Action {
+            id: deleteAction
             text: "Delete"
             iconSource: Qt.resolvedUrl("../assets/delete.png")
             visible: editable && !added
@@ -62,6 +64,7 @@
         }
 
         Action {
+            id: cancelAction
             text: "Cancel"
             iconSource: Qt.resolvedUrl("../assets/cancel.png")
             visible: editable
@@ -77,6 +80,7 @@
         }
 
         Action {
+            id: saveAction
             text: "Save"
             iconSource: Qt.resolvedUrl("../assets/save.png")
             visible: editable
@@ -163,7 +167,7 @@
         id: scrollArea
 
         anchors.top: parent.top
-        anchors.bottom: keyboard.top
+        anchors.bottom: editToolbar.top
         anchors.left: parent.left
         anchors.right: parent.right
         flickableDirection: Flickable.VerticalFlick
@@ -266,6 +270,23 @@
         }
     }
 
+    EditToolbar {
+        id: editToolbar
+        visible: editable
+        anchors.bottom: keyboard.top
+
+        onDeleteClicked: deleteAction.triggered(editToolbar)
+        onCancelClicked: cancelAction.triggered(editToolbar)
+        onSaveClicked: saveAction.triggered(editToolbar)
+
+        onVisibleChanged: {
+            if (visible) {
+                // hide the toolbar
+                toolbar.opened = false;
+            }
+        }
+    }
+
     Scrollbar {
         flickableItem: scrollArea
         align: Qt.AlignTrailing

=== added file 'src/qml/DetailViewContact/EditToolbar.qml'
--- src/qml/DetailViewContact/EditToolbar.qml	1970-01-01 00:00:00 +0000
+++ src/qml/DetailViewContact/EditToolbar.qml	2013-05-23 22:20:33 +0000
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of phone-app.
+ *
+ * phone-app 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.
+ *
+ * phone-app 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 as Theming
+
+Item {
+    id: toolbar
+    Theming.ItemStyle.class: "toolbar"
+    height: visible ? units.gu(6.5) : 0
+    anchors.left: parent.left
+    anchors.right: parent.right
+
+    signal deleteClicked()
+    signal cancelClicked()
+    signal saveClicked()
+
+    Component {
+        id: toolButtonComponent
+        Item {
+            id: toolButton
+            Theming.ItemStyle.class: "toolbar-button"
+            property string text: parent && parent.text ? parent.text : ""
+            property url iconSource: parent && parent.iconSource ? parent.iconSource : ""
+            signal clicked()
+            width: units.gu(5)
+            height: toolbar.height
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: parent.clicked()
+            }
+        }
+    }
+
+    Loader {
+        id: backButton
+        sourceComponent: toolButtonComponent
+
+        property string text: tools.back.text
+        property string iconSource: tools.back.iconSource
+
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
+        onStatusChanged: {
+            if (item && status == Loader.Ready) {
+                if (item.hasOwnProperty("clicked")) item.clicked.connect(backButton.itemTriggered);
+            }
+        }
+        signal itemTriggered()
+        onItemTriggered: mainView.resetView();
+    }
+
+    Row {
+        id: buttonsRow
+        anchors.right: parent.right
+        anchors.rightMargin: units.gu(2)
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+
+        //delete, cancel, save
+        Loader {
+            id: deleteButton
+
+            property string text: "Delete"
+            property string iconSource: Qt.resolvedUrl("../assets/delete.png")
+            sourceComponent: toolButtonComponent
+            anchors.verticalCenter: parent.verticalCenter
+            onStatusChanged: {
+                if (item && status == Loader.Ready) {
+                    if (item.hasOwnProperty("clicked")) item.clicked.connect(deleteButton.itemTriggered);
+                }
+            }
+            signal itemTriggered()
+            onItemTriggered: toolbar.deleteClicked()
+            visible: !added
+        }
+
+        Loader {
+            id: cancelButton
+
+            property string text: "Cancel"
+            property string iconSource: Qt.resolvedUrl("../assets/cancel.png")
+            sourceComponent: toolButtonComponent
+            anchors.verticalCenter: parent.verticalCenter
+            onStatusChanged: {
+                if (item && status == Loader.Ready) {
+                    if (item.hasOwnProperty("clicked")) item.clicked.connect(cancelButton.itemTriggered);
+                }
+            }
+            signal itemTriggered()
+            onItemTriggered: toolbar.cancelClicked()
+        }
+
+        Loader {
+            id: saveButton
+
+            property string text: "Save"
+            property string iconSource: Qt.resolvedUrl("../assets/save.png")
+            sourceComponent: toolButtonComponent
+            anchors.verticalCenter: parent.verticalCenter
+            onStatusChanged: {
+                if (item && status == Loader.Ready) {
+                    if (item.hasOwnProperty("clicked")) item.clicked.connect(saveButton.itemTriggered);
+                }
+            }
+            signal itemTriggered()
+            onItemTriggered: toolbar.saveClicked()
+        }
+    }
+}