aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/gncal-day-panel.c1
-rw-r--r--calendar/gncal-week-view.c2
-rw-r--r--calendar/gncal-week-view.h1
-rw-r--r--calendar/gui/gncal-day-panel.c1
-rw-r--r--calendar/gui/gncal-week-view.c2
-rw-r--r--calendar/gui/gncal-week-view.h1
-rw-r--r--calendar/gui/main.c48
-rw-r--r--calendar/gui/year-view.c1
-rw-r--r--calendar/main.c48
-rw-r--r--calendar/year-view.c1
11 files changed, 72 insertions, 38 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e056536bdf..8440184509 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+1998-09-21 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ * main.c: Added underlined shortcuts and accelerators to the main menu.
+
1998-09-16 Raja R Harinath <harinath@cs.umn.edu>
* gncal-week-view.c (<gtk/gtklabel.h>): Include.
diff --git a/calendar/gncal-day-panel.c b/calendar/gncal-day-panel.c
index 00d4f6f31e..11a2d21a7d 100644
--- a/calendar/gncal-day-panel.c
+++ b/calendar/gncal-day-panel.c
@@ -5,6 +5,7 @@
* Author: Federico Mena <quartic@gimp.org>
*/
+#include <gtk/gtkhseparator.h>
#include "gncal-day-panel.h"
#include "main.h"
#include "timeutil.h"
diff --git a/calendar/gncal-week-view.c b/calendar/gncal-week-view.c
index a2133a092a..6a23d58525 100644
--- a/calendar/gncal-week-view.c
+++ b/calendar/gncal-week-view.c
@@ -8,7 +8,7 @@
#include <config.h>
#include <string.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include "gncal-week-view.h"
#include "timeutil.h"
diff --git a/calendar/gncal-week-view.h b/calendar/gncal-week-view.h
index 464f317552..ab23238a37 100644
--- a/calendar/gncal-week-view.h
+++ b/calendar/gncal-week-view.h
@@ -9,6 +9,7 @@
#define WEEK_VIEW_H
+#include <gtk/gtkvbox.h>
#include <gtk/gtktable.h>
#include <gtk/gtkvbox.h>
#include <libgnome/gnome-defs.h>
diff --git a/calendar/gui/gncal-day-panel.c b/calendar/gui/gncal-day-panel.c
index 00d4f6f31e..11a2d21a7d 100644
--- a/calendar/gui/gncal-day-panel.c
+++ b/calendar/gui/gncal-day-panel.c
@@ -5,6 +5,7 @@
* Author: Federico Mena <quartic@gimp.org>
*/
+#include <gtk/gtkhseparator.h>
#include "gncal-day-panel.h"
#include "main.h"
#include "timeutil.h"
diff --git a/calendar/gui/gncal-week-view.c b/calendar/gui/gncal-week-view.c
index a2133a092a..6a23d58525 100644
--- a/calendar/gui/gncal-week-view.c
+++ b/calendar/gui/gncal-week-view.c
@@ -8,7 +8,7 @@
#include <config.h>
#include <string.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
#include "gncal-week-view.h"
#include "timeutil.h"
diff --git a/calendar/gui/gncal-week-view.h b/calendar/gui/gncal-week-view.h
index 464f317552..ab23238a37 100644
--- a/calendar/gui/gncal-week-view.h
+++ b/calendar/gui/gncal-week-view.h
@@ -9,6 +9,7 @@
#define WEEK_VIEW_H
+#include <gtk/gtkvbox.h>
#include <gtk/gtktable.h>
#include <gtk/gtkvbox.h>
#include <libgnome/gnome-defs.h>
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 462e71a06a..e47eb3e98c 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -1,5 +1,5 @@
/*
- * GnomeCalendar widget
+ * Main file for the GNOME Calendar program
* Copyright (C) 1998 the Free Software Foundation
*
* Authors:
@@ -392,40 +392,52 @@ save_calendar_cmd (GtkWidget *widget, void *data)
}
static GnomeUIInfo gnome_cal_file_menu [] = {
- GNOMEUIINFO_ITEM_STOCK (N_("New calendar"), NULL, new_calendar_cmd, GNOME_STOCK_MENU_NEW),
- GNOMEUIINFO_ITEM_STOCK (N_("Open calendar..."), NULL, open_calendar_cmd, GNOME_STOCK_MENU_OPEN),
- GNOMEUIINFO_ITEM_STOCK (N_("Save calendar"), NULL, save_calendar_cmd, GNOME_STOCK_MENU_SAVE),
- GNOMEUIINFO_ITEM_STOCK (N_("Save calendar as..."), NULL, save_as_calendar_cmd, GNOME_STOCK_MENU_SAVE),
+ { GNOME_APP_UI_ITEM, N_("_New calendar"), NULL, new_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 'n', GDK_CONTROL_MASK, NULL },
+ { GNOME_APP_UI_ITEM, N_("_Open calendar..."), NULL, open_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, 'o', GDK_CONTROL_MASK, NULL },
+ { GNOME_APP_UI_ITEM, N_("_Save calendar"), NULL, save_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, 's', GDK_CONTROL_MASK, NULL },
+ { GNOME_APP_UI_ITEM, N_("Save calendar _as..."), NULL, save_as_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, 0, 0, NULL },
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK (N_("Preferences..."), NULL, properties, GNOME_STOCK_MENU_PREF),
+ { GNOME_APP_UI_ITEM, N_("P_references..."), NULL, properties, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PREF, 0, 0, NULL },
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK (N_("Close this calendar"), NULL, close_cmd, GNOME_STOCK_MENU_EXIT),
- GNOMEUIINFO_ITEM_STOCK (N_("Exit"), NULL, quit_cmd, GNOME_STOCK_MENU_EXIT),
+ { GNOME_APP_UI_ITEM, N_("_Close this calendar"), NULL, close_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_EXIT, 'w', GDK_CONTROL_MASK, NULL },
+ { GNOME_APP_UI_ITEM, N_("E_xit"), NULL, quit_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_EXIT, 'x', GDK_CONTROL_MASK, NULL },
GNOMEUIINFO_END
};
-static GnomeUIInfo gnome_cal_help_menu [] = {
- GNOMEUIINFO_ITEM_STOCK (N_("About Gnomecal..."), NULL, about_calendar_cmd, GNOME_STOCK_MENU_ABOUT),
- GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_HELP ("cal"),
+static GnomeUIInfo gnome_cal_edit_menu [] = {
+ { GNOME_APP_UI_ITEM, N_("_New appointment..."), NULL, display_objedit, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 0, 0, NULL },
+ { GNOME_APP_UI_ITEM, N_("New appointment for _today..."), NULL, display_objedit_today, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 0, 0, NULL },
GNOMEUIINFO_END
};
-static GnomeUIInfo gnome_cal_edit_menu [] = {
- GNOMEUIINFO_ITEM_STOCK (N_("New appointment..."), NULL, display_objedit, GNOME_STOCK_MENU_NEW),
- GNOMEUIINFO_ITEM_STOCK (N_("New appointment for today..."), NULL, display_objedit_today, GNOME_STOCK_MENU_NEW),
+static GnomeUIInfo gnome_cal_help_menu [] = {
+ { GNOME_APP_UI_ITEM, N_("_About Gnomecal..."), NULL, about_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT, 0, 0, NULL },
+
+ GNOMEUIINFO_SEPARATOR,
+
+ GNOMEUIINFO_HELP ("cal"),
GNOMEUIINFO_END
};
static GnomeUIInfo gnome_cal_menu [] = {
- GNOMEUIINFO_SUBTREE (N_("File"), &gnome_cal_file_menu),
- GNOMEUIINFO_SUBTREE (N_("Edit"), &gnome_cal_edit_menu),
- GNOMEUIINFO_SUBTREE (N_("Help"), &gnome_cal_help_menu),
+ GNOMEUIINFO_SUBTREE (N_("_File"), &gnome_cal_file_menu),
+ GNOMEUIINFO_SUBTREE (N_("_Edit"), &gnome_cal_edit_menu),
+ GNOMEUIINFO_SUBTREE (N_("_Help"), &gnome_cal_help_menu),
GNOMEUIINFO_END
};
diff --git a/calendar/gui/year-view.c b/calendar/gui/year-view.c
index 97795628a4..4bf330c1fd 100644
--- a/calendar/gui/year-view.c
+++ b/calendar/gui/year-view.c
@@ -7,6 +7,7 @@
*/
#include <config.h>
+#include <gtk/gtkmain.h>
#include <libgnomeui/gnome-canvas-text.h>
#include "year-view.h"
#include "main.h"
diff --git a/calendar/main.c b/calendar/main.c
index 462e71a06a..e47eb3e98c 100644
--- a/calendar/main.c
+++ b/calendar/main.c
@@ -1,5 +1,5 @@
/*
- * GnomeCalendar widget
+ * Main file for the GNOME Calendar program
* Copyright (C) 1998 the Free Software Foundation
*
* Authors:
@@ -392,40 +392,52 @@ save_calendar_cmd (GtkWidget *widget, void *data)
}
static GnomeUIInfo gnome_cal_file_menu [] = {
- GNOMEUIINFO_ITEM_STOCK (N_("New calendar"), NULL, new_calendar_cmd, GNOME_STOCK_MENU_NEW),
- GNOMEUIINFO_ITEM_STOCK (N_("Open calendar..."), NULL, open_calendar_cmd, GNOME_STOCK_MENU_OPEN),
- GNOMEUIINFO_ITEM_STOCK (N_("Save calendar"), NULL, save_calendar_cmd, GNOME_STOCK_MENU_SAVE),
- GNOMEUIINFO_ITEM_STOCK (N_("Save calendar as..."), NULL, save_as_calendar_cmd, GNOME_STOCK_MENU_SAVE),
+ { GNOME_APP_UI_ITEM, N_("_New calendar"), NULL, new_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 'n', GDK_CONTROL_MASK, NULL },
+ { GNOME_APP_UI_ITEM, N_("_Open calendar..."), NULL, open_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, 'o', GDK_CONTROL_MASK, NULL },
+ { GNOME_APP_UI_ITEM, N_("_Save calendar"), NULL, save_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, 's', GDK_CONTROL_MASK, NULL },
+ { GNOME_APP_UI_ITEM, N_("Save calendar _as..."), NULL, save_as_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, 0, 0, NULL },
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK (N_("Preferences..."), NULL, properties, GNOME_STOCK_MENU_PREF),
+ { GNOME_APP_UI_ITEM, N_("P_references..."), NULL, properties, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PREF, 0, 0, NULL },
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK (N_("Close this calendar"), NULL, close_cmd, GNOME_STOCK_MENU_EXIT),
- GNOMEUIINFO_ITEM_STOCK (N_("Exit"), NULL, quit_cmd, GNOME_STOCK_MENU_EXIT),
+ { GNOME_APP_UI_ITEM, N_("_Close this calendar"), NULL, close_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_EXIT, 'w', GDK_CONTROL_MASK, NULL },
+ { GNOME_APP_UI_ITEM, N_("E_xit"), NULL, quit_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_EXIT, 'x', GDK_CONTROL_MASK, NULL },
GNOMEUIINFO_END
};
-static GnomeUIInfo gnome_cal_help_menu [] = {
- GNOMEUIINFO_ITEM_STOCK (N_("About Gnomecal..."), NULL, about_calendar_cmd, GNOME_STOCK_MENU_ABOUT),
- GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_HELP ("cal"),
+static GnomeUIInfo gnome_cal_edit_menu [] = {
+ { GNOME_APP_UI_ITEM, N_("_New appointment..."), NULL, display_objedit, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 0, 0, NULL },
+ { GNOME_APP_UI_ITEM, N_("New appointment for _today..."), NULL, display_objedit_today, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 0, 0, NULL },
GNOMEUIINFO_END
};
-static GnomeUIInfo gnome_cal_edit_menu [] = {
- GNOMEUIINFO_ITEM_STOCK (N_("New appointment..."), NULL, display_objedit, GNOME_STOCK_MENU_NEW),
- GNOMEUIINFO_ITEM_STOCK (N_("New appointment for today..."), NULL, display_objedit_today, GNOME_STOCK_MENU_NEW),
+static GnomeUIInfo gnome_cal_help_menu [] = {
+ { GNOME_APP_UI_ITEM, N_("_About Gnomecal..."), NULL, about_calendar_cmd, NULL, NULL,
+ GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT, 0, 0, NULL },
+
+ GNOMEUIINFO_SEPARATOR,
+
+ GNOMEUIINFO_HELP ("cal"),
GNOMEUIINFO_END
};
static GnomeUIInfo gnome_cal_menu [] = {
- GNOMEUIINFO_SUBTREE (N_("File"), &gnome_cal_file_menu),
- GNOMEUIINFO_SUBTREE (N_("Edit"), &gnome_cal_edit_menu),
- GNOMEUIINFO_SUBTREE (N_("Help"), &gnome_cal_help_menu),
+ GNOMEUIINFO_SUBTREE (N_("_File"), &gnome_cal_file_menu),
+ GNOMEUIINFO_SUBTREE (N_("_Edit"), &gnome_cal_edit_menu),
+ GNOMEUIINFO_SUBTREE (N_("_Help"), &gnome_cal_help_menu),
GNOMEUIINFO_END
};
diff --git a/calendar/year-view.c b/calendar/year-view.c
index 97795628a4..4bf330c1fd 100644
--- a/calendar/year-view.c
+++ b/calendar/year-view.c
@@ -7,6 +7,7 @@
*/
#include <config.h>
+#include <gtk/gtkmain.h>
#include <libgnomeui/gnome-canvas-text.h>
#include "year-view.h"
#include "main.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 23:11:14 +0800