Added Alfons font selection patch

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7213e75b83283c56e7afb2d2267776b7eb2f9131..a48af26a5a31bc0f7126a360986ab1473f694fc0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2001-05-13 [paul]
+
+        * added Alfons' font selection patch
+
+        * src/defs.h
+        * src/headerwindow.c
+        * src/prefs_common.c
+        * src/prefs_common.h
+
 2001-05-13 [hoa]
        * src/defs.h
                changed version of cache

diff --git a/src/defs.h b/src/defs.h
index 2e4ffc9f3540b3a84669425d4dbba92114c55025..0ed4845525f2fc9af69cb32dc90ac615964321c5 100644 (file)
--- a/src/defs.h
+++ b/src/defs.h
@@ -90,11 +90,17 @@
 #define FOLDER_SPACING                 4
 #define COLOR_DIM                      35000
 
+#if 0
 #define NORMAL_FONT    "-*-helvetica-medium-r-normal--12-*," \
                        "-*-*-medium-r-normal--12-*-*-*-*-*-*-*,*"
 #define BOLD_FONT      "-*-helvetica-bold-r-normal--12-*," \
                        "-*-*-bold-r-normal--12-*-*-*-*-*-*-*,*"
 #define SMALL_FONT     "-*-helvetica-medium-r-normal--10-*," \
                        "-*-*-medium-r-normal--10-*-*-*-*-*-*-*,*"
+#else
+#define NORMAL_FONT prefs_common.normalfont
+#define BOLD_FONT   prefs_common.boldfont
+#define SMALL_FONT     prefs_common.smallfont
+#endif
 
 #endif /* __DEFS_H__ */

diff --git a/src/headerwindow.c b/src/headerwindow.c
index a0462d084badf035c4c3fdde0704216581c65717..682ebd762ae1e1f3dad623f854cb0770b79f7677 100644 (file)
--- a/src/headerwindow.c
+++ b/src/headerwindow.c
@@ -38,6 +38,7 @@
 #include "procmsg.h"
 #include "codeconv.h"
 #include "utils.h"
+#include "prefs_common.h"
 
 static GdkFont *normalfont;
 static GdkFont *boldfont;

diff --git a/src/prefs_common.c b/src/prefs_common.c
index d5873e8d0122c6149310f1206b0ae531a5efe3f5..770862ab3ea29097b512491f0d851da5573dd2c6 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -98,9 +98,14 @@ static struct Compose {
 } compose;
 
 static struct Display {
+
        GtkWidget *entry_textfont;
        GtkWidget *button_textfont;
 
+       GtkWidget *entry_smallfont;
+       GtkWidget *entry_normalfont;
+       GtkWidget *entry_boldfont;
+
        GtkWidget *chkbtn_folder_unread;
 
        GtkWidget *chkbtn_transhdr;
@@ -276,6 +281,18 @@ static PrefParam param[] = {
         &prefs_common.textfont, P_STRING,
         &display.entry_textfont,
         prefs_set_data_from_entry, prefs_set_entry},
+       {"small_font",   "-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*",
+        &prefs_common.smallfont,   P_STRING,
+        &display.entry_smallfont,
+        prefs_set_data_from_entry, prefs_set_entry},
+       {"bold_font",    "-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*",
+        &prefs_common.boldfont,    P_STRING,
+        &display.entry_boldfont,
+        prefs_set_data_from_entry, prefs_set_entry},
+       {"normal_font",  "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
+        &prefs_common.normalfont,  P_STRING,
+        &display.entry_normalfont, 
+        prefs_set_data_from_entry, prefs_set_entry},
 
        {"display_folder_unread_num", "TRUE",
         &prefs_common.display_folder_unread, P_BOOL,
@@ -575,11 +592,11 @@ static void display_item_key_pressed      (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         gboolean       *cancelled);
 
-static void prefs_font_select                  (GtkButton      *button);
+static void prefs_font_select  (GtkButton *button, GtkEntry *entry);
 static void prefs_font_selection_key_pressed   (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
-static void prefs_font_selection_ok            (GtkButton      *button);
+static void prefs_font_selection_ok            (GtkButton      *button, GtkEntry *entry);
 
 static gint prefs_common_deleted       (GtkWidget      *widget,
                                         GdkEventAny    *event,
@@ -1391,6 +1408,7 @@ static void prefs_display_create(void)
        GtkWidget *label_datefmt;
        GtkWidget *label_datefmt_btn;
        GtkWidget *button_dispitem;
+       GtkWidget *tmplabel, *tmpentry, *tmpbutton;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1399,7 +1417,7 @@ static void prefs_display_create(void)
 
        PACK_FRAME(vbox1, frame_font, _("Font"));
 
-       table1 = gtk_table_new (1, 3, FALSE);
+       table1 = gtk_table_new (4, 3, FALSE);
        gtk_widget_show (table1);
        gtk_container_add (GTK_CONTAINER (frame_font), table1);
        gtk_container_set_border_width (GTK_CONTAINER (table1), 8);
@@ -1421,7 +1439,61 @@ static void prefs_display_create(void)
        gtk_table_attach (GTK_TABLE (table1), button_textfont, 2, 3, 0, 1,
                          0, 0, 0, 0);
        gtk_signal_connect (GTK_OBJECT (button_textfont), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_font_select), NULL);
+                           GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont);
+
+       tmplabel = gtk_label_new (_("Small"));
+       gtk_widget_show (tmplabel);
+       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 1, 2,
+                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       tmpentry = gtk_entry_new ();
+       gtk_widget_show (tmpentry);
+       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 1, 2,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+       tmpbutton = gtk_button_new_with_label ("... ");
+       gtk_widget_show (tmpbutton);
+       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 1, 2,
+                         0, 0, 0, 0);
+       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
+                           GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+       display.entry_smallfont = tmpentry;                       
+
+       tmplabel = gtk_label_new (_("Normal"));
+       gtk_widget_show (tmplabel);
+       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 2, 3,
+                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       tmpentry = gtk_entry_new ();
+       gtk_widget_show (tmpentry);
+       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 2, 3,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+       tmpbutton = gtk_button_new_with_label ("... ");
+       gtk_widget_show (tmpbutton);
+       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 2, 3,
+                         0, 0, 0, 0);
+       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
+                               GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+       display.entry_normalfont = tmpentry;                      
+
+       tmplabel = gtk_label_new (_("Bold"));
+       gtk_widget_show (tmplabel);
+       gtk_table_attach (GTK_TABLE (table1), tmplabel, 0, 1, 3, 4,
+                         GTK_FILL, (GTK_EXPAND | GTK_FILL), 0, 0);
+
+       tmpentry = gtk_entry_new ();
+       gtk_widget_show (tmpentry);
+       gtk_table_attach (GTK_TABLE (table1), tmpentry, 1, 2, 3, 4,
+                         (GTK_EXPAND | GTK_FILL), 0, 0, 0);
+
+       tmpbutton = gtk_button_new_with_label ("... ");
+       gtk_widget_show (tmpbutton);
+       gtk_table_attach (GTK_TABLE (table1), tmpbutton, 2, 3, 3, 4,
+                         0, 0, 0, 0);
+       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
+                               GTK_SIGNAL_FUNC(prefs_font_select), tmpentry);
+       display.entry_boldfont = tmpentry;                        
 
        vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
        gtk_widget_show (vbox2);
@@ -2485,7 +2557,7 @@ static void display_item_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 }
 
-static void prefs_font_select(GtkButton *button)
+static void prefs_font_select(GtkButton *button, GtkEntry *entry)
 {
        if (!font_sel_win) {
                font_sel_win = gtk_font_selection_dialog_new
@@ -2503,7 +2575,7 @@ static void prefs_font_select(GtkButton *button)
                        (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->ok_button),
                         "clicked",
                         GTK_SIGNAL_FUNC(prefs_font_selection_ok),
-                        NULL);
+                        entry);
                gtk_signal_connect_object
                        (GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(font_sel_win)->cancel_button),
                         "clicked",
@@ -2526,7 +2598,7 @@ static void prefs_font_selection_key_pressed(GtkWidget *widget,
                gtk_widget_hide(font_sel_win);
 }
 
-static void prefs_font_selection_ok(GtkButton *button)
+static void prefs_font_selection_ok(GtkButton *button, GtkEntry *entry)
 {
        gchar *fontname;
 
@@ -2534,7 +2606,7 @@ static void prefs_font_selection_ok(GtkButton *button)
                (GTK_FONT_SELECTION_DIALOG(font_sel_win));
 
        if (fontname) {
-               gtk_entry_set_text(GTK_ENTRY(display.entry_textfont), fontname);
+               gtk_entry_set_text(entry, fontname);
                g_free(fontname);
        }
 

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 3f341a48479412e940099eb5b1601b46b6aa0ba9..226cd302185e19584c5135e8a266997524adfe53 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -66,6 +66,9 @@ struct _PrefsCommon
        /* Display */
        gchar *widgetfont;
        gchar *textfont;
+       gchar *smallfont;
+       gchar *boldfont;
+       gchar *normalfont;
        gboolean display_folder_unread;
        ToolbarStyle toolbar_style;
        gboolean show_statusbar;