2005-12-05 [paul] 1.9.100cvs61

	* src/compose.c
	* src/prefs_account.c
	* src/prefs_filtering.c
	* src/prefs_quote.c
	* src/prefs_spelling.c
	* src/prefs_toolbar.c
	* src/summaryview.c
	* src/gtk/gtkutils.c
	* src/gtk/quicksearch.c
	* src/plugins/dillo_viewer/dillo_prefs.c
		dialog cleanups

diff --git a/ChangeLog b/ChangeLog
index 1b59bda06869ec8f72a23a090fcc27bae64f361d..2378a4d09a98c7499c4c16850221b770b211c106 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-12-05 [paul]      1.9.100cvs61
+
+       * src/compose.c
+       * src/prefs_account.c
+       * src/prefs_filtering.c
+       * src/prefs_quote.c
+       * src/prefs_spelling.c
+       * src/prefs_toolbar.c
+       * src/summaryview.c
+       * src/gtk/gtkutils.c
+       * src/gtk/quicksearch.c
+       * src/plugins/dillo_viewer/dillo_prefs.c
+               dialog cleanups
+

 2005-12-04 [paul]      1.9.100cvs60
 
        * src/inc.c
 2005-12-04 [paul]      1.9.100cvs60
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index caa62f755843aed493e389ad49a6266c2d9b304d..71c4c8fd501d5bdcd8d1141c20d861f0e6446df4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1044,3 +1044,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/gpl.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/sylpheed-claws-manual.xml;  ) > 1.9.100cvs58.patchset
 ( cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs59.patchset
 ( cvs diff -u -r 1.149.2.38 -r 1.149.2.39 src/inc.c;  cvs diff -u -r 1.105.2.43 -r 1.105.2.44 src/prefs_account.c;  cvs diff -u -r 1.49.2.16 -r 1.49.2.17 src/prefs_account.h;  ) > 1.9.100cvs60.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/gpl.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/sylpheed-claws-manual.xml;  ) > 1.9.100cvs58.patchset
 ( cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs59.patchset
 ( cvs diff -u -r 1.149.2.38 -r 1.149.2.39 src/inc.c;  cvs diff -u -r 1.105.2.43 -r 1.105.2.44 src/prefs_account.c;  cvs diff -u -r 1.49.2.16 -r 1.49.2.17 src/prefs_account.h;  ) > 1.9.100cvs60.patchset

+( cvs diff -u -r 1.382.2.199 -r 1.382.2.200 src/compose.c;  cvs diff -u -r 1.105.2.44 -r 1.105.2.45 src/prefs_account.c;  cvs diff -u -r 1.59.2.26 -r 1.59.2.27 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_quote.c;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/prefs_spelling.c;  cvs diff -u -r 1.30.2.19 -r 1.30.2.20 src/prefs_toolbar.c;  cvs diff -u -r 1.395.2.149 -r 1.395.2.150 src/summaryview.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/gtk/gtkutils.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/gtk/quicksearch.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/plugins/dillo_viewer/dillo_prefs.c;  ) > 1.9.100cvs61.patchset

diff --git a/configure.ac b/configure.ac
index c8c6b05dccc92d0e60ce31526f0f5fd8def8479a..20be668d3fb0f21ae8c816b7851f19cd93119f5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=60
+EXTRA_VERSION=61

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 3e9c1622db08e5e7cdf09ac7082018444a95fb69..abb9a0ca1bee046b09bad50e0730f30ed0ddc354 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5155,7 +5155,7 @@ static GtkWidget *compose_create_others(Compose *compose)
                g_free(folderidentifier);
        }
 
                g_free(folderidentifier);
        }
 

-       savemsg_select = gtk_button_new_with_label (_("Select ..."));
+       savemsg_select = gtkut_get_browse_file_btn(_("_Browse"));

        gtk_widget_show(savemsg_select);
        gtk_table_attach(GTK_TABLE(table), savemsg_select, 2, 3, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        g_signal_connect(G_OBJECT(savemsg_select), "clicked",
        gtk_widget_show(savemsg_select);
        gtk_table_attach(GTK_TABLE(table), savemsg_select, 2, 3, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
        g_signal_connect(G_OBJECT(savemsg_select), "clicked",

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 6c3e57aca4fc02a4c5314279f5fe3d24777b2d82..ce43cb87870a56b3afbf9ed404e2151cb8ec98c3 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -829,7 +829,7 @@ GtkWidget *gtkut_get_browse_file_btn(const gchar *button_label)
 #if GTK_CHECK_VERSION(2, 6, 0)
        button = gtk_button_new_with_mnemonic(button_label);
        gtk_button_set_image((GtkButton*)button,
 #if GTK_CHECK_VERSION(2, 6, 0)
        button = gtk_button_new_with_mnemonic(button_label);
        gtk_button_set_image((GtkButton*)button,

-               gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
+               gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_BUTTON));

 #else
        GtkWidget* image;
        GtkWidget* box;
 #else
        GtkWidget* image;
        GtkWidget* box;

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 93ea87f690acc615275dc1d9629d8cd6ae57fe84..3803970dd49fdc71e678644f20e18a796003d04f 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -427,6 +427,13 @@ QuickSearch *quicksearch_new()
 
        search_hbox = gtk_hbox_new(FALSE, 5);
 
 
        search_hbox = gtk_hbox_new(FALSE, 5);
 

+       clear_search = gtk_button_new_with_label(_(" Clear "));
+       gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
+                          FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT(clear_search), "clicked",
+                        G_CALLBACK(clear_search_cb), quicksearch);
+       gtk_widget_show(clear_search);
+

        search_condition_expression = gtk_button_new_with_label (_(" ... "));
        gtk_box_pack_start(GTK_BOX(search_hbox), search_condition_expression,
                           FALSE, FALSE, 0);
        search_condition_expression = gtk_button_new_with_label (_(" ... "));
        gtk_box_pack_start(GTK_BOX(search_hbox), search_condition_expression,
                           FALSE, FALSE, 0);


@@ -436,17 +443,10 @@ QuickSearch *quicksearch_new()
        search_cond_expr_tip = gtk_tooltips_new();
        gtk_tooltips_set_tip(GTK_TOOLTIPS(search_cond_expr_tip),
                             search_condition_expression,
        search_cond_expr_tip = gtk_tooltips_new();
        gtk_tooltips_set_tip(GTK_TOOLTIPS(search_cond_expr_tip),
                             search_condition_expression,

-                            _("Quicksearch: edit filtering condition"), NULL);
+                            _("Quick search: edit filtering condition"), NULL);

        gtk_widget_show(search_condition_expression);
 
        gtk_widget_show(search_condition_expression);
 

-       clear_search = gtk_button_new_with_label(_(" Clear "));
-       gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
-                          FALSE, FALSE, 0);
-       g_signal_connect(G_OBJECT(clear_search), "clicked",
-                        G_CALLBACK(clear_search_cb), quicksearch);
-       gtk_widget_show(clear_search);
-
-       search_description = gtk_button_new_with_label(_("Extended Symbols"));
+       search_description = gtk_button_new_with_label(_(" Extended Symbols... "));

        gtk_box_pack_start(GTK_BOX(search_hbox), search_description,
                           FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(search_description), "clicked",
        gtk_box_pack_start(GTK_BOX(search_hbox), search_description,
                           FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(search_description), "clicked",

diff --git a/src/plugins/dillo_viewer/dillo_prefs.c b/src/plugins/dillo_viewer/dillo_prefs.c
index cb049bf5e37b72246873af450a8699ca0019dcac..397e4deb52d1e3b9bc4b2c07e5449aad1ca6a9db 100644 (file)
--- a/src/plugins/dillo_viewer/dillo_prefs.c
+++ b/src/plugins/dillo_viewer/dillo_prefs.c
@@ -123,6 +123,8 @@ static void create_dillo_prefs_page(PrefsPage *page,
        label = gtk_label_new(_("You can still load remote links "
                              "by reloading the page"));
         gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
        label = gtk_label_new(_("You can still load remote links "
                              "by reloading the page"));
         gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);

+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+       gtkut_widget_set_small_font_size (label);

         gtk_widget_show(label);
 
        full_tooltip = gtk_tooltips_new();
         gtk_widget_show(label);
 
        full_tooltip = gtk_tooltips_new();

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 76cc92a6e4aefe432025c012d1b69eb9bb224cde..b3bfc0bcda3ec3d42acbe44fb460cf47812016e6 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -124,9 +124,9 @@ static struct Receive {
        GtkWidget *imapdir_entry;
 
        GtkWidget *frame_maxarticle;
        GtkWidget *imapdir_entry;
 
        GtkWidget *frame_maxarticle;

-       GtkWidget *label_maxarticle;
-       GtkWidget *spinbtn_maxarticle;
-       GtkObject *spinbtn_maxarticle_adj;
+       GtkWidget *maxarticle_label;
+       GtkWidget *maxarticle_spinbtn;
+       GtkObject *maxarticle_spinbtn_adj;

 } receive;
 
 static struct Send {
 } receive;
 
 static struct Send {


@@ -345,7 +345,7 @@ static PrefParam param[] = {
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"max_news_articles", "300", &tmp_ac_prefs.max_articles, P_INT,
         prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"max_news_articles", "300", &tmp_ac_prefs.max_articles, P_INT,

-        &receive.spinbtn_maxarticle,
+        &receive.maxarticle_spinbtn,

         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 
        /* Send */
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 
        /* Send */


@@ -1353,6 +1353,7 @@ static void prefs_account_receive_create(void)
        GtkWidget *use_apop_chkbtn;
        GtkWidget *rmmail_chkbtn;
        GtkWidget *hbox_spc;
        GtkWidget *use_apop_chkbtn;
        GtkWidget *rmmail_chkbtn;
        GtkWidget *hbox_spc;

+       GtkTooltips *leave_time_tooltip;

        GtkWidget *leave_time_label;
        GtkWidget *leave_time_entry;
        GtkWidget *getall_chkbtn;
        GtkWidget *leave_time_label;
        GtkWidget *leave_time_entry;
        GtkWidget *getall_chkbtn;


@@ -1365,6 +1366,7 @@ static void prefs_account_receive_create(void)
        GtkWidget *inbox_label;
        GtkWidget *inbox_entry;
        GtkWidget *inbox_btn;
        GtkWidget *inbox_label;
        GtkWidget *inbox_entry;
        GtkWidget *inbox_btn;

+       GtkTooltips *inbox_tooltip;

        GtkWidget *imap_frame;
        GtkWidget *imapdir_label;
        GtkWidget *imapdir_entry;
        GtkWidget *imap_frame;
        GtkWidget *imapdir_label;
        GtkWidget *imapdir_entry;


@@ -1382,9 +1384,12 @@ static void prefs_account_receive_create(void)
 
        GtkWidget *hbox2;
        GtkWidget *frame2;
 
        GtkWidget *hbox2;
        GtkWidget *frame2;

-       GtkWidget *label_maxarticle;
-       GtkWidget *spinbtn_maxarticle;
-       GtkObject *spinbtn_maxarticle_adj;
+       GtkWidget *maxarticle_label;
+       GtkWidget *maxarticle_spinbtn;
+       GtkObject *maxarticle_spinbtn_adj;
+       GtkTooltips *maxarticle_tool_tip;
+
+       inbox_tooltip = gtk_tooltips_new();

 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);


@@ -1408,11 +1413,17 @@ static void prefs_account_receive_create(void)
 
        local_inbox_entry = gtk_entry_new ();
        gtk_widget_show (local_inbox_entry);
 
        local_inbox_entry = gtk_entry_new ();
        gtk_widget_show (local_inbox_entry);

+       gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), local_inbox_entry,
+                            _("Unfiltered messages will be stored in this folder"),
+                            NULL);

        gtk_widget_set_size_request (local_inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
        gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_entry, TRUE, TRUE, 0);
 
        gtk_widget_set_size_request (local_inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
        gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_entry, TRUE, TRUE, 0);
 

-       local_inbox_btn = gtk_button_new_with_label (_(" Select... "));
+       local_inbox_btn = gtkut_get_browse_file_btn(_("_Browse"));

        gtk_widget_show (local_inbox_btn);
        gtk_widget_show (local_inbox_btn);

+       gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), local_inbox_btn,
+                            _("Unfiltered messages will be stored in this folder"),
+                            NULL);

        gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (local_inbox_btn), "clicked",
                          G_CALLBACK (prefs_account_select_folder_cb),
        gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (local_inbox_btn), "clicked",
                          G_CALLBACK (prefs_account_select_folder_cb),


@@ -1444,8 +1455,12 @@ static void prefs_account_receive_create(void)
        gtk_widget_show (leave_time_label);
        gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
 
        gtk_widget_show (leave_time_label);
        gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
 

+       leave_time_tooltip = gtk_tooltips_new();
+

        leave_time_entry = gtk_entry_new ();
        gtk_widget_show (leave_time_entry);
        leave_time_entry = gtk_entry_new ();
        gtk_widget_show (leave_time_entry);

+       gtk_tooltips_set_tip(GTK_TOOLTIPS(leave_time_tooltip), leave_time_entry,
+                            _("0 days: remove immediately"), NULL);

        gtk_widget_set_size_request (leave_time_entry, 64, -1);
        gtk_box_pack_start (GTK_BOX (hbox1), leave_time_entry, FALSE, FALSE, 0);
 
        gtk_widget_set_size_request (leave_time_entry, 64, -1);
        gtk_box_pack_start (GTK_BOX (hbox1), leave_time_entry, FALSE, FALSE, 0);
 


@@ -1455,25 +1470,6 @@ static void prefs_account_receive_create(void)
 
        SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
 
 
        SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
 

-       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-       hbox_spc = gtk_hbox_new (FALSE, 0);
-       gtk_widget_show (hbox_spc);
-       gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
-       gtk_widget_set_size_request (hbox_spc, 12, -1);
-
-       leave_time_label = gtk_label_new (_("(0 days: remove immediately)"));
-       gtk_label_set_justify (GTK_LABEL (leave_time_label), GTK_JUSTIFY_LEFT);
-       gtkut_widget_set_small_font_size (leave_time_label);
-       gtk_widget_show (leave_time_label);
-       gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
-
-       SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
-

        PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
                           _("Download all messages on server"));
 
        PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
                           _("Download all messages on server"));
 


