diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 30 |
3 files changed, 23 insertions, 14 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index cb23544111..26a88bb1cb 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2000-05-24 Christopher James Lahey <clahey@helixcode.com> + + * Makefile.am: Added libepaned.a. + + * e-shell-view.c: Switched from GtkPaned to EPaned. + 2000-05-23 Ettore Perazzoli <ettore@helixcode.com> * e-shell.c: New member `corba_storage_registry' in diff --git a/shell/Makefile.am b/shell/Makefile.am index a62fb41abd..10a7404035 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -73,6 +73,7 @@ $(EVOLUTION_CORBA_GENERATED): $(IDLS) evolution_LDADD = \ $(top_builddir)/widgets/shortcut-bar/libshortcut-bar.a \ + $(top_builddir)/widgets/e-paned/libepaned.a \ $(top_builddir)/widgets/e-text/libetext.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index f3dd6d1a9d..8f6e0a307e 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -42,6 +42,8 @@ #include "e-shell-view.h" #include "e-shell-view-menu.h" +#include <widgets/e-paned/e-paned.h> + #define PARENT_TYPE gnome_app_get_type () /* Losing GnomeApp does not define GNOME_TYPE_APP. */ static GnomeAppClass *parent_class = NULL; @@ -255,15 +257,15 @@ setup_widgets (EShellView *shell_view) /* Put things into a paned and the paned into the GnomeApp. */ - priv->hpaned2 = gtk_hpaned_new (); - gtk_paned_add1 (GTK_PANED (priv->hpaned2), priv->storage_set_view_box); - gtk_paned_add2 (GTK_PANED (priv->hpaned2), priv->notebook); - gtk_paned_set_position (GTK_PANED (priv->hpaned2), DEFAULT_SHORTCUT_BAR_WIDTH); + priv->hpaned2 = e_hpaned_new (); + e_paned_add1 (E_PANED (priv->hpaned2), priv->storage_set_view_box); + e_paned_add2 (E_PANED (priv->hpaned2), priv->notebook); + e_paned_set_position (E_PANED (priv->hpaned2), DEFAULT_SHORTCUT_BAR_WIDTH); - priv->hpaned1 = gtk_hpaned_new (); - gtk_paned_add1 (GTK_PANED (priv->hpaned1), priv->shortcut_bar_box); - gtk_paned_add2 (GTK_PANED (priv->hpaned1), priv->hpaned2); - gtk_paned_set_position (GTK_PANED (priv->hpaned1), DEFAULT_SHORTCUT_BAR_WIDTH); + priv->hpaned1 = e_hpaned_new (); + e_paned_add1 (E_PANED (priv->hpaned1), priv->shortcut_bar_box); + e_paned_add2 (E_PANED (priv->hpaned1), priv->hpaned2); + e_paned_set_position (E_PANED (priv->hpaned1), DEFAULT_SHORTCUT_BAR_WIDTH); gtk_container_set_border_width (GTK_CONTAINER (priv->hpaned1), 0); gtk_container_set_border_width (GTK_CONTAINER (priv->hpaned2), 0); @@ -762,14 +764,14 @@ e_shell_view_show_shortcuts (EShellView *shell_view, if (show) { if (! GTK_WIDGET_VISIBLE (priv->shortcut_bar_box)) { gtk_widget_show (priv->shortcut_bar_box); - gtk_paned_set_position (GTK_PANED (priv->hpaned1), priv->hpaned1_position); + e_paned_set_position (E_PANED (priv->hpaned1), priv->hpaned1_position); } } else { if (GTK_WIDGET_VISIBLE (priv->shortcut_bar_box)) { gtk_widget_hide (priv->shortcut_bar_box); /* FIXME this is a private field! */ - priv->hpaned1_position = GTK_PANED (priv->hpaned1)->child1_size; - gtk_paned_set_position (GTK_PANED (priv->hpaned1), 0); + priv->hpaned1_position = E_PANED (priv->hpaned1)->child1_size; + e_paned_set_position (E_PANED (priv->hpaned1), 0); } } } @@ -788,14 +790,14 @@ e_shell_view_show_folders (EShellView *shell_view, if (show) { if (! GTK_WIDGET_VISIBLE (priv->storage_set_view_box)) { gtk_widget_show (priv->storage_set_view_box); - gtk_paned_set_position (GTK_PANED (priv->hpaned2), priv->hpaned2_position); + e_paned_set_position (E_PANED (priv->hpaned2), priv->hpaned2_position); } } else { if (GTK_WIDGET_VISIBLE (priv->storage_set_view_box)) { gtk_widget_hide (priv->storage_set_view_box); /* FIXME this is a private field! */ - priv->hpaned2_position = GTK_PANED (priv->hpaned2)->child1_size; - gtk_paned_set_position (GTK_PANED (priv->hpaned2), 0); + priv->hpaned2_position = E_PANED (priv->hpaned2)->child1_size; + e_paned_set_position (E_PANED (priv->hpaned2), 0); } } } |