src/prefs_fonts.c: demystify font settings; src/textview.c: use textview->msgfont...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 22a80e5c27cce6272e82be6fedd106ca8f37ea8d..479e6945b9a0dc59aa790de299b9f9bf5c610669 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2004-01-20 [paul]      0.9.8claws37
+
+       * src/prefs_fonts.c
+               demystify font settings
+               
+       * src/textview.c
+               use textview->msgfont for header->body in
+               textview_show_header()
+

 2004-01-20 [paul]      0.9.8claws36
 
        * src/compose.c
 2004-01-20 [paul]      0.9.8claws36
 
        * src/compose.c

diff --git a/configure.ac b/configure.ac
index 40e3a9b90bcb89a4ecdd0478fd4c51c2265c2fdc..bcbcf4bb13e44c9b79bc450121d7a32c960a724b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=36
+EXTRA_VERSION=37

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
index 9a47b6b188325545ce1f459743c64812f2bd4bc1..d81e873a1f2e61fa4117aeb2798dcc104de317fc 100644 (file)
--- a/src/prefs_fonts.c
+++ b/src/prefs_fonts.c
@@ -46,12 +46,10 @@ typedef struct _FontsPage
 
        GtkWidget *window;              /* do not modify */
 
 
        GtkWidget *window;              /* do not modify */
 

-       GtkWidget *label_textfont;
-       GtkWidget *entry_textfont;
-       GtkWidget *entry_smallfont;
-       GtkWidget *entry_normalfont;
+       GtkWidget *entry_folderviewfont;
+       GtkWidget *entry_summaryviewfont;
+       GtkWidget *entry_messageviewfont;

        GtkWidget *entry_boldfont;
        GtkWidget *entry_boldfont;

-       GtkWidget *button_textfont;

 } FontsPage;
 
 static GtkWidget *font_sel_win;
 } FontsPage;
 
 static GtkWidget *font_sel_win;


@@ -139,12 +137,10 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        FontsPage *prefs_fonts = (FontsPage *) _page;
 
        GtkWidget *table;
        FontsPage *prefs_fonts = (FontsPage *) _page;
 
        GtkWidget *table;

-       GtkWidget *label_textfont;
-       GtkWidget *entry_textfont;
-       GtkWidget *entry_smallfont;
+       GtkWidget *entry_folderviewfont;
+       GtkWidget *entry_summaryviewfont;
+       GtkWidget *entry_messageviewfont;

        GtkWidget *entry_boldfont;
        GtkWidget *entry_boldfont;

-       GtkWidget *entry_normalfont;
-       GtkWidget *button_textfont;

        GtkWidget *tmplabel, *tmpbutton;
        GtkWidget *vbox;
        GtkWidget *hint_label;
        GtkWidget *tmplabel, *tmpbutton;
        GtkWidget *vbox;
        GtkWidget *hint_label;


@@ -155,30 +151,29 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 

-       label_textfont = gtk_label_new (_("Text"));
-       gtk_widget_show (label_textfont);
-       gtk_table_attach (GTK_TABLE (table), label_textfont, 0, 1, 0, 1,
-                        (GtkAttachOptions) (GTK_FILL),
+       tmplabel = gtk_label_new (_("Folder View"));
+       gtk_widget_show (tmplabel);
+       gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 0, 1,
+                        (GtkAttachOptions) GTK_FILL,

                         (GtkAttachOptions) (0), 0, 0);
                         (GtkAttachOptions) (0), 0, 0);

-       gtk_label_set_justify(GTK_LABEL(label_textfont), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label_textfont), 1, 0.5);
+       gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
+       gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);

 
 

-       entry_textfont = gtk_entry_new ();
-       gtk_widget_show (entry_textfont);
-       gtk_table_attach (GTK_TABLE (table), entry_textfont, 1, 2, 0, 1,
+       entry_folderviewfont = gtk_entry_new ();
+       gtk_widget_show (entry_folderviewfont);
+       gtk_table_attach (GTK_TABLE (table), entry_folderviewfont, 1, 2, 0, 1,

                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

-       gtk_entry_set_text(GTK_ENTRY(entry_textfont), prefs_common.textfont);
+       gtk_entry_set_text(GTK_ENTRY(entry_folderviewfont), prefs_common.normalfont);

 
 

-       button_textfont = gtk_button_new_with_label (" ... ");
-
-       gtk_widget_show (button_textfont);
-       gtk_table_attach (GTK_TABLE (table), button_textfont, 2, 3, 0, 1,
+       tmpbutton = gtk_button_new_with_label (" ... ");
+       gtk_widget_show (tmpbutton);
+       gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 0, 1,

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

-       gtk_signal_connect (GTK_OBJECT (button_textfont), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont);
+       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
+                               GTK_SIGNAL_FUNC(prefs_font_select), entry_folderviewfont);

 
 

-       tmplabel = gtk_label_new (_("Small"));
+       tmplabel = gtk_label_new (_("Summary View"));

        gtk_widget_show (tmplabel);
        gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 1, 2,
                         (GtkAttachOptions) GTK_FILL,
        gtk_widget_show (tmplabel);
        gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 1, 2,
                         (GtkAttachOptions) GTK_FILL,


@@ -186,21 +181,21 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
 
        gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
 

-       entry_smallfont = gtk_entry_new ();
-       gtk_widget_show (entry_smallfont);
-       gtk_table_attach (GTK_TABLE (table), entry_smallfont, 1, 2, 1, 2,
+       entry_summaryviewfont = gtk_entry_new ();
+       gtk_widget_show (entry_summaryviewfont);
+       gtk_table_attach (GTK_TABLE (table), entry_summaryviewfont, 1, 2, 1, 2,

                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

-       gtk_entry_set_text(GTK_ENTRY(entry_smallfont), prefs_common.smallfont);
+       gtk_entry_set_text(GTK_ENTRY(entry_summaryviewfont), prefs_common.smallfont);

 
        tmpbutton = gtk_button_new_with_label (" ... ");
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 1, 2,
                          0, 0, 0, 0);
        gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
 
        tmpbutton = gtk_button_new_with_label (" ... ");
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 1, 2,
                          0, 0, 0, 0);
        gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",

-                           GTK_SIGNAL_FUNC(prefs_font_select), entry_smallfont);
+                           GTK_SIGNAL_FUNC(prefs_font_select), entry_summaryviewfont);

 
 

-       tmplabel = gtk_label_new (_("Normal"));
+       tmplabel = gtk_label_new (_("Message View"));

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


@@ -208,19 +203,19 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
 
        gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
 

-       entry_normalfont = gtk_entry_new ();
-       gtk_widget_show (entry_normalfont);
-       gtk_table_attach (GTK_TABLE (table), entry_normalfont, 1, 2, 2, 3,
+       entry_messageviewfont = gtk_entry_new ();
+       gtk_widget_show (entry_messageviewfont);
+       gtk_table_attach (GTK_TABLE (table), entry_messageviewfont, 1, 2, 2, 3,

                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

-       gtk_entry_set_text(GTK_ENTRY(entry_normalfont), prefs_common.normalfont);
+       gtk_entry_set_text(GTK_ENTRY(entry_messageviewfont), prefs_common.textfont);

 
        tmpbutton = gtk_button_new_with_label (" ... ");
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 2, 3,
                          0, 0, 0, 0);
 
        tmpbutton = gtk_button_new_with_label (" ... ");
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 2, 3,
                          0, 0, 0, 0);

-       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
-                               GTK_SIGNAL_FUNC(prefs_font_select), entry_normalfont);
+       gtk_signal_connect (GTK_OBJECT (tmpbutton), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_font_select), entry_messageviewfont);

 
        tmplabel = gtk_label_new (_("Bold"));
        gtk_widget_show (tmplabel);
 
        tmplabel = gtk_label_new (_("Bold"));
        gtk_widget_show (tmplabel);


@@ -247,7 +242,7 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
        gtk_widget_show(vbox);
        gtk_table_attach (GTK_TABLE (table), vbox, 0, 4, 4, 5,
        vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
        gtk_widget_show(vbox);
        gtk_table_attach (GTK_TABLE (table), vbox, 0, 4, 4, 5,

-                        (GtkAttachOptions) (GTK_FILL),
+                        (GtkAttachOptions) GTK_FILL,

                         (GtkAttachOptions) (0), 0, 0);
        
        hint_label = gtk_label_new (_("You will need to restart for the "
                         (GtkAttachOptions) (0), 0, 0);
        
        hint_label = gtk_label_new (_("You will need to restart for the "


@@ -257,12 +252,11 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
                            hint_label, FALSE, FALSE, 0);
        gtk_misc_set_alignment(GTK_MISC(hint_label), 0.5, 0.5);
 
                            hint_label, FALSE, FALSE, 0);
        gtk_misc_set_alignment(GTK_MISC(hint_label), 0.5, 0.5);
 

-       prefs_fonts->window             = GTK_WIDGET(window);
-       prefs_fonts->entry_textfont     = entry_textfont;
-       prefs_fonts->entry_smallfont    = entry_smallfont;
-       prefs_fonts->entry_normalfont   = entry_normalfont;
-       prefs_fonts->entry_boldfont     = entry_boldfont;
-       prefs_fonts->button_textfont    = button_textfont;
+       prefs_fonts->window                = GTK_WIDGET(window);
+       prefs_fonts->entry_folderviewfont  = entry_folderviewfont;
+       prefs_fonts->entry_summaryviewfont = entry_summaryviewfont;
+       prefs_fonts->entry_messageviewfont = entry_messageviewfont;
+       prefs_fonts->entry_boldfont        = entry_boldfont;

 
        prefs_fonts->page.widget = table;
 }
 
        prefs_fonts->page.widget = table;
 }


@@ -271,15 +265,16 @@ void prefs_fonts_save(PrefsPage *_page)
 {
        FontsPage *fonts = (FontsPage *) _page;
 
 {
        FontsPage *fonts = (FontsPage *) _page;
 

-       prefs_common.textfont   = gtk_editable_get_chars
-               (GTK_EDITABLE(fonts->entry_textfont), 0, -1);
+       prefs_common.normalfont = gtk_editable_get_chars
+               (GTK_EDITABLE(fonts->entry_folderviewfont), 0, -1);

        prefs_common.smallfont  = gtk_editable_get_chars
        prefs_common.smallfont  = gtk_editable_get_chars

-               (GTK_EDITABLE(fonts->entry_smallfont), 0, -1);
+               (GTK_EDITABLE(fonts->entry_summaryviewfont), 0, -1);
+       prefs_common.textfont   = gtk_editable_get_chars
+               (GTK_EDITABLE(fonts->entry_messageviewfont), 0, -1);

        prefs_common.boldfont   = gtk_editable_get_chars
                (GTK_EDITABLE(fonts->entry_boldfont), 0, -1);
        prefs_common.boldfont   = gtk_editable_get_chars
                (GTK_EDITABLE(fonts->entry_boldfont), 0, -1);

-       prefs_common.normalfont = gtk_editable_get_chars
-               (GTK_EDITABLE(fonts->entry_normalfont), 0, -1);

 }
 }

+

 static void prefs_fonts_destroy_widget(PrefsPage *_page)
 {
        /* FontsPage *fonts = (FontsPage *) _page; */
 static void prefs_fonts_destroy_widget(PrefsPage *_page)
 {
        /* FontsPage *fonts = (FontsPage *) _page; */

diff --git a/src/textview.c b/src/textview.c
index c9e3597070ff9466ca246d05c3e2c72ecdb6ba65..0f4baec3238b43c95d188aa88a408deb7e119eae 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1466,15 +1466,15 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                     procheader_headername_equal(header->name,
                                                 "X-Newsreader")) &&
                    strstr(header->body, "Sylpheed") != NULL)
                     procheader_headername_equal(header->name,
                                                 "X-Newsreader")) &&
                    strstr(header->body, "Sylpheed") != NULL)

-                       gtk_stext_insert(text, NULL, &emphasis_color, NULL,
+                       gtk_stext_insert(text, textview->msgfont, &emphasis_color, NULL,

                                        header->body, -1);
                else if (prefs_common.enable_color) {
                        textview_make_clickable_parts(textview,
                                        header->body, -1);
                else if (prefs_common.enable_color) {
                        textview_make_clickable_parts(textview,

-                                                     NULL, NULL, &uri_color,
+                                                     textview->msgfont, NULL, &uri_color,

                                                      header->body);
                } else {
                        textview_make_clickable_parts(textview,
                                                      header->body);
                } else {
                        textview_make_clickable_parts(textview,

-                                                     NULL, NULL, NULL,
+                                                     textview->msgfont, NULL, NULL,

                                                      header->body);
                }
                gtk_stext_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
                                                      header->body);
                }
                gtk_stext_insert(text, textview->msgfont, NULL, NULL, "\n", 1);