Merge lp:~qqworini/ubuntu-rssreader-app/fix-toolbar-bug into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

fix bug #1231137: Missing "Next" button while adding feed (desktop only)

fix bug #1231137: Missing "Next" button while adding feed (desktop only)

// code like below will produce this bug
Page{
tool: ToolbarItems { // ToolbarItems initial with the page
        id: toolbar

        opened: true // bug from here, never open in desktop
        locked: true // if set lock to false, toolbar can be swiped up

// code like below solve temporarily
Page{
id: page
tool: null // set the tool to null at initialization

ToolbarItems {
        id: toolbar

        opened: true
        locked: true
}

function setTool() {
       page.tools = toolbar // set toolbar manually can solve
}

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

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

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Nice work Joey. It looks good to me as a workaround until the bug in the SDK is fixed, and Jenkins is happy with it.

Just one thing: could you add a comment in the code, referencing this bug? This way in a few weeks time, when none of us remembers why we did this, it'll help us recall the motivation :)

E.g.

// Workaround for bug #1231137

9 + tools: null

review: Approve

[Roman Shchekin (mrqtros)]

It works!

=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml	2013-09-21 09:27:59 +0000
+++ feeds/AppendFeedPage.qml	2013-09-27 05:18:31 +0000
@@ -20,7 +20,9 @@
     //.property var selectedFeeds: null // Become local.
     property bool resultsReceived: false // Indicates that at least once results were received.
 
-    tools: ToolbarItems {
+    tools: null
+
+    ToolbarItems {
         id: appendFeedTools
 
         opened: true
@@ -78,6 +80,7 @@
     }
 
     function reloadPageContent() {
+        appendFeedPage.tools = appendFeedTools
         if (isDirty) {
             tfFeedUrl.text = ""
             resultsReceived = false

=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml	2013-09-11 15:18:51 +0000
+++ feeds/ChooseTopicPage.qml	2013-09-27 05:18:31 +0000
@@ -17,7 +17,9 @@
 
     signal topicChoosen(int topicId, var addedFeeds)
 
-    tools: ToolbarItems {
+    tools: null
+
+    ToolbarItems {
         id: appendFeedTools
 
         opened: true
@@ -37,6 +39,7 @@
     }
 
     function reloadPageContent() {
+        chooseTopicPage.tools = appendFeedTools
         suggestionTopicsModel.clear()
 
         var tags = DB.loadTags()