Update setup ui, follow gnome UI guidelines.

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>