Merge lp:~vikoadi/switchboard-plug-keyboard/fix-options into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

[Viko Adi Rahmawan]

* change to org.gnome.desktop.input-sources.xkb-options from org.gnome.libgnomekbd.keyboard.options
* change get_code and from_code because we dont need group+"\t" anymore

fix keyboard option setting
* change to org.gnome.desktop.input-sources.xkb-options from org.gnome.libgnomekbd.keyboard.options
* change get_code and from_code because we dont need group+"\t" anymore

[Viko Adi Rahmawan (vikoadi)]

It seems that hard coded keyboard option doesnt work, should use libgnomedesktop XkbInfo one

[Viko Adi Rahmawan (vikoadi)]

Just update the key, save libgnome-desktop-3.0 for later

review: Needs Resubmitting

[Danielle Foré (danrabbit)]

I can confirm this works for setting compose key to right alt. Super keys seem to not work for whatever reason. Might be eaten by Gala? Perhaps we shouldn't offer that as an option to consider
Bug #1355536 fixed.

[Viko Adi Rahmawan (vikoadi)]

which Super key that i need to remove?
personally i don't use compose key, but mapping Ctrl to Super does work so i don't think gala do something wrong.

[lp:~vikoadi/switchboard-plug-keyboard/fix-options]

248. By Viko Adi Rahmawan on 2014-10-16

fix style

249. By Viko Adi Rahmawan on 2014-10-16

remove non working key

250. By Viko Adi Rahmawan on 2014-10-16

little fix

=== modified file 'src/Pages/Options/option_handler.vala'
--- src/Pages/Options/option_handler.vala	2014-10-04 23:25:34 +0000
+++ src/Pages/Options/option_handler.vala	2014-10-16 16:00:53 +0000
@@ -12,7 +12,7 @@
 			this.multiple_selection = multiple_selection;
 
 			if (multiple_selection == false) {
-				table.@set (_("None"), "");
+				table.@set (_("None"), option+":");
 			}
 		}
 
