Ubuntu Calendar App

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

  1. WeekViewHighlight
  2. Merge into trunk
Proposed by Kunal Parmar on 2015-05-14
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄 on 2015-06-08
Approved revision: 651
Merged at revision: 664
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/WeekViewHighlight
Merge into: lp:ubuntu-calendar-app
Diff against target: 108 lines (+35/-3)
4 files modified
EventListModel.qml (+1/-0)
HeaderDateComponent.qml (+11/-0)
TimeLineBaseComponent.qml (+6/-2)
TimeLineHeaderComponent.qml (+17/-1)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/WeekViewHighlight
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-04
Alan Pope 🍺🐧🐱 🦄 2015-05-14 Approve on 2015-05-20
Review via email: mp+259111@code.launchpad.net

Commit Message

WeekView highlight day before moving to day view

Description of the Change

WeekView highlight day before moving to day view

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

FAILED: Continuous integration, rev:644
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~pkunal-parmar/ubuntu-calendar-app/WeekViewHighlight/+merge/259111/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1164/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2741
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2741/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/635
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/161

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

review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM

review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :
lp:~pkunal-parmar/ubuntu-calendar-app/WeekViewHighlight updated on 2015-05-28
645. By Kunal Parmar on 2015-05-28

merge from trunk

646. By Kunal Parmar on 2015-05-28

reset the highlighted index

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/WeekViewHighlight updated on 2015-05-30
647. By Kunal Parmar on 2015-05-30

debug log

648. By Kunal Parmar on 2015-05-30

debug log

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/WeekViewHighlight updated on 2015-06-04
649. By Kunal Parmar on 2015-05-30

merge from trunk

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/WeekViewHighlight updated on 2015-06-04
650. By Kunal Parmar on 2015-06-04

AP fix

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~pkunal-parmar/ubuntu-calendar-app/WeekViewHighlight updated on 2015-06-04
651. By Kunal Parmar on 2015-06-04

AP fix

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'EventListModel.qml'
2--- EventListModel.qml 2014-09-28 05:25:31 +0000
3+++ EventListModel.qml 2015-06-04 14:13:48 +0000
4@@ -69,6 +69,7 @@
5 var collections = eventModel.collections;
6 for(var i = 0 ; i < collections.length ; ++i) {
7 var cal = collections[i];
8+ //print(cal.name + " ---- " + cal.extendedMetaData("collection-readonly"));
9 if( cal.extendedMetaData("collection-type") === "Calendar" ) {
10 cals.push(cal);
11 }
12
13=== modified file 'HeaderDateComponent.qml'
14--- HeaderDateComponent.qml 2015-03-21 16:15:53 +0000
15+++ HeaderDateComponent.qml 2015-06-04 14:13:48 +0000
16@@ -34,9 +34,20 @@
17 // Signal fired when pressing on the date
18 signal dateSelected(var date)
19
20+ property bool highlighted: false
21+
22 width: dayLabel.paintedWidth
23 height: dateContainer.height
24
25+ Rectangle{
26+ id: background
27+ color: "transparent"
28+ visible: highlighted
29+ anchors.fill: parent
30+ border.width: units.gu(0.3)
31+ border.color: UbuntuColors.orange
32+ }
33+
34 Column {
35 id: dateContainer
36 objectName: "dateContainer"
37
38=== modified file 'TimeLineBaseComponent.qml'
39--- TimeLineBaseComponent.qml 2015-05-18 11:03:07 +0000
40+++ TimeLineBaseComponent.qml 2015-06-04 14:13:48 +0000
41@@ -63,11 +63,15 @@
42 var today = DateExt.today();
43 var startOfWeek = today.weekStart(Qt.locale().firstDayOfWeek);
44 var weekDay = today.getDay();
45+ var diff = weekDay - Qt.locale().firstDayOfWeek
46+ diff = diff < 0 ? 6 : diff
47
48- if( startOfWeek.isSameDay(startDay) && weekDay > 2) {
49- timeLineView.contentX = (weekDay * timeLineView.delegateWidth);
50+ print(diff + ", " + Qt.locale().firstDayOfWeek + "--" + weekDay)
51+ if( startOfWeek.isSameDay(startDay) && diff > 2) {
52+ timeLineView.contentX = (diff * timeLineView.delegateWidth);
53 if( timeLineView.contentX > (timeLineView.contentWidth - timeLineView.width) ) {
54 timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
55+ print(timeLineView.contentX +"----" + (timeLineView.contentWidth - timeLineView.width) )
56 }
57 } else {
58 timeLineView.contentX = 0;
59
60=== modified file 'TimeLineHeaderComponent.qml'
61--- TimeLineHeaderComponent.qml 2014-11-29 05:15:13 +0000
62+++ TimeLineHeaderComponent.qml 2015-06-04 14:13:48 +0000
63@@ -30,20 +30,28 @@
64 property bool isCurrentItem: false
65 property var currentDay
66
67+ property int highlightedIndex;
68+
69 signal dateSelected(var date);
70
71 width: parent.width
72 height: units.gu(4)
73
74+ onStartDayChanged: {
75+ highlightedIndex = 0
76+ }
77+
78 Repeater{
79 model: type == ViewType.ViewTypeWeek ? 7 : 1
80
81 delegate: HeaderDateComponent{
82 date: type == ViewType.ViewTypeWeek ? startDay.addDays(index) : startDay
83 dayFormat: Locale.ShortFormat
84+ highlighted: (type == ViewType.ViewTypeWeek) && (highlightedIndex == index)
85
86 dayColor: {
87 if( type == ViewType.ViewTypeWeek && date.isSameDay(DateExt.today())){
88+ header.highlightedIndex = index
89 UbuntuColors.orange
90 } /*else if( type == ViewType.ViewTypeDay && date.isSameDay(currentDay) ) {
91 UbuntuColors.orange
92@@ -56,7 +64,15 @@
93 height: header.height
94
95 onDateSelected: {
96- header.dateSelected(date);
97+ if( type == ViewType.ViewTypeDay ){
98+ header.dateSelected(date);
99+ } else {
100+ if(highlighted) {
101+ header.dateSelected(date);
102+ } else {
103+ header.highlightedIndex = index
104+ }
105+ }
106 }
107
108 Loader{

Subscribers

People subscribed via source and target branches

to status/vote changes: