Merge lp://staging/~nataliabidart/software-center/cant-stop-the-music into lp://staging/software-center/5.2

Proposed by Natalia Bidart
Status: Merged
Merged at revision: 3050
Proposed branch: lp://staging/~nataliabidart/software-center/cant-stop-the-music
Merge into: lp://staging/software-center/5.2
Diff against target: 491 lines (+165/-59)
8 files modified
softwarecenter/ui/gtk3/session/navhistory.py (+2/-3)
softwarecenter/ui/gtk3/session/viewmanager.py (+5/-0)
softwarecenter/ui/gtk3/views/appdetailsview.py (+9/-8)
softwarecenter/ui/gtk3/widgets/videoplayer.py (+3/-0)
test/gtk3/test_appdetailsview.py (+58/-45)
test/gtk3/test_appmanager.py (+2/-1)
test/gtk3/test_viewmanager.py (+59/-0)
test/gtk3/test_widgets.py (+27/-2)
To merge this branch: bzr merge lp://staging/~nataliabidart/software-center/cant-stop-the-music
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+110607@code.staging.launchpad.net

Commit message

- Stop the video if user navigates away from an app details page
  (LP: #1003954).

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks Natalia, this is great work!

There is one small issue:
- navigate to "plutoids"
- click on "back"
- click on "forward"
- the video frame is now blank because on navigation to the page the url is not updated
  (as the view is "clever" and remembers that it does not need to reload the page)

It would be great if you could have a look at this.

Another thought for trunk would be to decouple the "stop" from the ViewManager.display_page and add
signals or functions like "enter-page", "leave-page" so that the page itself can do the magic that needs
to be done (like stop video or store the vadjustment in the applist). What do you think about
this?

Revision history for this message
Michael Vogt (mvo) wrote :

(oh, and I love your branch names)

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

> Thanks Natalia, this is great work!
>
> There is one small issue:
> - navigate to "plutoids"
> - click on "back"
> - click on "forward"
> - the video frame is now blank because on navigation to the page the url is
> not updated
> (as the view is "clever" and remembers that it does not need to reload the
> page)
>
> It would be great if you could have a look at this.

Nice catch! Will be fixing this ASAP.

> Another thought for trunk would be to decouple the "stop" from the
> ViewManager.display_page and add
> signals or functions like "enter-page", "leave-page" so that the page itself
> can do the magic that needs
> to be done (like stop video or store the vadjustment in the applist). What do
> you think about
> this?

I would love that considering that the current proposed solution couples the different modules too much.

You want me to propose a branch against trunk? is it ok if trunk and 5.2 start diverging?

Revision history for this message
Michael Vogt (mvo) wrote :

On Mon, Jun 18, 2012 at 11:51:34AM -0000, Natalia Bidart wrote:
> > Thanks Natalia, this is great work!
> >
> > There is one small issue:
> > - navigate to "plutoids"
> > - click on "back"
> > - click on "forward"
> > - the video frame is now blank because on navigation to the page the url is
> > not updated
> > (as the view is "clever" and remembers that it does not need to reload the
> > page)
> >
> > It would be great if you could have a look at this.
>
> Nice catch! Will be fixing this ASAP.
Thanks!

> > Another thought for trunk would be to decouple the "stop" from the
> > ViewManager.display_page and add
> > signals or functions like "enter-page", "leave-page" so that the page itself
> > can do the magic that needs
> > to be done (like stop video or store the vadjustment in the applist). What do
> > you think about
> > this?
>
> I would love that considering that the current proposed solution couples the different modules too much.
>
> You want me to propose a branch against trunk? is it ok if trunk and 5.2 start diverging?

I think for 5.2 this branch is perfect as it makes the SRU upload
easier (small amount of code changes etc). For the improved fix we
should target trunk and I think its ok if the two branches diverge,
its a unavoidable in the longer term anyway :)

Cheers,
 Michael

3053. By Natalia Bidart

Ensure that video gets updated when navigating back to an already visited app.

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for the fix, this looks fine now. Plus I appreciate the cleanup in the test, e.g. the new
 "set_mock_app_and_details()"

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches