Merge lp:~mblayman/entertainer/less-config into lp:entertainer/future

[Matt Layman]

Merged preference.conf into content.conf so there is only one config file to deal with.

[Matt Layman (mblayman)]

Here is a branch that eliminates preferences.conf and puts the information that was in it into content.conf. Of course, it also cleans up Configuration to account for these changes. I have more changes coming for Configuration, but I want to keep these branches relatively small.

This branch is smaller than the diff makes it appear. I merged in Paul's dialog-magics branch.

[Paul Hummer (rockstar)]

Generally this looks good. I think it's going to need some rigorous testing, but I don't think that's a bad thing.

review: Approve

=== modified file 'cfg/content.conf'
--- cfg/content.conf	2009-05-31 17:11:16 +0000
+++ cfg/content.conf	2009-08-16 19:34:38 +0000
@@ -1,26 +1,33 @@
 # 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
 
 [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 '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 19:34:38 +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.get_media_folders()
         self._index_videos(self.video_folders)
-        self.music_folders = self.config.get_music_folders()
+        self.music_folders = self.config.get_media_folders()
         self._index_music(self.music_folders)
-        self.image_folders = self.config.get_image_folders()
+        self.image_folders = self.config.get_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.get_media_folders()
+        updated_music_folders = self.config.get_media_folders()
+        updated_image_folders = self.config.get_media_folders()
 
         # Handle image folder changes
         current_images = set(self.image_folders)

=== modified file 'entertainerlib/configuration.py'
--- entertainerlib/configuration.py	2009-07-07 01:28:42 +0000
+++ entertainerlib/configuration.py	2009-08-16 20:02:42 +0000
@@ -64,24 +64,7 @@
             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.read_config_files()
 
             self.theme = Theme(self.get_theme_path())
 
@@ -94,6 +77,20 @@
                 'host': 'localhost',
                 'port': 55545}
 
+    def read_config_files(self):
+        '''Read in the config files.'''
+        self.content_conf = os.path.join(self.cfg_dir, 'content.conf')
+
+        self.content = ConfigParser.ConfigParser()
+        try:
+            self.content.readfp(open(self.content_conf))
+        except ParsingError:
+            print("ParsingError with configuration file.")
+            sys.exit(1)
+        except IOError:
+            print("IOError: Couldn't read configuration file.")
+            sys.exit(1)
+
     def create_cfg_dir(self):
         '''Create a configuration directory and default config files.'''
 
@@ -135,8 +132,7 @@
         Read configuration files again and update this object.
         """
         try:
-            self.content_config.readfp(open(self.content_conf))
-            self.preferences.readfp(open(self.preferences_conf))
+            self.content.readfp(open(self.content_conf))
         except ParsingError:
             raise Exception("Syntax error in configuration file.")
         except IOError:
@@ -144,33 +140,31 @@
 
     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.cfg_dir)
+            self.create_cfg_dir()
+            self.read_config_files()
+            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")
+            self.stage_width = self.content.getint("General", "stage_width")
         except (NoSectionError, NoOptionError):
             self.stage_width = 1366 # Default
 
@@ -186,8 +180,7 @@
             return self.stage_height
 
         try:
-            self.stage_height = self.preferences.getint("General",
-                "stage_height")
+            self.stage_height = self.content.getint("General", "stage_height")
         except (NoSectionError, NoOptionError):
             self.stage_height = 768 # Default
 
@@ -204,7 +197,7 @@
         """
         theme_path = os.path.join(self.get_cfg_dir(), 'themes')
         try:
-            theme = self.preferences.get("General", "theme")
+            theme = self.content.get("General", "theme")
         except (NoSectionError, NoOptionError):
             return os.path.join(theme_path, "Default")
 
@@ -219,7 +212,7 @@
         @return: boolean
         """
         try:
-            result = self.preferences.getboolean("General", "display_icon")
+            result = self.content.getboolean("General", "display_icon")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -230,7 +223,7 @@
         @return: Integer
         """
         try:
