gimp r25260 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Thu Mar 27 12:17:45 2008
New Revision: 25260
URL: http://svn.gnome.org/viewvc/gimp?rev=25260&view=rev

Log:
2008-03-27  Sven Neumann  <sven gimp org>

	* app/display/gimpstatusbar.c: use a button with icon for the
	progress cancel button.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpstatusbar.c

Modified: trunk/app/display/gimpstatusbar.c
==============================================================================
--- trunk/app/display/gimpstatusbar.c	(original)
+++ trunk/app/display/gimpstatusbar.c	Thu Mar 27 12:17:45 2008
@@ -154,6 +154,7 @@
 gimp_statusbar_init (GimpStatusbar *statusbar)
 {
   GtkWidget     *hbox;
+  GtkWidget     *image;
   GimpUnitStore *store;
 
   statusbar->shell          = NULL;
@@ -229,13 +230,19 @@
                           G_CALLBACK (gimp_statusbar_progress_expose),
                           statusbar);
 
-  statusbar->cancel_button = gtk_button_new_with_label (_("Cancel"));
+  statusbar->cancel_button = gtk_button_new ();
+  gtk_button_set_relief (GTK_BUTTON (statusbar->cancel_button),
+                         GTK_RELIEF_NONE);
   gtk_widget_set_sensitive (statusbar->cancel_button, FALSE);
   gtk_box_pack_start (GTK_BOX (hbox),
                       statusbar->cancel_button, FALSE, FALSE, 0);
   GTK_WIDGET_UNSET_FLAGS (statusbar->cancel_button, GTK_CAN_FOCUS);
   /*  don't show the cancel button  */
 
+  image = gtk_image_new_from_stock (GTK_STOCK_CANCEL, GTK_ICON_SIZE_MENU);
+  gtk_container_add (GTK_CONTAINER (statusbar->cancel_button), image);
+  gtk_widget_show (image);
+
   g_signal_connect (statusbar->cancel_button, "clicked",
                     G_CALLBACK (gimp_statusbar_progress_canceled),
                     statusbar);
@@ -327,7 +334,18 @@
       gtk_widget_set_sensitive (statusbar->cancel_button, cancelable);
 
       if (cancelable)
-        gtk_widget_show (statusbar->cancel_button);
+        {
+          if (message)
+            {
+              gchar *tooltip = g_strdup_printf (_("Cancel <i>%s</i>"), message);
+
+              gimp_help_set_help_data_with_markup (statusbar->cancel_button,
+                                                   tooltip, NULL);
+              g_free (tooltip);
+            }
+
+          gtk_widget_show (statusbar->cancel_button);
+        }
 
       gtk_widget_show (statusbar->progressbar);
       gtk_widget_hide (GTK_STATUSBAR (statusbar)->label);
@@ -335,7 +353,7 @@
       /*  This call is needed so that the progress bar is drawn in the
        *  correct place. Probably due a bug in GTK+.
        */
-      gtk_container_resize_children (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame));
+      gtk_container_resize_children (GTK_CONTAINER (statusbar));
 
       if (! GTK_WIDGET_VISIBLE (statusbar))
         {