fix font issues in summaryview

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index c1ba97bdaa431dc7845dd6b2ded6495844e5dd0f..8e42f8f21a7e3ce293f08b197f6de4272087f5bf 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwidget.h>
@@ -45,7 +46,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "intl.h"
 #include "main.h"
 #include "menu.h"
 #include "mainwindow.h"
@@ -611,8 +611,9 @@ SummaryView *summary_create(void)
 
 void summary_init(SummaryView *summaryview)
 {
-       GtkStyle *style;
        GtkWidget *pixmap;
+       PangoFontDescription *font_desc;
+       gint size;
 
        gtk_widget_realize(summaryview->ctree);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
@@ -640,39 +641,21 @@ void summary_init(SummaryView *summaryview)
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
                         &gpgsignedxpm, &gpgsignedxpmmask);
 
-       if (!small_style) {
-               PangoFontDescription *font_desc = NULL;
+       font_desc = pango_font_description_from_string(NORMAL_FONT);
+       gtk_widget_modify_font(summaryview->ctree, font_desc);
+       pango_font_description_free(font_desc);
 
-               small_style = gtk_style_copy
-                       (gtk_widget_get_style(summaryview->ctree));
-               if (SMALL_FONT)
-                       font_desc = pango_font_description_from_string
-                                               (SMALL_FONT);
-               if (font_desc) {
-                       if (small_style->font_desc)
-                               pango_font_description_free(small_style->font_desc);
-                       small_style->font_desc = font_desc;
-               }
-               small_marked_style = gtk_style_copy(small_style);
-               small_marked_style->fg[GTK_STATE_NORMAL] =
-                       summaryview->color_marked;
-               small_deleted_style = gtk_style_copy(small_style);
-               small_deleted_style->fg[GTK_STATE_NORMAL] =
-                       summaryview->color_dim;
-       }
        if (!bold_style) {
-               PangoFontDescription *font_desc = NULL;
                bold_style = gtk_style_copy
                        (gtk_widget_get_style(summaryview->ctree));
-               if (BOLD_FONT)
-                       font_desc = pango_font_description_from_string
-                                               (BOLD_FONT);
+               font_desc = pango_font_description_from_string(BOLD_FONT);
                if (font_desc) {
-                       if (bold_style->font_desc)
-                               pango_font_description_free
-                                       (bold_style->font_desc);
+                       pango_font_description_free(bold_style->font_desc);
                        bold_style->font_desc = font_desc;
                }
+               
+               pango_font_description_set_weight
+                               (bold_style->font_desc, PANGO_WEIGHT_BOLD);
                bold_marked_style = gtk_style_copy(bold_style);
                bold_marked_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
@@ -681,11 +664,14 @@ void summary_init(SummaryView *summaryview)
                        summaryview->color_dim;
        }
 
-       style = gtk_style_copy(gtk_widget_get_style
-                               (summaryview->statlabel_folder));
-       gtk_widget_set_style(summaryview->statlabel_folder, style);
-       gtk_widget_set_style(summaryview->statlabel_select, style);
-       gtk_widget_set_style(summaryview->statlabel_msgs, style);
+       font_desc = pango_font_description_new();
+       size = pango_font_description_get_size
+               (summaryview->statlabel_folder->style->font_desc);
+       pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+       gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
+       gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
+       gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
+       pango_font_description_free(font_desc);
 
        pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
@@ -978,10 +964,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
           create the thread */
        summary_set_ctree_from_list(summaryview, mlist);
 
-       g_slist_free(mlist);
 
-       if (summaryview->sort_key != SORT_BY_NONE)
-               summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
+       g_slist_free(mlist);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
@@ -2093,6 +2077,9 @@ void summary_sort(SummaryView *summaryview,
 
                main_window_cursor_normal(summaryview->mainwin);
 
+               if (summaryview->threaded)
+                       summary_thread_init(summaryview);
+
                debug_print("done.\n");
                STATUSBAR_POP(summaryview->mainwin);
        }
@@ -2178,8 +2165,6 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                }
 
                g_node_destroy(root);
-
-               summary_thread_init(summaryview);
        } else {
                gchar *text[N_SUMMARY_COLS];
                cur = mlist;
@@ -2227,6 +2212,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                debug_print("\tsubject hash table size = %d\n",
                            g_hash_table_size(subject_table));
        }
+
+       summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
 }
 
 static gchar *summary_complete_address(const gchar *addr)
@@ -2781,8 +2768,12 @@ void summary_mark(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
        /* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
        summary_status_show(summaryview);
@@ -2868,6 +2859,11 @@ void summary_mark_all_read(SummaryView *summaryview)
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
+       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+            node = gtkut_ctree_node_next(ctree, node)) {
+               if (!GTK_CTREE_ROW(node)->expanded)
+                       summary_set_row_marks(summaryview, node);
+       }
        folder_item_update_thaw();
        gtk_clist_thaw(clist);
 
@@ -3111,9 +3107,15 @@ void summary_unmark(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_status_show(summaryview);
 }
 
@@ -3160,11 +3162,17 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
             cur != NULL; cur = cur->next)
                summary_move_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
 
        if (prefs_common.immediate_exec)
@@ -3237,11 +3245,17 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
             cur != NULL; cur = cur->next)
                summary_copy_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
 
        if (prefs_common.immediate_exec)
@@ -3344,7 +3358,7 @@ void summary_save_as(SummaryView *summaryview)
                gchar *oldstr = filename;
                filename = conv_codeset_strdup(filename,
                                               CS_UTF_8,
-                                              conv_get_current_charset_str());
+                                              conv_get_locale_charset_str());
                if (!filename) {
                        g_warning("summary_save_as(): faild to convert character set.");
                        filename = g_strdup(oldstr);
@@ -3723,7 +3737,7 @@ static void summary_thread_init(SummaryView *summaryview)
                while (node) {
                        next = GTK_CTREE_ROW(node)->sibling;
                        if (GTK_CTREE_ROW(node)->children)
-                               gtk_ctree_expand(ctree, node);
+                               gtk_ctree_expand_recursive(ctree, node);
                        node = next;
                }
        } else if (prefs_common.bold_unread) {
@@ -4258,7 +4272,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_TRIANGLE);
 #endif
-       gtk_ctree_set_indent(GTK_CTREE(ctree), 16);
+       gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
        g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
@@ -4447,10 +4461,9 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
                                        gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
                                summaryview->selected = next;
-                               return TRUE;
                        }
                }
-               break;
+               return TRUE;
        case GDK_Home:
        case GDK_End:
                if ((node = summaryview->selected) != NULL) {
@@ -4467,10 +4480,9 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
                                        gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
                                summaryview->selected = next;
-                               return TRUE;
                        }
                }
-               break;
+               return TRUE;
        default:
                break;
        }