-            result = self.content_config.getint("RSS", "fetch_interval")
+            result = self.content.getint("RSS", "fetch_interval")
         except (NoSectionError, NoOptionError):
             return 60 # Default is one hour
         return result
@@ -241,46 +234,18 @@
         @return: Integer
         """
         try:
-            result = self.preferences.getint("General", "backend_port")
+            result = self.content.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_media_folders(self):
+        '''Return a list of folders for media.'''
+        try:
+            media = self.content.get("Media", "folders")
+            return self._is_valid_media_folder(media.split(';'))
+        except (NoSectionError, NoOptionError):
+            return []
 
     def get_feeds(self):
         """
@@ -288,7 +253,7 @@
         @return: String Array
         """
         try:
-            rss_feeds = self.content_config.get("RSS", "feeds")
+            rss_feeds = self.content.get("RSS", "feeds")
             result = rss_feeds.split(';')
         except (NoSectionError, NoOptionError):
             return []
@@ -300,7 +265,7 @@
         @return: List of strings
         """
         try:
-            location = self.content_config.get("Weather", "location")
+            location = self.content.get("Weather", "location")
         except (NoSectionError, NoOptionError):
             location = ''
         return location
@@ -311,8 +276,7 @@
         @return: Boolean
         """
         try:
-            result = self.content_config.getboolean("Weather",
-                "display_in_menu")
+            result = self.content.getboolean("Weather", "display_in_menu")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -323,8 +287,7 @@
         @return: Boolean
         """
         try:
-            result = self.content_config.getboolean("CD",
-                "display_eject_in_menu")
+            result = self.content.getboolean("CD", "display_eject_in_menu")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -334,8 +297,7 @@
         Get True if video metadata should be downloaded, otherwise False
         """
         try:
-            result = self.content_config.getboolean("Videos",
-                "download_metadata")
+            result = self.content.getboolean("Media", "download_video_metadata")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -346,8 +308,7 @@
         @return: boolean
         """
         try:
-            result = self.content_config.getboolean("Music",
-                "download_album_art")
+            result = self.content.getboolean("Media", "download_album_art")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -358,16 +319,7 @@
         @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")
+            result = self.content.getboolean("Media", "download_lyrics")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -378,7 +330,7 @@
         @return: boolean
         """
         try:
-            result = self.preferences.getboolean("General", "show_effects")
+            result = self.content.getboolean("General", "show_effects")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -389,7 +341,7 @@
         @return: string (name of the effect)
         """
         try:
-            result = self.preferences.get("General", "transition_effect")
+            result = self.content.get("General", "transition_effect")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -400,7 +352,7 @@
         @return: string (theme name)
         """
         try:
-            result = self.preferences.get("General", "theme")
+            result = self.content.get("General", "theme")
         except (NoSectionError, NoOptionError):
             result = "Default"
         return result
@@ -408,8 +360,7 @@
     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")
+            result = self.content.getboolean("General", "start_in_fullscreen")
         except (NoSectionError, NoOptionError):
             return True
         return result
@@ -420,8 +371,7 @@
         @return: boolean
         """
         try:
-            result = self.preferences.getboolean("General",
-                "start_server_auto")
+            result = self.content.getboolean("General", "start_server_auto")
         except (NoSectionError, NoOptionError):
             return False
         return result
@@ -433,7 +383,7 @@
         @return: Integer
         """
         try:
-            result = self.preferences.getint("General", "history_size")
+            result = self.content.getint("General", "history_size")
         except (NoSectionError, NoOptionError):
             return 10
         return result
@@ -444,7 +394,7 @@
         @return: Integer
         """
         try:
-            result = self.preferences.getint("Photographs", "slideshow_step")
+            result = self.content.getint("Photographs", "slideshow_step")
         except (NoSectionError, NoOptionError):
             return 5
         return result

=== modified file 'entertainerlib/dialog.py'
--- entertainerlib/dialog.py	2009-07-14 04:24:07 +0000
+++ entertainerlib/dialog.py	2009-08-16 20:02:42 +0000
@@ -50,33 +50,25 @@
         self.dialog = self.widgets.get_widget("ContentManagementDialog")
         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_ContentManagementDialog_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,
+
+                # Feed tab
                 "on_button_add_feed_clicked" :
                     self.on_button_add_feed_clicked,
                 "on_button_remove_feed_clicked" :
@@ -85,20 +77,23 @@
                     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,
+
+                # Reset tab
+                "on_button_media_rebuild_clicked" :
+                    self.on_button_media_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" :
@@ -112,6 +107,7 @@
                 "on_location_add_button_clicked" :
                     self.on_location_add_button_clicked,
                 "on_location_entry_activate" : self.on_location_entry_activate}
+
         self.widgets.signal_autoconnect(callback_dic)
 
         # Initialize dialog widgets with correct values and show dialog
@@ -127,8 +123,6 @@
         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:
@@ -165,12 +159,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 +173,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,11 +206,11 @@
             # 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_video_metadata_toggled(self, widget):
@@ -224,124 +218,9 @@
         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_video_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")
@@ -406,11 +285,11 @@
             widget.get_value_as_int())
 
     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,9 +434,9 @@
         """
         self.on_location_find_button_clicked(widget)
 
-    def on_button_video_rebuild_clicked(self, widget):
+    def on_button_media_rebuild_clicked(self, widget):
         """
-        Rebuild video cache requested
+        Rebuild media cache requested
         @param widget: GTK-Widget
         """
         try:
@@ -648,41 +527,25 @@
         """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.get_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
         art_checkbox = self.widgets.get_widget("art_checkbox")
         art_val = self.config.download_album_art()
         art_checkbox.set_active(art_val)
@@ -691,27 +554,6 @@
         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)
-
         # == RSS-feeds ==
         feedlist_widget = self.widgets.get_widget("treeview_feeds")
         feed_model = gtk.ListStore(str)
@@ -1230,28 +1072,28 @@
         comment = self.widgets.get_widget("comment_label")
         comment.set_text(theme.getComment())
 
