gimp r25930 - in trunk: . plug-ins/help-browser

[neo svn gnome org]

Author: neo
Date: Thu Jun 12 08:54:01 2008
New Revision: 25930
URL: http://svn.gnome.org/viewvc/gimp?rev=25930&view=rev

Log:
2008-06-12  Sven Neumann  <sven gimp org>

	* plug-ins/help-browser/dialog.c: use GTK_STOCK_HOME for the
	button that navigates to the index page.

	* plug-ins/help-browser/gimpthrobber.c
	(gimp_throbber_construct_contents): deal better with toolbar style
	GTK_TOOLBAR_ICONS.


Modified:
   trunk/ChangeLog
   trunk/plug-ins/help-browser/dialog.c
   trunk/plug-ins/help-browser/gimpthrobber.c

Modified: trunk/plug-ins/help-browser/dialog.c
==============================================================================
--- trunk/plug-ins/help-browser/dialog.c	(original)
+++ trunk/plug-ins/help-browser/dialog.c	Thu Jun 12 08:54:01 2008
@@ -92,7 +92,7 @@
                                           gpointer           data);
 static void       stop_callback          (GtkAction         *action,
                                           gpointer           data);
-static void       index_callback         (GtkAction         *action,
+static void       home_callback          (GtkAction         *action,
                                           gpointer           data);
 static void       zoom_in_callback       (GtkAction         *action,
                                           gpointer           data);
@@ -516,13 +516,14 @@
       G_CALLBACK (stop_callback)
     },
     {
-      "index", GTK_STOCK_INDEX,
+      "home", GTK_STOCK_HOME,
       NULL, "<alt>Home", N_("Go to the index page"),
-      G_CALLBACK (index_callback)
+      G_CALLBACK (home_callback)
     },
     {
       "copy-location", GTK_STOCK_COPY,
-      N_("Copy location"), "", N_("Copy the location of this page to the clipboard"),
+      N_("Copy location"), "",
+      N_("Copy the location of this page to the clipboard"),
       G_CALLBACK (copy_location_callback)
     },
     {
@@ -578,7 +579,7 @@
                                      "  <toolbar name=\"help-browser-toolbar\">"
                                      "    <toolitem action=\"reload\" />"
                                      "    <toolitem action=\"stop\" />"
-                                     "    <toolitem action=\"index\" />"
+                                     "    <toolitem action=\"home\" />"
                                      "    <separator name=\"space\" />"
                                      "    <toolitem action=\"website\" />"
                                      "  </toolbar>"
@@ -601,7 +602,7 @@
                                      "    <menuitem action=\"reload\" />"
                                      "    <menuitem action=\"stop\" />"
                                      "    <separator />"
-                                     "    <menuitem action=\"index\" />"
+                                     "    <menuitem action=\"home\" />"
                                      "    <menuitem action=\"copy-location\" />"
 #ifdef HAVE_WEBKIT_ZOOM_API
                                      "    <separator />"
@@ -652,8 +653,8 @@
 }
 
 static void
-index_callback (GtkAction *action,
-                gpointer   data)
+home_callback (GtkAction *action,
+               gpointer   data)
 {
   GtkTreeModel   *model  = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
   GimpHelpDomain *domain = g_object_get_data (G_OBJECT (model), "domain");

Modified: trunk/plug-ins/help-browser/gimpthrobber.c
==============================================================================
--- trunk/plug-ins/help-browser/gimpthrobber.c	(original)
+++ trunk/plug-ins/help-browser/gimpthrobber.c	Thu Jun 12 08:54:01 2008
@@ -169,8 +169,9 @@
 static void
 gimp_throbber_construct_contents (GtkToolItem *tool_item)
 {
-  GimpThrobber *button = GIMP_THROBBER (tool_item);
-  GtkWidget    *image;
+  GimpThrobber    *button = GIMP_THROBBER (tool_item);
+  GtkWidget       *image;
+  GtkToolbarStyle  style;
 
   if (button->priv->image && button->priv->image->parent)
     gtk_container_remove (GTK_CONTAINER (button->priv->image->parent),
@@ -179,11 +180,18 @@
   if (gtk_bin_get_child (GTK_BIN (button->priv->button)))
     gtk_widget_destroy (gtk_bin_get_child (GTK_BIN (button->priv->button)));
 
-  if (gtk_tool_item_get_toolbar_style (tool_item) == GTK_TOOLBAR_TEXT)
+  style = gtk_tool_item_get_toolbar_style (tool_item);
+
+  if (style == GTK_TOOLBAR_TEXT)
     {
       image = gtk_image_new_from_stock (button->priv->stock_id,
                                         GTK_ICON_SIZE_MENU);
     }
+  else if (style == GTK_TOOLBAR_ICONS)
+    {
+      image = gtk_image_new_from_stock (button->priv->stock_id,
+                                        GTK_ICON_SIZE_LARGE_TOOLBAR);
+    }
   else if (button->priv->image)
     {
       image = button->priv->image;