Merge lp:~heathbar/switchboard-plug-pantheon-shell/fix-1036271 into lp:~elementary-apps/switchboard-plug-pantheon-shell/trunk

[Heath Paddock]

Added support for changing dock theme to fix bug #1036271

[Tom Beckmann (tombeckmann)]

I got approval by our designers now :)
One last thing that should be done is hide the box when there is only a single entry.
Also, the extra indentation for the try-catch block seems quite unnecessary here, as the try-catch already intends it once. And it'd be better if you could add a simple "warning (e.message);" in the catch clause instead of ignoring the error, so if something goes wrong you can ask the user to get us the terminal output and get useful information.

[lp:~heathbar/switchboard-plug-pantheon-shell/fix-1036271]

103. By Heath Paddock on 2013-03-03

Improved error and edge-case handling for bug #1036271;

[Cody Garver (codygarver)]

Great work, much appreciated!

review: Approve

[Rico Tzschichholz (ricotz)]

Great to see this included.
Although I want to mention there are some drawbacks. It includes regular files rather than only non-hidden directories. Also there are only two directories supported ~/.local/share/plank/themes and %PREFIX%/share/plank/themes
Sorting the list alphabetically would be useful too.

=== modified file 'src/PlankSettings.vala'
--- src/PlankSettings.vala	2012-07-22 20:51:01 +0000
+++ src/PlankSettings.vala	2013-03-03 23:02:21 +0000
@@ -34,6 +34,21 @@
 		}
 	}
 	
+	private string _theme;
+	public string theme {
+		get {
+			try {
+				_theme = configs.get_value ("PlankDockPreferences", "Theme");
+				return _theme;
+			} catch (Error e) { warning (e.message); }
+			return "";
+		}
+		set {
+			configs.set_string ("PlankDockPreferences", "Theme", value);
+			save ();
+		}
+	}
+	
 	public int monitor {
 		get {
 			try {

=== modified file 'src/desktop-plug.vala'
--- src/desktop-plug.vala	2012-12-15 05:21:14 +0000
+++ src/desktop-plug.vala	2013-03-03 23:02:21 +0000
@@ -89,6 +89,35 @@
         hide_mode.halign = Gtk.Align.START;
         hide_mode.width_request = 164;
         
+        
+        var theme = new Gtk.ComboBoxText ();
+
+        int theme_index = 0;
+        try {
+            
+            string name;
+            var dirs = Environment.get_system_data_dirs ();
+            dirs += Environment.get_user_data_dir ();
+
+            foreach (string dir in dirs) {
+                if (FileUtils.test (dir + "/plank/themes", FileTest.EXISTS)) {
+                    var d = Dir.open(dir + "/plank/themes");
+                    while ((name = d.read_name()) != null) {
+                        theme.append(theme_index.to_string (), _(name));
+                        if (PlankSettings.get_default ().theme.to_string () == name)
+                            theme.active = theme_index;
+                        theme_index++;
+                    }
+                }
+            }
+        } catch (GLib.FileError e){
+            warning (e.message);
+        }
+
+        theme.changed.connect (() => PlankSettings.get_default ().theme = theme.get_active_text ());
+        theme.halign = Gtk.Align.START;
+        theme.width_request = 164;
+        
         var monitor = new Gtk.ComboBoxText ();
         monitor.append ("-1", _("Primary Monitor"));
         int i = 0;
@@ -105,9 +134,13 @@
         dock_grid.attach (icon_size, 3, 0, 1, 1);
         dock_grid.attach (new LLabel.right (_("Hide Mode:")), 0, 1, 2, 1);
         dock_grid.attach (hide_mode, 2, 1, 2, 1);
+        if (theme_index > 1) {
+            dock_grid.attach (new LLabel.right (_("Theme:")), 0, 2, 2, 1);
+            dock_grid.attach (theme, 2, 2, 2, 1);
+        }
         if (i > 1) {
-            dock_grid.attach (new LLabel.right (_("Monitor:")), 0, 2, 2, 1);
-            dock_grid.attach (monitor, 2, 2, 2, 1);
+            dock_grid.attach (new LLabel.right (_("Monitor:")), 0, 3, 2, 1);
+            dock_grid.attach (monitor, 2, 3, 2, 1);
         }
         
         notebook.append_page (dock_grid, new Gtk.Label (_("Dock")));