aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-01-09 10:40:46 +0800
committerChris Toshok <toshok@src.gnome.org>2003-01-09 10:40:46 +0800
commit81d8ab193f647151b6866a01b898d137154204c5 (patch)
treec4f9eb75f54a1923b630ec942a79ede4ac77f290 /addressbook
parent5d92db014941daf0831694f00deb6c1f6cb22e69 (diff)
downloadgsoc2013-evolution-81d8ab193f647151b6866a01b898d137154204c5.tar
gsoc2013-evolution-81d8ab193f647151b6866a01b898d137154204c5.tar.gz
gsoc2013-evolution-81d8ab193f647151b6866a01b898d137154204c5.tar.bz2
gsoc2013-evolution-81d8ab193f647151b6866a01b898d137154204c5.tar.lz
gsoc2013-evolution-81d8ab193f647151b6866a01b898d137154204c5.tar.xz
gsoc2013-evolution-81d8ab193f647151b6866a01b898d137154204c5.tar.zst
gsoc2013-evolution-81d8ab193f647151b6866a01b898d137154204c5.zip
add E_ADDRESSBOOK_VIEW_TREEVIEW to the enum, ifdef'ed out.
2003-01-08 Chris Toshok <toshok@ximian.com> * gui/widgets/e-addressbook-view.h: add E_ADDRESSBOOK_VIEW_TREEVIEW to the enum, ifdef'ed out. * gui/widgets/e-addressbook-view.c (e_addressbook_view_class_init): add ifdefed treeview code. (init_collection): same. (display_view): same. (get_selection_model): same. (treeview_row_activated): same. (create_treeview_view): same. (change_view_type): same.xo (e_addressbook_view_print): same. (e_addressbook_view_print_preview): same. * gui/widgets/Makefile.am: add in the treeview sources (commented out). svn path=/trunk/; revision=19300
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog31
-rw-r--r--addressbook/gui/widgets/Makefile.am7
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c167
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.h3
4 files changed, 190 insertions, 18 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2b4911b194..f7f0a05887 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,34 @@
+2003-01-08 Chris Toshok <toshok@ximian.com>
+
+ * gui/widgets/e-addressbook-view.h: add
+ E_ADDRESSBOOK_VIEW_TREEVIEW to the enum, ifdef'ed out.
+
+ * gui/widgets/e-addressbook-view.c
+ (e_addressbook_view_class_init): add ifdefed treeview code.
+ (init_collection): same.
+ (display_view): same.
+ (get_selection_model): same.
+ (treeview_row_activated): same.
+ (create_treeview_view): same.
+ (change_view_type): same.xo
+ (e_addressbook_view_print): same.
+ (e_addressbook_view_print_preview): same.
+
+ * gui/widgets/Makefile.am: add in the treeview sources (commented
+ out).
+
+2003-01-08 Chris Toshok <toshok@ximian.com>
+
+ * gui/widgets/gal-view-minicard.c (gal_view_minicard_edit): add
+ parent arg.
+
+ * gui/widgets/e-addressbook-treeview-adapter.[ch]: new files, for
+ a GtkTreeView view of contacts.
+
+ * gui/widgets/gal-view-treeview.[ch]: same
+
+ * gui/widgets/gal-view-favroty-treeview.[ch]: same
+
2003-01-08 Ettore Perazzoli <ettore@ximian.com>
* gui/component/Makefile.am: $(datadir)/evolution/images instead
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 3335593fca..01a139b8ba 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -50,6 +50,13 @@ libeminicard_a_SOURCES = \
gal-view-minicard.c \
gal-view-minicard.h
+#TREEVIEW_SOURCES= e-addressbook-treeview-adapter.c \
+# e-addressbook-treeview-adapter.h \
+# gal-view-factory-treeview.c \
+# gal-view-factory-treeview.h \
+# gal-view-treeview.c \
+# gal-view-treeview.h
+
# GLib marshalling cruft
e-addressbook-marshal.h: e-addressbook-marshal.list
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 375f05dae9..cbdaf36743 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -30,6 +30,7 @@
#include <gal/widgets/e-scroll-frame.h>
#include <gal/widgets/e-popup-menu.h>
#include <gal/widgets/e-gui-utils.h>
+#include <gal/widgets/e-treeview-selection-model.h>
#include <gal/menus/gal-view-factory-etable.h>
#include <gal/menus/gal-view-etable.h>
#include <gal/util/e-xml-utils.h>
@@ -45,12 +46,19 @@
#include "gal-view-factory-minicard.h"
#include "gal-view-minicard.h"
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+#include "gal-view-factory-treeview.h"
+#include "gal-view-treeview.h"
+#endif
#include "e-addressbook-marshal.h"
#include "e-addressbook-view.h"
#include "e-addressbook-model.h"
#include "e-addressbook-util.h"
#include "e-addressbook-table-adapter.h"
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+#include "e-addressbook-treeview-adapter.h"
+#endif
#include "e-addressbook-reflow-adapter.h"
#include "e-minicard-view-widget.h"
#include "e-contact-save-as.h"
@@ -184,7 +192,13 @@ e_addressbook_view_class_init (EAddressbookViewClass *klass)
g_param_spec_int ("type",
_("Type"),
/*_( */"XXX blurb" /*)*/,
- E_ADDRESSBOOK_VIEW_NONE, E_ADDRESSBOOK_VIEW_MINICARD, E_ADDRESSBOOK_VIEW_NONE,
+ E_ADDRESSBOOK_VIEW_NONE,
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+ E_ADDRESSBOOK_VIEW_TREEVIEW,
+#else
+ E_ADDRESSBOOK_VIEW_MINICARD,
+#endif
+ E_ADDRESSBOOK_VIEW_NONE,
G_PARAM_READWRITE));
e_addressbook_view_signals [STATUS_MESSAGE] =
@@ -397,6 +411,12 @@ init_collection (void)
gal_view_collection_add_factory (collection, factory);
g_object_unref (factory);
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+ factory = gal_view_factory_treeview_new ();
+ gal_view_collection_add_factory (collection, factory);
+ g_object_unref (factory);
+#endif
+
gal_view_collection_load(collection);
}
}
@@ -414,6 +434,12 @@ display_view(GalViewInstance *instance,
change_view_type (address_view, E_ADDRESSBOOK_VIEW_MINICARD);
gal_view_minicard_attach (GAL_VIEW_MINICARD(view), E_MINICARD_VIEW_WIDGET (address_view->object));
}
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+ else if (GAL_IS_VIEW_TREEVIEW (view)) {
+ change_view_type (address_view, E_ADDRESSBOOK_VIEW_TREEVIEW);
+ gal_view_treeview_attach (GAL_VIEW_TREEVIEW(view), GTK_TREE_VIEW (address_view->object));
+ }
+#endif
address_view->current_view = view;
}
@@ -523,8 +549,13 @@ get_selection_model (EAddressbookView *view)
{
if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD)
return e_minicard_view_widget_get_selection_model (E_MINICARD_VIEW_WIDGET(view->object));
- else
+ else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE)
return e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(view->widget)));
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+ else if (view->view_type == E_ADDRESSBOOK_VIEW_TREEVIEW) {
+ return e_treeview_get_selection_model (GTK_TREE_VIEW (view->object));
+ }
+#endif
}
/* Popup menu stuff */
@@ -1080,7 +1111,7 @@ create_alphabet (EAddressbookView *view)
}
static void
-minicard_selection_change (EMinicardViewWidget *widget, EAddressbookView *view)
+selection_changed (GObject *o, EAddressbookView *view)
{
command_state_change (view);
}
@@ -1111,7 +1142,7 @@ create_minicard_view (EAddressbookView *view)
g_object_set_data (G_OBJECT (adapter), "view", view);
g_signal_connect(minicard_view, "selection_change",
- G_CALLBACK(minicard_selection_change), view);
+ G_CALLBACK(selection_changed), view);
g_signal_connect(minicard_view, "right_click",
G_CALLBACK(minicard_right_click), view);
@@ -1193,12 +1224,6 @@ table_white_space_event(ETableScrolled *table, GdkEvent *event, EAddressbookView
}
static void
-table_selection_change(ETableScrolled *table, EAddressbookView *view)
-{
- command_state_change (view);
-}
-
-static void
table_drag_data_get (ETable *table,
int row,
int col,
@@ -1305,11 +1330,8 @@ static void
create_table_view (EAddressbookView *view)
{
ETableModel *adapter;
- ECardSimple *simple;
GtkWidget *table;
- simple = e_card_simple_new(NULL);
-
adapter = e_addressbook_table_adapter_new(view->model);
/* Here we create the table. We give it the three pieces of
@@ -1327,7 +1349,7 @@ create_table_view (EAddressbookView *view)
g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "white_space_event",
G_CALLBACK(table_white_space_event), view);
g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "selection_change",
- G_CALLBACK(table_selection_change), view);
+ G_CALLBACK(selection_changed), view);
/* drag & drop signals */
e_table_drag_source_set (E_TABLE(E_TABLE_SCROLLED(table)->table), GDK_BUTTON1_MASK,
@@ -1345,10 +1367,102 @@ create_table_view (EAddressbookView *view)
0, 0);
gtk_widget_show( GTK_WIDGET(table) );
+}
- g_object_unref (simple);
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+static void
+treeview_row_activated(GtkTreeView *treeview,
+ GtkTreePath *path, GtkTreeViewColumn *column,
+ EAddressbookView *view)
+{
+ EAddressbookModel *model = view->model;
+ int row = gtk_tree_path_get_indices (path)[0];
+ ECard *card = e_addressbook_model_get_card(model, row);
+ EBook *book;
+
+ g_object_get(model,
+ "book", &book,
+ NULL);
+
+ g_assert (E_IS_BOOK (book));
+
+ if (e_card_evolution_list (card))
+ e_addressbook_show_contact_list_editor (book, card, FALSE, view->editable);
+ else
+ e_addressbook_show_contact_editor (book, card, FALSE, view->editable);
}
+static void
+create_treeview_view (EAddressbookView *view)
+{
+ GtkTreeModel *adapter;
+ ECardSimple *simple;
+ GtkWidget *treeview;
+ GtkWidget *scrolled;
+ int i;
+
+ simple = e_card_simple_new(NULL);
+
+ adapter = e_addressbook_treeview_adapter_new(view->model);
+
+ scrolled = gtk_scrolled_window_new (NULL, NULL);
+ treeview = gtk_tree_view_new_with_model (adapter);
+
+ gtk_widget_show (treeview);
+
+ gtk_container_add (GTK_CONTAINER (scrolled), treeview);
+
+ for (i = 0; i < 15; i ++) {
+ GtkTreeViewColumn *column =
+ gtk_tree_view_column_new_with_attributes (e_card_simple_get_name (simple, i),
+ gtk_cell_renderer_text_new (),
+ "text", i,
+ NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+ }
+
+ view->object = G_OBJECT(treeview);
+ view->widget = scrolled;
+
+ gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), GTK_SELECTION_MULTIPLE);
+ gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (treeview),
+ GDK_BUTTON1_MASK,
+ drag_types,
+ num_drag_types,
+ GDK_ACTION_MOVE);
+
+ g_signal_connect(treeview, "row_activated",
+ G_CALLBACK (treeview_row_activated), view);
+#if 0
+ g_signal_connect(e_table_scrolled_get_table(E_TABLE_SCROLLED(table)), "right_click",
+ G_CALLBACK(table_right_click), view);
+
+ /* drag & drop signals */
+ e_table_drag_source_set (E_TABLE(E_TABLE_SCROLLED(table)->table), GDK_BUTTON1_MASK,
+ drag_types, num_drag_types, GDK_ACTION_MOVE);
+
+ g_signal_connect (E_TABLE_SCROLLED(table)->table,
+ "table_drag_data_get",
+ G_CALLBACK (table_drag_data_get),
+ view);
+#endif
+
+
+ g_signal_connect(e_treeview_get_selection_model (GTK_TREE_VIEW (treeview)), "selection_changed",
+ G_CALLBACK(selection_changed), view);
+
+ gtk_table_attach(GTK_TABLE(view), scrolled,
+ 0, 1,
+ 0, 1,
+ GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
+ 0, 0);
+
+ gtk_widget_show( GTK_WIDGET(scrolled) );
+
+ g_object_unref (simple);
+}
+#endif
static void
change_view_type (EAddressbookView *view, EAddressbookViewType view_type)
@@ -1369,8 +1483,13 @@ change_view_type (EAddressbookView *view, EAddressbookViewType view_type)
case E_ADDRESSBOOK_VIEW_TABLE:
create_table_view (view);
break;
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+ case E_ADDRESSBOOK_VIEW_TREEVIEW:
+ create_treeview_view (view);
+ break;
+#endif
default:
- g_warning ("view_type must be either TABLE or MINICARD\n");
+ g_warning ("view_type not recognized.");
return;
}
@@ -1518,7 +1637,8 @@ e_addressbook_view_print(EAddressbookView *view)
print = e_contact_print_dialog_new(book, query);
g_free(query);
gtk_widget_show_all(print);
- } else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
+ }
+ else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
GtkWidget *dialog;
EPrintable *printable;
ETable *etable;
@@ -1548,6 +1668,11 @@ e_addressbook_view_print(EAddressbookView *view)
gtk_widget_show(dialog);
}
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+ else if (view->view_type == E_ADDRESSBOOK_VIEW_TREEVIEW) {
+ /* XXX */
+ }
+#endif
}
void
@@ -1563,7 +1688,8 @@ e_addressbook_view_print_preview(EAddressbookView *view)
NULL);
e_contact_print_preview(book, query);
g_free(query);
- } else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
+ }
+ else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
EPrintable *printable;
ETable *etable;
GnomePrintMaster *master;
@@ -1600,6 +1726,11 @@ e_addressbook_view_print_preview(EAddressbookView *view)
g_object_unref (master);
g_object_unref (printable);
}
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+ else if (view->view_type == E_ADDRESSBOOK_VIEW_TREEVIEW) {
+ /* XXX */
+ }
+#endif
}
static void
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index 0ec5cfabe8..dbf32811d8 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -50,6 +50,9 @@ typedef enum {
E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */
E_ADDRESSBOOK_VIEW_TABLE,
E_ADDRESSBOOK_VIEW_MINICARD
+#ifdef WITH_ADDRESSBOOK_VIEW_TREEVIEW
+ ,E_ADDRESSBOOK_VIEW_TREEVIEW
+#endif
} EAddressbookViewType;