/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Match Grun
+ * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
*
* 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
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* 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.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
/*
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-
-#include "intl.h"
+#include <gtk/gtk.h>
+
#include "gtkutils.h"
#include "stock_pixmap.h"
#include "prefs_common.h"
+#include "prefs_gtk.h"
#include "addressadd.h"
-#include "addritem.h"
-#include "addrbook.h"
-#include "addrindex.h"
+#ifndef USE_ALT_ADDRBOOK
+ #include "addritem.h"
+ #include "addrbook.h"
+ #include "addrindex.h"
+ #include "ldapserver.h"
+ #include "ldapupdate.h"
+#else
+ #include "addressbook-dbus.h"
+#endif
#include "manage_window.h"
+#include "alertpanel.h"
+#ifndef USE_ALT_ADDRBOOK
typedef struct {
AddressBookFile *book;
ItemFolder *folder;
} FolderInfo;
+#else
+typedef struct {
+ gchar* book;
+} FolderInfo;
+#endif
static struct _AddressAdd_dlg {
GtkWidget *window;
+ GtkWidget *picture;
GtkWidget *entry_name;
GtkWidget *label_address;
GtkWidget *entry_remarks;
GtkWidget *tree_folder;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- GtkWidget *statusbar;
- gint status_cid;
FolderInfo *fiSelected;
} addressadd_dlg;
-static GdkPixmap *folderXpm;
-static GdkBitmap *folderXpmMask;
-static GdkPixmap *bookXpm;
-static GdkBitmap *bookXpmMask;
+static GdkPixbuf *folderXpm;
+static GdkPixbuf *bookXpm;
static gboolean addressadd_cancelled;
+enum {
+ ADDRADD_COL_ICON,
+ ADDRADD_COL_NAME,
+ ADDRADD_COL_PTR,
+ N_ADDRADD_COLS
+};
+
+#ifndef USE_ALT_ADDRBOOK
static FolderInfo *addressadd_create_folderinfo( AddressBookFile *abf, ItemFolder *folder )
{
FolderInfo *fi = g_new0( FolderInfo, 1 );
fi->folder = folder;
return fi;
}
+#else
+static FolderInfo *addressadd_create_folderinfo(gchar* book) {
+ FolderInfo *fi = g_new0( FolderInfo, 1 );
+ fi->book = book;
+ return fi;
+}
+#endif
+#ifndef USE_ALT_ADDRBOOK
static void addressadd_free_folderinfo( FolderInfo *fi ) {
fi->book = NULL;
fi->folder = NULL;
g_free( fi );
}
-
-/*
-* Edit functions.
-*/
-static void addressadd_status_show( gchar *msg ) {
- if( addressadd_dlg.statusbar != NULL ) {
- gtk_statusbar_pop( GTK_STATUSBAR(addressadd_dlg.statusbar), addressadd_dlg.status_cid );
- if( msg ) {
- gtk_statusbar_push( GTK_STATUSBAR(addressadd_dlg.statusbar), addressadd_dlg.status_cid, msg );
- }
- }
+#else
+static void addressadd_free_folderinfo( FolderInfo *fi ) {
+ fi->book = NULL;
+ g_free( fi );
}
+#endif
static gint addressadd_delete_event( GtkWidget *widget, GdkEventAny *event, gboolean *cancelled ) {
addressadd_cancelled = TRUE;
return TRUE;
}
-static void addressadd_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+static gboolean addressadd_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
+ if (event && event->keyval == GDK_KEY_Escape) {
addressadd_cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
+}
+
+/* Points addressadd_dlg.fiSelected to the selected item */
+static void set_selected_ptr()
+{
+ addressadd_dlg.fiSelected = gtkut_tree_view_get_selected_pointer(
+ GTK_TREE_VIEW(addressadd_dlg.tree_folder), ADDRADD_COL_PTR,
+ NULL, NULL, NULL);
}
static void addressadd_ok( GtkWidget *widget, gboolean *cancelled ) {
+ set_selected_ptr();
addressadd_cancelled = FALSE;
gtk_main_quit();
}
static void addressadd_cancel( GtkWidget *widget, gboolean *cancelled ) {
+ set_selected_ptr();
addressadd_cancelled = TRUE;
gtk_main_quit();
}
-static void addressadd_folder_select( GtkCTree *ctree, gint row, gint column,
- GdkEvent *event, gpointer data )
+static void addressadd_tree_row_activated(GtkTreeView *view,
+ GtkTreePath *path, GtkTreeViewColumn *col,
+ gpointer user_data)
{
- addressadd_dlg.fiSelected = gtk_clist_get_row_data( GTK_CLIST(ctree), row );
+ addressadd_ok(NULL, NULL);
}
-static void addressadd_tree_button( GtkCTree *ctree, GdkEventButton *event, gpointer data ) {
- if( ! event ) return;
- if( event->button == 1 ) {
- /* Handle double click */
- if( event->type == GDK_2BUTTON_PRESS ) {
- addressadd_cancelled = FALSE;
- gtk_main_quit();
- }
- }
+static void addressadd_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ cm_return_if_fail(allocation != NULL);
+
+ prefs_common.addressaddwin_width = allocation->width;
+ prefs_common.addressaddwin_height = allocation->height;
}
static void addressadd_create( void ) {
GtkWidget *window;
- GtkWidget *vbox;
+ GtkWidget *vbox, *hbox;
+ GtkWidget *frame;
GtkWidget *table;
GtkWidget *label;
+ GtkWidget *picture;
GtkWidget *entry_name;
GtkWidget *label_addr;
GtkWidget *entry_rems;
GtkWidget *vlbox;
GtkWidget *tree_win;
GtkWidget *hbbox;
- GtkWidget *hsep;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- GtkWidget *hsbox;
- GtkWidget *statusbar;
gint top;
-
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize( window, 300, 400 );
- gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
+ static GdkGeometry geometry;
+ GtkTreeStore *store;
+ GtkTreeViewColumn *col;
+ GtkCellRenderer *rdr;
+ GtkTreeSelection *sel;
+
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addressadd");
+ gtk_container_set_border_width( GTK_CONTAINER(window), VBOX_BORDER );
gtk_window_set_title( GTK_WINDOW(window), _("Add to address book") );
gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
- gtk_window_set_modal( GTK_WINDOW(window), TRUE );
- gtk_signal_connect( GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(addressadd_delete_event), NULL );
- gtk_signal_connect( GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(addressadd_key_pressed), NULL );
-
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+ g_signal_connect( G_OBJECT(window), "delete_event",
+ G_CALLBACK(addressadd_delete_event), NULL );
+ g_signal_connect( G_OBJECT(window), "key_press_event",
+ G_CALLBACK(addressadd_key_pressed), NULL );
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(addressadd_size_allocate_cb), NULL);
+
+ hbox = gtk_hbox_new(FALSE, 10);
+ gtk_container_set_border_width(GTK_CONTAINER(hbox), 4);
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
- gtk_container_set_border_width( GTK_CONTAINER(vbox), 8 );
+
+ picture = gtk_image_new();
+ gtk_box_pack_start(GTK_BOX(hbox), picture, FALSE, FALSE, 0);
table = gtk_table_new(3, 2, FALSE);
- gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
- gtk_container_set_border_width( GTK_CONTAINER(table), 8 );
- gtk_table_set_row_spacings(GTK_TABLE(table), 8);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+ gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 0);
+ gtk_table_set_row_spacings(GTK_TABLE(table), VSPACING_NARROW);
+ gtk_table_set_col_spacings(GTK_TABLE(table), HSPACING_NARROW);
+
+ frame = gtk_frame_new(_("Contact"));
+ gtk_frame_set_label_align(GTK_FRAME(frame), 0.01, 0.5);
+ gtk_container_add(GTK_CONTAINER(frame), hbox);
+ gtk_container_set_border_width( GTK_CONTAINER(frame), 4);
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
/* First row */
top = 0;
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_name = gtk_entry_new();
- /* gtk_entry_set_max_length(); */
+ gtk_widget_set_size_request(entry_name, 150, -1);
gtk_entry_set_text (GTK_ENTRY(entry_name),"");
gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_FILL | GTK_EXPAND , 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
label_addr = gtk_label_new("");
- gtk_table_attach(GTK_TABLE(table), label_addr, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
+ gtk_widget_set_size_request(label_addr, 150, -1);
+ gtk_table_attach(GTK_TABLE(table), label_addr, 1, 2, top, (top + 1), GTK_FILL | GTK_EXPAND, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label_addr), 0, 0.5);
/* Third row */
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_rems = gtk_entry_new();
- /* gtk_entry_set_max_length(); */
+ gtk_widget_set_size_request(entry_rems, 150, -1);
gtk_table_attach(GTK_TABLE(table), entry_rems, 1, 2, top, (top + 1), GTK_FILL | GTK_EXPAND, 0, 0, 0);
-
+
/* Address book/folder tree */
- vlbox = gtk_vbox_new(FALSE, 8);
+ vlbox = gtk_vbox_new(FALSE, VBOX_BORDER);
gtk_box_pack_start(GTK_BOX(vbox), vlbox, TRUE, TRUE, 0);
- gtk_container_set_border_width( GTK_CONTAINER(vlbox), 8 );
+ gtk_container_set_border_width( GTK_CONTAINER(vlbox), 4);
tree_win = gtk_scrolled_window_new( NULL, NULL );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(tree_win),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS );
+ GTK_POLICY_AUTOMATIC );
gtk_box_pack_start( GTK_BOX(vlbox), tree_win, TRUE, TRUE, 0 );
- tree_folder = gtk_ctree_new( 1, 0 );
+ store = gtk_tree_store_new(N_ADDRADD_COLS,
+ GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
+
+ tree_folder = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+ g_object_unref(store);
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree_folder), TRUE);
+ gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(tree_folder), FALSE);
+ gtk_tree_view_set_search_column(GTK_TREE_VIEW(tree_folder),
+ ADDRADD_COL_NAME);
+
+ /* Column with addressbook/folder icon and name. It has two
+ * renderers, so we create it a bit differently. */
+ col = gtk_tree_view_column_new();
+ rdr = gtk_cell_renderer_pixbuf_new();
+ gtk_cell_renderer_set_padding(rdr, 0, 0);
+ gtk_tree_view_column_pack_start(col, rdr, FALSE);
+ gtk_tree_view_column_set_attributes(col, rdr,
+ "pixbuf", ADDRADD_COL_ICON, NULL);
+ rdr = gtk_cell_renderer_text_new();
+ gtk_tree_view_column_pack_start(col, rdr, TRUE);
+ gtk_tree_view_column_set_attributes(col, rdr,
+ "markup", ADDRADD_COL_NAME, NULL);
+ gtk_tree_view_column_set_title(col, _("Select Address Book Folder"));
+ gtk_tree_view_append_column(GTK_TREE_VIEW(tree_folder), col);
+
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_folder));
+ gtk_tree_selection_set_mode(sel, GTK_SELECTION_BROWSE);
+
gtk_container_add( GTK_CONTAINER(tree_win), tree_folder );
- gtk_clist_column_titles_show( GTK_CLIST(tree_folder) );
- gtk_clist_set_column_title( GTK_CLIST(tree_folder), 0, _( "Select Address Book Folder" ) );
- gtk_ctree_set_line_style( GTK_CTREE(tree_folder), GTK_CTREE_LINES_DOTTED );
- gtk_clist_set_selection_mode( GTK_CLIST(tree_folder), GTK_SELECTION_BROWSE );
- gtk_ctree_set_expander_style( GTK_CTREE(tree_folder), GTK_CTREE_EXPANDER_SQUARE );
- gtk_ctree_set_indent( GTK_CTREE(tree_folder), CTREE_INDENT );
- gtk_clist_set_auto_sort( GTK_CLIST(tree_folder), TRUE );
+
+ g_signal_connect(G_OBJECT(tree_folder), "row-activated",
+ G_CALLBACK(addressadd_tree_row_activated), NULL);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
- gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
+ gtk_container_set_border_width( GTK_CONTAINER(hbbox), HSPACING_NARROW );
gtk_widget_grab_default(ok_btn);
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(addressadd_ok), NULL);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(addressadd_cancel), NULL);
- gtk_signal_connect(GTK_OBJECT(tree_folder), "select_row",
- GTK_SIGNAL_FUNC(addressadd_folder_select), NULL);
- gtk_signal_connect(GTK_OBJECT(tree_folder), "button_press_event",
- GTK_SIGNAL_FUNC(addressadd_tree_button), NULL);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(addressadd_ok), NULL);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(addressadd_cancel), NULL);
- gtk_widget_show_all(vbox);
+ if (!geometry.min_height) {
+ geometry.min_width = 300;
+ geometry.min_height = 350;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.addressaddwin_width,
+ prefs_common.addressaddwin_height);
addressadd_dlg.window = window;
+ addressadd_dlg.picture = picture;
addressadd_dlg.entry_name = entry_name;
addressadd_dlg.label_address = label_addr;
addressadd_dlg.entry_remarks = entry_rems;
addressadd_dlg.tree_folder = tree_folder;
addressadd_dlg.ok_btn = ok_btn;
addressadd_dlg.cancel_btn = cancel_btn;
- addressadd_dlg.statusbar = statusbar;
- addressadd_dlg.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Address Add" );
gtk_widget_show_all( window );
- stock_pixmap_gdk( window, STOCK_PIXMAP_BOOK, &bookXpm, &bookXpmMask );
- stock_pixmap_gdk( window, STOCK_PIXMAP_DIR_OPEN,
- &folderXpm, &folderXpmMask );
+ stock_pixbuf_gdk(STOCK_PIXMAP_BOOK, &bookXpm );
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderXpm );
+}
+
+/* Helper function used by addressadd_tree_clear(). */
+static gboolean close_dialog_foreach_func(GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ FolderInfo *fi;
+
+ gtk_tree_model_get(model, iter, ADDRADD_COL_PTR, &fi, -1);
+ if (fi != NULL) {
+ addressadd_free_folderinfo(fi);
+ }
+ gtk_tree_store_set(GTK_TREE_STORE(model), iter, ADDRADD_COL_PTR, NULL, -1);
+ return FALSE;
+}
+
+/* Function to remove all rows from the tree view, and free the
+ * FolderInfo pointers in them in pointer column. */
+static void addressadd_tree_clear()
+{
+ GtkWidget *view = addressadd_dlg.tree_folder;
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+
+ gtk_tree_model_foreach(model, close_dialog_foreach_func, NULL);
+ gtk_tree_store_clear(GTK_TREE_STORE(model));
}
-static void addressadd_load_folder( GtkCTreeNode *parentNode, ItemFolder *parentFolder,
- FolderInfo *fiParent )
+#ifndef USE_ALT_ADDRBOOK
+static void addressadd_load_folder( GtkTreeIter *parent_iter,
+ ItemFolder *parentFolder, FolderInfo *fiParent )
{
- GtkCTree *tree = GTK_CTREE( addressadd_dlg.tree_folder );
+ GtkWidget *view = addressadd_dlg.tree_folder;
+ GtkTreeIter iter;
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
GList *list;
ItemFolder *folder;
- gchar *fName;
- gchar **name;
- GtkCTreeNode *node;
+ gchar *name;
FolderInfo *fi;
list = parentFolder->listFolder;
while( list ) {
folder = list->data;
- fName = g_strdup( ADDRITEM_NAME(folder) );
- name = &fName;
- node = gtk_ctree_insert_node( tree, parentNode, NULL, name, FOLDER_SPACING,
- folderXpm, folderXpmMask, folderXpm, folderXpmMask,
- FALSE, TRUE );
- g_free( fName );
+ name = g_strdup( ADDRITEM_NAME(folder) );
fi = addressadd_create_folderinfo( fiParent->book, folder );
- gtk_ctree_node_set_row_data_full( tree, node, fi,
- ( GtkDestroyNotify ) addressadd_free_folderinfo );
- addressadd_load_folder( node, folder, fi );
+
+ gtk_tree_store_append(GTK_TREE_STORE(model), &iter, parent_iter);
+ gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
+ ADDRADD_COL_ICON, folderXpm,
+ ADDRADD_COL_NAME, name,
+ ADDRADD_COL_PTR, fi,
+ -1);
+ g_free( name );
+
+ addressadd_load_folder( parent_iter, folder, fi );
+
list = g_list_next( list );
}
}
static void addressadd_load_data( AddressIndex *addrIndex ) {
AddressDataSource *ds;
GList *list, *nodeDS;
- gchar **name;
- gchar *dsName;
+ gchar *name;
ItemFolder *rootFolder;
AddressBookFile *abf;
FolderInfo *fi;
- GtkCTree *tree = GTK_CTREE( addressadd_dlg.tree_folder );
- GtkCTreeNode *node;
+ GtkWidget *view = addressadd_dlg.tree_folder;
+ GtkTreeIter iter;
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+ GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+
+ addressadd_tree_clear();
- gtk_clist_clear( GTK_CLIST( tree ) );
list = addrindex_get_interface_list( addrIndex );
while( list ) {
- AddressInterface *interface = list->data;
- if( interface->type == ADDR_IF_BOOK ) {
- nodeDS = interface->listSource;
+ AddressInterface *ainterface = list->data;
+ if( ainterface->type == ADDR_IF_BOOK ||
+ ainterface->type == ADDR_IF_LDAP ) {
+ nodeDS = ainterface->listSource;
while( nodeDS ) {
ds = nodeDS->data;
- dsName = g_strdup( addrindex_ds_get_name( ds ) );
+ name = g_strdup( addrindex_ds_get_name( ds ) );
/* Read address book */
if( ! addrindex_ds_get_read_flag( ds ) ) {
/* Add node for address book */
abf = ds->rawDataSource;
- name = &dsName;
- node = gtk_ctree_insert_node( tree, NULL, NULL,
- name, FOLDER_SPACING, bookXpm,
- bookXpmMask, bookXpm, bookXpmMask,
- FALSE, TRUE );
- g_free( dsName );
-
fi = addressadd_create_folderinfo( abf, NULL );
- gtk_ctree_node_set_row_data_full( tree, node, fi,
- ( GtkDestroyNotify ) addressadd_free_folderinfo );
+
+ gtk_tree_store_append(GTK_TREE_STORE(model), &iter, NULL);
+ gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
+ ADDRADD_COL_ICON, bookXpm,
+ ADDRADD_COL_NAME, name,
+ ADDRADD_COL_PTR, fi,
+ -1);
+ g_free( name );
rootFolder = addrindex_ds_get_root_folder( ds );
- addressadd_load_folder( node, rootFolder, fi );
+ addressadd_load_folder( &iter, rootFolder, fi );
nodeDS = g_list_next( nodeDS );
}
}
list = g_list_next( list );
}
+
+ if (gtk_tree_model_get_iter_first(model, &iter))
+ gtk_tree_selection_select_iter(sel, &iter);
+}
+#else
+static void addressadd_load_data() {
+ GSList *list;
+ FolderInfo *fi = NULL;
+ GError* error = NULL;
+ GtkWidget *view = addressadd_dlg.tree_folder;
+ GtkTreeIter iter;
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+ GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
+ gchar *name;
+
+ addressadd_tree_clear();
+
+ list = addressbook_dbus_get_books(&error);
+ for (; list; list = g_slist_next(list)) {
+ name = (gchar *) list->data;
+ fi = addressadd_create_folderinfo(name);
+ gtk_tree_store_append(GTK_TREE_STORE(model), &iter, NULL);
+ gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
+ ADDRADD_COL_ICON, bookXpm,ADDRADD_COL_NAME, (gchar *)list->data,
+ ADDRADD_COL_PTR, fi,
+ -1);
+ }
+
+ if (gtk_tree_model_get_iter_first(model, &iter))
+ gtk_tree_selection_select_iter(sel, &iter);
}
+#endif
-gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name, const gchar *address, const gchar *remarks ) {
+#ifndef USE_ALT_ADDRBOOK
+gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name,
+ const gchar *address, const gchar *remarks, GdkPixbuf *picture ) {
+#else
+gboolean addressadd_selection(const gchar *name, const gchar *address,
+ const gchar *remarks, GdkPixbuf *picture ) {
+#endif
gboolean retVal = FALSE;
+#ifndef USE_ALT_ADDRBOOK
ItemPerson *person = NULL;
+#endif
FolderInfo *fi = NULL;
addressadd_cancelled = FALSE;
+
if( ! addressadd_dlg.window ) addressadd_create();
- gtk_widget_grab_focus(addressadd_dlg.ok_btn);
- gtk_widget_show(addressadd_dlg.window);
- manage_window_set_transient(GTK_WINDOW(addressadd_dlg.window));
addressadd_dlg.fiSelected = NULL;
- addressadd_status_show( "" );
+#ifndef USE_ALT_ADDRBOOK
addressadd_load_data( addrIndex );
- gtk_clist_select_row( GTK_CLIST( addressadd_dlg.tree_folder ), 0, 0 );
+#else
+ addressadd_load_data();
+#endif
gtk_widget_show(addressadd_dlg.window);
+ gtk_window_set_modal(GTK_WINDOW(addressadd_dlg.window), TRUE);
+ gtk_widget_grab_focus(addressadd_dlg.ok_btn);
+
+ manage_window_set_transient(GTK_WINDOW(addressadd_dlg.window));
gtk_entry_set_text( GTK_ENTRY(addressadd_dlg.entry_name ), "" );
gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_address ), "" );
gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_address ), address );
if( remarks )
gtk_entry_set_text( GTK_ENTRY(addressadd_dlg.entry_remarks ), remarks );
-
+ if( picture ) {
+ gtk_image_set_from_pixbuf(GTK_IMAGE(addressadd_dlg.picture), picture);
+ gtk_widget_show(GTK_WIDGET(addressadd_dlg.picture));
+ } else {
+ gtk_widget_hide(GTK_WIDGET(addressadd_dlg.picture));
+ }
gtk_main();
gtk_widget_hide( addressadd_dlg.window );
-
+ gtk_window_set_modal(GTK_WINDOW(addressadd_dlg.window), FALSE);
if( ! addressadd_cancelled ) {
if( addressadd_dlg.fiSelected ) {
gchar *returned_name;
fi = addressadd_dlg.fiSelected;
+#ifndef USE_ALT_ADDRBOOK
person = addrbook_add_contact( fi->book, fi->folder,
returned_name,
address,
returned_remarks);
+
+ if (person != NULL) {
+ person->status = ADD_ENTRY;
+
+ if (picture) {
+ GError *error = NULL;
+ gchar *name = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S,
+ ADDRITEM_ID(person), ".png", NULL );
+ gdk_pixbuf_save(picture, name, "png", &error, NULL);
+ if (error) {
+ g_warning("Failed to save image: %s",
+ error->message);
+ g_error_free(error);
+ }
+ addritem_person_set_picture( person, ADDRITEM_ID(person) ) ;
+ g_free( name );
+ }
+ }
+#else
+ ContactData* contact = g_new0(ContactData, 1);
+ GError* error = NULL;
+
+ if (returned_name)
+ contact->cn = g_strdup(returned_name);
+ else
+ contact->cn = g_strdup(address);
+
+ contact->name = g_strdup(returned_name);
+ contact->email = g_strdup(address);
+ contact->remarks = g_strdup(returned_remarks);
+ contact->book = g_strdup(fi->book);
+ contact->picture = picture;
+
+ if (addressbook_dbus_add_contact(contact, &error) == 0) {
+ debug_print("Added to addressbook:\n%s\n%s\n%s\n%s\n",
+ returned_name, address, returned_remarks, fi->book);
+ retVal = TRUE;
+ }
+ else {
+ retVal = FALSE;
+ if (error) {
+ GtkWidget* dialog = gtk_message_dialog_new (
+ GTK_WINDOW(addressadd_dlg.window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "%s", error->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ g_error_free(error);
+ }
+ }
+ contact_data_free(&contact);
+#endif
+#ifdef USE_LDAP
+ if (person != NULL && fi->book->type == ADBOOKTYPE_LDAP) {
+ LdapServer *server = (LdapServer *) fi->book;
+ ldapsvr_set_modified(server, TRUE);
+ ldapsvr_update_book(server, person);
+ if (server->retVal != LDAPRC_SUCCESS) {
+ alertpanel( _("Add address(es)"),
+ _("Can't add the specified address"),
+ GTK_STOCK_CLOSE, NULL, NULL, ALERTFOCUS_FIRST );
+ return server->retVal;
+ }
+ }
+#endif
g_free(returned_name);
g_free(returned_remarks);
+#ifndef USE_ALT_ADDRBOOK
if( person ) retVal = TRUE;
+#endif
}
}
- gtk_clist_clear( GTK_CLIST( addressadd_dlg.tree_folder ) );
+ addressadd_tree_clear();
return retVal;
}