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

Fixed progress code to account for when a plugin gets two progress inits 

Sun Jun 14 23:41:17 CDT 1998 Shawn T. Amundson <amundson@gimp.org>

        * app/plug_in.c: Fixed progress code to account for when
        a plugin gets two progress inits

        * app/interface.c: Fixed table allocation sickness.  Now use
        two tables, and a vbox instead of one table so things don't
        get expanded when they shouldn't.  This (table/table_inner)
        should be merged back to 1.0 tree.  The other resize bug is a
        gtkstatusbar bug.
This commit is contained in:
CDT 1998 Shawn T. Amundson 1998-06-15 04:46:32 +00:00 committed by Shawn Amundson
parent 127e98b5f7
commit c943e5e1c8
24 changed files with 236 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Sun Jun 14 23:41:17 CDT 1998 Shawn T. Amundson <amundson@gimp.org>
* app/plug_in.c: Fixed progress code to account for when
a plugin gets two progress inits
* app/interface.c: Fixed table allocation sickness. Now use
two tables, and a vbox instead of one table so things don't
get expanded when they shouldn't. This (table/table_inner)
should be merged back to 1.0 tree. The other resize bug is a
gtkstatusbar bug.
Sun Jun 14 21:16:42 CDT 1998 Shawn T. Amundson <amundson@gimp.org>
* app/gdisplay.c

8
app/actions/plug-in-commands.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

52
app/display/gimpdisplayshell-draw.c
View File

@ -679,7 +679,9 @@ create_display_shell (int gdisp_id,
static GtkWidget *image_popup_menu = NULL;
static GtkAccelGroup *image_accel_group = NULL;
GDisplay *gdisp;
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *table_inner;
GtkWidget *hbox;
GtkWidget *arrow;
int n_width, n_height;
@ -738,18 +740,30 @@ create_display_shell (int gdisp_id,
(GtkSignalFunc) gdisplay_destroy,
gdisp);
/* the table containing all widgets */
table = gtk_table_new (4, 3, FALSE);
/* the vbox, table containing all widgets */
vbox = gtk_vbox_new(0,0);
gtk_container_add(GTK_CONTAINER (gdisp->shell), vbox);
/* the table widget is pretty stupid so we need 2 tables
or it treats rulers and canvas with equal weight when
allocating space, ugh. */
table = gtk_table_new (2, 2, FALSE);
/*
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 1);
gtk_table_set_col_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 1);
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 2, 2);
gtk_container_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (gdisp->shell), table);
*/
gtk_box_pack_start(GTK_BOX (vbox), table, TRUE, TRUE, 0);
table_inner = gtk_table_new (2, 2, FALSE);
/* hbox for statusbar area */
hbox = gtk_hbox_new(0,2);
gtk_container_border_width(GTK_CONTAINER (hbox), 2);
gtk_box_pack_start(GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
/* scrollbars, rulers, canvas, menu popup button */
gdisp->origin = gtk_button_new ();
@ -802,22 +816,24 @@ create_display_shell (int gdisp_id,
/* pack all the widgets */
gtk_table_attach (GTK_TABLE (table), gdisp->origin, 0, 1, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hrule, 1, 2, 0, 1,
gtk_table_attach (GTK_TABLE (table), table_inner, 0, 1, 0, 1,
GTK_FILL | GTK_EXPAND | GTK_SHRINK,
GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hsb, 0, 1, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->vrule, 0, 1, 1, 2,
gtk_table_attach (GTK_TABLE (table), gdisp->vsb, 1, 2, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->canvas, 1, 2, 1, 2,
gtk_table_attach (GTK_TABLE (table_inner), gdisp->origin, 0, 1, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->hrule, 1, 2, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->vrule, 0, 1, 1, 2,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->canvas, 1, 2, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hsb, 0, 2, 2, 3,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->vsb, 2, 3, 0, 2,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), hbox, 0, 3, 3, 4,
GTK_FILL, 0, 0, 0);
if (! image_popup_menu)
menus_get_image_menu (&image_popup_menu, &image_accel_group);
@ -849,8 +865,10 @@ create_display_shell (int gdisp_id,
gtk_widget_show (gdisp->canvas);
gtk_widget_show (gdisp->statusbar);
gtk_widget_show (gdisp->progressbar);
gtk_widget_show (hbox);
gtk_widget_show (table_inner);
gtk_widget_show (table);
gtk_widget_show (hbox);
gtk_widget_show (vbox);
gtk_widget_show (gdisp->shell);
/* set the focus to the canvas area */

52
app/display/gimpdisplayshell.c
View File

@ -679,7 +679,9 @@ create_display_shell (int gdisp_id,
static GtkWidget *image_popup_menu = NULL;
static GtkAccelGroup *image_accel_group = NULL;
GDisplay *gdisp;
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *table_inner;
GtkWidget *hbox;
GtkWidget *arrow;
int n_width, n_height;
@ -738,18 +740,30 @@ create_display_shell (int gdisp_id,
(GtkSignalFunc) gdisplay_destroy,
gdisp);
/* the table containing all widgets */
table = gtk_table_new (4, 3, FALSE);
/* the vbox, table containing all widgets */
vbox = gtk_vbox_new(0,0);
gtk_container_add(GTK_CONTAINER (gdisp->shell), vbox);
/* the table widget is pretty stupid so we need 2 tables
or it treats rulers and canvas with equal weight when
allocating space, ugh. */
table = gtk_table_new (2, 2, FALSE);
/*
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 1);
gtk_table_set_col_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 1);
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 2, 2);
gtk_container_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (gdisp->shell), table);
*/
gtk_box_pack_start(GTK_BOX (vbox), table, TRUE, TRUE, 0);
table_inner = gtk_table_new (2, 2, FALSE);
/* hbox for statusbar area */
hbox = gtk_hbox_new(0,2);
gtk_container_border_width(GTK_CONTAINER (hbox), 2);
gtk_box_pack_start(GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
/* scrollbars, rulers, canvas, menu popup button */
gdisp->origin = gtk_button_new ();
@ -802,22 +816,24 @@ create_display_shell (int gdisp_id,
/* pack all the widgets */
gtk_table_attach (GTK_TABLE (table), gdisp->origin, 0, 1, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hrule, 1, 2, 0, 1,
gtk_table_attach (GTK_TABLE (table), table_inner, 0, 1, 0, 1,
GTK_FILL | GTK_EXPAND | GTK_SHRINK,
GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hsb, 0, 1, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->vrule, 0, 1, 1, 2,
gtk_table_attach (GTK_TABLE (table), gdisp->vsb, 1, 2, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->canvas, 1, 2, 1, 2,
gtk_table_attach (GTK_TABLE (table_inner), gdisp->origin, 0, 1, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->hrule, 1, 2, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->vrule, 0, 1, 1, 2,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->canvas, 1, 2, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hsb, 0, 2, 2, 3,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->vsb, 2, 3, 0, 2,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), hbox, 0, 3, 3, 4,
GTK_FILL, 0, 0, 0);
if (! image_popup_menu)
menus_get_image_menu (&image_popup_menu, &image_accel_group);
@ -849,8 +865,10 @@ create_display_shell (int gdisp_id,
gtk_widget_show (gdisp->canvas);
gtk_widget_show (gdisp->statusbar);
gtk_widget_show (gdisp->progressbar);
gtk_widget_show (hbox);
gtk_widget_show (table_inner);
gtk_widget_show (table);
gtk_widget_show (hbox);
gtk_widget_show (vbox);
gtk_widget_show (gdisp->shell);
/* set the focus to the canvas area */

8
app/gui/plug-in-commands.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/gui/plug-in-menus.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

52
app/interface.c
View File

@ -679,7 +679,9 @@ create_display_shell (int gdisp_id,
static GtkWidget *image_popup_menu = NULL;
static GtkAccelGroup *image_accel_group = NULL;
GDisplay *gdisp;
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *table_inner;
GtkWidget *hbox;
GtkWidget *arrow;
int n_width, n_height;
@ -738,18 +740,30 @@ create_display_shell (int gdisp_id,
(GtkSignalFunc) gdisplay_destroy,
gdisp);
/* the table containing all widgets */
table = gtk_table_new (4, 3, FALSE);
/* the vbox, table containing all widgets */
vbox = gtk_vbox_new(0,0);
gtk_container_add(GTK_CONTAINER (gdisp->shell), vbox);
/* the table widget is pretty stupid so we need 2 tables
or it treats rulers and canvas with equal weight when
allocating space, ugh. */
table = gtk_table_new (2, 2, FALSE);
/*
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 1);
gtk_table_set_col_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 0, 1);
gtk_table_set_row_spacing (GTK_TABLE (table), 1, 2);
gtk_table_set_row_spacing (GTK_TABLE (table), 2, 2);
gtk_container_border_width (GTK_CONTAINER (table), 2);
gtk_container_add (GTK_CONTAINER (gdisp->shell), table);
*/
gtk_box_pack_start(GTK_BOX (vbox), table, TRUE, TRUE, 0);
table_inner = gtk_table_new (2, 2, FALSE);
/* hbox for statusbar area */
hbox = gtk_hbox_new(0,2);
gtk_container_border_width(GTK_CONTAINER (hbox), 2);
gtk_box_pack_start(GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
/* scrollbars, rulers, canvas, menu popup button */
gdisp->origin = gtk_button_new ();
@ -802,22 +816,24 @@ create_display_shell (int gdisp_id,
/* pack all the widgets */
gtk_table_attach (GTK_TABLE (table), gdisp->origin, 0, 1, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hrule, 1, 2, 0, 1,
gtk_table_attach (GTK_TABLE (table), table_inner, 0, 1, 0, 1,
GTK_FILL | GTK_EXPAND | GTK_SHRINK,
GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hsb, 0, 1, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->vrule, 0, 1, 1, 2,
gtk_table_attach (GTK_TABLE (table), gdisp->vsb, 1, 2, 0, 1,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->canvas, 1, 2, 1, 2,
gtk_table_attach (GTK_TABLE (table_inner), gdisp->origin, 0, 1, 0, 1,
GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->hrule, 1, 2, 0, 1,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->vrule, 0, 1, 1, 2,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table_inner), gdisp->canvas, 1, 2, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->hsb, 0, 2, 2, 3,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), gdisp->vsb, 2, 3, 0, 2,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_table_attach (GTK_TABLE (table), hbox, 0, 3, 3, 4,
GTK_FILL, 0, 0, 0);
if (! image_popup_menu)
menus_get_image_menu (&image_popup_menu, &image_accel_group);
@ -849,8 +865,10 @@ create_display_shell (int gdisp_id,
gtk_widget_show (gdisp->canvas);
gtk_widget_show (gdisp->statusbar);
gtk_widget_show (gdisp->progressbar);
gtk_widget_show (hbox);
gtk_widget_show (table_inner);
gtk_widget_show (table);
gtk_widget_show (hbox);
gtk_widget_show (vbox);
gtk_widget_show (gdisp->shell);
/* set the focus to the canvas area */

8
app/menus/plug-in-menus.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/gimpplugin-message.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/gimpplugin-progress.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/gimpplugin.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/gimppluginmanager-call.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/gimppluginmanager-run.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/gimppluginmanager.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/gimppluginshm.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/plug-in-def.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/plug-in-message.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/plug-in-params.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/plug-in-progress.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/plug-in-run.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/plug-in-shm.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/plug-in.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug-in/plug-ins.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;

8
app/plug_in.c
View File

@ -2927,7 +2927,7 @@ plug_in_progress_init (PlugIn *plug_in,
{
GtkWidget *vbox;
GtkWidget *button;
GDisplay *gdisp;
GDisplay *gdisp = NULL;
guint context_id;
if (!message)
@ -2936,11 +2936,15 @@ plug_in_progress_init (PlugIn *plug_in,
if (gdisp_ID > 0)
gdisp = gdisplay_get_ID(gdisp_ID);
if (gdisp_ID > 0 && gdisp->progressid == 0)
if (gdisp_ID > 0 && (gdisp->progressid == 0 ||
plug_in->progress_gdisp_ID > 0))
{
context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(gdisp->statusbar),
"progress");
if (plug_in->progress_gdisp_ID > 0)
gtk_statusbar_pop(GTK_STATUSBAR(gdisp->statusbar), context_id);
gdisp->progressid = gtk_statusbar_push(GTK_STATUSBAR(gdisp->statusbar),
context_id, message);
plug_in->progress_gdisp_ID = gdisp_ID;