2006-09-03 [paul] 2.4.0cvs136

	* src/prefs_other.c
	* src/prefs_spelling.c
		unify the gui

diff --git a/ChangeLog b/ChangeLog
index f0dfb734f52a87e8a979883611ff65ff6f3156e2..18454beb0a9316473b1c849f9aa27d5af5450255 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-03 [paul]      2.4.0cvs136
+
+       * src/prefs_other.c
+       * src/prefs_spelling.c
+               unify the gui
+

 2006-09-03 [paul]      2.4.0cvs135
 
        * src/prefs_summaries.c
 2006-09-03 [paul]      2.4.0cvs135
 
        * src/prefs_summaries.c

diff --git a/PATCHSETS b/PATCHSETS
index 600ee8fdcb1efbbe0c70fbe88faa4481833d6d09..fed70cbc7a66956511b2a1c6ea8a99da13484374 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1827,3 +1827,4 @@
 ( cvs diff -u -r 1.94.2.100 -r 1.94.2.101 src/messageview.c;  cvs diff -u -r 1.395.2.240 -r 1.395.2.241 src/summaryview.c;  ) > 2.4.0cvs133.patchset
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 manual/advanced.xml;  cvs diff -u -r 1.274.2.146 -r 1.274.2.147 src/mainwindow.c;  cvs diff -u -r 1.94.2.101 -r 1.94.2.102 src/messageview.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_message.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_other.c;  cvs diff -u -r 1.395.2.241 -r 1.395.2.242 src/summaryview.c;  cvs diff -u -r 1.96.2.143 -r 1.96.2.144 src/textview.c;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/menu.c;  ) > 2.4.0cvs134.patchset
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_summaries.c;  ) > 2.4.0cvs135.patchset
 ( cvs diff -u -r 1.94.2.100 -r 1.94.2.101 src/messageview.c;  cvs diff -u -r 1.395.2.240 -r 1.395.2.241 src/summaryview.c;  ) > 2.4.0cvs133.patchset
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 manual/advanced.xml;  cvs diff -u -r 1.274.2.146 -r 1.274.2.147 src/mainwindow.c;  cvs diff -u -r 1.94.2.101 -r 1.94.2.102 src/messageview.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_message.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_other.c;  cvs diff -u -r 1.395.2.241 -r 1.395.2.242 src/summaryview.c;  cvs diff -u -r 1.96.2.143 -r 1.96.2.144 src/textview.c;  cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/menu.c;  ) > 2.4.0cvs134.patchset
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_summaries.c;  ) > 2.4.0cvs135.patchset

+( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_other.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/prefs_spelling.c;  ) > 2.4.0cvs136.patchset

diff --git a/configure.ac b/configure.ac
index 2d7cc4865feab48565c3907df8d5191499384c60..bb27dae934c69f4deec53b71e81efa9fbf94e6d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=135
+EXTRA_VERSION=136

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_other.c b/src/prefs_other.c
index 8aa226c8ee7d7da34d8eb31935722510b96712a4..5f68f8ff062f3aff8b659a4791513b1678b5f695 100644 (file)
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -118,7 +118,7 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_container_set_border_width (GTK_CONTAINER (vbox_cliplog), 8);
        PACK_CHECK_BUTTON (vbox_cliplog, checkbtn_cliplog,
                           _("Clip the log size"));
        gtk_container_set_border_width (GTK_CONTAINER (vbox_cliplog), 8);
        PACK_CHECK_BUTTON (vbox_cliplog, checkbtn_cliplog,
                           _("Clip the log size"));

-       hbox_cliplog = gtk_hbox_new (FALSE, 3);
+       hbox_cliplog = gtk_hbox_new (FALSE, 8);

        gtk_container_add (GTK_CONTAINER (vbox_cliplog), hbox_cliplog);
        gtk_widget_show (hbox_cliplog);
        
        gtk_container_add (GTK_CONTAINER (vbox_cliplog), hbox_cliplog);
        gtk_widget_show (hbox_cliplog);
        


@@ -178,7 +178,7 @@ void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 

-       label_iotimeout = gtk_label_new (_("Socket I/O timeout:"));
+       label_iotimeout = gtk_label_new (_("Socket I/O timeout"));

        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 
        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 

diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
index d647ced359f5f49a88a414509476415893fa8809..f609ac9d0076151fc0ba0d6c10bcee65c378c889 100644 (file)
--- a/src/prefs_spelling.c
+++ b/src/prefs_spelling.c
@@ -144,15 +144,13 @@ void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer
 {
        SpellingPage *prefs_spelling = (SpellingPage *) _page;
 
 {
        SpellingPage *prefs_spelling = (SpellingPage *) _page;
 

-       GtkWidget *vbox1, *vbox2, *hbox;
+       GtkWidget *vbox1, *vbox2;

 
        GtkWidget *enable_aspell_checkbtn;
        GtkWidget *check_while_typing_checkbtn;
        GtkWidget *recheck_when_changing_dict_checkbtn;
        GtkWidget *use_alternate_checkbtn;
 
 
        GtkWidget *enable_aspell_checkbtn;
        GtkWidget *check_while_typing_checkbtn;
        GtkWidget *recheck_when_changing_dict_checkbtn;
        GtkWidget *use_alternate_checkbtn;
 

-       GtkWidget *label;
-

        GtkWidget *automatic_frame;
        GtkWidget *dictionary_frame;
        GtkWidget *path_frame;
        GtkWidget *automatic_frame;
        GtkWidget *dictionary_frame;
        GtkWidget *path_frame;


@@ -161,6 +159,8 @@ void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer
        GtkWidget *aspell_path_entry;
        GtkWidget *aspell_path_select;
 
        GtkWidget *aspell_path_entry;
        GtkWidget *aspell_path_select;
 

+       GtkWidget *table;
+

        GtkWidget *default_dict_label;
        GtkWidget *default_dict_optmenu;
        GtkWidget *default_dict_optmenu_menu;
        GtkWidget *default_dict_label;
        GtkWidget *default_dict_optmenu;
        GtkWidget *default_dict_optmenu_menu;


@@ -228,62 +228,59 @@ void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer
        gtk_box_pack_start(GTK_BOX(vbox2), recheck_when_changing_dict_checkbtn, TRUE, TRUE, 0);
        
        PACK_FRAME(vbox1, dictionary_frame, _("Dictionary"));
        gtk_box_pack_start(GTK_BOX(vbox2), recheck_when_changing_dict_checkbtn, TRUE, TRUE, 0);
        
        PACK_FRAME(vbox1, dictionary_frame, _("Dictionary"));

-       vbox2 = gtk_vbox_new(FALSE, VSPACING_NARROW);
+       vbox2 = gtk_vbox_new(TRUE, VSPACING_NARROW);

        gtk_widget_show(vbox2);
        gtk_container_add(GTK_CONTAINER(dictionary_frame), vbox2);
        gtk_widget_show(vbox2);
        gtk_container_add(GTK_CONTAINER(dictionary_frame), vbox2);

-       gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
-       
-       hbox = gtk_hbox_new(FALSE, 10);
-       gtk_widget_show(hbox);
-       gtk_box_pack_start(GTK_BOX(vbox2), hbox, TRUE, TRUE, 0);

        
        

+       table = gtk_table_new(6, 2, FALSE);
+       gtk_widget_show(table);
+       gtk_container_set_border_width(GTK_CONTAINER(table), 8);
+       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+       gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+
+       gtk_box_pack_start(GTK_BOX(vbox2), table, TRUE, TRUE, 0);
+

        default_dict_label = gtk_label_new(_("Default dictionary"));
        gtk_widget_show(default_dict_label);
        default_dict_label = gtk_label_new(_("Default dictionary"));
        gtk_widget_show(default_dict_label);

-       gtk_label_set_justify(GTK_LABEL(default_dict_label), GTK_JUSTIFY_LEFT);
+       gtk_table_attach(GTK_TABLE (table), default_dict_label, 0, 1, 0, 1,
+                        (GtkAttachOptions) (GTK_FILL),
+                        (GtkAttachOptions) (0), 0, 2);
+       gtk_label_set_justify(GTK_LABEL(default_dict_label), GTK_JUSTIFY_RIGHT);

        gtk_misc_set_alignment(GTK_MISC(default_dict_label), 1, 0.5);
        gtk_misc_set_alignment(GTK_MISC(default_dict_label), 1, 0.5);

-       gtk_box_pack_start(GTK_BOX(hbox), default_dict_label, FALSE, FALSE, 0);
-       
-       label = gtk_label_new("");
-       gtk_widget_show(label);
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);

        
        default_dict_optmenu = gtk_option_menu_new();
        gtk_widget_show(default_dict_optmenu);
        gtk_widget_set_size_request(default_dict_optmenu, 180, -1);
        
        default_dict_optmenu = gtk_option_menu_new();
        gtk_widget_show(default_dict_optmenu);
        gtk_widget_set_size_request(default_dict_optmenu, 180, -1);

+       gtk_table_attach (GTK_TABLE (table), default_dict_optmenu, 1, 2, 0, 1,
+                         GTK_SHRINK, 0, 0, 0);

 
        default_dict_optmenu_menu = gtk_menu_new();
        gtk_option_menu_set_menu(GTK_OPTION_MENU(default_dict_optmenu),
                        default_dict_optmenu_menu);
 
        default_dict_optmenu_menu = gtk_menu_new();
        gtk_option_menu_set_menu(GTK_OPTION_MENU(default_dict_optmenu),
                        default_dict_optmenu_menu);

-       gtk_box_pack_start(GTK_BOX(hbox), default_dict_optmenu, FALSE, FALSE, 0);

 
 

-       hbox = gtk_hbox_new(FALSE, 10);
-       gtk_widget_show(hbox);
-       gtk_box_pack_start(GTK_BOX(vbox2), hbox, TRUE, TRUE, 0);
-       

        sugmode_label = gtk_label_new(_("Default suggestion mode"));
        gtk_widget_show(sugmode_label);
        sugmode_label = gtk_label_new(_("Default suggestion mode"));
        gtk_widget_show(sugmode_label);

-       gtk_label_set_justify(GTK_LABEL(sugmode_label), GTK_JUSTIFY_LEFT);
+       gtk_table_attach(GTK_TABLE (table), sugmode_label, 0, 1, 1, 2,
+                        (GtkAttachOptions) (GTK_FILL),
+                        (GtkAttachOptions) (0), 0, 2);
+       gtk_label_set_justify(GTK_LABEL(sugmode_label), GTK_JUSTIFY_RIGHT);

        gtk_misc_set_alignment(GTK_MISC(sugmode_label), 1, 0.5);
        gtk_misc_set_alignment(GTK_MISC(sugmode_label), 1, 0.5);

-       gtk_box_pack_start(GTK_BOX(hbox), sugmode_label, FALSE, FALSE, 0);
-
-       label = gtk_label_new("");
-       gtk_widget_show(label);
-       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);

 
        sugmode_optmenu = gtk_option_menu_new();
        gtk_widget_show(sugmode_optmenu);
        gtk_widget_set_size_request(sugmode_optmenu, 180, -1); 
 
        sugmode_optmenu = gtk_option_menu_new();
        gtk_widget_show(sugmode_optmenu);
        gtk_widget_set_size_request(sugmode_optmenu, 180, -1); 

