Commit 1b63a057 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/widgets/Makefile.am app/widgets/widgets-types.h added new preview

2004-03-03  Michael Natterer  <mitch@gimp.org>

	* app/widgets/Makefile.am
	* app/widgets/widgets-types.h
	* app/widgets/gimppreviewrendererimagefile.[ch]: added new preview
	renderer class (has some disabled code from my GtkFileChooser tree
	and behaves exactly as the default implementation).

	* app/widgets/gimppreviewrenderer-utils.c: use it for GimpImagefiles.
parent db856068
2004-03-03 Michael Natterer <mitch@gimp.org>
* app/widgets/Makefile.am
* app/widgets/widgets-types.h
* app/widgets/gimppreviewrendererimagefile.[ch]: added new preview
renderer class (has some disabled code from my GtkFileChooser tree
and behaves exactly as the default implementation).
* app/widgets/gimppreviewrenderer-utils.c: use it for GimpImagefiles.
2004-03-02 Manish Singh <yosh@gimp.org>
* plug-ins/pygimp/gimpfu.py: Disable PF_*ARRAY for now. Addresses
......@@ -152,6 +152,8 @@ libappwidgets_a_sources = \
gimppreviewrenderergradient.h \
gimppreviewrendererimage.c \
gimppreviewrendererimage.h \
gimppreviewrendererimagefile.c \
gimppreviewrendererimagefile.h \
gimppreviewrendererlayer.c \
gimppreviewrendererlayer.h \
gimppreviewrenderervectors.c \
......
......@@ -30,12 +30,14 @@
#include "core/gimpgradient.h"
#include "core/gimplayer.h"
#include "core/gimpimage.h"
#include "core/gimpimagefile.h"
#include "vectors/gimpvectors.h"
#include "gimppreviewrendererbrush.h"
#include "gimppreviewrendererlayer.h"
#include "gimppreviewrenderergradient.h"
#include "gimppreviewrendererimage.h"
#include "gimppreviewrendererimagefile.h"
#include "gimppreviewrenderervectors.h"
......@@ -71,6 +73,10 @@ gimp_preview_renderer_type_from_viewable_type (GType viewable_type)
{
type = GIMP_TYPE_PREVIEW_RENDERER_VECTORS;
}
else if (g_type_is_a (viewable_type, GIMP_TYPE_IMAGEFILE))
{
type = GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE;
}
return type;
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimppreviewrendererimagefile.c
* Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
*
* 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
/* #define ENABLE_FILE_SYSTEM_ICONS 1 */
#include <gtk/gtk.h>
#ifdef ENABLE_FILE_SYSTEM_ICONS
#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
#include <gtk/gtkfilesystem.h>
#endif
#include "libgimpthumb/gimpthumb.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "base/temp-buf.h"
#include "core/gimpimagefile.h"
#include "gimppreviewrendererimagefile.h"
static void gimp_preview_renderer_imagefile_class_init (GimpPreviewRendererImagefileClass *klass);
static void gimp_preview_renderer_imagefile_init (GimpPreviewRendererImagefile *renderer);
static void gimp_preview_renderer_imagefile_render (GimpPreviewRenderer *renderer,
GtkWidget *widget);
static GimpPreviewRendererClass *parent_class = NULL;
GType
gimp_preview_renderer_imagefile_get_type (void)
{
static GType renderer_type = 0;
if (! renderer_type)
{
static const GTypeInfo renderer_info =
{
sizeof (GimpPreviewRendererImagefileClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gimp_preview_renderer_imagefile_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpPreviewRendererImagefile),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_preview_renderer_imagefile_init,
};
renderer_type = g_type_register_static (GIMP_TYPE_PREVIEW_RENDERER,
"GimpPreviewRendererImagefile",
&renderer_info, 0);
}
return renderer_type;
}
static void
gimp_preview_renderer_imagefile_class_init (GimpPreviewRendererImagefileClass *klass)
{
GimpPreviewRendererClass *renderer_class;
renderer_class = GIMP_PREVIEW_RENDERER_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
renderer_class->render = gimp_preview_renderer_imagefile_render;
}
static void
gimp_preview_renderer_imagefile_init (GimpPreviewRendererImagefile *renderer)
{
renderer->file_system = NULL;
}
static void
gimp_preview_renderer_imagefile_render (GimpPreviewRenderer *renderer,
GtkWidget *widget)
{
TempBuf *temp_buf = gimp_viewable_get_preview (renderer->viewable,
renderer->width,
renderer->height);
if (temp_buf)
{
gimp_preview_renderer_default_render_buffer (renderer, widget, temp_buf);
}
else
{
GdkPixbuf *pixbuf = NULL;
#ifdef ENABLE_FILE_SYSTEM_ICONS
if (GIMP_PREVIEW_RENDERER_IMAGEFILE (renderer)->file_system)
{
GtkFileSystem *file_system;
const gchar *uri;
file_system = GIMP_PREVIEW_RENDERER_IMAGEFILE (renderer)->file_system;
uri = gimp_object_get_name (GIMP_OBJECT (renderer->viewable));
if (uri)
{
GtkFilePath *path;
path = gtk_file_system_uri_to_path (file_system, uri);
pixbuf = gtk_file_system_render_icon (file_system, path, widget,
MIN (renderer->width,
renderer->height),
NULL);
gtk_file_path_free (path);
}
}
#endif /* ENABLE_FILE_SYSTEM_ICONS */
if (pixbuf)
{
gint width;
gint height;
gint bytes;
guchar *src;
guchar *dest;
gint y;
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
bytes = gdk_pixbuf_get_n_channels (pixbuf);
temp_buf = temp_buf_new (width, height, bytes, 0, 0, NULL);
dest = temp_buf_data (temp_buf);
src = gdk_pixbuf_get_pixels (pixbuf);
for (y = 0; y < height; y++)
{
memcpy (dest, src, width * bytes);
dest += width * bytes;
src += gdk_pixbuf_get_rowstride (pixbuf);
}
if (temp_buf->width < renderer->width)
temp_buf->x = (renderer->width - temp_buf->width) / 2;
if (temp_buf->height < renderer->height)
temp_buf->y = (renderer->height - temp_buf->height) / 2;
gimp_preview_renderer_render_buffer (renderer, temp_buf, -1,
GIMP_PREVIEW_BG_WHITE,
GIMP_PREVIEW_BG_WHITE);
temp_buf_free (temp_buf);
g_object_unref (pixbuf);
}
else
{
const gchar *stock_id;
stock_id = gimp_viewable_get_stock_id (renderer->viewable);
gimp_preview_renderer_default_render_stock (renderer, widget,
stock_id);
}
}
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimppreviewrendererimagefile.h
* Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
*
* 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__
#define __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__
#include "gimppreviewrenderer.h"
#define GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE (gimp_preview_renderer_imagefile_get_type ())
#define GIMP_PREVIEW_RENDERER_IMAGEFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefile))
#define GIMP_PREVIEW_RENDERER_IMAGEFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefileClass))
#define GIMP_IS_PREVIEW_RENDERER_IMAGEFILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE))
#define GIMP_IS_PREVIEW_RENDERER_IMAGEFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE))
#define GIMP_PREVIEW_RENDERER_IMAGEFILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefileClass))
typedef struct _GimpPreviewRendererImagefileClass GimpPreviewRendererImagefileClass;
struct _GimpPreviewRendererImagefile
{
GimpPreviewRenderer parent_instance;
gpointer file_system;
};
struct _GimpPreviewRendererImagefileClass
{
GimpPreviewRendererClass parent_class;
};
GType gimp_preview_renderer_imagefile_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__ */
......@@ -30,12 +30,14 @@
#include "core/gimpgradient.h"
#include "core/gimplayer.h"
#include "core/gimpimage.h"
#include "core/gimpimagefile.h"
#include "vectors/gimpvectors.h"
#include "gimppreviewrendererbrush.h"
#include "gimppreviewrendererlayer.h"
#include "gimppreviewrenderergradient.h"
#include "gimppreviewrendererimage.h"
#include "gimppreviewrendererimagefile.h"
#include "gimppreviewrenderervectors.h"
......@@ -71,6 +73,10 @@ gimp_preview_renderer_type_from_viewable_type (GType viewable_type)
{
type = GIMP_TYPE_PREVIEW_RENDERER_VECTORS;
}
else if (g_type_is_a (viewable_type, GIMP_TYPE_IMAGEFILE))
{
type = GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE;
}
return type;
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimppreviewrendererimagefile.c
* Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
*
* 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
/* #define ENABLE_FILE_SYSTEM_ICONS 1 */
#include <gtk/gtk.h>
#ifdef ENABLE_FILE_SYSTEM_ICONS
#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
#include <gtk/gtkfilesystem.h>
#endif
#include "libgimpthumb/gimpthumb.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "base/temp-buf.h"
#include "core/gimpimagefile.h"
#include "gimppreviewrendererimagefile.h"
static void gimp_preview_renderer_imagefile_class_init (GimpPreviewRendererImagefileClass *klass);
static void gimp_preview_renderer_imagefile_init (GimpPreviewRendererImagefile *renderer);
static void gimp_preview_renderer_imagefile_render (GimpPreviewRenderer *renderer,
GtkWidget *widget);
static GimpPreviewRendererClass *parent_class = NULL;
GType
gimp_preview_renderer_imagefile_get_type (void)
{
static GType renderer_type = 0;
if (! renderer_type)
{
static const GTypeInfo renderer_info =
{
sizeof (GimpPreviewRendererImagefileClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) gimp_preview_renderer_imagefile_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GimpPreviewRendererImagefile),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_preview_renderer_imagefile_init,
};
renderer_type = g_type_register_static (GIMP_TYPE_PREVIEW_RENDERER,
"GimpPreviewRendererImagefile",
&renderer_info, 0);
}
return renderer_type;
}
static void
gimp_preview_renderer_imagefile_class_init (GimpPreviewRendererImagefileClass *klass)
{
GimpPreviewRendererClass *renderer_class;
renderer_class = GIMP_PREVIEW_RENDERER_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
renderer_class->render = gimp_preview_renderer_imagefile_render;
}
static void
gimp_preview_renderer_imagefile_init (GimpPreviewRendererImagefile *renderer)
{
renderer->file_system = NULL;
}
static void
gimp_preview_renderer_imagefile_render (GimpPreviewRenderer *renderer,
GtkWidget *widget)
{
TempBuf *temp_buf = gimp_viewable_get_preview (renderer->viewable,
renderer->width,
renderer->height);
if (temp_buf)
{
gimp_preview_renderer_default_render_buffer (renderer, widget, temp_buf);
}
else
{
GdkPixbuf *pixbuf = NULL;
#ifdef ENABLE_FILE_SYSTEM_ICONS
if (GIMP_PREVIEW_RENDERER_IMAGEFILE (renderer)->file_system)
{
GtkFileSystem *file_system;
const gchar *uri;
file_system = GIMP_PREVIEW_RENDERER_IMAGEFILE (renderer)->file_system;
uri = gimp_object_get_name (GIMP_OBJECT (renderer->viewable));
if (uri)
{
GtkFilePath *path;
path = gtk_file_system_uri_to_path (file_system, uri);
pixbuf = gtk_file_system_render_icon (file_system, path, widget,
MIN (renderer->width,
renderer->height),
NULL);
gtk_file_path_free (path);
}
}
#endif /* ENABLE_FILE_SYSTEM_ICONS */
if (pixbuf)
{
gint width;
gint height;
gint bytes;
guchar *src;
guchar *dest;
gint y;
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
bytes = gdk_pixbuf_get_n_channels (pixbuf);
temp_buf = temp_buf_new (width, height, bytes, 0, 0, NULL);
dest = temp_buf_data (temp_buf);
src = gdk_pixbuf_get_pixels (pixbuf);
for (y = 0; y < height; y++)
{
memcpy (dest, src, width * bytes);
dest += width * bytes;
src += gdk_pixbuf_get_rowstride (pixbuf);
}
if (temp_buf->width < renderer->width)
temp_buf->x = (renderer->width - temp_buf->width) / 2;
if (temp_buf->height < renderer->height)
temp_buf->y = (renderer->height - temp_buf->height) / 2;
gimp_preview_renderer_render_buffer (renderer, temp_buf, -1,
GIMP_PREVIEW_BG_WHITE,
GIMP_PREVIEW_BG_WHITE);
temp_buf_free (temp_buf);
g_object_unref (pixbuf);
}
else
{
const gchar *stock_id;
stock_id = gimp_viewable_get_stock_id (renderer->viewable);
gimp_preview_renderer_default_render_stock (renderer, widget,
stock_id);
}
}
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimppreviewrendererimagefile.h
* Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
*
* 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__
#define __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__
#include "gimppreviewrenderer.h"
#define GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE (gimp_preview_renderer_imagefile_get_type ())
#define GIMP_PREVIEW_RENDERER_IMAGEFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefile))
#define GIMP_PREVIEW_RENDERER_IMAGEFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefileClass))
#define GIMP_IS_PREVIEW_RENDERER_IMAGEFILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE))
#define GIMP_IS_PREVIEW_RENDERER_IMAGEFILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE))
#define GIMP_PREVIEW_RENDERER_IMAGEFILE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PREVIEW_RENDERER_IMAGEFILE, GimpPreviewRendererImagefileClass))
typedef struct _GimpPreviewRendererImagefileClass GimpPreviewRendererImagefileClass;
struct _GimpPreviewRendererImagefile
{
GimpPreviewRenderer parent_instance;
gpointer file_system;
};
struct _GimpPreviewRendererImagefileClass
{
GimpPreviewRendererClass parent_class;
};
GType gimp_preview_renderer_imagefile_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_PREVIEW_RENDERER_IMAGEFILE_H__ */
......@@ -43,6 +43,7 @@ typedef struct _GimpPreviewRendererDrawable GimpPreviewRendererDrawable;
typedef struct _GimpPreviewRendererGradient GimpPreviewRendererGradient;
typedef struct _GimpPreviewRendererLayer GimpPreviewRendererLayer;
typedef struct _GimpPreviewRendererImage GimpPreviewRendererImage;
typedef struct _GimpPreviewRendererImagefile GimpPreviewRendererImagefile;
typedef struct _GimpPreviewRendererVectors GimpPreviewRendererVectors;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment