add preedit option

git-svn-id: svn://localhost/trunk@43 79bd180b-0a32-48ee-ac55-ada8cae9df61

diff --git a/configure.ac b/configure.ac
index 5c64172fc0defdc156baabd6f2ca0dd3fc2672f4..d100dbc5776fcbbb96f848a13f2fa39f1da0fb2b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ cflags_set=${CFLAGS+set}
 cppflags_set=${CPPFLAGS+set}
 
 # Init automake stuff
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([src/scim_unikey_imengine.h])
 AM_PROG_INSTALL_STRIP
@@ -16,8 +16,7 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.17)
 
 # Init libtool
-LT_INIT
-AC_DISABLE_STATIC
+LT_INIT(disable-static)
 AC_PROG_LIBTOOL
 
 # Checks for programs.

diff --git a/po/scim-unikey.pot b/po/scim-unikey.pot
index 74f3970b6021ef5653f3416c2656255595ad68dc..4558be770b897f50dc71730fe3430ca6e7331bde 100644 (file)
--- a/po/scim-unikey.pot
+++ b/po/scim-unikey.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scim-unikey 0.3~r32\n"
 "Report-Msgid-Bugs-To: mr.lequoctuan@gmail.com\n"
-"POT-Creation-Date: 2009-07-04 10:59+0700\n"
+"POT-Creation-Date: 2009-07-08 22:47+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Enable Macro"
 msgstr ""
 
-#: src/scim_unikey_imengine.cpp:764
+#: src/scim_unikey_imengine.cpp:764 setup/setup-main.glade:239
 msgid "Enable PreEdit"
 msgstr ""
 
@@ -150,15 +150,15 @@ msgstr ""
 msgid "Process _W at word begin"
 msgstr ""
 
-#: setup/setup-main.glade:244
+#: setup/setup-main.glade:256
 msgid "<b>Options</b>"
 msgstr ""
 
-#: setup/setup-main.glade:264 setup/setup-macro.glade:101
+#: setup/setup-main.glade:276 setup/setup-macro.glade:101
 msgid "gtk-ok"
 msgstr ""
 
-#: setup/setup-main.glade:278 setup/setup-macro.glade:115
+#: setup/setup-main.glade:290 setup/setup-macro.glade:115
 msgid "gtk-cancel"
 msgstr ""
 

diff --git a/po/vi.po b/po/vi.po
index 157782374d0fb9189df27ccf6972d23707a4eb38..03c3bbedad5ecef0d8aa79d7b088069d2cd9bef1 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scim-unikey\n"
 "Report-Msgid-Bugs-To: mr.lequoctuan@gmail.com\n"
-"POT-Creation-Date: 2009-07-04 10:59+0700\n"
+"POT-Creation-Date: 2009-07-08 22:47+0700\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Le Quoc Tuan <mr.lequoctuan@gmail.com>\n"
 "Language-Team: Le Quoc Tuan <mr.lequoctuan@gmail.com>\n"
@@ -99,7 +99,7 @@ msgstr "Cho phép gõ tự do"
 msgid "Enable Macro"
 msgstr "Cho phép gõ tắt"
 
-#: src/scim_unikey_imengine.cpp:764
+#: src/scim_unikey_imengine.cpp:764 setup/setup-main.glade:239
 msgid "Enable PreEdit"
 msgstr "Bật PreEdit"
 
@@ -173,15 +173,15 @@ msgstr "Sửa bảng gõ tắt"
 msgid "Process _W at word begin"
 msgstr "Sử lý phím _W ở đầu từ"
 
-#: setup/setup-main.glade:244
+#: setup/setup-main.glade:256
 msgid "<b>Options</b>"
 msgstr "<b>Tùy chọn</b>"
 
-#: setup/setup-main.glade:264 setup/setup-macro.glade:101
+#: setup/setup-main.glade:276 setup/setup-macro.glade:101
 msgid "gtk-ok"
 msgstr ""
 
-#: setup/setup-main.glade:278 setup/setup-macro.glade:115
+#: setup/setup-main.glade:290 setup/setup-macro.glade:115
 msgid "gtk-cancel"
 msgstr ""
 

diff --git a/setup/config_utils.cpp b/setup/config_utils.cpp
index 6c838266240ae3ffeb36e07daa6fe1de4b1d15e1..aea7e15b1c6fa1d137151d3d55c0bfcb53f34638 100644 (file)
--- a/setup/config_utils.cpp
+++ b/setup/config_utils.cpp
@@ -22,6 +22,7 @@ void set_default_config(UnikeyMainSetupOptions* opt)
     opt->enableMacro = SCIM_IMENGINE_UNIKEY_MACROENABLED_DEF;
 
     opt->processwatbegin = SCIM_IMENGINE_UNIKEY_PROCESSWATWORDBEGIN_DEF;
+    opt->enablepreedit = SCIM_IMENGINE_UNIKEY_PREEDIT_DEF;
 
     opt->macrofile = get_macro_file();
 }
@@ -96,6 +97,14 @@ void read_config(UnikeyMainSetupOptions* opt)
         opt->processwatbegin = t;
     }
     // END get ProcessWAtBegin
+
+    // get EnablePreedit
+    b = scim_get_config(SCIM_IMENGINE_UNIKEY_PREEDIT, G_TYPE_BOOLEAN, &t);
+    if (b == TRUE)
+    {
+        opt->enablepreedit = t;
+    }
+    // END get EnablePreedit
 }
 
 void write_config(UnikeyMainSetupOptions* opt)
@@ -108,6 +117,7 @@ void write_config(UnikeyMainSetupOptions* opt)
     scim_set_config(SCIM_IMENGINE_UNIKEY_FREEMARKING, G_TYPE_BOOLEAN, &opt->freeMarking);
     scim_set_config(SCIM_IMENGINE_UNIKEY_MACROENABLED, G_TYPE_BOOLEAN, &opt->enableMacro);
     scim_set_config(SCIM_IMENGINE_UNIKEY_PROCESSWATWORDBEGIN, G_TYPE_BOOLEAN, &opt->processwatbegin);
+    scim_set_config(SCIM_IMENGINE_UNIKEY_PREEDIT, G_TYPE_BOOLEAN, &opt->enablepreedit);
 }
 
 int force_engine_to_reload_config()

diff --git a/setup/dlg_main_setup.cpp b/setup/dlg_main_setup.cpp
index 4a40dde443590c0bb9e723b1643fcc59b7057650..56c39fa76b2d2607a2c1dd90f4cc244c4bd38fb3 100644 (file)
--- a/setup/dlg_main_setup.cpp
+++ b/setup/dlg_main_setup.cpp
@@ -79,6 +79,9 @@ GtkWidget* unikey_main_setup_dialog_new()
     g_object_set_data(G_OBJECT(dlg),
                       "check_processwatbegin",
                       gtk_builder_get_object(builder, "check_processwatbegin"));
+    g_object_set_data(G_OBJECT(dlg),
+                      "check_enablepreedit",
+                      gtk_builder_get_object(builder, "check_enablepreedit"));
     // END save object pointer
 
     g_object_unref(builder);
@@ -126,6 +129,10 @@ void unikey_main_setup_set_values(const GtkDialog* dlg, const UnikeyMainSetupOpt
     wid = GTK_WIDGET(g_object_get_data(G_OBJECT(dlg), "check_processwatbegin"));
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wid), opt->processwatbegin);
 
+// set enablepreedit?
+    wid = GTK_WIDGET(g_object_get_data(G_OBJECT(dlg), "check_enablepreedit"));
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wid), opt->enablepreedit);
+
 // set macro file name data
     g_object_set_data(G_OBJECT(dlg), "macrofile", opt->macrofile);
 }
@@ -165,6 +172,11 @@ void unikey_main_setup_get_values(const GtkDialog* dlg, UnikeyMainSetupOptions *
 // get processwatbegin?
     wid = GTK_WIDGET(g_object_get_data(G_OBJECT(dlg), "check_processwatbegin"));
     opt->processwatbegin = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
+
+// get enablepreedit?
+    wid = GTK_WIDGET(g_object_get_data(G_OBJECT(dlg), "check_enablepreedit"));
+    opt->enablepreedit = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wid));
+
 }
 
 void macro_enable_toggle_cb(GtkToggleButton* btn, gpointer user_data)

diff --git a/setup/dlg_main_setup.h b/setup/dlg_main_setup.h
index 8f20ffffcfceaacdba7de679e996b45e29ba4c51..2e56acc8ae696aef3b9eb34e6d997f3c9eb27945 100644 (file)
--- a/setup/dlg_main_setup.h
+++ b/setup/dlg_main_setup.h
@@ -12,6 +12,8 @@ typedef struct
     gboolean enableMacro;
     gboolean processwatbegin;
 
+    gboolean enablepreedit;
+
     gchar* macrofile;
 } UnikeyMainSetupOptions;
 

diff --git a/setup/setup-main.glade b/setup/setup-main.glade
index 969ed498fba3798f4e40a73455cfbff0121005e9..f2645b08c62c16577ca6acdc4436872afe5271f6 100644 (file)
--- a/setup/setup-main.glade
+++ b/setup/setup-main.glade
@@ -126,7 +126,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame1">
+              <object class="GtkFrame" id="fr_options">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
@@ -234,6 +234,18 @@
                             <property name="position">5</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkCheckButton" id="check_enablepreedit">
+                            <property name="label" translatable="yes">Enable PreEdit</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="position">6</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                   </object>

diff --git a/setup/unikey_setup.cpp b/setup/unikey_setup.cpp
index 90f253db69f545cf5d519f5a0aba412e234452d0..fabcbcda9337d068b61c12aea9924aaa47f3e127 100644 (file)
--- a/setup/unikey_setup.cpp
+++ b/setup/unikey_setup.cpp
@@ -22,6 +22,7 @@ int main(int argc, char** argv)
     gtk_window_set_default_icon_from_file(SCIM_ICONDIR SCIM_UNIKEY_ICON_MAIN, NULL);
 
     GtkWidget* main_dlg = unikey_main_setup_dialog_new(); // create main dlg
+    gtk_window_set_title(GTK_WINDOW(main_dlg), "Scim-Unikey setup v" PACKAGE_VERSION);
 
     gtk_signal_connect(GTK_OBJECT(main_dlg), "destroy", gtk_main_quit, NULL); // connect with signal