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

only show the Cancel button while we are displaying a cancelable progress. 

2006-12-12  Sven Neumann  <sven@gimp.org>

	* app/display/gimpstatusbar.c: only show the Cancel button while
	we are displaying a cancelable progress. Also removed obsolete
	workaround for a resize problem that doesn't show up any longer.
This commit is contained in:
Sven Neumann 2006-12-12 09:37:58 +00:00 committed by Sven Neumann
parent 046be921e8
commit e4acf07f67
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-12-12 Sven Neumann <sven@gimp.org>
* app/display/gimpstatusbar.c: only show the Cancel button while
we are displaying a cancelable progress. Also removed obsolete
workaround for a resize problem that doesn't show up any longer.
2006-12-11 Manish Singh <yosh@gimp.org> 2006-12-11 Manish Singh <yosh@gimp.org>
* plug-ins/common/mkgen.pl: GTK_LIBS and GLIB_LIBS should be * plug-ins/common/mkgen.pl: GTK_LIBS and GLIB_LIBS should be

16
app/display/gimpstatusbar.c
View File

@ -216,22 +216,10 @@ gimp_statusbar_init (GimpStatusbar *statusbar)
gtk_widget_set_sensitive (statusbar->cancel_button, FALSE); gtk_widget_set_sensitive (statusbar->cancel_button, FALSE);
gtk_box_pack_start (box, statusbar->cancel_button, FALSE, FALSE, 0); gtk_box_pack_start (box, statusbar->cancel_button, FALSE, FALSE, 0);
GTK_WIDGET_UNSET_FLAGS (statusbar->cancel_button, GTK_CAN_FOCUS); GTK_WIDGET_UNSET_FLAGS (statusbar->cancel_button, GTK_CAN_FOCUS);
gtk_widget_show (statusbar->cancel_button);
g_signal_connect (statusbar->cancel_button, "clicked", g_signal_connect (statusbar->cancel_button, "clicked",
G_CALLBACK (gimp_statusbar_progress_canceled), G_CALLBACK (gimp_statusbar_progress_canceled),
statusbar); statusbar);
/* Update the statusbar once to work around a canvas size problem:
*
* The first update of the statusbar used to queue a resize which
* in term caused the canvas to be resized. That made it shrink by
* one pixel in height resulting in the last row not being displayed.
* Shrink-wrapping the display used to fix this reliably. With the
* next call the resize doesn't seem to happen any longer.
*/
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (statusbar->progressbar), "GIMP");
} }
static void static void
@ -281,6 +269,9 @@ gimp_statusbar_progress_start (GimpProgress *progress,
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
gtk_widget_set_sensitive (statusbar->cancel_button, cancelable); gtk_widget_set_sensitive (statusbar->cancel_button, cancelable);
if (cancelable)
gtk_widget_show (statusbar->cancel_button);
statusbar->progress_active = TRUE; statusbar->progress_active = TRUE;
if (GTK_WIDGET_DRAWABLE (bar)) if (GTK_WIDGET_DRAWABLE (bar))
@ -304,6 +295,7 @@ gimp_statusbar_progress_end (GimpProgress *progress)
gimp_statusbar_pop (statusbar, "progress"); gimp_statusbar_pop (statusbar, "progress");
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
gtk_widget_set_sensitive (statusbar->cancel_button, FALSE); gtk_widget_set_sensitive (statusbar->cancel_button, FALSE);
gtk_widget_hide (statusbar->cancel_button);
statusbar->progress_active = FALSE; statusbar->progress_active = FALSE;
} }