set the active radio button here. Oops - it wasn't a Bonobo problem after

2000-05-02  Damon Chaplin  <damon@helixcode.com>

        * gui/calendar-commands.c (calendar_control_activate): set the active
        radio button here. Oops - it wasn't a Bonobo problem after all.

        * gui/popup-menu.c (popup_menu): added call to
        e_auto_kill_popup_menu_on_hide() to destroy the menu.

        * gui/e-week-view.c (e_week_view_show_popup_menu):
        * gui/e-day-view.c (e_day_view_on_event_right_click): ico->user_data
        isn't useful any more, since the event editor keeps its own iCalObject.
        So for now we make the menu commands available even when the event is
        being edited in the event editor.
        Also corrected misspellings of 'occurance' -> 'occurrence'.

        * gui/eventedit.c (event_editor_destroy): destroy the iCalObject.
        The event editor now uses its own independent iCalObject.

        * gui/e-week-view.c (e_week_view_on_unrecur_appointment):
        * gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new
        uid for the new single instance. I'm not sure what we should do about
        the creation/last modification times of the objects.

        * gui/e-week-view.c (e_week_view_on_edit_appointment):
        * gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the
        iCalObject before passing it to the event editor, since it will change
        the fields. If we don't duplicate it we won't know what has changed
        when we get the "update_event" callback.

        * gui/e-week-view.c (e_week_view_key_press):
        * gui/e-day-view.c (e_day_view_key_press): set the created and last_mod
        times of the new iCalObject. We may want to set the default alarm as
        well.

        * cal-util/calobj.c (ical_gen_uid): made this function public so we
        can generate new uids if necessary.

svn path=/trunk/; revision=2759

1 files changed, 27 insertions, 0 deletions

diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index d1f88066a9..3b3f0edab0 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -521,6 +521,8 @@ calendar_control_activate (BonoboControl *control,
 	GtkWidget *toolbar;
 	GnomeUIBuilderData uibdata;
 	BonoboUIHandler *uih = bonobo_control_get_ui_handler (control);
+	gchar *page_name;
+	gint button;
 	g_assert (uih);
 
 	uibdata.connect_func = do_ui_signal_connect;
@@ -529,6 +531,8 @@ calendar_control_activate (BonoboControl *control,
 	uibdata.relay_func = NULL;
 	uibdata.destroy_func = NULL;
 
+	g_print ("In calendar_control_activate\n");
+
 	remote_uih = bonobo_control_get_remote_ui_handler (control);
 	bonobo_ui_handler_set_container (uih, remote_uih);
 
@@ -540,6 +544,26 @@ calendar_control_activate (BonoboControl *control,
 
 	/*gtk_toolbar_append_space (GTK_TOOLBAR (toolbar));*/
 
+	/* Note that these indices should correspond with the button indices
+	   in gnome_toolbar_view_buttons. */
+	page_name = gnome_calendar_get_current_view_name (cal);
+	if (!strcmp (page_name, "dayview")) {
+		button = 0;
+	} else if (!strcmp (page_name, "workweekview")) {
+		button = 1;
+	} else if (!strcmp (page_name, "weekview")) {
+		button = 2;
+	} else if (!strcmp (page_name, "monthview")) {
+		button = 3;
+	} else if (!strcmp (page_name, "yearview")) {
+		button = 4;
+	} else {
+		g_warning ("Unknown calendar view: %s", page_name);
+		button = 0;
+	}
+
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gnome_toolbar_view_buttons[button].widget), TRUE);
+
 	gtk_widget_show_all (toolbar);
 
 	bonobo_ui_handler_dock_add (uih, "/Toolbar",
@@ -611,6 +635,9 @@ calendar_control_deactivate (BonoboControl *control)
 {
 	BonoboUIHandler *uih = bonobo_control_get_ui_handler (control);
 	g_assert (uih);
+
+	g_print ("In calendar_control_deactivate\n");
+
 	bonobo_ui_handler_dock_remove (uih, "/Toolbar");
  	bonobo_ui_handler_unset_container (uih);
 }