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
69
        var collections = eventModel.collections;
69
        var collections = eventModel.collections;
6
70
        for(var i = 0 ; i < collections.length ; ++i) {
70
        for(var i = 0 ; i < collections.length ; ++i) {
7
71
            var cal = collections[i];
71
            var cal = collections[i];
8
72
            //print(cal.name + " ---- " + cal.extendedMetaData("collection-readonly"));
9
72
            if( cal.extendedMetaData("collection-type") === "Calendar" ) {
73
            if( cal.extendedMetaData("collection-type") === "Calendar" ) {
10
73
                cals.push(cal);
74
                cals.push(cal);
11
74
            }
75
            }
12
75
76
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
34
    // Signal fired when pressing on the date
34
    // Signal fired when pressing on the date
18
35
    signal dateSelected(var date)
35
    signal dateSelected(var date)
19
36
36
20
37
    property bool highlighted: false
21
38
22
37
    width: dayLabel.paintedWidth
39
    width: dayLabel.paintedWidth
23
38
    height: dateContainer.height
40
    height: dateContainer.height
24
39
41
25
42
    Rectangle{
26
43
        id: background
27
44
        color: "transparent"
28
45
        visible: highlighted
29
46
        anchors.fill: parent
30
47
        border.width: units.gu(0.3)
31
48
        border.color: UbuntuColors.orange
32
49
    }
33
50
34
40
    Column {
51
    Column {
35
41
        id: dateContainer
52
        id: dateContainer
36
42
        objectName: "dateContainer"
53
        objectName: "dateContainer"
37
43
54
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
63
        var today = DateExt.today();
63
        var today = DateExt.today();
43
64
        var startOfWeek = today.weekStart(Qt.locale().firstDayOfWeek);
64
        var startOfWeek = today.weekStart(Qt.locale().firstDayOfWeek);
44
65
        var weekDay = today.getDay();
65
        var weekDay = today.getDay();
45
66
        var diff = weekDay - Qt.locale().firstDayOfWeek
46
67
        diff = diff < 0 ? 6 : diff
47
66
68
50
67
        if( startOfWeek.isSameDay(startDay) && weekDay > 2) {
69
        print(diff + ", " + Qt.locale().firstDayOfWeek + "--" + weekDay)
51
68
            timeLineView.contentX = (weekDay * timeLineView.delegateWidth);            
70
        if( startOfWeek.isSameDay(startDay) && diff > 2) {
52
71
            timeLineView.contentX = (diff * timeLineView.delegateWidth);
53
69
            if( timeLineView.contentX  > (timeLineView.contentWidth - timeLineView.width) ) {
72
            if( timeLineView.contentX  > (timeLineView.contentWidth - timeLineView.width) ) {
54
70
                timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
73
                timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
55
74
                print(timeLineView.contentX +"----" + (timeLineView.contentWidth - timeLineView.width) )
56
71
            }
75
            }
57
72
        } else {
76
        } else {
58
73
            timeLineView.contentX = 0;
77
            timeLineView.contentX = 0;
59
74
78
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
30
    property bool isCurrentItem: false
30
    property bool isCurrentItem: false
65
31
    property var currentDay
31
    property var currentDay
66
32
32
67
33
    property int highlightedIndex;
68
34
69
33
    signal dateSelected(var date);
35
    signal dateSelected(var date);
70
34
36
71
35
    width: parent.width
37
    width: parent.width
72
36
    height: units.gu(4)
38
    height: units.gu(4)
73
37
39
74
40
    onStartDayChanged: {
75
41
        highlightedIndex = 0
76
42
    }
77
43
78
38
    Repeater{
44
    Repeater{
79
39
        model: type == ViewType.ViewTypeWeek ? 7 : 1
45
        model: type == ViewType.ViewTypeWeek ? 7 : 1
80
40
46
81
41
        delegate: HeaderDateComponent{
47
        delegate: HeaderDateComponent{
82
42
            date: type == ViewType.ViewTypeWeek ? startDay.addDays(index) : startDay
48
            date: type == ViewType.ViewTypeWeek ? startDay.addDays(index) : startDay
83
43
            dayFormat: Locale.ShortFormat
49
            dayFormat: Locale.ShortFormat
84
50
            highlighted: (type == ViewType.ViewTypeWeek) && (highlightedIndex == index)
85
44
51
86
45
            dayColor: {
52
            dayColor: {
87
46
                if( type == ViewType.ViewTypeWeek && date.isSameDay(DateExt.today())){
53
                if( type == ViewType.ViewTypeWeek && date.isSameDay(DateExt.today())){
88
54
                    header.highlightedIndex = index
89
47
                    UbuntuColors.orange
55
                    UbuntuColors.orange
90
48
                } /*else if( type == ViewType.ViewTypeDay && date.isSameDay(currentDay) ) {
56
                } /*else if( type == ViewType.ViewTypeDay && date.isSameDay(currentDay) ) {
91
49
                    UbuntuColors.orange
57
                    UbuntuColors.orange
92
@@ -56,7 +64,15 @@
93
56
            height: header.height
64
            height: header.height
94
57
65
95
58
            onDateSelected: {
66
            onDateSelected: {
97
59
                header.dateSelected(date);
67
                if( type == ViewType.ViewTypeDay ){
98
68
                    header.dateSelected(date);
99
69
                } else {
100
70
                    if(highlighted) {
101
71
                        header.dateSelected(date);
102
72
                    } else {
103
73
                        header.highlightedIndex = index
104
74
                    }
105
75
                }
106
60
            }
76
            }
107
61
77
108
62
            Loader{
78
            Loader{
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-06-04
Alan Pope 🍺🐧🐱 🦄 (community)		2015-05-14	Approve on 2015-05-20
Review via email: mp+259111@code.launchpad.net