Merge lp:~nik90/ubuntu-calendar-app/new-event-style into lp:ubuntu-calendar-app

Proposed by Nekhelesh Ramananthan on 2016-02-26
Status: Work in progress
Proposed branch: lp:~nik90/ubuntu-calendar-app/new-event-style
Merge into: lp:ubuntu-calendar-app
Diff against target: 564 lines (+139/-93)
7 files modified
EventBubble.qml (+29/-22)
MonthComponentDateDelegate.qml (+8/-18)
calendar.qml (+1/-4)
click/calendar-helper-apparmor.json (+1/-1)
click/calendar.apparmor (+1/-1)
click/manifest.json.in (+2/-2)
po/com.ubuntu.calendar.pot (+97/-45)
To merge this branch: bzr merge lp:~nik90/ubuntu-calendar-app/new-event-style
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Needs Fixing on 2016-02-26
Ubuntu Calendar Developers 2016-02-26 Pending
Review via email: mp+287324@code.launchpad.net

Commit message

- Updated event bubble style to match new design
- Housekeeping stuff (updating version to 0.5 and framework to 15.04.3)
- Updated month view ubuntushape style
- Changed background to white

Description of the change

- Updated event bubble style to match new design
- Housekeeping stuff (updating version to 0.5 and framework to 15.04.3)
- Updated month view ubuntushape style
- Changed background to white

To post a comment you must log in.
review: Needs Fixing (continuous-integration)
765. By Nekhelesh Ramananthan on 2016-02-26

update policy version to 1.3

review: Needs Fixing (continuous-integration)

Unmerged revisions

765. By Nekhelesh Ramananthan on 2016-02-26

update policy version to 1.3

764. By Nekhelesh Ramananthan on 2016-02-26

Updated calendar version to 0.5

763. By Nekhelesh Ramananthan on 2016-02-26

Updated framework version to 15.04.3

762. By Nekhelesh Ramananthan on 2016-02-26

Changed background color to white

761. By Nekhelesh Ramananthan on 2016-02-26

Tweaked month view a bit

760. By Nekhelesh Ramananthan on 2016-02-26

Changed event style in day and week view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventBubble.qml'
2--- EventBubble.qml 2016-01-29 14:35:14 +0000
3+++ EventBubble.qml 2016-02-26 17:14:41 +0000
4@@ -37,9 +37,8 @@
5
6 property Flickable flickable;
7
8- readonly property int minimumHeight: type == wideType
9- ? detailsItems.timeLabelHeight + /*top-bottom margin*/ units.gu(2)
10- : units.gu(2)
11+ readonly property int minimumHeight: type == wideType ? detailsItems.timeLabelHeight + /*top-bottom margin*/ units.gu(2)
12+ : units.gu(2)
13
14 z: depthInRow
15
16@@ -48,7 +47,14 @@
17 Rectangle{
18 id: bg
19 anchors.fill: parent
20- border.color: isLiveEditing ? "red" : "white"
21+ border.color: lg.color
22+ border.width: units.dp(1)
23+ opacity: 0.5
24+ Rectangle {
25+ id: lg
26+ anchors { left: parent.left; top: parent.top; bottom: parent.bottom }
27+ width: units.dp(5)
28+ }
29 }
30
31 function resize() {
32@@ -77,13 +83,16 @@
33 if( event.endDateTime >= now) {
34 if( getOwnersStatus(collection) === EventAttendee.StatusDeclined ) {
35 //if owner of account is not attending event the dim it
36- bg.color = Qt.tint( collection.color, "#aaffffff" );
37+ lg.color = collection.color
38+ bg.color = Qt.tint(collection.color, "#DDFFFFFF")
39 } else {
40- bg.color = collection.color
41+ lg.color = collection.color
42+ bg.color = Qt.tint(collection.color, "#77FFFFFF")
43 }
44 } else {
45 //if event is on past then add some white color to original color
46- bg.color = Qt.tint( collection.color, "#aaffffff" );
47+ lg.color = collection.color
48+ bg.color = Qt.tint(collection.color, "#DDFFFFFF")
49 }
50 }
51 }
52@@ -149,9 +158,7 @@
53 timeLabel.text = i18n.tr("%1 <b>%2</b>").arg(timeString).arg(event.displayLabel);
54 }
55 } else {
56- timeLabel.text = event.displayLabel;
57- timeLabel.horizontalAlignment = Text.AlignHCenter
58- timeLabel.wrapMode = Text.WrapAtWordBoundaryOrAnywhere
59+ titleLabel.text = event.displayLabel;
60 }
61
62 layoutBubbleDetails();
63@@ -172,26 +179,26 @@
64 top: parent.top
65 left: parent.left
66 right: parent.right
67- margins: units.gu(0.5)
68- }
69-
70- Label {
71- id: timeLabel
72- objectName: "timeLabel"
73- color: "White"
74- fontSize:"small"
75- font.bold: true
76- width: parent.width
77+ leftMargin: units.gu(2)
78+ margins: units.gu(1)
79 }
80
81 Label {
82 id: titleLabel
83 objectName: "titleLabel"
84- color: "White"
85- fontSize: "small"
86+ textSize: type === wideType ? Label.Medium : Label.Small
87+ font.bold: true
88 width: parent.width
89 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
90 }
91+
92+ Label {
93+ id: timeLabel
94+ objectName: "timeLabel"
95+ textSize: Label.Small
96+ width: parent.width
97+ visible: type == wideType
98+ }
99 }
100
101 onHeightChanged: {
102
103=== modified file 'MonthComponentDateDelegate.qml'
104--- MonthComponentDateDelegate.qml 2016-02-03 08:06:25 +0000
105+++ MonthComponentDateDelegate.qml 2016-02-26 17:14:41 +0000
106@@ -96,7 +96,7 @@
107 Loader{
108 sourceComponent: showEvent ? eventIndicatorComp : undefined
109 onSourceComponentChanged: {
110- width = Qt.binding( function() { return units.gu(0.8)})
111+ width = Qt.binding( function() { return units.gu(1)})
112 height = Qt.binding( function() { return width })
113 anchors.horizontalCenter = Qt.binding( function() { return parent.horizontalCenter })
114 anchors.top = Qt.binding( function() { return parent.verticalCenter })
115@@ -105,7 +105,7 @@
116 return (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height) / 2 + units.gu(1.5)
117 } else {
118 var w = (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height)/1.3
119- return (w/2) + units.gu(0.1)
120+ return (w/2) + units.gu(0.5)
121 }
122 });
123 }
124@@ -115,27 +115,17 @@
125 id: eventIndicatorComp
126 Rectangle {
127 anchors.fill: parent
128- radius: height/2
129- color: "black"
130+ radius: height/3
131+ color: UbuntuColors.lightGrey
132 }
133 }
134
135 Component{
136 id: highLightComp
137- UbuntuShape{
138- color: {
139- if( isToday && !isSelected ) {
140- "#DD4814"
141- } else {
142- "gray"
143- }
144- }
145-
146- Rectangle{
147- anchors.fill: parent
148- anchors.margins: units.gu(0.5)
149- color: isToday ? "#DD4814" : "darkgray"
150- }
151+ UbuntuShape {
152+ aspect: UbuntuShape.Flat
153+ backgroundColor: isToday && !isSelected ? UbuntuColors.orange : UbuntuColors.lightGrey
154+ relativeRadius: 0.74
155 }
156 }
157
158
159=== modified file 'calendar.qml'
160--- calendar.qml 2016-02-03 14:55:42 +0000
161+++ calendar.qml 2016-02-26 17:14:41 +0000
162@@ -91,10 +91,7 @@
163 height: units.gu(80)
164 focus: true
165 Keys.forwardTo: [pageStack.currentPage]
166-
167- headerColor: "#E8E8E8"
168- backgroundColor: "#f5f5f5"
169- footerColor: "#ECECEC"
170+ backgroundColor: "#FFFFFF"
171 anchorToKeyboard: true
172
173 Connections {
174
175=== modified file 'click/calendar-helper-apparmor.json'
176--- click/calendar-helper-apparmor.json 2015-12-16 10:51:01 +0000
177+++ click/calendar-helper-apparmor.json 2016-02-26 17:14:41 +0000
178@@ -3,5 +3,5 @@
179 "policy_groups": [
180 "push-notification-client"
181 ],
182- "policy_version": 1.2
183+ "policy_version": 1.3
184 }
185
186=== modified file 'click/calendar.apparmor'
187--- click/calendar.apparmor 2015-12-16 10:51:01 +0000
188+++ click/calendar.apparmor 2016-02-26 17:14:41 +0000
189@@ -6,5 +6,5 @@
190 "accounts",
191 "push-notification-client"
192 ],
193- "policy_version": 1.2
194+ "policy_version": 1.3
195 }
196
197=== modified file 'click/manifest.json.in'
198--- click/manifest.json.in 2015-12-16 10:51:01 +0000
199+++ click/manifest.json.in 2016-02-26 17:14:41 +0000
200@@ -1,7 +1,7 @@
201 {
202 "architecture": "all",
203 "description": "A calendar for Ubuntu which syncs with online accounts",
204- "framework": "ubuntu-sdk-14.10-qml",
205+ "framework": "ubuntu-sdk-15.04.3-qml",
206 "hooks": {
207 "calendar": {
208 "account-application": "@PROJECT_NAME@_@APP_NAME@.application",
209@@ -18,7 +18,7 @@
210 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
211 "name": "@PROJECT_NAME@",
212 "title": "Calendar",
213- "version": "0.4.@BZR_REVNO@",
214+ "version": "0.5.@BZR_REVNO@",
215 "x-source": {
216 "vcs-bzr": "@BZR_SOURCE@",
217 "vcs-bzr-revno": "@BZR_REVNO@"
218
219=== modified file 'po/com.ubuntu.calendar.pot'
220--- po/com.ubuntu.calendar.pot 2016-02-17 14:56:56 +0000
221+++ po/com.ubuntu.calendar.pot 2016-02-26 17:14:41 +0000
222@@ -8,7 +8,7 @@
223 msgstr ""
224 "Project-Id-Version: \n"
225 "Report-Msgid-Bugs-To: \n"
226-"POT-Creation-Date: 2016-01-11 21:36+0800\n"
227+"POT-Creation-Date: 2016-02-26 21:49+0530\n"
228 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
229 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
230 "Language-Team: LANGUAGE <LL@li.org>\n"
231@@ -18,30 +18,39 @@
232 "Content-Transfer-Encoding: 8bit\n"
233 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
234
235-#: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:39
236-#: ../WeekView.qml:44 ../YearView.qml:36
237+#: ../AgendaView.qml:52 ../DayView.qml:41 ../MonthView.qml:40
238+#: ../WeekView.qml:45 ../YearView.qml:43
239 msgid "Today"
240 msgstr ""
241
242-#: ../AgendaView.qml:92
243+#: ../AgendaView.qml:62 ../calendar.qml:288 ../calendar.qml:509
244+msgid "Agenda"
245+msgstr ""
246+
247+#: ../AgendaView.qml:101
248 msgid "No upcoming events"
249 msgstr ""
250
251-#: ../AgendaView.qml:95
252+#: ../AgendaView.qml:104
253 msgid "You have no calendars enabled"
254 msgstr ""
255
256-#: ../AgendaView.qml:105
257+#: ../AgendaView.qml:114
258 msgid "Enable calendars"
259 msgstr ""
260
261 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
262 #. while the second one (%2) refers to the end time
263-#: ../AgendaView.qml:168 ../EventBubble.qml:133
264+#: ../AgendaView.qml:177 ../EventBubble.qml:142
265 #, qt-format
266 msgid "%1 - %2"
267 msgstr ""
268
269+#: ../AgendaView.qml:183
270+#, qt-format
271+msgid "%1 %2 %3 %4 %5"
272+msgstr ""
273+
274 #. TRANSLATORS: the first parameter refers to the number of all-day events
275 #. on a given day. "Ev." is short form for "Events".
276 #. Please keep the translation of "Ev." to 3 characters only, as the week view
277@@ -59,21 +68,21 @@
278 msgstr[0] ""
279 msgstr[1] ""
280
281-#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:60
282+#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:63
283 msgid "Calendars"
284 msgstr ""
285
286-#: ../CalendarChoicePopup.qml:37
287+#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
288 msgid "Back"
289 msgstr ""
290
291 #. TRANSLATORS: Please translate this string to 15 characters only.
292 #. Currently ,there is no way we can increase width of action menu currently.
293-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
294+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
295 msgid "Sync"
296 msgstr ""
297
298-#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:36
299+#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
300 msgid "Syncing"
301 msgstr ""
302
303@@ -101,10 +110,16 @@
304 #. TRANSLATORS: this is a time formatting string,
305 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
306 #. It's used in the header of the month and week views
307-#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63
308+#: ../DayView.qml:64 ../DayView.qml:157 ../MonthView.qml:62
309+#: ../MonthView.qml:149 ../WeekView.qml:68 ../WeekView.qml:180
310 msgid "MMMM yyyy"
311 msgstr ""
312
313+#: ../DayView.qml:155 ../MonthView.qml:144 ../WeekView.qml:178
314+#, qt-format
315+msgid "%1 %2"
316+msgstr ""
317+
318 #: ../DeleteConfirmationDialog.qml:31
319 msgid "Delete Recurring Event"
320 msgstr ""
321@@ -136,7 +151,7 @@
322 msgid "Delete"
323 msgstr ""
324
325-#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324
326+#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325
327 msgid "Edit Event"
328 msgstr ""
329
330@@ -154,46 +169,70 @@
331 msgid "Edit this"
332 msgstr ""
333
334-#: ../EventActions.qml:50 ../NewEvent.qml:324
335+#: ../EventActions.qml:52 ../NewEvent.qml:325
336 msgid "New Event"
337 msgstr ""
338
339+#: ../EventActions.qml:75 ../Settings.qml:30
340+msgid "Settings"
341+msgstr ""
342+
343 #. TRANSLATORS: the first argument (%1) refers to a time for an event,
344 #. while the second one (%2) refers to title of event
345-#: ../EventBubble.qml:144 ../EventBubble.qml:149
346+#: ../EventBubble.qml:153 ../EventBubble.qml:158
347 #, qt-format
348 msgid "%1 <b>%2</b>"
349 msgstr ""
350
351-#: ../EventDetails.qml:43 ../NewEvent.qml:435
352+#: ../EventDetails.qml:44 ../NewEvent.qml:436
353 msgid "Event Details"
354 msgstr ""
355
356 #. TRANSLATORS: the first parameter refers to the name of event calendar.
357-#: ../EventDetails.qml:68
358+#: ../EventDetails.qml:69
359 #, qt-format
360 msgid "%1 Calendar"
361 msgstr ""
362
363-#: ../EventDetails.qml:129
364+#: ../EventDetails.qml:143
365+#, qt-format
366+msgid "%1 %2 %3 - %4 %5 %6 (All Day)"
367+msgstr ""
368+
369+#: ../EventDetails.qml:147
370 #, qt-format
371 msgid "%1 - %2 (All Day)"
372 msgstr ""
373
374-#: ../EventDetails.qml:133
375+#: ../EventDetails.qml:153
376+#, qt-format
377+msgid "%1 %2 %3 (All Day)"
378+msgstr ""
379+
380+#: ../EventDetails.qml:156
381 #, qt-format
382 msgid "%1 (All Day)"
383 msgstr ""
384
385-#: ../EventDetails.qml:203
386+#: ../EventDetails.qml:162
387+#, qt-format
388+msgid "%1 %2 %3, %4 - %5 %6 %7, %8"
389+msgstr ""
390+
391+#: ../EventDetails.qml:171
392+#, qt-format
393+msgid "%1 %2 %3, %4 - %5"
394+msgstr ""
395+
396+#: ../EventDetails.qml:238
397 msgid "Edit"
398 msgstr ""
399
400-#: ../EventDetails.qml:354 ../NewEvent.qml:537
401+#: ../EventDetails.qml:389 ../NewEvent.qml:538
402 msgid "Guests"
403 msgstr ""
404
405-#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:634
406+#: ../EventDetails.qml:432 ../EventReminder.qml:35 ../NewEvent.qml:635
407 msgid "Reminder"
408 msgstr ""
409
410@@ -216,7 +255,7 @@
411 #. TRANSLATORS: this refers to how often a recurrent event repeats
412 #. and it is shown as the header of the option selector to choose
413 #. its repetition
414-#: ../EventRepetition.qml:242 ../NewEvent.qml:618
415+#: ../EventRepetition.qml:242 ../NewEvent.qml:619
416 msgid "Repeats"
417 msgstr ""
418
419@@ -247,6 +286,11 @@
420 msgid "Weekly on %1"
421 msgstr ""
422
423+#: ../HeaderDateComponent.qml:90
424+#, qt-format
425+msgid "%1 %2 %3"
426+msgstr ""
427+
428 #: ../LimitLabelModel.qml:25
429 msgid "Never"
430 msgstr ""
431@@ -259,6 +303,10 @@
432 msgid "After Date"
433 msgstr ""
434
435+#: ../MonthComponent.qml:262
436+msgid "Wk"
437+msgstr ""
438+
439 #: ../NewEvent.qml:84
440 msgid "Save"
441 msgstr ""
442@@ -267,43 +315,43 @@
443 msgid "End time can't be before start time"
444 msgstr ""
445
446-#: ../NewEvent.qml:334
447+#: ../NewEvent.qml:335
448 msgid "Error"
449 msgstr ""
450
451-#: ../NewEvent.qml:336
452+#: ../NewEvent.qml:337
453 msgid "OK"
454 msgstr ""
455
456-#: ../NewEvent.qml:389
457+#: ../NewEvent.qml:390
458 msgid "From"
459 msgstr ""
460
461-#: ../NewEvent.qml:402
462+#: ../NewEvent.qml:403
463 msgid "To"
464 msgstr ""
465
466-#: ../NewEvent.qml:419
467+#: ../NewEvent.qml:420
468 msgid "All day event"
469 msgstr ""
470
471-#: ../NewEvent.qml:448
472+#: ../NewEvent.qml:449
473 msgid "Event Name"
474 msgstr ""
475
476-#: ../NewEvent.qml:466
477+#: ../NewEvent.qml:467
478 msgid "Description"
479 msgstr ""
480
481-#: ../NewEvent.qml:484
482+#: ../NewEvent.qml:485
483 msgid "Location"
484 msgstr ""
485
486-#: ../NewEvent.qml:499 com.ubuntu.calendar_calendar.desktop.in.in.h:1
487+#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1
488 msgid "Calendar"
489 msgstr ""
490
491-#: ../NewEvent.qml:541
492+#: ../NewEvent.qml:542
493 msgid "Add Guest"
494 msgstr ""
495
496@@ -390,52 +438,56 @@
497 msgid "2 weeks"
498 msgstr ""
499
500+#: ../Settings.qml:60
501+msgid "Show week numbers"
502+msgstr ""
503+
504+#: ../Settings.qml:91
505+msgid "Show lunar calendar"
506+msgstr ""
507+
508 #: ../TimeLineBase.qml:73
509 msgid "Untitled"
510 msgstr ""
511
512 #. TRANSLATORS: W refers to Week, followed by the actual week number (%1)
513-#: ../TimeLineHeader.qml:54
514+#: ../TimeLineHeader.qml:53
515 #, qt-format
516 msgid "W%1"
517 msgstr ""
518
519-#: ../TimeLineHeader.qml:66
520+#: ../TimeLineHeader.qml:65
521 msgid "All Day"
522 msgstr ""
523
524-#: ../YearView.qml:54
525+#: ../YearView.qml:61 ../YearView.qml:112
526 #, qt-format
527 msgid "Year %1"
528 msgstr ""
529
530-#: ../calendar.qml:45
531+#: ../calendar.qml:46
532 msgid ""
533 "Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
534 "eventid. They will be managed by system. See the source for a full comment "
535 "about them"
536 msgstr ""
537
538-#: ../calendar.qml:354
539+#: ../calendar.qml:256 ../calendar.qml:425
540 msgid "Year"
541 msgstr ""
542
543-#: ../calendar.qml:388
544+#: ../calendar.qml:264 ../calendar.qml:446
545 msgid "Month"
546 msgstr ""
547
548-#: ../calendar.qml:421
549+#: ../calendar.qml:272 ../calendar.qml:467
550 msgid "Week"
551 msgstr ""
552
553-#: ../calendar.qml:459
554+#: ../calendar.qml:280 ../calendar.qml:488
555 msgid "Day"
556 msgstr ""
557
558-#: ../calendar.qml:491
559-msgid "Agenda"
560-msgstr ""
561-
562 #: com.ubuntu.calendar_calendar.desktop.in.in.h:2
563 msgid "A calendar for Ubuntu which syncs with online accounts."
564 msgstr ""

Subscribers

People subscribed via source and target branches

to status/vote changes: