Merge lp:~rpadovani/ubuntu-calendar-app/1240152 into lp:ubuntu-calendar-app

[Riccardo Padovani]

Fixed bug #1240152

Fixed bug #1240152

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

FAILED: Continuous integration, rev:165
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/180/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1248
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/14

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

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

Hi, I think we are here assuming that frequency label's width is always going to be larger than reminder label. but depending on language this might not be true.

I think best way it to check which label's width is larger and use that for reference value instead of using frequency label's width as reference.

[Kunal Parmar (pkunal-parmar)]

6 Row{
7 width: parent.width
8 - spacing: units.gu(1)
9 + spacing: units.gu(1) + (frequencyLabel.width - remindLabel.width) // This is to align right the optionSelector

Hi, I think we should use Item here instead of Row, and use anchoring to align OptionSelector to right and we can set width to OptionSelector, as you are doing already.

And can get rid of following

spacing: units.gu(1) + (frequencyLabel.width - remindLabel.width) // This is to align right the optionSelector

[Riccardo Padovani (rpadovani)]

Hi Kunal,
thanks for your review.

I updated the code following your indication!

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

PASSED: Continuous integration, rev:166
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/181/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1260
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/181
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/181
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/15

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

looks good now, thanks :)

review: Approve

[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/ubuntu-calendar-app-autolanding/66/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/66
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/66
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/6

review: Needs Fixing (continuous-integration)

[Andrea Cerisara (acerisara)]

Hello Riccardo, problems are related to tests that are broken. Going to fix them and create a separate mp, sorry for this.

[lp:~rpadovani/ubuntu-calendar-app/1240152]

167. By Riccardo Padovani on 2013-11-23

Relaunch Jenkins test

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

FAILED: Continuous integration, rev:167
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/206/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/218
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/206
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/206
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/40

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

review: Needs Fixing (continuous-integration)

[lp:~rpadovani/ubuntu-calendar-app/1240152]

168. By Riccardo Padovani on 2013-11-23

Merged with current rev

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

FAILED: Continuous integration, rev:168
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/207/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/219
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/207
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/207
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/41

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

review: Needs Fixing (continuous-integration)

[lp:~rpadovani/ubuntu-calendar-app/1240152]

169. By Riccardo Padovani on 2013-11-27

Merge from trunk

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

PASSED: Continuous integration, rev:169
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/221/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/310
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/221
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/221
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/55

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

review: Approve (continuous-integration)

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2013-10-16 14:15:06 +0000
+++ NewEvent.qml	2013-11-27 22:38:39 +0000
@@ -12,6 +12,7 @@
     property var date: new Date();
     property var startDate;
     property var endDate;
+    property int optionSelectorWidth: frequencyLabel.width > remindLabel.width ? frequencyLabel.width : remindLabel.width
 
     property alias scrollY: flickable.contentY
 
@@ -239,30 +240,32 @@
                 objectName: "eventPeopleInput"
             }
 
-            Row{
+            Item {
                 width: parent.width
-                spacing: units.gu(1)
+                height: childrenRect.height
                 Label{
                     id: frequencyLabel
                     text: i18n.tr("This happens");
                     anchors.verticalCenter: parent.verticalCenter
                 }
                 OptionSelector{
+                    anchors.right: parent.right
+                    width: parent.width - optionSelectorWidth - units.gu(1)
                     model:[i18n.tr("Once"),i18n.tr("Daily"),i18n.tr("Weekly"),i18n.tr("Monthly"),i18n.tr("Yearly")]
-                    width: parent.width - frequencyLabel.width - units.gu(1)
                 }
             }
 
-            Row{
+            Item{
                 width: parent.width
-                spacing: units.gu(1)
+                height: childrenRect.height
                 Label{
                     id: remindLabel
                     text: i18n.tr("Remind me");
                     anchors.verticalCenter: parent.verticalCenter
                 }
                 OptionSelector{
-                    width: parent.width - remindLabel.width - units.gu(1)
+                    anchors.right: parent.right
+                    width: parent.width - optionSelectorWidth - units.gu(1)
                     model:[i18n.tr("No Reminder"),
                         i18n.tr("5 minutes"),
                         i18n.tr("15 minutes"),