/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto 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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "manage_window.h"
#include "gtkutils.h"
#include "codeconv.h"
+#include "editaddress.h"
#include "prefs_common.h"
static struct _PersonEdit_dlg {
- GtkWidget *window;
+ GtkWidget *container;
GtkWidget *notebook;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- GtkWidget *statusbar;
+ GtkWidget *statusbar; /* used when prefs_common.addressbook_use_editaddress_dialog is TRUE */
+ GtkWidget *title; /* used when prefs_common.addressbook_use_editaddress_dialog is FALSE */
gint status_cid;
/* User data tab */
gint rowIndEMail;
gint rowIndAttrib;
gboolean editNew;
-
+ gboolean read_only;
} personeditdlg;
+/* transient data */
+static AddressBookFile *current_abf = NULL;
+static ItemPerson *current_person = NULL;
+static ItemFolder *current_parent_folder = NULL;
+static EditAddressPostUpdateCallback edit_person_close_post_update_cb = NULL;
+
typedef enum {
EMAIL_COL_EMAIL = 0,
EMAIL_COL_ALIAS = 1,
} PersonEditAttribColumnPos;
#define EDITPERSON_WIDTH 520
-#define EDITPERSON_HEIGHT 340
+#define EDITPERSON_HEIGHT 320
#define EMAIL_N_COLS 3
#define EMAIL_COL_WIDTH_EMAIL 180
static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
*cancelled = FALSE;
+fprintf(stderr, "edit_person_ok\n");
+ if (prefs_common.addressbook_use_editaddress_dialog)
gtk_main_quit();
+ else
+ addressbook_edit_person_close( *cancelled );
}
static void edit_person_cancel(GtkWidget *widget, gboolean *cancelled) {
*cancelled = TRUE;
+fprintf(stderr, "edit_person_cancel\n");
+ if (prefs_common.addressbook_use_editaddress_dialog)
gtk_main_quit();
+ else
+ addressbook_edit_person_close( *cancelled );
}
static gint edit_person_delete_event(GtkWidget *widget, GdkEventAny *event, gboolean *cancelled) {
*cancelled = TRUE;
+fprintf(stderr, "edit_person_delete_event\n");
+ if (prefs_common.addressbook_use_editaddress_dialog)
gtk_main_quit();
+ else
+ addressbook_edit_person_close( *cancelled );
return TRUE;
}
static gboolean edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
+ if (prefs_common.addressbook_use_editaddress_dialog) {
if (event && event->keyval == GDK_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
+ }
return FALSE;
}
static gchar *_title_new_ = NULL;
static gchar *_title_edit_ = NULL;
+static void edit_person_set_widgets_title( gchar *text )
+{
+ gchar *label = NULL;
+
+ g_return_if_fail( text != NULL );
+
+ gtk_label_set_text(GTK_LABEL(personeditdlg.title), "");
+ label = g_markup_printf_escaped("<b>%s</b>", text);
+ gtk_label_set_markup(GTK_LABEL(personeditdlg.title), label);
+ g_free(label);
+}
+
static void edit_person_set_window_title( gint pageNum ) {
gchar *sTitle;
if( pageNum == PAGE_BASIC ) {
if( personeditdlg.editNew ) {
- gtk_window_set_title( GTK_WINDOW(personeditdlg.window), _title_new_ );
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ gtk_window_set_title( GTK_WINDOW(personeditdlg.container), _title_new_ );
+ else
+ edit_person_set_widgets_title( _title_new_ );
}
else {
- gtk_window_set_title( GTK_WINDOW(personeditdlg.window), _title_edit_ );
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ gtk_window_set_title( GTK_WINDOW(personeditdlg.container), _title_edit_ );
+ else
+ edit_person_set_widgets_title( _title_edit_ );
}
}
else {
sTitle = g_strdup_printf( "%s - %s", _title_edit_, name );
g_free( name );
}
- gtk_window_set_title( GTK_WINDOW(personeditdlg.window), sTitle );
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ gtk_window_set_title( GTK_WINDOW(personeditdlg.container), sTitle );
+ else
+ edit_person_set_widgets_title( sTitle );
g_free( sTitle );
}
}
gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_alias), ADDRITEM_NAME(email) );
if( email->remarks )
gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_remarks), email->remarks );
- gtk_widget_set_sensitive(personeditdlg.email_del, TRUE);
- gtk_widget_set_sensitive(personeditdlg.email_up, row > 0);
- gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, row + 1) != NULL);
+ if (!personeditdlg.read_only) {
+ gtk_widget_set_sensitive(personeditdlg.email_del, TRUE);
+ gtk_widget_set_sensitive(personeditdlg.email_up, row > 0);
+ gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, row + 1) != NULL);
+ }
} else {
gtk_widget_set_sensitive(personeditdlg.email_del, FALSE);
gtk_widget_set_sensitive(personeditdlg.email_up, FALSE);
if( email ) {
gtk_clist_row_move( clist, personeditdlg.rowIndEMail, row );
personeditdlg.rowIndEMail = row;
- gtk_widget_set_sensitive(personeditdlg.email_up, row > 0);
- gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, row + 1) != NULL);
+ if (!personeditdlg.read_only) {
+ gtk_widget_set_sensitive(personeditdlg.email_up, row > 0);
+ gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, row + 1) != NULL);
+ }
} else {
gtk_widget_set_sensitive(personeditdlg.email_up, FALSE);
gtk_widget_set_sensitive(personeditdlg.email_down, FALSE);
if( ! email ) {
personeditdlg.rowIndEMail = -1 + row;
}
- gtk_widget_set_sensitive(personeditdlg.email_del, gtk_clist_get_row_data(clist, 0) != NULL);
- gtk_widget_set_sensitive(personeditdlg.email_up, gtk_clist_get_row_data(clist, personeditdlg.rowIndEMail + 1) != NULL);
- gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, personeditdlg.rowIndEMail - 1) != NULL);
+ if (!personeditdlg.read_only) {
+ gtk_widget_set_sensitive(personeditdlg.email_del, gtk_clist_get_row_data(clist, 0) != NULL);
+ gtk_widget_set_sensitive(personeditdlg.email_up, gtk_clist_get_row_data(clist, personeditdlg.rowIndEMail + 1) != NULL);
+ gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, personeditdlg.rowIndEMail - 1) != NULL);
+ }
edit_person_status_show( NULL );
}
*error = FALSE;
}
else {
- edit_person_status_show( _( "An E-Mail address must be supplied." ) );
+ edit_person_status_show( _( "An Email address must be supplied." ) );
}
g_free( sEmail );
static void edit_person_attrib_list_selected( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
UserAttribute *attrib = gtk_clist_get_row_data( clist, row );
- if( attrib ) {
+ if( attrib && !personeditdlg.read_only) {
gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atname), attrib->name );
gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atvalue), attrib->value );
gtk_widget_set_sensitive(personeditdlg.attrib_del, TRUE);
personeditdlg.rowIndAttrib = -1 + row;
}
- gtk_widget_set_sensitive(personeditdlg.attrib_del, gtk_clist_get_row_data(clist, 0) != NULL);
+ if (!personeditdlg.read_only)
+ gtk_widget_set_sensitive(personeditdlg.attrib_del, gtk_clist_get_row_data(clist, 0) != NULL);
edit_person_status_show( NULL );
}
}
}
-static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
- GtkWidget *window;
+/*!
+ *\brief Save Gtk object size to prefs dataset
+ */
+static void edit_person_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.addressbookeditpersonwin_width = allocation->width;
+ prefs_common.addressbookeditpersonwin_height = allocation->height;
+}
+
+/* build edit person widgets, return a pointer to the main container of the widgetset (a vbox) */
+static GtkWidget* addressbook_edit_person_widgets_create( GtkWidget* container, gboolean *cancelled )
+{
GtkWidget *vbox;
GtkWidget *vnbox;
GtkWidget *notebook;
GtkWidget *hbbox;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- GtkWidget *hsbox;
- GtkWidget *statusbar;
-
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_size_request(window, EDITPERSON_WIDTH, EDITPERSON_HEIGHT );
- /* gtk_container_set_border_width(GTK_CONTAINER(window), 0); */
- gtk_window_set_title(GTK_WINDOW(window), _("Edit Person Data"));
- gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- g_signal_connect(G_OBJECT(window), "delete_event",
- G_CALLBACK(edit_person_delete_event),
- cancelled);
- g_signal_connect(G_OBJECT(window), "key_press_event",
- G_CALLBACK(edit_person_key_pressed),
- cancelled);
vbox = gtk_vbox_new(FALSE, 4);
/* gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER_WIDTH); */
gtk_widget_show(vbox);
- gtk_container_add(GTK_CONTAINER(window), vbox);
+ gtk_container_add(GTK_CONTAINER(container), vbox);
vnbox = gtk_vbox_new(FALSE, 4);
gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
gtk_box_pack_start(GTK_BOX(vnbox), notebook, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(notebook), 6);
- /* Status line */
- hsbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
- statusbar = gtk_statusbar_new();
- gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
-
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
- &cancel_btn, GTK_STOCK_CANCEL,
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
NULL, NULL);
+ else
+ gtkut_stock_with_text_button_set_create(&hbbox,
+ &cancel_btn, GTK_STOCK_CANCEL, _("Discard"),
+ &ok_btn, GTK_STOCK_OK, _("Apply"),
+ NULL, NULL, NULL);
gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
gtk_widget_show_all(vbox);
- personeditdlg.window = window;
personeditdlg.notebook = notebook;
personeditdlg.ok_btn = ok_btn;
personeditdlg.cancel_btn = cancel_btn;
+
+ return vbox;
+}
+
+static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
+ GtkWidget *window;
+ GtkWidget *hsbox;
+ GtkWidget *vbox;
+ GtkWidget *statusbar;
+ static GdkGeometry geometry;
+
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ /* gtk_container_set_border_width(GTK_CONTAINER(window), 0); */
+ gtk_window_set_title(GTK_WINDOW(window), _("Edit Person Data"));
+ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(edit_person_delete_event),
+ cancelled);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(edit_person_size_allocate_cb),
+ cancelled);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(edit_person_key_pressed),
+ cancelled);
+
+ vbox = addressbook_edit_person_widgets_create(window, cancelled);
+
+ /* Status line */
+ hsbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
+ statusbar = gtk_statusbar_new();
+ gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
+
+ if (!geometry.min_height) {
+ geometry.min_width = EDITPERSON_WIDTH;
+ geometry.min_height = EDITPERSON_HEIGHT;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.addressbookeditpersonwin_width,
+ prefs_common.addressbookeditpersonwin_height);
+
+ personeditdlg.container = window;
personeditdlg.statusbar = statusbar;
personeditdlg.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit Person Dialog" );
}
+/* parent must be a box */
+static void addressbook_edit_person_widgetset_create( GtkWidget *parent, gboolean *cancelled )
+{
+ GtkWidget *vbox;
+ GtkWidget *label;
+
+ if ( parent == NULL )
+ g_warning("addressbook_edit_person_widgetset_create: parent is NULL");
+
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(parent), vbox, TRUE, TRUE, 0);
+
+ label = gtk_label_new(_("Edit Person Data"));
+ gtk_label_set_justify( GTK_LABEL(label), GTK_JUSTIFY_CENTER);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+
+ addressbook_edit_person_widgets_create(vbox, cancelled);
+
+ gtk_widget_set_size_request(vbox, EDITPERSON_WIDTH, EDITPERSON_HEIGHT);
+
+ personeditdlg.container = vbox;
+ personeditdlg.title = label;
+ personeditdlg.statusbar = NULL;
+ personeditdlg.status_cid = 0;
+}
+
+void addressbook_edit_person_widgetset_hide( void )
+{
+ if ( personeditdlg.container )
+ gtk_widget_hide( personeditdlg.container );
+}
+
static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
GtkWidget *vbox;
GtkWidget *table;
gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
- label = gtk_label_new( pageLbl );
+ label = gtk_label_new_with_mnemonic( pageLbl );
gtk_widget_show( label );
gtk_notebook_set_tab_label(
GTK_NOTEBOOK( personeditdlg.notebook ),
static void edit_person_entry_email_changed (GtkWidget *entry, gpointer data)
{
- gboolean non_empty = gtk_clist_get_row_data(personeditdlg.clist_email, 0) != NULL;
+ gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_email), 0) != NULL;
+
+ if (personeditdlg.read_only)
+ return;
if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email)) == NULL
|| strlen(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email))) == 0) {
gchar *titles[ EMAIL_N_COLS ];
gint i;
- titles[ EMAIL_COL_EMAIL ] = _("E-Mail Address");
+ titles[ EMAIL_COL_EMAIL ] = _("Email Address");
titles[ EMAIL_COL_ALIAS ] = _("Alias");
titles[ EMAIL_COL_REMARKS ] = _("Remarks");
gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
- label = gtk_label_new( pageLbl );
+ label = gtk_label_new_with_mnemonic( pageLbl );
gtk_widget_show( label );
gtk_notebook_set_tab_label(
GTK_NOTEBOOK( personeditdlg.notebook ),
/* First row */
top = 0;
- label = gtk_label_new(_("E-Mail Address"));
+ label = gtk_label_new(_("Email Address"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
{
- gboolean non_empty = gtk_clist_get_row_data(personeditdlg.clist_attrib, 0) != NULL;
+ gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_attrib), 0) != NULL;
+
+ if (personeditdlg.read_only)
+ return;
if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname)) == NULL
|| strlen(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname))) == 0) {
gtk_container_add( GTK_CONTAINER( personeditdlg.notebook ), vbox );
gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
- label = gtk_label_new( pageLbl );
+ label = gtk_label_new_with_mnemonic( pageLbl );
gtk_widget_show( label );
gtk_notebook_set_tab_label(
GTK_NOTEBOOK( personeditdlg.notebook ),
personeditdlg.attrib_mod = buttonMod;
}
-static void addressbook_edit_person_create( gboolean *cancelled ) {
+static void addressbook_edit_person_create( GtkWidget *parent, gboolean *cancelled ) {
+ if (prefs_common.addressbook_use_editaddress_dialog)
addressbook_edit_person_dialog_create( cancelled );
- addressbook_edit_person_page_basic( PAGE_BASIC, _( "User Data" ) );
- addressbook_edit_person_page_email( PAGE_EMAIL, _( "E-Mail Addresses" ) );
- addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "Other Attributes" ) );
- gtk_widget_show_all( personeditdlg.window );
+ else
+ addressbook_edit_person_widgetset_create( parent, cancelled );
+ addressbook_edit_person_page_basic( PAGE_BASIC, _( "_User Data" ) );
+ addressbook_edit_person_page_email( PAGE_EMAIL, _( "_Email Addresses" ) );
+ addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "O_ther Attributes" ) );
+ gtk_widget_show_all( personeditdlg.container );
}
/*
return listAttrib;
}
+static void update_sensitivity(void)
+{
+ gtk_widget_set_sensitive(personeditdlg.entry_name, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.entry_first, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.entry_last, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.entry_nick, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.entry_email, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.entry_alias, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.entry_remarks, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.email_up, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.email_down, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.email_del, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.email_mod, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.email_add, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.entry_atname, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.entry_atvalue, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.attrib_add, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.attrib_del, !personeditdlg.read_only);
+ gtk_widget_set_sensitive(personeditdlg.attrib_mod, !personeditdlg.read_only);
+}
+
+static void addressbook_edit_person_flush_transient( void )
+{
+ ItemPerson *person = current_person;
+ EditAddressPostUpdateCallback callback = edit_person_close_post_update_cb;
+
+fprintf(stderr, "addressbook_edit_person_flush_transient\n");
+ /* reset transient data */
+ current_abf = NULL;
+ current_person = NULL;
+ current_parent_folder = NULL;
+ edit_person_close_post_update_cb = NULL;
+
+ /* post action to perform on addressbook side */
+ if (callback) {
+fprintf(stderr, "-> callback %p\n", callback);
+ callback( person );
+ }
+}
+
+void addressbook_edit_person_invalidate( AddressBookFile *abf, ItemFolder *parent_folder,
+ ItemPerson *person )
+{
+fprintf(stderr, "addressbook_edit_person_invalidate (arg: %p %p %p) (cur: %p %p %p)\n",
+abf, parent_folder, person, current_abf, current_parent_folder, current_person);
+ if (current_abf == NULL &&
+ current_person == NULL &&
+ current_parent_folder == NULL)
+ /* edit address form is already hidden */
+ return;
+
+ /* unconditional invalidation or invalidating the currently edited item */
+ if ( ( abf == NULL && person == NULL && parent_folder == NULL )
+ || (current_abf == abf ||
+ current_person == person ||
+ current_parent_folder == parent_folder))
+ addressbook_edit_person_close( TRUE );
+}
+
+gboolean addressbook_edit_person_close( gboolean cancelled )
+{
+ GList *listEMail = NULL;
+ GList *listAttrib = NULL;
+ gchar *cn = NULL;
+
+fprintf(stderr, "addressbook_edit_person_close\n");
+ listEMail = edit_person_build_email_list();
+ listAttrib = edit_person_build_attrib_list();
+ if( cancelled ) {
+ addritem_free_list_email( listEMail );
+ addritem_free_list_attribute( listAttrib );
+ gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
+ gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ gtk_widget_hide( personeditdlg.container );
+
+ /* no callback, as we're discarding the form */
+ edit_person_close_post_update_cb = NULL;
+ addressbook_edit_person_flush_transient();
+
+ /* set focus to the address list (this is done by the post_update_cb usually) */
+ addressbook_address_list_set_focus();
+ return FALSE;
+ }
+
+ cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
+ if( current_person && current_abf ) {
+ /* Update email/attribute list for existing current_person */
+ addrbook_update_address_list( current_abf, current_person, listEMail );
+ addrbook_update_attrib_list( current_abf, current_person, listAttrib );
+ }
+ else {
+ /* Create new current_person and email/attribute list */
+ if( cn == NULL || *cn == '\0' ) {
+ /* Wasting our time */
+ if( listEMail == NULL && listAttrib == NULL ) cancelled = TRUE;
+ }
+ if( ! cancelled && current_abf ) {
+ current_person = addrbook_add_address_list( current_abf, current_parent_folder, listEMail );
+ addrbook_add_attrib_list( current_abf, current_person, listAttrib );
+ }
+ }
+ listEMail = NULL;
+ listAttrib = NULL;
+
+ if( ! cancelled ) {
+ /* Set current_person stuff */
+ gchar *name;
+ addritem_person_set_common_name( current_person, cn );
+ name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
+ addritem_person_set_first_name( current_person, name );
+ g_free( name );
+ name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );
+ addritem_person_set_last_name( current_person, name );
+ g_free( name );
+ name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_nick), 0, -1 );
+ addritem_person_set_nick_name( current_person, name );
+ g_free( name );
+ }
+ g_free( cn );
+
+ gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
+ gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ gtk_widget_hide( personeditdlg.container );
+
+ addressbook_edit_person_flush_transient();
+
+ return TRUE;
+}
+
/*
* Edit person.
* Enter: abf Address book.
* pgMail If TRUE, E-Mail page will be activated.
* Return: Edited object, or NULL if cancelled.
*/
-ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent, ItemPerson *person, gboolean pgMail ) {
+ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent_folder, ItemPerson *person,
+ gboolean pgMail, GtkWidget *parent_container,
+ void (*post_update_cb) (ItemPerson *person),
+ gboolean get_focus) {
static gboolean cancelled;
- GList *listEMail = NULL;
- GList *listAttrib = NULL;
- gchar *cn = NULL;
- if (!personeditdlg.window)
- addressbook_edit_person_create(&cancelled);
- gtk_widget_grab_focus(personeditdlg.ok_btn);
- gtk_widget_grab_focus(personeditdlg.entry_name);
- gtk_widget_show(personeditdlg.window);
- manage_window_set_transient(GTK_WINDOW(personeditdlg.window));
+fprintf(stderr, "addressbook_edit_person: start\n");
+ /* set transient data */
+ current_abf = abf;
+ current_person = person;
+ current_parent_folder = parent_folder;
+ edit_person_close_post_update_cb = post_update_cb;
+
+ if( !personeditdlg.container )
+ addressbook_edit_person_create(parent_container, &cancelled);
+
+ /* typically, get focus when dialog mode is enabled, or when editing a new address */
+ if( get_focus ) {
+ gtk_widget_grab_focus(personeditdlg.ok_btn);
+ gtk_widget_grab_focus(personeditdlg.entry_name);
+ }
+
+ personeditdlg.read_only = (current_abf == NULL);
+ update_sensitivity();
+
+ gtk_widget_show(personeditdlg.container);
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ manage_window_set_transient(GTK_WINDOW(personeditdlg.container));
/* Clear all fields */
personeditdlg.rowIndEMail = -1;
edit_person_attrib_clear( NULL );
+ if (prefs_common.addressbook_use_editaddress_dialog) {
+
gtk_main();
- gtk_widget_hide( personeditdlg.window );
+ gtk_widget_hide( personeditdlg.container );
- listEMail = edit_person_build_email_list();
- listAttrib = edit_person_build_attrib_list();
- if( cancelled ) {
- addritem_free_list_email( listEMail );
- addritem_free_list_attribute( listAttrib );
- gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
- gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+fprintf(stderr, "addressbook_edit_person: sync end\n");
+ if (!addressbook_edit_person_close( cancelled ))
return NULL;
}
-
- cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
- if( person ) {
- /* Update email/attribute list for existing person */
- addrbook_update_address_list( abf, person, listEMail );
- addrbook_update_attrib_list( abf, person, listAttrib );
- }
- else {
- /* Create new person and email/attribute list */
- if( cn == NULL || *cn == '\0' ) {
- /* Wasting our time */
- if( listEMail == NULL && listAttrib == NULL ) cancelled = TRUE;
- }
- if( ! cancelled ) {
- person = addrbook_add_address_list( abf, parent, listEMail );
- addrbook_add_attrib_list( abf, person, listAttrib );
- }
- }
- listEMail = NULL;
- listAttrib = NULL;
-
- if( ! cancelled ) {
- /* Set person stuff */
- gchar *name;
- addritem_person_set_common_name( person, cn );
- name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
- addritem_person_set_first_name( person, name );
- g_free( name );
- name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );
- addritem_person_set_last_name( person, name );
- g_free( name );
- name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_nick), 0, -1 );
- addritem_person_set_nick_name( person, name );
- g_free( name );
- }
- g_free( cn );
-
- gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
- gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+fprintf(stderr, "addressbook_edit_person: async end\n");
return person;
}
projects / claws.git / blobdiff