Merge lp:~ricotz/plank/gsettings into lp:plank

[Rico Tzschichholz]

[lp:~ricotz/plank/gsettings]

1392. By Rico Tzschichholz on 2015-09-16

po: Update translations

1393. By Rico Tzschichholz on 2015-09-28

po: Update translations

1394. By Rico Tzschichholz on 2015-10-01

filedockitem: Correctly display filenames with underscores in folder-menu

1395. By Rico Tzschichholz on 2015-10-01

positionmanager: Just return primary_monitor if empty plug_name was given

1396. By Rico Tzschichholz on 2015-10-01

positionmanager: Add verbose output for monitor_geo_changed

1397. By Rico Tzschichholz on 2015-10-06

dockitemprovider: Insert items where the data was dropped

If there is currently no HoveredItem try to determine the nearest one as
drop-point.

1398. By Rico Tzschichholz on 2015-10-07

lib: Tweak method signature of file-monitor callbacks

1399. By Rico Tzschichholz on 2015-10-07

lib: FileMonitorEvent is a simple enum not a flag

1400. By Rico Tzschichholz on 2015-10-07

lib: Avoid some superfluous reference-taking

1401. By Rico Tzschichholz on 2015-10-07

plankdockitem: Open "preferences" on left-click instead of "about"

1402. By Rico Tzschichholz on 2015-10-08

defaultappprovider: Don't ignore opened applications if Wnck doesn't know

Better don't rely on Wnck if Bamf reported an opened application. If an
application is for whatever reason replacing or renaming its window on
startup we might drop it while Wnck reports a window-count of 0.

1403. By Rico Tzschichholz on 2015-10-08

transientdockitem: Delayed reloading of the window-icon if needed

If the window-icon was null on the first try then schedule a 2nd one.

1404. By Rico Tzschichholz on 2015-10-09

lib: Actually pass e.g. -lm to the linker by adding it to *_LIBADD

1405. By Rico Tzschichholz on 2015-10-09

po: Update translations

1406. By Rico Tzschichholz on 2015-10-09

Prepare 0.10.1 release

1407. By Rico Tzschichholz on 2015-10-19

Back to development

1408. By Rico Tzschichholz on 2015-10-19

build: Be more rebust for parallel building

1409. By Rico Tzschichholz on 2015-10-19

dockrenderer: Don't request a redraw if "transient_items" is empty

1410. By Rico Tzschichholz on 2015-10-31

dockrenderer: Use non-linear transition in/out the "zoom" state

Increase transition-time to 200ms and use cubic-easing.

1411. By Rico Tzschichholz on 2015-10-31

easing: Some optimization, avoid vala's struct-copying by using pointers

1412. By Rico Tzschichholz on 2015-10-31

build: Be more rebust for parallel building

1413. By Rico Tzschichholz on 2015-11-01

easing: Use proper codestyle for ANIMATION_MODES while it is a const

1414. By Rico Tzschichholz on 2015-11-01

dockrenderer: Factor out jump-calculation into easing_bounce

1415. By Rico Tzschichholz on 2015-11-01

dockrenderer: Define and use some internal constants

1416. By Rico Tzschichholz on 2015-11-02

po: Update translations

1417. By Rico Tzschichholz on 2015-11-02

Add docklets support (internal/private)

Based on initially proposed docky 3.0 branch

1418. By Rico Tzschichholz on 2015-11-02

Add GSettings support and transition DockPreferences to it

=== modified file '.bzrignore'
--- .bzrignore	2015-11-02 08:40:11 +0000
+++ .bzrignore	2015-11-02 13:45:34 +0000
@@ -69,4 +69,8 @@
 tests/gmock-tests
 tests/tests
 data/plank.appdata.xml
+data/gschemas.compiled
+data/net.launchpad.plank.gschema.valid
+data/net.launchpad.plank.gschema.xml
+data/net.launchpad.plank.gschema.xml.in
 data/plank.desktop

=== modified file 'configure.ac'
--- configure.ac	2015-11-02 08:40:11 +0000
+++ configure.ac	2015-11-02 13:45:34 +0000
@@ -63,6 +63,8 @@
 
 LT_LIB_M
 
+GLIB_GSETTINGS
+
 AC_SUBST([CFLAGS])
 AC_SUBST([CPPFLAGS])
 AC_SUBST([LDFLAGS])
@@ -390,6 +392,7 @@
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
+data/net.launchpad.plank.gschema.xml.in
 data/apport/Makefile
 data/icons/Makefile
 data/themes/Makefile

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2015-01-29 16:03:59 +0000
+++ data/Makefile.am	2015-11-02 13:45:34 +0000
@@ -12,6 +12,7 @@
 EXTRA_DIST = \
 	application-default-icon.svg \
 	plank.appdata.xml.in \
+	net.launchpad.plank.gschema.xml.in.in \
 	plank.desktop.in \
 	plank.gresource.xml \
 	poof.svg \
@@ -21,6 +22,10 @@
 CLEANFILES = \
 	plank.appdata.xml \
 	plank.desktop \
+	$(gsettings_SCHEMAS) \
+	gschemas.compiled \
+	net.launchpad.plank.gschema.valid \
+	net.launchpad.plank.gschema.xml.in \
 	$(NULL)
 
 dist_man_MANS = \
@@ -35,4 +40,14 @@
 appdatadir = $(datadir)/appdata
 appdata_DATA = plank.appdata.xml
 
+gsettings_SCHEMAS = net.launchpad.plank.gschema.xml
+
 @INTLTOOL_XML_RULE@
+
+@GSETTINGS_RULES@
+
+gschemas.compiled: Makefile $(gsettings_SCHEMAS:.xml=.valid)
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=$(builddir) $(builddir)
+
+all-local: gschemas.compiled
+