@@ -1506,52 +1502,52 @@ static void prefs_account_receive_create(void)
 
        inbox_entry = gtk_entry_new ();
        gtk_widget_show (inbox_entry);
 
        inbox_entry = gtk_entry_new ();
        gtk_widget_show (inbox_entry);

+       gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), inbox_entry,
+                            _("Unfiltered messages will be stored in this folder"),
+                            NULL);

        gtk_widget_set_size_request (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
        gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0);
 
        gtk_widget_set_size_request (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
        gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0);
 

-       inbox_btn = gtk_button_new_with_label (_(" Select... "));
+       inbox_btn = gtkut_get_browse_file_btn(_("_Browse"));

        gtk_widget_show (inbox_btn);
        gtk_widget_show (inbox_btn);

+       gtk_tooltips_set_tip(GTK_TOOLTIPS(inbox_tooltip), inbox_btn,
+                            _("Unfiltered messages will be stored in this folder"),
+                            NULL);

        gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (inbox_btn), "clicked",
                          G_CALLBACK (prefs_account_select_folder_cb),
                          inbox_entry);
 
        gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (inbox_btn), "clicked",
                          G_CALLBACK (prefs_account_select_folder_cb),
                          inbox_entry);
 

-       PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-       label = gtk_label_new
-               (_("(Unfiltered messages will be stored in this folder)"));
-       gtk_widget_show (label);
-       gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-       gtkut_widget_set_small_font_size (label);
+       PACK_FRAME(vbox1, frame2, _("NNTP"));

 
 

-       PACK_FRAME(vbox1, frame2, _("Maximum number of articles to download"));
+       vbox2 = gtk_vbox_new (FALSE, 0);
+       gtk_widget_show (vbox2);
+       gtk_container_add (GTK_CONTAINER (frame2), vbox2);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);

 
        hbox2 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox2);
 
        hbox2 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox2);

-       gtk_container_add (GTK_CONTAINER (frame2), hbox2);
-       gtk_container_set_border_width (GTK_CONTAINER (hbox2), 8);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
+
+       maxarticle_label = gtk_label_new
+               (_("Maximum number of articles to download"));
+       gtk_widget_show (maxarticle_label);
+       gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_label, FALSE, FALSE, 0);
+
+       maxarticle_tool_tip = gtk_tooltips_new();

 
 

-       spinbtn_maxarticle_adj =
+       maxarticle_spinbtn_adj =

                gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
                gtk_adjustment_new (300, 0, 10000, 10, 100, 100);

-       spinbtn_maxarticle = gtk_spin_button_new
-               (GTK_ADJUSTMENT (spinbtn_maxarticle_adj), 10, 0);
-       gtk_widget_show (spinbtn_maxarticle);
-       gtk_box_pack_start (GTK_BOX (hbox2), spinbtn_maxarticle,
+       maxarticle_spinbtn = gtk_spin_button_new
+               (GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
+       gtk_widget_show (maxarticle_spinbtn);
+       gtk_tooltips_set_tip(maxarticle_tool_tip, maxarticle_spinbtn,
+                            _("unlimited if 0 is specified"), NULL);
+       gtk_box_pack_start (GTK_BOX (hbox2), maxarticle_spinbtn,

                            FALSE, FALSE, 0);
                            FALSE, FALSE, 0);

-       gtk_widget_set_size_request (spinbtn_maxarticle, 64, -1);
+       gtk_widget_set_size_request (maxarticle_spinbtn, 64, -1);

        gtk_spin_button_set_numeric
        gtk_spin_button_set_numeric

-               (GTK_SPIN_BUTTON (spinbtn_maxarticle), TRUE);
-
-       label_maxarticle = gtk_label_new
-               (_("unlimited if 0 is specified"));
-       gtk_widget_show (label_maxarticle);
-       gtk_box_pack_start (GTK_BOX (hbox2), label_maxarticle, FALSE, FALSE, 0);
-       gtk_label_set_justify (GTK_LABEL (label_maxarticle), GTK_JUSTIFY_LEFT);
+               (GTK_SPIN_BUTTON (maxarticle_spinbtn), TRUE);

 
        PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
 
 
        PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
 


@@ -1584,8 +1580,13 @@ static void prefs_account_receive_create(void)
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
 
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 4);
 

-       imapdir_label = gtk_label_new (_("IMAP server directory (usually empty)"));
+       imapdir_label = gtk_label_new (_("IMAP server directory"));
+       gtk_widget_show (imapdir_label);
+       gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
+
+       imapdir_label = gtk_label_new(_("(usually empty)"));

        gtk_widget_show (imapdir_label);
        gtk_widget_show (imapdir_label);

+       gtkut_widget_set_small_font_size (imapdir_label);

        gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
 
        imapdir_entry = gtk_entry_new();
        gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
 
        imapdir_entry = gtk_entry_new();


@@ -1625,8 +1626,8 @@ static void prefs_account_receive_create(void)
        receive.recvatgetall_chkbtn      = recvatgetall_chkbtn;
 
        receive.frame_maxarticle        = frame2;
        receive.recvatgetall_chkbtn      = recvatgetall_chkbtn;
 
        receive.frame_maxarticle        = frame2;

-       receive.spinbtn_maxarticle      = spinbtn_maxarticle;
-       receive.spinbtn_maxarticle_adj  = spinbtn_maxarticle_adj;
+       receive.maxarticle_spinbtn      = maxarticle_spinbtn;
+       receive.maxarticle_spinbtn_adj  = maxarticle_spinbtn_adj;

 }
 
 static void prefs_account_send_create(void)
 }
 
 static void prefs_account_send_create(void)


@@ -2177,7 +2178,7 @@ static void prefs_account_ssl_create(void)
        gtk_widget_set_size_request (hbox_spc, 16, -1);
 
        label = gtk_label_new
        gtk_widget_set_size_request (hbox_spc, 16, -1);
 
        label = gtk_label_new

-               (_("(Turn this off if you have SSL connection problems)"));
+               (_("Turn this off if you have SSL connection problems"));

        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
        gtkut_widget_set_small_font_size (label);
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
        gtkut_widget_set_small_font_size (label);


@@ -2391,7 +2392,7 @@ static void prefs_account_advanced_create(void)
                          GTK_EXPAND | GTK_SHRINK | GTK_FILL,           \
                          GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);    \
                                                                        \
                          GTK_EXPAND | GTK_SHRINK | GTK_FILL,           \
                          GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);    \
                                                                        \

-       button = gtk_button_new_with_label (_(" ... "));                \
+       button = gtkut_get_browse_file_btn(_("Browse"));                \

        gtk_widget_show (button);                                       \
        gtk_table_attach (GTK_TABLE (table), button,                    \
                          2, 3, n, n + 1, GTK_FILL, 0, 0, 0);           \
        gtk_widget_show (button);                                       \
        gtk_table_attach (GTK_TABLE (table), button,                    \
                          2, 3, n, n + 1, GTK_FILL, 0, 0, 0);           \

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index a53b109fa747be441abd4e1933921e1274a93c65..788281dd4e13e743c95ce5124b4627276a9c840f 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -289,7 +289,7 @@ static void prefs_filtering_create(void)
                          (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                          (GtkAttachOptions) (0), 0, 0);
 
                          (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                          (GtkAttachOptions) (0), 0, 0);
 

-       cond_btn = gtk_button_new_with_label (_("Define ..."));
+       cond_btn = gtk_button_new_with_label (_("Define..."));

        gtk_widget_show (cond_btn);
        gtk_table_attach (GTK_TABLE (table), cond_btn, 2, 3, 1, 2,
                          (GtkAttachOptions) (GTK_FILL),
        gtk_widget_show (cond_btn);
        gtk_table_attach (GTK_TABLE (table), cond_btn, 2, 3, 1, 2,
                          (GtkAttachOptions) (GTK_FILL),


@@ -311,7 +311,7 @@ static void prefs_filtering_create(void)
                          (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                          (GtkAttachOptions) (0), 0, 0);
 
                          (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
                          (GtkAttachOptions) (0), 0, 0);
 

-       action_btn = gtk_button_new_with_label (_("Define ..."));
+       action_btn = gtk_button_new_with_label (_("Define..."));

        gtk_widget_show (action_btn);
        gtk_table_attach (GTK_TABLE (table), action_btn, 2, 3, 2, 3,
                          (GtkAttachOptions) (GTK_FILL),
        gtk_widget_show (action_btn);
        gtk_table_attach (GTK_TABLE (table), action_btn, 2, 3, 2, 3,
                          (GtkAttachOptions) (GTK_FILL),

diff --git a/src/prefs_quote.c b/src/prefs_quote.c
index b3fff0851c0b26008073ced1d81ea329a51d358c..8cabd0e2ea0f7ec2153d47d177fd97652d6c52ce 100644 (file)
--- a/src/prefs_quote.c
+++ b/src/prefs_quote.c
@@ -178,7 +178,7 @@ void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
        btn_quotedesc =
        gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
 
        btn_quotedesc =

-               gtk_button_new_with_label (_(" Description of symbols "));
+               gtk_button_new_with_label (_(" Description of symbols... "));

        gtk_widget_show (btn_quotedesc);
        gtk_box_pack_start (GTK_BOX (hbox1), btn_quotedesc, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(btn_quotedesc), "clicked",
        gtk_widget_show (btn_quotedesc);
        gtk_box_pack_start (GTK_BOX (hbox1), btn_quotedesc, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(btn_quotedesc), "clicked",

diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
index 20fe778dc2431ef0330cd4b3c4ed5d64373c0fa0..bf0f4f06b71182e0b868176c97bfca7b08bf5c31 100644 (file)
--- a/src/prefs_spelling.c
+++ b/src/prefs_spelling.c
@@ -260,16 +260,9 @@ void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer
        gtk_box_pack_start(GTK_BOX(hbox1), misspelled_btn, FALSE, FALSE,
                           0);
        gtk_widget_set_size_request(misspelled_btn, 30, 20);
        gtk_box_pack_start(GTK_BOX(hbox1), misspelled_btn, FALSE, FALSE,
                           0);
        gtk_widget_set_size_request(misspelled_btn, 30, 20);

-       label5 = gtk_label_new(_("(Black to use underline)"));
-       gtk_misc_set_alignment(GTK_MISC(label5), 0, 0.5);
-       gtk_label_set_justify(GTK_LABEL(label4), GTK_JUSTIFY_LEFT);
+       label5 = gtk_label_new(_("Use black to underline"));
+       gtkut_widget_set_small_font_size (label5);

        gtk_widget_show(label5);
        gtk_widget_show(label5);

-       font_desc = pango_font_description_new();
-       size = pango_font_description_get_size
-               (label5->style->font_desc);
-       pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
-       gtk_widget_modify_font(label5, font_desc);
-       pango_font_description_free(font_desc);

        gtk_box_pack_start(GTK_BOX(hbox1), label5, FALSE, FALSE,
                           4);
        /* END GLADE CODE */
        gtk_box_pack_start(GTK_BOX(hbox1), label5, FALSE, FALSE,
                           4);
        /* END GLADE CODE */

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 07a681d6f67cb3539dfa31ba67f008a7f5e61d06..b8948598aa5ff5835398c7a34e47235c665d1fd8 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -801,7 +801,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
                         G_CALLBACK(prefs_toolbar_delete), 
                          prefs_toolbar);
 
                         G_CALLBACK(prefs_toolbar_delete), 
                          prefs_toolbar);
 

-       default_btn = gtk_button_new_with_label(_(" Default "));
+       default_btn = gtk_button_new_with_label(_(" Use default "));

        gtk_box_pack_end(GTK_BOX(reg_hbox), default_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(default_btn), "clicked",
                         G_CALLBACK(prefs_toolbar_default), 
        gtk_box_pack_end(GTK_BOX(reg_hbox), default_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(default_btn), "clicked",
                         G_CALLBACK(prefs_toolbar_default), 

diff --git a/src/summaryview.c b/src/summaryview.c
index 91f5be1c02801d0ab478a3be82159392b07c63a8..bfb812cf63d5201713e3bdb5aaca3e8512e366a4 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -527,7 +527,7 @@ SummaryView *summary_create(void)
 
        gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
                             toggle_search,
 
        gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
                             toggle_search,

-                            _("Toggle quick-search bar"), NULL);
+                            _("Toggle quick search bar"), NULL);

        
        gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);      
 
        
        gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);