diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 92 | ||||
| -rw-r--r-- | shell/e-shell-view.h | 10 |
3 files changed, 91 insertions, 23 deletions
@@ -1,3 +1,15 @@ +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-17 Elliot Lee <sopwith@redhat.com> * calendar/cal-client/Makefile.am, calendar/cal-util/Makefile.am, calendar/gui/Makefile.am, diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 99f2db44f0..9f41b4ec3b 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -24,6 +24,14 @@ static GtkObjectClass *parent_class; +struct _EShellViewPrivate +{ + /* a hashtable of e-folders -> widgets */ + GHashTable *folder_views; + GtkWidget *notebook; +}; + + static void esv_destroy (GtkObject *object) { @@ -31,6 +39,8 @@ esv_destroy (GtkObject *object) e_shell_unregister_view (eshell_view->eshell, eshell_view); + g_hash_table_destroy (eshell_view->priv->folder_views); + g_free (eshell_view->priv); parent_class->destroy (object); } @@ -162,30 +172,47 @@ get_view (EShellView *eshell_view, EFolder *efolder, Bonobo_UIHandler uih) } + + void e_shell_view_set_view (EShellView *eshell_view, EFolder *efolder) { - GtkWidget *w; - Bonobo_UIHandler uih; - - uih = bonobo_object_corba_objref (BONOBO_OBJECT (eshell_view->uih)); - - w = get_view (eshell_view, efolder, uih); - - if (eshell_view->contents){ - gtk_widget_destroy (eshell_view->contents); + GtkWidget *notebook = eshell_view->priv->notebook; + GtkWidget *folder_view = g_hash_table_lookup ( + eshell_view->priv->folder_views, efolder); + + /* if we found a notebook page in our hash, that represents + this efolder, switch to it */ + if (folder_view) { + + int notebook_page = gtk_notebook_page_num ( + GTK_NOTEBOOK(notebook), + folder_view); + g_assert (notebook_page != -1); + + gtk_notebook_set_page (GTK_NOTEBOOK (notebook), notebook_page); } - - eshell_view->contents = w; + 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)); + + GtkWidget *w = get_view (eshell_view, efolder, uih); + int new_page_index; + + if (!w) return; + + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), w, NULL); - if (!w) - return; + new_page_index = gtk_notebook_page_num ( + GTK_NOTEBOOK(notebook), + folder_view); - if (eshell_view->shortcut_displayed){ - gtk_paned_pack2 (GTK_PANED (eshell_view->shortcut_hpaned), - eshell_view->contents, FALSE, TRUE); - } else { - gnome_app_set_contents (GNOME_APP (eshell_view), eshell_view->contents); + g_hash_table_insert (eshell_view->priv->folder_views, + efolder, w); + gtk_notebook_set_page (GTK_NOTEBOOK (notebook),new_page_index); } } @@ -196,7 +223,13 @@ e_shell_view_new (EShell *eshell, EFolder *efolder, gboolean show_shortcut_bar) eshell_view = gtk_type_new (e_shell_view_get_type ()); - gnome_app_construct (GNOME_APP (eshell_view), "Evolution", "Evolution"); + 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); @@ -206,6 +239,27 @@ e_shell_view_new (EShell *eshell, EFolder *efolder, gboolean show_shortcut_bar) 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, FALSE, 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; diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 5f5c5d39c6..3045b7adb7 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -11,6 +11,8 @@ #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; @@ -22,13 +24,13 @@ struct _EShellView { EFolder *efolder; -/* - * - */ - char shortcut_displayed; + + gboolean shortcut_displayed; GtkWidget *shortcut_hpaned; GtkWidget *shortcut_bar; GtkWidget *contents; + + EShellViewPrivate *priv; }; typedef struct { |