← Back to branch summary

~pkunal-parmar/ubuntu-calendar-app/CustomSwipeArea

« back to all changes in this revision

Viewing changes to WeekView.qml

  • Committer: Kunal Parmar
  • Date: 2014-02-12 00:24:25 UTC
  • mfrom: (196 trunk)
  • mto: This revision was merged to the branch mainline in revision 208.
  • Revision ID: pkunal.parmar@gmail.com-20140212002425-on9d12oczfqymipf
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
WeekView.qml
32
32
        id: weekViewPath
33
33
 
34
34
        property var visibleWeek: dayStart.weekStart(Qt.locale().firstDayOfWeek);
35
 
        property var weekStart: weekViewPath.visibleWeek.addDays(-7)
 
35
        property var weekStart: weekViewPath.visibleWeek
36
36
 
37
37
        width: parent.width
38
38
        height: root.height - weekViewPath.y
72
72
                    return weekViewPath.weekStart;
73
73
                case -1:
74
74
                    var weekStartDay= weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
75
 
                    return weekStartDay.addDays(14);
 
75
                    return weekStartDay.addDays(-7);
76
76
                case 1:
77
77
                    var weekStartDay = weekViewPath.weekStart.weekStart(Qt.locale().firstDayOfWeek);
78
78
                    return weekStartDay.addDays(7);