Merge lp:entertainer/future into lp:entertainer

[Matt Layman]

Merge in all the good work that had been happening in future. This should get trunk working again. It was badly neglected.

[Matt Layman (mblayman)]

So... stuff is broken. Very broken.

Trunk is broken for Karmic users and so is future. However, we're doing all of our work on future. This would be good *except* we lose the benefit of Tarmac landing our branches.

The whole reason we started using Tarmac was to avoid the problem of a human gatekeeper who may get too busy to merge code. Since we are now only using future, we totally lose what Tarmac was doing for us so there is code that has been idly sitting approved. I think we can all agree that unmerged *approved* code that is not merged is a delta that is a bad thing.

Therefore, I'm requesting we merge future into trunk, primarily for the sole benefit of not being blocked by human gatekeeper so we can make forward progress again (no offense Paul, I realize you're really busy).

I would love to use future again in the future, but I think it suffers from the human gatekeeper problem and should be configured to use Tarmac if possible.

I'm making this request at the jeopardy of the stability of trunk just because of how broken things are anyway. At this point, I think future is much better code than trunk.

-Matt

P.S. Let me try filing this against the correct branch this time. :P

[lp:entertainer/future]

382. By Matt Layman on 2010-01-02

Removes some crufty backend connection messages that did nothing. (Matt Layman)

383. By Matt Layman on 2010-01-02

Converted glade to gtk builder. (Francesco Marella)

384. By Matt Layman on 2010-01-03

Fix Open feed dialog. (Francesco Marella)

385. By Matt Layman on 2010-01-23

Final cleanup of clutter 1.0 transition. Fixed the fullscreen size problem.
(Matt Layman)

[Matt Layman (mblayman)]

Discussed on IRC with Paul. Trunk is so broken that this needs to be done.

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2008-10-05 17:11:31 +0000
+++ MANIFEST.in	2010-01-23 03:34:10 +0000
@@ -1,3 +1,10 @@
 include entertainer*
+include docs/COPYING docs/DEPENDENCIES
+include docs/entertainer.1 docs/entertainer.desktop
 recursive-include cfg *
+recursive-include entertainerlib *
+recursive-include icons *
+recursive-include themes *
+recursive-include tools *
+global-exclude *pyc
 
 
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2010-01-23 03:34:10 +0000
@@ -0,0 +1,6 @@
+To install Entertainer, run:
+
+python setup.py install
+
+For information on how to contribute, read docs/HACKING.
+
 
=== modified file 'cfg/content.conf'
--- cfg/content.conf	2009-05-31 17:11:16 +0000
+++ cfg/content.conf	2010-01-23 03:34:11 +0000
@@ -1,26 +1,34 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-[Images]
-folders = 
-display_hidden_files_folders = False
+[Media]
+download_lyrics = False
+download_album_art = True
+download_metadata = True
+display_eject_in_menu = False
+folders =
 
 [Weather]
 location = Bath,England
 display_in_menu = True
-metric_units = True
-
-[Music]
-folders = 
-download_lyrics = False
-download_album_art = True
-
-[Videos]
-folders = 
-download_metadata = True
 
 [RSS]
-feeds = http://theironlion.net/feeds/blog;http://www.joshuascotton.com/main/archives/tag/entertainer/feed;http://laymanstermsdev.wordpress.com/feed
+feeds = http://theironlion.net/blog/feed;http://www.joshuascotton.com/main/archives/tag/entertainer/feed;http://laymanstermsdev.wordpress.com/feed
 fetch_interval = 15
 
 [CD]
 display_eject_in_menu = False
 
+[Photographs]
+slideshow_step = 5
+
+[General]
+stage_width = 1366
+stage_height = 768
+show_effects = True
+start_in_fullscreen = True
+theme = Default
+backend_port = 45054
+history_size = 8
+transition_effect = Slide
+start_server_auto = True
+display_icon = False
+
 
=== removed file 'cfg/preferences.conf'
--- cfg/preferences.conf	2009-05-06 03:40:22 +0000
+++ cfg/preferences.conf	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-[Photographs]
-slideshow_step = 5
-
-[General]
-stage_width = 1366
-stage_height = 768
-show_effects = True
-start_in_fullscreen = True
-theme = Default
-backend_port = 45054
-history_size = 8
-transition_effect = Slide
-start_server_auto = True
-display_icon = False
-
 
=== modified file 'docs/COPYING'
--- docs/COPYING	2009-05-09 15:45:18 +0000
+++ docs/COPYING	2010-01-23 03:34:11 +0000
@@ -359,6 +359,7 @@
 GNU General Public License for more details.
 
 Entertainer Developers, as referenced in each file's copyright, refers to:
+ * Francesco Marella <[e-mail]>
  * Jamie Bennett <[e-mail]>
  * Joshua Scotton <[e-mail]>
  * Lauri Taimila <[e-mail]>
 
=== modified file 'docs/DEPENDENCIES'
--- docs/DEPENDENCIES	2009-05-09 19:08:39 +0000
+++ docs/DEPENDENCIES	2010-01-23 03:34:11 +0000
@@ -4,7 +4,6 @@
 python-ctypes
 python-eyed3
 python-feedparser
-python-glade2
 python-gobject
 python-gst0.10
 python-gtk2
@@ -14,3 +13,4 @@
 python-pyvorbis
 python-storm
 python-twisted
+python-xdg
 
=== modified file 'entertainer'
--- entertainer	2009-05-06 02:58:08 +0000
+++ entertainer	2010-01-23 03:34:10 +0000
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+'''Main client executable'''
 '''Main frontend executable'''
 
-from entertainerlib.frontend import main
+from entertainerlib.client import main
 
 if __name__ == '__main__':
     main()
 
=== modified file 'entertainer-backend'
--- entertainer-backend	2009-05-06 02:58:08 +0000
+++ entertainer-backend	2010-01-23 03:34:10 +0000
@@ -51,11 +51,7 @@
         sys.exit(0)
 
     if len(sys.argv) > 1 and sys.argv[1] == "--foreground":
-        try:
-            backend = BackendServer()
-        except KeyboardInterrupt:
-            backend.quitBackend()
-            sys.exit()
+        backend = BackendServer()
     else:
         print "Entertainer backend starting..."
         libc = ctypes.CDLL('libc.so.6')
 
=== renamed file 'entertainer-content-manager' => 'entertainer-manager'
--- entertainer-content-manager	2009-04-28 23:54:49 +0000
+++ entertainer-manager	2010-01-23 03:34:10 +0000
@@ -1,15 +1,14 @@
 #!/usr/bin/env python
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Content Management executable'''
+'''Manager executable'''
 
 import gtk
 
-from entertainerlib.frontend.translation_setup import TranslationSetup
+from entertainerlib.client.translation_setup import TranslationSetup
 TranslationSetup()
 
-from entertainerlib.utils.content_management_dialog import (
-    ContentManagementDialog)
-
-
-ContentManagementDialog(True)
+from entertainerlib.dialog import ManagerDialog
+
+
+ManagerDialog(True)
 gtk.main()
 
=== removed file 'entertainer-preferences'
--- entertainer-preferences	2009-04-28 23:54:49 +0000
+++ entertainer-preferences	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''A preferences editing tool'''
-
-import gtk
-
-from entertainerlib.frontend.translation_setup import TranslationSetup
-TranslationSetup()
-
-from entertainerlib.utils.preferences_dialog import PreferencesDialog
-
-
-PreferencesDialog(True)
-gtk.main()
 
=== added file 'entertainer-server'
--- entertainer-server	1970-01-01 00:00:00 +0000
+++ entertainer-server	2010-01-23 03:34:10 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+'''Server executable'''
+
+from entertainerlib.network import server_main
+
+server_main()
+
 
=== modified file 'entertainerlib/backend/backend_server.py'
--- entertainerlib/backend/backend_server.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/backend_server.py	2010-01-23 03:34:11 +0000
@@ -3,8 +3,8 @@
 
 import gobject
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 # Entertainer backend core
 from entertainerlib.backend.core.message import Message
@@ -39,18 +39,13 @@
         self.config = Configuration()
         self.logger = Logger().getLogger('backend.BackendServer')
         self.message_bus = MessageBus()
-        self._port = self.config.get_port()
+        self._port = self.config.port
 
         # Connection server - Thread that listens incoming socket connections
         self.connection_server = None
 
-        # Config files
-        self.content_config = None
-        self.preferences = None
-
         self.scheduler = None
         self.feed_manager = None
-        self.guide_updater = None
         self.media_manager = None
 
         # The order of the initialize method calls is significant! Don't change
@@ -65,15 +60,13 @@
         """Initialize configuration"""
         cfg_dict = {
             MessageType.CONTENT_CONF_UPDATED : MessagePriority.VERY_HIGH,
-            MessageType.PREFERENCES_CONF_UPDATED : MessagePriority.VERY_HIGH
             }
         self.message_bus.registerMessageHandler(self.config, cfg_dict)
         self.logger.debug("Configuration intialized successfully")
 
     def initialize_connection_server(self):
         """Initialize connection server."""
-        self.connection_server = ConnectionServer(self._port,
-                                                  self.message_bus)
+        self.connection_server = ConnectionServer(self._port, self.message_bus)
         # Start listening incoming connections
         self.connection_server.start()
 
@@ -81,7 +74,7 @@
         """Initialize message scheduler."""
         self.scheduler = MessageScheduler(self.message_bus)
         self.scheduler.addMessage(Message(MessageType.UPDATE_FEEDS),
-            60 * self.config.get_feed_fetch_interval())
+            60 * self.config.feed_fetch_interval)
         self.logger.debug("Message scheduler intialized successfully")
 
     def initialize_feed_manager(self):
@@ -105,7 +98,3 @@
         self.message_bus.registerMessageHandler(self.media_manager, media_dict)
         self.logger.debug("Media Manager intialized successfully")
 
-    def quitBackend(self):
-        '''Close the backend server'''
-        self.message_bus.unregisterAllMessageHandlers()
-
 
=== modified file 'entertainerlib/backend/components/feeds/feed_fetcher.py'
--- entertainerlib/backend/components/feeds/feed_fetcher.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/components/feeds/feed_fetcher.py	2010-01-23 03:34:11 +0000
@@ -7,8 +7,8 @@
 from datetime import datetime
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 # Messaging system
 from entertainerlib.backend.core.message import Message
 
=== modified file 'entertainerlib/backend/components/feeds/feed_manager.py'
--- entertainerlib/backend/components/feeds/feed_manager.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/components/feeds/feed_manager.py	2010-01-23 03:34:11 +0000
@@ -5,8 +5,8 @@
 from pysqlite2 import dbapi2 as sqlite
 from entertainerlib.backend.components.feeds.feed_fetcher import FeedFetcher
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 # Messaging system
 from entertainerlib.backend.core.message_type_priority import MessageType
@@ -35,8 +35,7 @@
         Update all feeds to cache in a new thread and after
         that emit FEED_DB_UPDATED message to the messagebus.
         """
-        fetch_thread = FeedFetcher(self.message_bus,
-                                   self.config.get_feeds())
+        fetch_thread = FeedFetcher(self.message_bus, self.config.feeds)
         fetch_thread.start()
 
     def createFeedCacheDatabase(self):
 
=== renamed file 'entertainerlib/utils/feed_utils.py' => 'entertainerlib/backend/components/feeds/feed_utils.py'
--- entertainerlib/utils/feed_utils.py	2009-05-06 02:02:20 +0000
+++ entertainerlib/backend/components/feeds/feed_utils.py	2010-01-23 03:34:11 +0000
@@ -6,9 +6,8 @@
 from xml.dom import minidom
 
 import gtk
-import gtk.glade
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 
 class FeedEntryParser:
 
=== modified file 'entertainerlib/backend/components/mediacache/image_cache.py'
--- entertainerlib/backend/components/mediacache/image_cache.py	2009-06-01 09:55:40 +0000
+++ entertainerlib/backend/components/mediacache/image_cache.py	2010-01-23 03:34:11 +0000
@@ -8,8 +8,8 @@
 from pysqlite2 import dbapi2 as sqlite
 
 from entertainerlib.thumbnailer import ImageThumbnailer
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 from entertainerlib.backend.components.mediacache.cache import Cache
 
@@ -117,15 +117,13 @@
                 "Path doesn't exist: " + path)
         else:
             for root, dirs, files in os.walk(path):
-                if os.path.split(root)[-1][0] == "." and not \
-                    self.config.display_hidden_files_folders():
+                if os.path.split(root)[-1][0] == ".":
                     continue
                 if not self.isDirectoryInCache(root):
                     self._addAlbum(root)
 
                 for name in files:
-                    if os.path.split(name)[-1][0] == "." and not \
-                        self.config.display_hidden_files_folders():
+                    if os.path.split(name)[-1][0] == ".":
                         continue
                     if self.isSupportedFormat(name):
                         self.addFile(os.path.join(root, name))
 
=== modified file 'entertainerlib/backend/components/mediacache/media_cache_manager.py'
--- entertainerlib/backend/components/mediacache/media_cache_manager.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/components/mediacache/media_cache_manager.py	2010-01-23 03:34:11 +0000
@@ -1,8 +1,8 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''MediaCacheManager - Downloads metadata and keeps media cache up-to-date'''
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 from entertainerlib.backend.core.message_type_priority import MessageType
 from entertainerlib.backend.core.message_handler import MessageHandler
@@ -13,7 +13,7 @@
 from entertainerlib.backend.components.mediacache.video_cache import VideoCache
 
 class MediaCacheManager(MessageHandler):
-    """Makes sure that frontend has all the data available."""
+    """Makes sure that client has all the data available."""
 
     def __init__(self):
         """
@@ -23,11 +23,11 @@
         self.logger = Logger().getLogger(
             'backend.components.mediacache.MediaCacheManager')
         self.config = Configuration()
-        self.video_folders = self.config.get_video_folders()
+        self.video_folders = self.config.media_folders
         self._index_videos(self.video_folders)
-        self.music_folders = self.config.get_music_folders()
+        self.music_folders = self.config.media_folders
         self._index_music(self.music_folders)
-        self.image_folders = self.config.get_image_folders()
+        self.image_folders = self.config.media_folders
         self._index_images(self.image_folders)
 
         # Should we rebuild to detect files that were removed while backend was
@@ -104,9 +104,9 @@
         we need to index them. If folders are removed, we need to remove
         them from the cache and also from FileSystemObeserver.
         """
-        updated_video_folders = self.config.get_video_folders()
-        updated_music_folders = self.config.get_music_folders()
-        updated_image_folders = self.config.get_image_folders()
+        updated_video_folders = self.config.media_folders
+        updated_music_folders = self.config.media_folders
+        updated_image_folders = self.config.media_folders
 
         # Handle image folder changes
         current_images = set(self.image_folders)
 
=== modified file 'entertainerlib/backend/components/mediacache/music_cache.py'
--- entertainerlib/backend/components/mediacache/music_cache.py	2009-05-09 17:03:51 +0000
+++ entertainerlib/backend/components/mediacache/music_cache.py	2010-01-23 03:34:11 +0000
@@ -9,11 +9,11 @@
 import ogg.vorbis
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.albumart_downloader import AlbumArtDownloader
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
-
 from entertainerlib.backend.components.mediacache.cache import Cache
+from entertainerlib.configuration import Configuration
+from entertainerlib.download import AlbumArtDownloader
+from entertainerlib.logger import Logger
+
 
 class MusicCache(Cache):
     """
@@ -433,7 +433,7 @@
                     album_art_file)
             # Local not found -> try internet
             else:
-                if self.config.download_album_art():
+                if self.config.download_album_art:
                     if album != "Unknown album" and artist != "Unknown Artist":
                         loader_thread = AlbumArtDownloader(album, artist,
                             self.config.ALBUM_ART_DIR)
 
=== modified file 'entertainerlib/backend/components/mediacache/video_cache.py'
--- entertainerlib/backend/components/mediacache/video_cache.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/components/mediacache/video_cache.py	2010-01-23 03:34:11 +0000
@@ -6,8 +6,8 @@
 from pysqlite2 import dbapi2 as sqlite
 
 from entertainerlib.thumbnailer import VideoThumbnailer
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 from entertainerlib.backend.components.mediacache.cache import Cache
 from entertainerlib.backend.components.mediacache.video_metadata_search import (
@@ -243,7 +243,7 @@
                                     VALUES (:fn)""",
                                     { "fn" : filename } )
         self.__db_conn.commit()
-        if self.config.download_video_metadata():
+        if self.config.download_metadata:
             self.__searchMetadata(filename)
 
     def __searchMetadata(self, filename):
 
=== modified file 'entertainerlib/backend/components/mediacache/video_metadata_search.py'
--- entertainerlib/backend/components/mediacache/video_metadata_search.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/components/mediacache/video_metadata_search.py	2010-01-23 03:34:11 +0000
@@ -9,8 +9,8 @@
 import threading
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.logger import Logger
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.logger import Logger
+from entertainerlib.configuration import Configuration
 
 class VideoMetadataSearch(threading.Thread):
     """
 
=== modified file 'entertainerlib/backend/core/client_connection.py'
--- entertainerlib/backend/core/client_connection.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/core/client_connection.py	2010-01-23 03:34:11 +0000
@@ -8,7 +8,7 @@
 # Messaging system
 from entertainerlib.backend.core.message_handler import MessageHandler
 
-from entertainerlib.utils.logger import Logger
+from entertainerlib.logger import Logger
 
 class ClientConnection(threading.Thread, MessageHandler):
     """
 
=== modified file 'entertainerlib/backend/core/connection_server.py'
--- entertainerlib/backend/core/connection_server.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/core/connection_server.py	2010-01-23 03:34:11 +0000
@@ -7,7 +7,7 @@
 
 from entertainerlib.backend.core.client_connection import ClientConnection
 
-from entertainerlib.utils.logger import Logger
+from entertainerlib.logger import Logger
 
 class ConnectionServer(threading.Thread):
     """
 
=== modified file 'entertainerlib/backend/core/message_bus.py'
--- entertainerlib/backend/core/message_bus.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/core/message_bus.py	2010-01-23 03:34:11 +0000
@@ -6,7 +6,7 @@
 from entertainerlib.backend.core.message import Message
 from entertainerlib.backend.core.message_handler import MessageHandler
 from entertainerlib.backend.core.message_type_priority import MessageType
-from entertainerlib.utils.logger import Logger
+from entertainerlib.logger import Logger
 
 class MessageBus:
     """
@@ -23,12 +23,7 @@
     When MessageHandler is registered to the MessageBus there is also another
     parameter besides handler itself. Second parameter is a dictionary that
     defines MessageTypes that registered handler wants to be notified of and
-    also priorities for those message types.
-
-    Example of second parameter:
-            dict = {MessageType.FRONTEND_OPENED : MessagePriority.LOW ,
-                    MessageType.FRONTEND_CLOSED : MessagePriority.NORMAL }
-    """
+    also priorities for those message types."""
 
     # This determines number of message types avaialble. In other words, this
     # variable tells how many variables is defined in MessageType class.
@@ -89,12 +84,6 @@
         self.logger.debug("MessageHandler '" + str(message_handler) +
                           "' unregistered from the message bus.")
 
-    def unregisterAllMessageHandlers(self):
-        """
-        Unregisters all MessageHandler from this MessageBus.
-        """
-        self.message_handlers[:] = []
-
     def notifyMessage(self, message):
         """
         Emit a new Message to this MessageBus.
 
=== modified file 'entertainerlib/backend/core/message_bus_proxy.py'
--- entertainerlib/backend/core/message_bus_proxy.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/core/message_bus_proxy.py	2010-01-23 03:34:11 +0000
@@ -6,7 +6,7 @@
 import threading
 from cStringIO import StringIO
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class MessageBusProxy(threading.Thread):
     """
@@ -57,7 +57,7 @@
         MessageHandler.
         """
         # Open socket
-        self.socket_to_server.connect(('localhost', self.config.get_port()))
+        self.socket_to_server.connect(('localhost', self.config.port))
 
         # Send client name
         self.socket_to_server.sendall(self.client_name + "\n")
 
=== modified file 'entertainerlib/backend/core/message_type_priority.py'
--- entertainerlib/backend/core/message_type_priority.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/backend/core/message_type_priority.py	2010-01-23 03:34:11 +0000
@@ -15,56 +15,27 @@
     VERY_LOW = 40
 
 class MessageType:
-    """
-    Determines all allowed Message types. MessageHandler should use these
-    to determine type. This simply makes code more readable.
-
-    Example:
-        if message.get_type() == MessageType.FRONTEND_OPENED:
-            do_something_useful()
-    """
-
-    # Indicates that Preferences UI has been used to update preferences.
-    PREFERENCES_CONF_UPDATED = 0
+    """Determines all allowed Message types. MessageHandler should use these to
+    determine type. This simply makes code more readable."""
 
     # Indicates that Content Management UI has been used to update contents.
-    CONTENT_CONF_UPDATED = 1
-
-    # Indicates that frontend has been opened.
-    FRONTEND_OPENED = 2
-
-    # Indicates that frontend has been closed.
-    FRONTEND_CLOSED = 3
+    CONTENT_CONF_UPDATED = 0
 
     # Indicates that Feed cache has been updated.
-    FEED_DB_UPDATED = 4
-
-    NOT_USED_5 = 5
-
-    NOT_USED_1 = 6
+    FEED_DB_UPDATED = 1
 
     # Indicates that Feed cache should be updated.
-    UPDATE_FEEDS = 7
-
-    NOT_USED_6 = 8
-
-    #This should be left in otherwise message_bus.py breaks
-    #If another message type is needed please use this
-    DO_NOT_DELETE_USE_NEXT = 9
-
-    NOT_USED_2 = 10
-    NOT_USED_3 = 11
-    NOT_USED_4 = 12
+    UPDATE_FEEDS = 2
 
     # Require to rebuild image cache
-    REBUILD_IMAGE_CACHE = 13
+    REBUILD_IMAGE_CACHE = 3
 
     # Require to rebuild music cache
-    REBUILD_MUSIC_CACHE = 14
+    REBUILD_MUSIC_CACHE = 4
 
     # Require to rebuild video cache
-    REBUILD_VIDEO_CACHE = 15
+    REBUILD_VIDEO_CACHE = 5
 
     # Require to rebuild feed cache
-    REBUILD_FEED_CACHE = 16
+    REBUILD_FEED_CACHE = 6
 
 
=== renamed directory 'entertainerlib/frontend' => 'entertainerlib/client'
=== modified file 'entertainerlib/client/__init__.py'
--- entertainerlib/frontend/__init__.py	2009-05-06 03:40:22 +0000
+++ entertainerlib/client/__init__.py	2010-01-23 03:34:11 +0000
@@ -1,12 +1,12 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Frontend gui to entertainer'''
+'''Client code for Entertainer.'''
 # pylint: disable-msg=W0612
 
 def main(*args, **kwargs):
-    '''Frontend runner'''
+    '''Client code main loop.'''
 
     # Import statements are inside the function so that they aren't imported
-    # every time something from the frontend is imported
+    # every time something from the client is imported
 
     # cluttergtk must be imported before the first import of clutter so it
     # must be imported even though pylint complains about it not being used.
@@ -15,23 +15,23 @@
     import gobject
     import gtk
 
-    from entertainerlib.frontend.translation_setup import TranslationSetup
+    from entertainerlib.client.translation_setup import TranslationSetup
     TranslationSetup()
 
     from entertainerlib.backend.backend_server import BackendServer
-    from entertainerlib.utils.configuration import Configuration
-    from entertainerlib.frontend.frontend_client import FrontendClient
+    from entertainerlib.configuration import Configuration
+    from entertainerlib.client.client import Client
 
     gobject.threads_init()
     gtk.gdk.threads_init()
     clutter.threads_init()
 
     config = Configuration()
-    if config.start_auto_server():
+    if config.start_auto_server:
         print "Entertainer backend starting..."
         BackendServer()
 
-    frontend_client = FrontendClient()
-    frontend_client.start()
+    client_client = Client()
+    client_client.start()
 
 
 
=== modified file 'entertainerlib/client/backend_connection.py'
--- entertainerlib/frontend/backend_connection.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/client/backend_connection.py	2010-01-23 03:34:11 +0000
@@ -7,49 +7,21 @@
 from entertainerlib.backend.core.message_handler import MessageHandler
 
 class BackendConnection(MessageHandler):
-    """
-    BackendConnection - Connection to the Entertainer backend. Instance from
-    this class is a gate to backend messagebus.
-    """
+    """Connection to the Entertainer backend messagebus."""
 
     def __init__(self):
-        """Initialize connection. Connects to backend."""
-        #messages = {
-        #    MessageType.CONTENT_CONF_UPDATED : MessagePriority.NORMAL,
-        #    MessageType.PREFERENCES_CONF_UPDATED : MessagePriority.NORMAL,
-        #    MessageType.FEED_DB_UPDATED : MessagePriority.HIGH }
-        # XXX: rockstar - The messages above are the "real" messages, and I'm
-        # not sure why they are commented out.  Anyone?
         MessageHandler.__init__(self)
         messages = {}
         name = "Entertainer Frontend"
         self.message_bus_proxy = MessageBusProxy(messages, self, name)
         self.message_bus_proxy.connectToMessageBus()
         self.message_bus_proxy.start()
-        self.message_bus_proxy.sendMessage(
-            Message(MessageType.FRONTEND_OPENED))
 
     def close_connection(self):
         """Close connection to backend"""
-        self.message_bus_proxy.sendMessage(
-            Message(MessageType.FRONTEND_CLOSED))
         self.message_bus_proxy.disconnectFromMessageBus()
 
     def request_feed_update(self):
         """Request backend to fetch all feeds from the Internet."""
         self.message_bus_proxy.sendMessage(Message(MessageType.UPDATE_FEEDS))
 
-    def request_weather_update(self):
-        """Request backend to update weather information from the Internet."""
-        self.message_bus_proxy.sendMessage(Message(MessageType.UPDATE_WEATHER))
-
-    # Implements MessageHandler interface
-    def handleMessage(self, message):
-        """Handle received messages. (Implements MessageHandler interface)"""
-        if message.get_type() == MessageType.CONTENT_CONF_UPDATED:
-            pass
-        elif message.get_type() == MessageType.PREFERENCES_CONF_UPDATED:
-            pass
-        elif message.get_type() == MessageType.FEED_DB_UPDATED:
-            pass
-
 
=== renamed file 'entertainerlib/frontend/frontend_client.py' => 'entertainerlib/client/client.py'
--- entertainerlib/frontend/frontend_client.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/client/client.py	2010-01-23 03:34:11 +0000
@@ -1,71 +1,65 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Entertainer Frontend - This is a client side of Entertainer.'''
+'''Entertainer client.'''
 
 import sys
 
 import gtk
-
-from entertainerlib.frontend.backend_connection import BackendConnection
-from entertainerlib.frontend.gui.user_interface import UserInterface
-from entertainerlib.frontend.medialibrary.feeds import FeedLibrary
-from entertainerlib.frontend.medialibrary.music import MusicLibrary
-from entertainerlib.frontend.medialibrary.images import ImageLibrary
-from entertainerlib.frontend.medialibrary.videos import VideoLibrary
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
-from entertainerlib.utils.system_tray_icon import SystemTrayIcon
-
-class FrontendClient:
-    '''
-    Entertainer frontend
-
-    This is a frontend application of the Entertainer. Frontend is a GUI part
-    that user sees on the screen. This class is a core of the frontend. Frontend
-    connects to the backend's messagebus at startup.
-    '''
+from twisted.internet import gtk2reactor
+gtk2reactor.install() # Install the gtk2 reactor before import the real reactor
+from twisted.internet import reactor
+from twisted.internet.protocol import ClientCreator
+from twisted.python.log import startLogging
+
+from entertainerlib.client.backend_connection import BackendConnection
+from entertainerlib.client.medialibrary.feeds import FeedLibrary
+from entertainerlib.client.medialibrary.music import MusicLibrary
+from entertainerlib.client.medialibrary.images import ImageLibrary
+from entertainerlib.client.medialibrary.videos import VideoLibrary
+from entertainerlib.configuration import Configuration
+from entertainerlib.gui.user_interface import UserInterface
+from entertainerlib.gui.system_tray_icon import SystemTrayIcon
+from entertainerlib.network.local.client import EntertainerLocalClientProtocol
+
+
+class Client:
+    '''This is a client application of the Entertainer. Entertainer's client
+    hooks into the server, and then provides a user interface for the data the
+    server creates.'''
 
     def __init__(self):
-        '''
-        Create a new frontend.
-
-        This initializes all frontend stuff like media librarys, remote
-        control receiver and GUI. After this we just wait user actions.
-        '''
         config = Configuration()
-        self.logger = Logger().getLogger('frontend.FrontendClient')
-        self.backend_connection = self.initialize_backend_connection()
+        self.backend_connection = BackendConnection()
         feed_library = FeedLibrary(self.backend_connection)
-        music_library = MusicLibrary(self.backend_connection)
-        image_library = ImageLibrary(self.backend_connection)
-        video_library = VideoLibrary(self.backend_connection)
+        music_library = MusicLibrary()
+        image_library = ImageLibrary()
+        video_library = VideoLibrary()
         self.ui = UserInterface(
             feed_library, image_library, music_library, video_library,
-            self.quit_frontend)
-
-        if config.tray_icon_enabled():
-            SystemTrayIcon(
-                self.quit_frontend, self.toggle_interface_visibility)
+            self.quit_client)
+
+        if config.tray_icon_enabled:
+            SystemTrayIcon(self.quit_client, self.toggle_interface_visibility)
+
+        startLogging(sys.stdout)
+        client = EntertainerLocalClientProtocol
+
+        ClientCreator(reactor, client).connectTCP(
+            config.network_options['host'],
+            config.network_options['port'])
 
     def start(self):
         '''Start the necessary main loop.'''
         self.ui.start_up()
         self.interface_visible = True
         gtk.gdk.threads_enter()
-        gtk.main()
+        reactor.run()
         gtk.gdk.threads_leave()
 
-    def initialize_backend_connection(self):
-        '''Connect to the backend server.'''
-        backend_connection = BackendConnection()
-        self.logger.debug('Connected to the Entertainer backend server.')
-
-        return backend_connection
-
-    def quit_frontend(self):
-        '''Clean up the connection to the backend then close the frontend.'''
+    def quit_client(self):
+        '''Clean up the connection to the backend then close the client.'''
         self.backend_connection.close_connection()
 
-        gtk.main_quit()
+        reactor.stop()
         sys.exit(0)
 
     def toggle_interface_visibility(self):
 
=== modified file 'entertainerlib/client/media_player.py'
--- entertainerlib/frontend/media_player.py	2009-06-29 19:41:35 +0000
+++ entertainerlib/client/media_player.py	2010-01-23 03:34:11 +0000
@@ -9,10 +9,10 @@
 import gobject
 import gst
 
-from entertainerlib.frontend.gui.widgets.motion_buffer import MotionBuffer
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.medialibrary.playable import Playable
-from entertainerlib.utils.logger import Logger
+from entertainerlib.gui.widgets.motion_buffer import MotionBuffer
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.client.medialibrary.playable import Playable
+from entertainerlib.logger import Logger
 
 class MediaPlayer(gobject.GObject, object):
     '''
@@ -72,7 +72,7 @@
         self.is_playing = False          # Is media player currently playing
         self.is_reactive_allowed = False # Is the video_texture reactive
 
-        self.logger = Logger().getLogger('frontend.MediaPlayer')
+        self.logger = Logger().getLogger('client.MediaPlayer')
 
         self._internal_callback_timeout_key = None
 
@@ -105,7 +105,9 @@
                 self.next()
         elif message.type == gst.MESSAGE_ERROR:
             self.video_texture.set_playing(False)
-            self.video_texture.set_property("position", 0)
+            # XXX: laymansterms - I don't know the implications of removing the
+            # position property.
+            #self.video_texture.set_property("position", 0)
             err, debug = message.parse_error()
             self.logger.error("Error: %(err)s, %(debug)s" % \
                 {'err': err, 'debug': debug})
@@ -167,7 +169,9 @@
             or self.media.get_type() == Playable.VIDEO_STREAM:
             self.video_texture.set_playing(False)
             self.video_texture.set_uri(playable.get_uri())
-            self.video_texture.set_property("position", 0)
+            # XXX: laymansterms - I don't know the implications of removing the
+            # position property.
+            #self.video_texture.set_property("position", 0)
 
     def get_media(self):
         '''Get URI of the current media stream.'''
@@ -248,7 +252,9 @@
             self.stage.set_color(self.bgcolor)
             self.stage.remove(self.video_texture)
         self.video_texture.set_playing(False)
-        self.video_texture.set_property("position", 0)
+        # XXX: laymansterms - I don't know the implications of removing the
+        # position property.
+        #self.video_texture.set_property("position", 0)
         self.emit('stop')
 
         if self._internal_callback_timeout_key is not None:
@@ -510,7 +516,7 @@
     def get_texture(self):
         '''Get media's texture. This is a video texture or album art texture.'''
         if self.media.get_type() == Playable.VIDEO_STREAM:
-            return clutter.CloneTexture(self.video_texture)
+            return clutter.Clone(self.video_texture)
 
         elif self.media.get_type() == Playable.AUDIO_STREAM:
             url = self.media.get_album_art_url()
 
=== modified file 'entertainerlib/client/medialibrary/feeds.py'
--- entertainerlib/frontend/medialibrary/feeds.py	2009-06-25 19:49:48 +0000
+++ entertainerlib/client/medialibrary/feeds.py	2010-01-23 03:34:11 +0000
@@ -3,7 +3,7 @@
 
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class FeedLibrary(object):
     '''This library can be used to handle RSS feeds in Entertainer.'''
 
=== modified file 'entertainerlib/client/medialibrary/images.py'
--- entertainerlib/frontend/medialibrary/images.py	2009-05-06 03:40:22 +0000
+++ entertainerlib/client/medialibrary/images.py	2010-01-23 03:34:11 +0000
@@ -4,25 +4,16 @@
 import os
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class ImageLibrary:
-    """
-    Image library.
-
-    Entertainer's image cache.
-    """
-
-    def __init__(self, backend_connection):
-        """
-        Initialize image library
-        @param backend_connection: BackendConnection object
-        """
+    """Entertainer's image cache."""
+
+    def __init__(self):
         self.config = Configuration()
 
         if not os.path.exists(self.config.IMAGE_DB):
             raise Exception("Image database doesn't exist!")
-        self.backend_connection = backend_connection
 
     def get_all_images(self):
         """
 
=== modified file 'entertainerlib/client/medialibrary/music.py'
--- entertainerlib/frontend/medialibrary/music.py	2009-07-19 19:27:31 +0000
+++ entertainerlib/client/medialibrary/music.py	2010-01-23 03:34:11 +0000
@@ -5,10 +5,10 @@
 import CDDB, DiscID
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
-from entertainerlib.frontend.medialibrary.playable import Playable
-from entertainerlib.utils.lyrics_downloader import LyricsDownloader
+from entertainerlib.client.medialibrary.playable import Playable
+from entertainerlib.download import LyricsDownloader
 
 
 class MusicLibraryException(Exception):
@@ -28,22 +28,13 @@
     pass
 
 class MusicLibrary:
-    """
-    Music library.
-
-    Interface for Entertainer's music cache.
-    """
-
-    def __init__(self, backend_connection):
-        """
-        Initialize library.
-        @param backend_connection: BackendConnection object
-        """
+    """Interface for Entertainer's music cache."""
+
+    def __init__(self):
         self.config = Configuration()
 
         if not os.path.exists(self.config.MUSIC_DB):
             raise Exception("Music database doesn't exist!")
-        self.backend_connection = backend_connection
         self.db_connection = sqlite.connect(self.config.MUSIC_DB)
         self.cursor = self.db_connection.cursor()
 
 
=== modified file 'entertainerlib/client/medialibrary/videos.py'
--- entertainerlib/frontend/medialibrary/videos.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/client/medialibrary/videos.py	2010-01-23 03:34:11 +0000
@@ -4,28 +4,19 @@
 import os
 from pysqlite2 import dbapi2 as sqlite
 
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
-from entertainerlib.frontend.medialibrary.playable import Playable
+from entertainerlib.client.medialibrary.playable import Playable
 
 class VideoLibrary:
-    """
-    Video library.
-
-    Interface for Entertainer's video cache.
-    """
-
-    def __init__(self, backend_connection):
-        """
-        Initialize video library
-        @param backend_connection: BackendConnection object
-        """
+    """Interface for Entertainer's video cache."""
+
+    def __init__(self):
         self.config = Configuration()
 
         if not os.path.exists(self.config.VIDEO_DB):
             raise Exception("Video database doesn't exist!")
-        self.backend_connection = backend_connection
 
     def get_movies(self):
         """
@@ -133,7 +124,7 @@
 
         #Setting default values
         self.logger = Logger().getLogger(
-            'frontend.medialibrary.videos.VideoItem')
+            'client.medialibrary.videos.VideoItem')
         self.__title = ""
         self.__filename = ""
         self.__length = 0
@@ -220,12 +211,12 @@
             else:
                 self.logger.error("Thumbnail does not exist for " + \
                     self.get_filename() + ", using default art instead")
-                return os.path.join(self.config.get_theme_path(),
+                return os.path.join(self.config.theme_path,
                     "images/default_movie_art.png")
         else:
             self.logger.error("Thumbnail does not exist for " + \
                 self.get_filename() + ", using default art instead")
-            return os.path.join(self.config.get_theme_path(),
+            return os.path.join(self.config.theme_path,
                 "images/default_movie_art.png")
 
     def has_thumbnail(self):
 
=== modified file 'entertainerlib/client/translation_setup.py'
--- entertainerlib/frontend/translation_setup.py	2009-07-26 07:59:56 +0000
+++ entertainerlib/client/translation_setup.py	2010-01-23 03:34:11 +0000
@@ -1,38 +1,48 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Translation Setup Code'''
 
+import locale
 import os
 
 import gettext
 import gtk
-import gtk.glade
-
-TRANSLATION_SOURCE = {
-    'branch' : os.path.abspath(os.path.dirname(__file__) + '/../../locale'),
-    # Hardcoded path for a package install
-    'package' : "/usr/share/locale"
-    }
+from xdg import BaseDirectory
 
 class TranslationSetup:
     def __init__(self):
+        '''Because of how early translation setup has to occur. This should be
+        the only file outside of Configuration that imports xdg.'''
+
+        def install_locale(locale_dir):
+            '''Install locale data from the provided directory.'''
+            # This sets up the _ function
+            gettext.install('entertainer', localedir=locale_dir,
+                    unicode=True)
+            # Call the C library gettext functions and set the codeset
+            # to avoid locale-dependent translation of the message catalog
+            locale.bindtextdomain('entertainer', locale_dir)
+            locale.bind_textdomain_codeset('entertainer', "UTF-8")
+            # XXX: fmarl - setlocale load in current locale properly
+            # We can remove it and get feedback from users to see if
+            # this hack it's really needed.
+            try:
+                locale.setlocale(locale.LC_ALL, "")
+            except locale.Error, e:
+                pass
+
         # Find locale data from a dev branch if we can
-        if os.path.exists(TRANSLATION_SOURCE['branch']):
-            #This setups the _ function
-            gettext.install('entertainer', TRANSLATION_SOURCE['branch'])
-
-            #This setups the glade translations
-            gtk.glade.bindtextdomain('entertainer',
-                TRANSLATION_SOURCE['branch'])
-        # Install locale data from the hardcoded package path
-        elif os.path.exists(TRANSLATION_SOURCE['package']):
-            #This setups the _ function
-            gettext.install('entertainer', TRANSLATION_SOURCE['package'])
-
-            #This setups the glade translations
-            gtk.glade.bindtextdomain('entertainer',
-                TRANSLATION_SOURCE['package'])
+        dev_locale =  os.path.abspath(os.path.dirname(__file__) +
+           '/../../locale')
+        if os.path.exists(dev_locale):
+            install_locale(dev_locale)
+
+        # Install locale data from the system location
         else:
-            pass
-
-        gtk.glade.textdomain ('entertainer')
-
+            system_data_dirs = [data_dir for data_dir in
+                BaseDirectory.xdg_data_dirs if not
+                data_dir.startswith(BaseDirectory.xdg_data_home)]
+            # Since we don't know for certain where the mo files were installed,
+            # we try to install from both /usr/share and /usr/local/share.
+            for data_dir in system_data_dirs:
+                system_locale = os.path.join(data_dir, 'locale')
+                install_locale(system_locale)
 
=== renamed file 'entertainerlib/utils/configuration.py' => 'entertainerlib/configuration.py'
--- entertainerlib/utils/configuration.py	2009-06-01 09:55:40 +0000
+++ entertainerlib/configuration.py	2010-01-23 03:34:11 +0000
@@ -2,475 +2,217 @@
 '''Configuration - Class represents Entertainer's configuration'''
 
 import os
-import sys
 import shutil
 import ConfigParser
-from ConfigParser import ParsingError, NoSectionError, NoOptionError
-
+from ConfigParser import NoSectionError, NoOptionError
+
+from xdg import BaseDirectory
+
+from entertainerlib.backend.core.message_handler import MessageHandler
 from entertainerlib.backend.core.message_type_priority import MessageType
-from entertainerlib.backend.core.message_handler import MessageHandler
-
-from entertainerlib.utils.theme import Theme
-
-SOURCE_CONFIG = {
-    'branch' : os.path.abspath(os.path.dirname(__file__) + '/../../cfg'),
-    # Hardcoded path for a package install
-    'package' : "/usr/share/entertainer/cfg"
-    }
+from entertainerlib.db.connection import Database
+from entertainerlib.gui.theme import Theme
 
 class Configuration(MessageHandler):
-    """
-    Configuration of Entertainer
-
-    This class is an interface to all configuration parameters. All components
-    of Entertainer should get configuration values through this class. Object
-    from this class reads current config files and returns values based on
-    those files. If there are missing lines or other errors in config file,
-    then object return default values defined in this class.
-    """
-
-    CFG_DIR = os.path.expanduser("~/.config/entertainer")
-    TEST_DIR = None
-
-    # This dictionary keeps track of data values that are written to config
-    # files but need to be returned to a known state while testing.
-    _tainted = {}
-
-    # This dictionary keeps track of data values that are tainted in memory
-    # instead of a config file
-    _tainted_in_memory = {}
+    '''Interface to all configuration parameters. All components of Entertainer
+    should get configuration values through this class.'''
 
     _shared_state = {}
 
     def __init__(self, test_dir=None):
-        """
-        Read configuration files and setup this object.
-        """
         self.__dict__ = self._shared_state
         MessageHandler.__init__(self)
 
-        if not self._shared_state:
-            self.TEST_DIR = test_dir
-
+        if not self._shared_state or test_dir is not None:
             # Set in a production mode or a test mode
-            if self.TEST_DIR is None:
-                self.cfg_dir = self.CFG_DIR
+            if test_dir is None:
+                self.resources = Resources()
             else:
-                self.cfg_dir = self.TEST_DIR
-
-            if not os.path.exists(os.path.expanduser(self.cfg_dir)):
-                self.create_cfg_dir()
-
-            self.ENTERTAINER_LOG = os.path.join(self.cfg_dir,
-                u'entertainer.log')
-
-            self.FEED_DB = os.path.join(self.cfg_dir, 'cache/feed.db')
-            self.IMAGE_DB = os.path.join(self.cfg_dir, 'cache/image.db')
-            self.MUSIC_DB = os.path.join(self.cfg_dir, 'cache/music.db')
-            self.VIDEO_DB = os.path.join(self.cfg_dir, 'cache/video.db')
-
-            self.THUMB_DIR = os.path.join(self.cfg_dir, 'cache', 'thumbnails')
+                self.resources = Resources(config_testing_dir=test_dir)
+
+            self.cache_dir = self.resources.cache_dir
+            self.config_dir = self.resources.config_dir
+            self.data_dir = self.resources.data_dir
+
+            self.LOG = os.path.join(self.cache_dir, u'entertainer.log')
+
+            self.MEDIA_DB = Database(os.path.join(self.cache_dir, 'media'))
+
+            self.FEED_DB = os.path.join(self.cache_dir, 'feed.db')
+            self.IMAGE_DB = os.path.join(self.cache_dir, 'image.db')
+            self.MUSIC_DB = os.path.join(self.cache_dir, 'music.db')
+            self.VIDEO_DB = os.path.join(self.cache_dir, 'video.db')
+
+            self.THUMB_DIR = os.path.join(self.cache_dir, 'thumbnails')
             self.IMAGE_THUMB_DIR = os.path.join(self.THUMB_DIR, 'image')
             self.VIDEO_THUMB_DIR = os.path.join(self.THUMB_DIR, 'video')
-            self.ALBUM_ART_DIR = os.path.join(self.cfg_dir, 'cache/album_art')
-            self.MOVIE_ART_DIR = os.path.join(self.cfg_dir, 'cache/movie_art')
-
-            # Preferences file
-            self.preferences_conf = os.path.join(self.cfg_dir,
-                'preferences.conf')
-
-            # Content file
-            self.content_conf = os.path.join(self.cfg_dir, 'content.conf')
-
-            self.content_config = ConfigParser.ConfigParser()
-            self.preferences = ConfigParser.ConfigParser()
-            try:
-                self.content_config.readfp(open(self.content_conf))
-                self.preferences.readfp(open(self.preferences_conf))
-            except ParsingError:
-                print("ParsingError with configuration file.")
-                sys.exit(1)
-            except IOError:
-                print("IOError: Couldn't read configuration file.")
-                sys.exit(1)
-
-            self.theme = Theme(self.get_theme_path())
-
-            self.stage_width = None
-            self.stage_height = None
-
-    def create_cfg_dir(self):
-        '''Create a configuration directory and default config files.'''
-
-        def create_cache_hierarchy(config_dir):
-            '''Create the directories needed for the cache'''
-            directories = [
-                'cache',
-                'cache/album_art',
-                'cache/movie_art',
-                'cache/thumbnails',
-                'cache/thumbnails/image',
-                'cache/thumbnails/video'
-                ]
-
-            for directory in directories:
-                new_dir = os.path.join(config_dir, directory)
-                os.mkdir(new_dir)
-
-        config_dir = self.get_cfg_dir()
-        try:
-            # Copy configuration data from a dev branch if we can
-            if os.path.exists(SOURCE_CONFIG['branch']):
-                shutil.copytree(SOURCE_CONFIG['branch'], config_dir)
-                create_cache_hierarchy(config_dir)
-            # Install configuration data from the hardcoded package path
-            elif os.path.exists(SOURCE_CONFIG['package']):
-                shutil.copytree(SOURCE_CONFIG['package'], config_dir)
-                create_cache_hierarchy(config_dir)
-            else:
-                print "Couldn't find configuration data. Execution aborted."
-                sys.exit(1)
-        except OSError:
-            print "Couldn't copy configuration data to %s. Execution aborted." \
-                % config_dir
-            sys.exit(1)
+            self.ALBUM_ART_DIR = os.path.join(self.cache_dir, 'album_art')
+            self.MOVIE_ART_DIR = os.path.join(self.cache_dir, 'movie_art')
+
+            self.read_config_file()
+
+            self.theme = Theme(self.theme_path)
+
+            self._stage_width = None
+            self._stage_height = None
+
+            # Network options specify the server type and extra options
+            self.network_options = {
+                'type': 'local',
+                'host': 'localhost',
+                'port': 55545}
+
+    def read_config_file(self):
+        '''Read in the config file.'''
+        self.content_conf = os.path.join(self.config_dir, 'content.conf')
+        self.content = ConfigParser.ConfigParser()
+        self.content.readfp(open(self.content_conf))
 
     def update_configuration(self):
-        """
-        Read configuration files again and update this object.
-        """
-        try:
-            self.content_config.readfp(open(self.content_conf))
-            self.preferences.readfp(open(self.preferences_conf))
-        except ParsingError:
-            raise Exception("Syntax error in configuration file.")
-        except IOError:
-            raise IOError("Couldn't read config file.")
+        '''Read configuration file again and update this object.'''
+        self.content.readfp(open(self.content_conf))
 
-    def write_content_value(self, section, option, value, sanitize=False):
+    def write_content_value(self, section, option, value):
         """Write a new value to the content configuration file."""
-        if self.TEST_DIR and not sanitize:
-            self.taint('content', section, option)
 
-        try:
-            self.content_config.set(section, option, value)
+        def write_value(section, option, value):
+            '''Actually write the value to the section and option.'''
+            self.content.set(section, option, value)
             cfg_file = file(self.content_conf, 'w')
-            self.content_config.write(cfg_file)
+            self.content.write(cfg_file)
+
+        try:
+            write_value(section, option, value)
         except NoSectionError:
-            raise Exception("No Section to set in content.conf file")
+            # Provide an upgrade path to additions of new sections.
+            shutil.rmtree(self.config_dir)
+            self.resources.create_configuration()
+            self.read_config_file()
+            write_value(section, option, value)
         except NoOptionError:
             raise Exception("No Option to set in content.conf file")
 
-    def write_preference_value(self, section, option, value, sanitize=False):
-        """Write a new value to the preferences configuration file."""
-        if self.TEST_DIR and not sanitize:
-            self.taint('preferences', section, option)
-
-        try:
-            self.preferences.set(section, option, value)
-            cfg_file = file(self.preferences_conf, 'w')
-            self.preferences.write(cfg_file)
-        except NoSectionError:
-            raise Exception("No Section to set in preferences.conf file")
-        except NoOptionError:
-            raise Exception("No Option to set in preferences.conf file")
-
-    def get_stage_width(self):
-        '''Get the stage width from the preferences'''
-        if self.stage_width:
-            return self.stage_width
-
-        try:
-            self.stage_width = self.preferences.getint("General", "stage_width")
-        except (NoSectionError, NoOptionError):
-            self.stage_width = 1366 # Default
-
-        return self.stage_width
-
-    def set_stage_width(self, new_width, sanitize=False):
-        '''Set the stage width for the in memory instance'''
-        # Taint data if in test mode
-        if self.TEST_DIR and not sanitize:
-            kwargs = {'new_width' : self.get_stage_width(),
-                'sanitize' : True}
-            self.taint_in_memory(self.set_stage_width, kwargs)
-
-        self.stage_width = new_width
-
-    def get_stage_height(self):
-        '''Get the stage height from the preferences'''
-        if self.stage_height:
-            return self.stage_height
-
-        try:
-            self.stage_height = self.preferences.getint("General",
-                "stage_height")
-        except (NoSectionError, NoOptionError):
-            self.stage_height = 768 # Default
-
-        return self.stage_height
-
-    def set_stage_height(self, new_height, sanitize=False):
-        '''Set the stage height for the in memory instance'''
-        # Taint data if in test mode
-        if self.TEST_DIR and not sanitize:
-            kwargs = {'new_height' : self.get_stage_height(),
-                'sanitize' : True}
-            self.taint_in_memory(self.set_stage_height, kwargs)
-
-        self.stage_height = new_height
-
-    def get_theme_path(self):
-        """
-        Get absolute path of the used theme.
-        @return: string (path)
-        """
-        theme_path = os.path.join(self.get_cfg_dir(), 'themes')
-        try:
-            theme = self.preferences.get("General", "theme")
-        except (NoSectionError, NoOptionError):
-            return os.path.join(theme_path, "Default")
-
-        if os.path.exists(os.path.join(theme_path, theme)):
-            return os.path.join(theme_path, theme)
-        else:
-            return os.path.join(theme_path, "Default")
-
+    def _get_stage_width(self):
+        '''stage_width property getter.'''
+        if self._stage_width:
+            return self._stage_width
+
+        self._stage_width = self.content.getint("General", "stage_width")
+        return self._stage_width
+
+    def _set_stage_width(self, new_width):
+        '''stage_width property setter.'''
+        self._stage_width = new_width
+
+    stage_width = property(_get_stage_width, _set_stage_width)
+
+    def _get_stage_height(self):
+        '''stage_height property getter.'''
+        if self._stage_height:
+            return self._stage_height
+
+        self._stage_height = self.content.getint("General", "stage_height")
+        return self._stage_height
+
+    def _set_stage_height(self, new_height):
+        '''stage_height property setter.'''
+        self._stage_height = new_height
+
+    stage_height = property(_get_stage_height, _set_stage_height)
+
+    @property
+    def theme_path(self):
+        '''Path to the currently selected theme.'''
+        theme_path = os.path.join(self.data_dir, 'themes')
+        theme = self.content.get("General", "theme")
+        return os.path.join(theme_path, theme)
+
+    @property
     def tray_icon_enabled(self):
-        """
-        Display tray icon.
-        @return: boolean
-        """
-        try:
-            result = self.preferences.getboolean("General", "display_icon")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
-
-    def get_feed_fetch_interval(self):
-        """
-        Get time interval (in minutes) for feed fetching.
-        @return: Integer
-        """
-        try:
-            result = self.content_config.getint("RSS", "fetch_interval")
-        except (NoSectionError, NoOptionError):
-            return 60 # Default is one hour
-        return result
-
-    def get_port(self):
-        """
-        Get backend server's port number.
-        @return: Integer
-        """
-        try:
-            result = self.preferences.getint("General", "backend_port")
-        except (NoSectionError, NoOptionError):
-            return 45054 # Default port
-        return result
-
-    def get_video_folders(self):
-        """
-        Get list of video folders
-        @return:String Array
-        """
-        try:
-            video_list = self.content_config.get("Videos", "folders")
-            result = self._is_valid_media_folder(video_list.split(';'))
-        except (NoSectionError, NoOptionError):
-            return []
-        return result
-
-    def get_music_folders(self):
-        """
-        Get list of music folders
-        @return: String Array
-        """
-        try:
-            music_list = self.content_config.get("Music", "folders")
-            result = music_list.split(';')
-        except (NoSectionError, NoOptionError):
-            return []
-        return result
-
-    def get_image_folders(self):
-        """
-        Get list of image folders
-        @return: String Array
-        """
-        try:
-            image_list = self.content_config.get("Images", "folders")
-            result = self._is_valid_media_folder(image_list.split(';'))
-        except (NoSectionError, NoOptionError):
-            return []
-        return result
-
-    def get_feeds(self):
-        """
-        Get list of feeds.
-        @return: String Array
-        """
-        try:
-            rss_feeds = self.content_config.get("RSS", "feeds")
-            result = rss_feeds.split(';')
-        except (NoSectionError, NoOptionError):
-            return []
-        return result
-
-    def get_weather_location(self):
-        """
-        Get list of weather location codes.
-        @return: List of strings
-        """
-        try:
-            location = self.content_config.get("Weather", "location")
-        except (NoSectionError, NoOptionError):
-            location = ''
-        return location
-
-    def display_weather_in_frontend(self):
-        """
-        Should we display weather in frontend
-        @return: Boolean
-        """
-        try:
-            result = self.content_config.getboolean("Weather",
-                "display_in_menu")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
-
-    def display_cd_eject_in_frontend(self):
-        """
-        Should we display the cd eject button in frontend
-        @return: Boolean
-        """
-        try:
-            result = self.content_config.getboolean("CD",
-                "display_eject_in_menu")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
-
-    def download_video_metadata(self):
-        """
-        Get True if video metadata should be downloaded, otherwise False
-        """
-        try:
-            result = self.content_config.getboolean("Videos",
-                "download_metadata")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
-
+        '''Boolean to indicate whether or not to show the tray icon.'''
+        return self.content.getboolean("General", "display_icon")
+
+    @property
+    def feed_fetch_interval(self):
+        '''Time interval (in minutes) for feed fetching.'''
+        return self.content.getint("RSS", "fetch_interval")
+
+    @property
+    def port(self):
+        '''Server's port number.'''
+        return self.content.getint("General", "backend_port")
+
+    @property
+    def media_folders(self):
+        '''Return a list of folders for media.'''
+        media = self.content.get("Media", "folders")
+        return self._is_valid_media_folder(media.split(';'))
+
+    @property
+    def feeds(self):
+        '''List of feeds.'''
+        rss_feeds = self.content.get("RSS", "feeds")
+        return rss_feeds.split(';')
+
+    @property
+    def weather_location(self):
+        '''User's weather location.'''
+        return self.content.get("Weather", "location")
+
+    @property
+    def display_weather_in_client(self):
+        '''Boolean to tell if weather should be displayed.'''
+        return self.content.getboolean("Weather", "display_in_menu")
+
+    @property
+    def download_metadata(self):
+        '''Boolean to tell if metadata should be downloaded.'''
+        return self.content.getboolean("Media", "download_metadata")
+
+    @property
     def download_album_art(self):
-        """
-        Download album art from the Internet.
-        @return: boolean
-        """
-        try:
-            result = self.content_config.getboolean("Music",
-                "download_album_art")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
+        '''Boolean to tell if album art should be downloaded.'''
+        return self.content.getboolean("Media", "download_album_art")
 
+    @property
     def download_lyrics(self):
-        """
-        Download song lyrics from the Internet.
-        @return: boolean
-        """
-        try:
-            result = self.content_config.getboolean("Music", "download_lyrics")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
-
-    def display_hidden_files_folders(self):
-        """If True hidden files and folders will be added to image library."""
-        try:
-            result = self.content_config.getboolean("Images",
-                "display_hidden_files_folders")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
-
+        '''Boolean to tell if lyrics should be downloaded.'''
+        return self.content.getboolean("Media", "download_lyrics")
+
+    @property
     def show_effects(self):
-        """
-        Use animations on user interface.
-        @return: boolean
-        """
-        try:
-            result = self.preferences.getboolean("General", "show_effects")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
+        '''Boolean to tell if effects should be shown.'''
+        return self.content.getboolean("General", "show_effects")
 
+    @property
     def transition_effect(self):
-        """
-        Which transition effect should be used when switching screens.
-        @return: string (name of the effect)
-        """
-        try:
-            result = self.preferences.get("General", "transition_effect")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
-
-    def get_theme_name(self):
-        """
-        Get the name of the current theme.
-        @return: string (theme name)
-        """
-        try:
-            result = self.preferences.get("General", "theme")
-        except (NoSectionError, NoOptionError):
-            result = "Default"
-        return result
-
+        '''Internal name of the user's selected screen transition style.'''
+        return self.content.get("General", "transition_effect")
+
+    @property
+    def theme_name(self):
+        '''Name of the current theme.'''
+        return self.content.get("General", "theme")
+
+    @property
     def start_in_fullscreen(self):
         '''Boolean to determine whether to start in fullscreen mode or not.'''
-        try:
-            result = self.preferences.getboolean("General",
-                "start_in_fullscreen")
-        except (NoSectionError, NoOptionError):
-            return True
-        return result
+        return self.content.getboolean("General", "start_in_fullscreen")
 
+    @property
     def start_auto_server(self):
-        """
-        Return True if backend server should auto start
-        @return: boolean
-        """
-        try:
-            result = self.preferences.getboolean("General",
-                "start_server_auto")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
+        '''Boolean to tell if the server should be auto started.'''
+        return self.content.getboolean("General", "start_server_auto")
 
+    @property
     def history_size(self):
-        """
-        Get screen history size. This determines how many screen are kept in
-        memory when scrolling.
-        @return: Integer
-        """
-        try:
-            result = self.preferences.getint("General", "history_size")
-        except (NoSectionError, NoOptionError):
-            return 10
-        return result
+        '''Number of screens to hold in history.'''
+        return self.content.getint("General", "history_size")
 
-    def get_slideshow_step(self):
-        """
-        Get the slideshow step in seconds used by the photo slideshow
-        @return: Integer
-        """
-        try:
-            result = self.preferences.getint("Photographs", "slideshow_step")
-        except (NoSectionError, NoOptionError):
-            return 5
-        return result
+    @property
+    def slideshow_step(self):
+        '''Amount of seconds before the slideshow steps to the next image.'''
+        return self.content.getint("Photographs", "slideshow_step")
 
     # Implements MessageHandler interface
     def handleMessage(self, message):
@@ -480,73 +222,99 @@
         """
         if message.get_type() == MessageType.CONTENT_CONF_UPDATED:
             self.update_configuration()
-        elif message.get_type() == MessageType.PREFERENCES_CONF_UPDATED:
-            self.update_configuration()
-
-    def get_cfg_dir(self):
-        """
-        Get the entertainer configuration dir.
-        @return: strings
-        """
-        return self.cfg_dir
-
-    def taint(self, kind, section, option):
-        '''Taint any data that is written to config files so that it can be
-        returned to a known state later'''
-        if kind == 'content':
-            value = self.content_config.get(section, option)
-        elif kind == 'preferences':
-            value = self.preferences.get(section, option)
-        else:
-            raise Exception(
-                "Taint type must be either 'content' or 'preferences'")
-
-        key = "%s %s %s" % (kind, section, option)
-        self._tainted[key] = value
-
-    def taint_in_memory(self, callback, kwargs):
-        '''Taint any data that is stored in memory. Callback is used as the
-        key to a tainted_in_memory dictionary whose stored value is a
-        dictionary of arguments (kwargs) needed to restore the original
-        value'''
-        self._tainted_in_memory[callback] = kwargs
-
-    def sanitize(self):
-        '''Restore all tainted values to their original state and clear the
-        tainted dictionary'''
-        # Sanitize values in config files
-        for key in self._tainted.keys():
-            # tokens will contain type, section, and option
-            tokens = key.split()
-            if tokens[0] == 'content':
-                # Write in the sanitize mode so taint checking will be skipped
-                self.write_content_value(tokens[1], tokens[2],
-                    self._tainted[key], sanitize=True)
-            elif tokens[0] == 'preferences':
-                # Write in the sanitize mode so taint checking will be skipped
-                self.write_preference_value(tokens[1], tokens[2],
-                    self._tainted[key], sanitize=True)
-
-        self.update_configuration()
-        self._tainted = {}
-
-        # Sanitize values in memory
-        for callback in self._tainted_in_memory.keys():
-            kwargs = self._tainted_in_memory[callback]
-            callback(**kwargs)
-
-        self._tainted_in_memory = {}
 
     def _is_valid_media_folder(self, folder_list):
         """Return a folder list where eventual cache folders are removed"""
-        cache_dir = os.path.join(self.get_cfg_dir(), 'cache')
         valid_folder_list = []
 
         for folder in folder_list:
-            common_prefix = os.path.commonprefix([cache_dir, folder])
-            if common_prefix != cache_dir:
-                # folder is not a subfolder of cache_dir we accept it
+            common_prefix = os.path.commonprefix([self.cache_dir, folder])
+            if common_prefix != self.cache_dir:
+                # if folder is not a subfolder of cache_dir, we accept it
                 valid_folder_list.append(folder)
 
         return valid_folder_list
 
+
+class Resources(object):
+    '''A Wrapper for the XDG directories. Also handles creation of a new setup
+    if the Entertainer directories within the XDG directories are missing. This
+    class is meant solely to support Configuration and should NOT be publicly
+    used because of testing conflicts that would occur.'''
+
+    def __init__(self, resource='entertainer', config_testing_dir=None):
+        if config_testing_dir is None:
+            self.cache_dir = os.path.join(BaseDirectory.xdg_cache_home,
+                 resource)
+            self.config_dir = os.path.join(BaseDirectory.xdg_config_home,
+                resource)
+            self.data_dir = os.path.join(BaseDirectory.xdg_data_home, resource)
+        else:
+            # Running in the test suite so don't create the XDG locations.
+            self.cache_dir = os.path.join(config_testing_dir, 'cache')
+            self.config_dir = os.path.join(config_testing_dir, 'config')
+            self.data_dir = os.path.join(config_testing_dir, 'data')
+
+        # Ensure that the directories exist.
+        if not os.path.exists(self.cache_dir):
+            self.create_cache_hierarchy()
+        if not os.path.exists(self.config_dir):
+            self.create_configuration()
+        if not os.path.exists(self.data_dir):
+            self.create_initial_data()
+
+    def create_cache_hierarchy(self):
+        '''Create the cache hierarchy that is assumed to exist.'''
+        os.makedirs(os.path.join(self.cache_dir, 'album_art'))
+        os.makedirs(os.path.join(self.cache_dir, 'movie_art'))
+        os.makedirs(os.path.join(self.cache_dir, 'thumbnails', 'image'))
+        os.makedirs(os.path.join(self.cache_dir, 'thumbnails', 'video'))
+
+    def create_configuration(self):
+        '''Create the user's configuration area and populate with the default
+        content configuration.'''
+
+        # Copy configuration data from a dev branch if we can
+        dev_config = os.path.abspath(os.path.dirname(__file__) + '/../cfg')
+        if os.path.exists(dev_config):
+            shutil.copytree(dev_config, self.config_dir)
+            return
+
+        # Must be a proper installation so install from the system location.
+        installed_config = os.path.join(self.installed_data_dir, 'cfg')
+        shutil.copytree(installed_config, self.config_dir)
+
+    def create_initial_data(self):
+        '''Create the initial data directory and populate with the default data
+        used by Entertainer.'''
+        os.mkdir(self.data_dir)
+
+        # Copy configuration data from a dev branch if we can
+        dev_config = os.path.abspath(os.path.dirname(__file__) + '/../themes')
+        if os.path.exists(dev_config):
+            shutil.copytree(dev_config, os.path.join(self.data_dir, 'themes'))
+            return
+
+        # Must be a proper installation so install from the system location.
+        themes_dir = os.path.join(self.installed_data_dir, 'themes')
+        shutil.copytree(themes_dir, os.path.join(self.data_dir, 'themes'))
+
+    @property
+    def installed_data_dir(self):
+        '''Since different distros decide on the install path differently, scan
+        through the system data directories to find where Entertainer was
+        installed.'''
+
+        # Get rid of the user's home data directory because we don't want it.
+        system_data_dirs = [data_dir for data_dir in BaseDirectory.xdg_data_dirs
+            if not data_dir.startswith(BaseDirectory.xdg_data_home)]
+
+        installed_data_dir = None
+        for directory in system_data_dirs:
+            possible_data_dir = os.path.join(directory, 'entertainer')
+            if os.path.exists(possible_data_dir):
+                installed_data_dir = possible_data_dir
+                break
+
+        return installed_data_dir
+
 
=== renamed directory 'entertainerlib/backend/core/db' => 'entertainerlib/db'
=== modified file 'entertainerlib/db/connection.py'
--- entertainerlib/backend/core/db/connection.py	2009-05-11 23:37:27 +0000
+++ entertainerlib/db/connection.py	2010-01-23 03:34:11 +0000
@@ -27,7 +27,7 @@
     'PhotoImage': '''CREATE TABLE `photoimage` (
                     id INTEGER PRIMARY KEY AUTOINCREMENT,
                     filename TEXT,
-                    thumb VARCHAR(32),
+                    thumbnail VARCHAR(32),
                     title TEXT,
                     description TEXT,
                     creation_date DATETIME,
 
=== modified file 'entertainerlib/db/models.py'
--- entertainerlib/backend/core/db/models.py	2009-04-28 23:54:49 +0000
+++ entertainerlib/db/models.py	2010-01-23 03:34:11 +0000
@@ -6,6 +6,7 @@
 from storm.properties import Bool, DateTime, Int, Unicode
 from storm.references import Reference, ReferenceSet
 
+
 class BaseModel(Storm):
     '''Abstract class from which all Entertainer models inherit.'''
 
@@ -96,7 +97,7 @@
     __storm_table__ = 'photoimage'
     id = Int(primary=True)
     filename = Unicode()
-    thumb = Unicode()
+    thumbnail = Unicode()
     title = Unicode()
     description = Unicode()
     creation_date = DateTime()
@@ -108,7 +109,7 @@
         ret = {
             'id': self.id,
             'filename': self.filename,
-            'thumb': self.thumb,
+            'thumbnail': self.thumbnail,
             'title': self.title,
             'description': self.description,
             'creation_date': self.creation_date,
 
=== added file 'entertainerlib/dialog.py'
--- entertainerlib/dialog.py	1970-01-01 00:00:00 +0000
+++ entertainerlib/dialog.py	2010-01-23 03:34:11 +0000
@@ -0,0 +1,1113 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+'''Dialogs for Entertainer.'''
+# pylint: disable-msg=C0302
+
+import os
+import shutil
+import socket
+import sys
+import tarfile
+
+import gtk
+
+from entertainerlib.backend.core.message import Message
+from entertainerlib.backend.core.message_bus_proxy import MessageBusProxy
+from entertainerlib.backend.core.message_type_priority import MessageType
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
+from entertainerlib.gui.theme import Theme
+from entertainerlib.backend.components.feeds.feed_utils import (OPMLParser,
+    FeedConfigTools)
+from entertainerlib.weather import Weather
+
+
+class ManagerDialog:
+    """
+    This is a content management tool for Entertainer media center application.
+    """
+
+    # Temporary storage for entered URL
+    url = ""
+    UI_DIR = os.path.join(os.path.dirname(__file__), "uis")
+
+    def __init__(self, stand_alone):
+        """
+        Initialize content management dialog
+        @param stand_alone: Boolean, Is this dialog running as a stand alone
+            process
+        """
+        self.stand_alone = stand_alone
+        self.config = Configuration()
+        self.themes = []
+        self.weather = Weather()
+
+        # Load UI with gtk.Builder
+        uifile = os.path.join(self.UI_DIR, 'manager.ui')
+        self.builder = gtk.Builder()
+        self.builder.set_translation_domain('entertainer')
+        self.builder.add_from_file(uifile)
+
+        # Get content management dialog and bind signal callbacks
+        self.dialog = self.builder.get_object("ManagerDialog")
+        if (self.dialog):
+            callback_dic = {
+                # Dialog-wide callbacks
+                "on_button_open_list_clicked" :
+                    self.on_button_open_list_clicked,
+                "on_close_button_clicked" : self.on_close_button_clicked,
+                "on_ManagerDialog_destroy" : self.on_dialog_closed,
+
+                # Media tab
+                "on_button_remove_media_clicked" :
+                    self.on_button_remove_media_clicked,
+                "on_button_add_media_clicked" :
+                    self.on_button_add_media_clicked,
+                "on_button_edit_media_clicked" :
+                    self.on_button_edit_media_clicked,
+                "on_checkbutton_video_metadata_toggled" :
+                    self.on_checkbutton_video_metadata_toggled,
+                "on_lyrics_checkbox_toggled" : self.on_lyrics_checkbox_toggled,
+                "on_art_checkbox_toggled" : self.on_art_checkbox_toggled,
+                "on_button_media_rebuild_clicked" :
+                    self.on_button_media_rebuild_clicked,
+
+                # Feed tab
+                "on_button_add_feed_clicked" :
+                    self.on_button_add_feed_clicked,
+                "on_button_remove_feed_clicked" :
+                    self.on_button_remove_feed_clicked,
+                "on_button_edit_feed_clicked" :
+                    self.on_button_edit_feed_clicked,
+                "on_fetch_interval_spinbutton_value_changed" :
+                    self.on_fetch_interval_spinbutton_value_changed,
+                "on_url_dialog_delete_event" : self.on_url_dialog_delete_event,
+                "on_url_dialog_ok_button_clicked" :
+                    self.on_url_dialog_ok_button_clicked,
+                "on_url_dialog_cancel_button_clicked" :
+                    self.on_url_dialog_cancel_button_clicked,
+                "on_button_feed_rebuild_clicked" :
+                    self.on_button_feed_rebuild_clicked,
+
+                # Weather tab
+                "on_button_add_weather_clicked" :
+                    self.on_button_add_weather_clicked,
+                "on_button_remove_weather_clicked" :
+                    self.on_button_remove_weather_clicked,
+                "on_weather_display_checkbox_toggled" :
+                    self.on_weather_display_checkbox_toggled,
+                "on_location_find_button_clicked" :
+                    self.on_location_find_button_clicked,
+                "on_location_cancel_button_clicked" :
+                    self.on_location_cancel_button_clicked,
+                "on_location_add_button_clicked" :
+                    self.on_location_add_button_clicked,
+                "on_location_entry_activate" : self.on_location_entry_activate,
+
+                # User Interface tab
+                "on_theme_list_cursor_changed" :
+                    self.on_theme_list_cursor_changed,
+                "on_theme_add_button_clicked" :
+                    self.on_theme_add_button_clicked,
+                "on_theme_remove_button_clicked" :
+                    self.on_theme_remove_button_clicked,
+                "on_checkbutton_effects_toggled" :
+                    self.on_checkbutton_effects_toggled,
+                "on_combobox_effects_changed" :
+                    self.on_combobox_effects_changed,
+
+                # General tab
+                "on_checkbutton_fullscreen_toggled" :
+                    self.on_checkbutton_fullscreen_toggled,
+                "on_checkbutton_autostart_toggled" :
+                    self.on_checkbutton_autostart_toggled,
+                "on_checkbutton_systray_icon_toggled" :
+                    self.on_checkbutton_systray_icon_toggled,
+                "on_spinbutton_slideshow_step_value_changed":
+                    self.on_spinbutton_slideshow_step_value_changed
+                }
+
+        self.builder.connect_signals(callback_dic)
+
+        # Initialize dialog widgets with correct values and show dialog
+        self.init_dialog_values_from_configure_file()
+        self.dialog.resize(500, 300)
+        self.dialog.show()
+
+        # Initialize location list in search dialog
+        result_list = self.builder.get_object("location_results_treeview")
+        store = gtk.ListStore(str)
+        result_list.set_model(store)
+        cell_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn(_("Location"), cell_renderer, text=0)
+        result_list.append_column(column)
+
+    def on_dialog_closed(self, widget):
+        """Callback function for dialog's close button"""
+        try:
+            proxy = MessageBusProxy(client_name = "Manager GUI")
+            proxy.connectToMessageBus()
+            proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
+            proxy.disconnectFromMessageBus()
+        except socket.error:
+            error = gtk.MessageDialog(
+                    None, gtk.DIALOG_MODAL,
+                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
+                        "Entertainer backend is not running. "
+                        "Cache cannot be rebuilt."
+                    ))
+            error.run()
+            error.destroy()
+
+        if(self.stand_alone):
+            self.dialog.hide()
+            self.dialog.destroy()
+            gtk.main_quit()
+        else:
+            self.dialog.hide()
+            self.dialog.destroy()
+
+    def on_close_button_clicked(self, widget):
+        """Callback function for dialog's close button"""
+        if(self.stand_alone):
+            self.dialog.hide()
+            self.dialog.destroy()
+            gtk.main_quit()
+        else:
+            self.dialog.hide()
+            self.dialog.destroy()
+
+    def on_button_add_media_clicked(self, widget):
+        """Opens add URL dialog. """
+        widget = self.builder.get_object("treeview_media")
+        model = widget.get_model()
+        # Open "Select folder" dialog
+        dialog =  gtk.FileChooserDialog(_("Select folder"), None,
+            gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
+            (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,
+                gtk.STOCK_OPEN,gtk.RESPONSE_OK),
+            None)
+        status = dialog.run()
+        # If folder was selected we add it to model and update config file
+        if(status == gtk.RESPONSE_OK):
+            self.add_to_model_and_config(dialog.get_current_folder(), model,
+                self.media_folders, "Media")
+        dialog.destroy()
+
+    def on_button_remove_media_clicked(self, widget):
+        """Remove currently selected folder from media folders"""
+        widget = self.builder.get_object("treeview_media")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        rm_folder = model.get_value(selection[1], 0)
+        self.media_folders.remove(rm_folder)
+        str_folders = ";".join(self.media_folders)
+        self.config.write_content_value("Media", "folders", str_folders)
+        model.remove(selection[1])
+
+    def on_button_edit_media_clicked(self, widget):
+        """Edit currently selected folder"""
+        widget = self.builder.get_object("treeview_media")
+        url_dialog = self.builder.get_object("url_dialog")
+        url_entry = self.builder.get_object("url_entry")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        folder = model.get_value(selection[1], 0)
+        url_entry.set_text(folder)
+        url_dialog.set_title(_("Edit URL"))
+        status = url_dialog.run()
+        if status == gtk.RESPONSE_OK and os.path.exists(self.url):
+            # Update list model
+            model.set_value(selection[1], 0, self.url)
+            # Update configure file
+            pos = self.media_folders.index(folder)
+            self.media_folders.remove(folder)
+            self.media_folders.insert(pos, self.url)
+            str_folders = ";".join(self.media_folders)
+            self.config.write_content_value("Media", "folders",
+                str_folders)
+
+    def on_checkbutton_autostart_toggled(self, widget):
+        '''Server autostart checkbox toggled.'''
+        self.config.write_content_value("General", "start_server_auto",
+            widget.get_active())
+
+    def on_checkbutton_fullscreen_toggled(self, widget):
+        '''Start in fullscreen checkbox toggled.'''
+        self.config.write_content_value("General", "start_in_fullscreen",
+            widget.get_active())
+
+    def on_checkbutton_systray_icon_toggled(self, widget):
+        """System Tray Icon checkbox toggled"""
+        self.config.write_content_value("General", "display_icon",
+            widget.get_active())
+
+    def on_checkbutton_video_metadata_toggled(self, widget):
+        """
+        Download video file metadata from internet
+        @param widget: GTK-Widget
+        """
+        self.config.write_content_value("Media", "download_metadata",
+            widget.get_active())
+
+    def on_button_add_feed_clicked(self, widget):
+        """Opens add feed dialog. """
+        widget = self.builder.get_object("treeview_feeds")
+        url_dialog = self.builder.get_object("url_dialog")
+        model = widget.get_model()
+        # Open dialog
+        url_dialog.set_title(_("Add RSS-feed"))
+        status = url_dialog.run()
+        # If folder was selected we add it to model and update config file
+        if(status == gtk.RESPONSE_OK):
+            model.append([self.url])
+            self.feeds.append(self.url)
+            str_folders = ";".join(self.feeds)
+            self.config.write_content_value("RSS", "feeds", str_folders)
+
+    def on_button_remove_feed_clicked(self, widget):
+        """Remove currently selected reed from RSS-feeds"""
+        widget = self.builder.get_object("treeview_feeds")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        rm_folder = model.get_value(selection[1], 0)
+        self.feeds.remove(rm_folder)
+        str_folders = ";".join(self.feeds)
+        self.config.write_content_value("RSS", "feeds", str_folders)
+        model.remove(selection[1])
+
+    def on_button_edit_feed_clicked(self, widget):
+        """Edit currently selected feed"""
+        widget = self.builder.get_object("treeview_feeds")
+        url_dialog = self.builder.get_object("url_dialog")
+        url_entry = self.builder.get_object("url_entry")
+        model = widget.get_model()
+        selection = widget.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        feed = model.get_value(selection[1], 0)
+        url_entry.set_text(feed)
+        url_dialog.set_title(_("Edit feed"))
+        status = url_dialog.run()
+        if status == gtk.RESPONSE_OK:
+            # Update list model
+            model.set_value(selection[1], 0, self.url)
+            # Update configure file
+            pos = self.feeds.index(feed)
+            self.feeds.remove(feed)
+            self.feeds.insert(pos, self.url)
+            str_feeds = ";".join(self.feeds)
+            self.config.write_content_value("RSS", "feeds", str_feeds)
+
+    def on_button_open_list_clicked(self, widget):
+        """Opens the open feed source dialog"""
+        open_dialog = OpenFeedSourceDialog(
+            self.builder.get_object("treeview_feeds"), self.feeds)
+        open_dialog.dialog.connect("destroy",
+            open_dialog.on_closeButton_clicked)
+
+    def on_fetch_interval_spinbutton_value_changed(self, widget):
+        self.config.write_content_value("RSS", "fetch_interval",
+            widget.get_value_as_int())
+
+    def on_spinbutton_slideshow_step_value_changed(self, widget):
+        """Activation of slideshow effects"""
+        self.config.write_content_value("Photographs", "slideshow_step",
+            int(widget.get_value()))
+
+    def on_lyrics_checkbox_toggled(self, widget):
+        self.config.write_content_value("Media", "download_lyrics",
+            widget.get_active())
+
+    def on_art_checkbox_toggled(self, widget):
+        self.config.write_content_value("Media", "download_album_art",
+            widget.get_active())
+
+    def on_url_dialog_ok_button_clicked(self, widget):
+        """URL dialog OK button pressed. Sets self.url"""
+        url_dialog = self.builder.get_object("url_dialog")
+        url_entry = self.builder.get_object("url_entry")
+        url_dialog.hide()
+        self.url = url_entry.get_text()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_OK)
+
+    def on_url_dialog_cancel_button_clicked(self, widget):
+        """URL dialog cancelled. Hides dialog"""
+        url_dialog = self.builder.get_object("url_dialog")
+        url_entry = self.builder.get_object("url_entry")
+        url_dialog.hide()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_CANCEL)
+
+    def on_url_dialog_delete_event(self, widget, data):
+        """Dialog's X clicked. Hides dialog"""
+        url_dialog = self.builder.get_object("url_dialog")
+        url_entry = self.builder.get_object("url_entry")
+        url_dialog.hide()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_CANCEL)
+        return True
+
+    def on_button_add_weather_clicked(self, widget):
+        """
+        Open location search dialog
+        @param widget: GTK-Widget
+        """
+        location_dialog = self.builder.get_object("weather_search_dialog")
+        location_dialog.set_title(_("Add location"))
+
+        # Clear results
+        result_list = self.builder.get_object("location_results_treeview")
+        model = result_list.get_model()
+        model.clear()
+
+        status = location_dialog.run()
+        if(status == gtk.RESPONSE_OK):
+            print "Added"
+
+    def on_button_remove_weather_clicked(self, widget):
+        """
+        Remove currently selected weather location from the location list
+        @param widget: GTK-Widget
+        """
+        widget = self.builder.get_object("treeview_locations")
+        model = widget.get_model()
+        self.weather_locations = []
+        str_folders = ""
+        self.config.write_content_value("Weather", "location", str_folders)
+        model.clear()
+
+    def on_weather_display_checkbox_toggled(self, widget):
+        """
+        Checkbox that defines should we use weather conditions
+        @param widget: GTK-Widget
+        """
+        self.config.write_content_value("Weather", "display_in_menu",
+            widget.get_active())
+        if widget.get_active():
+            self.builder.get_object("button_add_weather").set_sensitive(True)
+            self.builder.get_object(
+                "button_remove_weather").set_sensitive(True)
+            self.builder.get_object("treeview_locations").set_sensitive(True)
+        else:
+            self.builder.get_object("button_add_weather").set_sensitive(False)
+            self.builder.get_object(
+                "button_remove_weather").set_sensitive(False)
+            self.builder.get_object("treeview_locations").set_sensitive(False)
+
+    def on_location_find_button_clicked(self, widget):
+        """
+        Find location by search string
+        @param widget: GTK-Widget
+        """
+        add_button = self.builder.get_object("location_add_button")
+        search_term = self.builder.get_object("location_entry").get_text()
+        result_list = self.builder.get_object("location_results_treeview")
+        model = result_list.get_model()
+        model.clear()
+        if search_term != "":
+            self.weather.location = search_term
+            self.weather.refresh()
+            results = self.weather.forecasts
+            if len(results) > 0:
+                add_button.set_sensitive(True)
+                model.append([search_term])
+                result_list.set_cursor(0)
+            else:
+                model.clear()
+                model.append([_("Location Not Found!")])
+                add_button.set_sensitive(False)
+
+    def on_location_cancel_button_clicked(self, widget):
+        """
+        Close location search dialog without taking any actions.0
+        @param widget: GTK-Widget
+        """
+        location_dialog = self.builder.get_object("weather_search_dialog")
+        location_entry = self.builder.get_object("location_entry")
+        location_dialog.hide()
+        location_entry.set_text("")
+        location_dialog.response(gtk.RESPONSE_CANCEL)
+
+    def on_location_add_button_clicked(self, widget):
+        """
+        Add selected location to location list and close search dialog
+        @param widget: GTK-Widget
+        """
+        self.weather_locations = []
+        result_list = self.builder.get_object("location_results_treeview")
+        model = result_list.get_model()
+        selection = result_list.get_selection().get_selected()
+        if selection[1] == None:
+            return
+        location_string = model.get_value(selection[1], 0)
+
+        location_list = self.builder.get_object("treeview_locations")
+        loc_model = location_list.get_model()
+        loc_model.clear()
+        loc_model.append([location_string])
+
+        self.weather_locations.append(location_string)
+        str_locations = ";".join(self.weather_locations)
+        self.config.write_content_value("Weather", "location", str_locations)
+
+        location_dialog = self.builder.get_object("weather_search_dialog")
+        location_entry = self.builder.get_object("location_entry")
+        location_dialog.hide()
+        location_entry.set_text("")
+        location_dialog.response(gtk.RESPONSE_CANCEL)
+
+    def on_location_entry_activate(self, widget):
+        """
+        User hit enter on location entry to start search
+        @param widget: GTK-Widget
+        """
+        self.on_location_find_button_clicked(widget)
+
+    def on_button_media_rebuild_clicked(self, widget):
+        '''Rebuild media cache requested.'''
+        try:
+            proxy = MessageBusProxy(client_name = "Manager GUI")
+            proxy.connectToMessageBus()
+            proxy.sendMessage(Message(MessageType.REBUILD_IMAGE_CACHE))
+            proxy.sendMessage(Message(MessageType.REBUILD_MUSIC_CACHE))
+            proxy.sendMessage(Message(MessageType.REBUILD_VIDEO_CACHE))
+            proxy.disconnectFromMessageBus()
+        except socket.error:
+            error = gtk.MessageDialog(
+                None, gtk.DIALOG_MODAL,
+                gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
+                    "Entertainer backend is not running. "
+                    "Cache cannot be rebuilt."
+                ))
+            error.run()
+            error.destroy()
+
+    def on_button_feed_rebuild_clicked(self, widget):
+        """
+        Rebuild feed cache requested
+        @param widget: GTK-Widget
+        """
+        #We need the user to confirm the rebuild feed cache request
+        dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING,
+            gtk.BUTTONS_OK_CANCEL,
+            _("This will completely remove any feed entries in the cache!"))
+        status = dialog.run()
+        #If user has ok'd the request send the message to the message bus
+        if(status == gtk.RESPONSE_OK):
+            try:
+                proxy = MessageBusProxy(client_name = "Manager GUI")
+                proxy.connectToMessageBus()
+                proxy.sendMessage(Message(MessageType.REBUILD_FEED_CACHE))
+                proxy.disconnectFromMessageBus()
+            except socket.error:
+                error = gtk.MessageDialog(
+                    None, gtk.DIALOG_MODAL,
+                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
+                        "Entertainer backend is not running. "
+                        "Cache cannot be rebuilt."
+                    ))
+                error.run()
+                error.destroy()
+
+        dialog.destroy()
+
+    def on_theme_add_button_clicked(self, widget):
+        """Add theme button clicked"""
+        themelist = self.builder.get_object("theme_list")
+        model = themelist.get_model()
+        # Open "Select folder" dialog
+        dialog = gtk.FileChooserDialog(_("Select theme package file"),
+            None, gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL,
+            gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK), None)
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("Theme package (tar.gz)"))
+        file_filter.add_pattern("*.tar.gz")
+        dialog.add_filter(file_filter)
+        status = dialog.run()
+
+        # If theme was selected with file chooser
+        if(status == gtk.RESPONSE_OK):
+            package = dialog.get_filename()
+            tar = tarfile.open(package, 'r:gz') # Open tar.gz package
+
+            # Make sure that package contains configuration file (is theme)
+            content = tar.getnames()
+            theme_name = None
+            is_theme = False
+            for element in content:
+                if element[-10:] == "theme.conf":
+                    theme_name = element[:-11]
+                    is_theme = True
+
+            # Install them
+            if is_theme:
+                tar.extractall(os.path.join(self.config.data_dir, 'themes'))
+                model.insert(len(model), [theme_name])
+            else:
+                error = gtk.MessageDialog(None, gtk.DIALOG_MODAL,
+                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _("Invalid theme file!"))
+                error.run()
+                error.destroy()
+
+        dialog.destroy()
+
+    def on_theme_list_cursor_changed(self, widget):
+        """Executed when theme is changed in theme list. Update preview."""
+        # Get currently selected theme
+        themelist = self.builder.get_object("theme_list")
+        model = themelist.get_model()
+        selection = themelist.get_selection().get_selected()
+        name = model.get_value(selection[1], 0)
+        themedir = os.path.join(self.config.data_dir, 'themes', name)
+        theme = Theme(theme_path=themedir)
+
+        # Update preview
+        image = self.builder.get_object("theme_image")
+        image.set_from_file(os.path.join(themedir, "thumbnail.png"))
+        name = self.builder.get_object("name_label")
+        name.set_text(theme.getName())
+        author = self.builder.get_object("author_label")
+        author.set_text(theme.getAuthor())
+        license_label = self.builder.get_object("license_label")
+        license_label.set_text(theme.getLicence())
+        copyright_label = self.builder.get_object("copyright_label")
+        copyright_label.set_text(theme.getCopyright())
+        comment = self.builder.get_object("comment_label")
+        comment.set_text(theme.getComment())
+
+        self.config.write_content_value("General", "theme", name.get_text())
+
+    def on_theme_remove_button_clicked(self, widget):
+        """Remove theme button clicked"""
+        # Get currently selected theme
+        themelist = self.builder.get_object("theme_list")
+        model = themelist.get_model()
+        selection = themelist.get_selection().get_selected()
+        name = model.get_value(selection[1], 0)
+
+        confirm = gtk.MessageDialog(None,
+            gtk.DIALOG_MODAL, gtk.MESSAGE_QUESTION, gtk.BUTTONS_YES_NO,
+                _("Are you sure you want to delete\ntheme: %(name)s") % \
+                {'name': name})
+        status = confirm.run()
+        confirm.destroy()
+        if(status == gtk.RESPONSE_YES):
+            themedir = os.path.join(self.config.data_dir, 'themes', name)
+            shutil.rmtree(themedir)
+            model.remove(selection[1])
+            themelist.set_cursor(0)
+            self.themes.remove(name)
+
+    def on_checkbutton_effects_toggled(self, widget):
+        """Effect checkbox toggled"""
+        combobox = self.builder.get_object("combobox_effects")
+        combobox.set_sensitive(widget.get_active())
+        self.config.write_content_value("General", "show_effects",
+            widget.get_active())
+
+    def on_combobox_effects_changed(self, widget):
+        """User changed effect for screen transitions"""
+        text = widget.get_active_text()
+        if text == _("No effect"):
+            english_text = "No effect"
+        if text == _("Crossfade"):
+            english_text = "Crossfade"
+        if text == _("Zoom and fade"):
+            english_text = "Zoom and fade"
+        if text == _("Slide"):
+            english_text = "Slide"
+        self.config.write_content_value("General", "transition_effect",
+            english_text)
+
+    def init_dialog_values_from_configure_file(self):
+        """Read configuration and set dialog widget values with read values.
+        """
+        # == Videos ==
+        medialist_widget = self.builder.get_object("treeview_media")
+        mediastore = gtk.ListStore(str)
+
+        cell_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn(_("Folders"), cell_renderer, text=0)
+        medialist_widget.append_column(column)
+
+        self.media_folders = self.config.media_folders
+
+        # Fill model with folders read from config file
+        self.init_model(mediastore, self.media_folders)
+
+        medialist_widget.set_model(mediastore)
+
+        # Checkboxes
+        metadata_checkbox = self.builder.get_object("video_metadata_checkbox")
+        metadata_checkbox.set_active(self.config.download_metadata)
+
+        art_checkbox = self.builder.get_object("art_checkbox")
+        art_checkbox.set_active(self.config.download_album_art)
+
+        lyrics_checkbox = self.builder.get_object("lyrics_checkbox")
+        lyrics_checkbox.set_active(self.config.download_lyrics)
+
+        # == RSS-feeds ==
+        feedlist_widget = self.builder.get_object("treeview_feeds")
+        feed_model = gtk.ListStore(str)
+
+        rss_cell = gtk.CellRendererText()
+        rss_column = gtk.TreeViewColumn(_("Feeds"), rss_cell, text=0)
+        feedlist_widget.append_column(rss_column)
+
+        self.feeds = self.config.feeds
+
+        # Fill model with folders read from config file
+        for i in range(len(self.feeds)):
+            feed_model.insert(i, [self.feeds[i]])
+
+        feedlist_widget.set_model(feed_model)
+
+        # Interval spinner
+        interval_spinner = self.builder.get_object("fetch_interval_spinbutton")
+        interval_val = self.config.feed_fetch_interval
+        if interval_val < 15:
+            interval_val = 15
+        elif interval_val > 900:
+            interval_val = 900
+        interval_spinner.set_value(interval_val)
+
+        # == Weather ==
+        locationlist_widget = self.builder.get_object("treeview_locations")
+        location_model = gtk.ListStore(str)
+
+        loc_cell = gtk.CellRendererText()
+        location_column = gtk.TreeViewColumn(_("Location"), loc_cell, text=0)
+        locationlist_widget.append_column(location_column)
+
+        self.weather_location = self.config.weather_location
+
+        # Fill model with location read from config file
+        location_model.insert(0, [self.weather_location])
+        locationlist_widget.set_model(location_model)
+
+        weather_display_checkbox = self.builder.get_object(
+            "weather_display_checkbox")
+        display_val = self.config.display_weather_in_client
+        weather_display_checkbox.set_active(display_val)
+        if not display_val:
+            self.builder.get_object("button_add_weather").set_sensitive(False)
+            self.builder.get_object("button_remove_weather").set_sensitive(
+                False)
+            self.builder.get_object("treeview_locations").set_sensitive(False)
+
+        # == User Interface ==
+        self.load_themes()
+        current_theme = self.config.theme_name
+
+        themelist_widget = self.builder.get_object("theme_list")
+        model = gtk.ListStore(str)
+
+        cell_renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn("Themes", cell_renderer, text=0)
+        themelist_widget.append_column(column)
+
+        # Fill model with installed themes
+        for i in range(len(self.themes)):
+            model.insert(i, [self.themes[i]])
+
+        themelist_widget.set_model(model)
+
+        # Set current theme selected in theme list
+        index = model.get_iter_first()
+        unselected = True
+        index_counter = 0
+        while(unselected):
+            name = model.get_value(index, 0)
+            if name == current_theme:
+                unselected = False
+                themelist_widget.set_cursor(index_counter)
+            index = model.iter_next(index)
+            index_counter += 1
+
+        effect_checkbox = self.builder.get_object("checkbutton_effects")
+        effect_combobox = self.builder.get_object("combobox_effects")
+        if self.config.show_effects:
+            effect_checkbox.set_active(True)
+            effect_combobox.set_sensitive(True)
+        else:
+            effect_checkbox.set_active(False)
+            effect_combobox.set_sensitive(False)
+
+        # Set Effect Combobox value (Text values are set in ui file)
+        effect = self.config.transition_effect
+        if effect == "No effect":
+            effect_combobox.set_active(0)
+        if effect == "Crossfade":
+            effect_combobox.set_active(1)
+        if effect == "Zoom and fade":
+            effect_combobox.set_active(2)
+        if effect == "Slide":
+            effect_combobox.set_active(3)
+
+        # == General ==
+        checkbutton_fullscreen = self.builder.get_object(
+            "checkbutton_fullscreen")
+        if self.config.start_in_fullscreen:
+            checkbutton_fullscreen.set_active(True)
+        else:
+            checkbutton_fullscreen.set_active(False)
+
+        checkbutton_autostart = self.builder.get_object("checkbutton_autostart")
+        if self.config.start_auto_server:
+            checkbutton_autostart.set_active(True)
+        else:
+            checkbutton_autostart.set_active(False)
+
+        checkbutton_systray_icon = self.builder.get_object(
+            "checkbutton_systray_icon")
+        if self.config.tray_icon_enabled:
+            checkbutton_systray_icon.set_active(True)
+        else:
+            checkbutton_systray_icon.set_active(False)
+
+        spinbutton_slideshow_step = self.builder.get_object(
+            "spinbutton_slideshow_step")
+        spinbutton_slideshow_step.set_value(self.config.slideshow_step)
+
+    def add_to_model_and_config(self, selected_folder, model, folders, kind):
+        """
+        Add selected_folder to the model and the folders list while updating
+        the configuration item section specified by type
+        """
+        if not selected_folder in folders:
+            model.append([selected_folder])
+
+            if(folders == None):
+                folders = [selected_folder]
+            else:
+                folders.append(selected_folder)
+
+            if "" in folders:
+                folders.remove("")
+            str_folders = ";".join(folders)
+            self.config.write_content_value(kind, "folders", str_folders)
+
+    def init_model(self, model, items):
+        """Fill model with items from supplied list"""
+        for i in range(len(items)):
+            if not str(items[i]).strip() == "":
+                model.insert(i, [items[i]])
+
+    def load_themes(self):
+        """Load themes"""
+        themes = os.listdir(os.path.join(self.config.data_dir, 'themes'))
+        for element in themes:
+            theme = os.path.join(self.config.data_dir, 'themes', element)
+            if os.path.isdir(theme):
+                self.themes.append(element)
+
+
+class LogViewer:
+    """
+    Implements dialog that allows user to see logged events.
+
+    This dialog is used to check Entertainer logfiles. It reads all data from
+    selected file and saves rows to self.log_rows. Then it filters unwanted
+    rows away by calling self.filterMessages(). This method adds rows to
+    ListStore, which is the model of TreeView object.
+
+    Combobox and refresh -button actions read files again
+    Checkbox actions just filter current rows again
+    """
+
+    UI_DIR = os.path.join(os.path.dirname(__file__), "uis")
+
+    # Is this dialog running as a stand alone process
+    __STAND_ALONE = None
+
+    widgets = None
+    dialog = None
+    log_store = None
+    log_rows = []
+
+    def __init__(self, stand_alone):
+        self.logfile_entertainer = Configuration().LOG
+        self.logger = Logger().getLogger('utils.log_viewer')
+
+        self.__STAND_ALONE = stand_alone
+        try:
+            uifile = os.path.join(self.UI_DIR, "log_dialog.ui")
+            self.builder = gtk.Builder()
+            self.builder.set_translation_domain('entertainer')
+            self.builder.add_from_file(uifile)
+        except RuntimeError:
+            self.logger.critical("Couldn't open ui file: " + uifile)
+            sys.exit(1)
+        callback_dic = {
+            "on_close_log_button_clicked" : self.on_close_log_button_clicked,
+            "on_log_refresh_button_clicked" : self.update_log_rows,
+            "on_checkbutton_debug_toggled" : self.filter_messages,
+            "on_checkbutton_critical_toggled" : self.filter_messages,
+            "on_checkbutton_error_toggled" : self.filter_messages,
+            "on_checkbutton_warning_toggled" : self.filter_messages,
+            "on_checkbutton_info_toggled" : self.filter_messages }
+
+        self.builder.connect_signals(callback_dic)
+
+        # Create log treeview
+        treeview = self.builder.get_object("treeview_log")
+        cell_renderer1 = gtk.CellRendererText()
+        cell_renderer2 = gtk.CellRendererText()
+        cell_renderer3 = gtk.CellRendererText()
+        cell_renderer4 = gtk.CellRendererText()
+
+        column1 = gtk.TreeViewColumn("Date")
+        column1.pack_start(cell_renderer1, True)
+        column1.set_attributes(cell_renderer1, text = 0)
+
+        column2 = gtk.TreeViewColumn("Time")
+        column2.pack_start(cell_renderer2, True)
+        column2.set_attributes(cell_renderer2, text = 1)
+
+        column3 = gtk.TreeViewColumn("Type")
+        column3.pack_start(cell_renderer3, True)
+        column3.set_attributes(cell_renderer3, text = 2)
+
+        column4 = gtk.TreeViewColumn("Message")
+        column4.pack_end(cell_renderer4, True)
+        column4.set_attributes(cell_renderer4, text = 3)
+
+        treeview.append_column(column1)
+        treeview.append_column(column2)
+        treeview.append_column(column3)
+        treeview.append_column(column4)
+        treeview.set_headers_visible(True)
+
+        # Set model to view and read data from logfile
+        self.log_store = gtk.ListStore(str, str, str, str)
+        treeview.set_model(self.log_store)
+        self.update_log_rows()
+
+        # Show Log viewer dialog
+        self.dialog = self.builder.get_object("LogDialog")
+        self.dialog.resize(750, 500)
+        self.dialog.connect("destroy", self.on_close_log_button_clicked)
+        self.dialog.show()
+
+    def update_log_rows(self, widget=None):
+        """Read logfile and udpate treeview"""
+        self.log_rows[:] = []
+
+        try:
+            for line in open(self.logfile_entertainer, 'r'):
+                try:
+                    line_table = line.split()
+                    message = ' '.join(line_table[3:])
+                    row = line_table[:3] + [message]
+                    parsed_row = parse_row(row)
+                    self.log_rows.append(parsed_row)
+                except IndexError:
+                    print "Cannot parse log line: ", line
+        except IOError:
+            print "Cannot find logfile: ", self.logfile_entertainer
+
+        # Reverse so that the latest message is at top
+        self.log_rows.reverse()
+        # Filter unwated message types
+        self.filter_messages()
+
+    def filter_messages(self, widget = None):
+        """Checks which message types should be displayed on treeview"""
+        if self.log_store:
+            self.log_store.clear()
+
+        debug = self.builder.get_object("checkbutton_debug").get_active()
+        critical = self.builder.get_object("checkbutton_critical").get_active()
+        error = self.builder.get_object("checkbutton_error").get_active()
+        warning = self.builder.get_object("checkbutton_warning").get_active()
+        info = self.builder.get_object("checkbutton_info").get_active()
+
+        for element in self.log_rows:
+            if element[2] == "DEBUG" and debug:
+                self.log_store.append(element)
+            elif element[2] == "CRITICAL" and critical:
+                self.log_store.append(element)
+            elif element[2] == "ERROR" and error:
+                self.log_store.append(element)
+            elif element[2] == "WARNING" and warning:
+                self.log_store.append(element)
+            elif element[2] == "INFO" and info:
+                self.log_store.append(element)
+
+    # Signal handlers
+    def on_close_log_button_clicked(self, widget):
+        """
+        If running as a stand alone process, quit.
+        Otherwise only destroy dialog.
+        """
+        self.dialog.hide()
+        self.dialog.destroy()
+        if(self.__STAND_ALONE):
+            gtk.main_quit()
+
+
+def parse_row(row):
+    """
+    This parses the input list into a list suitable for the logviewer
+    @author Joshua Scotton
+    @param row The input list [Date, Time, Class, Type + Description]
+    """
+    if row[3][:5] == "DEBUG":
+        return [row[0], row[1], "DEBUG",
+            row[2] + ": " + row[3][5:]]
+    elif row[3][:8] == "CRITICAL":
+        return [row[0], row[1], "CRITICAL",
+            row[2] + ": " + row[3][8:]]
+    elif row[3][:5] == "ERROR":
+        return [row[0], row[1], "ERROR",
+            row[2] + ": " + row[3][5:]]
+    elif row[3][:7] == "WARNING":
+        return [row[0], row[1], "WARNING",
+            row[2] + ": " + row[3][7:]]
+    elif row[3][:4] == "INFO":
+        return [row[0], row[1], "INFO",
+            row[2] + ": " + row[3][4:]]
+
+
+class OpenFeedSourceDialog:
+    '''Feed source reader dialog'''
+
+    UI_DIR = os.path.join(os.path.dirname(__file__), "uis")
+
+    widgets = None
+    dialog = None
+    tree_widget = None
+    feeds = None
+    url = None
+
+    def __init__(self, the_widget, the_feeds):
+        """initialises the gtk window and displays it"""
+
+        #feeds is a pointer to a list of feeds from the config file
+        self.feeds = the_feeds
+
+        #needed so we can add feeds to the feed list widget
+        self.tree_widget = the_widget
+
+        # Load UI with gtk.Builder
+        uifile = os.path.join(self.UI_DIR, "open_feed_source_dialog.ui")
+        self.builder = gtk.Builder()
+        self.builder.set_translation_domain('entertainer')
+        self.builder.add_from_file(uifile)
+
+        # Get content management dialog and bind signal callbacks
+        self.dialog = self.builder.get_object("open_source_dialog")
+        if (self.dialog):
+            callback_dic = {
+                "on_fileOpen_clicked" : self.on_fileOpen_clicked,
+                "on_lifereaButton_clicked" : self.on_lifereaButton_clicked,
+                "on_enterURL_clicked" : self.on_enterURL_clicked,
+                "on_closeButton_clicked" : self.on_closeButton_clicked,
+                "on_url_dialog_ok_button_clicked" :
+                    self.on_url_dialog_ok_button_clicked,
+                "on_url_dialog_cancel_button_clicked" :
+                    self.on_url_dialog_cancel_button_clicked,
+                "on_url_dialog_delete_event" : self.on_url_dialog_delete_event,
+                "on_destroy" : self.on_closeButton_clicked
+                 }
+
+        self.builder.connect_signals(callback_dic)
+
+        # Initilize dialog widgets with correct values and show dialog
+        self.dialog.resize(300, 200)
+        self.dialog.run()
+
+    def on_fileOpen_clicked(self, widget):
+        """Opens add file dialog and then adds all feeds in the opml file
+        selected """
+
+        #get the model for the feed list widget so we can add the new feeds
+        model = self.tree_widget.get_model()
+
+        #create select file dialog
+        dialog = gtk.FileChooserDialog(_("Select OPML file"), None,
+            gtk.FILE_CHOOSER_ACTION_OPEN,
+            (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
+                gtk.RESPONSE_OK))
+
+        #set dialog up to filter for only opml files
+        file_filter = gtk.FileFilter()
+        file_filter.set_name(_("OPML files"))
+        file_filter.add_pattern("*.opml")
+        dialog.add_filter(file_filter)
+
+        #set dialog up to allow multiple selections
+        dialog.set_select_multiple(True)
+
+        #run the dialog
+        status = dialog.run()
+
+        # if file was selected, get list of feeds from it and add to
+        #model and update config file
+        if(status == gtk.RESPONSE_OK):
+            FeedConfigTools().add_file_feeds_to_widget(
+                dialog.get_filenames(), model, self.feeds)
+        dialog.destroy()
+
+    def on_lifereaButton_clicked(self, widget):
+        """Adds any liferea feeds it finds to the feed widget and config file
+        """
+        #get the model
+        model = self.tree_widget.get_model()
+        #get the liferea feeds and then send everything to the
+        #add_file_feeds_to_widget method
+        FeedConfigTools().add_file_feeds_to_widget(
+            [OPMLParser().get_liferea_opml()], model, self.feeds)
+
+    def on_enterURL_clicked(self, widget):
+        """gets a opml file link from a user and adds any feeds it finds to the
+        feed widget and config file"""
+        url_dialog = self.builder.get_object("url_dialog")
+        model = self.tree_widget.get_model()
+        # Open dialog
+        url_dialog.set_title(_("Add OPML File"))
+        status = url_dialog.run()
+        # If folder was selected we add it to model and update config file
+        if(status == gtk.RESPONSE_OK):
+            FeedConfigTools().add_file_feeds_to_widget([self.url],
+                model, self.feeds)
+
+    def on_closeButton_clicked(self, widget):
+        self.dialog.hide()
+        self.dialog.destroy()
+
+    def on_url_dialog_ok_button_clicked(self, widget):
+        """URL dialog OK button pressed. Sets self.url"""
+        url_dialog = self.builder.get_object("url_dialog")
+        url_entry = self.builder.get_object("url_entry")
+        url_dialog.hide()
+        self.url = url_entry.get_text()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_OK)
+
+    def on_url_dialog_cancel_button_clicked(self, widget):
+        """URL dialog cancelled. Hides dialog"""
+        url_dialog = self.builder.get_object("url_dialog")
+        url_entry = self.builder.get_object("url_entry")
+        url_dialog.hide()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_CANCEL)
+
+    def on_url_dialog_delete_event(self, widget, data):
+        """Dialog's X clicked. Hides dialog"""
+        url_dialog = self.builder.get_object("url_dialog")
+        url_entry = self.builder.get_object("url_entry")
+        url_dialog.hide()
+        url_entry.set_text("")
+        url_dialog.response(gtk.RESPONSE_CANCEL)
+        return True
+
+
 
=== added file 'entertainerlib/download.py'
--- entertainerlib/download.py	1970-01-01 00:00:00 +0000
+++ entertainerlib/download.py	2010-01-23 03:34:11 +0000
@@ -0,0 +1,455 @@
+# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
+'''Downloader classes.'''
+
+import locale
+import os
+import re
+import socket
+import threading
+import urllib
+from xml.dom import minidom
+
+import gobject
+
+# Amazon licence for Entertainer
+LICENSE_KEY = "1YCWYZ0SPPAJ27YZZ482"
+DEFAULT_LOCALE = "en_US"
+ASSOCIATE = "webservices-20"
+
+# We are not allowed to batch more than 2 requests at once
+# http://docs.amazonwebservices.com/AWSEcommerceService/4-0/
+# PgCombiningOperations.html
+MAX_BATCH_JOBS = 2
+
+
+class AlbumArtDownloader(threading.Thread):
+    """
+    Search and download album art from the internet.
+
+    This class is heavily based on Rhythmbox - AlbumArt plugin's class
+    'AmazonCoverArtSearch'. That plugin is released under GPLv2 (or higher)
+    and it's copyrights belong to Gareth Murphy and Martin Szulecki.
+
+    See more: http://www.gnome.org/projects/rhythmbox/
+
+    If you want better cover search, please contribute to Rhyhtmbox project.
+    """
+
+    def __init__(self, album, artist, art_file_path, callback = None):
+        """
+        Initialize album art downloader
+        @param album: Album title
+        @param artist: Artist name
+        @param art_file_path: Path where albumart is saved
+        @param callback: Callback function that is called after search if set
+        """
+        threading.Thread.__init__(self)
+        self.setName("AlbumArt Downloader")
+        self.callback_function = callback        # Callback function
+        self.album = album                       # Album title
+        self.artist = artist                     # Artist name
+        # Album art files are in this directory
+        self.path = art_file_path
+        (self.tld, self.encoding) = self.__get_locale ()
+
+    def run(self):
+        """Start searching and downloading albumart."""
+        self.search()
+
+    def __get_locale (self):
+        '''Get locale information from user\'s machine'''
+        # "JP is the only locale that correctly takes UTF8 input.
+        # All other locales use LATIN1."
+        # http://developer.amazonwebservices.com/connect/
+        # entry.jspa?externalID=1295&categoryID=117
+        supported_locales = {
+            "en_US" : ("com", "latin1"),
+            "en_GB" : ("co.uk", "latin1"),
+            "de" : ("de", "latin1"),
+            "ja" : ("jp", "utf8")
+        }
+
+        lc_id = DEFAULT_LOCALE
+        default = locale.getdefaultlocale ()[0]
+        if default:
+            if supported_locales.has_key (default):
+                lc_id = default
+            else:
+                lang = default.split("_")[0]
+                if supported_locales.has_key (lang):
+                    lc_id = lang
+
+        return supported_locales[lc_id]
+
+    def __valid_match (self, item):
+        '''Determine if item matches tag criteria'''
+        return (hasattr (item, "LargeImage") or hasattr (item, "MediumImage")) \
+               and hasattr (item, "ItemAttributes")
+
+    def __tidy_up_string (self, str_input):
+        """
+        Tidy up string. Remove spaces, convert to lowercase and replace chars.
+        """
+        # Lowercase
+        str_input = str_input.lower ()
+        # Strip
+        str_input = str_input.strip ()
+
+        # TODO: Convert accented to unaccented
+        str_input = str_input.replace (" - ", " ")
+        str_input = str_input.replace (": ", " ")
+        str_input = str_input.replace (" & ", " and ")
+
+        return str_input
+
+    def search(self):
+        """Search album art from Amazon"""
+        self.searching = True
+        self.cancel = False
+        self.keywords = []
+
+        st_artist = self.artist or u'Unknown'
+        st_album = self.album or u'Unknown'
+
+        if st_artist == st_album == u'Unknown':
+            self.on_search_completed (None)
+            return
+
+        # Tidy up
+
+        # Replace quote characters
+        # don't replace single quote: could be important punctuation
+        for char in ["\""]:
+            st_artist = st_artist.replace (char, '')
+            st_album = st_album.replace (char, '')
+
+
+        self.st_album = st_album
+        self.st_artist = st_artist
+
+        # Remove variants of Disc/CD [1-9] from album title before search
+        for exp in ["\([Dd]isc *[1-9]+\)", "\([Cc][Dd] *[1-9]+\)"]:
+            p = re.compile (exp)
+            st_album = p.sub ('', st_album)
+
+        st_album_no_vol = st_album
+        for exp in ["\(*[Vv]ol.*[1-9]+\)*"]:
+            p = re.compile (exp)
+            st_album_no_vol = p.sub ('', st_album_no_vol)
+
+        self.st_album_no_vol = st_album_no_vol
+
+        # Save current search's entry properties
+        self.search_album = st_album
+        self.search_artist = st_artist
+        self.search_album_no_vol = st_album_no_vol
+
+        # TODO: Improve to decrease wrong cover downloads, maybe add severity?
+        # Assemble list of search keywords (and thus search queries)
+        if st_album == u'Unknown':
+            self.keywords.append ("%s Best of" % (st_artist))
+            self.keywords.append ("%s Greatest Hits" % (st_artist))
+            self.keywords.append ("%s Essential" % (st_artist))
+            self.keywords.append ("%s Collection" % (st_artist))
+            self.keywords.append ("%s" % (st_artist))
+        elif st_artist == u'Unknown':
+            self.keywords.append ("%s" % (st_album))
+            if st_album_no_vol != st_artist:
+                self.keywords.append ("%s" % (st_album_no_vol))
+            self.keywords.append ("Various %s" % (st_album))
+        else:
+            if st_album != st_artist:
+                self.keywords.append ("%s %s" % (st_artist, st_album))
+                if st_album_no_vol != st_album:
+                    self.keywords.append ("%s %s" %
+                        (st_artist, st_album_no_vol))
+                self.keywords.append ("Various %s" % (st_album))
+            self.keywords.append ("%s" % (st_artist))
+
+        # Initiate asynchronous search
+        self.search_next ()
+
+    def search_next(self):
+        """Search again, because the last one didn't find any covers."""
+        if len (self.keywords) == 0:
+            # No keywords left to search -> no results
+            self.on_search_completed (None)
+            return False
+
+        self.searching = True
+
+        url = "http://ecs.amazonaws." + self.tld + "/onca/xml" \
+              "?Service=AWSECommerceService"                   \
+              "&AWSAccessKeyId=" + LICENSE_KEY +               \
+              "&AssociateTag=" + ASSOCIATE +                   \
+              "&ResponseGroup=Images,ItemAttributes"           \
+              "&Operation=ItemSearch"                          \
+              "&ItemSearch.Shared.SearchIndex=Music"
+
+        job = 1
+        while job <= MAX_BATCH_JOBS and len (self.keywords) > 0:
+            keyword = self.keywords.pop (0)
+            keyword = keyword.encode (self.encoding, "ignore")
+            keyword = keyword.strip ()
+            keyword = urllib.quote (keyword)
+            url += "&ItemSearch.%d.Keywords=%s" % (job, keyword)
+            job += 1
+
+        # Retrieve search for keyword
+        temp = urllib.urlopen(url)
+        search_results = temp.read()
+        self.on_search_response(search_results)
+        return True
+
+    def __unmarshal(self, element):
+        rc = object()
+        child_elements = [e for e in element.childNodes if isinstance (e,
+            minidom.Element)]
+        if child_elements:
+            for child in child_elements:
+                key = child.tagName
+                if hasattr (rc, key):
+                    if not isinstance (getattr (rc, key), list):
+                        setattr (rc, key, [getattr (rc, key)])
+                    getattr (rc, key).append (self.__unmarshal (child))
+                # get_best_match_urls() wants a list, even if there is only
+                # one item/artist
+                elif child.tagName in ("Items", "Item", "Artist"):
+                    setattr (rc, key, [self.__unmarshal(child)])
+                else:
+                    setattr (rc, key, self.__unmarshal(child))
+        else:
+            rc = "".join ([e.data for e in element.childNodes if isinstance (e,
+                minidom.Text)])
+        return rc
+
+    def on_search_response (self, result_data):
+        '''Check search results
+
+        If results are not good, we search again with the next keyword.
+        '''
+        if result_data is None:
+            self.search_next()
+            return
+
+        try:
+            xmldoc = minidom.parseString(result_data)
+        except (TypeError, AttributeError):
+            self.search_next()
+            return
+
+        data = self.__unmarshal (xmldoc)
+        if not hasattr (data, "ItemSearchResponse") or \
+           not hasattr (data.ItemSearchResponse, "Items"):
+            # Something went wrong ...
+            self.search_next ()
+        else:
+            # We got some search results
+            self.on_search_results (data.ItemSearchResponse.Items)
+
+    def on_search_results (self, results):
+        '''Results were found, now we need to take action.'''
+        self.on_search_completed (results)
+
+    def on_search_completed (self, result):
+        """
+        Search completed and results found.
+
+        Download large album art image from the first result and save it to
+        the disk. This function diverges greatly from the rhythmbox
+        implementation in order to avoid their loader and CoverArtDatabase
+        """
+        self.searching = False
+        image_urls = self.get_best_match_urls(result)
+        if len(image_urls) == 0:
+            return
+        image_url = image_urls[0]
+        image_file = urllib.urlopen(image_url)
+        # base64 encode artist and album so there can be a '/' in the artist
+        # or album
+        artist_album = self.artist + " - " + self.album
+        artist_album = artist_album.encode("base64")
+
+        dest = open(os.path.join(self.path, artist_album + ".jpg"),'w')
+        dest.write(image_file.read())
+        dest.close()
+
+        if self.callback_function is not None:
+            self.callback_function(self.artist, self.album)
+
+    def get_best_match_urls (self, search_results):
+        """Return tuple of URL's to large and medium cover of the best match"""
+        # Default to "no match", our results must match our criteria
+
+        # This code comes from Rhythmbox so we can't control the use of 'filter'
+        # pylint: disable-msg=W0141
+
+        if not search_results:
+            return []
+
+        best_match = None
+
+        for result in search_results:
+            if not hasattr (result, "Item"):
+                # Search was unsuccessful, try next batch job
+                continue
+
+            items = filter(self.__valid_match, result.Item)
+            if self.search_album != u'Unknown':
+                album_check = self.__tidy_up_string (self.search_album)
+                for item in items:
+                    if not hasattr (item.ItemAttributes, "Title"):
+                        continue
+
+                    album = self.__tidy_up_string (item.ItemAttributes.Title)
+                    if album == album_check:
+                        # Found exact album, can not get better than that
+                        best_match = item
+                        break
+                    # If we already found a best_match, just keep checking for
+                    # exact one. Check the results for both an album name that
+                    # contains the name we're searching for, and an album name
+                    # that's a substring of the name we're searching for
+                    elif (best_match is None) and \
+                         (album.find (album_check) != -1 or
+                          album_check.find (album) != -1):
+                        best_match = item
+
+            # If we still have no definite hit, use first result where artist
+            # matches
+            if (self.search_album == u'Unknown' and \
+                self.search_artist != u'Unknown'):
+                artist_check = self.__tidy_up_string (self.search_artist)
+                if best_match is None:
+                    # Check if artist appears in the Artists list
+                    hit = False
+                    for item in items:
+                        if not hasattr (item.ItemAttributes, "Artist"):
+                            continue
+
+                        for artist in item.ItemAttributes.Artist:
+                            artist = self.__tidy_up_string (artist)
+                            if artist.find (artist_check) != -1:
+                                best_match = item
+                                hit = True
+                                break
+                        if hit:
+                            break
+
+            urls = [getattr (best_match, size).URL for size in ("LargeImage",
+                "MediumImage")
+                    if hasattr (best_match, size)]
+            if urls:
+                return urls
+
+        # No search was successful
+        return []
+
+
+class LyricsDownloader(object):
+    """
+    Search and download song lyrics from the internet.
+    Update music cache if lyrics found.
+    """
+
+    # The permanent user ID from Lyricsfly
+    # NOTICE: This is the personal user ID for Entertainer, if you want to
+    # experiment with the API from lyricsfly you can get an ID here =>
+    # http://lyricsfly.com/api/, don't use this one as abuse of our key may
+    # invalidate it.
+    _LYRICSFLY_KEY = 'YzIxOTM4M2NkNGQ4MmRmODEtZW50ZXJ0YWluZXItcHJvamVjdC5jb20='
+
+    def __init__(self, title, artist, callback):
+        """
+        Initialize lyrics downloader.
+        @param title: Title of the track
+        @param artist: Artist of the track
+        @param callback: Callback function which is called when search is over.
+                   lyrics are given as a parameter to this callback function.
+        """
+        self.title = title.lower()
+        self.artist = artist.lower()
+        self.callback = callback
+
+    def search(self):
+        """
+        Search lyrics and download if found. Search is done asynchronously.
+        This method returns immediately and set callback is called when search
+        is over.
+        """
+        gobject.timeout_add(2000, self._async_search)
+
+    def _async_search(self):
+        """
+        Search lyrics and download if found
+        """
+        lyrics = ""
+        self._clean_up_artist_title()
+        lyrics_xml = self._get_lyrics_xml()
+        if lyrics_xml is not None:
+            lyrics = self._parse_lyrics_xml(lyrics_xml)
+        self.callback(lyrics)
+
+    def _clean_up_artist_title(self):
+        """
+        Clean up the artist and title.
+        """
+        # Clean spaces
+        self.title = self.title.strip()
+        self.artist = self.artist.strip()
+
+        # Convert title and artist to use in url, special symbols have to be
+        # replaced by a '%' not '%xx'
+        # TODO: Find out what the special symbols are (', &, ...)
+        # not letters, digits, spaces and ()$^*=:;|#@}{][!,.-_\
+        self.artist = urllib.quote(self.artist.encode('utf-8'),
+                                   "'&()$^*=:;|#@}{][!,\\")
+        self.title = urllib.quote(self.title.encode('utf-8'),
+                                   "'&()$^*=:;|#@}{][!,\\")
+
+        self.artist = self.artist.replace("'", "%").replace("&", "%")
+        self.title = self.title.replace("'", "%").replace("&", "%")
+
+    def _get_lyrics_xml(self):
+        """
+        Download the lyrics XML-file.
+        """
+        lyrics_xml = None
+
+        # timeout in seconds
+        timeout = 5
+        socket.setdefaulttimeout(timeout)
+
+        url = "http://lyricsfly.com/api/api.php?i=%s&a=%s&t=%s" \
+            % (self._LYRICSFLY_KEY.decode('base64'), self.artist, self.title)
+        try:
+            temp = urllib.urlopen(url)
+            lyrics_xml = temp.read()
+        except IOError:
+            return None
+
+        return lyrics_xml
+
+    def _parse_lyrics_xml(self, lyrics_xml):
+        """Parse lyrics XML and return lyrics string"""
+        xmldoc = minidom.parseString(lyrics_xml).documentElement
+
+        # Get the lyric from the XML file
+        try:
+            lyrics = xmldoc.getElementsByTagName('tx')[0].firstChild.nodeValue
+        except IndexError:
+            return ''
+
+        # Clean spaces and enters
+        lyrics = lyrics.strip().replace('\n', '')
+        lyrics = lyrics.replace('[br]', '\n')
+
+        # Add the artist and title to the top of the lyric
+        lyrics = xmldoc.getElementsByTagName('ar')[0].firstChild.nodeValue + \
+        ' - ' + xmldoc.getElementsByTagName('tt')[0].firstChild.nodeValue + \
+        '\n\n' + lyrics
+
+        xmldoc.unlink()
+
+        return lyrics
+
 
=== renamed directory 'entertainerlib/frontend/gui' => 'entertainerlib/gui'
=== modified file 'entertainerlib/gui/screen_history.py'
--- entertainerlib/frontend/gui/screen_history.py	2009-06-03 01:54:03 +0000
+++ entertainerlib/gui/screen_history.py	2010-01-23 03:34:11 +0000
@@ -1,7 +1,7 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Stack container for screen objects'''
 
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.configuration import Configuration
 
 class ScreenHistory(object):
     '''ScreenHistory contains the latest screens in is a stack.'''
@@ -13,7 +13,7 @@
 
     def add_screen(self, screen):
         '''Push the provided screen onto the history stack.'''
-        if len(self.screens) < self.config.history_size():
+        if len(self.screens) < self.config.history_size:
             self.screens.append(screen)
         else:
             self.remove_from_stage_callback(self.screens[0])
 
=== modified file 'entertainerlib/gui/screens/album.py'
--- entertainerlib/frontend/gui/screens/album.py	2009-07-14 10:46:47 +0000
+++ entertainerlib/gui/screens/album.py	2010-01-23 03:34:11 +0000
@@ -5,12 +5,11 @@
 import clutter
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
-    EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import EyeCandyTexture
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.text_menu import TextMenu
 
 class Album(Screen):
     '''Screen that allows user to browse and play tracks of the music album.'''
 
=== modified file 'entertainerlib/gui/screens/artist.py'
--- entertainerlib/frontend/gui/screens/artist.py	2009-05-12 17:18:10 +0000
+++ entertainerlib/gui/screens/artist.py	2010-01-23 03:34:11 +0000
@@ -3,11 +3,11 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.tabs.albums_tab import AlbumsTab
-from entertainerlib.frontend.gui.tabs.tracks_tab import TracksTab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.medialibrary.playlist import Playlist
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.albums_tab import AlbumsTab
+from entertainerlib.gui.tabs.tracks_tab import TracksTab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.client.medialibrary.playlist import Playlist
 
 class Artist(Screen):
     '''Screen that allows user to browse music by artist.'''
 
=== modified file 'entertainerlib/gui/screens/audio_play.py'
--- entertainerlib/frontend/gui/screens/audio_play.py	2009-05-28 20:23:17 +0000
+++ entertainerlib/gui/screens/audio_play.py	2010-01-23 03:34:11 +0000
@@ -5,10 +5,10 @@
 import gtk
 import clutter
 
-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.widgets.eyecandy_texture import (
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.lyrics_tab import LyricsTab
+from entertainerlib.gui.tabs.playing_tab import PlayingTab
+from entertainerlib.gui.widgets.eyecandy_texture import (
     EyeCandyTexture)
 
 class AudioPlay(Screen):
 
=== modified file 'entertainerlib/gui/screens/disc.py'
--- entertainerlib/frontend/gui/screens/disc.py	2009-07-19 20:23:56 +0000
+++ entertainerlib/gui/screens/disc.py	2010-01-23 03:34:11 +0000
@@ -9,17 +9,15 @@
 import pango
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
-    EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
-    LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.medialibrary.playlist import Playlist
-from entertainerlib.utils.albumart_downloader import AlbumArtDownloader
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import EyeCandyTexture
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import LoadingAnimation
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.client.medialibrary.playlist import Playlist
+from entertainerlib.download import AlbumArtDownloader
 
 class Disc(Screen):
     '''Screen allows user to play tracks from the current Audio CD.'''
 
=== modified file 'entertainerlib/gui/screens/factory.py'
--- entertainerlib/frontend/gui/screens/factory.py	2009-06-02 01:16:03 +0000
+++ entertainerlib/gui/screens/factory.py	2010-01-23 03:34:11 +0000
@@ -1,25 +1,26 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''ScreenFactory - Create correct screen based on the type provided.'''
 
