Merge lp:~tintou/switchboard-plug-keyboard/less-hardcode into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

[Corentin Noël]

* Get layouts from xkb-data instead of hardcoding a list
* Allow translations

Less hardcode
Use system layouts
Allow translations

[Felipe Escoto (philip.scott)]

Before mergin, the keyboard indicator needs to be updated to use this new backend. It depends on that layouts.txt file

[Danielle Foré (danrabbit)]

This branch also currently has the problem that languages and layouts aren't being properly matched. Corentin seemed to think it was because of the alphabetical sort

review: Needs Fixing

[Danielle Foré (danrabbit)]

The keyboard indicator has been updated

[lp:~tintou/switchboard-plug-keyboard/less-hardcode]

395. By Corentin Noël on 2016-04-20

Use the system keyboard layouts

[Corentin Noël (tintou)]

I fixed the addition mish-mash, it's now okay for review

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-08 09:32:04 +0000
+++ CMakeLists.txt	2016-04-20 22:56:03 +0000
@@ -31,15 +31,10 @@
 configure_file (${CMAKE_SOURCE_DIR}/config.vala.cmake ${CMAKE_BINARY_DIR}/src/config.vala)
 add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 
-# Files
-file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
-
 # Comment this out to enable C compiler warnings
 add_definitions (-w)
 
 # Traslation stuff
 add_subdirectory (po)
-# Info-plug
-install (FILES ${resources} DESTINATION ${PKGDATADIR})
 
 add_subdirectory(src)

=== removed directory 'data'
=== removed file 'data/layouts.txt'
--- data/layouts.txt	2013-01-03 16:19:15 +0000
+++ data/layouts.txt	1970-01-01 00:00:00 +0000
@@ -1,482 +0,0 @@
-#Afghani:af
-Pashto (Afghanistan, OLPC):olpc-ps
-Pashto:ps
-Persian (Afghanistan, Dari OLPC):fa-olpc
-Uzbek (Afghanistan):uz
-Uzbek (Afghanistan, OLPC):uz-olpc
-#Albanian:al
-#Amharic:et
-#Arabic (Morocco):ma
-Berber (Morocco, Tifinagh alternative phonetic):tifinagh-alt-phonetic
-Berber (Morocco, Tifinagh alternative):tifinagh-alt
-Berber (Morocco, Tifinagh extended phonetic):tifinagh-extended-phonetic
-Berber (Morocco, Tifinagh extended):tifinagh-extended
-Berber (Morocco, Tifinagh phonetic):tifinagh-phonetic
-Berber (Morocco, Tifinagh):tifinagh
-French (Morocco):french
-#Arabic (Syria):sy
-Kurdish (Syria, F):ku_f
-Kurdish (Syria, Latin Alt-Q):ku_alt
-Kurdish (Syria, Latin Q):ku
-Syriac (phonetic):syc_phonetic
-Syriac:syc
-#Arabic:ara
-Arabic (Buckwalter):buckwalter
-Arabic (azerty):azerty
-Arabic (azerty/digits):azerty_digits
-Arabic (digits):digits
-Arabic (qwerty):qwerty
-Arabic (qwerty/digits):qwerty_digits
-#Armenian:am
-Armenian (alternative eastern):eastern-alt
-Armenian (alternative phonetic):phonetic-alt
-Armenian (eastern):eastern
-Armenian (phonetic):phonetic
-Armenian (western):western
-#Azerbaijani:az
-Azerbaijani (Cyrillic):cyrillic
-#Bambara:ml
-English (Mali, US Macintosh):us-mac
-English (Mali, US international):us-intl
-French (Mali, alternative):fr-oss
-#Belarusian:by
-Belarusian (Latin):latin
-Belarusian (legacy):legacy
-#Belgian:be
-Belgian (ISO alternate):iso-alternate
-Belgian (Sun dead keys):sundeadkeys
-Belgian (Wang model 724 azerty):wang
-Belgian (alternative):oss
-Belgian (alternative, Sun dead keys):oss_sundeadkeys
-Belgian (alternative, latin-9 only):oss_latin9
-Belgian (eliminate dead keys):nodeadkeys
-#Bengali:bd
-Bengali (Probhat):probhat
-#Bosnian:ba
-Bosnian (US keyboard with Bosnian digraphs):unicodeus
-Bosnian (US keyboard with Bosnian letters):us
-Bosnian (use Bosnian digraphs):unicode
-Bosnian (use guillemets for quotes):alternatequotes
-#Braille:brai
-Braille (left hand):left_hand
-Braille (right hand):right_hand
-#Bulgarian:bg
-Bulgarian (new phonetic):bas_phonetic
-Bulgarian (traditional phonetic):phonetic
-#Burmese:mm
-#Catalan:ad
-#Chinese:cn
-Tibetan (with ASCII numerals):tib_asciinum
-Tibetan:tib
-Uyghur:uig
-#Croatian:hr
-Croatian (US keyboard with Croatian digraphs):unicodeus
-Croatian (US keyboard with Croatian letters):us
-Croatian (use Croatian digraphs):unicode
-Croatian (use guillemets for quotes):alternatequotes
-#Czech:cz
-Czech (UCW layout, accented letters only):ucw
-Czech (US Dvorak with CZ UCW support):dvorak-ucw
-Czech (qwerty):qwerty
-Czech (qwerty, extended Backslash):qwerty_bksl
-Czech (with <\|> key):bksl
-#Danish:dk
-Danish (Dvorak):dvorak
-Danish (Macintosh):mac
-Danish (Macintosh, eliminate dead keys):mac_nodeadkeys
-Danish (eliminate dead keys):nodeadkeys
-#Dhivehi:mv
-#Dutch:nl
-Dutch (Macintosh):mac
-Dutch (Sun dead keys):sundeadkeys
-Dutch (standard):std
-#Dzongkha:bt
-#English (Cameroon):cm
-Cameroon Multilingual (Dvorak):dvorak
-Cameroon Multilingual (azerty):azerty
-Cameroon Multilingual (qwerty):qwerty
-French (Cameroon):french
-#English (Ghana):gh
-Akan:akan
-Avatime:avn
-English (Ghana, GILLBT):gillbt
-English (Ghana, multilingual):generic
-Ewe:ewe
-Fula:fula
-Ga:ga
-Hausa:hausa
-#English (Nigeria):ng
-Hausa:hausa
-Igbo:igbo
-Yoruba:yoruba
-#English (South Africa):za
-#English (UK):gb
-English (UK, Colemak):colemak
-English (UK, Dvorak with UK punctuation):dvorakukp
-English (UK, Dvorak):dvorak
-English (UK, Macintosh international):mac_intl
-English (UK, Macintosh):mac
-English (UK, extended WinKeys):extd
-English (UK, international with dead keys):intl
-#English (US):us
-Cherokee:chr
-English (Colemak):colemak
-English (Dvorak alternative international no dead keys):dvorak-alt-intl
-English (Dvorak international with dead keys):dvorak-intl
-English (Dvorak):dvorak
-English (Macintosh):mac
-English (US, alternative international):alt-intl
-English (US, international with dead keys):intl
-English (US, with euro on 5):euro
-English (classic Dvorak):dvorak-classic
-English (international AltGr dead keys):altgr-intl
-English (layout toggle on multiply/divide key):olpc2
-English (left handed Dvorak):dvorak-l
-English (programmer Dvorak):dvp
-English (right handed Dvorak):dvorak-r
-Russian (US, phonetic):rus
-Serbo-Croatian (US):hbs
-#Esperanto:epo
-Esperanto (displaced semicolon and quote, obsolete):legacy
-#Estonian:ee
-Estonian (Dvorak):dvorak
-Estonian (US keyboard with Estonian letters):us
-Estonian (eliminate dead keys):nodeadkeys
-#Faroese:fo
-Faroese (eliminate dead keys):nodeadkeys
-#Filipino:ph
-Filipino (Capewell-Dvorak Baybayin):capewell-dvorak-bay
-Filipino (Capewell-Dvorak Latin):capewell-dvorak
-Filipino (Capewell-QWERF 2006 Baybayin):capewell-qwerf2k6-bay
-Filipino (Capewell-QWERF 2006 Latin):capewell-qwerf2k6
-Filipino (Colemak Baybayin):colemak-bay
-Filipino (Colemak Latin):colemak
-Filipino (Dvorak Baybayin):dvorak-bay
-Filipino (Dvorak Latin):dvorak
-Filipino (QWERTY Baybayin):qwerty-bay
-#Finnish:fi
-Finnish (Macintosh):mac
-Finnish (classic):classic
-Finnish (classic, eliminate dead keys):nodeadkeys
-Northern Saami (Finland):smi
-#French (Canada):ca
-Canadian Multilingual (first part):multi
-Canadian Multilingual (second part):multi-2gr
-Canadian Multilingual:multix
-English (Canada):eng
-French (Canada, Dvorak):fr-dvorak
-French (Canada, legacy):fr-legacy
-Inuktitut:ike
-#French (Democratic Republic of the Congo):cd
-#French (Guinea):gn
-#French:fr
-French (Bepo, ergonomic, Dvorak way):bepo
-French (Bepo, ergonomic, Dvorak way, latin-9 only):bepo_latin9
-French (Breton):bre
-French (Dvorak):dvorak
-French (Macintosh):mac
-French (Sun dead keys):sundeadkeys
-French (alternative):oss
-French (alternative, Sun dead keys):oss_sundeadkeys
-French (alternative, eliminate dead keys):oss_nodeadkeys
-French (alternative, latin-9 only):oss_latin9
-French (eliminate dead keys):nodeadkeys
-French (legacy, alternative):latin9
-French (legacy, alternative, Sun dead keys):latin9_sundeadkeys
-French (legacy, alternative, eliminate dead keys):latin9_nodeadkeys
-Georgian (France, AZERTY Tskapo):geo
-Occitan:oci
-#Georgian:ge
-Georgian (MESS):mess
-Georgian (ergonomic):ergonomic
-Ossetian (Georgia):os
-Russian (Georgia):ru
-#German (Austria):at
-German (Austria, Macintosh):mac
-German (Austria, Sun dead keys):sundeadkeys
-German (Austria, eliminate dead keys):nodeadkeys
-#German (Switzerland):ch
-French (Switzerland):fr
-French (Switzerland, Macintosh):fr_mac
-French (Switzerland, Sun dead keys):fr_sundeadkeys
-French (Switzerland, eliminate dead keys):fr_nodeadkeys
-German (Switzerland, Macintosh):de_mac
-German (Switzerland, Sun dead keys):de_sundeadkeys
-German (Switzerland, eliminate dead keys):de_nodeadkeys
-German (Switzerland, legacy):legacy
-#German:de
-German (Dvorak):dvorak
-German (Macintosh):mac
-German (Macintosh, eliminate dead keys):mac_nodeadkeys
-German (Neo 2):neo
-German (Sun dead keys):sundeadkeys
-German (dead acute):deadacute
-German (dead grave acute):deadgraveacute
-German (eliminate dead keys):nodeadkeys
-Lower Sorbian (qwertz):dsb_qwertz
-Lower Sorbian:dsb
-Romanian (Germany):ro
-Romanian (Germany, eliminate dead keys):ro_nodeadkeys
-Russian (Germany, phonetic):ru
-#Greek:gr
-Greek (eliminate dead keys):nodeadkeys
-Greek (extended):extended
-Greek (polytonic):polytonic
-Greek (simple):simple
-#Hebrew:il
-Hebrew (Biblical, Tiro):biblical
-Hebrew (lyx):lyx
-Hebrew (phonetic):phonetic
-#Hungarian:hu
-Hungarian (101/qwerty/comma/dead keys):101_qwerty_comma_dead
-Hungarian (101/qwerty/comma/eliminate dead keys):101_qwerty_comma_nodead
-Hungarian (101/qwerty/dot/dead keys):101_qwerty_dot_dead
-Hungarian (101/qwerty/dot/eliminate dead keys):101_qwerty_dot_nodead
-Hungarian (101/qwertz/comma/dead keys):101_qwertz_comma_dead
-Hungarian (101/qwertz/comma/eliminate dead keys):101_qwertz_comma_nodead
-Hungarian (101/qwertz/dot/dead keys):101_qwertz_dot_dead
-Hungarian (101/qwertz/dot/eliminate dead keys):101_qwertz_dot_nodead
-Hungarian (102/qwerty/comma/dead keys):102_qwerty_comma_dead
-Hungarian (102/qwerty/comma/eliminate dead keys):102_qwerty_comma_nodead
-Hungarian (102/qwerty/dot/dead keys):102_qwerty_dot_dead
-Hungarian (102/qwerty/dot/eliminate dead keys):102_qwerty_dot_nodead
-Hungarian (102/qwertz/comma/dead keys):102_qwertz_comma_dead
-Hungarian (102/qwertz/comma/eliminate dead keys):102_qwertz_comma_nodead
-Hungarian (102/qwertz/dot/dead keys):102_qwertz_dot_dead
-Hungarian (102/qwertz/dot/eliminate dead keys):102_qwertz_dot_nodead
-Hungarian (eliminate dead keys):nodeadkeys
-Hungarian (qwerty):qwerty
-Hungarian (standard):standard
-#Icelandic:is
-Icelandic (Dvorak):dvorak
-Icelandic (Macintosh):mac
-Icelandic (Sun dead keys):Sundeadkeys
-Icelandic (eliminate dead keys):nodeadkeys
-#Indian:in
-Bengali (India):ben
-Bengali (India, Baishakhi Inscript):ben_inscript
-Bengali (India, Baishakhi):ben_baishakhi
-Bengali (India, Bornona):ben_bornona
-Bengali (India, Probhat):ben_probhat
-Bengali (India, Uni Gitanjali):ben_gitanjali
-English (India, with RupeeSign):eng
-Gujarati:guj
-Hindi (Bolnagri):bolnagri
-Hindi (Wx):hin-wx
-Kannada:kan
-Malayalam (Lalitha):mal_lalitha
-Malayalam (enhanced Inscript with Rupee Sign):mal_enhanced
-Malayalam:mal
-Oriya:ori
-Punjabi (Gurmukhi Jhelum):jhelum
-Punjabi (Gurmukhi):guru
-Tamil (TAB typewriter):tam_TAB
-Tamil (TSCII typewriter):tam_TSCII
-Tamil (Unicode):tam_unicode
-Tamil (keyboard with numerals):tam_keyboard_with_numerals
-Tamil:tam
-Telugu:tel
-Urdu (WinKeys):urd-winkeys
-Urdu (alternative phonetic):urd-phonetic3
-Urdu (phonetic):urd-phonetic
-#Iraqi:iq
-Kurdish (Iraq, Arabic-Latin):ku_ara
-Kurdish (Iraq, F):ku_f
-Kurdish (Iraq, Latin Alt-Q):ku_alt
-Kurdish (Iraq, Latin Q):ku
-#Irish:ie
-CloGaelach:CloGaelach
-Irish (UnicodeExpert):UnicodeExpert
-Ogham (IS434):ogam_is434
-Ogham:ogam
-#Italian:it
-Georgian (Italy):geo
-Italian (Macintosh):mac
-Italian (US keyboard with Italian letters):us
-Italian (eliminate dead keys):nodeadkeys
-#Japanese (PC-98xx Series):nec_vndr/jp
-#Japanese:jp
-Japanese (Kana 86):kana86
-Japanese (Kana):kana
-Japanese (Macintosh):mac
-Japanese (OADG 109A):OADG109A
-#Kazakh:kz
-Kazakh (with Russian):kazrus
-Russian (Kazakhstan, with Kazakh):ruskaz
-#Khmer (Cambodia):kh
-#Korean:kr
-Korean (101/104 key compatible):kr104
-#Kyrgyz:kg
-Kyrgyz (phonetic):phonetic
-#Lao:la
-Lao (STEA proposed standard layout):stea
-#Latvian:lv
-Latvian (F variant):fkey
-Latvian (adapted):adapted
-Latvian (apostrophe variant):apostrophe
-Latvian (ergonomic, ŪGJRMV):ergonomic
-Latvian (modern):modern
-Latvian (tilde variant):tilde
-#Lithuanian:lt
-Lithuanian (IBM LST 1205-92):ibm
-Lithuanian (LEKP):lekp
-Lithuanian (LEKPa):lekpa
-Lithuanian (US keyboard with Lithuanian letters):us
-Lithuanian (standard):std
-#Macedonian:mk
-Macedonian (eliminate dead keys):nodeadkeys
-#Maltese:mt
-Maltese (with US layout):us
-#Maori:mao
-#Mongolian:mn
-#Montenegrin:me
-Montenegrin (Cyrillic with guillemets):cyrillicalternatequotes
-Montenegrin (Cyrillic):cyrillic
-Montenegrin (Cyrillic, Z and ZHE swapped):cyrillicyz
-Montenegrin (Latin Unicode qwerty):latinunicodeyz
-Montenegrin (Latin Unicode):latinunicode
-Montenegrin (Latin qwerty):latinyz
-Montenegrin (Latin with guillemets):latinalternatequotes
-#Nepali:np
-#Norwegian:no
-Northern Saami (Norway):smi
-Northern Saami (Norway, eliminate dead keys):smi_nodeadkeys
-Norwegian (Dvorak):dvorak
-Norwegian (Macintosh):mac
-Norwegian (Macintosh, eliminate dead keys):mac_nodeadkeys
-Norwegian (eliminate dead keys):nodeadkeys
-#Persian:ir
-Kurdish (Iran, Arabic-Latin):ku_ara
-Kurdish (Iran, F):ku_f
-Kurdish (Iran, Latin Alt-Q):ku_alt
-Kurdish (Iran, Latin Q):ku
-Persian (with Persian Keypad):pes_keypad
-#Polish:pl
-Kashubian:csb
-Polish (Dvorak):dvorak
-Polish (Dvorak, Polish quotes on key 1):dvorak_altquotes
-Polish (Dvorak, Polish quotes on quotemark key):dvorak_quotes
-Polish (programmer Dvorak):dvp
-Polish (qwertz):qwertz
-Russian (Poland, phonetic Dvorak):ru_phonetic_dvorak
-#Portuguese (Brazil):br
-Portuguese (Brazil, Dvorak):dvorak
-Portuguese (Brazil, eliminate dead keys):nodeadkeys
-Portuguese (Brazil, nativo for Esperanto):nativo-epo
-Portuguese (Brazil, nativo for USA keyboards):nativo-us
-Portuguese (Brazil, nativo):nativo
-#Portuguese:pt
-Esperanto (Portugal, Nativo):nativo-epo
-Portuguese (Macintosh):mac
-Portuguese (Macintosh, Sun dead keys):mac_sundeadkeys
-Portuguese (Macintosh, eliminate dead keys):mac_nodeadkeys
-Portuguese (Nativo for USA keyboards):nativo-us
-Portuguese (Nativo):nativo
-Portuguese (Sun dead keys):sundeadkeys
-Portuguese (eliminate dead keys):nodeadkeys
-#Romanian:ro
-Romanian (WinKeys):winkeys
-Romanian (cedilla):cedilla
-Romanian (standard cedilla):std_cedilla
-Romanian (standard):std
-#Russian:ru
-Bashkirian:bak
-Chuvash (Latin):cv_latin
-Chuvash:cv
-Kalmyk:xal
-Komi:kom
-Mari:chm
-Ossetian (WinKeys):os_winkeys
-Ossetian (legacy):os_legacy
-Russian (DOS):dos
-Russian (legacy):legacy
-Russian (phonetic WinKeys):phonetic_winkeys
-Russian (phonetic):phonetic
-Russian (typewriter):typewriter
-Russian (typewriter, legacy):typewriter-legacy
-Serbian (Russia):srp
-Tatar:tt
-Udmurt:udm
-Yakut:sah
-#Serbian (Cyrillic):rs
-Pannonian Rusyn (homophonic):rue
-Serbian (Cyrillic with guillemets):alternatequotes
-Serbian (Cyrillic, Z and ZHE swapped):yz
-Serbian (Latin Unicode qwerty):latinunicodeyz
-Serbian (Latin Unicode):latinunicode
-Serbian (Latin qwerty):latinyz
-Serbian (Latin with guillemets):latinalternatequotes
-Serbian (Latin):latin
-#Sinhala (phonetic):lk
-Tamil (Sri Lanka, TAB Typewriter):tam_TAB
-Tamil (Sri Lanka, Unicode):tam_unicode
-#Slovak:sk
-Slovak (extended Backslash):bksl
-Slovak (qwerty):qwerty
-Slovak (qwerty, extended Backslash):qwerty_bksl
-#Slovenian:si
-Slovenian (US keyboard with Slovenian letters):us
-Slovenian (use guillemets for quotes):alternatequotes
-#Spanish (Latin American):latam
-Spanish (Latin American, Sun dead keys):sundeadkeys
-Spanish (Latin American, eliminate dead keys):nodeadkeys
-Spanish (Latin American, include dead tilde):deadtilde
-#Spanish:es
-Asturian (Spain, with bottom-dot H and bottom-dot L):ast
-Catalan (Spain, with middle-dot L):cat
-Spanish (Dvorak):dvorak
-Spanish (Macintosh):mac
-Spanish (Sun dead keys):sundeadkeys
-Spanish (eliminate dead keys):nodeadkeys
-Spanish (include dead tilde):deadtilde
-#Swahili (Kenya):ke
-Kikuyu:kik
-#Swahili (Tanzania):tz
-#Swedish:se
-Northern Saami (Sweden):smi
-Russian (Sweden, phonetic):rus
-Russian (Sweden, phonetic, eliminate dead keys):rus_nodeadkeys
-Swedish (Dvorak):dvorak
-Swedish (Macintosh):mac
-Swedish (Svdvorak):svdvorak
-Swedish (eliminate dead keys):nodeadkeys
-Swedish Sign Language:swl
-#Taiwanese:tw
-Saisiyat (Taiwan):saisiyat
-Taiwanese (indigenous):indigenous
-#Tajik:tj
-Tajik (legacy):legacy
-#Thai:th
-Thai (Pattachote):pat
-Thai (TIS-820.2538):tis
-#Tswana:bw
-#Turkish:tr
-Crimean Tatar (Turkish Alt-Q):crh_alt
-Crimean Tatar (Turkish F):crh_f
-Crimean Tatar (Turkish Q):crh
-Kurdish (Turkey, F):ku_f
-Kurdish (Turkey, Latin Alt-Q):ku_alt
-Kurdish (Turkey, Latin Q):ku
-Turkish (Alt-Q):alt
-Turkish (F):f
-Turkish (Sun dead keys):sundeadkeys
-Turkish (international with dead keys):intl
-#Turkmen:tm
-Turkmen (Alt-Q):alt
-#Ukrainian:ua
-Russian (Ukraine, standard RSTU):rstu_ru
-Ukrainian (WinKeys):winkeys
-Ukrainian (homophonic):homophonic
-Ukrainian (legacy):legacy
-Ukrainian (phonetic):phonetic
-Ukrainian (standard RSTU):rstu
-Ukrainian (typewriter):typewriter
-#Urdu (Pakistan):pk
-Arabic (Pakistan):ara
-Sindhi:snd
-Urdu (Pakistan, CRULP):urd-crulp
-Urdu (Pakistan, NLA):urd-nla
-#Uzbek:uz
-Uzbek (Latin):latin
-#Vietnamese:vn
-#Wolof:sn

=== modified file 'debian/control'
--- debian/control	2014-01-09 23:07:40 +0000
+++ debian/control	2016-04-20 22:56:03 +0000
@@ -8,7 +8,7 @@
 
 Package: switchboard-plug-keyboard
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, xkb-data, xkb-data-i18n
 Enhances: switchboard
 Description: Switchboard plug for keyboard settings
  This plug can be used to change several keyboard settings, for example the delay and speed of the key repetition, or the cursor blinking speed. You can change your keyboard layout, and use multiple layouts at the same time. Keyboard shortcuts are also part of this plug.
@@ -20,4 +20,4 @@
 Depends: switchboard-plug-keyboard (= ${binary:Version}), ${misc:Depends}
 Enhances: switchboard-plug-keyboard
 Description: Switchboard plug for keyboard settings (debugging symbols)
- This package contains debugging symbols for switchboard-plug-keyboard.
\ No newline at end of file
+ This package contains debugging symbols for switchboard-plug-keyboard.

=== modified file 'src/Pages/Layout/add_layout.vala'
--- src/Pages/Layout/add_layout.vala	2015-10-26 23:56:54 +0000
+++ src/Pages/Layout/add_layout.vala	2016-04-20 22:56:03 +0000
@@ -3,7 +3,7 @@
 	// pop over widget to add a new keyboard layout
 	class AddLayout : Gtk.Popover
 	{
-		public signal void layout_added (int language, int layout = 0);
+		public signal void layout_added (string language, string layout);
 
 		public AddLayout()
 		{
@@ -26,32 +26,33 @@
 			grid.attach (label_layout,   0, 1, 1, 1);
 
 			// list stores
-			var lang_list   = create_list_store (handler.get_layouts ());
-			var layout_list = create_list_store (handler.get_variants (0));
-
-			// combo boxes to select language and layout
+			var lang_list   = create_list_store (handler.languages);
 			var language_box = new Gtk.ComboBox.with_model (lang_list);
+			language_box.id_column = 0;
+			language_box.active = 0;
+
+			var layout_list = create_list_store (handler.get_variants_for_language (language_box.active_id));
 			var layout_box   = new Gtk.ComboBox.with_model (layout_list);
+			layout_box.id_column = 0;
+			layout_box.active = 0;
 
 			var renderer = new Gtk.CellRendererText ();
 
 			language_box.pack_start (renderer, true);
-			language_box.add_attribute (renderer, "text", 0);
+			language_box.add_attribute (renderer, "text", 1);
 			language_box.active = 0;
 
 			layout_box.pack_start (renderer, true);
-			layout_box.add_attribute (renderer, "text", 0);
+			layout_box.add_attribute (renderer, "text", 1);
 			layout_box.active = 0;
 
 			grid.attach (language_box, 1, 0, 1, 1);
 			grid.attach (layout_box,   1, 1, 1, 1);
 
-			language_box.changed.connect( () =>
-			{
-				var active = language_box.active;
-				layout_box.model = create_list_store (handler.get_variants (active));
+			language_box.changed.connect(() => {
+				layout_box.model = create_list_store (handler.get_variants_for_language (language_box.active_id));
 				layout_box.active = 0;
-			} );
+			});
 
 			// add buttons
 			var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
@@ -70,11 +71,42 @@
 				this.hide ();
 			} );
 
-			button_add.clicked.connect (() =>
-			{
+			button_add.clicked.connect (() => {
 				this.hide ();
-				layout_added (language_box.active, layout_box.active);
+				layout_added (language_box.active_id, layout_box.active_id);
 			} );
 		}
+
+		// creates a list store from a string vector
+		Gtk.ListStore create_list_store (HashTable<string, string> values)
+		{
+			Gtk.ListStore list_store = new Gtk.ListStore (2, typeof (string), typeof (string));
+			list_store.set_default_sort_func (compare_func);
+			list_store.set_sort_column_id (Gtk.TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, Gtk.SortType.ASCENDING);
+
+			values.foreach ((key, val) => {
+				Gtk.TreeIter iter;
+				list_store.append (out iter);
+				list_store.set (iter, 0, key, 1, val);
+			});
+
+			return list_store;
+		}
+
+		int compare_func (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b) {
+			Value val_a;
+			Value val_b;
+			model.get_value (a, 1, out val_a);
+			model.get_value (b, 1, out val_b);
+			if (((string) val_a) == _("Default")) {
+				return -1;
+			}
+
+			if (((string) val_b) == _("Default")) {
+				return 1;
+			}
+
+			return ((string) val_a).collate ((string) val_b);
+		}
 	}
 }

=== modified file 'src/Pages/Layout/display.vala'
--- src/Pages/Layout/display.vala	2015-10-27 00:02:07 +0000
+++ src/Pages/Layout/display.vala	2016-04-20 22:56:03 +0000
@@ -160,21 +160,15 @@
         }
 
         Gtk.ListStore build_store () {
-            Gtk.ListStore list_store = new Gtk.ListStore (3, typeof (string), typeof(uint), typeof(uint));
+            Gtk.ListStore list_store = new Gtk.ListStore (2, typeof (string), typeof(string));
             Gtk.TreeIter iter;
-
-            uint layout = 0, variant = 0;
-
             for (uint i = 0; i < settings.layouts.length; i++) {
                 string item = settings.layouts.get_layout (i).name;
-                handler.from_code (item, out layout, out variant);
-                item = handler.get_name (layout, variant);
-
                 list_store.append (out iter);
-                list_store.set (iter, 0, item);
-                list_store.set (iter, 1, layout);
-                list_store.set (iter, 2, variant);
+                list_store.set (iter, 0, handler.get_display_name (item));
+                list_store.set (iter, 1, item);
             }
+
             return list_store;
         }
 
