aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-component.c6
-rw-r--r--shell/ChangeLog9
-rw-r--r--shell/e-storage-browser.c15
-rw-r--r--shell/e-storage-browser.h7
5 files changed, 38 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 43876b1e41..fe29a71caf 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,11 @@
2003-10-22 Ettore Perazzoli <ettore@ximian.com>
+ * mail-component.c (impl_createControls): Use
+ e_storage_browser_peek_widget_scrolled() to retrieve the scrolled
+ window that the EStorageSetView is contained in.
+
+2003-10-22 Ettore Perazzoli <ettore@ximian.com>
+
* GNOME_Evolution_Mail.server.in.in: Add an
"evolution:button_label" attribute to the Component for use in the
shell.
diff --git a/mail/mail-component.c b/mail/mail-component.c
index bb0bc876d1..908403f824 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -930,6 +930,7 @@ impl_createControls (PortableServer_Servant servant,
MailComponentPrivate *priv = mail_component->priv;
EStorageBrowser *browser;
GtkWidget *tree_widget;
+ GtkWidget *tree_widget_scrolled;
GtkWidget *view_widget;
BonoboControl *sidebar_control;
BonoboControl *view_control;
@@ -937,6 +938,7 @@ impl_createControls (PortableServer_Servant servant,
browser = e_storage_browser_new (priv->storage_set, "/", create_view_callback, NULL);
tree_widget = e_storage_browser_peek_tree_widget (browser);
+ tree_widget_scrolled = e_storage_browser_peek_tree_widget_scrolled (browser);
view_widget = e_storage_browser_peek_view_widget (browser);
e_storage_set_view_set_drag_types ((EStorageSetView *) tree_widget, drag_types, num_drag_types);
@@ -946,10 +948,10 @@ impl_createControls (PortableServer_Servant servant,
g_signal_connect (tree_widget, "folder_dragged", G_CALLBACK (folder_dragged_cb), browser);
g_signal_connect (tree_widget, "folder_receive_drop", G_CALLBACK (folder_receive_drop_cb), browser);
- gtk_widget_show (tree_widget);
+ gtk_widget_show (tree_widget_scrolled);
gtk_widget_show (view_widget);
- sidebar_control = bonobo_control_new (tree_widget);
+ sidebar_control = bonobo_control_new (tree_widget_scrolled);
view_control = bonobo_control_new (view_widget);
*corba_sidebar_control = CORBA_Object_duplicate (BONOBO_OBJREF (sidebar_control), ev);
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6ae50e37fd..0989623b18 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,14 @@
2003-10-22 Ettore Perazzoli <ettore@ximian.com>
+ * e-storage-browser.c (struct _EStorageBrowserPrivate): New member
+ "storage_set_view_scrolled".
+ (e_storage_browser_new): Put the storage_set_view in a scrolled
+ window. Set priv->storage_set_view_scrolled to this scrolled
+ window.
+ (e_storage_browser_peek_tree_widget_scrolled): New.
+
+2003-10-22 Ettore Perazzoli <ettore@ximian.com>
+
* e-sidebar.c (PADDING): Increase to 6 pixels.
(button_toggled_callback): Add a cast.
(e_sidebar_set_selection_widget): Handle the NULL widget case
diff --git a/shell/e-storage-browser.c b/shell/e-storage-browser.c
index a5452d80c1..d3ba4d24a9 100644
--- a/shell/e-storage-browser.c
+++ b/shell/e-storage-browser.c
@@ -42,6 +42,7 @@
#include <gal/util/e-util.h>
#include <gtk/gtknotebook.h>
+#include <gtk/gtkscrolledwindow.h>
#include <string.h>
@@ -55,6 +56,7 @@ struct _EStorageBrowserPrivate {
GtkWidget *view_notebook;
GtkWidget *storage_set_view;
+ GtkWidget *storage_set_view_scrolled;
GHashTable *path_to_view; /* (char *, GtkWidget *) */
@@ -221,7 +223,14 @@ e_storage_browser_new (EStorageSet *storage_set,
new->priv->create_view_callback = create_view_callback;
new->priv->create_view_callback_data = callback_data;
new->priv->starting_path = g_strdup (starting_path);
+
new->priv->storage_set_view = e_storage_set_create_new_view (storage_set, NULL);
+ gtk_widget_show (new->priv->storage_set_view);
+
+ new->priv->storage_set_view_scrolled = gtk_scrolled_window_new (NULL, NULL);
+ gtk_container_add (GTK_CONTAINER (new->priv->storage_set_view_scrolled), new->priv->storage_set_view);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (new->priv->storage_set_view_scrolled),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
g_object_weak_ref (G_OBJECT (new->priv->storage_set_view), (GWeakNotify) storage_set_view_weak_notify, new);
@@ -248,6 +257,12 @@ e_storage_browser_peek_tree_widget (EStorageBrowser *browser)
}
GtkWidget *
+e_storage_browser_peek_tree_widget_scrolled (EStorageBrowser *browser)
+{
+ return browser->priv->storage_set_view_scrolled;
+}
+
+GtkWidget *
e_storage_browser_peek_view_widget (EStorageBrowser *browser)
{
return browser->priv->view_notebook;
diff --git a/shell/e-storage-browser.h b/shell/e-storage-browser.h
index fa9b3a121d..f500134704 100644
--- a/shell/e-storage-browser.h
+++ b/shell/e-storage-browser.h
@@ -70,9 +70,10 @@ EStorageBrowser *e_storage_browser_new (EStorageSet *stor
EStorageBrowserCreateViewCallback create_view_callback,
void *create_view_callback_data);
-GtkWidget *e_storage_browser_peek_tree_widget (EStorageBrowser *browser);
-GtkWidget *e_storage_browser_peek_view_widget (EStorageBrowser *browser);
-EStorageSet *e_storage_browser_peek_storage_set (EStorageBrowser *browser);
+GtkWidget *e_storage_browser_peek_tree_widget (EStorageBrowser *browser);
+GtkWidget *e_storage_browser_peek_tree_widget_scrolled (EStorageBrowser *browser);
+GtkWidget *e_storage_browser_peek_view_widget (EStorageBrowser *browser);
+EStorageSet *e_storage_browser_peek_storage_set (EStorageBrowser *browser);
gboolean e_storage_browser_show_path (EStorageBrowser *browser,
const char *path);