Merge lp:~l-admin-3/configurator/automatic-cleanup-branch into lp:configurator

[Marcus Wichelmann]

Automatic code cleanup

Here are some code cleanups. ;)
The branch and this merge proposal are automatically generated.

The changes passed the thest-build.

Unmerged revisions

76. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/Key.vala

75. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/Schema.vala

74. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/SchemaFolder.vala

73. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/KeyInfo.vala

72. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/SchemaList.vala

71. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/Fields/DoubleInput.vala

70. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/Fields/ArrayInput.vala

69. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/Fields/SelectInput.vala

68. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/Fields/IntegerInput.vala

67. By Marcus Wichelmann on 2015-08-04

Cleanup: ./src/Widgets/Fields/StringInput.vala

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2015-04-04 19:12:47 +0000
+++ src/MainWindow.vala	2015-08-04 19:27:32 +0000
@@ -1,80 +1,83 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator {
-	public class MainWindow : Gtk.Window {
-		public configuratorApp app;
-
-		private Gtk.Box box;
-
-		private Widgets.TitleBar title_bar;
-
-		private Gtk.Stack stack;
-
-		private Widgets.BrowserView browser_view;
-		private Widgets.EventsView events_view;
-
-		public MainWindow (configuratorApp app) {
-			this.app = app;
-			this.set_application (app);
-
-			this.set_size_request (1000, 650);
-			this.set_has_resize_grip (false);
-			this.window_position = Gtk.WindowPosition.CENTER;
-
-			setup_ui ();
-
-			if (Services.Settings.get_default ().maximized)
-				this.maximize ();
-			else
-				this.unmaximize ();
-
-			this.window_state_event.connect ((e) => {
-				Services.Settings.get_default ().maximized = (get_window ().get_state () & Gdk.WindowState.MAXIMIZED) != 0;
-				return false;
-			});
-
-			this.show_all ();
-		}
-
-		private void setup_ui () {
-			box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-
-			title_bar = new Widgets.TitleBar (this);
-
-			this.set_titlebar (title_bar);
-			box.pack_start (title_bar, false, true);
-
-			stack = new Gtk.Stack ();
-
-			browser_view = new Widgets.BrowserView ();
-
-			stack.add_titled (browser_view, "browser", _("Schemas"));
-
-			events_view = new Widgets.EventsView ();
-
-			stack.add_titled (events_view, "events", _("Events"));
-
-			box.pack_start (stack, true, true);
-
-			title_bar.show_stack (stack);
-
-			this.add (box);
-		}
-	}
-}
+    public class MainWindow : Gtk.Window {
+        public configuratorApp app;
+
+        private Gtk.Box box;
+
+        private Widgets.TitleBar title_bar;
+
+        private Gtk.Stack stack;
+
+        private Widgets.BrowserView browser_view;
+        private Widgets.EventsView events_view;
+
+        public MainWindow (configuratorApp app) {
+            this.app = app;
+            this.set_application (app);
+
+            this.set_size_request (1000, 650);
+            this.set_has_resize_grip (false);
+            this.window_position = Gtk.WindowPosition.CENTER;
+
+            setup_ui ();
+
+            if (Services.Settings.get_default ().maximized) {
+                this.maximize ();
+            } else {
+                this.unmaximize ();
+            }
+
+            this.window_state_event.connect ((e) => {
+                Services.Settings.get_default ().maximized = (get_window ().get_state () & Gdk.WindowState.MAXIMIZED) != 0;
+
+                return false;
+            });
+
+            this.show_all ();
+        }
+
+        private void setup_ui () {
+            box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+
+            title_bar = new Widgets.TitleBar (this);
+
+            this.set_titlebar (title_bar);
+            box.pack_start (title_bar, false, true);
+
+            stack = new Gtk.Stack ();
+
+            browser_view = new Widgets.BrowserView ();
+
+            stack.add_titled (browser_view, "browser", _("Schemas"));
+
+            events_view = new Widgets.EventsView ();
+
+            stack.add_titled (events_view, "events", _("Events"));
+
+            box.pack_start (stack, true, true);
+
+            title_bar.show_stack (stack);
+
+            this.add (box);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Services/EventManager.vala'
--- src/Services/EventManager.vala	2015-04-15 18:48:01 +0000
+++ src/Services/EventManager.vala	2015-08-04 19:27:32 +0000
@@ -1,46 +1,47 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Services {
-	public enum EventType {
-		KEY_CHANGED
-	}
-
-	public class EventManager : Object {
-		public signal void event (EventType type, GLib.Settings settings, string key);
-
-		public static EventManager? instance = null;
-
-		public EventManager () {
-			
-		}
-
-		public void key_changed (GLib.Settings settings, string key) {
-			if (settings.schema_id != "org.pantheon.configurator")
-				event (EventType.KEY_CHANGED, settings, key);
-		}
-
-		public static EventManager get_default () {
-			if (instance == null) {
-				instance = new EventManager ();
-			}
-
-			return instance;
-		}
-	}
-}
+    public enum EventType {
+        KEY_CHANGED
+    }
+
+    public class EventManager : Object {
+        public signal void event (EventType type, GLib.Settings settings, string key);
+
+        public static EventManager? instance = null;
+
+        public EventManager () {
+        }
+
+        public void key_changed (GLib.Settings settings, string key) {
+            if (settings.schema_id != "org.pantheon.configurator") {
+                event (EventType.KEY_CHANGED, settings, key);
+            }
+        }
+
+        public static EventManager get_default () {
+            if (instance == null) {
+                instance = new EventManager ();
+            }
+
+            return instance;
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Services/Settings.vala'
--- src/Services/Settings.vala	2015-04-04 19:12:47 +0000
+++ src/Services/Settings.vala	2015-08-04 19:27:32 +0000
@@ -1,37 +1,38 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Services {
-	public class Settings : Granite.Services.Settings {
-		public bool maximized { get; set; }
-
-		public static Settings? instance = null;
-
-		public Settings () {
-			base ("org.pantheon.configurator");
-		}
-
-		public static Settings get_default () {
-			if (instance == null) {
-				instance = new Settings ();
-			}
-
-			return instance;
-		}
-	}
-}
+    public class Settings : Granite.Services.Settings {
+        public bool maximized { get; set; }
+
+        public static Settings? instance = null;
+
+        public Settings () {
+            base ("org.pantheon.configurator");
+        }
+
+        public static Settings get_default () {
+            if (instance == null) {
+                instance = new Settings ();
+            }
+
+            return instance;
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2015-04-12 12:50:47 +0000
+++ src/Utils.vala	2015-08-04 19:27:32 +0000
@@ -1,103 +1,127 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Utils {
-	public string type_to_string (VariantType variant_type) {
-		var type = variant_type.dup_string ();
-
-		if (type.has_prefix ("a") && type.length >= 2)
-			return "Array of %s".printf (dup_type_to_string (type.substring (1)).down ());
-
-		return dup_type_to_string (type);
-	}
-
-	public string dup_type_to_string (string type) {
-		switch (type) {
-			case "b":
-				return "Boolean";
-			case "y":
-				return "Byte";
-			case "n":
-				return "Integer";
-			case "q":
-				return "Unsigned integer";
-			case "i":
-				return "Int32";
-			case "u":
-				return "Unsigned Int32";
-			case "x":
-				return "Int64";
-			case "t":
-				return "Unsigned Int64";
-			case "h":
-				return "Handle";
-			case "s":
-			case "o":
-			case "g":
-				return "String";
-		}
-
-		return "\"%s\"".printf (type);
-	}
-
-	public string variant_to_string (Variant variant) {
-		var type = variant.get_type ().dup_string ();
-
-		switch (type) {
-			case "b":
-				return variant.get_boolean () ? _("Enabled") : _("Disabled");
-			case "y":
-				return variant.get_byte ().to_string ();
-			case "n":
-				return variant.get_int16 ().to_string ();
-			case "q":
-				return variant.get_uint16 ().to_string ();
-			case "i":
-				return variant.get_int32 ().to_string ();
-			case "u":
-				return variant.get_uint32 ().to_string ();
-			case "x":
-				return variant.get_int64 ().to_string ();
-			case "t":
-				return variant.get_uint64 ().to_string ();
-			case "h":
-				return variant.get_handle ().to_string ();
-			case "s":
-			case "o":
-			case "g":
-				return "\"%s\"".printf (variant.get_string ().to_string ());
-			case "as":
-				var strings = variant.get_strv ();
-				var text = "";
-
-				if (strings.length == 0)
-					return _("Empty array");
-
-				for (int i = 0; i < strings.length; i++) {
-					text += "\"%s\"".printf (strings[i]);
-
-					if (i < strings.length -1)
-						text += ", ";
-				}
-
-				return text;
-		}
-
-		return _("Preview not supported.");
-	}
-}
+    public string type_to_string (VariantType variant_type) {
+        var type = variant_type.dup_string ();
+
+        if (type.has_prefix ("a") && type.length >= 2) {
+            return "Array of %s".printf (dup_type_to_string (type.substring (1)).down ());
+        }
+
+        return dup_type_to_string (type);
+    }
+
+    public string dup_type_to_string (string type) {
+        switch (type) {
+            case "b":
+
+                return "Boolean";
+            case "y":
+
+                return "Byte";
+            case "n":
+
+                return "Integer";
+            case "q":
+
+                return "Unsigned integer";
+            case "i":
+
+                return "Int32";
+            case "u":
+
+                return "Unsigned Int32";
+            case "x":
+
+                return "Int64";
+            case "t":
+
+                return "Unsigned Int64";
+            case "h":
+
+                return "Handle";
+            case "s":
+            case "o":
+            case "g":
+
+                return "String";
+        }
+
+        return "\"%s\"".printf (type);
+    }
+
+    public string variant_to_string (Variant variant) {
+        var type = variant.get_type ().dup_string ();
+
+        switch (type) {
+            case "b":
+
+                return variant.get_boolean () ? _("Enabled") : _("Disabled");
+            case "y":
+
+                return variant.get_byte ().to_string ();
+            case "n":
+
+                return variant.get_int16 ().to_string ();
+            case "q":
+
+                return variant.get_uint16 ().to_string ();
+            case "i":
+
+                return variant.get_int32 ().to_string ();
+            case "u":
+
+                return variant.get_uint32 ().to_string ();
+            case "x":
+
+                return variant.get_int64 ().to_string ();
+            case "t":
+
+                return variant.get_uint64 ().to_string ();
+            case "h":
+
+                return variant.get_handle ().to_string ();
+            case "s":
+            case "o":
+            case "g":
+
+                return "\"%s\"".printf (variant.get_string ().to_string ());
+            case "as":
+                var strings = variant.get_strv ();
+                var text = "";
+
+                if (strings.length == 0) {
+                    return _("Empty array");
+                }
+
+                for (int i = 0; i < strings.length; i++) {
+                    text += "\"%s\"".printf (strings[i]);
+
+                    if (i < strings.length - 1) {
+                        text += ", ";
+                    }
+                }
+
+                return text;
+        }
+
+        return _("Preview not supported.");
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/BrowserView.vala'
--- src/Widgets/BrowserView.vala	2015-04-16 17:11:58 +0000
+++ src/Widgets/BrowserView.vala	2015-08-04 19:27:32 +0000
@@ -1,53 +1,55 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class BrowserView : Gtk.Paned {
-		private SchemaList schema_list;
-
-		private Gtk.ScrolledWindow scrolled;
-		private KeyList key_list;
-
-		public BrowserView () {
-			schema_list = new SchemaList ();
-			schema_list.set_size_request (200, -1);
-			schema_list.item_selected.connect ((item) => {
-				if (item.get_type () == typeof (Schema))
-					key_list.show_keys_for_schema ((item as Schema).get_schema ());
-				else if (item.get_type () == typeof (SchemaFolder))
-					key_list.show_keys_for_schema ((item as SchemaFolder).get_schema ());
-				else
-					key_list.clear_list ();
-			});
-
-			this.pack1 (schema_list, false, false);
-
-			scrolled = new Gtk.ScrolledWindow (null, null);
-			scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
-
-			key_list = new KeyList ();
-			key_list.valign = Gtk.Align.START;
-			key_list.margin_start = 12;
-			key_list.margin_end = 12;
-
-			scrolled.add (key_list);
-
-			this.pack2 (scrolled, true, false);
-		}
-	}
-}
+    public class BrowserView : Gtk.Paned {
+        private SchemaList schema_list;
+
+        private Gtk.ScrolledWindow scrolled;
+        private KeyList key_list;
+
+        public BrowserView () {
+            schema_list = new SchemaList ();
+            schema_list.set_size_request (200, -1);
+            schema_list.item_selected.connect ((item) => {
+                if (item.get_type () == typeof (Schema)) {
+                    key_list.show_keys_for_schema ((item as Schema).get_schema ());
+                } else if (item.get_type () == typeof (SchemaFolder)) {
+                    key_list.show_keys_for_schema ((item as SchemaFolder).get_schema ());
+                } else {
+                    key_list.clear_list ();
+                }
+            });
+
+            this.pack1 (schema_list, false, false);
+
+            scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
+
+            key_list = new KeyList ();
+            key_list.valign = Gtk.Align.START;
+            key_list.margin_start = 12;
+            key_list.margin_end = 12;
+
+            scrolled.add (key_list);
+
+            this.pack2 (scrolled, true, false);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/EventsView.vala'
--- src/Widgets/EventsView.vala	2015-04-14 22:17:42 +0000
+++ src/Widgets/EventsView.vala	2015-08-04 19:27:32 +0000
@@ -1,64 +1,65 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class EventsView : Gtk.Box {
-		private Gtk.Stack stack;
-
-		private InfoScreen info_screen;
-
-		private Gtk.ScrolledWindow scrolled;
-		private KeyList key_list;
-
-		public EventsView () {
-			stack = new Gtk.Stack ();
-
-			info_screen = new InfoScreen (_("No events logged yet"),
-					_("On this page you'll see a list of settings-keys that have changed since you have started this application.") + "\n\n" +
-					_("You could use this feature to search for keys that are changed by the preferences of another program. Thanks to the code-examples you're then\nable to integrate these keys into your own applications and scripts."),
-					"dialog-information");
-
-			stack.add_named (info_screen, "info-screen");
-
-			scrolled = new Gtk.ScrolledWindow (null, null);
-			scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
-
-			key_list = new KeyList ();
-			key_list.valign = Gtk.Align.START;
-			key_list.margin_start = 12;
-			key_list.margin_end = 12;
-
-			scrolled.add (key_list);
-
-			stack.add_named (scrolled, "key-list");
-
-			this.pack_start (stack, true, true);
-
-			Services.EventManager.get_default ().event.connect ((type, settings, key) => {
-				if (type == Services.EventType.KEY_CHANGED) {
-					stack.set_visible_child_name ("key-list");
-
-					key_list.add_item (settings, key, true, false, true);
-					key_list.show_all ();
-				} else {
-					warning (_("Unsupported event type \"%s\""), type.to_string ());
-				}
-			});
-		}
-	}
-}
+    public class EventsView : Gtk.Box {
+        private Gtk.Stack stack;
+
+        private InfoScreen info_screen;
+
+        private Gtk.ScrolledWindow scrolled;
+        private KeyList key_list;
+
+        public EventsView () {
+            stack = new Gtk.Stack ();
+
+            info_screen = new InfoScreen (_("No events logged yet"),
+                                          _("On this page you'll see a list of settings-keys that have changed since you have started this application.") + "\n\n" +
+                                          _("You could use this feature to search for keys that are changed by the preferences of another program. Thanks to the code-examples you're then\nable to integrate these keys into your own applications and scripts."),
+                                          "dialog-information");
+
+            stack.add_named (info_screen, "info-screen");
+
+            scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
+
+            key_list = new KeyList ();
+            key_list.valign = Gtk.Align.START;
+            key_list.margin_start = 12;
+            key_list.margin_end = 12;
+
+            scrolled.add (key_list);
+
+            stack.add_named (scrolled, "key-list");
+
+            this.pack_start (stack, true, true);
+
+            Services.EventManager.get_default ().event.connect ((type, settings, key) => {
+                if (type == Services.EventType.KEY_CHANGED) {
+                    stack.set_visible_child_name ("key-list");
+
+                    key_list.add_item (settings, key, true, false, true);
+                    key_list.show_all ();
+                } else {
+                    warning (_("Unsupported event type \"%s\""), type.to_string ());
+                }
+            });
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/ArrayInput.vala'
--- src/Widgets/Fields/ArrayInput.vala	2015-04-15 18:56:01 +0000
+++ src/Widgets/Fields/ArrayInput.vala	2015-08-04 19:27:32 +0000
@@ -1,201 +1,203 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class ArrayInput : Gtk.Button {
-		private Gtk.Popover popover;
-
-		private Gtk.Box box;
-
-		private Gtk.ListBox listbox;
-
-		private Gtk.ActionBar action_bar;
-
-		private Gtk.Entry add_entry;
-		private Gtk.Button add_button;
-
-		public ArrayInput (Settings settings, string key) {
-			popover = new Gtk.Popover (this);
-
-			this.clicked.connect (() => popover.show_all ());
-
-			box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-
-			listbox = new Gtk.ListBox ();
-			listbox.margin_top = 3;
-			listbox.margin_bottom = 3;
-
-			box.pack_start (listbox, true, true);
-
-			action_bar = new Gtk.ActionBar ();
-
-			add_entry = new Gtk.Entry ();
-			add_entry.hexpand = true;
-			add_entry.placeholder_text = _("New element");
-
-			action_bar.pack_start (add_entry);
-
-			add_button = new Gtk.Button.from_icon_name ("list-add-symbolic", Gtk.IconSize.BUTTON);
-			add_button.clicked.connect (() => {
-				Variant? new_child = null;
-
-				var type = settings.get_value (key).get_type ().dup_string ();
-
-				assert (type.has_prefix ("a") && type.length == 2);
-
-				switch (type.substring (1)) {
-					case "b":
-						new_child = new Variant.boolean (add_entry.text.down () == "true" || add_entry.text.down () == "on" || add_entry.text.down () == "enabled" || add_entry.text.down () == _("Enabled").down ());
-						break;
-					case "y":
-						new_child = new Variant.byte ((uchar)int.parse (add_entry.text));
-						break;
-					case "n":
-						new_child = new Variant.int16 ((int16)int.parse (add_entry.text));
-						break;
-					case "q":
-						new_child = new Variant.uint16 ((uint16)int.parse (add_entry.text));
-						break;
-					case "i":
-						new_child = new Variant.int32 ((int32)int.parse (add_entry.text));
-						break;
-					case "u":
-						new_child = new Variant.uint32 ((uint32)int.parse (add_entry.text));
-						break;
-					case "x":
-						new_child = new Variant.int64 ((int64)int.parse (add_entry.text));
-						break;
-					case "t":
-						new_child = new Variant.uint64 ((uint64)int.parse (add_entry.text));
-						break;
-					case "h":
-						new_child = new Variant.int32 ((int32)int.parse (add_entry.text));
-						break;
-					case "s":
-					case "o":
-					case "g":
-						new_child = new Variant.string (add_entry.text);
-						break;
-					default:
-						warning (_("Unsupported type \"%s\". Can't create new entry."), type);
-						break;
-				}
-
-				if (new_child != null) {
-					var childs = settings.get_value (key).n_children ();
-					Variant[] new_child_list = new Variant[childs + 1];
-
-					for (int c = 0; c < childs; c++) {
-						new_child_list[c] = settings.get_value (key).get_child_value (c);
-					}
-
-					new_child_list[childs] = new_child;
-
-					var new_val = new Variant.array (new_child.get_type (), new_child_list);
-
-					settings.set_value (key, new_val);
-
-					add_entry.text = "";
-				}
-			});
-
-			action_bar.pack_end (add_button);
-
-			box.pack_end (action_bar, true, false);
-
-			popover.add (box);
-
-			display_value (settings, key, settings.get_value (key));
-
-			settings.changed.connect ((k) => {
-				if (k == key) {
-					listbox.get_children ().foreach ((item) => listbox.remove (item));
-					display_value (settings, key, settings.get_value (key));
-				}
-			});
-		}
-
-		private void display_value (Settings settings, string key, Variant val) {
-			assert (val.is_container ());
-
-			var childs = val.n_children ();
-
-			this.label = _("%s elements").printf (childs.to_string ());
-
-			if (childs < 1) {
-				var no_items_label = new Gtk.Label (_("No items found."));
-				no_items_label.get_style_context ().add_class ("h3");
-				no_items_label.hexpand = true;
-				no_items_label.vexpand = true;
-				no_items_label.halign = Gtk.Align.CENTER;
-				no_items_label.valign = Gtk.Align.CENTER;
-				no_items_label.margin_start = 6;
-				no_items_label.margin_end = 6;
-				no_items_label.set_size_request (-1, 60);
-				no_items_label.sensitive = false;
-
-				listbox.add (no_items_label);
-			} else {
-				for (int i = 0; i < childs; i++) {
-					var child_index = i;
-					var child = val.get_child_value (child_index);
-
-					var item = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-					item.margin_start = 6;
-					item.margin_end = 6;
-
-					var item_number = new Gtk.Label ("<b>%s</b>".printf (child_index.to_string ()));
-					item_number.use_markup = true;
-					item_number.halign = Gtk.Align.END;
-					item_number.valign = Gtk.Align.CENTER;
-
-					item.pack_start (item_number, false, false);
-
-					var item_content = new Gtk.Label (Utils.variant_to_string (child));
-					item_content.halign = Gtk.Align.START;
-					item_content.valign = Gtk.Align.CENTER;
-
-					item.pack_start (item_content, true, true);
-
-					var item_remove_button = new Gtk.Button.from_icon_name ("list-remove-symbolic", Gtk.IconSize.BUTTON);
-					item_remove_button.relief = Gtk.ReliefStyle.NONE;
-					item_remove_button.clicked.connect (() => {
-						Variant[] new_child_list = new Variant[childs - 1];
-						var new_child_list_counter = 0;
-
-						for (int c = 0; c < childs; c++) {
-							if (c != child_index) {
-								new_child_list[new_child_list_counter++] = val.get_child_value (c);
-							}
-						}
-
-						var new_val = new Variant.array (child.get_type (), new_child_list);
-
-						settings.set_value (key, new_val);
-					});
-
-					item.pack_end (item_remove_button, false, false);
-
-					listbox.add (item);
-				}
-			}
-
-			listbox.show_all ();
-		}
-	}
-}
+    public class ArrayInput : Gtk.Button {
+        private Gtk.Popover popover;
+
+        private Gtk.Box box;
+
+        private Gtk.ListBox listbox;
+
+        private Gtk.ActionBar action_bar;
+
+        private Gtk.Entry add_entry;
+        private Gtk.Button add_button;
+
+        public ArrayInput (Settings settings, string key) {
+            popover = new Gtk.Popover (this);
+
+            this.clicked.connect (() => popover.show_all ());
+
+            box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+
+            listbox = new Gtk.ListBox ();
+            listbox.margin_top = 3;
+            listbox.margin_bottom = 3;
+
+            box.pack_start (listbox, true, true);
+
+            action_bar = new Gtk.ActionBar ();
+
+            add_entry = new Gtk.Entry ();
+            add_entry.hexpand = true;
+            add_entry.placeholder_text = _("New element");
+
+            action_bar.pack_start (add_entry);
+
+            add_button = new Gtk.Button.from_icon_name ("list-add-symbolic", Gtk.IconSize.BUTTON);
+            add_button.clicked.connect (() => {
+                Variant? new_child = null;
+
+                var type = settings.get_value (key).get_type ().dup_string ();
+
+                assert (type.has_prefix ("a") && type.length == 2);
+
+                switch (type.substring (1)) {
+                    case "b" :
+                        new_child = new Variant.boolean (add_entry.text.down () == "true" || add_entry.text.down () == "on" || add_entry.text.down () == "enabled" || add_entry.text.down () == _("Enabled").down ());
+                        break;
+                    case "y":
+                        new_child = new Variant.byte ((uchar)int.parse (add_entry.text));
+                        break;
+                    case "n":
+                        new_child = new Variant.int16 ((int16)int.parse (add_entry.text));
+                        break;
+                    case "q":
+                        new_child = new Variant.uint16 ((uint16)int.parse (add_entry.text));
+                        break;
+                    case "i":
+                        new_child = new Variant.int32 ((int32)int.parse (add_entry.text));
+                        break;
+                    case "u":
+                        new_child = new Variant.uint32 ((uint32)int.parse (add_entry.text));
+                        break;
+                    case "x":
+                        new_child = new Variant.int64 ((int64)int.parse (add_entry.text));
+                        break;
+                    case "t":
+                        new_child = new Variant.uint64 ((uint64)int.parse (add_entry.text));
+                        break;
+                    case "h":
+                        new_child = new Variant.int32 ((int32)int.parse (add_entry.text));
+                        break;
+                    case "s":
+                    case "o":
+                    case "g":
+                        new_child = new Variant.string (add_entry.text);
+                        break;
+                    default:
+                        warning (_("Unsupported type \"%s\". Can't create new entry."), type);
+                        break;
+                }
+
+                if (new_child != null) {
+                    var childs = settings.get_value (key).n_children ();
+                    Variant[] new_child_list = new Variant[childs + 1];
+
+                    for (int c = 0; c < childs; c++) {
+                        new_child_list[c] = settings.get_value (key).get_child_value (c);
+                    }
+
+                    new_child_list[childs] = new_child;
+
+                    var new_val = new Variant.array (new_child.get_type (), new_child_list);
+
+                    settings.set_value (key, new_val);
+
+                    add_entry.text = "";
+                }
+            });
+
+            action_bar.pack_end (add_button);
+
+            box.pack_end (action_bar, true, false);
+
+            popover.add (box);
+
+            display_value (settings, key, settings.get_value (key));
+
+            settings.changed.connect ((k) => {
+                if (k == key) {
+                    listbox.get_children ().foreach ((item) => listbox.remove (item));
+
+                    display_value (settings, key, settings.get_value (key));
+                }
+            });
+        }
+
+        private void display_value (Settings settings, string key, Variant val) {
+            assert (val.is_container ());
+
+            var childs = val.n_children ();
+
+            this.label = _("%s elements").printf (childs.to_string ());
+
+            if (childs < 1) {
+                var no_items_label = new Gtk.Label (_("No items found."));
+                no_items_label.get_style_context ().add_class ("h3");
+                no_items_label.hexpand = true;
+                no_items_label.vexpand = true;
+                no_items_label.halign = Gtk.Align.CENTER;
+                no_items_label.valign = Gtk.Align.CENTER;
+                no_items_label.margin_start = 6;
+                no_items_label.margin_end = 6;
+                no_items_label.set_size_request (-1, 60);
+                no_items_label.sensitive = false;
+
+                listbox.add (no_items_label);
+            } else {
+                for (int i = 0; i < childs; i++) {
+                    var child_index = i;
+                    var child = val.get_child_value (child_index);
+
+                    var item = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+                    item.margin_start = 6;
+                    item.margin_end = 6;
+
+                    var item_number = new Gtk.Label ("<b>%s</b>".printf (child_index.to_string ()));
+                    item_number.use_markup = true;
+                    item_number.halign = Gtk.Align.END;
+                    item_number.valign = Gtk.Align.CENTER;
+
+                    item.pack_start (item_number, false, false);
+
+                    var item_content = new Gtk.Label (Utils.variant_to_string (child));
+                    item_content.halign = Gtk.Align.START;
+                    item_content.valign = Gtk.Align.CENTER;
+
+                    item.pack_start (item_content, true, true);
+
+                    var item_remove_button = new Gtk.Button.from_icon_name ("list-remove-symbolic", Gtk.IconSize.BUTTON);
+                    item_remove_button.relief = Gtk.ReliefStyle.NONE;
+                    item_remove_button.clicked.connect (() => {
+                        Variant[] new_child_list = new Variant[childs - 1];
+                        var new_child_list_counter = 0;
+
+                        for (int c = 0; c < childs; c++) {
+                            if (c != child_index) {
+                                new_child_list[new_child_list_counter++] = val.get_child_value (c);
+                            }
+                        }
+
+                        var new_val = new Variant.array (child.get_type (), new_child_list);
+
+                        settings.set_value (key, new_val);
+                    });
+
+                    item.pack_end (item_remove_button, false, false);
+
+                    listbox.add (item);
+                }
+            }
+
+            listbox.show_all ();
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/BoolInput.vala'
--- src/Widgets/Fields/BoolInput.vala	2015-04-10 23:54:28 +0000
+++ src/Widgets/Fields/BoolInput.vala	2015-08-04 19:27:32 +0000
@@ -1,25 +1,25 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class BoolInput : Gtk.Switch {
-		public BoolInput () {
-			
-		}
-	}
-}
+    public class BoolInput : Gtk.Switch {
+        public BoolInput () {
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/DoubleInput.vala'
--- src/Widgets/Fields/DoubleInput.vala	2015-04-10 23:54:28 +0000
+++ src/Widgets/Fields/DoubleInput.vala	2015-08-04 19:27:32 +0000
@@ -1,25 +1,26 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class DoubleInput : Gtk.Entry {
-		public DoubleInput () {
-			this.secondary_icon_tooltip_text = _("Not a number");
-		}
-	}
-}
+    public class DoubleInput : Gtk.Entry {
+        public DoubleInput () {
+            this.secondary_icon_tooltip_text = _("Not a number");
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/Int64Input.vala'
--- src/Widgets/Fields/Int64Input.vala	2015-04-16 15:28:17 +0000
+++ src/Widgets/Fields/Int64Input.vala	2015-08-04 19:27:32 +0000
@@ -1,26 +1,27 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class Int64Input : Gtk.SpinButton {
-		public Int64Input () {
-			this.set_range (int64.MIN, int64.MAX);
-			this.set_increments (1, 1);
-		}
-	}
-}
+    public class Int64Input : Gtk.SpinButton {
+        public Int64Input () {
+            this.set_range (int64.MIN, int64.MAX);
+            this.set_increments (1, 1);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/IntegerInput.vala'
--- src/Widgets/Fields/IntegerInput.vala	2015-04-10 23:54:28 +0000
+++ src/Widgets/Fields/IntegerInput.vala	2015-08-04 19:27:32 +0000
@@ -1,26 +1,27 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class IntegerInput : Gtk.SpinButton {
-		public IntegerInput () {
-			this.set_range (int.MIN, int.MAX);
-			this.set_increments (1, 1);
-		}
-	}
-}
+    public class IntegerInput : Gtk.SpinButton {
+        public IntegerInput () {
+            this.set_range (int.MIN, int.MAX);
+            this.set_increments (1, 1);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/SelectInput.vala'
--- src/Widgets/Fields/SelectInput.vala	2015-04-13 19:41:24 +0000
+++ src/Widgets/Fields/SelectInput.vala	2015-08-04 19:27:32 +0000
@@ -1,28 +1,29 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class SelectInput : Gtk.ComboBoxText {
-		public SelectInput (Variant options) {
-			for (int i = 0; i < options.n_children (); i++) {
-				var option = options.get_child_value (i).get_string ();
-				this.append (option, option);
-			}
-		}
-	}
-}
+    public class SelectInput : Gtk.ComboBoxText {
+        public SelectInput (Variant options) {
+            for (int i = 0; i < options.n_children (); i++) {
+                var option = options.get_child_value (i).get_string ();
+                this.append (option, option);
+            }
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/StringInput.vala'
--- src/Widgets/Fields/StringInput.vala	2015-04-10 23:54:28 +0000
+++ src/Widgets/Fields/StringInput.vala	2015-08-04 19:27:32 +0000
@@ -1,33 +1,34 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class StringInput : Gtk.Entry {
-		public StringInput () {
-			this.changed.connect (() => {
-				var color = Gdk.RGBA ();
+    public class StringInput : Gtk.Entry {
+        public StringInput () {
+            this.changed.connect (() => {
+                var color = Gdk.RGBA ();
 
-				if (color.parse (this.text)) {
-					this.override_color (Gtk.StateFlags.NORMAL, color);
-				} else {
-					this.override_color (Gtk.StateFlags.NORMAL, null);
-				}
-			});
-		}
-	}
-}
+                if (color.parse (this.text)) {
+                    this.override_color (Gtk.StateFlags.NORMAL, color);
+                } else {
+                    this.override_color (Gtk.StateFlags.NORMAL, null);
+                }
+            });
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/UInt64Input.vala'
--- src/Widgets/Fields/UInt64Input.vala	2015-04-16 15:28:17 +0000
+++ src/Widgets/Fields/UInt64Input.vala	2015-08-04 19:27:32 +0000
@@ -1,26 +1,27 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class UInt64Input : Gtk.SpinButton {
-		public UInt64Input () {
-			this.set_range (uint64.MIN, uint64.MAX);
-			this.set_increments (1, 1);
-		}
-	}
-}
+    public class UInt64Input : Gtk.SpinButton {
+        public UInt64Input () {
+            this.set_range (uint64.MIN, uint64.MAX);
+            this.set_increments (1, 1);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Fields/UIntegerInput.vala'
--- src/Widgets/Fields/UIntegerInput.vala	2015-04-10 23:54:28 +0000
+++ src/Widgets/Fields/UIntegerInput.vala	2015-08-04 19:27:32 +0000
@@ -1,26 +1,27 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets.Fields {
-	public class UIntegerInput : Gtk.SpinButton {
-		public UIntegerInput () {
-			this.set_range (uint.MIN, uint.MAX);
-			this.set_increments (1, 1);
-		}
-	}
-}
+    public class UIntegerInput : Gtk.SpinButton {
+        public UIntegerInput () {
+            this.set_range (uint.MIN, uint.MAX);
+            this.set_increments (1, 1);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/InfoScreen.vala'
--- src/Widgets/InfoScreen.vala	2015-04-14 17:16:32 +0000
+++ src/Widgets/InfoScreen.vala	2015-08-04 19:27:32 +0000
@@ -1,67 +1,68 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class InfoScreen : Gtk.Frame {
-		private Gtk.Grid grid;
-
-		private Gtk.Image image;
-		private Gtk.Label title;
-		private Gtk.Label description;
-
-		// Stolen from my other application: switchboard-plug-notifications ;)
-		public InfoScreen (string header, string desc, string icon_name) {
-			this.expand = true;
-			this.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
-			this.shadow_type = Gtk.ShadowType.NONE;
-
-			grid = new Gtk.Grid ();
-			grid.vexpand = false;
-			grid.valign = Gtk.Align.CENTER;
-			grid.halign = Gtk.Align.CENTER;
-			grid.border_width = 24;
-			grid.row_spacing = 12;
-			grid.column_spacing = 12;
-
-			image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG);
-			image.valign = Gtk.Align.START;
-			image.halign = Gtk.Align.END;
-
-			grid.attach (image, 0, 0, 1, 2);
-
-			title = new Gtk.Label (header);
-			title.halign = Gtk.Align.START;
-			title.set_line_wrap (true);
-			title.justify = Gtk.Justification.FILL;
-			title.get_style_context ().add_class ("h2");
-
-			grid.attach (title, 1, 0, 1, 1);
-
-			description = new Gtk.Label (desc);
-			description.halign = Gtk.Align.START;
-			description.set_line_wrap (true);
-			description.justify = Gtk.Justification.FILL;
-
-			grid.attach (description, 1, 1, 1, 1);
-
-			grid.show_all ();
-
-			this.add (grid);
-		}
-	}
-}
+    public class InfoScreen : Gtk.Frame {
+        private Gtk.Grid grid;
+
+        private Gtk.Image image;
+        private Gtk.Label title;
+        private Gtk.Label description;
+
+        /* Stolen from my other application: switchboard-plug-notifications ;) */
+        public InfoScreen (string header, string desc, string icon_name) {
+            this.expand = true;
+            this.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
+            this.shadow_type = Gtk.ShadowType.NONE;
+
+            grid = new Gtk.Grid ();
+            grid.vexpand = false;
+            grid.valign = Gtk.Align.CENTER;
+            grid.halign = Gtk.Align.CENTER;
+            grid.border_width = 24;
+            grid.row_spacing = 12;
+            grid.column_spacing = 12;
+
+            image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG);
+            image.valign = Gtk.Align.START;
+            image.halign = Gtk.Align.END;
+
+            grid.attach (image, 0, 0, 1, 2);
+
+            title = new Gtk.Label (header);
+            title.halign = Gtk.Align.START;
+            title.set_line_wrap (true);
+            title.justify = Gtk.Justification.FILL;
+            title.get_style_context ().add_class ("h2");
+
+            grid.attach (title, 1, 0, 1, 1);
+
+            description = new Gtk.Label (desc);
+            description.halign = Gtk.Align.START;
+            description.set_line_wrap (true);
+            description.justify = Gtk.Justification.FILL;
+
+            grid.attach (description, 1, 1, 1, 1);
+
+            grid.show_all ();
+
+            this.add (grid);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Key.vala'
--- src/Widgets/Key.vala	2015-04-16 15:28:17 +0000
+++ src/Widgets/Key.vala	2015-08-04 19:27:32 +0000
@@ -1,182 +1,188 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class Key : Gtk.Grid {
-		private Gtk.Image info_image;
-		private Gtk.ToggleButton info_button;
-
-		private Gtk.Label label_name;
-		private Gtk.Label label_description;
-
-		private Gtk.Widget? widg = null;
-
-		private Gtk.Revealer revealer;
-		private KeyInfo key_info;
-
-		private Gtk.Separator separator;
-
-		private Gtk.Image readonly_image;
-
-		public Key (Settings settings, string name, SettingsSchemaKey key, bool live, bool show_schema) {
-			this.column_spacing = 12;
-			this.margin_top = 18;
-
-			info_image = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.BUTTON);
-			info_image.margin = 0;
-
-			info_button = new Gtk.ToggleButton ();
-			info_button.image = info_image;
-			info_button.vexpand = true;
-			info_button.valign = Gtk.Align.CENTER;
-			info_button.halign = Gtk.Align.START;
-			info_button.toggled.connect (() => revealer.set_reveal_child (info_button.active));
-
-			this.attach (info_button, 0, 0, 1, 2);
-
-			label_name = new Gtk.Label (show_schema ? "%s -> <b>%s</b>".printf (settings.schema_id, name) : "<b>%s</b>".printf (name));
-			label_name.get_style_context ().add_class ("h3");
-			label_name.use_markup = true;
-			label_name.selectable = true;
-			label_name.wrap = true;
-			label_name.halign = Gtk.Align.START;
-			label_name.valign = Gtk.Align.END;
-			label_name.hexpand = true;
-
-			this.attach (label_name, 1, 0, 1, 1);
-
-			if (key.get_summary () != null) {
-				label_description = new Gtk.Label (key.get_summary ());
-				label_description.use_markup = true;
-				label_description.selectable = true;
-				label_description.wrap = true;
-				label_description.halign = Gtk.Align.START;
-				label_description.valign = Gtk.Align.START;
-				label_description.hexpand = true;
-
-				this.attach (label_description, 1, 1, 1, 1);
-			} else {
-				label_name.valign = Gtk.Align.CENTER;
-			}
-
-			var type = key.get_value_type ().dup_string ();
-
-			if (type == "b") {
-				widg = new Fields.BoolInput ();
-
-				settings.bind (name, widg, "active", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
-			} else if (type == "s") {
-				if (key.get_range ().get_child_value (0).get_string () == "enum") {
-					widg = new Fields.SelectInput (key.get_range ().get_child_value (1).get_variant ());
-
-					settings.bind (name, widg, "active_id", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
-				} else {
-					widg = new Fields.StringInput ();
-					widg.set_size_request (350, -1);
-
-					settings.bind (name, widg, "text", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
-				}
-			} else if (type == "i") {
-				widg = new Fields.IntegerInput ();
-
-				settings.bind (name, widg, "value", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
-			} else if (type == "u") {
-				widg = new Fields.UIntegerInput ();
-
-				settings.bind (name, widg, "value", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
-			} else if (type == "x") {
-				widg = new Fields.Int64Input ();
-
-				settings.bind (name, widg, "value", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
-			} else if (type == "t") {
-				widg = new Fields.UInt64Input ();
-
-				settings.bind (name, widg, "value", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
-			} else if (type == "d") {
-				// FIXME: The SpinButton gets very big when setting the Min- and Max- values for double.
-				//widg = new Gtk.SpinButton.with_range (double.MIN, double.MAX, double.EPSILON);
-
-				widg = new Fields.DoubleInput ();
-				widg.set_size_request (350, -1);
-
-				(widg as Gtk.Entry).text = settings.get_double (name).to_string ();
-
-				if (live) {
-					(widg as Gtk.Entry).changed.connect (() => {
-						double parsed;
-						if (double.try_parse ((widg as Gtk.Entry).text, out parsed)) {
-							settings.set_double (name, parsed);
-							(widg as Gtk.Entry).set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, null);
-						} else {
-							(widg as Gtk.Entry).set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic");
-						}
-					});
-
-					settings.changed.connect ((key) => {
-						if (key == name)
-							(widg as Gtk.Entry).text = settings.get_double (name).to_string ();
-					});
-				}
-			} else if (type.has_prefix ("a") && type.length == 2) {
-				widg = new Fields.ArrayInput (settings, name);
-			} else {
-				widg = new Gtk.Label (_("This settings type is not supported yet."));
-				widg.get_style_context ().add_class ("h3");
-
-				warning (_("Unsupported type \"%s\" in %s->%s"), type, settings.schema_id, name);
-			}
-
-			if (widg != null) {
-				widg.vexpand = true;
-				widg.valign = Gtk.Align.CENTER;
-				widg.halign = Gtk.Align.END;
-				widg.sensitive = live;
-
-				this.attach (widg, 2, 0, 1, 2);
-			}
-
-			revealer = new Gtk.Revealer ();
-			revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
-
-			key_info = new KeyInfo (settings, name, key);
-
-			revealer.add (key_info);
-
-			this.attach (revealer, 0, 2, 3, 1);
-
-			separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
-			separator.margin_top = 18;
-
-			this.attach (separator, 0, 3, 3, 1);
-
-			if (!settings.is_writable (name)) {
-				if (widg != null)
-					widg.sensitive = false;
-
-				key_info.set_reset_enabled (false);
-
-				readonly_image = new Gtk.Image.from_icon_name ("changes-prevent-symbolic", Gtk.IconSize.BUTTON);
-				readonly_image.vexpand = true;
-				readonly_image.valign = Gtk.Align.CENTER;
-				readonly_image.halign = Gtk.Align.END;
-
-				this.attach (readonly_image, 3, 0, 1, 2);
-			}
-		}
-	}
-}
+    public class Key : Gtk.Grid {
+        private Gtk.Image info_image;
+        private Gtk.ToggleButton info_button;
+
+        private Gtk.Label label_name;
+        private Gtk.Label label_description;
+
+        private Gtk.Widget? widg = null;
+
+        private Gtk.Revealer revealer;
+        private KeyInfo key_info;
+
+        private Gtk.Separator separator;
+
+        private Gtk.Image readonly_image;
+
+        public Key (Settings settings, string name, SettingsSchemaKey key, bool live, bool show_schema) {
+            this.column_spacing = 12;
+            this.margin_top = 18;
+
+            info_image = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.BUTTON);
+            info_image.margin = 0;
+
+            info_button = new Gtk.ToggleButton ();
+            info_button.image = info_image;
+            info_button.vexpand = true;
+            info_button.valign = Gtk.Align.CENTER;
+            info_button.halign = Gtk.Align.START;
+            info_button.toggled.connect (() => revealer.set_reveal_child (info_button.active));
+
+            this.attach (info_button, 0, 0, 1, 2);
+
+            label_name = new Gtk.Label (show_schema ? "%s -> <b>%s</b>".printf (settings.schema_id, name) : "<b>%s</b>".printf (name));
+            label_name.get_style_context ().add_class ("h3");
+            label_name.use_markup = true;
+            label_name.selectable = true;
+            label_name.wrap = true;
+            label_name.halign = Gtk.Align.START;
+            label_name.valign = Gtk.Align.END;
+            label_name.hexpand = true;
+
+            this.attach (label_name, 1, 0, 1, 1);
+
+            if (key.get_summary () != null) {
+                label_description = new Gtk.Label (key.get_summary ());
+                label_description.use_markup = true;
+                label_description.selectable = true;
+                label_description.wrap = true;
+                label_description.halign = Gtk.Align.START;
+                label_description.valign = Gtk.Align.START;
+                label_description.hexpand = true;
+
+                this.attach (label_description, 1, 1, 1, 1);
+            } else {
+                label_name.valign = Gtk.Align.CENTER;
+            }
+
+            var type = key.get_value_type ().dup_string ();
+
+            if (type == "b") {
+                widg = new Fields.BoolInput ();
+
+                settings.bind (name, widg, "active", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
+            } else if (type == "s") {
+                if (key.get_range ().get_child_value (0).get_string () == "enum") {
+                    widg = new Fields.SelectInput (key.get_range ().get_child_value (1).get_variant ());
+
+                    settings.bind (name, widg, "active_id", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
+                } else {
+                    widg = new Fields.StringInput ();
+                    widg.set_size_request (350, -1);
+
+                    settings.bind (name, widg, "text", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
+                }
+            } else if (type == "i") {
+                widg = new Fields.IntegerInput ();
+
+                settings.bind (name, widg, "value", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
+            } else if (type == "u") {
+                widg = new Fields.UIntegerInput ();
+
+                settings.bind (name, widg, "value", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
+            } else if (type == "x") {
+                widg = new Fields.Int64Input ();
+
+                settings.bind (name, widg, "value", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
+            } else if (type == "t") {
+                widg = new Fields.UInt64Input ();
+
+                settings.bind (name, widg, "value", live ? GLib.SettingsBindFlags.DEFAULT : GLib.SettingsBindFlags.GET_NO_CHANGES);
+            } else if (type == "d") {
+                /*
+                 * FIXME: The SpinButton gets very big when setting the Min- and Max- values for double.
+                 * widg = new Gtk.SpinButton.with_range (double.MIN, double.MAX, double.EPSILON);
+                 */
+
+                widg = new Fields.DoubleInput ();
+                widg.set_size_request (350, -1);
+
+                (widg as Gtk.Entry).text = settings.get_double (name).to_string ();
+
+                if (live) {
+                    (widg as Gtk.Entry).changed.connect (() => {
+                        double parsed;
+
+                        if (double.try_parse ((widg as Gtk.Entry).text, out parsed)) {
+                            settings.set_double (name, parsed);
+                            (widg as Gtk.Entry).set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, null);
+                        } else {
+                            (widg as Gtk.Entry).set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic");
+                        }
+                    });
+
+                    settings.changed.connect ((key) => {
+                        if (key == name) {
+                            (widg as Gtk.Entry).text = settings.get_double (name).to_string ();
+                        }
+                    });
+                }
+            } else if (type.has_prefix ("a") && type.length == 2) {
+                widg = new Fields.ArrayInput (settings, name);
+            } else {
+                widg = new Gtk.Label (_("This settings type is not supported yet."));
+                widg.get_style_context ().add_class ("h3");
+
+                warning (_("Unsupported type \"%s\" in %s->%s"), type, settings.schema_id, name);
+            }
+
+            if (widg != null) {
+                widg.vexpand = true;
+                widg.valign = Gtk.Align.CENTER;
+                widg.halign = Gtk.Align.END;
+                widg.sensitive = live;
+
+                this.attach (widg, 2, 0, 1, 2);
+            }
+
+            revealer = new Gtk.Revealer ();
+            revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+
+            key_info = new KeyInfo (settings, name, key);
+
+            revealer.add (key_info);
+
+            this.attach (revealer, 0, 2, 3, 1);
+
+            separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
+            separator.margin_top = 18;
+
+            this.attach (separator, 0, 3, 3, 1);
+
+            if (!settings.is_writable (name)) {
+                if (widg != null) {
+                    widg.sensitive = false;
+                }
+
+                key_info.set_reset_enabled (false);
+
+                readonly_image = new Gtk.Image.from_icon_name ("changes-prevent-symbolic", Gtk.IconSize.BUTTON);
+                readonly_image.vexpand = true;
+                readonly_image.valign = Gtk.Align.CENTER;
+                readonly_image.halign = Gtk.Align.END;
+
+                this.attach (readonly_image, 3, 0, 1, 2);
+            }
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/KeyInfo.vala'
--- src/Widgets/KeyInfo.vala	2015-04-11 11:06:14 +0000
+++ src/Widgets/KeyInfo.vala	2015-08-04 19:27:32 +0000
@@ -1,119 +1,120 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class KeyInfo : Gtk.Grid {
-		private Gtk.Label type_label;
-		private Gtk.Label type_field;
-
-		private Gtk.Label default_label;
-		private Gtk.Label default_field;
-
-		private Gtk.Label code_label;
-		private Gtk.Label code_field;
-
-		private Gtk.Label command_label;
-		private Gtk.Label command_field;
-
-		private Gtk.Label description_label;
-		private Gtk.Label description_field;
-
-		private Gtk.Button reset_button;
-
-		public KeyInfo (Settings settings, string name, SettingsSchemaKey key) {
-			this.column_spacing = 12;
-			this.row_spacing = 12;
-			this.margin_top = 18;
-
-			type_label = new Gtk.Label (_("<b>Property type</b>"));
-			type_label.use_markup = true;
-			type_label.halign = Gtk.Align.END;
-			this.attach (type_label, 0, 0, 1, 1);
-
-			type_field = new Gtk.Label (Utils.type_to_string (key.get_value_type ()));
-			type_field.use_markup = true;
-			type_field.selectable = true;
-			type_field.wrap = true;
-			type_field.halign = Gtk.Align.START;
-			type_field.hexpand = true;
-			this.attach (type_field, 1, 0, 1, 1);
-
-			default_label = new Gtk.Label (_("<b>Default value</b>"));
-			default_label.use_markup = true;
-			default_label.halign = Gtk.Align.END;
-			this.attach (default_label, 0, 1, 1, 1);
-
-			default_field = new Gtk.Label (Utils.variant_to_string (key.get_default_value ()));
-			default_field.use_markup = true;
-			default_field.selectable = true;
-			default_field.wrap = true;
-			default_field.halign = Gtk.Align.START;
-			default_field.hexpand = true;
-			this.attach (default_field, 1, 1, 1, 1);
-
-			code_label = new Gtk.Label (_("<b>Vala code</b>"));
-			code_label.use_markup = true;
-			code_label.halign = Gtk.Align.END;
-			this.attach (code_label, 0, 2, 1, 1);
-
-			code_field = new Gtk.Label ("<tt><span foreground=\"#000000\" stretch=\"condensed\"><span foreground=\"#FF420B\" weight=\"bold\">var</span> val = <span foreground=\"#FF420B\" weight=\"bold\">new</span> Settings (<span foreground=\"#13A50B\">\"%s\"</span>).get_value (<span foreground=\"#13A50B\">\"%s\"</span>);</span></tt>".printf (settings.schema_id, name));
-			code_field.use_markup = true;
-			code_field.selectable = true;
-			code_field.wrap = true;
-			code_field.halign = Gtk.Align.START;
-			code_field.hexpand = true;
-			this.attach (code_field, 1, 2, 1, 1);
-
-			command_label = new Gtk.Label (_("<b>Command</b>"));
-			command_label.use_markup = true;
-			command_label.halign = Gtk.Align.END;
-			this.attach (command_label, 0, 3, 1, 1);
-
-			command_field = new Gtk.Label ("<tt><span foreground=\"#000000\" stretch=\"condensed\">dconf read %s</span></tt>".printf (settings.path + name));
-			command_field.use_markup = true;
-			command_field.selectable = true;
-			command_field.wrap = true;
-			command_field.halign = Gtk.Align.START;
-			command_field.hexpand = true;
-			this.attach (command_field, 1, 3, 1, 1);
-
-			description_label = new Gtk.Label (_("<b>Description</b>"));
-			description_label.use_markup = true;
-			description_label.halign = Gtk.Align.END;
-			this.attach (description_label, 0, 4, 1, 1);
-
-			description_field = new Gtk.Label (key.get_description ());
-			description_field.use_markup = true;
-			description_field.selectable = true;
-			description_field.wrap = true;
-			description_field.halign = Gtk.Align.START;
-			description_field.hexpand = true;
-			this.attach (description_field, 1, 4, 1, 1);
-
-			reset_button = new Gtk.Button.with_label (_("Reset to default"));
-			reset_button.get_style_context ().add_class ("destructive-action");
-			reset_button.halign = Gtk.Align.END;
-			reset_button.clicked.connect (() => settings.reset (name));
-			this.attach (reset_button, 0, 5, 2, 1);
-		}
-
-		public void set_reset_enabled (bool enabled) {
-			reset_button.sensitive = enabled;
-		}
-	}
-}
+    public class KeyInfo : Gtk.Grid {
+        private Gtk.Label type_label;
+        private Gtk.Label type_field;
+
+        private Gtk.Label default_label;
+        private Gtk.Label default_field;
+
+        private Gtk.Label code_label;
+        private Gtk.Label code_field;
+
+        private Gtk.Label command_label;
+        private Gtk.Label command_field;
+
+        private Gtk.Label description_label;
+        private Gtk.Label description_field;
+
+        private Gtk.Button reset_button;
+
+        public KeyInfo (Settings settings, string name, SettingsSchemaKey key) {
+            this.column_spacing = 12;
+            this.row_spacing = 12;
+            this.margin_top = 18;
+
+            type_label = new Gtk.Label (_("<b>Property type</b>"));
+            type_label.use_markup = true;
+            type_label.halign = Gtk.Align.END;
+            this.attach (type_label, 0, 0, 1, 1);
+
+            type_field = new Gtk.Label (Utils.type_to_string (key.get_value_type ()));
+            type_field.use_markup = true;
+            type_field.selectable = true;
+            type_field.wrap = true;
+            type_field.halign = Gtk.Align.START;
+            type_field.hexpand = true;
+            this.attach (type_field, 1, 0, 1, 1);
+
+            default_label = new Gtk.Label (_("<b>Default value</b>"));
+            default_label.use_markup = true;
+            default_label.halign = Gtk.Align.END;
+            this.attach (default_label, 0, 1, 1, 1);
+
+            default_field = new Gtk.Label (Utils.variant_to_string (key.get_default_value ()));
+            default_field.use_markup = true;
+            default_field.selectable = true;
+            default_field.wrap = true;
+            default_field.halign = Gtk.Align.START;
+            default_field.hexpand = true;
+            this.attach (default_field, 1, 1, 1, 1);
+
+            code_label = new Gtk.Label (_("<b>Vala code</b>"));
+            code_label.use_markup = true;
+            code_label.halign = Gtk.Align.END;
+            this.attach (code_label, 0, 2, 1, 1);
+
+            code_field = new Gtk.Label ("<tt><span foreground=\"#000000\" stretch=\"condensed\"><span foreground=\"#FF420B\" weight=\"bold\">var</span> val = <span foreground=\"#FF420B\" weight=\"bold\">new</span> Settings (<span foreground=\"#13A50B\">\"%s\"</span>).get_value (<span foreground=\"#13A50B\">\"%s\"</span>);</span></tt>".printf (settings.schema_id, name));
+            code_field.use_markup = true;
+            code_field.selectable = true;
+            code_field.wrap = true;
+            code_field.halign = Gtk.Align.START;
+            code_field.hexpand = true;
+            this.attach (code_field, 1, 2, 1, 1);
+
+            command_label = new Gtk.Label (_("<b>Command</b>"));
+            command_label.use_markup = true;
+            command_label.halign = Gtk.Align.END;
+            this.attach (command_label, 0, 3, 1, 1);
+
+            command_field = new Gtk.Label ("<tt><span foreground=\"#000000\" stretch=\"condensed\">dconf read %s</span></tt>".printf (settings.path + name));
+            command_field.use_markup = true;
+            command_field.selectable = true;
+            command_field.wrap = true;
+            command_field.halign = Gtk.Align.START;
+            command_field.hexpand = true;
+            this.attach (command_field, 1, 3, 1, 1);
+
+            description_label = new Gtk.Label (_("<b>Description</b>"));
+            description_label.use_markup = true;
+            description_label.halign = Gtk.Align.END;
+            this.attach (description_label, 0, 4, 1, 1);
+
+            description_field = new Gtk.Label (key.get_description ());
+            description_field.use_markup = true;
+            description_field.selectable = true;
+            description_field.wrap = true;
+            description_field.halign = Gtk.Align.START;
+            description_field.hexpand = true;
+            this.attach (description_field, 1, 4, 1, 1);
+
+            reset_button = new Gtk.Button.with_label (_("Reset to default"));
+            reset_button.get_style_context ().add_class ("destructive-action");
+            reset_button.halign = Gtk.Align.END;
+            reset_button.clicked.connect (() => settings.reset (name));
+            this.attach (reset_button, 0, 5, 2, 1);
+        }
+
+        public void set_reset_enabled (bool enabled) {
+            reset_button.sensitive = enabled;
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/KeyList.vala'
--- src/Widgets/KeyList.vala	2015-04-04 19:12:47 +0000
+++ src/Widgets/KeyList.vala	2015-08-04 19:27:32 +0000
@@ -1,56 +1,58 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class KeyList : Gtk.Box {
-		public KeyList () {
-			this.orientation = Gtk.Orientation.VERTICAL;
-		}
-
-		public void show_keys_for_schema (Settings schema) {
-			clear_list ();
-
-			var keys = schema.list_keys ();
-
-			for (int i = 0; i < keys.length; i++) {
-				add_item (schema, keys[i]);
-			}
-
-			this.show_all ();
-		}
-
-		public void add_item (Settings settings, string key, bool to_end = false, bool live = true, bool show_schema = false) {
-			var item = new Key (settings, key, settings.settings_schema.get_key (key), live, show_schema);
-
-			if (to_end)
-				this.pack_end (item, false, false);
-			else
-				this.pack_start (item, false, false);
-		}
-
-		public void clear_list () {
-			var childs = this.get_children ();
-
-			for (int i = 0; i < childs.length (); i++) {
-				this.remove (childs.nth_data (i));
-			}
-
-			this.show_all ();
-		}
-	}
-}
+    public class KeyList : Gtk.Box {
+        public KeyList () {
+            this.orientation = Gtk.Orientation.VERTICAL;
+        }
+
+        public void show_keys_for_schema (Settings schema) {
+            clear_list ();
+
+            var keys = schema.list_keys ();
+
+            for (int i = 0; i < keys.length; i++) {
+                add_item (schema, keys[i]);
+            }
+
+            this.show_all ();
+        }
+
+        public void add_item (Settings settings, string key, bool to_end = false, bool live = true, bool show_schema = false) {
+            var item = new Key (settings, key, settings.settings_schema.get_key (key), live, show_schema);
+
+            if (to_end) {
+                this.pack_end (item, false, false);
+            } else {
+                this.pack_start (item, false, false);
+            }
+        }
+
+        public void clear_list () {
+            var childs = this.get_children ();
+
+            for (int i = 0; i < childs.length (); i++) {
+                this.remove (childs.nth_data (i));
+            }
+
+            this.show_all ();
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/Schema.vala'
--- src/Widgets/Schema.vala	2015-04-04 19:12:47 +0000
+++ src/Widgets/Schema.vala	2015-08-04 19:27:32 +0000
@@ -1,34 +1,35 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class Schema : Granite.Widgets.SourceList.Item {
-		private Settings settings;
-
-		public Schema (string schema, string name) {
-			this.settings = new Settings (schema);
-			this.name = name;
-
-			settings.changed.connect ((key) => Services.EventManager.get_default ().key_changed (settings, key));
-		}
-
-		public Settings get_schema () {
-			return settings;
-		}
-	}
-}
+    public class Schema : Granite.Widgets.SourceList.Item {
+        private Settings settings;
+
+        public Schema (string schema, string name) {
+            this.settings = new Settings (schema);
+            this.name = name;
+
+            settings.changed.connect ((key) => Services.EventManager.get_default ().key_changed (settings, key));
+        }
+
+        public Settings get_schema () {
+            return settings;
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/SchemaFolder.vala'
--- src/Widgets/SchemaFolder.vala	2015-04-16 17:26:51 +0000
+++ src/Widgets/SchemaFolder.vala	2015-08-04 19:27:32 +0000
@@ -1,34 +1,35 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class SchemaFolder : Granite.Widgets.SourceList.ExpandableItem {
-		private Settings settings;
-
-		public SchemaFolder (string schema, string name) {
-			this.settings = new Settings (schema);
-			this.name = name;
-
-			settings.changed.connect ((key) => Services.EventManager.get_default ().key_changed (settings, key));
-		}
-
-		public Settings get_schema () {
-			return settings;
-		}
-	}
-}
+    public class SchemaFolder : Granite.Widgets.SourceList.ExpandableItem {
+        private Settings settings;
+
+        public SchemaFolder (string schema, string name) {
+            this.settings = new Settings (schema);
+            this.name = name;
+
+            settings.changed.connect ((key) => Services.EventManager.get_default ().key_changed (settings, key));
+        }
+
+        public Settings get_schema () {
+            return settings;
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/SchemaList.vala'
--- src/Widgets/SchemaList.vala	2015-04-16 17:11:58 +0000
+++ src/Widgets/SchemaList.vala	2015-08-04 19:27:32 +0000
@@ -1,117 +1,122 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class SchemaList : Granite.Widgets.SourceList {
-		private Granite.Widgets.SourceList.ExpandableItem root_item;
-
-		private List<string> schemas;
-
-		private Gee.ArrayList<string> proc_schemas;
-
-		public SchemaList () {
-			root_item = new Granite.Widgets.SourceList.ExpandableItem ();
-
-			this.root = root_item;
-
-			try {
-				string[] data;
-
-				var source = new SettingsSchemaSource.from_directory ("/usr/share/glib-2.0/schemas/", null, false);
-				source.list_schemas (true, out data, null);
-
-				schemas = new List<string> ();
-
-				int i = 0;
-				while (data[i] != null) {
-					schemas.append (data[i]);
-					i++;
-				}
-
-				schemas.sort ((a, b) => {
-					return a.collate (b);
-				});
-
-				proc_schemas = new Gee.ArrayList<string> ();
-
-				fill_folder ("", root_item, 0);
-			} catch (Error e) {
-				warning (e.message);
-			}
-		}
-
-		private bool fill_folder (string folder, Granite.Widgets.SourceList.ExpandableItem parent_item, int level) {
-			int sub_items = 0;
-
-			foreach (string schema in schemas) {
-				if (!proc_schemas.contains (schema)) {
-					if (schema.has_prefix (folder) && is_schema (schema)) {
-						var parts = schema.split (".");
-						var is_folder = false;
-
-						if (parts.length > level + 1) {
-							var folder_path = schema.substring (0, schema.length - (parts[parts.length - 1].length + 1));
-							var folder_name = parts[level];
-							Granite.Widgets.SourceList.ExpandableItem folder_item;
-
-							if (is_in_schema_list (folder_path))
-								folder_item = new SchemaFolder (folder_path, folder_name);
-							else
-								folder_item = new Granite.Widgets.SourceList.ExpandableItem (folder_name);
-
-							is_folder = fill_folder (folder != "" ? folder + "." + folder_name : folder_name, folder_item, level + 1);
-
-							if (is_folder)
-								parent_item.add (folder_item);
-						}
-
-						if (!is_folder && parts.length > 0) {
-							var schema_item = new Schema (schema, parts[parts.length -1]);
-							parent_item.add (schema_item);
-						}
-
-						proc_schemas.add (schema);
-
-						sub_items++;
-					}
-				}
-			}
-
-			return sub_items > 0;
-		}
-
-		private bool is_schema (string s) {
-			foreach (string schema in schemas) {
-				if (schema.length != s.length && schema.has_prefix (s)) {
-					return false;
-				}
-			}
-
-			return true;
-		}
-
-		private bool is_in_schema_list (string s) {
-			foreach (string schema in schemas) {
-				if (schema == s)
-					return true;
-			}
-
-			return false;
-		}
-	}
-}
+    public class SchemaList : Granite.Widgets.SourceList {
+        private Granite.Widgets.SourceList.ExpandableItem root_item;
+
+        private List<string> schemas;
+
+        private Gee.ArrayList<string> proc_schemas;
+
+        public SchemaList () {
+            root_item = new Granite.Widgets.SourceList.ExpandableItem ();
+
+            this.root = root_item;
+
+            try {
+                string[] data;
+
+                var source = new SettingsSchemaSource.from_directory ("/usr/share/glib-2.0/schemas/", null, false);
+                source.list_schemas (true, out data, null);
+
+                schemas = new List<string> ();
+
+                int i = 0;
+
+                while (data[i] != null) {
+                    schemas.append (data[i]);
+                    i++;
+                }
+
+                schemas.sort ((a, b) => {
+                    return a.collate (b);
+                });
+
+                proc_schemas = new Gee.ArrayList<string> ();
+
+                fill_folder ("", root_item, 0);
+            } catch (Error e) {
+                warning (e.message);
+            }
+        }
+
+        private bool fill_folder (string folder, Granite.Widgets.SourceList.ExpandableItem parent_item, int level) {
+            int sub_items = 0;
+
+            foreach (string schema in schemas) {
+                if (!proc_schemas.contains (schema)) {
+                    if (schema.has_prefix (folder) && is_schema (schema)) {
+                        var parts = schema.split (".");
+                        var is_folder = false;
+
+                        if (parts.length > level + 1) {
+                            var folder_path = schema.substring (0, schema.length - (parts[parts.length - 1].length + 1));
+                            var folder_name = parts[level];
+                            Granite.Widgets.SourceList.ExpandableItem folder_item;
+
+                            if (is_in_schema_list (folder_path)) {
+                                folder_item = new SchemaFolder (folder_path, folder_name);
+                            } else {
+                                folder_item = new Granite.Widgets.SourceList.ExpandableItem (folder_name);
+                            }
+
+                            is_folder = fill_folder (folder != "" ? folder + "." + folder_name : folder_name, folder_item, level + 1);
+
+                            if (is_folder) {
+                                parent_item.add (folder_item);
+                            }
+                        }
+
+                        if (!is_folder && parts.length > 0) {
+                            var schema_item = new Schema (schema, parts[parts.length - 1]);
+                            parent_item.add (schema_item);
+                        }
+
+                        proc_schemas.add (schema);
+
+                        sub_items++;
+                    }
+                }
+            }
+
+            return sub_items > 0;
+        }
+
+        private bool is_schema (string s) {
+            foreach (string schema in schemas) {
+                if (schema.length != s.length && schema.has_prefix (s)) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private bool is_in_schema_list (string s) {
+            foreach (string schema in schemas) {
+                if (schema == s) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/TitleBar.vala'
--- src/Widgets/TitleBar.vala	2015-07-02 14:44:26 +0000
+++ src/Widgets/TitleBar.vala	2015-08-04 19:27:32 +0000
@@ -1,37 +1,38 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator.Widgets {
-	public class TitleBar : Gtk.HeaderBar {
-		private Gtk.StackSwitcher stack_switcher;
-
-		public TitleBar (MainWindow parent) {
-			this.get_style_context ().add_class ("primary-toolbar");
-			this.show_close_button = true;
-			this.set_title (_("Configurator"));
-
-			stack_switcher = new Gtk.StackSwitcher ();
-
-			this.set_custom_title (stack_switcher);
-		}
-
-		public void show_stack (Gtk.Stack stack) {
-			stack_switcher.set_stack (stack);
-		}
-	}
-}
+    public class TitleBar : Gtk.HeaderBar {
+        private Gtk.StackSwitcher stack_switcher;
+
+        public TitleBar (MainWindow parent) {
+            this.get_style_context ().add_class ("primary-toolbar");
+            this.show_close_button = true;
+            this.set_title (_("Configurator"));
+
+            stack_switcher = new Gtk.StackSwitcher ();
+
+            this.set_custom_title (stack_switcher);
+        }
+
+        public void show_stack (Gtk.Stack stack) {
+            stack_switcher.set_stack (stack);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/config.vala'
--- src/config.vala	2015-04-04 19:12:47 +0000
+++ src/config.vala	2015-08-04 19:27:32 +0000
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2011-2015 elementary Developers (https://launchpad.net/elementary)
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 namespace Constants {
     public const string DATADIR = "/usr/share/configurator";
     public const string PKGDATADIR = "/usr/share/configurator/configurator";
@@ -6,4 +25,4 @@
     public const string VERSION = "0.1";
     public const string VERSION_INFO = "Release";
     public const string INSTALL_PREFIX = "/usr";
-}
+}
\ No newline at end of file

=== modified file 'src/configurator.vala'
--- src/configurator.vala	2015-04-15 22:45:03 +0000
+++ src/configurator.vala	2015-08-04 19:27:32 +0000
@@ -1,82 +1,83 @@
-/* Copyright 2015 Marcus Wichelmann
-*
-* This file is part of Configurator.
-*
-* Configurator 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.
-*
-* Configurator is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without Configurator 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 Configurator. If not, see http://www.gnu.org/licenses/.
-*/
+/*
+ * Copyright (c) 2011-2015 Marcus Wichelmann
+ *
+ * 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 2 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 namespace configurator {
-	public class configuratorApp : Granite.Application {
-		public MainWindow window;
-
-		construct {
-			// App-Properties
-			program_name = "Configurator";
-			exec_name = "configurator";
-
-			build_data_dir = Constants.DATADIR;
-			build_pkg_data_dir = Constants.PKGDATADIR;
-			build_release_name = Constants.RELEASE_NAME;
-			build_version = Constants.VERSION;
-			build_version_info = Constants.VERSION_INFO;
-
-			app_years = "2015";
-			app_icon = "configurator";
-			app_launcher = "configurator.desktop";
-			application_id = "net.launchpad.configurator";
-			main_url = "https://launchpad.net/configurator";
-			bug_url = "https://bugs.launchpad.net/configurator";
-			help_url = "https://answers.launchpad.net/configurator";
-			translate_url = "https://translations.launchpad.net/configurator";
-			about_authors = {"Marcus Wichelmann <[e-mail]>"};
-			about_documenters = {"Marcus Wichelmann <[e-mail]>"};
-			about_artists = {"Marcus Wichelmann <[e-mail]>"};
-			about_comments = _("A tool to edit your system-settings in elementary OS.");
-			about_translators = "Launchpad Translators";
-		}
-
-		public configuratorApp () {
-			// Translations
-			Intl.setlocale (LocaleCategory.ALL, "");
-			string langpack_dir = Path.build_filename (Constants.INSTALL_PREFIX, "share", "locale");
-			Intl.bindtextdomain (Constants.GETTEXT_PACKAGE, langpack_dir);
-			Intl.bind_textdomain_codeset (Constants.GETTEXT_PACKAGE, "UTF-8");
-			Intl.textdomain (Constants.GETTEXT_PACKAGE);
-
-			// Debug service
-			Granite.Services.Logger.initialize ("configurator");
-			Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
-		}
-
-		public override void activate () {
-			if (get_windows () == null) {
-				window = new MainWindow (this);
-				window.show_all ();
-			} else {
-				window.present ();
-			}
-		}
-
-		public override void open (File[] files, string hint) {
-			// Do nothing
-		}
-
-		public static void main (string[] args) {
-			Gtk.init (ref args);
-
-			var app = new configurator.configuratorApp ();
-			app.run (args);
-		}
-	}
-}
+    public class configuratorApp : Granite.Application {
+        public MainWindow window;
+
+        construct {
+            /* App-Properties */
+            program_name = "Configurator";
+            exec_name = "configurator";
+
+            build_data_dir = Constants.DATADIR;
+            build_pkg_data_dir = Constants.PKGDATADIR;
+            build_release_name = Constants.RELEASE_NAME;
+            build_version = Constants.VERSION;
+            build_version_info = Constants.VERSION_INFO;
+
+            app_years = "2015";
+            app_icon = "configurator";
+            app_launcher = "configurator.desktop";
+            application_id = "net.launchpad.configurator";
+            main_url = "https://launchpad.net/configurator";
+            bug_url = "https://bugs.launchpad.net/configurator";
+            help_url = "https://answers.launchpad.net/configurator";
+            translate_url = "https://translations.launchpad.net/configurator";
+            about_authors = { "Marcus Wichelmann <[e-mail]>" };
+            about_documenters = { "Marcus Wichelmann <[e-mail]>" };
+            about_artists = { "Marcus Wichelmann <[e-mail]>" };
+            about_comments = _("A tool to edit your system-settings in elementary OS.");
+            about_translators = "Launchpad Translators";
+        }
+
+        public configuratorApp () {
+            /* Translations */
+            Intl.setlocale (LocaleCategory.ALL, "");
+            string langpack_dir = Path.build_filename (Constants.INSTALL_PREFIX, "share", "locale");
+            Intl.bindtextdomain (Constants.GETTEXT_PACKAGE, langpack_dir);
+            Intl.bind_textdomain_codeset (Constants.GETTEXT_PACKAGE, "UTF-8");
+            Intl.textdomain (Constants.GETTEXT_PACKAGE);
+
+            /* Debug service */
+            Granite.Services.Logger.initialize ("configurator");
+            Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
+        }
+
+        public override void activate () {
+            if (get_windows () == null) {
+                window = new MainWindow (this);
+                window.show_all ();
+            } else {
+                window.present ();
+            }
+        }
+
+        public override void open (File[] files, string hint) {
+            /* Do nothing */
+        }
+
+        public static void main (string[] args) {
+            Gtk.init (ref args);
+
+            var app = new configurator.configuratorApp ();
+            app.run (args);
+        }
+    }
+}
\ No newline at end of file