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
1=== modified file 'DayComponent.qml'
2--- DayComponent.qml 2013-09-02 23:31:37 +0000
3+++ DayComponent.qml 2013-09-03 15:15:54 +0000
4@@ -10,7 +10,7 @@
5 property var day: new Date()
6 property int weekWidth:0;
7
8- contentHeight: timeLineColumn.height + units.gu(3)
9+ contentHeight: timeLineColumn.height
10 contentWidth: width
11
12 clip: true
13@@ -48,7 +48,6 @@
14 TimeLineBackground{
15 id: timeLineColumn
16 anchors.top: parent.top
17- anchors.topMargin: units.gu(3)
18 width: parent.width
19 }
20
21@@ -59,7 +58,6 @@
22 width: timeLineColumn.width
23 height: timeLineColumn.height
24 anchors.top: parent.top
25- anchors.topMargin: units.gu(3)
26 delegate: infoBubbleComponent
27 day: timeLineView.day
28 }
29
30=== modified file 'TimeLineBackground.qml'
31--- TimeLineBackground.qml 2013-07-18 18:48:26 +0000
32+++ TimeLineBackground.qml 2013-09-03 15:15:54 +0000
33@@ -6,37 +6,20 @@
34 Repeater{
35 model: 24 // hour in a day
36
37- delegate: Item {
38- id: delegate
39+ delegate: Rectangle {
40 width: parent.width
41- // FIXME: get hour hight from somewhere
42 height: units.gu(10)
43-
44- Row {
45- width: parent.width
46- y: -timeLabel.height/2
47- Label{
48- id: timeLabel
49- // TRANSLATORS: this is a time formatting string,
50- // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
51- text: new Date(0, 0, 0, index).toLocaleTimeString(Qt.locale(), i18n.tr("HH"))
52- color:"gray"
53- anchors.top: parent.top
54- }
55- Rectangle{
56- width: parent.width - timeLabel.width
57- height:units.dp(1)
58- color:"gray"
59- anchors.verticalCenter: parent.verticalCenter
60- }
61- }
62-
63- Rectangle{
64- width: parent.width - units.gu(5)
65- height:units.dp(1)
66+ color: ( index % 2 == 0) ? "#e5dbe6" : "#e6e4e9"
67+ Label{
68+ id: timeLabel
69+ // TRANSLATORS: this is a time formatting string,
70+ // see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
71+ text: new Date(0, 0, 0, index).toLocaleTimeString(Qt.locale(), i18n.tr("hh ap"))
72 color:"gray"
73+ anchors.horizontalCenter: parent.horizontalCenter
74 anchors.verticalCenter: parent.verticalCenter
75- anchors.horizontalCenter: parent.horizontalCenter
76+ fontSize: "x-large"
77+ opacity: 0.3
78 }
79 }
80 }
81
82=== modified file 'WeekComponent.qml'
83--- WeekComponent.qml 2013-09-02 23:31:37 +0000
84+++ WeekComponent.qml 2013-09-03 15:15:54 +0000
85@@ -10,7 +10,7 @@
86 property var weekStart: new Date().midnight();
87 property int weekWidth:0;
88
89- contentHeight: timeLineColumn.height + units.gu(3)
90+ contentHeight: timeLineColumn.height
91 contentWidth: width
92
93 clip: true
94@@ -48,7 +48,6 @@
95 TimeLineBackground{
96 id: timeLineColumn
97 anchors.top: parent.top
98- anchors.topMargin: units.gu(3)
99 width: parent.width
100 }
101
102@@ -76,7 +75,6 @@
103 width: timeLineColumn.width - x
104 height: timeLineColumn.height
105 anchors.top: parent.top
106- anchors.topMargin: units.gu(3)
107 x: timeLabel.width
108 spacing: 0
109
110
111=== modified file 'WeekView.qml'
112--- WeekView.qml 2013-08-19 13:14:23 +0000
113+++ WeekView.qml 2013-09-03 15:15:54 +0000
114@@ -83,7 +83,7 @@
115
116 width: parent.width
117 height: parent.height
118- weekWidth: weekRibbon.weekWidth //dummy.width + units.gu(1)
119+ weekWidth: weekRibbon.weekWidth
120 weekStart: getWeekStart();
121
122 function getWeekStart() {

Subscribers

People subscribed via source and target branches

to status/vote changes: