Merge lp:~docky-core/plank/themes into lp:plank

[Rico Tzschichholz]

Make theme choosable through a settings-option

Theme would be the folder-name located in system's or user's themes-folder
(/usr/share/plank/themes/, ~/.local/share/plank/themes/).
This folder will contain the *.theme files as we know them.

[Robert Dyer (psybers)]

What is the point of get_theme_list? It isn't used anywhere.

[Robert Dyer (psybers)]

Why do you have get_default_theme_folder and get_theme_folder? It appears the first is just a special case of the latter (for the default theme) and not needed. Also the default one is for some reason preferring global theme over user theme (which should NEVER be the case).

review: Needs Fixing

[Robert Dyer (psybers)]

Also we should never give an error() when looking for themes. If we fail to find the them they want, or indeed any theme folder, just warn and return. The defaults are already in the properties so it is ok to not have an actual theme.

[Rico Tzschichholz (ricotz)]

> What is the point of get_theme_list? It isn't used anywhere.

This is for future usage and I am already using it in another branch.

[Rico Tzschichholz (ricotz)]

> Why do you have get_default_theme_folder and get_theme_folder? It appears the
> first is just a special case of the latter (for the default theme) and not
> needed. Also the default one is for some reason preferring global theme over
> user theme (which should NEVER be the case).

This behavior is intended. I want to preserve the ability of plank to generate the files of its internal default theme which is only possible in the user-folder. So if the choice/fallback is "Default" use the installed/packaged (distro-)theme, and if that isn't available use the writeable user-folder to generate it or use the existing one.

The error is there since it is an assert and should never happen.

[Cody Garver (codygarver)]

This is a lot better than the old way. It doesn't require OS hacks and I it's far more modern to put things in /usr/share. Hope this gets merged soon, users desire theming in elementary OS. Great work on Plank guys, there's talk it could even be used in the panel after Luna for autohiding!

[Robert Dyer (psybers)]

[DEBUG 19:04:30.463962] [Preferences:286] Loading preferences from file '/usr/local/share/plank/themes/Default/dock.theme'
[WARN 19:04:30.464671] [Preferences:301] Missing key 'TopRoundness' for group 'PlankDrawingTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.464961] [Preferences:301] Missing key 'BottomRoundness' for group 'PlankDrawingTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.465185] [Preferences:301] Missing key 'LineWidth' for group 'PlankDrawingTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.465405] [Preferences:301] Missing key 'OuterStrokeColor' for group 'PlankDrawingTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.465627] [Preferences:301] Missing key 'FillStartColor' for group 'PlankDrawingTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.465845] [Preferences:301] Missing key 'FillEndColor' for group 'PlankDrawingTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.466066] [Preferences:301] Missing key 'InnerStrokeColor' for group 'PlankDrawingTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.466287] [Preferences:301] Missing key 'HorizPadding' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.466503] [Preferences:301] Missing key 'TopPadding' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.466713] [Preferences:301] Missing key 'BottomPadding' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.466923] [Preferences:301] Missing key 'ItemPadding' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.467144] [Preferences:301] Missing key 'IndicatorSize' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.467366] [Preferences:301] Missing key 'UrgentBounceHeight' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.467589] [Preferences:301] Missing key 'LaunchBounceHeight' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.467810] [Preferences:301] Missing key 'FadeOpacity' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/dock.theme' - using default value
[WARN 19:04:30.468033] [Preferences:301] Missing key 'ClickTime' for group 'PlankDrawingDockTheme' in preferences file '/usr/local/share/plank/themes/Default/do...

review: Needs Fixing

[Robert Dyer (psybers)]

Basically, anyone upgrading would have a miserable time. Something needs to happen to make this fail more gracefully.

What is happening here is its using a theme out of /usr/local/share. But our Preferences wants to write values to that location, which clearly it has no write access to.

[Rico Tzschichholz (ricotz)]

So the Preferences class should have field/property "read-only" which can be manually set to TRUE and is set automatically based on the write-permissions of the backing_file.

[Robert Dyer (psybers)]

I don't know about that. If it is only a hack to make this upgrading possible then no.

It may be the case we simply break everyone's configs with this change and they have to fix it themselves.

[Rico Tzschichholz (ricotz)]

This is not a hack but a reasonable change for trunk directly. It would solve this problem partly and makes it possible to have two Preferences instances pointing to the same backing_file which is currently the case for running plank with gala. Gala is using the Plank.Drawing.Theme classes to draw the fake-plank actor. So there are two processes watching the same file and this makes it possible they are fighting over this file if it changes.

[Rico Tzschichholz (ricotz)]

Like http://people.ubuntu.com/~ricotz/plank/plank-prefs-read-only

[lp:~docky-core/plank/themes]

735. By Rico Tzschichholz on 2013-01-29

items: No need for a SeparatorMenuItem if the associated folder is empty

736. By Rico Tzschichholz on 2013-01-30

main: Avoid calling Poxis.exit ()

Change the way we are passing the commandline-arguments through the
initalization methods and return EXIT_SUCCESS or EXIT_FAILURE to the
actual main function

737. By Rico Tzschichholz on 2013-01-30

items: Validate an item before adding it here too

738. By Rico Tzschichholz on 2013-01-30

items: Delay the start of watching our launchers directory

load_items can actually lead to updates of dockitem files if their
syntax was changed. So activing the monitor at the very last is more
appropriate.

739. By Rico Tzschichholz on 2013-01-30

Use URIs instead of paths for saving the location of dockitem's Launcher

740. By Rico Tzschichholz on 2013-01-30

lib: Require valac >= 0.16.0 and fix deprecated syntax

741. By Rico Tzschichholz on 2013-02-01

Pass an URI to ApplicationDockItem.parse_launcher ()

Fixes fallout of r739

742. By Rico Tzschichholz on 2013-02-01

filedockitem: Make sure Hashmap keys are unique

Clashing keys will result in leftover menuitems leading to a crash

743. By Rico Tzschichholz on 2013-02-01

Make sure icon-regions and struts are updated on a dockwindow-resize

748. By Rico Tzschichholz on 2013-02-02

theme: Fallback to built-in defaults if needed

749. By Rico Tzschichholz on 2013-02-02

preferences: Handle file errors

750. By Rico Tzschichholz on 2013-02-02

data: add fully qualified Default theme

751. By Rico Tzschichholz on 2013-02-03

Don't allow slashes in "Theme" string

[Sergey "Shnatsel" Davidoff (shnatsel)]

Works fine for me, including changing themes at runtime. Tested lookup from both $XDG_DATA_HOME and $XDG_DATA_DIRS.

Theme names with spaces and unicode characters in the name work as well. When given a nonexistent theme, falls back to theme "Default". Strips all "/" characters from malformed filenames.

=== modified file 'data/themes/Default/dock.theme'
--- data/themes/Default/dock.theme	2012-11-16 16:05:23 +0000
+++ data/themes/Default/dock.theme	2013-02-03 11:21:19 +0000
@@ -1,4 +1,58 @@
+#This file auto-generated by Plank.
+#2013-02-02T11:25:31+0000
 
 [PlankDrawingTheme]
+#The roundness of the top corners.
+TopRoundness=4
+#The roundness of the bottom corners.
+BottomRoundness=0
+#The thickness (in pixels) of lines drawn.
+LineWidth=1
+#The color (RGBA) of the outer stroke.
+OuterStrokeColor=41;;41;;41;;255
+#The starting color (RGBA) of the fill gradient.
+FillStartColor=41;;41;;41;;255
+#The ending color (RGBA) of the fill gradient.
+FillEndColor=80;;80;;80;;255
+#The color (RGBA) of the inner stroke.
+InnerStrokeColor=255;;255;;255;;255
 
 [PlankDrawingDockTheme]
+#The padding on the left/right dock edges, in tenths of a percent of IconSize.
+HorizPadding=0
+#The padding on the top dock edge, in tenths of a percent of IconSize.
+TopPadding=-11
+#The padding on the bottom dock edge, in tenths of a percent of IconSize.
+BottomPadding=2.5
+#The padding between items on the dock, in tenths of a percent of IconSize.
+ItemPadding=2
+#The size of item indicators, in tenths of a percent of IconSize.
+IndicatorSize=5
+#The height (in percent of IconSize) to bounce an icon when the application sets urgent.
+UrgentBounceHeight=1.6666666666666667
+#The height (in percent of IconSize) to bounce an icon when launching an application.
+LaunchBounceHeight=0.625
+#The opacity value (0 to 1) to fade the dock to when hiding it.
+FadeOpacity=1
+#The amount of time (in ms) for click animations.
+ClickTime=300
+#The amount of time (in ms) to bounce an urgent icon.
+UrgentBounceTime=600
+#The amount of time (in ms) to bounce an icon when launching an application.
+LaunchBounceTime=600
+#The amount of time (in ms) for active window indicator animations.
+ActiveTime=300
+#The amount of time (in ms) to slide icons into/out of the dock.
+SlideTime=300
+#The time (in ms) to fade the dock in/out on a hide (if FadeOpacity is < 1).
+FadeTime=250
+#The time (in ms) to slide the dock in/out on a hide (if FadeOpacity is 1).
+HideTime=150
+#The size of the urgent glow (shown when dock is hidden), in tenths of a percent of IconSize.
+GlowSize=30
+#The total time (in ms) to show the hidden-dock urgent glow.
+GlowTime=10000
+#The time (in ms) of each pulse of the hidden-dock urgent glow.
+GlowPulseTime=2000
+#The hue-shift (-180 to 180) of the urgent indicator color.
+UrgentHueShift=150

=== modified file 'data/themes/Default/hover.theme'
--- data/themes/Default/hover.theme	2012-11-16 16:05:23 +0000
+++ data/themes/Default/hover.theme	2013-02-03 11:21:19 +0000
@@ -1,1 +1,18 @@
+#This file auto-generated by Plank.
+#2013-02-02T11:25:30+0000
+
 [PlankDrawingTheme]
+#The roundness of the top corners.
+TopRoundness=3
+#The roundness of the bottom corners.
+BottomRoundness=3
+#The thickness (in pixels) of lines drawn.
+LineWidth=1
+#The color (RGBA) of the outer stroke.
+OuterStrokeColor=41;;41;;41;;255
+#The starting color (RGBA) of the fill gradient.
+FillStartColor=41;;41;;41;;255
+#The ending color (RGBA) of the fill gradient.
+FillEndColor=80;;80;;80;;255
+#The color (RGBA) of the inner stroke.
+InnerStrokeColor=255;;255;;255;;255

=== modified file 'lib/DockPreferences.vala'
--- lib/DockPreferences.vala	2013-01-21 12:10:22 +0000
+++ lib/DockPreferences.vala	2013-02-03 11:21:19 +0000
@@ -55,6 +55,9 @@
 		[Description(nick = "offset", blurb = "The dock's position offset from center (in percent).")]
 		public int Offset { get; set; }
 		
+		[Description(nick = "theme", blurb = "The name of the dock's theme to use.")]
+		public string Theme { get; set; }
+		
 		[Description(nick = "alignment", blurb = "The alignment for the dock on the monitor's edge.")]
 		public Gtk.Align Alignment { get; set; }
 		
@@ -99,6 +102,7 @@
 			DockItems = "";
 			Position = PositionType.BOTTOM;
 			Offset = 0;
+			Theme = Plank.Drawing.Theme.DEFAULT_NAME;
 			Alignment = Gtk.Align.CENTER;
 			ItemsAlignment = Gtk.Align.CENTER;
 		}
@@ -190,6 +194,13 @@
 					Offset = 100;
 				break;
 			
+			case "Theme":
+				if (Theme == "")
+					Theme = Plank.Drawing.Theme.DEFAULT_NAME;
+				else if (Theme.contains ("/"))
+					Theme = Theme.replace ("/", "");
+				break;
+			
 			case "Alignment":
 				break;
 			

=== modified file 'lib/DockRenderer.vala'
--- lib/DockRenderer.vala	2013-01-21 12:10:22 +0000
+++ lib/DockRenderer.vala	2013-02-03 11:21:19 +0000
@@ -83,11 +83,7 @@
 		{
 			this.controller = controller;
 			
-			theme = new DockTheme ();
-			theme.load ("dock");
-			
 			controller.prefs.notify.connect (prefs_changed);
-			theme.changed.connect (theme_changed);
 			
 			controller.items.item_state_changed.connect (item_state_changed);
 			controller.items.item_position_changed.connect (item_position_changed);
@@ -106,9 +102,13 @@
 			requires (controller.window != null)
 		{
 			set_widget (controller.window);
+			
+			load_theme ();
+			
 			controller.position_manager.reset_caches (theme);
 			controller.position_manager.update_regions ();
 			controller.window.notify["HoveredItem"].connect (animated_draw);
+			controller.prefs.notify["Theme"].connect (load_theme);
 		}
 		
 		~DockRenderer ()
@@ -124,6 +124,7 @@
 
 			notify["Hidden"].disconnect (hidden_changed);
 			
+			controller.prefs.notify["Theme"].disconnect (load_theme);
 			controller.window.notify["HoveredItem"].disconnect (animated_draw);
 		}
 		
@@ -164,6 +165,23 @@
 			controller.position_manager.update_regions ();
 		}
 		
+		void load_theme ()
+		{
+			var is_reload = (theme != null);
+			
+			if (is_reload)
+				theme.changed.disconnect (theme_changed);
+			
+			theme = new DockTheme (controller.prefs.Theme);
+			theme.load ("dock");
+			theme.changed.connect (theme_changed);
+			
+			controller.position_manager.reset_caches (theme);
+			
+			if (is_reload)
+				controller.position_manager.update_regions ();
+		}
+		
 		/**
 		 * The dock should be shown.
 		 */

=== modified file 'lib/Drawing/DockTheme.vala'
--- lib/Drawing/DockTheme.vala	2012-10-31 07:49:07 +0000
+++ lib/Drawing/DockTheme.vala	2013-02-03 11:21:19 +0000
@@ -87,6 +87,11 @@
 		[Description(nick = "urgent-hue-shift", blurb = "The hue-shift (-180 to 180) of the urgent indicator color.")]
 		public int UrgentHueShift { get; set; }
 		
+		public DockTheme (string name)
+		{
+			base.with_name (name);
+		}
+		
 		/**
 		 * {@inheritDoc}
 		 */

=== modified file 'lib/Drawing/HoverTheme.vala'
--- lib/Drawing/HoverTheme.vala	2012-07-31 12:22:20 +0000
+++ lib/Drawing/HoverTheme.vala	2013-02-03 11:21:19 +0000
@@ -24,6 +24,11 @@
 	 */
 	public class HoverTheme : Theme
 	{
+		public HoverTheme (string name)
+		{
+			base.with_name (name);
+		}
+		
 		/**
 		 * {@inheritDoc}
 		 */

=== modified file 'lib/Drawing/Theme.vala'
--- lib/Drawing/Theme.vala	2012-07-31 12:22:20 +0000
+++ lib/Drawing/Theme.vala	2013-02-03 11:21:19 +0000
@@ -17,6 +17,7 @@
 
 using Cairo;
 using Gdk;
+using Gee;
 using Gtk;
 
 using Plank.Services;
@@ -28,6 +29,10 @@
 	 */
 	public class Theme : Preferences
 	{
+		public const string DEFAULT_NAME = "Default";
+		
+		File? theme_folder;
+		
 		[Description(nick = "top-roundness", blurb = "The roundness of the top corners.")]
 		public int TopRoundness { get; set; }
 		
@@ -52,6 +57,13 @@
 		public Theme ()
 		{
 			base ();
+			theme_folder = get_theme_folder (DEFAULT_NAME);
+		}
+		
+		public Theme.with_name (string name)
+		{
+			base ();
+			theme_folder = get_theme_folder (name);
 		}
 		
 		/**
@@ -77,8 +89,13 @@
 		 */
 		public void load (string type)
 		{
-			Paths.ensure_directory_exists (Paths.AppConfigFolder.get_child ("theme"));
-			init_from_filename ("theme/" + type + ".theme");
+			// if there is no folder available, fallback to the internal defaults
+			if (theme_folder == null) {
+				reset_properties ();
+				return;
+			}
+			
+			init_from_file (theme_folder.get_child (type + ".theme"));
 		}
 		
 		/**
@@ -288,5 +305,99 @@
 				break;
 			}
 		}
+		
+		/**
+		 * Get a sorted list of all available theme-names
+		 *
+		 * @return {@link Gee.ArrayList} the list of theme-names
+		 */
+		public static ArrayList<string> get_theme_list ()
+		{
+			var list = new HashSet<string> (str_hash, str_equal);
+			
+			list.add (DEFAULT_NAME);
+			
+			// Look in user's themes-folder
+			try {
+				var enumerator = Paths.AppThemeFolder.enumerate_children ("standard::name,standard::type",
+					GLib.FileQueryInfoFlags.NONE);
+				FileInfo info;
+				while ((info = enumerator.next_file ()) != null) {
+					if (info.get_is_hidden ()
+						|| info.get_file_type () != GLib.FileType.DIRECTORY)
+						continue;
+					
+					list.add (info.get_name ());
+				}
+			} catch {}
+			
+			// Look in system's themes-folder
+			try {
+				var enumerator = Paths.ThemeFolder.enumerate_children ("standard::name,standard::type",
+					GLib.FileQueryInfoFlags.NONE);
+				FileInfo info;
+				while ((info = enumerator.next_file ()) != null) {
+					if (info.get_is_hidden ()
+						|| info.get_file_type () != GLib.FileType.DIRECTORY)
+						continue;
+					
+					list.add (info.get_name ());
+				}
+			} catch {}
+			
+			var result = new ArrayList<string> ();
+			result.add_all (list);
+			result.sort ((CompareFunc) strcmp);
+			
+			return result;
+		}
+		
+		/**
+		 * Try to get an already existing folder located in the
+		 * themes folder while prefering the user's themes folder.
+		 * If there is no folder found we fallback to the "Default" theme.
+		 * If even that folder doesn't exist return NULL (and use built-in defaults)
+		 *
+		 * @param basename the name of the folder
+		 * @return {@link GLib.File} the folder of the theme or NULL
+		 */
+		public static File? get_theme_folder (string name)
+		{
+			if (name == DEFAULT_NAME)
+				return get_default_theme_folder ();
+			
+			File folder;
+			
+			// Look in user's themes-folder
+			folder = Paths.AppThemeFolder.get_child (name);
+			if (folder.query_exists ()
+				&& folder.query_file_type (FileQueryInfoFlags.NONE, null) == FileType.DIRECTORY)
+				return folder;
+			
+			// Look in system's themes-folder
+			folder = Paths.ThemeFolder.get_child (name);
+			if (folder.query_exists ()
+				&& folder.query_file_type (FileQueryInfoFlags.NONE, null) == FileType.DIRECTORY)
+				return folder;
+			
+			warning ("%s not found, falling back to %s.", name, DEFAULT_NAME);
+			
+			return get_default_theme_folder ();
+		}
+		
+		static File? get_default_theme_folder ()
+		{
+			File folder;
+			
+			// "Default" folder located in system's themes-folder
+			folder = Paths.ThemeFolder.get_child (DEFAULT_NAME);
+			if (folder.query_exists ()
+				&& folder.query_file_type (FileQueryInfoFlags.NONE, null) == FileType.DIRECTORY)
+				return folder;
+			
+			warning ("%s is not a folder fallback to the built-in defaults!", folder.get_path ());
+			
+			return null;
+		}
 	}
 }

=== modified file 'lib/Services/Paths.vala'
--- lib/Services/Paths.vala	2013-01-22 18:35:52 +0000
+++ lib/Services/Paths.vala	2013-02-03 11:21:19 +0000
@@ -40,6 +40,10 @@
 		 */
 		public static File DataFolder { get; protected set; }
 		
+		/**
+		 * DataFolder/themes
+		 */
+		public static File ThemeFolder { get; protected set; }
 		
 		/**
 		 * HomeFolder/.config
@@ -73,6 +77,11 @@
 		public static File AppDataFolder { get; protected set; }
 		
 		/**
+		 * defaults to AppDataFolder/themes
+		 */
+		public static File AppThemeFolder { get; protected set; }
+		
+		/**
 		 * defaults to CacheHomeFolder/app_name
 		 */
 		public static File AppCacheFolder { get; protected set; }
