From ec6a1f428845967606ef209be19679d702811c0c Mon Sep 17 00:00:00 2001 From: Arturo Espinosa Date: Tue, 18 Jan 2000 08:47:25 +0000 Subject: More work; Model view for the shortcut bar is better; More menus; More features -migu svn path=/trunk/; revision=1587 --- shell/e-shortcut.c | 347 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 297 insertions(+), 50 deletions(-) (limited to 'shell/e-shortcut.c') diff --git a/shell/e-shortcut.c b/shell/e-shortcut.c index ec83bc3854..767f9e4067 100644 --- a/shell/e-shortcut.c +++ b/shell/e-shortcut.c @@ -9,22 +9,26 @@ */ #include #include +#include +#include #include "e-util/e-util.h" #include "e-shortcut.h" +#include "shortcut-bar/e-shortcut-bar.h" +#include "shortcut-bar/e-clipped-label.h" #define SHORTCUT_PARENT_TYPE gtk_object_get_type () +#define SHORTCUT_BAR_MODEL_PARENT_TYPE gtk_object_get_type () #define SHORTCUT_GROUP_PARENT_TYPE gtk_object_get_type () static GtkObjectClass *shortcut_parent_class; static GtkObjectClass *shortcut_group_parent_class; +static GtkObjectClass *shortcut_bar_model_parent_class; enum { STRUCTURE_CHANGED, LAST_SIGNAL }; -static unsigned int sg_signals [LAST_SIGNAL] = { 0, }; - static void es_destroy (GtkObject *object) { @@ -58,49 +62,16 @@ esg_destroy (GtkObject *object) } g_array_free (efg->shortcuts, TRUE); + efg->model = NULL; shortcut_group_parent_class->destroy (object); } -typedef void (*MyGtkSignal_NONE__INT_INT_INT) (GtkObject * object, - int arg1, - int arg2, - int arg3, - gpointer user_data); -static void -mygtk_marshal_NONE__INT_INT_INT (GtkObject * object, - GtkSignalFunc func, - gpointer func_data, - GtkArg * args) -{ - MyGtkSignal_NONE__INT_INT_INT rfunc; - rfunc = (MyGtkSignal_NONE__INT_INT_INT) func; - - (*rfunc) (object, - GTK_VALUE_INT (args[0]), - GTK_VALUE_INT (args[1]), - GTK_VALUE_INT (args[2]), - func_data); -} - static void e_shortcut_group_class_init (GtkObjectClass *object_class) { object_class->destroy = esg_destroy; shortcut_parent_class = gtk_type_class (SHORTCUT_GROUP_PARENT_TYPE); - - sg_signals [STRUCTURE_CHANGED] = - gtk_signal_new ("structure_changed", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (EShortcutGroupClass, structure_changed), - mygtk_marshal_NONE__INT_INT_INT, - GTK_TYPE_NONE, - 3, - GTK_TYPE_ENUM, GTK_TYPE_INT, GTK_TYPE_INT); - gtk_object_class_add_signals ( - object_class, sg_signals, LAST_SIGNAL); - } static void @@ -108,12 +79,11 @@ e_shortcut_group_init (GtkObject *object) { EShortcutGroup *esg = E_SHORTCUT_GROUP (object); + GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (object), GTK_FLOATING); + esg->shortcuts = g_array_new (FALSE, FALSE, sizeof (EShortcut *)); } -E_MAKE_TYPE (e_shortcut, "EShortcut", EShortcut, e_shortcut_class_init, NULL, SHORTCUT_PARENT_TYPE); -E_MAKE_TYPE (e_shortcut_group, "EShortcutGroup", EShortcutGroup, e_shortcut_group_class_init, e_shortcut_group_init, SHORTCUT_GROUP_PARENT_TYPE); - EShortcut * e_shortcut_new (EFolder *efolder) { @@ -126,21 +96,15 @@ e_shortcut_new (EFolder *efolder) } EShortcutGroup * -e_shortcut_group_new (const char *title, gboolean small_icons) +e_shortcut_group_new (const char *title, EIconBarViewType type) { EShortcutGroup *shortcut_group = gtk_type_new (e_shortcut_group_get_type ()); shortcut_group->title = g_strdup (title); - shortcut_group->small_icons = small_icons; + shortcut_group->type = type; return shortcut_group; } -static void -es_emit (EShortcutGroup *sg, EShortcutGroupChange change, int arg1, int arg2) -{ - gtk_signal_emit (GTK_OBJECT (sg), sg_signals [STRUCTURE_CHANGED], change, arg1, arg2); -} - void e_shortcut_group_append (EShortcutGroup *sg, EShortcut *shortcut) { @@ -150,9 +114,11 @@ e_shortcut_group_append (EShortcutGroup *sg, EShortcut *shortcut) g_return_if_fail (E_IS_SHORTCUT (shortcut)); gtk_object_ref (GTK_OBJECT (shortcut)); + gtk_object_sink (GTK_OBJECT (shortcut)); + g_array_append_val (sg->shortcuts, shortcut); - es_emit (sg, E_SHORTCUT_GROUP_ITEM_ADDED, sg->shortcuts->len-1, 0); + /* FIXME: Broadcast change */ } void @@ -172,7 +138,7 @@ e_shortcut_group_remove (EShortcutGroup *sg, EShortcut *shortcut) if (es == shortcut){ g_array_remove_index (sg->shortcuts, i); - es_emit (sg, E_SHORTCUT_GROUP_ITEM_REMOVED, i, 0); + /* FIXME: Broadcast change */ return; } } @@ -200,5 +166,286 @@ e_shortcut_group_move (EShortcutGroup *sg, int from, int to) g_array_index (sg->shortcuts, EShortcut *, to); g_array_index (sg->shortcuts, EShortcut *, to) = t; - es_emit (sg, E_SHORTCUT_GROUP_ITEM_MOVED, from, to); + /* FIXME: Broadcast change */ +} + +void +e_shortcut_group_rename (EShortcutGroup *sg, const char *text) +{ + GSList *l; + int id; + + g_return_if_fail (sg != NULL); + g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); + + id = e_group_num_from_group_ptr (sg->model, sg); + for (l = sg->model->views; l; l = l->next){ + EShortcutBar *shortcut_bar = l->data; + GtkWidget *label; + + label = e_clipped_label_new (text); + + gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); + gtk_widget_show (label); + + e_group_bar_set_group_button_label ( + E_GROUP_BAR (shortcut_bar), id, label); + } +} + +static void +esb_destroy (GtkObject *object) +{ + EShortcutBarModel *esb = E_SHORTCUT_BAR_MODEL (object); + const int count = esb->groups->len; + int i; + + for (i = 0; i < count; i++){ + EShortcutGroup *esg = g_array_index (esb->groups, EShortcutGroup *, i); + + gtk_object_destroy (GTK_OBJECT (esg)); + } + + g_array_free (esb->groups, TRUE); + shortcut_bar_model_parent_class->destroy (object); +} + +static void +e_shortcut_bar_model_class_init (GtkObjectClass *object_class) +{ + object_class->destroy = esb_destroy; + shortcut_bar_model_parent_class = gtk_type_class (SHORTCUT_BAR_MODEL_PARENT_TYPE); +} + +static void +e_shortcut_bar_model_init (GtkObject *object) +{ + EShortcutBarModel *esb = E_SHORTCUT_BAR_MODEL (object); + + /* The shortcut bar model is self owned */ + GTK_OBJECT_UNSET_FLAGS (object, GTK_FLOATING); + + esb->groups = g_array_new (FALSE, FALSE, sizeof (EShortcutGroup *)); +} + +EShortcutBarModel * +e_shortcut_bar_model_new (void) +{ + EShortcutBarModel *bm; + + bm = gtk_type_new (e_shortcut_bar_model_get_type ()); + + return bm; +} + +void +e_shortcut_bar_model_append (EShortcutBarModel *bm, EShortcutGroup *sg) +{ + g_return_if_fail (bm != NULL); + g_return_if_fail (sg != NULL); + g_return_if_fail (E_IS_SHORTCUT_BAR_MODEL (bm)); + g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); + + gtk_object_ref (GTK_OBJECT (sg)); + gtk_object_sink (GTK_OBJECT (sg)); + + sg->model = bm; + + g_array_append_val (bm->groups, sg); +} + +EShortcutGroup * +e_shortcut_group_from_pos (EShortcutBarModel *bm, int group_num) +{ + EShortcutGroup *group; + + if (group_num == -1) + return NULL; + + group = g_array_index (bm->groups, EShortcutGroup *, group_num); + return group; +} + +EShortcut * +e_shortcut_from_pos (EShortcutGroup *group, int item_num) +{ + EShortcut *shortcut; + + g_return_val_if_fail (group != NULL, NULL); + g_return_val_if_fail (E_IS_SHORTCUT_GROUP (group), NULL); + + if (item_num == -1) + return NULL; + + g_return_val_if_fail (item_num < group->shortcuts->len, NULL); + + shortcut = g_array_index (group->shortcuts, EShortcut *, item_num); + return shortcut; +} + +static void +populate_group (EShortcutBarModel *bm, EShortcutGroup *esg, EShortcutBar *shortcut_bar) +{ + int group_num, i; + const int items = esg->shortcuts->len; + + group_num = e_shortcut_bar_add_group (shortcut_bar, esg->title); + e_shortcut_bar_set_view_type (shortcut_bar, group_num, esg->type); + + for (i = 0; i < items; i++){ + EShortcut *shortcut = E_SHORTCUT (g_array_index (esg->shortcuts, EShortcut *, i)); + EFolder *folder = shortcut->efolder; + char *type = NULL; + + switch (folder->type){ + case E_FOLDER_MAIL: + type = "folder:"; + break; + + case E_FOLDER_CONTACTS: + type = "contacts:"; + break; + + case E_FOLDER_CALENDAR: + type = "calendar:"; + break; + + case E_FOLDER_TASKS: + type = "todo:"; + break; + + case E_FOLDER_OTHER: + type = "file:"; + break; + + default: + g_assert_not_reached (); + } + + e_shortcut_bar_add_item (shortcut_bar, group_num, type, folder->name); + } +} + +static void +populate_from_model (EShortcutBarModel *bm, EShortcutBar *shortcut_bar) +{ + const int groups = bm->groups->len; + int i; + + for (i = 0; i < groups; i++){ + EShortcutGroup *esg; + + esg = g_array_index (bm->groups, EShortcutGroup *, i); + + populate_group (bm, esg, shortcut_bar); + } + +} + +static void +view_destroyed (EShortcutBar *shortcut_bar, EShortcutBarModel *bm) +{ + bm->views = g_slist_remove (bm->views, shortcut_bar); +} + +GtkWidget * +e_shortcut_bar_view_new (EShortcutBarModel *bm) +{ + GtkWidget *shortcut_bar; + + gtk_widget_push_visual (gdk_rgb_get_visual ()); + gtk_widget_push_colormap (gdk_rgb_get_cmap ()); + + shortcut_bar = e_shortcut_bar_new (); + + gtk_widget_pop_visual (); + gtk_widget_pop_colormap (); + + populate_from_model (bm, E_SHORTCUT_BAR (shortcut_bar)); + + bm->views = g_slist_prepend (bm->views, shortcut_bar); + gtk_signal_connect (GTK_OBJECT (shortcut_bar), "destroy", GTK_SIGNAL_FUNC (view_destroyed), bm); + + return shortcut_bar; +} + +int +e_group_num_from_group_ptr (EShortcutBarModel *bm, EShortcutGroup *group) +{ + const int n = bm->groups->len; + int i; + + for (i = 0; i < n; i++) + if (g_array_index (bm->groups, EShortcutGroup *, i) == group) + return i; + return -1; +} + +/* + * Sets the view mode in all the views + */ +void +e_shortcut_group_set_view_type (EShortcutGroup *group, EIconBarViewType type) +{ + GSList *l; + int group_num; + + g_return_if_fail (group != NULL); + g_return_if_fail (E_IS_SHORTCUT_GROUP (group)); + + group_num = e_group_num_from_group_ptr (group->model, group); + + g_assert (group_num != -1); + + group->type = type; + + for (l = group->model->views; l ; l = l->next){ + EShortcutBar *shortcut_bar = l->data; + + e_shortcut_bar_set_view_type (shortcut_bar, group_num, type); + } +} + +gint +e_shortcut_bar_model_add_group (EShortcutBarModel *model) +{ + int id = -1; + GSList *l = NULL; + + g_return_val_if_fail (model != NULL, -1); + g_return_val_if_fail (E_IS_SHORTCUT_BAR_MODEL (model), -1); + + for (l = model->views; l; l = l->next){ + EShortcutBar *shortcut_bar = l->data; + + id = e_shortcut_bar_add_group (shortcut_bar, _("New group")); + } + + return id; +} + +void +e_shortcut_bar_model_remove_group (EShortcutBarModel *model, EShortcutGroup *sg) +{ + GSList *l = NULL; + int group_num; + + g_return_if_fail (model != NULL); + g_return_if_fail (E_IS_SHORTCUT_BAR_MODEL (model)); + g_return_if_fail (sg != NULL); + g_return_if_fail (E_IS_SHORTCUT_GROUP (sg)); + + group_num = e_group_num_from_group_ptr (model, sg); + + for (l = model->views; l; l = l->next){ + EShortcutBar *shortcut_bar = l->data; + + e_shortcut_bar_remove_group (shortcut_bar, group_num); + } + } + +E_MAKE_TYPE (e_shortcut, "EShortcut", EShortcut, e_shortcut_class_init, NULL, SHORTCUT_PARENT_TYPE); +E_MAKE_TYPE (e_shortcut_group, "EShortcutGroup", EShortcutGroup, e_shortcut_group_class_init, e_shortcut_group_init, SHORTCUT_GROUP_PARENT_TYPE); +E_MAKE_TYPE (e_shortcut_bar_model, "EShortcutBarModel", EShortcutBarModel, e_shortcut_bar_model_class_init, e_shortcut_bar_model_init, SHORTCUT_BAR_MODEL_PARENT_TYPE); + -- cgit v1.2.3