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

Proposed by Kunal Parmar
Status: Merged
Approved by: David Planella
Approved revision: 182
Merged at revision: 187
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/MonthHighlightFix
Merge into: lp:ubuntu-calendar-app
Diff against target: 12 lines (+1/-1)
1 file modified
MonthComponent.qml (+1/-1)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/MonthHighlightFix
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Olivier Tilloy Needs Information
Review via email: mp+201279@code.launchpad.net

Commit message

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

Description of the change

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

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: Approve (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

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

review: Needs Information
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> 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 ?

Revision history for this message
Olivier Tilloy (osomon) wrote :

> > 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.

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> > > 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.

182. By Kunal Parmar

manifest file reverted

Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> > > 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.

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

Looks good to me and works, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MonthComponent.qml'
2--- MonthComponent.qml 2013-11-27 13:24:56 +0000
3+++ MonthComponent.qml 2014-01-16 00:02:20 +0000
4@@ -98,7 +98,7 @@
5 height: parent.height / parent.weekCount
6
7 Loader {
8- width: parent.width
9+ width: parent.width < parent.height ? parent.width : parent.height
10 height: width
11 anchors.centerIn: parent
12 sourceComponent: date.isSameDay(DateExt.today()) && isCurrentMonth ? highLightComp : undefined

Subscribers

People subscribed via source and target branches

to status/vote changes: