Merge lp:~vikoadi/switchboard-plug-locale/new-ui into lp:~elementary-apps/switchboard-plug-locale/trunk

[Viko Adi Rahmawan]

new ui

[Cody Garver (codygarver)]

error: Package `monetary' not found in specified Vala API directories or GObject-Introspection GIR directories

Vala 0.26.1

[lp:~vikoadi/switchboard-plug-locale/new-ui]

71. By Viko Adi Rahmawan on 2014-12-19

add monetary.vapi

[Viko Adi Rahmawan (vikoadi)]

add monetary.vapi

[lp:~vikoadi/switchboard-plug-locale/new-ui]

72. By Viko Adi Rahmawan on 2014-12-19

allow removing language

73. By Viko Adi Rahmawan on 2014-12-19

allow removing language

[PerfectCarl (name-is-carl)]

Could you remove the --save-temps from cmake/PreCompile.vala to avoid the warning :

warning: --save-temps has no effect when -C or --ccode is set

[PerfectCarl (name-is-carl)]

1) the regions are not sorted it seems
http://i.imgur.com/2Agg53g.png

2) Some language are not capitalized in the add dialog. Is it on purpose?
http://i.imgur.com/u4bDvI2.png

3) Chinese apprears multiple times
http://i.imgur.com/u4bDvI2.png

[PerfectCarl (name-is-carl)]

About 3) same for English.

4) In the add language dialog, Deutsch is listed and also German, Low (Germany). What is the reason behind it

5) In the add language dialog, some languages are displayed with an additional label in parenthesis, some aren't. What is the reason behind it?

6) In the add language dialog, what is the sorting order?
http://i.imgur.com/rV5aZaQ.png

[PerfectCarl (name-is-carl)]

7) In the add language dialog, there is a string named 'Unspecified'. What does it do?

[PerfectCarl (name-is-carl)]

8) When I add a language (francais on top of the existing English) the language is not displayed in the left list.
Could we add the language so the user can see that their changes are taken into account (and so he got a chance to change the formats before the reboot)

[PerfectCarl (name-is-carl)]

About 8) after having log out/log it and even reboot the computer, the language that I added (francais) is not displayed in the left list (nor has it been used as the system language)

review: Needs Fixing

[Corentin Noël (tintou)]

About 2) This is normal as the language appear in the right locale, for example in french « français » is correct whereas « Français » is incorrect.
About 3) it's a bug that all variants of each languages are shown in this list because it's something that will be selected afterward, but it's not a merge blocker as it's already wrong in trunk.

[Corentin Noël (tintou)]

3) 4) 5) are the same problem, here all variants are listed when it should only show the name of the language (for example it should only show English that would install English (UK), English (US), …)

[Corentin Noël (tintou)]

You also need to show the thousand separator in the example.

[Shawn McTear (syst3mfailur3)]

About 1) Looks like its sorted based on the language code, not the string displayed. "English (United Kindom)" would have the language code of en_GB, which is be correcly between en_CA and en_NZ.

Note: Didn't try this branch or look at code, just an observation based on the screenshot PerfectCarl provided.

[PerfectCarl (name-is-carl)]

@tintou
> About 2) This is normal as the language appear in the right locale, for example in french « français » is correct whereas « Français » is incorrect.

I thought about something along those lines.
But text is usually capitalized in comboboxes (see the power plug for an example).
I guess because each line is considered as a new sentence.

So the rule for the language does not feel consistent.
Maybe a ux guy could get us a confirmation

[lp:~vikoadi/switchboard-plug-locale/new-ui]

74. By Viko Adi Rahmawan on 2014-12-21

enable grouping for number

75. By Viko Adi Rahmawan on 2014-12-21

remove --save-temps

[Danielle Foré (danrabbit)]

Yes let's please capitalize in the comboboxes and add list since in this case we're talking about a title and not just the word in the middle of a sentence.

Also, if there is only one item in a combobox, we should probably make the box insensitive.

[lp:~vikoadi/switchboard-plug-locale/new-ui]

76. By Viko Adi Rahmawan on 2014-12-21

trying sort

77. By Viko Adi Rahmawan on 2014-12-21

more preview strftime format

78. By Viko Adi Rahmawan on 2014-12-21

sort format

[Viko Adi Rahmawan (vikoadi)]

@Carl :
* remove --save-temps - DONE
1. region now sorted - DONE
2, 3, 4, 5, 6, 7, I'm not changing anything related to Add Dialog Popover, I'll take a look in another branch
8. It's actually an installation error which dont give any message dialog, I'll try to look at apt-daemon dbus to see how error is handled.

@Corentin:
* thousand separator - DONE
any idea from where /usr/lib/i386-linux-gnu/switchboard/personal/pantheon-locale/languagelist is generated? All the add dialog string is coming from there.

@Daniel:
* Insensitive Combobox - DONE
* Capitalize - Related to add dialog i mention above.

[Viko Adi Rahmawan (vikoadi)]

> About 1) Looks like its sorted based on the language code, not the string
> displayed. "English (United Kindom)" would have the language code of en_GB,
> which is be correcly between en_CA and en_NZ.
>
> Note: Didn't try this branch or look at code, just an observation based on the
> screenshot PerfectCarl provided.

You're right,
Now sorted

[lp:~vikoadi/switchboard-plug-locale/new-ui]

79. By Viko Adi Rahmawan on 2014-12-21

hide combobox if only have one item

80. By Viko Adi Rahmawan on 2014-12-22

show Message Dialog on installation error

81. By Viko Adi Rahmawan on 2014-12-22

gettexting

82. By Viko Adi Rahmawan on 2014-12-22

no need to simulate

83. By Viko Adi Rahmawan on 2015-01-16

dont use translated string for display (but still searchable)

Unmerged revisions

83. By Viko Adi Rahmawan on 2015-01-16

dont use translated string for display (but still searchable)

82. By Viko Adi Rahmawan on 2014-12-22

no need to simulate

81. By Viko Adi Rahmawan on 2014-12-22

gettexting

80. By Viko Adi Rahmawan on 2014-12-22

show Message Dialog on installation error

79. By Viko Adi Rahmawan on 2014-12-21

hide combobox if only have one item

78. By Viko Adi Rahmawan on 2014-12-21

sort format

77. By Viko Adi Rahmawan on 2014-12-21

more preview strftime format

76. By Viko Adi Rahmawan on 2014-12-21

trying sort

75. By Viko Adi Rahmawan on 2014-12-21

remove --save-temps

74. By Viko Adi Rahmawan on 2014-12-21

enable grouping for number

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2014-06-09 19:13:14 +0000
+++ cmake/ValaPrecompile.cmake	2015-01-16 04:39:50 +0000
@@ -229,7 +229,6 @@
         ${vala_pkg_opts} 
         ${ARGS_OPTIONS} 
         "-g"
-        "--save-temps"
         ${in_files} 
         ${custom_vapi_arguments}
     COMMAND

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-12-13 17:17:47 +0000
+++ src/CMakeLists.txt	2015-01-16 04:39:50 +0000
@@ -18,12 +18,11 @@
     LocaleManager.vala
     Installer/UbuntuInstaller.vala
     Installer/aptd-client.vala
-    Widgets/BaseEntry.vala
-    Widgets/LanguageList.vala
-    Widgets/LanguageEntry.vala
-    Widgets/InstallEntry.vala
+    Widgets/LocaleSetting.vala
+    Widgets/LanguageListBox.vala
     Widgets/InstallPopover.vala
     Widgets/InstallInfoBar.vala
+    Widgets/Preview.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     gtk+-3.0
@@ -34,6 +33,7 @@
     posix
     ibus-1.0
     polkit-gobject-1
+    monetary
 OPTIONS
 	--vapidir=${CMAKE_CURRENT_SOURCE_DIR}/../vapi/
     --thread

=== modified file 'src/Installer/UbuntuInstaller.vala'
--- src/Installer/UbuntuInstaller.vala	2014-12-13 17:32:18 +0000
+++ src/Installer/UbuntuInstaller.vala	2015-01-16 04:39:50 +0000
@@ -93,14 +93,10 @@
 
     public void check_missing_languages () {
         Utils.get_missing_languages.begin ((obj, res) => {
-                try {
-                    missing_packages = Utils.get_missing_languages.end (res);
+            missing_packages = Utils.get_missing_languages.end (res);
 
-                    if (missing_packages != null)
-                        check_missing_finished (missing_packages);
-                } catch (Error e) {
-                    warning ("cant parse missing language:%s", e.message);
-                }
+            if (missing_packages != null)
+                check_missing_finished (missing_packages);
         });
 
     }
@@ -118,7 +114,6 @@
 
         var installed = get_to_remove_packages_for_language (languagecode);
 
-
         aptd.remove_packages.begin (installed, (obj, res) => {
 
             try {
@@ -147,8 +142,22 @@
     void run_transaction (string transaction_id) {
 
         proxy = new AptdTransactionProxy ();
-        proxy.finished.connect (() => {
-            on_apt_finshed (transaction_id, true);
+        proxy.finished.connect ((id, exit_state) => {
+            if (exit_state == "exit-success") {
+                on_apt_finshed (id, true);
+            } else {
+                on_apt_finshed (id, false);
+                if (exit_state != "exit-cancelled") {
+                    var msg = new Gtk.MessageDialog (null,
+                        Gtk.DialogFlags.MODAL,
+                        Gtk.MessageType.WARNING,
+                        Gtk.ButtonsType.OK,
+                        _("Transaction Error with exit state: %s").printf (exit_state));
+                    msg.response.connect ( ()=> {msg.destroy ();});
+                    msg.run ();
+                }
+            }
+
         });
 
         proxy.property_changed.connect ((prop, val) => {
@@ -160,8 +169,6 @@
 
         try {
             proxy.connect_to_aptd (transaction_id);
-            proxy.simulate ();
-
             proxy.run ();
         } catch (Error e) {
             on_apt_finshed (transaction_id, false);
@@ -172,11 +179,6 @@
 
 
     void on_apt_finshed (string id, bool success) {
-        if (!success) {
-            transactions.unset (id);
-            return;
-        }
-
         if (!transactions.has_key (id)) { //transaction already removed
             return;
         }

=== modified file 'src/Installer/aptd-client.vala'
--- src/Installer/aptd-client.vala	2014-12-13 17:17:47 +0000
+++ src/Installer/aptd-client.vala	2015-01-16 04:39:50 +0000
@@ -69,7 +69,7 @@
 
   public class AptdTransactionProxy: GLib.Object
   {
-    public signal void finished (string transaction_id);
+    public signal void finished (string transaction_id, string exit_state);
     public signal void property_changed (string property, Variant variant);
 
     public void connect_to_aptd (string transaction_id) throws IOError
@@ -78,7 +78,7 @@
       _aptd_service.finished.connect ((exit_state) =>
         {
           debug ("aptd transaction finished: %s\n", exit_state);
-          finished (transaction_id);
+          finished (transaction_id, exit_state);
         });
       _aptd_service.property_changed.connect ((prop, variant) => {
           property_changed (prop, variant);

=== modified file 'src/LocaleManager.vala'
--- src/LocaleManager.vala	2014-05-07 12:25:29 +0000
+++ src/LocaleManager.vala	2015-01-16 04:39:50 +0000
@@ -8,9 +8,9 @@
   MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
   PURPOSE. See the GNU General Public License for more details.
   You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
+  with this program. If not, see
 ***/
- 
+
 /*[DBus (name = "org.freedesktop.locale1")]
   public interface LocaleProxy: GLib.Object
   {
@@ -53,7 +53,7 @@
     Gnome.XkbInfo xkbinfo;
 
     public signal void loaded_user (string language, string format, Gee.HashMap<string, string> inputs);
-    
+
     public signal void connected ();
 
     bool is_connected = false;
@@ -77,7 +77,7 @@
             (obj, res) => {
                 try {
                     locale_proxy = Bus.get_proxy.end (res);
-                    
+
                     if (account_proxy != null && locale_proxy != null) {
                         is_connected = true;
                         connected ();
@@ -97,7 +97,7 @@
             (obj, res) => {
                 try {
                     account_proxy = Bus.get_proxy.end (res);
-                    
+
                     if (account_proxy != null && locale1_proxy != null) {
                         is_connected = true;
                         connected ();
@@ -107,7 +107,7 @@
                 } catch (Error e) {
                     warning ("Could not connect to user account");
                 }
-                
+
         });
 
         DBusProxy.create_for_bus.begin (BusType.SYSTEM,
@@ -120,12 +120,12 @@
              (obj, res) => {
                 try {
                     locale1_proxy = DBusProxy.create_for_bus.end (res);
-                 
+
                     if (account_proxy != null && locale1_proxy != null) {
                         is_connected = true;
                         connected ();
                     }
-      
+
                 } catch (Error e) {
                     warning ("Could not connect to locale1 dbus");
                 }
@@ -150,10 +150,10 @@
             while (iter.next ("(ss)", &k, &value)) {
                 map.@set (k, value);
             }
-            
+
 
             loaded_user (language, format, map);
-        
+
     }
 
     void on_settings_changed (string key) {
@@ -186,7 +186,7 @@
 
     /* // leading to segfault, would be my preferred way instead of using raw dbus
     void set_system_language (string language, string? format) {
-        
+
         var list = new Gee.ArrayList<string> ();
 
         list.add ("LANG=%s".printf (language));
@@ -207,7 +207,7 @@
 
     void set_system_language_direct (string language, string? format) {
 
-        VariantBuilder builder = new VariantBuilder (new VariantType ("as") );      
+        VariantBuilder builder = new VariantBuilder (new VariantType ("as") );
         builder.add ("s", "LANG=%s".printf (language));
         if (format != null) {
             builder.add ("s", "LC_TIME=%s".printf (format));
@@ -215,11 +215,10 @@
             builder.add ("s", "LC_MONETARY=%s".printf (format));
             builder.add ("s", "LC_MEASUREMENT=%s".printf (format));
         }
-    
+
         var variant = new Variant ("(asb)", builder, true);
         locale1_proxy.call.begin ("SetLocale", variant, DBusCallFlags.NONE, -1, null);
-        
-        
+
     }
 
     void set_system_input_direct () {
@@ -263,7 +262,7 @@
         debug("Setting user language to %s", language);
 
         try {
-            account_proxy.set_language (language); 
+            account_proxy.set_language (language);
         } catch (Error e) {
             critical (e.message);
         }
@@ -277,7 +276,7 @@
         debug("Setting user format to %s", language);
 
         try {
-            account_proxy.set_formats_locale (language); 
+            account_proxy.set_formats_locale (language);
         } catch (Error e) {
             critical (e.message);
         }
@@ -344,4 +343,4 @@
         }
         return instance;
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2014-12-13 17:32:18 +0000
+++ src/Plug.vala	2015-01-16 04:39:50 +0000
@@ -8,7 +8,7 @@
   MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
   PURPOSE. See the GNU General Public License for more details.
   You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
+  with this program. If not, see
 ***/
 
 namespace LC {
@@ -27,14 +27,17 @@
 
 public class Locale.Plug : Switchboard.Plug {
 
-    LanguageList language_list;
+    LanguageListBox list_box;
+    LocaleSetting locale_setting;
 
+    UbuntuInstaller installer;
     LocaleManager lm;
 
     Gtk.InfoBar infobar;
+    InstallInfoBar install_infobar;
     Gtk.InfoBar missing_lang_infobar;
     Gtk.Grid grid;
-    Gtk.Box top_box;
+    Gtk.Box locale_box;
 
     public Plug () {
 
@@ -43,39 +46,74 @@
                 display_name: _("Region & Language"),
                 description: _("Change your region and language settings"),
                 icon: "preferences-desktop-locale");
-        
+
     }
 
     public override Gtk.Widget get_widget () {
         if (grid == null) {
             grid = new Gtk.Grid ();
 
+            setup_ui ();
+            setup_info ();
+
         }
         return grid;
     }
 
+    void reload () {
+        var langs = Utils.get_installed_languages ();
+        var locales = Utils.get_installed_locales ();
+
+        list_box.reload_languages (langs);
+        locale_setting.reload_languages (langs, locales.to_array ());
+        installer.check_missing_languages ();
+    }
     void setup_info () {
         lm = LocaleManager.get_default ();
 
         lm.connected.connect (() => {
-            language_list.reload_languages();
+            reload ();
+
+            infobar.no_show_all = true;
+            infobar.hide ();
+        });
+
+        installer = new UbuntuInstaller ();
+        installer.install_finished.connect ((langcode) => {
+            reload ();
+            make_sensitive (true);
+        });
+        installer.remove_finished.connect ((langcode) => {
+            reload ();
+            make_sensitive (true);
+        });
+        installer.check_missing_finished.connect ((missing) => {
+            if (missing.length > 0) {
+                missing_lang_infobar.show ();
+                missing_lang_infobar.show_all ();
+            } else {
+                missing_lang_infobar.hide ();
+            }
+        });
+        installer.progress_changed.connect ((progress) => {
+            install_infobar.set_progress (progress);
+            install_infobar.set_cancellable (installer.install_cancellable);
+            install_infobar.set_transaction_mode (installer.transaction_mode);
         });
 
     }
-    
+
     public override void shown () {
-        setup_ui ();
-        setup_info ();
     }
-    
+
     public override void hidden () {
-    
+
     }
-    
+
     public override void search_callback (string location) {
-    
+
     }
-    
+
     // 'search' returns results like ("Keyboard → Behavior → Duration", "keyboard<sep>behavior")
     public override async Gee.TreeMap<string, string> search (string search) {
         return new Gee.TreeMap<string, string> (null, null);
@@ -85,75 +123,19 @@
 
     // Wires up and configures initial UI
     private void setup_ui () {
-        
-        try {
-            var provider = new Gtk.CssProvider();
-            provider.load_from_data ("
-                .rounded-corners {
-                    border-radius: 5px;
-                }
-
-                .insensitve {
-                    color: #ccc;
-                }
-
-                .bg1 {background-color: #444;}
-                .bg2 {background-color: #666;}
-                .bg3 {background-color: #888;}
-                .bg4 {background-color: #aaa;}
-            ", 400);
-
-            Gtk.StyleContext.add_provider_for_screen (grid.get_style_context ().get_screen (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        } catch (Error e) {
-            warning ("Could not set styles");
-        }
-
-        var sw = new Gtk.ScrolledWindow (null, null);
-
-        grid.column_homogeneous = true;
-        grid.row_spacing = 5;
-
-        language_list = new LanguageList ();
-        language_list.valign = Gtk.Align.START;
-        sw.add (language_list);
-
-        var header_entry = new BaseEntry ();
-        header_entry.hexpand = true;
-        header_entry.margin_left = 24;
-        header_entry.margin_right = 24;
-
-        var choose_language_hint = new Gtk.Label (_("Choose your language:"));
-        choose_language_hint.hexpand = true;
-        var choose_format_hint = new Gtk.Label (_("Numbers and dates:"));
-        var choose_input_hint = new Gtk.Label (_("Keyboard input:"));
-
-        choose_language_hint.halign = Gtk.Align.START;
-        choose_format_hint.halign = Gtk.Align.START;
-        choose_input_hint.halign = Gtk.Align.START;
-
-        header_entry.left_grid.attach (choose_language_hint, 0, 0, 1, 1);
-        header_entry.right_grid.attach (choose_format_hint, 0, 0, 1, 1);
-        header_entry.right_grid.attach (choose_input_hint, 1, 0, 1, 1);
-        var spacer = new Gtk.Image.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.MENU);
-        spacer.set_opacity (0);
-        header_entry.settings_grid.add (spacer);
 
         infobar = new Gtk.InfoBar ();
         infobar.message_type = Gtk.MessageType.INFO;
         infobar.no_show_all = true;
+        infobar.hide ();
         var content = infobar.get_content_area () as Gtk.Container;
         var label = new Gtk.Label (_("Some changes will not take effect until you log out"));
         content.add (label);
 
-        language_list.settings_changed.connect (() => {
-            infobar.no_show_all = false;
-            infobar.show_all ();
-        });
-
-        var install_infobar = new InstallInfoBar ();
-        install_infobar.hide ();
+        install_infobar = new InstallInfoBar ();
+        install_infobar.no_show_all = true;
         install_infobar.cancel_clicked.connect (() => {
-            language_list.cancel_install ();
+            installer.cancel_install ();
         });
 
         missing_lang_infobar = new Gtk.InfoBar ();
@@ -167,69 +149,93 @@
         install_missing.clicked.connect (() => {
             missing_lang_infobar.hide ();
 
-            language_list.install_missing_languages ();
-        });
-        language_list.check_missing_finished.connect ((missing) => {
-            if (missing.length > 0) {
-                missing_lang_infobar.show ();
-                missing_lang_infobar.show_all ();
-            } else {
-                missing_lang_infobar.hide ();
-            }
+            installer.install_missing_languages ();
         });
 
         missing_content.pack_start (missing_label, false);
         missing_content.pack_end (install_missing, false);
 
-        language_list.settings_changed.connect (() => {
+        list_box = new LanguageListBox ();
+
+        locale_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+        var scroll = new Gtk.ScrolledWindow (null, null);
+        scroll.shadow_type = Gtk.ShadowType.IN;
+        scroll.add (list_box);
+        scroll.expand = true;
+        locale_box.pack_start (scroll, true, true);
+
+        var add_button = new Gtk.ToolButton (null, "add");
+        add_button.set_icon_name ("list-add-symbolic");
+        add_button.set_tooltip_text (_("Add…"));
+        add_button.clicked.connect (() => {
+            var popover = new InstallPopover (add_button);
+            popover.show_all ();
+            popover.language_selected.connect (on_install_language);
+        });
+
+
+        var remove_button = new Gtk.ToolButton (null, "remove");
+        remove_button.set_icon_name ("list-remove-symbolic");
+        remove_button.set_tooltip_text (_("Remove"));
+        remove_button.clicked.connect (() => {
+            make_sensitive (false);
+            installer.remove (list_box.get_selected_language_code ());
+        });
+
+        var tbar = new Gtk.Toolbar ();
+        tbar.set_style (Gtk.ToolbarStyle.ICONS);
+        tbar.set_icon_size (Gtk.IconSize.SMALL_TOOLBAR);
+        tbar.set_show_arrow (false);
+        tbar.hexpand = true;
+        tbar.insert (add_button, -1);
+        tbar.insert (remove_button, -1);
+
+        scroll.get_style_context().set_junction_sides(Gtk.JunctionSides.BOTTOM);
+        tbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+        tbar.get_style_context().set_junction_sides(Gtk.JunctionSides.TOP);
+
+        locale_setting = new LocaleSetting ();
+        locale_setting.margin_top = 50;
+        locale_setting.hexpand = true;
+        locale_setting.settings_changed.connect (() => {
             infobar.no_show_all = false;
             infobar.show_all ();
         });
-        language_list.progress_changed.connect((progress) => {
-            install_infobar.set_progress (progress);
-            install_infobar.set_cancellable (language_list.install_cancellable);
-            install_infobar.set_transaction_mode (language_list.get_transaction_mode ());
+
+        locale_box.pack_start (tbar, false, false);
+
+        var keyboard_link = new Gtk.LinkButton.with_label ("", _("Keyboard layout settings…"));
+        keyboard_link.margin = 10;
+        keyboard_link.halign = Gtk.Align.END;
+        keyboard_link.valign = Gtk.Align.END;
+        keyboard_link.activate_link.connect (() => {
+            var command = new Granite.Services.SimpleCommand (
+                        Environment.get_home_dir (),
+                        "/usr/bin/switchboard -o hardware-pantheon-keyboard");
+            command.run ();
+            return true;
         });
 
-        try {
-
-            var permission = new Polkit.Permission.sync ("org.freedesktop.locale1.set-locale", Polkit.UnixProcess.new (Posix.getpid ()));
-            var apply_button = new Gtk.LockButton (permission);
-
-            apply_button.label = _("Apply for login screen, guest account and new users");
-            apply_button.halign = Gtk.Align.CENTER;
-            apply_button.margin = 12;
-            grid.attach (apply_button, 0, 6, 4, 1);
-
-            permission.notify["allowed"].connect (() => {
-                if (permission.allowed) {
-                    on_applied_to_system();
-                    permission.impl_update (false, true, true);
-                }
-            });
-
-        } catch (Error e) {
-                critical (e.message);
-        }
-
-
-        sw.show ();
-        header_entry.show_all ();
-
-        grid.attach (infobar, 0, 0, 4, 1);
-        grid.attach (missing_lang_infobar, 0, 1, 4, 1);
-        grid.attach (install_infobar, 0, 2, 4, 1);
-        grid.attach (header_entry, 0, 3, 4, 1);
-        grid.attach (top_box, 0, 4, 4, 1);
-        grid.attach (sw, 0, 5, 4, 1);
-        grid.show ();
-
-    }
-
-    void on_applied_to_system () {
-        lm.apply_user_to_system ();
-        infobar.no_show_all = false;
-        infobar.show_all ();
+        grid.attach (infobar, 0, 0, 3, 1);
+        grid.attach (missing_lang_infobar, 0, 1, 3, 1);
+        grid.attach (install_infobar, 0, 2, 3, 1);
+        grid.attach (locale_box, 0, 3, 1, 2);
+        grid.attach (locale_setting, 1, 3, 2, 1);
+        grid.attach (keyboard_link, 2, 4, 1, 1);
+
+        locale_box.show_all ();
+        grid.show_all ();
+        missing_lang_infobar.hide ();
+    }
+
+    void on_install_language (string language) {
+        make_sensitive (false);
+        installer.install (language);
+    }
+
+    void make_sensitive (bool sensitive ) {
+        locale_box.set_sensitive (sensitive);
+        locale_setting.set_sensitive (sensitive);
     }
 }
 

=== removed file 'src/Widgets/BaseEntry.vala'
--- src/Widgets/BaseEntry.vala	2014-11-15 20:22:28 +0000
+++ src/Widgets/BaseEntry.vala	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/***
-  Copyright (C) 2011-2012 Switchboard Locale Plug Developers
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-
-public class BaseEntry : Gtk.ListBoxRow {
-
-    public bool selected = false;
-    public string locale {get; set;}
-    public string region = "";
-    public string country = "";
-
-    public Gtk.Grid left_grid;
-    public Gtk.Grid right_grid;
-    public Gtk.Box settings_grid;
-
-    public BaseEntry () {
-
-        var box = new Gtk.Grid ();
-        //box.column_homogeneous = true;
-        box.margin = 10;
-        box.column_spacing = 5;
-        
-        var inner_grid = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
-        inner_grid.homogeneous = true;
-
-        left_grid = new Gtk.Grid ();
-        inner_grid.pack_start (left_grid, true, true);
-
-        right_grid = new Gtk.Grid ();
-        right_grid.column_homogeneous = true;
-        right_grid.column_spacing = 5;
-        inner_grid.pack_start (right_grid, true, true);
-
-        box.attach (inner_grid, 0, 0, 1, 1);
-
-        settings_grid = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 5);
-        settings_grid.halign = Gtk.Align.END;
-
-        box.attach (settings_grid, 1, 0, 1, 1);
-        add (box);
-
-        box.show_all ();
-
-    }
-}

=== removed file 'src/Widgets/InstallEntry.vala'
--- src/Widgets/InstallEntry.vala	2014-12-13 18:42:10 +0000
+++ src/Widgets/InstallEntry.vala	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/***
-  Copyright (C) 2011-2012 Switchboard Locale Plug Developers
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-
-public class InstallEntry : BaseEntry {
-
-
-    public Gtk.Label label;
-
-    Gtk.Spinner spinner;
-    Gtk.Image image;
-
-    private const string STYLE = """
-
-        GtkListBoxRow.list-row {
-            background-image: none;
-            background-color: #fff;
-            border-radius: 5px;
-            border: 1px solid #ccc;
-        }
-
-    """;
-
-    public InstallEntry () {
-
-        var css_provider = new Gtk.CssProvider ();
-        try {
-            css_provider.load_from_data (STYLE, STYLE.length);
-        } catch (Error e) {
-            warning ("loading css: %s", e.message);
-        }          
-        get_style_context ().add_provider (css_provider, -1);
-
-        locale = "zz_ZZ";
-        region = "zz";
-        country = "ZZ";
-
-        spinner = new Gtk.Spinner ();
-        spinner.margin_end = 3;
-
-        image = new Gtk.Image.from_icon_name ("browser-download", Gtk.IconSize.BUTTON);
-        image.halign = Gtk.Align.START;
-        image.valign = Gtk.Align.START;
-        image.margin_end = 3;
-        left_grid.attach (spinner, 0, 0, 1, 1);
-        left_grid.attach (image, 0, 0, 1, 1);
-
-        label = new Gtk.Label (_("Install more languages…"));
-        label.halign = Gtk.Align.START;
-
-        left_grid.attach (label, 1, 0, 2, 1);
-
-        show_all ();
-        spinner.hide ();
-    }
-
-    public void install_started () {
-
-        start_spinner ();
-    }
-
-
-    public void install_complete () {
-
-        stop_spinner ();
-    }
-
-
-    void start_spinner () {
-
-        spinner.show ();
-        image.hide ();
-        spinner.start ();
-
-    }
-
-    void stop_spinner () {
-
-        spinner.stop ();
-        image.show ();
-        spinner.hide ();
-
-    }
-
-}

=== modified file 'src/Widgets/InstallInfoBar.vala'
--- src/Widgets/InstallInfoBar.vala	2014-12-14 05:11:57 +0000
+++ src/Widgets/InstallInfoBar.vala	2015-01-16 04:39:50 +0000
@@ -44,7 +44,7 @@
         box.pack_end (cancel_button, false);
         box.pack_end (progress, false);
 
-        show_all ();
+        box.show_all ();
     }
 
     public void set_transaction_mode (UbuntuInstaller.TransactionMode transaction_mode) {

=== modified file 'src/Widgets/InstallPopover.vala'
--- src/Widgets/InstallPopover.vala	2014-11-15 18:07:42 +0000
+++ src/Widgets/InstallPopover.vala	2015-01-16 04:39:50 +0000
@@ -126,8 +126,8 @@
         language_label = new Gtk.Label (language);
         language_label.halign = Gtk.Align.START;
         language_label.margin = 5;
-        language_label.set_markup ("<b>%s</b>".printf(translated_lang));
-        //warning ("Language: %s Translated: %s", language, );
+        language_label.set_markup ("<b>%s</b>".printf(language));
+        //warning ("Language: %s Translated: %s", language, translated_lang);
         add (language_label);
     }
 }

=== removed file 'src/Widgets/LanguageEntry.vala'
--- src/Widgets/LanguageEntry.vala	2014-12-13 18:42:10 +0000
+++ src/Widgets/LanguageEntry.vala	1970-01-01 00:00:00 +0000
@@ -1,362 +0,0 @@
-/***
-  Copyright (C) 2011-2012 Switchboard Locale Plug Developers
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-
-public enum UpdateType {
-    LANGUAGE,
-    FORMAT,
-    INPUT;
-}
-
-public class LanguageEntry : BaseEntry {
-
-    public Gtk.Button delete_button;
-
-    public signal void set_region (string region);
-
-    public signal void language_changed (UpdateType type, string locale);
-    public signal void input_changed (string langcode, string region, bool added);
-    public signal void deletion_requested (string region);
-
-    // language selecetion
-    public Gtk.RadioButton check_button;
-    Gtk.Label region_label;
-    Gtk.ComboBox country_combobox;
-
-    // region selection
-    public Gtk.RadioButton format_checkbutton;
-    Gtk.ComboBox format_combobox;
-    Gtk.ListStore format_store;
-
-    // input selection
-    public Gtk.CheckButton input_checkbutton;
-    Gtk.ComboBox input_combobox;
-    Gtk.ListStore input_store;
-
-    Gtk.Image delete_image;
-
-    Gtk.ListStore list_store;
-
-    bool update_lock = false;
-
-    Gtk.TreeIter iter;
-
-    Gee.HashMap<string, int> regionbox_map = new Gee.HashMap<string, int> ();
-    Gee.HashMap<string, int> formatbox_map = new Gee.HashMap<string, int> ();
-    Gee.HashMap<string, int> inputbox_map = new Gee.HashMap<string, int> ();
-
-    public string langcode;
-
-    private const string STYLE = """
-
-        GtkListBoxRow.list-row {
-            background-image: none;
-            background-color: #fff;
-            border-radius: 5px;
-            border: 1px solid #ccc;
-        }
-
-    """;
-
-    public LanguageEntry (string _locale, LanguageList? list = null) {
-
-        var css_provider = new Gtk.CssProvider ();
-        try {
-            css_provider.load_from_data (STYLE, STYLE.length);
-        } catch (Error e) {
-            warning ("loading css: %s", e.message);
-        }          
-        get_style_context ().add_provider (css_provider, -1);
-        margin_bottom = 5;
-
-        locale = _locale;
-        langcode = locale.substring (0, 2);
-
-        country = Gnome.Languages.get_country_from_locale (locale, null);
-        region = Gnome.Languages.get_language_from_code (langcode, null);
-
-        format_store = new Gtk.ListStore (2, typeof (string), typeof (string));
-        input_store = new Gtk.ListStore (2, typeof (string), typeof (string));
-        list_store = new Gtk.ListStore (2, typeof (string), typeof (string));
-
-        Gtk.CellRendererText value_renderer = new Gtk.CellRendererText ();
-        value_renderer.ellipsize = Pango.EllipsizeMode.END;
-        value_renderer.max_width_chars = 25;
-
-        reload_input ();
-
-        /*
-         * Language (translation)
-         */
-
-        check_button = new Gtk.RadioButton.from_widget (list.language_button);
-        check_button.toggled.connect (on_language_activated);
-        check_button.set_active (false);
-
-        region_label = new Gtk.Label (region);
-        region_label.halign = Gtk.Align.START;
-        region_label.set_markup ("<b>%s</b>".printf(region_label.label));
-
-        country_combobox = new Gtk.ComboBox.with_model (list_store);
-        country_combobox.changed.connect (on_language_changed);
-        country_combobox.width_request = 50;
-        country_combobox.halign = Gtk.Align.END;
-        country_combobox.hexpand = true;
-        country_combobox.pack_start (value_renderer, true);
-        country_combobox.add_attribute (value_renderer, "text", 0);
-
-        /*
-         * Regional format (date, currency, …)
-         */
-
-        format_checkbutton = new Gtk.RadioButton.from_widget (list.format_button);
-        format_checkbutton.toggled.connect (on_format_activated);
-
-        format_combobox = new Gtk.ComboBox.with_model (format_store);
-        format_combobox.changed.connect (on_format_changed);
-        format_combobox.pack_start (value_renderer, true);
-        format_combobox.add_attribute (value_renderer, "text", 0);
-
-        var format_grid = new Gtk.Grid ();
-        format_grid.attach (format_checkbutton, 0, 0, 1, 1);
-        format_grid.attach (format_combobox, 1, 0, 1, 1);
-
-        /*
-         * Input language (Keyboard layout)
-         */
-
-        input_checkbutton = new Gtk.CheckButton ();
-        input_checkbutton.toggled.connect (() => {
-            on_input_changed ();
-        });
-
-        input_combobox = new Gtk.ComboBox.with_model (input_store);
-        input_combobox.changed.connect (on_input_changed);
-        input_combobox.pack_start (value_renderer, true);
-        input_combobox.add_attribute (value_renderer, "text", 0);
-        input_combobox.hexpand = true;
-
-        var input_grid = new Gtk.Grid ();
-        input_grid.attach (input_checkbutton, 0, 0, 1, 1);
-        input_grid.attach (input_combobox, 1, 0, 1, 1);
-
-
-        //left_grid.attach (country_grid, 0, 0, 1, 1);
-        left_grid.attach (check_button, 0, 0, 1, 1);
-        left_grid.attach (region_label, 1, 0, 1, 1);
-        left_grid.attach (country_combobox, 2, 0, 1, 1);
-
-        right_grid.attach (format_grid, 0, 0, 1, 1);
-        right_grid.attach (input_grid, 1, 0, 1, 1);
-
-        delete_image = new Gtk.Image.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.MENU);
-
-        delete_button = new Gtk.ToggleButton();
-        delete_button.set_image (delete_image);
-        delete_button.sensitive = true;
-        delete_button.clicked.connect (() => {
-            deletion_requested (locale);
-        });
-
-        settings_grid.pack_start (delete_button);
-        
-        add_language (locale);
-
-        show_all ();
-    }
-
-    void reload_input () {
-        var xkb = new Gnome.XkbInfo ();
-        var input_sources = xkb.get_layouts_for_language (langcode);
-
-        foreach (var input in input_sources) {
-            string display_name;
-            string short_name;
-            string xkb_layout;
-            string xkb_variant;
-
-            xkb.get_layout_info (input, out display_name, out short_name, out xkb_layout, out xkb_variant);
-            
-            if (xkb_layout == "us" && langcode != "en") {
-                // skip english international
-                continue;
-            }
-
-            var xkb_string = xkb_layout;
-            if (xkb_variant != "")
-                xkb_string += "+"+xkb_variant;
-            
-            input_store.append (out iter);
-            input_store.set (iter, 0, display_name, 1, xkb_string);
-
-            inputbox_map.@set (xkb_string, inputbox_map.size);
-        }
-    }
-
-    public void set_display_region (string locale) {
-
-        update_lock = true;
-
-        if (regionbox_map.has_key (locale)) {
-            country_combobox.active = regionbox_map.@get (locale);
-            check_button.active = true;
-        }
-
-        update_lock = false;
-        
-    }
-
-    public void set_display_format (string locale) {
-
-        update_lock = true;
-
-        format_combobox.active = formatbox_map.@get (locale);
-        format_checkbutton.active = true;
-
-        update_lock = false;
-
-    }
-
-    public void set_display_input (string input) {
-        
-        update_lock = true;
-
-        if (inputbox_map.has_key (input)) {
-            var number = inputbox_map.@get (input);
-            input_combobox.active = number;
-            input_checkbutton.active = true;
-        }
-        
-        update_lock = false;
-        
-    }
-
-    void on_language_activated () {
-        
-        if (update_lock) 
-            return;
-
-        Value lang;
-
-        country_combobox.get_active_iter (out iter);
-
-        list_store.get_value (iter, 1, out lang);
-
-        language_changed (UpdateType.LANGUAGE, lang.get_string ());
-
-    }
-
-    void on_format_activated () {
-
-        if (update_lock) 
-            return;
-
-        Value format;
-
-        format_combobox.get_active_iter (out iter);
-        format_store.get_value (iter, 1, out format);
-        message ("%s", format.get_string ());
-        language_changed (UpdateType.FORMAT, format.get_string ());
-
-    }
-
-    void on_input_activated (bool? changed = false) {
-        if (update_lock) 
-            return;
-
-        Value xkb_string;
-
-        input_combobox.get_active_iter (out iter);
-        input_store.get_value (iter, 1, out xkb_string);
-
-        input_changed (langcode, xkb_string.get_string (), changed);
-
-    }
-
-    void on_language_changed () {
-        if (!check_button.active)
-            return;
-
-        on_language_activated ();
-
-    }
-
-    void on_format_changed () {
-        if (!format_checkbutton.active)
-            return;
-
-        on_format_activated ();
-    }
-
-    void on_input_changed () {
-        if (!input_checkbutton.active) {
-            on_input_activated (false);
-            return;
-        }
-
-        on_input_activated (true);
-    }
-
-
-    public void add_language (string locale) {
-
-        string language = "";
-        string country = "";
-
-        if (locale.length == 2)  {// only lancode
-            language = Gnome.Languages.get_language_from_code (locale, null);
-            country = Gnome.Languages.get_country_from_code (locale, null);
-        } else if (locale.length == 5) {// full locale
-            language = Gnome.Languages.get_language_from_locale (locale, null);
-            country = Gnome.Languages.get_country_from_locale (locale, null);
-        }
-
-        if (country == null)
-            country = language;
-
-
-        list_store.append (out iter);
-        regionbox_map.@set (locale, regionbox_map.size);
-        list_store.set (iter, 0, country, 1, locale);
-
-        
-        country_combobox.active = 0;
-        input_combobox.active = 0;
-    }
-
-    public void add_locale (string locale) {
-        var country = Gnome.Languages.get_country_from_locale (locale, null);
-
-        var country_short = country.replace ("(%s)".printf (region), "");
-        if (country != null) {
-            format_store.append (out iter);
-            formatbox_map.@set (locale, formatbox_map.size);
-            format_store.set (iter, 0, country_short, 1, locale);
-
-            format_combobox.show ();
-            format_checkbutton.show ();
-        }
-
-        format_combobox.active = 0;
-    }
-
-    public void hide_delete () {
-
-        delete_image.set_opacity (0);
-
-    }
-
-    public void show_delete () {
-
-        delete_image.set_opacity (1);
-    }
-}

=== removed file 'src/Widgets/LanguageList.vala'
--- src/Widgets/LanguageList.vala	2014-12-16 17:40:58 +0000
+++ src/Widgets/LanguageList.vala	1970-01-01 00:00:00 +0000
@@ -1,349 +0,0 @@
-/***
-  Copyright (C) 2011-2012 Switchboard Locale Plug Developers
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-  PURPOSE. See the GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License along
-  with this program. If not, see 
-***/
-
-public class LanguageList : Gtk.ListBox {
-
-	public signal void settings_changed ();
-	public signal void check_missing_finished (string [] missing);
-	public signal void progress_changed (int progress);
-
-    InstallPopover language_popover;
-    InstallEntry install_entry;
-
-    UbuntuInstaller li;
-
-    public bool install_cancellable {
-        get {return li.install_cancellable;}
-    }
-
-    public Gtk.RadioButton language_button = new Gtk.RadioButton (null);
-    public Gtk.RadioButton format_button = new Gtk.RadioButton (null);
-
-    LocaleManager lm;
-
-    Gee.HashMap<string, LanguageEntry> languages;
-    Gee.HashMap<string, string?> input_sources;
-
-    private const string STYLE = """
-
-        GtkListBox {
-            background-color: transparent;
-        }
-
-    """;
-
-    public LanguageList () {
-
-        var css_provider = new Gtk.CssProvider ();
-        try {
-            css_provider.load_from_data (STYLE, STYLE.length);
-        } catch (Error e) {
-            warning ("loading css: %s", e.message);
-        }  
-        get_style_context ().add_provider (css_provider, -1);
-
-        valign = Gtk.Align.START;
-        vexpand = true;
-        hexpand = true;
-        margin_start = 24;
-        margin_end = 24;
-
-        set_activate_on_single_click(true);
-        set_sort_func (sort_func);
-        set_selection_mode (Gtk.SelectionMode.NONE);
-        //set_header_func (header_func);
-        set_filter_func (filter_func);
-
-        languages = new Gee.HashMap<string, LanguageEntry> ();
-        input_sources = new Gee.HashMap<string, string?> ();
-
-        li = new UbuntuInstaller ();
-        li.install_finished.connect (on_install_finished);
-        li.remove_finished.connect (on_remove_finished);
-        li.check_missing_languages ();
-        li.check_missing_finished.connect (on_check_missing_finished);
-        li.progress_changed.connect ((progress) => {
-            progress_changed (progress);
-        });
-        
-        lm = LocaleManager.get_default ();
-        
-        install_entry = new InstallEntry();
-        language_popover = new InstallPopover (install_entry.label);
-        language_popover.language_selected.connect (on_install_language);
-
-        add (install_entry);
-
-        show ();
-  
-    }
-
-    bool update_lock = true;
-
-    public void reload_languages () {
-
-        var langs = Utils.get_installed_languages ();
-        foreach (var lang in langs) {
-            add_language (lang);
-        }
-
-        var locales = Utils.get_installed_locales ();
-        foreach (var locale in locales) {
-            add_locale (locale);
-        }
-
-        li.check_missing_languages ();
-
-        requery_display ();
-
-    }
-
-    void requery_display () {
-
-        var lang = lm.get_user_language ();
-        var region = lm.get_user_format ();
-        var inputs = lm.get_user_inputmaps ();
-
-        update_lock = true;
-
-        select_language (lang);
-        select_format (region);
-        select_inputs (inputs);
-
-        update_lock = false;
-
-    }
-
-    /*
-     * update selections
-     */
-
-    void select_language (string language) {
-
-        var lang = languages.get (language[0:2]);
-        lang.set_display_region (language);
-
-    }
-
-    void select_format (string locale) {
-
-        var lang = languages.get (locale[0:2]);
-        lang.set_display_format(locale[0:5]);
-
-    }
-
-    void select_inputs (Gee.HashMap<string, string> map) {
-        
-        map.@foreach ((entry) => {
-            input_sources.@set (entry.key, entry.value);
-            var lang = languages.get (entry.key);
-            lang.set_display_input (entry.value);
-            return true;
-        });
-
-    }
-
-    void on_install_language (string lang) {
-        
-        li.install (lang);
-        install_entry.install_started ();
-        
-    }
-
-    void on_install_finished (string language) {
-        
-        reload_languages ();
-        install_entry.install_complete ();
-
-        li.check_missing_languages ();
-
-    }
-
-    void on_deletion_requested (string locale) {
-        
-        li.remove (locale);
-
-    }
-
-    void on_remove_finished (string langcode) {
-        
-        var widget = languages.@get (langcode);
-        remove (widget);
-        languages.unset (langcode);
-
-        if (languages.size == 1) {
-            languages.@foreach ((entry) => {
-                entry.value.hide_delete ();
-                return true;
-            });
-        }
-
-    }
-
-    void on_check_missing_finished (string [] missing) {
-        this.set_sensitive (true);
-        check_missing_finished (missing);
-    }
-
-    public void cancel_install () {
-        li.cancel_install ();
-        check_missing_languages ();
-    }
-
-    public UbuntuInstaller.TransactionMode get_transaction_mode () {
-        return li.transaction_mode;
-    }
-
-    public void add_language(string locale) {
-
-        var langcode = locale.substring (0, 2);
-
-        if (languages.has_key (langcode)) {
-            var entry = languages.@get (langcode);
-            entry.add_language (locale);
-
-            return;
-        }
-
-        var l_entry = new LanguageEntry(locale, this);
-
-        languages.@set (langcode, l_entry);
-
-        l_entry.language_changed.connect (on_language_changed);
-        l_entry.input_changed.connect (on_input_changed);
-        l_entry.deletion_requested.connect (on_deletion_requested);
-
-        add (l_entry);
-        l_entry.show ();
-
-
-        // update visibility of delete button
-        if (languages.size == 1) {
-            languages.@foreach ((entry) => {
-                entry.value.hide_delete ();
-                return true;
-            });
-        } else {
-            languages.@foreach ((entry) => {
-                entry.value.show_delete ();
-                return true;
-            });
-        }
-        
-    }
-
-    public void add_locale (string locale) {
-        var langcode = locale.substring (0, 2);
-
-        if (languages.has_key (langcode)) {
-            var entry = languages.@get (langcode);
-            entry.add_locale (locale);
-
-            return;
-        } else {
-            warning ("Found locale without corresponding language pack");
-        }
-    }
-
-    public void check_missing_languages () {
-        li.check_missing_languages ();
-    }
-
-    public void install_missing_languages (){
-        this.set_sensitive (false);
-        li.install_missing_languages ();
-    }
-
-    void on_language_changed (UpdateType type, string lang) {
-        if (update_lock) 
-            return;
-
-        switch (type) {
-            case UpdateType.LANGUAGE:
-                lm.set_user_language (lang);
-                break;
-            case UpdateType.FORMAT:
-                lm.set_user_format (lang+".UTF-8");
-                break;
-        }
-
-        settings_changed ();
-        
-    }
-
-
-    void on_input_changed (string langcode, string inputcode, bool added) {
-        
-        if (update_lock)
-            return;
-
-        if (!added) {
-            input_sources.@unset (langcode);
-        } else {
-            input_sources.@set (langcode, inputcode);
-        }
-
-        VariantBuilder builder2 = new VariantBuilder (new VariantType ("a(ss)") );      
-        VariantBuilder builder = new VariantBuilder (new VariantType ("a(ss)") );       
-        input_sources.@foreach((entry) => {
-            message ("('%s', '%s')", "xkb", entry.value);
-            builder2.add ("(ss)", entry.key, entry.value);
-            builder.add ("(ss)", "xkb", entry.value);
-            return true;
-        }); 
-
-        lm.set_input_language (builder.end (), builder2.end ());
-   
-    }
-
-    /*
-     * Gtk.ListBox functions
-     */
-
-    public override void row_activated (Gtk.ListBoxRow row) {
-
-        if (row is InstallEntry) {
-            language_popover.show_all ();
-        } else {
-            var locale = row as LanguageEntry;
-            locale.check_button.set_active (true);
-        }
-
-    }
-
-    int sort_func (Gtk.ListBoxRow row1, Gtk.ListBoxRow row2) {
-        
-        var first = row1 as BaseEntry;
-        var second = row2 as BaseEntry;
-
-        var string1 = first.region + " " + first.country;
-        var string2 = second.region + " " + second.country;
-        var diff = (int) (string1.collate (string2) );
-        return diff;
-
-    }
-
-    /*void header_func (Gtk.ListBoxRow? row, Gtk.ListBoxRow? before) {
-        
-        if (before != null) {
-            row.set_header (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
-        }
-
-    }*/
-
-    bool filter_func (Gtk.ListBoxRow row) {
-
-        return true;
-
-    }
-}

=== added file 'src/Widgets/LanguageListBox.vala'
--- src/Widgets/LanguageListBox.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/LanguageListBox.vala	2015-01-16 04:39:50 +0000
@@ -0,0 +1,49 @@
+public class LanguageListBox : Gtk.ListBox {
+    Gee.HashMap <string, LanguageRow> languages;
+    public LanguageListBox () {
+        languages = new Gee.HashMap <string, LanguageRow> ();
+    }
+    public void reload_languages (string[] langs) {
+        //clear hashmap and this listbox
+        languages.clear ();
+        this.foreach ((item) => {
+            this.remove (item);
+        });
+
+        foreach (var lang in langs) {
+            add_language (lang);
+        }
+
+        var first_row = get_row_at_index (0);
+        select_row (first_row);
+
+        show_all ();
+    }
+    void add_language (string locale) {
+        var code = locale.substring (0, 2);
+        if (!languages.has_key (code)) {
+            var country = Gnome.Languages.get_language_from_code (locale, null);
+            var label = new LanguageRow (code, country);
+            languages.set (code, label);
+            add (label);
+        }
+    }
+    public string? get_selected_language_code () {
+        var selected_row = get_selected_row () as LanguageRow;
+        if (selected_row != null)
+            return selected_row.code;
+        else
+            return null;
+    }
+    private class LanguageRow : Gtk.ListBoxRow {
+        public string code;
+        Gtk.Label label;
+        public LanguageRow (string code, string text) {
+            this.code = code;
+            label = new Gtk.Label (text);
+            label.halign = Gtk.Align.START;
+            label.margin = 10;
+            this.add (label);
+        }
+    }
+}

=== added file 'src/Widgets/LocaleSetting.vala'
--- src/Widgets/LocaleSetting.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/LocaleSetting.vala	2015-01-16 04:39:50 +0000
@@ -0,0 +1,249 @@
+/***
+  Copyright (C) 2011-2012 Switchboard Locale Plug Developers
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License version 3, as published
+  by the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+  PURPOSE. See the GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License along
+  with this program. If not, see 
+***/
+
+public class LocaleSetting : Gtk.Grid {
+    Gtk.ComboBox language_combobox;
+    Gtk.ComboBox region_combobox;
+    Gtk.ComboBox format_combobox;
+
+    Gtk.ListStore language_store;
+    Gtk.ListStore region_store;
+    Gtk.ListStore format_store;
+
+    LocaleManager lm;
+    Preview preview;
+
+    string[] langs;
+    string[] locales;
+
+    public signal void settings_changed ();
+
+    public LocaleSetting () {
+        this.column_homogeneous = false;
+        this.margin = 20;
+        this.row_spacing = 10;
+        this.column_spacing = 10;
+        this.halign = Gtk.Align.CENTER;
+
+        lm = LocaleManager.get_default ();
+
+        language_store = new Gtk.ListStore (2, typeof (string), typeof (string));
+        region_store = new Gtk.ListStore (2, typeof (string), typeof (string));
+        format_store = new Gtk.ListStore (2, typeof (string), typeof (string));
+
+        region_store.set_sort_column_id (0, Gtk.SortType.ASCENDING);
+        format_store.set_sort_column_id (0, Gtk.SortType.ASCENDING);
+        format_store.set_sort_func (0, format_compare_func);
+
+        language_combobox = new Gtk.ComboBox.with_model (language_store);
+        region_combobox = new Gtk.ComboBox.with_model (region_store);
+        format_combobox = new Gtk.ComboBox.with_model (format_store);
+
+        Gtk.CellRendererText renderer = new Gtk.CellRendererText ();
+
+        language_combobox.pack_start (renderer, true);
+        language_combobox.add_attribute (renderer, "text", 0);
+        language_combobox.changed.connect (on_language_changed);
+        language_combobox.active = 0;
+
+        region_combobox.pack_start (renderer, true);
+        region_combobox.add_attribute (renderer, "text", 0);
+        region_combobox.changed.connect (on_region_changed);
+        region_combobox.active = 0;
+
+        format_combobox.pack_start (renderer, true);
+        format_combobox.add_attribute (renderer, "text", 0);
+        format_combobox.changed.connect (on_format_changed);
+        format_combobox.active = 0;
+
+        preview = new Preview ();
+
+        attach (create_end_label (_("Language: ")), 0, 0, 1, 1);
+        attach (language_combobox,1, 0, 1, 1);
+        attach (create_end_label (_("Region: ")), 0, 2, 1, 1);
+        attach (region_combobox, 1, 2, 1, 1);
+        attach (create_end_label (_("Formats: ")), 0, 3, 1, 1);
+        attach (format_combobox, 1, 3, 1, 1);
+        attach (preview, 0, 4, 2, 1);
+
+
+        try {
+            var permission = new Polkit.Permission.sync ("org.freedesktop.locale1.set-locale", Polkit.UnixProcess.new (Posix.getpid ()));
+
+            var apply_button = new Gtk.LockButton (permission);
+            apply_button.label = _("Apply to entire system");
+            apply_button.tooltip_lock = _("Apply for login screen, guest account and new users");
+            apply_button.tooltip_unlock = _("Apply for login screen, guest account and new users");
+            apply_button.halign = Gtk.Align.START;
+            attach (apply_button, 1, 5, 1, 1);
+
+            permission.notify["allowed"].connect (() => {
+                if (permission.allowed) {
+                    on_applied_to_system();
+                    permission.impl_update (false, true, true);
+                }
+            });
+
+        } catch (Error e) {
+                critical (e.message);
+        }
+
+        this.show_all ();
+    }
+
+    void on_language_changed () {
+        // populate region
+        region_store.clear ();
+        Gtk.TreeIter iter;
+
+        var user_language = lm.get_user_language ();
+        int selected_language = 0;
+        string lang_code;
+
+        if (!language_combobox.get_active_iter (out iter))
+            return;
+        language_store.get (iter, 1, out lang_code);
+
+        var i = 0;
+        foreach (string lang in this.langs) {
+            if (lang.has_prefix (lang_code)) {
+                var language = Gnome.Languages.get_language_from_locale (lang, null);
+
+                if (language == "")
+                    break;
+
+                region_store.append (out iter);
+                region_store.set (iter, 0, language, 1, lang);
+
+                if (user_language == lang)
+                    selected_language = i;
+                i++;
+            }
+        }
+
+        region_combobox.sensitive = i != 1; // set to unsensitive if only have one item
+        region_combobox.active = selected_language;
+    }
+    void on_region_changed () {
+        Gtk.TreeIter iter;
+        string region;
+
+        if (!region_combobox.get_active_iter (out iter))
+            return;
+        region_store.get (iter, 1, out region);
+
+        if (lm.get_user_language () != region)
+            settings_changed ();
+
+        warning ("set language :%s ", region);
+        lm.set_user_language (region);
+    }
+    void on_format_changed () {
+        Gtk.TreeIter iter;
+        string format;
+
+        if (!format_combobox.get_active_iter (out iter))
+            return;
+        format_store.get (iter, 1, out format);
+
+        if (lm.get_user_format () != format)
+            settings_changed ();
+
+        warning ("set format :%s ", format);
+        lm.set_user_format (format);
+
+        preview.reload_languages (format);
+    }
+
+    Gtk.Label create_end_label (string text) {
+        var label = new Gtk.Label (text);
+        label.halign = Gtk.Align.END;
+        return label;
+    }
+
+    public void reload_languages (string[] langs, string[] locales) {
+        this.langs = langs;
+        this.locales = locales;
+
+        int i;
+        int selected_format = 0;
+        int selected_language = 0;
+
+        var user_format = lm.get_user_format ();
+        var user_language = lm.get_user_language ();
+
+        warning ("current format"+user_format);
+        warning ("current language"+user_language);
+
+        language_store.clear ();
+        region_store.clear ();
+        format_store.clear ();
+
+        i = 0;
+        foreach (var lang in this.langs) {
+            string language = null;
+
+            if (lang.length == 2)
+                language = Gnome.Languages.get_language_from_code (lang, null);
+
+            if (language != null) {
+                var iter = Gtk.TreeIter ();
+                language_store.append (out iter);
+                language_store.set (iter, 0, language, 1, lang);
+
+                if (user_language.has_prefix (lang))
+                    selected_language = i;
+                i++;
+            }
+        }
+        language_combobox.sensitive = i != 1; // set to unsensitive if only have one item
+        language_combobox.active = selected_language;
+
+        i = 0;
+        foreach (var locale in this.locales) {
+            var country = Gnome.Languages.get_country_from_locale (locale, null);
+
+            if (country != null) {
+                locale += ".UTF-8";
+                var iter = Gtk.TreeIter ();
+                format_store.append (out iter);
+                format_store.set (iter, 0, country, 1, locale);
+
+                if (locale == user_format)
+                    selected_format = i;
+                i++;
+            }
+        }
+        format_combobox.sensitive = i != 1; // set to unsensitive if only have one item
+        format_combobox.active = selected_format;
+    }
+
+    void on_applied_to_system () {
+        lm.apply_user_to_system ();
+        settings_changed ();
+    }
+    int format_compare_func (Gtk.TreeModel model, Gtk.TreeIter a, Gtk.TreeIter b){
+        string a_lang, a_code, b_lang, b_code;
+
+        model.get (a, 1, out a_code);
+        model.get (b, 1, out b_code);
+
+        if (a_code.substring (0, 2) != b_code.substring (0, 2))
+            return a_code.ascii_casecmp (b_code);
+
+        model.get (a, 0, out a_lang);
+        model.get (b, 0, out b_lang);
+
+        return a_lang.ascii_casecmp (b_lang);
+    }
+}

=== added file 'src/Widgets/Preview.vala'
--- src/Widgets/Preview.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/Preview.vala	2015-01-16 04:39:50 +0000
@@ -0,0 +1,41 @@
+public class Preview : Gtk.Grid {
+    LocaleManager lm;
+    Gtk.Label first_line;
+    Gtk.Label second_line;
+
+    public Preview () {
+        this.row_spacing = 10;
+        this.margin_top = 10;
+        this.margin_bottom = 20;
+
+        lm = LocaleManager.get_default ();
+
+        first_line = new Gtk.Label ("");
+        second_line = new Gtk.Label ("");
+
+        first_line.set_sensitive (false);
+        second_line.set_sensitive (false);
+
+        attach (first_line, 0, 0, 1, 1);
+        attach (second_line, 0, 1, 1, 1);
+
+        this.show_all ();
+    }
+
+    public void reload_languages (string format) {
+        Intl.setlocale (LocaleCategory.ALL, format);
+
+        var date = new DateTime.now_local ();
+        first_line.set_label ("%s".printf (
+            date.format ("%c")
+            ));
+
+        char currency[20];
+        Monetary.strfmon (currency, "%5.2n", 1234.56);
+
+        second_line.set_label ("%s   %s   %'.2f ".printf (
+            date.format("%x   %X"),
+            (string) currency,
+            1234.56));
+    }
+}

=== added file 'vapi/monetary.vapi'
--- vapi/monetary.vapi	1970-01-01 00:00:00 +0000
+++ vapi/monetary.vapi	2015-01-16 04:39:50 +0000
@@ -0,0 +1,5 @@
+[CCode (cheader_filename = "monetary.h")]
+public class Monetary {
+     [CCode(cname = "strfmon")]
+      public static ssize_t strfmon(char[] s, string format, double data);
+}