@@ -90,6 +99,7 @@
 			// get environment-based settings
 			HomeFolder = File.new_for_path (Environment.get_home_dir ());
 			DataFolder = File.new_for_path (data_folder);
+			ThemeFolder = DataFolder.get_child ("themes");
 			
 			
 			// get standard directories
@@ -106,12 +116,14 @@
 			// set the program-specific directories to use
 			AppConfigFolder = ConfigHomeFolder.get_child (app_name);
 			AppDataFolder   = DataHomeFolder.get_child (app_name);
+			AppThemeFolder  = AppDataFolder.get_child ("themes");
 			AppCacheFolder  = CacheHomeFolder.get_child (app_name);
 			
 			
 			// ensure all writable directories exist
 			ensure_directory_exists (AppConfigFolder);
 			ensure_directory_exists (AppDataFolder);
+			ensure_directory_exists (AppThemeFolder);
 			ensure_directory_exists (AppCacheFolder);
 		}
 		

=== modified file 'lib/Services/Preferences.vala'
--- lib/Services/Preferences.vala	2012-05-08 11:19:34 +0000
+++ lib/Services/Preferences.vala	2013-02-03 11:21:19 +0000
@@ -84,6 +84,9 @@
 		
 		void handle_notify (Object sender, ParamSpec property)
 		{
+			if (read_only)
+				return;
+			
 			Logger.verbose ("property changed: %s", property.name);
 			
 			is_delayed_internal = true;
@@ -136,6 +139,7 @@
 		
 		File? backing_file;
 		FileMonitor backing_monitor;
+		bool read_only = false;
 		
 		/**
 		 * Creates a preferences object with a backing file.
@@ -164,10 +168,31 @@
 		 */
 		protected void init_from_file (GLib.File file)
 		{
+			stop_monitor ();
+			
 			backing_file = file;
+			var file_exists = backing_file.query_exists ();
+			
+			if (!read_only) {
+				try {
+					FileInfo info;
+					if (file_exists)
+						info = file.query_info (FileAttribute.ACCESS_CAN_WRITE, FileQueryInfoFlags.NONE, null);
+					else
+						info = file.get_parent ().query_info (FileAttribute.ACCESS_CAN_WRITE, FileQueryInfoFlags.NONE, null);
+					
+					read_only = read_only || !info.get_attribute_boolean (FileAttribute.ACCESS_CAN_WRITE);
+					
+					if (read_only)
+						warning ("'%s' is read-only!", file.get_path () ?? "");
+				} catch (Error e) {
+					warning (e.message);
+					read_only = true;
+				}
+			}
 			
 			// ensure the preferences file exists
-			if (!backing_file.query_exists ()) {
+			if (!file_exists) {
 				reset_properties ();
 				save_prefs ();
 			} else {
@@ -196,6 +221,9 @@
 		 */
 		public void delay ()
 		{
+			if (read_only)
+				return;
+			
 			if (is_delayed)
 				return;
 			
@@ -212,6 +240,9 @@
 		 */
 		public void apply ()
 		{
+			if (read_only)
+				return;
+			
 			if (!is_delayed)
 				return;
 			
@@ -242,6 +273,9 @@
 		 */
 		public void delete ()
 		{
+			if (read_only)
+				return;
+			
 			is_delayed = false;
 			is_changed = false;
 			
@@ -365,6 +399,9 @@
 		void save_prefs ()
 			requires (backing_file != null)
 		{
+			if (read_only)
+				return;
+			
 			if (is_delayed || is_delayed_internal) {
 				if (backing_file != null && backing_file.get_path () != null)
 					Logger.verbose ("Preferences.save_prefs('%s') - delaying save", backing_file.get_path ());

=== modified file 'lib/Widgets/HoverWindow.vala'
--- lib/Widgets/HoverWindow.vala	2012-12-15 20:36:01 +0000
+++ lib/Widgets/HoverWindow.vala	2013-02-03 11:21:19 +0000
@@ -60,15 +60,15 @@
 			
 			set_redraw_on_allocate (true);
 			
-			theme = new HoverTheme ();
-			theme.load ("hover");
-			theme.changed.connect (theme_changed);
+			load_theme ();
 			
 			update_layout ();
 			style_set.connect (() => update_layout ());
 			
 			notify["Text"].connect (invalidate);
 			
+			controller.prefs.notify["Theme"].connect (load_theme);
+			
 			stick ();
 			show_all ();
 			hide ();
@@ -80,6 +80,21 @@
 			queue_draw ();
 		}
 		
+		void load_theme ()
+		{
+			var is_reload = (theme != null);
+			
+			if (is_reload)
+				theme.changed.disconnect (theme_changed);
+			
+			theme = new HoverTheme (controller.prefs.Theme);
+			theme.load ("hover");
+			theme.changed.connect (theme_changed);
+			
+			if (is_reload)
+				theme_changed ();
+		}
+		
 		/**
 		 * Centers the window at the x/y location specified.
 		 *

=== modified file 'lib/libplank.symbols'
--- lib/libplank.symbols	2013-01-29 07:57:53 +0000
+++ lib/libplank.symbols	2013-02-03 11:21:19 +0000
@@ -26,6 +26,7 @@
 plank_dock_preferences_get_Monitor
 plank_dock_preferences_get_Offset
 plank_dock_preferences_get_Position
+plank_dock_preferences_get_Theme
 plank_dock_preferences_get_type
 plank_dock_preferences_get_UnhideDelay
 plank_dock_preferences_increase_icon_size
@@ -41,6 +42,7 @@
 plank_dock_preferences_set_Monitor
 plank_dock_preferences_set_Offset
 plank_dock_preferences_set_Position
+plank_dock_preferences_set_Theme
 plank_dock_preferences_set_UnhideDelay
 plank_dock_renderer_construct
 plank_dock_renderer_draw_dock
@@ -170,6 +172,7 @@
 plank_drawing_hover_theme_get_type
 plank_drawing_hover_theme_new
 plank_drawing_theme_construct
+plank_drawing_theme_construct_with_name
 plank_drawing_theme_draw_background
 plank_drawing_theme_draw_inner_rect
 plank_drawing_theme_draw_rounded_line
@@ -181,11 +184,13 @@
 plank_drawing_theme_get_InnerStrokeColor
 plank_drawing_theme_get_LineWidth
 plank_drawing_theme_get_OuterStrokeColor
+plank_drawing_theme_get_theme_folder
 plank_drawing_theme_get_top_offset
 plank_drawing_theme_get_TopRoundness
 plank_drawing_theme_get_type
 plank_drawing_theme_load
 plank_drawing_theme_new
+plank_drawing_theme_new_with_name
 plank_drawing_theme_set_BottomRoundness
 plank_drawing_theme_set_FillEndColor
 plank_drawing_theme_set_FillStartColor
@@ -386,24 +391,28 @@
 plank_services_paths_get_AppCacheFolder
 plank_services_paths_get_AppConfigFolder
 plank_services_paths_get_AppDataFolder
+plank_services_paths_get_AppThemeFolder
 plank_services_paths_get_CacheHomeFolder
 plank_services_paths_get_ConfigHomeFolder
 plank_services_paths_get_DataDirFolders
 plank_services_paths_get_DataFolder
 plank_services_paths_get_DataHomeFolder
 plank_services_paths_get_HomeFolder
+plank_services_paths_get_ThemeFolder
 plank_services_paths_get_type
 plank_services_paths_initialize
 plank_services_paths_new
 plank_services_paths_set_AppCacheFolder
 plank_services_paths_set_AppConfigFolder
 plank_services_paths_set_AppDataFolder
+plank_services_paths_set_AppThemeFolder
 plank_services_paths_set_CacheHomeFolder
 plank_services_paths_set_ConfigHomeFolder
 plank_services_paths_set_DataDirFolders
 plank_services_paths_set_DataFolder
 plank_services_paths_set_DataHomeFolder
 plank_services_paths_set_HomeFolder
+plank_services_paths_set_ThemeFolder
 plank_services_preferences_apply
 plank_services_preferences_construct
 plank_services_preferences_construct_with_file