update setup for compatible with new engine

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

diff --git a/setup/config_utils.cpp b/setup/config_utils.cpp
index aea7e15..6c83826 100644 (file)
--- a/setup/config_utils.cpp
+++ b/setup/config_utils.cpp
@@ -22,7 +22,6 @@ 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();
 }
@@ -97,14 +96,6 @@ 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)
@@ -117,7 +108,6 @@ 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 56c39fa..4a40dde 100644 (file)
--- a/setup/dlg_main_setup.cpp
+++ b/setup/dlg_main_setup.cpp
@@ -79,9 +79,6 @@ 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);
@@ -129,10 +126,6 @@ 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);
 }
@@ -172,11 +165,6 @@ 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 2e56acc..8f20fff 100644 (file)
--- a/setup/dlg_main_setup.h
+++ b/setup/dlg_main_setup.h
@@ -12,8 +12,6 @@ typedef struct
     gboolean enableMacro;
     gboolean processwatbegin;
 
-    gboolean enablepreedit;
-
     gchar* macrofile;
 } UnikeyMainSetupOptions;
 

diff --git a/setup/setup-main.glade b/setup/setup-main.glade
index 2db10cc..705ab19 100644 (file)
--- a/setup/setup-main.glade
+++ b/setup/setup-main.glade
@@ -237,18 +237,6 @@
                             <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>