*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkpixmap.h>
+#include <gtk/gtk.h>
#include "procmime.h"
#include "utils.h"
void image_viewer_get_resized_size(gint w, gint h, gint aw, gint ah,
gint * sw, gint * sh);
static void image_viewer_clear_viewer(MimeViewer *imageviewer);
-
+static void scrolledwin_resize_cb(GtkWidget *scrolledwin, GtkAllocation *alloc,
+ ImageViewer *imageviewer);
struct _ImageViewer
{
MimeViewer mimeviewer;
GtkWidget *notebook;
GtkWidget *filename;
GtkWidget *filesize;
+ GtkWidget *error_lbl;
+ GtkWidget *error_msg;
GtkWidget *content_type;
+ GtkWidget *load_button;
};
static GtkWidget *image_viewer_get_widget(MimeViewer *_mimeviewer)
static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfile)
{
- GdkPixbuf *pixbuf;
- GdkPixmap *pixmap;
- GdkBitmap *mask;
+ GdkPixbufAnimation *animation = NULL;
+ GdkPixbuf *pixbuf = NULL;
gint avail_width;
gint avail_height;
GError *error = NULL;
debug_print("image_viewer_show_mimepart\n");
if (!imageviewer->resize_img) {
- pixbuf = gdk_pixbuf_new_from_file(imgfile, &error);
+ animation = gdk_pixbuf_animation_new_from_file(imgfile, &error);
} else {
gint w, h;
gdk_pixbuf_get_file_info(imgfile, &w, &h);
if (avail_width > 8) avail_width -= 8;
if (avail_height > 8) avail_height -= 8;
if (avail_width - 100 > 0 &&
- w > avail_width || h > avail_height)
+ (w > avail_width || h > avail_height)) {
pixbuf = gdk_pixbuf_new_from_file_at_scale(imgfile, avail_width,
avail_height, TRUE, &error);
- else
- pixbuf = gdk_pixbuf_new_from_file(imgfile, &error);
+ } else {
+ animation = gdk_pixbuf_animation_new_from_file(imgfile, &error);
+ }
}
- if (error) {
- g_warning(error->message);
+ if (error && !pixbuf && !animation) {
+ gtk_label_set_text(GTK_LABEL(imageviewer->error_lbl), _("Error:"));
+ gtk_label_set_text(GTK_LABEL(imageviewer->error_msg), error->message);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(imageviewer->notebook), 0);
+ gtk_widget_hide(imageviewer->load_button);
g_error_free(error);
}
- if (!pixbuf) {
+ if (!pixbuf && !animation) {
g_warning("Can't load the image.");
return;
}
- gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 0);
+ if (animation)
+ gtk_image_set_from_animation(GTK_IMAGE(imageviewer->image), animation);
+ else
+ gtk_image_set_from_pixbuf(GTK_IMAGE(imageviewer->image), pixbuf);
- if (!imageviewer->image) {
- imageviewer->image = gtk_pixmap_new(pixmap, mask);
+ g_signal_handlers_block_by_func(G_OBJECT(imageviewer->scrolledwin),
+ G_CALLBACK(scrolledwin_resize_cb), imageviewer);
- gtk_scrolled_window_add_with_viewport
- (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin),
- imageviewer->image);
- } else
- gtk_pixmap_set(GTK_PIXMAP(imageviewer->image), pixmap, mask);
gtk_widget_show(imageviewer->image);
+ GTK_EVENTS_FLUSH();
+ g_signal_handlers_unblock_by_func(G_OBJECT(imageviewer->scrolledwin),
+ G_CALLBACK(scrolledwin_resize_cb), imageviewer);
- g_object_unref(pixbuf);
+ if (pixbuf)
+ g_object_unref(pixbuf);
+ if (animation)
+ g_object_unref(animation);
}
static void image_viewer_set_notebook_page(MimeViewer *_mimeviewer)
return;
}
image_viewer_load_file(imageviewer, imgfile);
- g_unlink(imgfile);
+ claws_unlink(imgfile);
g_free(imgfile);
}
imageviewer->file = g_strdup(file);
imageviewer->mimeinfo = mimeinfo;
+ gtk_label_set_text(GTK_LABEL(imageviewer->filename),
+ procmime_mimeinfo_get_parameter(mimeinfo, "name"));
+ gtk_label_set_text(GTK_LABEL(imageviewer->filesize), to_human_readable((goffset)mimeinfo->length));
+ gtk_label_set_text(GTK_LABEL(imageviewer->content_type), mimeinfo->subtype);
+ gtk_label_set_text(GTK_LABEL(imageviewer->error_lbl), "");
+ gtk_label_set_text(GTK_LABEL(imageviewer->error_msg), "");
+
if (prefs_common.display_img)
image_viewer_load_image(imageviewer);
- else {
- gtk_label_set_text(GTK_LABEL(imageviewer->filename),
- procmime_mimeinfo_get_parameter(mimeinfo, "name"));
- gtk_label_set_text(GTK_LABEL(imageviewer->filesize), to_human_readable(mimeinfo->length));
- gtk_label_set_text(GTK_LABEL(imageviewer->content_type), mimeinfo->subtype);
- }
}
static void image_viewer_clear_viewer(MimeViewer *_mimeviewer)
image_viewer_set_notebook_page(_mimeviewer);
- if (imageviewer->image != NULL)
- gtk_pixmap_set(GTK_PIXMAP(imageviewer->image), NULL, NULL);
-
if (imageviewer->scrolledwin) {
hadj = gtk_scrolled_window_get_hadjustment
(GTK_SCROLLED_WINDOW(imageviewer->scrolledwin));
- if (hadj)
+ if (hadj) {
gtk_adjustment_set_value(hadj, 0.0);
+ gtk_adjustment_changed(hadj);
+ }
vadj = gtk_scrolled_window_get_vadjustment
(GTK_SCROLLED_WINDOW(imageviewer->scrolledwin));
- if (vadj)
+ if (vadj) {
gtk_adjustment_set_value(vadj, 0.0);
+ gtk_adjustment_changed(vadj);
+ }
}
g_free(imageviewer->file);
imageviewer->file = NULL;
image_viewer_load_image(imageviewer);
}
-MimeViewer *image_viewer_create(void)
+static MimeViewer *image_viewer_create(void)
{
ImageViewer *imageviewer;
/*
GtkWidget *label5;
GtkWidget *content_type;
GtkWidget *scrolledwin;
+ GtkWidget *error_lbl;
+ GtkWidget *error_msg;
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
- table1 = gtk_table_new(4, 3, FALSE);
+ table1 = gtk_table_new(5, 3, FALSE);
gtk_widget_show(table1);
gtk_container_add(GTK_CONTAINER(notebook), table1);
gtk_container_set_border_width(GTK_CONTAINER(table1), 8);
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment(GTK_MISC(filesize), 0, 0.5);
- load_button = gtk_button_new_with_label(_("Load Image"));
- gtk_widget_show(load_button);
- gtk_table_attach(GTK_TABLE(table1), load_button, 1, 2, 3, 4,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
-
label5 = gtk_label_new(_("Content-Type:"));
gtk_widget_show(label5);
gtk_table_attach(GTK_TABLE(table1), label5, 0, 1, 2, 3,
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment(GTK_MISC(content_type), 0, 0.5);
+ error_lbl = gtk_label_new("");
+ gtk_widget_show(error_lbl);
+ gtk_table_attach(GTK_TABLE(table1), error_lbl, 0, 1, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(error_lbl), 0, 0.5);
+
+ error_msg = gtk_label_new("");
+ gtk_widget_show(error_msg);
+ gtk_table_attach(GTK_TABLE(table1), error_msg, 1, 3, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment(GTK_MISC(error_msg), 0, 0.5);
+
+ load_button = gtk_button_new_with_label(_("Load Image"));
+ gtk_widget_show(load_button);
+ gtk_table_attach(GTK_TABLE(table1), load_button, 0, 1, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwin);
gtk_container_add(GTK_CONTAINER(notebook), scrolledwin);
imageviewer->resize_img = prefs_common.resize_img;
imageviewer->scrolledwin = scrolledwin;
- imageviewer->image = NULL;
+ imageviewer->image = gtk_image_new();
+ gtk_scrolled_window_add_with_viewport
+ (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin),
+ imageviewer->image);
imageviewer->notebook = notebook;
imageviewer->filename = filename;
imageviewer->filesize = filesize;
imageviewer->content_type = content_type;
+ imageviewer->error_msg = error_msg;
+ imageviewer->error_lbl = error_lbl;
+ imageviewer->load_button = load_button;
- gtk_widget_ref(notebook);
+ g_object_ref(notebook);
g_signal_connect(G_OBJECT(load_button), "clicked",
G_CALLBACK(load_cb), imageviewer);