aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/Makefile.am1
-rw-r--r--mail/subscribe-dialog.c21
3 files changed, 27 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1c9e12f1aa..2146f2d27e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,14 @@
2000-10-02 Chris Toshok <toshok@helixcode.com>
+ * Makefile.am (INCLUDES): add -I$(top_srcdir)/widgets/misc
+
+ * subscribe-dialog.c (subscribe_dialog_gui_init): change the
+ window title to Manage Subscriptions, bold subscribed folders, and
+ add a title bar ala the evolution shell (but without the close
+ button).
+
+2000-10-02 Chris Toshok <toshok@helixcode.com>
+
* subscribe-dialog.h: add fields for the storage set
Bonobo_Control and Evolution_StorageSetView interfaces.
diff --git a/mail/Makefile.am b/mail/Makefile.am
index c25ae80838..ff988594c0 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -7,6 +7,7 @@ providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
INCLUDES = \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/e-text \
+ -I$(top_srcdir)/widgets/misc \
-I$(top_srcdir) \
-I$(top_srcdir)/camel \
-I$(top_builddir)/shell \
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index 079e0ddf8c..639dde2b3c 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -11,6 +11,7 @@
#include <gnome.h>
#include "subscribe-dialog.h"
#include "e-util/e-html-utils.h"
+#include "e-title-bar.h"
#include <gtkhtml/gtkhtml.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-unicode.h>
@@ -390,14 +391,14 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
GdkPixbuf *toggles[2];
BonoboUIComponent *component;
Bonobo_UIContainer container;
- GtkWidget *folder_search_widget;
+ GtkWidget *folder_search_widget, *vbox, *storage_set_title_bar;
BonoboControl *search_control;
CORBA_Environment ev;
CORBA_exception_init (&ev);
/* Construct the app */
- sc->app = bonobo_win_new ("subscribe-dialog", "Subscribe");
+ sc->app = bonobo_win_new ("subscribe-dialog", "Manage Subscriptions");
/* Build the menu and toolbar */
sc->uih = bonobo_ui_handler_new ();
@@ -433,7 +434,15 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
sc->table = gtk_table_new (1, 2, FALSE);
sc->hpaned = e_hpaned_new ();
- e_paned_add1 (E_PANED (sc->hpaned), sc->storage_set_view_widget);
+ vbox = gtk_vbox_new (FALSE, 0);
+
+ storage_set_title_bar = e_title_bar_new (_("Storages"));
+ e_title_bar_show_button (E_TITLE_BAR (storage_set_title_bar), FALSE);
+
+ gtk_box_pack_start (GTK_BOX (vbox), storage_set_title_bar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), sc->storage_set_view_widget, TRUE, TRUE, 0);
+
+ e_paned_add1 (E_PANED (sc->hpaned), vbox);
e_paned_add2 (E_PANED (sc->hpaned), sc->table);
e_paned_set_position (E_PANED (sc->hpaned), DEFAULT_STORAGE_SET_WIDTH);
@@ -517,7 +526,9 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
gtk_object_set (GTK_OBJECT (E_TABLE_SCROLLED (sc->etable)->table),
"cursor_mode", E_TABLE_CURSOR_LINE,
NULL);
-
+ gtk_object_set (GTK_OBJECT (cells[2]),
+ "bold_column", COL_FOLDER_SUBSCRIBED,
+ NULL);
gtk_table_attach (
GTK_TABLE (sc->table), sc->etable,
0, 1, 1, 3,
@@ -529,6 +540,8 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
gtk_widget_show (sc->etable);
gtk_widget_show (sc->table);
gtk_widget_show (sc->storage_set_view_widget);
+ gtk_widget_show (storage_set_title_bar);
+ gtk_widget_show (vbox);
gtk_widget_show (sc->hpaned);
/* FIXME: Session management and stuff? */