mirror of https://github.com/GNOME/gimp.git
More code clean-up. Better use of libgimp routines, etc.
This commit is contained in:
parent
c7af92e8d3
commit
449d4913fa
23
ChangeLog
23
ChangeLog
|
@ -1,3 +1,26 @@
|
|||
2002-12-19 Maurits Rijk <lpeek.mrijk@consunet.nl>
|
||||
|
||||
* plug-ins/common/grid.c: replace preview code by calls to libgimp
|
||||
|
||||
* plug-ins/imagemap/imap_file.c
|
||||
* plug-ins/imagemap/imap_menu.c: use g_file_test funcs to test if a
|
||||
file already exists iso call to fstat.
|
||||
|
||||
2002-12-19 Maurits Rijk <lpeek.mrijk@consunet.nl>
|
||||
|
||||
* plug-ins/common/wind.c (dialog_box)
|
||||
* plug-ins/common/nova.c (nova_center_create)
|
||||
* plug-ins/common/max_rgb.c (dialog)
|
||||
* plug-ins/common/jigsaw.c (dialog_box)
|
||||
* plug-ins/common/flarefx.c (flare_center_create)
|
||||
* plug-ins/common/illusion.c
|
||||
* plug-ins/common/glasstile.c: add parameter to call to
|
||||
gimp_fixme_preview_new
|
||||
|
||||
* libgimp/gimpmiscui.[ch] (gimp_fixme_preview_new): Added boolean
|
||||
parameter has_frame to put the preview into a frame. Preview now
|
||||
also handles indexed images correctly.
|
||||
|
||||
2002-12-19 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* libgimpwidgets/gimpcolorscales.c: mark "Scales" for translation.
|
||||
|
|
|
@ -35,12 +35,13 @@
|
|||
#include "config.h"
|
||||
|
||||
#include "gimp.h"
|
||||
#include "gimpintl.h"
|
||||
#include "gimpmiscui.h"
|
||||
|
||||
#define PREVIEW_SIZE 128
|
||||
|
||||
GimpFixMePreview*
|
||||
gimp_fixme_preview_new (GimpDrawable *drawable)
|
||||
gimp_fixme_preview_new (GimpDrawable *drawable, gboolean has_frame)
|
||||
{
|
||||
GimpFixMePreview *preview = g_new (GimpFixMePreview, 1);
|
||||
|
||||
|
@ -49,12 +50,33 @@ gimp_fixme_preview_new (GimpDrawable *drawable)
|
|||
if (drawable)
|
||||
gimp_fixme_preview_fill_with_thumb (preview, drawable->drawable_id);
|
||||
|
||||
if (has_frame)
|
||||
{
|
||||
GtkWidget *frame, *abox;
|
||||
|
||||
preview->frame = gtk_frame_new (_("Preview"));
|
||||
gtk_widget_show (preview->frame);
|
||||
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (preview->frame), abox);
|
||||
gtk_widget_show (abox);
|
||||
|
||||
frame = gtk_frame_new (NULL);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (abox), frame);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
|
||||
}
|
||||
|
||||
return preview;
|
||||
}
|
||||
|
||||
void
|
||||
gimp_fixme_preview_free (GimpFixMePreview *preview)
|
||||
{
|
||||
g_free (preview->cmap);
|
||||
g_free (preview->even);
|
||||
g_free (preview->odd);
|
||||
g_free (preview->cache);
|
||||
|
@ -70,43 +92,46 @@ gimp_fixme_preview_do_row (GimpFixMePreview *preview,
|
|||
gint x;
|
||||
guchar *p0 = preview->even;
|
||||
guchar *p1 = preview->odd;
|
||||
gint bpp = preview->bpp;
|
||||
gdouble r, g, b, a;
|
||||
gdouble c0, c1;
|
||||
|
||||
|
||||
for (x = 0; x < width; x++)
|
||||
{
|
||||
switch (preview->bpp)
|
||||
{
|
||||
case 4:
|
||||
r = ((gdouble) src[x*4]) / 255.0;
|
||||
if (bpp == 4)
|
||||
{
|
||||
r = ((gdouble) src[x*4 + 0]) / 255.0;
|
||||
g = ((gdouble) src[x*4 + 1]) / 255.0;
|
||||
b = ((gdouble) src[x*4 + 2]) / 255.0;
|
||||
a = ((gdouble) src[x*4 + 3]) / 255.0;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
r = ((gdouble) src[x*3]) / 255.0;
|
||||
}
|
||||
else if (bpp == 3)
|
||||
{
|
||||
r = ((gdouble) src[x*3 + 0]) / 255.0;
|
||||
g = ((gdouble) src[x*3 + 1]) / 255.0;
|
||||
b = ((gdouble) src[x*3 + 2]) / 255.0;
|
||||
a = 1.0;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
r = ((gdouble)src[x*2]) / 255.0;
|
||||
g = b = r;
|
||||
a = ((gdouble)src[x*2 + 1]) / 255.0;
|
||||
break;
|
||||
|
||||
case 1:
|
||||
r = ((gdouble)src[x*2]) / 255.0;
|
||||
g = b = r;
|
||||
a = 1.0;
|
||||
break;
|
||||
|
||||
default:
|
||||
r = g = b = a = 1.0; /* just to please the compiler */
|
||||
g_assert_not_reached ();
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (preview->cmap)
|
||||
{
|
||||
gint index = MIN (src[x*bpp], preview->ncolors - 1);
|
||||
|
||||
r = ((gdouble)preview->cmap[index * 3 + 0]) / 255.0;
|
||||
g = ((gdouble)preview->cmap[index * 3 + 1]) / 255.0;
|
||||
b = ((gdouble)preview->cmap[index * 3 + 2]) / 255.0;
|
||||
}
|
||||
else
|
||||
{
|
||||
r = ((gdouble)src[x*bpp + 0]) / 255.0;
|
||||
g = b = r;
|
||||
}
|
||||
|
||||
if (bpp == 2)
|
||||
a = ((gdouble)src[x*2 + 1]) / 255.0;
|
||||
else
|
||||
a = 1.0;
|
||||
}
|
||||
|
||||
if ((x / GIMP_CHECK_SIZE_SM) & 1)
|
||||
|
@ -160,6 +185,16 @@ gimp_fixme_preview_fill_with_thumb (GimpFixMePreview *preview,
|
|||
preview->rowstride = width * bpp;
|
||||
preview->bpp = bpp;
|
||||
|
||||
if (gimp_drawable_is_indexed (drawable_ID))
|
||||
{
|
||||
gint32 image_ID = gimp_drawable_image (drawable_ID);
|
||||
preview->cmap = gimp_image_get_cmap (image_ID, &preview->ncolors);
|
||||
}
|
||||
else
|
||||
{
|
||||
preview->cmap = NULL;
|
||||
}
|
||||
|
||||
gtk_preview_size (GTK_PREVIEW (preview->widget), width, height);
|
||||
|
||||
preview->scale_x =
|
||||
|
@ -206,6 +241,16 @@ gimp_fixme_preview_fill (GimpFixMePreview *preview,
|
|||
height = y2 - y1;
|
||||
bpp = gimp_drawable_bpp (drawable->drawable_id);
|
||||
|
||||
if (gimp_drawable_is_indexed (drawable->drawable_id))
|
||||
{
|
||||
gint32 image_ID = gimp_drawable_image (drawable->drawable_id);
|
||||
preview->cmap = gimp_image_get_cmap (image_ID, &preview->ncolors);
|
||||
}
|
||||
else
|
||||
{
|
||||
preview->cmap = NULL;
|
||||
}
|
||||
|
||||
gtk_preview_size (GTK_PREVIEW (preview->widget), width, height);
|
||||
|
||||
gimp_pixel_rgn_init (&srcPR, drawable, x1, y1, x2, y2, FALSE, FALSE);
|
||||
|
|
|
@ -41,6 +41,7 @@ G_BEGIN_DECLS
|
|||
|
||||
typedef struct {
|
||||
GtkWidget *widget;
|
||||
GtkWidget *frame;
|
||||
guchar *cache;
|
||||
guchar *even;
|
||||
guchar *odd;
|
||||
|
@ -49,11 +50,14 @@ typedef struct {
|
|||
gint height;
|
||||
gint rowstride;
|
||||
gint bpp;
|
||||
guchar *cmap;
|
||||
gint ncolors;
|
||||
gdouble scale_x;
|
||||
gdouble scale_y;
|
||||
} GimpFixMePreview;
|
||||
|
||||
GimpFixMePreview *gimp_fixme_preview_new (GimpDrawable *drawable);
|
||||
GimpFixMePreview *gimp_fixme_preview_new (GimpDrawable *drawable,
|
||||
gboolean has_frame);
|
||||
void gimp_fixme_preview_free (GimpFixMePreview *preview);
|
||||
void gimp_fixme_preview_fill_with_thumb (GimpFixMePreview *preview,
|
||||
gint32 drawable_ID);
|
||||
|
|
|
@ -815,7 +815,7 @@ flare_center_create (GimpDrawable *drawable)
|
|||
gtk_table_attach (GTK_TABLE (table), pframe, 0, 4, 1, 2, 0, 0, 0, 0);
|
||||
|
||||
/* PREVIEW */
|
||||
preview = gimp_fixme_preview_new (drawable);
|
||||
preview = gimp_fixme_preview_new (drawable, FALSE);
|
||||
gtk_widget_set_events (GTK_WIDGET (preview->widget), PREVIEW_MASK);
|
||||
gtk_container_add (GTK_CONTAINER (pframe), preview->widget);
|
||||
gtk_widget_show (preview->widget);
|
||||
|
|
|
@ -231,7 +231,6 @@ glass_dialog (GimpDrawable *drawable)
|
|||
GtkWidget *main_vbox;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *table;
|
||||
GtkWidget *abox;
|
||||
GtkObject *adj;
|
||||
|
||||
gimp_ui_init ("glasstile", TRUE);
|
||||
|
@ -258,24 +257,10 @@ glass_dialog (GimpDrawable *drawable)
|
|||
main_vbox, TRUE, TRUE, 0);
|
||||
gtk_widget_show (main_vbox);
|
||||
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), abox);
|
||||
gtk_widget_show (abox);
|
||||
|
||||
frame = gtk_frame_new (NULL);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (abox), frame);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
preview = gimp_fixme_preview_new (drawable);
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
|
||||
glasstile (drawable, TRUE); /* filter routine, initial pass */
|
||||
preview = gimp_fixme_preview_new (drawable, TRUE);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (preview->widget);
|
||||
glasstile (drawable, TRUE); /* filter routine, initial pass */
|
||||
|
||||
/* Parameter settings */
|
||||
frame = gtk_frame_new (_("Parameter Settings"));
|
||||
|
@ -412,28 +397,16 @@ glasstile (GimpDrawable *drawable,
|
|||
d = dest;
|
||||
ypixel2 = ymitt + yoffs * 2;
|
||||
|
||||
if (ypixel2 < 0)
|
||||
ypixel2 = 0;
|
||||
|
||||
ypixel2 = CLAMP (ypixel2, 0, y2 - 1);
|
||||
if (preview_mode)
|
||||
{
|
||||
if (ypixel2 < height)
|
||||
memcpy (cur_row,
|
||||
preview->cache + (ypixel2 * preview->rowstride),
|
||||
preview->rowstride);
|
||||
else
|
||||
memcpy (cur_row,
|
||||
preview->cache + ((y2 - 1) * preview->rowstride),
|
||||
preview->rowstride);
|
||||
memcpy (cur_row, preview->cache + ypixel2 * preview->rowstride,
|
||||
preview->rowstride);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (ypixel2 < height)
|
||||
gimp_pixel_rgn_get_row (&srcPR, cur_row, x1, ypixel2, iwidth);
|
||||
else
|
||||
gimp_pixel_rgn_get_row (&srcPR, cur_row, x1, y2 - 1, iwidth);
|
||||
gimp_pixel_rgn_get_row (&srcPR, cur_row, x1, ypixel2, iwidth);
|
||||
}
|
||||
|
||||
yoffs++;
|
||||
|
||||
if (yoffs == yhalv)
|
||||
|
@ -445,7 +418,7 @@ glasstile (GimpDrawable *drawable,
|
|||
xmitt = 0;
|
||||
xoffs = 0;
|
||||
|
||||
for (col = 0; col < (x2 - x1); col++) /* one pixel */
|
||||
for (col = 0; col < x2 - x1; col++) /* one pixel */
|
||||
{
|
||||
xpixel1 = (xmitt + xoffs) * bytes;
|
||||
xpixel2 = (xmitt + xoffs * 2) * bytes;
|
||||
|
|
|
@ -43,11 +43,6 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
#warning GTK_DISABLE_DEPRECATED
|
||||
#endif
|
||||
#undef GTK_DISABLE_DEPRECATED
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
|
@ -58,7 +53,6 @@
|
|||
|
||||
#define SPIN_BUTTON_WIDTH 8
|
||||
#define COLOR_BUTTON_WIDTH 55
|
||||
#define PREVIEW_SIZE 128
|
||||
|
||||
|
||||
/* Declare local functions. */
|
||||
|
@ -77,11 +71,6 @@ static void doit (gint32 image_ID,
|
|||
gboolean preview_mode);
|
||||
static gint dialog (gint32 image_ID,
|
||||
GimpDrawable *drawable);
|
||||
static GtkWidget * preview_widget (gint32 image_ID,
|
||||
GimpDrawable *drawable);
|
||||
static void fill_preview (GtkWidget *preview_widget,
|
||||
gint32 image_ID,
|
||||
GimpDrawable *drawable);
|
||||
|
||||
GimpPlugInInfo PLUG_IN_INFO =
|
||||
{
|
||||
|
@ -91,14 +80,12 @@ GimpPlugInInfo PLUG_IN_INFO =
|
|||
run, /* run_proc */
|
||||
};
|
||||
|
||||
gint sx1, sy1, sx2, sy2;
|
||||
gint run_flag = FALSE;
|
||||
static gint sx1, sy1, sx2, sy2;
|
||||
static gint run_flag = FALSE;
|
||||
|
||||
static GtkWidget *hcolor_button;
|
||||
static GtkWidget *vcolor_button;
|
||||
static guchar *preview_bits;
|
||||
static GtkWidget *preview;
|
||||
|
||||
static GimpFixMePreview *preview;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
@ -239,7 +226,7 @@ run (gchar *name,
|
|||
/* The dialog was closed, or something similarly evil happened. */
|
||||
status = GIMP_PDB_EXECUTION_ERROR;
|
||||
}
|
||||
g_free(preview_bits);
|
||||
gimp_fixme_preview_free (preview);
|
||||
}
|
||||
|
||||
if (grid_cfg.hspace <= 0 || grid_cfg.vspace <= 0)
|
||||
|
@ -397,12 +384,12 @@ doit (gint32 image_ID,
|
|||
if (preview_mode)
|
||||
{
|
||||
sx1 = sy1 = 0;
|
||||
sx2 = GTK_PREVIEW (preview)->buffer_width;
|
||||
sy2 = GTK_PREVIEW (preview)->buffer_height;
|
||||
sx2 = preview->width;
|
||||
sy2 = preview->height;
|
||||
width = sx2;
|
||||
height = sy2;
|
||||
alpha = 0;
|
||||
bytes = GTK_PREVIEW (preview)->bpp;
|
||||
bytes = preview->bpp;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -424,9 +411,8 @@ doit (gint32 image_ID,
|
|||
for (y = sy1; y < sy2; y++)
|
||||
{
|
||||
if (preview_mode)
|
||||
memcpy (dest,
|
||||
preview_bits + (GTK_PREVIEW (preview)->rowstride * y),
|
||||
GTK_PREVIEW (preview)->rowstride);
|
||||
memcpy (dest, preview->cache + preview->rowstride * y,
|
||||
preview->rowstride);
|
||||
else
|
||||
gimp_pixel_rgn_get_row (&srcPR, dest, sx1, y, (sx2 - sx1));
|
||||
|
||||
|
@ -489,9 +475,8 @@ doit (gint32 image_ID,
|
|||
}
|
||||
if (preview_mode)
|
||||
{
|
||||
memcpy (GTK_PREVIEW (preview)->buffer + (GTK_PREVIEW (preview)->rowstride * y),
|
||||
dest,
|
||||
GTK_PREVIEW (preview)->rowstride);
|
||||
memcpy (preview->buffer + preview->rowstride * y, dest,
|
||||
preview->rowstride);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -504,7 +489,7 @@ doit (gint32 image_ID,
|
|||
/* update the timred region */
|
||||
if (preview_mode)
|
||||
{
|
||||
gtk_widget_queue_draw (preview);
|
||||
gtk_widget_queue_draw (preview->widget);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -703,10 +688,12 @@ dialog (gint32 image_ID,
|
|||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (abox), frame);
|
||||
gtk_widget_show (frame);
|
||||
preview = preview_widget (image_ID, drawable); /* we are here */
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview);
|
||||
|
||||
preview = gimp_fixme_preview_new (NULL, FALSE);
|
||||
gimp_fixme_preview_fill (preview, drawable);
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
|
||||
doit (image_ID, drawable, TRUE); /* render preview */
|
||||
gtk_widget_show (preview);
|
||||
gtk_widget_show (preview->widget);
|
||||
|
||||
/* row 2 */
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
|
@ -1016,146 +1003,3 @@ dialog (gint32 image_ID,
|
|||
|
||||
return run_flag;
|
||||
}
|
||||
|
||||
static GtkWidget *
|
||||
preview_widget (gint32 image_ID,
|
||||
GimpDrawable *drawable)
|
||||
{
|
||||
gint size;
|
||||
GtkWidget *preview;
|
||||
|
||||
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
|
||||
fill_preview (preview, image_ID, drawable);
|
||||
size =
|
||||
GTK_PREVIEW (preview)->rowstride * GTK_PREVIEW (preview)->buffer_height;
|
||||
preview_bits = g_malloc (size);
|
||||
memcpy (preview_bits, GTK_PREVIEW (preview)->buffer, size);
|
||||
|
||||
return preview;
|
||||
}
|
||||
|
||||
static void
|
||||
fill_preview (GtkWidget *widget,
|
||||
gint32 image_ID,
|
||||
GimpDrawable *drawable)
|
||||
{
|
||||
GimpPixelRgn srcPR;
|
||||
gint width;
|
||||
gint height;
|
||||
gint x1, x2, y1, y2;
|
||||
gint bpp;
|
||||
gint x, y;
|
||||
guchar *src;
|
||||
gdouble r, g, b, a;
|
||||
gdouble c0, c1;
|
||||
guchar *p0, *p1;
|
||||
guchar *even, *odd;
|
||||
guchar *cmap;
|
||||
gint ncolors;
|
||||
|
||||
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
|
||||
|
||||
if (x2 - x1 > PREVIEW_SIZE)
|
||||
x2 = x1 + PREVIEW_SIZE;
|
||||
|
||||
if (y2 - y1 > PREVIEW_SIZE)
|
||||
y2 = y1 + PREVIEW_SIZE;
|
||||
|
||||
width = x2 - x1;
|
||||
height = y2 - y1;
|
||||
bpp = gimp_drawable_bpp (drawable->drawable_id);
|
||||
|
||||
if (width < 1 || height < 1)
|
||||
return;
|
||||
|
||||
gtk_preview_size (GTK_PREVIEW (widget), width, height);
|
||||
|
||||
gimp_pixel_rgn_init (&srcPR, drawable, x1, y1, x2, y2, FALSE, FALSE);
|
||||
|
||||
even = g_malloc (width * 3);
|
||||
odd = g_malloc (width * 3);
|
||||
src = g_malloc (width * bpp);
|
||||
|
||||
if (gimp_drawable_is_indexed (drawable->drawable_id))
|
||||
cmap = gimp_image_get_cmap (image_ID, &ncolors);
|
||||
else
|
||||
cmap = NULL;
|
||||
|
||||
for (y = 0; y < height; y++)
|
||||
{
|
||||
gimp_pixel_rgn_get_row (&srcPR, src, x1, y + y1, width);
|
||||
p0 = even;
|
||||
p1 = odd;
|
||||
|
||||
for (x = 0; x < width; x++)
|
||||
{
|
||||
if (bpp == 4)
|
||||
{
|
||||
r = ((gdouble)src[x*4+0]) / 255.0;
|
||||
g = ((gdouble)src[x*4+1]) / 255.0;
|
||||
b = ((gdouble)src[x*4+2]) / 255.0;
|
||||
a = ((gdouble)src[x*4+3]) / 255.0;
|
||||
}
|
||||
else if (bpp == 3)
|
||||
{
|
||||
r = ((gdouble)src[x*3+0]) / 255.0;
|
||||
g = ((gdouble)src[x*3+1]) / 255.0;
|
||||
b = ((gdouble)src[x*3+2]) / 255.0;
|
||||
a = 1.0;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (cmap)
|
||||
{
|
||||
gint index = MIN (src[x*bpp], ncolors - 1);
|
||||
|
||||
r = ((gdouble)cmap[index * 3 + 0]) / 255.0;
|
||||
g = ((gdouble)cmap[index * 3 + 1]) / 255.0;
|
||||
b = ((gdouble)cmap[index * 3 + 2]) / 255.0;
|
||||
}
|
||||
else
|
||||
{
|
||||
r = ((gdouble)src[x*bpp+0]) / 255.0;
|
||||
g = b = r;
|
||||
}
|
||||
|
||||
if (bpp == 2)
|
||||
a = ((gdouble)src[x*bpp+1]) / 255.0;
|
||||
else
|
||||
a = 1.0;
|
||||
}
|
||||
|
||||
if ((x / GIMP_CHECK_SIZE) & 1)
|
||||
{
|
||||
c0 = GIMP_CHECK_LIGHT;
|
||||
c1 = GIMP_CHECK_DARK;
|
||||
}
|
||||
else
|
||||
{
|
||||
c0 = GIMP_CHECK_DARK;
|
||||
c1 = GIMP_CHECK_LIGHT;
|
||||
}
|
||||
|
||||
*p0++ = (c0 + (r - c0) * a) * 255.0;
|
||||
*p0++ = (c0 + (g - c0) * a) * 255.0;
|
||||
*p0++ = (c0 + (b - c0) * a) * 255.0;
|
||||
|
||||
*p1++ = (c1 + (r - c1) * a) * 255.0;
|
||||
*p1++ = (c1 + (g - c1) * a) * 255.0;
|
||||
*p1++ = (c1 + (b - c1) * a) * 255.0;
|
||||
|
||||
} /* for */
|
||||
|
||||
if ((y / GIMP_CHECK_SIZE) & 1)
|
||||
gtk_preview_draw_row (GTK_PREVIEW (widget), (guchar *)odd, 0, y, width);
|
||||
else
|
||||
gtk_preview_draw_row (GTK_PREVIEW (widget), (guchar *)even, 0, y, width);
|
||||
}
|
||||
|
||||
g_free (even);
|
||||
g_free (odd);
|
||||
g_free (src);
|
||||
|
||||
if (cmap)
|
||||
g_free (cmap);
|
||||
}
|
||||
|
|
|
@ -381,7 +381,6 @@ dialog (GimpDrawable *mangle)
|
|||
{
|
||||
GtkWidget *dlg;
|
||||
GtkWidget *main_vbox;
|
||||
GtkWidget *abox;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *table;
|
||||
GtkWidget *spinbutton;
|
||||
|
@ -417,22 +416,8 @@ dialog (GimpDrawable *mangle)
|
|||
TRUE, TRUE, 0);
|
||||
gtk_widget_show (main_vbox);
|
||||
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), abox);
|
||||
gtk_widget_show (abox);
|
||||
|
||||
frame = gtk_frame_new (NULL);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (abox), frame);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
preview = gimp_fixme_preview_new (mangle);
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
|
||||
preview = gimp_fixme_preview_new (mangle, TRUE);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
|
||||
filter_preview();
|
||||
gtk_widget_show (preview->widget);
|
||||
|
||||
|
|
|
@ -2451,8 +2451,6 @@ dialog_box (void)
|
|||
GimpDrawable *drawable = globals.drawable;
|
||||
GtkWidget *dlg;
|
||||
GtkWidget *main_hbox;
|
||||
GtkWidget *abox;
|
||||
|
||||
GtkWidget *main_vbox;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *rbutton1;
|
||||
|
@ -2493,21 +2491,8 @@ dialog_box (void)
|
|||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_hbox, TRUE, TRUE, 0);
|
||||
gtk_widget_show (main_hbox);
|
||||
|
||||
/* make a nice frame */
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
|
||||
gtk_box_pack_start (GTK_BOX (main_hbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), abox);
|
||||
gtk_widget_show (abox);
|
||||
frame = gtk_frame_new (NULL);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (abox), frame);
|
||||
gtk_widget_show (frame);
|
||||
preview = gimp_fixme_preview_new (drawable);
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
|
||||
preview = gimp_fixme_preview_new (drawable, TRUE);
|
||||
gtk_box_pack_start (GTK_BOX (main_hbox), preview->frame, FALSE, FALSE, 0);
|
||||
jigsaw(TRUE); /* render preview */
|
||||
gtk_widget_show (preview->widget);
|
||||
|
||||
|
|
|
@ -321,7 +321,6 @@ dialog (GimpDrawable *drawable)
|
|||
{
|
||||
GtkWidget *dlg;
|
||||
GtkWidget *main_vbox;
|
||||
GtkWidget *abox;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *max;
|
||||
GtkWidget *min;
|
||||
|
@ -351,22 +350,8 @@ dialog (GimpDrawable *drawable)
|
|||
TRUE, TRUE, 0);
|
||||
gtk_widget_show (main_vbox);
|
||||
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), abox);
|
||||
gtk_widget_show (abox);
|
||||
|
||||
frame = gtk_frame_new (NULL);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (abox), frame);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
preview = gimp_fixme_preview_new (drawable);
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
|
||||
preview = gimp_fixme_preview_new (drawable, TRUE);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
|
||||
main_function (drawable, TRUE);
|
||||
gtk_widget_show (preview->widget);
|
||||
|
||||
|
|
|
@ -332,7 +332,6 @@ noisify_dialog (GimpDrawable *drawable,
|
|||
{
|
||||
GtkWidget *dlg;
|
||||
GtkWidget *main_vbox;
|
||||
GtkWidget *abox;
|
||||
GtkWidget *toggle;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *table;
|
||||
|
@ -361,23 +360,11 @@ noisify_dialog (GimpDrawable *drawable,
|
|||
gtk_widget_show (main_vbox);
|
||||
|
||||
/* preview */
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), abox);
|
||||
gtk_widget_show (abox);
|
||||
frame = gtk_frame_new (NULL);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (abox), frame);
|
||||
gtk_widget_show (frame);
|
||||
preview = gimp_fixme_preview_new (NULL);
|
||||
gimp_fixme_preview_fill (preview, drawable);
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
|
||||
noisify (drawable, TRUE); /* preview noisify */
|
||||
preview = gimp_fixme_preview_new (NULL, TRUE);
|
||||
gtk_box_pack_start (GTK_BOX (main_vbox), preview->frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (preview->widget);
|
||||
gimp_fixme_preview_fill (preview, drawable);
|
||||
noisify (drawable, TRUE); /* preview noisify */
|
||||
|
||||
/* parameter settings */
|
||||
frame = gtk_frame_new (_("Parameter Settings"));
|
||||
|
|
|
@ -358,7 +358,6 @@ nova_dialog (GimpDrawable *drawable)
|
|||
center_frame = nova_center_create (drawable);
|
||||
gtk_table_attach (GTK_TABLE (table), center_frame, 0, 3, 0, 1,
|
||||
0, 0, 0, 0);
|
||||
|
||||
button = gimp_color_button_new (_("SuperNova Color Picker"),
|
||||
SCALE_WIDTH - 8, 16,
|
||||
&pvals.color, GIMP_COLOR_AREA_FLAT);
|
||||
|
@ -384,7 +383,6 @@ nova_dialog (GimpDrawable *drawable)
|
|||
g_signal_connect_swapped (G_OBJECT (adj), "value_changed",
|
||||
G_CALLBACK (nova),
|
||||
drawable);
|
||||
|
||||
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 4,
|
||||
_("_Spokes:"), SCALE_WIDTH, 8,
|
||||
pvals.nspoke, 1, 1024, 1, 16, 0,
|
||||
|
@ -530,7 +528,7 @@ nova_center_create (GimpDrawable *drawable)
|
|||
0, 0, 0, 0);
|
||||
|
||||
/* PREVIEW */
|
||||
preview = gimp_fixme_preview_new (center->drawable);
|
||||
preview = gimp_fixme_preview_new (drawable, FALSE);
|
||||
gtk_widget_set_events (preview->widget, PREVIEW_MASK);
|
||||
gtk_container_add (GTK_CONTAINER (pframe), preview->widget);
|
||||
gtk_widget_show (preview->widget);
|
||||
|
@ -676,7 +674,9 @@ nova_center_preview_expose (GtkWidget *widget,
|
|||
GdkEvent *event,
|
||||
gpointer data)
|
||||
{
|
||||
printf("Before\n");
|
||||
nova_center_draw ((NovaCenter*) data, ALL);
|
||||
printf("After\n");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
|
@ -869,7 +869,6 @@ dialog_box (GimpDrawable *drawable)
|
|||
{
|
||||
GtkWidget *main_vbox;
|
||||
GtkWidget *vbox;
|
||||
GtkWidget *abox;
|
||||
GtkWidget *table;
|
||||
GtkObject *adj;
|
||||
GtkWidget *frame;
|
||||
|
@ -908,21 +907,9 @@ dialog_box (GimpDrawable *drawable)
|
|||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
frame = gtk_frame_new (_("Preview"));
|
||||
gtk_container_set_border_width (GTK_CONTAINER (frame), 6);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
|
||||
gtk_widget_show (frame);
|
||||
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
|
||||
gtk_container_add (GTK_CONTAINER (frame), abox);
|
||||
gtk_widget_show (abox);
|
||||
frame = gtk_frame_new (NULL);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
|
||||
gtk_container_add (GTK_CONTAINER (abox), frame);
|
||||
gtk_widget_show (frame);
|
||||
preview = gimp_fixme_preview_new (NULL);
|
||||
preview = gimp_fixme_preview_new (NULL, TRUE);
|
||||
gimp_fixme_preview_fill (preview, drawable);
|
||||
gtk_container_add (GTK_CONTAINER (frame), preview->widget);
|
||||
gtk_box_pack_start (GTK_BOX (vbox), preview->frame, FALSE, FALSE, 0);
|
||||
render_effect (drawable, TRUE);
|
||||
gtk_widget_show (preview->widget);
|
||||
|
||||
|
|
|
@ -23,16 +23,12 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
#include <libgimp/gimpui.h>
|
||||
|
||||
#include "imap_default_dialog.h"
|
||||
#include "imap_file.h"
|
||||
#include "imap_main.h"
|
||||
#include "imap_table.h"
|
||||
|
||||
#include "libgimp/stdplugins-intl.h"
|
||||
|
||||
|
@ -41,12 +37,9 @@ static void
|
|||
open_cb(GtkWidget *widget, gpointer data)
|
||||
{
|
||||
const gchar *filename;
|
||||
struct stat buf;
|
||||
int err;
|
||||
|
||||
filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data));
|
||||
err = stat(filename, &buf);
|
||||
if (!err && (buf.st_mode & S_IFREG)) {
|
||||
if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
|
||||
gtk_widget_hide((GtkWidget*) data);
|
||||
load(filename);
|
||||
} else {
|
||||
|
@ -99,20 +92,13 @@ static void
|
|||
save_cb(GtkWidget *widget, gpointer data)
|
||||
{
|
||||
const gchar *filename;
|
||||
struct stat buf;
|
||||
int err;
|
||||
|
||||
filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data));
|
||||
err = stat(filename, &buf);
|
||||
if (err) {
|
||||
gtk_widget_hide((GtkWidget*) data);
|
||||
save_as(filename);
|
||||
} else { /* File exists */
|
||||
if (buf.st_mode & S_IFREG) {
|
||||
do_file_exists_dialog(data);
|
||||
} else {
|
||||
/* Fix me! */
|
||||
}
|
||||
if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
|
||||
do_file_exists_dialog(data);
|
||||
} else {
|
||||
gtk_widget_hide((GtkWidget*) data);
|
||||
save_as(filename);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -23,9 +23,6 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "imap_circle.h"
|
||||
|
@ -60,11 +57,8 @@ menu_mru(GtkWidget *widget, gpointer data)
|
|||
{
|
||||
MRU_t *mru = get_mru();
|
||||
char *filename = (char*) data;
|
||||
struct stat buf;
|
||||
int err;
|
||||
|
||||
err = stat(filename, &buf);
|
||||
if (!err && (buf.st_mode & S_IFREG)) {
|
||||
if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
|
||||
load(filename);
|
||||
} else {
|
||||
do_file_error_dialog(_("Error opening file"), filename);
|
||||
|
|
Loading…
Reference in New Issue