[ fixes 90% of #25047 ] shamelessly lifted from

2002-05-24  Chris Toshok  <toshok@ximian.com>

	[ fixes 90% of #25047 ]
	* e-folder-list.c (get_folder_for_uri): shamelessly lifted from
	evolution-folder-selector-button.c.
	(create_display_string): modeled again after
	evolution-folder-selector-button.c, so we can give a little more
	context (and make the table look like the folder selector
	buttons.)
	(SPEC): add a pixbuf column, also remove the sorting behavior.
	(columns): add a pixbuf column and another string column (for the
	display string).
	(add_clicked): create the display string and get the proper
	pixbuf, and insert both.
	(edit_clicked): removed.
	(update_buttons): remove edit button handling from here.
	(e_folder_list_init): remove the hooking up of button-edit's
	"clicked" signal.
	(e_folder_list_construct): get a reference to the storage registry
	so we can look up folders.
	(e_folder_list_set_items): analogous change to add_clicked - get
	the display string and pixbuf and insert them.

	* glade/e-folder-list.glade: remove the edit button.

	* glade/e-shell-config-default-folders.glade: remove the
	frame/vbox,  since we embed it in a notebook and the tab has the
	title already.

	* e-shell-config.c (config_control_factory_cb): the only config
	control we deal with here now is the folder settings control.

	* e-shell-config-default-folders.c
	(e_shell_config_default_folders_create_widget): rename
	e_shell_config_default_folders_create_control to this, return the
	widget, and take the config control to use as an arg.

	* e-shell-config-offline.c (e_shell_config_offline_create_widget):
	make an analogous change here as with
	default_folders_create_widget.

	* e-shell-config-default-folders.h
	(e_shell_config_default_folders_create_widget): track change to
	prototype.

	* e-shell-config-offline.h (e_shell_config_offline_create_widget): same.

	* GNOME_Evolution_Shell.oaf.in: remove the DefaultFolders and
	OfflineFolders controls and add a FolderSettings_Control.

	* Makefile.am (evolution_SOURCES): add
	e-shell-config-folder-settings.[ch] and
	e-shell-config-autocompletion.[ch].

	* e-shell-config-folder-settings.[ch]: new files, embed (after a
	fashion) the default folder, offline, and autocompletion UI's in a
	notebook.

	* e-shell-config-autocompletion.[ch]: Basically copy over and
	shell-ize the addressbook autocompletion config control so it can
	be embedded more easily with the other folder settings.

svn path=/trunk/; revision=17000

1 files changed, 83 insertions, 0 deletions

diff --git a/shell/e-shell-config-folder-settings.c b/shell/e-shell-config-folder-settings.c
new file mode 100644
index 0000000000..25a3d1a3ff
--- /dev/null
+++ b/shell/e-shell-config-folder-settings.c
@@ -0,0 +1,83 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-shell-config-folder-settings.c - Configuration page for folder settings.
+ *
+ * Copyright (C) 2002 Ximian, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ * Author: Ettore Perazzoli <ettore@ximian.com>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
+#include "e-shell-config-folder-settings.h"
+#include "e-shell-config-offline.h"
+#include "e-shell-config-autocompletion.h"
+#include "e-shell-config-default-folders.h"
+
+#include "evolution-config-control.h"
+#include "e-storage-set-view.h"
+
+#include "Evolution.h"
+
+#include <bonobo-conf/Bonobo_Config.h>
+#include <bonobo/bonobo-exception.h>
+
+#include <libgnome/gnome-i18n.h>
+#include <gtk/gtknotebook.h>
+#include <gtk/gtklabel.h>
+
+
+static void
+append_to_notebook (GtkWidget *notebook, char *label_str,
+		    GtkWidget *child)
+{
+	GtkWidget *label;
+
+	label = gtk_label_new (label_str);
+
+	gtk_notebook_append_page (GTK_NOTEBOOK(notebook), child, label);
+	gtk_widget_show (label);
+	gtk_widget_show (child);
+}
+
+BonoboObject *
+e_shell_config_folder_settings_create_control (EShell *shell)
+{
+	GtkWidget *notebook;
+	EvolutionConfigControl *control;
+
+	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
+
+	notebook = gtk_notebook_new ();
+
+	control = evolution_config_control_new (notebook);
+
+	append_to_notebook (notebook, _("Default Folders"),
+			    e_shell_config_default_folders_create_widget (shell, control));
+
+	append_to_notebook (notebook, _("Offline Folders"),
+			    e_shell_config_offline_create_widget (shell, control));
+
+	append_to_notebook (notebook, _("Autocompletion Folders"),
+			    e_shell_config_autocompletion_create_widget (shell, control));
+
+	gtk_widget_show (notebook);
+
+	return BONOBO_OBJECT (control);
+}