Merge lp:~mblayman/entertainer/241727-no-music into lp:entertainer

[Matt Layman]

[Joshua Scotton (joshuascotton)]

Entertainer runs ok and the screens displays the correct message as expected

However the "Artist", "Albums" and "Playlists" labels are all red now.

This is due to:
+ self.tab_group = TabGroup(0.95, 0.13, self.theme.getColor("title"))
The color parameter in the TabGroup constructor is NOT a color name. It is the theme descriptor name which is then passed on to the Label object which finally calls self.set_color(self.theme.getColor(color_name)) on line 28 of label.py
Hence line 60 in music_screen.py should be:
            self.tab_group = TabGroup(0.95, 0.13, "title")

Please fix

Tests and pylint work ok. No other problems

review: Disapprove

[lp:~mblayman/entertainer/241727-no-music]

281. By Matt Layman on 2008-10-11

Fixed some silly mistake based on Josh's review. I think I may have copied something from old code.

[Matt Layman (mblayman)]

On Sat, Oct 11, 2008 at 4:36 PM, Joshua Scotton <email address hidden>wrote:

> Vote: Disapprove
> Entertainer runs ok and the screens displays the correct message as
> expected
>
> However the "Artist", "Albums" and "Playlists" labels are all red now.
>
> This is due to:
> + self.tab_group = TabGroup(0.95, 0.13,
> self.theme.getColor("title"))
> The color parameter in the TabGroup constructor is NOT a color name. It is
> the theme descriptor name which is then passed on to the Label object which
> finally calls self.set_color(self.theme.getColor(color_name)) on line 28 of
> label.py
> Hence line 60 in music_screen.py should be:
> self.tab_group = TabGroup(0.95, 0.13, "title")
>
> Please fix
>

I must have copied some code from an old branch because I modeled this fix
after the way the photoalbums screen handles this case. I tested the case
when there was no music, but I guess I forgot to regression test and look at
the case where there was music. Thanks for catching this. I've pushed up the
fix already.

[Joshua Scotton (joshuascotton)]

Thanks

review: Approve