dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

delay the creation of the display for the export image preview until the 

2004-11-27  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/jpeg.c: delay the creation of the display for
	the export image preview until the user requests a preview. Fixes
	bug #159376.
This commit is contained in:
Sven Neumann 2004-11-27 22:07:23 +00:00 committed by Sven Neumann
parent 97fc44bf4e
commit 7643d5e971
8 changed files with 104 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-11-27 Sven Neumann <sven@gimp.org>
* plug-ins/common/jpeg.c: delay the creation of the display for
the export image preview until the user requests a preview. Fixes
bug #159376.
2004-11-27 Øyvind Kolås <pippin@gimp.org>
* libgimp/gimpexport.c: minor layout adjustments for HIG compliance.

26
plug-ins/common/jpeg.c
View File

@ -196,13 +196,15 @@
#define DEFAULT_THUMBNAIL FALSE
/* sg - these should not be global... */
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 display_ID = 0;
typedef struct
{
@ -428,7 +430,6 @@ run (const gchar *name,
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
gint32 display_ID = -1;
GimpParasite *parasite;
gboolean err;
GimpExportReturn export = GIMP_EXPORT_CANCEL;
@ -520,8 +521,7 @@ run (const gchar *name,
g_free (tmp);
}
display_ID = gimp_display_new (image_ID);
gimp_displays_flush ();
display_ID = -1;
}
break;
case GIMP_EXPORT_IGNORE:
@ -732,7 +732,7 @@ run (const gchar *name,
/* If the image was exported, delete the new display. */
/* This also deletes the image. */
if (display_ID > -1)
if (display_ID != -1)
gimp_display_delete (display_ID);
else
gimp_image_delete (image_ID);
@ -1798,11 +1798,13 @@ make_preview (void)
drawable_ID_global,
orig_image_ID_global,
TRUE);
if (display_ID == -1)
display_ID = gimp_display_new (image_ID_global);
}
else
{
gtk_label_set_text (GTK_LABEL (preview_size), _("File size: unknown"));
gimp_displays_flush ();
}

26
plug-ins/jpeg/jpeg-load.c
View File

@ -196,13 +196,15 @@
#define DEFAULT_THUMBNAIL FALSE
/* sg - these should not be global... */
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 display_ID = 0;
typedef struct
{
@ -428,7 +430,6 @@ run (const gchar *name,
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
gint32 display_ID = -1;
GimpParasite *parasite;
gboolean err;
GimpExportReturn export = GIMP_EXPORT_CANCEL;
@ -520,8 +521,7 @@ run (const gchar *name,
g_free (tmp);
}
display_ID = gimp_display_new (image_ID);
gimp_displays_flush ();
display_ID = -1;
}
break;
case GIMP_EXPORT_IGNORE:
@ -732,7 +732,7 @@ run (const gchar *name,
/* If the image was exported, delete the new display. */
/* This also deletes the image. */
if (display_ID > -1)
if (display_ID != -1)
gimp_display_delete (display_ID);
else
gimp_image_delete (image_ID);
@ -1798,11 +1798,13 @@ make_preview (void)
drawable_ID_global,
orig_image_ID_global,
TRUE);
if (display_ID == -1)
display_ID = gimp_display_new (image_ID_global);
}
else
{
gtk_label_set_text (GTK_LABEL (preview_size), _("File size: unknown"));
gimp_displays_flush ();
}

26
plug-ins/jpeg/jpeg-load.h
View File

@ -196,13 +196,15 @@
#define DEFAULT_THUMBNAIL FALSE
/* sg - these should not be global... */
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 display_ID = 0;
typedef struct
{
@ -428,7 +430,6 @@ run (const gchar *name,
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
gint32 display_ID = -1;
GimpParasite *parasite;
gboolean err;
GimpExportReturn export = GIMP_EXPORT_CANCEL;
@ -520,8 +521,7 @@ run (const gchar *name,
g_free (tmp);
}
display_ID = gimp_display_new (image_ID);
gimp_displays_flush ();
display_ID = -1;
}
break;
case GIMP_EXPORT_IGNORE:
@ -732,7 +732,7 @@ run (const gchar *name,
/* If the image was exported, delete the new display. */
/* This also deletes the image. */
if (display_ID > -1)
if (display_ID != -1)
gimp_display_delete (display_ID);
else
gimp_image_delete (image_ID);
@ -1798,11 +1798,13 @@ make_preview (void)
drawable_ID_global,
orig_image_ID_global,
TRUE);
if (display_ID == -1)
display_ID = gimp_display_new (image_ID_global);
}
else
{
gtk_label_set_text (GTK_LABEL (preview_size), _("File size: unknown"));
gimp_displays_flush ();
}

26
plug-ins/jpeg/jpeg-save.c
View File

@ -196,13 +196,15 @@
#define DEFAULT_THUMBNAIL FALSE
/* sg - these should not be global... */
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 display_ID = 0;
typedef struct
{
@ -428,7 +430,6 @@ run (const gchar *name,
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
gint32 display_ID = -1;
GimpParasite *parasite;
gboolean err;
GimpExportReturn export = GIMP_EXPORT_CANCEL;
@ -520,8 +521,7 @@ run (const gchar *name,
g_free (tmp);
}
display_ID = gimp_display_new (image_ID);
gimp_displays_flush ();
display_ID = -1;
}
break;
case GIMP_EXPORT_IGNORE:
@ -732,7 +732,7 @@ run (const gchar *name,
/* If the image was exported, delete the new display. */
/* This also deletes the image. */
if (display_ID > -1)
if (display_ID != -1)
gimp_display_delete (display_ID);
else
gimp_image_delete (image_ID);
@ -1798,11 +1798,13 @@ make_preview (void)
drawable_ID_global,
orig_image_ID_global,
TRUE);
if (display_ID == -1)
display_ID = gimp_display_new (image_ID_global);
}
else
{
gtk_label_set_text (GTK_LABEL (preview_size), _("File size: unknown"));
gimp_displays_flush ();
}

26
plug-ins/jpeg/jpeg-save.h
View File

@ -196,13 +196,15 @@
#define DEFAULT_THUMBNAIL FALSE
/* sg - these should not be global... */
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 display_ID = 0;
typedef struct
{
@ -428,7 +430,6 @@ run (const gchar *name,
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
gint32 display_ID = -1;
GimpParasite *parasite;
gboolean err;
GimpExportReturn export = GIMP_EXPORT_CANCEL;
@ -520,8 +521,7 @@ run (const gchar *name,
g_free (tmp);
}
display_ID = gimp_display_new (image_ID);
gimp_displays_flush ();
display_ID = -1;
}
break;
case GIMP_EXPORT_IGNORE:
@ -732,7 +732,7 @@ run (const gchar *name,
/* If the image was exported, delete the new display. */
/* This also deletes the image. */
if (display_ID > -1)
if (display_ID != -1)
gimp_display_delete (display_ID);
else
gimp_image_delete (image_ID);
@ -1798,11 +1798,13 @@ make_preview (void)
drawable_ID_global,
orig_image_ID_global,
TRUE);
if (display_ID == -1)
display_ID = gimp_display_new (image_ID_global);
}
else
{
gtk_label_set_text (GTK_LABEL (preview_size), _("File size: unknown"));
gimp_displays_flush ();
}

26
plug-ins/jpeg/jpeg.c
View File

@ -196,13 +196,15 @@
#define DEFAULT_THUMBNAIL FALSE
/* sg - these should not be global... */
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 display_ID = 0;
typedef struct
{
@ -428,7 +430,6 @@ run (const gchar *name,
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
gint32 display_ID = -1;
GimpParasite *parasite;
gboolean err;
GimpExportReturn export = GIMP_EXPORT_CANCEL;
@ -520,8 +521,7 @@ run (const gchar *name,
g_free (tmp);
}
display_ID = gimp_display_new (image_ID);
gimp_displays_flush ();
display_ID = -1;
}
break;
case GIMP_EXPORT_IGNORE:
@ -732,7 +732,7 @@ run (const gchar *name,
/* If the image was exported, delete the new display. */
/* This also deletes the image. */
if (display_ID > -1)
if (display_ID != -1)
gimp_display_delete (display_ID);
else
gimp_image_delete (image_ID);
@ -1798,11 +1798,13 @@ make_preview (void)
drawable_ID_global,
orig_image_ID_global,
TRUE);
if (display_ID == -1)
display_ID = gimp_display_new (image_ID_global);
}
else
{
gtk_label_set_text (GTK_LABEL (preview_size), _("File size: unknown"));
gimp_displays_flush ();
}

26
plug-ins/jpeg/jpeg.h
View File

@ -196,13 +196,15 @@
#define DEFAULT_THUMBNAIL FALSE
/* sg - these should not be global... */
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 volatile image_ID_global = -1;
static gint32 orig_image_ID_global = -1;
static gint32 drawable_ID_global = -1;
static gint32 layer_ID_global = -1;
static GtkWidget *preview_size = NULL;
static GimpDrawable *drawable_global = NULL;
static gboolean undo_touched = FALSE;
static gint32 display_ID = 0;
typedef struct
{
@ -428,7 +430,6 @@ run (const gchar *name,
gint32 image_ID;
gint32 drawable_ID;
gint32 orig_image_ID;
gint32 display_ID = -1;
GimpParasite *parasite;
gboolean err;
GimpExportReturn export = GIMP_EXPORT_CANCEL;
@ -520,8 +521,7 @@ run (const gchar *name,
g_free (tmp);
}
display_ID = gimp_display_new (image_ID);
gimp_displays_flush ();
display_ID = -1;
}
break;
case GIMP_EXPORT_IGNORE:
@ -732,7 +732,7 @@ run (const gchar *name,
/* If the image was exported, delete the new display. */
/* This also deletes the image. */
if (display_ID > -1)
if (display_ID != -1)
gimp_display_delete (display_ID);
else
gimp_image_delete (image_ID);
@ -1798,11 +1798,13 @@ make_preview (void)
drawable_ID_global,
orig_image_ID_global,
TRUE);
if (display_ID == -1)
display_ID = gimp_display_new (image_ID_global);
}
else
{
gtk_label_set_text (GTK_LABEL (preview_size), _("File size: unknown"));
gimp_displays_flush ();
}