/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* 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
GtkWidget *statusbar;
gint status_cid;
- // Basic data tab
+ /* Basic data tab */
GtkWidget *entry_name;
GtkCList *clist_group;
GtkCList *clist_avail;
GHashTable *hashEMail;
- gint rowIndGroup;
- gint rowIndAvail;
} groupeditdlg;
}
static void edit_group_ok(GtkWidget *widget, gboolean *cancelled) {
- gchar *sName = g_strdup( gtk_editable_get_chars( GTK_EDITABLE(groupeditdlg.entry_name), 0, -1 ) );
+ gchar *sName;
gboolean errFlag = TRUE;
+
+ sName = gtk_editable_get_chars( GTK_EDITABLE(groupeditdlg.entry_name), 0, -1 );
if( sName ) {
g_strstrip( sName );
if( *sName != '\0' ) {
return TRUE;
}
-static void edit_group_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
+static gboolean edit_group_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
if (event && event->keyval == GDK_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
static gchar *edit_group_format_item_clist( ItemPerson *person, ItemEMail *email ) {
}
}
-static void edit_group_group_selected( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
- groupeditdlg.rowIndGroup = row;
-}
-
-static void edit_group_avail_selected( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
- groupeditdlg.rowIndAvail = row;
-}
static gint edit_group_move_email( GtkCList *clist_from, GtkCList *clist_to, gint row ) {
ItemEMail *email = gtk_clist_get_row_data( clist_from, row );
}
static void edit_group_to_group( GtkWidget *widget, gpointer data ) {
- groupeditdlg.rowIndGroup = edit_group_move_email( groupeditdlg.clist_avail,
- groupeditdlg.clist_group, groupeditdlg.rowIndAvail );
+ GList *selected = GTK_CLIST(groupeditdlg.clist_avail)->selection;
+ /* Clear the selected rows on destination clist */
+ gtk_clist_unselect_all(groupeditdlg.clist_group);
+ while (selected) {
+ edit_group_move_email( groupeditdlg.clist_avail,
+ groupeditdlg.clist_group, GPOINTER_TO_UINT(selected->data) );
+ /* cannot use g_list_next as the selection list will have changed */
+ selected = GTK_CLIST(groupeditdlg.clist_avail)->selection;
+ }
}
static void edit_group_to_avail( GtkWidget *widget, gpointer data ) {
- groupeditdlg.rowIndAvail = edit_group_move_email( groupeditdlg.clist_group,
- groupeditdlg.clist_avail, groupeditdlg.rowIndGroup );
+ GList *selected = GTK_CLIST(groupeditdlg.clist_group)->selection;
+ gtk_clist_unselect_all(groupeditdlg.clist_avail);
+ while (selected) {
+ edit_group_move_email( groupeditdlg.clist_group,
+ groupeditdlg.clist_avail, GPOINTER_TO_UINT(selected->data) );
+ selected = GTK_CLIST(groupeditdlg.clist_group)->selection;
+ }
}
-static void edit_group_list_group_button( GtkCList *clist, GdkEventButton *event, gpointer data ) {
- if( ! event ) return;
+static gboolean edit_group_list_group_button( GtkCList *clist, GdkEventButton *event, gpointer data ) {
+ if( ! event ) return FALSE;
if( event->button == 1 ) {
if( event->type == GDK_2BUTTON_PRESS ) {
edit_group_to_avail( NULL, NULL );
}
}
+ return FALSE;
}
-static void edit_group_list_avail_button( GtkCList *clist, GdkEventButton *event, gpointer data ) {
- if( ! event ) return;
+static gboolean edit_group_list_avail_button( GtkCList *clist, GdkEventButton *event, gpointer data ) {
+ if( ! event ) return FALSE;
if( event->button == 1 ) {
if( event->type == GDK_2BUTTON_PRESS ) {
edit_group_to_group( NULL, NULL );
}
}
+ return FALSE;
}
static gint edit_group_list_compare_func( GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 ) {
GtkWidget *buttonAvail;
gint top;
- gchar *titles[ GROUP_N_COLS ] = { _( "Name" ), _("E-Mail Address"), _("Remarks") };
+ gchar *titles[ GROUP_N_COLS ];
gint i;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize(window, EDITGROUP_WIDTH, EDITGROUP_HEIGHT );
+ titles[ GROUP_COL_NAME ] = _( "Name" );
+ titles[ GROUP_COL_EMAIL ] = _("E-Mail Address");
+ titles[ GROUP_COL_REMARKS ] = _("Remarks");
+
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_size_request(window, EDITGROUP_WIDTH, EDITGROUP_HEIGHT );
gtk_container_set_border_width(GTK_CONTAINER(window), 0);
gtk_window_set_title(GTK_WINDOW(window), _("Edit Group Data"));
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(edit_group_delete_event),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(edit_group_key_pressed),
- cancelled);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(edit_group_delete_event),
+ cancelled);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(edit_group_key_pressed),
+ cancelled);
vbox = gtk_vbox_new( FALSE, 6 );
gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER_WIDTH);
gtk_widget_show( vbox );
gtk_container_add( GTK_CONTAINER( window ), vbox );
- // Group area
+ /* Group area */
hboxg = gtk_hbox_new( FALSE, 0 );
gtk_box_pack_start(GTK_BOX(vbox), hboxg, FALSE, FALSE, 0);
- // Data entry area
+ /* Data entry area */
table = gtk_table_new( 1, 3, FALSE);
gtk_box_pack_start(GTK_BOX(hboxg), table, TRUE, TRUE, 0);
gtk_container_set_border_width( GTK_CONTAINER(table), 4 );
gtk_table_set_row_spacings(GTK_TABLE(table), 0);
gtk_table_set_col_spacings(GTK_TABLE(table), 4);
- // First row
+ /* First row */
top = 0;
label = gtk_label_new(_("Group Name"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
entry_name = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- // List area
+ /* List area */
hboxl = gtk_hbox_new( FALSE, 6 );
gtk_container_set_border_width( GTK_CONTAINER(hboxl), 8 );
gtk_box_pack_start(GTK_BOX(vbox), hboxl, TRUE, TRUE, 0);
- // Group list
+ /* Group list */
vboxl = gtk_vbox_new( FALSE, 0 );
gtk_box_pack_start(GTK_BOX(hboxl), vboxl, TRUE, TRUE, 0);
clist_group = gtk_clist_new_with_titles( GROUP_N_COLS, titles );
gtk_container_add( GTK_CONTAINER(clist_swin), clist_group );
- gtk_clist_set_selection_mode( GTK_CLIST(clist_group), GTK_SELECTION_BROWSE );
+ gtk_clist_set_selection_mode( GTK_CLIST(clist_group), GTK_SELECTION_EXTENDED );
gtk_clist_set_column_width( GTK_CLIST(clist_group), GROUP_COL_NAME, GROUP_COL_WIDTH_NAME );
gtk_clist_set_column_width( GTK_CLIST(clist_group), GROUP_COL_EMAIL, GROUP_COL_WIDTH_EMAIL );
gtk_clist_set_compare_func( GTK_CLIST(clist_group), edit_group_list_compare_func );
for( i = 0; i < GROUP_N_COLS; i++ )
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist_group)->column[i].button, GTK_CAN_FOCUS);
- // Available list
+ /* Available list */
vboxl = gtk_vbox_new( FALSE, 0 );
gtk_box_pack_start(GTK_BOX(hboxl), vboxl, TRUE, TRUE, 0);
clist_avail = gtk_clist_new_with_titles( GROUP_N_COLS, titles );
gtk_container_add( GTK_CONTAINER(clist_swin), clist_avail );
- gtk_clist_set_selection_mode( GTK_CLIST(clist_avail), GTK_SELECTION_BROWSE );
+ gtk_clist_set_selection_mode( GTK_CLIST(clist_avail), GTK_SELECTION_EXTENDED );
gtk_clist_set_column_width( GTK_CLIST(clist_avail), GROUP_COL_NAME, GROUP_COL_WIDTH_NAME );
gtk_clist_set_column_width( GTK_CLIST(clist_avail), GROUP_COL_EMAIL, GROUP_COL_WIDTH_EMAIL );
gtk_clist_set_compare_func( GTK_CLIST(clist_avail), edit_group_list_compare_func );
for( i = 0; i < GROUP_N_COLS; i++ )
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist_avail)->column[i].button, GTK_CAN_FOCUS);
- // Status line
+ /* 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
+ /* Button panel */
gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
&cancel_btn, _("Cancel"), NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_group_ok), cancelled);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_group_cancel), cancelled);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(edit_group_ok), cancelled);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(edit_group_cancel), cancelled);
gtk_widget_show_all(vbox);
- // Event handlers
- gtk_signal_connect( GTK_OBJECT(clist_group), "select_row",
- GTK_SIGNAL_FUNC( edit_group_group_selected), NULL );
- gtk_signal_connect( GTK_OBJECT(clist_avail), "select_row",
- GTK_SIGNAL_FUNC( edit_group_avail_selected), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonGroup), "clicked",
- GTK_SIGNAL_FUNC( edit_group_to_group ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonAvail), "clicked",
- GTK_SIGNAL_FUNC( edit_group_to_avail ), NULL );
- gtk_signal_connect(GTK_OBJECT(clist_avail), "button_press_event",
- GTK_SIGNAL_FUNC(edit_group_list_avail_button), NULL);
- gtk_signal_connect(GTK_OBJECT(clist_group), "button_press_event",
- GTK_SIGNAL_FUNC(edit_group_list_group_button), NULL);
+ /* Event handlers */
+ g_signal_connect( G_OBJECT(buttonGroup), "clicked",
+ G_CALLBACK( edit_group_to_group ), NULL );
+ g_signal_connect( G_OBJECT(buttonAvail), "clicked",
+ G_CALLBACK( edit_group_to_avail ), NULL );
+ g_signal_connect(G_OBJECT(clist_avail), "button_press_event",
+ G_CALLBACK(edit_group_list_avail_button), NULL);
+ g_signal_connect(G_OBJECT(clist_group), "button_press_event",
+ G_CALLBACK(edit_group_list_group_button), NULL);
groupeditdlg.window = window;
groupeditdlg.ok_btn = ok_btn;
ItemGroup *addressbook_edit_group( AddressBookFile *abf, ItemFolder *parent, ItemGroup *group ) {
static gboolean cancelled;
GList *listEMail = NULL;
+ gchar *name;
if (!groupeditdlg.window)
addressbook_edit_group_create(&cancelled);
gtk_widget_show(groupeditdlg.window);
manage_window_set_transient(GTK_WINDOW(groupeditdlg.window));
- // Clear all fields
- groupeditdlg.rowIndGroup = -1;
- groupeditdlg.rowIndAvail = -1;
+ /* Clear all fields */
edit_group_status_show( "" );
gtk_clist_clear( GTK_CLIST(groupeditdlg.clist_group) );
gtk_clist_clear( GTK_CLIST(groupeditdlg.clist_avail) );
listEMail = edit_group_build_email_list();
if( group ) {
- // Update email list
+ /* Update email list */
addrbook_update_group_list( abf, group, listEMail );
}
else {
- // Create new person and email list
+ /* Create new person and email list */
group = addrbook_add_group_list( abf, parent, listEMail );
}
- addritem_group_set_name( group, gtk_editable_get_chars( GTK_EDITABLE(groupeditdlg.entry_name), 0, -1 ) );
+ name = gtk_editable_get_chars( GTK_EDITABLE(groupeditdlg.entry_name), 0, -1 );
+ addritem_group_set_name( group, name );
+ g_free( name );
listEMail = NULL;
return group;
return NULL;
}
if( folder ) {
- if( strcasecmp( name, ADDRITEM_NAME(folder) ) == 0 ) {
+ if( strcmp( name, ADDRITEM_NAME(folder) ) == 0 ) {
g_free( name );
return NULL;
}
projects / claws.git / blobdiff