Merge lp:~tiagosh/address-book-app/bugfixing into lp:address-book-app

[Tiago Salem Herrmann]

- add selection mode button to the main view toolbar
- change color of the favorite star
- do not append undefined variable to the contact name
- increase size touch area size for detail types
- do not rely on focus to open/close the detail type list

- add selection mode button to the main view toolbar
- change color of the favorite star
- do not append undefined variable to the contact name
- increase size touch area size for detail types
- do not rely on focus to open/close the detail type list

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:61
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/125/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/126
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2808
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2814
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/409
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/377

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Just tried on the device, the select.png artwork is not being installed, and thus the toolbar button has no icon.

review: Needs Fixing

[lp:~tiagosh/address-book-app/bugfixing]

62. By Tiago Salem Herrmann on 2013-08-29

install new icon

[Gustavo Pichorim Boiko (boiko)]

Looks good now!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/127
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2816
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2816/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/411
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/378

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

review: Approve (continuous-integration)

=== modified file 'src/artwork/CMakeLists.txt'
--- src/artwork/CMakeLists.txt	2013-07-25 21:47:14 +0000
+++ src/artwork/CMakeLists.txt	2013-08-29 21:00:59 +0000
@@ -32,6 +32,7 @@
     protocol-twitter.svg
     protocol-yahoo.svg
     save.png
+    select.png
     settings.png
     vertical-div.png
 )

=== modified file 'src/artwork/favorite-selected.svg'
--- src/artwork/favorite-selected.svg	2013-07-25 20:00:03 +0000
+++ src/artwork/favorite-selected.svg	2013-08-29 21:00:59 +0000
@@ -13,8 +13,8 @@
    height="90.000008"
    id="svg3289"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="[e-mail]">
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="favorite-selected.svg">
   <defs
      id="defs3291" />
   <sodipodi:namedview
@@ -31,7 +31,7 @@
      inkscape:current-layer="g4451"
      showgrid="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1029"
+     inkscape:window-height="1056"
      inkscape:window-x="0"
      inkscape:window-y="24"
      inkscape:window-maximized="1"
@@ -84,7 +84,7 @@
       </g>
       <path
          sodipodi:type="star"
-         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#db4111;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path3008"
          sodipodi:sides="5"
          sodipodi:cx="-29"

=== added file 'src/artwork/select.png'
Binary files src/artwork/select.png	1970-01-01 00:00:00 +0000 and src/artwork/select.png	2013-08-29 21:00:59 +0000 differ
=== modified file 'src/imports/ContactEdit/ValueSelector.qml'
--- src/imports/ContactEdit/ValueSelector.qml	2013-07-25 21:16:28 +0000
+++ src/imports/ContactEdit/ValueSelector.qml	2013-08-29 21:00:59 +0000
@@ -17,13 +17,14 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 
-FocusScope {
+Item {
     id: root
 
     property alias values: listView.model
     property alias currentIndex: listView.currentIndex
-    readonly property bool expanded: activeFocus
+    property bool expanded: false
     readonly property alias text: label.text
+    onExpandedChanged: expanded && timer.start()
 
     function selectItem(text) {
         for(var i=0; i < values.length; i++) {
@@ -35,11 +36,29 @@
         currentIndex = -1
     }
 
-    focus: true
+    // FIXME: workaround to close list after a while.
+    // we cant rely on focus since it hides the keyboard.
+    MouseArea {
+        anchors.fill: parent
+        visible: expanded
+        onPressed: {
+            mouse.accepted = false
+            timer.restart()
+        }
+        propagateComposedEvents: true
+        z: 1
+    }
+
+    Timer {
+        id: timer
+        interval: 5000
+        onTriggered: expanded = false
+        running: false
+    }
 
     Item {
 
-        visible: !root.activeFocus
+        visible: !expanded
         anchors.fill: parent
 
         Label {
@@ -78,7 +97,7 @@
         MouseArea {
             anchors.fill: label
             propagateComposedEvents: true
-            onClicked: root.forceActiveFocus()
+            onClicked: expanded = true
         }
     }
 
@@ -87,7 +106,7 @@
 
         anchors.fill: parent
         orientation: ListView.Horizontal
-        visible: root.activeFocus
+        visible: expanded
 
         delegate: Item {
             anchors {
@@ -129,7 +148,9 @@
                 opacity: currentIndex == index ? 1.0 : 0.2
 
                 MouseArea {
-                    anchors.fill: parent
+                    width: parent.width + units.gu(0.5)
+                    height: parent.height + units.gu(0.5)
+                    anchors.centerIn: parent
                     onClicked: currentIndex = index
                 }
             }

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2013-08-08 19:00:15 +0000
+++ src/imports/ContactList/ContactListPage.qml	2013-08-29 21:00:59 +0000
@@ -104,6 +104,14 @@
         locked: contactList.isInSelectionMode
         ToolbarButton {
             action: Action {
+                objectName: "selectButton"
+                text: i18n.tr("Select")
+                iconSource: "artwork:/select.png"
+                onTriggered: contactList.startSelection()
+            }
+        }
+        ToolbarButton {
+            action: Action {
                 text: i18n.tr("Add")
                 iconSource: "artwork:/add.png"
                 onTriggered: {

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2013-08-28 17:06:38 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2013-08-29 21:00:59 +0000
@@ -178,7 +178,10 @@
                 values += " "
             }
             if (detail) {
-                values +=  detail.value(detailFields[i])
+                var value = detail.value(detailFields[i])
+                if (value !== undefined) {
+                    values += value
+                }
             }
         }