Merge lp:~renatofilho/address-book-app/fix-1199122-phase2 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Replaced contact edit toolbar to a sheet component.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/102

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/102/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good.

review: Approve

=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
--- src/imports/ContactEdit/CMakeLists.txt	2013-07-16 18:05:26 +0000
+++ src/imports/ContactEdit/CMakeLists.txt	2013-08-02 17:47:26 +0000
@@ -8,6 +8,7 @@
     ContactDetailPhoneNumbersEditor.qml
     ContactDetailWithTypeEditor.qml
     ContactEditor.qml
+    EditToolbar.qml
     TextInputDetail.qml
     ValueSelector.qml
 )

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2013-08-01 18:44:51 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2013-08-02 17:47:26 +0000
@@ -76,7 +76,12 @@
         id: scrollArea
 
         flickableDirection: Flickable.VerticalFlick
-        anchors.fill: parent
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: toolbar.top
+        }
         contentHeight: contents.height
         contentWidth: parent.width
         visible: !busyIndicator.visible
@@ -181,19 +186,25 @@
         }
     }
 
-    tools: ToolbarItems {
-        locked: true
-        opened: true
-        ToolbarButton {
-            action: Action {
-                text: i18n.tr("Done")
-                iconSource: "artwork:/save.png"
-                onTriggered: {
-                    // wait for contact to be saved or cause a error
-                    contactSaveLock.saving = true
-                    contactEditor.save()
-                }
+    EditToolbar {
+        id: toolbar
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        height: units.gu(6)
+        acceptAction: Action {
+            text: i18n.tr("Save")
+            onTriggered: {
+                // wait for contact to be saved or cause a error
+                contactSaveLock.saving = true
+                contactEditor.save()
             }
         }
+        rejectAction: Action {
+            text: i18n.tr("Cancel")
+            onTriggered: pageStack.pop()
+        }
     }
 }

=== added file 'src/imports/ContactEdit/EditToolbar.qml'
--- src/imports/ContactEdit/EditToolbar.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactEdit/EditToolbar.qml	2013-08-02 17:47:26 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2012-2013 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 Ubuntu.Components.ListItems 0.1 as ListItem
+
+Rectangle {
+    id: root
+
+    signal reject()
+    signal accept()
+
+    property alias acceptAction: accept.action
+    property alias rejectAction: reject.action
+
+    color: "gray"
+
+    Button {
+        id: reject
+
+        action: Action {
+            text: i18n.tr("Cancel")
+        }
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        onClicked: root.reject()
+    }
+
+    Button {
+        id: accept
+
+        action: Action {
+            text: i18n.tr("Done")
+        }
+        anchors {
+            right: parent.right
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        onClicked: root.accept()
+    }
+}