From 21b79630873c79ced591cf5e909660cf4c1bda69 Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Mon, 9 Mar 2009 17:21:45 +0800
Subject: Implement ibus_bus_get_config function.

---
 bus/dbusimpl.c   |  17 ++++--
 bus/matchrule.c  |   3 ++
 src/ibusbus.c    |  42 ++++++++++++++-
 src/ibusbus.h    |   2 +
 src/ibusproxy.c  | 158 ++++++++++++++++++++++++++++++++++++++++++-------------
 src/ibusproxy.h  |   1 +
 src/test-proxy.c |  24 ++++++---
 7 files changed, 197 insertions(+), 50 deletions(-)

diff --git a/bus/dbusimpl.c b/bus/dbusimpl.c
index 3cc51dc..f51ab96 100644
--- a/bus/dbusimpl.c
+++ b/bus/dbusimpl.c
@@ -828,6 +828,16 @@ _connection_ibus_message_cb (BusConnection  *connection,
                  ibus_message_get_error_message (message));
         break;
 #endif
+#if 0
+    case DBUS_MESSAGE_TYPE_SIGNAL:
+        g_debug ("From :%s to %s, Signal: %s @ %s",
+                 ibus_message_get_sender (message),
+                 ibus_message_get_destination (message),
+                 ibus_message_get_member (message),
+                 ibus_message_get_path (message)
+                 );
+        break;
+#endif
 #if 0
     case DBUS_MESSAGE_TYPE_METHOD_CALL:
         g_debug("From %s to %s, Method %s on %s",
@@ -1068,10 +1078,9 @@ bus_dbus_impl_dispatch_message_by_rule (BusDBusImpl     *dbus,
 #endif
 
     for (link = dbus->rules; link != NULL; link = link->next) {
-        recipients = bus_match_rule_get_recipients (BUS_MATCH_RULE (link->data),
-                                                    message);
-        if (recipients != NULL)
-            break;
+        GList *list = bus_match_rule_get_recipients (BUS_MATCH_RULE (link->data),
+                                                     message);
+        recipients = g_list_concat (recipients, list);
     }
 
     for (link = recipients; link != NULL; link = link->next) {
diff --git a/bus/matchrule.c b/bus/matchrule.c
index f40147a..039602e 100644
--- a/bus/matchrule.c
+++ b/bus/matchrule.c
@@ -270,6 +270,8 @@ bus_match_rule_new (const gchar *text)
 {
     g_assert (text != NULL);
 
+    g_debug ("new rule=%s", text);
+
     Token *tokens, *p;
     BusMatchRule *rule;
 
@@ -499,6 +501,7 @@ bus_match_rule_match (BusMatchRule   *rule,
             ibus_message_iter_next (&iter);
         }
     }
+
     return TRUE;
 }
 
diff --git a/src/ibusbus.c b/src/ibusbus.c
index 52631e8..4115689 100644
--- a/src/ibusbus.c
+++ b/src/ibusbus.c
@@ -23,6 +23,7 @@
 #include "ibusinternal.h"
 #include "ibusshare.h"
 #include "ibusconnection.h"
+#include "ibusconfig.h"
 
 #define IBUS_BUS_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), IBUS_TYPE_BUS, IBusBusPrivate))
@@ -40,6 +41,7 @@ struct _IBusBusPrivate {
     GFileMonitor *monitor;
     IBusConnection *connection;
     gboolean watch_dbus_signal;
+    IBusConfig *config;
 };
 typedef struct _IBusBusPrivate IBusBusPrivate;
 
@@ -210,6 +212,7 @@ ibus_bus_init (IBusBus *bus)
     IBusBusPrivate *priv;
     priv = IBUS_BUS_GET_PRIVATE (bus);
 
+    priv->config = NULL;
     priv->connection = NULL;
     priv->watch_dbus_signal = FALSE;
 
@@ -239,8 +242,13 @@ ibus_bus_destroy (IBusObject *object)
         priv->monitor = NULL;
     }
 
+    if (priv->config) {
+        ibus_object_destroy ((IBusObject *) priv->config);
+        priv->config = NULL;
+    }
+
     if (priv->connection) {
-        ibus_object_destroy (IBUS_OBJECT (priv->connection));
+        ibus_object_destroy ((IBusObject *) priv->connection);
         priv->connection = NULL;
     }
 
@@ -613,7 +621,7 @@ ibus_bus_get_name_owner (IBusBus        *bus,
                             DBUS_SERVICE_DBUS,
                             DBUS_PATH_DBUS,
                             DBUS_INTERFACE_DBUS,
-                            "RemoveMatch",
+                            "GetNameOwner",
                             G_TYPE_STRING, &name,
                             G_TYPE_INVALID,
                             G_TYPE_STRING, &owner,
@@ -729,3 +737,33 @@ ibus_bus_list_active_engines (IBusBus *bus)
 {
     return NULL;
 }
+
+static void
+_config_destroy_cb (IBusConfig *config,
+                    IBusBus    *bus)
+{
+    IBusBusPrivate *priv;
+    priv = IBUS_BUS_GET_PRIVATE (bus);
+
+    g_assert (priv->config == config);
+
+    g_object_unref (config);
+    priv->config = NULL;
+}
+
+IBusConfig *
+ibus_bus_get_config (IBusBus *bus)
+{
+    g_assert (IBUS_IS_BUS (bus));
+    IBusBusPrivate *priv;
+    priv = IBUS_BUS_GET_PRIVATE (bus);
+
+    if (priv->config == NULL && priv->connection) {
+        priv->config = ibus_config_new (priv->connection);
+        if (priv->config) {
+            g_signal_connect (priv->config, "destroy", G_CALLBACK (_config_destroy_cb), bus);
+        }
+    }
+
+    return priv->config;
+}
diff --git a/src/ibusbus.h b/src/ibusbus.h
index be1fba8..e02c193 100644
--- a/src/ibusbus.h
+++ b/src/ibusbus.h
@@ -92,6 +92,8 @@ gboolean     ibus_bus_register_component(IBusBus        *bus,
 GList       *ibus_bus_list_engines      (IBusBus        *bus);
 GList       *ibus_bus_list_active_engines
                                         (IBusBus        *bus);
+/* declare config apis */
+IBusConfig  *ibus_bus_get_config        (IBusBus        *bus);
 
 G_END_DECLS
 #endif
diff --git a/src/ibusproxy.c b/src/ibusproxy.c
index 5ef3b40..9abf8f6 100644
--- a/src/ibusproxy.c
+++ b/src/ibusproxy.c
@@ -43,6 +43,7 @@ enum {
 /* IBusProxyPriv */
 struct _IBusProxyPrivate {
     gchar *name;
+    gchar *unique_name;
     gchar *path;
     gchar *interface;
     IBusConnection *connection;
@@ -187,6 +188,12 @@ _connection_ibus_signal_cb (IBusConnection *connection,
                             IBusMessage    *message,
                             IBusProxy      *proxy)
 {
+    IBusProxyPrivate *priv;
+    priv = IBUS_PROXY_GET_PRIVATE (proxy);
+
+    if (g_strcmp0 (ibus_message_get_path (message), priv->path) != 0)
+        return FALSE;
+
     if (ibus_proxy_handle_signal (proxy, message)) {
         g_signal_stop_emission_by_name (connection, "ibus-signal");
         return TRUE;
@@ -224,45 +231,71 @@ ibus_proxy_constructor (GType           type,
     proxy = IBUS_PROXY (obj);
     priv = IBUS_PROXY_GET_PRIVATE (proxy);
 
-    if (priv->connection != NULL) {
-        if (priv->name != NULL) {
+    if (priv->connection == NULL) {
+        g_object_unref (proxy);
+        return NULL;
+    }
 
-            IBusError *error;
-            gchar *rule;
+    if (priv->name != NULL) {
+        IBusError *error;
+        gchar *rule;
 
-            rule = g_strdup_printf ("type='signal',"
-                                    "sender='"      DBUS_SERVICE_DBUS   "',"
-                                    "path='"        DBUS_PATH_DBUS      "',"
-                                    "interface='"   DBUS_INTERFACE_DBUS "',"
-                                    "member='NameOwnerChanged',"
-                                    "arg0='%s'",
-                                    priv->name);
+        if (ibus_proxy_get_unique_name (proxy) == NULL) {
+            g_object_unref (proxy);
+            return NULL;
+        }
 
-            if (!ibus_connection_call (priv->connection,
-                                       DBUS_SERVICE_DBUS,
-                                       DBUS_PATH_DBUS,
-                                       DBUS_INTERFACE_DBUS,
-                                       "AddMatch",
-                                       &error,
-                                       G_TYPE_STRING, &rule,
-                                       G_TYPE_INVALID,
-                                       G_TYPE_INVALID)) {
-                g_warning ("%s: %s", error->name, error->message);
-                ibus_error_free (error);
-            }
-            g_free (rule);
+        rule = g_strdup_printf ("type='signal',"
+                                "sender='"      DBUS_SERVICE_DBUS   "',"
+                                "path='"        DBUS_PATH_DBUS      "',"
+                                "interface='"   DBUS_INTERFACE_DBUS "',"
+                                "member='NameOwnerChanged',"
+                                "arg0='%s'",
+                                priv->unique_name);
+
+        if (!ibus_connection_call (priv->connection,
+                                   DBUS_SERVICE_DBUS,
+                                   DBUS_PATH_DBUS,
+                                   DBUS_INTERFACE_DBUS,
+                                   "AddMatch",
+                                   &error,
+                                   G_TYPE_STRING, &rule,
+                                   G_TYPE_INVALID,
+                                   G_TYPE_INVALID)) {
+            g_warning ("%s: %s", error->name, error->message);
+            ibus_error_free (error);
+        }
+        g_free (rule);
+
+        rule =  g_strdup_printf ("type='signal',"
+                                 "sender='%s',"
+                                 "path='%s'",
+                                 priv->unique_name,
+                                 priv->path);
+
+        if (!ibus_connection_call (priv->connection,
+                                   DBUS_SERVICE_DBUS,
+                                   DBUS_PATH_DBUS,
+                                   DBUS_INTERFACE_DBUS,
+                                   "AddMatch",
+                                   &error,
+                                   G_TYPE_STRING, &rule,
+                                   G_TYPE_INVALID,
+                                   G_TYPE_INVALID)) {
+            g_warning ("%s: %s", error->name, error->message);
+            ibus_error_free (error);
         }
-        g_signal_connect (priv->connection,
-                          "ibus-signal",
-                          (GCallback) _connection_ibus_signal_cb,
-                          proxy);
-
-        g_signal_connect (priv->connection,
-                          "destroy",
-                          (GCallback) _connection_destroy_cb,
-                          proxy);
+        g_free (rule);
     }
-
+    g_signal_connect (priv->connection,
+                      "ibus-signal",
+                      (GCallback) _connection_ibus_signal_cb,
+                      proxy);
+
+    g_signal_connect (priv->connection,
+                      "destroy",
+                      (GCallback) _connection_destroy_cb,
+                      proxy);
     return obj;
 }
 
@@ -273,6 +306,7 @@ ibus_proxy_init (IBusProxy *proxy)
     priv = IBUS_PROXY_GET_PRIVATE (proxy);
 
     priv->name = NULL;
+    priv->unique_name = NULL;
     priv->path = NULL;
     priv->interface = NULL;
     priv->connection = NULL;
@@ -304,7 +338,28 @@ ibus_proxy_destroy (IBusProxy *proxy)
                                     "interface='"   DBUS_INTERFACE_DBUS "',"
                                     "member='NameOwnerChanged',"
                                     "arg0='%s'",
-                                    priv->name);
+                                    priv->unique_name);
+
+            if (!ibus_connection_call (priv->connection,
+                                       DBUS_SERVICE_DBUS,
+                                       DBUS_PATH_DBUS,
+                                       DBUS_INTERFACE_DBUS,
+                                       "RemoveMatch",
+                                       &error,
+                                       G_TYPE_STRING, &rule,
+                                       G_TYPE_INVALID,
+                                       G_TYPE_INVALID)) {
+
+                g_warning ("%s: %s", error->name, error->message);
+                ibus_error_free (error);
+            }
+            g_free (rule);
+
+            rule =  g_strdup_printf ("type='signal',"
+                                     "sender='%s',"
+                                     "path='%s'",
+                                     priv->unique_name,
+                                     priv->path);
 
             if (!ibus_connection_call (priv->connection,
                                        DBUS_SERVICE_DBUS,
@@ -320,10 +375,12 @@ ibus_proxy_destroy (IBusProxy *proxy)
                 ibus_error_free (error);
             }
             g_free (rule);
+
         }
     }
 
     g_free (priv->name);
+    g_free (priv->unique_name);
     g_free (priv->path);
     g_free (priv->interface);
 
@@ -421,7 +478,7 @@ ibus_proxy_handle_signal (IBusProxy     *proxy,
             ibus_error_free (error);
         }
 
-        if (g_strcmp0 (priv->name, old_name) == 0) {
+        if (g_strcmp0 (priv->unique_name, old_name) == 0) {
             ibus_object_destroy (IBUS_OBJECT (proxy));
             return FALSE;
         }
@@ -451,6 +508,35 @@ ibus_proxy_get_name (IBusProxy *proxy)
     return priv->name;
 }
 
+const gchar *
+ibus_proxy_get_unique_name (IBusProxy *proxy)
+{
+
+    IBusProxyPrivate *priv;
+    priv = IBUS_PROXY_GET_PRIVATE (proxy);
+
+    if (priv->unique_name == NULL && priv->connection != NULL) {
+        IBusError *error;
+        gchar *owner;
+        if (!ibus_connection_call (priv->connection,
+                                   DBUS_SERVICE_DBUS,
+                                   DBUS_PATH_DBUS,
+                                   DBUS_INTERFACE_DBUS,
+                                   "GetNameOwner",
+                                   &error,
+                                   G_TYPE_STRING, &(priv->name),
+                                   G_TYPE_INVALID,
+                                   G_TYPE_STRING, &owner,
+                                   G_TYPE_INVALID)) {
+            g_warning ("%s: %s", error->name, error->message);
+            ibus_error_free (error);
+        }
+        priv->unique_name = g_strdup (owner);
+    }
+
+    return priv->unique_name;
+}
+
 const gchar *
 ibus_proxy_get_path (IBusProxy *proxy)
 {
diff --git a/src/ibusproxy.h b/src/ibusproxy.h
index 0cc22d4..ce85b4d 100644
--- a/src/ibusproxy.h
+++ b/src/ibusproxy.h
@@ -98,6 +98,7 @@ IBusMessage     *ibus_proxy_send_with_reply_and_block
 gboolean         ibus_proxy_handle_signal   (IBusProxy          *proxy,
                                              IBusMessage        *message);
 const gchar     *ibus_proxy_get_name        (IBusProxy          *proxy);
+const gchar     *ibus_proxy_get_unique_name (IBusProxy          *proxy);
 const gchar     *ibus_proxy_get_path        (IBusProxy          *proxy);
 const gchar     *ibus_proxy_get_interface   (IBusProxy          *proxy);
 IBusConnection  *ibus_proxy_get_connection  (IBusProxy          *proxy);
diff --git a/src/test-proxy.c b/src/test-proxy.c
index 31866f1..aedd732 100644
--- a/src/test-proxy.c
+++ b/src/test-proxy.c
@@ -1,18 +1,26 @@
 #include "ibus.h"
 
+static
+_value_changed_cb (IBusConfig *config, gchar *section, gchar *name, GValue *value, gpointer data)
+{
+	g_debug ("value-changed %s %s", section, name);
+}
+
 int main()
 {
 	g_type_init ();
 
-	IBusConnection *connection;
-	IBusProxy *proxy;
+	IBusBus *bus;
+	IBusConfig *config;
+
+	bus = ibus_bus_new ();
+	config = ibus_bus_get_config (bus);
 
-	connection = ibus_connection_new ();
-	proxy = ibus_proxy_new ("a", "/a", connection);
-	GValue value = {0};
-	g_value_init (&value, G_TYPE_STRING);
-	g_value_set_static_string (&value, "aaa");
-	g_object_set_property (G_OBJECT (proxy), "name", &value);
+	g_signal_connect (config,
+					  "value-changed",
+					  G_CALLBACK (_value_changed_cb),
+					  NULL);
+	g_main_loop_run (g_main_loop_new (NULL, FALSE));
 
 	return 0;
 }
-- 
cgit 


From edbab2fa45e5775249e426309cee6b5254ab0342 Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Mon, 9 Mar 2009 17:23:50 +0800
Subject: Remove some debug output.

---
 bus/matchrule.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bus/matchrule.c b/bus/matchrule.c
index 039602e..932d256 100644
--- a/bus/matchrule.c
+++ b/bus/matchrule.c
@@ -270,8 +270,6 @@ bus_match_rule_new (const gchar *text)
 {
     g_assert (text != NULL);
 
-    g_debug ("new rule=%s", text);
-
     Token *tokens, *p;
     BusMatchRule *rule;
 
-- 
cgit 


From cd8f83a89ae5f80a60fe344a56ef82206dc45725 Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Wed, 11 Mar 2009 14:14:27 +0800
Subject: Update setup ui, follow gnome UI guidelines.

---
 po/fr.po          | 135 ++++++++++---------
 po/ja.po          | 124 +++++++++---------
 po/pa.po          | 126 +++++++++---------
 po/zh_CN.po       | 119 +++++++----------
 setup/main.py     |   9 +-
 setup/setup.glade | 386 ++++++++++++++++++++++++++----------------------------
 6 files changed, 438 insertions(+), 461 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 7003a24..a905f98 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-06 10:39+0800\n"
+"POT-Creation-Date: 2009-03-11 14:12+0800\n"
 "PO-Revision-Date: 2009-02-06 01:55+0100\n"
 "Last-Translator: Julroy67 <julroy67@gmail.com>\n"
 "Language-Team: French <julroy67@gmail.com>\n"
@@ -47,23 +47,23 @@ msgstr "HUMBERT Julien <julroy67@gmail.com>"
 msgid "Switch engine"
 msgstr "Changer de moteur"
 
-#: setup/main.py:99
+#: setup/main.py:103
 msgid "trigger"
 msgstr "déclencheur"
 
-#: setup/main.py:109
+#: setup/main.py:113
 msgid "next engine"
 msgstr "moteur suivant"
 
-#: setup/main.py:119
+#: setup/main.py:123
 msgid "prev engine"
 msgstr "moteur précédent"
 
-#: setup/main.py:197
+#: setup/main.py:201
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer maintenant ?"
 
-#: setup/main.py:212
+#: setup/main.py:216
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -78,7 +78,7 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:227
+#: setup/main.py:231
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Choisissez le raccourci clavier pour %s"
@@ -116,31 +116,33 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:46
-msgid "Trigger:"
-msgstr "Déclencheur :"
+#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
+msgid "..."
+msgstr "…"
 
-#: setup/setup.glade:60
-msgid "Next engine:"
-msgstr "Moteur suivant :"
+#: setup/setup.glade:148
+msgid "previous input method:"
+msgstr ""
 
-#: setup/setup.glade:76
-msgid "Previous engine:"
-msgstr "Moteur précédent :"
+#: setup/setup.glade:161
+#, fuzzy
+msgid "Next input method:"
+msgstr "Moteur suivant :"
 
-#: setup/setup.glade:139 setup/setup.glade:156 setup/setup.glade:176
-msgid "..."
-msgstr "…"
+#: setup/setup.glade:174
+msgid "Enable or disable:"
+msgstr ""
 
-#: setup/setup.glade:197
+#: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Raccourcis claviers</b>"
 
-#: setup/setup.glade:229
-msgid "Lookup table orientation:"
+#: setup/setup.glade:222
+#, fuzzy
+msgid "Candidates orientation:"
 msgstr "Orientation de la table :"
 
-#: setup/setup.glade:240
+#: setup/setup.glade:232
 msgid ""
 "Horizontal\n"
 "Vertical"
@@ -148,60 +150,39 @@ msgstr ""
 "Horizontal\n"
 "Vertical"
 
-#: setup/setup.glade:257
+#: setup/setup.glade:249
 msgid "Show language panel:"
 msgstr ""
 
-#: setup/setup.glade:268
+#: setup/setup.glade:259
 msgid ""
-"Always Hide\n"
-"On Daemon\n"
-"Always Show"
+"Never\n"
+"Dynamically\n"
+"Always"
 msgstr ""
 
-#: setup/setup.glade:285
+#: setup/setup.glade:276
 msgid "Use custom font"
 msgstr "Utiliser une police personnalisée"
 
-#: setup/setup.glade:311
-msgid "<b>Font and Style</b>"
-msgstr ""
-
-#: setup/setup.glade:336
+#: setup/setup.glade:292
 #, fuzzy
-msgid "Start ibus on login"
-msgstr "Démarrer automatiquement IBus lors de la connexion"
+msgid "Custom font:"
+msgstr "Utiliser une police personnalisée"
 
-#: setup/setup.glade:346
-#, fuzzy
-msgid "<b>Startup</b>"
-msgstr "<b>Interface Utilisateur</b>"
+#: setup/setup.glade:317
+msgid "<b>Font and Style</b>"
+msgstr ""
 
-#: setup/setup.glade:371
+#: setup/setup.glade:337
 msgid "General"
 msgstr "Général"
 
-#: setup/setup.glade:442
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: setup/setup.glade:456
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: setup/setup.glade:471
-msgid "gtk-go-up"
-msgstr "gtk-go-up"
-
-#: setup/setup.glade:486
-msgid "gtk-go-down"
-msgstr "gtk-go-down"
-
-#: setup/setup.glade:513
+#: setup/setup.glade:465
 msgid "Input Methods"
 msgstr ""
 
-#: setup/setup.glade:529
+#: setup/setup.glade:482
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -217,13 +198,41 @@ msgstr ""
 "\n"
 "\n"
 
-#: setup/setup.glade:554
+#: setup/setup.glade:510
+#, fuzzy
+msgid "Start ibus on login"
+msgstr "Démarrer automatiquement IBus lors de la connexion"
+
+#: setup/setup.glade:521
+#, fuzzy
+msgid "<b>Startup</b>"
+msgstr "<b>Interface Utilisateur</b>"
+
+#: setup/setup.glade:543
 msgid "About"
 msgstr "À propos"
 
-#: setup/setup.glade:576
-msgid "gtk-close"
-msgstr "gtk-close"
+#~ msgid "Trigger:"
+#~ msgstr "Déclencheur :"
+
+#, fuzzy
+#~ msgid "Previous IME:"
+#~ msgstr "Moteur précédent :"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "gtk-go-up"
+#~ msgstr "gtk-go-up"
+
+#~ msgid "gtk-go-down"
+#~ msgstr "gtk-go-down"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
 
 #~ msgid "Auto hide language bar"
 #~ msgstr "Cacher automatiquement la barre de langue"
diff --git a/po/ja.po b/po/ja.po
index f97ae09..24be937 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-06 10:39+0800\n"
+"POT-Creation-Date: 2009-03-11 14:12+0800\n"
 "PO-Revision-Date: 2008-08-28 17:31+0900\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -45,23 +45,23 @@ msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>"
 msgid "Switch engine"
 msgstr ""
 
-#: setup/main.py:99
+#: setup/main.py:103
 msgid "trigger"
 msgstr "トリガー"
 
-#: setup/main.py:109
+#: setup/main.py:113
 msgid "next engine"
 msgstr "次のエンジン"
 
-#: setup/main.py:119
+#: setup/main.py:123
 msgid "prev engine"
 msgstr "前のエンジン"
 
-#: setup/main.py:197
+#: setup/main.py:201
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus デーモンが動いていません。起動しますか？"
 
-#: setup/main.py:212
+#: setup/main.py:216
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -75,7 +75,7 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:227
+#: setup/main.py:231
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
@@ -112,31 +112,33 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:46
-msgid "Trigger:"
-msgstr "トリガー:"
+#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
+msgid "..."
+msgstr "..."
 
-#: setup/setup.glade:60
-msgid "Next engine:"
-msgstr "次のエンジン:"
+#: setup/setup.glade:148
+msgid "previous input method:"
+msgstr ""
 
-#: setup/setup.glade:76
-msgid "Previous engine:"
-msgstr "前のエンジン:"
+#: setup/setup.glade:161
+#, fuzzy
+msgid "Next input method:"
+msgstr "次のエンジン:"
 
-#: setup/setup.glade:139 setup/setup.glade:156 setup/setup.glade:176
-msgid "..."
-msgstr "..."
+#: setup/setup.glade:174
+msgid "Enable or disable:"
+msgstr ""
 
-#: setup/setup.glade:197
+#: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>キーボードショートカット</b>"
 
-#: setup/setup.glade:229
-msgid "Lookup table orientation:"
+#: setup/setup.glade:222
+#, fuzzy
+msgid "Candidates orientation:"
 msgstr "候補ウィンドウの向き:"
 
-#: setup/setup.glade:240
+#: setup/setup.glade:232
 msgid ""
 "Horizontal\n"
 "Vertical"
@@ -144,60 +146,39 @@ msgstr ""
 "横\n"
 "縦"
 
-#: setup/setup.glade:257
+#: setup/setup.glade:249
 msgid "Show language panel:"
 msgstr ""
 
-#: setup/setup.glade:268
+#: setup/setup.glade:259
 msgid ""
-"Always Hide\n"
-"On Daemon\n"
-"Always Show"
+"Never\n"
+"Dynamically\n"
+"Always"
 msgstr ""
 
-#: setup/setup.glade:285
+#: setup/setup.glade:276
 msgid "Use custom font"
 msgstr "カスタムフォントを使う"
 
-#: setup/setup.glade:311
-msgid "<b>Font and Style</b>"
-msgstr ""
-
-#: setup/setup.glade:336
+#: setup/setup.glade:292
 #, fuzzy
-msgid "Start ibus on login"
-msgstr "セッションログイン時に IBus を自動的に起動"
+msgid "Custom font:"
+msgstr "カスタムフォントを使う"
 
-#: setup/setup.glade:346
-msgid "<b>Startup</b>"
+#: setup/setup.glade:317
+msgid "<b>Font and Style</b>"
 msgstr ""
 
-#: setup/setup.glade:371
+#: setup/setup.glade:337
 msgid "General"
 msgstr "一般"
 
-#: setup/setup.glade:442
-msgid "gtk-add"
-msgstr ""
-
-#: setup/setup.glade:456
-#, fuzzy
-msgid "gtk-remove"
-msgstr "gtk-close"
-
-#: setup/setup.glade:471
-msgid "gtk-go-up"
-msgstr ""
-
-#: setup/setup.glade:486
-msgid "gtk-go-down"
-msgstr ""
-
-#: setup/setup.glade:513
+#: setup/setup.glade:465
 msgid "Input Methods"
 msgstr ""
 
-#: setup/setup.glade:529
+#: setup/setup.glade:482
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -207,13 +188,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: setup/setup.glade:554
+#: setup/setup.glade:510
+#, fuzzy
+msgid "Start ibus on login"
+msgstr "セッションログイン時に IBus を自動的に起動"
+
+#: setup/setup.glade:521
+msgid "<b>Startup</b>"
+msgstr ""
+
+#: setup/setup.glade:543
 msgid "About"
 msgstr "About"
 
-#: setup/setup.glade:576
-msgid "gtk-close"
-msgstr "gtk-close"
+#~ msgid "Trigger:"
+#~ msgstr "トリガー:"
+
+#, fuzzy
+#~ msgid "Previous IME:"
+#~ msgstr "前のエンジン:"
+
+#, fuzzy
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
 
 #~ msgid "Auto hide language bar"
 #~ msgstr "言語バーを自動で隠す"
diff --git a/po/pa.po b/po/pa.po
index 375c53e..096f1ad 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-06 10:39+0800\n"
+"POT-Creation-Date: 2009-03-11 14:12+0800\n"
 "PO-Revision-Date: 2008-10-17 14:15+0530\n"
 "Last-Translator: Amanpreet Singh <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-l10n@lists.sf.net>\n"
@@ -45,23 +45,23 @@ msgstr "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
 msgid "Switch engine"
 msgstr "ਇੰਜਣ ਬਦਲੋ"
 
-#: setup/main.py:99
+#: setup/main.py:103
 msgid "trigger"
 msgstr "ਟਰਿੱਗਰ"
 
-#: setup/main.py:109
+#: setup/main.py:113
 msgid "next engine"
 msgstr "ਅਗਲਾ ਇੰਜਣ"
 
-#: setup/main.py:119
+#: setup/main.py:123
 msgid "prev engine"
 msgstr "ਪਿਛਲਾ ਇੰਜਣ"
 
-#: setup/main.py:197
+#: setup/main.py:201
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: setup/main.py:212
+#: setup/main.py:216
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -74,7 +74,7 @@ msgstr ""
 "
  export XMODIFIERS=@im=ibus\n"
 "
  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:227
+#: setup/main.py:231
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
@@ -111,31 +111,33 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:46
-msgid "Trigger:"
-msgstr "ਟਰਿੱਗਰ:"
+#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
+msgid "..."
+msgstr "..."
 
-#: setup/setup.glade:60
-msgid "Next engine:"
-msgstr "ਅਗਲਾ ਇੰਜਣ:"
+#: setup/setup.glade:148
+msgid "previous input method:"
+msgstr ""
 
-#: setup/setup.glade:76
-msgid "Previous engine:"
-msgstr "ਪਿਛਲਾ ਇੰਜਣ"
+#: setup/setup.glade:161
+#, fuzzy
+msgid "Next input method:"
+msgstr "ਅਗਲਾ ਇੰਜਣ:"
 
-#: setup/setup.glade:139 setup/setup.glade:156 setup/setup.glade:176
-msgid "..."
-msgstr "..."
+#: setup/setup.glade:174
+msgid "Enable or disable:"
+msgstr ""
 
-#: setup/setup.glade:197
+#: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ</b>"
 
-#: setup/setup.glade:229
-msgid "Lookup table orientation:"
+#: setup/setup.glade:222
+#, fuzzy
+msgid "Candidates orientation:"
 msgstr "ਖੋਜ ਟੇਬਲ ਸਥਿਤੀ:"
 
-#: setup/setup.glade:240
+#: setup/setup.glade:232
 msgid ""
 "Horizontal\n"
 "Vertical"
@@ -143,60 +145,39 @@ msgstr ""
 "ਹਰੀਜੱਟਲ\n"
 "
ਵਰਟੀਕਲ"
 
-#: setup/setup.glade:257
+#: setup/setup.glade:249
 msgid "Show language panel:"
 msgstr ""
 
-#: setup/setup.glade:268
+#: setup/setup.glade:259
 msgid ""
-"Always Hide\n"
-"On Daemon\n"
-"Always Show"
+"Never\n"
+"Dynamically\n"
+"Always"
 msgstr ""
 
-#: setup/setup.glade:285
+#: setup/setup.glade:276
 msgid "Use custom font"
 msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: setup/setup.glade:311
-msgid "<b>Font and Style</b>"
-msgstr ""
-
-#: setup/setup.glade:336
+#: setup/setup.glade:292
 #, fuzzy
-msgid "Start ibus on login"
-msgstr "ਸ਼ੈਸ਼ਨ ਲਾਗਇਨ ਨਾਲ IBus ਆਟੋਮੈਟਿਕ ਚਾਲੂ ਕਰੋ"
+msgid "Custom font:"
+msgstr "ਪਸੰਦੀਦਾ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: setup/setup.glade:346
-#, fuzzy
-msgid "<b>Startup</b>"
-msgstr "<b>UI</b>"
+#: setup/setup.glade:317
+msgid "<b>Font and Style</b>"
+msgstr ""
 
-#: setup/setup.glade:371
+#: setup/setup.glade:337
 msgid "General"
 msgstr "ਆਮ"
 
-#: setup/setup.glade:442
-msgid "gtk-add"
-msgstr ""
-
-#: setup/setup.glade:456
-msgid "gtk-remove"
-msgstr "gtk-close"
-
-#: setup/setup.glade:471
-msgid "gtk-go-up"
-msgstr ""
-
-#: setup/setup.glade:486
-msgid "gtk-go-down"
-msgstr ""
-
-#: setup/setup.glade:513
+#: setup/setup.glade:465
 msgid "Input Methods"
 msgstr ""
 
-#: setup/setup.glade:529
+#: setup/setup.glade:482
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -212,13 +193,32 @@ msgstr ""
 "
\n"
 "
\n"
 
-#: setup/setup.glade:554
+#: setup/setup.glade:510
+#, fuzzy
+msgid "Start ibus on login"
+msgstr "ਸ਼ੈਸ਼ਨ ਲਾਗਇਨ ਨਾਲ IBus ਆਟੋਮੈਟਿਕ ਚਾਲੂ ਕਰੋ"
+
+#: setup/setup.glade:521
+#, fuzzy
+msgid "<b>Startup</b>"
+msgstr "<b>UI</b>"
+
+#: setup/setup.glade:543
 msgid "About"
 msgstr "ਇਸ ਬਾਰੇ"
 
-#: setup/setup.glade:576
-msgid "gtk-close"
-msgstr "gtk-close"
+#~ msgid "Trigger:"
+#~ msgstr "ਟਰਿੱਗਰ:"
+
+#, fuzzy
+#~ msgid "Previous IME:"
+#~ msgstr "ਪਿਛਲਾ ਇੰਜਣ"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
 
 #~ msgid "Auto hide language bar"
 #~ msgstr "ਭਾਸ਼ਾ ਪੱਟੀ ਆਟੋਮੈਟਿਕ ਓਹਲੇ ਕਰੋ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 984517c..adf0f77 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1.20080813\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-06 10:39+0800\n"
+"POT-Creation-Date: 2009-03-11 14:12+0800\n"
 "PO-Revision-Date: 2008-08-13 21:59+0800\n"
 "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
 "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"
@@ -45,23 +45,23 @@ msgstr "Huang Peng <shawn.p.huang@gmail.com>"
 msgid "Switch engine"
 msgstr "切换引擎"
 
-#: setup/main.py:99
+#: setup/main.py:103
 msgid "trigger"
 msgstr "开关"
 
-#: setup/main.py:109
+#: setup/main.py:113
 msgid "next engine"
 msgstr "下一个引擎"
 
-#: setup/main.py:119
+#: setup/main.py:123
 msgid "prev engine"
 msgstr "上一个引擎"
 
-#: setup/main.py:197
+#: setup/main.py:201
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus守护进程没有启动，您是否想现在启动它？"
 
-#: setup/main.py:212
+#: setup/main.py:216
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -74,7 +74,7 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:227
+#: setup/main.py:231
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择%s的快捷键"
@@ -111,31 +111,31 @@ msgstr "选择输入法"
 msgid "IBus Preferences"
 msgstr "IBus设置"
 
-#: setup/setup.glade:46
-msgid "Trigger:"
-msgstr "开关:"
+#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
+msgid "..."
+msgstr ""
 
-#: setup/setup.glade:60
-msgid "Next engine:"
-msgstr "下一个引擎:"
+#: setup/setup.glade:148
+msgid "previous input method:"
+msgstr "前一入法"
 
-#: setup/setup.glade:76
-msgid "Previous engine:"
-msgstr "上一个引擎:"
+#: setup/setup.glade:161
+msgid "Next input method:"
+msgstr "下一入法"
 
-#: setup/setup.glade:139 setup/setup.glade:156 setup/setup.glade:176
-msgid "..."
-msgstr ""
+#: setup/setup.glade:174
+msgid "Enable or disable:"
+msgstr "开关"
 
-#: setup/setup.glade:197
+#: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>快捷键</b>"
 
-#: setup/setup.glade:229
-msgid "Lookup table orientation:"
-msgstr "候选词表方向:"
+#: setup/setup.glade:222
+msgid "Candidates orientation:"
+msgstr "候选词排列方向:"
 
-#: setup/setup.glade:240
+#: setup/setup.glade:232
 msgid ""
 "Horizontal\n"
 "Vertical"
@@ -143,62 +143,41 @@ msgstr ""
 "水平\n"
 "竖直"
 
-#: setup/setup.glade:257
+#: setup/setup.glade:249
 msgid "Show language panel:"
 msgstr "显示语言栏"
 
-#: setup/setup.glade:268
+#: setup/setup.glade:259
 msgid ""
-"Always Hide\n"
-"On Daemon\n"
-"Always Show"
+"Never\n"
+"Dynamically\n"
+"Always"
 msgstr ""
-"总是隐藏\n"
-"按需要显示\n"
-"总是显示"
-
+"从不\n"
+"动态\n"
+"总是"
 
-#: setup/setup.glade:285
+#: setup/setup.glade:276
 msgid "Use custom font"
 msgstr "使用自定义字体"
 
-#: setup/setup.glade:311
+#: setup/setup.glade:292
+msgid "Custom font:"
+msgstr "自定义字体:"
+
+#: setup/setup.glade:317
 msgid "<b>Font and Style</b>"
 msgstr "<b>字体和风格</b>"
 
-#: setup/setup.glade:336
-msgid "Start ibus on login"
-msgstr "启动桌面时自动启动IBus"
-
-#: setup/setup.glade:346
-msgid "<b>Startup</b>"
-msgstr "<b>启动</b>"
-
-#: setup/setup.glade:371
+#: setup/setup.glade:337
 msgid "General"
 msgstr "通用"
 
-#: setup/setup.glade:442
-msgid "gtk-add"
-msgstr ""
-
-#: setup/setup.glade:456
-msgid "gtk-remove"
-msgstr ""
-
-#: setup/setup.glade:471
-msgid "gtk-go-up"
-msgstr ""
-
-#: setup/setup.glade:486
-msgid "gtk-go-down"
-msgstr ""
-
-#: setup/setup.glade:513
+#: setup/setup.glade:465
 msgid "Input Methods"
 msgstr "输入法"
 
-#: setup/setup.glade:529
+#: setup/setup.glade:482
 msgid ""
 "<big><b>IBus</b></big>\n"
 "<small>The intelligent input bus</small>\n"
@@ -208,13 +187,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: setup/setup.glade:554
+#: setup/setup.glade:510
+msgid "Start ibus on login"
+msgstr "启动桌面时自动启动IBus"
+
+#: setup/setup.glade:521
+msgid "<b>Startup</b>"
+msgstr "<b>启动</b>"
+
+#: setup/setup.glade:543
 msgid "About"
 msgstr "关于"
 
-#: setup/setup.glade:576
-msgid "gtk-close"
-msgstr ""
-
-#~ msgid "Auto hide language bar"
-#~ msgstr "自动隐藏语言栏"
diff --git a/setup/main.py b/setup/main.py
index afd7e0b..c67cbd9 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -78,7 +78,11 @@ class Setup(object):
 
     def __init_ui(self):
         # add icon search path
-        self.__dialog = self.__xml.get_widget("dialog_setup")
+        self.__window = self.__xml.get_widget("window_preferences")
+        self.__window.connect("delete-event", gtk.main_quit)
+
+        self.__button_close = self.__xml.get_widget("button_close")
+        self.__button_close.connect("clicked", gtk.main_quit)
 
         # auto start ibus
         self.__checkbutton_auto_start = self.__xml.get_widget("checkbutton_auto_start")
@@ -353,7 +357,8 @@ class Setup(object):
         pass
 
     def run(self):
-        return self.__dialog.run()
+        self.__window.show_all()
+        gtk.main()
 
 if __name__ == "__main__":
     Setup().run()
diff --git a/setup/setup.glade b/setup/setup.glade
index d6b31ee..694240b 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Mar  6 10:26:22 2009 -->
+<!--*- mode: xml -*-->
 <glade-interface>
-  <widget class="GtkDialog" id="dialog_setup">
-    <property name="border_width">5</property>
+  <widget class="GtkWindow" id="window_preferences">
+    <property name="border_width">12</property>
     <property name="title" translatable="yes">IBus Preferences</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
     <property name="icon_name">gtk-preferences</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
+    <child>
+      <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="spacing">2</property>
+        <property name="spacing">12</property>
         <child>
           <widget class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
@@ -20,11 +19,14 @@
             <child>
               <widget class="GtkAlignment" id="alignment3">
                 <property name="visible">True</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">6</property>
+                <property name="top_padding">12</property>
+                <property name="bottom_padding">12</property>
+                <property name="left_padding">12</property>
+                <property name="right_padding">12</property>
                 <child>
                   <widget class="GtkVBox" id="vbox5">
                     <property name="visible">True</property>
+                    <property name="spacing">18</property>
                     <child>
                       <widget class="GtkFrame" id="frame3">
                         <property name="visible">True</property>
@@ -33,158 +35,147 @@
                         <child>
                           <widget class="GtkAlignment" id="alignment4">
                             <property name="visible">True</property>
+                            <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
                               <widget class="GtkTable" id="table1">
                                 <property name="visible">True</property>
                                 <property name="n_rows">3</property>
-                                <property name="n_columns">3</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">6</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label7">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Trigger:</property>
-                                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Next engine:</property>
-                                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label9">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Previous engine:</property>
-                                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkEntry" id="entry_trigger">
+                                  <widget class="GtkHBox" id="hbox6">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="editable">False</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <widget class="GtkEntry" id="entry_prev_engine">
+                                        <property name="visible">True</property>
+                                        <property name="sensitive">False</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="editable">False</property>
+                                      </widget>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="button_prev_engine">
+                                        <property name="visible">True</property>
+                                        <property name="sensitive">False</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">...</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="entry_next_engine">
+                                  <widget class="GtkHBox" id="hbox5">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="editable">False</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <widget class="GtkEntry" id="entry_next_engine">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="editable">False</property>
+                                      </widget>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="button_next_engine">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">...</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="entry_prev_engine">
+                                  <widget class="GtkHBox" id="hbox4">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="editable">False</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <widget class="GtkEntry" id="entry_trigger">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="editable">False</property>
+                                      </widget>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="button_trigger">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">...</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button_trigger">
+                                  <widget class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="label" translatable="yes">...</property>
-                                    <property name="response_id">0</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">previous input method:</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button_next_engine">
+                                  <widget class="GtkLabel" id="label8">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="label" translatable="yes">...</property>
-                                    <property name="response_id">0</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Next input method:</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button_prev_engine">
+                                  <widget class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="label" translatable="yes">...</property>
-                                    <property name="response_id">0</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Enable or disable:</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
-                                    <property name="x_padding">4</property>
-                                    <property name="y_padding">4</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -214,10 +205,12 @@
                         <child>
                           <widget class="GtkAlignment" id="alignment5">
                             <property name="visible">True</property>
+                            <property name="top_padding">6</property>
                             <property name="left_padding">12</property>
                             <child>
                               <widget class="GtkVBox" id="vbox6">
                                 <property name="visible">True</property>
+                                <property name="spacing">6</property>
                                 <child>
                                   <widget class="GtkHBox" id="hbox2">
                                     <property name="visible">True</property>
@@ -225,13 +218,12 @@
                                     <child>
                                       <widget class="GtkLabel" id="label6">
                                         <property name="visible">True</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Lookup table orientation:</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Candidates orientation:</property>
                                         <property name="justify">GTK_JUSTIFY_RIGHT</property>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="padding">4</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -253,21 +245,20 @@ Vertical</property>
                                     <child>
                                       <widget class="GtkLabel" id="label10">
                                         <property name="visible">True</property>
-                                        <property name="xalign">1</property>
+                                        <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Show language panel:</property>
                                         <property name="justify">GTK_JUSTIFY_RIGHT</property>
                                       </widget>
                                       <packing>
                                         <property name="expand">False</property>
-                                        <property name="padding">4</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <widget class="GtkComboBox" id="combobox_panel_show">
                                         <property name="visible">True</property>
-                                        <property name="items" translatable="yes">Always Hide
-On Daemon
-Always Show</property>
+                                        <property name="items" translatable="yes">Never
+Dynamically
+Always</property>
                                       </widget>
                                       <packing>
                                         <property name="position">1</property>
@@ -283,6 +274,7 @@ Always Show</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="label" translatable="yes">Use custom font</property>
+                                    <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
                                   </widget>
@@ -291,11 +283,25 @@ Always Show</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkFontButton" id="fontbutton_custom_font">
+                                  <widget class="GtkHBox" id="hbox7">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="response_id">0</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label11">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Custom font:</property>
+                                      </widget>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkFontButton" id="fontbutton_custom_font">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </widget>
                                   <packing>
                                     <property name="position">3</property>
@@ -321,46 +327,6 @@ Always Show</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkFrame" id="frame1">
-                        <property name="label_xalign">0</property>
-                        <property name="shadow_type">GTK_SHADOW_NONE</property>
-                        <child>
-                          <widget class="GtkAlignment" id="alignment7">
-                            <property name="visible">True</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="checkbutton_auto_start">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Start ibus on login</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Startup&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="type">label_item</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">4</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </widget>
                 </child>
               </widget>
@@ -378,19 +344,18 @@ Always Show</property>
             <child>
               <widget class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
-                <property name="top_padding">2</property>
-                <property name="bottom_padding">2</property>
-                <property name="left_padding">2</property>
-                <property name="right_padding">2</property>
+                <property name="top_padding">12</property>
+                <property name="bottom_padding">12</property>
+                <property name="left_padding">12</property>
+                <property name="right_padding">12</property>
                 <child>
                   <widget class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkAlignment" id="alignment6">
                         <property name="visible">True</property>
-                        <property name="top_padding">4</property>
                         <child>
-                          <widget class="GtkVBox" id="vbox1">
+                          <widget class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
                             <property name="spacing">6</property>
                             <child>
@@ -400,11 +365,14 @@ Always Show</property>
                                   <placeholder/>
                                 </child>
                               </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                              </packing>
                             </child>
                             <child>
                               <widget class="GtkScrolledWindow" id="scrolledwindow_engine_treeview">
                                 <property name="width_request">240</property>
-                                <property name="height_request">350</property>
+                                <property name="height_request">300</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
@@ -425,10 +393,7 @@ Always Show</property>
                     <child>
                       <widget class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
-                        <property name="top_padding">8</property>
-                        <property name="bottom_padding">8</property>
-                        <property name="left_padding">8</property>
-                        <property name="right_padding">8</property>
+                        <property name="left_padding">12</property>
                         <child>
                           <widget class="GtkVButtonBox" id="vbuttonbox1">
                             <property name="visible">True</property>
@@ -438,28 +403,20 @@ Always Show</property>
                               <widget class="GtkButton" id="button_engine_add">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">gtk-add</property>
+                                <property name="label">gtk-add</property>
                                 <property name="use_stock">True</property>
                                 <property name="response_id">0</property>
                               </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                              </packing>
                             </child>
                             <child>
                               <widget class="GtkButton" id="button_engine_remove">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">gtk-remove</property>
+                                <property name="label">gtk-remove</property>
                                 <property name="use_stock">True</property>
                                 <property name="response_id">0</property>
                               </widget>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -467,14 +424,11 @@ Always Show</property>
                               <widget class="GtkButton" id="button_engine_up">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">gtk-go-up</property>
+                                <property name="label">gtk-go-up</property>
                                 <property name="use_stock">True</property>
                                 <property name="response_id">0</property>
                               </widget>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -482,14 +436,11 @@ Always Show</property>
                               <widget class="GtkButton" id="button_engine_down">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="label" translatable="yes">gtk-go-down</property>
+                                <property name="label">gtk-go-down</property>
                                 <property name="use_stock">True</property>
                                 <property name="response_id">0</property>
                               </widget>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
                                 <property name="position">3</property>
                               </packing>
                             </child>
@@ -497,6 +448,7 @@ Always Show</property>
                         </child>
                       </widget>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -520,6 +472,7 @@ Always Show</property>
             </child>
             <child>
               <widget class="GtkVBox" id="vbox4">
+                <property name="no_show_all">True</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -541,7 +494,43 @@ Homepage: http://code.google.com/p/ibus
                   </packing>
                 </child>
                 <child>
-                  <placeholder/>
+                  <widget class="GtkFrame" id="frame1">
+                    <property name="no_show_all">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment7">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="checkbutton_auto_start">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Start ibus on login</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Startup&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </widget>
               <packing>
@@ -560,32 +549,25 @@ Homepage: http://code.google.com/p/ibus
               </packing>
             </child>
           </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</property>
+            <property name="spacing">12</property>
             <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
               <widget class="GtkButton" id="button_close">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
                 <property name="response_id">0</property>
               </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </widget>
-- 
cgit 


From a8f1c7d06886f282ceeb2637a843935287eaa46e Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Wed, 11 Mar 2009 14:18:11 +0800
Subject: Change sensitive of custom font label.

---
 setup/main.py     |  5 +++
 setup/setup.glade | 94 +++++++++++++++++++++++++++----------------------------
 2 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/setup/main.py b/setup/main.py
index c67cbd9..42c3233 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -141,10 +141,13 @@ class Setup(object):
             self.__config.get_value("panel", "use_custom_font", False))
         self.__checkbutton_custom_font.connect("toggled", self.__checkbutton_custom_font_toggled_cb)
 
+        self.__label_custom_font = self.__xml.get_widget("label_custom_font")
         self.__fontbutton_custom_font = self.__xml.get_widget("fontbutton_custom_font")
         if self.__config.get_value("panel", "use_custom_font", False):
+            self.__label_custom_font.set_sensitive(True)
             self.__fontbutton_custom_font.set_sensitive(True)
         else:
+            self.__label_custom_font.set_sensitive(False)
             self.__fontbutton_custom_font.set_sensitive(False)
         font_name = gtk.settings_get_default().get_property("gtk-font-name")
         font_name = unicode(font_name, "utf-8")
@@ -339,9 +342,11 @@ class Setup(object):
 
     def __checkbutton_custom_font_toggled_cb(self, button):
         if self.__checkbutton_custom_font.get_active():
+            self.__label_custom_font.set_sensitive(True)
             self.__fontbutton_custom_font.set_sensitive(True)
             self.__config.set_value("panel", "use_custom_font", True)
         else:
+            self.__label_custom_font.set_sensitive(False)
             self.__fontbutton_custom_font.set_sensitive(False)
             self.__config.set_value("panel", "use_custom_font", False)
 
diff --git a/setup/setup.glade b/setup/setup.glade
index 694240b..a50efd1 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -45,21 +45,57 @@
                                 <property name="column_spacing">12</property>
                                 <property name="row_spacing">6</property>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox6">
+                                  <widget class="GtkLabel" id="label7">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Enable or disable:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label8">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Next input method:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label9">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">previous input method:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox4">
                                     <property name="visible">True</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <widget class="GtkEntry" id="entry_prev_engine">
+                                      <widget class="GtkEntry" id="entry_trigger">
                                         <property name="visible">True</property>
-                                        <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">False</property>
                                       </widget>
                                     </child>
                                     <child>
-                                      <widget class="GtkButton" id="button_prev_engine">
+                                      <widget class="GtkButton" id="button_trigger">
                                         <property name="visible">True</property>
-                                        <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">...</property>
                                         <property name="use_underline">True</property>
@@ -74,8 +110,6 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -111,19 +145,21 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox4">
+                                  <widget class="GtkHBox" id="hbox6">
                                     <property name="visible">True</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <widget class="GtkEntry" id="entry_trigger">
+                                      <widget class="GtkEntry" id="entry_prev_engine">
                                         <property name="visible">True</property>
+                                        <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">False</property>
                                       </widget>
                                     </child>
                                     <child>
-                                      <widget class="GtkButton" id="button_trigger">
+                                      <widget class="GtkButton" id="button_prev_engine">
                                         <property name="visible">True</property>
+                                        <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">...</property>
                                         <property name="use_underline">True</property>
@@ -138,44 +174,8 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label9">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">previous input method:</property>
-                                  </widget>
-                                  <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Next input method:</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label7">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Enable or disable:</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -286,7 +286,7 @@ Always</property>
                                   <widget class="GtkHBox" id="hbox7">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkLabel" id="label11">
+                                      <widget class="GtkLabel" id="label_custom_font">
                                         <property name="visible">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label" translatable="yes">Custom font:</property>
-- 
cgit 


From 09c1fe4ecaf790633d76408c4754ce535da6f4c5 Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Wed, 11 Mar 2009 14:28:50 +0800
Subject: Fix translation msg in zh_CN.po.

---
 po/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index adf0f77..b62134d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -145,7 +145,7 @@ msgstr ""
 
 #: setup/setup.glade:249
 msgid "Show language panel:"
-msgstr "显示语言栏"
+msgstr "显示语言栏:"
 
 #: setup/setup.glade:259
 msgid ""
-- 
cgit 


From 0dc9376baaf67e8fcb363b1c9623bd634e35ccff Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Wed, 11 Mar 2009 14:38:14 +0800
Subject: Fix problems during making distcheck

---
 src/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index ba868e0..9b3eafe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,6 @@ ibus_h_sources = \
 	ibusconfigprivate.h \
 	keyname-table.h \
 	$(ibus_public_h_sources) \
-	$(ibus_built_public_h_sources) \
 	$(NULL)
 ibus_c_sources = \
 	ibusshare.c \
@@ -103,19 +102,20 @@ ibus_c_sources = \
 	ibusenginedesc.c \
 	ibusobservedpath.c \
 	ibuscomponent.c \
-	$(ibus_built_c_sources) \
 	$(NULL)
-
 ibusincludedir = $(includedir)/ibus-1.0
 ibusinclude_HEADERS = \
 	$(ibus_public_h_sources) \
 	$(ibus_built_public_h_sources) \
 	$(NULL)
-
 libibus_la_SOURCES = \
 	$(ibus_h_sources) \
 	$(ibus_c_sources) \
 	$(NULL)
+nodist_libibus_la_SOURCES = \
+	$(ibus_built_h_sources) \
+	$(ibus_built_c_sources) \
+	$(NULL)
 libibus_la_CFLAGS = \
 	@X11_CFLAGS@ \
 	@GLIB2_CFLAGS@ \
-- 
cgit 


From 3a560b8f18128c28fa759eb32d10bee7fd86e008 Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Wed, 11 Mar 2009 14:39:30 +0800
Subject: Update po files.

---
 po/fr.po    | 26 +++++++++++++-------------
 po/ja.po    | 26 +++++++++++++-------------
 po/pa.po    | 26 +++++++++++++-------------
 po/zh_CN.po | 31 +++++++++++++++----------------
 4 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index a905f98..4b1850c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-11 14:12+0800\n"
+"POT-Creation-Date: 2009-03-11 14:31+0800\n"
 "PO-Revision-Date: 2009-02-06 01:55+0100\n"
 "Last-Translator: Julroy67 <julroy67@gmail.com>\n"
 "Language-Team: French <julroy67@gmail.com>\n"
@@ -59,11 +59,11 @@ msgstr "moteur suivant"
 msgid "prev engine"
 msgstr "moteur précédent"
 
-#: setup/main.py:201
+#: setup/main.py:204
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer maintenant ?"
 
-#: setup/main.py:216
+#: setup/main.py:219
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -78,7 +78,7 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:231
+#: setup/main.py:234
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "Choisissez le raccourci clavier pour %s"
@@ -116,23 +116,23 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
-msgid "..."
-msgstr "…"
-
-#: setup/setup.glade:148
-msgid "previous input method:"
+#: setup/setup.glade:51
+msgid "Enable or disable:"
 msgstr ""
 
-#: setup/setup.glade:161
+#: setup/setup.glade:62
 #, fuzzy
 msgid "Next input method:"
 msgstr "Moteur suivant :"
 
-#: setup/setup.glade:174
-msgid "Enable or disable:"
+#: setup/setup.glade:76
+msgid "previous input method:"
 msgstr ""
 
+#: setup/setup.glade:100 setup/setup.glade:130 setup/setup.glade:164
+msgid "..."
+msgstr "…"
+
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Raccourcis claviers</b>"
diff --git a/po/ja.po b/po/ja.po
index 24be937..185f58e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-11 14:12+0800\n"
+"POT-Creation-Date: 2009-03-11 14:31+0800\n"
 "PO-Revision-Date: 2008-08-28 17:31+0900\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -57,11 +57,11 @@ msgstr "次のエンジン"
 msgid "prev engine"
 msgstr "前のエンジン"
 
-#: setup/main.py:201
+#: setup/main.py:204
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus デーモンが動いていません。起動しますか？"
 
-#: setup/main.py:216
+#: setup/main.py:219
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -75,7 +75,7 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:231
+#: setup/main.py:234
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
@@ -112,23 +112,23 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
-msgid "..."
-msgstr "..."
-
-#: setup/setup.glade:148
-msgid "previous input method:"
+#: setup/setup.glade:51
+msgid "Enable or disable:"
 msgstr ""
 
-#: setup/setup.glade:161
+#: setup/setup.glade:62
 #, fuzzy
 msgid "Next input method:"
 msgstr "次のエンジン:"
 
-#: setup/setup.glade:174
-msgid "Enable or disable:"
+#: setup/setup.glade:76
+msgid "previous input method:"
 msgstr ""
 
+#: setup/setup.glade:100 setup/setup.glade:130 setup/setup.glade:164
+msgid "..."
+msgstr "..."
+
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>キーボードショートカット</b>"
diff --git a/po/pa.po b/po/pa.po
index 096f1ad..425a788 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-11 14:12+0800\n"
+"POT-Creation-Date: 2009-03-11 14:31+0800\n"
 "PO-Revision-Date: 2008-10-17 14:15+0530\n"
 "Last-Translator: Amanpreet Singh <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-l10n@lists.sf.net>\n"
@@ -57,11 +57,11 @@ msgstr "ਅਗਲਾ ਇੰਜਣ"
 msgid "prev engine"
 msgstr "ਪਿਛਲਾ ਇੰਜਣ"
 
-#: setup/main.py:201
+#: setup/main.py:204
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: setup/main.py:216
+#: setup/main.py:219
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -74,7 +74,7 @@ msgstr ""
 "
  export XMODIFIERS=@im=ibus\n"
 "
  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:231
+#: setup/main.py:234
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s ਲਈ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਚੁਣੋ"
@@ -111,23 +111,23 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
-msgid "..."
-msgstr "..."
-
-#: setup/setup.glade:148
-msgid "previous input method:"
+#: setup/setup.glade:51
+msgid "Enable or disable:"
 msgstr ""
 
-#: setup/setup.glade:161
+#: setup/setup.glade:62
 #, fuzzy
 msgid "Next input method:"
 msgstr "ਅਗਲਾ ਇੰਜਣ:"
 
-#: setup/setup.glade:174
-msgid "Enable or disable:"
+#: setup/setup.glade:76
+msgid "previous input method:"
 msgstr ""
 
+#: setup/setup.glade:100 setup/setup.glade:130 setup/setup.glade:164
+msgid "..."
+msgstr "..."
+
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ</b>"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b62134d..eb95e2f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1.20080813\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-11 14:12+0800\n"
+"POT-Creation-Date: 2009-03-11 14:31+0800\n"
 "PO-Revision-Date: 2008-08-13 21:59+0800\n"
 "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
 "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"
@@ -57,11 +57,11 @@ msgstr "下一个引擎"
 msgid "prev engine"
 msgstr "上一个引擎"
 
-#: setup/main.py:201
+#: setup/main.py:204
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus守护进程没有启动，您是否想现在启动它？"
 
-#: setup/main.py:216
+#: setup/main.py:219
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -74,7 +74,7 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:231
+#: setup/main.py:234
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择%s的快捷键"
@@ -111,21 +111,21 @@ msgstr "选择输入法"
 msgid "IBus Preferences"
 msgstr "IBus设置"
 
-#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
-msgid "..."
-msgstr ""
-
-#: setup/setup.glade:148
-msgid "previous input method:"
-msgstr "前一入法"
+#: setup/setup.glade:51
+msgid "Enable or disable:"
+msgstr "开关"
 
-#: setup/setup.glade:161
+#: setup/setup.glade:62
 msgid "Next input method:"
 msgstr "下一入法"
 
-#: setup/setup.glade:174
-msgid "Enable or disable:"
-msgstr "开关"
+#: setup/setup.glade:76
+msgid "previous input method:"
+msgstr "前一入法"
+
+#: setup/setup.glade:100 setup/setup.glade:130 setup/setup.glade:164
+msgid "..."
+msgstr ""
 
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
@@ -198,4 +198,3 @@ msgstr "<b>启动</b>"
 #: setup/setup.glade:543
 msgid "About"
 msgstr "关于"
-
-- 
cgit 


From 6af7e9f2f1ff18e4a6334d15f14c27e3edf2111c Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Wed, 11 Mar 2009 15:51:34 +0800
Subject: Implement ibus_engine_forward_event_key function.

---
 src/ibusengine.c | 4 +---
 src/ibusengine.h | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/ibusengine.c b/src/ibusengine.c
index d924e25..e664454 100644
--- a/src/ibusengine.c
+++ b/src/ibusengine.c
@@ -942,13 +942,11 @@ void ibus_engine_hide_lookup_table (IBusEngine *engine)
 
 void ibus_engine_forward_key_event (IBusEngine      *engine,
                                     guint            keyval,
-                                    gboolean         is_press,
                                     guint            state)
 {
     _send_signal (engine,
-                  "HideLookupTable",
+                  "ForwardKeyEvent",
                   G_TYPE_UINT, &keyval,
-                  G_TYPE_BOOLEAN, &is_press,
                   G_TYPE_UINT, &state,
                   G_TYPE_INVALID);
 }
diff --git a/src/ibusengine.h b/src/ibusengine.h
index 1a35c06..5a86bf0 100644
--- a/src/ibusengine.h
+++ b/src/ibusengine.h
@@ -137,7 +137,6 @@ void         ibus_engine_hide_lookup_table
 void         ibus_engine_forward_key_event
                                         (IBusEngine         *engine,
                                          guint               keyval,
-                                         gboolean            is_press,
                                          guint               state);
 
 void         ibus_engine_register_properties
-- 
cgit 


From 9f2ca25b5638cc1e3f10a2671472dbd72e45e479 Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Wed, 11 Mar 2009 15:54:39 +0800
Subject: Remove is_press from ForwardKeyEvent signal.

---
 src/ibusinputcontext.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
index 94de55a..95754cf 100644
--- a/src/ibusinputcontext.c
+++ b/src/ibusinputcontext.c
@@ -426,14 +426,12 @@ ibus_input_context_ibus_signal (IBusProxy           *proxy,
                                      IBUS_INTERFACE_INPUT_CONTEXT,
                                      "ForwardKeyEvent")) {
         guint32 keyval;
-        gboolean is_press;
         guint32 state;
         gboolean retval;
 
         retval = ibus_message_get_args (message,
                                         &error,
                                         G_TYPE_UINT, &keyval,
-                                        G_TYPE_BOOLEAN, &is_press,
                                         G_TYPE_UINT, &state,
                                         G_TYPE_INVALID);
 
-- 
cgit 


From 4b3a45829005626d9f6e23dfde97731b70e2bdeb Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Wed, 11 Mar 2009 15:56:47 +0800
Subject: Remove is_press argument from gtk im module.

---
 client/gtk2/ibusimcontext.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 29e7753..4483696 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -569,7 +569,6 @@ _ibus_context_commit_text_cb (IBusInputContext *ibus_context,
 static void
 _ibus_context_forward_key_event_cb (IBusInputContext  *ibus_context,
                                     guint              keyval,
-                                    gboolean           is_press,
                                     guint              state,
                                     IBusIMContext     *context)
 {
@@ -579,7 +578,7 @@ _ibus_context_forward_key_event_cb (IBusInputContext  *ibus_context,
     IBusIMContextPrivate *priv;
 
     priv = context->priv;
-    event = (GdkEventKey *)gdk_event_new (is_press ? GDK_KEY_PRESS : GDK_KEY_RELEASE);
+    event = (GdkEventKey *)gdk_event_new (state & IBUS_RELEASE_MASK ? GDK_KEY_RELEASE : GDK_KEY_PRESS);
 
     event->time = GDK_CURRENT_TIME;
     event->window = g_object_ref (priv->client_window);
-- 
cgit 


From bf9ed69bfa4ee7c82397ba28b18869e1c80cc1a7 Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Fri, 20 Mar 2009 09:52:51 +0800
Subject: Change "Dynamically" to "When active" in setup window.

---
 po/fr.po          | 22 ++++++-------
 po/ja.po          | 22 ++++++-------
 po/pa.po          | 22 ++++++-------
 po/zh_CN.po       | 28 ++++++++---------
 setup/setup.glade | 94 +++++++++++++++++++++++++++----------------------------
 5 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 4b1850c..8d6e071 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-11 14:31+0800\n"
+"POT-Creation-Date: 2009-03-20 09:52+0800\n"
 "PO-Revision-Date: 2009-02-06 01:55+0100\n"
 "Last-Translator: Julroy67 <julroy67@gmail.com>\n"
 "Language-Team: French <julroy67@gmail.com>\n"
@@ -116,23 +116,23 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:51
-msgid "Enable or disable:"
+#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
+msgid "..."
+msgstr "…"
+
+#: setup/setup.glade:148
+msgid "previous input method:"
 msgstr ""
 
-#: setup/setup.glade:62
+#: setup/setup.glade:161
 #, fuzzy
 msgid "Next input method:"
 msgstr "Moteur suivant :"
 
-#: setup/setup.glade:76
-msgid "previous input method:"
+#: setup/setup.glade:174
+msgid "Enable or disable:"
 msgstr ""
 
-#: setup/setup.glade:100 setup/setup.glade:130 setup/setup.glade:164
-msgid "..."
-msgstr "…"
-
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>Raccourcis claviers</b>"
@@ -157,7 +157,7 @@ msgstr ""
 #: setup/setup.glade:259
 msgid ""
 "Never\n"
-"Dynamically\n"
+"When active\n"
 "Always"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 185f58e..0c40d33 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-11 14:31+0800\n"
+"POT-Creation-Date: 2009-03-20 09:52+0800\n"
 "PO-Revision-Date: 2008-08-28 17:31+0900\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -112,23 +112,23 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:51
-msgid "Enable or disable:"
+#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
+msgid "..."
+msgstr "..."
+
+#: setup/setup.glade:148
+msgid "previous input method:"
 msgstr ""
 
-#: setup/setup.glade:62
+#: setup/setup.glade:161
 #, fuzzy
 msgid "Next input method:"
 msgstr "次のエンジン:"
 
-#: setup/setup.glade:76
-msgid "previous input method:"
+#: setup/setup.glade:174
+msgid "Enable or disable:"
 msgstr ""
 
-#: setup/setup.glade:100 setup/setup.glade:130 setup/setup.glade:164
-msgid "..."
-msgstr "..."
-
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>キーボードショートカット</b>"
@@ -153,7 +153,7 @@ msgstr ""
 #: setup/setup.glade:259
 msgid ""
 "Never\n"
-"Dynamically\n"
+"When active\n"
 "Always"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 425a788..0bb12ce 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-11 14:31+0800\n"
+"POT-Creation-Date: 2009-03-20 09:52+0800\n"
 "PO-Revision-Date: 2008-10-17 14:15+0530\n"
 "Last-Translator: Amanpreet Singh <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-l10n@lists.sf.net>\n"
@@ -111,23 +111,23 @@ msgstr ""
 msgid "IBus Preferences"
 msgstr ""
 
-#: setup/setup.glade:51
-msgid "Enable or disable:"
+#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
+msgid "..."
+msgstr "..."
+
+#: setup/setup.glade:148
+msgid "previous input method:"
 msgstr ""
 
-#: setup/setup.glade:62
+#: setup/setup.glade:161
 #, fuzzy
 msgid "Next input method:"
 msgstr "ਅਗਲਾ ਇੰਜਣ:"
 
-#: setup/setup.glade:76
-msgid "previous input method:"
+#: setup/setup.glade:174
+msgid "Enable or disable:"
 msgstr ""
 
-#: setup/setup.glade:100 setup/setup.glade:130 setup/setup.glade:164
-msgid "..."
-msgstr "..."
-
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ</b>"
@@ -152,7 +152,7 @@ msgstr ""
 #: setup/setup.glade:259
 msgid ""
 "Never\n"
-"Dynamically\n"
+"When active\n"
 "Always"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eb95e2f..6713459 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1.20080813\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-03-11 14:31+0800\n"
+"POT-Creation-Date: 2009-03-20 09:52+0800\n"
 "PO-Revision-Date: 2008-08-13 21:59+0800\n"
 "Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
 "Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"
@@ -111,21 +111,21 @@ msgstr "选择输入法"
 msgid "IBus Preferences"
 msgstr "IBus设置"
 
-#: setup/setup.glade:51
-msgid "Enable or disable:"
-msgstr "开关"
-
-#: setup/setup.glade:62
-msgid "Next input method:"
-msgstr "下一入法"
+#: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
+msgid "..."
+msgstr ""
 
-#: setup/setup.glade:76
+#: setup/setup.glade:148
 msgid "previous input method:"
 msgstr "前一入法"
 
-#: setup/setup.glade:100 setup/setup.glade:130 setup/setup.glade:164
-msgid "..."
-msgstr ""
+#: setup/setup.glade:161
+msgid "Next input method:"
+msgstr "下一入法"
+
+#: setup/setup.glade:174
+msgid "Enable or disable:"
+msgstr "开关"
 
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
@@ -150,11 +150,11 @@ msgstr "显示语言栏:"
 #: setup/setup.glade:259
 msgid ""
 "Never\n"
-"Dynamically\n"
+"When active\n"
 "Always"
 msgstr ""
 "从不\n"
-"动态\n"
+"活动时\n"
 "总是"
 
 #: setup/setup.glade:276
diff --git a/setup/setup.glade b/setup/setup.glade
index a50efd1..ab7b061 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -45,57 +45,21 @@
                                 <property name="column_spacing">12</property>
                                 <property name="row_spacing">6</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label7">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Enable or disable:</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Next input method:</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label9">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">previous input method:</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkHBox" id="hbox4">
+                                  <widget class="GtkHBox" id="hbox6">
                                     <property name="visible">True</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <widget class="GtkEntry" id="entry_trigger">
+                                      <widget class="GtkEntry" id="entry_prev_engine">
                                         <property name="visible">True</property>
+                                        <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">False</property>
                                       </widget>
                                     </child>
                                     <child>
-                                      <widget class="GtkButton" id="button_trigger">
+                                      <widget class="GtkButton" id="button_prev_engine">
                                         <property name="visible">True</property>
+                                        <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">...</property>
                                         <property name="use_underline">True</property>
@@ -110,6 +74,8 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -145,21 +111,19 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox6">
+                                  <widget class="GtkHBox" id="hbox4">
                                     <property name="visible">True</property>
                                     <property name="spacing">6</property>
                                     <child>
-                                      <widget class="GtkEntry" id="entry_prev_engine">
+                                      <widget class="GtkEntry" id="entry_trigger">
                                         <property name="visible">True</property>
-                                        <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="editable">False</property>
                                       </widget>
                                     </child>
                                     <child>
-                                      <widget class="GtkButton" id="button_prev_engine">
+                                      <widget class="GtkButton" id="button_trigger">
                                         <property name="visible">True</property>
-                                        <property name="sensitive">False</property>
                                         <property name="can_focus">True</property>
                                         <property name="label" translatable="yes">...</property>
                                         <property name="use_underline">True</property>
@@ -174,8 +138,44 @@
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label9">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">previous input method:</property>
+                                  </widget>
+                                  <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label8">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Next input method:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label7">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Enable or disable:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -257,7 +257,7 @@ Vertical</property>
                                       <widget class="GtkComboBox" id="combobox_panel_show">
                                         <property name="visible">True</property>
                                         <property name="items" translatable="yes">Never
-Dynamically
+When active
 Always</property>
                                       </widget>
                                       <packing>
-- 
cgit 


From ab417dd043ee6ba338518758c1c833f6ccbb7bdf Mon Sep 17 00:00:00 2001
From: Huang Peng <shawn.p.huang@gmail.com>
Date: Fri, 20 Mar 2009 11:24:27 +0800
Subject: Update ja.po by iwaim.sub

---
 po/ja.po | 87 +++++++++++++++++++++++-----------------------------------------
 1 file changed, 31 insertions(+), 56 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 0c40d33..eeb2117 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
 "POT-Creation-Date: 2009-03-20 09:52+0800\n"
-"PO-Revision-Date: 2008-08-28 17:31+0900\n"
-"Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
+"PO-Revision-Date: 2009-03-19 16:12+0900\n"
+"Last-Translator: IWAI, Masaharu <iwai@alib.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +19,33 @@ msgstr ""
 #: ibus/lang.py:40 ui/gtk/panel.py:307 ui/gtk/panel.py:308 ui/gtk/panel.py:309
 #: ui/gtk/panel.py:310
 msgid "Other"
-msgstr ""
+msgstr "その他"
 
 #: ui/gtk/panel.py:97
 msgid "IBus input method framework"
-msgstr ""
+msgstr "IBus インプットメソッドフレームワーク"
 
 #: ui/gtk/panel.py:282
 msgid "Restart"
-msgstr ""
+msgstr "再起動"
 
 #: ui/gtk/panel.py:337
 msgid "No input method"
-msgstr ""
+msgstr "インプットメソッドがありません"
 
 #: ui/gtk/panel.py:383
 msgid "IBus is an intelligent input bus for Linux/Unix."
-msgstr ""
+msgstr "IBus は、Linux/Unix のためのインテリジェントなインプットバスです。"
 
 #: ui/gtk/panel.py:387
 msgid "translator-credits"
-msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>"
+msgstr ""
+"UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
+"IWAI, Masaharu <iwai@alib.jp>"
 
 #: ui/gtk/languagebar.py:84
 msgid "Switch engine"
-msgstr ""
+msgstr "エンジンの変更"
 
 #: setup/main.py:103
 msgid "trigger"
@@ -106,11 +108,11 @@ msgstr "キーもしくはキーの組み合わせを入力してください"
 
 #: setup/enginecombobox.py:99
 msgid "Select an input method"
-msgstr ""
+msgstr "インプットメソッドの選択"
 
 #: setup/setup.glade:7
 msgid "IBus Preferences"
-msgstr ""
+msgstr "IBus の設定"
 
 #: setup/setup.glade:64 setup/setup.glade:96 setup/setup.glade:128
 msgid "..."
@@ -118,23 +120,21 @@ msgstr "..."
 
 #: setup/setup.glade:148
 msgid "previous input method:"
-msgstr ""
+msgstr "ひとつ前のインプットメソッド:"
 
 #: setup/setup.glade:161
-#, fuzzy
 msgid "Next input method:"
-msgstr "次のエンジン:"
+msgstr "次のインプットメソッド:"
 
 #: setup/setup.glade:174
 msgid "Enable or disable:"
-msgstr ""
+msgstr "切り替え"
 
 #: setup/setup.glade:188
 msgid "<b>Keyboard Shortcuts</b>"
 msgstr "<b>キーボードショートカット</b>"
 
 #: setup/setup.glade:222
-#, fuzzy
 msgid "Candidates orientation:"
 msgstr "候補ウィンドウの向き:"
 
@@ -148,7 +148,7 @@ msgstr ""
 
 #: setup/setup.glade:249
 msgid "Show language panel:"
-msgstr ""
+msgstr "言語パネルの表示:"
 
 #: setup/setup.glade:259
 msgid ""
@@ -156,19 +156,21 @@ msgid ""
 "When active\n"
 "Always"
 msgstr ""
+"表示しない\n"
+"有効なときだけ表示する\n"
+"常に表示する"
 
 #: setup/setup.glade:276
 msgid "Use custom font"
 msgstr "カスタムフォントを使う"
 
 #: setup/setup.glade:292
-#, fuzzy
 msgid "Custom font:"
-msgstr "カスタムフォントを使う"
+msgstr "カスタムフォント:"
 
 #: setup/setup.glade:317
 msgid "<b>Font and Style</b>"
-msgstr ""
+msgstr "<b>フォントとスタイル</b>"
 
 #: setup/setup.glade:337
 msgid "General"
@@ -176,7 +178,7 @@ msgstr "一般"
 
 #: setup/setup.glade:465
 msgid "Input Methods"
-msgstr ""
+msgstr "インプットメソッド"
 
 #: setup/setup.glade:482
 msgid ""
@@ -187,48 +189,21 @@ msgid ""
 "\n"
 "\n"
 msgstr ""
+"<big><b>IBus</b></big>\n"
+"<small>インテリジェントなインプットバス</small>\n"
+"ホームページ: http://code.google.com/p/ibus\n"
+"\n"
+"\n"
+"\n"
 
 #: setup/setup.glade:510
-#, fuzzy
 msgid "Start ibus on login"
-msgstr "セッションログイン時に IBus を自動的に起動"
+msgstr "ログイン時に IBus を起動"
 
 #: setup/setup.glade:521
 msgid "<b>Startup</b>"
-msgstr ""
+msgstr "<b>スタートアップ</b>"
 
 #: setup/setup.glade:543
 msgid "About"
 msgstr "About"
-
-#~ msgid "Trigger:"
-#~ msgstr "トリガー:"
-
-#, fuzzy
-#~ msgid "Previous IME:"
-#~ msgstr "前のエンジン:"
-
-#, fuzzy
-#~ msgid "gtk-remove"
-#~ msgstr "gtk-close"
-
-#~ msgid "gtk-close"
-#~ msgstr "gtk-close"
-
-#~ msgid "Auto hide language bar"
-#~ msgstr "言語バーを自動で隠す"
-
-#~ msgid "IBus - Running"
-#~ msgstr "IBus - 実行中"
-
-#~ msgid "IBus - Setup"
-#~ msgstr "IBus - セットアップ"
-
-#~ msgid "Engine"
-#~ msgstr "エンジン"
-
-#~ msgid "Started"
-#~ msgstr "開始"
-
-#~ msgid "Preload"
-#~ msgstr "プリロード"
-- 
cgit