-        self.config.write_preference_value("General", "theme", name.get_text())
+        self.config.write_content_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",
+        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_preference_value("General", "start_in_fullscreen",
+        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_preference_value("General", "display_icon",
+        self.config.write_content_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",
+        self.config.write_content_value("General", "show_effects",
             widget.get_active())
 
     def on_effect_combobox_changed(self, widget):
@@ -1265,12 +1107,12 @@
             english_text = "Zoom and fade"
         if text == _("Slide"):
             english_text = "Slide"
-        self.config.write_preference_value("General", "transition_effect",
+        self.config.write_content_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",
+        self.config.write_content_value("Photographs", "slideshow_step",
             int(widget.get_value()))
 
     def on_dialog_closed(self, widget, after):

=== modified file 'entertainerlib/glade/entertainer-content-management.glade'
--- entertainerlib/glade/entertainer-content-management.glade	2009-05-31 16:36:18 +0000
+++ entertainerlib/glade/entertainer-content-management.glade	2009-07-11 21:39:40 +0000
@@ -1,1481 +1,1646 @@
-<?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
+
+<widget class="GtkDialog" id="ContentManagementDialog">
+  <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">Content management</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">True</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="icon_name">applications-multimedia</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="destroy" handler="on_ContentManagementDialog_destroy"/>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-layout">
+      <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-closebutton-area">
+	  <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="tabs">
+	  <property name="visible">True</property>
+	  <property name="can_default">True</property>
+	  <property name="has_default">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="has_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="vbox_videos">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox1">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkFrame" id="frame_video_lib1">
+		      <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_ETCHED_IN</property>
+
+		      <child>
+			<widget class="GtkAlignment" id="alignment1">
+			  <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="vbox2">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label_media_folder_tip1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Entertainer will catalog the media in the folders below.</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</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">True</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="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_AUTOMATIC</property>
+				      <property name="shadow_type">GTK_SHADOW_NONE</property>
+				      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+				      <child>
+					<widget class="GtkTreeView" id="treeview_media">
+					  <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">True</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>
+					</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_DEFAULT_STYLE</property>
+				      <property name="spacing">5</property>
+
+				      <child>
+					<widget class="GtkButton" id="button_add_folder">
+					  <property name="visible">True</property>
+					  <property name="can_default">True</property>
+					  <property name="has_default">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="has_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_button_add_media_clicked" last_modification_time="Sat, 11 Jul 2009 19:03:28 GMT"/>
+					</widget>
+				      </child>
+
+				      <child>
+					<widget class="GtkButton" id="button_remove_folder">
+					  <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_button_remove_media_clicked" last_modification_time="Sat, 11 Jul 2009 19:03:39 GMT"/>
+					</widget>
+				      </child>
+
+				      <child>
+					<widget class="GtkButton" id="button_edit_folder">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label">gtk-edit</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_button_edit_media_clicked" last_modification_time="Sat, 11 Jul 2009 19:03:49 GMT"/>
+					</widget>
+				      </child>
+				    </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>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label_media_library">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">&lt;b&gt;Media Library&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">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox20">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox23">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="video_metadata_checkbox">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Download movie and TV-series metadata</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_video_metadata_toggled" last_modification_time="Sat, 11 Jul 2009 19:09:32 GMT"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">1</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="art_checkbox">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Download album cover art</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_art_checkbox_toggled"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">1</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="lyrics_checkbox">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Download song lyrics</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_lyrics_checkbox_toggled"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">1</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">15</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">10</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="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label_media">
+	      <property name="visible">True</property>
+	      <property name="has_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="has_focus">True</property>
+	      <property name="label" translatable="yes">Media</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_feeds">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkFrame" id="frame_rss_feeds3">
+		  <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_ETCHED_IN</property>
+
+		  <child>
+		    <widget class="GtkAlignment" id="alignment13">
+		      <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="vbox17">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label_rss_tip3">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Below is a list of RSS feeds that are displayd in Entertainer.</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="GtkHBox" id="hbox16">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkScrolledWindow" id="scrolledwindow_rss3">
+				  <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_AUTOMATIC</property>
+				  <property name="shadow_type">GTK_SHADOW_NONE</property>
+				  <property name="window_placement">GTK_CORNER_TOP_LEFT</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="headers_visible">True</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>
+				    </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="vbuttonbox8">
+				  <property name="visible">True</property>
+				  <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+				  <property name="spacing">5</property>
+
+				  <child>
+				    <widget class="GtkButton" id="button_add_feed">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Add RSS Feed</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_button_add_feed_clicked"/>
+				    </widget>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="button_remove_feed">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Remove RSS Feed</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_button_remove_feed_clicked"/>
+				    </widget>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="button_edit_feed">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Edit current item</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-edit</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_button_edit_feed_clicked"/>
+				    </widget>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="button_open_list">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Add feeds from a datasource</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-open</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_button_open_list_clicked"/>
+				    </widget>
+				  </child>
+				</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>
+			</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_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">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkFrame" id="frame_feed_settings3">
+		  <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_ETCHED_IN</property>
+
+		  <child>
+		    <widget class="GtkAlignment" id="alignment14">
+		      <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="vbox18">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox17">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label12">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Update all feeds every</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">False</property>
+				  <property name="fill">True</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="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">False</property>
+				  <property name="wrap">False</property>
+				  <property name="adjustment">60 15 900 1 10 0</property>
+				  <signal name="value_changed" handler="on_fetch_interval_spinbutton_value_changed"/>
+				</widget>
+				<packing>
+				  <property name="padding">5</property>
+				  <property name="expand">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label13">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">minutes.</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">False</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </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="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_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">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="label_rss3">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">RSS feeds</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="vbox5">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkFrame" id="frame_video_lib3">
+		  <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_ETCHED_IN</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="weather_location_list_area">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label_weather_tip">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Get weather conditions from the locations listed below.</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">True</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="GtkHBox" id="hbox4">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkScrolledWindow" id="scrolledwindow3">
+				  <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_AUTOMATIC</property>
+				  <property name="shadow_type">GTK_SHADOW_NONE</property>
+				  <property name="window_placement">GTK_CORNER_TOP_LEFT</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="headers_visible">True</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>
+				    </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="vbuttonbox3">
+				  <property name="visible">True</property>
+				  <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+				  <property name="spacing">5</property>
+
+				  <child>
+				    <widget class="GtkButton" id="button_add_weather">
+				      <property name="visible">True</property>
+				      <property name="can_default">True</property>
+				      <property name="has_default">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="has_focus">True</property>
+				      <property name="label">gtk-new</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_button_add_weather_clicked"/>
+				    </widget>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="button_remove_weather">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-clear</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_button_remove_weather_clicked"/>
+				    </widget>
+				  </child>
+				</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>
+			</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_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">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkFrame" id="frame4">
+		  <property name="visible">True</property>
+		  <property name="label_xalign">0</property>
+		  <property name="label_yalign">0.5</property>
+		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</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="GtkVBox" id="vbox7">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="weather_display_checkbox">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Display weather option in main menu</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="on_weather_display_checkbox_toggled"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">False</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_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">0</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="label_weather">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Weather</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.409999996424</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="GtkFrame" id="frame2">
+	      <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_ETCHED_IN</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="vbox3">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkLabel" id="label5">
+			  <property name="visible">True</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>
+			  <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">7</property>
+			  <property name="ypad">7</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>
+
+		      <child>
+			<widget class="GtkButton" id="button_video_rebuild">
+			  <property name="border_width">5</property>
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Rebuild video cache</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_button_video_rebuild_clicked"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="button_music_rebuild">
+			  <property name="border_width">5</property>
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Rebuild music cache</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_button_music_rebuild_clicked"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="button_image_rebuild">
+			  <property name="border_width">5</property>
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Rebuild image cache</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_button_image_rebuild_clicked"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="button_feed_rebuild">
+			  <property name="border_width">5</property>
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Rebuild RSS-feed cache</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">False</property>
+			  <signal name="clicked" handler="on_button_feed_rebuild_clicked"/>
+			</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="label4">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Media cache management&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="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label3">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Reset</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>
+
+<widget class="GtkDialog" id="url_dialog">
+  <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"></property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">True</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">True</property>
+  <property name="icon_name">gtk-edit</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">True</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_url_dialog_delete_event"/>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox2">
+      <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_area2">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="url_dialog_cancel_button">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</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_url_dialog_cancel_button_clicked"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="url_dialog_ok_button">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</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_url_dialog_ok_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="GtkHBox" id="hbox1">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="label1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">URL:</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>
+
+	  <child>
+	    <widget class="GtkEntry" id="url_entry">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="has_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="editable">True</property>
+	      <property name="visibility">True</property>
+	      <property name="max_length">0</property>
+	      <property name="text" translatable="yes"></property>
+	      <property name="has_frame">True</property>
+	      <property name="invisible_char">●</property>
+	      <property name="activates_default">False</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>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="weather_search_dialog">
+  <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"></property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</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>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="vbox20">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">2</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="hbuttonbox1">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="location_button_cancel">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</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_location_cancel_button_clicked"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="location_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>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="on_location_add_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="GtkVBox" id="vbox21">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame6">
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment16">
+		  <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">5</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox18">
+		      <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">City:</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">False</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkEntry" id="location_entry">
+			  <property name="visible">True</property>
+			  <property name="can_default">True</property>
+			  <property name="has_default">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="has_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="editable">True</property>
+			  <property name="visibility">True</property>
+			  <property name="max_length">0</property>
+			  <property name="text" translatable="yes"></property>
+			  <property name="has_frame">True</property>
+			  <property name="invisible_char">●</property>
+			  <property name="activates_default">False</property>
+			  <signal name="activate" handler="on_location_entry_activate"/>
+			</widget>
+			<packing>
+			  <property name="padding">5</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="location_find_button">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label">gtk-find</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_location_find_button_clicked"/>
+			</widget>
+			<packing>
+			  <property name="padding">5</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;Search for location&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="frame7">
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment17">
+		  <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="GtkScrolledWindow" id="scrolledwindow7">
+		      <property name="border_width">5</property>
+		      <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_AUTOMATIC</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</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>
+			  <property name="headers_visible">True</property>
+			  <property name="rules_hint">False</property>
+			  <property name="reorderable">False</property>
+			  <property name="enable_search">True</property>
+			  <property name="fixed_height_mode">False</property>
+			  <property name="hover_selection">False</property>
+			  <property name="hover_expand">False</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_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="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>

=== modified file 'entertainerlib/tests/test_configuration.py'
--- entertainerlib/tests/test_configuration.py	2009-07-02 20:58:37 +0000
+++ entertainerlib/tests/test_configuration.py	2009-08-16 20:02:42 +0000
@@ -65,14 +65,6 @@
         self.configuration.update_configuration()
         self.assertEqual(self.configuration.get_weather_location(), new_value)
 
-    def test_write_preference_value(self):
-        """Test writing a value to the preference configuration file"""
-        new_value = True
-        self.configuration.write_preference_value(
-            "General", "display_icon", new_value)
-        self.configuration.update_configuration()
-        self.assertEqual(self.configuration.tray_icon_enabled(), new_value)
-
     def testGetThemeName(self):
         """Test getting the current theme name"""
         current_name = "Default"
@@ -85,9 +77,3 @@
     def testGetSlideshowStep(self):
         '''Test getting the slideshow step'''
         self.assertEqual(self.configuration.get_slideshow_step(), 5)
-
-    def test_hidden_files_folders(self):
-        """Test getting the `display_hidden_files_folders` setting."""
-        self.assertEqual(self.configuration.display_hidden_files_folders(),
-            False)
-

=== modified file 'entertainerlib/tests/test_scrollarea.py'
--- entertainerlib/tests/test_scrollarea.py	2009-08-04 01:09:03 +0000
+++ entertainerlib/tests/test_scrollarea.py	2009-08-16 20:02:42 +0000
@@ -1,9 +1,6 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 """Tests ScrollArea"""
 
-import clutter
-
-from entertainerlib.gui.widgets.base import Base
 from entertainerlib.gui.widgets.label import Label
 from entertainerlib.gui.widgets.scroll_area import ScrollArea
 from entertainerlib.tests import EntertainerTest

=== modified file 'entertainerlib/tests/test_transitionfactory.py'
--- entertainerlib/tests/test_transitionfactory.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/tests/test_transitionfactory.py	2009-08-16 20:02:42 +0000
@@ -59,14 +59,14 @@
         }
         # Test all possible transitions
         for key in values_to_test.keys():
-            self.config.write_preference_value('General', 'transition_effect',
+            self.config.write_content_value('General', 'transition_effect',
                 key)
             self.config.update_configuration()
             transition = self.factory.generate_transition()
             self.assertTrue(isinstance(transition, values_to_test[key]))
 
         # Test the path when the user doesn't have effects
-        self.config.write_preference_value('General', 'show_effects', 'False')
+        self.config.write_content_value('General', 'show_effects', 'False')
         self.config.update_configuration()
         transition = self.factory.generate_transition()
         self.assertTrue(isinstance(transition, NoEffect))