+       gtk_table_attach (GTK_TABLE (table), sugmode_optmenu, 1, 2, 1, 2,
+                         GTK_SHRINK, 0, 0, 0);

        
        sugmode_optmenu_menu = gtk_menu_new();
        gtk_option_menu_set_menu(GTK_OPTION_MENU(sugmode_optmenu),
                        sugmode_optmenu_menu);
        
        sugmode_optmenu_menu = gtk_menu_new();
        gtk_option_menu_set_menu(GTK_OPTION_MENU(sugmode_optmenu),
                        sugmode_optmenu_menu);

-       gtk_box_pack_start(GTK_BOX(hbox), sugmode_optmenu, FALSE, FALSE, 0);

        
        misspelled_hbox = gtk_hbox_new(FALSE, 10);
        gtk_widget_show(misspelled_hbox);
        gtk_box_pack_start(GTK_BOX(vbox1), misspelled_hbox, FALSE, FALSE, 0);
                
        
        misspelled_hbox = gtk_hbox_new(FALSE, 10);
        gtk_widget_show(misspelled_hbox);
        gtk_box_pack_start(GTK_BOX(vbox1), misspelled_hbox, FALSE, FALSE, 0);
                

-       misspelled_label = gtk_label_new(_("Misspelled word color:"));
+       misspelled_label = gtk_label_new(_("Misspelled word color"));

        gtk_widget_show(misspelled_label);
        gtk_box_pack_start(GTK_BOX(misspelled_hbox), misspelled_label,
                FALSE, FALSE, 0);
        gtk_widget_show(misspelled_label);
        gtk_box_pack_start(GTK_BOX(misspelled_hbox), misspelled_label,
                FALSE, FALSE, 0);