Merge lp:~lukas-kde/indicator-keyboard/fallbackIconAndTitle into lp:indicator-keyboard

[Lukáš Tinkl]

Implement the "title" property and a fallback icon, if no keymap is configured yet

For unity 8, implement the "title" property and a fallback icon, if no keymap is configured yet.

Fixes a too long subtitle text when the panel is expanded and the default ugly "cog" icon.

See https://imgur.com/a/IOqTk for an example of the changes made

[Michał Sawicz (saviq)]

So no fallback for the per-language icons?

review: Needs Information

[Lukáš Tinkl (lukas-kde)]

> So no fallback for the per-language icons?

Yup, I can try

As for the -symbolic icon, sure

[lp:~lukas-kde/indicator-keyboard/fallbackIconAndTitle]

1045. By Lukáš Tinkl on 2016-08-03

default to -symbolic

1046. By Lukáš Tinkl on 2016-08-03

per-keymap fallback icon

[Lukáš Tinkl (lukas-kde)]

Alright, tested this and it works fine in both cases

[lp:~lukas-kde/indicator-keyboard/fallbackIconAndTitle]

1047. By Lukáš Tinkl on 2016-08-03

input-keyboard as the last resort

1048. By Lukáš Tinkl on 2016-08-03

make update-po

[Michał Sawicz (saviq)]

Looks fine, thanks!

review: Approve

[Charles Kerr (charlesk)]

Looks sensible. One suggestion inline for paranoid null checking.

[Charles Kerr (charlesk)]

Thanks Lukáš!

review: Approve

=== modified file 'lib/main.vala'
--- lib/main.vala	2016-08-03 17:16:40 +0000
+++ lib/main.vala	2016-08-03 17:16:40 +0000
@@ -812,10 +812,17 @@
 		builder.add ("{sv}", "visible", indicator_settings.get_value ("visible"));
 		if (name != null) {
 			var description = _ ("%s input source").printf ((!) name);
+			builder.add ("{sv}", "title", new Variant.string ((!) name));
 			builder.add ("{sv}", "accessible-desc", new Variant.string (description));
+		} else {
+			builder.add ("{sv}", "title", new Variant.string (_("Keyboard Layout")));
+			builder.add ("{sv}", "accessible-desc", new Variant.string (_("Input source selection")));
 		}
 		if (icon != null) {
 			builder.add ("{sv}", "icon", ((!) icon).serialize ());
+		} else {
+			var fallbackIcon = new ThemedIcon.with_default_fallbacks("input-keyboard-symbolic");
+			builder.add ("{sv}", "icon", fallbackIcon.serialize());
 		}
 
 		get_indicator_action ().set_state (builder.end ());

=== modified file 'lib/source.vala'
--- lib/source.vala	2015-02-18 16:19:40 +0000
+++ lib/source.vala	2016-08-03 17:16:40 +0000
@@ -471,7 +471,8 @@
 				Gtk.IconInfo? icon_info = icon_theme.lookup_icon (icon_name, 22, 0);
 
 				if (icon_info != null) {
-					icon = new ThemedIcon (icon_name);
+					string [] iconNames = {icon_name, "input-keyboard-symbolic", "input-keyboard"};
+					icon = new ThemedIcon.from_names (iconNames);
 				}
 			} else {
 				icon = new ThemedIcon (icon_name);

=== modified file 'po/indicator-keyboard.pot'
--- po/indicator-keyboard.pot	2014-04-04 22:53:34 +0000
+++ po/indicator-keyboard.pot	2016-08-03 17:16:40 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-05 11:53+1300\n"
+"POT-Creation-Date: 2016-08-03 18:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,19 +17,27 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/main.vala:706
+#: ../lib/main.vala:814
 #, c-format
 msgid "%s input source"
 msgstr ""
 
-#: ../lib/indicator-menu.vala:48
+#: ../lib/main.vala:818
+msgid "Keyboard Layout"
+msgstr ""
+
+#: ../lib/main.vala:819
+msgid "Input source selection"
+msgstr ""
+
+#: ../lib/indicator-menu.vala:54
 msgid "Character Map"
 msgstr ""
 
-#: ../lib/indicator-menu.vala:49
+#: ../lib/indicator-menu.vala:55
 msgid "Keyboard Layout Chart"
 msgstr ""
 
-#: ../lib/indicator-menu.vala:50
+#: ../lib/indicator-menu.vala:56
 msgid "Text Entry Settings..."
 msgstr ""