Merge lp:~samuel-buffet/entertainer/no_fakes into lp:entertainer

[Samuel Buffet]

Unimplemented playlists tabs have been removed. (Samuel Buffet)

[Samuel Buffet (samuel-buffet)]

Hi again,

Here I wanted to remove the fake playlists tabs. But I did not removed the code related to playlists elsewhere because it looks good. So I've only touched visual things.

the diff:
=== modified file 'entertainerlib/frontend/gui/screens/audio_play.py'
--- entertainerlib/frontend/gui/screens/audio_play.py 2009-02-28 17:52:38 +0000
+++ entertainerlib/frontend/gui/screens/audio_play.py 2009-04-03 20:05:17 +0000
@@ -12,7 +12,6 @@
 from entertainerlib.frontend.gui.screens.screen import Screen
 from entertainerlib.frontend.gui.tabs.lyrics_tab import LyricsTab
 from entertainerlib.frontend.gui.tabs.playing_tab import PlayingTab
-from entertainerlib.frontend.gui.tabs.playlist_tab import PlaylistTab
 from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)

@@ -45,10 +44,8 @@
         # Tabs
         tab1 = PlayingTab(track)
         tab2 = LyricsTab(music_library, track)
- tab3 = PlaylistTab()
         self.add_tab(tab1)
         self.add_tab(tab2)
- self.add_tab(tab3)

         media_player.set_media(track)
         media_player.play()

=== modified file 'entertainerlib/frontend/gui/screens/music.py'
--- entertainerlib/frontend/gui/screens/music.py 2009-02-28 17:52:38 +0000
+++ entertainerlib/frontend/gui/screens/music.py 2009-04-03 20:02:58 +0000
@@ -7,7 +7,6 @@
 from entertainerlib.frontend.gui.screens.screen import Screen
 from entertainerlib.frontend.gui.tabs.albums_tab import AlbumsTab
 from entertainerlib.frontend.gui.tabs.artists_tab import ArtistsTab
-from entertainerlib.frontend.gui.tabs.playlists_tab import PlaylistsTab
 from entertainerlib.frontend.gui.widgets.label import Label
 from entertainerlib.frontend.gui.widgets.texture import Texture
 from entertainerlib.frontend.medialibrary.playlist import Playlist
@@ -39,11 +38,9 @@
             tab2 = AlbumsTab(music_library.get_all_albums(),
                 move_to_new_screen_callback)
             tab2.hide_tab()
- tab3 = PlaylistsTab(music_library.get_playlists())

             self.add_tab(tab1)
             self.add_tab(tab2)
- self.add_tab(tab3)

     def _create_no_music_information(self):
         """

=== removed file 'entertainerlib/frontend/gui/tabs/playlist_tab.py'
--- entertainerlib/frontend/gui/tabs/playlist_tab.py 2008-12-06 03:56:48 +0000
+++ entertainerlib/frontend/gui/tabs/playlist_tab.py 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-'''Playlist tab for the audio screen'''
-
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <email address hidden>"
-
-from entertainerlib.frontend.gui.tabs.tab import Tab
-
-class PlaylistTab(Tab):
- '''Tab for the audio play screen to show playlists.'''
-
- def __init__(self, name = "playlist", tab_title = _("Current playlist")):
- '''Initialize the tab'''
-
- Tab.__init__(self, name, tab_title)
- self.hide_tab()
-
- def can_activate(self):
- '''PlaylistTab is currently not implemented. This file is a placeholder
- for when the feature is available. Therefore the tab is not active'''
- return False
-

=== removed file 'entertainerlib/frontend/gui/tabs/playlists_tab.py'
-...

[Matt Layman (mblayman)]

Useless tabs with no immediate push to get the underlying functionality implemented for playlists? I'm all for getting rid of that kind of code. :D

I love how the clean separation of screens and tabs made this look so easy to remove. :)

I ran some functional tests to make sure that the screens still worked. I must say, after looking at those playlist tabs for so long, it looks a little odd to me, but no one is going to miss something that never did anything.

`make check` passed.

Thanks for this work Samuel.

review: Approve

[Matt Layman (mblayman)]

Commit Message: Unimplemented playlists tabs have been removed. (Samuel Buffet)

=== modified file 'entertainerlib/frontend/gui/screens/audio_play.py'
--- entertainerlib/frontend/gui/screens/audio_play.py	2009-02-28 17:52:38 +0000
+++ entertainerlib/frontend/gui/screens/audio_play.py	2009-04-03 20:07:08 +0000
@@ -12,7 +12,6 @@
 from entertainerlib.frontend.gui.screens.screen import Screen
 from entertainerlib.frontend.gui.tabs.lyrics_tab import LyricsTab
 from entertainerlib.frontend.gui.tabs.playing_tab import PlayingTab
-from entertainerlib.frontend.gui.tabs.playlist_tab import PlaylistTab
 from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
 
@@ -45,10 +44,8 @@
         # Tabs
         tab1 = PlayingTab(track)
         tab2 = LyricsTab(music_library, track)
-        tab3 = PlaylistTab()
         self.add_tab(tab1)
         self.add_tab(tab2)
-        self.add_tab(tab3)
 
         media_player.set_media(track)
         media_player.play()

=== modified file 'entertainerlib/frontend/gui/screens/music.py'
--- entertainerlib/frontend/gui/screens/music.py	2009-02-28 17:52:38 +0000
+++ entertainerlib/frontend/gui/screens/music.py	2009-04-03 20:03:33 +0000
@@ -7,7 +7,6 @@
 from entertainerlib.frontend.gui.screens.screen import Screen
 from entertainerlib.frontend.gui.tabs.albums_tab import AlbumsTab
 from entertainerlib.frontend.gui.tabs.artists_tab import ArtistsTab
-from entertainerlib.frontend.gui.tabs.playlists_tab import PlaylistsTab
 from entertainerlib.frontend.gui.widgets.label import Label
 from entertainerlib.frontend.gui.widgets.texture import Texture
 from entertainerlib.frontend.medialibrary.playlist import Playlist
@@ -39,11 +38,9 @@
             tab2 = AlbumsTab(music_library.get_all_albums(),
                 move_to_new_screen_callback)
             tab2.hide_tab()
-            tab3 = PlaylistsTab(music_library.get_playlists())
 
             self.add_tab(tab1)
             self.add_tab(tab2)
-            self.add_tab(tab3)
 
     def _create_no_music_information(self):
         """

=== removed file 'entertainerlib/frontend/gui/tabs/playlist_tab.py'
--- entertainerlib/frontend/gui/tabs/playlist_tab.py	2008-12-06 03:56:48 +0000
+++ entertainerlib/frontend/gui/tabs/playlist_tab.py	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-'''Playlist tab for the audio screen'''
-
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
-from entertainerlib.frontend.gui.tabs.tab import Tab
-
-class PlaylistTab(Tab):
-    '''Tab for the audio play screen to show playlists.'''
-
-    def __init__(self, name = "playlist", tab_title = _("Current playlist")):
-        '''Initialize the tab'''
-
-        Tab.__init__(self, name, tab_title)
-        self.hide_tab()
-
-    def can_activate(self):
-        '''PlaylistTab is currently not implemented. This file is a placeholder
-        for when the feature is available. Therefore the tab is not active'''
-        return False
-

=== removed file 'entertainerlib/frontend/gui/tabs/playlists_tab.py'
--- entertainerlib/frontend/gui/tabs/playlists_tab.py	2009-02-03 23:37:57 +0000
+++ entertainerlib/frontend/gui/tabs/playlists_tab.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-'''Playlists tab for the music screen'''
-
-__licence__ = "GPLv2"
-__copyright__ = "2008, Matt Layman"
-__author__ = "Matt Layman <[e-mail]>"
-
-import clutter
-
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.text_menu_item import TextMenuItem
-
-class PlaylistsTab(Tab):
-    '''Tab for the music screen to show playlists.'''
-
-    def __init__(self, playlists, name="playlists", tab_title=_("Playlists")):
-        Tab.__init__(self, name, tab_title)
-        if len(playlists) == 0:
-            empty_label = Label(0.05, "title", 0.5, 0.5,
-                _("No saved playlists available."))
-            empty_label.set_anchor_point_from_gravity(clutter.GRAVITY_CENTER)
-            self.add(empty_label)
-        else:
-            self.menu = TextMenu(self.config.theme, self.config.show_effects())
-            self.menu.set_item_size(self.get_abs_x(0.9115),
-                self.get_abs_y(0.07813))
-
-            for playlist in playlists:
-                item = TextMenuItem(0.9115, 0.07813, playlist)
-                item.set_userdata(playlist)
-                self.menu.add_actor(item)
-
-            self.menu.set_position(self.get_abs_x(0.4026),
-                self.get_abs_y(0.1823))
-
-            if self.config.show_effects():
-                self.menu.set_animate(True)
-
-            self.add(self.menu)
-
-        self.hide_tab()
-
-    def can_activate(self):
-        '''Playlists are currently not implemented. This file is a placeholder
-        for when the feature is available. Therefore the tab is not active'''
-        return False
-