@@ -193,12 +187,7 @@
         void add_item (LayoutPage.AddLayout pop)
         {
             pop.layout_added.connect ((layout, variant) => {
-
-                var name = handler.get_name (layout, variant);
-                var code = handler.get_code (layout, variant);
-
-                // TODO variant
-                settings.layouts.add_layout (new Layout.XKB (code, ""));
+                settings.layouts.add_layout (new Layout.XKB (layout, variant));
                 rebuild_list ();
             });
         }

=== modified file 'src/Pages/Layout/handler.vala'
--- src/Pages/Layout/handler.vala	2014-08-10 19:29:15 +0000
+++ src/Pages/Layout/handler.vala	2016-04-20 22:56:03 +0000
@@ -1,147 +1,89 @@
-namespace Pantheon.Keyboard.LayoutPage
-{
-	// class that parses the layout file, provides lists of languages and
-	// variants, and converts between layout names and their gsettings codes
-	class LayoutHandler : GLib.Object
-	{
-		InternalLayout[]  layouts;
-
-		private string[] names;
-		private string[] codes;
-
-		public LayoutHandler ()
-		{
-			foreach (var l in parse_layouts ())
-			{
-				var parts = l.split(":", 2);
-
-				names += parts[0];
-				codes += parts[1];
-
-				layouts += new InternalLayout (parse_variants (l));
-			}
-		}
-
-		public string[] get_layouts () {
-			return names;
-		}
-
-		public string[] get_variants (uint index) {
-			return layouts[index].names;
-		}
-
-		public string get_code (uint l, uint v)
-		{
-			if (v != 0)
-				return codes[l] + "+" + layouts[l].codes[v];
-			return codes[l];
-		}
-
-		public string get_name (uint l, uint v)
-		{
-			if (v != 0)
-				return layouts[l].names[v];
-			return names[l];
-		}
-
-		public bool from_code (string code, out uint l, out uint v)
-		{
-			var parts = code.split("+", 2);
-
-			l = v = 0;
-
-			if (parts[0] == null) return false;
-
-			while (codes[l] != parts[0])
-				if (l++ > codes.length)
-					return false;
-
-			if (parts[1] == null) return true;
-
-			while (layouts[l].codes[v] != parts[1])
-				if (v++ > layouts[l].codes.length)
-					return false;
-
-			return true;
-		}
-
-		// private class that contains the variants of one language
-		private class InternalLayout : GLib.Object {
-			public string[] names;
-			public string[] codes;
-
-			public InternalLayout (string[] variants )
-			{
-				names += _("Default");
-				codes += "";
-
-				foreach (var v in variants)
-				{
-					var parts = v.split(":", 2);
-
-					names += parts[0];
-					codes += parts[1];
-				}
-			}
-		}
-
-		// private functions to parse the files
-		private string[]? parse_layouts ()
-		{
-			string[] return_val = null;
-
-			var file = File.new_for_path (Build.PKGDATADIR + "/layouts.txt");
-
-			if (!file.query_exists ()) {
-				warning ("File '%s' doesn't exist.\n", file.get_path ());
-				return return_val;
-			}
-
-			try {
-				var dis = new DataInputStream (file.read ());
-
-				string line;
-
-				while ((line = dis.read_line (null)) != null)
-					if( "#" in line )
-						return_val += line.replace ("#", "");
-			} catch (Error e) {
-				error ("%s", e.message);
-			}
-
-			return return_val;
-		}
-
-		private string[]? parse_variants (string language)
-		{
-			string[] return_val = null;
-
-			var file = File.new_for_path (Build.PKGDATADIR + "/layouts.txt");
-
-			if (!file.query_exists ()) {
-				warning ("File '%s' doesn't exist.\n", file.get_path ());
-				return null;
-			}
-
-			try {
-				var dis = new DataInputStream (file.read ());
-
-				string line;
-
-				while ((line = dis.read_line (null)) != null) {
-					if (line == "#" + language) {
-						while ((line = dis.read_line (null)) != null) {
-							if( "#" in line ) break;
-							return_val += line;
-						}
-						break;
-					}
-				}
-			} catch (Error e) {
-				error ("%s", e.message);
-			}
-
-			return return_val;
-		}
-	}
-}
\ No newline at end of file
+public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object {
+    public HashTable<string, string> languages { public get; private set; }
+
+    public LayoutHandler () {
+        parse_layouts ();
+    }
+
+    construct {
+        languages = new HashTable<string, string> (str_hash, str_equal);
+    }
+
+    private void parse_layouts () {
+        var file = File.new_for_path ("/usr/share/X11/xkb/rules/evdev.lst");
+
+        if (!file.query_exists ()) {
+            critical ("File '%s' doesn't exist.", file.get_path ());
+            return;
+        }
+
+        try {
+            var dis = new DataInputStream (file.read ());
+            string line;
+            bool layout_found = false;
+            while ((line = dis.read_line (null)) != null) {
+                if (layout_found) {
+                    if ("!" in line || line == "") {
+                        break;
+                    }
+                    
+                    var parts = line.chug ().split (" ", 2);
+                    languages.set (parts[0], dgettext ("xkeyboard-config", parts[1].chug ()));
+                } else {
+                    if ("!" in line && "layout" in line) {
+                        layout_found = true;
+                    }
+                }
+            }
+        } catch (Error e) {
+            error (e.message);
+        }
+    }
+
+    public HashTable<string, string> get_variants_for_language (string language) {
+        var returned_table = new HashTable<string, string> (str_hash, str_equal);
+        returned_table.set ("", _("Default"));
+        var file = File.new_for_path ("/usr/share/X11/xkb/rules/evdev.lst");
+
+        if (!file.query_exists ()) {
+            critical ("File '%s' doesn't exist.", file.get_path ());
+            return returned_table;
+        }
+
+        try {
+            var dis = new DataInputStream (file.read ());
+            string line;
+            bool variant_found = false;
+            while ((line = dis.read_line (null)) != null) {
+                if (variant_found) {
+                    if ("!" in line || line == "") {
+                        break;
+                    }
+                    
+                    var parts = line.chug ().split (" ", 2);
+                    var subparts = parts[1].chug ().split (":", 2);
+                    if (subparts[0] == language) {
+                        returned_table.set (parts[0], dgettext ("xkeyboard-config", subparts[1].chug ()));
+                    }
+                } else {
+                    if ("!" in line && "variant" in line) {
+                        variant_found = true;
+                    }
+                }
+            }
+        } catch (Error e) {
+            error (e.message);
+        }
+
+        return returned_table;
+    }
+
+    public string get_display_name (string variant) {
+        if ("+" in variant) {
+            var parts = variant.split ("+", 2);
+            return get_variants_for_language (parts[0]).get (parts[1]);
+        } else {
+            return languages.get (variant);
+        }
+    }
+}

=== modified file 'src/Pages/layout.vala'
--- src/Pages/layout.vala	2015-10-22 15:32:43 +0000
+++ src/Pages/layout.vala	2016-04-20 22:56:03 +0000
@@ -60,18 +60,4 @@
 			this.attach (entry_test, 4, 3, 3, 1);
 		}
 	}
-
-	// creates a list store from a string vector
-	Gtk.ListStore create_list_store (string[] strv)
-	{
-		Gtk.ListStore list_store = new Gtk.ListStore (1, typeof (string));
-		Gtk.TreeIter iter;
-
-		foreach (string item in strv) {
-			list_store.append (out iter);
-			list_store.set (iter, 0, item);
-		}
-
-		return list_store;
-	}
 }