@@ -59,7 +59,7 @@
 
 		public string? get_code (uint index, uint v) {
 			var item = items.nth (index).data;
-			return item.option + "\t" + item.table.get_values ().nth_data (v);
+			return item.table.get_values ().nth_data (v);
 		}
 
 		public string get_name (uint index, uint v) {
@@ -67,22 +67,21 @@
 		}
 
 		public bool from_code (string code, out uint l, out uint v) {
-			var parts = code.split ("\t", 2);
+			var parts = code.split (":", 2);
 			l = v = 0;
 			if (parts[0] == null || parts[1] == null)
 				return false;
 
 			foreach (var item in items) {
 				v = 0;
-				if (item.option == parts[0]) {
-					foreach (var val in item.table.get_values ()) {
-						if (val == parts[1]) {
-							return true;
-						}
-
-						v++;
-					}
+
+				foreach (var val in item.table.get_values ()) {
+					if (val == code)
+						return true;
+
+					v++;
 				}
+
 				l++;
 			}
 
@@ -200,31 +199,31 @@
 			item.set (_("Make Caps Lock an additional Super"), "caps:super");
 			item.set (_("Make Caps Lock an additional Hyper"), "caps:hyper");
 			item.set (_("Caps Lock toggles Shift so all keys are affected"), "caps:shiftlock");
-			item.set (_("Caps Lock is disabled"), "caps:none");
 			item.set (_("Make Caps Lock an additional Control but keep the Caps_Lock keysym"), "caps:ctrl_modifier");
 			items.append (item);
 
 			item = new Item (_("Alt/Win key behavior"), "altwin", false);
-			item.set (_("Add the standard behavior to Menu key"), "compose:menu");
-			item.set (_("Alt and Meta are on Alt keys"), "compose:meta_alt");
-			item.set (_("Control is mapped to Win keys (and the usual Ctrl keys)"), "compose:ctrl_win");
-			item.set (_("Control is mapped to Alt keys, Alt is mapped to Win keys"), "compose:ctrl_alt_win");
-			item.set (_("Meta is mapped to Win keys"), "compose:meta_win");
-			item.set (_("Meta is mapped to Left Win"), "compose:left_meta_win");
-			item.set (_("Hyper is mapped to Win-keys"), "compose:hyper_win");
-			item.set (_("Alt is mapped to Right Win, Super to Menu"), "compose:alt_super_win");
-			item.set (_("Left Alt is swapped with Left Win"), "compose:swap_lalt_lwin");
+			item.set (_("Add the standard behavior to Menu key"), "altwin:menu");
+			item.set (_("Alt and Meta are on Alt keys"), "altwin:meta_alt");
+			item.set (_("Control is mapped to Win keys (and the usual Ctrl keys)"), "altwin:ctrl_win");
+			item.set (_("Control is mapped to Alt keys, Alt is mapped to Win keys"), "altwin:ctrl_alt_win");
+			item.set (_("Meta is mapped to Win keys"), "altwin:meta_win");
+			item.set (_("Meta is mapped to Left Win"), "altwin:left_meta_win");
+			item.set (_("Hyper is mapped to Win-keys"), "altwin:hyper_win");
+			item.set (_("Alt is mapped to Right Win, Super to Menu"), "altwin:alt_super_win");
+			item.set (_("Alt is mapped to Win keys (and the usual Alt keys)"), "altwin:alt_win");
+			item.set (_("Alt is swapped with Win"), "altwin:swap_alt_win");
 			items.append (item);
 
 			item = new Item (_("Compose key position"), "Compose key", true);
 			item.set (_("Right Alt"), "compose:ralt");
-			item.set (_("Left Win"), "compose:lwin");
-			item.set (_("Right Win"), "compose:rwin");
-			item.set (_("Menu"), "compose:menu");
-			item.set (_("Left Ctrl"), "compose:lctrl");
-			item.set (_("Right Ctrl"), "compose:rctrl");
-			item.set (_("Caps Lock"), "compose:caps");
-			item.set (_("<Less/Greater>"), "compose:102");
+			item.set (_("Left Win"), "compose:lwin-altgr");
+			item.set (_("Right Win"), "compose:rwin-altgr");
+			item.set (_("Menu"), "compose:menu-altgr");
+			item.set (_("Left Ctrl"), "compose:lctrl-altgr");
+			item.set (_("Right Ctrl"), "compose:rctrl-altgr");
+			item.set (_("Caps Lock"), "compose:caps-altgr");
+			item.set (_("<Less/Greater>"), "compose:102-altgr");
 			item.set (_("Pause"), "compose:paus");
 			item.set (_("PrtSc"), "compose:prsc");
 			item.set (_("Scroll Lock"), "compose:sclk");
@@ -255,7 +254,7 @@
 			items.append (item);
 
 			item = new Item (_("Key to choose 5th level"), "lv5", true);
-			item.set (_("<Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:lalt_switch_lock");
+			item.set (_("<Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:lsgt_switch_lock");
 			item.set (_("Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:ralt_switch_lock");
 			item.set (_("Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:lwin_switch_lock");
 			item.set (_("Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser"), "lv5:rwin_switch_lock");
@@ -272,7 +271,7 @@
 			item.set (_("Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)"), "nbsp:level4nl");
 			item.set (_("Zero-width non-joiner character at second level"), "nbsp:zwnj2");
 			item.set (_("Zero-width non-joiner character at second level, zero-width joiner character at third level"), "nbsp:zwnj2zwj3");
-			item.set (_("Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"), "zwnj2zwj3nb4");
+			item.set (_("Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level"), "nbsp:zwnj2zwj3nb4");
 			item.set (_("Zero-width non-joiner character at second level, non-breakable space character at third level"), "nbsp:zwnj2nb3");
 			item.set (_("Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level"), "nbsp:zwnj2nb3s");
 			item.set (_("Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level"), "nbsp:zwnj2nb3zwj4");
@@ -289,6 +288,7 @@
 			item = new Item (_("Adding Esperanto circumflexes (supersigno)"), "esperanto", false);
 			item.set (_("To the corresponding key in a Qwerty keyboard"), "esperanto:qwerty");
 			item.set (_("To the corresponding key in a Dvorak keyboard"), "esperanto:dvorak");
+			item.set (_("To the corresponding key in a Colemak layout"), "esperanto:colemak");
 			items.append (item);
 
 			item = new Item (_("Key sequence to kill the X server"), "terminate", true);
 
=== modified file 'src/Pages/Options/option_settings.vala'
--- src/Pages/Options/option_settings.vala	2014-01-06 17:12:27 +0000
+++ src/Pages/Options/option_settings.vala	2014-10-16 16:00:53 +0000
@@ -13,7 +13,7 @@
 		
 		public OptionSettings()
 		{
-			var schema_name   = "org.gnome.libgnomekbd.keyboard";
+			var schema_name   = "org.gnome.desktop.input-sources";
 			var schema_source = GLib.SettingsSchemaSource.get_default ();
 				
 			// check if schema exists
@@ -28,7 +28,7 @@
 				apply ();
 			}
 			
-			settings.changed["options"].connect (() => {
+			settings.changed["xkb-options"].connect (() => {
 				uint[] old_groups  = groups;
 				uint[] old_options = options;
 				
@@ -49,7 +49,7 @@
 		// emittedwhen the options are changed from an external program
 		public signal void external_change ();
 		
-		// parse the "options" key and store the values in options[] and groups[]
+		// parse the "xkb-options" key and store the values in options[] and groups[]
 		public bool parse ()
 		{
 			groups  = {};
@@ -57,7 +57,7 @@
 			
 			uint group, option;
 			
-			foreach (var code in settings.get_strv ("options"))
+			foreach (var code in settings.get_strv ("xkb-options"))
 			{
 				var add = true;
 				
@@ -86,7 +86,7 @@
 		{
 			groups  = {};
 			options = {};
-			settings.set_strv ("options", null);
+			settings.set_strv ("xkb-options", null);
 		}
 		
 		
@@ -99,7 +99,7 @@
 			for (int i = 0; i < groups.length; i++)
 				tmp += option_handler.get_code (groups[i], options[i]);
 			
-			settings.set_strv ("options", tmp);
+			settings.set_strv ("xkb-options", tmp);
 		}
 		
 		public void add (uint group, uint option) {