-from entertainerlib.frontend.gui.screens.artist import Artist
-from entertainerlib.frontend.gui.screens.album import Album
-from entertainerlib.frontend.gui.screens.audio_play import AudioPlay
-from entertainerlib.frontend.gui.screens.disc import Disc
-from entertainerlib.frontend.gui.screens.feed import Feed
-from entertainerlib.frontend.gui.screens.feed_entry import FeedEntry
-from entertainerlib.frontend.gui.screens.main import Main
-from entertainerlib.frontend.gui.screens.movie import Movie
-from entertainerlib.frontend.gui.screens.music import Music
-from entertainerlib.frontend.gui.screens.photo import Photo
-from entertainerlib.frontend.gui.screens.photo_albums import PhotoAlbums
-from entertainerlib.frontend.gui.screens.photographs import Photographs
-from entertainerlib.frontend.gui.screens.question import Question
-from entertainerlib.frontend.gui.screens.rss import Rss
-from entertainerlib.frontend.gui.screens.tv_episodes import TvEpisodes
-from entertainerlib.frontend.gui.screens.tv_series import TvSeries
-from entertainerlib.frontend.gui.screens.video import Video
-from entertainerlib.frontend.gui.screens.video_osd import VideoOSD
-from entertainerlib.frontend.gui.screens.weather import WeatherScreen
+from entertainerlib.gui.screens.artist import Artist
+from entertainerlib.gui.screens.album import Album
+from entertainerlib.gui.screens.audio_play import AudioPlay
+from entertainerlib.gui.screens.disc import Disc
+from entertainerlib.gui.screens.feed import Feed
+from entertainerlib.gui.screens.feed_entry import FeedEntry
+from entertainerlib.gui.screens.main import Main
+from entertainerlib.gui.screens.movie import Movie
+from entertainerlib.gui.screens.music import Music
+from entertainerlib.gui.screens.photo import Photo
+from entertainerlib.gui.screens.photo_albums import PhotoAlbums
+from entertainerlib.gui.screens.photographs import Photographs
+from entertainerlib.gui.screens.question import Question
+from entertainerlib.gui.screens.rss import Rss
+from entertainerlib.gui.screens.tv_episodes import TvEpisodes
+from entertainerlib.gui.screens.tv_series import TvSeries
+from entertainerlib.gui.screens.video import Video
+from entertainerlib.gui.screens.video_osd import VideoOSD
+from entertainerlib.gui.screens.weather import WeatherScreen
+
 
 class ScreenFactory(object):
     '''Generate a screen based on the type provided.'''
 
=== modified file 'entertainerlib/gui/screens/feed.py'
--- entertainerlib/frontend/gui/screens/feed.py	2009-07-12 07:57:05 +0000
+++ entertainerlib/gui/screens/feed.py	2010-01-23 03:34:11 +0000
@@ -3,12 +3,12 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class Feed(Screen):
     '''Screen is displayed when headlines are accessed for a specific feed.'''
 
=== modified file 'entertainerlib/gui/screens/feed_entry.py'
--- entertainerlib/frontend/gui/screens/feed_entry.py	2009-06-25 18:56:15 +0000
+++ entertainerlib/gui/screens/feed_entry.py	2010-01-23 03:34:11 +0000
@@ -3,12 +3,12 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class FeedEntry(Screen):
     '''Screen displays one feed entry.'''
 
=== modified file 'entertainerlib/gui/screens/main.py'
--- entertainerlib/frontend/gui/screens/main.py	2009-07-19 19:27:31 +0000
+++ entertainerlib/gui/screens/main.py	2010-01-23 03:34:11 +0000
@@ -3,14 +3,13 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.clock_label import ClockLabel
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.scroll_menu import ScrollMenu
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.utils.cd_utils import eject_cd
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.clock_label import ClockLabel
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.scroll_menu import ScrollMenu
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class Main(Screen):
     '''Screen displayed when frontend is opened and provides main navigation.'''
@@ -76,12 +75,9 @@
         menu.add_item(_("Photographs"), "photo")
         menu.add_item(_("Headlines"), "rss")
 
-        if self.config.display_weather_in_frontend():
+        if self.config.display_weather_in_client:
             menu.add_item(_("Weather"), "weather")
 
-        if self.config.display_cd_eject_in_frontend():
-            menu.add_item(_("Eject CD"), "eject_cd")
-
         if self.media_player.has_media():
             menu.add_item(_("Playing now..."), "playing")
 
@@ -90,7 +86,7 @@
 
         # Menu position
         menu_clip = menu.visible_items * 70
-        menu_y = int((self.config.get_stage_height() - menu_clip + 10) / 2)
+        menu_y = int((self.config.stage_height - menu_clip + 10) / 2)
         menu.set_position(self.get_abs_x(0.75), menu_y)
 
         return menu
@@ -222,8 +218,8 @@
 
         # If the preview was updated fade it in.
         if update:
-            fade_in = clutter.Timeline(20, 60)
-            alpha_in = clutter.Alpha(fade_in, clutter.smoothstep_inc_func)
+            fade_in = clutter.Timeline(500)
+            alpha_in = clutter.Alpha(fade_in, clutter.EASE_IN_OUT_SINE)
             self.behaviour = clutter.BehaviourOpacity(0, 255, alpha_in)
             self.behaviour.apply(self.preview)
             fade_in.start()
@@ -288,8 +284,6 @@
             self.callback("video")
         elif item.get_name() == "weather":
             self.callback("weather")
-        elif item.get_name() == "eject_cd":
-            eject_cd()
         elif item.get_name() == "photo":
             self.callback("photo_albums")
         elif item.get_name() == "rss":
 
=== modified file 'entertainerlib/gui/screens/movie.py'
--- entertainerlib/frontend/gui/screens/movie.py	2009-07-21 22:22:53 +0000
+++ entertainerlib/gui/screens/movie.py	2010-01-23 03:34:11 +0000
@@ -5,14 +5,13 @@
 import gtk
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
-    EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.eyecandy_texture import EyeCandyTexture
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
 
 class Movie(Screen):
     '''Screen contains information of one movie.'''
@@ -85,10 +84,14 @@
 
         # Stars (rating)
         star = Texture(self.theme.getImage("star"))
+        star.hide()
+        self.add(star)
         star2 = Texture(self.theme.getImage("star2"))
+        star2.hide()
+        self.add(star2)
 
         for i in range(self.movie.get_rating()):
-            tex = clutter.CloneTexture(star)
+            tex = clutter.Clone(star)
             tex.set_position(
                 self.get_abs_x(0.47) + (self.get_abs_x(0.0366) * i),
                 self.get_abs_y(0.17))
@@ -97,7 +100,7 @@
 
         dark_star = 5 - self.movie.get_rating()
         for i in range(dark_star):
-            tex = clutter.CloneTexture(star2)
+            tex = clutter.Clone(star2)
             tex.set_position(self.get_abs_x(0.47) + (self.get_abs_x(0.0366) * \
                 (i+ self.movie.get_rating())), self.get_abs_y(0.17))
             tex.set_size(self.get_abs_x(0.024), self.get_abs_y(0.04))
 
=== modified file 'entertainerlib/gui/screens/music.py'
--- entertainerlib/frontend/gui/screens/music.py	2009-05-11 11:43:56 +0000
+++ entertainerlib/gui/screens/music.py	2010-01-23 03:34:11 +0000
@@ -1,12 +1,13 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Music - Screen allows user to select music he/she wants to listen'''
 
-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.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.medialibrary.playlist import Playlist
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.albums_tab import AlbumsTab
+from entertainerlib.gui.tabs.artists_tab import ArtistsTab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.client.medialibrary.playlist import Playlist
+
 
 class Music(Screen):
     '''Screen that allows user to browse music library content.'''
 
=== modified file 'entertainerlib/gui/screens/photo.py'
--- entertainerlib/frontend/gui/screens/photo.py	2009-05-21 16:12:09 +0000
+++ entertainerlib/gui/screens/photo.py	2010-01-23 03:34:11 +0000
@@ -4,9 +4,9 @@
 import clutter
 import gobject
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
 
 class Photo(Screen):
     '''Screen displays photograph in fullscreen and allows user to zoom in.'''
@@ -18,8 +18,8 @@
     def __init__(self, current_photo_index, images):
         Screen.__init__(self, 'Photo')
 
-        self.animate = self.config.show_effects()
-        self.slideshow_step = self.config.get_slideshow_step()
+        self.animate = self.config.show_effects
+        self.slideshow_step = self.config.slideshow_step
 
         self.zoom_level = 1
         self.index = current_photo_index
@@ -30,8 +30,8 @@
 
         # Create black background
         self.background = clutter.Rectangle()
-        self.background.set_size(self.config.get_stage_width(),
-            self.config.get_stage_height())
+        self.background.set_size(
+            self.config.stage_width, self.config.stage_height)
         self.background.set_color((0, 0, 0, 255))
         self.add(self.background)
 
@@ -60,9 +60,9 @@
         self.texture = Texture(image.get_filename())
         self._scale_image(self.texture)
 
-        timeline = clutter.Timeline(fps=120, duration=1000)
-        alpha = clutter.Alpha(timeline, clutter.smoothstep_inc_func)
-        self.opacity_behaviour = clutter.BehaviourOpacity(alpha=alpha, 
+        timeline = clutter.Timeline(1000)
+        alpha = clutter.Alpha(timeline, clutter.EASE_IN_OUT_SINE)
+        self.opacity_behaviour = clutter.BehaviourOpacity(alpha=alpha,
             opacity_start=0, opacity_end=255)
         self.opacity_behaviour.apply(self.texture)
         self.texture.set_opacity(0)
@@ -79,34 +79,33 @@
         # Center position when zoomed
         width = texture.get_width()
         height = texture.get_height()
-        x_ratio = self.config.get_stage_width() / float(width)
-        y_ratio = self.config.get_stage_height() / float(height)
+        x_ratio = self.config.stage_width / float(width)
+        y_ratio = self.config.stage_height / float(height)
 
         if x_ratio > y_ratio:
             texture.set_anchor_point_from_gravity(clutter.GRAVITY_CENTER)
             texture.set_scale(
-                self.config.get_stage_height() / float(height) * zoom_level,
-                self.config.get_stage_height() / float(height) * zoom_level)
+                self.config.stage_height / float(height) * zoom_level,
+                self.config.stage_height / float(height) * zoom_level)
             texture.set_anchor_point(0, 0)
 
             if zoom_level == 1: # Center image if in normal size
                 new_width = int(width *
-                    (self.config.get_stage_height() / float(height)))
+                    (self.config.stage_height / float(height)))
                 new_x = int(
-                    (self.config.get_stage_width() - new_width) / float(2))
+                    (self.config.stage_width - new_width) / float(2))
                 texture.set_position(new_x, 0)
         else:
             texture.set_anchor_point_from_gravity(clutter.GRAVITY_CENTER)
             texture.set_scale(
-                self.config.get_stage_width() / float(width) * zoom_level,
-                self.config.get_stage_width() / float(width) * zoom_level)
+                self.config.stage_width / float(width) * zoom_level,
+                self.config.stage_width / float(width) * zoom_level)
             texture.set_anchor_point(0, 0)
 
             if zoom_level == 1:  # Center image if in normal size
                 new_height = int(
-                    height * (self.config.get_stage_width() / float(width)))
-                new_y = int(
-                    (self.config.get_stage_height() - new_height) / float(2))
+                    height * (self.config.stage_width / float(width)))
+                new_y = int((self.config.stage_height - new_height) / float(2))
                 texture.set_position(0, new_y)
 
     def is_interested_in_play_action(self):
 
=== modified file 'entertainerlib/gui/screens/photo_albums.py'
--- entertainerlib/frontend/gui/screens/photo_albums.py	2009-07-19 19:27:31 +0000
+++ entertainerlib/gui/screens/photo_albums.py	2010-01-23 03:34:11 +0000
@@ -6,13 +6,12 @@
 import gobject
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
-    EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import EyeCandyTexture
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
 
 class PhotoAlbums(Screen):
     '''Screen contains a list of photo albums and album previews.'''
@@ -159,15 +158,15 @@
 
         new = self._create_album_preview(album)
 
-        if self.config.show_effects():
+        if self.config.show_effects:
             old = self.preview
             new.set_opacity(0)
             self.preview = new
             self.add(self.preview)
 
             #Fade out timeline
-            timeline1 = clutter.Timeline(10, 26)
-            alpha1 = clutter.Alpha(timeline1, clutter.smoothstep_inc_func)
+            timeline1 = clutter.Timeline(500)
+            alpha1 = clutter.Alpha(timeline1, clutter.EASE_IN_OUT_SINE)
             self.out_opacity = clutter.BehaviourOpacity(255, 0, alpha1)
             self.out_opacity.apply(old)
 
@@ -175,8 +174,8 @@
                 old)
 
             # Fade in timeline
-            timeline2 = clutter.Timeline(10, 26)
-            alpha2 = clutter.Alpha(timeline2, clutter.smoothstep_inc_func)
+            timeline2 = clutter.Timeline(500)
+            alpha2 = clutter.Alpha(timeline2, clutter.EASE_IN_OUT_SINE)
             self.in_opacity = clutter.BehaviourOpacity(0, 255, alpha2)
             self.in_opacity.apply(new)
 
@@ -211,16 +210,16 @@
         """
         if len(self.preview_textures)<=1:
             self.preview_textures[0].set_opacity(255)
-        elif self.config.show_effects():
+        elif self.config.show_effects:
             #Fade out timeline
-            fade_out = clutter.Timeline(40, 26)
-            alpha_out = clutter.Alpha(fade_out, clutter.smoothstep_inc_func)
+            fade_out = clutter.Timeline(500)
+            alpha_out = clutter.Alpha(fade_out, clutter.EASE_IN_OUT_SINE)
             self.out_behaviour = clutter.BehaviourOpacity(255, 0, alpha_out)
             self.out_behaviour.apply(self.preview_textures[0])
 
             # Fade in timeline
-            fade_in = clutter.Timeline(40, 26)
-            alpha_in = clutter.Alpha(fade_in, clutter.smoothstep_inc_func)
+            fade_in = clutter.Timeline(500)
+            alpha_in = clutter.Alpha(fade_in, clutter.EASE_IN_OUT_SINE)
             self.in_behaviour = clutter.BehaviourOpacity(0, 255, alpha_in)
             self.in_behaviour.apply(self.preview_textures[1])
 
 
=== modified file 'entertainerlib/gui/screens/photographs.py'
--- entertainerlib/frontend/gui/screens/photographs.py	2009-07-14 11:06:21 +0000
+++ entertainerlib/gui/screens/photographs.py	2010-01-23 03:34:11 +0000
@@ -3,13 +3,12 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
-    LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import LoadingAnimation
+from entertainerlib.gui.widgets.texture import Texture
 
 class Photographs(Screen):
     '''Screen displays a grid of selectable photograph thumbnails.'''
 
=== modified file 'entertainerlib/gui/screens/question.py'
--- entertainerlib/frontend/gui/screens/question.py	2009-06-27 09:03:33 +0000
+++ entertainerlib/gui/screens/question.py	2010-01-23 03:34:11 +0000
@@ -1,9 +1,9 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Question - Screen displays a question label and specified buttons.'''
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.text_menu import TextMenu
 
 class Question(Screen):
     '''Screen is displayed when the application needs to ask a close ended
 
=== modified file 'entertainerlib/gui/screens/rss.py'
--- entertainerlib/frontend/gui/screens/rss.py	2009-07-19 19:27:31 +0000
+++ entertainerlib/gui/screens/rss.py	2010-01-23 03:34:11 +0000
@@ -3,12 +3,12 @@
 
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.utils.feed_utils import FeedEntryParser
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class Rss(Screen):
     '''Screen displays RSS-feed titles and number of entries.'''
 
=== modified file 'entertainerlib/gui/screens/screen.py'
--- entertainerlib/frontend/gui/screens/screen.py	2009-05-28 20:15:47 +0000
+++ entertainerlib/gui/screens/screen.py	2010-01-23 03:34:11 +0000
@@ -6,9 +6,9 @@
 import clutter
 
 from entertainerlib.exceptions import ScreenException
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.tab_group import TabGroup
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.tab_group import TabGroup
 
 class Screen(Base, clutter.Group):
     """
@@ -61,9 +61,7 @@
         })
 
         rect = clutter.Rectangle()
-        rect.set_size(
-            self.config.get_stage_width(),
-            self.config.get_stage_height())
+        rect.set_size(self.config.stage_width, self.config.stage_height)
         rect.hide()
         self.add(rect)
 
 
=== modified file 'entertainerlib/gui/screens/tv_episodes.py'
--- entertainerlib/frontend/gui/screens/tv_episodes.py	2009-07-21 22:22:53 +0000
+++ entertainerlib/gui/screens/tv_episodes.py	2010-01-23 03:34:11 +0000
@@ -4,13 +4,12 @@
 import gtk
 import pango
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
-    EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import EyeCandyTexture
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
 
 class TvEpisodes(Screen):
     '''Screen contains list of all episodes of one specific season.'''
@@ -101,6 +100,7 @@
             self.menu.selected_userdata.get_title(),
             font_weight="bold")
         self.title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.title.set_line_wrap(False)
         self.title.width = 0.4
         self.add(self.title)
 
 
=== modified file 'entertainerlib/gui/screens/tv_series.py'
--- entertainerlib/frontend/gui/screens/tv_series.py	2009-07-12 07:57:05 +0000
+++ entertainerlib/gui/screens/tv_series.py	2010-01-23 03:34:11 +0000
@@ -3,12 +3,11 @@
 
 import gtk
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.eyecandy_texture import (
-    EyeCandyTexture)
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.eyecandy_texture import EyeCandyTexture
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.text_menu import TextMenu
 
 class TvSeries(Screen):
     '''Screen that contains all seasons of one TV series.'''
 
=== modified file 'entertainerlib/gui/screens/video.py'
--- entertainerlib/frontend/gui/screens/video.py	2009-05-06 03:40:22 +0000
+++ entertainerlib/gui/screens/video.py	2010-01-23 03:34:11 +0000
@@ -1,11 +1,12 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Video - Screen allows user to browse video library content'''
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.tabs.movies_tab import MoviesTab
-from entertainerlib.frontend.gui.tabs.series_tab import SeriesTab
-from entertainerlib.frontend.gui.tabs.video_clips_tab import VideoClipsTab
-from entertainerlib.frontend.gui.widgets.label import Label
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.tabs.movies_tab import MoviesTab
+from entertainerlib.gui.tabs.series_tab import SeriesTab
+from entertainerlib.gui.tabs.video_clips_tab import VideoClipsTab
+from entertainerlib.gui.widgets.label import Label
+
 
 class Video(Screen):
     '''Screen contains tabs for different video types in the video library.'''
 
=== modified file 'entertainerlib/gui/screens/video_osd.py'
--- entertainerlib/frontend/gui/screens/video_osd.py	2009-05-25 11:07:55 +0000
+++ entertainerlib/gui/screens/video_osd.py	2010-01-23 03:34:11 +0000
@@ -4,10 +4,11 @@
 import gobject
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.progress_bar import ProgressBar
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.progress_bar import ProgressBar
+from entertainerlib.gui.widgets.texture import Texture
+
 
 class VideoOSD(Screen):
     '''Screen is displayed when video is being watched.
@@ -54,23 +55,38 @@
         '''Create the pause, seek-backward & seek-forward textures.'''
         self.pause_texture = Texture(
             self.theme.getImage("media-playback-pause"), 0.5, 0.5)
-        self.pause_texture.set_anchor_point_from_gravity(
-            clutter.GRAVITY_CENTER)
+        self.pause_texture.set_anchor_point_from_gravity(clutter.GRAVITY_CENTER)
         self.pause_texture.hide()
         self.add(self.pause_texture)
 
-        pause_timeline = clutter.Timeline(fps=20, duration=2000)
-        pause_timeline.set_loop(True)
-        alpha_pause = clutter.Alpha(pause_timeline, clutter.sine_func)
+        pause_in_time = clutter.Timeline(1000)
+        in_alpha_pause = clutter.Alpha(pause_in_time, clutter.EASE_IN_OUT_SINE)
 
-        self.pause_opacity = clutter.BehaviourOpacity(alpha=alpha_pause,
+        self.pause_in_opacity = clutter.BehaviourOpacity(alpha=in_alpha_pause,
             opacity_start=100, opacity_end=255)
-        self.pause_scale = clutter.BehaviourScale(1.0, 1.0, 1.4, 1.4,
-            alpha_pause)
-
-        self.pause_opacity.apply(self.pause_texture)
-        self.pause_scale.apply(self.pause_texture)
-        pause_timeline.start()
+        self.pause_in_scale = clutter.BehaviourScale(1.0, 1.0, 1.4, 1.4,
+            in_alpha_pause)
+
+        self.pause_in_opacity.apply(self.pause_texture)
+        self.pause_in_scale.apply(self.pause_texture)
+
+        pause_out_time = clutter.Timeline(1000)
+        out_alpha_pause = clutter.Alpha(pause_out_time,
+            clutter.EASE_IN_OUT_SINE)
+
+        self.pause_out_opacity = clutter.BehaviourOpacity(alpha=out_alpha_pause,
+            opacity_start=255, opacity_end=100)
+        self.pause_out_scale = clutter.BehaviourScale(1.4, 1.4, 1.0, 1.0,
+            out_alpha_pause)
+
+        self.pause_out_opacity.apply(self.pause_texture)
+        self.pause_out_scale.apply(self.pause_texture)
+
+        self.score = clutter.Score()
+        self.score.set_loop(True)
+        self.score.append(timeline=pause_in_time)
+        self.score.append(timeline=pause_out_time, parent=pause_in_time)
+        self.score.start()
 
         self.seekbackward_texture = Texture(
             self.theme.getImage("media-seek-backward"), 0.1, 0.5)
@@ -79,9 +95,9 @@
         self.seekbackward_texture.set_opacity(0)
         self.add(self.seekbackward_texture)
 
-        self.seekbackward_timeline = clutter.Timeline(fps=120, duration=1000)
+        self.seekbackward_timeline = clutter.Timeline(1000)
         alpha_seekbackward = clutter.Alpha(self.seekbackward_timeline,
-            clutter.smoothstep_inc_func)
+            clutter.EASE_IN_OUT_SINE)
 
         self.seekbackward_opacity = clutter.BehaviourOpacity(
             alpha=alpha_seekbackward, opacity_start=255, opacity_end=0)
@@ -94,9 +110,9 @@
         self.seekforward_texture.set_opacity(0)
         self.add(self.seekforward_texture)
 
-        self.seekforward_timeline = clutter.Timeline(fps=120, duration=1000)
+        self.seekforward_timeline = clutter.Timeline(1000)
         alpha_seekforward = clutter.Alpha(self.seekforward_timeline,
-            clutter.smoothstep_inc_func)
+            clutter.EASE_IN_OUT_SINE)
 
         self.seekforward_opacity = clutter.BehaviourOpacity(
             alpha=alpha_seekforward, opacity_start=255, opacity_end=0)
@@ -130,8 +146,8 @@
         self.timeout_key = None # This is used when canceling timeouts
         for texture in self.aspect_textures:
             texture.position = (
-                float(self.config.get_stage_width() - texture.get_width()) /
-                (self.config.get_stage_width() * 2), 0.67)
+                float(self.config.stage_width - texture.get_width()) /
+                (self.config.stage_width * 2), 0.67)
 
     def _hide_aspect_ratio_logo(self, number):
         '''
 
=== modified file 'entertainerlib/gui/screens/weather.py'
--- entertainerlib/frontend/gui/screens/weather.py	2009-07-12 19:10:32 +0000
+++ entertainerlib/gui/screens/weather.py	2010-01-23 03:34:11 +0000
@@ -3,10 +3,11 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
-from entertainerlib.utils.weather import Weather
+from entertainerlib.gui.screens.screen import Screen
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
+from entertainerlib.weather import Weather
+
 
 class WeatherScreen(Screen):
     '''Screen to display the user's set weather location.'''
@@ -17,7 +18,7 @@
         # Screen Title
         self.add(Label(0.13, "screentitle", 0, 0.87, _("Weather")))
 
-        self.weather = Weather(self.config.get_weather_location())
+        self.weather = Weather(self.config.weather_location)
 
         location = Label(0.04167, "text", 0.50, 0.13, self.weather.location,
             font_weight="bold")
 
=== renamed file 'entertainerlib/utils/system_tray_icon.py' => 'entertainerlib/gui/system_tray_icon.py'
--- entertainerlib/utils/system_tray_icon.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/gui/system_tray_icon.py	2010-01-23 03:34:11 +0000
@@ -4,19 +4,16 @@
 import os
 
 import gtk
-import gtk.glade
-
-from entertainerlib.utils.log_viewer import LogViewer
-from entertainerlib.utils.preferences_dialog import PreferencesDialog
-from entertainerlib.utils.content_management_dialog import (
-    ContentManagementDialog)
-from entertainerlib.utils.configuration import Configuration
+
+from entertainerlib.configuration import Configuration
+from entertainerlib.dialog import ManagerDialog, LogViewer
+
 
 class SystemTrayIcon:
     """Implements system tray icon for entertainer."""
 
     FILE_DIR = os.path.dirname(__file__)
-    GLADE_DIR = os.path.join(FILE_DIR, "glade")
+    UI_DIR = os.path.join(FILE_DIR, '..', 'uis')
 
     def __init__(self, quit_callback, toggle_interface_visibility_callback):
         '''Create the system tray icon and pop-up menu for it.'''
@@ -32,24 +29,24 @@
         self.icon_widget = gtk.StatusIcon()
         self.icon_widget.set_tooltip(_("Entertainer Server"))
 
-        # Load glade files
-        self.menu_widgets = gtk.glade.XML(
-            os.path.join(self.GLADE_DIR, "system_tray_icon_menu.glade"))
+        # Load UI with gtk.Builder
+        uifile = os.path.join(self.UI_DIR, 'system_tray_icon_menu.ui')
+        self.menu_widgets = gtk.Builder()
+        self.menu_widgets.set_translation_domain('entertainer')
+        self.menu_widgets.add_from_file(uifile)
 
         # Bind menu signals
-        callback_dic = {"on_menuitem_frontend_activate"
-                        : self.on_menuitem_frontend_activate,
-                        "on_menuitem_preferences_activate"
-                        : self.on_menuitem_preferences_activate,
-                        "on_menuitem_content_management_activate"
-                        : self.on_menuitem_content_management_activate,
+        callback_dic = {"on_menuitem_client_activate"
+                        : self.on_menuitem_client_activate,
+                        "on_menuitem_manager_activate"
+                        : self.on_menuitem_manager_activate,
                         "on_menuitem_log_viewer_activate"
                         : self.on_menuitem_log_viewer_activate,
                         "on_menuitem_quit_activate"
                         : self.on_menuitem_quit_activate
                         }
-        self.menu_widgets.signal_autoconnect(callback_dic)
-        self.popup = self.menu_widgets.get_widget("SystemTrayIconMenu")
+        self.menu_widgets.connect_signals(callback_dic)
+        self.popup = self.menu_widgets.get_object("SystemTrayIconMenu")
 
         # Check if running from a branch to set the tray icon
         if (os.path.exists(self.tray_icon_url)):
@@ -62,7 +59,7 @@
         self.icon_widget.connect('popup-menu', self.open_popup_menu)
 
     def systray_icon_activated(self, widget, data= None):
-        """Switch visibility of frontend when system tray icon is clicked"""
+        """Switch visibility of client when system tray icon is clicked"""
         self.toggle_interface_visibility_callback()
 
     def open_popup_menu(self, widget, button, time, data = None):
@@ -70,17 +67,13 @@
         self.popup.show_all()
         self.popup.popup(None, None, None, 3, time)
 
-    def on_menuitem_frontend_activate(self, widget):
-        """Execute frontend here if not running. Show if running"""
-        self.set_frontend_visible(True)
-
-    def on_menuitem_preferences_activate(self, widget):
-        """Executes preferences-tool."""
-        PreferencesDialog(False)
-
-    def on_menuitem_content_management_activate(self, widget):
-        """Executes content-management-tool"""
-        ContentManagementDialog(False)
+    def on_menuitem_client_activate(self, widget):
+        """Execute client here if not running. Show if running"""
+        self.set_client_visible(True)
+
+    def on_menuitem_manager_activate(self, widget):
+        '''Executes the manager dialog.'''
+        ManagerDialog(False)
 
     def on_menuitem_log_viewer_activate(self, widget):
         """Display log viewer dialog"""
 
=== modified file 'entertainerlib/gui/tabs/albums_tab.py'
--- entertainerlib/frontend/gui/tabs/albums_tab.py	2009-07-14 11:06:21 +0000
+++ entertainerlib/gui/tabs/albums_tab.py	2010-01-23 03:34:11 +0000
@@ -4,12 +4,11 @@
 
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
-    LoadingAnimation)
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import LoadingAnimation
 
 class AlbumsTab(Tab):
     '''Tab to show album listings'''
@@ -55,11 +54,13 @@
         # Create album information (displays current menuitem information)
         self.album_title = Label(0.045, "title", 0.22, 0.79, "")
         self.album_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.album_title.set_line_wrap(False)
         self.album_title.width = 0.366
         self.add(self.album_title)
 
         self.album_artist = Label(0.037, "subtitle", 0.22, 0.86, "")
         self.album_artist.set_ellipsize(pango.ELLIPSIZE_END)
+        self.album_artist.set_line_wrap(False)
         self.album_artist.width = 0.366
         self.add(self.album_artist)
 
 
=== modified file 'entertainerlib/gui/tabs/artists_tab.py'
--- entertainerlib/frontend/gui/tabs/artists_tab.py	2009-07-16 20:31:22 +0000
+++ entertainerlib/gui/tabs/artists_tab.py	2010-01-23 03:34:11 +0000
@@ -4,12 +4,11 @@
 
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
-    LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import LoadingAnimation
+from entertainerlib.gui.widgets.text_menu import TextMenu
 
 class ArtistsTab(Tab):
     '''Tab for the music screen to show artist listings'''
@@ -38,6 +37,7 @@
         # Create artist label
         self.artist_title = Label(0.0416, "title", 0.22, 0.794, "")
         self.artist_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.artist_title.set_line_wrap(False)
         self.artist_title.width = 0.366
         self.add(self.artist_title)
 
@@ -47,7 +47,7 @@
         self.artist_tracks = Label(0.0365, "subtitle", 0.22, 0.911, "")
         self.add(self.artist_tracks)
 
-        # Create artis menu list indicator
+        # Create artist menu list indicator
         self.li = ListIndicator(0.77, 0.8, 0.18, 0.045,
             ListIndicator.VERTICAL)
         self.li.set_maximum(len(artists))
 
=== modified file 'entertainerlib/gui/tabs/lyrics_tab.py'
--- entertainerlib/frontend/gui/tabs/lyrics_tab.py	2009-07-22 20:46:29 +0000
+++ entertainerlib/gui/tabs/lyrics_tab.py	2010-01-23 03:34:11 +0000
@@ -4,11 +4,11 @@
 import clutter
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.loading_animation import (
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.loading_animation import (
     LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.scroll_area import ScrollArea
+from entertainerlib.gui.widgets.scroll_area import ScrollArea
 
 class LyricsTab(Tab):
     '''Tab for the audio play screen to show lyrics'''
 
=== modified file 'entertainerlib/gui/tabs/movies_tab.py'
--- entertainerlib/frontend/gui/tabs/movies_tab.py	2009-07-14 11:06:21 +0000
+++ entertainerlib/gui/tabs/movies_tab.py	2010-01-23 03:34:11 +0000
@@ -3,12 +3,11 @@
 
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
-    LoadingAnimation)
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import LoadingAnimation
 
 class MoviesTab(Tab):
     """
@@ -95,11 +94,13 @@
         self.movie_title = Label(0.042, "title", 0.2, 0.75, "",
             font_weight="bold")
         self.movie_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.movie_title.set_line_wrap(False)
         self.movie_title.width = 0.5
         self.add(self.movie_title)
 
         self.movie_info = Label(0.034, "subtitle", 0.2, 0.8, "")
         self.movie_info.set_ellipsize(pango.ELLIPSIZE_END)
+        self.movie_info.set_line_wrap(False)
         self.movie_info.width = 0.5
         self.add(self.movie_info)
 
 
=== modified file 'entertainerlib/gui/tabs/playing_tab.py'
--- entertainerlib/frontend/gui/tabs/playing_tab.py	2009-05-26 17:32:56 +0000
+++ entertainerlib/gui/tabs/playing_tab.py	2010-01-23 03:34:11 +0000
@@ -3,9 +3,9 @@
 
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.progress_bar import ProgressBar
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.progress_bar import ProgressBar
 
 class PlayingTab(Tab):
     '''Tab for the audio play screen to show currently playing audio.'''
 
=== modified file 'entertainerlib/gui/tabs/series_tab.py'
--- entertainerlib/frontend/gui/tabs/series_tab.py	2009-07-14 11:06:21 +0000
+++ entertainerlib/gui/tabs/series_tab.py	2010-01-23 03:34:11 +0000
@@ -3,12 +3,11 @@
 
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
-    LoadingAnimation)
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import LoadingAnimation
 
 class SeriesTab(Tab):
     """
@@ -94,6 +93,7 @@
         self.series_title = Label(0.042, "title", 0.2, 0.75, "",
             font_weight="bold")
         self.series_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.series_title.set_line_wrap(False)
         self.series_title.width = 0.5
         self.add(self.series_title)
 
 
=== modified file 'entertainerlib/gui/tabs/tab.py'
--- entertainerlib/frontend/gui/tabs/tab.py	2009-05-21 16:12:09 +0000
+++ entertainerlib/gui/tabs/tab.py	2010-01-23 03:34:11 +0000
@@ -4,10 +4,10 @@
 import clutter
 import gobject
 
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.base import Base
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.texture import Texture
+from entertainerlib.gui.user_event import UserEvent
+from entertainerlib.gui.widgets.base import Base
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.texture import Texture
 
 class Tab(Base, clutter.Group):
     '''
@@ -39,9 +39,9 @@
         }
 
         # show/hide animation on the Tab
-        self.timeline = clutter.Timeline(30, 60)
+        self.timeline = clutter.Timeline(500)
         self.timeline.connect('completed', self._on_timeline_completed)
-        self.alpha = clutter.Alpha(self.timeline, clutter.smoothstep_inc_func)
+        self.alpha = clutter.Alpha(self.timeline, clutter.EASE_IN_OUT_SINE)
         self.behaviour = clutter.BehaviourOpacity(0, 255, self.alpha)
         self.behaviour.apply(self)
 
 
=== modified file 'entertainerlib/gui/tabs/tracks_tab.py'
--- entertainerlib/frontend/gui/tabs/tracks_tab.py	2009-07-16 20:31:22 +0000
+++ entertainerlib/gui/tabs/tracks_tab.py	2010-01-23 03:34:11 +0000
@@ -3,12 +3,11 @@
 
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
-    LoadingAnimation)
-from entertainerlib.frontend.gui.widgets.text_menu import TextMenu
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import LoadingAnimation
+from entertainerlib.gui.widgets.text_menu import TextMenu
 
 class TracksTab(Tab):
     '''Tab for the artist screen to show track listings'''
@@ -35,11 +34,13 @@
 
         self.track_title = Label(0.045, "title", 0.22, 0.79, "")
         self.track_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.track_title.set_line_wrap(False)
         self.track_title.width = 0.366
         self.add(self.track_title)
 
         self.track_number = Label(0.037, "subtitle", 0.22, 0.86, "")
         self.track_number.set_ellipsize(pango.ELLIPSIZE_END)
+        self.track_number.set_line_wrap(False)
         self.track_number.width = 0.366
         self.add(self.track_number)
 
 
=== modified file 'entertainerlib/gui/tabs/video_clips_tab.py'
--- entertainerlib/frontend/gui/tabs/video_clips_tab.py	2009-07-14 11:06:21 +0000
+++ entertainerlib/gui/tabs/video_clips_tab.py	2010-01-23 03:34:11 +0000
@@ -5,12 +5,11 @@
 
 import pango
 
-from entertainerlib.frontend.gui.tabs.tab import Tab
-from entertainerlib.frontend.gui.widgets.image_menu import ImageMenu
-from entertainerlib.frontend.gui.widgets.label import Label
-from entertainerlib.frontend.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.frontend.gui.widgets.loading_animation import (
-    LoadingAnimation)
+from entertainerlib.gui.tabs.tab import Tab
+from entertainerlib.gui.widgets.image_menu import ImageMenu
+from entertainerlib.gui.widgets.label import Label
+from entertainerlib.gui.widgets.list_indicator import ListIndicator
+from entertainerlib.gui.widgets.loading_animation import LoadingAnimation
 
 class VideoClipsTab(Tab):
     """
@@ -94,11 +93,13 @@
         self.clip_title = Label(0.042, "title", 0.15, 0.77, "",
             font_weight="bold")
         self.clip_title.set_ellipsize(pango.ELLIPSIZE_END)
+        self.clip_title.set_line_wrap(False)
         self.clip_title.width = 0.5
         self.add(self.clip_title)
 
         self.clip_info = Label(0.034, "subtitle", 0.15, 0.85, "")
         self.clip_info.set_ellipsize(pango.ELLIPSIZE_END)
+        self.clip_info.set_line_wrap(False)
         self.clip_info.width = 0.5
         self.add(self.clip_info)
 
 
=== renamed file 'entertainerlib/utils/theme.py' => 'entertainerlib/gui/theme.py'
=== modified file 'entertainerlib/gui/transitions/factory.py'
--- entertainerlib/frontend/gui/transitions/factory.py	2009-04-28 22:30:06 +0000
+++ entertainerlib/gui/transitions/factory.py	2010-01-23 03:34:11 +0000
@@ -2,11 +2,12 @@
 '''TransitionFactory - create a transition object based on the configuration
 that is in the user's preferences'''
 
-from entertainerlib.frontend.gui.transitions.fade import Fade
-from entertainerlib.frontend.gui.transitions.no_effect import NoEffect
-from entertainerlib.frontend.gui.transitions.slide import Slide
-from entertainerlib.frontend.gui.transitions.zoom_and_fade import ZoomAndFade
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.gui.transitions.fade import Fade
+from entertainerlib.gui.transitions.no_effect import NoEffect
+from entertainerlib.gui.transitions.slide import Slide
+from entertainerlib.gui.transitions.zoom_and_fade import ZoomAndFade
+from entertainerlib.configuration import Configuration
+
 
 class TransitionFactory:
     '''Generates a transition object based on the configuration setting'''
@@ -31,8 +32,8 @@
             'Zoom and fade' : self._generate_zoom_and_fade
         }
 
-        if self.config.show_effects():
-            kind = self.config.transition_effect()
+        if self.config.show_effects:
+            kind = self.config.transition_effect
         else:
             kind = "No effect"
 
 
=== modified file 'entertainerlib/gui/transitions/fade.py'
--- entertainerlib/frontend/gui/transitions/fade.py	2009-05-06 03:40:22 +0000
+++ entertainerlib/gui/transitions/fade.py	2010-01-23 03:34:11 +0000
@@ -2,8 +2,8 @@
 '''Fade - Transition to fade out old screen and fade in the new screen'''
 
 import clutter
+from entertainerlib.gui.transitions.transition import Transition
 
-from entertainerlib.frontend.gui.transitions.transition import Transition
 
 class Fade(Transition):
     """
 
=== modified file 'entertainerlib/gui/transitions/no_effect.py'
--- entertainerlib/frontend/gui/transitions/no_effect.py	2009-05-06 03:40:22 +0000
+++ entertainerlib/gui/transitions/no_effect.py	2010-01-23 03:34:11 +0000
@@ -1,7 +1,8 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''NoEffect - Simple change transition from screen 1 to screen 2'''
 
-from entertainerlib.frontend.gui.transitions.transition import Transition
+from entertainerlib.gui.transitions.transition import Transition
+
 
 class NoEffect(Transition):
     """
 
=== modified file 'entertainerlib/gui/transitions/slide.py'
--- entertainerlib/frontend/gui/transitions/slide.py	2009-05-06 03:40:22 +0000
+++ entertainerlib/gui/transitions/slide.py	2010-01-23 03:34:11 +0000
@@ -3,8 +3,8 @@
 
 import clutter
 
-from entertainerlib.frontend.gui.transitions.transition import Transition
-from entertainerlib.utils.configuration import Configuration
+from entertainerlib.gui.transitions.transition import Transition
+from entertainerlib.configuration import Configuration
 
 class Slide(Transition):
     '''Move screens on and off the stage through horizontal movements.'''
@@ -27,7 +27,7 @@
         '''Execute the common sliding logic needed by each direction.
 
         Direction will set the sign of width to determine which way to slide.'''
-        width = self.config.get_stage_width() * direction
+        width = self.config.stage_width * direction
 
         # Initialize to_screen for animation
         to_screen.set_position(-width, 0)
@@ -35,10 +35,12 @@
 
         # Slide out timeline
         if from_screen is not None:
-            slide_out = clutter.Timeline(20, 60)
-            alpha_out = clutter.Alpha(slide_out, clutter.smoothstep_inc_func)
-            self.out_behaviour = clutter.BehaviourPath(alpha_out, ((0, 0),
-                (width, 0)))
+            slide_out = clutter.Timeline(500)
+            alpha_out = clutter.Alpha(slide_out, clutter.EASE_IN_OUT_SINE)
+            out_path = clutter.Path()
+            out_path.add_move_to(0, 0)
+            out_path.add_line_to(width, 0)
+            self.out_behaviour = clutter.BehaviourPath(alpha_out, out_path)
             self.out_behaviour.apply(from_screen)
 
             if remove_screen:
@@ -46,10 +48,12 @@
                     from_screen)
 
         # Slide in timeline
-        slide_in = clutter.Timeline(20, 60)
-        alpha_in = clutter.Alpha(slide_in, clutter.smoothstep_inc_func)
-        self.in_behaviour = clutter.BehaviourPath(alpha_in, ((-width, 0),
-            (0, 0)))
+        slide_in = clutter.Timeline(500)
+        alpha_in = clutter.Alpha(slide_in, clutter.EASE_IN_OUT_SINE)
+        in_path = clutter.Path()
+        in_path.add_move_to(-width, 0)
+        in_path.add_line_to(0, 0)
+        self.in_behaviour = clutter.BehaviourPath(alpha_in, in_path)
         self.in_behaviour.apply(to_screen)
 
         # Start transition animating
 
=== modified file 'entertainerlib/gui/transitions/zoom_and_fade.py'
--- entertainerlib/frontend/gui/transitions/zoom_and_fade.py	2009-05-06 03:40:22 +0000
+++ entertainerlib/gui/transitions/zoom_and_fade.py	2010-01-23 03:34:11 +0000
@@ -2,8 +2,8 @@
 '''ZoomAndFade - Transition to zoom and fade between screens'''
 
 import clutter
+from entertainerlib.gui.transitions.transition import Transition
 
-from entertainerlib.frontend.gui.transitions.transition import Transition
 
 class ZoomAndFade(Transition):
     """
 
=== modified file 'entertainerlib/gui/user_event.py'
--- entertainerlib/frontend/gui/user_event.py	2009-05-29 10:33:32 +0000
+++ entertainerlib/gui/user_event.py	2010-01-23 03:34:11 +0000
@@ -40,7 +40,7 @@
     USE_ASPECT_RATIO_2 = 52
     USE_ASPECT_RATIO_3 = 53
     USE_ASPECT_RATIO_4 = 54
-    QUIT_FRONTEND = 56
+    QUIT = 56
     DEFAULT_EVENT = 57
 
     def __init__(self, code):
 
=== modified file 'entertainerlib/gui/user_interface.py'
--- entertainerlib/frontend/gui/user_interface.py	2009-06-29 19:41:35 +0000
+++ entertainerlib/gui/user_interface.py	2010-01-23 03:34:11 +0000
@@ -1,5 +1,5 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''UserInterface - Main window of the Entertainer frontend'''
+'''UserInterface - Main window of the Entertainer client'''
 
 # Clutter uses _1 to represent the 1 key and pylint complains about it
 # pylint: disable-msg=W0212
@@ -12,31 +12,32 @@
 import gobject
 import gtk
 
-from entertainerlib.frontend.gui.screen_history import ScreenHistory
-from entertainerlib.frontend.gui.screens.factory import ScreenFactory
-from entertainerlib.frontend.gui.screens.screen import Screen
-from entertainerlib.frontend.gui.transitions.factory import TransitionFactory
-from entertainerlib.frontend.gui.transitions.transition import Transition
-from entertainerlib.frontend.gui.user_event import UserEvent
-from entertainerlib.frontend.gui.widgets.menu_overlay import MenuOverlay
-from entertainerlib.frontend.media_player import MediaPlayer
-from entertainerlib.frontend.gui.widgets.volume_indicator import VolumeIndicator
-from entertainerlib.utils.configuration import Configuration
-from entertainerlib.utils.logger import Logger
+from entertainerlib.gui.widgets.volume_indicator import VolumeIndicator
+from entertainerlib.gui.screen_history import ScreenHistory
+from entertainerlib.gui.screens.factory import ScreenFactory
+from entertainerlib.gui.screens.screen import Screen