Ubuntu Calendar App

Merge lp:~pkunal-parmar/ubuntu-calendar-app/new_timeline into lp:ubuntu-calendar-app

  1. new_timeline
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Merged
Approved by: David Planella
Approved revision: 101
Merged at revision: 106
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/new_timeline
Merge into: lp:ubuntu-calendar-app
Diff against target: 122 lines (+13/-34)
4 files modified
DayComponent.qml (+1/-3)
TimeLineBackground.qml (+10/-27)
WeekComponent.qml (+1/-3)
WeekView.qml (+1/-1)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/new_timeline
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Olivier Tilloy (community) Needs Fixing
Riccardo Padovani (community) Approve
Review via email: mp+183316@code.launchpad.net

Commit message

New timeline background

Description of the change

New timeline background

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:96
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/29/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/29

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Hi Kunal,
you do a great work :)

review: Approve
lp:~pkunal-parmar/ubuntu-calendar-app/new_timeline updated
97. By Kunal Parmar

added id to component

Revision history for this message
Olivier Tilloy (osomon) wrote :

74 + text: new Date(0, 0, 0, index).toLocaleTimeString(Qt.locale(), i18n.tr("hh ap"))

Can you please add a comment for translators to explain what this string corresponds to? (with a link to http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for allowed formats)

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

97. By Kunal Parmar 7 minutes ago
added id to component

Was this needed? I’m not seeing any reference to this component’s id anywhere.

Revision history for this message
Olivier Tilloy (osomon) wrote :

The rest of the changeset looks good. Great job!

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

PASSED: Continuous integration, rev:97
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/31/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/134
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/31
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/31
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/31
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/31

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

review: Approve (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> 97. By Kunal Parmar 7 minutes ago
> added id to component
>
> Was this needed? I’m not seeing any reference to this component’s id anywhere.

I just wanted to trigger auto build :). I tried to click that rebuild link many time but did not worked.

lp:~pkunal-parmar/ubuntu-calendar-app/new_timeline updated
98. By Kunal Parmar

Translationl comment added

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

> 74 + text: new Date(0, 0, 0,
> index).toLocaleTimeString(Qt.locale(), i18n.tr("hh ap"))
>
> Can you please add a comment for translators to explain what this string
> corresponds to? (with a link to http://qt-project.org/doc/qt-5.0/qtqml/qml-
> qtquick2-date.html#details for allowed formats)

done, thanks

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

FAILED: Continuous integration, rev:98
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/32/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/136
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/32
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/32
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/32
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/32

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

> > 97. By Kunal Parmar 7 minutes ago
> > added id to component
> >
> > Was this needed? I’m not seeing any reference to this component’s id
> anywhere.
>
> I just wanted to trigger auto build :). I tried to click that rebuild link
> many time but did not worked.

OK :) Can you please remove it now? In the future, if you need to trigger a build again, you can do an empty commit, just run `bzr commit --unchanged`.

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

> > > 97. By Kunal Parmar 7 minutes ago
> > > added id to component
> > >
> > > Was this needed? I’m not seeing any reference to this component’s id
> > anywhere.
> >
> > I just wanted to trigger auto build :). I tried to click that rebuild link
> > many time but did not worked.
>
> OK :) Can you please remove it now? In the future, if you need to trigger a
> build again, you can do an empty commit, just run `bzr commit --unchanged`.

Removed. Thanks, I will use empty commit than,

lp:~pkunal-parmar/ubuntu-calendar-app/new_timeline updated
99. By Kunal Parmar

Running build again

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

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/35/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/140
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/35
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/35
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/35
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/35

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

review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/new_timeline updated
100. By Kunal Parmar

merge from trunk

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

FAILED: Continuous integration, rev:100
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/37/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/142
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/37

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

review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/new_timeline updated
101. By Kunal Parmar

merge from trunk

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

PASSED: Continuous integration, rev:101
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/46/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/176
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/46
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/46
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/46
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/46

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'DayComponent.qml'
--- DayComponent.qml 2013-09-02 23:31:37 +0000
+++ DayComponent.qml 2013-09-03 15:15:54 +0000
@@ -10,7 +10,7 @@
10 property var day: new Date()10 property var day: new Date()
11 property int weekWidth:0;11 property int weekWidth:0;
1212
13 contentHeight: timeLineColumn.height + units.gu(3)13 contentHeight: timeLineColumn.height
14 contentWidth: width14 contentWidth: width
1515
16 clip: true16 clip: true
@@ -48,7 +48,6 @@
48 TimeLineBackground{48 TimeLineBackground{
49 id: timeLineColumn49 id: timeLineColumn
50 anchors.top: parent.top50 anchors.top: parent.top
51 anchors.topMargin: units.gu(3)
52 width: parent.width51 width: parent.width
53 }52 }
5453
@@ -59,7 +58,6 @@
59 width: timeLineColumn.width58 width: timeLineColumn.width
60 height: timeLineColumn.height59 height: timeLineColumn.height
61 anchors.top: parent.top60 anchors.top: parent.top
62 anchors.topMargin: units.gu(3)
63 delegate: infoBubbleComponent61 delegate: infoBubbleComponent
64 day: timeLineView.day62 day: timeLineView.day
65 }63 }
6664
=== modified file 'TimeLineBackground.qml'
--- TimeLineBackground.qml 2013-07-18 18:48:26 +0000
+++ TimeLineBackground.qml 2013-09-03 15:15:54 +0000
@@ -6,37 +6,20 @@
6 Repeater{6 Repeater{
7 model: 24 // hour in a day7 model: 24 // hour in a day
88
9 delegate: Item {9 delegate: Rectangle {
10 id: delegate
11 width: parent.width10 width: parent.width
12 // FIXME: get hour hight from somewhere
13 height: units.gu(10)11 height: units.gu(10)
1412 color: ( index % 2 == 0) ? "#e5dbe6" : "#e6e4e9"
15 Row {13 Label{
16 width: parent.width14 id: timeLabel
17 y: -timeLabel.height/215 // TRANSLATORS: this is a time formatting string,
18 Label{16 // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
19 id: timeLabel17 text: new Date(0, 0, 0, index).toLocaleTimeString(Qt.locale(), i18n.tr("hh ap"))
20 // TRANSLATORS: this is a time formatting string,
21 // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
22 text: new Date(0, 0, 0, index).toLocaleTimeString(Qt.locale(), i18n.tr("HH"))
23 color:"gray"
24 anchors.top: parent.top
25 }
26 Rectangle{
27 width: parent.width - timeLabel.width
28 height:units.dp(1)
29 color:"gray"
30 anchors.verticalCenter: parent.verticalCenter
31 }
32 }
33
34 Rectangle{
35 width: parent.width - units.gu(5)
36 height:units.dp(1)
37 color:"gray"18 color:"gray"
19 anchors.horizontalCenter: parent.horizontalCenter
38 anchors.verticalCenter: parent.verticalCenter20 anchors.verticalCenter: parent.verticalCenter
39 anchors.horizontalCenter: parent.horizontalCenter21 fontSize: "x-large"
22 opacity: 0.3
40 }23 }
41 }24 }
42 }25 }
4326
=== modified file 'WeekComponent.qml'
--- WeekComponent.qml 2013-09-02 23:31:37 +0000
+++ WeekComponent.qml 2013-09-03 15:15:54 +0000
@@ -10,7 +10,7 @@
10 property var weekStart: new Date().midnight();10 property var weekStart: new Date().midnight();
11 property int weekWidth:0;11 property int weekWidth:0;
1212
13 contentHeight: timeLineColumn.height + units.gu(3)13 contentHeight: timeLineColumn.height
14 contentWidth: width14 contentWidth: width
1515
16 clip: true16 clip: true
@@ -48,7 +48,6 @@
48 TimeLineBackground{48 TimeLineBackground{
49 id: timeLineColumn49 id: timeLineColumn
50 anchors.top: parent.top50 anchors.top: parent.top
51 anchors.topMargin: units.gu(3)
52 width: parent.width51 width: parent.width
53 }52 }
5453
@@ -76,7 +75,6 @@
76 width: timeLineColumn.width - x75 width: timeLineColumn.width - x
77 height: timeLineColumn.height76 height: timeLineColumn.height
78 anchors.top: parent.top77 anchors.top: parent.top
79 anchors.topMargin: units.gu(3)
80 x: timeLabel.width78 x: timeLabel.width
81 spacing: 079 spacing: 0
8280
8381
=== modified file 'WeekView.qml'
--- WeekView.qml 2013-08-19 13:14:23 +0000
+++ WeekView.qml 2013-09-03 15:15:54 +0000
@@ -83,7 +83,7 @@
8383
84 width: parent.width84 width: parent.width
85 height: parent.height85 height: parent.height
86 weekWidth: weekRibbon.weekWidth //dummy.width + units.gu(1)86 weekWidth: weekRibbon.weekWidth
87 weekStart: getWeekStart();87 weekStart: getWeekStart();
8888
89 function getWeekStart() {89 function getWeekStart() {

Subscribers

People subscribed via source and target branches

to status/vote changes: