added some toolbox and dock related help IDs.

2003-08-26  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimphelp-ids.h: added some toolbox and dock related
	help IDs.

	* app/gui/dialogs-menu.c
	* app/widgets/gimpimagedock.c
	* app/widgets/gimptoolbox.c: use them.

ChangeLog

@@ -1,3 +1,12 @@
+2003-08-26  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimphelp-ids.h: added some toolbox and dock related
+	help IDs.
+
+	* app/gui/dialogs-menu.c
+	* app/widgets/gimpimagedock.c
+	* app/widgets/gimptoolbox.c: use them.
+
 2003-08-26  Michael Natterer  <mitch@gimp.org>
 
 	* app/helpbrowser/helpbrowser.c: some cleanup and fixes before

app/gui/dialogs-menu.c

@@ -169,10 +169,12 @@ GimpItemFactoryEntry dialogs_menu_entries[] =
 
   { { N_("/Show Image _Menu"), NULL,
       dialogs_toggle_image_menu_cmd_callback, 0, "<ToggleItem>" },
-    NULL, NULL, NULL },
+    NULL,
+    GIMP_HELP_DOCK_IMAGE_MENU, NULL },
   { { N_("/Auto Follow Active _Image"), NULL,
       dialogs_toggle_auto_cmd_callback, 0, "<ToggleItem>" },
-    NULL, NULL, NULL }
+    NULL,
+    GIMP_HELP_DOCK_AUTO_BUTTON, NULL }
 };
 
 #undef ADD_TAB

app/widgets/gimphelp-ids.h

@@ -234,6 +234,8 @@
 #define GIMP_HELP_FILTER_RESHOW                   "gimp-filter-reshow"
 
 #define GIMP_HELP_TOOLBOX                         "gimp-toolbox"
+#define GIMP_HELP_TOOLBOX_COLOR_AREA              "gimp-toolbox-color-area"
+#define GIMP_HELP_TOOLBOX_INDICATOR_AREA          "gimp-toolbox-indicator-area"
 #define GIMP_HELP_TOOLBOX_DEFAULT_COLORS          "gimp-toolbox-default-colors"
 #define GIMP_HELP_TOOLBOX_SWAP_COLORS             "gimp-toolbox-swap-colors"
 
@@ -354,6 +356,8 @@
 #define GIMP_HELP_PREFS_FOLDERS_THEMES            "gimp-prefs-folders-themes"
 
 #define GIMP_HELP_DOCK                            "gimp-dock"
+#define GIMP_HELP_DOCK_IMAGE_MENU                 "gimp-dock-image-menu"
+#define GIMP_HELP_DOCK_AUTO_BUTTON                "gimp-dock-auto-button"
 #define GIMP_HELP_DOCK_TAB_ADD                    "gimp-dock-tab-add"
 #define GIMP_HELP_DOCK_TAB_REMOVE                 "gimp-dock-tab-remove"
 #define GIMP_HELP_DOCK_PREVIEW_SIZE               "gimp-dock-preview-size"

app/widgets/gimpimagedock.c

@@ -37,6 +37,7 @@
 #include "gimpcontainermenuimpl.h"
 #include "gimpdockable.h"
 #include "gimpdockbook.h"
+#include "gimphelp-ids.h"
 
 #include "gimp-intl.h"
 
@@ -169,6 +170,9 @@ gimp_image_dock_init (GimpImageDock *dock)
 		    G_CALLBACK (gtk_widget_destroyed),
 		    &dock->option_menu);
 
+  gimp_help_set_help_data (dock->option_menu, NULL,
+                           GIMP_HELP_DOCK_IMAGE_MENU);
+
   dock->auto_button = gtk_toggle_button_new_with_label (_("Auto"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dock->auto_button),
 				dock->auto_follow_active);
@@ -178,6 +182,9 @@ gimp_image_dock_init (GimpImageDock *dock)
   g_signal_connect (dock->auto_button, "clicked",
 		    G_CALLBACK (gimp_image_dock_auto_clicked),
 		    dock);
+
+  gimp_help_set_help_data (dock->auto_button, NULL,
+                           GIMP_HELP_DOCK_AUTO_BUTTON);
 }
 
 static void
@@ -310,6 +317,9 @@ gimp_image_dock_new (GimpDialogFactory *dialog_factory,
 
   gimp_dock_construct (GIMP_DOCK (image_dock), dialog_factory, context);
 
+  gimp_help_connect (GTK_WIDGET (image_dock), gimp_standard_help_func,
+                     GIMP_HELP_DOCK, NULL);
+
   gimp_context_define_properties (context,
 				  GIMP_CONTEXT_ALL_PROPS_MASK &
 				  ~(GIMP_CONTEXT_IMAGE_MASK |

app/widgets/gimpmenudock.c

@@ -37,6 +37,7 @@
 #include "gimpcontainermenuimpl.h"
 #include "gimpdockable.h"
 #include "gimpdockbook.h"
+#include "gimphelp-ids.h"
 
 #include "gimp-intl.h"
 
@@ -169,6 +170,9 @@ gimp_image_dock_init (GimpImageDock *dock)
 		    G_CALLBACK (gtk_widget_destroyed),
 		    &dock->option_menu);
 
+  gimp_help_set_help_data (dock->option_menu, NULL,
+                           GIMP_HELP_DOCK_IMAGE_MENU);
+
   dock->auto_button = gtk_toggle_button_new_with_label (_("Auto"));
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dock->auto_button),
 				dock->auto_follow_active);
@@ -178,6 +182,9 @@ gimp_image_dock_init (GimpImageDock *dock)
   g_signal_connect (dock->auto_button, "clicked",
 		    G_CALLBACK (gimp_image_dock_auto_clicked),
 		    dock);
+
+  gimp_help_set_help_data (dock->auto_button, NULL,
+                           GIMP_HELP_DOCK_AUTO_BUTTON);
 }
 
 static void
@@ -310,6 +317,9 @@ gimp_image_dock_new (GimpDialogFactory *dialog_factory,
 
   gimp_dock_construct (GIMP_DOCK (image_dock), dialog_factory, context);
 
+  gimp_help_connect (GTK_WIDGET (image_dock), gimp_standard_help_func,
+                     GIMP_HELP_DOCK, NULL);
+
   gimp_context_define_properties (context,
 				  GIMP_CONTEXT_ALL_PROPS_MASK &
 				  ~(GIMP_CONTEXT_IMAGE_MASK |

app/widgets/gimptoolbox.c

@@ -189,9 +189,6 @@ gimp_toolbox_init (GimpToolbox *toolbox)
   gtk_window_add_accel_group (GTK_WINDOW (toolbox),
                               GTK_ITEM_FACTORY (toolbox_factory)->accel_group);
 
-  gimp_help_connect (GTK_WIDGET (toolbox), gimp_standard_help_func,
-                     GIMP_HELP_TOOLBOX, NULL);
-
   toolbox->wbox = gtk_hwrap_box_new (FALSE);
   gtk_wrap_box_set_justify (GTK_WRAP_BOX (toolbox->wbox), GTK_JUSTIFY_TOP);
   gtk_wrap_box_set_line_justify (GTK_WRAP_BOX (toolbox->wbox),
@@ -447,6 +444,9 @@ gimp_toolbox_new (GimpDialogFactory *dialog_factory,
 
   gimp_dock_construct (GIMP_DOCK (toolbox), dialog_factory, context);
 
+  gimp_help_connect (GTK_WIDGET (toolbox), gimp_standard_help_func,
+                     GIMP_HELP_TOOLBOX, NULL);
+
   /* We need to know when the current device changes, so we can update
    * the correct tool - to do this we connect to motion events.
    * We can't just use EXTENSION_EVENTS_CURSOR though, since that
@@ -727,7 +727,7 @@ toolbox_create_color_area (GimpToolbox *toolbox,
   gtk_container_set_border_width (GTK_CONTAINER (alignment), 3);
   gtk_container_add (GTK_CONTAINER (frame), alignment);
 
-  gimp_help_set_help_data (alignment, NULL, "#color_area");
+  gimp_help_set_help_data (alignment, NULL, GIMP_HELP_TOOLBOX_COLOR_AREA);
 
   col_area = gimp_toolbox_color_area_create (toolbox, 54, 42);
 
@@ -761,7 +761,7 @@ toolbox_create_indicator_area (GimpToolbox *toolbox,
   gtk_container_set_border_width (GTK_CONTAINER (alignment), 3);
   gtk_container_add (GTK_CONTAINER (frame), alignment);
 
-  gimp_help_set_help_data (alignment, NULL, "#indicator_area");
+  gimp_help_set_help_data (alignment, NULL, GIMP_HELP_TOOLBOX_INDICATOR_AREA);
 
   ind_area = gimp_toolbox_indicator_area_create (toolbox);
   gtk_container_add (GTK_CONTAINER (alignment), ind_area);