diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-04-10 10:06:59 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-04-10 10:06:59 +0000 |
commit | af08d8ea61bc7883236796625f98b6730ccef18a (patch) | |
tree | 3eda79a60632fddc2961c57b23f5b3b37df4da99 | |
parent | 90bb780649c2a5ecee7c579ae976eaba84f50969 (diff) |
added Remarks field and fixed reorder of the last row in CSV import.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1609 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ChangeLog.ja | 4 | ||||
-rw-r--r-- | src/importcsv.c | 11 |
3 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,9 @@ 2007-04-10 + * src/importcsv.c: added Remarks field. Fixed reorder of the last row. + +2007-04-10 + * src/importcsv.c: implemented enable/disable of fields. 2007-04-10 diff --git a/ChangeLog.ja b/ChangeLog.ja index ab7f111e..0f53b8b6 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,9 @@ 2007-04-10 + * src/importcsv.c: 備考フィールドを追加。最後の行の順序変更を修正。 + +2007-04-10 + * src/importcsv.c: フィールドの有効/無効を実装。 2007-04-10 diff --git a/src/importcsv.c b/src/importcsv.c index f2fa6b55..e7215ae9 100644 --- a/src/importcsv.c +++ b/src/importcsv.c @@ -107,6 +107,7 @@ typedef enum { ATTR_DISPLAY_NAME, ATTR_NICK_NAME, ATTR_EMAIL_ADDRESS, + ATTR_REMARKS, N_CSV_ATTRIB } ImpCSVAttribIndex; @@ -121,7 +122,8 @@ static struct _ImpCSVAttrib { {N_("Last Name"), NULL, 1, TRUE}, {N_("Display Name"), NULL, 2, TRUE}, {N_("Nick Name"), NULL, 3, TRUE}, - {N_("E-Mail Address"), NULL, 4, TRUE} + {N_("E-Mail Address"), NULL, 4, TRUE}, + {N_("Remarks"), NULL, 5, TRUE} }; static AddressBookFile *_importedBook_; @@ -270,7 +272,7 @@ static void imp_csv_field_list_up( GtkWidget *button, gpointer data ) { if (!clist->selection) return; row = GPOINTER_TO_INT( clist->selection->data ); - if (row > 0 && row < clist->rows - 1 ) { + if ( row > 0 && row < clist->rows ) { gtk_clist_freeze( clist ); src_attr = gtk_clist_get_row_data( clist, row ); @@ -308,7 +310,7 @@ static void imp_csv_field_list_down( GtkWidget *button, gpointer data ) { if (!clist->selection) return; row = GPOINTER_TO_INT( clist->selection->data ); - if (row >= 0 && row < clist->rows - 2 ) { + if ( row >= 0 && row < clist->rows - 1 ) { gtk_clist_freeze( clist ); src_attr = gtk_clist_get_row_data( clist, row ); @@ -346,6 +348,7 @@ static gint imp_csv_import_data( gchar *csvFile, AddressCache *cache ) { gchar *fullName = NULL; gchar *nickName = NULL; gchar *address = NULL; + gchar *remarks = NULL; ItemPerson *person; ItemEMail *email; gint count = 0; @@ -390,6 +393,7 @@ static gint imp_csv_import_data( gchar *csvFile, AddressCache *cache ) { fullName = imp_csv_attrib[ATTR_DISPLAY_NAME].value; nickName = imp_csv_attrib[ATTR_NICK_NAME].value; address = imp_csv_attrib[ATTR_EMAIL_ADDRESS].value; + remarks = imp_csv_attrib[ATTR_REMARKS].value; if (!fullName && !firstName && !lastName && address) fullName = address; @@ -405,6 +409,7 @@ static gint imp_csv_import_data( gchar *csvFile, AddressCache *cache ) { if (address) { email = addritem_create_item_email(); addritem_email_set_address( email, address ); + addritem_email_set_remarks( email, remarks ); addrcache_id_email( cache, email ); addrcache_person_add_email( cache, person, email ); } |