diff options
Diffstat (limited to 'shell')
30 files changed, 0 insertions, 3797 deletions
diff --git a/shell/.cvsignore b/shell/.cvsignore deleted file mode 100644 index 0f718dcf79..0000000000 --- a/shell/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -.deps -.libs -Shell-stubs.c -Shell-skels.c -Shell-common.c -Shell.h -evolution -Makefile.in -Makefile -Evolution-stubs.c -Evolution-skels.c -Evolution-common.c -Evolution.h
\ No newline at end of file diff --git a/shell/ChangeLog b/shell/ChangeLog deleted file mode 100644 index de2478e268..0000000000 --- a/shell/ChangeLog +++ /dev/null @@ -1,215 +0,0 @@ -2000-04-19 Seth Alves <alves@hungry.com> - - * e-shell-view.c (get_view): set calendar's uri with a property bag - -2000-04-19 Christopher James Lahey <clahey@helixcode.com> - - * idl/folder.idl: New idl file. Still unused. - -2000-04-14 Christopher James Lahey <clahey@helixcode.com> - - * e-shell-view.c: Made the left pane of the shell view not - autoresize. - -2000-04-09 Matt Loper <matt@helixcode.com> - - * e-shell-view.c (e_shell_view_setup): Set the default height - bigger, to 600, so that everything in the shortcut-bar shows up. - -2000-04-07 Matt Loper <matt@helixcode.com> - - * e-shell-view.c (destroy_folder_view): New function; - Bonobo_Unknown_unref's the controls that have the views in them. - (esv_destroy): Calls the above for each folder_view in the - hashtable. - (get_view): unref the ServiceRepository interface of the control - when we're done with it. - -2000-04-06 Miguel de Icaza <miguel@gnu.org> - - * shell/e-shortcut.c (shell_icon_cb): Append a slash here. - (shell_icons): Only list the filenames. - - * shell/main.c (evolution_boot): Be less rude. - -2000-04-06 Matt Loper <matt@helixcode.com> - - * shell/main.c (evolution_boot): Make sure our data directory is - available with e_setup_base_dir (). - -2000-04-06 Miguel de Icaza <miguel@gnu.org> - - * shell/e-shortcut.c (shell_icon_cb): Load the icons from the - installation path, not form the GNOME-libs installation prefix. - (shell_icon_cb): Memory leak fix. - - * shell/Makefile.am (imagesdir): Pass the EVOLUTION_IMAGES - installation directory here. - -2000-04-05 Seth Alves <alves@hungry.com> - - * shell/e-shell-view.c (get_view): hook up control:calendar - -2000-03-31 Dan Winship <danw@helixcode.com> - - * shell/e-shortcut.c (e_shortcut_bar_view_new, shell_icon_cb): - Update for shortcut bar changes. - - * shell/e-folder.h: add E_FOLDER_SUMMARY - * shell/e-shell.c (e_shell_setup_default_folders): make the - "Today" icon be of type E_FOLDER_SUMMARY, not E_FOLDER_MAIL. - -2000-03-30 Dan Winship <danw@helixcode.com> - - * shell/e-shell-view.c (e_shell_view_set_view): Hold off on - deactivating the "outgoing" control until after setting up the - "incoming" control. That way if the new control takes a few - seconds to load, there won't be an ugly empty spot where the - toolbar used to be while the new control loads. - -2000-03-29 Dan Winship <danw@helixcode.com> - - * shell/e-shell-view.c (e_shell_view_set_view): Call - bonobo_control_frame_activate on the folder_view every time it - is displayed, and bonobo_control_frame_deactivate every time it is - hidden. - -2000-03-25 Matt Loper <matt@helixcode.com> - - * shell/e-shell-view.c (get_view): Move CORBA_Environment to - different scope. - -2000-03-22 Matt Loper <matt@helixcode.com> - - * shell/main.c (evolution_boot): gtk_signal_connect'ed "destroy" - to gtk_main_quit, so that the shell dies when you want it to. - - * shell/e-shell-view.c (get_view): Reorganized, and added - assertions. - (e_shell_view_set_view): Added assertions. - -2000-03-20 Matt Loper <matt@helixcode.com> - - * shell/e-shell-view.h: New private field in EShellView added, - which contains the notebook and a hashtable of folders to views. - - * shell/e-shell-view.c (e_shell_view_set_view): Instead of - creating a new control every time we set the view, we now keep our - controls in a notebook. This function now switches to the correct - notebook page, or creates a new page/control as necessary. - (e_shell_view_new): Creates and inserts the notebook into the - shell. - -2000-03-13 Christopher James Lahey <clahey@helixcode.com> - - * shell/e-shell-view.c: Added an E_FOLDER_CONTACTS section to the - get_view function. - -2000-03-13 bertrand <bertrand@helixcode.com> - - * shell/e-shell.c (EShell_register_service): - test implementation. Show the uri and the type - of service that has just been registered. - - * shell/e-shell-view.c (get_view): - once we have the bonobo control widget, - disable the autoactivation and activate - the control frame. - (get_view): added a parameter to have - a reference to the EShellView. - (get_view): In the case of the mail component - use the Evolution_ServiceRepository to - give the component a reference to the - Shell server. - -2000-03-12 bertrand <bertrand@helixcode.com> - - * shell/e-shell-view.c (get_view): name change - - - * shell/e-folder.c (e_folder_get_folder_type): added the - get_e_folder_type function. - - * shell/evolution-service-repository.c: - (evolution_service_repository_new): creates an - Evolution_ServiceRepository object. - (create_evolution_service_repository): - create the corresponding servant. - (evolution_service_repository_construct): set - the closure as well as the virtual functions. - -2000-03-12 bertrand <bertrand@helixcode.com> - - * shell/evolution-service-repository.c: - * shell/evolution-service-repository.h: - Implementation of the service repository interface - as a bonobo object. - - * shell/evolution-service-repository.idl: - new file. Contains the definition for the service - repository interface. - - * shell/Shell.idl: move the shell related stuff - here - -2000-03-12 bertrand <bertrand@helixcode.com> - - * shell/e-folder.h: add a field refering to a - service associated to the efolder. In the case of - distant folders, it is generally a server. - - * shell/e-service.c: New class. Models a service. - A service is an object with an URI and a root folder. - It genreally reporesents a distant folder. - A service is generally a ressource shared amongst - several folders. - * shell/e-service.h: - -2000-03-07 bertrand <bertrand@helixcode.com> - - * shell/e-shell-shortcut.c (shortcut_bar_item_selected): - removed a test that prevented the standard menu - to be shown. - -2000-03-01 Ettore Perazzoli <ettore@helixcode.com> - - * shell/Makefile.am (INCLUDES): use `top_srcdir' instead of - `srcdir'. Also, add `$(top_srcdir)'. And put the srcdir includes - before everything else. - (evolution_LDADD): `libeutil.la', not `libeutil.a'. - -2000-02-22 bertrand <Bertrand.Guiheneuf@aful.org> - - * shell/Makefile.am (evolution_LDADD): - add libetext.a. - -2000-02-08 Iain Holmes <ih@csd.abdn.ac.uk> - - * shell/Makefile.am: Changed the order of the compilation, so the CORBA - stuff was generated before it was needed. - -2000-01-15 Miguel de Icaza <miguel@gnu.org> - - * shell/e-shell.c: Construct the default folders - - * shell/e-shell-view.c (e_shell_view_new): Setup the main GnomeApp - application, load the shortcut, internal api. - - * shell/e-folder.c (e_folder_get_type_name): Return description - here; Change of policy; We now know about all of the possible - types that can be displayed on Evolution. - -2000-01-15 Miguel de Icaza <miguel@gnu.org> - - * shell/e-folder.c: Renamed signal. - - * widgets/shortcut-bar/e-shortcut-bar.c (e_shortcut_bar_add_item): - Use e_bar_set_item_data. - - Drop item_url; Require image argument; Require user data - argument. - -2000-01-05 Miguel de Icaza <miguel@gnu.org> - - * shell/Makefile.am: New file. - diff --git a/shell/Evolution.idl b/shell/Evolution.idl deleted file mode 100644 index c9026e2083..0000000000 --- a/shell/Evolution.idl +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * CORBA interface for the Evolution shell - * - * Authors: - * Miguel de Icaza (miguel@kernel.org) - * - * (C) 2000 Helix Code, Inc. - */ -#include <Bonobo.idl> -#include <Shell.idl> -#include <evolution-service-repository.idl> - diff --git a/shell/Makefile.am b/shell/Makefile.am deleted file mode 100644 index 6a5d1cbf7a..0000000000 --- a/shell/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -imagesdir = $(datadir)/images/evolution - -bin_PROGRAMS = evolution - -INCLUDES = \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir) \ - $(BONOBO_GNOME_CFLAGS) \ - -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ - -DEVOLUTION_VERSION=\""$(VERSION)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" - -EVOLUTION_CORBA_GENERATED = \ - Evolution.h \ - Evolution-common.c \ - Evolution-skels.c \ - Evolution-stubs.c - -evolution_SOURCES = \ - $(EVOLUTION_CORBA_GENERATED) \ - main.c \ - e-folder.c \ - e-folder.h \ - e-init.c \ - e-init.h \ - e-service.c \ - e-service.h \ - e-shell.c \ - e-shell.h \ - e-shell-shortcut.c \ - e-shell-shortcut.h \ - e-shell-view.c \ - e-shell-view.h \ - e-shell-view-menu.c \ - e-shell-view-menu.h \ - e-shortcut.c \ - e-shortcut.h \ - evolution-service-repository.c \ - evolution-service-repository.h - - -Evolution-impl.o: Evolution.h - -$(EVOLUTION_CORBA_GENERATED): Evolution.idl evolution-service-repository.idl - orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Evolution.idl - -evolution_LDADD = \ - ../widgets/shortcut-bar/libshortcut-bar.a \ - ../widgets/e-text/libetext.a \ - ../e-util/libeutil.la \ - $(BONOBO_GNOME_LIBS) - -EXTRA_DIST = Evolution.idl \ - Shell.idl \ - evolution-service-repository.idl - diff --git a/shell/Shell.idl b/shell/Shell.idl deleted file mode 100644 index 07dfbbf191..0000000000 --- a/shell/Shell.idl +++ /dev/null @@ -1,45 +0,0 @@ -/* - * CORBA interface for the Evolution shell - * - * Authors: - * Miguel de Icaza (miguel@kernel.org) - * - * (C) 2000 Helix Code, Inc. - */ -#include <bonobo.idl> - - -module Evolution { - interface Shell : Bonobo::Unknown { - enum NewType { - APPOINTMENT, - MEETING_REQUEST, - TASK, - TASK_REQUEST, - CONTACT, - MAIL_MESSAGE, - DISTRIBUTION_LIST, - JOURNAL_ENTRY, - NOTE - }; - - enum ServiceType { - MAIL_STORE, - MAIL_TRANSPORT - }; - - void new (in NewType type); - - /** - * register_service : register a service into the shell - * - * @type : type of the service - * @uri : uri of the service, uniquely determine the service. - * - */ - void register_service (in ServiceType type, - in string uri); - - - }; -}; diff --git a/shell/e-folder-mail.c b/shell/e-folder-mail.c deleted file mode 100644 index 9765b7d946..0000000000 --- a/shell/e-folder-mail.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * e-folder-mail.c: Mail folder - * - * Author: - * Miguel de Icaza (miguel@helixcode.com) - * - * (C) 2000 Helix Code, Inc. - */ -#include <config.h> -#include <glib.h> -#include <libgnome/gnome-defs.h> -#include <libgnome/gnome-i18n.h> -#include "e-util/e-util.h" -#include "e-folder-mail.h" - -#define PARENT_TYPE e_folder_get_type () - -static void -e_folder_mail_init (GtkObject *object) -{ -} - -E_MAKE_TYPE (e_folder_mail, "EFolderMail", EFolderMail, e_folder_mail_class_init, e_folder_mail_init, PARENT_TYPE) - -EFolder * -e_folder_mail_new (const char *uri, const char *name, const char *desc, - const char *home_page, const char *view_name) -{ - EFolderMail *efm = gtk_type_new (e_folder_mail_get_type ()); - - e_folder_construct (E_FOLDER (efm), E_FOLDER_MAIL, uri, name, desc, home_page, view_name); - - return E_FOLDER (efm); -} - - diff --git a/shell/e-folder-mail.h b/shell/e-folder-mail.h deleted file mode 100644 index 76098c6182..0000000000 --- a/shell/e-folder-mail.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _E_FOLDER_MAIL_H_ -#define _E_FOLDER_MAIL_H_ - -#include "e-folder.h" - -#define E_FOLDER_MAIL_TYPE (e_folder_mail_get_type ()) -#define E_FOLDER_MAIL(o) (GTK_CHECK_CAST ((o), E_FOLDER_MAIL_TYPE, EFolderMail)) -#define E_FOLDER_MAIL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_FOLDER_MAIL_TYPE, EFolderMailClass)) -#define E_IS_FOLDER_MAIL(o) (GTK_CHECK_TYPE ((o), E_FOLDER_MAIL_TYPE)) -#define E_IS_FOLDER_MAIL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_FOLDER_MAIL_TYPE)) - -typedef struct { - EFolder parent; -} EFolderMail; - -typedef struct { - EFolderClass parent; -} EFolderMailClass; - -GtkType e_folder_mail_get_type (void); -EFolder *e_folder_mail_new (const char *uri, const char *name, const char *desc, - const char *home_page, const char *view_name); - -#endif /* _E_FOLDER_MAIL_H_ */ - - - - diff --git a/shell/e-folder.c b/shell/e-folder.c deleted file mode 100644 index ba6e10b22e..0000000000 --- a/shell/e-folder.c +++ /dev/null @@ -1,266 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * e-folder.c: Abstract class for Evolution folders - * - * Author: - * Miguel de Icaza (miguel@helixcode.com) - * - * (C) 2000 Helix Code, Inc. - */ - - -#include <config.h> -#include <gtk/gtksignal.h> -#include <libgnome/libgnome.h> -#include "e-util/e-util.h" -#include "e-folder.h" - -#define PARENT_TYPE gtk_object_get_type () - -static GtkObjectClass *parent_class; - -#define EFC(o) E_FOLDER_CLASS (GTK_OBJECT (o)->klass) - -enum { - CHANGED, - LAST_SIGNAL -}; -static guint efolder_signals [LAST_SIGNAL] = { 0, }; - -static void -e_folder_destroy (GtkObject *object) -{ - EFolder *efolder = E_FOLDER (object); - - if (efolder->uri) - g_free (efolder->uri); - - if (efolder->desc) - g_free (efolder->desc); - - if (efolder->home_page) - g_free (efolder->home_page); - - parent_class->destroy (object); -} - -static void -e_folder_class_init (GtkObjectClass *object_class) -{ - parent_class = gtk_type_class (PARENT_TYPE); - - object_class->destroy = e_folder_destroy; - - efolder_signals [CHANGED] = - gtk_signal_new ("changed", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (EFolderClass, changed), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, - 0); - - /* Register our signals */ - gtk_object_class_add_signals ( - object_class, efolder_signals, LAST_SIGNAL); -} - -static void -e_folder_init (GtkObject *object) -{ -} - -E_MAKE_TYPE (e_folder, "EFolder", EFolder, e_folder_class_init, e_folder_init, PARENT_TYPE) - -void -e_folder_set_uri (EFolder *efolder, const char *uri) -{ - g_return_if_fail (efolder != NULL); - g_return_if_fail (E_IS_FOLDER (efolder)); - g_return_if_fail (uri != NULL); - - if (efolder->uri) - g_free (efolder->uri); - - efolder->uri = g_strdup (uri); -} - -const char * -e_folder_get_uri (EFolder *efolder) -{ - g_return_val_if_fail (efolder != NULL, NULL); - g_return_val_if_fail (E_IS_FOLDER (efolder), NULL); - - return efolder->uri; -} - -void -e_folder_set_description (EFolder *efolder, const char *desc) -{ - g_return_if_fail (efolder != NULL); - g_return_if_fail (E_IS_FOLDER (efolder)); - g_return_if_fail (desc != NULL); - - if (efolder->desc) - g_free (efolder->desc); - - efolder->desc = g_strdup (desc); -} - -const char * -e_folder_get_description (EFolder *efolder) -{ - g_return_val_if_fail (efolder != NULL, NULL); - g_return_val_if_fail (E_IS_FOLDER (efolder), NULL); - - return efolder->desc; -} - -void -e_folder_set_home_page (EFolder *efolder, const char *home_page) -{ - g_return_if_fail (efolder != NULL); - g_return_if_fail (E_IS_FOLDER (efolder)); - g_return_if_fail (home_page != NULL); - - if (efolder->home_page) - g_free (efolder->home_page); - - efolder->home_page = g_strdup (home_page); -} - -const char * -e_folder_get_home_page (EFolder *efolder) -{ - g_return_val_if_fail (efolder != NULL, NULL); - g_return_val_if_fail (E_IS_FOLDER (efolder), NULL); - - return efolder->home_page; -} - -const char * -e_folder_get_type_name (EFolder *efolder) -{ - g_return_val_if_fail (efolder != NULL, NULL); - g_return_val_if_fail (E_IS_FOLDER (efolder), NULL); - - switch (efolder->type){ - case E_FOLDER_MAIL: - return _("A folder containing mail items"); - - case E_FOLDER_CONTACTS: - return _("A folder containing contacts"); - - case E_FOLDER_CALENDAR: - return _("A folder containing calendar entries"); - - case E_FOLDER_TASKS: - return _("A folder containing tasks"); - - default: - g_assert_not_reached (); - } - - return NULL; -} - - -EFolderType -e_folder_get_folder_type (EFolder *efolder) -{ - g_return_val_if_fail (efolder != NULL, E_FOLDER_OTHER); - g_return_val_if_fail (E_IS_FOLDER (efolder), E_FOLDER_OTHER); - - return (efolder->type); -} - - - - -void -e_folder_construct (EFolder *efolder, EFolderType type, - const char *uri, const char *name, - const char *desc, const char *home_page, - const char *view_name) -{ - g_return_if_fail (efolder != NULL); - g_return_if_fail (E_IS_FOLDER (efolder)); - - /* EFolders are self-owned */ - GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (efolder), GTK_FLOATING); - - if (uri) - efolder->uri = g_strdup (uri); - if (name) - efolder->name = g_strdup (name); - if (desc) - efolder->desc = g_strdup (desc); - if (home_page) - efolder->home_page = g_strdup (home_page); - if (view_name) - efolder->view_name = g_strdup (view_name); - - efolder->type = type; -} - -EFolder * -e_folder_new (EFolderType type, - const char *uri, const char *name, - const char *desc, const char *home_page, - const char *view_name) -{ - EFolder *efolder; - - efolder = gtk_type_new (e_folder_get_type ()); - - e_folder_construct (efolder, type, uri, name, desc, home_page, view_name); - return efolder; -} - -const char * -e_folder_get_name (EFolder *efolder) -{ - g_return_val_if_fail (efolder != NULL, NULL); - g_return_val_if_fail (E_IS_FOLDER (efolder), NULL); - - return efolder->name; -} - -void -e_folder_set_name (EFolder *efolder, const char *name) -{ - g_return_if_fail (efolder != NULL); - g_return_if_fail (E_IS_FOLDER (efolder)); - - if (efolder->name) - g_free (efolder->name); - - efolder->name = g_strdup (name); -} - -const char * -e_folder_get_view_name (EFolder *efolder) -{ - g_return_val_if_fail (efolder != NULL, NULL); - g_return_val_if_fail (E_IS_FOLDER (efolder), NULL); - - return efolder->view_name; -} - -void -e_folder_set_view_name (EFolder *efolder, const char *view_name) -{ - g_return_if_fail (efolder != NULL); - g_return_if_fail (E_IS_FOLDER (efolder)); - - if (efolder->view_name) - g_free (efolder->view_name); - - efolder->view_name = g_strdup (view_name); - - gtk_signal_emit (GTK_OBJECT (efolder), - efolder_signals [CHANGED]); -} - - diff --git a/shell/e-folder.h b/shell/e-folder.h deleted file mode 100644 index 147399268b..0000000000 --- a/shell/e-folder.h +++ /dev/null @@ -1,94 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - - - -#ifndef _E_FOLDER_H_ -#define _E_FOLDER_H_ - - -#include "eshell-types.h" -#include <gtk/gtkobject.h> -#include <gdk-pixbuf/gdk-pixbuf.h> - - -#define E_FOLDER_TYPE (e_folder_get_type ()) -#define E_FOLDER(o) (GTK_CHECK_CAST ((o), E_FOLDER_TYPE, EFolder)) -#define E_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_FOLDER_TYPE, EFolderClass)) -#define E_IS_FOLDER(o) (GTK_CHECK_TYPE ((o), E_FOLDER_TYPE)) -#define E_IS_FOLDER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_FOLDER_TYPE)) - -typedef enum { - E_FOLDER_DND_AS_FORWARD, - E_FOLDER_DND_AS_MOVE_COPY -} EFolderDragDropAction; - -typedef enum { - E_FOLDER_SUMMARY, - E_FOLDER_MAIL, - E_FOLDER_CONTACTS, - E_FOLDER_CALENDAR, - E_FOLDER_TASKS, - E_FOLDER_OTHER -} EFolderType; - -struct _EFolder { - GtkObject parent_object; - - EFolderType type; - - EService *eservice; /* an Efolder should have an eservice */ - - /* - * General properties - */ - char *uri; /* Location */ - char *name; /* Short name */ - char *desc; /* Full description */ - char *home_page; /* Home page for this folder */ - - /* - * Administration properties - */ - char *view_name; /* View name */ -}; - -typedef struct { - GtkObjectClass parent_class; - - /* - * Notifies views of visible changes in the Efolder - */ - void (*changed) (EFolder *efolder); -} EFolderClass; - -GtkType e_folder_get_type (void); -void e_folder_construct (EFolder *efolder, EFolderType type, - const char *uri, const char *name, - const char *desc, const char *home_page, - const char *view_name); -EFolder *e_folder_new (EFolderType type, - const char *uri, const char *name, - const char *desc, const char *home_page, - const char *view_name); - -void e_folder_set_uri (EFolder *efolder, const char *uri); -const char *e_folder_get_uri (EFolder *efolder); - -void e_folder_set_description (EFolder *efolder, const char *desc); -const char *e_folder_get_description (EFolder *efolder); - -void e_folder_set_home_page (EFolder *efolder, const char *desc); -const char *e_folder_get_home_page (EFolder *efolder); - -const char *e_folder_get_name (EFolder *efolder); -void e_folder_set_name (EFolder *efolder, const char *name); - -const char *e_folder_get_view_name (EFolder *efolder); -void e_folder_set_view_name (EFolder *efolder, const char *view_name); - -const char *e_folder_get_type_name (EFolder *efolder); - -EFolderType e_folder_get_folder_type (EFolder *efolder); - -#endif /* _E_FOLDER_H_ */ - diff --git a/shell/e-init.c b/shell/e-init.c deleted file mode 100644 index 34ccdbcfc3..0000000000 --- a/shell/e-init.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * e-init.c: Initializes Evolution for first time users - * - */ -#include <config.h> -#include <gnome.h> -#include "e-init.h" -#include <sys/stat.h> -#include <sys/types.h> -#include <fcntl.h> -#include <unistd.h> -#include "e-util/e-gui-utils.h" - -char *evolution_base_dir; - -static void -e_init_local (void) -{ - evolution_base_dir = g_concat_dir_and_file (g_get_home_dir (), "Evolution"); - - if (g_file_exists (evolution_base_dir)) - return; - - if (-1 == mkdir (evolution_base_dir, 0755)){ - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Evolution can not create its local folders")); - exit (0); - } -} - -void -e_init (void) -{ - e_init_local (); -} diff --git a/shell/e-init.h b/shell/e-init.h deleted file mode 100644 index 5684f87b44..0000000000 --- a/shell/e-init.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef E_INIT_H -#define E_INIT_H - -extern char *evolution_base_dir; - -void e_init (void); - -#endif /* E_INIT_H */ diff --git a/shell/e-service.c b/shell/e-service.c deleted file mode 100644 index c8c52383f7..0000000000 --- a/shell/e-service.c +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * e-service.c: Abstract class for Evolution services - * - * Author: - * Bertrand Guiheneuf (bg@aful.org) - * Miguel de Icaza (miguel@helixcode.com) - * - * (C) 2000 Helix Code, Inc. - */ - -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 - */ - - - - -#include <config.h> -#include <libgnome/libgnome.h> -#include "e-util/e-util.h" -#include "e-service.h" - -#define PARENT_TYPE gtk_object_get_type () - -static GtkObjectClass *parent_class; - -#define EFC(o) E_SERVICE_CLASS (GTK_OBJECT (o)->klass) - - - -static void -e_service_destroy (GtkObject *object) -{ - EService *eservice = E_SERVICE (object); - - if (eservice->uri) - g_free (eservice->uri); - - if (eservice->desc) - g_free (eservice->desc); - - if (eservice->home_page) - g_free (eservice->home_page); - - parent_class->destroy (object); -} - -static void -e_service_class_init (GtkObjectClass *object_class) -{ - parent_class = gtk_type_class (PARENT_TYPE); - - object_class->destroy = e_service_destroy; - - -} - -static void -e_service_init (GtkObject *object) -{ -} - -E_MAKE_TYPE (e_service, "EService", EService, e_service_class_init, e_service_init, PARENT_TYPE) - - -EFolder * -e_service_get_root_efolder (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->root_efolder; -} - - - -void -e_service_set_uri (EService *eservice, const char *uri) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - g_return_if_fail (uri != NULL); - - if (eservice->uri) - g_free (eservice->uri); - - eservice->uri = g_strdup (uri); -} - -const char * -e_service_get_uri (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->uri; -} - -void -e_service_set_description (EService *eservice, const char *desc) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - g_return_if_fail (desc != NULL); - - if (eservice->desc) - g_free (eservice->desc); - - eservice->desc = g_strdup (desc); -} - -const char * -e_service_get_description (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->desc; -} - -void -e_service_set_home_page (EService *eservice, const char *home_page) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - g_return_if_fail (home_page != NULL); - - if (eservice->home_page) - g_free (eservice->home_page); - - eservice->home_page = g_strdup (home_page); -} - -const char * -e_service_get_home_page (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->home_page; -} - -const char * -e_service_get_type_name (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - switch (eservice->type){ - case E_SERVICE_MAIL: - return _("A service containing mail items"); - - case E_SERVICE_CONTACTS: - return _("A service containing contacts"); - - case E_SERVICE_CALENDAR: - return _("A service containing calendar entries"); - - case E_SERVICE_TASKS: - return _("A service containing tasks"); - - default: - g_assert_not_reached (); - } - - return NULL; -} - -void -e_service_construct (EService *eservice, EServiceType type, - const char *uri, const char *name, - const char *desc, const char *home_page) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - - - /* EServices are self-owned */ - GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (eservice), GTK_FLOATING); - - if (uri) - eservice->uri = g_strdup (uri); - if (name) - eservice->name = g_strdup (name); - if (desc) - eservice->desc = g_strdup (desc); - if (home_page) - eservice->home_page = g_strdup (home_page); - - eservice->type = type; -} - -EService * -e_service_new (EServiceType type, - const char *uri, const char *name, - const char *desc, const char *home_page) -{ - EService *eservice; - - eservice = gtk_type_new (e_service_get_type ()); - - e_service_construct (eservice, type, uri, name, desc, home_page); - return eservice; -} - -const char * -e_service_get_name (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->name; -} - -void -e_service_set_name (EService *eservice, const char *name) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - - if (eservice->name) - g_free (eservice->name); - - eservice->name = g_strdup (name); -} - - diff --git a/shell/e-service.h b/shell/e-service.h deleted file mode 100644 index 3488d613ee..0000000000 --- a/shell/e-service.h +++ /dev/null @@ -1,142 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* camel-stream-fs.h : abstract class for the Evolution services */ - -/* - * - * Author : - * Bertrand Guiheneuf <bertrand@helixcode.com> - * Miguel de Icaza (miguel@helixcode.com) - * - * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 class represents a service, that is, an object - * we can get e-folders from. - * - * In the case of the mail, it represents : - * - a store to get mail folder from (an imap server, - * an mbox toplevel directory - * or - * - a mail transport thanks to which you can send - * mail from. - * - * This class may probably handle the connection - * operations, and probably allow the some kind of - * configuration of the authentication methods - * used. - * - * - * NOTE : this class shares a lot of code and properties - * with the folder class. It may be a good idea to determine - * exactely if it would be useful to make both classes - * be children of another parent abstract class. - * for the moment, we don't really show the service to - * the user in the UI, so that there is not an urgent - * need to create the abstract parent class. - * - * - ber. - * - */ - - -#ifndef _E_SERVICE_H_ -#define _E_SERVICE_H_ - -#include "eshell-types.h" -#include <gtk/gtkobject.h> - -#define E_SERVICE_TYPE (e_service_get_type ()) -#define E_SERVICE(o) (GTK_CHECK_CAST ((o), E_SERVICE_TYPE, EService)) -#define E_SERVICE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SERVICE_TYPE, EServiceClass)) -#define E_IS_SERVICE(o) (GTK_CHECK_TYPE ((o), E_SERVICE_TYPE)) -#define E_IS_SERVICE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SERVICE_TYPE)) - - -typedef enum { - E_SERVICE_MAIL = 1 << 0, - E_SERVICE_CONTACTS = 1 << 1, - E_SERVICE_CALENDAR = 1 << 2, - E_SERVICE_TASKS = 1 << 3, - E_SERVICE_OTHER = 1 << 4 -} EServiceType; - - struct _EService { - - GtkObject parent_object; - - EFolder *root_efolder; /* a service may have a root EFolder */ - - /* - * General properties - */ - char *uri; /* Location */ - char *name; /* Short name */ - char *desc; /* Full description */ - char *home_page; /* Home page for this service */ - - EServiceType type; /* type of the service */ - - -}; - -typedef struct { - GtkObjectClass parent_class; - -} EServiceClass; - -GtkType e_service_get_type (void); -void e_service_construct (EService *eservice, - EServiceType type, - const char *uri, - const char *name, - const char *desc, - const char *home_page); -EService *e_service_new (EServiceType type, - const char *uri, - const char *name, - const char *desc, - const char *home_page); - -EFolder *e_service_get_root_efolder (EService *eservice); - -void e_service_set_uri (EService *eservice, - const char *uri); -const char *e_service_get_uri (EService *eservice); - -void e_service_set_description (EService *eservice, - const char *desc); -const char *e_service_get_description (EService *eservice); - -void e_service_set_home_page (EService *eservice, - const char *desc); -const char *e_service_get_home_page (EService *eservice); - -const char *e_service_get_name (EService *eservice); -void e_service_set_name (EService *eservice, - const char *name); - - -const char *e_service_get_type_name (EService *eservice); - -#endif /* _E_SERVICE_H_ */ - - - - diff --git a/shell/e-shell-shortcut.c b/shell/e-shell-shortcut.c deleted file mode 100644 index 6ac3fc9e1c..0000000000 --- a/shell/e-shell-shortcut.c +++ /dev/null @@ -1,316 +0,0 @@ -/* - * e-shell-shortcut.c: Handles events from the shortcut bar widget on the - * e-shell-view - * - * Authors: - * Damon Chaplin (damon@gtk.org) - * Miguel de Icaza (miguel@kernel.org) - * - * (C) 1999, 2000 Helix Code, Inc. - */ -#include <config.h> -#include <gnome.h> -#include "shortcut-bar/e-shortcut-bar.h" -#include "e-shell-shortcut.h" -#include "e-shell-view.h" - -#define SMALL_ICONS 1 -#define LARGE_ICONS 2 - -typedef struct { - EShellView *eshell_view; - EShortcutGroup *sg; -} closure_group_t; - -static void -set_large_icons (GtkMenuItem *menu_item, closure_group_t *closure) -{ - e_shortcut_group_set_view_type (closure->sg, E_ICON_BAR_LARGE_ICONS); -} - -static void -set_small_icons (GtkMenu *menu_item, closure_group_t *closure) -{ - e_shortcut_group_set_view_type (closure->sg, E_ICON_BAR_SMALL_ICONS); -} - -static void -add_group (GtkMenu *menu, closure_group_t *closure) -{ - int group_num; - GtkWidget *entry; - - group_num = e_shortcut_bar_model_add_group (closure->eshell_view->eshell->shortcut_bar); - - /* - * FIXME: Figure out why this does not quite work - */ - entry = gtk_entry_new (); - gtk_widget_show (entry); - - e_group_bar_set_group_button_label ( - E_GROUP_BAR (closure->eshell_view->shortcut_bar), - group_num, - entry); -} - -static void -remove_group (GtkMenuItem *menu_item, closure_group_t *closure) -{ - e_shortcut_bar_model_remove_group (closure->eshell_view->eshell->shortcut_bar, closure->sg); -} - -static void -do_rename (GtkEntry *entry, EShortcutGroup *sg) -{ - e_shortcut_group_rename (sg, gtk_entry_get_text (entry)); -} - -static void -rename_group (GtkMenuItem *menu_item, closure_group_t *closure) -{ - GtkWidget *entry; - int item; - - item = e_group_num_from_group_ptr (closure->eshell_view->eshell->shortcut_bar, closure->sg); - e_shortcut_group_rename (closure->sg, "Ren Test"); - - return; - - entry = gtk_entry_new (); - gtk_widget_show (entry); - gtk_widget_grab_focus (entry); - - gtk_signal_connect (GTK_OBJECT (entry), "activate", GTK_SIGNAL_FUNC (do_rename), closure->sg); - - e_group_bar_set_group_button_label (E_GROUP_BAR (closure->eshell_view->shortcut_bar), item, entry); -} - -static void -add_shortcut (GtkMenu *menu, closure_group_t *closure) -{ -} - -static struct { - char *label; - int flags; - GtkSignalFunc callback; -} shortcut_menu [] = { - { N_("Large Icons"), SMALL_ICONS, GTK_SIGNAL_FUNC (set_large_icons) }, - { N_("Small Icons"), LARGE_ICONS, GTK_SIGNAL_FUNC (set_small_icons) }, - { NULL, 0, NULL }, - { N_("Add New Group"), 0, GTK_SIGNAL_FUNC (add_group) }, - { N_("Remove Group"), 0, GTK_SIGNAL_FUNC (remove_group) }, - { N_("Rename Group"), 0, GTK_SIGNAL_FUNC (rename_group) }, - { NULL, 0, NULL }, - { N_("Add Shortcut"), 0, GTK_SIGNAL_FUNC (add_shortcut) }, -}; - -#define ELEMENTS(x) (sizeof (x) / sizeof (x[0])) - -static void -shortcut_bar_show_standard_popup (EShellView *eshell_view, GdkEvent *event, EShortcutGroup *shortcut_group) -{ - GtkWidget *menu, *menuitem; - int i; - closure_group_t closure; - - menu = gtk_menu_new (); - - closure.sg = shortcut_group; - closure.eshell_view = eshell_view; - - for (i = 0; i < ELEMENTS (shortcut_menu); i++){ - gboolean disable = FALSE; - - if (shortcut_menu [i].flags & SMALL_ICONS) - if (shortcut_group->type != E_ICON_BAR_SMALL_ICONS) - disable = TRUE; - - if (shortcut_menu [i].flags & LARGE_ICONS) - if (shortcut_group->type != E_ICON_BAR_LARGE_ICONS) - disable = TRUE; - - if (shortcut_menu [i].label == NULL){ - menuitem = gtk_menu_item_new (); - gtk_widget_set_sensitive (menuitem, FALSE); - } else - menuitem = gtk_menu_item_new_with_label (_(shortcut_menu [i].label)); - - if (disable) - gtk_widget_set_sensitive (menuitem, FALSE); - - gtk_widget_show (menuitem); - gtk_menu_append (GTK_MENU (menu), menuitem); - - gtk_signal_connect ( - GTK_OBJECT (menuitem), "activate", - shortcut_menu [i].callback, &closure); - } - - gtk_signal_connect (GTK_OBJECT (menu), "deactivate", - GTK_SIGNAL_FUNC (gtk_main_quit), NULL); - - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, - event->button.button, event->button.time); - - gtk_main (); - - gtk_object_destroy (GTK_OBJECT (menu)); -} - -typedef struct { - EShellView *eshell_view; - EShortcutGroup *sg; - EShortcut *shortcut; -} closure_context_t; - -static void -shortcut_open (GtkMenuItem *menuitem, closure_context_t *closure) -{ - e_shell_view_set_view (closure->eshell_view, closure->shortcut->efolder); -} - -static void -shortcut_open_new_window (GtkMenuItem *menuitem, closure_context_t *closure) -{ - GtkWidget *toplevel; - - toplevel = e_shell_view_new (closure->eshell_view->eshell, closure->shortcut->efolder, FALSE); - gtk_widget_show (toplevel); -} - -static void -shortcut_remove (GtkMenuItem *menuitem, closure_context_t *closure) -{ - e_shortcut_group_remove (closure->sg, closure->shortcut); -} - -static void -shortcut_rename (GtkMenuItem *menuitem, closure_context_t *closure) -{ - printf ("Implement: %s %s\n", __FILE__, __FUNCTION__); -} - -static void -shortcut_properties (GtkMenuItem *menuitem, closure_context_t *closure) -{ - printf ("Implement: %s %s\n", __FILE__, __FUNCTION__); -} - -#define NOT_IMPLEMENTED 1 -static struct { - char *label; - char *stock_id; - int flags; - GtkSignalFunc callback; -} context_shortcut_menu [] = { - { N_("Open Folder"), GNOME_STOCK_MENU_OPEN, 0, GTK_SIGNAL_FUNC (shortcut_open) }, - { N_("Open in New Window"), NULL, 0, GTK_SIGNAL_FUNC (shortcut_open_new_window) }, - { N_("Advanced Find"), NULL, NOT_IMPLEMENTED, NULL }, - { NULL, }, - { N_("Remove From Shortcut Bar"), NULL, 0, GTK_SIGNAL_FUNC (shortcut_remove) }, - { N_("Rename Shortcut"), NULL, 0, GTK_SIGNAL_FUNC (shortcut_rename) }, - { NULL, }, - { N_("Properties"), NULL, 0, GTK_SIGNAL_FUNC (shortcut_properties) }, -}; - -static void -shortcut_bar_show_context_popup (EShellView *eshell_view, GdkEvent *event, - EShortcutGroup *shortcut_group, EShortcut *shortcut) -{ - closure_context_t closure; - GtkWidget *menu, *menuitem; - int i; - gboolean disable; - - menu = gtk_menu_new (); - - closure.eshell_view = eshell_view; - closure.sg = shortcut_group; - closure.shortcut = shortcut; - - for (i = 0; i < ELEMENTS (context_shortcut_menu); i++){ - disable = FALSE; - - if (context_shortcut_menu [i].flags & NOT_IMPLEMENTED) - disable = TRUE; - - if (context_shortcut_menu [i].label == NULL){ - menuitem = gtk_menu_item_new (); - gtk_widget_set_sensitive (menuitem, FALSE); - } else { - GtkWidget *label; - - if (context_shortcut_menu [i].stock_id){ - GtkWidget *stock; - - menuitem = gtk_pixmap_menu_item_new (); - stock = gnome_stock_pixmap_widget ( - menu, - context_shortcut_menu [i].stock_id); - if (stock){ - gtk_widget_show (stock); - gtk_pixmap_menu_item_set_pixmap ( - GTK_PIXMAP_MENU_ITEM (menuitem), stock); - } - } else - menuitem = gtk_menu_item_new (); - - label = gtk_label_new (_(context_shortcut_menu [i].label)); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_widget_show (label); - gtk_container_add (GTK_CONTAINER (menuitem), label); - } - - if (disable) - gtk_widget_set_sensitive (menuitem, FALSE); - - gtk_widget_show (menuitem); - gtk_menu_append (GTK_MENU (menu), menuitem); - - gtk_signal_connect ( - GTK_OBJECT (menuitem), "activate", - context_shortcut_menu [i].callback, &closure); - } - - gtk_signal_connect (GTK_OBJECT (menu), "deactivate", - GTK_SIGNAL_FUNC (gtk_main_quit), NULL); - - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, - event->button.button, event->button.time); - - gtk_main (); - - gtk_object_destroy (GTK_OBJECT (menu)); -} - -void -shortcut_bar_item_selected (EShortcutBar *e_shortcut_bar, - GdkEvent *event, gint group_num, gint item_num, - EShellView *eshell_view) -{ - EShortcut *shortcut; - EShortcutGroup *shortcut_group; - EShortcutBarModel *shortcut_bar = eshell_view->eshell->shortcut_bar; - - shortcut_group = e_shortcut_group_from_pos (shortcut_bar, group_num); - if (shortcut_group == NULL) - return; - - shortcut = e_shortcut_from_pos (shortcut_group, item_num); - - - if (event->button.button == 1) { - e_shell_view_set_view (eshell_view, shortcut->efolder); - } else if (event->button.button == 3) { - - if (shortcut == NULL) - shortcut_bar_show_standard_popup ( - eshell_view, event, shortcut_group); - else - shortcut_bar_show_context_popup ( - eshell_view, event, shortcut_group, shortcut); - } -} - diff --git a/shell/e-shell-shortcut.h b/shell/e-shell-shortcut.h deleted file mode 100644 index 2f526be6ab..0000000000 --- a/shell/e-shell-shortcut.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef E_SHELL_SHORTCUT_H -#define E_SHELL_SHORTCUT_H - -#include "e-shell-view.h" - - -void shortcut_bar_item_selected (EShortcutBar *shortcut_bar, - GdkEvent *event, gint group_num, gint item_num, - EShellView *eshell_view); - -#endif /* E_SHELL_SHORTCUT_H */ diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c deleted file mode 100644 index 8e8231d774..0000000000 --- a/shell/e-shell-view-menu.c +++ /dev/null @@ -1,227 +0,0 @@ -/* - * E-shell-view-menu.c: Controls the shell view's menus. - * - * This file provides API entry points for changing and updating - * the menus to reflect the status of Evolution. - * - * Authors: - * Miguel de Icaza (miguel@helixcode.com) - * - * (C) 2000 Helix Code, Inc. - */ - -#include <config.h> -#include <gnome.h> -#include "e-shell-view.h" -#include "e-shell-view-menu.h" - -static void -esv_cmd_new_folder (GtkWidget *widget, EShellView *esv) -{ - e_shell_view_new_folder (esv); -} - -static void -esv_cmd_new_shortcut (GtkWidget *widget, EShellView *esv) -{ - e_shell_view_new_shortcut (esv); -} - -static void -esv_cmd_new_mail_message (GtkWidget *widget, EShellView *esv) -{ - e_shell_new_mail_message (esv->eshell); -} - -static void -esv_cmd_new_meeting_request (GtkWidget *widget, EShellView *esv) -{ - e_shell_new_meeting_request (esv->eshell); -} - -static void -esv_cmd_new_contact (GtkWidget *widget, EShellView *esv) -{ - e_shell_new_contact (esv->eshell); -} - -static void -esv_cmd_new_task (GtkWidget *widget, EShellView *esv) -{ - e_shell_new_task (esv->eshell); -} - -static void -esv_cmd_new_task_request (GtkWidget *widget, EShellView *esv) -{ - e_shell_new_task_request (esv->eshell); -} - -static void -esv_cmd_new_journal_entry (GtkWidget *widget, EShellView *esv) -{ - e_shell_new_journal_entry (esv->eshell); -} - -static void -esv_cmd_new_note (GtkWidget *widget, EShellView *esv) -{ - e_shell_new_note (esv->eshell); -} - -static void -esv_cmd_open_selected_items (GtkWidget *widget, EShellView *esv) -{ - printf ("Unimplemented open selected items\n"); -} - -static void -esv_cmd_save_as (GtkWidget *widget, EShellView *esv) -{ -} - -static void -quit_cmd (GtkWidget *widget, EShellView *esv) -{ - e_shell_quit (esv->eshell); -} - -static void -esv_cmd_close_open_items (GtkWidget *widget, EShellView *esv) -{ - printf ("Unimplemented function"); -} - -/* - * Fixme - * - * This menu is actually pretty dynamic, it changes de values of various entries - * depending on the current data being displayed - * - * This is currently only a placeholder. We need to figure what to do about this. - */ -static GnomeUIInfo esv_menu_file_new [] = { - - { GNOME_APP_UI_ITEM, N_("_Folder"), - NULL, esv_cmd_new_folder, NULL, - NULL, 0, 0, 'e', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - - { GNOME_APP_UI_ITEM, N_("Evolution _Bar Shortcut"), - NULL, esv_cmd_new_shortcut, NULL, - NULL, 0, 0, 'e', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - - GNOMEUIINFO_SEPARATOR, - - { GNOME_APP_UI_ITEM, N_("_Mail message"), - N_("Composes a new mail message"), esv_cmd_new_mail_message, NULL, - NULL, 0, 0, 'n', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - { GNOME_APP_UI_ITEM, N_("_Appointment"), - N_("Composes a new mail message"), esv_cmd_new_mail_message, NULL, - NULL, 0, 0, 'a', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - { GNOME_APP_UI_ITEM, N_("Meeting Re_quest"), NULL, - esv_cmd_new_meeting_request, NULL, - NULL, 0, 0, 'q', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - { GNOME_APP_UI_ITEM, N_("_Contact"), NULL, - esv_cmd_new_contact, NULL, - NULL, 0, 0, 'c', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - { GNOME_APP_UI_ITEM, N_("_Task"), NULL, - esv_cmd_new_task, NULL, - NULL, 0, 0, 'k', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - { GNOME_APP_UI_ITEM, N_("Task _Request"), NULL, - esv_cmd_new_task_request, NULL, - NULL, 0, 0, 'u', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - { GNOME_APP_UI_ITEM, N_("_Journal Entry"), NULL, - esv_cmd_new_journal_entry, NULL, - NULL, 0, 0, 'j', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - { GNOME_APP_UI_ITEM, N_("_Note"), NULL, - esv_cmd_new_note, NULL, - NULL, 0, 0, 'o', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - - GNOMEUIINFO_SEPARATOR, - - GNOMEUIINFO_END -}; - -static GnomeUIInfo esv_menu_file_open [] = { - { GNOME_APP_UI_ITEM, N_("_Selected Items"), NULL, - esv_cmd_open_selected_items, NULL, - NULL, 0, 0, 'o', GDK_CONTROL_MASK }, - - GNOMEUIINFO_END -}; - -static GnomeUIInfo esv_menu_folder [] = { - { GNOME_APP_UI_ITEM, N_("_New Folder"), NULL, - esv_cmd_new_folder, NULL, - NULL, 0, 0, 'e', GDK_CONTROL_MASK | GDK_SHIFT_MASK }, - - GNOMEUIINFO_END -}; - -static GnomeUIInfo esv_menu_file [] = { - GNOMEUIINFO_SUBTREE_STOCK (N_("_New"), esv_menu_file_new, GNOME_STOCK_MENU_NEW), - GNOMEUIINFO_SUBTREE_STOCK (N_("_Open"), esv_menu_file_open, GNOME_STOCK_MENU_NEW), - GNOMEUIINFO_ITEM_NONE (N_("Clos_e All Items"), N_("Closes all the open items"), esv_cmd_close_open_items), - GNOMEUIINFO_SEPARATOR, - - GNOMEUIINFO_MENU_SAVE_AS_ITEM (esv_cmd_save_as, NULL), - - GNOMEUIINFO_SEPARATOR, - - GNOMEUIINFO_SUBTREE (N_("_Folder"), esv_menu_folder), - - GNOMEUIINFO_SEPARATOR, - - GNOMEUIINFO_MENU_EXIT_ITEM(quit_cmd, NULL), - - GNOMEUIINFO_END -}; - -static GnomeUIInfo esv_menu_edit [] = { - GNOMEUIINFO_END -}; - -static GnomeUIInfo esv_menu_view [] = { - GNOMEUIINFO_END -}; - -static GnomeUIInfo esv_menu_tools [] = { - GNOMEUIINFO_END -}; - -static GnomeUIInfo esv_menu_actions [] = { - GNOMEUIINFO_END -}; - -static GnomeUIInfo esv_menu [] = { - GNOMEUIINFO_MENU_FILE_TREE (esv_menu_file), - GNOMEUIINFO_MENU_EDIT_TREE (esv_menu_edit), - GNOMEUIINFO_MENU_VIEW_TREE (esv_menu_view), - - /* FIXME: add Favorites here */ - - { GNOME_APP_UI_SUBTREE, N_("_Tools"), NULL, esv_menu_tools }, - { GNOME_APP_UI_SUBTREE, N_("_Actions"), NULL, esv_menu_actions }, -#warning Should provide a help menu here; Bonobo needs it - GNOMEUIINFO_END -}; - -/* - * Sets up the menus for the EShellView. - * - * Creates the Bonobo UI Handler, and then loads the menus from our - * GnomeUIInfo definitions - */ -void -e_shell_view_setup_menus (EShellView *eshell_view) -{ - BonoboUIHandlerMenuItem *list; - - eshell_view->uih = bonobo_ui_handler_new (); - bonobo_ui_handler_set_app (eshell_view->uih, GNOME_APP (eshell_view)); - bonobo_ui_handler_create_menubar (eshell_view->uih); - - list = bonobo_ui_handler_menu_parse_uiinfo_list_with_data (esv_menu, eshell_view); - bonobo_ui_handler_menu_add_list (eshell_view->uih, "/", list); - bonobo_ui_handler_menu_free_list (list); -} diff --git a/shell/e-shell-view-menu.h b/shell/e-shell-view-menu.h deleted file mode 100644 index f198efb806..0000000000 --- a/shell/e-shell-view-menu.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef E_SHELL_VIEW_MENU_H -#define E_SHELL_VIEW_MENU_H - -void e_shell_view_setup_menus (EShellView *eshell_view); - -#endif /* E_SHELL_VIEW_MENU_H */ diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c deleted file mode 100644 index e18af8550d..0000000000 --- a/shell/e-shell-view.c +++ /dev/null @@ -1,364 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * E-shell-view.c: Implements a Shell View of Evolution - * - * Authors: - * Miguel de Icaza (miguel@helixcode.com) - * - * (C) 2000 Helix Code, Inc. - */ -#include <config.h> -#include <gnome.h> -#include "shortcut-bar/e-shortcut-bar.h" -#include "e-util/e-util.h" -#include "e-shell-view.h" -#include "e-shell-view-menu.h" -#include "e-shell-shortcut.h" -#include "Evolution.h" - -#include <bonobo.h> -#include <libgnorba/gnorba.h> - -#define PARENT_TYPE gnome_app_get_type () - -static GtkObjectClass *parent_class; - -struct _EShellViewPrivate -{ - /* a hashtable of e-folders -> widgets */ - GHashTable *folder_views; - GtkWidget *notebook; -}; - -static void -destroy_folder_view (EFolder *unused, GtkWidget *folder_view, gpointer unused2) -{ - BonoboWidget *bonobo_widget; - BonoboObject *bonobo_object; - CORBA_Object corba_control; - CORBA_Environment ev; - - g_print ("%s: %s entered\n", - __FILE__, __FUNCTION__); - - g_return_if_fail (BONOBO_IS_WIDGET (folder_view)); - - bonobo_widget = BONOBO_WIDGET (folder_view); - - bonobo_object = BONOBO_OBJECT ( - bonobo_widget_get_server (bonobo_widget)); - - corba_control = bonobo_object_corba_objref (bonobo_object); - - g_return_if_fail (corba_control != NULL); - - CORBA_exception_init (&ev); - - /* hangs on this! */ - Bonobo_Unknown_unref (corba_control, &ev); - CORBA_exception_free (&ev); - - g_print ("%s: %s exited\n", - __FILE__, __FUNCTION__); -} - - -static void -esv_destroy (GtkObject *object) -{ - EShellView *eshell_view = E_SHELL_VIEW (object); - - e_shell_unregister_view (eshell_view->eshell, eshell_view); - - g_hash_table_foreach (eshell_view->priv->folder_views, - destroy_folder_view, NULL); - - g_hash_table_destroy (eshell_view->priv->folder_views); - g_free (eshell_view->priv); - parent_class->destroy (object); -} - -static void -e_shell_view_class_init (GtkObjectClass *object_class) -{ - object_class->destroy = esv_destroy; - - parent_class = gtk_type_class (PARENT_TYPE); -} - -static void -e_shell_view_setup (EShellView *eshell_view) -{ - /* - * FIXME, should load the config if (load_config).... - */ - gtk_window_set_default_size (GTK_WINDOW (eshell_view), 600, 600); -} - -static void -e_shell_view_setup_shortcut_display (EShellView *eshell_view) -{ - eshell_view->shortcut_bar = e_shortcut_bar_view_new (eshell_view->eshell->shortcut_bar); - - eshell_view->shortcut_hpaned = gtk_hpaned_new (); - gtk_widget_show (eshell_view->shortcut_hpaned); - gtk_paned_set_position (GTK_PANED (eshell_view->shortcut_hpaned), 100); - - gtk_paned_pack1 (GTK_PANED (eshell_view->shortcut_hpaned), - eshell_view->shortcut_bar, FALSE, FALSE); - gtk_widget_show (eshell_view->shortcut_bar); - - gnome_app_set_contents (GNOME_APP (eshell_view), eshell_view->shortcut_hpaned); - - gtk_signal_connect ( - GTK_OBJECT (eshell_view->shortcut_bar), "item_selected", - GTK_SIGNAL_FUNC (shortcut_bar_item_selected), eshell_view); -} - -static GtkWidget * -get_view (EShellView *eshell_view, EFolder *efolder, Bonobo_UIHandler uih) -{ - GtkWidget *w = NULL; - Evolution_Shell corba_shell = CORBA_OBJECT_NIL; - EShell *shell_model = eshell_view->eshell; - - /* This type could be E_FOLDER_MAIL, E_FOLDER_CONTACTS, etc */ - EFolderType e_folder_type; - - g_assert (efolder); - g_assert (eshell_view); - - e_folder_type = e_folder_get_folder_type (efolder); - - if (shell_model) - corba_shell = bonobo_object_corba_objref ( - BONOBO_OBJECT (shell_model)); - else - g_warning ("The shell Bonobo object does not have " - "an associated CORBA object\n"); - - /* depending on the type of folder, - * we launch a different bonobo component */ - switch (e_folder_type) { - - case E_FOLDER_MAIL : - w = bonobo_widget_new_control ("control:evolution-mail", uih); - break; - - case E_FOLDER_CONTACTS : - w = bonobo_widget_new_control ("control:addressbook", uih); - break; - - case E_FOLDER_CALENDAR : { - gchar *user_cal_file; - BonoboPropertyBagClient *pbc; - BonoboControlFrame *cf; - - w = bonobo_widget_new_control ("control:calendar", uih); - cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (w)); - pbc = bonobo_control_frame_get_control_property_bag (cf); - /*pbc = bonobo_control_get_property_bag (w);*/ - - user_cal_file = - g_concat_dir_and_file (gnome_util_user_home (), - ".gnome/user-cal.vcf"); - - bonobo_property_bag_client_set_value_string (pbc, - "calendar_uri", - user_cal_file); - break; - } - - case E_FOLDER_TASKS : - case E_FOLDER_OTHER : - default : - printf ("%s: %s: No bonobo component associated with %s\n", - __FILE__, - __FUNCTION__, - e_folder_get_description (efolder)); - return NULL; - } - - if (w) - { - Evolution_ServiceRepository corba_sr; - BonoboObjectClient *server = - bonobo_widget_get_server (BONOBO_WIDGET (w)); - CORBA_Environment ev; - CORBA_exception_init (&ev); - - /* Does this control have the "ServiceRepository" interface? */ - corba_sr = (Evolution_ServiceRepository) - bonobo_object_client_query_interface ( - server, - "IDL:Evolution/ServiceRepository:1.0", - NULL); - - /* If it does, pass our shell interface to it */ - if (corba_sr != CORBA_OBJECT_NIL) { - - Evolution_ServiceRepository_set_shell (corba_sr, - corba_shell, - &ev); - /* We're done with the service repository interface, - so now let's get rid of it */ - Bonobo_Unknown_unref (corba_sr, &ev); - - } else { - - g_print ("The bonobo component for \"%s\" doesn't " - "seem to implement the " - "Evolution::ServiceRepository interface\n", - e_folder_get_description (efolder)); - } - - CORBA_exception_free (&ev); - - gtk_widget_show (w); - } - - return w; -} - - - -void -e_shell_view_set_view (EShellView *eshell_view, EFolder *efolder) -{ - GtkNotebook *notebook; - GtkWidget *folder_view; - int current_page; - BonoboControlFrame *control_frame; - - g_assert (eshell_view); - g_assert (efolder); - - notebook = GTK_NOTEBOOK (eshell_view->priv->notebook); - current_page = gtk_notebook_get_current_page (notebook); - - if (current_page != -1) { - GtkWidget *current; - - current = gtk_notebook_get_nth_page (notebook, current_page); - control_frame = bonobo_widget_get_control_frame ( - BONOBO_WIDGET (current)); - } else - control_frame = NULL; - - /* If there's a notebook page in our hash that represents this - * efolder, switch to it. - */ - folder_view = g_hash_table_lookup (eshell_view->priv->folder_views, - efolder); - if (folder_view) { - int notebook_page = gtk_notebook_page_num (notebook, - folder_view); - g_assert (notebook_page != -1); - - gtk_notebook_set_page (notebook, notebook_page); - } else { - /* Get a new control that represents this efolder, - * append it to our notebook, and put it in our hash. - */ - Bonobo_UIHandler uih = - bonobo_object_corba_objref ( - BONOBO_OBJECT (eshell_view->uih)); - int new_page_index; - - folder_view = get_view (eshell_view, efolder, uih); - if (!folder_view) - return; - - gtk_notebook_append_page (notebook, folder_view, NULL); - new_page_index = gtk_notebook_page_num (notebook, - folder_view); - g_hash_table_insert (eshell_view->priv->folder_views, - efolder, folder_view); - gtk_notebook_set_page (notebook, new_page_index); - } - - if (control_frame) - bonobo_control_frame_control_deactivate (control_frame); - - control_frame = - bonobo_widget_get_control_frame (BONOBO_WIDGET (folder_view)); - bonobo_control_frame_control_activate (control_frame); -} - -GtkWidget * -e_shell_view_new (EShell *eshell, EFolder *efolder, gboolean show_shortcut_bar) -{ - EShellView *eshell_view; - - g_return_val_if_fail (eshell != NULL, NULL); - g_return_val_if_fail (efolder != NULL, NULL); - - eshell_view = gtk_type_new (e_shell_view_get_type ()); - - eshell_view->priv = g_new (EShellViewPrivate, 1); - eshell_view->priv->folder_views = - g_hash_table_new (g_direct_hash, g_direct_equal); - eshell_view->priv->notebook = NULL; - - gnome_app_construct (GNOME_APP (eshell_view), - "Evolution", "Evolution"); - - eshell_view->eshell = eshell; - e_shell_view_setup (eshell_view); - e_shell_view_setup_menus (eshell_view); - - e_shell_register_view (eshell, eshell_view); - eshell_view->shortcut_displayed = show_shortcut_bar; - e_shell_view_setup_shortcut_display (eshell_view); - - /* create our notebook, if it hasn't been created already */ - if (!eshell_view->priv->notebook) { - eshell_view->priv->notebook = gtk_notebook_new(); - - gtk_notebook_set_show_tabs ( - GTK_NOTEBOOK (eshell_view->priv->notebook), - FALSE); - - gtk_widget_show (eshell_view->priv->notebook); - - if (eshell_view->shortcut_displayed){ - gtk_paned_pack2 ( - GTK_PANED (eshell_view->shortcut_hpaned), - eshell_view->priv->notebook, TRUE, TRUE); - } - else { - gnome_app_set_contents (GNOME_APP (eshell_view), - eshell_view->priv->notebook); - } - } - - e_shell_view_set_view (eshell_view, efolder); - - return (GtkWidget *) eshell_view; -} - -void -e_shell_view_display_shortcut_bar (EShellView *eshell_view, gboolean display) -{ - g_return_if_fail (eshell_view != NULL); - g_return_if_fail (E_IS_SHELL_VIEW (eshell_view)); - - g_error ("Switching code for the shortcut bar is not written yet"); -} - -E_MAKE_TYPE (e_shell_view, "EShellView", EShellView, e_shell_view_class_init, NULL, PARENT_TYPE); - -void -e_shell_view_new_folder (EShellView *esv) -{ - g_return_if_fail (esv != NULL); - g_return_if_fail (E_IS_SHELL_VIEW (esv)); -} - -void -e_shell_view_new_shortcut (EShellView *esv) -{ - g_return_if_fail (esv != NULL); - g_return_if_fail (E_IS_SHELL_VIEW (esv)); -} diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h deleted file mode 100644 index 3045b7adb7..0000000000 --- a/shell/e-shell-view.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef E_SHELL_VIEW_H -#define E_SHELL_VIEW_H - -#include <bonobo/bonobo-object.h> -#include <bonobo/bonobo-ui-handler.h> -#include "e-shell.h" - -#define E_SHELL_VIEW_TYPE (e_shell_view_get_type ()) -#define E_SHELL_VIEW(o) (GTK_CHECK_CAST ((o), E_SHELL_VIEW_TYPE, EShellView)) -#define E_SHELL_VIEW_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SHELL_VIEW_TYPE, EShellViewClass)) -#define E_IS_SHELL_VIEW(o) (GTK_CHECK_TYPE ((o), E_SHELL_VIEW_TYPE)) -#define E_IS_SHELL_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SHELL_VIEW_TYPE)) - -typedef struct _EShellViewPrivate EShellViewPrivate; - -struct _EShellView { - GnomeApp parent; - - /* Pointer to our model */ - EShell *eshell; - - /* Our user interface handler */ - BonoboUIHandler *uih; - - - EFolder *efolder; - - gboolean shortcut_displayed; - GtkWidget *shortcut_hpaned; - GtkWidget *shortcut_bar; - GtkWidget *contents; - - EShellViewPrivate *priv; -}; - -typedef struct { - GnomeAppClass parent_class; -} EShellViewClass; - -GtkWidget *e_shell_view_new (EShell *eshell, EFolder *folder, - gboolean show_shortcut_bar); -GtkType e_shell_view_get_type (void); - -void e_shell_view_new_folder (EShellView *esv); -void e_shell_view_new_shortcut (EShellView *esv); - -void e_shell_view_set_view (EShellView *eshell_view, - EFolder *efolder); - -void e_shell_view_display_shortcut_bar (EShellView *eshell_view, gboolean display); - -#endif /* E_SHELL_VIEW_H */ diff --git a/shell/e-shell.c b/shell/e-shell.c deleted file mode 100644 index 2713df3921..0000000000 --- a/shell/e-shell.c +++ /dev/null @@ -1,377 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * E-shell.c: Shell object for Evolution - * - * Authors: - * Miguel de Icaza (miguel@helixcode.com) - * - * (C) 1999 Miguel de Icaza - * (C) 2000 Helix Code, Inc. - */ - -#include <config.h> -#include <gtk/gtkmain.h> -#include <libgnome/libgnome.h> -#include "Evolution.h" -#include "e-util/e-util.h" -#include "e-shell.h" - -#define PARENT_TYPE (bonobo_object_get_type ()) - -static BonoboObjectClass *e_shell_parent_class; -POA_Evolution_Shell__vepv eshell_vepv; - -GtkType e_shell_get_type (void); - -void -e_shell_new_appointment (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -void -e_shell_new_meeting_request (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -void -e_shell_new_task (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -void -e_shell_new_task_request (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -void -e_shell_new_contact (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -void -e_shell_new_mail_message (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -void -e_shell_new_distribution_list (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -void -e_shell_new_journal_entry (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -void -e_shell_new_note (EShell *eshell) -{ - printf ("Unimplemented function invoked: %s\n", __FUNCTION__); -} - -static void -EShell_cmd_new (PortableServer_Servant servant, - const Evolution_Shell_NewType type, - CORBA_Environment *ev) -{ - EShell *eshell = E_SHELL (bonobo_object_from_servant (servant)); - - switch (type){ - case Evolution_Shell_APPOINTMENT: - e_shell_new_appointment (eshell); - break; - - case Evolution_Shell_MEETING_REQUEST: - e_shell_new_meeting_request (eshell); - break; - - case Evolution_Shell_TASK: - e_shell_new_task (eshell); - break; - - case Evolution_Shell_TASK_REQUEST: - e_shell_new_task_request (eshell); - break; - - case Evolution_Shell_CONTACT: - e_shell_new_contact (eshell); - break; - - case Evolution_Shell_MAIL_MESSAGE: - e_shell_new_mail_message (eshell); - break; - - case Evolution_Shell_DISTRIBUTION_LIST: - e_shell_new_distribution_list (eshell); - break; - - case Evolution_Shell_JOURNAL_ENTRY: - e_shell_new_journal_entry (eshell); - break; - - case Evolution_Shell_NOTE: - e_shell_new_note (eshell); - break; - - default: - } -} - -static void -EShell_register_service (PortableServer_Servant servant, - const Evolution_Shell_ServiceType type, - const CORBA_char *uri, - CORBA_Environment *ev) -{ - char *service_type_desc = NULL; - - switch (type) { - - case Evolution_Shell_MAIL_STORE : - service_type_desc = "store"; - break; - case Evolution_Shell_MAIL_TRANSPORT : - service_type_desc = "transport"; - break; - default : - service_type_desc = "service of unknown type"; - } - - printf ("A component has registered a %s with uri \"%s\"\n", service_type_desc, uri); - -} - - -static POA_Evolution_Shell__epv * -e_shell_get_epv (void) -{ - POA_Evolution_Shell__epv *epv; - - epv = g_new0 (POA_Evolution_Shell__epv, 1); - - epv->new = EShell_cmd_new; - epv->register_service = EShell_register_service; - - return epv; -} - -static void -init_e_shell_corba_class (void) -{ - eshell_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv (); - eshell_vepv.Evolution_Shell_epv = e_shell_get_epv (); -} - -static void -es_destroy_default_folders (EShell *eshell) -{ - gtk_object_unref (GTK_OBJECT (eshell->default_folders.inbox)); - gtk_object_unref (GTK_OBJECT (eshell->default_folders.outbox)); - gtk_object_unref (GTK_OBJECT (eshell->default_folders.drafts)); - gtk_object_unref (GTK_OBJECT (eshell->default_folders.calendar)); - gtk_object_unref (GTK_OBJECT (eshell->default_folders.tasks)); -} - -static void -e_shell_destroy (GtkObject *object) -{ - EShell *eshell = E_SHELL (object); - - gtk_object_unref (GTK_OBJECT (eshell->shortcut_bar)); - es_destroy_default_folders (eshell); - - GTK_OBJECT_CLASS (e_shell_parent_class)->destroy (object); -} - -static void -e_shell_class_init (GtkObjectClass *object_class) -{ - e_shell_parent_class = gtk_type_class (PARENT_TYPE); - init_e_shell_corba_class (); - - object_class->destroy = e_shell_destroy; -} - -static void -e_shell_destroy_views (EShell *eshell) -{ - - /* - * Notice that eshell->views is updated by the various views - * during unregistration - */ - while (eshell->views){ - EShellView *view = eshell->views->data; - - gtk_object_destroy (GTK_OBJECT (view)); - } -} - -void -e_shell_quit (EShell *eshell) -{ - g_return_if_fail (eshell != NULL); - g_return_if_fail (E_IS_SHELL (eshell)); - - e_shell_destroy_views (eshell); - - gtk_main_quit (); -} - -static CORBA_Object -create_corba_eshell (BonoboObject *object) -{ - POA_Evolution_Shell *servant; - CORBA_Environment ev; - - servant = (POA_Evolution_Shell *)g_new0 (BonoboObjectServant, 1); - servant->vepv = &eshell_vepv; - - CORBA_exception_init (&ev); - - POA_Evolution_Shell__init ((PortableServer_Servant) servant, &ev); - if (ev._major != CORBA_NO_EXCEPTION){ - CORBA_exception_free (&ev); - g_free (servant); - return CORBA_OBJECT_NIL; - } - - CORBA_exception_free (&ev); - - return bonobo_object_activate_servant (object, servant); -} - -static void -e_shell_setup_default_folders (EShell *eshell) -{ - eshell->default_folders.summary = e_folder_new ( - E_FOLDER_SUMMARY, "internal:summary", _("Today"), _("Executive Summary"), - NULL, "internal:"); - eshell->default_folders.inbox = e_folder_new ( - E_FOLDER_MAIL, "internal:inbox", _("Inbox"), _("New mail messages"), - NULL, "internal:mail_view"); - eshell->default_folders.outbox = e_folder_new ( - E_FOLDER_MAIL, "internal:outbox", _("Sent messages"), _("Sent mail messages"), - NULL, "internal:mail_view"); - eshell->default_folders.drafts = e_folder_new ( - E_FOLDER_MAIL, "internal:drafts", _("Drafts"), _("Draft mail messages"), - NULL, "internal:mail_view"); - eshell->default_folders.calendar = e_folder_new ( - E_FOLDER_CALENDAR, "internal:personal_calendar", _("Calendar"), _("Your calendar"), - NULL, "internal:calendar_daily"); - eshell->default_folders.contacts = e_folder_new ( - E_FOLDER_CONTACTS, "internal:personal_contacts", _("Contacts"), _("Your contacts list"), - NULL, "internal:contact_view"); - eshell->default_folders.tasks = e_folder_new ( - E_FOLDER_TASKS, "internal:personal_calendar", _("Tasks"), _("Tasks list"), - NULL, "internal:tasks_view"); -} - -static EShortcutGroup * -setup_main_shortcuts (EShell *eshell) -{ - EShortcutGroup *m; - - m = e_shortcut_group_new (_("Main Shortcuts"), FALSE); - e_shortcut_group_append (m, e_shortcut_new (eshell->default_folders.summary)); - e_shortcut_group_append (m, e_shortcut_new (eshell->default_folders.inbox)); - e_shortcut_group_append (m, e_shortcut_new (eshell->default_folders.calendar)); - e_shortcut_group_append (m, e_shortcut_new (eshell->default_folders.contacts)); - e_shortcut_group_append (m, e_shortcut_new (eshell->default_folders.tasks)); - - return m; -} - -static EShortcutGroup * -setup_secondary_shortcuts (EShell *eshell) -{ - EShortcutGroup *sec; - - sec = e_shortcut_group_new (_("Other Shortcuts"), TRUE); - - e_shortcut_group_append (sec, e_shortcut_new (eshell->default_folders.drafts)); - e_shortcut_group_append (sec, e_shortcut_new (eshell->default_folders.outbox)); - - return sec; -} - -static void -e_shell_setup_default_shortcuts (EShell *eshell) -{ - eshell->shortcut_bar = e_shortcut_bar_model_new (); - e_shortcut_bar_model_append ( - eshell->shortcut_bar, - setup_main_shortcuts (eshell)); - e_shortcut_bar_model_append ( - eshell->shortcut_bar, - setup_secondary_shortcuts (eshell)); -} - -static void -e_shell_init (GtkObject *object) -{ - EShell *eshell = E_SHELL (object); - - e_shell_setup_default_folders (eshell); - e_shell_setup_default_shortcuts (eshell); -} - -static void -e_shell_construct (EShell *eshell, Evolution_Shell corba_eshell) -{ - bonobo_object_construct (BONOBO_OBJECT (eshell), corba_eshell); -} - -EShell * -e_shell_new (void) -{ - Evolution_Shell corba_eshell; - EShell *eshell; - - eshell = gtk_type_new (e_shell_get_type ()); - - corba_eshell = create_corba_eshell (BONOBO_OBJECT (eshell)); - if (corba_eshell == CORBA_OBJECT_NIL){ - gtk_object_destroy (GTK_OBJECT (eshell)); - return NULL; - } - - e_shell_construct (eshell, corba_eshell); - - return eshell; -} - -void -e_shell_register_view (EShell *eshell, EShellView *eshell_view) -{ - g_return_if_fail (eshell != NULL); - g_return_if_fail (E_IS_SHELL (eshell)); - g_return_if_fail (eshell_view != NULL); - - eshell->views = g_slist_prepend (eshell->views, eshell_view); -} - -void -e_shell_unregister_view (EShell *eshell, EShellView *eshell_view) -{ - g_return_if_fail (eshell != NULL); - g_return_if_fail (E_IS_SHELL (eshell)); - g_return_if_fail (eshell_view != NULL); - - eshell->views = g_slist_remove (eshell->views, eshell_view); -} - -E_MAKE_TYPE (e_shell, "EShell", EShell, e_shell_class_init, e_shell_init, PARENT_TYPE); - - - - diff --git a/shell/e-shell.h b/shell/e-shell.h deleted file mode 100644 index 64de044fb4..0000000000 --- a/shell/e-shell.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef E_SHELL_H -#define E_SHELL_H - -#include <bonobo/bonobo-object.h> -#include "evolution.h" -#include "e-folder.h" -#include "e-shortcut.h" - -#define E_SHELL_GOAD_ID "GOADID:GNOME:Evolution:Shell:1.0" -#define E_SHELL_FACTORY_GOAD_ID "GOADID:GNOME:Evolution:ShellFactory:1.0" - -#define E_SHELL_TYPE (e_shell_get_type ()) -#define E_SHELL(o) (GTK_CHECK_CAST ((o), E_SHELL_TYPE, EShell)) -#define E_SHELL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SHELL_TYPE, EShellClass)) -#define E_IS_SHELL(o) (GTK_CHECK_TYPE ((o), E_SHELL_TYPE)) -#define E_IS_SHELL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SHELL_TYPE)) - -struct _EShell { - BonoboObject base_object; - - /* A list of EShellViews */ - GSList *views; - - struct { - EFolder *inbox; - EFolder *outbox; - EFolder *drafts; - EFolder *calendar; - EFolder *tasks; - EFolder *summary; - EFolder *contacts; - } default_folders; - - EShortcutBarModel *shortcut_bar; -}; - -typedef struct { - BonoboObjectClass parent_class; -} EShellClass; - -EShell *e_shell_new (void); -void e_shell_register_view (EShell *eshell, EShellView *eshell_view); -void e_shell_unregister_view (EShell *eshell, EShellView *eshell_view); - -/* - * New - */ -void e_shell_new_appointment (EShell *eshell); -void e_shell_new_meeting_request (EShell *eshell); -void e_shell_new_task (EShell *eshell); -void e_shell_new_task_request (EShell *eshell); -void e_shell_new_contact (EShell *eshell); -void e_shell_new_mail_message (EShell *eshell); -void e_shell_new_distribution_list (EShell *eshell); -void e_shell_new_journal_entry (EShell *eshell); -void e_shell_new_note (EShell *eshell); - -void e_shell_quit (EShell *eshell); - -#endif /* EVOLUTION_SHELL_H */ diff --git a/shell/e-shortcut.c b/shell/e-shortcut.c deleted file mode 100644 index d066394049..0000000000 --- a/shell/e-shortcut.c +++ /dev/null @@ -1,497 +0,0 @@ -/* - * Shortcut.c: implements shortcuts and shortcut group models - * - * Author: - * Miguel de Icaza (miguel@kernel.org) - * - * (C) 2000 Helix Code, Inc. - * - */ -#include <config.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkmisc.h> -#include <libgnome/libgnome.h> -#include "e-util/e-util.h" -#include "e-shortcut.h" -#include "shortcut-bar/e-shortcut-bar.h" -#include "shortcut-bar/e-clipped-label.h" - -#define SHORTCUT_PARENT_TYPE gtk_object_get_type () -#define SHORTCUT_BAR_MODEL_PARENT_TYPE gtk_object_get_type () -#define SHORTCUT_GROUP_PARENT_TYPE gtk_object_get_type () - -static GtkObjectClass *shortcut_parent_class; -static GtkObjectClass *shortcut_group_parent_class; -static GtkObjectClass *shortcut_bar_model_parent_class; - -enum { - STRUCTURE_CHANGED, - LAST_SIGNAL -}; - -static void -es_destroy (GtkObject *object) -{ - EShortcut *ef = E_SHORTCUT (object); - - gtk_object_unref (GTK_OBJECT (ef->efolder)); - - shortcut_parent_class->destroy (object); -} - -static void -e_shortcut_class_init (GtkObjectClass *object_class) -{ - object_class->destroy = es_destroy; - shortcut_parent_class = gtk_type_class (SHORTCUT_PARENT_TYPE); -} - -static void -esg_destroy (GtkObject *object) -{ - EShortcutGroup *efg = E_SHORTCUT_GROUP (object); - const int shortcut_count = efg->shortcuts->len; - int i; - - g_free (efg->title); - - for (i = 0; i < shortcut_count; i++){ - EShortcut *es = g_array_index (efg->shortcuts, EShortcut *, i); - - gtk_object_unref (GTK_OBJECT (es)); - } - - g_array_free (efg->shortcuts, TRUE); - efg->model = NULL; - - shortcut_group_parent_class->destroy (object); -} - -static void -e_shortcut_group_class_init (GtkObjectClass *object_class) -{ - object_class->destroy = esg_destroy; - shortcut_parent_class = gtk_type_class (SHORTCUT_GROUP_PARENT_TYPE); -} - -static void -e_shortcut_group_init (GtkObject *object) -{ - EShortcutGroup *esg = E_SHORTCUT_GROUP (object); - - GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (object), GTK_FLOATING); - - esg->shortcuts = g_array_new (FALSE, FALSE, sizeof (EShortcut *)); -} - -EShortcut * -e_shortcut_new (EFolder *efolder) -{ - EShortcut *shortcut = gtk_type_new (e_shortcut_get_type ()); - - shortcut->efolder = efolder; - gtk_object_ref (GTK_OBJECT (efolder)); - - return shortcut; -} - -EShortcutGroup * -e_shortcut_group_new (const char *title, EIconBarViewType type) -{ - EShortcutGroup *shortcut_group = gtk_type_new (e_shortcut_group_get_type ()); - - shortcut_group->title = g_strdup (title); - shortcut_group->type = type; - return shortcut_group; -} - -void -e_shortcut_group_append (EShortcutGroup *sg, EShortcut *shortcut) -{ - g_return_if_fail (sg != NULL); - g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); - g_return_if_fail (shortcut != NULL); - g_return_if_fail (E_IS_SHORTCUT (shortcut)); - - gtk_object_ref (GTK_OBJECT (shortcut)); - gtk_object_sink (GTK_OBJECT (shortcut)); - - g_array_append_val (sg->shortcuts, shortcut); - - /* FIXME: Broadcast change */ -} - -void -e_shortcut_group_remove (EShortcutGroup *sg, EShortcut *shortcut) -{ - g_return_if_fail (sg != NULL); - g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); - g_return_if_fail (shortcut != NULL); - g_return_if_fail (E_IS_SHORTCUT (sg)); - - { - const int len = sg->shortcuts->len; - int i; - - for (i = 0; i < len; i++){ - EShortcut *es = g_array_index (sg->shortcuts, EShortcut *, i); - - if (es == shortcut){ - g_array_remove_index (sg->shortcuts, i); - /* FIXME: Broadcast change */ - return; - } - } - } -} - -void -e_shortcut_group_move (EShortcutGroup *sg, int from, int to) -{ - EShortcut *t; - - g_return_if_fail (sg != NULL); - g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); - - g_return_if_fail (from < sg->shortcuts->len); - g_return_if_fail (to < sg->shortcuts->len); - g_return_if_fail (from >= 0); - g_return_if_fail (to >= 0); - - if (from == to) - return; - - t = g_array_index (sg->shortcuts, EShortcut *, from); - g_array_index (sg->shortcuts, EShortcut *, from) = - g_array_index (sg->shortcuts, EShortcut *, to); - g_array_index (sg->shortcuts, EShortcut *, to) = t; - - /* FIXME: Broadcast change */ -} - -void -e_shortcut_group_rename (EShortcutGroup *sg, const char *text) -{ - GSList *l; - int id; - - g_return_if_fail (sg != NULL); - g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); - - id = e_group_num_from_group_ptr (sg->model, sg); - for (l = sg->model->views; l; l = l->next){ - EShortcutBar *shortcut_bar = l->data; - GtkWidget *label; - - label = e_clipped_label_new (text); - - gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - gtk_widget_show (label); - - e_group_bar_set_group_button_label ( - E_GROUP_BAR (shortcut_bar), id, label); - } -} - -static void -esb_destroy (GtkObject *object) -{ - EShortcutBarModel *esb = E_SHORTCUT_BAR_MODEL (object); - const int count = esb->groups->len; - int i; - - for (i = 0; i < count; i++){ - EShortcutGroup *esg = g_array_index (esb->groups, EShortcutGroup *, i); - - gtk_object_destroy (GTK_OBJECT (esg)); - } - - g_array_free (esb->groups, TRUE); - shortcut_bar_model_parent_class->destroy (object); -} - -static void -e_shortcut_bar_model_class_init (GtkObjectClass *object_class) -{ - object_class->destroy = esb_destroy; - shortcut_bar_model_parent_class = gtk_type_class (SHORTCUT_BAR_MODEL_PARENT_TYPE); -} - -static void -e_shortcut_bar_model_init (GtkObject *object) -{ - EShortcutBarModel *esb = E_SHORTCUT_BAR_MODEL (object); - - /* The shortcut bar model is self owned */ - GTK_OBJECT_UNSET_FLAGS (object, GTK_FLOATING); - - esb->groups = g_array_new (FALSE, FALSE, sizeof (EShortcutGroup *)); -} - -EShortcutBarModel * -e_shortcut_bar_model_new (void) -{ - EShortcutBarModel *bm; - - bm = gtk_type_new (e_shortcut_bar_model_get_type ()); - - return bm; -} - -void -e_shortcut_bar_model_append (EShortcutBarModel *bm, EShortcutGroup *sg) -{ - g_return_if_fail (bm != NULL); - g_return_if_fail (sg != NULL); - g_return_if_fail (E_IS_SHORTCUT_BAR_MODEL (bm)); - g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); - - gtk_object_ref (GTK_OBJECT (sg)); - gtk_object_sink (GTK_OBJECT (sg)); - - sg->model = bm; - - g_array_append_val (bm->groups, sg); -} - -EShortcutGroup * -e_shortcut_group_from_pos (EShortcutBarModel *bm, int group_num) -{ - EShortcutGroup *group; - - if (group_num == -1) - return NULL; - - group = g_array_index (bm->groups, EShortcutGroup *, group_num); - return group; -} - -EShortcut * -e_shortcut_from_pos (EShortcutGroup *group, int item_num) -{ - EShortcut *shortcut; - - g_return_val_if_fail (group != NULL, NULL); - g_return_val_if_fail (E_IS_SHORTCUT_GROUP (group), NULL); - - if (item_num == -1) - return NULL; - - g_return_val_if_fail (item_num < group->shortcuts->len, NULL); - - shortcut = g_array_index (group->shortcuts, EShortcut *, item_num); - return shortcut; -} - -static void -populate_group (EShortcutBarModel *bm, EShortcutGroup *esg, EShortcutBar *shortcut_bar) -{ - int group_num, i; - const int items = esg->shortcuts->len; - - group_num = e_shortcut_bar_add_group (shortcut_bar, esg->title); - e_shortcut_bar_set_view_type (shortcut_bar, group_num, esg->type); - - for (i = 0; i < items; i++){ - EShortcut *shortcut = E_SHORTCUT (g_array_index (esg->shortcuts, EShortcut *, i)); - EFolder *folder = shortcut->efolder; - char *type = NULL; - - switch (folder->type){ - case E_FOLDER_SUMMARY: - type = "summary:"; - break; - - case E_FOLDER_MAIL: - type = "mail:"; - break; - - case E_FOLDER_CONTACTS: - type = "contacts:"; - break; - - case E_FOLDER_CALENDAR: - type = "calendar:"; - break; - - case E_FOLDER_TASKS: - type = "todo:"; - break; - - case E_FOLDER_OTHER: - type = "file:"; - break; - - default: - g_assert_not_reached (); - } - - e_shortcut_bar_add_item (shortcut_bar, group_num, type, folder->name); - } -} - -static void -populate_from_model (EShortcutBarModel *bm, EShortcutBar *shortcut_bar) -{ - const int groups = bm->groups->len; - int i; - - for (i = 0; i < groups; i++){ - EShortcutGroup *esg; - - esg = g_array_index (bm->groups, EShortcutGroup *, i); - - populate_group (bm, esg, shortcut_bar); - } - -} - -static struct { - char *prefix, *path; - GdkPixbuf *image; -} shell_icons[] = { - { "summary:", "evolution-today.png", NULL }, - { "mail:", "evolution-inbox.png", NULL }, - { "calendar:", "evolution-calendar.png", NULL }, - { "contacts:", "evolution-contacts.png", NULL }, - { "notes:", "evolution-notes.png", NULL }, - { "todo:", "evolution-tasks.png", NULL } -}; -#define NSHELL_ICONS (sizeof (shell_icons) / sizeof (shell_icons[0])) - -static GdkPixbuf * -shell_icon_cb (EShortcutBar *shortcut_bar, gchar *url) -{ - int i; - - for (i = 0; i < NSHELL_ICONS; i++) { - if (!strncmp (shell_icons[i].prefix, url, - strlen (shell_icons[i].prefix))) { - if (!shell_icons[i].image) { - char *pixmap_path; - - pixmap_path = g_strconcat (EVOLUTION_IMAGES "/", shell_icons[i].path, NULL); - if (pixmap_path) - shell_icons[i].image = gdk_pixbuf_new_from_file (pixmap_path); - else { - g_warning ("Couldn't find image: %s", - pixmap_path); - } - g_free (pixmap_path); - } - return shell_icons[i].image; - } - } - - return NULL; -} - -static void -view_destroyed (EShortcutBar *shortcut_bar, EShortcutBarModel *bm) -{ - bm->views = g_slist_remove (bm->views, shortcut_bar); -} - -GtkWidget * -e_shortcut_bar_view_new (EShortcutBarModel *bm) -{ - GtkWidget *shortcut_bar; - - gtk_widget_push_visual (gdk_rgb_get_visual ()); - gtk_widget_push_colormap (gdk_rgb_get_cmap ()); - - shortcut_bar = e_shortcut_bar_new (); - e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcut_bar), - shell_icon_cb); - - gtk_widget_pop_visual (); - gtk_widget_pop_colormap (); - - populate_from_model (bm, E_SHORTCUT_BAR (shortcut_bar)); - - bm->views = g_slist_prepend (bm->views, shortcut_bar); - gtk_signal_connect (GTK_OBJECT (shortcut_bar), "destroy", GTK_SIGNAL_FUNC (view_destroyed), bm); - - return shortcut_bar; -} - -int -e_group_num_from_group_ptr (EShortcutBarModel *bm, EShortcutGroup *group) -{ - const int n = bm->groups->len; - int i; - - for (i = 0; i < n; i++) - if (g_array_index (bm->groups, EShortcutGroup *, i) == group) - return i; - return -1; -} - -/* - * Sets the view mode in all the views - */ -void -e_shortcut_group_set_view_type (EShortcutGroup *group, EIconBarViewType type) -{ - GSList *l; - int group_num; - - g_return_if_fail (group != NULL); - g_return_if_fail (E_IS_SHORTCUT_GROUP (group)); - - group_num = e_group_num_from_group_ptr (group->model, group); - - g_assert (group_num != -1); - - group->type = type; - - for (l = group->model->views; l ; l = l->next){ - EShortcutBar *shortcut_bar = l->data; - - e_shortcut_bar_set_view_type (shortcut_bar, group_num, type); - } -} - -gint -e_shortcut_bar_model_add_group (EShortcutBarModel *model) -{ - int id = -1; - GSList *l = NULL; - - g_return_val_if_fail (model != NULL, -1); - g_return_val_if_fail (E_IS_SHORTCUT_BAR_MODEL (model), -1); - - for (l = model->views; l; l = l->next){ - EShortcutBar *shortcut_bar = l->data; - - id = e_shortcut_bar_add_group (shortcut_bar, _("New group")); - } - - return id; -} - -void -e_shortcut_bar_model_remove_group (EShortcutBarModel *model, EShortcutGroup *sg) -{ - GSList *l = NULL; - int group_num; - - g_return_if_fail (model != NULL); - g_return_if_fail (E_IS_SHORTCUT_BAR_MODEL (model)); - g_return_if_fail (sg != NULL); - g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); - - group_num = e_group_num_from_group_ptr (model, sg); - - for (l = model->views; l; l = l->next){ - EShortcutBar *shortcut_bar = l->data; - - e_shortcut_bar_remove_group (shortcut_bar, group_num); - } - -} - -E_MAKE_TYPE (e_shortcut, "EShortcut", EShortcut, e_shortcut_class_init, NULL, SHORTCUT_PARENT_TYPE); -E_MAKE_TYPE (e_shortcut_group, "EShortcutGroup", EShortcutGroup, e_shortcut_group_class_init, e_shortcut_group_init, SHORTCUT_GROUP_PARENT_TYPE); -E_MAKE_TYPE (e_shortcut_bar_model, "EShortcutBarModel", EShortcutBarModel, e_shortcut_bar_model_class_init, e_shortcut_bar_model_init, SHORTCUT_BAR_MODEL_PARENT_TYPE); - diff --git a/shell/e-shortcut.h b/shell/e-shortcut.h deleted file mode 100644 index e7dde69124..0000000000 --- a/shell/e-shortcut.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef SHELL_SHORTCUT_H -#define SHELL_SHORTCUT_H - -#include <gtk/gtkobject.h> -#include "e-folder.h" -#include "shortcut-bar/e-icon-bar.h" - -typedef struct _EShortcut EShortcut; -typedef struct _EShortcutGroup EShortcutGroup; -typedef struct _EShortcutBarModel EShortcutBarModel; - -#define E_SHORTCUT_TYPE (e_shortcut_get_type ()) -#define E_SHORTCUT(o) (GTK_CHECK_CAST ((o), E_SHORTCUT_TYPE, EShortcut)) -#define E_SHORTCUT_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SHORTCUT_TYPE, EShortcutClass)) -#define E_IS_SHORTCUT(o) (GTK_CHECK_TYPE ((o), E_SHORTCUT_TYPE)) -#define E_IS_SHORTCUT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SHORTCUT_TYPE)) - -struct _EShortcut { - GtkObject object; - EFolder *efolder; -}; - -typedef struct { - GtkObjectClass parent_class; -} EShortcutClass; - -#define E_SHORTCUT_GROUP_TYPE (e_shortcut_group_get_type ()) -#define E_SHORTCUT_GROUP(o) (GTK_CHECK_CAST ((o), E_SHORTCUT_GROUP_TYPE, EShortcutGroup)) -#define E_SHORTCUT_GROUP_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SHORTCUT_GROUP_TYPE, EShortcutGroupClass)) -#define E_IS_SHORTCUT_GROUP(o) (GTK_CHECK_TYPE ((o), E_SHORTCUT_GROUP_TYPE)) -#define E_IS_SHORTCUT_GROUP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SHORTCUT_GROUP_TYPE)) - -struct _EShortcutGroup { - GtkObject object; - EShortcutBarModel *model; - char *group_name; - GArray *shortcuts; - char *title; - EIconBarViewType type; -}; - -typedef struct { - GtkObjectClass parent_class; -} EShortcutGroupClass; - -GtkType e_shortcut_get_type (void); -EShortcut *e_shortcut_new (EFolder *efolder); - -GtkType e_shortcut_group_get_type (void); -EShortcutGroup *e_shortcut_group_new (const char *name, EIconBarViewType type); -void e_shortcut_group_append (EShortcutGroup *sg, EShortcut *shortcut); -void e_shortcut_group_destroy (EShortcutGroup *sg); -void e_shortcut_group_remove (EShortcutGroup *sg, EShortcut *shortcut); -void e_shortcut_group_move (EShortcutGroup *sg, int from, int to); -void e_shortcut_group_set_view_type (EShortcutGroup *sg, EIconBarViewType type); -void e_shortcut_group_rename (EShortcutGroup *sg, const char *text); - -#define E_SHORTCUT_BAR_MODEL_TYPE (e_shortcut_bar_model_get_type ()) -#define E_SHORTCUT_BAR_MODEL(o) (GTK_CHECK_CAST ((o), E_SHORTCUT_BAR_MODEL_TYPE, EShortcutBarModel)) -#define E_SHORTCUT_BAR_MODEL_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SHORTCUT_BAR_MODEL_TYPE, EShortcutBarMNodelClass)) -#define E_IS_SHORTCUT_BAR_MODEL(o) (GTK_CHECK_TYPE ((o), E_SHORTCUT_BAR_MODEL_TYPE)) -#define E_IS_SHORTCUT_BAR_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SHORTCUT_BAR_MODEL_TYPE)) - -struct _EShortcutBarModel { - GtkObject object; - - GArray *groups; - GSList *views; -}; - -typedef struct { - GtkObjectClass object_class; -} EShortcutBarModelClass; - -GtkType e_shortcut_bar_model_get_type (void); -EShortcutBarModel *e_shortcut_bar_model_new (void); -void e_shortcut_bar_model_append (EShortcutBarModel *shortcut_bar, - EShortcutGroup *group); -int e_shortcut_bar_model_add_group (EShortcutBarModel *shortcut_bar); -void e_shortcut_bar_model_remove_group - (EShortcutBarModel *model, - EShortcutGroup *sg); - -/* Ugly api name */ -int e_group_num_from_group_ptr (EShortcutBarModel *bm, - EShortcutGroup *group); - -/* - * Produces a new view of the Shortcut Bar model - */ -GtkWidget *e_shortcut_bar_view_new (EShortcutBarModel *bm); - -/* - * Locating objects - */ -EShortcutGroup *e_shortcut_group_from_pos (EShortcutBarModel *bm, - int group_num); -EShortcut *e_shortcut_from_pos (EShortcutGroup *group, - int item_num); - -#endif - diff --git a/shell/eshell-types.h b/shell/eshell-types.h deleted file mode 100644 index a5e82dfcfc..0000000000 --- a/shell/eshell-types.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef ESHELL_TYPES_H -#define ESHELL_TYPES_H 1 - -typedef struct _EFolder EFolder; -typedef struct _EService EService; - - -#endif /* ESHELL_TYPES_H */ - - diff --git a/shell/evolution-service-repository.c b/shell/evolution-service-repository.c deleted file mode 100644 index 3714ac5a62..0000000000 --- a/shell/evolution-service-repository.c +++ /dev/null @@ -1,279 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * Author: - * Bertrand Guiheneuf (bg@aful.org) - * - * Dumped from bonobo/bonobo-persist-stream.c - * - * (C) 2000 Helix Code, Inc. - */ - -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 - */ - -#include <config.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkmarshal.h> -#include "evolution-service-repository.h" - -/* Parent class */ -static BonoboObjectClass *evolution_service_repository_parent_class; - - -/* CORBA implementation Entry Point Vector */ -POA_Evolution_ServiceRepository__vepv evolution_service_repository_vepv; - - - - - -/* - *function assigned to the - * Evolution::ServiceRepository::set_shell - * method. - * This function calls the set_shell_fn in - * the EvolutionServiceRepository - */ -static void -impl_set_shell (PortableServer_Servant servant, - Evolution_Shell shell, - CORBA_Environment *ev) -{ - BonoboObject *object = bonobo_object_from_servant (servant); - EvolutionServiceRepository *sr = EVOLUTION_SERVICE_REPOSITORY (object); - - if (sr->set_shell_fn != NULL) { - (*sr->set_shell_fn)(sr, shell, sr->closure); - } else { - GtkObjectClass *oc = GTK_OBJECT (sr)->klass; - EvolutionServiceRepositoryClass *class = EVOLUTION_SERVICE_REPOSITORY_CLASS (oc); - (*class->set_shell)(sr, shell); - } - -} - -/** - * evolution_service_repository_get_epv: - * create and initialize the ServiceRepository - * epv. - */ -POA_Evolution_ServiceRepository__epv * -evolution_service_repository_get_epv (void) -{ - POA_Evolution_ServiceRepository__epv *epv; - - epv = g_new0 (POA_Evolution_ServiceRepository__epv, 1); - - epv->set_shell = impl_set_shell; - - return epv; -} - - -/* create the Evolution_ServiceRepository vepv */ -static void -init_service_repository_corba_class (void) -{ - /* create the Bonobo interface epv */ - evolution_service_repository_vepv.Bonobo_Unknown_epv = - bonobo_object_get_epv (); - - /* create the ServiceRepository interface epv. - * Defined above */ - evolution_service_repository_vepv.Evolution_ServiceRepository_epv = - evolution_service_repository_get_epv (); -} - - -/* default implementation for the ::set_shell method */ -static void -evolution_service_repository_set_shell_default (EvolutionServiceRepository *service_repository, - Evolution_Shell shell) -{ - /* do nothing */ -} - - - -static void -evolution_service_repository_destroy (GtkObject *object) -{ - GTK_OBJECT_CLASS (evolution_service_repository_parent_class)->destroy (object); -} - - -/* initialize the Gtk object class */ -static void -evolution_service_repository_class_init (EvolutionServiceRepositoryClass *klass) -{ - GtkObjectClass *object_class = (GtkObjectClass *) klass; - - evolution_service_repository_parent_class = gtk_type_class (bonobo_object_get_type ()); - - /* - * Override and initialize methods - */ - object_class->destroy = evolution_service_repository_destroy; - klass->set_shell = evolution_service_repository_set_shell_default; - - /* create the corba class */ - init_service_repository_corba_class (); -} - -static void -evolution_service_repository_init (EvolutionServiceRepository *service_repository) -{ -} - - -/** - * evolution_service_repository_get_type: - * - * Returns: the GtkType for the EvolutionServiceRepository class. - */ -GtkType -evolution_service_repository_get_type (void) -{ - static GtkType type = 0; - - if (!type){ - GtkTypeInfo info = { - "EvolutionServiceRepository", - sizeof (EvolutionServiceRepository), - sizeof (EvolutionServiceRepositoryClass), - (GtkClassInitFunc) evolution_service_repository_class_init, - (GtkObjectInitFunc) evolution_service_repository_init, - NULL, /* reserved 1 */ - NULL, /* reserved 2 */ - (GtkClassInitFunc) NULL - }; - - type = gtk_type_unique (bonobo_object_get_type (), &info); - } - - return type; -} - - - - -/** - * evolution_service_repository_construct: construct the object - * @sr: the gtk service repository object to construct - * @corba_service_repository: the corresponding corba object - * @set_shell_fn: the ::set_shell implementation for this object - * @closure: data to pass to the set_shell operation - * - * This construct an EvolutionServiceRepository object. - * The caller can give the function that will implement - * the Corba interface. If those methods are %NULL then the - * default class method will be called instead. - * - * Return value: The constructed service repository. - **/ -EvolutionServiceRepository * -evolution_service_repository_construct (EvolutionServiceRepository *sr, - Evolution_ServiceRepository corba_service_repository, - EvolutionServiceRepositorySetShellFn set_shell_fn, - void *closure) -{ - g_return_val_if_fail (sr != NULL, NULL); - g_return_val_if_fail (EVOLUTION_IS_SERVICE_REPOSITORY (sr), NULL); - g_return_val_if_fail (corba_service_repository != CORBA_OBJECT_NIL, NULL); - - bonobo_object_construct (BONOBO_OBJECT (sr), - corba_service_repository); - - sr->closure = closure; - sr->set_shell_fn = set_shell_fn; - - return sr; -} - - -/* - * construct the corba - * Evolution_ServiceRepository object - */ -static Evolution_ServiceRepository -create_evolution_service_repository (BonoboObject *object) -{ - POA_Evolution_ServiceRepository *servant; - CORBA_Environment ev; - - /* create a servant */ - servant = (POA_Evolution_ServiceRepository *) g_new0 (BonoboObjectServant, 1); - - /* initialize its virtual entry point vector */ - servant->vepv = &evolution_service_repository_vepv; - - CORBA_exception_init (&ev); - - /* initialise the servant */ - POA_Evolution_ServiceRepository__init ((PortableServer_Servant) servant, &ev); - if (ev._major != CORBA_NO_EXCEPTION){ - g_free (servant); - CORBA_exception_free (&ev); - return CORBA_OBJECT_NIL; - } - CORBA_exception_free (&ev); - - /* activate it and return */ - return (Evolution_ServiceRepository) bonobo_object_activate_servant (object, servant); -} - - - - - -/** - * evolution_service_repository_new: create a new EvolutionServiceRepository object - * @set_shell_fn: The ::set_shell method - * @closure: The data passed to the ::set_shell method - * - * Create a full EvolutionServiceRepository. Also create the correspoding - * servant. The ::set_shell method calls set_shell_fn unless set_shell_fn - * is %NULL, in which case, the class default method is called. - * - * Return value: The newly created EvolutionServiceRepository object - **/ -EvolutionServiceRepository * -evolution_service_repository_new (EvolutionServiceRepositorySetShellFn set_shell_fn, - void *closure) -{ - Evolution_ServiceRepository corba_sr; - EvolutionServiceRepository *sr; - - /* create the gtk object */ - sr = gtk_type_new (evolution_service_repository_get_type ()); - - /* create the Corba object */ - corba_sr = create_evolution_service_repository ( - BONOBO_OBJECT (sr)); - - /* check for an error in the creation of the corba object */ - if (corba_sr == CORBA_OBJECT_NIL){ - gtk_object_destroy (GTK_OBJECT (sr)); - return NULL; - } - - /* construct the object */ - evolution_service_repository_construct (sr, corba_sr, set_shell_fn, closure); - - return sr; -} diff --git a/shell/evolution-service-repository.h b/shell/evolution-service-repository.h deleted file mode 100644 index 88a0f621d7..0000000000 --- a/shell/evolution-service-repository.h +++ /dev/null @@ -1,66 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -#ifndef _EVOLUTION_SERVICE_REPOSITORY_H -#define _EVOLUTION_SERVICE_REPOSITORY_H 1 - -#include <bonobo/bonobo-object.h> -#include "Evolution.h" - -BEGIN_GNOME_DECLS - -#define EVOLUTION_SERVICE_REPOSITORY_TYPE (evolution_service_repository_get_type ()) -#define EVOLUTION_SERVICE_REPOSITORY(o) (GTK_CHECK_CAST ((o), EVOLUTION_SERVICE_REPOSITORY_TYPE, EvolutionServiceRepository)) -#define EVOLUTION_SERVICE_REPOSITORY_CLASS(k) (GTK_CHECK_CLASS_CAST((k), EVOLUTION_SERVICE_REPOSITORY_TYPE, EvolutionServiceRepositoryClass)) -#define EVOLUTION_IS_SERVICE_REPOSITORY(o) (GTK_CHECK_TYPE ((o), EVOLUTION_SERVICE_REPOSITORY_TYPE)) -#define EVOLUTION_IS_SERVICE_REPOSITORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), EVOLUTION_SERVICE_REPOSITORY_TYPE)) - -typedef struct _EvolutionServiceRepository EvolutionServiceRepositoryPrivate; -typedef struct _EvolutionServiceRepository EvolutionServiceRepository; - -typedef void (*EvolutionServiceRepositorySetShellFn) (EvolutionServiceRepository *sr, const Evolution_Shell shell, void *closure); - - -struct _EvolutionServiceRepository { - BonoboObject object; - - - EvolutionServiceRepositorySetShellFn set_shell_fn; - - void *closure; - - EvolutionServiceRepositoryPrivate *priv; - -}; - - - -typedef struct { - BonoboObjectClass parent_class; - - void (*set_shell) (EvolutionServiceRepository *sr, Evolution_Shell shell); - -} EvolutionServiceRepositoryClass; - - - -GtkType evolution_service_repository_get_type (void); - -EvolutionServiceRepository * evolution_service_repository_new ( - EvolutionServiceRepositorySetShellFn set_shell_fn, - void *closure); - -EvolutionServiceRepository * evolution_service_repository_construct ( - EvolutionServiceRepository *sr, - Evolution_ServiceRepository corba_service_repository, - EvolutionServiceRepositorySetShellFn set_shell_fn, - void *closure); - - -POA_Evolution_ServiceRepository__epv *evolution_service_repository_get_epv (void); - -extern POA_Evolution_ServiceRepository__vepv evolution_service_repository_vepv; - -END_GNOME_DECLS - - -#endif /* _EVOLUTION_SERVICE_REPOSITORY_H */ - diff --git a/shell/evolution-service-repository.idl b/shell/evolution-service-repository.idl deleted file mode 100644 index 809ccbdc21..0000000000 --- a/shell/evolution-service-repository.idl +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * Component Interface - * - * Authors: - * Bertrand Guiheneuf (bg@aful.org) - * - * (C) 2000 Helix Code, Inc. - */ -#include <Bonobo.idl> - -module Evolution { - interface ServiceRepository : Bonobo::Unknown { - - void set_shell (in Shell shell); - - - }; -}; - diff --git a/shell/evolution.h b/shell/evolution.h deleted file mode 100644 index 11e5b342f9..0000000000 --- a/shell/evolution.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _EVOLUTION_H_ -#define _EVOLUTION_H_ - -typedef struct _EShell EShell; -typedef struct _EShellView EShellView; - -#endif diff --git a/shell/idl/folder.idl b/shell/idl/folder.idl deleted file mode 100644 index a3db71410b..0000000000 --- a/shell/idl/folder.idl +++ /dev/null @@ -1,101 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * folder.idl - * Copyright (C) 2000 Helix Code, Inc. - * Author: Christopher James Lahey <clahey@helixcode.com> - * - * Based on original from Matt Loper. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * 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 library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -module Evolution { - - interface FolderListener { - - enum CallStatus { - Success, - RepositoryOffline, - PermissionDenied, - WrongFolderType, - WrongFolderDomain, - FolderNotFound - }; - - void folder_listener_ready (in CallStatus status, - in Folder folder); - - void respond_get_control (in CallStatus stutus, - in Bonobo::Control control); - /* - * You must know what interface to query_interface() - * for once you get a data source! - */ - void respond_get_data_source (in CallStatus status, - in Bonobo::Unknown data_source); - - void respond_get_name(in CallStatus status, - in string viewable_name); - /* void respond_get_icon(in CallStatus status, - in */ - - void respond_add_subfolder (in CallStatus status, - in Folder folder); - void respond_move_subfolder (in CallStatus status); - void respond_delete_subfolder (in CallStatus status); - - /* This signals that some piece of data has changed. - The name, control or data source has changed. */ - void signal_name_changed(in Folder folder); - void signal_icon_changed(in Folder folder); - - /* This says a child/children has been added. */ - void signal_subfolder_added(in FolderList folders); - /* This says a child has been removed. */ - void signal_subfolder_removed(in Folder folder); - }; - - interface Folder { - void set_listener (in FolderListener listener); - - /* - * get a bonobo control for this view; a client won't - * use the goad_id gathered in the above function, b/c - * only the wombat knows how to do that, by surfing - * the physical evolution directory structure - */ - void get_control(); - - /* - * You must know what interface to query_interface() - * for once you get a data source! - */ - void get_data_source(); - - void get_name(); - void get_icon(); - - void add_subfolder (in string data_source_id, - in string control_id, - in string viewable_name); - void move_subfolder (in Folder subfolder); - void delete_subfolder (in Folder subfolder); - }; - - interface Wombat { - void get_root_folder(FolderListener listener); - }; -}; diff --git a/shell/main.c b/shell/main.c deleted file mode 100644 index d03c925b44..0000000000 --- a/shell/main.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Main evolution shell application - * - * Authors: - * Miguel de Icaza (miguel@helixcode.com) - * - */ -#include <config.h> -#include <gnome.h> -#include <libgnorba/gnorba.h> -#include <bonobo.h> -#include <e-util/e-gui-utils.h> -#include <e-util/e-cursors.h> -#include <e-util/e-setup.h> /* for e_setup_base_dir */ -#include <glade/glade.h> -#include <glade/glade-xml.h> -#include "e-shell.h" -#include "e-shell-view.h" - -int shell_debugging = 0; - -poptContext ctx; - -EShell *eshell; - -const struct poptOption shell_popt_options [] = { - { "debug", '\0', POPT_ARG_INT, &shell_debugging, 0, - N_("Enables some debugging functions"), N_("LEVEL") }, - { NULL, '\0', 0, NULL, 0 } -}; - -static void -corba_init (int *argc, char *argv []) -{ - CORBA_Environment ev; - - CORBA_exception_init (&ev); - gnome_CORBA_init_with_popt_table ( - "Evolution", VERSION, argc, argv, - shell_popt_options, 0, &ctx, GNORBA_INIT_SERVER_FUNC, &ev); - CORBA_exception_free (&ev); - - if (bonobo_init (gnome_CORBA_ORB (), NULL, NULL) == FALSE){ - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, - _("Failed to initialize the Bonobo component system")); - exit (1); - } -} - -static void -gui_init (void) -{ - e_cursors_init (); - - glade_gnome_init (); - - bonobo_activate (); -} - -static void -gui_shutdown (void) -{ - /* shutdown */ - e_cursors_shutdown (); -} - -static void -evolution_boot (void) -{ - EShellView *e_shell_view; - - if (!e_setup_base_dir ()){ - e_notice ( - NULL, GNOME_MESSAGE_BOX_ERROR, - _("It was not possible to setup the Evolution startup files. Please\n" - "fix the problem, and restart Evolution")); - exit (0); - } - - eshell = e_shell_new (); - e_shell_view = E_SHELL_VIEW ( - e_shell_view_new (eshell, - eshell->default_folders.inbox, - TRUE)); - gtk_signal_connect (GTK_OBJECT (e_shell_view), "destroy", - GTK_SIGNAL_FUNC(gtk_main_quit), - NULL); - - gtk_widget_show (GTK_WIDGET (e_shell_view)); -} - -int -main (int argc, char *argv []) -{ - bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); - textdomain (PACKAGE); - - corba_init (&argc, argv); - gui_init (); - - evolution_boot (); - - gtk_main (); - - gui_shutdown (); - - return 0; -} |