diff options
| -rw-r--r-- | calendar/ChangeLog | 4 | ||||
| -rw-r--r-- | calendar/gui/main.c | 25 | ||||
| -rw-r--r-- | calendar/main.c | 25 |
3 files changed, 16 insertions, 38 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 8991e3ab29..4b8e47de0d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,9 @@ 1999-01-08 Nat Friedman <nat@nat.org> + * main.c: Converted some more stuff to use the standards. + +1999-01-08 Nat Friedman <nat@nat.org> + * main.c (setup_appbar): New function to create the status bar. (setup_menu): Install menu hints. diff --git a/calendar/gui/main.c b/calendar/gui/main.c index db92a49d40..c21aafef18 100644 --- a/calendar/gui/main.c +++ b/calendar/gui/main.c @@ -402,28 +402,15 @@ static GnomeUIInfo gnome_cal_file_menu [] = { N_("Create a new calendar"), new_calendar_cmd, NULL), - { GNOME_APP_UI_ITEM, N_("_Open calendar..."), - N_("Open a saved calendar"), open_calendar_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, - GNOME_KEY_NAME_OPEN, GNOME_KEY_MOD_OPEN, NULL }, - - { GNOME_APP_UI_ITEM, N_("_Save calendar"), - N_("Save the current calendar"), save_calendar_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, - GNOME_KEY_NAME_SAVE, GNOME_KEY_MOD_SAVE, NULL }, - - { GNOME_APP_UI_ITEM, N_("Save calendar _as..."), - N_("Save the current calendar with a different name"), - save_as_calendar_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE_AS, - GNOME_KEY_NAME_SAVE_AS, GNOME_KEY_MOD_SAVE_AS, NULL }, + GNOMEUIINFO_MENU_OPEN_ITEM(open_calendar_cmd, NULL), + + GNOMEUIINFO_MENU_SAVE_ITEM(save_calendar_cmd, NULL), + + GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_calendar_cmd, NULL), GNOMEUIINFO_SEPARATOR, - { GNOME_APP_UI_ITEM, N_("_Close calendar..."), - N_("Close the current calendar"), close_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE, - GNOME_KEY_NAME_CLOSE, GNOME_KEY_MOD_CLOSE, NULL }, + GNOMEUIINFO_MENU_CLOSE_ITEM(close_cmd, NULL), GNOMEUIINFO_MENU_EXIT_ITEM(quit_cmd, NULL), diff --git a/calendar/main.c b/calendar/main.c index db92a49d40..c21aafef18 100644 --- a/calendar/main.c +++ b/calendar/main.c @@ -402,28 +402,15 @@ static GnomeUIInfo gnome_cal_file_menu [] = { N_("Create a new calendar"), new_calendar_cmd, NULL), - { GNOME_APP_UI_ITEM, N_("_Open calendar..."), - N_("Open a saved calendar"), open_calendar_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, - GNOME_KEY_NAME_OPEN, GNOME_KEY_MOD_OPEN, NULL }, - - { GNOME_APP_UI_ITEM, N_("_Save calendar"), - N_("Save the current calendar"), save_calendar_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, - GNOME_KEY_NAME_SAVE, GNOME_KEY_MOD_SAVE, NULL }, - - { GNOME_APP_UI_ITEM, N_("Save calendar _as..."), - N_("Save the current calendar with a different name"), - save_as_calendar_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE_AS, - GNOME_KEY_NAME_SAVE_AS, GNOME_KEY_MOD_SAVE_AS, NULL }, + GNOMEUIINFO_MENU_OPEN_ITEM(open_calendar_cmd, NULL), + + GNOMEUIINFO_MENU_SAVE_ITEM(save_calendar_cmd, NULL), + + GNOMEUIINFO_MENU_SAVE_AS_ITEM(save_as_calendar_cmd, NULL), GNOMEUIINFO_SEPARATOR, - { GNOME_APP_UI_ITEM, N_("_Close calendar..."), - N_("Close the current calendar"), close_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE, - GNOME_KEY_NAME_CLOSE, GNOME_KEY_MOD_CLOSE, NULL }, + GNOMEUIINFO_MENU_CLOSE_ITEM(close_cmd, NULL), GNOMEUIINFO_MENU_EXIT_ITEM(quit_cmd, NULL), |