Update the shortcut bar in the shell view to match the changes in the

way drag and drop is handled.  Separate the handling for the view into
a separate object.

This should make the shortcut bar work again, but it's untested.

svn path=/trunk/; revision=5575

1 files changed, 296 insertions, 0 deletions

diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c
new file mode 100644
index 0000000000..c37e45092c
--- /dev/null
+++ b/shell/e-shortcuts-view-model.c
@@ -0,0 +1,296 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-shortcuts-view-model.c
+ *
+ * Copyright (C) 2000  Helix Code, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ */
+
+/* FIXME.  This really sucks.  We are using the model/view approach in the
+   dumbest possible way.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gnome.h>
+#include <gal/util/e-util.h>
+
+#include "e-shortcuts-view-model.h"
+
+
+#define PARENT_TYPE e_shortcut_model_get_type ()
+static EShortcutModelClass *parent_class = NULL;
+
+struct _EShortcutsViewModelPrivate {
+	EShortcuts *shortcuts;
+};
+
+
+/* View initialization.  */
+
+static const char *
+get_storage_set_path_from_uri (const char *uri)
+{
+	const char *colon;
+
+	if (g_path_is_absolute (uri))
+		return NULL;
+
+	colon = strchr (uri, ':');
+	if (colon == NULL || colon == uri || colon[1] == '\0')
+		return NULL;
+
+	if (! g_path_is_absolute (colon + 1))
+		return NULL;
+
+	if (g_strncasecmp (uri, "evolution", colon - uri) != 0)
+		return NULL;
+
+	return colon + 1;
+}
+
+static void
+load_group_into_model (EShortcutsViewModel *shortcuts_view_model,
+		       const char *group_title,
+		       int group_num)
+{
+	EShortcutsViewModelPrivate *priv;
+	EStorageSet *storage_set;
+	GList *shortcut_list;
+	GList *p;
+
+	priv = shortcuts_view_model->priv;
+
+	storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
+	g_assert (storage_set != NULL);
+
+	shortcut_list = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, group_title);
+	if (shortcut_list == NULL)
+		return;
+
+	for (p = shortcut_list; p != NULL; p = p->next) {
+		EFolder *folder;
+		const char *path;
+		const char *uri;
+		const char *name;
+
+		uri = (const char *) p->data;
+		path = get_storage_set_path_from_uri (uri);
+		if (path != NULL)
+			folder = e_storage_set_get_folder (storage_set, path);
+
+		if (path == NULL || folder == NULL) {
+			/* FIXME */
+			g_warning ("Invalid link while loading shortcut bar view -- %s\n",
+				   uri);
+			continue;
+		}
+
+		name = e_folder_get_name (folder);
+		e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, -1, uri, name);
+	}
+
+	e_free_string_list (shortcut_list);
+}
+
+static void
+load_all_shortcuts_into_model (EShortcutsViewModel *shortcuts_view_model)
+{
+	EShortcutsViewModelPrivate *priv;
+	GList *group_titles;
+	GList *p;
+	int group_num;
+
+	priv = shortcuts_view_model->priv;
+
+	group_titles = e_shortcuts_get_group_titles (priv->shortcuts);
+
+	for (p = group_titles; p != NULL; p = p->next) {
+		const char *group_title;
+
+		group_title = (const char *) p->data;
+		group_num = e_shortcut_model_add_group (E_SHORTCUT_MODEL (shortcuts_view_model), -1, group_title);
+
+		load_group_into_model (shortcuts_view_model, group_title, group_num);
+	}
+
+	e_free_string_list (group_titles);
+}
+
+
+/* EShortcuts callbacks.  */
+
+static void
+shortcuts_new_group_cb (EShortcuts *shortcuts,
+			int group_num,
+			void *data)
+{
+	EShortcutsViewModel *shortcuts_view_model;
+	EShortcutsViewModelPrivate *priv;
+	const char *title;
+
+	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (shortcuts);
+	priv = shortcuts_view_model->priv;
+
+	title = e_shortcuts_get_group_title (priv->shortcuts, group_num);
+	e_shortcut_model_add_group (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, title);
+}
+
+static void
+shortcuts_remove_group_cb (EShortcuts *shortcuts,
+			   int group_num,
+			   void *data)
+{
+	EShortcutsViewModel *shortcuts_view_model;
+
+	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
+	e_shortcut_model_remove_group (E_SHORTCUT_MODEL (shortcuts_view_model), group_num);
+}
+
+static void
+shortcuts_new_shortcut_cb (EShortcuts *shortcuts,
+			   int group_num,
+			   int item_num,
+			   void *data)
+{
+	EShortcutsViewModel *shortcuts_view_model;
+	EShortcutsViewModelPrivate *priv;
+	EStorageSet *storage_set;
+	EFolder *folder;
+	const char *uri;
+	const char *storage_set_path;
+	const char *folder_name;
+
+	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
+	priv = shortcuts_view_model->priv;
+
+	uri = e_shortcuts_get_uri (priv->shortcuts, group_num, item_num);
+	g_assert (uri != NULL);
+
+	storage_set_path = get_storage_set_path_from_uri (uri);
+	if (storage_set_path == NULL)
+		return;
+
+	storage_set = e_shortcuts_get_storage_set (priv->shortcuts);
+	folder = e_storage_set_get_folder (storage_set, storage_set_path);
+	folder_name = e_folder_get_name (folder);
+
+	e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model),
+				   group_num, item_num, uri, folder_name);
+}
+
+static void
+shortcuts_remove_shortcut_cb (EShortcuts *shortcuts,
+			      int group_num,
+			      int item_num,
+			      void *data)
+{
+	EShortcutsViewModel *shortcuts_view_model;
+
+	shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data);
+	e_shortcut_model_remove_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, item_num);
+}
+
+
+/* GtkObject methods.  */
+
+static void
+impl_destroy (GtkObject *object)
+{
+	EShortcutsViewModel *view_model;
+	EShortcutsViewModelPrivate *priv;
+
+	view_model = E_SHORTCUTS_VIEW_MODEL (object);
+	priv = view_model->priv;
+
+	g_free (priv);
+}
+
+
+static void
+class_init (EShortcutsViewModelClass *klass)
+{
+	GtkObjectClass *object_class;
+
+	object_class = GTK_OBJECT_CLASS (klass);
+
+	parent_class = gtk_type_class (e_shortcut_model_get_type ());
+}
+
+static void
+init (EShortcutsViewModel *shortcuts_view_model)
+{
+	EShortcutsViewModelPrivate *priv;
+
+	priv = g_new (EShortcutsViewModelPrivate, 1);
+	priv->shortcuts = NULL;
+
+	shortcuts_view_model->priv = priv;
+}
+
+
+void
+e_shortcuts_view_model_construct (EShortcutsViewModel *model,
+				  EShortcuts *shortcuts)
+{
+	EShortcutsViewModelPrivate *priv;
+
+	g_return_if_fail (model != NULL);
+	g_return_if_fail (E_IS_SHORTCUTS_VIEW_MODEL (model));
+	g_return_if_fail (shortcuts != NULL);
+	g_return_if_fail (E_IS_SHORTCUTS (shortcuts));
+
+	priv = model->priv;
+	g_return_if_fail (priv->shortcuts == NULL);
+
+	priv->shortcuts = shortcuts;
+
+	load_all_shortcuts_into_model (model);
+
+	gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts),
+					"new_group", GTK_SIGNAL_FUNC (shortcuts_new_group_cb), model,
+					GTK_OBJECT (model));
+	gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts),
+					"remove_group", GTK_SIGNAL_FUNC (shortcuts_remove_group_cb), model,
+					GTK_OBJECT (model));
+	gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts),
+					"new_shortcut", GTK_SIGNAL_FUNC (shortcuts_new_shortcut_cb), model,
+					GTK_OBJECT (model));
+	gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts),
+					"remove_shortcut", GTK_SIGNAL_FUNC (shortcuts_remove_shortcut_cb), model,
+					GTK_OBJECT (model));
+}
+
+EShortcutsViewModel *
+e_shortcuts_view_model_new (EShortcuts *shortcuts)
+{
+	EShortcutsViewModel *new;
+
+	g_return_val_if_fail (shortcuts != NULL, NULL);
+	g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL);
+
+	new = gtk_type_new (e_shortcuts_view_model_get_type ());
+
+	e_shortcuts_view_model_construct (new, shortcuts);
+
+	return new;
+}
+
+
+E_MAKE_TYPE (e_shortcuts_view_model, "EShortcutsViewModel", EShortcutsViewModel, class_init, init, PARENT_TYPE)