Commit 9377b26e authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

added help IDs to all actions representing the toplevel popups and menus

2004-05-02  Michael Natterer  <mitch@gimp.org>

	* app/actions/*-actions.c: added help IDs to all actions
	representing the toplevel popups and menus (as fallbacks for the
	still-to-be-written help system intrgration of GimpUIManager).

	* app/display/gimpdisplayshell.c (gimp_display_shell_new): removed
	call to gtk_ui_manager_ensure_update() because that's done by
	gimp_ui_manager_ui_get() now.

	* app/widgets/gimpmenufactory.[ch]: removed API to register and
	create item factories.

	* app/gui/menus.c: changed accordingly.

	* app/gui/dialogs.c
	* app/actions/plug-in-commands.c
	* app/gui/file-dialog-utils.c
	* app/gui/file-save-dialog.c
	* app/widgets/gimpdataeditor.c
	* app/widgets/gimpdockable.c
	* app/widgets/gimpdockbook.[ch]
	* app/widgets/gimpimagedock.c
	* app/widgets/gimpitemtreeview.c: removed leftover item factory
	cruft.

	* app/widgets/widgets-types.h: removed item factory typedefs...

	* app/widgets/gimpitemfactory.h: ...and added them here.

	* app/widgets/gimpactiongroup.[ch]: added new function
	gimp_action_group_add_plug_in_actions().

	* app/actions/plug-in-actions.c: use it here instead of adding
	the actions manually.

	* app/widgets/gimptoolbox.c: ported the code which dynamically
	updates the tool button tooltips on accelerator changes to
	GtkAction. Disabled the whole stuff because GTK+ lacks
	gtk_action_get_accel_closure().
parent 41a9add7
2004-05-02 Michael Natterer <mitch@gimp.org>
* app/actions/*-actions.c: added help IDs to all actions
representing the toplevel popups and menus (as fallbacks for the
still-to-be-written help system intrgration of GimpUIManager).
* app/display/gimpdisplayshell.c (gimp_display_shell_new): removed
call to gtk_ui_manager_ensure_update() because that's done by
gimp_ui_manager_ui_get() now.
* app/widgets/gimpmenufactory.[ch]: removed API to register and
create item factories.
* app/gui/menus.c: changed accordingly.
* app/gui/dialogs.c
* app/actions/plug-in-commands.c
* app/gui/file-dialog-utils.c
* app/gui/file-save-dialog.c
* app/widgets/gimpdataeditor.c
* app/widgets/gimpdockable.c
* app/widgets/gimpdockbook.[ch]
* app/widgets/gimpimagedock.c
* app/widgets/gimpitemtreeview.c: removed leftover item factory
cruft.
* app/widgets/widgets-types.h: removed item factory typedefs...
* app/widgets/gimpitemfactory.h: ...and added them here.
* app/widgets/gimpactiongroup.[ch]: added new function
gimp_action_group_add_plug_in_actions().
* app/actions/plug-in-actions.c: use it here instead of adding
the actions manually.
* app/widgets/gimptoolbox.c: ported the code which dynamically
updates the tool button tooltips on accelerator changes to
GtkAction. Disabled the whole stuff because GTK+ lacks
gtk_action_get_accel_closure().
2004-05-02 Sven Neumann <sven@gimp.org> 2004-05-02 Sven Neumann <sven@gimp.org>
* menus/Makefile.am: added a rule to generate gtkuimanager XML * menus/Makefile.am: added a rule to generate gtkuimanager XML
......
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
static GimpActionEntry brushes_actions[] = static GimpActionEntry brushes_actions[] =
{ {
{ "brushes-popup", GIMP_STOCK_BRUSH, N_("Brushes Menu") }, { "brushes-popup", GIMP_STOCK_BRUSH, N_("Brushes Menu"), NULL, NULL, NULL,
GIMP_HELP_BRUSH_DIALOG },
{ "brushes-edit", GIMP_STOCK_EDIT, { "brushes-edit", GIMP_STOCK_EDIT,
N_("_Edit Brush..."), NULL, NULL, N_("_Edit Brush..."), NULL, NULL,
......
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
static GimpActionEntry buffers_actions[] = static GimpActionEntry buffers_actions[] =
{ {
{ "buffers-popup", GIMP_STOCK_BUFFER, N_("Buffers Menu") }, { "buffers-popup", GIMP_STOCK_BUFFER, N_("Buffers Menu"), NULL, NULL, NULL,
GIMP_HELP_BUFFER_DIALOG },
{ "buffers-paste", GTK_STOCK_PASTE, { "buffers-paste", GTK_STOCK_PASTE,
N_("_Paste Buffer"), "", NULL, N_("_Paste Buffer"), "", NULL,
......
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
static GimpActionEntry channels_actions[] = static GimpActionEntry channels_actions[] =
{ {
{ "channels-popup", GIMP_STOCK_CHANNELS, N_("Channels Menu") }, { "channels-popup", GIMP_STOCK_CHANNELS, N_("Channels Menu"), NULL, NULL, NULL,
GIMP_HELP_CHANNEL_DIALOG },
{ "channels-edit-attributes", GIMP_STOCK_EDIT, { "channels-edit-attributes", GIMP_STOCK_EDIT,
N_("_Edit Channel Attributes..."), NULL, NULL, N_("_Edit Channel Attributes..."), NULL, NULL,
......
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
static GimpActionEntry colormap_editor_actions[] = static GimpActionEntry colormap_editor_actions[] =
{ {
{ "colormap-editor-popup", GIMP_STOCK_INDEXED_PALETTE, { "colormap-editor-popup", GIMP_STOCK_INDEXED_PALETTE,
N_("Indexed Palette Menu") }, N_("Indexed Palette Menu"), NULL, NULL, NULL,
GIMP_HELP_INDEXED_PALETTE_DIALOG },
{ "colormap-editor-edit-color", GIMP_STOCK_EDIT, { "colormap-editor-edit-color", GIMP_STOCK_EDIT,
N_("_Edit Color..."), NULL, NULL, N_("_Edit Color..."), NULL, NULL,
......
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
static GimpActionEntry colormap_editor_actions[] = static GimpActionEntry colormap_editor_actions[] =
{ {
{ "colormap-editor-popup", GIMP_STOCK_INDEXED_PALETTE, { "colormap-editor-popup", GIMP_STOCK_INDEXED_PALETTE,
N_("Indexed Palette Menu") }, N_("Indexed Palette Menu"), NULL, NULL, NULL,
GIMP_HELP_INDEXED_PALETTE_DIALOG },
{ "colormap-editor-edit-color", GIMP_STOCK_EDIT, { "colormap-editor-edit-color", GIMP_STOCK_EDIT,
N_("_Edit Color..."), NULL, NULL, N_("_Edit Color..."), NULL, NULL,
......
...@@ -35,26 +35,23 @@ ...@@ -35,26 +35,23 @@
static GimpActionEntry dialogs_actions[] = static GimpActionEntry dialogs_actions[] =
{ {
{ "dialogs-menu", NULL, { "dialogs-menu", NULL, N_("_Dialogs") },
N_("_Dialogs") }, { "dialogs-new-dock-menu", NULL, N_("Create New Doc_k") },
{ "dialogs-new-dock-menu", NULL,
N_("Create New Doc_k") },
{ "dialogs-new-dock-lcp", NULL, { "dialogs-new-dock-lcp", NULL,
N_("_Layers, Channels & Paths"), NULL, NULL, N_("_Layers, Channels & Paths"), NULL, NULL,
G_CALLBACK (dialogs_create_lc_cmd_callback), G_CALLBACK (dialogs_create_lc_cmd_callback),
NULL }, GIMP_HELP_DOCK },
{ "dialogs-new-dock-data", NULL, { "dialogs-new-dock-data", NULL,
N_("_Brushes, Patterns & Gradients"), NULL, NULL, N_("_Brushes, Patterns & Gradients"), NULL, NULL,
G_CALLBACK (dialogs_create_data_cmd_callback), G_CALLBACK (dialogs_create_data_cmd_callback),
NULL }, GIMP_HELP_DOCK },
{ "dialogs-new-dock-stuff", NULL, { "dialogs-new-dock-stuff", NULL,
N_("_Misc. Stuff"), NULL, NULL, N_("_Misc. Stuff"), NULL, NULL,
G_CALLBACK (dialogs_create_stuff_cmd_callback), G_CALLBACK (dialogs_create_stuff_cmd_callback),
NULL }, GIMP_HELP_DOCK },
{ "dialogs-toolbox", NULL, { "dialogs-toolbox", NULL,
N_("Tool_box"), NULL, NULL, N_("Tool_box"), NULL, NULL,
......
...@@ -45,7 +45,9 @@ ...@@ -45,7 +45,9 @@
static GimpActionEntry dockable_actions[] = static GimpActionEntry dockable_actions[] =
{ {
{ "dockable-popup", NULL, N_("Dialogs Menu") }, { "dockable-popup", NULL, N_("Dialogs Menu"), NULL, NULL, NULL,
GIMP_HELP_DOCK },
{ "dockable-menu", GTK_STOCK_MISSING_IMAGE, "" }, { "dockable-menu", GTK_STOCK_MISSING_IMAGE, "" },
{ "dockable-add-tab-menu", NULL, N_("_Add Tab") }, { "dockable-add-tab-menu", NULL, N_("_Add Tab") },
{ "dockable-preview-size-menu", NULL, N_("Preview Si_ze") }, { "dockable-preview-size-menu", NULL, N_("Preview Si_ze") },
......
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
static GimpActionEntry documents_actions[] = static GimpActionEntry documents_actions[] =
{ {
{ "documents-popup", GTK_STOCK_OPEN, N_("Documents Menu") }, { "documents-popup", GTK_STOCK_OPEN, N_("Documents Menu"), NULL, NULL, NULL,
GIMP_HELP_DOCUMENT_DIALOG },
{ "documents-open", GTK_STOCK_OPEN, { "documents-open", GTK_STOCK_OPEN,
N_("_Open Image"), "", NULL, N_("_Open Image"), "", NULL,
......
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
static GimpActionEntry error_console_actions[] = static GimpActionEntry error_console_actions[] =
{ {
{ "error-console-popup", GIMP_STOCK_WARNING, N_("Error Console Menu") }, { "error-console-popup", GIMP_STOCK_WARNING, N_("Error Console Menu"),
NULL, NULL, NULL,
GIMP_HELP_ERRORS_DIALOG },
{ "error-console-clear", GTK_STOCK_CLEAR, { "error-console-clear", GTK_STOCK_CLEAR,
N_("_Clear Errors"), "", NULL, N_("_Clear Errors"), "", NULL,
......
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
static GimpActionEntry file_open_actions[] = static GimpActionEntry file_open_actions[] =
{ {
{ "file-open-popup", NULL, N_("File Open Menu") }, { "file-open-popup", NULL, N_("File Open Menu"), NULL, NULL, NULL,
GIMP_HELP_FILE_OPEN },
{ "file-open-automatic", NULL, { "file-open-automatic", NULL,
N_("Automatic"), NULL, NULL, N_("Automatic"), NULL, NULL,
......
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
static GimpActionEntry file_save_actions[] = static GimpActionEntry file_save_actions[] =
{ {
{ "file-save-popup", NULL, N_("File Save Menu") }, { "file-save-popup", NULL, N_("File Save Menu"), NULL, NULL, NULL,
GIMP_HELP_FILE_SAVE },
{ "file-save-by-extension", NULL, { "file-save-by-extension", NULL,
N_("By Extension"), NULL, NULL, N_("By Extension"), NULL, NULL,
......
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
static GimpActionEntry fonts_actions[] = static GimpActionEntry fonts_actions[] =
{ {
{ "fonts-popup", GIMP_STOCK_FONT, N_("Fonts Menu") }, { "fonts-popup", GIMP_STOCK_FONT, N_("Fonts Menu"), NULL, NULL, NULL,
GIMP_HELP_FONT_DIALOG },
{ "fonts-refresh", GTK_STOCK_REFRESH, { "fonts-refresh", GTK_STOCK_REFRESH,
N_("_Rescan Font List"), "", NULL, N_("_Rescan Font List"), "", NULL,
......
...@@ -42,7 +42,9 @@ ...@@ -42,7 +42,9 @@
static GimpActionEntry gradient_editor_actions[] = static GimpActionEntry gradient_editor_actions[] =
{ {
{ "gradient-editor-popup", GIMP_STOCK_GRADIENT, N_("Gradient Editor Menu") }, { "gradient-editor-popup", GIMP_STOCK_GRADIENT, N_("Gradient Editor Menu"),
NULL, NULL, NULL,
GIMP_HELP_GRADIENT_EDITOR_DIALOG },
{ "gradient-editor-load-left-color", NULL, N_("_Load Left Color From") }, { "gradient-editor-load-left-color", NULL, N_("_Load Left Color From") },
{ "gradient-editor-save-left-color", NULL, N_("_Save Left Color To") }, { "gradient-editor-save-left-color", NULL, N_("_Save Left Color To") },
......
...@@ -42,7 +42,9 @@ ...@@ -42,7 +42,9 @@
static GimpActionEntry gradients_actions[] = static GimpActionEntry gradients_actions[] =
{ {
{ "gradients-popup", GIMP_STOCK_GRADIENT, N_("Gradients Menu") }, { "gradients-popup", GIMP_STOCK_GRADIENT, N_("Gradients Menu"),
NULL, NULL, NULL,
GIMP_HELP_GRADIENT_DIALOG },
{ "gradients-edit", GIMP_STOCK_EDIT, { "gradients-edit", GIMP_STOCK_EDIT,
N_("_Edit Gradient..."), NULL, NULL, N_("_Edit Gradient..."), NULL, NULL,
......
...@@ -45,12 +45,19 @@ ...@@ -45,12 +45,19 @@
static GimpActionEntry image_actions[] = static GimpActionEntry image_actions[] =
{ {
{ "toolbox-menubar", NULL, N_("Toolbox Menu") }, { "toolbox-menubar", NULL, N_("Toolbox Menu"), NULL, NULL, NULL,
{ "extensions-menu", NULL, N_("_Xtns") }, GIMP_HELP_TOOLBOX },
{ "image-menubar", NULL, N_("Image Menu") },
{ "image-menu", NULL, N_("_Image") }, { "image-menubar", NULL, N_("Image Menu"), NULL, NULL, NULL,
{ "image-mode-menu", NULL, N_("_Mode") }, GIMP_HELP_IMAGE_WINDOW },
{ "image-transform-menu", NULL, N_("_Transform") },
{ "image-popup", NULL, N_("Image Menu"), NULL, NULL, NULL,
GIMP_HELP_IMAGE_WINDOW },
{ "extensions-menu", NULL, N_("_Xtns") },
{ "image-menu", NULL, N_("_Image") },
{ "image-mode-menu", NULL, N_("_Mode") },
{ "image-transform-menu", NULL, N_("_Transform") },
{ "image-convert-rgb", GIMP_STOCK_CONVERT_RGB, { "image-convert-rgb", GIMP_STOCK_CONVERT_RGB,
N_("_RGB"), NULL, NULL, N_("_RGB"), NULL, NULL,
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "widgets/gimpactiongroup.h" #include "widgets/gimpactiongroup.h"
#include "widgets/gimpcontainereditor.h" #include "widgets/gimpcontainereditor.h"
#include "widgets/gimpcontainerview.h" #include "widgets/gimpcontainerview.h"
#include "widgets/gimphelp-ids.h"
#include "images-actions.h" #include "images-actions.h"
#include "images-commands.h" #include "images-commands.h"
...@@ -39,7 +40,8 @@ ...@@ -39,7 +40,8 @@
static GimpActionEntry images_actions[] = static GimpActionEntry images_actions[] =
{ {
{ "images-popup", GIMP_STOCK_IMAGES, N_("Images Menu") }, { "images-popup", GIMP_STOCK_IMAGES, N_("Images Menu"), NULL, NULL, NULL,
GIMP_HELP_IMAGE_DIALOG },
{ "images-raise-views", GTK_STOCK_GOTO_TOP, { "images-raise-views", GTK_STOCK_GOTO_TOP,
N_("_Raise Views"), "", NULL, N_("_Raise Views"), "", NULL,
...@@ -80,9 +82,9 @@ images_actions_update (GimpActionGroup *group, ...@@ -80,9 +82,9 @@ images_actions_update (GimpActionGroup *group,
#define SET_SENSITIVE(action,condition) \ #define SET_SENSITIVE(action,condition) \
gimp_action_group_set_action_sensitive (group, action, (condition) != 0) gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
SET_SENSITIVE ("images-raise-views", image); SET_SENSITIVE ("images-raise-views", image);
SET_SENSITIVE ("images-new-view", image); SET_SENSITIVE ("images-new-view", image);
SET_SENSITIVE ("images-delete", image && image->disp_count == 0); SET_SENSITIVE ("images-delete", image && image->disp_count == 0);
#undef SET_SENSITIVE #undef SET_SENSITIVE
} }
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
static GimpActionEntry layers_actions[] = static GimpActionEntry layers_actions[] =
{ {
{ "layers-popup", GIMP_STOCK_LAYERS, N_("Layers Menu") }, { "layers-popup", GIMP_STOCK_LAYERS, N_("Layers Menu"), NULL, NULL, NULL,
GIMP_HELP_LAYER_DIALOG },
{ "layers-menu", NULL, N_("_Layer") }, { "layers-menu", NULL, N_("_Layer") },
{ "layers-stack-menu", NULL, N_("Stac_k") }, { "layers-stack-menu", NULL, N_("Stac_k") },
......
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
static GimpActionEntry palette_editor_actions[] = static GimpActionEntry palette_editor_actions[] =
{ {
{ "palette-editor-popup", GIMP_STOCK_PALETTE, N_("Palette Editor Menu") }, { "palette-editor-popup", GIMP_STOCK_PALETTE, N_("Palette Editor Menu"),
NULL, NULL, NULL,
GIMP_HELP_PALETTE_EDITOR_DIALOG },
{ "palette-editor-edit-color", GIMP_STOCK_EDIT, { "palette-editor-edit-color", GIMP_STOCK_EDIT,
N_("_Edit Color..."), "", NULL, N_("_Edit Color..."), "", NULL,
......
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
static GimpActionEntry palettes_actions[] = static GimpActionEntry palettes_actions[] =
{ {
{ "palettes-popup", GIMP_STOCK_PALETTE, N_("Palettes Menu") }, { "palettes-popup", GIMP_STOCK_PALETTE, N_("Palettes Menu"), NULL, NULL, NULL,
GIMP_HELP_PALETTE_DIALOG },
{ "palettes-edit", GIMP_STOCK_EDIT, { "palettes-edit", GIMP_STOCK_EDIT,
N_("_Edit Palette..."), NULL, NULL, N_("_Edit Palette..."), NULL, NULL,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment