/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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 "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkentry.h>
#include <gtk/gtktable.h>
-#include "intl.h"
#include "mgutils.h"
#include "addressbook.h"
#include "addressitem.h"
GtkWidget *statusbar;
gint status_cid;
- /* Basic data tab */
+ /* User data tab */
GtkWidget *entry_name;
GtkWidget *entry_first;
GtkWidget *entry_last;
GtkWidget *entry_alias;
GtkWidget *entry_remarks;
GtkWidget *clist_email;
+ GtkWidget *email_up;
+ GtkWidget *email_down;
+ GtkWidget *email_del;
+ GtkWidget *email_mod;
+ GtkWidget *email_add;
/* Attribute data tab */
GtkWidget *entry_atname;
GtkWidget *entry_atvalue;
GtkWidget *clist_attrib;
+ GtkWidget *attrib_add;
+ GtkWidget *attrib_del;
+ GtkWidget *attrib_mod;
gint rowIndEMail;
gint rowIndAttrib;
gboolean editNew;
+ gboolean read_only;
} personeditdlg;
return TRUE;
}
-static void edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
+static gboolean edit_person_key_pressed(GtkWidget *widget, GdkEventKey *event, gboolean *cancelled) {
if (event && event->keyval == GDK_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
static gchar *_title_new_ = NULL;
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 );
+ 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);
+ gtk_widget_set_sensitive(personeditdlg.email_down, FALSE);
}
personeditdlg.rowIndEMail = row;
edit_person_status_show( NULL );
if( email ) {
gtk_clist_row_move( clist, personeditdlg.rowIndEMail, row );
personeditdlg.rowIndEMail = row;
+ 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);
}
edit_person_email_clear( NULL );
edit_person_status_show( NULL );
if( ! email ) {
personeditdlg.rowIndEMail = -1 + row;
}
+ 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 );
if( cell2 ) name2 = cell2->u.text;
if( ! name1 ) return ( name2 != NULL );
if( ! name2 ) return -1;
- return strcasecmp( name1, name2 );
+ return g_utf8_collate( name1, name2 );
+}
+
+static gboolean list_find_attribute(const gchar *attr)
+{
+ GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+ UserAttribute *attrib;
+ gint row = 0;
+ while( (attrib = gtk_clist_get_row_data( clist, row )) ) {
+ if (!g_ascii_strcasecmp(attrib->name, attr)) {
+ gtk_clist_select_row(clist, row, 0);
+ return TRUE;
+ }
+ row++;
+ }
+ return FALSE;
+}
+
+static gboolean list_find_email(const gchar *addr)
+{
+ GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+ ItemEMail *email;
+ gint row = 0;
+ while( (email = gtk_clist_get_row_data( clist, row )) ) {
+ if (!g_ascii_strcasecmp(email->address, addr)) {
+ gtk_clist_select_row(clist, row, 0);
+ return TRUE;
+ }
+ row++;
+ }
+ return FALSE;
}
/*
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);
+ } else {
+ gtk_widget_set_sensitive(personeditdlg.attrib_del, FALSE);
}
personeditdlg.rowIndAttrib = row;
edit_person_status_show( NULL );
attrib = gtk_clist_get_row_data( clist, row );
if( ! attrib ) {
personeditdlg.rowIndAttrib = -1 + row;
- }
+ }
+
+ if (!personeditdlg.read_only)
+ gtk_widget_set_sensitive(personeditdlg.attrib_del, gtk_clist_get_row_data(clist, 0) != NULL);
+
edit_person_status_show( NULL );
}
}
}
+/*!
+ *\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;
+}
+
static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
GtkWidget *window;
GtkWidget *vbox;
GtkWidget *cancel_btn;
GtkWidget *hsbox;
GtkWidget *statusbar;
+ static GdkGeometry geometry;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize(window, EDITPERSON_WIDTH, EDITPERSON_HEIGHT );
+ 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);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(edit_person_delete_event),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(edit_person_key_pressed),
- cancelled);
+ 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 = gtk_vbox_new(FALSE, 4);
/* gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER_WIDTH); */
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* 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(vnbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_person_ok), cancelled);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_person_cancel), cancelled);
- gtk_signal_connect(GTK_OBJECT(notebook), "switch_page",
- GTK_SIGNAL_FUNC(edit_person_switch_page), NULL );
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(edit_person_ok), cancelled);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(edit_person_cancel), cancelled);
+ g_signal_connect(G_OBJECT(notebook), "switch_page",
+ G_CALLBACK(edit_person_switch_page), NULL );
gtk_widget_show_all(vbox);
+ 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.window = window;
personeditdlg.notebook = notebook;
personeditdlg.ok_btn = ok_btn;
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 ),
ATTACH_ROW(_("Display Name"), entry_name);
locale = conv_get_current_locale();
if (locale &&
- (!g_strncasecmp(locale, "ja", 2) ||
- !g_strncasecmp(locale, "ko", 2) ||
- !g_strncasecmp(locale, "zh", 2))) {
+ (!g_ascii_strncasecmp(locale, "ja", 2) ||
+ !g_ascii_strncasecmp(locale, "ko", 2) ||
+ !g_ascii_strncasecmp(locale, "zh", 2))) {
ATTACH_ROW(_("Last Name"), entry_ln);
ATTACH_ROW(_("First Name"), entry_fn);
} else {
personeditdlg.entry_nick = entry_nn;
}
+static gboolean email_adding = FALSE, email_saving = FALSE;
+
+static void edit_person_entry_email_changed (GtkWidget *entry, gpointer data)
+{
+ 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) {
+ gtk_widget_set_sensitive(personeditdlg.email_add,FALSE);
+ gtk_widget_set_sensitive(personeditdlg.email_mod,FALSE);
+ email_adding = FALSE;
+ email_saving = FALSE;
+ } else if (list_find_email(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email)))) {
+ gtk_widget_set_sensitive(personeditdlg.email_add,FALSE);
+ gtk_widget_set_sensitive(personeditdlg.email_mod,non_empty);
+ email_adding = FALSE;
+ email_saving = non_empty;
+ } else {
+ gtk_widget_set_sensitive(personeditdlg.email_add,TRUE);
+ gtk_widget_set_sensitive(personeditdlg.email_mod,non_empty);
+ email_adding = TRUE;
+ email_saving = non_empty;
+ }
+}
+
+static gboolean edit_person_entry_email_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ if (event && event->keyval == GDK_Return) {
+ if (email_saving)
+ edit_person_email_modify(NULL);
+ else if (email_adding)
+ edit_person_email_add(NULL);
+ }
+ return FALSE;
+}
+
+
static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *buttonDel;
GtkWidget *buttonMod;
GtkWidget *buttonAdd;
- GtkWidget *buttonClr;
GtkWidget *table;
GtkWidget *label;
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 ),
gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
clist = gtk_clist_new_with_titles( EMAIL_N_COLS, titles );
gtk_container_add( GTK_CONTAINER(clist_swin), clist );
/* 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);
vbuttonbox = gtk_vbutton_box_new();
gtk_button_box_set_layout( GTK_BUTTON_BOX(vbuttonbox), GTK_BUTTONBOX_START );
- gtk_button_box_set_spacing( GTK_BUTTON_BOX(vbuttonbox), 8 );
+ gtk_box_set_spacing( GTK_BOX(vbuttonbox), 8 );
gtk_container_set_border_width( GTK_CONTAINER(vbuttonbox), 4 );
gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
/* Buttons */
- buttonUp = gtk_button_new_with_label( _( "Move Up" ) );
+ buttonUp = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonUp );
- buttonDown = gtk_button_new_with_label( _( "Move Down" ) );
+ buttonDown = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDown );
- buttonDel = gtk_button_new_with_label( _( "Delete" ) );
+ buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
- buttonMod = gtk_button_new_with_label( _( "Modify" ) );
+ buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
- buttonAdd = gtk_button_new_with_label( _( "Add" ) );
+ buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonAdd );
- buttonClr = gtk_button_new_with_label( _( "Clear" ) );
- gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonClr );
-
gtk_widget_show_all(vbox);
/* Event handlers */
- gtk_signal_connect( GTK_OBJECT(clist), "select_row",
- GTK_SIGNAL_FUNC( edit_person_email_list_selected), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonUp), "clicked",
- GTK_SIGNAL_FUNC( edit_person_email_move_up ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonDown), "clicked",
- GTK_SIGNAL_FUNC( edit_person_email_move_down ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonDel), "clicked",
- GTK_SIGNAL_FUNC( edit_person_email_delete ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonMod), "clicked",
- GTK_SIGNAL_FUNC( edit_person_email_modify ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonAdd), "clicked",
- GTK_SIGNAL_FUNC( edit_person_email_add ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonClr), "clicked",
- GTK_SIGNAL_FUNC( edit_person_email_clear ), NULL );
+ g_signal_connect( G_OBJECT(clist), "select_row",
+ G_CALLBACK( edit_person_email_list_selected), NULL );
+ g_signal_connect( G_OBJECT(buttonUp), "clicked",
+ G_CALLBACK( edit_person_email_move_up ), NULL );
+ g_signal_connect( G_OBJECT(buttonDown), "clicked",
+ G_CALLBACK( edit_person_email_move_down ), NULL );
+ g_signal_connect( G_OBJECT(buttonDel), "clicked",
+ G_CALLBACK( edit_person_email_delete ), NULL );
+ g_signal_connect( G_OBJECT(buttonMod), "clicked",
+ G_CALLBACK( edit_person_email_modify ), NULL );
+ g_signal_connect( G_OBJECT(buttonAdd), "clicked",
+ G_CALLBACK( edit_person_email_add ), NULL );
+ g_signal_connect(G_OBJECT(entry_email), "changed",
+ G_CALLBACK(edit_person_entry_email_changed), NULL);
+ g_signal_connect(G_OBJECT(entry_email), "key_press_event",
+ G_CALLBACK(edit_person_entry_email_pressed), NULL);
+ g_signal_connect(G_OBJECT(entry_alias), "key_press_event",
+ G_CALLBACK(edit_person_entry_email_pressed), NULL);
+ g_signal_connect(G_OBJECT(entry_remarks), "key_press_event",
+ G_CALLBACK(edit_person_entry_email_pressed), NULL);
personeditdlg.clist_email = clist;
personeditdlg.entry_email = entry_email;
personeditdlg.entry_alias = entry_alias;
personeditdlg.entry_remarks = entry_remarks;
+ personeditdlg.email_up = buttonUp;
+ personeditdlg.email_down = buttonDown;
+ personeditdlg.email_del = buttonDel;
+ personeditdlg.email_mod = buttonMod;
+ personeditdlg.email_add = buttonAdd;
+}
+
+static gboolean attrib_adding = FALSE, attrib_saving = FALSE;
+
+static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
+{
+ 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_widget_set_sensitive(personeditdlg.attrib_add,FALSE);
+ gtk_widget_set_sensitive(personeditdlg.attrib_mod,FALSE);
+ attrib_adding = FALSE;
+ attrib_saving = FALSE;
+ } else if (list_find_attribute(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname)))) {
+ gtk_widget_set_sensitive(personeditdlg.attrib_add,FALSE);
+ gtk_widget_set_sensitive(personeditdlg.attrib_mod,non_empty);
+ attrib_adding = FALSE;
+ attrib_saving = non_empty;
+ } else {
+ gtk_widget_set_sensitive(personeditdlg.attrib_add,TRUE);
+ gtk_widget_set_sensitive(personeditdlg.attrib_mod,non_empty);
+ attrib_adding = TRUE;
+ attrib_saving = non_empty;
+ }
+}
+
+static gboolean edit_person_entry_att_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ if (event && event->keyval == GDK_Return) {
+ if (attrib_saving)
+ edit_person_attrib_modify(NULL);
+ else if (attrib_adding)
+ edit_person_attrib_add(NULL);
+ }
+ return FALSE;
}
static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) {
GtkWidget *buttonDel;
GtkWidget *buttonMod;
GtkWidget *buttonAdd;
- GtkWidget *buttonClr;
GtkWidget *table;
GtkWidget *label;
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 ),
gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
clist = gtk_clist_new_with_titles( ATTRIB_N_COLS, titles );
gtk_container_add( GTK_CONTAINER(clist_swin), clist );
vbuttonbox = gtk_vbutton_box_new();
gtk_button_box_set_layout( GTK_BUTTON_BOX(vbuttonbox), GTK_BUTTONBOX_START );
- gtk_button_box_set_spacing( GTK_BUTTON_BOX(vbuttonbox), 8 );
+ gtk_box_set_spacing( GTK_BOX(vbuttonbox), 8 );
gtk_container_set_border_width( GTK_CONTAINER(vbuttonbox), 4 );
gtk_container_add( GTK_CONTAINER(vboxb), vbuttonbox );
/* Buttons */
- buttonDel = gtk_button_new_with_label( _( "Delete" ) );
+ buttonDel = gtk_button_new_from_stock(GTK_STOCK_DELETE);
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonDel );
- buttonMod = gtk_button_new_with_label( _( "Modify" ) );
+ buttonMod = gtk_button_new_from_stock(GTK_STOCK_SAVE);
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonMod );
- buttonAdd = gtk_button_new_with_label( _( "Add" ) );
+ buttonAdd = gtk_button_new_from_stock(GTK_STOCK_ADD);
gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonAdd );
-
- buttonClr = gtk_button_new_with_label( _( "Clear" ) );
- gtk_container_add( GTK_CONTAINER(vbuttonbox), buttonClr );
+
+ gtk_widget_set_sensitive(buttonDel,FALSE);
+ gtk_widget_set_sensitive(buttonMod,FALSE);
+ gtk_widget_set_sensitive(buttonAdd,FALSE);
gtk_widget_show_all(vbox);
/* Event handlers */
- gtk_signal_connect( GTK_OBJECT(clist), "select_row",
- GTK_SIGNAL_FUNC( edit_person_attrib_list_selected), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonDel), "clicked",
- GTK_SIGNAL_FUNC( edit_person_attrib_delete ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonMod), "clicked",
- GTK_SIGNAL_FUNC( edit_person_attrib_modify ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonAdd), "clicked",
- GTK_SIGNAL_FUNC( edit_person_attrib_add ), NULL );
- gtk_signal_connect( GTK_OBJECT(buttonClr), "clicked",
- GTK_SIGNAL_FUNC( edit_person_attrib_clear ), NULL );
+ g_signal_connect( G_OBJECT(clist), "select_row",
+ G_CALLBACK( edit_person_attrib_list_selected), NULL );
+ g_signal_connect( G_OBJECT(buttonDel), "clicked",
+ G_CALLBACK( edit_person_attrib_delete ), NULL );
+ g_signal_connect( G_OBJECT(buttonMod), "clicked",
+ G_CALLBACK( edit_person_attrib_modify ), NULL );
+ g_signal_connect( G_OBJECT(buttonAdd), "clicked",
+ G_CALLBACK( edit_person_attrib_add ), NULL );
+ g_signal_connect(G_OBJECT(entry_name), "changed",
+ G_CALLBACK(edit_person_entry_att_changed), NULL);
+ g_signal_connect(G_OBJECT(entry_name), "key_press_event",
+ G_CALLBACK(edit_person_entry_att_pressed), NULL);
+ g_signal_connect(G_OBJECT(entry_value), "key_press_event",
+ G_CALLBACK(edit_person_entry_att_pressed), NULL);
personeditdlg.clist_attrib = clist;
personeditdlg.entry_atname = entry_name;
personeditdlg.entry_atvalue = entry_value;
+ personeditdlg.attrib_add = buttonAdd;
+ personeditdlg.attrib_del = buttonDel;
+ personeditdlg.attrib_mod = buttonMod;
}
static void addressbook_edit_person_create( gboolean *cancelled ) {
addressbook_edit_person_dialog_create( cancelled );
- addressbook_edit_person_page_basic( PAGE_BASIC, _( "Basic Data" ) );
- addressbook_edit_person_page_email( PAGE_EMAIL, _( "E-Mail Address" ) );
- addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "User Attributes" ) );
+ 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.window );
}
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);
+}
+
/*
* Edit person.
* Enter: abf Address book.
addressbook_edit_person_create(&cancelled);
gtk_widget_grab_focus(personeditdlg.ok_btn);
gtk_widget_grab_focus(personeditdlg.entry_name);
+
+ personeditdlg.read_only = (abf == NULL);
+ update_sensitivity();
+
gtk_widget_show(personeditdlg.window);
manage_window_set_transient(GTK_WINDOW(personeditdlg.window));
/* Select appropriate start page */
if( pgMail ) {
- gtk_notebook_set_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_EMAIL );
+ gtk_notebook_set_current_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_EMAIL );
}
else {
- gtk_notebook_set_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_BASIC );
+ gtk_notebook_set_current_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_BASIC );
}
gtk_clist_select_row( GTK_CLIST(personeditdlg.clist_email), 0, 0 );
gtk_clist_select_row( GTK_CLIST(personeditdlg.clist_attrib), 0, 0 );
edit_person_email_clear( NULL );
+ if (person)
+ edit_person_email_list_selected(GTK_CLIST(personeditdlg.clist_email), 0, 0, NULL, NULL);
+
edit_person_attrib_clear( NULL );
gtk_main();
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) );
return NULL;
}
cn = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
- if( person ) {
- /* Update email/attribute list */
+ if( person && abf ) {
+ /* Update email/attribute list for existing person */
addrbook_update_address_list( abf, person, listEMail );
addrbook_update_attrib_list( abf, person, listAttrib );
}
/* Wasting our time */
if( listEMail == NULL && listAttrib == NULL ) cancelled = TRUE;
}
- if( ! cancelled ) {
+ if( ! cancelled && abf ) {
person = addrbook_add_address_list( abf, parent, listEMail );
addrbook_add_attrib_list( abf, person, listAttrib );
}
}
+ listEMail = NULL;
+ listAttrib = NULL;
- if( !cancelled ) {
+ if( ! cancelled ) {
/* Set person stuff */
gchar *name;
addritem_person_set_common_name( person, cn );
}
g_free( cn );
- listEMail = NULL;
-
gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
projects / claws.git / blobdiff