implemented CSV import (in progress).

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1600 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 901 insertions, 0 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 474ebea5..47902071 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,6 +48,7 @@ sylpheed_SOURCES = \
 	vcard.c vcard.h \
 	ldif.c ldif.h \
 	importldif.c importldif.h \
+	importcsv.c importcsv.h \
 	jpilot.c jpilot.h \
 	syldap.c syldap.h \
 	editbook.c editbook.h \
diff --git a/src/addressbook.c b/src/addressbook.c
index cfb865d2..2946b84b 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -78,6 +78,7 @@
 #include "editbook.h"
 #include "ldif.h"
 #include "importldif.h"
+#include "importcsv.h"
 
 #ifdef USE_JPILOT
 #include "jpilot.h"
@@ -343,6 +344,7 @@ static void addressbook_list_select_add		(AddressObject *obj);
 static void addressbook_list_select_remove	(AddressObject *obj);
 
 static void addressbook_import_ldif_cb		(void);
+static void addressbook_import_csv_cb		(void);
 
 static GtkItemFactoryEntry addressbook_entries[] =
 {
@@ -376,6 +378,7 @@ static GtkItemFactoryEntry addressbook_entries[] =
 
 	{N_("/_Tools"),			NULL,		NULL, 0, "<Branch>"},
 	{N_("/_Tools/Import _LDIF file"), NULL,		addressbook_import_ldif_cb,	0, NULL},
+	{N_("/_Tools/Import _CSV file"), NULL,		addressbook_import_csv_cb,	0, NULL},
 
 	{N_("/_Help"),			NULL,		NULL, 0, "<Branch>"},
 	{N_("/_Help/_About"),		NULL,		about_show, 0, NULL}
@@ -3604,5 +3607,35 @@ static void addressbook_import_ldif_cb() {
 }
 
 /*
+* Import CSV file.
+*/
+static void addressbook_import_csv_cb() {
+	AddressDataSource *ds = NULL;
+	AdapterDSource *ads = NULL;
+	AddressBookFile *abf = NULL;
+	AdapterInterface *adapter;
+	GtkCTreeNode *newNode;
+
+	adapter = addrbookctl_find_interface( ADDR_IF_BOOK );
+	if ( !adapter || !adapter->treeNode ) return;
+
+	abf = addressbook_imp_csv( _addressIndex_ );
+	if ( !abf ) return;
+
+	ds = addrindex_index_add_datasource( _addressIndex_, ADDR_IF_BOOK, abf );
+	ads = addressbook_create_ds_adapter( ds, ADDR_BOOK, NULL );
+	addressbook_ads_set_name( ads, abf->name );
+	newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
+	if ( newNode ) {
+		addrbook.treeSelected = NULL;
+		gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+		addrbook.treeSelected = newNode;
+	}
+
+	/* Notify address completion */
+	invalidate_address_completion();
+}
+
+/*
 * End of Source.
 */
diff --git a/src/importcsv.c b/src/importcsv.c
new file mode 100644
index 00000000..7768f3a4
--- /dev/null
+++ b/src/importcsv.c
@@ -0,0 +1,833 @@
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2007 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+/*
+ * Edit VCard address book data.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "defs.h"
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtkwindow.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtktable.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhbbox.h>
+#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkstatusbar.h>
+#include <gtk/gtknotebook.h>
+#include <gtk/gtkfilesel.h>
+#include <gtk/gtkstock.h>
+
+#include <stdio.h>
+
+#include "addrbook.h"
+#include "addressbook.h"
+#include "addressitem.h"
+#include "gtkutils.h"
+#include "stock_pixmap.h"
+#include "prefs_common.h"
+#include "manage_window.h"
+#include "mgutils.h"
+#include "importcsv.h"
+#include "utils.h"
+
+#define IMPORTCSV_GUESS_NAME "CSV Import"
+
+#define PAGE_FILE_INFO             0
+#define PAGE_ATTRIBUTES            1
+#define PAGE_FINISH                2
+
+#define IMPORTCSV_WIDTH           380
+#define IMPORTCSV_HEIGHT          300
+
+#define FIELDS_N_COLS              3
+#define FIELDS_COL_WIDTH_SELECT    10
+#define FIELDS_COL_WIDTH_FIELD     140
+#define FIELDS_COL_WIDTH_ATTRIB    140
+
+typedef enum {
+	FIELD_COL_SELECT  = 0,
+	FIELD_COL_FIELD   = 1,
+	FIELD_COL_ATTRIB  = 2
+} ImpCSV_FieldColPos;
+
+static struct _ImpCSV_Dlg {
+	GtkWidget *window;
+	GtkWidget *notebook;
+	GtkWidget *file_entry;
+	GtkWidget *name_entry;
+	GtkWidget *clist_field;
+	GtkWidget *check_select;
+	GtkWidget *labelBook;
+	GtkWidget *labelFile;
+	GtkWidget *labelRecords;
+	GtkWidget *btnPrev;
+	GtkWidget *btnNext;
+	GtkWidget *btnCancel;
+	GtkWidget *statusbar;
+	gint      status_cid;
+	gint      rowIndSelect;
+	gint      rowCount;
+	gchar     *nameBook;
+	gchar     *fileName;
+	gboolean  cancelled;
+} impcsv_dlg;
+
+typedef enum {
+	ATTR_FIRST_NAME,
+	ATTR_LAST_NAME,
+	ATTR_DISPLAY_NAME,
+	ATTR_NICK_NAME,
+	ATTR_EMAIL_ADDRESS,
+
+	N_CSV_ATTRIB
+} ImpCSVAttribIndex;
+
+static struct _ImpCSVAttrib {
+	gchar *name;
+	gint col;
+	gboolean enabled;
+} imp_csv_attrib[] = {
+	{N_("First Name"),	0, TRUE},
+	{N_("Last Name"),	1, TRUE},
+	{N_("Display Name"),	2, TRUE},
+	{N_("Nick Name"),	3, TRUE},
+	{N_("E-Mail Address"),	4, TRUE}
+};
+
+static struct _AddressFileSelection _imp_csv_file_selector_;
+static AddressBookFile *_importedBook_;
+static AddressIndex *_imp_addressIndex_;
+static gint importCount = 0;
+static gint result;
+
+static GdkPixmap *markxpm;
+static GdkBitmap *markxpmmask;
+
+static void imp_csv_status_show( gchar *msg ) {
+	if( impcsv_dlg.statusbar != NULL ) {
+		gtk_statusbar_pop( GTK_STATUSBAR(impcsv_dlg.statusbar), impcsv_dlg.status_cid );
+		if( msg ) {
+			gtk_statusbar_push( GTK_STATUSBAR(impcsv_dlg.statusbar), impcsv_dlg.status_cid, msg );
+		}
+	}
+}
+
+static void imp_csv_message( void ) {
+	gchar *sMsg = NULL;
+	gint pageNum;
+
+	pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(impcsv_dlg.notebook) );
+	if( pageNum == PAGE_FILE_INFO ) {
+		sMsg = _( "Please specify address book name and file to import." );
+	}
+	else if( pageNum == PAGE_ATTRIBUTES ) {
+		sMsg = _( "Select and reorder CSV field names to import." );
+	}
+	else if( pageNum == PAGE_FINISH ) {
+		sMsg = _( "File imported." );
+	}
+	imp_csv_status_show( sMsg );
+}
+
+static gchar *imp_csv_guess_file( AddressBookFile *abf ) {
+	gchar *newFile = NULL;
+	GList *fileList = NULL;
+	gint fileNum = 1;
+	fileList = addrbook_get_bookfile_list( abf );
+	if( fileList ) {
+		fileNum = 1 + abf->maxValue;
+	}
+	newFile = addrbook_gen_new_file_name( fileNum );
+	g_list_free( fileList );
+	fileList = NULL;
+	return newFile;
+}
+
+static void imp_csv_load_fields( gchar *sFile ) {
+	GtkCList *clist = GTK_CLIST(impcsv_dlg.clist_field);
+	FILE *fp;
+	gchar buf[BUFFSIZE];
+	gchar *text[ FIELDS_N_COLS ];
+	gint i;
+	gchar **strv;
+	CharSet enc;
+
+	g_return_if_fail(sFile != NULL);
+
+	impcsv_dlg.rowIndSelect = -1;
+	impcsv_dlg.rowCount = 0;
+	gtk_clist_clear( clist );
+
+	enc = conv_check_file_encoding(sFile);
+
+	if ((fp = g_fopen(sFile, "rb")) == NULL) {
+		return;
+	}
+
+	while (fgets(buf, sizeof(buf), fp) != NULL) {
+		gchar *str;
+
+		strretchomp(buf);
+		if (enc == C_UTF_8)
+			str = g_strdup(buf);
+		else
+			str = conv_localetodisp(buf, NULL);
+		g_print("%s\n", str);
+		strv = g_strsplit(str, ",", 0);
+		for (i = 0; strv[i] != NULL; i++) {
+			text[ FIELD_COL_SELECT ] = "";
+			text[ FIELD_COL_FIELD  ] = strv[i];
+			text[ FIELD_COL_ATTRIB ] =
+				i < N_CSV_ATTRIB ? gettext(imp_csv_attrib[i].name) : "";
+			gtk_clist_append( clist, text );
+		}
+		g_free(str);
+		g_strfreev(strv);
+		break;
+	}
+
+	fclose(fp);
+}
+
+static void imp_csv_field_list_selected( GtkCList *clist, gint row, gint column ) {
+}
+
+static gboolean imp_csv_field_list_toggle( GtkCList *clist, GdkEventButton *event, gpointer data ) {
+	return FALSE;
+}
+
+static void imp_csv_modify_pressed( GtkWidget *widget, gpointer data ) {
+}
+
+static gint imp_csv_import_data( gchar *csvFile, AddressCache *cache ) {
+	FILE *fp;
+	gchar buf[BUFFSIZE];
+	gint i;
+	gchar **strv;
+	gchar *firstName = NULL;
+	gchar *lastName = NULL;
+	gchar *fullName = NULL;
+	gchar *nickName = NULL;
+	gchar *address = NULL;
+	ItemPerson *person;
+	ItemEMail *email;
+	gint count = 0;
+
+	g_return_val_if_fail( csvFile != NULL, MGU_BAD_ARGS );
+
+	addrcache_clear( cache );
+	cache->dataRead = FALSE;
+
+	if ((fp = g_fopen(csvFile, "rb")) == NULL) {
+		return;
+	}
+
+	while (fgets(buf, sizeof(buf), fp) != NULL) {
+		strretchomp(buf);
+		g_print("%s\n", buf);
+		strv = g_strsplit(buf, ",", 0);
+
+		for (i = 0; strv[i] != NULL; i++) {
+			if (i == imp_csv_attrib[ATTR_FIRST_NAME].col)
+				firstName = strv[i];
+			else if (i == imp_csv_attrib[ATTR_LAST_NAME].col)
+				lastName = strv[i];
+			else if (i == imp_csv_attrib[ATTR_DISPLAY_NAME].col)
+				fullName = strv[i];
+			else if (i == imp_csv_attrib[ATTR_NICK_NAME].col)
+				nickName = strv[i];
+			else if (i == imp_csv_attrib[ATTR_EMAIL_ADDRESS].col)
+				address = strv[i];
+		}
+
+		person = addritem_create_item_person();
+		addritem_person_set_common_name( person, fullName);
+		addritem_person_set_first_name( person, firstName);
+		addritem_person_set_last_name( person, lastName);
+		addritem_person_set_nick_name( person, nickName);
+		addrcache_id_person( cache, person );
+		addrcache_add_person( cache, person );
+
+		if (address && *address) {
+			email = addritem_create_item_email();
+			addritem_email_set_address( email, address );
+			addrcache_id_email( cache, email );
+			addrcache_person_add_email( cache, person, email );
+		}
+
+		firstName = lastName = fullName = nickName = address = NULL;
+		g_strfreev(strv);
+
+		count++;
+	}
+
+	fclose(fp);
+
+	cache->modified = FALSE;
+	cache->dataRead = TRUE;
+	importCount = count;
+
+	return MGU_SUCCESS;
+}
+
+/*
+* Move off fields page.
+* return: TRUE if OK to move off page.
+*/
+static gboolean imp_csv_field_move() {
+	gboolean retVal = FALSE;
+	gchar *newFile;
+	AddressBookFile *abf = NULL;
+
+	if( _importedBook_ ) {
+		addrbook_free_book( _importedBook_ );
+	}
+
+	abf = addrbook_create_book();
+	addrbook_set_path( abf, _imp_addressIndex_->filePath );
+	addrbook_set_name( abf, impcsv_dlg.nameBook );
+	newFile = imp_csv_guess_file( abf );
+	addrbook_set_file( abf, newFile );
+	g_free( newFile );
+
+	/* Import data into file */
+	if( imp_csv_import_data( impcsv_dlg.fileName, abf->addressCache ) == MGU_SUCCESS ) {
+		addrbook_save_data( abf );
+		abf->dirtyFlag = TRUE;
+		_importedBook_ = abf;
+		retVal = TRUE;
+	}
+	else {
+		addrbook_free_book( abf );
+	}
+
+	return retVal;
+}
+
+/*
+* Move off fields page.
+* return: TRUE if OK to move off page.
+*/
+static gboolean imp_csv_file_move() {
+	gboolean retVal = FALSE;
+	gchar *sName;
+	gchar *sFile;
+	gchar *sMsg = NULL;
+	gboolean errFlag = FALSE;
+
+	sFile = gtk_editable_get_chars( GTK_EDITABLE(impcsv_dlg.file_entry), 0, -1 );
+	g_strchug( sFile ); g_strchomp( sFile );
+
+	sName = gtk_editable_get_chars( GTK_EDITABLE(impcsv_dlg.name_entry), 0, -1 );
+	g_strchug( sName ); g_strchomp( sName );
+
+	g_free( impcsv_dlg.nameBook );
+	g_free( impcsv_dlg.fileName );
+	impcsv_dlg.nameBook = sName;
+	impcsv_dlg.fileName = sFile;
+
+	gtk_entry_set_text( GTK_ENTRY(impcsv_dlg.file_entry), sFile );
+	gtk_entry_set_text( GTK_ENTRY(impcsv_dlg.name_entry), sName );
+
+	if( *sFile == '\0'|| strlen( sFile ) < 1 ) {
+		sMsg = _( "Please select a file." );
+		gtk_widget_grab_focus(impcsv_dlg.file_entry);
+		errFlag = TRUE;
+	}
+
+	if( *sName == '\0'|| strlen( sName ) < 1 ) {
+		if( ! errFlag ) sMsg = _( "Address book name must be supplied." );
+		gtk_widget_grab_focus(impcsv_dlg.name_entry);
+		errFlag = TRUE;
+	}
+
+	if( ! errFlag ) {
+		imp_csv_load_fields( sFile );
+		retVal = TRUE;
+	}
+	imp_csv_status_show( sMsg );
+
+	return retVal;
+}
+
+/*
+ * Display finish page.
+ */
+static void imp_csv_finish_show() {
+	gchar *sMsg;
+	gchar *name;
+
+	name = gtk_editable_get_chars( GTK_EDITABLE(impcsv_dlg.name_entry), 0, -1 );
+	gtk_label_set_text( GTK_LABEL(impcsv_dlg.labelBook), name );
+	g_free( name );
+	gtk_label_set_text( GTK_LABEL(impcsv_dlg.labelFile), impcsv_dlg.fileName );
+	gtk_label_set_text( GTK_LABEL(impcsv_dlg.labelRecords), itos( importCount ) );
+	gtk_widget_set_sensitive( impcsv_dlg.btnPrev, FALSE );
+	gtk_widget_set_sensitive( impcsv_dlg.btnNext, FALSE );
+	if( result == MGU_SUCCESS ) {
+		sMsg = _( "CSV file imported successfully." );
+	}
+	else {
+		sMsg = mgu_error2string( result );
+	}
+	imp_csv_status_show( sMsg );
+	gtk_button_set_label(GTK_BUTTON(impcsv_dlg.btnCancel), GTK_STOCK_CLOSE);
+	gtk_widget_grab_focus(impcsv_dlg.btnCancel);
+}
+
+static void imp_csv_prev( GtkWidget *widget ) {
+	gint pageNum;
+
+	pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(impcsv_dlg.notebook) );
+	if( pageNum == PAGE_ATTRIBUTES ) {
+		/* Goto file page stuff */
+		gtk_notebook_set_current_page(
+			GTK_NOTEBOOK(impcsv_dlg.notebook), PAGE_FILE_INFO );
+		gtk_widget_set_sensitive( impcsv_dlg.btnPrev, FALSE );
+	}
+	imp_csv_message();
+}
+
+static void imp_csv_next( GtkWidget *widget ) {
+	gint pageNum;
+
+	pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(impcsv_dlg.notebook) );
+	if( pageNum == PAGE_FILE_INFO ) {
+		/* Goto attributes stuff */
+		if( imp_csv_file_move() ) {
+			gtk_notebook_set_current_page(
+				GTK_NOTEBOOK(impcsv_dlg.notebook), PAGE_ATTRIBUTES );
+			imp_csv_message();
+			gtk_widget_set_sensitive( impcsv_dlg.btnPrev, TRUE );
+		}
+		else {
+			gtk_widget_set_sensitive( impcsv_dlg.btnPrev, FALSE );
+		}
+	}
+	else if( pageNum == PAGE_ATTRIBUTES ) {
+		/* Goto finish stuff */
+		if( imp_csv_field_move() ) {
+			gtk_notebook_set_current_page(
+				GTK_NOTEBOOK(impcsv_dlg.notebook), PAGE_FINISH );
+			imp_csv_finish_show();
+		}
+	}
+}
+
+static void imp_csv_cancel( GtkWidget *widget, gpointer data ) {
+	gint pageNum;
+
+	pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(impcsv_dlg.notebook) );
+	if( pageNum != PAGE_FINISH ) {
+		impcsv_dlg.cancelled = TRUE;
+	}
+	gtk_main_quit();
+}
+
+static void imp_csv_file_ok( GtkWidget *widget, gpointer data ) {
+	const gchar *sFile;
+	AddressFileSelection *afs;
+	GtkWidget *fileSel;
+
+	afs = ( AddressFileSelection * ) data;
+	fileSel = afs->fileSelector;
+	sFile = gtk_file_selection_get_filename( GTK_FILE_SELECTION(fileSel) );
+
+	afs->cancelled = FALSE;
+	gtk_entry_set_text( GTK_ENTRY(impcsv_dlg.file_entry), sFile );
+	gtk_widget_hide( afs->fileSelector );
+	gtk_grab_remove( afs->fileSelector );
+	gtk_widget_grab_focus( impcsv_dlg.file_entry );
+}
+
+static void imp_csv_file_cancel( GtkWidget *widget, gpointer data ) {
+	AddressFileSelection *afs = ( AddressFileSelection * ) data;
+	afs->cancelled = TRUE;
+	gtk_widget_hide( afs->fileSelector );
+	gtk_grab_remove( afs->fileSelector );
+	gtk_widget_grab_focus( impcsv_dlg.file_entry );
+}
+
+static void imp_csv_file_select_create( AddressFileSelection *afs ) {
+	GtkWidget *fileSelector;
+
+	fileSelector = gtk_file_selection_new( _("Select CSV File") );
+	gtk_file_selection_hide_fileop_buttons( GTK_FILE_SELECTION(fileSelector) );
+	g_signal_connect( G_OBJECT (GTK_FILE_SELECTION(fileSelector)->ok_button),
+			  "clicked", G_CALLBACK (imp_csv_file_ok), ( gpointer ) afs );
+	g_signal_connect( G_OBJECT (GTK_FILE_SELECTION(fileSelector)->cancel_button),
+			  "clicked", G_CALLBACK (imp_csv_file_cancel), ( gpointer ) afs );
+	afs->fileSelector = fileSelector;
+	afs->cancelled = TRUE;
+}
+
+static void imp_csv_file_select( void ) {
+	gchar *sFile;
+	if( ! _imp_csv_file_selector_.fileSelector )
+		imp_csv_file_select_create( & _imp_csv_file_selector_ );
+
+	sFile = gtk_editable_get_chars( GTK_EDITABLE(impcsv_dlg.file_entry), 0, -1 );
+	gtk_file_selection_set_filename(
+		GTK_FILE_SELECTION( _imp_csv_file_selector_.fileSelector ),
+		sFile );
+	g_free( sFile );
+	gtk_widget_show( _imp_csv_file_selector_.fileSelector );
+	gtk_grab_add( _imp_csv_file_selector_.fileSelector );
+}
+
+static gint imp_csv_delete_event( GtkWidget *widget, GdkEventAny *event, gpointer data ) {
+	imp_csv_cancel( widget, data );
+	return TRUE;
+}
+
+static gboolean imp_csv_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data ) {
+	if (event && event->keyval == GDK_Escape) {
+		imp_csv_cancel( widget, data );
+	}
+	return FALSE;
+}
+
+static void imp_csv_page_file( gint pageNum, gchar *pageLbl ) {
+	GtkWidget *vbox;
+	GtkWidget *table;
+	GtkWidget *label;
+	GtkWidget *file_entry;
+	GtkWidget *name_entry;
+	GtkWidget *file_btn;
+	gint top;
+
+	vbox = gtk_vbox_new(FALSE, 8);
+	gtk_container_add( GTK_CONTAINER( impcsv_dlg.notebook ), vbox );
+	gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
+
+	label = gtk_label_new( pageLbl );
+	gtk_widget_show( label );
+	gtk_notebook_set_tab_label(
+		GTK_NOTEBOOK( impcsv_dlg.notebook ),
+		gtk_notebook_get_nth_page(
+			GTK_NOTEBOOK( impcsv_dlg.notebook ), pageNum ),
+		label );
+
+	table = gtk_table_new(2, 3, FALSE);
+	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+	gtk_container_set_border_width( GTK_CONTAINER(table), 8 );
+	gtk_table_set_row_spacings(GTK_TABLE(table), 8);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 8 );
+
+	/* First row */
+	top = 0;
+	label = gtk_label_new(_("Address Book"));
+	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);
+
+	name_entry = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, top, (top + 1),
+		GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+	/* Second row */
+	top = 1;
+	label = gtk_label_new(_("File 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);
+
+	file_entry = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1),
+		GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+
+	file_btn = gtk_button_new_with_label( _(" ... "));
+	gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1),
+		GTK_FILL, 0, 3, 0);
+
+	gtk_widget_show_all(vbox);
+
+	/* Button handler */
+	g_signal_connect(G_OBJECT(file_btn), "clicked",
+			 G_CALLBACK(imp_csv_file_select), NULL);
+
+	impcsv_dlg.file_entry = file_entry;
+	impcsv_dlg.name_entry = name_entry;
+}
+
+static void imp_csv_page_fields( gint pageNum, gchar *pageLbl ) {
+	GtkWidget *vbox;
+	GtkWidget *vboxt;
+
+	GtkWidget *table;
+	GtkWidget *label;
+	GtkWidget *clist_swin;
+	GtkWidget *clist_field;
+
+	gchar *titles[ FIELDS_N_COLS ];
+	gint i;
+
+	titles[ FIELD_COL_SELECT ] = _("S");
+	titles[ FIELD_COL_FIELD  ] = _("CSV Field");
+	titles[ FIELD_COL_ATTRIB ] = _("Attribute Name");
+
+	vbox = gtk_vbox_new(FALSE, 8);
+	gtk_container_add( GTK_CONTAINER( impcsv_dlg.notebook ), vbox );
+	gtk_container_set_border_width( GTK_CONTAINER (vbox), 4 );
+
+	label = gtk_label_new( pageLbl );
+	gtk_widget_show( label );
+	gtk_notebook_set_tab_label(
+		GTK_NOTEBOOK( impcsv_dlg.notebook ),
+		gtk_notebook_get_nth_page(GTK_NOTEBOOK( impcsv_dlg.notebook ), pageNum ),
+		label );
+
+	vboxt = gtk_vbox_new( FALSE, 4 );
+	gtk_container_add( GTK_CONTAINER( vbox ), vboxt );
+
+	clist_swin = gtk_scrolled_window_new( NULL, NULL );
+	gtk_container_add( GTK_CONTAINER(vboxt), clist_swin );
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
+				       GTK_POLICY_AUTOMATIC,
+				       GTK_POLICY_ALWAYS);
+
+	clist_field = gtk_clist_new_with_titles( FIELDS_N_COLS, titles );
+	gtk_container_add( GTK_CONTAINER(clist_swin), clist_field );
+	gtk_clist_set_selection_mode( GTK_CLIST(clist_field), GTK_SELECTION_BROWSE );
+	gtk_clist_set_column_width(
+			GTK_CLIST(clist_field), FIELD_COL_SELECT, FIELDS_COL_WIDTH_SELECT );
+	gtk_clist_set_column_width(
+			GTK_CLIST(clist_field), FIELD_COL_FIELD, FIELDS_COL_WIDTH_FIELD );
+	gtk_clist_set_column_width(
+			GTK_CLIST(clist_field), FIELD_COL_ATTRIB, FIELDS_COL_WIDTH_ATTRIB );
+	gtkut_clist_set_redraw( GTK_CLIST(clist_field) );
+
+	for( i = 0; i < FIELDS_N_COLS; i++ )
+		GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist_field)->column[i].button, GTK_CAN_FOCUS);
+
+	gtk_widget_show_all(vbox);
+
+	g_signal_connect( G_OBJECT(clist_field), "select_row",
+			  G_CALLBACK(imp_csv_field_list_selected), NULL );
+	g_signal_connect( G_OBJECT(clist_field), "button_press_event",
+			  G_CALLBACK(imp_csv_field_list_toggle), NULL );
+
+	impcsv_dlg.clist_field  = clist_field;
+}
+
+static void imp_csv_page_finish( gint pageNum, gchar *pageLbl ) {
+	GtkWidget *vbox;
+	GtkWidget *table;
+	GtkWidget *label;
+	GtkWidget *labelBook;
+	GtkWidget *labelFile;
+	GtkWidget *labelRecs;
+	gint top;
+
+	vbox = gtk_vbox_new(FALSE, 8);
+	gtk_container_add( GTK_CONTAINER( impcsv_dlg.notebook ), vbox );
+	gtk_container_set_border_width( GTK_CONTAINER (vbox), BORDER_WIDTH );
+
+	label = gtk_label_new( pageLbl );
+	gtk_widget_show( label );
+	gtk_notebook_set_tab_label(
+		GTK_NOTEBOOK( impcsv_dlg.notebook ),
+		gtk_notebook_get_nth_page( GTK_NOTEBOOK( impcsv_dlg.notebook ), pageNum ), label );
+
+	table = gtk_table_new(3, 2, FALSE);
+	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
+	gtk_container_set_border_width( GTK_CONTAINER(table), 8 );
+	gtk_table_set_row_spacings(GTK_TABLE(table), 8);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 8 );
+
+	/* First row */
+	top = 0;
+	label = gtk_label_new(_("Address Book :"));
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+
+	labelBook = gtk_label_new("");
+	gtk_table_attach(GTK_TABLE(table), labelBook, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC(labelBook), 0, 0.5);
+
+	/* Second row */
+	top++;
+	label = gtk_label_new(_("File 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), 1, 0.5);
+
+	labelFile = gtk_label_new("");
+	gtk_table_attach(GTK_TABLE(table), labelFile, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC(labelFile), 0, 0.5);
+
+	/* Third row */
+	top++;
+	label = gtk_label_new(_("Records :"));
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+
+	labelRecs = gtk_label_new("");
+	gtk_table_attach(GTK_TABLE(table), labelRecs, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
+	gtk_misc_set_alignment(GTK_MISC(labelRecs), 0, 0.5);
+
+	impcsv_dlg.labelBook    = labelBook;
+	impcsv_dlg.labelFile    = labelFile;
+	impcsv_dlg.labelRecords = labelRecs;
+}
+
+static void imp_csv_dialog_create() {
+	GtkWidget *window;
+	GtkWidget *vbox;
+	GtkWidget *vnbox;
+	GtkWidget *notebook;
+	GtkWidget *hbbox;
+	GtkWidget *btnPrev;
+	GtkWidget *btnNext;
+	GtkWidget *btnCancel;
+	GtkWidget *hsbox;
+	GtkWidget *statusbar;
+
+	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_widget_set_size_request(window, IMPORTCSV_WIDTH, IMPORTCSV_HEIGHT );
+	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
+	gtk_window_set_title( GTK_WINDOW(window), _("Import CSV file into Address Book") );
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
+	g_signal_connect(G_OBJECT(window), "delete_event",
+			 G_CALLBACK(imp_csv_delete_event), NULL);
+	g_signal_connect(G_OBJECT(window), "key_press_event",
+			 G_CALLBACK(imp_csv_key_pressed), NULL);
+
+	vbox = gtk_vbox_new(FALSE, 4);
+	gtk_widget_show(vbox);
+	gtk_container_add(GTK_CONTAINER(window), vbox);
+
+	vnbox = gtk_vbox_new(FALSE, 4);
+	gtk_container_set_border_width(GTK_CONTAINER(vnbox), 4);
+	gtk_widget_show(vnbox);
+	gtk_box_pack_start(GTK_BOX(vbox), vnbox, TRUE, TRUE, 0);
+
+	/* Notebook */
+	notebook = gtk_notebook_new();
+	gtk_notebook_set_show_tabs( GTK_NOTEBOOK(notebook), FALSE );
+	gtk_widget_show(notebook);
+	gtk_box_pack_start(GTK_BOX(vnbox), notebook, TRUE, TRUE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(notebook), 6);
+
+	/* Status line */
+	hsbox = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, 0);
+	statusbar = gtk_statusbar_new();
+	gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, 0);
+
+	/* Button panel */
+	gtkut_stock_button_set_create(&hbbox, &btnNext, _("Next"),
+				      &btnPrev, _("Prev"),
+				      &btnCancel, GTK_STOCK_CANCEL);
+	gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(hbbox), btnCancel,
+					   TRUE);
+	gtkut_box_set_reverse_order(GTK_BOX(hbbox), FALSE);
+	gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
+	gtk_widget_grab_default(btnNext);
+
+	/* Button handlers */
+	g_signal_connect(G_OBJECT(btnPrev), "clicked",
+			 G_CALLBACK(imp_csv_prev), NULL);
+	g_signal_connect(G_OBJECT(btnNext), "clicked",
+			 G_CALLBACK(imp_csv_next), NULL);
+	g_signal_connect(G_OBJECT(btnCancel), "clicked",
+			 G_CALLBACK(imp_csv_cancel), NULL);
+
+	gtk_widget_show_all(vbox);
+
+	impcsv_dlg.window     = window;
+	impcsv_dlg.notebook   = notebook;
+	impcsv_dlg.btnPrev    = btnPrev;
+	impcsv_dlg.btnNext    = btnNext;
+	impcsv_dlg.btnCancel  = btnCancel;
+	impcsv_dlg.statusbar  = statusbar;
+	impcsv_dlg.status_cid = gtk_statusbar_get_context_id(
+			GTK_STATUSBAR(statusbar), "Import CSV Dialog" );
+
+}
+
+static void imp_csv_create() {
+	imp_csv_dialog_create();
+	imp_csv_page_file( PAGE_FILE_INFO, _( "File Info" ) );
+	imp_csv_page_fields( PAGE_ATTRIBUTES, _( "Fields" ) );
+	imp_csv_page_finish( PAGE_FINISH, _( "Finish" ) );
+	gtk_widget_show_all( impcsv_dlg.window );
+}
+
+AddressBookFile *addressbook_imp_csv( AddressIndex *addrIndex ) {
+	_importedBook_ = NULL;
+	_imp_addressIndex_ = addrIndex;
+
+	if( ! impcsv_dlg.window )
+		imp_csv_create();
+	impcsv_dlg.cancelled = FALSE;
+	gtk_widget_show(impcsv_dlg.window);
+	manage_window_set_transient(GTK_WINDOW(impcsv_dlg.window));
+	gtk_widget_grab_default(impcsv_dlg.btnNext);
+
+	gtk_entry_set_text( GTK_ENTRY(impcsv_dlg.name_entry), IMPORTCSV_GUESS_NAME );
+	gtk_entry_set_text( GTK_ENTRY(impcsv_dlg.file_entry), "" );
+	gtk_clist_clear( GTK_CLIST(impcsv_dlg.clist_field) );
+	gtk_notebook_set_current_page( GTK_NOTEBOOK(impcsv_dlg.notebook), PAGE_FILE_INFO );
+	gtk_widget_set_sensitive( impcsv_dlg.btnPrev, FALSE );
+	gtk_widget_set_sensitive( impcsv_dlg.btnNext, TRUE );
+	gtk_button_set_label( GTK_BUTTON(impcsv_dlg.btnCancel), GTK_STOCK_CANCEL );
+	stock_pixmap_gdk( impcsv_dlg.window, STOCK_PIXMAP_MARK,
+			  &markxpm, &markxpmmask );
+	imp_csv_message();
+	gtk_widget_grab_focus(impcsv_dlg.file_entry);
+
+	impcsv_dlg.rowIndSelect = -1;
+	impcsv_dlg.rowCount = 0;
+	g_free( impcsv_dlg.nameBook );
+	g_free( impcsv_dlg.fileName );
+	impcsv_dlg.nameBook = NULL;
+	impcsv_dlg.fileName = NULL;
+	importCount = 0;
+
+	gtk_main();
+	gtk_widget_hide(impcsv_dlg.window);
+	_imp_addressIndex_ = NULL;
+
+	g_free( impcsv_dlg.nameBook );
+	g_free( impcsv_dlg.fileName );
+	impcsv_dlg.nameBook = NULL;
+	impcsv_dlg.fileName = NULL;
+
+	if( impcsv_dlg.cancelled == TRUE ) return NULL;
+	return _importedBook_;
+}
+
+/*
+* End of Source.
+*/
+
diff --git a/src/importcsv.h b/src/importcsv.h
new file mode 100644
index 00000000..01047a59
--- /dev/null
+++ b/src/importcsv.h
@@ -0,0 +1,34 @@
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2007 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+/*
+ * Import CSV text data.
+ */
+
+#ifndef __IMPORT_CSV_H__
+#define __IMPORT_CSV_H__
+
+/* Function prototypes */
+AddressBookFile *addressbook_imp_csv( AddressIndex *addrIndex );
+
+#endif /* __IMPORT_CSV_H__ */
+
+/*
+* End of Source.
+*/