Merge lp:~leonardolemos/wingpanel-indicator-keyboard/fix-1559189 into lp:~wingpanel-devs/wingpanel-indicator-keyboard/trunk

[Leonardo Lemos]

Add a method to show the current keyboard layout.

This branch introduces a method to open gkbd-keyboard-display and show the current layout map.

[David Hewitt (davidmhewitt)]

It's possible to make this much simpler by using "layouts.get_current ()" in your show_keyboard_map method.

review: Needs Fixing

[lp:~leonardolemos/wingpanel-indicator-keyboard/fix-1559189]

69. By Leonardo Lemos on 2017-03-16

Simplify show_keyboard_map method using alyouts.get_current ()

[David Hewitt (davidmhewitt)]

Looks good now.

review: Approve (code, function)

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-09-26 03:08:28 +0000
+++ src/Indicator.vala	2017-03-16 20:23:35 +0000
@@ -53,6 +53,9 @@
             var settings_button = new Wingpanel.Widgets.Button (_("Keyboard Settings…"));
             settings_button.clicked.connect (show_settings);
 
+            var map_button = new Wingpanel.Widgets.Button (_("Show keyboard map"));
+            map_button.clicked.connect (show_keyboard_map);
+
             layouts.updated.connect (() => {
                 display_icon.label = layouts.get_current (true);
                 var new_visibility = layouts.has_layouts ();
@@ -66,6 +69,7 @@
             main_grid.add (layouts);
             main_grid.add (separator);
             main_grid.add (settings_button);
+            main_grid.add (map_button);
             main_grid.show_all ();
         }
 
@@ -89,6 +93,19 @@
             warning ("%s\n", e.message);
         }
     }
+
+    private void show_keyboard_map () {
+        close ();
+
+        string command = "gkbd-keyboard-display -l " + layouts.get_current ();
+
+        try {
+            AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null);
+        }
+        catch (Error e) {
+            warning ("%s\n", e.message);
+        }
+    }
 }
 
 public Wingpanel.Indicator? get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) {