Merge lp:~pkunal-parmar/ubuntu-calendar-app/YearView-Today into lp:ubuntu-calendar-app

Proposed by Kunal Parmar
Status: Merged
Approved by: Mihir Soni
Approved revision: 214
Merged at revision: 220
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/YearView-Today
Merge into: lp:ubuntu-calendar-app
Diff against target: 23 lines (+6/-0)
1 file modified
calendar.qml (+6/-0)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/YearView-Today
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Mihir Soni Approve
Review via email: mp+210942@code.launchpad.net

Commit message

fix for Bug #1290728,

Click on today will move yearview to current year.

Description of the change

fix for Bug #1290728,

Click on today will move yearview to current year.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me.

Thank you Kunal.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

There is merge conflicts, I will resolve those. Then we can approve it.

214. By Kunal Parmar

Merge from trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'calendar.qml'
2--- calendar.qml 2014-03-22 04:43:11 +0000
3+++ calendar.qml 2014-03-23 14:22:42 +0000
4@@ -76,6 +76,11 @@
5 property int endtime: -1;
6
7 onCurrentDayChanged: {
8+ if( yearView.currentYear !== undefined &&
9+ yearView.currentYear.getFullYear() !== currentDay.getFullYear() ) {
10+ yearView.currentYear = tabPage.currentDay.midnight();
11+ }
12+
13 if( monthView.currentMonth !== undefined && !monthView.currentMonth.isSameDay(currentDay))
14 monthView.currentMonth = currentDay.midnight();
15
16@@ -242,6 +247,7 @@
17 anchors.fill: parent
18 tools: commonToolBar
19 YearView{
20+ id: yearView
21 onMonthSelected: {
22 tabs.selectedTabIndex = 1
23 var now = DateExt.today();

Subscribers

People subscribed via source and target branches

to status/vote changes: