Merge lp:~mblayman/entertainer/working-sdist into lp:entertainer/future

[Matt Layman]

[Matt Layman (mblayman)]

Dependent on fix-setup-for-2.6.

I found out that python setup.py sdist was broken. All sorts of stuff was missing from the source tarball that would be needed to install Entertainer from that tarball. I fixed it along with fixing a bug that I introduced when I moved themes out of cfg.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2008-10-05 17:11:31 +0000
+++ MANIFEST.in	2009-09-05 13:58:02 +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	2009-09-05 13:58:02 +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	2009-08-16 22:19:22 +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/DEPENDENCIES'
--- docs/DEPENDENCIES	2009-05-09 19:08:39 +0000
+++ docs/DEPENDENCIES	2009-08-25 02:51:36 +0000
@@ -14,3 +14,4 @@
 python-pyvorbis
 python-storm
 python-twisted
+python-xdg

=== renamed file 'entertainer-content-manager' => 'entertainer-manager'
--- entertainer-content-manager	2009-05-10 17:36:49 +0000
+++ entertainer-manager	2009-08-23 01:01:18 +0000
@@ -1,14 +1,14 @@
 #!/usr/bin/env python
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Content Management executable'''
+'''Manager executable'''
 
 import gtk
 
 from entertainerlib.client.translation_setup import TranslationSetup
 TranslationSetup()
 
-from entertainerlib.dialog import ContentManagementDialog
-
-
-ContentManagementDialog(True)
+from entertainerlib.dialog import ManagerDialog
+
+
+ManagerDialog(True)
 gtk.main()

=== removed file 'entertainer-preferences'
--- entertainer-preferences	2009-05-10 17:36: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.client.translation_setup import TranslationSetup
-TranslationSetup()
-
-from entertainerlib.dialog import PreferencesDialog
-
-
-PreferencesDialog(True)
-gtk.main()

=== modified file 'entertainerlib/backend/backend_server.py'
--- entertainerlib/backend/backend_server.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/backend/backend_server.py	2009-08-23 01:16:18 +0000
@@ -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):

=== modified file 'entertainerlib/backend/components/feeds/feed_manager.py'
--- entertainerlib/backend/components/feeds/feed_manager.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/backend/components/feeds/feed_manager.py	2009-08-16 23:01:49 +0000
@@ -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):

=== modified file 'entertainerlib/backend/components/mediacache/image_cache.py'
--- entertainerlib/backend/components/mediacache/image_cache.py	2009-06-30 01:06:01 +0000
+++ entertainerlib/backend/components/mediacache/image_cache.py	2009-08-16 18:51:06 +0000
@@ -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-10 17:36:49 +0000
+++ entertainerlib/backend/components/mediacache/media_cache_manager.py	2009-08-16 22:19:22 +0000
@@ -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-10 17:36:49 +0000
+++ entertainerlib/backend/components/mediacache/music_cache.py	2009-08-18 02:50:40 +0000
@@ -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-10 17:36:49 +0000
+++ entertainerlib/backend/components/mediacache/video_cache.py	2009-08-18 02:45:02 +0000
@@ -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/core/message_bus_proxy.py'
--- entertainerlib/backend/core/message_bus_proxy.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/backend/core/message_bus_proxy.py	2009-08-16 22:03:14 +0000
@@ -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-10 17:36:49 +0000
+++ entertainerlib/backend/core/message_type_priority.py	2009-08-23 01:16:18 +0000
@@ -25,7 +25,7 @@
     """
 
     # Indicates that Preferences UI has been used to update preferences.
-    PREFERENCES_CONF_UPDATED = 0
+    NOT_USED_7 = 0
 
     # Indicates that Content Management UI has been used to update contents.
     CONTENT_CONF_UPDATED = 1

=== modified file 'entertainerlib/client/__init__.py'
--- entertainerlib/client/__init__.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/client/__init__.py	2009-08-21 01:55:09 +0000
@@ -27,7 +27,7 @@
     clutter.threads_init()
 
     config = Configuration()
-    if config.start_auto_server():
+    if config.start_auto_server:
         print "Entertainer backend starting..."
         BackendServer()
 

=== modified file 'entertainerlib/client/backend_connection.py'
--- entertainerlib/client/backend_connection.py	2009-05-06 02:58:08 +0000
+++ entertainerlib/client/backend_connection.py	2009-08-23 01:16:18 +0000
@@ -16,7 +16,6 @@
         """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?
@@ -48,8 +47,6 @@
         """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
 

=== modified file 'entertainerlib/client/client.py'
--- entertainerlib/client/client.py	2009-05-10 17:47:23 +0000
+++ entertainerlib/client/client.py	2009-08-16 21:53:22 +0000
@@ -50,7 +50,7 @@
             feed_library, image_library, music_library, video_library,
             self.quit_client)
 
-        if config.tray_icon_enabled():
+        if config.tray_icon_enabled:
             SystemTrayIcon(
                 self.quit_client, self.toggle_interface_visibility)
 

=== modified file 'entertainerlib/client/medialibrary/videos.py'
--- entertainerlib/client/medialibrary/videos.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/client/medialibrary/videos.py	2009-08-16 21:48:15 +0000
@@ -220,12 +220,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/client/translation_setup.py	2009-07-26 07:59:56 +0000
+++ entertainerlib/client/translation_setup.py	2009-08-28 02:38:48 +0000
@@ -6,33 +6,37 @@
 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', locale_dir)
+
+            # This sets up the glade translations
+            gtk.glade.bindtextdomain('entertainer', locale_dir)
+
         # 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
+            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)
 
-        gtk.glade.textdomain ('entertainer')
+        gtk.glade.textdomain('entertainer')
 

=== modified file 'entertainerlib/configuration.py'
--- entertainerlib/configuration.py	2009-07-07 01:28:42 +0000
+++ entertainerlib/configuration.py	2009-08-27 03:18:41 +0000
@@ -2,35 +2,20 @@
 '''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.db.connection import Database
-
 from entertainerlib.gui.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"
-    }
-
 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")
+    '''Interface to all configuration parameters. All components of Entertainer
+    should get configuration values through this class.'''
 
     _shared_state = {}
 
@@ -41,52 +26,35 @@
         if not self._shared_state or test_dir is not None:
             # Set in a production mode or a test mode
             if test_dir is None:
-                self.cfg_dir = self.CFG_DIR
+                self.resources = Resources()
             else:
-                self.cfg_dir = 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.MEDIA_DB = Database(os.path.join(self.cfg_dir, 'cache/media'))
-
-            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
+            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 = {
@@ -94,360 +62,157 @@
                 'host': 'localhost',
                 'port': 55545}
 
-    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)
+    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):
         """Write a new value to the content configuration file."""
-        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):
-        """Write a new value to the preferences configuration file."""
-        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):
-        '''Set the stage width for the in memory instance'''
-        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):
-        '''Set the stage height for the in memory instance'''
-        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
-
+        '''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):
-        """
-        Should we display weather in client
-        @return: Boolean
-        """
-        try:
-            result = self.content_config.getboolean("Weather",
-                "display_in_menu")
-        except (NoSectionError, NoOptionError):
-            return False
-        return result
-
-    def display_cd_eject_in_client(self):
-        """
-        Should we display the cd eject button in client
-        @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 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):
@@ -457,26 +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 _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
+

=== modified file 'entertainerlib/dialog.py'
--- entertainerlib/dialog.py	2009-07-14 04:24:07 +0000
+++ entertainerlib/dialog.py	2009-08-27 03:18:41 +0000
@@ -22,7 +22,7 @@
 from entertainerlib.weather import Weather
 
 
-class ContentManagementDialog:
+class ManagerDialog:
     """
     This is a content management tool for Entertainer media center application.
     """
@@ -39,44 +39,38 @@
         """
         self.stand_alone = stand_alone
         self.config = Configuration()
+        self.themes = []
         self.weather = Weather()
 
         # Load glade UI
-        self.gladefile = os.path.join(self.GLADE_DIR,
-            "entertainer-content-management.glade")
+        self.gladefile = os.path.join(self.GLADE_DIR, 'manager.glade')
         self.widgets = gtk.glade.XML(self.gladefile)
 
         # Get content management dialog and bind signal callbacks
-        self.dialog = self.widgets.get_widget("ContentManagementDialog")
+        self.dialog = self.widgets.get_widget("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_button_remove_videos_clicked" :
-                    self.on_button_remove_videos_clicked,
-                "on_button_add_videos_clicked" :
-                    self.on_button_add_videos_clicked,
-                "on_button_edit_videos_clicked" :
-                    self.on_button_edit_videos_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_button_add_music_clicked" :
-                    self.on_button_add_music_clicked,
-                "on_button_remove_music_clicked" :
-                    self.on_button_remove_music_clicked,
-                "on_button_edit_music_clicked" :
-                    self.on_button_edit_music_clicked,
                 "on_lyrics_checkbox_toggled" : self.on_lyrics_checkbox_toggled,
                 "on_art_checkbox_toggled" : self.on_art_checkbox_toggled,
-                "on_button_add_images_clicked" :
-                    self.on_button_add_images_clicked,
-                "on_button_remove_images_clicked" :
-                    self.on_button_remove_images_clicked,
-                "on_button_edit_images_clicked" :
-                    self.on_button_edit_images_clicked,
-                "on_hidden_files_folders_checkbox_toggled" :
-                    self.on_hidden_files_folders_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" :
@@ -85,20 +79,15 @@
                     self.on_button_edit_feed_clicked,
                 "on_fetch_interval_spinbutton_value_changed" :
                     self.on_fetch_interval_spinbutton_value_changed,
-                "on_ContentManagementDialog_destroy" : self.on_dialog_closed,
                 "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_video_rebuild_clicked" :
-                    self.on_button_video_rebuild_clicked,
-                "on_button_music_rebuild_clicked" :
-                    self.on_button_music_rebuild_clicked,
-                "on_button_image_rebuild_clicked" :
-                    self.on_button_image_rebuild_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" :
@@ -111,7 +100,31 @@
                     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}
+                "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.widgets.signal_autoconnect(callback_dic)
 
         # Initialize dialog widgets with correct values and show dialog
@@ -127,12 +140,10 @@
         column = gtk.TreeViewColumn(_("Location"), cell_renderer, text=0)
         result_list.append_column(column)
 
-# Signal handlers
-
     def on_dialog_closed(self, widget):
         """Callback function for dialog's close button"""
         try:
-            proxy = MessageBusProxy(client_name = "Content Management GUI")
+            proxy = MessageBusProxy(client_name = "Manager GUI")
             proxy.connectToMessageBus()
             proxy.sendMessage(Message(MessageType.CONTENT_CONF_UPDATED))
             proxy.disconnectFromMessageBus()
@@ -146,7 +157,6 @@
             error.run()
             error.destroy()
 
-
         if(self.stand_alone):
             self.dialog.hide()
             self.dialog.destroy()
@@ -165,12 +175,12 @@
             self.dialog.hide()
             self.dialog.destroy()
 
-    def on_button_add_videos_clicked(self, widget):
+    def on_button_add_media_clicked(self, widget):
         """Opens add URL dialog. """
-        widget = self.widgets.get_widget("treeview_videos")
+        widget = self.widgets.get_widget("treeview_media")
         model = widget.get_model()
         # Open "Select folder" dialog
-        dialog =  gtk.FileChooserDialog(_("Select video folder"), None,
+        dialog =  gtk.FileChooserDialog(_("Select folder"), None,
             gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
             (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,
                 gtk.STOCK_OPEN,gtk.RESPONSE_OK),
@@ -179,25 +189,25 @@
         # 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.video_folders, "Videos")
+                self.media_folders, "Media")
         dialog.destroy()
 
-    def on_button_remove_videos_clicked(self, widget):
-        """Remove currently selected folder from video folders"""
-        widget = self.widgets.get_widget("treeview_videos")
+    def on_button_remove_media_clicked(self, widget):
+        """Remove currently selected folder from media folders"""
+        widget = self.widgets.get_widget("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.video_folders.remove(rm_folder)
-        str_folders = ";".join(self.video_folders)
-        self.config.write_content_value("Videos", "folders", str_folders)
+        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_videos_clicked(self, widget):
+    def on_button_edit_media_clicked(self, widget):
         """Edit currently selected folder"""
-        widget = self.widgets.get_widget("treeview_videos")
+        widget = self.widgets.get_widget("treeview_media")
         url_dialog = self.widgets.get_widget("url_dialog")
         url_entry = self.widgets.get_widget("url_entry")
         model = widget.get_model()
@@ -212,136 +222,36 @@
             # Update list model
             model.set_value(selection[1], 0, self.url)
             # Update configure file
-            pos = self.video_folders.index(folder)
-            self.video_folders.remove(folder)
-            self.video_folders.insert(pos, self.url)
-            str_folders = ";".join(self.video_folders)
-            self.config.write_content_value("Videos", "folders",
+            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("Videos", "download_metadata",
+        self.config.write_content_value("Media", "download_metadata",
             widget.get_active())
 
-    def on_button_add_music_clicked(self, widget):
-        """
-        Opens add URL dialog
-        @param widget: GTK-Widget
-        """
-        widget = self.widgets.get_widget("treeview_music")
-        model = widget.get_model()
-        # Open "Select folder" dialog
-        dialog =  gtk.FileChooserDialog(_("Select music 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.music_folders, "Music")
-        dialog.destroy()
-
-    def on_button_remove_music_clicked(self, widget):
-        """Remove currently selected folder from music folders"""
-        widget = self.widgets.get_widget("treeview_music")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        rm_folder = model.get_value(selection[1], 0)
-        self.music_folders.remove(rm_folder)
-        str_folders = ";".join(self.music_folders)
-        self.config.write_content_value("Music", "folders", str_folders)
-        model.remove(selection[1])
-
-    def on_button_edit_music_clicked(self, widget):
-        """Edit currently selected music folder"""
-        widget = self.widgets.get_widget("treeview_music")
-        url_dialog = self.widgets.get_widget("url_dialog")
-        url_entry = self.widgets.get_widget("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.music_folders.index(folder)
-            self.music_folders.remove(folder)
-            self.music_folders.insert(pos, self.url)
-            str_folders = ";".join(self.music_folders)
-            self.config.write_content_value("Music", "folders", str_folders)
-
-    def on_button_add_images_clicked(self, widget):
-        """Opens add URL dialog. """
-        widget = self.widgets.get_widget("treeview_images")
-        model = widget.get_model()
-        # Open "Select folder" dialog
-        dialog =  gtk.FileChooserDialog(_("Select image 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.image_folders, "Images")
-        dialog.destroy()
-
-    def on_button_remove_images_clicked(self, widget):
-        """Remove currently selected folder from images folders"""
-        widget = self.widgets.get_widget("treeview_images")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        rm_folder = model.get_value(selection[1], 0)
-        self.image_folders.remove(rm_folder)
-        str_folders = ";".join(self.image_folders)
-        self.config.write_content_value("Images", "folders", str_folders)
-        model.remove(selection[1])
-
-    def on_button_edit_images_clicked(self, widget):
-        """Edit currently selected music folder"""
-        widget = self.widgets.get_widget("treeview_images")
-        url_dialog = self.widgets.get_widget("url_dialog")
-        url_entry = self.widgets.get_widget("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.image_folders.index(folder)
-            self.image_folders.remove(folder)
-            self.image_folders.insert(pos, self.url)
-            str_folders = ";".join(self.image_folders)
-            self.config.write_content_value("Images", "folders",
-                str_folders)
-
-    def on_hidden_files_folders_checkbox_toggled(self, widget):
-        """If True hidden files and folders will be added to image library."""
-        self.config.write_content_value("Images",
-            "display_hidden_files_folders", widget.get_active())
-
     def on_button_add_feed_clicked(self, widget):
         """Opens add feed dialog. """
         widget = self.widgets.get_widget("treeview_feeds")
@@ -405,12 +315,17 @@
         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("Music", "download_lyrics",
+        self.config.write_content_value("Media", "download_lyrics",
             widget.get_active())
 
     def on_art_checkbox_toggled(self, widget):
-        self.config.write_content_value("Music", "download_album_art",
+        self.config.write_content_value("Media", "download_album_art",
             widget.get_active())
 
     def on_url_dialog_ok_button_clicked(self, widget):
@@ -555,14 +470,13 @@
         """
         self.on_location_find_button_clicked(widget)
 
-    def on_button_video_rebuild_clicked(self, widget):
-        """
-        Rebuild video cache requested
-        @param widget: GTK-Widget
-        """
+    def on_button_media_rebuild_clicked(self, widget):
+        '''Rebuild media cache requested.'''
         try:
-            proxy = MessageBusProxy(client_name = "Content Management GUI")
+            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:
@@ -575,46 +489,6 @@
             error.run()
             error.destroy()
 
-    def on_button_music_rebuild_clicked(self, widget):
-        """
-        Rebuild music cache requested
-        @param widget: GTK-Widget
-        """
-        try:
-            proxy = MessageBusProxy(client_name = "Content Management GUI")
-            proxy.connectToMessageBus()
-            proxy.sendMessage(Message(MessageType.REBUILD_MUSIC_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_image_rebuild_clicked(self, widget):
-        """
-        Rebuild image cache requested
-        @param widget: GTK-Widget
-        """
-        try:
-            proxy = MessageBusProxy(client_name = "Content Management GUI")
-            proxy.connectToMessageBus()
-            proxy.sendMessage(Message(MessageType.REBUILD_IMAGE_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
@@ -628,7 +502,7 @@
         #If user has ok'd the request send the message to the message bus
         if(status == gtk.RESPONSE_OK):
             try:
-                proxy = MessageBusProxy(client_name = "Content Management GUI")
+                proxy = MessageBusProxy(client_name = "Manager GUI")
                 proxy.connectToMessageBus()
                 proxy.sendMessage(Message(MessageType.REBUILD_FEED_CACHE))
                 proxy.disconnectFromMessageBus()
@@ -644,73 +518,141 @@
 
         dialog.destroy()
 
+    def on_theme_add_button_clicked(self, widget):
+        """Add theme button clicked"""
+        themelist = self.widgets.get_widget("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.widgets.get_widget("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.widgets.get_widget("theme_image")
+        image.set_from_file(os.path.join(themedir, "thumbnail.png"))
+        name = self.widgets.get_widget("name_label")
+        name.set_text(theme.getName())
+        author = self.widgets.get_widget("author_label")
+        author.set_text(theme.getAuthor())
+        license_label = self.widgets.get_widget("license_label")
+        license_label.set_text(theme.getLicence())
+        copyright_label = self.widgets.get_widget("copyright_label")
+        copyright_label.set_text(theme.getCopyright())
+        comment = self.widgets.get_widget("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.widgets.get_widget("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.widgets.get_widget("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 ==
-        videolist_widget = self.widgets.get_widget("treeview_videos")
-        videostore = gtk.ListStore(str)
+        medialist_widget = self.widgets.get_widget("treeview_media")
+        mediastore = gtk.ListStore(str)
 
         cell_renderer = gtk.CellRendererText()
         column = gtk.TreeViewColumn(_("Folders"), cell_renderer, text=0)
-        videolist_widget.append_column(column)
+        medialist_widget.append_column(column)
 
-        self.video_folders = self.config.get_video_folders()
+        self.media_folders = self.config.media_folders
 
         # Fill model with folders read from config file
-        self.init_model(videostore, self.video_folders)
+        self.init_model(mediastore, self.media_folders)
 
-        videolist_widget.set_model(videostore)
+        medialist_widget.set_model(mediastore)
 
         # Checkboxes
         metadata_checkbox = self.widgets.get_widget("video_metadata_checkbox")
-        md_val = self.config.download_video_metadata()
-        metadata_checkbox.set_active(md_val)
-
-        # == Music ==
-        musiclist_widget = self.widgets.get_widget("treeview_music")
-        music_model = gtk.ListStore(str)
-
-        music_cell = gtk.CellRendererText()
-        music_column = gtk.TreeViewColumn(_("Folders"), music_cell, text=0)
-        musiclist_widget.append_column(music_column)
-
-        self.music_folders = self.config.get_music_folders()
-
-        # Fill model with folders read from config file
-        self.init_model(music_model, self.music_folders)
-
-        musiclist_widget.set_model(music_model)
-
-        # Checkboxes
+        metadata_checkbox.set_active(self.config.download_metadata)
+
         art_checkbox = self.widgets.get_widget("art_checkbox")
-        art_val = self.config.download_album_art()
-        art_checkbox.set_active(art_val)
+        art_checkbox.set_active(self.config.download_album_art)
 
         lyrics_checkbox = self.widgets.get_widget("lyrics_checkbox")
-        lyrics_val = self.config.download_lyrics()
-        lyrics_checkbox.set_active(lyrics_val)
-
-        # == Images ==
-        imagelist_widget = self.widgets.get_widget("treeview_images")
-        images_model = gtk.ListStore(str)
-
-        img_cell = gtk.CellRendererText()
-        img_column = gtk.TreeViewColumn(_("Folders"), img_cell, text=0)
-        imagelist_widget.append_column(img_column)
-
-        self.image_folders = self.config.get_image_folders()
-
-        # Fill model with folders read from config file
-        self.init_model(images_model, self.image_folders)
-
-        imagelist_widget.set_model(images_model)
-
-        # Checkboxes
-        hidden_checkbox = self.widgets.get_widget(
-            "hidden_files_folders_checkbox")
-        hidden_val = self.config.display_hidden_files_folders()
-        hidden_checkbox.set_active(hidden_val)
+        lyrics_checkbox.set_active(self.config.download_lyrics)
 
         # == RSS-feeds ==
         feedlist_widget = self.widgets.get_widget("treeview_feeds")
@@ -720,7 +662,7 @@
         rss_column = gtk.TreeViewColumn(_("Feeds"), rss_cell, text=0)
         feedlist_widget.append_column(rss_column)
 
-        self.feeds = self.config.get_feeds()
+        self.feeds = self.config.feeds
 
         # Fill model with folders read from config file
         for i in range(len(self.feeds)):
@@ -730,14 +672,14 @@
 
         # Interval spinner
         interval_spinner = self.widgets.get_widget("fetch_interval_spinbutton")
-        interval_val = self.config.get_feed_fetch_interval()
+        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 location ==
+        # == Weather ==
         locationlist_widget = self.widgets.get_widget("treeview_locations")
         location_model = gtk.ListStore(str)
 
@@ -745,17 +687,15 @@
         location_column = gtk.TreeViewColumn(_("Location"), loc_cell, text=0)
         locationlist_widget.append_column(location_column)
 
-        self.weather_location = self.config.get_weather_location()
+        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)
 
-        # Checkboxes
         weather_display_checkbox = self.widgets.get_widget(
             "weather_display_checkbox")
-        display_val = self.config.display_weather_in_client()
+        display_val = self.config.display_weather_in_client
         weather_display_checkbox.set_active(display_val)
         if not display_val:
             self.widgets.get_widget("button_add_weather").set_sensitive(False)
@@ -763,6 +703,80 @@
                 False)
             self.widgets.get_widget("treeview_locations").set_sensitive(False)
 
+        # == User Interface ==
+        self.load_themes()
+        current_theme = self.config.theme_name
+
+        themelist_widget = self.widgets.get_widget("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.widgets.get_widget("checkbutton_effects")
+        effect_combobox = self.widgets.get_widget("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 glade 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.widgets.get_widget(
+            "checkbutton_fullscreen")
+        if self.config.start_in_fullscreen:
+            checkbutton_fullscreen.set_active(True)
+        else:
+            checkbutton_fullscreen.set_active(False)
+
+        checkbutton_autostart = self.widgets.get_widget("checkbutton_autostart")
+        if self.config.start_auto_server:
+            checkbutton_autostart.set_active(True)
+        else:
+            checkbutton_autostart.set_active(False)
+
+        checkbutton_systray_icon = self.widgets.get_widget(
+            "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.widgets.get_widget(
+            "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
@@ -787,6 +801,14 @@
             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:
     """
@@ -814,7 +836,7 @@
     gladefile = os.path.join(GLADE_DIR, "log_dialog.glade")
 
     def __init__(self, stand_alone):
-        self.logfile_entertainer = Configuration().ENTERTAINER_LOG
+        self.logfile_entertainer = Configuration().LOG
         self.logger = Logger().getLogger('utils.log_viewer')
 
         self.__STAND_ALONE = stand_alone
@@ -1086,300 +1108,3 @@
         return True
 
 
-class PreferencesDialog:
-    """This is a preferences editing tool for Entertainer media center."""
-
-    # Glade file location
-    GLADE_DIR = os.path.join(os.path.dirname(__file__), "glade")
-
-    def __init__(self, stand_alone):
-        """
-        Initialize Preferenced dialog
-        @param stand_alone: Is this dialog stand alone process or part of
-            client
-        """
-        # Is this dialog running as a stand alone process
-        self.STAND_ALONE = stand_alone
-        self.themes = []
-        self.config = Configuration()
-
-        # Load glade UI
-        self.gladefile = os.path.join(self.GLADE_DIR,
-            "entertainer-preferences.glade")
-        self.widgets = gtk.glade.XML(self.gladefile)
-
-        # Get preferences dialog and bind signal callbacks
-        self.pref_dialog = self.widgets.get_widget("PreferencesDialog")
-        if (self.pref_dialog):
-            callback_dic = {
-                "on_close_button_clicked" : self.on_close_button_clicked,
-                "on_PreferencesDialog_delete_event" : self.on_dialog_closed,
-                "on_theme_list_cursor_changed" :
-                    self.on_theme_list_cursor_changed,
-                "on_checkbutton_autostart_toggled" :
-                    self.on_checkbutton_autostart_toggled,
-                "on_checkbutton_fullscreen_toggled" :
-                    self.on_checkbutton_fullscreen_toggled,
-                "on_checkbutton_systray_icon_toggled" :
-                    self.on_checkbutton_systray_icon_toggled,
-                "on_effect_checkbox_toggled" : self.on_effect_checkbox_toggled,
-                "on_effect_combobox_changed" : self.on_effect_combobox_changed,
-                "on_add_button_clicked" : self.on_add_button_clicked,
-                "on_remove_button_clicked" : self.on_remove_button_clicked,
-                "on_spinbutton_slideshow_step_value_changed":
-                    self.on_spinbutton_slideshow_step_value_changed
-            }
-        self.widgets.signal_autoconnect(callback_dic)
-
-        # Initilize dialog widgets with correct values and show dialog
-        self.init_dialog_values_from_configure_file()
-        #self.pref_dialog.resize(500,400)
-        self.pref_dialog.show()
-
-    def load_themes(self):
-        """Load themes"""
-        themes = os.listdir(os.path.join(self.config.get_cfg_dir(), 'themes'))
-        for element in themes:
-            theme = os.path.join(self.config.get_cfg_dir(), 'themes', element)
-            if os.path.isdir(theme):
-                self.themes.append(element)
-
-    def on_add_button_clicked(self, widget):
-        """Add theme button clicked"""
-        themelist = self.widgets.get_widget("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.get_cfg_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_remove_button_clicked(self, widget):
-        """Remove theme button clicked"""
-        # Get currently selected theme
-        themelist = self.widgets.get_widget("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.get_cfg_dir(), 'themes', name)
-            shutil.rmtree(themedir)
-            model.remove(selection[1])
-            themelist.set_cursor(0)
-            self.themes.remove(name)
-
-    def on_theme_list_cursor_changed(self, widget):
-        """Executed when theme is changed in theme list. Update preview."""
-        # Get currently selected theme
-        themelist = self.widgets.get_widget("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.get_cfg_dir(), 'themes', name)
-        theme = Theme(theme_path=themedir)
-
-        # Update preview
-        image = self.widgets.get_widget("theme_image")
-        image.set_from_file(os.path.join(themedir, "thumbnail.png"))
-        name = self.widgets.get_widget("name_label")
-        name.set_text(theme.getName())
-        author = self.widgets.get_widget("author_label")
-        author.set_text(theme.getAuthor())
-        licence = self.widgets.get_widget("licence_label")
-        licence.set_text(theme.getLicence())
-        copyright_label = self.widgets.get_widget("copyright_label")
-        copyright_label.set_text(theme.getCopyright())
-        comment = self.widgets.get_widget("comment_label")
-        comment.set_text(theme.getComment())
-
-        self.config.write_preference_value("General", "theme", name.get_text())
-
-    def on_checkbutton_autostart_toggled(self, widget):
-        """Server Autostart checkbox toggled"""
-        self.config.write_preference_value("General", "start_server_auto",
-            widget.get_active())
-
-    def on_checkbutton_fullscreen_toggled(self, widget):
-        """Start in fullscreen checkbox toggled"""
-        self.config.write_preference_value("General", "start_in_fullscreen",
-            widget.get_active())
-
-    def on_checkbutton_systray_icon_toggled(self, widget):
-        """System Tray Icon checkbox toggled"""
-        self.config.write_preference_value("General", "display_icon",
-            widget.get_active())
-
-    def on_effect_checkbox_toggled(self, widget):
-        """Effect checkbox toggled"""
-        combobox = self.widgets.get_widget("effect_combobox")
-        combobox.set_sensitive(widget.get_active())
-        self.config.write_preference_value("General", "show_effects",
-            widget.get_active())
-
-    def on_effect_combobox_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_preference_value("General", "transition_effect",
-            english_text)
-
-    def on_spinbutton_slideshow_step_value_changed(self, widget):
-        """Activation of slideshow effects"""
-        self.config.write_preference_value("Photographs", "slideshow_step",
-            int(widget.get_value()))
-
-    def on_dialog_closed(self, widget, after):
-        """Callback function for dialog's close button"""
-        self.close()
-
-    def on_close_button_clicked(self, widget):
-        """Callback function for dialog's close button"""
-        self.close()
-
-    def close(self):
-        """Close Dialog"""
-        try:
-            proxy = MessageBusProxy(client_name = "Preferences GUI")
-            proxy.connectToMessageBus()
-            proxy.sendMessage(Message(MessageType.PREFERENCES_CONF_UPDATED))
-            proxy.disconnectFromMessageBus()
-        except socket.error:
-            error = gtk.MessageDialog(
-                    None, gtk.DIALOG_MODAL,
-                    gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, _(
-                        "Entertainer backend is not running. "
-                        "Config updates will happen on backend restart."
-                    ))
-            error.run()
-            error.destroy()
-
-
-        if(self.STAND_ALONE):
-            self.pref_dialog.hide()
-            self.pref_dialog.destroy()
-            gtk.main_quit()
-        else:
-            self.pref_dialog.hide()
-            self.pref_dialog.destroy()
-
-    def init_dialog_values_from_configure_file(self):
-        """Read configure file and set dialog widget values with read values.
-        """
-        self.load_themes()
-        current_theme = self.config.get_theme_name()
-
-        themelist_widget = self.widgets.get_widget("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
-
-        # Checkboxes
-        checkbutton_systray_icon = self.widgets.get_widget(
-            "checkbutton_systray_icon")
-        if self.config.tray_icon_enabled():
-            checkbutton_systray_icon.set_active(True)
-        else:
-            checkbutton_systray_icon.set_active(False)
-
-        checkbutton_autostart = self.widgets.get_widget("checkbutton_autostart")
-        if self.config.start_auto_server():
-            checkbutton_autostart.set_active(True)
-        else:
-            checkbutton_autostart.set_active(False)
-
-        checkbutton_fullscreen = self.widgets.get_widget(
-            "checkbutton_fullscreen")
-        if self.config.start_in_fullscreen():
-            checkbutton_fullscreen.set_active(True)
-        else:
-            checkbutton_fullscreen.set_active(False)
-
-        effect_checkbox = self.widgets.get_widget("effect_checkbox")
-        effect_combobox = self.widgets.get_widget("effect_combobox")
-        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)
-
-        spinbutton_slideshow_step = self.widgets.get_widget(
-            "spinbutton_slideshow_step")
-        spinbutton_slideshow_step.set_value(self.config.get_slideshow_step())
-
-        # Set Effect Combobox value (Text values are set in glade 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)
-

=== removed file 'entertainerlib/glade/entertainer-preferences.glade'
--- entertainerlib/glade/entertainer-preferences.glade	2009-03-08 22:29:55 +0000
+++ entertainerlib/glade/entertainer-preferences.glade	1970-01-01 00:00:00 +0000
@@ -1,1223 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkDialog" id="PreferencesDialog">
-  <property name="border_width">5</property>
-  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-  <property name="title" translatable="yes">Preferences</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon_name">gtk-preferences</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-  <signal name="delete_event" handler="on_PreferencesDialog_delete_event"/>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-    <widget class="GtkHButtonBox" id="dialog-action_area1">
-      <property name="visible">True</property>
-      <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-      <child>
-        <widget class="GtkButton" id="close_button">
-          <property name="visible">True</property>
-          <property name="can_focus">True</property>
-          <property name="label">gtk-close</property>
-          <property name="use_stock">True</property>
-          <property name="relief">GTK_RELIEF_NORMAL</property>
-          <property name="focus_on_click">True</property>
-          <property name="response_id">0</property>
-          <signal name="clicked" handler="on_close_button_clicked"/>
-        </widget>
-      </child>
-    </widget>
-    <packing>
-      <property name="padding">0</property>
-      <property name="expand">False</property>
-      <property name="fill">True</property>
-      <property name="pack_type">GTK_PACK_END</property>
-    </packing>
-      </child>
-
-      <child>
-    <widget class="GtkNotebook" id="notebook1">
-      <property name="visible">True</property>
-      <property name="can_focus">True</property>
-      <property name="show_tabs">True</property>
-      <property name="show_border">True</property>
-      <property name="tab_pos">GTK_POS_TOP</property>
-      <property name="scrollable">False</property>
-      <property name="enable_popup">False</property>
-
-      <child>
-        <widget class="GtkVBox" id="vbox4">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-        <widget class="GtkFrame" id="frame3">
-          <property name="border_width">5</property>
-          <property name="visible">True</property>
-          <property name="label_xalign">0</property>
-          <property name="label_yalign">0.5</property>
-          <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-          <child>
-            <widget class="GtkAlignment" id="alignment3">
-              <property name="visible">True</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xscale">1</property>
-              <property name="yscale">1</property>
-              <property name="top_padding">0</property>
-              <property name="bottom_padding">0</property>
-              <property name="left_padding">12</property>
-              <property name="right_padding">0</property>
-
-              <child>
-            <widget class="GtkVBox" id="vbox5">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkCheckButton" id="checkbutton_autostart">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="label" translatable="yes">Start server automatically</property>
-                  <property name="use_underline">True</property>
-                  <property name="relief">GTK_RELIEF_NORMAL</property>
-                  <property name="focus_on_click">True</property>
-                  <property name="active">False</property>
-                  <property name="inconsistent">False</property>
-                  <property name="draw_indicator">True</property>
-                  <signal name="toggled" handler="on_checkbutton_autostart_toggled"/>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkCheckButton" id="checkbutton_systray_icon">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="label" translatable="yes">Display system tray icon in notification area</property>
-                  <property name="use_underline">True</property>
-                  <property name="relief">GTK_RELIEF_NORMAL</property>
-                  <property name="focus_on_click">True</property>
-                  <property name="active">False</property>
-                  <property name="inconsistent">False</property>
-                  <property name="draw_indicator">True</property>
-                  <signal name="toggled" handler="on_checkbutton_systray_icon_toggled"/>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkCheckButton" id="checkbutton_fullscreen">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="label" translatable="yes">Start in fullscreen</property>
-                  <property name="use_underline">True</property>
-                  <property name="relief">GTK_RELIEF_NORMAL</property>
-                  <property name="focus_on_click">True</property>
-                  <property name="active">False</property>
-                  <property name="inconsistent">False</property>
-                  <property name="draw_indicator">True</property>
-                  <signal name="toggled" handler="on_checkbutton_fullscreen_toggled" last_modification_time="Sun, 08 Mar 2009 21:58:45 GMT"/>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-            </widget>
-              </child>
-            </widget>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label15">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">&lt;b&gt;Server settings&lt;/b&gt;</property>
-              <property name="use_underline">False</property>
-              <property name="use_markup">True</property>
-              <property name="justify">GTK_JUSTIFY_LEFT</property>
-              <property name="wrap">False</property>
-              <property name="selectable">False</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xpad">0</property>
-              <property name="ypad">0</property>
-              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-              <property name="width_chars">-1</property>
-              <property name="single_line_mode">False</property>
-              <property name="angle">0</property>
-            </widget>
-            <packing>
-              <property name="type">label_item</property>
-            </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">5</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-          </child>
-
-          <child>
-        <widget class="GtkFrame" id="frame4">
-          <property name="border_width">5</property>
-          <property name="label_xalign">0</property>
-          <property name="label_yalign">0.5</property>
-          <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-          <child>
-            <widget class="GtkAlignment" id="alignment4">
-              <property name="visible">True</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xscale">1</property>
-              <property name="yscale">1</property>
-              <property name="top_padding">0</property>
-              <property name="bottom_padding">0</property>
-              <property name="left_padding">12</property>
-              <property name="right_padding">0</property>
-
-              <child>
-            <widget class="GtkVBox" id="vbox6">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkHBox" id="hbox9">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                <widget class="GtkSpinButton" id="spinbutton1">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  <property name="climb_rate">1</property>
-                  <property name="digits">0</property>
-                  <property name="numeric">False</property>
-                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                  <property name="snap_to_ticks">False</property>
-                  <property name="wrap">False</property>
-                  <property name="adjustment">0 0 100 1 10 0</property>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">False</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-
-                  <child>
-                <widget class="GtkLabel" id="label26">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Screen history size</property>
-                  <property name="use_underline">False</property>
-                  <property name="use_markup">False</property>
-                  <property name="justify">GTK_JUSTIFY_LEFT</property>
-                  <property name="wrap">False</property>
-                  <property name="selectable">False</property>
-                  <property name="xalign">0.5</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xpad">0</property>
-                  <property name="ypad">0</property>
-                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                  <property name="width_chars">-1</property>
-                  <property name="single_line_mode">False</property>
-                  <property name="angle">0</property>
-                </widget>
-                <packing>
-                  <property name="padding">5</property>
-                  <property name="expand">False</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <placeholder/>
-              </child>
-
-              <child>
-                <placeholder/>
-              </child>
-            </widget>
-              </child>
-            </widget>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label16">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">&lt;b&gt;What comes here?&lt;/b&gt;</property>
-              <property name="use_underline">False</property>
-              <property name="use_markup">True</property>
-              <property name="justify">GTK_JUSTIFY_LEFT</property>
-              <property name="wrap">False</property>
-              <property name="selectable">False</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xpad">0</property>
-              <property name="ypad">0</property>
-              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-              <property name="width_chars">-1</property>
-              <property name="single_line_mode">False</property>
-              <property name="angle">0</property>
-            </widget>
-            <packing>
-              <property name="type">label_item</property>
-            </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">5</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="tab_expand">False</property>
-          <property name="tab_fill">True</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkLabel" id="label1">
-          <property name="visible">True</property>
-          <property name="label" translatable="yes">General</property>
-          <property name="use_underline">False</property>
-          <property name="use_markup">False</property>
-          <property name="justify">GTK_JUSTIFY_LEFT</property>
-          <property name="wrap">False</property>
-          <property name="selectable">False</property>
-          <property name="xalign">0.5</property>
-          <property name="yalign">0.5</property>
-          <property name="xpad">0</property>
-          <property name="ypad">0</property>
-          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-          <property name="width_chars">-1</property>
-          <property name="single_line_mode">False</property>
-          <property name="angle">0</property>
-        </widget>
-        <packing>
-          <property name="type">tab</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox_user_interface">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-        <widget class="GtkFrame" id="frame_effects">
-          <property name="border_width">5</property>
-          <property name="visible">True</property>
-          <property name="label_xalign">0</property>
-          <property name="label_yalign">0.5</property>
-          <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-          <child>
-            <widget class="GtkAlignment" id="alignment5">
-              <property name="visible">True</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xscale">1</property>
-              <property name="yscale">1</property>
-              <property name="top_padding">0</property>
-              <property name="bottom_padding">0</property>
-              <property name="left_padding">12</property>
-              <property name="right_padding">0</property>
-
-              <child>
-            <widget class="GtkVBox" id="vbox7">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkCheckButton" id="effect_checkbox">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="label" translatable="yes">Show user interface effects</property>
-                  <property name="use_underline">True</property>
-                  <property name="relief">GTK_RELIEF_NORMAL</property>
-                  <property name="focus_on_click">True</property>
-                  <property name="active">False</property>
-                  <property name="inconsistent">False</property>
-                  <property name="draw_indicator">True</property>
-                  <signal name="toggled" handler="on_effect_checkbox_toggled"/>
-                </widget>
-                <packing>
-                  <property name="padding">5</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkHBox" id="hbox1">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                <widget class="GtkLabel" id="label19">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Screen change effect</property>
-                  <property name="use_underline">False</property>
-                  <property name="use_markup">False</property>
-                  <property name="justify">GTK_JUSTIFY_LEFT</property>
-                  <property name="wrap">False</property>
-                  <property name="selectable">False</property>
-                  <property name="xalign">0</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xpad">0</property>
-                  <property name="ypad">0</property>
-                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                  <property name="width_chars">-1</property>
-                  <property name="single_line_mode">False</property>
-                  <property name="angle">0</property>
-                </widget>
-                <packing>
-                  <property name="padding">5</property>
-                  <property name="expand">False</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-
-                  <child>
-                <widget class="GtkComboBox" id="effect_combobox">
-                  <property name="visible">True</property>
-                  <property name="items" translatable="yes">No effect
-Crossfade
-Zoom and fade
-Slide</property>
-                  <property name="add_tearoffs">False</property>
-                  <property name="focus_on_click">True</property>
-                  <signal name="changed" handler="on_effect_combobox_changed"/>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-            </widget>
-              </child>
-            </widget>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label17">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">&lt;b&gt;Effects&lt;/b&gt;</property>
-              <property name="use_underline">False</property>
-              <property name="use_markup">True</property>
-              <property name="justify">GTK_JUSTIFY_LEFT</property>
-              <property name="wrap">False</property>
-              <property name="selectable">False</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xpad">0</property>
-              <property name="ypad">0</property>
-              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-              <property name="width_chars">-1</property>
-              <property name="single_line_mode">False</property>
-              <property name="angle">0</property>
-            </widget>
-            <packing>
-              <property name="type">label_item</property>
-            </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">5</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-        </packing>
-          </child>
-
-          <child>
-        <widget class="GtkFrame" id="frame_themes">
-          <property name="border_width">5</property>
-          <property name="visible">True</property>
-          <property name="label_xalign">0</property>
-          <property name="label_yalign">0.5</property>
-          <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-          <child>
-            <widget class="GtkAlignment" id="alignment6">
-              <property name="visible">True</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xscale">1</property>
-              <property name="yscale">1</property>
-              <property name="top_padding">0</property>
-              <property name="bottom_padding">0</property>
-              <property name="left_padding">12</property>
-              <property name="right_padding">0</property>
-
-              <child>
-            <widget class="GtkHBox" id="hbox2">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                  <property name="shadow_type">GTK_SHADOW_IN</property>
-                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                  <child>
-                <widget class="GtkTreeView" id="theme_list">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  <property name="headers_visible">False</property>
-                  <property name="rules_hint">False</property>
-                  <property name="reorderable">False</property>
-                  <property name="enable_search">False</property>
-                  <property name="fixed_height_mode">False</property>
-                  <property name="hover_selection">False</property>
-                  <property name="hover_expand">False</property>
-                  <signal name="cursor_changed" handler="on_theme_list_cursor_changed"/>
-                </widget>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkVButtonBox" id="vbuttonbox1">
-                  <property name="visible">True</property>
-                  <property name="layout_style">GTK_BUTTONBOX_START</property>
-                  <property name="spacing">5</property>
-
-                  <child>
-                <widget class="GtkButton" id="add_button">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="label">gtk-add</property>
-                  <property name="use_stock">True</property>
-                  <property name="relief">GTK_RELIEF_NORMAL</property>
-                  <property name="focus_on_click">True</property>
-                  <signal name="clicked" handler="on_add_button_clicked"/>
-                </widget>
-                  </child>
-
-                  <child>
-                <widget class="GtkButton" id="remove_button">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="label">gtk-remove</property>
-                  <property name="use_stock">True</property>
-                  <property name="relief">GTK_RELIEF_NORMAL</property>
-                  <property name="focus_on_click">True</property>
-                  <signal name="clicked" handler="on_remove_button_clicked"/>
-                </widget>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">10</property>
-                  <property name="expand">False</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-            </widget>
-              </child>
-            </widget>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label18">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">&lt;b&gt;Themes&lt;/b&gt;</property>
-              <property name="use_underline">False</property>
-              <property name="use_markup">True</property>
-              <property name="justify">GTK_JUSTIFY_LEFT</property>
-              <property name="wrap">False</property>
-              <property name="selectable">False</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xpad">0</property>
-              <property name="ypad">5</property>
-              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-              <property name="width_chars">-1</property>
-              <property name="single_line_mode">False</property>
-              <property name="angle">0</property>
-            </widget>
-            <packing>
-              <property name="type">label_item</property>
-            </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">5</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-          </child>
-
-          <child>
-        <widget class="GtkFrame" id="frame_theme_information">
-          <property name="border_width">5</property>
-          <property name="visible">True</property>
-          <property name="label_xalign">0</property>
-          <property name="label_yalign">0.5</property>
-          <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-          <child>
-            <widget class="GtkAlignment" id="alignment7">
-              <property name="visible">True</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xscale">1</property>
-              <property name="yscale">1</property>
-              <property name="top_padding">0</property>
-              <property name="bottom_padding">0</property>
-              <property name="left_padding">12</property>
-              <property name="right_padding">0</property>
-
-              <child>
-            <widget class="GtkHBox" id="hbox3">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkImage" id="theme_image">
-                  <property name="visible">True</property>
-                  <property name="stock">gtk-missing-image</property>
-                  <property name="icon_size">4</property>
-                  <property name="xalign">0.5</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xpad">0</property>
-                  <property name="ypad">0</property>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">False</property>
-                  <property name="fill">False</property>
-                </packing>
-              </child>
-
-              <child>
-                <widget class="GtkVBox" id="vbox8">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                <widget class="GtkHBox" id="hbox4">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label21">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">&lt;b&gt;Name:&lt;/b&gt;</property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">True</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">5</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">5</property>
-                      <property name="expand">False</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="name_label">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes"></property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">False</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">0</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-
-                  <child>
-                <widget class="GtkHBox" id="hbox5">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label22">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">&lt;b&gt;Author:&lt;/b&gt;</property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">True</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">5</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">5</property>
-                      <property name="expand">False</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="author_label">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes"></property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">False</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">0</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-
-                  <child>
-                <widget class="GtkHBox" id="hbox6">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label23">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">&lt;b&gt;Licence:&lt;/b&gt;</property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">True</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">5</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">5</property>
-                      <property name="expand">False</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="licence_label">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes"></property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">False</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">0</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-
-                  <child>
-                <widget class="GtkHBox" id="hbox8">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label24">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">&lt;b&gt;Copyright:&lt;/b&gt;</property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">True</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">5</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">5</property>
-                      <property name="expand">False</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="copyright_label">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes"></property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">False</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">0</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-
-                  <child>
-                <widget class="GtkHBox" id="hbox7">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                    <widget class="GtkLabel" id="label25">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">&lt;b&gt;Comment:&lt;/b&gt;</property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">True</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">False</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">5</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">5</property>
-                      <property name="expand">False</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-
-                  <child>
-                    <widget class="GtkLabel" id="comment_label">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes"></property>
-                      <property name="use_underline">False</property>
-                      <property name="use_markup">False</property>
-                      <property name="justify">GTK_JUSTIFY_LEFT</property>
-                      <property name="wrap">True</property>
-                      <property name="selectable">False</property>
-                      <property name="xalign">0</property>
-                      <property name="yalign">0.5</property>
-                      <property name="xpad">0</property>
-                      <property name="ypad">0</property>
-                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                      <property name="width_chars">-1</property>
-                      <property name="single_line_mode">False</property>
-                      <property name="angle">0</property>
-                    </widget>
-                    <packing>
-                      <property name="padding">0</property>
-                      <property name="expand">True</property>
-                      <property name="fill">True</property>
-                    </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-            </widget>
-              </child>
-            </widget>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="label20">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">&lt;b&gt;Theme information&lt;/b&gt;</property>
-              <property name="use_underline">False</property>
-              <property name="use_markup">True</property>
-              <property name="justify">GTK_JUSTIFY_LEFT</property>
-              <property name="wrap">False</property>
-              <property name="selectable">False</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xpad">0</property>
-              <property name="ypad">5</property>
-              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-              <property name="width_chars">-1</property>
-              <property name="single_line_mode">False</property>
-              <property name="angle">0</property>
-            </widget>
-            <packing>
-              <property name="type">label_item</property>
-            </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">0</property>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
-        </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="tab_expand">False</property>
-          <property name="tab_fill">True</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkLabel" id="label2">
-          <property name="visible">True</property>
-          <property name="label" translatable="yes">User interface</property>
-          <property name="use_underline">False</property>
-          <property name="use_markup">False</property>
-          <property name="justify">GTK_JUSTIFY_LEFT</property>
-          <property name="wrap">False</property>
-          <property name="selectable">False</property>
-          <property name="xalign">0.5</property>
-          <property name="yalign">0.5</property>
-          <property name="xpad">0</property>
-          <property name="ypad">0</property>
-          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-          <property name="width_chars">-1</property>
-          <property name="single_line_mode">False</property>
-          <property name="angle">0</property>
-        </widget>
-        <packing>
-          <property name="type">tab</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkVBox" id="vbox_photographs">
-          <property name="visible">True</property>
-          <property name="homogeneous">False</property>
-          <property name="spacing">0</property>
-
-          <child>
-        <widget class="GtkFrame" id="fphotographs">
-          <property name="visible">True</property>
-          <property name="label_xalign">0</property>
-          <property name="label_yalign">0.5</property>
-          <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-          <child>
-            <widget class="GtkAlignment" id="aphotographs1">
-              <property name="visible">True</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xscale">1</property>
-              <property name="yscale">1</property>
-              <property name="top_padding">0</property>
-              <property name="bottom_padding">0</property>
-              <property name="left_padding">12</property>
-              <property name="right_padding">0</property>
-
-              <child>
-            <widget class="GtkVBox" id="vbox10">
-              <property name="visible">True</property>
-              <property name="homogeneous">False</property>
-              <property name="spacing">0</property>
-
-              <child>
-                <widget class="GtkHBox" id="hbphotographs">
-                  <property name="visible">True</property>
-                  <property name="homogeneous">False</property>
-                  <property name="spacing">0</property>
-
-                  <child>
-                <widget class="GtkSpinButton" id="spinbutton_slideshow_step">
-                  <property name="visible">True</property>
-                  <property name="can_focus">True</property>
-                  <property name="climb_rate">1</property>
-                  <property name="digits">0</property>
-                  <property name="numeric">True</property>
-                  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                  <property name="snap_to_ticks">True</property>
-                  <property name="wrap">False</property>
-                  <property name="adjustment">5 1 100 1 10 0</property>
-                  <signal name="value_changed" handler="on_spinbutton_slideshow_step_value_changed"/>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-
-                  <child>
-                <widget class="GtkLabel" id="lslideshowstep">
-                  <property name="visible">True</property>
-                  <property name="label" translatable="yes">Slideshow step (in seconds)</property>
-                  <property name="use_underline">False</property>
-                  <property name="use_markup">False</property>
-                  <property name="justify">GTK_JUSTIFY_LEFT</property>
-                  <property name="wrap">False</property>
-                  <property name="selectable">False</property>
-                  <property name="xalign">0.5</property>
-                  <property name="yalign">0.5</property>
-                  <property name="xpad">0</property>
-                  <property name="ypad">0</property>
-                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                  <property name="width_chars">-1</property>
-                  <property name="single_line_mode">False</property>
-                  <property name="angle">0</property>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">True</property>
-                  <property name="fill">True</property>
-                </packing>
-                  </child>
-                </widget>
-                <packing>
-                  <property name="padding">0</property>
-                  <property name="expand">False</property>
-                  <property name="fill">True</property>
-                </packing>
-              </child>
-            </widget>
-              </child>
-            </widget>
-          </child>
-
-          <child>
-            <widget class="GtkLabel" id="lslideshow">
-              <property name="visible">True</property>
-              <property name="label" translatable="yes">&lt;b&gt;Slideshow&lt;/b&gt;</property>
-              <property name="use_underline">False</property>
-              <property name="use_markup">True</property>
-              <property name="justify">GTK_JUSTIFY_LEFT</property>
-              <property name="wrap">False</property>
-              <property name="selectable">False</property>
-              <property name="xalign">0.5</property>
-              <property name="yalign">0.5</property>
-              <property name="xpad">0</property>
-              <property name="ypad">0</property>
-              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-              <property name="width_chars">-1</property>
-              <property name="single_line_mode">False</property>
-              <property name="angle">0</property>
-            </widget>
-            <packing>
-              <property name="type">label_item</property>
-            </packing>
-          </child>
-        </widget>
-        <packing>
-          <property name="padding">5</property>
-          <property name="expand">True</property>
-          <property name="fill">True</property>
-        </packing>
-          </child>
-
-          <child>
-        <placeholder/>
-          </child>
-
-          <child>
-        <placeholder/>
-          </child>
-        </widget>
-        <packing>
-          <property name="tab_expand">False</property>
-          <property name="tab_fill">True</property>
-        </packing>
-      </child>
-
-      <child>
-        <widget class="GtkLabel" id="LPhotographs">
-          <property name="visible">True</property>
-          <property name="label" translatable="yes">Photographs</property>
-          <property name="use_underline">False</property>
-          <property name="use_markup">False</property>
-          <property name="justify">GTK_JUSTIFY_LEFT</property>
-          <property name="wrap">False</property>
-          <property name="selectable">False</property>
-          <property name="xalign">0.5</property>
-          <property name="yalign">0.5</property>
-          <property name="xpad">0</property>
-          <property name="ypad">0</property>
-          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-          <property name="width_chars">-1</property>
-          <property name="single_line_mode">False</property>
-          <property name="angle">0</property>
-        </widget>
-        <packing>
-          <property name="type">tab</property>
-        </packing>
-      </child>
-    </widget>
-    <packing>
-      <property name="padding">0</property>
-      <property name="expand">True</property>
-      <property name="fill">True</property>
-    </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>

=== renamed file 'entertainerlib/glade/entertainer-content-management.glade' => 'entertainerlib/glade/manager.glade'
--- entertainerlib/glade/entertainer-content-management.glade	2009-05-31 16:36:18 +0000
+++ entertainerlib/glade/manager.glade	2009-08-23 01:01:18 +0000
@@ -1,1481 +1,2170 @@
-<?xml version="1.0"?>
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
 <glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkDialog" id="ContentManagementDialog">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Content management</property>
-    <property name="modal">True</property>
-    <property name="window_position">center</property>
-    <property name="icon_name">applications-multimedia</property>
-    <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
-    <signal name="destroy" handler="on_ContentManagementDialog_destroy"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-layout">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkNotebook" id="tabs">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="has_focus">True</property>
-            <property name="can_default">True</property>
-            <property name="has_default">True</property>
-            <child>
-              <widget class="GtkVBox" id="vbox_videos">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkVBox" id="vbox1">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkFrame" id="frame_video_lib1">
-                        <property name="visible">True</property>
-                        <property name="border_width">5</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment1">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <widget class="GtkVBox" id="vbox2">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkLabel" id="label_video_folder_tip1">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Entertainer video library scans data from the listed folders.</property>
-                                    <property name="single_line_mode">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkHBox" id="hbox2">
-                                    <property name="visible">True</property>
-                                    <child>
-                                      <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="hscrollbar_policy">automatic</property>
-                                        <property name="vscrollbar_policy">automatic</property>
-                                        <property name="shadow_type">in</property>
-                                        <child>
-                                          <widget class="GtkTreeView" id="treeview_videos">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                            <property name="enable_search">False</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkVButtonBox" id="vbuttonbox1">
-                                        <property name="visible">True</property>
-                                        <property name="spacing">5</property>
-                                        <property name="layout_style">start</property>
-                                        <child>
-                                          <widget class="GtkButton" id="button_add_videos">
-                                            <property name="label">gtk-add</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="has_focus">True</property>
-                                            <property name="can_default">True</property>
-                                            <property name="has_default">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="use_stock">True</property>
-                                            <signal name="clicked" handler="on_button_add_videos_clicked"/>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkButton" id="button_remove_videos">
-                                            <property name="label">gtk-remove</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="use_stock">True</property>
-                                            <signal name="clicked" handler="on_button_remove_videos_clicked"/>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <widget class="GtkButton" id="button_edit_videos">
-                                            <property name="label">gtk-edit</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="use_stock">True</property>
-                                            <signal name="clicked" handler="on_button_edit_videos_clicked"/>
-                                          </widget>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="padding">5</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label_video_library1">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Video library&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkFrame" id="frame1">
-                        <property name="visible">True</property>
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">none</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment2">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="video_metadata_checkbox">
-                                <property name="label" translatable="yes">Download movie and TV-series metadata</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_checkbutton_video_metadata_toggled"/>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Video library settings&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label_video3">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="has_default">True</property>
-                <property name="label" translatable="yes">Videos</property>
-              </widget>
-              <packing>
-                <property name="tab_fill">False</property>
-                <property name="type">tab</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox_music">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkFrame" id="frame_music_folders3">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment9">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox12">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkLabel" id="label8">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Entertainer music library scans data from the listed folders.</property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkHBox" id="hbox12">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkScrolledWindow" id="scrolledwindow5">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <widget class="GtkTreeView" id="treeview_music">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="enable_search">False</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkVButtonBox" id="vbuttonbox6">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">5</property>
-                                    <property name="layout_style">start</property>
-                                    <child>
-                                      <widget class="GtkButton" id="button_add_music">
-                                        <property name="label">gtk-add</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_add_music_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" id="button_remove_music">
-                                        <property name="label">gtk-remove</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_remove_music_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" id="button_edit_music">
-                                        <property name="label">gtk-edit</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_edit_music_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label_music_folders3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Music library&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame_music_lib_settings3">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment10">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox13">
-                            <property name="visible">True</property>
-                            <property name="homogeneous">True</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="art_checkbox">
-                                <property name="label" translatable="yes">Download album cover art</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_art_checkbox_toggled"/>
-                              </widget>
-                              <packing>
-                                <property name="padding">5</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="lyrics_checkbox">
-                                <property name="label" translatable="yes">Download song lyrics</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_lyrics_checkbox_toggled"/>
-                              </widget>
-                              <packing>
-                                <property name="padding">5</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label9">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Music library settings&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label10">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Music</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-                <property name="type">tab</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox14">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkFrame" id="frame_image_folders3">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment11">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox15">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkLabel" id="label_music_tip3">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Entertainer image library scans data from the listed folders.</property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkHBox" id="hbox14">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkScrolledWindow" id="scrolledwindow6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <widget class="GtkTreeView" id="treeview_images">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="enable_search">False</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkVButtonBox" id="vbuttonbox7">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">5</property>
-                                    <property name="layout_style">start</property>
-                                    <child>
-                                      <widget class="GtkButton" id="button_add_images">
-                                        <property name="label">gtk-add</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_add_images_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" id="button_remove_images">
-                                        <property name="label">gtk-remove</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_remove_images_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" id="button_edit_images">
-                                        <property name="label">gtk-edit</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_edit_images_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label11">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Image library&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame_image_lib_settings3">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment12">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox16">
-                            <property name="visible">True</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="hidden_files_folders_checkbox">
-                                <property name="label" translatable="yes">Display hidden files and folders in image library</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_hidden_files_folders_checkbox_toggled"/>
-                              </widget>
-                              <packing>
-                                <property name="padding">5</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label_image_lib_settings3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Image library settings&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label_images3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Images</property>
-              </widget>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-                <property name="type">tab</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox_feeds">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkFrame" id="frame_rss_feeds3">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment13">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox17">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkLabel" id="label_rss_tip3">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Below is a list of RSS feeds that are displayd in Entertainer.</property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkHBox" id="hbox16">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkScrolledWindow" id="scrolledwindow_rss3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <widget class="GtkTreeView" id="treeview_feeds">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="enable_search">False</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkVButtonBox" id="vbuttonbox8">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">5</property>
-                                    <property name="layout_style">start</property>
-                                    <child>
-                                      <widget class="GtkButton" id="button_add_feed">
-                                        <property name="label">gtk-add</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip" translatable="yes">Add RSS Feed</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_add_feed_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" id="button_remove_feed">
-                                        <property name="label">gtk-remove</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip" translatable="yes">Remove RSS Feed</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_remove_feed_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" id="button_edit_feed">
-                                        <property name="label">gtk-edit</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip" translatable="yes">Edit current item</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_edit_feed_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" id="button_open_list">
-                                        <property name="label">gtk-open</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip" translatable="yes">Add feeds from a datasource</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_open_list_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">3</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label_rss_sources3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;RSS feeds&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame_feed_settings3">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment14">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox18">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkHBox" id="hbox17">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkLabel" id="label12">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Update all feeds every</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkSpinButton" id="fetch_interval_spinbutton">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="adjustment">60 15 900 1 10 0</property>
-                                    <property name="climb_rate">1</property>
-                                    <property name="numeric">True</property>
-                                    <signal name="value_changed" handler="on_fetch_interval_spinbutton_value_changed"/>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label13">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">minutes.</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="padding">10</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label_rss_settings3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Feed settings&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label_rss3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">RSS feeds</property>
-              </widget>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-                <property name="type">tab</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox5">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkFrame" id="frame_video_lib3">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment5">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="weather_location_list_area">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkLabel" id="label_weather_tip">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Get weather conditions from the locations listed below.</property>
-                                <property name="single_line_mode">True</property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="padding">5</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkHBox" id="hbox4">
-                                <property name="visible">True</property>
-                                <child>
-                                  <widget class="GtkScrolledWindow" id="scrolledwindow3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">automatic</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <widget class="GtkTreeView" id="treeview_locations">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="enable_search">False</property>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkVButtonBox" id="vbuttonbox3">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">5</property>
-                                    <property name="layout_style">start</property>
-                                    <child>
-                                      <widget class="GtkButton" id="button_add_weather">
-                                        <property name="label">gtk-new</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="has_focus">True</property>
-                                        <property name="can_default">True</property>
-                                        <property name="has_default">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_add_weather_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" id="button_remove_weather">
-                                        <property name="label">gtk-clear</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="on_button_remove_weather_clicked"/>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label_weather_options">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Weather locations&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="frame4">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment7">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="vbox7">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="weather_display_checkbox">
-                                <property name="label" translatable="yes">Display weather option in main menu</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="on_weather_display_checkbox_toggled"/>
-                              </widget>
-                              <packing>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Weather settings&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label_weather">
-                <property name="visible">True</property>
-                <property name="yalign">0.40999999642372131</property>
-                <property name="label" translatable="yes">Weather</property>
-              </widget>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab_fill">False</property>
-                <property name="type">tab</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkFrame" id="frame2">
-                <property name="visible">True</property>
-                <property name="border_width">5</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <widget class="GtkAlignment" id="alignment3">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <widget class="GtkVBox" id="vbox3">
-                        <property name="visible">True</property>
-                        <child>
-                          <widget class="GtkLabel" id="label5">
-                            <property name="visible">True</property>
-                            <property name="xpad">7</property>
-                            <property name="ypad">7</property>
-                            <property name="label" translatable="yes">Rebuilding cache means that all data is removed and then
-folders are indexed again. This fixes broken media cache.</property>
-                          </widget>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" id="button_video_rebuild">
-                            <property name="label" translatable="yes">Rebuild video cache</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="border_width">5</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" handler="on_button_video_rebuild_clicked"/>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" id="button_music_rebuild">
-                            <property name="label" translatable="yes">Rebuild music cache</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="border_width">5</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" handler="on_button_music_rebuild_clicked"/>
-                          </widget>
-                          <packing>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" id="button_image_rebuild">
-                            <property name="label" translatable="yes">Rebuild image cache</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="border_width">5</property>
-                            <property name="use_underline">True</property>
-                            <signal name="clicked" handler="on_button_image_rebuild_clicked"/>
-                          </widget>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" id="button_feed_rebuild">
-                            <property name="label" translatable="yes">Rebuild RSS-feed cache</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="border_width">5</property>
-                            <property name="use_underline">True</property>
-                            <property name="focus_on_click">False</property>
-                            <signal name="clicked" handler="on_button_feed_rebuild_clicked"/>
-                          </widget>
-                          <packing>
-                            <property name="position">4</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Media cache management&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Reset</property>
-              </widget>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab_fill">False</property>
-                <property name="type">tab</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-closebutton-area">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <widget class="GtkButton" id="close_button">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_close_button_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="url_dialog">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">gtk-edit</property>
-    <property name="type_hint">normal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="has_separator">False</property>
-    <signal name="delete_event" handler="on_url_dialog_delete_event"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkHBox" id="hbox1">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">URL:</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="padding">5</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkEntry" id="url_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <widget class="GtkButton" id="url_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_url_dialog_cancel_button_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="url_dialog_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_url_dialog_ok_button_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="weather_search_dialog">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="vbox20">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkVBox" id="vbox21">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkFrame" id="frame6">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <widget class="GtkAlignment" id="alignment16">
-                    <property name="visible">True</property>
-                    <property name="top_padding">5</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox18">
-                        <property name="visible">True</property>
-                        <child>
-                          <widget class="GtkLabel" id="label19">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">City:</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkEntry" id="location_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="has_focus">True</property>
-                            <property name="can_default">True</property>
-                            <property name="has_default">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <signal name="activate" handler="on_location_entry_activate"/>
-                          </widget>
-                          <packing>
-                            <property name="padding">5</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" id="location_find_button">
-                            <property name="label">gtk-find</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" handler="on_location_find_button_clicked"/>
-                          </widget>
-                          <packing>
-                            <property name="padding">5</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label20">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Search for location&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="padding">5</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkFrame" id="frame7">
-                <property name="visible">True</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <widget class="GtkAlignment" id="alignment17">
-                    <property name="visible">True</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="border_width">5</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <property name="shadow_type">etched-in</property>
-                        <child>
-                          <widget class="GtkTreeView" id="location_results_treeview">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label21">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Search result&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">5</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <widget class="GtkButton" id="location_button_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_location_cancel_button_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="location_add_button">
-                <property name="label">gtk-add</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_location_add_button_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
+
+<widget class="GtkDialog" id="ManagerDialog">
+  <property name="border_width">5</property>
+  <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>