mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean menu -- made to use GNOME standart menu items, so that e.g. GNOME 

wide items will be transleted in gnome-libs.

mc/gtkedit/editmenu.c removed from POTFILES.in because it is not used,
but was poluting *.po files with extra translations which, in turn, were
interfering with translations in gnome-libs.
This commit is contained in:
Sergey Panov 1999-02-08 14:47:54 +00:00
parent 9238cba4f9
commit a8fb0e3e22
3 changed files with 51 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
gnome/glayout.c
View File

@ -281,10 +281,10 @@ void configure_box (void);
GtkCheckMenuItem *gnome_toggle_snap (void); GtkCheckMenuItem *gnome_toggle_snap (void);
GnomeUIInfo gnome_panel_new_menu [] = { GnomeUIInfo gnome_panel_new_menu [] = {
{ GNOME_APP_UI_ITEM, N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal}, GNOMEUIINFO_ITEM_NONE(N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal),
/* If this ever changes, make sure you update create_new_menu accordingly. */ /* If this ever changes, make sure you update create_new_menu accordingly. */
{ GNOME_APP_UI_ITEM, N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd }, GNOMEUIINFO_ITEM_NONE( N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd ),
{ GNOME_APP_UI_ENDOFINFO, 0, 0 } GNOMEUIINFO_END
}; };
@ -299,46 +299,44 @@ GnomeUIInfo gnome_panel_file_menu [] = {
/* Gnumeric Spreadsheet */ /* Gnumeric Spreadsheet */
/* Text Document */ /* Text Document */
/* etc... */ /* etc... */
{ GNOME_APP_UI_SUBTREE, N_("_New"), NULL, gnome_panel_new_menu}, GNOMEUIINFO_MENU_NEW_SUBTREE(gnome_panel_new_menu),
{ GNOME_APP_UI_SEPARATOR }, GNOMEUIINFO_SEPARATOR,
{ GNOME_APP_UI_ITEM, N_("_Open"), N_("Opens the selected files"), gnome_open_files }, GNOMEUIINFO_MENU_OPEN_ITEM( gnome_open_files, GNOME_STOCK_PIXMAP_OPEN),
/* { GNOME_APP_UI_ITEM, N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },*/ /* GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },*/
{ GNOME_APP_UI_ITEM, N_("_Copy..."), N_("Copy files"), copy_cmd, NULL}, GNOMEUIINFO_ITEM_STOCK(N_("_Copy..."), N_("Copy files"), copy_cmd, GNOME_STOCK_PIXMAP_COPY),
{ GNOME_APP_UI_ITEM, N_("_Delete..."), N_("Delete files from disk"), delete_cmd, NULL, NULL, 0, NULL, 'd', GDK_CONTROL_MASK}, GNOMEUIINFO_ITEM_STOCK(N_("_Delete..."), N_("Delete files"), delete_cmd, GNOME_STOCK_PIXMAP_REMOVE),
{ GNOME_APP_UI_ITEM, N_("_Move..."), N_("Rename or move files"), ren_cmd }, GNOMEUIINFO_ITEM_NONE(N_("_Move..."), N_("Rename or move files"), ren_cmd),
{ GNOME_APP_UI_SEPARATOR }, GNOMEUIINFO_SEPARATOR,
{ GNOME_APP_UI_ITEM, N_("C_lose"), N_("Close this panel"), gnome_close_panel, NULL, GNOMEUIINFO_MENU_CLOSE_ITEM( gnome_close_panel, NULL),
NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE, GNOMEUIINFO_END
GNOME_KEY_NAME_CLOSE, GNOME_KEY_MOD_CLOSE, NULL },
{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
}; };
GnomeUIInfo gnome_panel_edit_menu [] = { GnomeUIInfo gnome_panel_edit_menu [] = {
{ GNOME_APP_UI_ITEM, N_("Select _All"), N_("Select all files in the current Panel"), gnome_select_all_cmd, NULL, NULL, 0, NULL, 'a', GDK_CONTROL_MASK }, { GNOME_APP_UI_ITEM, N_("Select _All"), N_("Select all files in the current Panel"), gnome_select_all_cmd,
{ GNOME_APP_UI_ITEM, N_("_Select Files..."), N_("Select a group of files"), select_cmd }, NULL, NULL, 0, NULL, 'a', GDK_CONTROL_MASK },
{ GNOME_APP_UI_ITEM, N_("_Invert Selection"), N_("Reverses the list of tagged files"), reverse_selection_cmd }, GNOMEUIINFO_ITEM_NONE( N_("_Select Files..."), N_("Select a group of files"), select_cmd ),
{ GNOME_APP_UI_SEPARATOR }, GNOMEUIINFO_ITEM_NONE( N_("_Invert Selection"), N_("Reverses the list of tagged files"), reverse_selection_cmd ),
{ GNOME_APP_UI_ITEM, N_("_Rescan Directory"), N_("Rescan the directory contents"), reread_cmd }, GNOMEUIINFO_SEPARATOR,
{ GNOME_APP_UI_SEPARATOR }, GNOMEUIINFO_ITEM_NONE( N_("_Rescan Directory"), N_("Rescan the directory contents"), reread_cmd ),
GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_MENU_PREFERENCES_ITEM(gnome_configure_box, NULL), GNOMEUIINFO_MENU_PREFERENCES_ITEM(gnome_configure_box, NULL),
{ GNOME_APP_UI_ENDOFINFO, 0, 0 } GNOMEUIINFO_END
}; };
GnomeUIInfo gnome_panel_view_menu [] = { GnomeUIInfo gnome_panel_view_menu [] = {
{ GNOME_APP_UI_ITEM, N_("Icon View"), NULL, gnome_icon_view_cmd, NULL}, GNOMEUIINFO_RADIOITEM(N_("Icon View"), NULL, gnome_icon_view_cmd,NULL),
{ GNOME_APP_UI_ITEM, N_("Partial View"), NULL, gnome_partial_view_cmd, NULL}, GNOMEUIINFO_RADIOITEM(N_("Partial View"), NULL, gnome_partial_view_cmd,NULL),
{ GNOME_APP_UI_ITEM, N_("Full View"), NULL, gnome_full_view_cmd, NULL}, GNOMEUIINFO_RADIOITEM(N_("Full View"), NULL, gnome_full_view_cmd,NULL),
{ GNOME_APP_UI_ITEM, N_("Custom View"), NULL, gnome_custom_view_cmd, NULL}, GNOMEUIINFO_RADIOITEM(N_("Custom View"), NULL, gnome_custom_view_cmd,NULL),
{GNOME_APP_UI_ENDOFINFO, NULL, NULL, NULL, NULL, NULL, GNOMEUIINFO_END
GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL}
}; };
GnomeUIInfo gnome_panel_layout_menu [] = { GnomeUIInfo gnome_panel_layout_menu [] = {
{ GNOME_APP_UI_ITEM, N_("_Sort By..."), N_("Confirmation settings"), gnome_sort_cmd }, GNOMEUIINFO_ITEM_NONE( N_("_Sort By..."), N_("Confirmation settings"), gnome_sort_cmd ),
{ GNOME_APP_UI_ITEM, N_("_Filter View..."), N_("Global option settings"), gnome_filter_cmd }, GNOMEUIINFO_ITEM_NONE( N_("_Filter View..."), N_("Global option settings"), gnome_filter_cmd ),
{ GNOME_APP_UI_SEPARATOR }, GNOMEUIINFO_SEPARATOR,
{ GNOME_APP_UI_RADIOITEMS, NULL , NULL, gnome_panel_view_menu}, GNOMEUIINFO_RADIOLIST( gnome_panel_view_menu),
{ GNOME_APP_UI_ENDOFINFO, 0, 0 } GNOMEUIINFO_END
}; };
GnomeUIInfo gnome_panel_commands_menu [] = { GnomeUIInfo gnome_panel_commands_menu [] = {
@ -351,33 +349,32 @@ GnomeUIInfo gnome_panel_commands_menu [] = {
{ GNOME_APP_UI_ITEM, N_("_Run Command in panel..."),N_("Run a command and put the results in a panel"), gnome_external_panelize }, { GNOME_APP_UI_ITEM, N_("_Run Command in panel..."),N_("Run a command and put the results in a panel"), gnome_external_panelize },
#ifdef USE_VFS #ifdef USE_VFS
{ GNOME_APP_UI_ITEM, N_("_Active VFS list..."),N_("List of active virtual file systems"), reselect_vfs }, GNOMEUIINFO_ITEM_NONE(N_("_Active VFS list..."),N_("List of active virtual file systems"), reselect_vfs),
#endif #endif
#ifdef USE_EXT2FSLIB #ifdef USE_EXT2FSLIB
/*does this do anything?*/ /*does this do anything?*/
/* { GNOME_APP_UI_ITEM, N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd },*/ /* { GNOME_APP_UI_ITEM, N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd },*/
#endif #endif
#ifdef WITH_BACKGROUND #ifdef WITH_BACKGROUND
{ GNOME_APP_UI_ITEM, N_("_Background jobs..."), N_("List of background operations"), jobs_cmd }, GNOMEUIINFO_ITEM_NONE( N_("_Background jobs..."), N_("List of background operations"), jobs_cmd ),
#endif #endif
{ GNOME_APP_UI_ENDOFINFO, 0, 0 } GNOMEUIINFO_END
}; };
GnomeUIInfo gnome_panel_about_menu [] = { GnomeUIInfo gnome_panel_about_menu [] = {
/* GNOMEUIINFO_HELP ("midnight-commander"), */ /* GNOMEUIINFO_HELP ("midnight-commander"), */
{ GNOME_APP_UI_ITEM, N_("_About"), N_("Information on this program"), gnome_about_cmd, NULL, NULL, GNOMEUIINFO_MENU_ABOUT_ITEM( gnome_about_cmd,NULL),
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT },
GNOMEUIINFO_END GNOMEUIINFO_END
}; };
GnomeUIInfo gnome_panel_menu [] = { GnomeUIInfo gnome_panel_menu [] = {
{ GNOME_APP_UI_SUBTREE, N_("_File"), NULL, &gnome_panel_file_menu }, GNOMEUIINFO_MENU_FILE_TREE(gnome_panel_file_menu),
{ GNOME_APP_UI_SUBTREE, N_("_Edit"), NULL, &gnome_panel_edit_menu }, GNOMEUIINFO_MENU_EDIT_TREE(gnome_panel_edit_menu),
{ GNOME_APP_UI_SUBTREE, N_("_Layout"), NULL, &gnome_panel_layout_menu }, GNOMEUIINFO_SUBTREE(N_("_Layout"),gnome_panel_layout_menu),
{ GNOME_APP_UI_SUBTREE, N_("_Commands"), NULL, &gnome_panel_commands_menu }, GNOMEUIINFO_SUBTREE(N_("_Commands"),gnome_panel_commands_menu),
{ GNOME_APP_UI_SUBTREE, N_("_Help"), NULL, &gnome_panel_about_menu }, GNOMEUIINFO_MENU_HELP_TREE(gnome_panel_about_menu),
{ GNOME_APP_UI_ENDOFINFO, 0, 0 } GNOMEUIINFO_END
}; };
GtkCheckMenuItem * GtkCheckMenuItem *

20
gnome/gview.c
View File

@ -291,7 +291,7 @@ GnomeUIInfo gview_file_menu [] = {
&gnome_goto_line, GNOME_STOCK_PIXMAP_JUMP_TO), &gnome_goto_line, GNOME_STOCK_PIXMAP_JUMP_TO),
GNOMEUIINFO_ITEM (N_("_Monitor file"), N_("Monitor file growing"), &gnome_monitor, NULL), GNOMEUIINFO_ITEM (N_("_Monitor file"), N_("Monitor file growing"), &gnome_monitor, NULL),
GNOMEUIINFO_MENU_CLOSE_ITEM(gview_quit, NULL), GNOMEUIINFO_MENU_CLOSE_ITEM(gview_quit, NULL),
{ GNOME_APP_UI_ENDOFINFO, 0, 0 } GNOMEUIINFO_END
}; };
GnomeUIInfo gview_search_menu [] = { GnomeUIInfo gview_search_menu [] = {
@ -301,29 +301,29 @@ GnomeUIInfo gview_search_menu [] = {
gnome_regexp_search_cmd, GNOME_STOCK_MENU_SEARCH), gnome_regexp_search_cmd, GNOME_STOCK_MENU_SEARCH),
GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_MENU_FIND_AGAIN_ITEM(gnome_continue_search, NULL), GNOMEUIINFO_MENU_FIND_AGAIN_ITEM(gnome_continue_search, NULL),
{ GNOME_APP_UI_ENDOFINFO, 0, 0 } GNOMEUIINFO_END
}; };
GnomeUIInfo gview_mode_menu [] = { GnomeUIInfo gview_mode_menu [] = {
#define WRAP_POS 0 #define WRAP_POS 0
GNOMEUIINFO_TOGGLEITEM (N_("_Wrap"), N_("Wrap the text"), gnome_toggle_wrap, NULL), GNOMEUIINFO_TOGGLEITEM (N_("_Wrap"),
N_("Wrap the text"), gnome_toggle_wrap, NULL),
#if 0 #if 0
/* Can not use this one yet, as it destroys the viewer, need to fix that */ /* Can not use this one yet, as it destroys the viewer, need to fix that */
GNOMEUIINFO_TOGGLEITEM ("_Parsed view", NULL, gnome_toggle_parse, NULL), GNOMEUIINFO_TOGGLEITEM (N_("_Parsed view"), NULL, gnome_toggle_parse, NULL),
#endif #endif
#define FORMAT_POS 1 #define FORMAT_POS 1
GNOMEUIINFO_TOGGLEITEM (N_("_Formatted"), NULL, gnome_toggle_format, NULL), GNOMEUIINFO_TOGGLEITEM (N_("_Formatted"), NULL, gnome_toggle_format, NULL),
#define HEX_POS 2 #define HEX_POS 2
GNOMEUIINFO_TOGGLEITEM (N_("_Hex"), NULL, gnome_toggle_hex, NULL), GNOMEUIINFO_TOGGLEITEM (N_("_Hex"), NULL, gnome_toggle_hex, NULL),
GNOMEUIINFO_END
{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
}; };
GnomeUIInfo gview_top_menu [] = { GnomeUIInfo gview_top_menu [] = {
{ GNOME_APP_UI_SUBTREE, N_("_File"), NULL, &gview_file_menu }, GNOMEUIINFO_MENU_FILE_TREE( &gview_file_menu ),
{ GNOME_APP_UI_SUBTREE, N_("_Search"), NULL, &gview_search_menu }, GNOMEUIINFO_SUBTREE (N_ ("_Search"), &gview_search_menu),
{ GNOME_APP_UI_SUBTREE, N_("_Mode"), NULL, &gview_mode_menu }, GNOMEUIINFO_MENU_SETTINGS_TREE( &gview_mode_menu),
{ GNOME_APP_UI_ENDOFINFO, 0, 0 } GNOMEUIINFO_END
}; };
static int static int

1
po/POTFILES.in
View File

@ -15,7 +15,6 @@ gnome/gwidget.c
gtkedit/edit.c gtkedit/edit.c
gtkedit/edit.h gtkedit/edit.h
gtkedit/editcmd.c gtkedit/editcmd.c
gtkedit/editmenu.c
gtkedit/editoptions.c gtkedit/editoptions.c
gtkedit/editwidget.c gtkedit/editwidget.c
gtkedit/gtkedit.c gtkedit/gtkedit.c