1
=== modified file 'DayView.qml'
2
--- DayView.qml	2013-08-27 14:41:12 +0000
3
+++ DayView.qml	2013-09-03 15:16:52 +0000
4
@@ -13,7 +13,7 @@
5
13
    property var currentDay: new Date()
13
    property var currentDay: new Date()
6
14
14
7
15
    onCurrentDayChanged:{
15
    onCurrentDayChanged:{
9
16
        weekRibbon.visibleWeek = currentDay.weekStart(intern.firstDayOfWeek);
16
        weekRibbon.visibleWeek = currentDay.weekStart(Qt.locale().firstDayOfWeek);
10
17
        weekRibbon.setSelectedDay(currentDay);
17
        weekRibbon.setSelectedDay(currentDay);
11
18
    }
18
    }
12
19
19
13
@@ -29,18 +29,15 @@
14
29
        text: new Date(0, 0, 0, 0).toLocaleTimeString(Qt.locale(), i18n.tr("HH"))
29
        text: new Date(0, 0, 0, 0).toLocaleTimeString(Qt.locale(), i18n.tr("HH"))
15
30
    }
30
    }
16
31
31
17
32
    Label{
18
33
        id: dummy;text: "SUN";visible: false;fontSize: "large"
19
34
    }
20
35
21
36
    WeekRibbon{
32
    WeekRibbon{
22
37
        id: weekRibbon
33
        id: weekRibbon
24
38
        visibleWeek: currentDay.weekStart(intern.firstDayOfWeek);
34
        visibleWeek: currentDay.weekStart(Qt.locale().firstDayOfWeek);
25
39
        anchors.top: todayLabel.bottom
35
        anchors.top: todayLabel.bottom
26
40
        anchors.left: timeLabel.right
36
        anchors.left: timeLabel.right
28
41
        width: parent.width - timeLabel.width
37
        width: parent.width
29
42
        height: units.gu(10)
38
        height: units.gu(10)
31
43
        weekWidth: dummy.width + units.gu(1)
39
        //removing timeLabel.width from front and back of ribbon
32
40
        weekWidth: ((width - 2* timeLabel.width )/ 7 )
33
44
41
34
45
        onWeekChanged: {
42
        onWeekChanged: {
35
46
            currentDay = visibleWeek
43
            currentDay = visibleWeek
36
@@ -59,7 +56,6 @@
37
59
56
38
60
        QtObject{
57
        QtObject{
39
61
            id: intern
58
            id: intern
40
62
            property int firstDayOfWeek: Qt.locale().firstDayOfWeek
41
63
            property var startDay: weekViewPath.visibleDay.addDays(-1)
59
            property var startDay: weekViewPath.visibleDay.addDays(-1)
42
64
        }
60
        }
43
65
61
44
@@ -89,7 +85,7 @@
45
89
85
46
90
            width: parent.width
86
            width: parent.width
47
91
            height: parent.height
87
            height: parent.height
49
92
            weekWidth: dummy.width + units.gu(1)
88
            weekWidth: weekRibbon.weekWidth
50
93
            day: getStartDay();
89
            day: getStartDay();
51
94
90
52
95
            function getStartDay() {
91
            function getStartDay() {
53
96
92
54
=== modified file 'WeekRibbon.qml'
55
--- WeekRibbon.qml	2013-08-17 03:29:15 +0000
56
+++ WeekRibbon.qml	2013-09-03 15:16:52 +0000
57
@@ -16,7 +16,6 @@
58
16
    QtObject{
16
    QtObject{
59
17
        id: intern
17
        id: intern
60
18
        property var now: new Date();
18
        property var now: new Date();
61
19
        property int weekstartDay: Qt.locale().firstDayOfWeek
62
20
        property var weekStart: visibleWeek.addDays(-7)
19
        property var weekStart: visibleWeek.addDays(-7)
63
21
        property var selectedDate: visibleWeek
20
        property var selectedDate: visibleWeek
64
22
    }
21
    }
65
@@ -38,7 +37,7 @@
66
38
    }
37
    }
67
39
38
68
40
    function nextWeek() {
39
    function nextWeek() {
70
41
        var weekStartDay= visibleWeek.weekStart(intern.weekstartDay);
40
        var weekStartDay= visibleWeek.weekStart(Qt.locale().firstDayOfWeek);
71
42
        visibleWeek = weekStartDay.addDays(7);
41
        visibleWeek = weekStartDay.addDays(7);
72
43
        setSelectedDay();
42
        setSelectedDay();
73
44
43
74
@@ -46,7 +45,7 @@
75
46
    }
45
    }
76
47
46
77
48
    function previousWeek(){
47
    function previousWeek(){
79
49
        var weekStartDay = visibleWeek.weekStart(intern.weekstartDay);
48
        var weekStartDay = visibleWeek.weekStart(Qt.locale().firstDayOfWeek);
80
50
        visibleWeek = weekStartDay.addDays(-7);
49
        visibleWeek = weekStartDay.addDays(-7);
81
51
        setSelectedDay();
50
        setSelectedDay();
82
52
51
83
@@ -60,7 +59,7 @@
84
60
            return;
59
            return;
85
61
        }
60
        }
86
62
61
88
63
        if( intern.now.weekStart(intern.weekstartDay).isSameDay(visibleWeek) ) {
62
        if( intern.now.weekStart(Qt.locale().firstDayOfWeek).isSameDay(visibleWeek) ) {
89
64
            intern.selectedDate =  intern.now
63
            intern.selectedDate =  intern.now
90
65
        } else {
64
        } else {
91
66
            intern.selectedDate = visibleWeek
65
            intern.selectedDate = visibleWeek
92
@@ -113,7 +112,7 @@
93
113
                id: column
112
                id: column
94
114
                width: weekWidth
113
                width: weekWidth
95
115
                Label{
114
                Label{
97
116
                    text: Qt.locale().standaloneDayName(( intern.weekstartDay + index), Locale.ShortFormat)
115
                    text: Qt.locale().standaloneDayName(( Qt.locale().firstDayOfWeek + index), Locale.ShortFormat)
98
117
                    horizontalAlignment: Text.AlignHCenter
116
                    horizontalAlignment: Text.AlignHCenter
99
118
                    width: column.width
117
                    width: column.width
100
119
                    fontSize: "medium"
118
                    fontSize: "medium"
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-09-03
Olivier Tilloy (community)		2013-08-30	Approve on 2013-09-02
Review via email: mp+183149@code.launchpad.net