/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 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
static gint addressbook_close (void);
static void addressbook_button_set_sensitive (void);
+static gboolean address_index_has_focus = FALSE;
+static gboolean address_list_has_focus = FALSE;
+
/* callback functions */
static void addressbook_del_clicked (GtkButton *button,
gpointer data);
static void addressbook_folder_remove_node (GtkCTree *clist,
GtkCTreeNode *node);
+static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
+ gboolean force_focus );
+
/* LUT's and IF stuff */
static void addressbook_free_treenode ( gpointer data );
AddressTypeControlItem *addrbookctl_lookup (gint ot);
static GtkTargetEntry addressbook_drag_types[] =
{
- {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+ {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY}
};
static GtkTargetList *addressbook_target_list = NULL;
{
{N_("/_Edit"), NULL, addressbook_treenode_edit_cb, 0, NULL},
{N_("/_Delete"), NULL, addressbook_treenode_delete_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
+ {N_("/New _Book"), NULL, addressbook_new_book_cb, 0, NULL},
{N_("/New _Folder"), NULL, addressbook_new_folder_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/C_ut"), NULL, addressbook_treenode_cut_cb, 0, NULL},
{N_("/_Copy"), NULL, addressbook_treenode_copy_cb, 0, NULL},
{N_("/_Paste"), NULL, addressbook_treenode_paste_cb, 0, NULL}
static GtkItemFactoryEntry addressbook_list_popup_entries[] =
{
{N_("/_Select all"), NULL, addressbook_select_all_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Edit"), NULL, addressbook_edit_address_cb, 0, NULL},
{N_("/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/New _Address"), NULL, addressbook_new_address_cb, 0, NULL},
{N_("/New _Group"), NULL, addressbook_new_group_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/C_ut"), NULL, addressbook_clip_cut_cb, 0, NULL},
{N_("/_Copy"), NULL, addressbook_clip_copy_cb, 0, NULL},
{N_("/_Paste"), NULL, addressbook_clip_paste_cb, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {"/---", NULL, NULL, 0, "<Separator>"},
/* {N_("/Pa_ste Address"), NULL, addressbook_clip_paste_address_cb, 0, NULL},*/
{N_("/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL},
#ifdef USE_LDAP
}
gtk_widget_show_all(addrbook.window);
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_person_widgetset_hide();
+
+ address_completion_start(addrbook.window);
+
addressbook_show_buttons(target == NULL, lastCanLookup, target != NULL);
addressbook_set_target_compose(target);
}
{
if (event && event->keyval == GDK_Escape)
addressbook_close();
- else if (event && event->keyval == GDK_Delete)
- addressbook_del_clicked(NULL, NULL);
+ else if (event && event->keyval == GDK_Delete) {
+ /* TODO: enable deletion when focus is in ctree (needs implementation in _del_clicked() */
+ if ( /* address_index_has_focus || */ address_list_has_focus )
+ addressbook_del_clicked(NULL, NULL);
+ }
return FALSE;
}
addressbook_sort_list(clist, COL_REMARKS, sort_type);
}
+static gboolean addressbook_address_index_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ address_index_has_focus = TRUE;
+ return FALSE;
+}
+
+static gboolean addressbook_address_index_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ address_index_has_focus = FALSE;
+ if (!prefs_common.addressbook_use_editaddress_dialog
+ && !address_list_has_focus)
+ addressbook_address_list_disable_some_actions();
+ return FALSE;
+}
+
+static gboolean addressbook_address_list_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ address_list_has_focus = TRUE;
+ return FALSE;
+}
+
+static gboolean addressbook_address_list_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ address_list_has_focus = FALSE;
+ if (!prefs_common.addressbook_use_editaddress_dialog
+ && !address_index_has_focus)
+ addressbook_address_list_disable_some_actions();
+ return FALSE;
+}
+
+/* save hpane and vpane's handle position when it moves */
+static void addressbook_pane_notify_position(GObject *gobject,
+ GParamSpec *arg1,
+ gpointer user_data)
+{
+ prefs_common.addressbook_hpaned_pos = gtk_paned_get_position(GTK_PANED(addrbook.hpaned));
+ prefs_common.addressbook_vpaned_pos = gtk_paned_get_position(GTK_PANED(addrbook.vpaned));
+}
+
/*
* Create the address book widgets. The address book contains two CTree widgets: the
* address index tree on the left and the address list on the right.
GtkWidget *vbox2;
GtkWidget *ctree_swin;
GtkWidget *ctree;
+ GtkWidget *editaddress_vbox;
GtkWidget *clist_vbox;
GtkWidget *clist_swin;
GtkWidget *clist;
- GtkWidget *paned;
+ GtkWidget *hpaned;
+ GtkWidget *vpaned;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *entry;
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ctree_swin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
+ gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 20, -1);
/* Address index */
ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
g_signal_connect(G_OBJECT(ctree), "drag_data_received",
G_CALLBACK(addressbook_drag_received_cb),
ctree);
+ g_signal_connect(G_OBJECT(ctree), "focus_in_event",
+ G_CALLBACK(addressbook_address_index_focus_evt_in), NULL);
+ g_signal_connect(G_OBJECT(ctree), "focus_out_event",
+ G_CALLBACK(addressbook_address_index_focus_evt_out), NULL);
clist_vbox = gtk_vbox_new(FALSE, 4);
COL_NAME_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(clist), COL_ADDRESS,
COL_ADDRESS_WIDTH);
+ gtk_widget_set_size_request(clist, -1, 80);
addressbook_sort_list(GTK_CLIST(clist), COL_NAME, GTK_SORT_ASCENDING);
g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_NAME].button),
"clicked", G_CALLBACK(addressbook_address_clicked), clist);
g_signal_connect(G_OBJECT(GTK_CLIST(clist)->column[COL_REMARKS].button),
"clicked", G_CALLBACK(addressbook_remarks_clicked), clist);
-
+ g_signal_connect(G_OBJECT(clist), "focus_in_event",
+ G_CALLBACK(addressbook_address_list_focus_evt_in), NULL);
+ g_signal_connect(G_OBJECT(clist), "focus_out_event",
+ G_CALLBACK(addressbook_address_list_focus_evt_out), NULL);
+
for (i = 0; i < N_LIST_COLS; i++)
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
GTK_CAN_FOCUS);
entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
- address_completion_register_entry(GTK_ENTRY(entry));
+ address_completion_register_entry(GTK_ENTRY(entry), FALSE);
g_signal_connect(G_OBJECT(entry), "key_press_event",
G_CALLBACK(addressbook_entry_key_pressed),
NULL);
- paned = gtk_hpaned_new();
- gtk_box_pack_start(GTK_BOX(vbox2), paned, TRUE, TRUE, 0);
- gtk_paned_add1(GTK_PANED(paned), ctree_swin);
- gtk_paned_add2(GTK_PANED(paned), clist_vbox);
+
+ if (!prefs_common.addressbook_use_editaddress_dialog) {
+ editaddress_vbox = gtk_vbox_new(FALSE, 4);
+ vpaned = gtk_vpaned_new();
+ gtk_paned_pack1(GTK_PANED(vpaned), clist_vbox, FALSE, FALSE);
+ gtk_paned_pack2(GTK_PANED(vpaned), editaddress_vbox, TRUE, FALSE);
+ } else {
+ vpaned = NULL;
+ editaddress_vbox = NULL;
+ }
+ hpaned = gtk_hpaned_new();
+ gtk_box_pack_start(GTK_BOX(vbox2), hpaned, TRUE, TRUE, 0);
+ gtk_paned_pack1(GTK_PANED(hpaned), ctree_swin, FALSE, FALSE);
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ gtk_paned_pack2(GTK_PANED(hpaned), clist_vbox, TRUE, FALSE);
+ else
+ gtk_paned_pack2(GTK_PANED(hpaned), vpaned, TRUE, FALSE);
/* Status bar */
hsbox = gtk_hbox_new(FALSE, 0);
NULL);
addrbook.window = window;
+ addrbook.hpaned = hpaned;
+ addrbook.vpaned = vpaned;
addrbook.menubar = menubar;
addrbook.ctree = ctree;
addrbook.ctree_swin
= ctree_swin;
+ addrbook.editaddress_vbox = editaddress_vbox;
addrbook.clist = clist;
addrbook.label = label;
addrbook.entry = entry;
addrbook.menu_factory = menu_factory;
addrbook.listSelected = NULL;
- address_completion_start(window);
if (!geometry.min_height) {
geometry.min_width = ADDRESSBOOK_WIDTH;
gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
prefs_common.addressbookwin_height);
+ if (!prefs_common.addressbook_use_editaddress_dialog) {
+ gtk_paned_set_position(GTK_PANED(vpaned), prefs_common.addressbook_vpaned_pos);
+ g_signal_connect(G_OBJECT(vpaned), "notify::position",
+ G_CALLBACK(addressbook_pane_notify_position), NULL);
+ }
+ gtk_paned_set_position(GTK_PANED(hpaned), prefs_common.addressbook_hpaned_pos);
+ g_signal_connect(G_OBJECT(hpaned), "notify::position",
+ G_CALLBACK(addressbook_pane_notify_position), NULL);
+
gtk_widget_show_all(window);
}
* Close address book window and save to file(s).
*/
static gint addressbook_close( void ) {
+ address_completion_end(addrbook.window);
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_person_invalidate(NULL, NULL, NULL);
gtk_widget_hide(addrbook.window);
addressbook_export_to_file();
return TRUE;
if (addrbook.target_compose) {
to_sens = TRUE;
cc_sens = TRUE;
-#ifndef CLAWS
- if (addrbook.target_compose->use_bcc)
-#endif
- bcc_sens = TRUE;
+ bcc_sens = TRUE;
}
gtk_widget_set_sensitive(addrbook.to_btn, to_sens);
abf = ds->rawDataSource;
if( abf == NULL ) return;
- /* Confirm deletion */
- aval = alertpanel( _("Delete address(es)"),
- _("Really delete the address(es)?"),
- GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
- if( aval != G_ALERTALTERNATE ) return;
/* Process deletions */
if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
+ gboolean group_delete = TRUE;
/* Items inside folders */
list = addrselect_get_list( _addressSelect_ );
+ /* Confirm deletion */
+ node = list;
+ while( node ) {
+ item = node->data;
+ node = g_list_next( node );
+ aio = ( AddrItemObject * ) item->addressItem;
+ if( aio->type == ADDR_ITEM_PERSON || aio->type == ADDR_ITEM_EMAIL ) {
+ group_delete = FALSE;
+ break;
+ }
+ }
+ if (group_delete) {
+ aval = alertpanel( _("Delete group"),
+ _("Really delete the group(s)?\n"
+ "The addresses it contains will not be lost."),
+ GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+ if( aval != G_ALERTALTERNATE ) return;
+ } else {
+ aval = alertpanel( _("Delete address(es)"),
+ _("Really delete the address(es)?"),
+ GTK_STOCK_CANCEL, "+"GTK_STOCK_DELETE, NULL );
+ if( aval != G_ALERTALTERNATE ) return;
+ }
node = list;
while( node ) {
/* Select from address list */
list = addrselect_get_list( _addressSelect_ );
node = list;
- while( node ) {
- item = node->data;
- node = g_list_next( node );
- aio = item->addressItem;
- if( aio->type == ADDR_ITEM_PERSON ||
- aio->type == ADDR_ITEM_EMAIL ) {
- addr = addressbook_format_address( aio );
- compose_entry_append(
- compose, addr, (ComposeEntryType) data );
- g_free( addr );
- }
- else if( aio->type == ADDR_ITEM_GROUP ) {
- ItemGroup *group = ( ItemGroup * ) aio;
- AddressDataSource *ds = NULL;
- AddressBookFile *abf = NULL;
- GList *nodeMail = group->listEMail;
- if (nodeMail == NULL) {
- if(addrbook.treeSelected ) {
- ds = addressbook_find_datasource( addrbook.treeSelected );
- abf = ds->rawDataSource;
- if( abf != NULL )
- nodeMail = addrbook_get_available_email_list( abf, group );
+ if (node) {
+ while( node ) {
+ item = node->data;
+ node = g_list_next( node );
+ aio = item->addressItem;
+ if( aio->type == ADDR_ITEM_PERSON ||
+ aio->type == ADDR_ITEM_EMAIL ) {
+ addr = addressbook_format_address( aio );
+ compose_entry_append(
+ compose, addr, (ComposeEntryType) data );
+ g_free( addr );
+ }
+ else if( aio->type == ADDR_ITEM_GROUP ) {
+ ItemGroup *group = ( ItemGroup * ) aio;
+ GList *nodeMail = group->listEMail;
+ while( nodeMail ) {
+ ItemEMail *email = nodeMail->data;
+
+ addr = addressbook_format_address(
+ ( AddrItemObject * ) email );
+ compose_entry_append(
+ compose, addr, (ComposeEntryType) data );
+ g_free( addr );
+ nodeMail = g_list_next( nodeMail );
}
}
+ }
+ } else {
+ AddressObject *obj = NULL;
+
+ obj = gtk_ctree_node_get_row_data( GTK_CTREE(addrbook.ctree), addrbook.treeSelected );
+
+ if( obj && obj->type == ADDR_ITEM_GROUP ) {
+ ItemGroup *itemGroup = ADAPTER_GROUP(obj)->itemGroup;
+ GList *nodeMail = itemGroup->listEMail;
while( nodeMail ) {
ItemEMail *email = nodeMail->data;
g_signal_handlers_unblock_by_func
(G_OBJECT(ctree),
G_CALLBACK(addressbook_tree_selected), NULL);
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_person_invalidate(NULL, NULL, NULL);
/* Setup main menu selections */
addressbook_menubar_set_sensitive( FALSE );
}
addressbook_list_menu_setup();
+
+ if (!addrbook.target_compose && !prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_address(NULL, 0, NULL, FALSE);
}
static void addressbook_list_row_unselected( GtkCTree *ctree,
/* printf( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
addressbook_list_select_remove( aio );
}
+
+ if (!prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_person_invalidate(NULL, NULL, NULL);
}
/* from gdkevents.c */
addrbook.target_compose)
addressbook_to_clicked(NULL, GINT_TO_POINTER(COMPOSE_TO));
else
+ if (prefs_common.addressbook_use_editaddress_dialog)
addressbook_edit_address_cb(NULL, 0, NULL);
lasttime = 0;
gboolean canTreeCopy = FALSE;
gboolean canTreePaste = FALSE;
gboolean canLookup = FALSE;
+ GtkCTreeNode *node = NULL;
if( ! event ) return FALSE;
addressbook_menubar_set_sensitive( FALSE );
menu_set_insensitive_all(GTK_MENU_SHELL(addrbook.tree_popup));
if( obj == NULL ) return FALSE;
+ node = gtk_ctree_node_nth(GTK_CTREE(clist), row);
if( ! addrclip_is_empty( _clipBoard_ ) ) {
canTreePaste = TRUE;
}
+ if (obj->type == ADDR_INTERFACE) {
+ AdapterInterface *adapter = ADAPTER_INTERFACE(obj);
+ iface = adapter->interface;
+ canEdit = FALSE;
+ canDelete = FALSE;
+ canTreeCopy = FALSE;
+ if( iface->readOnly ) {
+ canTreePaste = FALSE;
+ }
+ else {
+ menu_set_sensitive( addrbook.tree_factory, "/New Book", TRUE );
+ gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
+ }
+ if( iface->externalQuery ) canLookup = TRUE;
+ }
if (obj->type == ADDR_DATASOURCE) {
ads = ADAPTER_DSOURCE(obj);
ds = ads->dataSource;
}
else {
menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
+ menu_set_sensitive( addrbook.tree_factory, "/New Group", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
canTreeCopy = TRUE;
if( iface->externalQuery ) canLookup = TRUE;
}
else if (obj->type == ADDR_ITEM_FOLDER) {
- ds = addressbook_find_datasource( addrbook.treeSelected );
- if (!ds)
+ ds = addressbook_find_datasource( node );
+ if (!ds) {
goto just_set_sens;
+ }
iface = ds->interface;
if (!iface)
goto just_set_sens;
canDelete = TRUE;
canTreeCut = TRUE;
menu_set_sensitive( addrbook.tree_factory, "/New Folder", TRUE );
+ menu_set_sensitive( addrbook.tree_factory, "/New Group", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
canTreeCopy = TRUE;
}
}
else if (obj->type == ADDR_ITEM_GROUP) {
- ds = addressbook_find_datasource( addrbook.treeSelected );
+ ds = addressbook_find_datasource( node );
if (!ds)
goto just_set_sens;
iface = ds->interface;
}
}
}
- else {
+ else if( obj->type == ADDR_ITEM_GROUP ) {
+ message = g_strdup_printf(_("Do you want to delete '%s'?\n"
+ "The addresses it contains will not be lost."), obj->name);
+ aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL,
+ "+" GTK_STOCK_DELETE, NULL);
+ g_free(message);
+ if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_FOLDER_ONLY;
+ } else {
message = g_strdup_printf(_("Do you want to delete '%s'?\n"
"The addresses it contains will be lost."), obj->name);
aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL,
}
}
+void addressbook_new_address_from_book_post_cb( ItemPerson *person )
+{
+ if( person && addrbook.treeSelected == addrbook.opened ) {
+ gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
+ addressbook_folder_refresh_one_person(
+ GTK_CTREE(addrbook.clist), person );
+ }
+ addressbook_address_list_set_focus();
+}
+
+void addressbook_new_address_from_folder_post_cb( ItemPerson *person )
+{
+ if( person && addrbook.treeSelected == addrbook.opened) {
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
+ addressbook_set_clist(
+ gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
+ addrbook.opened),
+ TRUE);
+ }
+ addressbook_address_list_set_focus();
+}
+
static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *widget ) {
AddressObject *pobj = NULL;
AddressDataSource *ds = NULL;
if( pobj->type == ADDR_DATASOURCE ) {
if( ADAPTER_DSOURCE(pobj)->subType == ADDR_BOOK ) {
/* New address */
- ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE );
- if( person && addrbook.treeSelected == addrbook.opened ) {
- gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
- addressbook_folder_refresh_one_person(
- GTK_CTREE(addrbook.clist), person );
- }
+ ItemPerson *person = addressbook_edit_person( abf, NULL, NULL, FALSE,
+ addrbook.editaddress_vbox,
+ addressbook_new_address_from_book_post_cb,
+ TRUE );
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_new_address_from_book_post_cb( person );
}
}
else if( pobj->type == ADDR_ITEM_FOLDER ) {
/* New address */
ItemFolder *folder = ADAPTER_FOLDER(pobj)->itemFolder;
- ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE );
- if( person ) {
- if (addrbook.treeSelected == addrbook.opened) {
- gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
- addressbook_set_clist(
- gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
- addrbook.opened),
- TRUE);
- }
- }
+ ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE,
+ addrbook.editaddress_vbox,
+ addressbook_new_address_from_folder_post_cb,
+ TRUE );
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_new_address_from_folder_post_cb( person );
}
else if( pobj->type == ADDR_ITEM_GROUP ) {
/* New address in group */
}
}
+void addressbook_edit_address_post_cb( ItemPerson *person )
+{
+ if( person ) {
+ addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
+ invalidate_address_completion();
+ }
+ addressbook_address_list_set_focus();
+}
+
+void addressbook_address_list_set_focus( void )
+{
+ if (!prefs_common.addressbook_use_editaddress_dialog) {
+ gtk_window_set_focus(GTK_WINDOW(addrbook.window), addrbook.clist);
+ addressbook_list_menu_setup();
+ }
+}
+
+void addressbook_address_list_disable_some_actions(void)
+{
+ /* disable address copy/pasting when editing contact's detail (embedded form) */
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", FALSE );
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", FALSE );
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", FALSE );
+
+ /* we're already editing contact's detail here */
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Edit", FALSE );
+ gtk_widget_set_sensitive( addrbook.edit_btn, FALSE );
+}
+
static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget *widget ) {
+ addressbook_edit_address(data, action, widget, TRUE);
+}
+
+static void addressbook_edit_address( gpointer data, guint action, GtkWidget *widget,
+ gboolean force_focus ) {
GtkCTree *clist = GTK_CTREE(addrbook.clist);
GtkCTree *ctree;
AddressObject *obj = NULL, *pobj = NULL;
/* Edit person - email page */
ItemPerson *person;
person = ( ItemPerson * ) ADDRITEM_PARENT(email);
- if( addressbook_edit_person( abf, NULL, person, TRUE ) == NULL ) return;
- addressbook_folder_refresh_one_person( clist, person );
- invalidate_address_completion();
+ if ( addressbook_edit_person( abf, NULL, person, TRUE, addrbook.editaddress_vbox,
+ addressbook_edit_address_post_cb,
+ (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
+ != NULL ) {
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_address_post_cb( person );
+ }
return;
}
}
else if( obj->type == ADDR_ITEM_PERSON ) {
/* Edit person - basic page */
ItemPerson *person = ( ItemPerson * ) obj;
- if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
- invalidate_address_completion();
- addressbook_folder_refresh_one_person( clist, person );
+ if( addressbook_edit_person( abf, NULL, person, FALSE, addrbook.editaddress_vbox,
+ addressbook_edit_address_post_cb,
+ (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
+ != NULL ) {
+ if (prefs_common.addressbook_use_editaddress_dialog)
+ addressbook_edit_address_post_cb( person );
+ }
return;
}
else if( obj->type == ADDR_ITEM_GROUP ) {
parentNode = addrbook.treeSelected;
node = addressbook_find_group_node( parentNode, itemGrp );
name = ADDRITEM_NAME(itemGrp);
+ invalidate_address_completion();
}
else {
return;
/* printf( "addressbook_clear_idler::%d::\n", queryID ); */
ptrQID = GINT_TO_POINTER( queryID );
if( ptrQID ) {
- gtk_idle_remove_by_data( ptrQID );
+ g_idle_remove_by_data( ptrQID );
}
}
/* Remove idler function */
ptrQID = GINT_TO_POINTER( queryID );
if( ptrQID ) {
- gtk_idle_remove_by_data( ptrQID );
+ g_idle_remove_by_data( ptrQID );
}
/* Refresh addressbook contents */
if( queryID == 0 ) return;
/* Set up idler function */
- idleID = gtk_idle_add(
+ idleID = g_idle_add(
( GtkFunction ) addressbook_search_idle,
GINT_TO_POINTER( queryID ) );
projects / claws.git / blobdiff