Add about dialog in ibus menu.

8 files changed, 136 insertions, 89 deletions

diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 991ef8c..a70f407 100644
--- a/client/gtk2/ibusimcontext.c
+++ b/client/gtk2/ibusimcontext.c
@@ -25,6 +25,7 @@
 #include <sys/un.h>
 #include "ibusimcontext.h"
 #include "ibusimclient.h"
+
 /* IBusIMContextPriv */
 struct _IBusIMContextPrivate {
     GtkIMContext *slave;
diff --git a/configure.ac b/configure.ac
index 3da76ec..4ac10a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,7 @@ AM_CONDITIONAL(IBUS_BUILD_QT4, [test x"$enable_qt4" = x"yes" ])
 AC_CONFIG_FILES([ po/Makefile.in
 Makefile
 ibus.spec
+ibus/config.py
 ibus/Makefile
 ibus/interface/Makefile
 daemon/Makefile
diff --git a/ibus/Makefile.am b/ibus/Makefile.am
index 68520de..df8b4d0 100644
--- a/ibus/Makefile.am
+++ b/ibus/Makefile.am
@@ -41,11 +41,19 @@ ibus_PYTHON = \
 	panel.py \
 	property.py \
 	utility.py \
+	config.py \
 	$(NULL)
 
 ibusdir = @pkgpythondir@
 
+EXTRA_DIST = \
+	config.py.in \
+	$(NULL)
+
 CLEANFILES = \
 	*.pyc \
 	$(NULL)
 
+DISTCLEANFILES = \
+	config.py \
+	$(NULL)
diff --git a/ibus/__init__.py b/ibus/__init__.py
index 55c5768..2b0e63f 100644
--- a/ibus/__init__.py
+++ b/ibus/__init__.py
@@ -32,3 +32,5 @@ from utility import *
 from engine import *
 from factory import *
 from panel import *
+from config import *
+
diff --git a/panel/panel.py b/panel/panel.py
index 7647acf..84da720 100644
--- a/panel/panel.py
+++ b/panel/panel.py
@@ -25,6 +25,7 @@ import gobject
 import ibus
 import icon as _icon
 import os
+import sys
 from os import path
 from ibus import LANGUAGES
 from ibus import interface
@@ -236,6 +237,10 @@ class Panel(ibus.PanelBase):
         item.connect("activate",
             self.__sys_menu_item_activate_cb, gtk.STOCK_PREFERENCES)
         menu.add(item)
+        item = gtk.ImageMenuItem(gtk.STOCK_ABOUT)
+        item.connect("activate",
+            self.__sys_menu_item_activate_cb, gtk.STOCK_ABOUT)
+        menu.add(item)
         menu.add(gtk.SeparatorMenuItem())
         item = gtk.ImageMenuItem(gtk.STOCK_QUIT)
         item.connect("activate",
@@ -319,6 +324,20 @@ class Panel(ibus.PanelBase):
     def __sys_menu_item_activate_cb(self, item, command):
         if command == gtk.STOCK_PREFERENCES:
             self.__start_setup()
+        elif command == gtk.STOCK_ABOUT:
+            about_dialog = gtk.AboutDialog()
+            about_dialog.set_name("iBus")
+            about_dialog.set_version(ibus.get_version())
+            about_dialog.set_copyright(ibus.get_copyright())
+            about_dialog.set_license(ibus.get_license())
+            about_dialog.set_comments(_("The intelligent input bus."))
+            about_dialog.set_website("http://code.google.com/p/ibus")
+            about_dialog.set_authors(["Huang Peng <shawn.p.huang@gmail.com>"])
+            about_dialog.set_documenters(["Huang Peng <shawn.p.huang@gmail.com>"])
+            about_dialog.set_translator_credits(_("translator-credits"))
+            about_dialog.set_logo_icon_name("ibus")
+            about_dialog.run()
+            about_dialog.destroy()
         elif command == gtk.STOCK_QUIT:
             self.__bus.kill()
         else:
diff --git a/po/ja.po b/po/ja.po
index 0aa0573..05757a2 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: 2008-08-29 20:32+0800\n"
+"POT-Creation-Date: 2008-08-30 21:34+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"
@@ -384,31 +384,39 @@ msgstr "中国語 (簡体)"
 msgid "Chinese (traditional)"
 msgstr "中国語 (繁体)"
 
-#: panel/panel.py:80
+#: panel/panel.py:81
 msgid "iBus - Running"
 msgstr "iBus - 実行中"
 
+#: panel/panel.py:333
+msgid "The intelligent input bus."
+msgstr ""
+
+#: panel/panel.py:337
+msgid "translator-credits"
+msgstr "UTUMI Hirosi <utuhiro78@yahoo.co.jp>"
+
 #: panel/languagebar.py:81
 msgid "Switch engine"
 msgstr ""
 
-#: setup/main.py:103
+#: setup/main.py:102
 msgid "trigger"
 msgstr "トリガー"
 
-#: setup/main.py:113
+#: setup/main.py:112
 msgid "next engine"
 msgstr "次のエンジン"
 
-#: setup/main.py:122
+#: setup/main.py:121
 msgid "prev engine"
 msgstr "前のエンジン"
 
-#: setup/main.py:167
+#: setup/main.py:166
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus デーモンが動いていません。起動しますか？"
 
-#: setup/main.py:182
+#: setup/main.py:181
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -422,23 +430,27 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:204 setup/setup.glade:365
+#: setup/main.py:203 setup/setup.glade:365
 msgid "Engine"
 msgstr "エンジン"
 
-#: setup/main.py:228
+#: setup/main.py:227
 msgid "Started"
 msgstr "開始"
 
-#: setup/main.py:237
+#: setup/main.py:236
 msgid "Preload"
 msgstr "プリロード"
 
-#: setup/main.py:246
+#: setup/main.py:245
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "%s のキーボードショートカットを選択"
 
+#: setup/keyboardshortcut.py:54 setup/setup.glade:208
+msgid "Keyboard shortcuts"
+msgstr "キーボードショートカット"
+
 #: setup/keyboardshortcut.py:62
 msgid "Key code:"
 msgstr "キーコード:"
@@ -483,10 +495,6 @@ msgstr "前のエンジン:"
 msgid "..."
 msgstr "..."
 
-#: setup/setup.glade:208
-msgid "Keyboard shortcuts"
-msgstr "キーボードショートカット"
-
 #: setup/setup.glade:242
 msgid "Lookup table orientation:"
 msgstr "候補ウィンドウの向き:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d888465..abb725a 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: 2008-08-29 20:32+0800\n"
+"POT-Creation-Date: 2008-08-30 21:34+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"
@@ -383,31 +383,39 @@ msgstr "简体中文"
 msgid "Chinese (traditional)"
 msgstr "繁体中文"
 
-#: panel/panel.py:80
+#: panel/panel.py:81
 msgid "iBus - Running"
 msgstr "iBus - 运行"
 
+#: panel/panel.py:333
+msgid "The intelligent input bus."
+msgstr ""
+
+#: panel/panel.py:337
+msgid "translator-credits"
+msgstr "Huang Peng <shawn.p.huang@gmail.com>"
+
 #: panel/languagebar.py:81
 msgid "Switch engine"
 msgstr "切换引擎"
 
-#: setup/main.py:103
+#: setup/main.py:102
 msgid "trigger"
 msgstr "开关"
 
-#: setup/main.py:113
+#: setup/main.py:112
 msgid "next engine"
 msgstr "下一个引擎"
 
-#: setup/main.py:122
+#: setup/main.py:121
 msgid "prev engine"
 msgstr "上一个引擎"
 
-#: setup/main.py:167
+#: setup/main.py:166
 msgid "IBus daemon is not started. Do you want to start it now?"
 msgstr "IBus守护进程没有启动，您是否想现在启动它？"
 
-#: setup/main.py:182
+#: setup/main.py:181
 msgid ""
 "IBus has been started! If you can not use IBus, please add below lines in "
 "$HOME/.bashrc, and relogin your desktop.\n"
@@ -420,23 +428,27 @@ msgstr ""
 "  export XMODIFIERS=@im=ibus\n"
 "  export QT_IM_MODULE=ibus"
 
-#: setup/main.py:204 setup/setup.glade:365
+#: setup/main.py:203 setup/setup.glade:365
 msgid "Engine"
 msgstr "输入法引擎"
 
-#: setup/main.py:228
+#: setup/main.py:227
 msgid "Started"
 msgstr "启动"
 
-#: setup/main.py:237
+#: setup/main.py:236
 msgid "Preload"
 msgstr "预加载"
 
-#: setup/main.py:246
+#: setup/main.py:245
 #, python-format
 msgid "Select keyboard shortcut for %s"
 msgstr "选择%s的快捷键"
 
+#: setup/keyboardshortcut.py:54 setup/setup.glade:208
+msgid "Keyboard shortcuts"
+msgstr "快捷键"
+
 #: setup/keyboardshortcut.py:62
 msgid "Key code:"
 msgstr "按键:"
@@ -481,10 +493,6 @@ msgstr "上一个引擎:"
 msgid "..."
 msgstr ""
 
-#: setup/setup.glade:208
-msgid "Keyboard shortcuts"
-msgstr "快捷键"
-
 #: setup/setup.glade:242
 msgid "Lookup table orientation:"
 msgstr "候选词表方向:"
diff --git a/setup/setup.glade b/setup/setup.glade
index be64e33..ca9ae61 100644
--- a/setup/setup.glade
+++ b/setup/setup.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.4 on Sun Aug 24 16:26:38 2008 -->
+<!--Generated with glade3 3.4.4 on Sat Aug 30 21:50:58 2008 -->
 <glade-interface>
   <widget class="GtkDialog" id="dialog_setup">
     <property name="border_width">5</property>
@@ -51,13 +51,19 @@
                             <property name="n_rows">3</property>
                             <property name="n_columns">3</property>
                             <child>
-                              <widget class="GtkLabel" id="label7">
+                              <widget class="GtkButton" id="button_prev_engine">
                                 <property name="visible">True</property>
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">Trigger:</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</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>
                               </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>
@@ -65,46 +71,51 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="entry_trigger">
+                              <widget class="GtkButton" id="button_next_engine">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="editable">False</property>
+                                <property name="receives_default">True</property>
+                                <property name="label" translatable="yes">...</property>
+                                <property name="response_id">0</property>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
+                                <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="GtkLabel" id="label8">
+                              <widget class="GtkEntry" id="entry_prev_engine">
                                 <property name="visible">True</property>
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">Next engine:</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
                               </widget>
                               <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
+                                <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="GtkLabel" id="label9">
+                              <widget class="GtkEntry" id="entry_next_engine">
                                 <property name="visible">True</property>
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">Previous engine:</property>
-                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="can_focus">True</property>
+                                <property name="editable">False</property>
                               </widget>
                               <packing>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
+                                <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>
@@ -128,70 +139,59 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="entry_next_engine">
+                              <widget class="GtkLabel" id="label9">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="editable">False</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Previous engine:</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
                               </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="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_prev_engine">
+                              <widget class="GtkLabel" id="label8">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="editable">False</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Next engine:</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
                               </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="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_next_engine">
+                              <widget class="GtkEntry" id="entry_trigger">
                                 <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="editable">False</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="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>
                               </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">1</property>
+                                <property name="label" translatable="yes">Trigger:</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</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>
@@ -379,14 +379,14 @@ Vertical</property>
                 <child>
                   <widget class="GtkLabel" id="label5">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">IBus
-
+                    <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;iBus&lt;/b&gt;&lt;/big&gt;
+&lt;small&gt;The intelligent input bus&lt;/small&gt;
 Homepage: http://code.google.com/p/ibus
-Author: Huang Peng &lt;shawn.p.huang@gmail.com&gt;
 
 
 
 </property>
+                    <property name="use_markup">True</property>
                     <property name="justify">GTK_JUSTIFY_CENTER</property>
                   </widget>
                   <packing>