Ubuntu Calendar App

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

  1. 1240152
  2. Merge into trunk
Proposed by Riccardo Padovani
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 169
Merged at revision: 170
Proposed branch: lp:~rpadovani/ubuntu-calendar-app/1240152
Merge into: lp:ubuntu-calendar-app
Diff against target: 50 lines (+9/-6)
1 file modified
NewEvent.qml (+9/-6)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-calendar-app/1240152
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Kunal Parmar Approve
Review via email: mp+193191@code.launchpad.net

Commit message

Fixed bug #1240152

Description of the change

Fixed bug #1240152

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

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.

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

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

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Hi Kunal,
thanks for your review.

I updated the code following your indication!

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

looks good now, thanks :)

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Andrea Cerisara (acerisara) wrote :

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 updated
167. By Riccardo Padovani

Relaunch Jenkins test

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
168. By Riccardo Padovani

Merged with current rev

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
169. By Riccardo Padovani

Merge from trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NewEvent.qml'
2--- NewEvent.qml 2013-10-16 14:15:06 +0000
3+++ NewEvent.qml 2013-11-27 22:38:39 +0000
4@@ -12,6 +12,7 @@
5 property var date: new Date();
6 property var startDate;
7 property var endDate;
8+ property int optionSelectorWidth: frequencyLabel.width > remindLabel.width ? frequencyLabel.width : remindLabel.width
9
10 property alias scrollY: flickable.contentY
11
12@@ -239,30 +240,32 @@
13 objectName: "eventPeopleInput"
14 }
15
16- Row{
17+ Item {
18 width: parent.width
19- spacing: units.gu(1)
20+ height: childrenRect.height
21 Label{
22 id: frequencyLabel
23 text: i18n.tr("This happens");
24 anchors.verticalCenter: parent.verticalCenter
25 }
26 OptionSelector{
27+ anchors.right: parent.right
28+ width: parent.width - optionSelectorWidth - units.gu(1)
29 model:[i18n.tr("Once"),i18n.tr("Daily"),i18n.tr("Weekly"),i18n.tr("Monthly"),i18n.tr("Yearly")]
30- width: parent.width - frequencyLabel.width - units.gu(1)
31 }
32 }
33
34- Row{
35+ Item{
36 width: parent.width
37- spacing: units.gu(1)
38+ height: childrenRect.height
39 Label{
40 id: remindLabel
41 text: i18n.tr("Remind me");
42 anchors.verticalCenter: parent.verticalCenter
43 }
44 OptionSelector{
45- width: parent.width - remindLabel.width - units.gu(1)
46+ anchors.right: parent.right
47+ width: parent.width - optionSelectorWidth - units.gu(1)
48 model:[i18n.tr("No Reminder"),
49 i18n.tr("5 minutes"),
50 i18n.tr("15 minutes"),

Subscribers

People subscribed via source and target branches

to status/vote changes: