forgot to register the "patterns" actions.

2004-04-21  Michael Natterer  <mitch@gimp.org>

	* app/actions/actions.c: forgot to register the "patterns" actions.

	* app/actions/*-actions.c: added actions representing the toplevel
	menus (popups and menubars). Fixed some typos.

	* menus/*-menu.xml: added action="foo" attributes to all toplevel
	menus. Fixed typos here too.

	* menus/gtkuimanager.dtd: fixed possible attributes.

ChangeLog

@@ -1,3 +1,15 @@
+2004-04-21  Michael Natterer  <mitch@gimp.org>
+
+	* app/actions/actions.c: forgot to register the "patterns" actions.
+
+	* app/actions/*-actions.c: added actions representing the toplevel
+	menus (popups and menubars). Fixed some typos.
+
+	* menus/*-menu.xml: added action="foo" attributes to all toplevel
+	menus. Fixed typos here too.
+
+	* menus/gtkuimanager.dtd: fixed possible attributes.
+
 2004-04-21  Sven Neumann  <sven@gimp.org>
 
 	* libgimp/gimpmenu.c (gimp_menu_add_none): use the same label as

app/actions/actions.c

@@ -132,6 +132,9 @@ static GimpActionFactoryEntry action_groups[] =
   { "palettes",
     palettes_actions_setup,
     palettes_actions_update },
+  { "patterns",
+    patterns_actions_setup,
+    patterns_actions_update },
   { "plug-in",
     plug_in_actions_setup,
     plug_in_actions_update },

app/actions/brushes-actions.c

@@ -41,6 +41,8 @@
 
 static GimpActionEntry brushes_actions[] =
 {
+  { "brushes-popup", NULL, N_("Brushes Menu") },
+
   { "brushes-edit", GIMP_STOCK_EDIT,
     N_("_Edit Brush..."), NULL, NULL,
     G_CALLBACK (data_edit_data_cmd_callback),

app/actions/buffers-actions.c

@@ -39,12 +39,14 @@
 
 static GimpActionEntry buffers_actions[] =
 {
+  { "buffers-popup", NULL, N_("Buffers Menu") },
+
   { "buffers-paste", GTK_STOCK_PASTE,
     N_("_Paste Buffer"), "", NULL,
     G_CALLBACK (buffers_paste_buffer_cmd_callback),
     GIMP_HELP_BUFFER_PASTE },
 
-  { "buffers-paste-info", GIMP_STOCK_PASTE_INTO,
+  { "buffers-paste-into", GIMP_STOCK_PASTE_INTO,
     N_("Paste Buffer _Into"), NULL, NULL,
     G_CALLBACK (buffers_paste_buffer_into_cmd_callback),
     GIMP_HELP_BUFFER_PASTE_INTO },

app/actions/channels-actions.c

@@ -40,6 +40,8 @@
 
 static GimpActionEntry channels_actions[] =
 {
+  { "channels-popup", NULL, N_("Channels Menu") },
+
   { "channels-edit-attributes", GIMP_STOCK_EDIT,
     N_("_Edit Channel Attributes..."), NULL, NULL,
     G_CALLBACK (channels_edit_attributes_cmd_callback),

app/actions/colormap-actions.c

@@ -38,6 +38,8 @@
 
 static GimpActionEntry colormap_editor_actions[] =
 {
+  { "colormap-editor-popup", NULL, N_("Indexed Palette Menu") },
+
   { "colormap-editor-edit-color", GIMP_STOCK_EDIT,
     N_("_Edit Color..."), NULL, NULL,
     G_CALLBACK (colormap_editor_edit_color_cmd_callback),

app/actions/colormap-editor-actions.c

@@ -38,6 +38,8 @@
 
 static GimpActionEntry colormap_editor_actions[] =
 {
+  { "colormap-editor-popup", NULL, N_("Indexed Palette Menu") },
+
   { "colormap-editor-edit-color", GIMP_STOCK_EDIT,
     N_("_Edit Color..."), NULL, NULL,
     G_CALLBACK (colormap_editor_edit_color_cmd_callback),

app/actions/dockable-actions.c

@@ -45,16 +45,11 @@
 
 static GimpActionEntry dockable_actions[] =
 {
-  { "dockable-menu", GTK_STOCK_MISSING_IMAGE, NULL },
+  { "dockable-popup",             NULL, N_("Dialogs Menu")      },
-
+  { "dockable-menu",              GTK_STOCK_MISSING_IMAGE, NULL },
-  { "dockable-add-tab-menu", NULL,
+  { "dockable-add-tab-menu",      NULL, N_("_Add Tab")          },
-    N_("_Add Tab") },
+  { "dockable-preview-size-menu", NULL, N_("Preview Si_ze")     },
-
+  { "dockable-tab-style-menu",    NULL, N_("/_Tab Style")       },
-  { "dockable-preview-size-menu", NULL,
-    N_("Preview Si_ze") },
-
-  { "dockable-tab-style-menu", NULL,
-    N_("/_Tab Style") },
 
   { "dockable-close-tab", GTK_STOCK_CLOSE,
     N_("_Close Tab"), "", NULL,

app/actions/documents-actions.c

@@ -39,6 +39,8 @@
 
 static GimpActionEntry documents_actions[] =
 {
+  { "ducuments-popup", NULL, N_("Documents Menu") },
+
   { "documents-open", GTK_STOCK_OPEN,
     N_("_Open Image"), "", NULL,
     G_CALLBACK (documents_open_document_cmd_callback),

app/actions/fonts-actions.c

@@ -41,6 +41,8 @@
 
 static GimpActionEntry fonts_actions[] =
 {
+  { "fonts-popup", NULL, N_("Fonts Menu") },
+
   { "fonts-refresh", GTK_STOCK_REFRESH,
     N_("_Rescan Font List"), "", NULL,
     G_CALLBACK (fonts_refresh_cmd_callback),

app/actions/gradient-editor-actions.c

@@ -42,6 +42,8 @@
 
 static GimpActionEntry gradient_editor_actions[] =
 {
+  { "gradient-editor-popup", NULL, N_("Gradient Editor Menu") },
+
   { "gradient-editor-left-color", NULL,
     N_("L_eft Endpoint's Color..."), NULL, NULL,
     G_CALLBACK (gradient_editor_left_color_cmd_callback),

app/actions/gradients-actions.c

@@ -42,6 +42,8 @@
 
 static GimpActionEntry gradients_actions[] =
 {
+  { "gradients-popup", NULL, N_("Gradients Menu") },
+
   { "gradients-edit", GIMP_STOCK_EDIT,
     N_("_Edit Gradient..."), NULL, NULL,
     G_CALLBACK (data_edit_data_cmd_callback),

app/actions/image-actions.c

@@ -45,6 +45,7 @@
 
 static GimpActionEntry image_actions[] =
 {
+  { "toolbox-menubar",      NULL, N_("Toolbox Menu") },
   { "image-menubar",        NULL, N_("Image Menu") },
   { "image-menu",           NULL, N_("_Image")     },
   { "image-mode-menu",      NULL, N_("_Mode")      },

app/actions/images-actions.c

@@ -39,6 +39,8 @@
 
 static GimpActionEntry images_actions[] =
 {
+  { "images-popup", NULL, N_("Images Menu") },
+
   { "images-raise-views", GTK_STOCK_GOTO_TOP,
     N_("_Raise Views"), "", NULL,
     G_CALLBACK (images_raise_views_cmd_callback),

app/actions/layers-actions.c

@@ -45,26 +45,14 @@
 
 static GimpActionEntry layers_actions[] =
 {
-  { "layers-menu", NULL,
+  { "layers-popup",             NULL, N_("Layers Menu")   },
-    N_("_Layer") },
+  { "layers-menu",              NULL, N_("_Layer")        },
-
+  { "layers-stack-menu",        NULL, N_("Stac_k")        },
-  { "layers-stack-menu", NULL,
+  { "layers-colors-menu",       NULL, N_("_Colors")       },
-    N_("Stac_k") },
+  { "layers-colors-auto-menu",  NULL, N_("_Auto")         },
-
+  { "layers-mask-menu",         NULL, N_("_Mask")         },
-  { "layers-colors-menu", NULL,
+  { "layers-transparency-menu", NULL, N_("Tr_ansparency") },
-    N_("_Colors") },
+  { "layers-transform-menu",    NULL, N_("_Transform")    },
-
-  { "layers-colors-auto-menu", NULL,
-    N_("_Auto") },
-
-  { "layers-mask-menu", NULL,
-    N_("_Mask") },
-
-  { "layers-transparency-menu", NULL,
-    N_("Tr_ansparency") },
-
-  { "layers-transform-menu", NULL,
-    N_("_Transform") },
 
   { "layers-text-tool", GIMP_STOCK_TOOL_TEXT,
     N_("Te_xt Tool"), NULL, NULL,

app/actions/palette-editor-actions.c

@@ -36,6 +36,8 @@
 
 static GimpActionEntry palette_editor_actions[] =
 {
+  { "palette-editor-popup", NULL, N_("Palette Editor Menu") },
+
   { "palette-editor-edit-color", GIMP_STOCK_EDIT,
     N_("_Edit Color..."), "", NULL,
     G_CALLBACK (palette_editor_edit_color_cmd_callback),

app/actions/palettes-actions.c

@@ -42,6 +42,8 @@
 
 static GimpActionEntry palettes_actions[] =
 {
+  { "palettes-popup", NULL, N_("Palettes Menu") },
+
   { "palettes-edit", GIMP_STOCK_EDIT,
     N_("_Edit Palette..."), NULL, NULL,
     G_CALLBACK (data_edit_data_cmd_callback),

app/actions/patterns-actions.c

@@ -41,6 +41,8 @@
 
 static GimpActionEntry patterns_actions[] =
 {
+  { "patterns-popup", NULL, N_("Patterns Menu") },
+
   { "patterns-edit", GIMP_STOCK_EDIT,
     N_("_Edit Pattern..."), NULL, NULL,
     G_CALLBACK (data_edit_data_cmd_callback),

app/actions/qmask-actions.c

@@ -40,6 +40,8 @@
 
 static GimpActionEntry qmask_actions[] =
 {
+  { "qmask-popup", NULL, N_("QMask Menu") },
+
   { "qmask-configure", NULL,
     N_("_Configure Color and Opacity..."), NULL, NULL,
     G_CALLBACK (qmask_configure_cmd_callback),

app/actions/quick-mask-actions.c

@@ -40,6 +40,8 @@
 
 static GimpActionEntry qmask_actions[] =
 {
+  { "qmask-popup", NULL, N_("QMask Menu") },
+
   { "qmask-configure", NULL,
     N_("_Configure Color and Opacity..."), NULL, NULL,
     G_CALLBACK (qmask_configure_cmd_callback),

app/actions/templates-actions.c

@@ -39,6 +39,8 @@
 
 static GimpActionEntry templates_actions[] =
 {
+  { "templates-popup", NULL, N_("Templates Menu") },
+
   { "templates-create-image", GIMP_STOCK_IMAGE,
     N_("_Create Image from Template..."), "", NULL,
     G_CALLBACK (templates_create_image_cmd_callback),

app/actions/tool-options-actions.c

@@ -53,23 +53,17 @@ static void tool_options_actions_update_presets (GimpActionGroup *group,
 
 static GimpActionEntry tool_options_actions[] =
 {
-  { "tool-options-save-menu", NULL,
+  { "tool-options-popup",        NULL, N_("Tool Options Menu")     },
-    N_("_Save Options to") },
+  { "tool-options-save-menu",    NULL, N_("_Save Options to")      },
+  { "tool-options-restore-menu", NULL, N_("_Restore Options from") },
+  { "tool-options-rename-menu",  NULL, N_("Re_name Saved Options") },
+  { "tool-options-delete-menu",  NULL, N_("_Delete Saved Options") },
 
   { "tool-options-save-new", GTK_STOCK_NEW,
     N_("_New Entry..."), "", NULL,
     G_CALLBACK (tool_options_save_new_cmd_callback),
     GIMP_HELP_TOOL_OPTIONS_SAVE },
 
-  { "tool-options-restore-menu", NULL,
-    N_("_Restore Options from") },
-
-  { "tool-options-rename-menu", NULL,
-    N_("Re_name Saved Options") },
-
-  { "tool-options-delete-menu", NULL,
-    N_("_Delete Saved Options") },
-
   { "tool-options-reset", GIMP_STOCK_RESET,
     N_("R_eset Tool Options"), "", NULL,
     G_CALLBACK (tool_options_reset_cmd_callback),

app/actions/vectors-actions.c

@@ -40,6 +40,8 @@
 
 static GimpActionEntry vectors_actions[] =
 {
+  { "vectors-popup", NULL, N_("Paths Menu") },
+
   { "vectors-path-tool", GIMP_STOCK_TOOL_PATH,
     N_("Path _Tool"), NULL, NULL,
     G_CALLBACK (vectors_vectors_tool_cmd_callback),

app/actions/view-actions.c

@@ -225,7 +225,7 @@ static GimpRadioActionEntry view_zoom_actions[] =
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-other", NULL,
-    "/View/Zoom/O_ther...", NULL, NULL,
+    "O_ther...", NULL, NULL,
     0,
     GIMP_HELP_VIEW_ZOOM_OTHER }
 };
@@ -386,7 +386,7 @@ view_actions_set_zoom (GimpActionGroup  *group,
 
   if (!action)
     {
-      action = "/View/Zoom/Other...";
+      action = "view-zoom-other";
 
       label = g_strdup_printf (_("Other (%s) ..."), buf);
       gimp_action_group_set_action_label (group, action, label);

menus/buffers-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="buffers-popup">
     <menuitem action="buffers-paste" />
     <menuitem action="buffers-paste-into" />
     <menuitem action="buffers-paste-as-new" />

menus/channels-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="channels-popup">
     <menuitem action="channels-edit-attributes" />
     <separator />
     <menuitem action="channels-new" />

menus/dockable-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="dockable-popup">
     <menuitem action="dockable-menu" />
     <menu action="dockable-add-tab-menu">
       <menuitem action="dialogs-tool-options" />

menus/documents-menu.xml

@@ -2,10 +2,10 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="documents-popup">
     <menuitem action="documents-open" />
     <menuitem action="documents-raise-or-open" />
-    <menuitem action="documents-file-new-dialog" />
+    <menuitem action="documents-file-open-dialog" />
     <menuitem action="documents-remove" />
     <separator />
     <menuitem action="documents-recreate-preview" />

menus/error-console-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="error-console-popup">
     <menuitem action="error-console-clear" />
     <separator />
     <menuitem action="error-console-save-all" />

menus/fonts-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="fonts-popup">
     <menuitem action="fonts-refresh" />
   </popup>
 </ui>

menus/gradient-editor-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="gradient-editor-menu">
     <menuitem action="gradient-editor-left-color" />
     <menu action="gradient-editor-load-left-color">
       <menuitem action="gradient-editor-load-left-left-neighbor" />

menus/gradients-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="gradients-menu">
     <menuitem action="gradients-edit" />
     <separator />
     <menuitem action="gradients-new" />

menus/gtkuimanager.dtd

@@ -10,10 +10,14 @@
 <!ELEMENT toolitem     EMPTY >
 <!ELEMENT separator    EMPTY >
 <!ELEMENT accelerator  EMPTY >
-<!ATTLIST menubar      name         CDATA #IMPLIED >
+<!ATTLIST menubar      name         CDATA #IMPLIED
-<!ATTLIST toolbar      name         CDATA #IMPLIED >
+                       action       CDATA #IMPLIED >
-<!ATTLIST popup        name         CDATA #IMPLIED >
+<!ATTLIST toolbar      name         CDATA #IMPLIED
-<!ATTLIST placeholder  name         CDATA #IMPLIED >
+                       action       CDATA #IMPLIED >
+<!ATTLIST popup        name         CDATA #IMPLIED
+                       action       CDATA #IMPLIED >
+<!ATTLIST placeholder  name         CDATA #IMPLIED
+                       action       CDATA #IMPLIED >
 <!ATTLIST menu         name         CDATA #IMPLIED
                        action       CDATA #REQUIRED
                        position (top|bot) #IMPLIED >

menus/images-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="images-popup">
     <menuitem action="images-raise-views" />
     <menuitem action="images-new-view" />
     <menuitem action="images-delete" />

menus/layers-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="layers-popup">
     <menuitem action="layers-text-tool" />
     <menuitem action="layers-edit-attributes" />
     <separator />

menus/palette-editor-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="palette-editor-popup">
     <menuitem action="palette-editor-edit-color" />
     <menuitem action="palette-editor-new-color-fg" />
     <menuitem action="palette-editor-new-color-bg" />

menus/palettes-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="palettes-popup">
     <menuitem action="palettes-edit" />
     <separator />
     <menuitem action="palettes-new" />

menus/patterns-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="patterns-menu">
 
     <!-- disabled because they are useless now
     <menuitem action="patterns-edit" />

menus/qmask-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="qmask-popup">
     <menuitem action="qmask-toggle" />
     <separator />
     <menuitem action="qmask-invert-on" />

menus/templates-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="templates-popup">
     <menuitem action="templates-create-image" />
     <separator />
     <menuitem action="templates-new" />

menus/tool-options-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="tool-options-popup">
     <menu action="tool-options-save-menu">
       <menuitem action="tool-options-save-new" />
       <separator />

menus/toolbox-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <menubar>
+  <menubar action="toolbox-menubar">
 
     <menu action="file-menu">
       <menuitem action="file-new" />

menus/vectors-menu.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE ui SYSTEM "gtkuimanager.dtd">
 
 <ui>
-  <popup>
+  <popup action="vectors-popup">
     <menuitem action="vectors-path-tool" />
     <menuitem action="vectors-edit-attributes" />
     <separator />
@@ -17,7 +17,7 @@
     <menuitem action="vectors-selection-add" />
     <menuitem action="vectors-selection-subtract" />
     <menuitem action="vectors-selection-intersect" />
-    <menuitem action="vectors-selection-to-path" />
+    <menuitem action="vectors-selection-to-vectors" />
     <menuitem action="vectors-stroke" />
     <separator />
     <menuitem action="vectors-copy" />