From 692f6caa142ee68c6b9b26c0dd10170f7d5486bf Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Wed, 25 May 2011 19:01:23 +0900 Subject: [PATCH] Showed XKB variant descriptions only without layout descriptions. --- ibus-541492-xkb.patch | 10 +++++----- ibus-xx-setup-frequent-lang.patch | 15 ++++++++------- ibus.spec | 7 +++++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ibus-541492-xkb.patch b/ibus-541492-xkb.patch index 03ff19d..333e35f 100644 --- a/ibus-541492-xkb.patch +++ b/ibus-541492-xkb.patch @@ -1,6 +1,6 @@ -From 3262b43c6c865ff2fe9214fa10181d34e9b0908f Mon Sep 17 00:00:00 2001 +From 161cbcc46feb27e52b6579fe4b0b328386f230e9 Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Mon, 9 May 2011 17:15:42 +0900 +Date: Wed, 25 May 2011 18:51:13 +0900 Subject: [PATCH] Add XKB layouts --- @@ -511,7 +511,7 @@ index 0000000..7685776 + self.__default_option = self.get_option() diff --git a/ibus/xkbxml.py.in b/ibus/xkbxml.py.in new file mode 100644 -index 0000000..d3d0ba2 +index 0000000..57f54da --- /dev/null +++ b/ibus/xkbxml.py.in @@ -0,0 +1,413 @@ @@ -810,8 +810,8 @@ index 0000000..d3d0ba2 + layout_desc=None, + variant=None, + variant_desc=None): -+ if layout_desc != None and variant_desc != None: -+ longname = layout_desc + " - " + variant_desc ++ if variant_desc != None: ++ longname = variant_desc + elif layout != None and variant != None: + longname = layout + " - " + variant + elif layout_desc != None: diff --git a/ibus-xx-setup-frequent-lang.patch b/ibus-xx-setup-frequent-lang.patch index 1d28a22..a019fa8 100644 --- a/ibus-xx-setup-frequent-lang.patch +++ b/ibus-xx-setup-frequent-lang.patch @@ -1,7 +1,8 @@ -From 8e982ef7d76f40f3e516c2f2a96b2e4f68e65fc2 Mon Sep 17 00:00:00 2001 +From 231285d6d9e1b0b868edb842b46c30974a5c517a Mon Sep 17 00:00:00 2001 From: fujiwarat -Date: Tue, 19 Apr 2011 11:43:03 +0900 -Subject: [PATCH] Enable ibus-setup to show the frequent used languages only in IME list. +Date: Wed, 25 May 2011 18:52:25 +0900 +Subject: [PATCH] Enable ibus-setup to show the frequently used languages + only in IME list. --- data/ibus.schemas.in | 168 +++++++++++++++++++++++++++++++++++++++++++++++ @@ -189,7 +190,7 @@ index 39922a0..2e33b2c 100644 /desktop/ibus/panel/use_custom_font ibus diff --git a/setup/enginecombobox.py b/setup/enginecombobox.py -index 7383177..c5b194f 100644 +index 7383177..bff2407 100644 --- a/setup/enginecombobox.py +++ b/setup/enginecombobox.py @@ -43,7 +43,10 @@ class EngineComboBox(gtk.ComboBox): @@ -381,9 +382,9 @@ index 7383177..c5b194f 100644 + renderer.set_property("weight", pango.WEIGHT_NORMAL) + elif engine < 0: + if not self.__show_sub_lang: -+ renderer.set_property("text", _("Show all languages")) ++ renderer.set_property("text", _("Show all input methods")) + else: -+ renderer.set_property("text", _("Show frequent used languages only")) ++ renderer.set_property("text", _("Show only input methods for your region")) + renderer.set_property("weight", pango.WEIGHT_BOLD) else: renderer.set_property("sensitive", True) @@ -424,5 +425,5 @@ index 9cdce02..5201139 100644 engines = self.__bus.list_active_engines() -- -1.7.4.2 +1.7.4.4 diff --git a/ibus.spec b/ibus.spec index d6e8812..79cddf1 100644 --- a/ibus.spec +++ b/ibus.spec @@ -13,7 +13,7 @@ Name: ibus Version: 1.3.99.20110408 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPLv2+ Group: System Environment/Libraries @@ -328,11 +328,14 @@ fi %{_datadir}/gtk-doc/html/* %changelog -* Mon May 09 2011 Takao Fujiwara - 1.3.99.20110408-3 +* Wed May 25 2011 Takao Fujiwara - 1.3.99.20110408-4 - Added ibus-HEAD.patch Fixed Bug 697471 - ibus-gconf zombie when restart ibus from ibus panel. - Updated ibus-541492-xkb.patch Fixed Bug 701202 - us(dvorak) does not show up in list + Showed XKB variant descriptions only without layout descriptions. +- Updated ibus-xx-setup-frequent-lang.patch + Updated UI strings * Tue Apr 19 2011 Takao Fujiwara - 1.3.99.20110408-1 - Updated to 1.3.99.20110408