Merge lp:~mzanetti/reminders-app/improve-edit-tags into lp:reminders-app

[Michael Zanetti]

Improve the edit tags dialog and some other strings

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:450
http://91.189.93.70:8080/job/reminders-app-ci/754/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2909
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2909/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/356
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/176

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/754/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Great improvement!
Some feedbacks inline...

review: Needs Fixing

[Michael Zanetti (mzanetti)]

thanks! Inline replies

[Riccardo Padovani (rpadovani)]

> Hmm... I tried with a Popover at first, but in this context it didn't feel right. Just having an
> UbuntuShape without the arrow pointing to the input seems odd too. IMO the rectangle fits best here
> but not sure... Maybe we can ask popey for a thirst opinion.

Well, I didn't test it so it was just an idea, you know the UX doesn't run strong in me.
We can indeed ask popey tomorrow.

I approve on my side because code and all other things looks good

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:451
http://91.189.93.70:8080/job/reminders-app-ci/756/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2916
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2916/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/358/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/178/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/756/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

I found the UI worked as I'd expect. I can easily enter new tags and select (and de-select) from the existing ones. I don't have any particularly strong opinion on the shape of the list, it works, it looks consistent with other apps, it's good. :)

review: Approve

[Riccardo Padovani (rpadovani)]

Well, then with popey's blessing I land this :-)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/448/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2921/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/226/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/170/console

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/449/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2922/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/227/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/171/console

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/improve-edit-tags]

452. By Michael Zanetti on 2015-06-12

merge trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/app/qml/components/EditTagsDialog.qml'
--- src/app/qml/components/EditTagsDialog.qml	2015-02-27 22:43:12 +0000
+++ src/app/qml/components/EditTagsDialog.qml	2015-06-12 09:48:34 +0000
@@ -26,6 +26,12 @@
 Dialog {
     id: root
 
+    title: i18n.tr("Edit tags")
+    text: tags.count == 0 ? noTagsText : haveTagsText
+
+    property string noTagsText: i18n.tr("Enter a tag name to attach it to the note.")
+    property string haveTagsText: i18n.tr("Enter a tag name or select one from the list to attach it to the note.")
+
     property var note
     property int pageHeight
 
@@ -35,42 +41,105 @@
         id: tags
     }
 
+    SortFilterModel {
+        id: tagsSortFilterModel
+        model: tags
+        filter.property: "name"
+        filter.pattern: RegExp(textField.text)
+    }
+
     RowLayout {
         Layout.preferredWidth: parent.width - units.gu(2)
         Layout.alignment: Qt.AlignHCenter
+        z: 2
 
-        TextField {
-            id: textField
+        Item {
             Layout.fillWidth: true
-            placeholderText: i18n.tr("Create a new tag")
-
-            onAccepted: accept();
-
-            function accept() {
-                var tagName = text;
-                text = '';
-
-                // Check if the tag exists
-                for (var i=0; i < tags.count; i++) {
-                    var tag = tags.tag(i);
-                    if (tag.name == tagName) {
-                        // The tag exists, check if is already selected: if it is,
-                        // do nothing, otherwise add to tags of the note
-                        if (note.tagGuids.indexOf(tag.guid) === -1) {
-                            note.tagGuids.push(tag.guid);
-                        }
-                        return;
-                    }
-                }
-
-                var newTag = NotesStore.createTag(tagName);
-                print("tag created", newTag.name, "appending to note");
-                note.tagGuids.push(newTag.guid)
+            Layout.preferredHeight: okButton.height
+
+            TextField {
+                id: textField
+                placeholderText: i18n.tr("Tag name")
+                anchors.fill: parent
+
+                onAccepted: accept();
+
+                function accept() {
+                    var tagName = text;
+                    text = '';
+
+                    // Check if the tag exists
+                    for (var i=0; i < tags.count; i++) {
+                        var tag = tags.tag(i);
+                        if (tag.name == tagName) {
+                            // The tag exists, check if is already selected: if it is,
+                            // do nothing, otherwise add to tags of the note
+                            if (note.tagGuids.indexOf(tag.guid) === -1) {
+                                note.tagGuids.push(tag.guid);
+                            }
+                            return;
+                        }
+                    }
+
+                    var newTag = NotesStore.createTag(tagName);
+                    print("tag created", newTag.name, "appending to note");
+                    note.tagGuids.push(newTag.guid)
+                }
+
+            }
+
+            Rectangle {
+                anchors {
+                    left: textField.left
+                    top: textField.bottom
+                    right: textField.right
+                }
+                color: "white"
+                border.width: units.dp(1)
+                border.color: "black"
+                height: Math.min(5, tagsListView.count) * units.gu(4)
+                visible: textField.text.length > 0 && (textField.focus || tagsListView.focus)
+
+                ListView {
+                    id: tagsListView
+                    anchors.fill: parent
+                    model: tagsSortFilterModel
+                    clip: true
+
+                    delegate: Empty {
+                        height: units.gu(4)
+                        RowLayout {
+                            id: tagRow
+                            anchors.fill: parent
+                            anchors.margins: units.gu(1)
+                            spacing: units.gu(1)
+
+                            property bool used: root.note ? root.note.tagGuids.indexOf(model.guid) !== -1 : false
+                            Label {
+                                text: model.name
+                                color: textField.text === model.name ? UbuntuColors.orange : "black"
+                                Layout.fillHeight: true
+                                Layout.fillWidth: true
+                            }
+                            Icon {
+                                name: "tick"
+                                visible: tagRow.used
+                                Layout.fillHeight: true
+                            }
+                        }
+
+                        onClicked: {
+                            textField.text = model.name
+                        }
+                    }
+                }
             }
         }
 
+
         Button {
-            text: i18n.tr("Create tag")
+            id: okButton
+            text: i18n.tr("OK")
             color: UbuntuColors.orange
             enabled: textField.text.replace(/\s+/g, '') !== ''; // Not only whitespaces!
             onClicked: textField.accept()
@@ -86,7 +155,7 @@
         currentlyExpanded: true
         multiSelection: true
 
-        containerHeight: Math.min(root.pageHeight - textField.height - closeButton.height - units.gu(12), tags.count * itemHeight)
+        containerHeight: Math.min(root.pageHeight / 3, tags.count * itemHeight)
 
         model: tags
 
@@ -117,7 +186,7 @@
 
         color: UbuntuColors.orange
 
-        text: i18n.tr("Done")
+        text: i18n.tr("Close")
 
         onClicked: {
             root.done();

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-05-30 16:18:42 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-06-12 09:48:34 +0000
@@ -647,7 +647,7 @@
             RtfButton {
                 iconName: "tick"
                 // TRANSLATORS: Button to close the edit mode
-                text: i18n.tr("Done")
+                text: i18n.tr("Close")
                 height: parent.height
                 iconColor: UbuntuColors.green
                 onClicked: {

=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp	2015-06-11 21:38:27 +0000
+++ src/libqtevernote/notesstore.cpp	2015-06-12 09:48:34 +0000
@@ -499,6 +499,12 @@
 
 Tag* NotesStore::createTag(const QString &name)
 {
+    foreach (Tag *tag, m_tags) {
+        if (tag->name() == name) {
+            return tag;
+        }
+    }
+
     QString newGuid = QUuid::createUuid().toString();
     newGuid.remove("{").remove("}");
     Tag *tag = new Tag(newGuid, 1, this);