=== added file 'data/net.launchpad.plank.gschema.xml.in.in'
--- data/net.launchpad.plank.gschema.xml.in.in	1970-01-01 00:00:00 +0000
+++ data/net.launchpad.plank.gschema.xml.in.in	2015-11-02 13:45:34 +0000
@@ -0,0 +1,132 @@
+<schemalist>
+	<enum id="PlankHideType">
+		<value nick="none" value="0"/>
+		<value nick="intelligent" value="1"/>
+		<value nick="auto" value="2"/>
+		<value nick="dodge-maximized" value="3"/>
+		<value nick="window-dodge" value="4"/>
+		<value nick="dodge-active" value="5"/>
+	</enum>
+
+	<enum id="GtkAlignType">
+		<value nick="fill" value="0"/>
+		<value nick="start" value="1"/>
+		<value nick="end" value="2"/>
+		<value nick="center" value="3"/>
+	</enum>
+
+	<enum id="GtkPositionType">
+		<value nick="left" value="0"/>
+		<value nick="right" value="1"/>
+		<value nick="top" value="2"/>
+		<value nick="bottom" value="3"/>
+	</enum>
+
+
+	<schema id="net.launchpad.plank" path="/net/launchpad/plank/">
+		<child name="docks" schema="net.launchpad.plank.dock.settings"/>
+	</schema>
+
+	<schema id="net.launchpad.plank.dock.settings" gettext-domain="@GETTEXT_PACKAGE@">
+		<key name="alignment" enum='GtkAlignType'>
+			<default>'center'</default>
+			<_summary>The alignment for the dock on the monitor's edge.</_summary>
+			<_description>fill, start, end, center</_description>
+		</key>
+		<key name="auto-pinning" type="b">
+			<default>true</default>
+			<_summary>Whether to automatically pin an application if it seems useful to do.</_summary>
+			<_description></_description>
+		</key>
+		<key name="current-workspace-only" type="b">
+			<default>false</default>
+			<_summary>Whether to show only windows of the current workspace.</_summary>
+			<_description></_description>
+		</key>
+		<key name="dock-items" type="as">
+			<default>[]</default>
+			<_summary>Array of dockitem-files on this dock. DO NOT MODIFY</_summary>
+			<_description></_description>
+		</key>
+		<key name="hide-delay" type="i">
+			<range min="0"/>
+			<default>0</default>
+			<_summary>Time (in ms) to wait before hiding the dock.</_summary>
+			<_description></_description>
+		</key>
+		<key name="hide-mode" enum='PlankHideType'>
+			<default>'intelligent'</default>
+			<_summary>Hidemode of the dock.</_summary>
+			<_description>none, intelligent, auto</_description>
+		</key>
+		<key name="icon-size" type="i">
+			<range min="24" max="128"/>
+			<default>48</default>
+			<_summary>The size of dock icons (in pixels).</_summary>
+			<_description></_description>
+		</key>
+		<key name="items-alignment" enum='GtkAlignType'>
+			<default>'center'</default>
+			<_summary>The alignment of the items in this dock.</_summary>
+			<_description>fill, start, end, center</_description>
+		</key>
+		<key name="lock-items" type="b">
+			<default>false</default>
+			<_summary>Whether to prevent drag'n'drop actions and lock items on the dock.</_summary>
+			<_description></_description>
+		</key>
+		<key name="monitor" type="s">
+			<default>''</default>
+			<_summary>The plug-name of the monitor for the dock to show on (e.g. DVI-I-1, HDMI1, LVDS1). Leave this empty to keep on the primary monitor.</_summary>
+			<_description></_description>
+		</key>
+		<key name="offset" type="i">
+			<range min="-100" max="100"/>
+			<default>0</default>
+			<_summary>The dock's position offset from center (in percent).</_summary>
+			<_description></_description>
+		</key>
+		<key name="pinned-only" type="b">
+			<default>false</default>
+			<_summary>Whether to show only pinned applications. Useful for running more then one dock.</_summary>
+			<_description></_description>
+		</key>
+		<key name="position" enum='GtkPositionType'>
+			<default>'bottom'</default>
+			<_summary>The position for the dock on the monitor.</_summary>
+			<_description>left, right, top, bottom</_description>
+		</key>
+		<key name="pressure-reveal" type="b">
+			<default>false</default>
+			<_summary>Whether to use pressure-based revealing of the dock if the support is available.</_summary>
+			<_description></_description>
+		</key>
+		<key name="show-dock-item" type="b">
+			<default>true</default>
+			<_summary>Whether to show the item for the dock itself.</_summary>
+			<_description></_description>
+		</key>
+		<key name="theme" type="s">
+			<default>'Default'</default>
+			<_summary>The name of the dock's theme to use.</_summary>
+			<_description></_description>
+		</key>
+		<key name="unhide-delay" type="i">
+			<range min="0"/>
+			<default>0</default>
+			<_summary>Time (in ms) to wait before unhiding the dock.</_summary>
+			<_description></_description>
+		</key>
+		<key name="zoom-enabled" type="b">
+			<default>false</default>
+			<_summary>Whether the dock will zoom when hovered.</_summary>
+			<_description></_description>
+		</key>
+		<key name="zoom-percent" type="i">
+			<range min="100" max="200"/>
+			<default>150</default>
+			<_summary>The dock's icon-zoom (in percent).</_summary>
+			<_description></_description>
+		</key>
+	</schema>
+</schemalist>

=== modified file 'docs/Makefile.am'
--- docs/Makefile.am	2015-07-16 08:24:10 +0000
+++ docs/Makefile.am	2015-11-02 13:45:34 +0000
@@ -54,6 +54,7 @@
 	$(top_srcdir)/lib/Services/Logger.vala \
 	$(top_srcdir)/lib/Services/Paths.vala \
 	$(top_srcdir)/lib/Services/Preferences.vala \
+	$(top_srcdir)/lib/Services/Settings.vala \
 	$(top_srcdir)/lib/Services/System.vala \
 	$(top_srcdir)/lib/Services/Worker.vala \
 	$(top_srcdir)/lib/Widgets/CompositedWindow.vala \

=== modified file 'lib/DockController.vala'
--- lib/DockController.vala	2015-09-03 19:48:10 +0000
+++ lib/DockController.vala	2015-11-02 13:45:34 +0000
@@ -74,15 +74,14 @@
 		 *
 		 * @param config_folder the base-folder to load settings from and save them to
 		 */
-		public DockController (File config_folder)
+		public DockController (string dock_name, File config_folder)
 		{
 			// Make sure our config-directory exists
 			Paths.ensure_directory_exists (config_folder);
 			
 			Logger.verbose ("DockController (config_folder = %s)", config_folder.get_path ());
 			
-			Object (config_folder : config_folder,
-				prefs : new DockPreferences.with_file (config_folder.get_child ("settings")));
+			Object (config_folder : config_folder, prefs : new DockPreferences (dock_name));
 		}
 		
 		construct

=== modified file 'lib/DockPreferences.vala'
--- lib/DockPreferences.vala	2015-06-27 13:37:11 +0000
+++ lib/DockPreferences.vala	2015-11-02 13:45:34 +0000
@@ -24,8 +24,20 @@
 	/**
 	 * Contains all preferences for docks.
 	 */
-	public class DockPreferences : Preferences
+	public class DockPreferences : Plank.Services.Settings
 	{
+		static GLib.Settings create_settings (string schema_id, string? path = null)
+		{
+			//FIXME Only to make it run/work uninstalled from top_builddir
+			Environment.set_variable ("GSETTINGS_SCHEMA_DIR", Environment.get_current_dir () + "/data", false);
+			
+			var schema = GLib.SettingsSchemaSource.get_default ().lookup (schema_id, true);
+			if (schema == null)
+				error ("GSettingsSchema '%s' not found", schema_id);
+			
+			return new GLib.Settings.full (schema, null, path);
+		}
+		
 		public const int MIN_ICON_SIZE = 24;
 		public const int MAX_ICON_SIZE = 128;
 		
@@ -50,8 +62,8 @@
 		[Description(nick = "monitor", blurb = "The plug-name of the monitor for the dock to show on (e.g. DVI-I-1, HDMI1, LVDS1). Leave this empty to keep on the primary monitor.")]
 		public string Monitor { get; set; }
 		
-		[Description(nick = "dock-items", blurb = "List of *.dockitem files on this dock. DO NOT MODIFY")]
-		public string DockItems { get; set; }
+		[Description(nick = "dock-items", blurb = "Array of the dockitem-files on this dock. DO NOT MODIFY")]
+		public string[] DockItems { get; set; }
 		
 		[Description(nick = "position", blurb = "The position for the dock on the monitor.  If 0, left.  If 1, right.  If 2, top.  If 3, bottom.")]
 		public Gtk.PositionType Position { get; set; }
@@ -92,25 +104,9 @@
 		/**
 		 * {@inheritDoc}
 		 */
-		public DockPreferences ()
-		{
-			base ();
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		public DockPreferences.with_file (File file)
-		{
-			base.with_file (file);
-		}
-		
-		/**
-		 * {@inheritDoc}
-		 */
-		public DockPreferences.with_filename (string filename)
-		{
-			base.with_filename (filename);
+		public DockPreferences (string name)
+		{
+			Object (settings: create_settings ("net.launchpad.plank.dock.settings", "/net/launchpad/plank/docks/%s/".printf (name)));
 		}
 		
 		~DockPreferences ()
@@ -118,34 +114,6 @@
 		}
 		
 		/**
-		 * {@inheritDoc}
-		 */
-		protected override void reset_properties ()
-		{
-			Logger.verbose ("DockPreferences.reset_properties ()");
-			
-			CurrentWorkspaceOnly = false;
-			IconSize = 48;
-			HideMode = HideType.INTELLIGENT;
-			UnhideDelay = 0;
-			HideDelay = 0;
-			Monitor = "";
-			DockItems = "";
-			Position = Gtk.PositionType.BOTTOM;
-			Offset = 0;
-			Theme = Plank.Drawing.Theme.DEFAULT_NAME;
-			Alignment = Gtk.Align.CENTER;
-			ItemsAlignment = Gtk.Align.CENTER;
-			LockItems = false;
-			PressureReveal = false;
-			PinnedOnly = false;
-			AutoPinning = true;
-			ShowDockItem = true;
-			ZoomEnabled = false;
-			ZoomPercent = 150;
-		}
-		
-		/**
 		 * Increases the IconSize, if it is not already at its max.
 		 */
 		public void increase_icon_size ()
@@ -179,9 +147,6 @@
 		protected override void verify (string prop)
 		{
 			switch (prop) {
-			case "CurrentWorkspaceOnly":
-				break;
-			
 			case "IconSize":
 				if (IconSize < MIN_ICON_SIZE)
 					IconSize = MIN_ICON_SIZE;
@@ -191,71 +156,12 @@
 					IconSize -= 1;
 				break;
 			
-			case "HideMode":
-				break;
-			
-			case "UnhideDelay":
-				break;
-			
-			case "HideDelay":
-				break;
-			
-			case "Monitor":
-				// TODO Try to transition old setting
-				if (Monitor == "-1")
-					Monitor = "";
-				break;
-			
-			case "DockItems":
-				break;
-			
-			case "Position":
-				break;
-			
-			case "Offset":
-				if (Offset < -100)
-					Offset = -100;
-				else if (Offset > 100)
-					Offset = 100;
-				break;
-			
 			case "Theme":
 				if (Theme == "")
 					Theme = Plank.Drawing.Theme.DEFAULT_NAME;
 				else if (Theme.contains ("/"))
 					Theme = Theme.replace ("/", "");
 				break;
-			
-			case "Alignment":
-				break;
-			
-			case "ItemsAlignment":
-				break;
-			
-			case "LockItems":
-				break;
-			
-			case "PressureReveal":
-				break;
-			
-			case "PinnedOnly":
-				break;
-			
-			case "AutoPinning":
-				break;
-			
-			case "ShowDockItem":
-				break;
-			
-			case "ZoomEnabled":
-				break;
-			
-			case "ZoomPercent":
-				if (ZoomPercent < MIN_ICON_ZOOM)
-					ZoomPercent = MIN_ICON_ZOOM;
-				else if (ZoomPercent > MAX_ICON_ZOOM)
-					ZoomPercent = MAX_ICON_ZOOM;
-				break;
 			}
 		}
 	}

=== modified file 'lib/Factories/AbstractMain.vala'
--- lib/Factories/AbstractMain.vala	2015-07-20 09:03:45 +0000
+++ lib/Factories/AbstractMain.vala	2015-11-02 13:45:34 +0000
@@ -299,7 +299,7 @@
 		 */
 		protected virtual void create_controller ()
 		{
-			controller = new DockController (Paths.AppConfigFolder.get_child (dock_name));
+			controller = new DockController (dock_name, Paths.AppConfigFolder.get_child (dock_name));
 			controller.initialize ();
 			
 			add_window (controller.window);

=== modified file 'lib/Factories/ItemFactory.vala'
--- lib/Factories/ItemFactory.vala	2015-10-07 13:31:26 +0000
+++ lib/Factories/ItemFactory.vala	2015-11-02 13:45:34 +0000
@@ -157,7 +157,7 @@
 		 * @param ordering a ";;"-separated string to be used to order the loaded DockItems
 		 * @return the new List of DockItems
 		 */
-		public Gee.ArrayList<DockItem> load_items (GLib.File source_dir, string? ordering = null)
+		public Gee.ArrayList<DockItem> load_items (GLib.File source_dir, string[]? ordering = null)
 		{
 			var result = new Gee.ArrayList<DockItem> ();
 			
@@ -204,7 +204,7 @@
 			var new_items = new Gee.ArrayList<DockItem> ();
 			
 			foreach (var item in result) {
-				if (ordering.contains (item.DockItemFilename))
+				if (item.DockItemFilename in ordering)
 					existing_items.add (item);
 				else
 					new_items.add (item);
@@ -213,8 +213,7 @@
 			result.clear ();
 			
 			// add saved dockitems based on their serialized order
-			var dockitems = ordering.split (";;");
-			foreach (unowned string dockitem in dockitems)
+			foreach (unowned string dockitem in ordering)
 				foreach (var item in existing_items)
 					if (dockitem == item.DockItemFilename) {
 						result.add (item);

=== modified file 'lib/Items/ApplicationDockItemProvider.vala'
--- lib/Items/ApplicationDockItemProvider.vala	2015-10-07 13:31:26 +0000
+++ lib/Items/ApplicationDockItemProvider.vala	2015-11-02 13:45:34 +0000
@@ -277,11 +277,11 @@
 		/**
 		 * Serializes the dockitem-filenames
 		 *
-		 * @return string containing all filesnames separated by ';;'
+		 * @return a array of string containing all filesnames
 		 */
-		public string get_item_list_string ()
+		public string[] get_item_list_string ()
 		{
-			string? item_list = null;
+			var item_list = new Gee.ArrayList<string> ();
 			foreach (var element in internal_elements) {
 				unowned DockItem? item = (element as DockItem);
 				if (item == null || (item is TransientDockItem))
@@ -289,17 +289,11 @@
 				
 				var dock_item_filename = item.DockItemFilename;
 				if (dock_item_filename.length > 0) {
-					if (item_list != null)
-						item_list = "%s;;%s".printf (item_list, dock_item_filename);
-					else
-						item_list = (owned) dock_item_filename;
+					item_list.add ((owned) dock_item_filename);
 				}
 			}
 			
-			if (item_list == null)
-				return "";
-			
-			return item_list;
+			return item_list.to_array ();
 		}
 		
 		protected virtual void app_opened (Bamf.Application app)

=== modified file 'lib/Makefile.am'
--- lib/Makefile.am	2015-11-02 08:40:11 +0000
+++ lib/Makefile.am	2015-11-02 13:45:34 +0000
@@ -95,6 +95,7 @@
 	Services/Logger.vala \
 	Services/Paths.vala \
 	Services/Preferences.vala \
+	Services/Settings.vala \
 	Services/System.vala \
 	Services/Worker.vala \
 	Widgets/CompositedWindow.vala \

=== modified file 'lib/PositionManager.vala'
--- lib/PositionManager.vala	2015-10-06 18:10:59 +0000
+++ lib/PositionManager.vala	2015-11-02 13:45:34 +0000
@@ -167,8 +167,6 @@
 		{
 			static_dock_region = {};
 			draw_values = new Gee.HashMap<DockElement, DockItemDrawValue> ();
-			
-			controller.prefs.notify.connect (prefs_changed);
 		}
 		
 		/**
@@ -179,6 +177,7 @@
 		{
 			unowned Gdk.Screen screen = controller.window.get_screen ();
 			
+			controller.prefs.notify.connect (prefs_changed);
 			screen.monitors_changed.connect (screen_changed);
 			screen.size_changed.connect (screen_changed);
 			screen.composited_changed.connect (screen_composited_changed);

=== added file 'lib/Services/Settings.vala'
--- lib/Services/Settings.vala	1970-01-01 00:00:00 +0000
+++ lib/Services/Settings.vala	2015-11-02 13:45:34 +0000
@@ -0,0 +1,122 @@
+//
+//  Copyright (C) 2014 Rico Tzschichholz
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+namespace Plank.Services
+{
+	/**
+	 * The base class for gsettings-based configuration classes. Defined properties will be bound
+	 * to the corresponing schema-key of the given schema-path. The property's nick-name must match
+	 * the schema-key.
+	 */
+	public abstract class Settings : GLib.Object
+	{
+		[CCode (notify = false)]
+		public GLib.Settings settings { get; construct; }
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		public Settings (string schema)
+		{
+			Object (settings: new GLib.Settings (schema));
+		}
+		
+		/**
+		 * {@inheritDoc}
+		 */
+		public Settings.with_path (string schema, string path)
+		{
+			Object (settings: new GLib.Settings.with_path (schema, path));
+		}
+		
+		construct
+		{
+			debug ("Bind '%s' to '%s'", get_type ().name (), settings.path);
+			
+			unowned ParamSpec[] properties = get_class ().list_properties ();
+			
+			// Bind available gsettings-keys to their class-properties
+			foreach (unowned string key in settings.list_keys ()) {
+				ParamSpec? property = null;
+				foreach (unowned ParamSpec p in properties)
+					if (p.get_nick () == key)
+						property = p;
+				if (property == null)
+					continue;
+				
+				unowned string name = property.get_name ();
+				unowned string nick = property.get_nick ();
+				var type = property.value_type;
+				
+				Logger.verbose ("Bind '%s%s' to '%s.%s'", settings.path, nick, get_type ().name (), name);
+				if (type.is_fundamental () || type.is_enum () || type.is_flags () || type == typeof(string[])) {
+					settings.bind (nick, this, name, SettingsBindFlags.DEFAULT);
+				} else {
+					warning ("Binding of '%s' from type '%s' not supported yet!", name, type.name ());
+				}
+				
+				verify (name);
+			}
+		}
+		
+		/**
+		 * Verify the property given by its name and change the property if necessary.
+		 *
+		 * @param name the name of the property
+		 */
+		protected virtual void verify (string name)
+		{
+			// do nothing, this isnt abstract because we dont
+			// want to force subclasses to implement this
+		}
+		
+		/**
+		 * Resets all properties to their default values.
+		 */
+		protected void reset_all ()
+		{
+			foreach (unowned string key in settings.list_keys ())
+				settings.reset (key);
+		}
+		
+		/**
+		 * Delays saving changes until apply() is called.
+		 */
+		public void delay ()
+		{
+			if (settings.delay_apply)
+				return;
+			
+			Logger.verbose ("Settings.delay()");
+			
+			settings.delay ();
+		}
+		
+		/**
+		 * If any settings were changed, apply them now.
+		 */
+		public void apply ()
+		{
+			if (!settings.delay_apply)
+				return;
+			
+			Logger.verbose ("Settings.apply()");
+			
+			settings.apply ();
+		}
+	}
+}

=== modified file 'lib/libplank.symbols'
--- lib/libplank.symbols	2015-09-03 19:37:54 +0000
+++ lib/libplank.symbols	2015-11-02 13:45:34 +0000
@@ -31,8 +31,6 @@
 plank_dock_controller_set_renderer
 plank_dock_controller_set_window
 plank_dock_preferences_construct
-plank_dock_preferences_construct_with_file
-plank_dock_preferences_construct_with_filename
 plank_dock_preferences_decrease_icon_size
 plank_dock_preferences_get_Alignment
 plank_dock_preferences_get_AutoPinning
@@ -57,8 +55,6 @@
 plank_dock_preferences_increase_icon_size
 plank_dock_preferences_is_horizontal_dock
 plank_dock_preferences_new
-plank_dock_preferences_new_with_file
-plank_dock_preferences_new_with_filename
 plank_dock_preferences_set_Alignment
 plank_dock_preferences_set_AutoPinning
 plank_dock_preferences_set_CurrentWorkspaceOnly
@@ -597,6 +593,14 @@
 plank_services_prefs_serializable_get_type
 plank_services_prefs_serializable_prefs_deserialize
 plank_services_prefs_serializable_prefs_serialize
+plank_services_settings_apply
+plank_services_settings_construct
+plank_services_settings_construct_with_path
+plank_services_settings_delay
+plank_services_settings_get_settings
+plank_services_settings_get_type
+plank_services_settings_reset_all
+plank_services_settings_verify
 plank_services_system_get_type
 plank_services_system_is_desktop_session
 plank_services_system_launch

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2015-01-04 13:41:19 +0000
+++ po/POTFILES.in	2015-11-02 13:45:34 +0000
@@ -1,3 +1,4 @@
+data/net.launchpad.plank.gschema.xml.in.in
 data/plank.appdata.xml.in
 data/plank.desktop.in
 [type: gettext/glade]data/ui/preferences.ui

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2015-11-02 08:40:11 +0000
+++ po/POTFILES.skip	2015-11-02 13:45:34 +0000
@@ -1,3 +1,4 @@
+data/net.launchpad.plank.gschema.xml.in
 docklets/Clippy/ClippyDockItem.c
 docklets/Clock/ClockDockItem.c
 docklets/Desktop/DesktopDockItem.c

=== modified file 'po/plank.pot'
--- po/plank.pot	2015-07-16 11:48:57 +0000
+++ po/plank.pot	2015-11-02 13:45:34 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 13:47+0200\n"
+"POT-Creation-Date: 2015-09-15 13:40+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,100 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:1
+msgid "The alignment for the dock on the monitor's edge."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:2
+msgid "fill, start, end, center"
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:3
+msgid "Whether to automatically pin an application if it seems useful to do."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:4
+msgid "Whether to show only windows of the current workspace."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:5
+msgid "Array of dockitem-files on this dock. DO NOT MODIFY"
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:6
+msgid "Time (in ms) to wait before hiding the dock."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:7
+msgid "Hidemode of the dock."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:8
+msgid "none, intelligent, auto"
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:9
+msgid "The size of dock icons (in pixels)."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:10
+msgid "The alignment of the items in this dock."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:11
+msgid "Whether to prevent drag'n'drop actions and lock items on the dock."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:12
+msgid ""
+"The plug-name of the monitor for the dock to show on (e.g. DVI-I-1, HDMI1, "
+"LVDS1). Leave this empty to keep on the primary monitor."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:13
+msgid "The dock's position offset from center (in percent)."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:14
+msgid ""
+"Whether to show only pinned applications. Useful for running more then one "
+"dock."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:15
+msgid "The position for the dock on the monitor."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:16
+msgid "left, right, top, bottom"
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:17
+msgid ""
+"Whether to use pressure-based revealing of the dock if the support is "
+"available."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:18
+msgid "Whether to show the item for the dock itself."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:19
+msgid "The name of the dock's theme to use."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:20
+msgid "Time (in ms) to wait before unhiding the dock."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:21
+msgid "Whether the dock will zoom when hovered."
+msgstr ""
+
+#: ../data/net.launchpad.plank.gschema.xml.in.in.h:22
+msgid "The dock's icon-zoom (in percent)."
+msgstr ""
+
 #: ../data/plank.appdata.xml.in.h:1
 msgid ""
 "Plank is meant to be the simplest dock on the planet. The goal is to provide "
@@ -176,28 +270,28 @@
 msgid "Behaviour"
 msgstr ""
 
-#: ../lib/Items/ApplicationDockItem.vala:442
-#: ../lib/Items/FileDockItem.vala:326 ../lib/Items/FileDockItem.vala:344
+#: ../lib/Items/ApplicationDockItem.vala:454
+#: ../lib/Items/FileDockItem.vala:328 ../lib/Items/FileDockItem.vala:346
 msgid "_Keep in Dock"
 msgstr ""
 
-#: ../lib/Items/ApplicationDockItem.vala:450
+#: ../lib/Items/ApplicationDockItem.vala:462
 msgid "_Close All"
 msgstr ""
 
-#: ../lib/Items/ApplicationDockItem.vala:450
+#: ../lib/Items/ApplicationDockItem.vala:462
 msgid "_Close"
 msgstr ""
 
-#: ../lib/Items/FileDockItem.vala:331
+#: ../lib/Items/FileDockItem.vala:333
 msgid "_Open in File Browser"
 msgstr ""
 
-#: ../lib/Items/FileDockItem.vala:349
+#: ../lib/Items/FileDockItem.vala:351
 msgid "_Open"
 msgstr ""
 
-#: ../lib/Items/FileDockItem.vala:353
+#: ../lib/Items/FileDockItem.vala:355
 msgid "Open Containing _Folder"
 msgstr ""
 

=== modified file 'tests/Controller.vala'
--- tests/Controller.vala	2015-05-17 11:04:46 +0000
+++ tests/Controller.vala	2015-11-02 13:45:34 +0000
@@ -59,7 +59,7 @@
 		provider.add (item);
 		assert (item.ref_count > 1);
 
-		controller = new DockController (config_folder);
+		controller = new DockController (TEST_DOCK_NAME, config_folder);
 		controller.add (provider);
 		controller.initialize ();
 		
@@ -88,7 +88,7 @@
 		DockController controller;
 		
 		File config_folder = Paths.AppConfigFolder.get_child (TEST_DOCK_NAME);
-		controller = new DockController (config_folder);
+		controller = new DockController (TEST_DOCK_NAME, config_folder);
 		controller.initialize ();
 	}
 	

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2015-10-19 12:16:04 +0000
+++ tests/Makefile.am	2015-11-02 13:45:34 +0000
@@ -90,7 +90,7 @@
 	data \
 	$(NULL)
 
-TESTS_ENVIRONMENT = HOME=$(abs_builddir)/home
+TESTS_ENVIRONMENT = HOME=$(abs_builddir)/home GSETTINGS_SCHEMA_DIR=$(abs_top_builddir)/data
 
 if HAVE_HEADLESS_TESTS
 TESTS_ENVIRONMENT += $(XVFB_RUN) --auto-servernum --server-args="-screen 0 1280x1024x24" $(DBUS_LAUNCH)

=== modified file 'tests/Widgets.vala'
--- tests/Widgets.vala	2015-04-27 13:39:02 +0000
+++ tests/Widgets.vala	2015-11-02 13:45:34 +0000
@@ -106,7 +106,7 @@
 		PreferencesWindow window;
 		DockPreferences prefs;
 		
-		prefs = new DockPreferences ();
+		prefs = new DockPreferences ("test");
 		window = new PreferencesWindow (prefs);
 		window.show ();