re-enable different font settings for gtk1/2; fix folder prefs displayed wrong; set...

diff --git a/ChangeLog-gtk2 b/ChangeLog-gtk2
index b7b1e0d720f8b4b75893bc9e0ccd124801960c8f..a05f8720a6581b7ec15309ec90de48c2ae9dfdac 100644 (file)
--- a/ChangeLog-gtk2
+++ b/ChangeLog-gtk2
@@ -1,5 +1,13 @@
+2004-02-08 Thorsten Maerz <torte@netztorte.de>
+       * src/prefs_common.c
+               re-enable different font settings for gtk1/2
+       * src/prefs_folder_item.c
+               fix folder prefs displayed wrong
+       * src/textview.c
+               set 'sunken' shadow type
+
 2004-02-07 Colin Leroy <colin@colino.net>
-       *src/compose.c
+       * src/compose.c
                Fix message being always [Edited]
                Encode headers correctly (utf8 buf)
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 48599e57763758078137700872dab3abc5ee999e..6dc925117bd047d72525178b4a0e08705f174d75 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -410,48 +410,29 @@ static PrefParam param[] = {
         &quote.entry_quote_chars, prefs_set_data_from_entry, prefs_set_entry},
 
        /* Display */
-       {"widget_font", NULL, &prefs_common.widgetfont, P_STRING,
-        NULL, NULL, NULL},
-       {"message_font", "Helvetica 14",
-        &prefs_common.textfont, P_STRING, NULL, NULL, NULL},
-       {"small_font",   "Helvetica 10",
-        &prefs_common.smallfont,   P_STRING, NULL, NULL, NULL},
-       {"bold_font",    "Helvetica Bold 14",
-        &prefs_common.boldfont,    P_STRING, NULL, NULL, NULL},
-       {"normal_font",  "Helvetica 14",
-        &prefs_common.normalfont,  P_STRING, NULL, NULL, NULL},
-
-#if 0 /* sylpheed-gtk2(original) separate font setting with gtk+-1.2 version */
        /* Obsolete fonts. For coexisting with Gtk+-1.2 version */
-       {"widget_font", NULL, &prefs_common.widgetfont_gtk1, P_STRING,
-        NULL, NULL, NULL},
-       {"message_font", "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
-        &prefs_common.textfont_gtk1, P_STRING,
-        NULL, NULL, NULL},
-       {"normal_font", DEFAULT_NORMAL_FONT_GTK1, &prefs_common.normalfont_gtk1, P_STRING,
-        NULL, NULL, NULL},
-       {"bold_font", DEFAULT_BOLD_FONT_GTK1, &prefs_common.boldfont_gtk1, P_STRING,
-        NULL, NULL, NULL},
-       {"small_font", DEFAULT_SMALL_FONT_GTK1, &prefs_common.smallfont_gtk1, P_STRING,
-        NULL, NULL, NULL},
+       {"widget_font",         NULL,
+         &prefs_common.widgetfont_gtk1,        P_STRING, NULL, NULL, NULL},
+       {"message_font",        "-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
+        &prefs_common.textfont_gtk1,           P_STRING, NULL, NULL, NULL},
+       {"small_font",          "-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*",
+         &prefs_common.smallfont_gtk1,         P_STRING, NULL, NULL, NULL},
+       {"bold_font",           "-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*",
+         &prefs_common.boldfont_gtk1,          P_STRING, NULL, NULL, NULL},
+       {"normal_font",         "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
+         &prefs_common.normalfont_gtk1,        P_STRING, NULL, NULL, NULL},
 
        /* new fonts */
-       {"widget_font_gtk2", NULL, &prefs_common.widgetfont, P_STRING,
-        NULL, NULL, NULL},
-       {"message_font_gtk2", DEFAULT_MESSAGE_FONT,
-        &prefs_common.textfont, P_STRING,
-        &display.entry_textfont,
-        prefs_set_data_from_entry, prefs_set_entry},
-       {"normal_font_gtk2", DEFAULT_NORMAL_FONT, &prefs_common.normalfont, P_STRING,
-        NULL, NULL, NULL},
-       {"bold_font_gtk2", DEFAULT_BOLD_FONT, &prefs_common.boldfont, P_STRING,
-        NULL, NULL, NULL},
-       {"small_font_gtk2", DEFAULT_SMALL_FONT, &prefs_common.smallfont, P_STRING,
-        NULL, NULL, NULL},
-       {"title_font_gtk2", DEFAULT_TITLE_FONT, &prefs_common.titlefont, P_STRING,
-        NULL, NULL, NULL},
-#endif
-
+       {"widget_font_gtk2",    NULL,
+         &prefs_common.widgetfont,             P_STRING, NULL, NULL, NULL},
+       {"message_font_gtk2",   "fixed 9",
+        &prefs_common.textfont,                P_STRING, NULL, NULL, NULL},
+       {"small_font_gtk2",     "Sans 9",
+         &prefs_common.smallfont,              P_STRING, NULL, NULL, NULL},
+       {"bold_font_gtk2",      "Sans Bold 9",
+         &prefs_common.boldfont,               P_STRING, NULL, NULL, NULL},
+       {"normal_font_gtk2",    "Sans 9", 
+         &prefs_common.normalfont,             P_STRING, NULL, NULL, NULL},
 
        {"display_folder_unread_num", "TRUE",
         &prefs_common.display_folder_unread, P_BOOL,

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index b0d0181ea6fd6fe9971768a2e0a350b9225804b9..e14d5687a4be6829fec0745bdc330206a5c6c362 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -124,23 +124,24 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->item         = item;
 
        /* Table */
-       table = gtk_table_new(4, 2, FALSE);
+       table = gtk_table_new(5, 2, FALSE);
        gtk_widget_show(table);
-       gtk_table_set_row_spacings(GTK_TABLE(table), -1);
+       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+       gtk_table_set_col_spacings(GTK_TABLE(table), 4);
        rowcount = 0;
 
        /* Simplify Subject */
        checkbtn_simplify_subject = gtk_check_button_new_with_label(_("Simplify Subject RegExp: "));
        gtk_widget_show(checkbtn_simplify_subject);
        gtk_table_attach(GTK_TABLE(table), checkbtn_simplify_subject, 0, 1, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_simplify_subject), 
                                     item->prefs->enable_simplify_subject);
 
        entry_simplify_subject = gtk_entry_new();
        gtk_widget_show(entry_simplify_subject);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_simplify_subject, 1, 2, 
-                                 rowcount, rowcount + 1);
+       gtk_table_attach(GTK_TABLE(table), entry_simplify_subject, 1, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, entry_simplify_subject);
        gtk_entry_set_text(GTK_ENTRY(entry_simplify_subject), 
                           SAFE_STRING(item->prefs->simplify_subject_regexp));
@@ -151,15 +152,15 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        checkbtn_folder_chmod = gtk_check_button_new_with_label(_("Folder chmod: "));
        gtk_widget_show(checkbtn_folder_chmod);
        gtk_table_attach(GTK_TABLE(table), checkbtn_folder_chmod, 0, 1, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_folder_chmod), 
                                     item->prefs->enable_folder_chmod);
 
        entry_folder_chmod = gtk_entry_new();
        gtk_widget_show(entry_folder_chmod);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_folder_chmod, 1, 2, 
-                                 rowcount, rowcount + 1);
+       gtk_table_attach(GTK_TABLE(table), entry_folder_chmod, 1, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_folder_chmod, entry_folder_chmod);
        if (item->prefs->folder_chmod) {
                gchar *buf;
@@ -175,13 +176,13 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        folder_color = gtk_label_new(_("Folder color: "));
        gtk_misc_set_alignment(GTK_MISC(folder_color), 0, 0.5);
        gtk_widget_show(folder_color);
-       gtk_table_attach_defaults(GTK_TABLE(table), folder_color, 0, 1, 
-                        rowcount, rowcount + 1);
+       gtk_table_attach(GTK_TABLE(table), folder_color, 0, 1, 
+                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
 
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_widget_show(hbox);
-       gtk_table_attach_defaults(GTK_TABLE(table), hbox, 1, 2, 
-                                 rowcount, rowcount + 1);
+       gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
        folder_color_btn = gtk_button_new_with_label("");
        gtk_widget_set_size_request(folder_color_btn, 36, 26);
@@ -201,7 +202,7 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        checkbtn_enable_processing = gtk_check_button_new_with_label(_("Process at startup"));
        gtk_widget_show(checkbtn_enable_processing);
        gtk_table_attach(GTK_TABLE(table), checkbtn_enable_processing, 0, 2, 
-                        rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_processing), 
                                     item->prefs->enable_processing);
@@ -212,7 +213,7 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        checkbtn_newmailcheck = gtk_check_button_new_with_label(_("Scan for new mail"));
        gtk_widget_show(checkbtn_newmailcheck);
        gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
-                                        rowcount, rowcount+1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+                        rowcount, rowcount+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
        
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_newmailcheck),
                                                                 item->prefs->newmailcheck);
@@ -324,7 +325,8 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 #endif
        table = gtk_table_new(TABLEHEIGHT, 2, FALSE);
        gtk_widget_show(table);
-       gtk_table_set_row_spacings(GTK_TABLE(table), -1);
+       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+       gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        rowcount = 0;
 
        /* Request Return Receipt */
@@ -360,7 +362,8 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 
        entry_default_to = gtk_entry_new();
        gtk_widget_show(entry_default_to);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_default_to, 1, 2, rowcount, rowcount + 1);
+       gtk_table_attach(GTK_TABLE(table), entry_default_to, 1, 2,
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_default_to, entry_default_to);
        gtk_entry_set_text(GTK_ENTRY(entry_default_to), SAFE_STRING(item->prefs->default_to));
        address_completion_register_entry(GTK_ENTRY(entry_default_to));
@@ -377,7 +380,8 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 
        entry_default_reply_to = gtk_entry_new();
        gtk_widget_show(entry_default_reply_to);
-       gtk_table_attach_defaults(GTK_TABLE(table), entry_default_reply_to, 1, 2, rowcount, rowcount + 1);
+       gtk_table_attach(GTK_TABLE(table), entry_default_reply_to, 1, 2,
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
        SET_TOGGLE_SENSITIVITY(checkbtn_default_reply_to, entry_default_reply_to);
        gtk_entry_set_text(GTK_ENTRY(entry_default_reply_to), SAFE_STRING(item->prefs->default_reply_to));
        address_completion_register_entry(GTK_ENTRY(entry_default_reply_to));
@@ -394,8 +398,8 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 
        optmenu_default_account = gtk_option_menu_new ();
        gtk_widget_show (optmenu_default_account);
-       gtk_table_attach_defaults(GTK_TABLE(table), optmenu_default_account, 1, 2, 
-                                 rowcount, rowcount + 1);
+       gtk_table_attach(GTK_TABLE(table), optmenu_default_account, 1, 2, 
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
        optmenu_default_account_menu = gtk_menu_new ();
 
        account_list = account_get_list();
@@ -436,8 +440,8 @@ void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
 
        optmenu_default_dictionary = gtk_option_menu_new();
        gtk_widget_show(optmenu_default_dictionary);
-       gtk_table_attach_defaults(GTK_TABLE(table), optmenu_default_dictionary, 1, 2,
-                               rowcount, rowcount + 1);
+       gtk_table_attach(GTK_TABLE(table), optmenu_default_dictionary, 1, 2,
+                        rowcount, rowcount + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
 
        gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_default_dictionary), 
                                 gtkaspell_dictionary_option_menu_new(

diff --git a/src/textview.c b/src/textview.c
index 0eee8fe605e278fd875145bac81ce305f974e0f1..2737a843711777d43c28343adc17c4fc6e509370 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -184,6 +184,8 @@ TextView *textview_create(void)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
        gtk_widget_set_size_request(scrolledwin, prefs_common.mainview_width, -1);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_SHADOW_IN);
 
        /* create GtkSText widgets for single-byte and multi-byte character */
        text = gtk_text_view_new();