*
* 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 "expldifdlg.h"
#include "browseldap.h"
+typedef enum
+{
+ COL_SOURCES = 0,
+ N_INDEX_COLS = 1
+} AddressIndexColumns;
+
typedef enum
{
COL_NAME = 0,
COL_ADDRESS = 1,
- COL_REMARKS = 2
-} AddressBookColumnPos;
+ COL_REMARKS = 2,
+ N_LIST_COLS = 3
+} AddressListColumns;
-#define N_COLS 3
#define COL_NAME_WIDTH 164
#define COL_ADDRESS_WIDTH 156
gpointer data);
static void addressbook_lup_clicked (GtkButton *button,
gpointer data);
+static void addressbook_close_clicked (GtkButton *button,
+ gpointer data);
static gboolean addressbook_tree_selected (GtkCTree *ctree,
GtkCTreeNode *node,
static void addressbook_person_collapse_node (GtkCTree *ctree,
GList *node,
gpointer *data );
-static void addressbook_entry_gotfocus (GtkWidget *widget);
#if 0
static void addressbook_entry_changed (GtkWidget *widget);
static gboolean addressbook_tree_button_released(GtkWidget *ctree,
GdkEventButton *event,
gpointer data);
-static void addressbook_popup_close (GtkMenuShell *menu_shell,
- gpointer data);
static void addressbook_new_folder_cb (gpointer data,
guint action,
GtkCTreeNode *node);
static GtkCTreeNode *addressbook_find_group_node (GtkCTreeNode *parent,
ItemGroup *group);
-static gboolean key_pressed (GtkWidget *widget,
+static gboolean addressbook_entry_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static gint addressbook_treenode_compare_func (GtkCList *clist,
static void addressbook_folder_remove_node (GtkCTree *clist,
GtkCTreeNode *node);
-#ifdef USE_LDAP
-static void addressbook_ldap_show_message ( LdapServer *server );
-#endif
-
/* LUT's and IF stuff */
static void addressbook_free_treenode ( gpointer data );
AddressTypeControlItem *addrbookctl_lookup (gint ot);
#ifdef USE_LDAP
static void addressbook_browse_entry_cb ( void );
#endif
+static void addressbook_edit_clicked(GtkButton *button, gpointer data);
static void addressbook_start_drag(GtkWidget *widget, gint button,
GdkEvent *event,
guint info,
guint time,
void *pdata);
+static void addressbook_list_menu_setup( void );
static GtkTargetEntry addressbook_drag_types[] =
{
{N_("/_Book"), NULL, NULL, 0, "<Branch>"},
{N_("/_Book/New _Book"), "<control>B", addressbook_new_book_cb, 0, NULL},
{N_("/_Book/New _Folder"), "<control>R", addressbook_new_folder_cb, 0, NULL},
- {N_("/_Book/New _vCard"), "<control>D", addressbook_new_vcard_cb, 0, NULL},
+ {N_("/_Book/New _vCard"), "<control><shift>D", addressbook_new_vcard_cb, 0, NULL},
#ifdef USE_JPILOT
{N_("/_Book/New _JPilot"), "<control>J", addressbook_new_jpilot_cb, 0, NULL},
#endif
{N_("/_Book/New _Server"), "<control><shift>S", addressbook_new_ldap_cb, 0, NULL},
#endif
{N_("/_Book/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Book/_Edit book name"), NULL, addressbook_treenode_edit_cb, 0, NULL},
+ {N_("/_Book/_Edit book"), NULL, addressbook_treenode_edit_cb, 0, NULL},
{N_("/_Book/_Delete book"), NULL, addressbook_treenode_delete_cb, 0, NULL},
{N_("/_Book/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Book/_Save"), "<control>S", addressbook_file_save_cb, 0, NULL},
{N_("/_Address/_Paste"), "<control>V", addressbook_clip_paste_cb, 0, NULL},
{N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Address/_Edit"), "<control>Return",addressbook_edit_address_cb, 0, NULL},
- {N_("/_Address/_Delete"), NULL, addressbook_delete_address_cb, 0, NULL},
+ {N_("/_Address/_Delete"), "<control>D", addressbook_delete_address_cb, 0, NULL},
{N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Address/New _Address"), "<control>N", addressbook_new_address_cb, 0, NULL},
{N_("/_Address/New _Group"), "<control>G", addressbook_new_group_cb, 0, NULL},
{N_("/_Address/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Address/_Mail To"), NULL, addressbook_mail_to_cb, 0, NULL},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/Import _LDIF file..."), NULL, addressbook_import_ldif_cb, 0, NULL},
{N_("/_Tools/Import M_utt file..."), NULL, addressbook_import_mutt_cb, 0, NULL},
{N_("/_Tools/Import _Pine file..."), NULL, addressbook_import_pine_cb, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/Export _HTML..."), NULL, addressbook_export_html_cb, 0, NULL},
{N_("/_Tools/Export LDI_F..."), NULL, addressbook_export_ldif_cb, 0, NULL},
- {N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
+ {N_("/_Help"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
void addressbook_show_buttons(gboolean add_and_delete, gboolean lookup, gboolean mail_ops)
{
if (add_and_delete) {
+ gtk_widget_show(addrbook.edit_btn);
gtk_widget_show(addrbook.del_btn);
gtk_widget_show(addrbook.reg_btn);
} else {
+ gtk_widget_hide(addrbook.edit_btn);
gtk_widget_hide(addrbook.del_btn);
gtk_widget_hide(addrbook.reg_btn);
}
addressbook_read_file();
addressbook_create();
addressbook_load_tree();
- gtk_ctree_select(GTK_CTREE(addrbook.ctree),
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list));
}
else {
{
if (addrbook.window) {
if (addrbook.treeSelected) {
- gtk_ctree_select(GTK_CTREE(addrbook.ctree),
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
addrbook.treeSelected);
}
}
addressbook_export_to_file();
}
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ if (event && event->keyval == GDK_Escape)
+ addressbook_close();
+ else if (event && event->keyval == GDK_Delete)
+ addressbook_del_clicked(NULL, NULL);
+ return FALSE;
+}
+
/*
* 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 *hbbox;
GtkWidget *hsbox;
GtkWidget *del_btn;
+ GtkWidget *edit_btn;
GtkWidget *reg_btn;
GtkWidget *lup_btn;
GtkWidget *to_btn;
GtkWidget *cc_btn;
GtkWidget *bcc_btn;
+ GtkWidget *close_btn;
GtkWidget *tree_popup;
GtkWidget *list_popup;
GtkItemFactory *tree_factory;
gint n_entries;
GList *nodeIf;
- gchar *titles[N_COLS];
- gchar *dummy_titles[1];
+ gchar *index_titles[N_INDEX_COLS];
+ gchar *list_titles[N_LIST_COLS];
gchar *text;
gint i;
debug_print("Creating addressbook window...\n");
- titles[COL_NAME] = _("Name");
- titles[COL_ADDRESS] = _("E-Mail address");
- titles[COL_REMARKS] = _("Remarks");
- dummy_titles[0] = "";
+ index_titles[COL_SOURCES] = _("Sources");
+ list_titles[COL_NAME] = _("Name");
+ list_titles[COL_ADDRESS] = _("E-Mail address");
+ list_titles[COL_REMARKS] = _("Remarks");
+ /* Address book window */
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Address book"));
gtk_widget_set_size_request(window, ADDRESSBOOK_WIDTH, ADDRESSBOOK_HEIGHT);
G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
- vbox = gtk_vbox_new(FALSE, 4);
+ vbox = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
+ /* Menu bar */
n_entries = sizeof(addressbook_entries) /
sizeof(addressbook_entries[0]);
menubar = menubar_create(window, addressbook_entries, n_entries,
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
menu_factory = gtk_item_factory_from_widget(menubar);
- vbox2 = gtk_vbox_new(FALSE, 4);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
+ vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
ctree_swin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_set_size_request(ctree_swin, COL_FOLDER_WIDTH + 40, -1);
/* Address index */
- ctree = gtk_sctree_new_with_titles(1, 0, dummy_titles);
+ ctree = gtk_sctree_new_with_titles(N_INDEX_COLS, 0, index_titles);
gtk_container_add(GTK_CONTAINER(ctree_swin), ctree);
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
gtk_clist_set_column_width(GTK_CLIST(ctree), 0, COL_FOLDER_WIDTH);
gtk_box_pack_start(GTK_BOX(clist_vbox), clist_swin, TRUE, TRUE, 0);
/* Address list */
- clist = gtk_sctree_new_with_titles(N_COLS, 0, titles);
+ clist = gtk_sctree_new_with_titles(N_LIST_COLS, 0, list_titles);
gtk_container_add(GTK_CONTAINER(clist_swin), clist);
gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_EXTENDED);
gtk_ctree_set_line_style(GTK_CTREE(clist), GTK_CTREE_LINES_NONE);
gtk_clist_set_compare_func(GTK_CLIST(clist),
addressbook_list_compare_func);
- for (i = 0; i < N_COLS; i++)
+ for (i = 0; i < N_LIST_COLS; i++)
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button,
GTK_CAN_FOCUS);
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
address_completion_register_entry(GTK_ENTRY(entry));
- g_signal_connect(G_OBJECT(entry), "focus_in_event",
- G_CALLBACK(addressbook_entry_gotfocus), NULL);
+ g_signal_connect(G_OBJECT(entry), "key_press_event",
+ G_CALLBACK(addressbook_entry_key_pressed),
+ NULL);
#if 0
g_signal_connect(G_OBJECT(entry), "changed",
G_CALLBACK(addressbook_entry_changed), NULL);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
- del_btn = gtk_button_new_with_label(_("Delete"));
+#if GTK_CHECK_VERSION(2, 6, 0)
+ edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+#else
+ edit_btn = gtk_button_new_from_stock(GTK_STOCK_PROPERTIES);
+#endif
+ GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
+ del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
GTK_WIDGET_SET_FLAGS(del_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
- reg_btn = gtk_button_new_with_label(_("Add"));
+ reg_btn = gtk_button_new_from_stock(GTK_STOCK_NEW);
GTK_WIDGET_SET_FLAGS(reg_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbbox), reg_btn, TRUE, TRUE, 0);
- lup_btn = gtk_button_new_with_label(_("Lookup"));
+
+
+ lup_btn = gtk_button_new_from_stock(GTK_STOCK_FIND);
GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
+ g_signal_connect(G_OBJECT(edit_btn), "clicked",
+ G_CALLBACK(addressbook_edit_clicked), NULL);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(addressbook_del_clicked), NULL);
g_signal_connect(G_OBJECT(reg_btn), "clicked",
GTK_WIDGET_SET_FLAGS(bcc_btn, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(hbbox), bcc_btn, TRUE, TRUE, 0);
+ close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+ GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+ gtk_box_pack_start(GTK_BOX(hbbox), close_btn, TRUE, TRUE, 0);
+
g_signal_connect(G_OBJECT(to_btn), "clicked",
G_CALLBACK(addressbook_to_clicked),
GINT_TO_POINTER(COMPOSE_TO));
g_signal_connect(G_OBJECT(bcc_btn), "clicked",
G_CALLBACK(addressbook_to_clicked),
GINT_TO_POINTER(COMPOSE_BCC));
+ g_signal_connect(G_OBJECT(close_btn), "clicked",
+ G_CALLBACK(addressbook_close_clicked), NULL);
/* Build icons for interface */
stock_pixmap_gdk( window, STOCK_PIXMAP_INTERFACE,
n_entries,
"<AddressBookTree>", &tree_factory,
NULL);
- g_signal_connect(G_OBJECT(tree_popup), "selection_done",
- G_CALLBACK(addressbook_popup_close), NULL);
n_entries = sizeof(addressbook_list_popup_entries) /
sizeof(addressbook_list_popup_entries[0]);
list_popup = menu_create_items(addressbook_list_popup_entries,
addrbook.status_cid = gtk_statusbar_get_context_id(
GTK_STATUSBAR(statusbar), "Addressbook Window" );
+ addrbook.edit_btn = edit_btn;
addrbook.del_btn = del_btn;
addrbook.reg_btn = reg_btn;
addrbook.lup_btn = lup_btn;
gtk_widget_set_sensitive(addrbook.bcc_btn, bcc_sens);
}
+static void addressbook_edit_clicked(GtkButton *button, gpointer data)
+{
+ addressbook_edit_address_cb(NULL, 0, NULL);
+}
+
/*
* Delete one or more objects from address list.
*/
/* Test whether anything selected for deletion */
nodeList = addrbook.listSelected;
+
aio = gtk_ctree_node_get_row_data( clist, nodeList );
if( aio == NULL) return;
ds = addressbook_find_datasource( addrbook.treeSelected );
if( pobj->type == ADDR_DATASOURCE || pobj->type == ADDR_ITEM_FOLDER ) {
/* Items inside folders */
list = addrselect_get_list( _addressSelect_ );
+
node = list;
while( node ) {
item = node->data;
g_list_free( list );
addressbook_list_select_clear();
if( refreshList )
- gtk_ctree_select( ctree, addrbook.opened);
+ gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
addrbook_set_dirty(abf, TRUE);
addressbook_export_to_file();
+ addressbook_list_menu_setup();
return;
}
else if( pobj->type == ADDR_ITEM_GROUP ) {
}
g_list_free( list );
addressbook_list_select_clear();
- gtk_ctree_select( ctree, addrbook.opened);
+ gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
addrbook_set_dirty(abf, TRUE);
addressbook_export_to_file();
+ addressbook_list_menu_setup();
return;
}
}
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 );
+ }
+ }
while( nodeMail ) {
ItemEMail *email = nodeMail->data;
}
static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name", sensitive );
+ menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Book/New Folder", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/Paste", sensitive );
-/* menu_set_sensitive( addrbook.menu_factory, "/Edit/Paste Address", sensitive ); */
menu_set_sensitive( addrbook.menu_factory, "/Address/New Address", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/New Group", sensitive );
menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To", sensitive );
gtk_widget_set_sensitive( addrbook.reg_btn, sensitive );
+ gtk_widget_set_sensitive( addrbook.edit_btn, sensitive );
gtk_widget_set_sensitive( addrbook.del_btn, sensitive );
}
static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode *node ) {
gboolean canEdit = FALSE;
+ gboolean canDelete = TRUE;
gboolean canAdd = FALSE;
gboolean canEditTr = TRUE;
gboolean editAddress = FALSE;
ds = ads->dataSource;
iface = ds->interface;
if( ! iface->readOnly ) {
- canAdd = canEdit = editAddress = TRUE;
+ canAdd = canEdit = editAddress = canDelete = TRUE;
}
if( ! iface->haveLibrary ) {
- canAdd = canEdit = editAddress = canExport = FALSE;
+ canAdd = canEdit = editAddress = canExport = canDelete = FALSE;
}
}
else if( obj->type == ADDR_ITEM_FOLDER ) {
iface = ds->interface;
if( iface->readOnly ) {
canEditTr = FALSE;
+ canDelete = FALSE;
}
else {
canAdd = editAddress = TRUE;
/* Enable edit */
menu_set_sensitive( addrbook.menu_factory, "/Address/Edit", canEdit );
- menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canEdit );
- gtk_widget_set_sensitive( addrbook.del_btn, canEdit );
+ menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canDelete );
+ gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
+ gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name", canEditTr );
+ menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", canEditTr );
menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", canEditTr );
/* Export data */
addressbook_menuitem_set_sensitive( obj, node );
addressbook_list_select_clear();
-
+ addressbook_list_menu_setup();
return FALSE;
}
if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
if( obj ) canEdit = TRUE;
}
+ canDelete = canEdit;
}
else if( pobj->type != ADDR_INTERFACE ) {
/* Parent object is not an interface */
}
if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
+ canDelete = canEdit;
}
if( iface->type == ADDR_IF_LDAP ) {
if( obj ) canBrowse = TRUE;
+ canEdit = TRUE;
+ canDelete = FALSE;
}
}
if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
- canDelete = canEdit;
-
/* Disable edit or browse if more than one row selected */
if( GTK_CLIST(clist)->selection && GTK_CLIST(clist)->selection->next ) {
canEdit = FALSE;
menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canDelete );
menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To", canCopy );
+ gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
#ifdef USE_LDAP
}
/* Display items pasted */
- gtk_ctree_select( ctree, addrbook.opened );
+ gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
}
/* Display items pasted */
if( cnt > 0 ) {
- gtk_ctree_select( ctree, addrbook.opened );
+ gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
}
}
#endif
}
}
-static void addressbook_entry_gotfocus( GtkWidget *widget ) {
- gtk_editable_select_region( GTK_EDITABLE(addrbook.entry), 0, -1 );
-}
-
/* from gdkevents.c */
#define DOUBLE_CLICK_TIME 250
if( gtk_clist_get_selection_info( clist, event->x, event->y, &row, &column ) ) {
gtk_clist_select_row( clist, row, column );
+
gtkut_clist_set_focus_row(clist, row);
obj = gtk_clist_get_row_data( clist, row );
}
if( ! iface->readOnly ) {
canEdit = TRUE;
canDelete = TRUE;
- menu_set_sensitive( addrbook.tree_factory, "/New Address", TRUE );
+ menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
}
}
menu_set_sensitive( addrbook.tree_factory, "/Copy", canTreeCopy );
menu_set_sensitive( addrbook.tree_factory, "/Paste", canTreePaste );
- menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name", canEdit );
+ menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book", canEdit );
menu_set_sensitive( addrbook.menu_factory, "/Book/Delete book", canEdit );
menu_set_sensitive( addrbook.menu_factory, "/Address/Cut", canCut );
menu_set_sensitive( addrbook.menu_factory, "/Address/Copy", canCopy );
GdkEventButton *event,
gpointer data)
{
- gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
+
gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
return FALSE;
}
-static void addressbook_popup_close(GtkMenuShell *menu_shell, gpointer data)
-{
- if (!addrbook.opened) return;
-
- gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
- gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree),
- addrbook.opened);
-}
-
static void addressbook_new_folder_cb(gpointer data, guint action,
GtkWidget *widget)
{
addressbook_change_node_name( node, name );
gtk_sctree_sort_node(ctree, parentNode);
gtk_ctree_expand( ctree, node );
- gtk_ctree_select( ctree, node );
+ gtk_sctree_select( GTK_SCTREE( ctree), node );
}
}
ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE );
if( person ) {
if (addrbook.treeSelected == addrbook.opened) {
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
}
}
}
if (addrbook.treeSelected == addrbook.opened) {
/* Change node name in tree. */
addressbook_change_node_name( addrbook.treeSelected, ADDRITEM_NAME(group) );
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
}
}
}
if( ds == NULL ) return;
abf = addressbook_get_book_file();
- if( abf == NULL ) return;
+
if( obj->type == ADDR_ITEM_EMAIL ) {
ItemEMail *email = ( ItemEMail * ) obj;
if( email == NULL ) return;
/* Edit parent group */
AdapterGroup *adapter = ADAPTER_GROUP(pobj);
ItemGroup *itemGrp = adapter->itemGroup;
+ if( abf == NULL ) return;
if( addressbook_edit_group( abf, NULL, itemGrp ) == NULL ) return;
name = ADDRITEM_NAME(itemGrp);
node = addrbook.treeSelected;
if( node == NULL ) return;
addressbook_change_node_name( node, name );
gtk_sctree_sort_node( ctree, parentNode );
- gtk_ctree_select( ctree, addrbook.opened );
+ gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
}
static void addressbook_delete_address_cb(gpointer data, guint action,
AddressTypeControlItem *atci = addrbookctl_lookup( ADDR_ITEM_EMAIL );
for( ; items != NULL; items = g_list_next( items ) ) {
GtkCTreeNode *nodeEMail = NULL;
- gchar *text[N_COLS];
+ gchar *text[N_LIST_COLS];
ItemEMail *email = items->data;
ItemPerson *person;
gchar *str = NULL;
{
GtkCTreeNode *nodePerson = NULL;
GtkCTreeNode *nodeEMail = NULL;
- gchar *text[N_COLS];
+ gchar *text[N_LIST_COLS];
gboolean flgFirst = TRUE, haveAddr = FALSE;
GList *node;
if( node )
addressbook_folder_remove_node( clist, node );
addressbook_folder_load_one_person( clist, person, atci, atciMail );
+ gtk_sctree_sort_node( clist, NULL );
node = gtk_ctree_find_by_row_data( clist, NULL, person );
if( node ) {
- gtk_ctree_select( clist, node );
+ gtk_sctree_select( GTK_SCTREE(clist), node );
if (!gtk_ctree_node_is_visible( clist, node ) )
gtk_ctree_node_moveto( clist, node, 0, 0, 0 );
}
items = addritem_folder_get_group_list( itemFolder );
for( ; items != NULL; items = g_list_next( items ) ) {
GtkCTreeNode *nodeGroup = NULL;
- gchar *text[N_COLS];
+ gchar *text[N_LIST_COLS];
ItemGroup *group = items->data;
if( group == NULL ) continue;
text[COL_NAME] = ADDRITEM_NAME(group);
}
}
-static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
- addressbook_close();
+ if (event && event->keyval == GDK_Return)
+ addressbook_lup_clicked(NULL, NULL);
return FALSE;
}
if( ads ) {
newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
addrbook.treeSelected = newNode;
}
}
if( ads ) {
newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
addrbook.treeSelected = newNode;
}
}
if( ads ) {
newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
addrbook.treeSelected = newNode;
}
}
if( ads ) {
newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
addrbook.treeSelected = newNode;
}
}
nNode = addressbook_node_add_folder( pNode, ds, folder, aoType );
gtk_ctree_expand( ctree, pNode );
if( nNode ) {
- gtk_ctree_select( ctree, nNode );
+ gtk_sctree_select( GTK_SCTREE(ctree), nNode );
addrbook.treeSelected = nNode;
}
parentNode = node;
}
addressbook_perform_search( ds, searchTerm, parentNode );
+
gtk_widget_grab_focus( addrbook.entry );
g_free( searchTerm );
}
+static void addressbook_close_clicked( GtkButton *button, gpointer data ) {
+ addressbook_close();
+}
+
#ifdef USE_LDAP
/**
* Browse address entry for highlighted entry.
adapter->treeNode,
ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select(
- GTK_CTREE(addrbook.ctree),
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
newNode );
addrbook.treeSelected = newNode;
}
adapter->treeNode,
ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select(
- GTK_CTREE(addrbook.ctree),
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
newNode );
addrbook.treeSelected = newNode;
}
adapter->treeNode,
ADDRESS_OBJECT(ads) );
if( newNode ) {
- gtk_ctree_select(
- GTK_CTREE(addrbook.ctree),
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
newNode );
addrbook.treeSelected = newNode;
}
g_signal_handlers_block_by_func
(G_OBJECT(widget),
G_CALLBACK(addressbook_tree_selected), NULL);
- gtk_ctree_select(GTK_CTREE(widget), node);
+ gtk_sctree_select( GTK_SCTREE(widget), node);
g_signal_handlers_unblock_by_func
(G_OBJECT(widget),
G_CALLBACK(addressbook_tree_selected), NULL);
g_signal_handlers_block_by_func
(G_OBJECT(widget),
G_CALLBACK(addressbook_tree_selected), NULL);
- gtk_ctree_select(GTK_CTREE(widget), addrbook.treeSelected);
+ gtk_sctree_select( GTK_SCTREE(widget), addrbook.treeSelected);
g_signal_handlers_unblock_by_func
(G_OBJECT(widget),
G_CALLBACK(addressbook_tree_selected), NULL);
ds->type == ADDR_IF_LDAP)
goto free_list;
afolder = addrindex_ds_get_root_folder( ds );
-
} else {
goto free_list;
}
AddressBookFile *obook = dragged_ab;
AddressBookFile *abook = addressbook_get_book_file_for_node(node);
for (cur = dragged_persons; cur; cur = cur->next) {
+ AddrBookBase *adbase = ( AddrBookBase * ) ds ? ds->rawDataSource : NULL;
+ AddressCache *cache = (adbase) ? adbase->addressCache : NULL;
+
person = (ItemPerson *)cur->data;
addritem_folder_remove_person(ofolder, person);
- addritem_folder_add_person(afolder, person);
+ if (cache) {
+ addrcache_folder_add_person(cache, afolder, person);
+ } else {
+ addritem_folder_add_person(afolder, person);
+ }
}
addressbook_list_select_clear();
- gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened);
+ gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
if (abook) {
addrbook_set_dirty(abook, TRUE);
projects / claws.git / blobdiff