1
=== modified file 'MonthComponent.qml'
2
--- MonthComponent.qml	2013-09-03 00:51:30 +0000
3
+++ MonthComponent.qml	2013-09-03 23:46:33 +0000
4
@@ -5,103 +5,155 @@
5
5
5
6
6
Item{
6
Item{
7
7
    id: root
7
    id: root
11
8
    property var date;
8
    objectName: "MonthComponent"
12
9
9
13
10
    signal monthSelected(var date);
10
    property var monthDate;
14
11
15
12
    property string dayLabelFontSize: "medium"
16
13
    property string dateLabelFontSize: "large"
17
14
    property string monthLabelFontSize: "large"
18
15
    property string yearLabelFontSize: "medium"
19
11
16
20
12
    property alias dayLabelDelegate : dayLabelRepeater.delegate
17
    property alias dayLabelDelegate : dayLabelRepeater.delegate
21
13
    property alias dateLabelDelegate : dateLabelRepeater.delegate
18
    property alias dateLabelDelegate : dateLabelRepeater.delegate
22
14
19
29
15
    objectName: "MonthComponent"
20
    signal dateSelected(var date)
30
16
21
31
17
    width: monthGrid.width
22
    height: ubuntuShape.height
32
18
    height: monthGrid.height + units.gu(0.5)+ monthName.height
23
33
19
24
    UbuntuShape {
34
20
    MouseArea{
25
        id: ubuntuShape
35
26
36
21
        anchors.fill: parent
27
        anchors.fill: parent
80
22
        onClicked: {
28
        radius: "medium"
81
23
            root.monthSelected( root.date );
29
82
24
        }
30
        Column{
83
25
    }
31
            id: column
84
26
32
85
27
    Label{
33
            anchors.top: parent.top
86
28
        id: monthName
34
            anchors.topMargin: units.gu(1.5)
87
29
        width: parent.width
35
            anchors.fill: parent
88
30
        horizontalAlignment: Text.AlignHCenter
36
            spacing: units.gu(1.5)
89
31
        font.bold: true
37
90
32
        text: {
38
            Item{
91
33
            Qt.locale().standaloneMonthName(root.date.getMonth())
39
                id: monthHeader
92
34
        }
40
                width: parent.width
93
35
    }
41
                height: monthLabel.height
94
36
42
95
37
    Row{
43
                Label{
96
38
        id: dayLabelRow
44
                    id: monthLabel
97
39
        anchors.top: monthName.bottom
45
                    fontSize: monthLabelFontSize
98
40
        anchors.topMargin: units.gu(0.5)
46
                    text: Qt.locale().standaloneMonthName(root.monthDate.getMonth())
99
41
        spacing: units.gu(0.5)
47
                    anchors.leftMargin: units.gu(1)
100
42
        width: parent.width
48
                    anchors.left: parent.left
101
43
        Repeater{
49
                    //color:"white"
102
44
            id: dayLabelRepeater
50
                    anchors.verticalCenter: parent.verticalCenter
103
45
            model:7
51
                }
104
46
            delegate: dafaultDayLabelComponent
52
105
47
        }
53
                Label{
106
48
    }
54
                    id: yearLabel
107
49
55
                    fontSize: yearLabelFontSize
108
50
    Grid{
56
                    text: root.monthDate.getFullYear()
109
51
        id: monthGrid
57
                    anchors.right: parent.right
110
52
        property var monthStart: DateExt.getFirstDateofWeek(root.date.getFullYear(),root.date.getMonth())
58
                    anchors.rightMargin: units.gu(1)
111
53
59
                    color:"#AEA79F"
112
54
        rows: DateExt.weekCount(root.date.getFullYear(), root.date.getMonth())
60
                    anchors.verticalCenter: parent.verticalCenter
113
55
        columns: 7
61
                }
114
56
        spacing: units.gu(0.5)
62
            }
115
57
63
116
58
        anchors.top: dayLabelRow.bottom
64
            Row{
117
59
        anchors.topMargin: units.gu(0.5)
65
                id: dayLabelRow
118
60
66
                width: parent.width
119
61
        Repeater{
67
                anchors.horizontalCenter: parent.horizontalCenter
120
62
            id: dateLabelRepeater
68
121
63
            model: monthGrid.rows * monthGrid.columns
69
                Repeater{
122
64
            delegate: defaultDateLabelComponent
70
                    id: dayLabelRepeater
123
71
                    model:7
124
72
                    delegate: dafaultDayLabelComponent
125
73
                }
126
74
            }
127
75
128
76
            Grid{
129
77
                id: monthGrid
130
78
131
79
                property int weekCount : 6
132
80
                property var monthStart: root.monthDate.weekStart( Qt.locale().firstDayOfWeek )
133
81
134
82
                width: parent.width
135
83
                height: parent.height - monthHeader.height - dayLabelRow.height - units.gu(3)
136
84
137
85
                rows: weekCount
138
86
                columns: 7
139
87
140
88
                Repeater{
141
89
                    id: dateLabelRepeater
142
90
                    model: monthGrid.rows * monthGrid.columns
143
91
                    delegate: defaultDateLabelComponent
144
92
                }
145
93
            }
146
65
        }
94
        }
147
66
    }
95
    }
148
67
96
149
68
    Component{
97
    Component{
150
69
        id: defaultDateLabelComponent
98
        id: defaultDateLabelComponent
151
70
99
166
71
        Text {
100
        Item{
167
72
            id: dateLabel
101
            id: dateRootItem
168
73
102
169
74
            property var day: parent.monthStart.addDays(index)
103
            property var date: parent.monthStart.addDays(index);
170
75
            property var isToday: day.isSameDay(intern.now)
104
            property bool isCurrentMonth: DateExt.isSameMonth(root.monthDate,date)
171
76
            property bool isPaddingDate: day.getMonth() != root.date.getMonth()
105
172
77
106
            width: parent.width / 7;
173
78
            text: day.getDate()
107
            height: parent.height / parent.weekCount
174
79
            horizontalAlignment: Text.AlignHCenter
108
175
80
            width: dummy.width
109
            UbuntuShape{
176
81
            height: dummy.height
110
                id: highLightRect
177
82
            font.pointSize: dummy.font.pointSize
111
178
83
            color: isToday ? Color.ubuntuOrange : (isPaddingDate ? Color.warmGrey : dummy.color)
112
                width: parent.width
179
84
            scale: isToday ? 1.5 : 1.
113
                height: width
180
114
                anchors.centerIn: parent
181
115
182
116
                color: "white"
183
117
                visible: date.isSameDay(DateExt.today()) && isCurrentMonth
184
118
            }
185
119
186
120
            Label{
187
121
                id: dateLabel
188
122
                anchors.centerIn: parent
189
123
                text: date.getDate()
190
124
                horizontalAlignment: Text.AlignHCenter
191
125
                fontSize: root.dateLabelFontSize
192
126
                color: {
193
127
                    if( date.isSameDay(DateExt.today()) && isCurrentMonth ) {
194
128
                        "#2C001E"
195
129
                    } else if( parent.isCurrentMonth ) {
196
130
                        "#333333"
197
131
                    } else {
198
132
                        "#AEA79F"
199
133
                    }
200
134
                }
201
135
            }
202
136
203
137
            MouseArea{
204
138
                anchors.fill: parent
205
139
                onClicked: {
206
140
                    root.dateSelected(date);
207
141
                }
208
142
            }
209
85
        }
143
        }
210
86
    }
144
    }
211
87
145
212
88
    Component{
146
    Component{
213
89
        id: dafaultDayLabelComponent
147
        id: dafaultDayLabelComponent
217
90
        Text{
148
218
91
            //FIXME: how to get localized day initial ?
149
        Label{
219
92
            text: Qt.locale().standaloneDayName( (intern.weekstartDay + index), Locale.ShortFormat).charAt(0)
150
            id: weekDay
220
151
            width: parent.width / 7
221
152
            property var day :Qt.locale().standaloneDayName(( Qt.locale().firstDayOfWeek + index), Locale.ShortFormat)
222
153
            text: day.toUpperCase();
223
93
            horizontalAlignment: Text.AlignHCenter
154
            horizontalAlignment: Text.AlignHCenter
228
94
            width: dummy.width
155
            fontSize: root.dayLabelFontSize
229
95
            height: dummy.height
156
            color: "#AEA79F"
226
96
            font.pointSize: dummy.font.pointSize
227
97
            font.bold: true
230
98
        }
157
        }
231
99
    }
158
    }
232
100
233
101
    Text{
234
102
        id: dummy
235
103
        text: "00"
236
104
        visible: false
237
105
        font.pointSize: 7.5
238
106
    }
239
107
}
159
}
240
108
160
241
=== modified file 'MonthView.qml'
242
--- MonthView.qml	2013-08-04 02:26:31 +0000
243
+++ MonthView.qml	2013-09-03 23:46:33 +0000
244
@@ -3,204 +3,70 @@
245
3
import "dateExt.js" as DateExt
3
import "dateExt.js" as DateExt
246
4
import "colorUtils.js" as Color
4
import "colorUtils.js" as Color
247
5
5
447
6
ListView {
6
Page {
448
7
    id: monthView
7
    id: monthViewPage
449
8
8
450
9
    // FIXME: change monthview to use this date as start date
9
    property var currentMonth: DateExt.today();
451
10
    property alias startDay: intern.currentDayStart
10
452
11
11
    signal dateSelected(var date);
453
12
    readonly property var monthStart: currentItem != null ? currentItem.monthStart : (new Date()).monthStart()
12
454
13
    readonly property var monthEnd: currentItem != null ? currentItem.monthEnd : (new Date()).monthStart().addMonths(1)
13
    PathViewBase{
455
14
    readonly property var currentDayStart: intern.currentDayStart
14
        id: monthViewPath
456
15
15
457
16
    property bool compressed: false
16
        property var startMonth: addMonth(currentMonth,-1);
458
17
    readonly property real compressedHeight: intern.squareUnit + intern.verticalMargin * 2
17
459
18
    readonly property real expandedHeight: intern.squareUnit * 6 + intern.verticalMargin * 2
18
        anchors.top:parent.top
460
19
19
461
20
    signal incrementCurrentDay
20
        width:parent.width
462
21
    signal decrementCurrentDay
21
        height: parent.height
463
22
22
464
23
    signal gotoNextMonth(int month)
23
        onNextItemHighlighted: {
465
24
    signal focusOnDay(var dayStart)
24
            nextMonth();
466
25
25
        }
467
26
    onCurrentItemChanged: {
26
468
27
        if (currentItem == null) {
27
        onPreviousItemHighlighted: {
469
28
            intern.currentDayStart = intern.currentDayStart
28
            previousMonth();
470
29
            return
29
        }
471
30
        }
30
472
31
        if (currentItem.monthStart <= intern.currentDayStart && intern.currentDayStart < currentItem.monthEnd)
31
        function nextMonth() {
473
32
            return
32
            currentMonth = addMonth(currentMonth,1);
474
33
        if (currentItem.monthStart <= intern.today && intern.today < currentItem.monthEnd)
33
        }
475
34
            intern.currentDayStart = intern.today
34
476
35
        else
35
        function previousMonth(){
477
36
            intern.currentDayStart = currentItem.monthStart
36
            currentMonth = addMonth(currentMonth,-1);
478
37
    }
37
        }
479
38
38
480
39
    onIncrementCurrentDay: {
39
        function addMonth(date,month){
481
40
        var t = intern.currentDayStart.addDays(1)
40
            var temp = new Date(date.getFullYear(),date.getMonth(),1,0,0,0);
482
41
        if (t < monthEnd) {
41
            temp.setMonth(date.getMonth() + month);
483
42
            intern.currentDayStart = t
42
            return temp;
484
43
        }
43
        }
485
44
        else if (currentIndex < count - 1) {
44
486
45
            intern.currentDayStart = t
45
        delegate: MonthComponent{
487
46
            currentIndex = currentIndex + 1
46
            width: parent.width - units.gu(5)
488
47
        }
47
            height: parent.height - units.gu(5)
489
48
    }
48
490
49
49
            monthDate: getMonthDate();
491
50
    onDecrementCurrentDay: {
50
492
51
        var t = intern.currentDayStart.addDays(-1)
51
            function getMonthDate() {
493
52
        if (t >= monthStart) {
52
                //previous page
494
53
            intern.currentDayStart = t
53
                if (index === monthViewPath.currentIndex) {
495
54
        }
54
                    return monthViewPath.startMonth;
496
55
        else if (currentIndex > 0) {
55
                }
497
56
            intern.currentDayStart = t
56
498
57
            currentIndex = currentIndex - 1
57
                //next page
499
58
        }
58
                var previousIndex = monthViewPath.currentIndex > 0 ? monthViewPath.currentIndex - 1 : 2
500
59
    }
59
                if ( index === previousIndex ) {
501
60
60
                    return monthViewPath.addMonth(monthViewPath.startMonth,2);
502
61
    onGotoNextMonth: {
61
                }
503
62
        if (monthStart.getMonth() != month) {
62
504
63
            var i = intern.monthIndex0, m = intern.today.getMonth()
63
                //current page
505
64
            while (m != month) {
64
                return monthViewPath.addMonth(monthViewPath.startMonth,1);
506
65
                m = (m + 1) % 12
65
            }
507
66
                i = i + 1
66
508
67
            }
67
            onDateSelected: {
509
68
            currentIndex = i
68
                monthViewPage.dateSelected(date);
510
69
        }
69
            }
511
70
    }
70
        }
313
71
314
72
    onFocusOnDay: {
315
73
        if (dayStart < monthStart) {
316
74
            if (currentIndex > 0) {
317
75
                intern.currentDayStart = dayStart
318
76
                currentIndex = currentIndex - 1
319
77
            }
320
78
        }
321
79
        else if (dayStart >= monthEnd) {
322
80
            if (currentIndex < count - 1) {
323
81
                intern.currentDayStart = dayStart
324
82
                currentIndex = currentIndex + 1
325
83
            }
326
84
        }
327
85
        else intern.currentDayStart = dayStart
328
86
    }
329
87
330
88
    function goToToday() {
331
89
        var today = (new Date()).midnight();
332
90
        intern.currentDayStart = today
333
91
        currentIndex= intern.monthIndex0
334
92
    }
335
93
336
94
    focus: true
337
95
    Keys.onLeftPressed: decrementCurrentDay()
338
96
    Keys.onRightPressed: incrementCurrentDay()
339
97
340
98
    QtObject {
341
99
        id: intern
342
100
343
101
        property int squareUnit: monthView.width / 8
344
102
        property int verticalMargin: units.gu(1)
345
103
        property int weekstartDay: Qt.locale().firstDayOfWeek
346
104
        property int monthCount: 49 // months for +-2 years
347
105
348
106
        property var today: (new Date()).midnight() // TODO: update at midnight
349
107
        property var currentDayStart: today
350
108
        property int monthIndex0: Math.floor(monthCount / 2)
351
109
        property var monthStart0: today.monthStart()
352
110
    }
353
111
354
112
    width: parent.width
355
113
    height: compressed ? compressedHeight : expandedHeight
356
114
357
115
    interactive: !compressed
358
116
    clip: true
359
117
    orientation: ListView.Horizontal
360
118
    snapMode: ListView.SnapOneItem
361
119
    cacheBuffer: width + 1
362
120
363
121
    highlightRangeMode: ListView.StrictlyEnforceRange
364
122
    preferredHighlightBegin: 0
365
123
    preferredHighlightEnd: width
366
124
367
125
    model: intern.monthCount
368
126
    currentIndex: intern.monthIndex0
369
127
370
128
    delegate: Item {
371
129
        id: monthItem
372
130
373
131
        property var monthStart: intern.monthStart0.addMonths(index - intern.monthIndex0)
374
132
        property var monthEnd: monthStart.addMonths(1)
375
133
        property var gridStart: monthStart.weekStart(intern.weekstartDay)
376
134
        property int currentWeekRow: Math.floor((currentDayStart.getTime() - gridStart.getTime()) / Date.msPerWeek)
377
135
378
136
        width: monthView.width
379
137
        height: monthView.height
380
138
381
139
        Grid {
382
140
            id: monthGrid
383
141
384
142
            rows: 6
385
143
            columns: 7
386
144
387
145
            x: intern.squareUnit / 2
388
146
            y: intern.verticalMargin
389
147
            width: intern.squareUnit * columns
390
148
            height: intern.squareUnit * rows
391
149
392
150
            Repeater {
393
151
                model: monthGrid.rows * monthGrid.columns
394
152
                delegate: Item {
395
153
                    id: dayItem
396
154
                    property var dayStart: gridStart.addDays(index)
397
155
                    property bool isCurrentMonth: monthStart <= dayStart && dayStart < monthEnd
398
156
                    property bool isToday: dayStart.getTime() === intern.today.getTime()
399
157
                    property bool isCurrent: dayStart.getTime() === intern.currentDayStart.getTime()
400
158
                    property int weekday: (index % 7 + intern.weekstartDay) % 7
401
159
                    property bool isSunday: weekday == 0
402
160
                    property int row: Math.floor(index / 7)
403
161
                    property bool isCurrentWeek: row == currentWeekRow
404
162
                    property real topMargin: (row == 0 || (monthView.compressed && isCurrentWeek)) ? -intern.verticalMargin : 0
405
163
                    property real bottomMargin: (row == 5 || (monthView.compressed && isCurrentWeek)) ? -intern.verticalMargin : 0
406
164
                    visible: monthView.compressed ? isCurrentWeek : true
407
165
                    width: intern.squareUnit
408
166
                    height: intern.squareUnit
409
167
                    Rectangle {
410
168
                        visible: isSunday
411
169
                        anchors.fill: parent
412
170
                        anchors.topMargin: dayItem.topMargin
413
171
                        anchors.bottomMargin: dayItem.bottomMargin
414
172
                        color: Color.warmGrey
415
173
                        opacity: 0.1
416
174
                    }
417
175
                    Text {
418
176
                        anchors.centerIn: parent
419
177
                        text: dayStart.getDate()
420
178
                        font: themeDummy.font
421
179
                        color: isToday ? Color.ubuntuOrange : themeDummy.color
422
180
                        scale: isCurrent ? 1.8 : 1.
423
181
                        opacity: isCurrentMonth ? 1. : 0.3
424
182
                        Behavior on scale {
425
183
                            NumberAnimation { duration: 50 }
426
184
                        }
427
185
                    }
428
186
                    MouseArea {
429
187
                        anchors.fill: parent
430
188
                        anchors.topMargin: dayItem.topMargin
431
189
                        anchors.bottomMargin: dayItem.bottomMargin
432
190
                        onReleased: monthView.focusOnDay(dayStart)
433
191
                    }
434
192
                    // Component.onCompleted: console.log(dayStart, intern.currentDayStart)
435
193
                }
436
194
            }
437
195
        }
438
196
439
197
        // Component.onCompleted: console.log("Created delegate for month", index, monthStart, gridStart, currentWeekRow, currentWeekRowReal)
440
198
    }
441
199
442
200
    Label {
443
201
        visible: false
444
202
        id: themeDummy
445
203
        fontSize: "large"
446
204
        // Component.onCompleted: console.log(color, Qt.lighter(color, 1.74))
512
205
    }
71
    }
513
206
}
72
}
514
207
73
515
=== modified file 'YearView.qml'
516
--- YearView.qml	2013-07-09 14:35:09 +0000
517
+++ YearView.qml	2013-09-03 23:46:33 +0000
518
@@ -1,20 +1,23 @@
519
1
import QtQuick 2.0
1
import QtQuick 2.0
520
2
import Ubuntu.Components 0.1
2
import Ubuntu.Components 0.1
521
3
3
522
4
import "dateExt.js" as DateExt
523
5
524
4
PathViewBase {
6
PathViewBase {
525
5
    id: root
7
    id: root
526
6
8
527
9
    property var currentYear: DateExt.today();
528
10
529
11
    signal monthSelected(var date);
530
12
531
7
    anchors.fill: parent
13
    anchors.fill: parent
532
8
    property var year: getDateFromYear(intern.now.getFullYear()-1);
533
9
534
10
    signal monthSelected(var date);
535
11
14
536
12
    onNextItemHighlighted: {
15
    onNextItemHighlighted: {
538
13
        year = getDateFromYear(year.getFullYear() + 1);
16
        currentYear = getDateFromYear(currentYear.getFullYear() + 1);
539
14
    }
17
    }
540
15
18
541
16
    onPreviousItemHighlighted: {
19
    onPreviousItemHighlighted: {
543
17
        year = getDateFromYear(year.getFullYear() - 1);
20
        currentYear = getDateFromYear(currentYear.getFullYear() - 1);
544
18
    }
21
    }
545
19
22
546
20
    function getDateFromYear(year) {
23
    function getDateFromYear(year) {
547
@@ -23,54 +26,62 @@
548
23
26
549
24
    QtObject{
27
    QtObject{
550
25
        id: intern
28
        id: intern
553
26
        property var now: new Date()
29
        property var startYear: getDateFromYear(currentYear.getFullYear()-1);
552
27
        property int weekstartDay: Qt.locale().firstDayOfWeek
554
28
    }
30
    }
555
29
31
557
30
    delegate: Item{
32
    delegate: Flickable{
558
31
        id: yearView
33
        id: yearView
561
32
34
        clip: true
562
33
        property var year: {
35
563
36
        property var year: getYear();
564
37
565
38
        function getYear(){
566
34
            if (index === root.currentIndex) {
39
            if (index === root.currentIndex) {
568
35
                return root.year;
40
                return intern.startYear;
569
36
            }
41
            }
570
37
            var previousIndex = root.currentIndex > 0 ? root.currentIndex - 1 : 2
42
            var previousIndex = root.currentIndex > 0 ? root.currentIndex - 1 : 2
571
38
43
572
39
            if ( index === previousIndex ) {
44
            if ( index === previousIndex ) {
574
40
                return getDateFromYear(root.year.getFullYear()-1);
45
                return getDateFromYear(intern.startYear.getFullYear() - 1);
575
41
            }
46
            }
576
42
47
578
43
            return getDateFromYear(root.year.getFullYear()+ 1);
48
            return getDateFromYear(intern.startYear.getFullYear() + 1);
579
44
        }
49
        }
580
45
50
581
46
        width: parent.width
51
        width: parent.width
582
47
        height: parent.height
52
        height: parent.height
583
48
53
591
49
        Label{
54
        contentHeight: yearGrid.height + units.gu(2)
592
50
            id: yearLabel
55
        contentWidth: width
586
51
            text: year.getFullYear()
587
52
            fontSize: "large"
588
53
            anchors.horizontalCenter: parent.horizontalCenter
589
54
            font.bold: true
590
55
        }
593
56
56
594
57
        Grid{
57
        Grid{
595
58
            id: yearGrid
58
            id: yearGrid
603
59
            rows: 4
59
            rows: 6
604
60
            columns: 3
60
            columns: 2
605
61
61
606
62
            width: parent.width
62
            anchors.top: parent.top
607
63
            height: parent.height
63
            anchors.topMargin: units.gu(1.5)
608
64
            anchors.top: yearLabel.bottom
64
609
65
            spacing: units.gu(2.5)
65
            width: parent.width - ((columns-1) * yearGrid.spacing)
610
66
            spacing: units.gu(2)
611
67
            anchors.horizontalCenter: parent.horizontalCenter
612
66
68
613
67
            Repeater{
69
            Repeater{
614
68
                model: yearGrid.rows * yearGrid.columns
70
                model: yearGrid.rows * yearGrid.columns
615
69
                delegate: MonthComponent{
71
                delegate: MonthComponent{
617
70
                    date: new Date(year.getFullYear(),index,1,0,0,0,0)
72
                    monthDate: new Date(yearView.year.getFullYear(),index,1,0,0,0,0)
618
73
                    width: (parent.width - units.gu(2))/2
619
74
                    height: width * 1.5
620
75
                    dayLabelFontSize:"x-small"
621
76
                    dateLabelFontSize: "medium"
622
77
                    monthLabelFontSize: "medium"
623
78
                    yearLabelFontSize: "small"
624
71
79
627
72
                    onMonthSelected: {
80
                    MouseArea{
628
73
                        root.monthSelected(date);
81
                        anchors.fill: parent
629
82
                        onClicked: {
630
83
                            root.monthSelected(monthDate);
631
84
                        }
632
74
                    }
85
                    }
633
75
                }
86
                }
634
76
            }
87
            }
635
77
88
636
=== modified file 'calendar.qml'
637
--- calendar.qml	2013-08-20 14:32:27 +0000
638
+++ calendar.qml	2013-09-03 23:46:33 +0000
639
@@ -24,8 +24,8 @@
640
24
            property var currentDay: DateExt.today();
24
            property var currentDay: DateExt.today();
641
25
25
642
26
            onCurrentDayChanged: {
26
            onCurrentDayChanged: {
645
27
                if( monthView.startDay !== undefined && !monthView.startDay.isSameDay(currentDay))
27
                if( monthView.currentMonth !== undefined && !monthView.currentMonth.isSameDay(currentDay))
646
28
                    monthView.startDay = currentDay.midnight();
28
                    monthView.currentMonth = currentDay.midnight();
647
29
29
648
30
                if( !dayView.currentDay.isSameDay(currentDay))
30
                if( !dayView.currentDay.isSameDay(currentDay))
649
31
                    dayView.currentDay = currentDay
31
                    dayView.currentDay = currentDay
650
@@ -60,7 +60,6 @@
651
60
                        text: i18n.tr("Today");
60
                        text: i18n.tr("Today");
652
61
                        onTriggered: {
61
                        onTriggered: {
653
62
                            tabPage.currentDay = (new Date()).midnight();
62
                            tabPage.currentDay = (new Date()).midnight();
654
63
                            monthView.goToToday();
655
64
                        }
63
                        }
656
65
                    }
64
                    }
657
66
                }
65
                }
658
@@ -76,13 +75,12 @@
659
76
                        YearView{
75
                        YearView{
660
77
                            onMonthSelected: {
76
                            onMonthSelected: {
661
78
                                tabs.selectedTabIndex = 1
77
                                tabs.selectedTabIndex = 1
663
79
                                var now = new Date();
78
                                var now = DateExt.today();
664
80
                                if( date.getMonth() === now.getMonth()
79
                                if( date.getMonth() === now.getMonth()
665
81
                                        && date.getFullYear() === now.getFullYear()) {
80
                                        && date.getFullYear() === now.getFullYear()) {
667
82
                                    monthView.goToToday();
81
                                    monthView.currentMonth = now
668
83
                                } else {
82
                                } else {
671
84
                                    monthView.startDay = date.midnight();
83
                                    monthView.currentMonth = date.midnight();
670
85
                                    monthView.gotoNextMonth(date.getMonth());
672
86
                                }
84
                                }
673
87
                            }
85
                            }
674
88
                        }
86
                        }
675
@@ -91,24 +89,14 @@
676
91
                Tab {
89
                Tab {
677
92
                    id: monthTab
90
                    id: monthTab
678
93
                    title: i18n.tr("Month")
91
                    title: i18n.tr("Month")
680
94
                    page: Page{
92
                    page: MonthView{
681
95
                        anchors.fill: parent
93
                        anchors.fill: parent
682
96
                        tools: commonToolBar
94
                        tools: commonToolBar
690
97
                        Column {
95
                        id: monthView
684
98
                            anchors.fill: parent
685
99
                            Label{
686
100
                                id: monthLabel
687
101
                                fontSize: "large"
688
102
                                text: Qt.formatDateTime(monthView.startDay,"MMMM yyyy");
689
103
                            }
691
104
96
699
105
                            MonthView {
97
                        onDateSelected: {
700
106
                                id: monthView
98
                            tabs.selectedTabIndex  = 3
701
107
                                onFocusOnDay: {
99
                            tabPage.currentDay = date;
695
108
                                    tabs.selectedTabIndex  = 3
696
109
                                    tabPage.currentDay = dayStart;
697
110
                                }
698
111
                            }
702
112
                        }
100
                        }
703
113
                    }
101
                    }
704
114
                }
102
                }
705
115
103
706
=== modified file 'dateExt.js'
707
--- dateExt.js	2013-09-03 01:52:17 +0000
708
+++ dateExt.js	2013-09-03 23:46:33 +0000
709
@@ -104,3 +104,8 @@
710
104
    date.setHours(0,0,0,0);
104
    date.setHours(0,0,0,0);
711
105
    return date
105
    return date
712
106
}
106
}
713
107
714
108
function isSameMonth(date1, date2) {
715
109
    return ( date1.getMonth() === date2.getMonth()
716
110
            && date1.getFullYear() === date2.getFullYear())
717
111
}
718
107
112
719
=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
720
--- tests/autopilot/calendar_app/tests/test_monthview.py	2013-08-28 16:19:06 +0000
721
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2013-09-03 23:46:33 +0000
722
@@ -24,7 +24,7 @@
723
24
24
724
25
    def get_currentDayStart(self):
25
    def get_currentDayStart(self):
725
26
        month_view = self.main_view.get_month_view()
26
        month_view = self.main_view.get_month_view()
727
27
        return datetime.fromtimestamp(month_view.currentDayStart)
27
        return datetime.fromtimestamp(month_view.currentMonth)
728
28
28
729
29
    def change_month(self, delta):
29
    def change_month(self, delta):
730
30
        month_view = self.main_view.get_month_view()
30
        month_view = self.main_view.get_month_view()
Status:	Merged
Approved by:	Olivier Tilloy on 2013-09-04
Approved revision:	101
Merged at revision:	108
Proposed branch:	lp:~pkunal-parmar/ubuntu-calendar-app/new_month_yearview
Merge into:	lp:ubuntu-calendar-app
Diff against target:	730 lines (+254/-332) 6 files modified MonthComponent.qml (+132/-80) MonthView.qml (+65/-199) YearView.qml (+41/-30) calendar.qml (+10/-22) dateExt.js (+5/-0) tests/autopilot/calendar_app/tests/test_monthview.py (+1/-1)
To merge this branch:	bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/new_month_yearview
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-09-04
Olivier Tilloy (community)		2013-08-31	Approve on 2013-09-03
Riccardo Padovani (community)			Approve on 2013-09-02
Review via email: mp+183305@code.launchpad.net