[evolution-patches] 60354, window title thing, all components
- From: Not Zed <notzed ximian com>
- To: evolution-patches ximian com
- Subject: [evolution-patches] 60354, window title thing, all components
- Date: Mon, 28 Jun 2004 12:42:30 +0800
A more complete patch and the exchange bit for it too.
Properly handles various components setting the title out of order now, etc etc blah blah.
Still not 100% on the reffing stuff.
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1783
diff -u -3 -r1.1783 ChangeLog
--- addressbook/ChangeLog 26 Jun 2004 01:42:27 -0000 1.1783
+++ addressbook/ChangeLog 28 Jun 2004 04:37:56 -0000
@@ -12,6 +12,11 @@
a newline between street line and rest of extended address.
(extract_address_textview): Omit the newline trailing the street line.
+2004-06-28 Not Zed <NotZed Ximian com>
+
+ * gui/component/addressbook-component.c (impl_createView): changed
+ from createControls for new shell apis.
+
2004-06-24 Hans Petter Jansson <hpj ximian com>
* gui/contact-editor/e-contact-editor.c (address_labels): Add table.
Index: addressbook/gui/component/addressbook-component.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-component.c,v
retrieving revision 1.128
diff -u -3 -r1.128 addressbook-component.c
--- addressbook/gui/component/addressbook-component.c 20 May 2004 18:53:04 -0000 1.128
+++ addressbook/gui/component/addressbook-component.c 28 Jun 2004 04:37:56 -0000
@@ -35,6 +35,8 @@
#include "widgets/misc/e-task-bar.h"
#include "widgets/misc/e-info-label.h"
+#include "shell/e-component-view.h"
+
#include <string.h>
#include <bonobo/bonobo-i18n.h>
#include <gtk/gtkimage.h>
@@ -56,25 +58,20 @@
/* Evolution::Component CORBA methods. */
-static void
-impl_createControls (PortableServer_Servant servant,
- Bonobo_Control *corba_sidebar_control,
- Bonobo_Control *corba_view_control,
- Bonobo_Control *corba_statusbar_control,
- CORBA_Environment *ev)
+static GNOME_Evolution_ComponentView
+impl_createView (PortableServer_Servant servant,
+ GNOME_Evolution_ShellView parent,
+ CORBA_Environment *ev)
{
AddressbookView *view = addressbook_view_new ();
- BonoboControl *sidebar_control;
- BonoboControl *view_control;
- BonoboControl *statusbar_control;
-
- sidebar_control = bonobo_control_new (addressbook_view_peek_sidebar (view));
- view_control = addressbook_view_peek_folder_view (view);
- statusbar_control = bonobo_control_new (addressbook_view_peek_statusbar (view));
-
- *corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
- *corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
- *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
+ EComponentView *component_view;
+
+ component_view = e_component_view_new_controls (parent, "contacts",
+ bonobo_control_new (addressbook_view_peek_sidebar (view)),
+ addressbook_view_peek_folder_view (view),
+ bonobo_control_new (addressbook_view_peek_statusbar (view)));
+
+ return BONOBO_OBJREF(component_view);
}
static GNOME_Evolution_CreatableItemTypeList *
@@ -230,7 +227,7 @@
POA_GNOME_Evolution_Component__epv *epv = &class->epv;
GObjectClass *object_class = G_OBJECT_CLASS (class);
- epv->createControls = impl_createControls;
+ epv->createView = impl_createView;
epv->_get_userCreatableItems = impl__get_userCreatableItems;
epv->requestCreateItem = impl_requestCreateItem;
epv->upgradeFromVersion = impl_upgradeFromVersion;
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2429
diff -u -3 -r1.2429 ChangeLog
--- calendar/ChangeLog 25 Jun 2004 17:39:26 -0000 1.2429
+++ calendar/ChangeLog 28 Jun 2004 04:37:58 -0000
@@ -95,6 +95,13 @@
(dalarm_message_toggled_cb): sensitize message entry
(init_widgets): listen for toggle signals
+2004-06-28 Not Zed <NotZed Ximian com>
+
+ * gui/tasks-component.c (impl_createControls): same.
+
+ * gui/calendar-component.c (impl_createControls): ->createView for
+ new shell apis.
+
2004-06-24 JP Rosevear <jpr novell com>
* gui/dialogs/alarm-list-dialog.c (selection_changed_cb):
Index: calendar/gui/calendar-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-component.c,v
retrieving revision 1.175
diff -u -3 -r1.175 calendar-component.c
--- calendar/gui/calendar-component.c 24 Jun 2004 17:22:40 -0000 1.175
+++ calendar/gui/calendar-component.c 28 Jun 2004 04:37:59 -0000
@@ -33,6 +33,7 @@
#include <libical/icalvcal.h>
#include <libecal/e-cal-time-util.h>
#include <shell/e-user-creatable-items-handler.h>
+#include <shell/e-component-view.h>
#include "e-pub-utils.h"
#include "e-calendar-view.h"
#include "calendar-config-keys.h"
@@ -1176,16 +1177,15 @@
}
}
-static void
-impl_createControls (PortableServer_Servant servant,
- Bonobo_Control *corba_sidebar_control,
- Bonobo_Control *corba_view_control,
- Bonobo_Control *corba_statusbar_control,
- CORBA_Environment *ev)
+static GNOME_Evolution_ComponentView
+impl_createView (PortableServer_Servant servant,
+ GNOME_Evolution_ShellView parent,
+ CORBA_Environment *ev)
{
CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
CalendarComponentPrivate *priv;
CalendarComponentView *component_view;
+ EComponentView *ecv;
priv = calendar_component->priv;
@@ -1195,18 +1195,18 @@
/* FIXME Should we describe the problem in a control? */
bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
- return;
+ return CORBA_OBJECT_NIL;
}
g_object_weak_ref (G_OBJECT (component_view->view_control), view_destroyed_cb, calendar_component);
priv->views = g_list_append (priv->views, component_view);
-
- /* Return the controls */
- *corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->sidebar_control), ev);
- *corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->view_control), ev);
- *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->statusbar_control), ev);
-}
+ /* TODO: Make CalendarComponentView just subclass EComponentView */
+ ecv = e_component_view_new_controls (parent, "calendar", component_view->sidebar_control,
+ component_view->view_control, component_view->statusbar_control);
+
+ return BONOBO_OBJREF(ecv);
+}
static GNOME_Evolution_CreatableItemTypeList *
impl__get_userCreatableItems (PortableServer_Servant servant,
@@ -1348,7 +1348,7 @@
parent_class = g_type_class_peek_parent (class);
epv->upgradeFromVersion = impl_upgradeFromVersion;
- epv->createControls = impl_createControls;
+ epv->createView = impl_createView;
epv->_get_userCreatableItems = impl__get_userCreatableItems;
epv->requestCreateItem = impl_requestCreateItem;
Index: calendar/gui/tasks-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-component.c,v
retrieving revision 1.69
diff -u -3 -r1.69 tasks-component.c
--- calendar/gui/tasks-component.c 24 Jun 2004 17:22:40 -0000 1.69
+++ calendar/gui/tasks-component.c 28 Jun 2004 04:37:59 -0000
@@ -32,6 +32,7 @@
#include <gconf/gconf-client.h>
#include <libecal/e-cal.h>
#include <shell/e-user-creatable-items-handler.h>
+#include <shell/e-component-view.h>
#include "e-cal-model.h"
#include "e-tasks.h"
#include "tasks-component.h"
@@ -983,16 +984,15 @@
}
}
-static void
-impl_createControls (PortableServer_Servant servant,
- Bonobo_Control *corba_sidebar_control,
- Bonobo_Control *corba_view_control,
- Bonobo_Control *corba_statusbar_control,
- CORBA_Environment *ev)
+static GNOME_Evolution_ComponentView
+impl_createView (PortableServer_Servant servant,
+ GNOME_Evolution_ShellView parent,
+ CORBA_Environment *ev)
{
TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
TasksComponentPrivate *priv;
TasksComponentView *component_view;
+ EComponentView *ecv;
priv = component->priv;
@@ -1002,16 +1002,17 @@
/* FIXME Should we describe the problem in a control? */
bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
- return;
+ return CORBA_OBJECT_NIL;
}
g_object_weak_ref (G_OBJECT (component_view->view_control), view_destroyed_cb, component);
priv->views = g_list_append (priv->views, component_view);
-
- /* Return the controls */
- *corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->sidebar_control), ev);
- *corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->view_control), ev);
- *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (component_view->statusbar_control), ev);
+
+ /* TODO: Make TasksComponentView just subclass EComponentView */
+ ecv = e_component_view_new_controls (parent, "tasks", component_view->sidebar_control,
+ component_view->view_control, component_view->statusbar_control);
+
+ return BONOBO_OBJREF(ecv);
}
static GNOME_Evolution_CreatableItemTypeList *
@@ -1134,7 +1135,7 @@
parent_class = g_type_class_peek_parent (klass);
epv->upgradeFromVersion = impl_upgradeFromVersion;
- epv->createControls = impl_createControls;
+ epv->createView = impl_createView;
epv->_get_userCreatableItems = impl__get_userCreatableItems;
epv->requestCreateItem = impl_requestCreateItem;
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3405
diff -u -3 -r1.3405 ChangeLog
--- mail/ChangeLog 25 Jun 2004 14:44:49 -0000 1.3405
+++ mail/ChangeLog 28 Jun 2004 04:38:02 -0000
@@ -7,6 +7,19 @@
full_name so update the argument to make that clear.
(emft_create_folder): Same and also don't strip a leading '/'
+2004-06-28 Not Zed <NotZed Ximian com>
+
+ * mail-component.c (impl_createView, view_changed_cb): api updates.
+
+2004-06-25 Not Zed <NotZed Ximian com>
+
+ ** See bug #60354.
+
+ * mail-component.c (view_changed_cb): set the shell window title
+ as well.
+ (impl_createView): renamed from createControls, just return a
+ EComponentView instead.
+
2004-06-25 Not Zed <NotZed Ximian com>
* em-folder-tree.c (folder_tree_new): set search column. #60152.
Index: mail/mail-component.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
retrieving revision 1.94
diff -u -3 -r1.94 mail-component.c
--- mail/mail-component.c 17 Jun 2004 07:34:49 -0000 1.94
+++ mail/mail-component.c 28 Jun 2004 04:38:03 -0000
@@ -64,6 +64,7 @@
#include "e-activity-handler.h"
#include "shell/e-user-creatable-items-handler.h"
+#include "shell/e-component-view.h"
#include "composer/e-msg-composer.h"
@@ -440,10 +441,15 @@
}
static void
-view_changed_cb(EMFolderView *emfv, EInfoLabel *el)
+view_changed_cb(EMFolderView *emfv, EComponentView *component_view)
{
+ EInfoLabel *el = g_object_get_data((GObject *)component_view, "info-label");
+ CORBA_Environment ev;
+
+ CORBA_exception_init(&ev);
+
if (emfv->folder) {
- char *name;
+ char *name, *title;
guint32 visible, unread, deleted, junked;
GString *tmp = g_string_new("");
@@ -500,27 +506,31 @@
}
e_info_label_set_info(el, name, tmp->str);
+
+ title = g_strdup_printf("%s, %s", name, tmp->str);
+ e_component_view_set_title(component_view, title);
+ g_free(title);
+
g_string_free(tmp, TRUE);
camel_object_free(emfv->folder, CAMEL_FOLDER_NAME, name);
} else {
e_info_label_set_info(el, _("Mail"), "");
+ e_component_view_set_title(component_view, _("Mail"));
}
+
+ CORBA_exception_free(&ev);
}
/* Evolution::Component CORBA methods. */
-static void
-impl_createControls (PortableServer_Servant servant,
- Bonobo_Control *corba_tree_control,
- Bonobo_Control *corba_view_control,
- Bonobo_Control *corba_statusbar_control,
- CORBA_Environment *ev)
+static GNOME_Evolution_ComponentView
+impl_createView (PortableServer_Servant servant,
+ GNOME_Evolution_ShellView parent,
+ CORBA_Environment *ev)
{
MailComponent *mail_component = MAIL_COMPONENT (bonobo_object_from_servant (servant));
MailComponentPrivate *priv = mail_component->priv;
- BonoboControl *tree_control;
- BonoboControl *view_control;
- BonoboControl *statusbar_control;
+ EComponentView *component_view;
GtkWidget *tree_widget, *vbox, *info;
GtkWidget *view_widget;
GtkWidget *statusbar_widget;
@@ -563,23 +573,21 @@
gtk_widget_show(info);
gtk_widget_show(vbox);
- tree_control = bonobo_control_new (vbox);
- view_control = bonobo_control_new (view_widget);
- statusbar_control = bonobo_control_new (statusbar_widget);
-
- *corba_tree_control = CORBA_Object_duplicate (BONOBO_OBJREF (tree_control), ev);
- *corba_view_control = CORBA_Object_duplicate (BONOBO_OBJREF (view_control), ev);
- *corba_statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (statusbar_control), ev);
+ component_view = e_component_view_new(parent, "mail", vbox, view_widget, statusbar_widget);
+
+ g_object_set_data((GObject *)component_view, "info-label", info);
g_object_set_data_full((GObject *)view_widget, "e-creatable-items-handler",
e_user_creatable_items_handler_new("mail", create_local_item_cb, tree_widget),
(GDestroyNotify)g_object_unref);
- g_signal_connect (view_control, "activate", G_CALLBACK (view_control_activate_cb), view_widget);
+ g_signal_connect (component_view->view_control, "activate", G_CALLBACK (view_control_activate_cb), view_widget);
g_signal_connect (tree_widget, "folder-selected", G_CALLBACK (folder_selected_cb), view_widget);
- g_signal_connect(view_widget, "changed", G_CALLBACK(view_changed_cb), info);
- g_signal_connect(view_widget, "loaded", G_CALLBACK(view_changed_cb), info);
+ g_signal_connect(view_widget, "changed", G_CALLBACK(view_changed_cb), component_view);
+ g_signal_connect(view_widget, "loaded", G_CALLBACK(view_changed_cb), component_view);
+
+ return BONOBO_OBJREF(component_view);
}
static CORBA_boolean
@@ -821,7 +829,7 @@
object_class->dispose = impl_dispose;
object_class->finalize = impl_finalize;
- epv->createControls = impl_createControls;
+ epv->createView = impl_createView;
epv->requestQuit = impl_requestQuit;
epv->quit = impl_quit;
epv->_get_userCreatableItems = impl__get_userCreatableItems;
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1459
diff -u -3 -r1.1459 ChangeLog
--- shell/ChangeLog 24 Jun 2004 08:14:51 -0000 1.1459
+++ shell/ChangeLog 28 Jun 2004 04:38:03 -0000
@@ -1,3 +1,40 @@
+2004-06-28 Not Zed <NotZed Ximian com>
+
+ * e-shell-view.c (impl_ShellView_setTitle): take a component id
+ argument.
+
+ * e-shell-window.c (component_view_free): release the corba object
+ properly.
+ (e_shell_window_set_title): new helper to set the title for the
+ component.
+ (switch_view): use the component specific title if available or
+ fallback to the component name.
+
+2004-06-25 Not Zed <NotZed Ximian com>
+
+ ** See bug #60354.
+
+ * Evolution-Component.idl: createControls -> createView and
+ ComponentView to keep track of things.
+
+ * Evolution-Shell.idl: return a new type ShellView from
+ createNewWindow so other parts of the system can access it later.
+ ShellView so far just lets you set title or switch component, but
+ could be subclassed later.
+
+ * e-shell.c (impl_Shell_createNewWindow): return a shell view.
+
+ * e-shell-window.c (init_view): create the view from the compnent
+ first, then get the controls from it separately.
+ (init): setup the e-shell-view object for the create view
+ thing.
+
+ * e-shell-view.c (e_shell_view_new): simple bonobo object for
+ Evolution_ShellView, keep track of the EShellWindow.
+
+ * e-component-view.[ch]: simple bonobo object for
+ Evolution_ComponentView. Just keep track of the controls.
+
2004-06-24 Not Zed <NotZed Ximian com>
** See bug #57367.
Index: shell/Evolution-Component.idl
===================================================================
RCS file: /cvs/gnome/evolution/shell/Evolution-Component.idl,v
retrieving revision 1.15
diff -u -3 -r1.15 Evolution-Component.idl
--- shell/Evolution-Component.idl 12 May 2004 03:33:51 -0000 1.15
+++ shell/Evolution-Component.idl 28 Jun 2004 04:38:03 -0000
@@ -30,6 +30,12 @@
};
typedef sequence <CreatableItemType> CreatableItemTypeList;
+ interface ComponentView : Bonobo::Unknown {
+ void getControls (out Bonobo::Control sidebar_control,
+ out Bonobo::Control view_control,
+ out Bonobo::Control statusbar_control);
+ };
+
interface Component : Bonobo::Unknown {
exception Failed {};
exception UnknownType {};
@@ -48,11 +54,15 @@
/*** Basic functionality. ***/
+ ComponentView createView(in ShellView parent)
+ raises (Failed);
+
+
/* Create the controls for embedding in the shell. */
- void createControls (out Bonobo::Control sidebar_control,
+ /*void createControls (out Bonobo::Control sidebar_control,
out Bonobo::Control view_control,
out Bonobo::Control statusbar_control)
- raises (Failed);
+ raises (Failed);*/
/* Check if the component can quit.
Do not perform any quit-related tasks however.
Index: shell/Evolution-Shell.idl
===================================================================
RCS file: /cvs/gnome/evolution/shell/Evolution-Shell.idl,v
retrieving revision 1.25
diff -u -3 -r1.25 Evolution-Shell.idl
--- shell/Evolution-Shell.idl 11 Nov 2003 01:01:11 -0000 1.25
+++ shell/Evolution-Shell.idl 28 Jun 2004 04:38:03 -0000
@@ -12,6 +12,13 @@
module GNOME {
module Evolution {
+
+ interface ShellView : Bonobo::Unknown {
+ /* Should really use a ComponentView i guess */
+ void setTitle(in string component, in string title);
+ void setComponent(in string component);
+ };
+
interface Shell : Bonobo::Unknown {
exception Busy {};
exception ComponentNotFound {};
@@ -26,7 +33,7 @@
* @component_id: id or alias of the component to display in the new window.
*
*/
- void createNewWindow (in string component_id)
+ ShellView createNewWindow (in string component_id)
raises (NotReady, ComponentNotFound, UnsupportedSchema, InternalError);
/**
Index: shell/Evolution.idl
===================================================================
RCS file: /cvs/gnome/evolution/shell/Evolution.idl,v
retrieving revision 1.22
diff -u -3 -r1.22 Evolution.idl
--- shell/Evolution.idl 3 Dec 2003 17:59:27 -0000 1.22
+++ shell/Evolution.idl 28 Jun 2004 04:38:04 -0000
@@ -12,8 +12,8 @@
#include <Evolution-common.idl>
-#include <Evolution-Component.idl>
#include <Evolution-ConfigControl.idl>
#include <Evolution-Offline.idl>
#include <Evolution-Shell.idl>
+#include <Evolution-Component.idl>
#include <Evolution-Wizard.idl>
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.199
diff -u -3 -r1.199 Makefile.am
--- shell/Makefile.am 10 Jun 2004 16:30:14 -0000 1.199
+++ shell/Makefile.am 28 Jun 2004 04:38:04 -0000
@@ -79,6 +79,7 @@
eshellinclude_HEADERS = \
Evolution.h \
+ e-component-view.h \
e-shell-corba-icon-utils.h \
e-shell-utils.h \
e-user-creatable-items-handler.h \
@@ -89,6 +90,7 @@
libeshell_la_SOURCES = \
$(IDL_GENERATED) \
$(MARSHAL_GENERATED) \
+ e-component-view.c \
e-shell-corba-icon-utils.c \
e-shell-utils.c \
e-user-creatable-items-handler.c \
@@ -113,6 +115,8 @@
e-corba-config-page.h \
e-history.c \
e-history.h \
+ e-shell.c \
+ e-shell.h \
e-shell-constants.h \
e-shell-folder-title-bar.c \
e-shell-folder-title-bar.h \
@@ -128,8 +132,8 @@
e-shell-window-commands.h \
e-shell-window.c \
e-shell-window.h \
- e-shell.c \
- e-shell.h \
+ e-shell-view.c \
+ e-shell-view.h \
e-sidebar.c \
e-sidebar.h \
main.c
Index: shell/e-component-view.c
===================================================================
RCS file: shell/e-component-view.c
diff -N shell/e-component-view.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ shell/e-component-view.c 28 Jun 2004 04:38:04 -0000
@@ -0,0 +1,140 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ * e-component-view.c
+ *
+ * Copyright (C) 2004 Novell Inc.
+ *
+ * Author(s): Michael Zucchi <notzed ximian com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Helper class for evolution components to setup a view
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+
+#include "e-component-view.h"
+
+#include "bonobo/bonobo-control.h"
+
+static BonoboObjectClass *parent_class = NULL;
+
+static void
+impl_ComponentView_getControls(PortableServer_Servant servant,
+ Bonobo_Control *side_control,
+ Bonobo_Control *view_control,
+ Bonobo_Control *statusbar_control,
+ CORBA_Environment *ev)
+{
+ EComponentView *ecv = (EComponentView *)bonobo_object_from_servant(servant);
+
+ *side_control = CORBA_Object_duplicate (BONOBO_OBJREF (ecv->side_control), ev);
+ *view_control = CORBA_Object_duplicate (BONOBO_OBJREF (ecv->view_control), ev);
+ *statusbar_control = CORBA_Object_duplicate (BONOBO_OBJREF (ecv->statusbar_control), ev);
+}
+
+/* GObject methods. */
+
+static void
+impl_dispose (GObject *object)
+{
+ EComponentView *ecv = (EComponentView *)object;
+
+ ecv->side_control = NULL;
+ ecv->view_control = NULL;
+ ecv->statusbar_control = NULL;
+
+ ((GObjectClass *)parent_class)->dispose(object);
+}
+
+static void
+impl_finalise (GObject *object)
+{
+ EComponentView *ecv = (EComponentView *)object;
+
+ g_free(ecv->id);
+
+ ((GObjectClass *)parent_class)->finalize(object);
+}
+
+static void
+e_component_view_class_init (EComponentViewClass *klass)
+{
+ GObjectClass *object_class;
+ POA_GNOME_Evolution_ComponentView__epv *epv;
+
+ parent_class = g_type_class_ref(bonobo_object_get_type());
+
+ object_class = G_OBJECT_CLASS (klass);
+ object_class->dispose = impl_dispose;
+ object_class->finalize = impl_finalise;
+
+ epv = & klass->epv;
+ epv->getControls = impl_ComponentView_getControls;
+}
+
+static void
+e_component_view_init (EComponentView *shell)
+{
+}
+
+EComponentView *e_component_view_new(GNOME_Evolution_ShellView parent, const char *id, struct _GtkWidget *side, struct _GtkWidget *view, struct _GtkWidget *statusbar)
+{
+ EComponentView *new = g_object_new (e_component_view_get_type (), NULL);
+ CORBA_Environment ev = { 0 };
+
+ new->id = g_strdup(id);
+ new->shell_view = CORBA_Object_duplicate(parent, &ev);
+ CORBA_exception_free(&ev);
+
+ /* FIXME: hook onto destroys */
+ new->side_control = bonobo_control_new(side);
+ new->view_control = bonobo_control_new(view);
+ new->statusbar_control = bonobo_control_new(statusbar);
+
+ return new;
+}
+
+EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent, const char *id, BonoboControl *side, BonoboControl *view, BonoboControl *statusbar)
+{
+ EComponentView *new = g_object_new (e_component_view_get_type (), NULL);
+ CORBA_Environment ev = { 0 };
+
+ new->id = g_strdup(id);
+ new->shell_view = CORBA_Object_duplicate(parent, &ev);
+ CORBA_exception_free(&ev);
+
+ /* FIXME: hook onto destroys */
+ new->side_control = side;
+ new->view_control = view;
+ new->statusbar_control = statusbar;
+
+ return new;
+}
+
+void
+e_component_view_set_title(EComponentView *ecv, const char *title)
+{
+ CORBA_Environment ev = { 0 };
+
+ /* save roundtrips, check title is the same */
+ GNOME_Evolution_ShellView_setTitle(ecv->shell_view, ecv->id, title, &ev);
+ CORBA_exception_free(&ev);
+}
+
+BONOBO_TYPE_FUNC_FULL (EComponentView, GNOME_Evolution_ComponentView, bonobo_object_get_type(), e_component_view)
Index: shell/e-component-view.h
===================================================================
RCS file: shell/e-component-view.h
diff -N shell/e-component-view.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ shell/e-component-view.h 28 Jun 2004 04:38:04 -0000
@@ -0,0 +1,77 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ * e-component-view.h
+ *
+ * Copyright (C) 2004 Novell Inc.
+ *
+ * Author(s): Michael Zucchi <notzed ximian com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef _E_COMPONENT_VIEW_H_
+#define _E_COMPONENT_VIEW_H_
+
+#include <bonobo/bonobo-object.h>
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+struct _GtkWidget;
+
+typedef struct _EComponentView EComponentView;
+typedef struct _EComponentViewPrivate EComponentViewPrivate;
+typedef struct _EComponentViewClass EComponentViewClass;
+
+#include "Evolution.h"
+
+#define E_TYPE_COMPONENT_VIEW (e_component_view_get_type ())
+#define E_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), E_TYPE_COMPONENT_VIEW, EComponentView))
+#define E_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_COMPONENT_VIEW, EComponentViewClass))
+#define E_IS_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
+#define E_IS_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_COMPONENT_VIEW))
+
+struct _EComponentView {
+ BonoboObject parent;
+
+ EComponentViewPrivate *priv;
+
+ char *id;
+ GNOME_Evolution_ShellView shell_view;
+
+ struct _BonoboControl *side_control;
+ struct _BonoboControl *view_control;
+ struct _BonoboControl *statusbar_control;
+};
+
+struct _EComponentViewClass {
+ BonoboObjectClass parent_class;
+
+ POA_GNOME_Evolution_ComponentView__epv epv;
+};
+
+GType e_component_view_get_type(void);
+EComponentView *e_component_view_new(GNOME_Evolution_ShellView shell_view, const char *id, struct _GtkWidget *side, struct _GtkWidget *view, struct _GtkWidget *status);
+EComponentView *e_component_view_new_controls(GNOME_Evolution_ShellView parent, const char *id, struct _BonoboControl *side, struct _BonoboControl *view, struct _BonoboControl *statusbar);
+
+void e_component_view_set_title(EComponentView *ecv, const char *title);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _E_COMPONENT_VIEW_H_ */
Index: shell/e-shell-view.c
===================================================================
RCS file: shell/e-shell-view.c
diff -N shell/e-shell-view.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ shell/e-shell-view.c 28 Jun 2004 04:38:04 -0000
@@ -0,0 +1,108 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+ * e-shell-view.c
+ *
+ * Copyright (C) 2004 Novell Inc.
+ *
+ * Author(s): Michael Zucchi <notzed ximian com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Helper class for evolution shells to setup a view
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+
+#include <gtk/gtkwindow.h>
+
+#include "e-shell-view.h"
+#include "e-shell-window.h"
+
+static BonoboObjectClass *parent_class = NULL;
+
+struct _EShellViewPrivate {
+ int dummy;
+};
+
+static void
+impl_ShellView_setTitle(PortableServer_Servant _servant, const CORBA_char *id, const CORBA_char * title, CORBA_Environment * ev)
+{
+ EShellView *esw = (EShellView *)bonobo_object_from_servant(_servant);
+ char *tmp = g_strdup_printf("Evolution - %s", title);
+
+ printf("shell view:setTitle '%s'\n", title);
+
+ e_shell_window_set_title(esw->window, id, tmp);
+ g_free(tmp);
+}
+
+static void
+impl_ShellView_setComponent(PortableServer_Servant _servant, const CORBA_char *id, CORBA_Environment * ev)
+{
+ EShellView *esw = (EShellView *)bonobo_object_from_servant(_servant);
+
+ e_shell_window_switch_to_component(esw->window, id);
+}
+
+static void
+impl_dispose (GObject *object)
+{
+ /*EShellView *esv = (EShellView *)object;*/
+
+ ((GObjectClass *)parent_class)->dispose(object);
+}
+
+static void
+impl_finalise (GObject *object)
+{
+ ((GObjectClass *)parent_class)->finalize(object);
+}
+
+static void
+e_shell_view_class_init (EShellViewClass *klass)
+{
+ GObjectClass *object_class;
+ POA_GNOME_Evolution_ShellView__epv *epv;
+
+ parent_class = g_type_class_ref(bonobo_object_get_type());
+
+ object_class = G_OBJECT_CLASS (klass);
+ object_class->dispose = impl_dispose;
+ object_class->finalize = impl_finalise;
+
+ epv = & klass->epv;
+ epv->setTitle = impl_ShellView_setTitle;
+ epv->setComponent = impl_ShellView_setComponent;
+}
+
+static void
+e_shell_view_init (EShellView *shell)
+{
+}
+
+EShellView *e_shell_view_new(struct _EShellWindow *window)
+{
+ EShellView *new = g_object_new (e_shell_view_get_type (), NULL);
+
+ /* TODO: listen to destroy? */
+ new->window = window;
+
+ return new;
+}
+
+BONOBO_TYPE_FUNC_FULL (EShellView, GNOME_Evolution_ShellView, bonobo_object_get_type(), e_shell_view)
Index: shell/e-shell-view.h
===================================================================
RCS file: shell/e-shell-view.h
diff -N shell/e-shell-view.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ shell/e-shell-view.h 28 Jun 2004 04:38:04 -0000
@@ -0,0 +1,69 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-shell-view.h
+ *
+ * Copyright (C) 2000 Ximian, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * This is only a CORBA wrapper around e_shell_window.
+ */
+
+#ifndef _E_SHELL_VIEW_H_
+#define _E_SHELL_VIEW_H_
+
+#include <bonobo-activation/bonobo-activation.h>
+#include <bonobo/bonobo-object.h>
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+struct _EShell;
+
+typedef struct _EShellView EShellView;
+typedef struct _EShellViewPrivate EShellViewPrivate;
+typedef struct _EShellViewClass EShellViewClass;
+
+#include "Evolution.h"
+
+#define E_TYPE_SHELL_VIEW (e_shell_view_get_type ())
+#define E_SHELL_VIEW(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SHELL_VIEW, EShellView))
+#define E_SHELL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL_VIEW, EShellViewClass))
+#define E_IS_SHELL_VIEW(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SHELL_VIEW))
+#define E_IS_SHELL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_VIEW))
+
+struct _EShellView {
+ BonoboObject parent;
+
+ struct _EShellWindow *window;
+
+ EShellViewPrivate *priv;
+};
+
+struct _EShellViewClass {
+ BonoboObjectClass parent_class;
+
+ POA_GNOME_Evolution_ShellView__epv epv;
+};
+
+GType e_shell_view_get_type (void);
+EShellView *e_shell_view_new(struct _EShellWindow *window);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _E_SHELL_VIEW_H_ */
Index: shell/e-shell-window.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.c,v
retrieving revision 1.27
diff -u -3 -r1.27 e-shell-window.c
--- shell/e-shell-window.c 24 Jun 2004 08:14:51 -0000 1.27
+++ shell/e-shell-window.c 28 Jun 2004 04:38:04 -0000
@@ -23,6 +23,7 @@
#include <config.h>
#include "e-shell-window.h"
+#include "e-shell-view.h"
#include "Evolution.h"
@@ -67,6 +68,9 @@
char *component_id;
char *component_alias;
+ GNOME_Evolution_ComponentView component_view;
+ char *title;
+
GtkWidget *sidebar_widget;
GtkWidget *view_widget;
GtkWidget *statusbar_widget;
@@ -79,6 +83,8 @@
struct _EShellWindowPrivate {
EShell *shell;
+ EShellView *shell_view; /* CORBA wrapper for this, just a placeholder */
+
/* All the ComponentViews. */
GSList *component_views;
@@ -145,6 +151,13 @@
static void
component_view_free (ComponentView *view)
{
+ if (view->component_view) {
+ CORBA_Environment ev = { 0 };
+
+ CORBA_Object_release(view->component_view, &ev);
+ CORBA_exception_free(&ev);
+ }
+
g_free (view->component_id);
g_free (view->component_alias);
g_free (view);
@@ -189,6 +202,7 @@
EShellWindowPrivate *priv = window->priv;
EComponentRegistry *registry = e_shell_peek_component_registry (window->priv->shell);
GNOME_Evolution_Component component_iface;
+ GNOME_Evolution_ComponentView component_view;
Bonobo_UIContainer container;
Bonobo_Control sidebar_control;
Bonobo_Control view_control;
@@ -217,19 +231,30 @@
/* 2. Set up view. */
- GNOME_Evolution_Component_createControls (component_iface, &sidebar_control, &view_control, &statusbar_control, &ev);
- if (BONOBO_EX (&ev)) {
+ /* The rest of the code assumes that the component is valid and can create
+ controls; if this fails something is really wrong in the component
+ (e.g. methods not implemented)... So handle it as if there was no
+ component at all. */
+
+ component_view = GNOME_Evolution_Component_createView(component_iface, BONOBO_OBJREF(priv->shell_view), &ev);
+ if (component_view == NULL || BONOBO_EX (&ev)) {
g_warning ("Cannot create view for %s", view->component_id);
+ bonobo_object_release_unref (component_iface, NULL);
+ CORBA_exception_free (&ev);
+ return;
+ }
- /* The rest of the code assumes that the component is valid and can create
- controls; if this fails something is really wrong in the component
- (e.g. methods not implemented)... So handle it as if there was no
- component at all. */
+ GNOME_Evolution_ComponentView_getControls(component_view, &sidebar_control, &view_control, &statusbar_control, &ev);
+ if (BONOBO_EX (&ev)) {
+ g_warning ("Cannot create view for %s", view->component_id);
bonobo_object_release_unref (component_iface, NULL);
+ bonobo_object_release_unref (component_view, NULL);
CORBA_exception_free (&ev);
return;
}
+ view->component_view = component_view;
+
CORBA_exception_free (&ev);
container = bonobo_ui_component_get_container (priv->ui_component);
@@ -297,9 +322,12 @@
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->statusbar_notebook), component_view->notebook_page_num);
}
- title = g_strdup_printf ("Evolution - %s", info->button_label);
- gtk_window_set_title (GTK_WINDOW (window), title);
- g_free (title);
+ if (component_view->title == NULL) {
+ title = g_strdup_printf ("Evolution - %s", info->button_label);
+ gtk_window_set_title (GTK_WINDOW (window), title);
+ g_free (title);
+ } else
+ gtk_window_set_title (GTK_WINDOW (window), component_view->title);
if (info->button_icon)
gtk_window_set_icon (GTK_WINDOW (window), info->button_icon);
@@ -706,7 +734,6 @@
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
-
/* Initialization. */
static void
@@ -736,6 +763,7 @@
EShellWindowPrivate *priv = g_new0 (EShellWindowPrivate, 1);
priv->tooltips = gtk_tooltips_new ();
+ priv->shell_view = e_shell_view_new(shell_window);
shell_window->priv = priv;
}
@@ -908,5 +936,30 @@
e_shell_show_settings (window->priv->shell, window->priv->current_view ? window->priv->current_view->component_alias : NULL, window);
}
+void
+e_shell_window_set_title(EShellWindow *window, const char *component_id, const char *title)
+{
+ EShellWindowPrivate *priv = window->priv;
+ ComponentView *view = NULL;
+ GSList *p;
+
+ for (p = priv->component_views; p != NULL; p = p->next) {
+ ComponentView *this_view = p->data;
+
+ if (strcmp (this_view->component_id, component_id) == 0
+ || (this_view->component_alias != NULL
+ && strcmp (this_view->component_alias, component_id) == 0)) {
+ view = p->data;
+ break;
+ }
+ }
+
+ if (view) {
+ g_free(view->title);
+ view->title = g_strdup(title);
+ if (view->title && view == priv->current_view)
+ gtk_window_set_title((GtkWindow *)window, title);
+ }
+}
E_MAKE_TYPE (e_shell_window, "EShellWindow", EShellWindow, class_init, init, BONOBO_TYPE_WINDOW)
Index: shell/e-shell-window.h
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.h,v
retrieving revision 1.8
diff -u -3 -r1.8 e-shell-window.h
--- shell/e-shell-window.h 2 Dec 2003 02:17:23 -0000 1.8
+++ shell/e-shell-window.h 28 Jun 2004 04:38:04 -0000
@@ -65,6 +65,8 @@
EShell *e_shell_window_peek_shell (EShellWindow *window);
BonoboUIComponent *e_shell_window_peek_bonobo_ui_component (EShellWindow *window);
+void e_shell_window_set_title(EShellWindow *window, const char *component_id, const char *title);
+
void e_shell_window_save_defaults (EShellWindow *window);
void e_shell_window_show_settings (EShellWindow *window);
Index: shell/e-shell.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell.c,v
retrieving revision 1.250
diff -u -3 -r1.250 e-shell.c
--- shell/e-shell.c 24 Jun 2004 08:14:51 -0000 1.250
+++ shell/e-shell.c 28 Jun 2004 04:38:04 -0000
@@ -25,6 +25,7 @@
#endif
#include "e-shell.h"
+#include "e-shell-view.h"
#include "e-util/e-dialog-utils.h"
#include "e-util/e-bconf-map.h"
@@ -208,7 +209,7 @@
return FALSE;
}
-static void
+static GNOME_Evolution_ShellView
impl_Shell_createNewWindow (PortableServer_Servant servant,
const CORBA_char *component_id,
CORBA_Environment *ev)
@@ -216,9 +217,10 @@
BonoboObject *bonobo_object;
EShell *shell;
EShellWindow *shell_window;
+ EShellView *shell_view;
if (raise_exception_if_not_ready (servant, ev))
- return;
+ return CORBA_OBJECT_NIL;
bonobo_object = bonobo_object_from_servant (servant);
shell = E_SHELL (bonobo_object);
@@ -230,8 +232,13 @@
if (shell_window == NULL) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
- return;
+ return CORBA_OBJECT_NIL;
}
+
+ /* refs?? */
+ shell_view = e_shell_view_new(shell_window);
+
+ return BONOBO_OBJREF(shell_view);
}
static void
Index: storage/GNOME_Evolution_Exchange_Storage.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/GNOME_Evolution_Exchange_Storage.server.in.in,v
retrieving revision 1.2
diff -u -3 -r1.2 GNOME_Evolution_Exchange_Storage.server.in.in
--- storage/GNOME_Evolution_Exchange_Storage.server.in.in 3 Jun 2004 15:47:55 -0000 1.2
+++ storage/GNOME_Evolution_Exchange_Storage.server.in.in 28 Jun 2004 04:39:19 -0000
@@ -20,6 +20,8 @@
<item value="IDL:GNOME/Evolution/Component:@BASE_VERSION@"/>
</oaf_attribute>
+ <oaf_attribute name="evolution:component_alias" type="string" value="exchange"/>
+
<oaf_attribute name="name" type="string"
_value="Evolution Exchange Component"/>
<oaf_attribute name="evolution:button_icon" type="string"
Index: storage/exchange-component.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/storage/exchange-component.c,v
retrieving revision 1.2
diff -u -3 -r1.2 exchange-component.c
--- storage/exchange-component.c 12 Jun 2004 10:56:11 -0000 1.2
+++ storage/exchange-component.c 28 Jun 2004 04:39:19 -0000
@@ -29,6 +29,8 @@
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-main.h>
+#include "shell/e-component-view.h"
+
#include "e-storage-set.h"
#include "e-storage-set-view.h"
@@ -115,36 +117,27 @@
G_OBJECT_CLASS (parent_class)->finalize (object);
}
-static void
-impl_createControls (PortableServer_Servant servant,
- Bonobo_Control *sidebar_control,
- Bonobo_Control *view_control,
- Bonobo_Control *statusbar_control,
- CORBA_Environment *ev)
+static GNOME_Evolution_ComponentView
+impl_createView (PortableServer_Servant servant,
+ GNOME_Evolution_ShellView parent,
+ CORBA_Environment *ev)
{
ExchangeComponent *component = EXCHANGE_COMPONENT (bonobo_object_from_servant (servant));
ExchangeComponentPrivate *priv = component->priv;
XCBackendView *view;
BonoboControl *control = NULL;
- d(printf("createControls...\n"));
+ d(printf("createView...\n"));
view = xc_backend_view_new (priv->config_listener,
priv->folder_type_registry);
if (view)
priv->views = g_slist_append (priv->views, control);
- control = xc_backend_view_get_sidebar (view);
- *sidebar_control =
- CORBA_Object_duplicate (BONOBO_OBJREF (control), ev);
-
- control = xc_backend_view_get_statusbar (view);
- *statusbar_control =
- CORBA_Object_duplicate (BONOBO_OBJREF (control), ev);
-
- control = xc_backend_view_get_view (view);
- *view_control =
- CORBA_Object_duplicate (BONOBO_OBJREF (control), ev);
+ return BONOBO_OBJREF(e_component_view_new_controls(parent, "exchange",
+ xc_backend_view_get_sidebar (view),
+ xc_backend_view_get_view (view),
+ xc_backend_view_get_statusbar (view));
}
static void
@@ -349,7 +342,7 @@
object_class->dispose = dispose;
object_class->finalize = finalize;
- epv->createControls = impl_createControls;
+ epv->createView = impl_createView;
epv->upgradeFromVersion = impl_upgradeFromVersion;
epv->requestQuit = impl_requestQuit;
epv->quit = impl_quit;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
