Rewrite the mail label code from top to bottom.

  - Kill the e-util-labels API and read label information into a
    single-column GtkListStore.  Use GConfBridge to automatically
    keep GConf synched with the list store.

  - The list store (a singleton instance) is stored in EShellSettings
    so it's available everywhere.

  - The list store serves as the model for EMailLabelTreeView,
    which itself is embedded in EMailLabelManager; a complete
    label management UI as seen in the preferences dialog.

  - EMailLabelDialog is used to add or edit a label.  Avoid using a
    color button, instead embed a GtkColorSelection directly in the
    dialog so everything is in one window.

Open issues:

  - The weird toggle/color/text menu items in the popup menu aren't
    there.  For now they're just regular toggle items.  I'll deal
    with it later.

  - Filter intergration is broken at the moment.


svn path=/branches/kill-bonobo/; revision=37233

1 files changed, 323 insertions, 0 deletions

diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
new file mode 100644
index 0000000000..23b5068737
--- /dev/null
+++ b/mail/e-mail-label-dialog.c
@@ -0,0 +1,323 @@
+/*
+ * e-mail-label-dialog.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ *
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#include "e-mail-label-dialog.h"
+
+#include <glib/gi18n.h>
+
+#define E_MAIL_LABEL_DIALOG_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_MAIL_LABEL_DIALOG, EMailLabelDialogPrivate))
+
+struct _EMailLabelDialogPrivate {
+	GtkWidget *entry;
+	GtkWidget *colorsel;
+};
+
+enum {
+	PROP_0,
+	PROP_LABEL_COLOR,
+	PROP_LABEL_NAME
+};
+
+static gpointer parent_class;
+
+static void
+mail_label_dialog_entry_changed_cb (EMailLabelDialog *dialog)
+{
+	const gchar *text;
+	gboolean sensitive;
+
+	text = gtk_entry_get_text (GTK_ENTRY (dialog->priv->entry));
+	sensitive = (text != NULL && *text != '\0');
+
+	gtk_dialog_set_response_sensitive (
+		GTK_DIALOG (dialog), GTK_RESPONSE_OK, sensitive);
+}
+
+static void
+mail_label_dialog_set_property (GObject *object,
+                                guint property_id,
+                                const GValue *value,
+                                GParamSpec *pspec)
+{
+	switch (property_id) {
+		case PROP_LABEL_COLOR:
+			e_mail_label_dialog_set_label_color (
+				E_MAIL_LABEL_DIALOG (object),
+				g_value_get_boxed (value));
+			return;
+
+		case PROP_LABEL_NAME:
+			e_mail_label_dialog_set_label_name (
+				E_MAIL_LABEL_DIALOG (object),
+				g_value_get_string (value));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+mail_label_dialog_get_property (GObject *object,
+                                guint property_id,
+                                GValue *value,
+                                GParamSpec *pspec)
+{
+	GdkColor color;
+
+	switch (property_id) {
+		case PROP_LABEL_COLOR:
+			e_mail_label_dialog_get_label_color (
+				E_MAIL_LABEL_DIALOG (object), &color);
+			g_value_set_boxed (value, &color);
+			return;
+
+		case PROP_LABEL_NAME:
+			g_value_set_string (
+				value, e_mail_label_dialog_get_label_name (
+				E_MAIL_LABEL_DIALOG (object)));
+			return;
+	}
+
+	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+}
+
+static void
+mail_label_dialog_dispose (GObject *object)
+{
+	EMailLabelDialogPrivate *priv;
+
+	priv = E_MAIL_LABEL_DIALOG_GET_PRIVATE (object);
+
+	if (priv->entry != NULL) {
+		g_object_unref (priv->entry);
+		priv->entry = NULL;
+	}
+
+	if (priv->colorsel != NULL) {
+		g_object_unref (priv->colorsel);
+		priv->colorsel = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+
+static void
+mail_label_dialog_constructed (GObject *object)
+{
+	GtkWidget *action_area;
+	GtkWidget *content_area;
+
+	/* XXX Override GTK's style property defaults for GtkDialog.
+	 *     Hopefully GTK+ 3.0 will fix the broken defaults. */
+
+	action_area = gtk_dialog_get_action_area (GTK_DIALOG (object));
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (object));
+
+	gtk_box_set_spacing (GTK_BOX (content_area), 12);
+	gtk_container_set_border_width (GTK_CONTAINER (object), 12);
+	gtk_container_set_border_width (GTK_CONTAINER (action_area), 0);
+	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
+}
+
+static void
+mail_label_dialog_class_init (EMailLabelDialogClass *class)
+{
+	GObjectClass *object_class;
+
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (EMailLabelDialogPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->set_property = mail_label_dialog_set_property;
+	object_class->get_property = mail_label_dialog_get_property;
+	object_class->dispose = mail_label_dialog_dispose;
+	object_class->constructed = mail_label_dialog_constructed;
+
+	g_object_class_install_property (
+		object_class,
+		PROP_LABEL_COLOR,
+		g_param_spec_boxed (
+			"label-color",
+			"Label Color",
+			NULL,
+			GDK_TYPE_COLOR,
+			G_PARAM_READWRITE));
+
+	g_object_class_install_property (
+		object_class,
+		PROP_LABEL_NAME,
+		g_param_spec_string (
+			"label-name",
+			"Label Name",
+			NULL,
+			NULL,
+			G_PARAM_READWRITE));
+}
+
+static void
+mail_label_dialog_init (EMailLabelDialog *dialog)
+{
+	GtkWidget *content_area;
+	GtkWidget *container;
+	GtkWidget *widget;
+
+	dialog->priv = E_MAIL_LABEL_DIALOG_GET_PRIVATE (dialog);
+
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+	gtk_dialog_add_button (
+		GTK_DIALOG (dialog),
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
+	gtk_dialog_add_button (
+		GTK_DIALOG (dialog),
+		GTK_STOCK_OK, GTK_RESPONSE_OK);
+
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+	container = content_area;
+
+	widget = gtk_hbox_new (FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
+	container = widget;
+
+	widget = gtk_entry_new ();
+	gtk_entry_set_activates_default (GTK_ENTRY (widget), TRUE);
+	gtk_box_pack_end (GTK_BOX (container), widget, TRUE, TRUE, 0);
+	dialog->priv->entry = g_object_ref (widget);
+	gtk_widget_show (widget);
+
+	g_signal_connect_swapped (
+		widget, "changed",
+		G_CALLBACK (mail_label_dialog_entry_changed_cb), dialog);
+
+	mail_label_dialog_entry_changed_cb (dialog);
+
+	widget = gtk_label_new_with_mnemonic (_("_Label name:"));
+	gtk_label_set_mnemonic_widget (
+		GTK_LABEL (widget), dialog->priv->entry);
+	gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
+	container = content_area;
+
+	widget = gtk_color_selection_new ();
+	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+	dialog->priv->colorsel = g_object_ref (widget);
+	gtk_widget_show (widget);
+}
+
+GType
+e_mail_label_dialog_get_type (void)
+{
+	static GType type = 0;
+
+	if (G_UNLIKELY (type == 0)) {
+		static const GTypeInfo type_info = {
+			sizeof (EMailLabelDialogClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) mail_label_dialog_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL,  /* class_data */
+			sizeof (EMailLabelDialog),
+			0,     /* n_preallocs */
+			(GInstanceInitFunc) mail_label_dialog_init,
+			NULL   /* value_table */
+		};
+
+		type = g_type_register_static (
+			GTK_TYPE_DIALOG, "EMailLabelDialog", &type_info, 0);
+	}
+
+	return type;
+}
+
+GtkWidget *
+e_mail_label_dialog_new (GtkWindow *parent)
+{
+	return g_object_new (
+		E_TYPE_MAIL_LABEL_DIALOG,
+		"transient-for", parent, NULL);
+}
+
+const gchar *
+e_mail_label_dialog_get_label_name (EMailLabelDialog *dialog)
+{
+	GtkEntry *entry;
+
+	g_return_val_if_fail (E_IS_MAIL_LABEL_DIALOG (dialog), NULL);
+
+	entry = GTK_ENTRY (dialog->priv->entry);
+
+	return gtk_entry_get_text (entry);
+}
+
+void
+e_mail_label_dialog_set_label_name (EMailLabelDialog *dialog,
+                                    const gchar *label_name)
+{
+	GtkEntry *entry;
+
+	g_return_if_fail (E_IS_MAIL_LABEL_DIALOG (dialog));
+
+	entry = GTK_ENTRY (dialog->priv->entry);
+
+	gtk_entry_set_text (entry, label_name);
+
+	g_object_notify (G_OBJECT (dialog), "label-name");
+}
+
+void
+e_mail_label_dialog_get_label_color (EMailLabelDialog *dialog,
+                                     GdkColor *label_color)
+{
+	GtkColorSelection *colorsel;
+
+	g_return_if_fail (E_IS_MAIL_LABEL_DIALOG (dialog));
+	g_return_if_fail (label_color != NULL);
+
+	colorsel = GTK_COLOR_SELECTION (dialog->priv->colorsel);
+
+	gtk_color_selection_get_current_color (colorsel, label_color);
+}
+
+void
+e_mail_label_dialog_set_label_color (EMailLabelDialog *dialog,
+                                     const GdkColor *label_color)
+{
+	GtkColorSelection *colorsel;
+
+	g_return_if_fail (E_IS_MAIL_LABEL_DIALOG (dialog));
+	g_return_if_fail (label_color != NULL);
+
+	colorsel = GTK_COLOR_SELECTION (dialog->priv->colorsel);
+
+	gtk_color_selection_set_current_color (colorsel, label_color);
+
+	g_object_notify (G_OBJECT (dialog), "label-color");
+}