From 99eb1fca6b8b69ad7c67736557225ca00134f84c Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 12 Nov 2003 13:35:06 +0000 Subject: [PATCH] app/display/gimpdisplayshell.c app/widgets/gimplayertreeview.c replaced 2003-11-12 Michael Natterer * app/display/gimpdisplayshell.c * app/widgets/gimplayertreeview.c * app/widgets/gimphelp-ids.h: replaced the last few html help links in app/ by help IDs. --- ChangeLog | 7 +++++++ app/display/gimpdisplayshell-draw.c | 19 ++++++++++++------- app/display/gimpdisplayshell.c | 19 ++++++++++++------- app/widgets/gimphelp-ids.h | 12 ++++++++++++ app/widgets/gimplayertreeview.c | 11 ++++++----- 5 files changed, 49 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4dbec2e66..49fd5c807e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-11-12 Michael Natterer + + * app/display/gimpdisplayshell.c + * app/widgets/gimplayertreeview.c + * app/widgets/gimphelp-ids.h: replaced the last few html help + links in app/ by help IDs. + 2003-11-12 Michael Natterer Use the correct GTK+ APIs for setting and changing the theme: diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index f197913a3d..188733bbbf 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -716,7 +716,8 @@ gimp_display_shell_new (GimpDisplay *gdisp, G_CALLBACK (gimp_display_shell_origin_button_press), shell); - gimp_help_set_help_data (shell->origin, NULL, "#origin_button"); + gimp_help_set_help_data (shell->origin, NULL, + GIMP_HELP_IMAGE_WINDOW_ORIGIN_BUTTON); shell->canvas = gimp_canvas_new (); @@ -734,7 +735,7 @@ gimp_display_shell_new (GimpDisplay *gdisp, G_CALLBACK (gimp_display_shell_hruler_button_press), shell); - gimp_help_set_help_data (shell->hrule, NULL, "#ruler"); + gimp_help_set_help_data (shell->hrule, NULL, GIMP_HELP_IMAGE_WINDOW_RULER); /* the vertical ruler */ shell->vrule = gtk_vruler_new (); @@ -748,7 +749,7 @@ gimp_display_shell_new (GimpDisplay *gdisp, G_CALLBACK (gimp_display_shell_vruler_button_press), shell); - gimp_help_set_help_data (shell->vrule, NULL, "#ruler"); + gimp_help_set_help_data (shell->vrule, NULL, GIMP_HELP_IMAGE_WINDOW_RULER); /* the canvas */ gtk_widget_set_size_request (shell->canvas, n_width, n_height); @@ -785,7 +786,8 @@ gimp_display_shell_new (GimpDisplay *gdisp, gimp_get_user_context (gdisp->gimage->gimp)); gimp_help_set_help_data (shell->padding_button, - _("Set canvas padding color"), "#padding_button"); + _("Set canvas padding color"), + GIMP_HELP_IMAGE_WINDOW_PADDING_BUTTON); g_signal_connect (shell->padding_button, "button_press_event", G_CALLBACK (gimp_display_shell_color_button_press), @@ -842,7 +844,8 @@ gimp_display_shell_new (GimpDisplay *gdisp, gtk_widget_show (image); gimp_help_set_help_data (shell->qmask, - _("Toggle QuickMask"), "#qmask_button"); + _("Toggle QuickMask"), + GIMP_HELP_IMAGE_WINDOW_QMASK_BUTTON); g_signal_connect (shell->qmask, "toggled", G_CALLBACK (gimp_display_shell_qmask_toggled), @@ -862,14 +865,16 @@ gimp_display_shell_new (GimpDisplay *gdisp, G_CALLBACK (gimp_display_shell_nav_button_press), shell); - gimp_help_set_help_data (shell->nav_ebox, NULL, "#nav_window_button"); + gimp_help_set_help_data (shell->nav_ebox, NULL, + GIMP_HELP_IMAGE_WINDOW_NAV_BUTTON); /* create the contents of the status area *********************************/ /* the statusbar */ shell->statusbar = gimp_statusbar_new (shell); gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (shell->statusbar), FALSE); - gimp_help_set_help_data (shell->statusbar, NULL, "#status_area"); + gimp_help_set_help_data (shell->statusbar, NULL, + GIMP_HELP_IMAGE_WINDOW_STATUS_BAR); /* pack all the widgets **************************************************/ diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index f197913a3d..188733bbbf 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -716,7 +716,8 @@ gimp_display_shell_new (GimpDisplay *gdisp, G_CALLBACK (gimp_display_shell_origin_button_press), shell); - gimp_help_set_help_data (shell->origin, NULL, "#origin_button"); + gimp_help_set_help_data (shell->origin, NULL, + GIMP_HELP_IMAGE_WINDOW_ORIGIN_BUTTON); shell->canvas = gimp_canvas_new (); @@ -734,7 +735,7 @@ gimp_display_shell_new (GimpDisplay *gdisp, G_CALLBACK (gimp_display_shell_hruler_button_press), shell); - gimp_help_set_help_data (shell->hrule, NULL, "#ruler"); + gimp_help_set_help_data (shell->hrule, NULL, GIMP_HELP_IMAGE_WINDOW_RULER); /* the vertical ruler */ shell->vrule = gtk_vruler_new (); @@ -748,7 +749,7 @@ gimp_display_shell_new (GimpDisplay *gdisp, G_CALLBACK (gimp_display_shell_vruler_button_press), shell); - gimp_help_set_help_data (shell->vrule, NULL, "#ruler"); + gimp_help_set_help_data (shell->vrule, NULL, GIMP_HELP_IMAGE_WINDOW_RULER); /* the canvas */ gtk_widget_set_size_request (shell->canvas, n_width, n_height); @@ -785,7 +786,8 @@ gimp_display_shell_new (GimpDisplay *gdisp, gimp_get_user_context (gdisp->gimage->gimp)); gimp_help_set_help_data (shell->padding_button, - _("Set canvas padding color"), "#padding_button"); + _("Set canvas padding color"), + GIMP_HELP_IMAGE_WINDOW_PADDING_BUTTON); g_signal_connect (shell->padding_button, "button_press_event", G_CALLBACK (gimp_display_shell_color_button_press), @@ -842,7 +844,8 @@ gimp_display_shell_new (GimpDisplay *gdisp, gtk_widget_show (image); gimp_help_set_help_data (shell->qmask, - _("Toggle QuickMask"), "#qmask_button"); + _("Toggle QuickMask"), + GIMP_HELP_IMAGE_WINDOW_QMASK_BUTTON); g_signal_connect (shell->qmask, "toggled", G_CALLBACK (gimp_display_shell_qmask_toggled), @@ -862,14 +865,16 @@ gimp_display_shell_new (GimpDisplay *gdisp, G_CALLBACK (gimp_display_shell_nav_button_press), shell); - gimp_help_set_help_data (shell->nav_ebox, NULL, "#nav_window_button"); + gimp_help_set_help_data (shell->nav_ebox, NULL, + GIMP_HELP_IMAGE_WINDOW_NAV_BUTTON); /* create the contents of the status area *********************************/ /* the statusbar */ shell->statusbar = gimp_statusbar_new (shell); gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (shell->statusbar), FALSE); - gimp_help_set_help_data (shell->statusbar, NULL, "#status_area"); + gimp_help_set_help_data (shell->statusbar, NULL, + GIMP_HELP_IMAGE_WINDOW_STATUS_BAR); /* pack all the widgets **************************************************/ diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index 85cc6e2ae1..6d44a713f6 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -92,6 +92,14 @@ #define GIMP_HELP_VIEW_CHANGE_SCREEN "gimp-view-change-screen" #define GIMP_HELP_IMAGE_WINDOW "gimp-image-window" +#define GIMP_HELP_IMAGE_WINDOW_ORIGIN_BUTTON "gimp-image-window-origin-button" +#define GIMP_HELP_IMAGE_WINDOW_PADDING_BUTTON "gimp-image-window-padding-button" +#define GIMP_HELP_IMAGE_WINDOW_QMASK_BUTTON "gimp-image-window-qmask-button" +#define GIMP_HELP_IMAGE_WINDOW_NAV_BUTTON "gimp-image-window-nav-button" +#define GIMP_HELP_IMAGE_WINDOW_RULER "gimp-image-window-ruler" +#define GIMP_HELP_IMAGE_WINDOW_STATUS_BAR "gimp-image-window-status-bar" + + #define GIMP_HELP_IMAGE_DIALOG "gimp-image-dialog" #define GIMP_HELP_IMAGE_CONVERT_RGB "gimp-image-convert-rgb" #define GIMP_HELP_IMAGE_CONVERT_GRAYSCALE "gimp-image-convert-grayscale" @@ -111,6 +119,10 @@ #define GIMP_HELP_IMAGE_GRID "gimp-image-grid" #define GIMP_HELP_LAYER_DIALOG "gimp-layer-dialog" +#define GIMP_HELP_LAYER_DIALOG_PAINT_MODE_MENU "gimp-layer-dialog-paint-mode-menu" +#define GIMP_HELP_LAYER_DIALOG_KEEP_TRANS_BUTTON "gimp-layer-dialog-keep-trans-button" +#define GIMP_HELP_LAYER_DIALOG_OPACITY_SCALE "gimp-layer-dialog-opacity-scale" + #define GIMP_HELP_LAYER_NEW "gimp-layer-new" #define GIMP_HELP_LAYER_DUPLICATE "gimp-layer-duplicate" #define GIMP_HELP_LAYER_ANCHOR "gimp-layer-anchor" diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 11492d860b..98d9f32636 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -278,8 +278,8 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view) gtk_box_pack_start (GTK_BOX (hbox), view->paint_mode_menu, TRUE, TRUE, 0); gtk_widget_show (view->paint_mode_menu); - gimp_help_set_help_data (view->paint_mode_menu, - NULL, "#paint_mode_menu"); + gimp_help_set_help_data (view->paint_mode_menu, NULL, + GIMP_HELP_LAYER_DIALOG_PAINT_MODE_MENU); /* Preserve transparency toggle */ @@ -291,8 +291,8 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view) G_CALLBACK (gimp_layer_tree_view_preserve_button_toggled), view); - gimp_help_set_help_data (toggle, - _("Keep Transparency"), "#keep_trans_button"); + gimp_help_set_help_data (toggle, _("Keep Transparency"), + GIMP_HELP_LAYER_DIALOG_KEEP_TRANS_BUTTON); gtk_widget_style_get (GTK_WIDGET (view), "button_icon_size", &icon_size, @@ -313,7 +313,8 @@ gimp_layer_tree_view_init (GimpLayerTreeView *view) _("Opacity:"), -1, -1, 100.0, 0.0, 100.0, 1.0, 10.0, 1, TRUE, 0.0, 0.0, - NULL, "#opacity_sacle")); + NULL, + GIMP_HELP_LAYER_DIALOG_OPACITY_SCALE)); g_signal_connect (view->opacity_adjustment, "value_changed", G_CALLBACK (gimp_layer_tree_view_opacity_scale_changed),