Merge lp:~qqworini/ubuntu-rssreader-app/edit-topic-confirm into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

add confirm/cancel buttons for edit topic

add confirm/cancel buttons for edit topic

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

PASSED: Continuous integration, rev:68
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/46/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/407
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/46
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/46
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/46
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/46

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/46/rebuild

review: Approve (continuous-integration)

[Roman Shchekin (mrqtros)]

Seems that all is ok.

review: Approve

[David Planella (dpm)]

Top-approving as per Roman's comment.

=== modified file 'feeds/TopicComponent.qml'
--- feeds/TopicComponent.qml	2013-08-20 15:17:56 +0000
+++ feeds/TopicComponent.qml	2013-09-18 12:16:38 +0000
@@ -18,6 +18,8 @@
     property int topicId
     property int modelIndex
 
+    signal edit()
+
 //    onClicked: isExpended = !isExpended ;
 
     onStateChanged:{
@@ -38,6 +40,26 @@
         }
     }
 
+    function cancelEdit() {
+        rowTopicContent.isEditing = false
+        inputTopicName.text = topicName
+    }
+
+    function confirmEdit() {
+        var result = DB.updateTag(topicComponent.topicId, inputTopicName.text)
+        if (result.rowsAffected == 1)
+        {
+            mainView.changeTopicName(topicComponent.topicId, inputTopicName.text)
+            labelTopicName.text = inputTopicName.text
+            topicName = inputTopicName.text
+        }
+        else
+        {
+            inputTopicName.text = labelTopicName.text
+        }
+        cancelEdit()
+    }
+
     Column{
         id: columnContent
         anchors{ left: parent.left; right: parent.right }
@@ -96,24 +118,12 @@
                         smooth: true
 
                         MouseArea{
+                            enabled: !rowTopicContent.isEditing
                             anchors { fill: parent; margins: units.gu(-1) }
                             onClicked:
                             {
-                                if (rowTopicContent.isEditing)
-                                {
-                                    var result = DB.updateTag(topicComponent.topicId, inputTopicName.text)
-                                    if (result.rowsAffected == 1)
-                                    {
-                                        labelTopicName.text = inputTopicName.text
-                                    }
-                                    else
-                                    {
-                                        inputTopicName.text = labelTopicName.text
-                                    }
-                                }
-                                else
-                                {}
-                                rowTopicContent.isEditing = !rowTopicContent.isEditing
+                                rowTopicContent.isEditing = true
+                                topicComponent.edit()
                             }
                         }
                     }
@@ -139,6 +149,10 @@
 
                         Behavior on width { UbuntuNumberAnimation{} }
 
+                        onAccepted: {
+                            Qt.inputMethod.hide()
+                        }
+
                         Connections {
                             target: Qt.inputMethod
                             onVisibleChanged: {

=== modified file 'feeds/TopicManagement.qml'
--- feeds/TopicManagement.qml	2013-09-01 14:35:33 +0000
+++ feeds/TopicManagement.qml	2013-09-18 12:16:38 +0000
@@ -12,17 +12,7 @@
 
     title: i18n.tr("Management")
     flickable: content
-    tools: ToolbarItems {
-        id: toolbar
-
-        ToolbarButton {
-            id: actionsButton
-            text: i18n.tr("Add Feed")
-            iconSource: Qt.resolvedUrl("../icons_tmp/add.svg")
-            onTriggered: pageStack.push(appendFeedPage/*, {"isDirty" : true}*/) ;
-            visible: true
-        }
-    }
+    tools: toolbar
 
     Component.onCompleted:
     {
@@ -50,6 +40,53 @@
 
     }
 
+    ToolbarItems {
+        id: toolbar
+
+        ToolbarButton {
+            id: actionsButton
+            text: i18n.tr("Add Feed")
+            iconSource: Qt.resolvedUrl("../icons_tmp/add.svg")
+            onTriggered: pageStack.push(appendFeedPage/*, {"isDirty" : true}*/) ;
+            visible: true
+        }
+    }
+
+    ToolbarItems {
+        id: editConfirm
+        opened: true
+        locked: true
+        visible: false
+//        anchors.bottom: content.bottom
+
+        property int editIndex
+
+        back: Button {
+            id: cancelButton
+            text: i18n.tr("Cancel")
+            gradient: UbuntuColors.greyGradient
+            anchors.verticalCenter: parent.verticalCenter
+            onClicked: {
+                topicList.currentItem.cancelEdit()
+                topicManagement.state = ""
+                editConfirm.visible = false
+                topicList.currentIndex = -1
+            }
+        }
+
+        Button {
+            id: confirmButton
+            text: i18n.tr("Confirm")
+            anchors.verticalCenter: parent.verticalCenter
+            onClicked: {
+                topicList.currentItem.confirmEdit()
+                topicManagement.state = ""
+                editConfirm.visible = false
+                topicList.currentIndex = -1
+            }
+        }
+    }
+
     Flickable {
         id: content
         anchors.fill: parent
@@ -103,6 +140,7 @@
                 anchors{ left: parent.left; right: parent.right }
                 height: contentItem.childrenRect.height
                 interactive: false
+                currentIndex: -1
 //                clip: true
 
                 signal collapseAllItem()
@@ -129,12 +167,29 @@
                         anchors{ left: parent.left; right: parent.right }
                         height: topicItem.height
 
+                        function cancelEdit() {
+                            topicItem.cancelEdit()
+                        }
+
+                        function confirmEdit() {
+                            topicItem.confirmEdit()
+                        }
+
                         TopicComponent{
                             id: topicItem
                             topicName: model.name
                             topicId: model.id
                             modelIndex: index
 //                            isExpended: delegateRoot.isExpended
+
+                            onEdit: {
+                                if (topicList.currentItem)
+                                    topicList.currentItem.cancelEdit()
+                                editConfirm.editIndex = index
+                                topicManagement.state = "editMode"
+                                editConfirm.visible = true
+                                topicList.currentIndex = index
+                            }
                         }
 
                         DropArea {
@@ -221,4 +276,21 @@
         }
     }
 
+    states: [
+        State {
+            name: ""
+            PropertyChanges {
+                target: topicManagement
+                tools: toolbar
+            }
+        },
+        State {
+            name: "editMode"
+            PropertyChanges {
+                target: topicManagement
+                tools: editConfirm
+            }
+        }
+    ]
+
 }

=== modified file 'ubuntu-rssreader-app.qml'
--- ubuntu-rssreader-app.qml	2013-09-11 11:56:41 +0000
+++ ubuntu-rssreader-app.qml	2013-09-18 12:16:38 +0000
@@ -87,6 +87,11 @@
         pageStack.push(editFeed) ;
     }
 
+                                                    //  change the topic name if the name changed by management
+    function changeTopicName(topicId, newName) {
+        repeater.changeTopicName(topicId, newName)
+    }
+
     PageStack {
         id: pageStack
 
@@ -216,6 +221,15 @@
                 function reloadSaved() {
                     repeater.itemAt(repeater.model - 1).reload()
                 }
+
+                function changeTopicName(topicId, newName) {
+                    for(var i = 0; i < repeater.count; i++) {
+                        if (repeater.itemAt(i).topicId == topicId) {
+                            repeater.itemAt(i).title = newName
+                            break
+                        }
+                    }
+                }
             } // Repeater
         }