diff -ruN gjiten-1.0/src/gjiten.c gjiten-1.0-fixed/src/gjiten.c --- gjiten-1.0/src/gjiten.c Sat Jan 19 18:20:55 2002 +++ gjiten-1.0-fixed/src/gjiten.c Tue Jan 22 15:28:02 2002 @@ -47,6 +47,7 @@ void gjiten_search(unsigned char *srchstrg); void gjiten_paste(GtkWidget *widget, gpointer data); void gjiten_copy(GtkWidget *widget, gpointer data); +static void gjiten_exit(); void on_text_entered(); extern uint32_t jindex(uint32_t xit); extern int DicTest(int dn); @@ -165,7 +166,7 @@ static GnomeUIInfo file_menu_uiinfo[] = { - GNOMEUIINFO_MENU_EXIT_ITEM (GTK_SIGNAL_FUNC(gtk_exit), NULL), + GNOMEUIINFO_MENU_EXIT_ITEM (GTK_SIGNAL_FUNC(gjiten_exit), NULL), GNOMEUIINFO_END }; @@ -1074,12 +1075,8 @@ strcat(XJDXnamet[0],".xjdx"); } g_free(conf.version); - if (conf.usekanjipad) { - conf.kanjipad = gnome_config_get_string("/gjiten/general/kanjipad"); - } - else { - conf.kanjipad = NULL; - } + conf.kanjipad = gnome_config_get_string("/gjiten/general/kanjipad"); + conf.numofdics = gnome_config_get_int("/gjiten/general/numofdics"); for (i = 1; i <= conf.numofdics; i++) { sprintf(dicstr, "%s%d", dicprefix, i-1); @@ -1242,24 +1239,19 @@ } +void checkb_searchlimit_toggled() { + int state = GTK_TOGGLE_BUTTON (checkb_searchlimit)->active; + if (spinb_searchlimit != NULL) gtk_widget_set_sensitive(spinb_searchlimit, state); + conf.searchlimit_enabled = state; +} + void shade_gjiten_widgets() { - if ((menubar_selectdic != NULL) && (radiob_searchdic != NULL)) gtk_widget_set_sensitive(menubar_selectdic,GTK_TOGGLE_BUTTON(radiob_searchdic)->active); - if (checkb_searchlimit != NULL) { - if (GTK_TOGGLE_BUTTON(checkb_searchlimit)->active) { - if (spinb_searchlimit != NULL) gtk_widget_set_sensitive(spinb_searchlimit, TRUE); - conf.searchlimit_enabled = TRUE; - } - else { - if (spinb_searchlimit != NULL) gtk_widget_set_sensitive(spinb_searchlimit, FALSE); - conf.searchlimit_enabled = FALSE; - } - } + if (checkb_autoadjust != NULL) conf.autoadjust_enabled = (GTK_TOGGLE_BUTTON(checkb_autoadjust)->active); if (checkb_linear != NULL) conf.linearsearch_enabled = (GTK_TOGGLE_BUTTON(checkb_linear)->active); - if (checkb_verb != NULL) conf.deinflection_enabled = (GTK_TOGGLE_BUTTON(checkb_verb)->active); - + if (checkb_verb != NULL) conf.deinflection_enabled = (GTK_TOGGLE_BUTTON(checkb_verb)->active); } void get_searchlimit() { @@ -1573,7 +1565,7 @@ gtk_widget_show (checkb_searchlimit); gtk_box_pack_start (GTK_BOX (hbox_searchlimit), checkb_searchlimit, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (checkb_searchlimit), "toggled", - GTK_SIGNAL_FUNC (shade_gjiten_widgets), NULL); + GTK_SIGNAL_FUNC (checkb_searchlimit_toggled), NULL); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (checkb_searchlimit), conf.searchlimit_enabled); spinb_searchlimit_adj = gtk_adjustment_new (conf.maxwordmatches, 1, G_MAXFLOAT, 1, 2, 2); diff -ruN gjiten-1.0/src/gjiten.h.in gjiten-1.0-fixed/src/gjiten.h.in --- gjiten-1.0/src/gjiten.h.in Tue Jan 15 21:25:31 2002 +++ gjiten-1.0-fixed/src/gjiten.h.in Tue Jan 22 13:53:31 2002 @@ -4,7 +4,7 @@ #define PIXMAPDIR "@prefix@/share/pixmaps/" #define DEFDICDIR "@prefix@/share/dict/gjiten/" #define DEFWORDFONTNAME "-*-fixed-medium-r-normal-*-14-*-*-*-*-*-jisx0208.1983-0" -#define DEFBIGFONTNAME "-*-fixed-medium-r-normal-*-48-*-*-*-*-*-jisx0208.1983-0"; +#define DEFBIGFONTNAME "-*-fixed-medium-r-normal-*-24-*-*-*-*-*-jisx0208.1983-0"; #define DEFMAXWORDMATCHES 100 struct gjiten_conf { diff -ruN gjiten-1.0/src/kanjidic.c gjiten-1.0-fixed/src/kanjidic.c --- gjiten-1.0/src/kanjidic.c Sat Jan 19 18:25:27 2002 +++ gjiten-1.0-fixed/src/kanjidic.c Tue Jan 22 13:49:49 2002 @@ -826,8 +826,6 @@ strcpy(last_kanji, kanji); gtk_clist_append(GTK_CLIST(clist_history), &kanji); //printf("%d\n", gtk_clist_optimal_column_width(GTK_CLIST (clist_history), 0)); - gtk_clist_set_column_width (GTK_CLIST (clist_history), 0, - gtk_clist_optimal_column_width(GTK_CLIST (clist_history), 0)); gtk_widget_hide (scrolledwin_history); gtk_widget_show (scrolledwin_history); } @@ -966,6 +964,7 @@ GtkWidget *hbox; GtkWidget *frame_kinfo; GtkStyle *clist_style; + int clist_col_width = 20; gchar *kanji = NULL; if (window_kanjidic != NULL) { @@ -1199,7 +1198,11 @@ gtk_clist_append(GTK_CLIST(clist_history), &kanji); // This is very hackish. FIXME. // Make two rows visible in clist_kresults - gtk_paned_set_position (GTK_PANED(vpane), gtk_clist_optimal_column_width(GTK_CLIST (clist_history), 0)*2 + 34); + clist_col_width = gtk_clist_optimal_column_width(GTK_CLIST (clist_history), 0); + gtk_paned_set_position (GTK_PANED(vpane), clist_col_width*2 + 34); + for (i = 0; i < KANJLISTLEN; i++) + gtk_clist_set_column_width(GTK_CLIST (clist_kresults), i, clist_col_width); + gtk_clist_set_column_width (GTK_CLIST (clist_history), 0, clist_col_width); gtk_clist_clear(GTK_CLIST (clist_history)); gtk_signal_connect(GTK_OBJECT(clist_kresults), "select_row", diff -ruN gjiten-1.0/src/pref.c gjiten-1.0-fixed/src/pref.c --- gjiten-1.0/src/pref.c Sat Jan 19 17:22:39 2002 +++ gjiten-1.0-fixed/src/pref.c Tue Jan 22 15:23:35 2002 @@ -110,7 +110,7 @@ gchar dicstr[25]; gchar *confpath; int i; - + gnome_config_set_string("/gjiten/general/version",VERSION); for (i = 0; i < KCFGNUM; i++) { @@ -291,7 +291,8 @@ combo_entry_kanjidic = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (fileentry_kanjidic)); gtk_widget_show (combo_entry_kanjidic); - gtk_entry_set_text (GTK_ENTRY (combo_entry_kanjidic), Dnamet[0]); + if (combo_entry_kanjidic != NULL) + gtk_entry_set_text (GTK_ENTRY (combo_entry_kanjidic), Dnamet[0]); fileentry_kanjipad = gnome_file_entry_new (NULL, NULL); gtk_widget_show (fileentry_kanjipad); @@ -300,7 +301,8 @@ combo_entry_kanjipad = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (fileentry_kanjipad)); gtk_widget_show (combo_entry_kanjipad); - gtk_entry_set_text (GTK_ENTRY (combo_entry_kanjipad), conf.kanjipad); + if (conf.kanjipad != NULL) + gtk_entry_set_text (GTK_ENTRY (combo_entry_kanjipad), conf.kanjipad); label_path = gtk_label_new (_("Path To Dictionary Files: ")); gtk_widget_show (label_path); @@ -348,11 +350,9 @@ gtk_widget_show (checkb_kanjipad); gtk_table_attach (GTK_TABLE (table_goptions), checkb_kanjipad, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - if (conf.usekanjipad) - { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkb_kanjipad), TRUE); - gtk_widget_set_sensitive(combo_entry_kanjidic,GTK_TOGGLE_BUTTON(checkb_kanjipad)->active); - } + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkb_kanjipad), conf.usekanjipad); + gtk_widget_set_sensitive(combo_entry_kanjipad, conf.usekanjipad); gtk_signal_connect (GTK_OBJECT (checkb_kanjipad), "toggled", GTK_SIGNAL_FUNC(shade_pref_widgets), NULL ); @@ -360,11 +360,9 @@ gtk_widget_show (checkb_kanjidic); gtk_table_attach (GTK_TABLE (table_goptions), checkb_kanjidic, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - if (conf.usekanjidic) - { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkb_kanjidic), TRUE); - gtk_widget_set_sensitive(combo_entry_kanjidic,GTK_TOGGLE_BUTTON(checkb_kanjidic)->active); - } + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkb_kanjidic), conf.usekanjidic); + gtk_widget_set_sensitive(combo_entry_kanjidic, conf.usekanjidic); + gtk_signal_connect (GTK_OBJECT (checkb_kanjidic), "toggled", GTK_SIGNAL_FUNC(shade_pref_widgets), NULL ); @@ -376,7 +374,8 @@ combo_entry_dictpath = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (fileentry_dictpath)); gtk_widget_show (combo_entry_dictpath); - gtk_entry_set_text (GTK_ENTRY (combo_entry_dictpath), conf.dictpath); + if (conf.dictpath != NULL) + gtk_entry_set_text (GTK_ENTRY (combo_entry_dictpath), conf.dictpath); scrolledwin_clist = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwin_clist);