Merge lp:~vthompson/ubuntu-rssreader-app/show-osk into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Victor Thompson]

Allow text fields to trigger OSK.

Allow text fields to trigger OSK.

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

FAILED: Continuous integration, rev:158
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/142/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/669
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/142
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/142
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/29

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

review: Needs Fixing (continuous-integration)

[Roman Shchekin (mrqtros)]

As Joey already answered in email, it's design team decision.

review: Disapprove

[lp:~vthompson/ubuntu-rssreader-app/show-osk]

159. By Victor Thompson on 2014-01-12

Update Feed labels.

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

FAILED: Continuous integration, rev:159
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/144/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/677
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/144
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/144
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/31

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

159. By Victor Thompson on 2014-01-12

Update Feed labels.

158. By Victor Thompson on 2014-01-11

Allow text fields to trigger OSK.

=== modified file 'feeds/EditFeed.qml'
--- feeds/EditFeed.qml	2013-11-25 14:20:53 +0000
+++ feeds/EditFeed.qml	2014-01-12 22:05:07 +0000
@@ -128,18 +128,10 @@
                 Label
                 {
                     id: labelTitle
-                    text: i18n.tr("Title: ")
-                    width: units.gu(6)
-                    anchors.verticalCenter: parent.verticalCenter
-                }
-
-                TextField
-                {
                     text: feedTitle
-                    width: parent.width - labelTitle.width - parent.spacing
+                    fontSize: "medium"
+                    width: parent.width
                     anchors.verticalCenter: parent.verticalCenter
-                    readOnly: true
-                    hasClearButton: false
                 }
             }
 
@@ -151,18 +143,17 @@
                 Label
                 {
                     id: labelURL
-                    text: i18n.tr("URL: ")
+                    text: feedURL
+                    fontSize: "small"
+                    font.italic: true
                     width: labelTitle.width
                     anchors.verticalCenter: parent.verticalCenter
-                }
-
-                TextField
-                {
-                    text: feedURL
-                    width: parent.width - labelURL.width - parent.spacing
-                    anchors.verticalCenter: parent.verticalCenter
-                    readOnly: true
-                    hasClearButton: false
+
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: Qt.openUrlExternally(feedURL)
+                    }
+
                 }
             }