aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog12
-rw-r--r--calendar/gnome-cal.c29
-rw-r--r--calendar/gnome-cal.h33
-rw-r--r--calendar/gui/gnome-cal.c29
-rw-r--r--calendar/gui/gnome-cal.h33
-rw-r--r--calendar/gui/main.c40
-rw-r--r--calendar/main.c40
7 files changed, 172 insertions, 44 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d1e30d83e0..f9d4353e64 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+1998-07-07 Miguel de Icaza <miguel@nuclecu.unam.mx>
+
+ * main.c: Add support for --view flag.
+ (session_save_state): Save the view mode;
+ (new_calendar): Now takes a view mode flag.
+
+ * gnome-cal.c (gnome_calendar_get_current_view_name): New
+ function for enhancing the session management support for
+ gnomecal.
+ (gnome_calendar_set_view): New function that makes a given page
+ active.
+
1998-07-01 Nuno Ferreira <nmrf@rnl.ist.utl.pt>
* gncal.desktop: Added Portuguese translation.
diff --git a/calendar/gnome-cal.c b/calendar/gnome-cal.c
index e96a6add8b..9731bd855c 100644
--- a/calendar/gnome-cal.c
+++ b/calendar/gnome-cal.c
@@ -71,6 +71,21 @@ get_current_page (GnomeCalendar *gcal)
return GTK_NOTEBOOK (gcal->notebook)->cur_page->child;
}
+char *
+gnome_calendar_get_current_view_name (GnomeCalendar *gcal)
+{
+ GtkWidget *page = get_current_page (gcal);
+
+ if (page == gcal->day_view)
+ return "dayview";
+ else if (page == gcal->week_view)
+ return "weekview";
+ else if (page == gcal->year_view)
+ return "yearview";
+ else
+ return "dayview";
+}
+
void
gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
{
@@ -134,6 +149,20 @@ gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time)
gnome_calendar_goto (gcal, time);
}
+void
+gnome_calendar_set_view (GnomeCalendar *gcal, char *page_name)
+{
+ int page = 0;
+
+ if (strcmp (page_name, "dayview") == 0)
+ page = 0;
+ else if (strcmp (page_name, "weekview") == 0)
+ page = 1;
+ else if (strcmp (page_name, "yearview") == 0)
+ page = 2;
+ gtk_notebook_set_page (GTK_NOTEBOOK (gcal->notebook), page);
+}
+
GtkWidget *
gnome_calendar_new (char *title)
{
diff --git a/calendar/gnome-cal.h b/calendar/gnome-cal.h
index 513bf88ad3..52ce26eaf9 100644
--- a/calendar/gnome-cal.h
+++ b/calendar/gnome-cal.h
@@ -36,19 +36,30 @@ typedef struct {
GnomeAppClass parent_class;
} GnomeCalendarClass;
-guint gnome_calendar_get_type (void);
-GtkWidget *gnome_calendar_new (char *title);
-int gnome_calendar_load (GnomeCalendar *gcal, char *file);
-void gnome_calendar_add_object (GnomeCalendar *gcal, iCalObject *obj);
-void gnome_calendar_remove_object (GnomeCalendar *gcal, iCalObject *obj);
-void gnome_calendar_next (GnomeCalendar *gcal);
-void gnome_calendar_previous (GnomeCalendar *gcal);
-void gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time);
-void gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time);
-void gnome_calendar_tag_calendar (GnomeCalendar *cal, GtkCalendar *gtk_cal);
+guint gnome_calendar_get_type (void);
+GtkWidget *gnome_calendar_new (char *title);
+int gnome_calendar_load (GnomeCalendar *gcal,
+ char *file);
+void gnome_calendar_add_object (GnomeCalendar *gcal,
+ iCalObject *obj);
+void gnome_calendar_remove_object (GnomeCalendar *gcal,
+ iCalObject *obj);
+void gnome_calendar_next (GnomeCalendar *gcal);
+void gnome_calendar_previous (GnomeCalendar *gcal);
+void gnome_calendar_goto (GnomeCalendar *gcal,
+ time_t new_time);
+void gnome_calendar_dayjump (GnomeCalendar *gcal,
+ time_t time);
+void gnome_calendar_tag_calendar (GnomeCalendar *cal,
+ GtkCalendar *gtk_cal);
+char *gnome_calendar_get_current_view_name (GnomeCalendar *gcal);
+void gnome_calendar_set_view (GnomeCalendar *gcal,
+ char *page_name);
/* Flags is a bitmask of CalObjectChange values */
-void gnome_calendar_object_changed (GnomeCalendar *gcal, iCalObject *obj, int flags);
+void gnome_calendar_object_changed (GnomeCalendar *gcal,
+ iCalObject *obj,
+ int flags);
END_GNOME_DECLS
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index e96a6add8b..9731bd855c 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -71,6 +71,21 @@ get_current_page (GnomeCalendar *gcal)
return GTK_NOTEBOOK (gcal->notebook)->cur_page->child;
}
+char *
+gnome_calendar_get_current_view_name (GnomeCalendar *gcal)
+{
+ GtkWidget *page = get_current_page (gcal);
+
+ if (page == gcal->day_view)
+ return "dayview";
+ else if (page == gcal->week_view)
+ return "weekview";
+ else if (page == gcal->year_view)
+ return "yearview";
+ else
+ return "dayview";
+}
+
void
gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
{
@@ -134,6 +149,20 @@ gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time)
gnome_calendar_goto (gcal, time);
}
+void
+gnome_calendar_set_view (GnomeCalendar *gcal, char *page_name)
+{
+ int page = 0;
+
+ if (strcmp (page_name, "dayview") == 0)
+ page = 0;
+ else if (strcmp (page_name, "weekview") == 0)
+ page = 1;
+ else if (strcmp (page_name, "yearview") == 0)
+ page = 2;
+ gtk_notebook_set_page (GTK_NOTEBOOK (gcal->notebook), page);
+}
+
GtkWidget *
gnome_calendar_new (char *title)
{
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 513bf88ad3..52ce26eaf9 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -36,19 +36,30 @@ typedef struct {
GnomeAppClass parent_class;
} GnomeCalendarClass;
-guint gnome_calendar_get_type (void);
-GtkWidget *gnome_calendar_new (char *title);
-int gnome_calendar_load (GnomeCalendar *gcal, char *file);
-void gnome_calendar_add_object (GnomeCalendar *gcal, iCalObject *obj);
-void gnome_calendar_remove_object (GnomeCalendar *gcal, iCalObject *obj);
-void gnome_calendar_next (GnomeCalendar *gcal);
-void gnome_calendar_previous (GnomeCalendar *gcal);
-void gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time);
-void gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time);
-void gnome_calendar_tag_calendar (GnomeCalendar *cal, GtkCalendar *gtk_cal);
+guint gnome_calendar_get_type (void);
+GtkWidget *gnome_calendar_new (char *title);
+int gnome_calendar_load (GnomeCalendar *gcal,
+ char *file);
+void gnome_calendar_add_object (GnomeCalendar *gcal,
+ iCalObject *obj);
+void gnome_calendar_remove_object (GnomeCalendar *gcal,
+ iCalObject *obj);
+void gnome_calendar_next (GnomeCalendar *gcal);
+void gnome_calendar_previous (GnomeCalendar *gcal);
+void gnome_calendar_goto (GnomeCalendar *gcal,
+ time_t new_time);
+void gnome_calendar_dayjump (GnomeCalendar *gcal,
+ time_t time);
+void gnome_calendar_tag_calendar (GnomeCalendar *cal,
+ GtkCalendar *gtk_cal);
+char *gnome_calendar_get_current_view_name (GnomeCalendar *gcal);
+void gnome_calendar_set_view (GnomeCalendar *gcal,
+ char *page_name);
/* Flags is a bitmask of CalObjectChange values */
-void gnome_calendar_object_changed (GnomeCalendar *gcal, iCalObject *obj, int flags);
+void gnome_calendar_object_changed (GnomeCalendar *gcal,
+ iCalObject *obj,
+ int flags);
END_GNOME_DECLS
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index a489a157be..27042c3d2a 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -43,7 +43,7 @@ int active_calendars = 0;
/* A list of all of the calendars started */
GList *all_calendars = NULL;
-static void new_calendar (char *full_name, char *calendar_file, char *geometry);
+static void new_calendar (char *full_name, char *calendar_file, char *geometry, char *view);
/* For dumping part of a calendar */
static time_t from_t, to_t;
@@ -226,14 +226,14 @@ today_clicked (GtkWidget *widget, GnomeCalendar *gcal)
static void
new_calendar_cmd (GtkWidget *widget, void *data)
{
- new_calendar (full_name, NULL, NULL);
+ new_calendar (full_name, NULL, NULL, NULL);
}
static void
open_ok (GtkWidget *widget, GtkFileSelection *fs)
{
/* FIXME: find out who owns this calendar and use that name */
- new_calendar ("Somebody", gtk_file_selection_get_filename (fs), NULL);
+ new_calendar ("Somebody", gtk_file_selection_get_filename (fs), NULL, NULL);
gtk_widget_destroy (GTK_WIDGET (fs));
}
@@ -393,7 +393,7 @@ calendar_close_event (GtkWidget *widget, GdkEvent *event, GnomeCalendar *gcal)
}
static void
-new_calendar (char *full_name, char *calendar_file, char *geometry)
+new_calendar (char *full_name, char *calendar_file, char *geometry, char *page)
{
GtkWidget *toplevel;
char *title;
@@ -411,6 +411,9 @@ new_calendar (char *full_name, char *calendar_file, char *geometry)
g_free (title);
setup_menu (toplevel);
+ if (page)
+ gnome_calendar_set_view (GNOME_CALENDAR (toplevel), page);
+
if (calendar_file && g_file_exists (calendar_file))
gnome_calendar_load (GNOME_CALENDAR (toplevel), calendar_file);
else
@@ -436,7 +439,8 @@ process_dates (void)
enum {
GEOMETRY_KEY = -1,
- USERFILE_KEY = -2
+ USERFILE_KEY = -2,
+ VIEW_KEY = -3
};
static struct argp_option argp_options [] = {
@@ -445,12 +449,15 @@ static struct argp_option argp_options [] = {
{ "file", 'F', N_("FILE"), 0, N_("File to load calendar from"), 1 },
{ "userfile", USERFILE_KEY, NULL, 0, N_("Load the user calendar"), 1 },
{ "geometry", GEOMETRY_KEY, N_("GEOMETRY"), 0, N_("Geometry for starting up"), 1 },
+ { "view", VIEW_KEY, N_("VIEW"), 0, N_("The startup view mode"), 1 },
{ "to", 't', N_("DATE"), 0, N_("Specifies ending date [for --events]"), 1 },
{ NULL, 0, NULL, 0, NULL, 0 },
};
+/* Lists used to startup various GnomeCalendars */
static GList *start_calendars;
static GList *start_geometries;
+static GList *start_views;
static int
same_day (struct tm *a, struct tm *b)
@@ -532,6 +539,10 @@ parse_an_arg (int key, char *arg, struct argp_state *state)
*/
arg = COOKIE_USER_HOME_DIR;
/* fall trough */
+
+ case VIEW_KEY:
+ start_views = g_list_append (start_views, arg);
+ break;
case 'F':
start_calendars = g_list_append (start_calendars, arg);
@@ -570,7 +581,7 @@ session_save_state (GnomeClient *client, gint phase, GnomeRestartStyle save_styl
GnomeInteractStyle interact_style, gint fast, gpointer client_data)
{
char *sess_id;
- char **argv = (char **) g_malloc (sizeof (char *) * ((active_calendars * 4) + 3));
+ char **argv = (char **) g_malloc (sizeof (char *) * ((active_calendars * 6) + 3));
GList *l, *free_list = 0;
int i;
@@ -591,6 +602,8 @@ session_save_state (GnomeClient *client, gint phase, GnomeRestartStyle save_styl
}
argv [i++] = "--geometry";
argv [i++] = geometry;
+ argv [i++] = "--view";
+ argv [i++] = gnome_calendar_get_current_view_name (gcal);
free_list = g_list_append (free_list, geometry);
calendar_save (gcal->cal, gcal->cal->filename);
}
@@ -633,15 +646,17 @@ main(int argc, char *argv[])
* the geometry specificied -if any-
*/
if (start_calendars){
- GList *p, *g;
+ GList *p, *g, *v;
char *title;
p = start_calendars;
g = start_geometries;
+ v = start_views;
while (p){
char *file = p->data;
char *geometry = g ? g->data : NULL;
-
+ char *page_name = v ? v->data : NULL;
+
if (file == COOKIE_USER_HOME_DIR)
file = user_calendar_file;
@@ -649,17 +664,20 @@ main(int argc, char *argv[])
title = full_name;
else
title = file;
- new_calendar (title, file, geometry);
-
+ new_calendar (title, file, geometry, page_name);
+
p = p->next;
if (g)
g = g->next;
+ if (v)
+ v = v->next;
}
g_list_free (p);
} else {
char *geometry = start_geometries ? start_geometries->data : NULL;
+ char *page_name = start_views ? start_views->data : NULL;
- new_calendar (full_name, user_calendar_file, geometry);
+ new_calendar (full_name, user_calendar_file, geometry, page_name);
}
gtk_main ();
return 0;
diff --git a/calendar/main.c b/calendar/main.c
index a489a157be..27042c3d2a 100644
--- a/calendar/main.c
+++ b/calendar/main.c
@@ -43,7 +43,7 @@ int active_calendars = 0;
/* A list of all of the calendars started */
GList *all_calendars = NULL;
-static void new_calendar (char *full_name, char *calendar_file, char *geometry);
+static void new_calendar (char *full_name, char *calendar_file, char *geometry, char *view);
/* For dumping part of a calendar */
static time_t from_t, to_t;
@@ -226,14 +226,14 @@ today_clicked (GtkWidget *widget, GnomeCalendar *gcal)
static void
new_calendar_cmd (GtkWidget *widget, void *data)
{
- new_calendar (full_name, NULL, NULL);
+ new_calendar (full_name, NULL, NULL, NULL);
}
static void
open_ok (GtkWidget *widget, GtkFileSelection *fs)
{
/* FIXME: find out who owns this calendar and use that name */
- new_calendar ("Somebody", gtk_file_selection_get_filename (fs), NULL);
+ new_calendar ("Somebody", gtk_file_selection_get_filename (fs), NULL, NULL);
gtk_widget_destroy (GTK_WIDGET (fs));
}
@@ -393,7 +393,7 @@ calendar_close_event (GtkWidget *widget, GdkEvent *event, GnomeCalendar *gcal)
}
static void
-new_calendar (char *full_name, char *calendar_file, char *geometry)
+new_calendar (char *full_name, char *calendar_file, char *geometry, char *page)
{
GtkWidget *toplevel;
char *title;
@@ -411,6 +411,9 @@ new_calendar (char *full_name, char *calendar_file, char *geometry)
g_free (title);
setup_menu (toplevel);
+ if (page)
+ gnome_calendar_set_view (GNOME_CALENDAR (toplevel), page);
+
if (calendar_file && g_file_exists (calendar_file))
gnome_calendar_load (GNOME_CALENDAR (toplevel), calendar_file);
else
@@ -436,7 +439,8 @@ process_dates (void)
enum {
GEOMETRY_KEY = -1,
- USERFILE_KEY = -2
+ USERFILE_KEY = -2,
+ VIEW_KEY = -3
};
static struct argp_option argp_options [] = {
@@ -445,12 +449,15 @@ static struct argp_option argp_options [] = {
{ "file", 'F', N_("FILE"), 0, N_("File to load calendar from"), 1 },
{ "userfile", USERFILE_KEY, NULL, 0, N_("Load the user calendar"), 1 },
{ "geometry", GEOMETRY_KEY, N_("GEOMETRY"), 0, N_("Geometry for starting up"), 1 },
+ { "view", VIEW_KEY, N_("VIEW"), 0, N_("The startup view mode"), 1 },
{ "to", 't', N_("DATE"), 0, N_("Specifies ending date [for --events]"), 1 },
{ NULL, 0, NULL, 0, NULL, 0 },
};
+/* Lists used to startup various GnomeCalendars */
static GList *start_calendars;
static GList *start_geometries;
+static GList *start_views;
static int
same_day (struct tm *a, struct tm *b)
@@ -532,6 +539,10 @@ parse_an_arg (int key, char *arg, struct argp_state *state)
*/
arg = COOKIE_USER_HOME_DIR;
/* fall trough */
+
+ case VIEW_KEY:
+ start_views = g_list_append (start_views, arg);
+ break;
case 'F':
start_calendars = g_list_append (start_calendars, arg);
@@ -570,7 +581,7 @@ session_save_state (GnomeClient *client, gint phase, GnomeRestartStyle save_styl
GnomeInteractStyle interact_style, gint fast, gpointer client_data)
{
char *sess_id;
- char **argv = (char **) g_malloc (sizeof (char *) * ((active_calendars * 4) + 3));
+ char **argv = (char **) g_malloc (sizeof (char *) * ((active_calendars * 6) + 3));
GList *l, *free_list = 0;
int i;
@@ -591,6 +602,8 @@ session_save_state (GnomeClient *client, gint phase, GnomeRestartStyle save_styl
}
argv [i++] = "--geometry";
argv [i++] = geometry;
+ argv [i++] = "--view";
+ argv [i++] = gnome_calendar_get_current_view_name (gcal);
free_list = g_list_append (free_list, geometry);
calendar_save (gcal->cal, gcal->cal->filename);
}
@@ -633,15 +646,17 @@ main(int argc, char *argv[])
* the geometry specificied -if any-
*/
if (start_calendars){
- GList *p, *g;
+ GList *p, *g, *v;
char *title;
p = start_calendars;
g = start_geometries;
+ v = start_views;
while (p){
char *file = p->data;
char *geometry = g ? g->data : NULL;
-
+ char *page_name = v ? v->data : NULL;
+
if (file == COOKIE_USER_HOME_DIR)
file = user_calendar_file;
@@ -649,17 +664,20 @@ main(int argc, char *argv[])
title = full_name;
else
title = file;
- new_calendar (title, file, geometry);
-
+ new_calendar (title, file, geometry, page_name);
+
p = p->next;
if (g)
g = g->next;
+ if (v)
+ v = v->next;
}
g_list_free (p);
} else {
char *geometry = start_geometries ? start_geometries->data : NULL;
+ char *page_name = start_views ? start_views->data : NULL;
- new_calendar (full_name, user_calendar_file, geometry);
+ new_calendar (full_name, user_calendar_file, geometry, page_name);
}
gtk_main ();
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:59:28 +0800