1
=== modified file 'TimeLineBaseComponent.qml'
2
--- TimeLineBaseComponent.qml	2014-12-18 19:00:07 +0000
3
+++ TimeLineBaseComponent.qml	2015-02-17 05:43:06 +0000
4
@@ -52,6 +52,24 @@
5
52
        }
52
        }
6
53
    }
53
    }
7
54
54
8
55
    function scrollTocurrentDate() {
9
56
        if ( type != ViewType.ViewTypeWeek ){
10
57
            return;
11
58
        }
12
59
13
60
        var today = DateExt.today();
14
61
        var startOfWeek = today.weekStart(Qt.locale().firstDayOfWeek);
15
62
        var weekDay = today.getDay();
16
63
        if( startOfWeek.isSameDay(startDay) && weekDay > 2) {
17
64
            timeLineView.contentX = (weekDay * timeLineView.delegateWidth);
18
65
            if( timeLineView.contentX  > (timeLineView.contentWidth - timeLineView.width) ) {
19
66
                timeLineView.contentX = timeLineView.contentWidth - timeLineView.width
20
67
            }
21
68
        } else {
22
69
            timeLineView.contentX = 0;
23
70
        }
24
71
    }
25
72
26
55
    Connections{
73
    Connections{
27
56
        target: keyboardEventProvider
74
        target: keyboardEventProvider
28
57
        onScrollUp:{
75
        onScrollUp:{
29
58
76
30
=== modified file 'WeekView.qml'
31
--- WeekView.qml	2014-11-04 18:32:16 +0000
32
+++ WeekView.qml	2015-02-17 05:43:06 +0000
33
@@ -88,6 +88,7 @@
34
88
        }
88
        }
35
89
89
36
90
        delegate: Loader {
90
        delegate: Loader {
37
91
            id: timelineLoader
38
91
            width: parent.width
92
            width: parent.width
39
92
            height: parent.height
93
            height: parent.height
40
93
            asynchronous: !weekViewPath.isCurrentItem
94
            asynchronous: !weekViewPath.isCurrentItem
41
@@ -108,18 +109,32 @@
42
108
                    Component.onCompleted: {
109
                    Component.onCompleted: {
43
109
                        if(weekViewPage.isCurrentPage){
110
                        if(weekViewPage.isCurrentPage){
44
110
                            timeLineView.scrollToCurrentTime();
111
                            timeLineView.scrollToCurrentTime();
45
112
                            timeLineView.scrollTocurrentDate();
46
111
                        }
113
                        }
47
112
                    }
114
                    }
48
113
115
49
116
                    onIsActiveChanged: {
50
117
                        timeLineView.scrollTocurrentDate();
51
118
                    }
52
119
53
114
                    onDateSelected: {
120
                    onDateSelected: {
54
115
                        weekViewPage.dateSelected(date);
121
                        weekViewPage.dateSelected(date);
55
116
                    }
122
                    }
56
117
123
57
118
                    Connections{
124
                    Connections{
58
125
                        target: calendarTodayAction
59
126
                        onTriggered:{
60
127
                            if( isActive )
61
128
                                timeLineView.scrollTocurrentDate();
62
129
                        }
63
130
                    }
64
131
65
132
                    Connections{
66
119
                        target: weekViewPage
133
                        target: weekViewPage
67
120
                        onIsCurrentPageChanged:{
134
                        onIsCurrentPageChanged:{
68
121
                            if(weekViewPage.isCurrentPage){
135
                            if(weekViewPage.isCurrentPage){
69
122
                                timeLineView.scrollToCurrentTime();
136
                                timeLineView.scrollToCurrentTime();
70
137
                                timeLineView.scrollTocurrentDate();
71
123
                            }
138
                            }
72
124
                        }
139
                        }
73
125
                    }
140
                    }
74
126
141
75
=== modified file 'tests/autopilot/calendar_app/__init__.py'
76
--- tests/autopilot/calendar_app/__init__.py	2014-12-18 16:00:08 +0000
77
+++ tests/autopilot/calendar_app/__init__.py	2015-02-17 05:43:06 +0000
78
@@ -214,7 +214,7 @@
79
214
                sleep(1)
214
                sleep(1)
80
215
            timeout += 1
215
            timeout += 1
81
216
216
83
217
    def swipe_view(self, direction, view, x_pad=0.15):
217
    def swipe_view(self, direction, view, x_pad=0.08):
84
218
        """Swipe the given view to left or right.
218
        """Swipe the given view to left or right.
85
219
219
86
220
        Args:
220
        Args:
87
@@ -400,6 +400,7 @@
88
400
        for event in event_bubbles:
400
        for event in event_bubbles:
89
401
            # Event-bubbles objects are recycled, only show visible ones.
401
            # Event-bubbles objects are recycled, only show visible ones.
90
402
            temp = "<b>"+event_name+"</b>"
402
            temp = "<b>"+event_name+"</b>"
91
403
            print(temp + "-----" + event.get_name())
92
403
            if event.get_name() == temp:
404
            if event.get_name() == temp:
93
404
                if (visible and event.visible) or not visible:
405
                if (visible and event.visible) or not visible:
94
405
                    matched_event = event
406
                    matched_event = event
Status:	Merged
Approved by:	Kunal Parmar on 2015-02-18
Approved revision:	571
Merged at revision:	581
Proposed branch:	lp:~pkunal-parmar/ubuntu-calendar-app/WeekView-ScrollToToday
Merge into:	lp:ubuntu-calendar-app
Prerequisite:	lp:~pkunal-parmar/ubuntu-calendar-app/NewDayView-Final
Diff against target:	94 lines (+35/-1) 3 files modified TimeLineBaseComponent.qml (+18/-0) WeekView.qml (+15/-0) tests/autopilot/calendar_app/__init__.py (+2/-1)
To merge this branch:	bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/WeekView-ScrollToToday
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-02-17
Mihir Soni		2014-12-04	Approve on 2014-12-15
Review via email: mp+243664@code.launchpad.net