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

[Kunal Parmar]

Month highlight fix, on scaling monthview on desktop highlight does not scale properly. This patch fix it.

Month highlight fix, on scaling monthview on desktop highlight does not scale properly. This patch fix it.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:181
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/240/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/658
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/240
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/240
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/74

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/240/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

What with the changes to manifest.json? They look unrelated.

review: Needs Information

[Kunal Parmar (pkunal-parmar)]

> What with the changes to manifest.json? They look unrelated.

Right, its not related, I don't know but when I make branch its gets changed by itself.

Do you know how to avoid it and how I can revert it back ?

[Olivier Tilloy (osomon)]

> > What with the changes to manifest.json? They look unrelated.
>
> Right, its not related, I don't know but when I make branch its gets changed
> by itself.
>
> Do you know how to avoid it and how I can revert it back ?

It’s as easy as choosing what to commit and what not to commit when you issue `bzr commit`. It’s made even easier if you use the qbzr frontend: `bzr qcommit`.

Or, before committing, you can issue `bzr revert manifest.json`.

Now to fix this situation you will need to manually revert the changes.

[Kunal Parmar (pkunal-parmar)]

> > > What with the changes to manifest.json? They look unrelated.
> >
> > Right, its not related, I don't know but when I make branch its gets changed
> > by itself.
> >
> > Do you know how to avoid it and how I can revert it back ?
>
> It’s as easy as choosing what to commit and what not to commit when you issue
> `bzr commit`. It’s made even easier if you use the qbzr frontend: `bzr
> qcommit`.
>
> Or, before committing, you can issue `bzr revert manifest.json`.
>
> Now to fix this situation you will need to manually revert the changes.

Yes, I could have remove those before commit, but was not sure, I thought its some new thing required for BZR.

But yes I will revert changes manually. Thanks for help.

[lp:~pkunal-parmar/ubuntu-calendar-app/MonthHighlightFix]

182. By Kunal Parmar on 2014-01-16

manifest file reverted

[Kunal Parmar (pkunal-parmar)]

> > > What with the changes to manifest.json? They look unrelated.
> >
> > Right, its not related, I don't know but when I make branch its gets changed
> > by itself.
> >
> > Do you know how to avoid it and how I can revert it back ?
>
> It’s as easy as choosing what to commit and what not to commit when you issue
> `bzr commit`. It’s made even easier if you use the qbzr frontend: `bzr
> qcommit`.
>
> Or, before committing, you can issue `bzr revert manifest.json`.
>
> Now to fix this situation you will need to manually revert the changes.

Now I reverted file manually, Please check again.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:182
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/242/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/722
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/242
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/242
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/76

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/242/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me and works, thanks!

review: Approve

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2013-11-27 13:24:56 +0000
+++ MonthComponent.qml	2014-01-16 00:02:20 +0000
@@ -98,7 +98,7 @@
             height: parent.height / parent.weekCount
 
             Loader {
-                width: parent.width
+                width: parent.width < parent.height ? parent.width : parent.height
                 height: width
                 anchors.centerIn: parent
                 sourceComponent: date.isSameDay(DateExt.today()) && isCurrentMonth ? highLightComp : undefined