/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Match Grun
+ * Copyright (C) 2001-2007 Match Grun 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.
*/
/*
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkhbbox.h>
#include <gtk/gtkbutton.h>
-#include "intl.h"
#include "gtkutils.h"
+#include "stock_pixmap.h"
#include "prefs_common.h"
#include "addressadd.h"
#include "addritem.h"
#include "addrbook.h"
#include "addrindex.h"
-
-#include "pixmaps/book.xpm"
-#include "pixmaps/dir-open.xpm"
+#include "manage_window.h"
typedef struct {
AddressBookFile *book;
static struct _AddressAdd_dlg {
GtkWidget *window;
- GtkWidget *label_name;
+ GtkWidget *entry_name;
GtkWidget *label_address;
- GtkWidget *label_remarks;
+ GtkWidget *entry_remarks;
GtkWidget *tree_folder;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
return TRUE;
}
-static void addressadd_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
+static gboolean addressadd_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
if (event && event->keyval == GDK_Escape) {
addressadd_cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
static void addressadd_ok( GtkWidget *widget, gboolean *cancelled ) {
addressadd_dlg.fiSelected = gtk_clist_get_row_data( GTK_CLIST(ctree), row );
}
-static void addressadd_tree_button( GtkCTree *ctree, GdkEventButton *event, gpointer data ) {
- if( ! event ) return;
+static gboolean addressadd_tree_button( GtkCTree *ctree, GdkEventButton *event, gpointer data ) {
+ if( ! event ) return FALSE;
if( event->button == 1 ) {
- // Handle double click
+ /* Handle double click */
if( event->type == GDK_2BUTTON_PRESS ) {
addressadd_cancelled = FALSE;
gtk_main_quit();
}
}
+
+ return FALSE;
+}
+
+static void addressadd_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.addressaddwin_width = allocation->width;
+ prefs_common.addressaddwin_height = allocation->height;
}
static void addressadd_create( void ) {
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *label;
- GtkWidget *label_name;
+ GtkWidget *entry_name;
GtkWidget *label_addr;
- GtkWidget *label_rems;
+ GtkWidget *entry_rems;
GtkWidget *tree_folder;
GtkWidget *vlbox;
GtkWidget *tree_win;
- GtkWidget *hlbox;
GtkWidget *hbbox;
- GtkWidget *hsep;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- GtkWidget *check_btn;
- GtkWidget *file_btn;
GtkWidget *hsbox;
GtkWidget *statusbar;
gint top;
+ static GdkGeometry geometry;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize( window, 300, 400 );
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
- gtk_window_set_title( GTK_WINDOW(window), _("Add Address to Book") );
+ gtk_window_set_title( GTK_WINDOW(window), _("Add to address book") );
gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
gtk_window_set_modal( GTK_WINDOW(window), TRUE );
- gtk_signal_connect( GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(addressadd_delete_event), NULL );
- gtk_signal_connect( GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(addressadd_key_pressed), NULL );
+ g_signal_connect( G_OBJECT(window), "delete_event",
+ G_CALLBACK(addressadd_delete_event), NULL );
+ g_signal_connect( G_OBJECT(window), "key_press_event",
+ G_CALLBACK(addressadd_key_pressed), NULL );
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(addressadd_size_allocate_cb), NULL);
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
- gtk_container_set_border_width( GTK_CONTAINER(vbox), 0 );
+ gtk_container_set_border_width( GTK_CONTAINER(vbox), 8 );
table = gtk_table_new(3, 2, FALSE);
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
gtk_table_set_row_spacings(GTK_TABLE(table), 8);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- // First row
+ /* First row */
top = 0;
label = gtk_label_new(_("Name"));
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);
- label_name = gtk_label_new("");
- gtk_table_attach(GTK_TABLE(table), label_name, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label_name), 0, 0.5);
+ entry_name = gtk_entry_new();
+ /* gtk_entry_set_max_length(); */
+ gtk_entry_set_text (GTK_ENTRY(entry_name),"");
+
+ gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_FILL | GTK_EXPAND , 0, 0, 0);
- // Second row
+ /* Second row */
top = 1;
label = gtk_label_new(_("Address"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(table), label_addr, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(label_addr), 0, 0.5);
- // Third row
+ /* Third row */
top = 2;
label = gtk_label_new(_("Remarks"));
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);
- label_rems = gtk_label_new("");
- gtk_table_attach(GTK_TABLE(table), label_rems, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
- gtk_misc_set_alignment(GTK_MISC(label_rems), 0, 0.5);
+ entry_rems = gtk_entry_new();
+ /* gtk_entry_set_max_length(); */
+ gtk_table_attach(GTK_TABLE(table), entry_rems, 1, 2, top, (top + 1), GTK_FILL | GTK_EXPAND, 0, 0, 0);
- // Address book/folder tree
+ /* Address book/folder tree */
vlbox = gtk_vbox_new(FALSE, 8);
gtk_box_pack_start(GTK_BOX(vbox), vlbox, TRUE, TRUE, 0);
gtk_container_set_border_width( GTK_CONTAINER(vlbox), 8 );
tree_win = gtk_scrolled_window_new( NULL, NULL );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(tree_win),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS );
+ GTK_POLICY_AUTOMATIC );
gtk_box_pack_start( GTK_BOX(vlbox), tree_win, TRUE, TRUE, 0 );
tree_folder = gtk_ctree_new( 1, 0 );
gtk_ctree_set_indent( GTK_CTREE(tree_folder), CTREE_INDENT );
gtk_clist_set_auto_sort( GTK_CLIST(tree_folder), TRUE );
- // 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
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ /* Button panel */
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
gtk_widget_grab_default(ok_btn);
- hsep = gtk_hseparator_new();
- gtk_box_pack_end(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(addressadd_ok), NULL);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(addressadd_cancel), NULL);
+ g_signal_connect(G_OBJECT(tree_folder), "select_row",
+ G_CALLBACK(addressadd_folder_select), NULL);
+ g_signal_connect(G_OBJECT(tree_folder), "button_press_event",
+ G_CALLBACK(addressadd_tree_button), NULL);
+
+ if (!geometry.min_height) {
+ geometry.min_width = 300;
+ geometry.min_height = 400;
+ }
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(addressadd_ok), NULL);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(addressadd_cancel), NULL);
- gtk_signal_connect(GTK_OBJECT(tree_folder), "select_row",
- GTK_SIGNAL_FUNC(addressadd_folder_select), NULL);
- gtk_signal_connect(GTK_OBJECT(tree_folder), "button_press_event",
- GTK_SIGNAL_FUNC(addressadd_tree_button), NULL);
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.addressaddwin_width,
+ prefs_common.addressaddwin_height);
gtk_widget_show_all(vbox);
addressadd_dlg.window = window;
- addressadd_dlg.label_name = label_name;
+ addressadd_dlg.entry_name = entry_name;
addressadd_dlg.label_address = label_addr;
- addressadd_dlg.label_remarks = label_rems;
+ addressadd_dlg.entry_remarks = entry_rems;
addressadd_dlg.tree_folder = tree_folder;
addressadd_dlg.ok_btn = ok_btn;
addressadd_dlg.cancel_btn = cancel_btn;
gtk_widget_show_all( window );
- PIXMAP_CREATE( window, bookXpm, bookXpmMask, book_xpm );
- PIXMAP_CREATE( window, folderXpm, folderXpmMask, DIRECTORY_OPEN_XPM );
+ stock_pixmap_gdk( window, STOCK_PIXMAP_BOOK, &bookXpm, &bookXpmMask );
+ stock_pixmap_gdk( window, STOCK_PIXMAP_DIR_OPEN,
+ &folderXpm, &folderXpmMask );
}
static void addressadd_load_folder( GtkCTreeNode *parentNode, ItemFolder *parentFolder,
folder = list->data;
fName = g_strdup( ADDRITEM_NAME(folder) );
name = &fName;
- node = gtk_ctree_insert_node( tree, parentNode, NULL, name, FOLDER_SPACING,
+ node = gtk_sctree_insert_node( tree, parentNode, NULL, name, FOLDER_SPACING,
folderXpm, folderXpmMask, folderXpm, folderXpmMask,
FALSE, TRUE );
g_free( fName );
ds = nodeDS->data;
dsName = g_strdup( addrindex_ds_get_name( ds ) );
- // Read address book
+ /* Read address book */
if( ! addrindex_ds_get_read_flag( ds ) ) {
addrindex_ds_read_data( ds );
}
- // Add node for address book
+ /* Add node for address book */
abf = ds->rawDataSource;
name = &dsName;
node = gtk_ctree_insert_node( tree, NULL, NULL,
gboolean addressadd_selection( AddressIndex *addrIndex, const gchar *name, const gchar *address, const gchar *remarks ) {
gboolean retVal = FALSE;
ItemPerson *person = NULL;
-
+ FolderInfo *fi = NULL;
addressadd_cancelled = FALSE;
if( ! addressadd_dlg.window ) addressadd_create();
gtk_widget_grab_focus(addressadd_dlg.ok_btn);
gtk_clist_select_row( GTK_CLIST( addressadd_dlg.tree_folder ), 0, 0 );
gtk_widget_show(addressadd_dlg.window);
- gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_name ), "" );
+ gtk_entry_set_text( GTK_ENTRY(addressadd_dlg.entry_name ), "" );
gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_address ), "" );
- gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_remarks ), "" );
+ gtk_entry_set_text( GTK_ENTRY(addressadd_dlg.entry_remarks ), "" );
if( name )
- gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_name ), name );
+ gtk_entry_set_text( GTK_ENTRY(addressadd_dlg.entry_name ), name );
if( address )
gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_address ), address );
if( remarks )
- gtk_label_set_text( GTK_LABEL(addressadd_dlg.label_remarks ), remarks );
+ gtk_entry_set_text( GTK_ENTRY(addressadd_dlg.entry_remarks ), remarks );
gtk_main();
gtk_widget_hide( addressadd_dlg.window );
if( ! addressadd_cancelled ) {
if( addressadd_dlg.fiSelected ) {
- FolderInfo *fi = addressadd_dlg.fiSelected;
- person = addrbook_add_contact( fi->book, fi->folder, name, address, remarks );
+ gchar *returned_name;
+ gchar *returned_remarks;
+ returned_name = gtk_editable_get_chars( GTK_EDITABLE(addressadd_dlg.entry_name), 0, -1 );
+ returned_remarks = gtk_editable_get_chars( GTK_EDITABLE(addressadd_dlg.entry_remarks), 0, -1 );
+
+ fi = addressadd_dlg.fiSelected;
+
+ person = addrbook_add_contact( fi->book, fi->folder,
+ returned_name,
+ address,
+ returned_remarks);
+ g_free(returned_name);
+ g_free(returned_remarks);
if( person ) retVal = TRUE;
}
}