Merge lp:~qqworini/ubuntu-rssreader-app/editable-topic-name into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

new feature: editable topic name and removable topic item

new feature: editable topic name and removable topic item

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

FAILED: Continuous integration, rev:44
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/120/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/409
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/115
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/120
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/120
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/115

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

review: Needs Fixing (continuous-integration)

[lp:~qqworini/ubuntu-rssreader-app/editable-topic-name]

45. By Joey Chan on 2013-08-22

new feature: editable topic name and removable topic item

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2013-05-23 10:56:53 +0000
+++ .bzrignore	2013-08-22 15:37:02 +0000
@@ -5,3 +5,4 @@
 debian/*.debhelper.log
 debian/*.substvars
 RE:\.?[^.]+
+./ubuntu-rssreader-app.qmlproject

=== modified file 'databasemodule_v2.js'
--- databasemodule_v2.js	2013-08-08 15:15:39 +0000
+++ databasemodule_v2.js	2013-08-22 15:37:02 +0000
@@ -167,6 +167,21 @@
     return dbResult
 }
 
+function deleteFeedByTagId(tagId)
+{
+    var db = openStdDataBase()
+    var dbResult
+    db.transaction(function (tx) {
+//        ensureFeedTableExists(tx)
+        tx.executeSql('PRAGMA foreign_keys = ON;')   // enable foreign key support
+        dbResult = tx.executeSql('delete from feed where exists (select 1 from feed_tag where feed_tag.feed_id = feed.id and feed_tag.tag_id = ?)',
+                                 [tagId])
+        console.log("feed delete by tag id, AFFECTED ROWS: ", dbResult.rowsAffected)
+    }
+    )
+    return dbResult
+}
+
 // select feeds without of topic (tag).
 function loadFeedsWithoutTopic()
 {
@@ -515,7 +530,7 @@
 
     db.transaction(function(tx) {
         dbResult = tx.executeSql("DELETE FROM feed_tag WHERE feed_id = ? AND tag_id = ?", [feedId, tagId])
-        console.log("feed_tag delete by feedId and tagId: ", dbResult.rows.length)
+        console.log("feed_tag delete by feedId and tagId: ", dbResult.rowsAffected)
     }
     )
     return dbResult;

=== modified file 'feeds/TopicComponent.qml'
--- feeds/TopicComponent.qml	2013-08-03 10:06:36 +0000
+++ feeds/TopicComponent.qml	2013-08-22 15:37:02 +0000
@@ -16,14 +16,13 @@
     property bool isExpended: false
     property string topicName
     property int topicId
+    property int modelIndex
 
 //    onClicked: isExpended = !isExpended ;
 
-    onStateChanged:
-    {
-        if (isExpended)
-        {
-            reloadFeed() ;
+    onStateChanged:{
+        if (isExpended){
+            reloadFeed()
         }
     }
 
@@ -31,37 +30,154 @@
         NumberAnimation { duration: 150; easing.type: Easing.OutQuad }
     }
 
-    function reloadFeed ()
-    {
-//        for (var j=0; j < columnFeeds.children.length; j++)
-//        {
-//            columnFeeds.children[j].destroy() ;
-//        }
-        feedModel.clear() ;
-        var feeds_tag =  DB.loadFeedsFromTag(topicId) ;
-//        var feed_array = [] ;
-        for (var i=0; i< feeds_tag.rows.length; i++)
-        {
-//            feed_array.push(feeds_tag.rows.item(i)) ;
-//            var component = Qt.createComponent("./FeedComponent.qml");
-//            var sprite = component.createObject(columnFeeds, {"text": feeds_tag.rows[i].title});
+    function reloadFeed (){
+        feedModel.clear()
+        var feeds_tag =  DB.loadFeedsFromTag(topicId)
+        for (var i=0; i< feeds_tag.rows.length; i++){
             feedModel.append(feeds_tag.rows[i]) ;
         }
-//        columnFeeds.height = columnFeeds.childrenRect.height ;
-//        return feed_array ;
     }
 
-    Column
-    {
+    Column{
         id: columnContent
         anchors{ left: parent.left; right: parent.right }
 
-        ListItem.Standard
+        Item
         {
-            id: headerTopic
-            text: topicName
-
-            onClicked: isExpended = !isExpended ;
+            anchors{ left: parent.left; right: parent.right }
+            height: units.gu(5)
+
+            ListItem.Base{
+                id: headerTopic
+                removable: true
+                height: units.gu(5)
+
+                onClicked: isExpended = !isExpended
+
+                onItemRemoved:{
+                    console.log("item about to be removed: ", topicComponent.topicId)
+//                    itemCancelDelete.startCounting()
+                    var result = DB.deleteFeedByTagId(topicComponent.topicId)
+                    if (result.rowsAffected == undefined)
+                    {
+                        topicManagement.reloadTopics()
+                    }
+                    result = DB.deleteTag(topicComponent.topicId)
+//                            topicManagement.reloadTopics()
+                    if (result.rowsAffected == 1)
+                    {
+                        topicManagement.removeModelItem(topicComponent.modelIndex)
+                    }
+                    else
+                    {
+                        topicManagement.reloadTopics()
+                    }
+                }
+
+                Row{
+                    id: rowTopicContent
+                    anchors
+                    {
+                        top: parent.top; bottom: parent.bottom; left: parent.left;
+                        leftMargin: units.gu(0); topMargin: units.gu(1); bottomMargin: units.gu(1);
+                    }
+                    spacing: units.gu(2)
+
+                    property bool isEditing: false
+
+                    Image{
+                        anchors
+                        {
+                            top: parent.top; bottom: parent.bottom;
+                            topMargin: units.gu(0.5); bottomMargin: units.gu(0.5);
+                        }
+                        fillMode: Image.PreserveAspectFit
+                        source: Qt.resolvedUrl("../icons_tmp/compose.svg")
+                        smooth: true
+
+                        MouseArea{
+                            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
+                            }
+                        }
+                    }
+
+                    Label{
+                        id: labelTopicName
+                        anchors.verticalCenter: parent.verticalCenter
+                        text: topicName
+                        width: rowTopicContent.isEditing ? 0 : paintedWidth
+                        opacity: rowTopicContent.isEditing ? 0 : 1
+
+    //                    Behavior on width { UbuntuNumberAnimation{} }
+                    }
+
+                    TextField{
+                        id: inputTopicName
+                        anchors.verticalCenter: parent.verticalCenter
+                        text: topicName
+                        width: rowTopicContent.isEditing ? headerTopic.width - units.gu(15) : 0
+                        opacity: rowTopicContent.isEditing ? 1 : 0
+                        hasClearButton: true
+                        activeFocusOnPress: true
+
+                        Behavior on width { UbuntuNumberAnimation{} }
+
+                        Connections {
+                            target: Qt.inputMethod
+                            onVisibleChanged: {
+                                if (!Qt.inputMethod.visible) {
+                                    topicComponent.focus = true
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Image{
+                    id: imgArrow
+                    anchors
+                    {
+                        right: parent.right; top: parent.top; bottom: parent.bottom;
+                        topMargin: units.gu(1.5); bottomMargin: units.gu(1.5); rightMargin: units.gu(2)
+                    }
+                    fillMode: Image.PreserveAspectFit
+                    source: Qt.resolvedUrl("../icons_tmp/go-to.svg")
+                    smooth: true
+
+                    Behavior on rotation { UbuntuNumberAnimation{} }
+
+                    states: [
+                        State {
+                            name: "expended"
+                            when: topicComponent.isExpended
+
+                            PropertyChanges
+                            {
+                                target: imgArrow
+                                rotation: 90
+                            }
+                        }
+                    ]
+                }
+            }
+
         }
 
         ListView

=== modified file 'feeds/TopicManagement.qml'
--- feeds/TopicManagement.qml	2013-08-08 17:17:28 +0000
+++ feeds/TopicManagement.qml	2013-08-22 15:37:02 +0000
@@ -10,9 +10,6 @@
     objectName: "topicmanagement"
     id: topicManagement
 
-//    width: units.gu(50)
-//    height: units.gu(75)
-
     title: i18n.tr("Management")
     flickable: content
     tools: ToolbarItems {
@@ -29,31 +26,26 @@
 
     Component.onCompleted:
     {
-        reloadTopics () ;
+        reloadTopics ()
     }
 
     function reloadTopics ()
     {
-        topicModel.clear() ;
-//        for (var j=0; j < topicColumn.children.length; j++)
-//        {
-//            topicColumn.children[j].destroy() ;
-//        }
-
-        var topics = DB.loadTags() ;
-        for (var i=0; i < topics.rows.length; i++)
-        {
+        topicModel.clear()
+        var topics = DB.loadTags()
+        for (var i=0; i < topics.rows.length; i++){
             topicModel.append(
                     {
                 "id": topics.rows[i].id
                 ,"name": topics.rows[i].name
-            });
-
-//            var component = Qt.createComponent("./TopicComponent.qml");
-//            var sprite = component.createObject(topicColumn, {"topicName": topics.rows[i].name});
+            })
         }
     }
 
+    function removeModelItem (modelIndex){
+        topicModel.remove(modelIndex)
+    }
+
     function reloadPageContent() {
 
     }
@@ -64,8 +56,7 @@
         contentHeight: contentItem.childrenRect.height
         boundsBehavior: (contentHeight > topicManagement.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
 
-        Column
-        {
+        Column{
             anchors{ left: parent.left; right: parent.right }
 
             Item {
@@ -74,22 +65,19 @@
                 anchors{ left: parent.left; right: parent.right }
                 height: units.gu(8)
 
-                UbuntuShape
-                {
+                UbuntuShape{
                     id: uAddTopic
                     anchors { fill: parent; margins: units.gu(1) }
                     gradientColor: "goldenrod"
                     radius: "medium"
 
-                    Label
-                    {
+                    Label{
                         text: i18n.tr("Add a Topic")
                         fontSize: "large"
                         anchors.centerIn: parent
                     }
 
-                    MouseArea
-                    {
+                    MouseArea{
                         id: maAddTopic
                         anchors.fill: parent
                         onClicked: pageStack.push(createTopicPage)
@@ -110,8 +98,7 @@
                 }
             }
 
-            ListView
-            {
+            ListView {
                 id: topicList
                 anchors{ left: parent.left; right: parent.right }
                 height: contentItem.childrenRect.height
@@ -120,15 +107,8 @@
 
                 signal collapseAllItem()
 
-                function collapseAll()
-                {
-//                    console.log("topicList length", topicList.contentItem.children.length) ;
-//                    for (var j=0; j < topicList.contentItem.children.length; j++)
-//                    {
-//                        console.log("topicList children", topicList.contentItem.children[j]) ;
-//                        topicList.contentItem.children[j].isExpended = false ;
-//                    }
-                    collapseAllItem() ;
+                function collapseAll(){
+                    collapseAllItem()
                 }
 
                 displaced: Transition {
@@ -149,78 +129,64 @@
                         anchors{ left: parent.left; right: parent.right }
                         height: topicItem.height
 
-//                        onPressAndHold:
-//                        {
-//                            delegateRoot.drag.target = icon
-//                        }
-
-                        TopicComponent
-                        {
+                        TopicComponent{
                             id: topicItem
                             topicName: model.name
                             topicId: model.id
+                            modelIndex: index
 //                            isExpended: delegateRoot.isExpended
                         }
 
                         DropArea {
                             anchors { fill: parent; margins: 0 }
 
-                            onEntered:
-                            {
+                            onEntered:{
 //                                console.log("enter", drag.source)
-                                topicItem.selected = true ;
+                                topicItem.selected = true
                             }
 
-                            onExited:
-                            {
+                            onExited:{
 //                                console.log("exit", drag.source)
-                                topicItem.selected = false ;
+                                topicItem.selected = false
                             }
 
-                            onDropped:
-                            {
-//                                console.log("drop", drag.source) ;
-                                topicItem.selected = false ;
-                                drag.source.opacity = 0 ;
-                                console.log("dropped item feed id", drag.source.feedId) ;
-                                console.log("dropped item topic id", drag.source.topicId) ;
-                                DB.deleteFeedTag(drag.source.feedId, drag.source.topicId) ;
-                                DB.addFeedTag(drag.source.feedId, model.id) ;
-                                delegateRoot.isExpended = true ;
+                            onDropped:{
+//                                console.log("drop", drag.source)
+                                topicItem.selected = false
+                                drag.source.opacity = 0
+                                console.log("dropped item feed id", drag.source.feedId)
+                                console.log("dropped item topic id", drag.source.topicId)
+                                DB.deleteFeedTag(drag.source.feedId, drag.source.topicId)
+                                DB.addFeedTag(drag.source.feedId, model.id)
+                                delegateRoot.isExpended = true
                             }
                         }
 
-                        Connections
-                        {
+                        Connections{
                             id: connTopicList
                             target: topicList
 
                             onCollapseAllItem:
                             {
-                                delegateRoot.isExpended = false ;
+                                delegateRoot.isExpended = false
                             }
                         }
 
-                        Connections
-                        {
+                        Connections{
                             id: connEditFeed0
                             target: editFeed
 
-                            onApply:
-                            {
-                                if (model.id == newTopicId || model.id == previousTopicId)
-                                {
-                                    topicItem.reloadFeed() ;
-                                    topicItem.isExpended = true ;
+                            onApply:{
+                                if (model.id == newTopicId || model.id == previousTopicId){
+                                    topicItem.reloadFeed()
+                                    topicItem.isExpended = true
                                 }
                             }
 
-                            onDeleteFeed:
-                            {
-                                if (model.id == topicId)
-                                {
-                                    topicItem.reloadFeed() ;
-                                    topicItem.isExpended = true ;
+                            onDeleteFeed:{
+                                if (model.id == topicId){
+                                    topicItem.reloadFeed()
+                                    topicItem.isExpended = true
                                 }
                             }
                         }
@@ -231,31 +197,25 @@
         } // column
     } // flickable
 
-    Connections
-    {
+    Connections{
         id: connAddTopic
         target: createTopicPage
 
-        onTopicAdded:
-        {
-            reloadTopics() ;
+        onTopicAdded:{
+            reloadTopics()
         }
     }
 
-    Connections
-    {
+    Connections {
         id: connAddFeed
         target: chooseTopicPage
 
-        onFeedAdded:
-        {
-            reloadTopics() ;
-            for (var i=0; i<topicModel.count; i++)
-            {
-                if (topicModel.get(i).id == topicId)
-                {
-                    topicList.currentIndex = i ;
-                    topicList.currentItem.isExpended = true ;
+        onFeedAdded:{
+            reloadTopics()
+            for (var i=0; i<topicModel.count; i++){
+                if (topicModel.get(i).id == topicId){
+                    topicList.currentIndex = i
+                    topicList.currentItem.isExpended = true
                 }
             }
         }