projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2010-03-23 [pawel] 3.7.5cvs37
[claws.git] / src / mimeview.c
diff --git a/src/mimeview.c b/src/mimeview.c
index 0d7d41135b4b988188b98ce13601c5ed26010cf6..b514356fc0bc17e775151e4843cca403bfa61560 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2008 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -278,16 +278,22 @@ MimeView *mimeview_create(MainWindow *mainwin)
                                       GTK_POLICY_AUTOMATIC);
 
        ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
-       gtk_widget_show(ctree);
+
+       if (prefs_common.show_col_headers == FALSE)
+               gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
+
        gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
        gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
        gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), COL_SIZE,
                                           GTK_JUSTIFY_RIGHT);
        gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_MIMETYPE, 240);
        gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_SIZE, 90);
+       gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_MIMETYPE, TRUE);
+       gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_NAME, TRUE); 
        for (i = 0; i < N_MIMEVIEW_COLS; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
+       gtk_widget_show(ctree);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
        g_signal_connect(G_OBJECT(ctree), "tree_select_row",
@@ -321,8 +327,6 @@ MimeView *mimeview_create(MainWindow *mainwin)
        mime_toggle = gtk_event_box_new();
        gtk_event_box_set_visible_window(GTK_EVENT_BOX(mime_toggle), FALSE);
 
-       g_signal_connect(G_OBJECT(mime_toggle), "visibility-notify-event",
-                        G_CALLBACK(mimeview_visi_notify), mimeview);
        g_signal_connect(G_OBJECT(mime_toggle), "motion-notify-event",
                         G_CALLBACK(mimeview_visi_notify), mimeview);
        g_signal_connect(G_OBJECT(mime_toggle), "leave-notify-event",
@@ -461,8 +465,8 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
 
        mimeview_clear(mimeview);
 
-       g_return_if_fail(file != NULL);
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(file != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
 
        mimeview->mimeinfo = mimeinfo;
 
@@ -575,7 +579,7 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
 {
        GtkCMCTreeNode *node;
 
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
 
        while (mimeinfo != NULL) {
                node = mimeview_append_part(mimeview, mimeinfo, parent);
@@ -860,8 +864,8 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
        StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
        SignatureStatus mycode = SIGNATURE_UNCHECKED;
        
-       g_return_if_fail(mimeview != NULL);
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(mimeview != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
        
        if (special)
                mycode = code;
@@ -1171,8 +1175,8 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
        MimeInfo *siginfo;
        MimeInfo *first_text;
        
-       g_return_if_fail(mimeview != NULL);
-       g_return_if_fail(selected != NULL);
+       cm_return_if_fail(mimeview != NULL);
+       cm_return_if_fail(selected != NULL);
        
        if (selected->type == MIMETYPE_MESSAGE 
        &&  !g_ascii_strcasecmp(selected->subtype, "rfc822")) {
@@ -1251,7 +1255,7 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
        GdkDragContext *context;
        MimeInfo *partinfo;
 
-       g_return_if_fail(mimeview != NULL);
+       cm_return_if_fail(mimeview != NULL);
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
@@ -1409,13 +1413,16 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                return FALSE;
                
        switch (event->keyval) {
+       case GDK_Page_Down:
        case GDK_space:
-               if (mimeview_scroll_page(mimeview, FALSE))
+               if (mimeview_scroll_page(mimeview,
+                                        (event->state & GDK_SHIFT_MASK) != 0))
                        return TRUE;
-
-               mimeview_select_next_part(mimeview);
+                       
+               if (!(event->state & GDK_SHIFT_MASK))
+                       mimeview_select_next_part(mimeview);
                return TRUE;
-
+       case GDK_Page_Up:
        case GDK_BackSpace:
                mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
@@ -1424,6 +1431,10 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                mimeview_scroll_one_line(mimeview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                return TRUE;
+       case GDK_Up:
+       case GDK_Down:
+               mimeview_scroll_one_line(mimeview, (event->keyval == GDK_Up));
+               return TRUE;
        case GDK_n:
        case GDK_N:
                BREAK_ON_MODIFIER_KEY();
@@ -1451,13 +1462,13 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                KEY_PRESS_EVENT_STOP();
                mimeview_launch(mimeview, NULL);
                return TRUE;
-#ifndef G_OS_WIN32
        case GDK_o:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
+#ifndef G_OS_WIN32
                mimeview_open_with(mimeview);
-               return TRUE;
 #endif
+               return TRUE;
        case GDK_c:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
@@ -1598,8 +1609,10 @@ static gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
        gchar *filename;
 
        filename = g_strdup(get_part_name(partinfo));
-       if (!filename || !*filename)
+       if (!filename || !*filename) {
+               g_free(filename);
                filename = g_strdup_printf("noname.%d", number);
+       }
 
        if (!g_utf8_validate(filename, -1, NULL)) {
                gchar *tmp = conv_filename_to_utf8(filename);
@@ -1769,7 +1782,7 @@ static void mimeview_save_as(MimeView *mimeview)
 
        partinfo = mimeview_get_part_to_use(mimeview);
 
-       g_return_if_fail(partinfo != NULL);
+       cm_return_if_fail(partinfo != NULL);
        
        if (get_part_name(partinfo) == NULL) {
                return;
@@ -1791,7 +1804,7 @@ static void mimeview_save_as(MimeView *mimeview)
 
        subst_for_filename(partname);
        
-       if (prefs_common.attach_save_dir)
+       if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
                filepath = g_strconcat(prefs_common.attach_save_dir,
                                       G_DIR_SEPARATOR_S, partname, NULL);
        else
@@ -1825,7 +1838,7 @@ static void mimeview_display_as_text(MimeView *mimeview)
 
        partinfo = mimeview_get_part_to_use(mimeview);
        mimeview_select_mimepart_icon(mimeview, partinfo);
-       g_return_if_fail(partinfo != NULL);
+       cm_return_if_fail(partinfo != NULL);
        mimeview_show_message_part(mimeview, partinfo);
 }
 
@@ -1840,7 +1853,7 @@ static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
        if (!partinfo)
                partinfo = mimeview_get_part_to_use(mimeview);
 
-       g_return_if_fail(partinfo != NULL);
+       cm_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
@@ -1883,7 +1896,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
        gchar *uri;
        int r = 0;
 #endif
-       g_return_if_fail(partinfo != NULL);
+       cm_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
@@ -2217,8 +2230,6 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        mimeview->icon_count++;
        button = gtk_event_box_new();
 
-       g_signal_connect(G_OBJECT(button), "visibility-notify-event",
-                        G_CALLBACK(mimeview_visi_notify), mimeview);
        g_signal_connect(G_OBJECT(button), "motion-notify-event",
                         G_CALLBACK(mimeview_visi_notify), mimeview);
        g_signal_connect(G_OBJECT(button), "leave-notify-event",
@@ -2251,7 +2262,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
-               if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature"))
+               if (mimeinfo->subtype && (!g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature")
+                   || !g_ascii_strcasecmp(mimeinfo->subtype, "x-pkcs7-signature")
+                   || !g_ascii_strcasecmp(mimeinfo->subtype, "pkcs7-signature")))
                        stockp = STOCK_PIXMAP_MIME_PGP_SIG;
                else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
                        stockp = STOCK_PIXMAP_MIME_PDF;
@@ -2325,8 +2338,15 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        content_type = procmime_get_content_type_str(mimeinfo->type,
                                                     mimeinfo->subtype);
 
-       tip = g_strjoin("\n", content_type,
-                       to_human_readable((goffset)mimeinfo->length), NULL);
+#if GTK_CHECK_VERSION(2,12,0)
+       tip = g_strconcat("<b>", _("Type:"), "  </b>", content_type,
+                         "\n<b>", _("Size:"), " </b>",
+                         to_human_readable((goffset)mimeinfo->length), NULL);
+#else
+       tip = g_strconcat(_("Type:"), " ", content_type,
+                         "\n", _("Size:"), " ",
+                         to_human_readable((goffset)mimeinfo->length), NULL);
+#endif 
        g_free(content_type);
        if (desc && *desc) {
                gchar *tmp = NULL;
@@ -2335,7 +2355,17 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                } else {
                        tmp = g_strdup(desc);
                }
-               tiptmp = g_strjoin("\n", tmp, tip, NULL);
+#if GTK_CHECK_VERSION(2,12,0)
+               tiptmp = g_strconcat(tip, "\n<b>",
+                               prefs_common.attach_desc && mimeinfo->description ?
+                               _("Description:") : _("Filename:"),
+                               " </b>", tmp, NULL);
+#else
+               tiptmp = g_strconcat(tip, "\n",
+                               prefs_common.attach_desc && mimeinfo->description ?
+                               _("Description:") : _("Filename:"),
+                               " ", tmp, NULL);
+#endif
                g_free(tip);
                tip = tiptmp;
                g_free(tmp);
@@ -2347,7 +2377,11 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        }
        g_free(sigshort);
 
+#if GTK_CHECK_VERSION(2,12,0)
+       gtk_widget_set_tooltip_markup(button, tip);
+#else
        CLAWS_SET_TIP(button, tip);
+#endif
        g_free(tip);
        gtk_widget_show_all(button);
        gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
@@ -2421,7 +2455,7 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
 {
        GtkRequisition size;
 
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
 
        while (mimeinfo != NULL) {
                if (mimeinfo->type != MIMETYPE_MULTIPART)
Claws Mail