|
 |
1096fc9 |
From 0be4664b2ea3071c01ff479443033eb1accdfb03 Mon Sep 17 00:00:00 2001
|
|
|
1096fc9 |
From: fujiwarat <takao.fujiwara1@gmail.com>
|
|
|
1096fc9 |
Date: Fri, 2 May 2014 11:55:08 +0900
|
|
|
1096fc9 |
Subject: [PATCH] Set max-width-chars property in ibus-setup wrapped
|
|
|
1096fc9 |
GtkLabel.
|
|
|
1096fc9 |
|
|
|
1096fc9 |
If GtkWindow has 'resizable' property = FALSE, the wrap in GtkLabel
|
|
|
1096fc9 |
is not done automatically and need to set 'max-width-chars' property.
|
|
|
1096fc9 |
|
|
|
1096fc9 |
TEST=ibus-setup
|
|
|
1096fc9 |
|
|
|
1096fc9 |
Review URL: https://codereview.appspot.com/92940043
|
|
|
1096fc9 |
---
|
|
|
1096fc9 |
setup/setup.ui | 1 +
|
|
|
1096fc9 |
1 file changed, 1 insertion(+)
|
|
|
1096fc9 |
|
|
|
1096fc9 |
diff --git a/setup/setup.ui b/setup/setup.ui
|
|
|
1096fc9 |
index 5ffbe47..bb78433 100644
|
|
|
1096fc9 |
--- a/setup/setup.ui
|
|
|
1096fc9 |
+++ b/setup/setup.ui
|
|
|
1096fc9 |
@@ -902,6 +902,7 @@
|
|
|
1096fc9 |
<property name="can_focus">False</property>
|
|
|
1096fc9 |
<property name="xalign">0</property>
|
|
|
1096fc9 |
<property name="wrap">True</property>
|
|
|
1096fc9 |
+ <property name="max_width_chars">74</property>
|
|
|
1096fc9 |
<property name="label" translatable="yes"><small><i>The active input method can be switched around from the selected ones in the above list by pressing the keyboard shortcut keys or clicking the panel icon.</i></small></property>
|
|
|
1096fc9 |
<property name="use_markup">True</property>
|
|
|
1096fc9 |
</object>
|
|
|
1096fc9 |
--
|
|
|
1096fc9 |
1.8.5.3
|
|
|
1096fc9 |
|
|
|
1096fc9 |
From 318836a647460e28dcc682543a118567474f9854 Mon Sep 17 00:00:00 2001
|
|
|
1096fc9 |
From: Eike Hein <hein@kde.org>
|
|
|
1096fc9 |
Date: Thu, 8 May 2014 11:16:02 +0900
|
|
|
1096fc9 |
Subject: [PATCH] Add the nodeadkeys variant of the German keyboard layout.
|
|
|
1096fc9 |
|
|
|
1096fc9 |
BUG=http://code.google.com/p/ibus/issues/detail?id=1710
|
|
|
1096fc9 |
|
|
|
1096fc9 |
Review URL: https://codereview.appspot.com/96040043
|
|
|
1096fc9 |
Patch from Eike Hein <hein@kde.org>.
|
|
|
1096fc9 |
---
|
|
|
1096fc9 |
engine/simple.xml.in | 12 ++++++++++++
|
|
|
1096fc9 |
1 file changed, 12 insertions(+)
|
|
|
1096fc9 |
|
|
|
1096fc9 |
diff --git a/engine/simple.xml.in b/engine/simple.xml.in
|
|
|
1096fc9 |
index b3ac6a5..9736421 100644
|
|
|
1096fc9 |
--- a/engine/simple.xml.in
|
|
|
1096fc9 |
+++ b/engine/simple.xml.in
|
|
|
1096fc9 |
@@ -330,6 +330,18 @@
|
|
|
1096fc9 |
<icon>ibus-keyboard</icon>
|
|
|
1096fc9 |
<rank>99</rank>
|
|
|
1096fc9 |
</engine>
|
|
|
1096fc9 |
+ <engine>
|
|
|
1096fc9 |
+ <name>xkb:de:nodeadkeys:ger</name>
|
|
|
1096fc9 |
+ <language>ger</language>
|
|
|
1096fc9 |
+ <license>GPL</license>
|
|
|
1096fc9 |
+ <author>Peng Huang <shawn.p.huang@gmail.com></author>
|
|
|
1096fc9 |
+ <layout>de</layout>
|
|
|
1096fc9 |
+ <layout_variant>nodeadkeys</layout_variant>
|
|
|
1096fc9 |
+ <longname>German (eliminate dead keys)</longname>
|
|
|
1096fc9 |
+ <description>German (eliminate dead keys)</description>
|
|
|
1096fc9 |
+ <icon>ibus-keyboard</icon>
|
|
|
1096fc9 |
+ <rank>99</rank>
|
|
|
1096fc9 |
+ </engine>
|
|
|
1096fc9 |
<engine>
|
|
|
1096fc9 |
<name>xkb:gr::gre</name>
|
|
|
1096fc9 |
<language>gre</language>
|
|
|
1096fc9 |
--
|
|
|
1096fc9 |
1.8.5.3
|
|
|
1096fc9 |
|
|
|
1096fc9 |
From 386bafb0b91a61d51385e0bba2b3fc4b1e2d9013 Mon Sep 17 00:00:00 2001
|
|
|
1096fc9 |
From: Ryu Changwoo <ryu.changwoo@gmail.com>
|
|
|
1096fc9 |
Date: Thu, 8 May 2014 11:23:14 +0900
|
|
|
1096fc9 |
Subject: [PATCH] Delete Korean keymap.
|
|
|
1096fc9 |
|
|
|
1096fc9 |
BUG=http://code.google.com/p/ibus/issues/detail?id=1708
|
|
|
1096fc9 |
|
|
|
1096fc9 |
Review URL: https://codereview.appspot.com/92090043
|
|
|
1096fc9 |
Patch from Ryu Changwoo <ryu.changwoo@gmail.com>.
|
|
|
1096fc9 |
---
|
|
|
1096fc9 |
engine/simple.xml.in | 12 ------------
|
|
|
1096fc9 |
1 file changed, 12 deletions(-)
|
|
|
1096fc9 |
|
|
|
1096fc9 |
diff --git a/engine/simple.xml.in b/engine/simple.xml.in
|
|
|
1096fc9 |
index 9736421..1b617f8 100644
|
|
|
1096fc9 |
--- a/engine/simple.xml.in
|
|
|
1096fc9 |
+++ b/engine/simple.xml.in
|
|
|
1096fc9 |
@@ -682,17 +682,5 @@
|
|
|
1096fc9 |
<icon>ibus-keyboard</icon>
|
|
|
1096fc9 |
<rank>99</rank>
|
|
|
1096fc9 |
</engine>
|
|
|
1096fc9 |
- <engine>
|
|
|
1096fc9 |
- <name>xkb:kr:kr104:kor</name>
|
|
|
1096fc9 |
- <language>kor</language>
|
|
|
1096fc9 |
- <license>GPL</license>
|
|
|
1096fc9 |
- <author>Peng Huang <shawn.p.huang@gmail.com></author>
|
|
|
1096fc9 |
- <layout>kr</layout>
|
|
|
1096fc9 |
- <layout_variant>kr104</layout_variant>
|
|
|
1096fc9 |
- <longname>Korean (101/104 key compatible)</longname>
|
|
|
1096fc9 |
- <description>Korean (101/104 key compatible)</description>
|
|
|
1096fc9 |
- <icon>ibus-keyboard</icon>
|
|
|
1096fc9 |
- <rank>99</rank>
|
|
|
1096fc9 |
- </engine>
|
|
|
1096fc9 |
</engines>
|
|
|
1096fc9 |
</component>
|
|
|
1096fc9 |
--
|
|
|
1096fc9 |
1.8.5.3
|
|
|
1096fc9 |
|
|
|
1096fc9 |
From 34692850bd58543e016e35ea7c863d311ca92519 Mon Sep 17 00:00:00 2001
|
|
|
1096fc9 |
From: fujiwarat <takao.fujiwara1@gmail.com>
|
|
|
1096fc9 |
Date: Fri, 9 May 2014 11:40:21 +0900
|
|
|
1096fc9 |
Subject: [PATCH] Let ibus-ui-gtk3 not to show zero-lenght preedit text.
|
|
|
1096fc9 |
|
|
|
1096fc9 |
preedit text is shown by ibus-ui-gtk3 on X11 applications
|
|
|
1096fc9 |
and do not have to show it likes GTK+ when the lenght is zero.
|
|
|
1096fc9 |
|
|
|
1096fc9 |
BUG=http://code.google.com/p/ibus/issues/detail?id=1709
|
|
|
1096fc9 |
TEST=ibus-ui-gtk3 with ibus-pinyin and x11 applications
|
|
|
1096fc9 |
|
|
|
1096fc9 |
Review URL: https://codereview.appspot.com/93150043
|
|
|
1096fc9 |
---
|
|
|
1096fc9 |
ui/gtk3/candidatepanel.vala | 11 +++++++++--
|
|
|
1096fc9 |
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
1096fc9 |
|
|
|
1096fc9 |
diff --git a/ui/gtk3/candidatepanel.vala b/ui/gtk3/candidatepanel.vala
|
|
|
1096fc9 |
index e22135b..db2d5aa 100644
|
|
|
1096fc9 |
--- a/ui/gtk3/candidatepanel.vala
|
|
|
1096fc9 |
+++ b/ui/gtk3/candidatepanel.vala
|
|
|
1096fc9 |
@@ -112,8 +112,15 @@ public class CandidatePanel : Gtk.Box{
|
|
|
1096fc9 |
|
|
|
1096fc9 |
public void set_preedit_text(IBus.Text? text, uint cursor) {
|
|
|
1096fc9 |
if (text != null) {
|
|
|
1096fc9 |
- m_preedit_label.set_text(text.get_text());
|
|
|
1096fc9 |
- m_preedit_label.show();
|
|
|
1096fc9 |
+ var str = text.get_text();
|
|
|
1096fc9 |
+
|
|
|
1096fc9 |
+ if (str.length > 0) {
|
|
|
1096fc9 |
+ m_preedit_label.set_text(str);
|
|
|
1096fc9 |
+ m_preedit_label.show();
|
|
|
1096fc9 |
+ } else {
|
|
|
1096fc9 |
+ m_preedit_label.set_text("");
|
|
|
1096fc9 |
+ m_preedit_label.hide();
|
|
|
1096fc9 |
+ }
|
|
|
1096fc9 |
} else {
|
|
|
1096fc9 |
m_preedit_label.set_text("");
|
|
|
1096fc9 |
m_preedit_label.hide();
|
|
|
1096fc9 |
--
|
|
|
1096fc9 |
1.8.5.3
|
|
|
99df57f |
|