/*
* $Id$
*
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
*
* Copyright (C) Jaakko Heinonen
*/
{
char *header;
char email[MAX_EMAIL_LEN];
- int i, x, len;
if( (header = (char *)malloc(EDITW_COLS)) == NULL )
return;
if( *database[item][EMAIL] )
snprintf(header, EDITW_COLS, "%s <%s>",
database[item][NAME],
- database[item][EMAIL]);
+ email);
else
snprintf(header, EDITW_COLS, "%s", database[item][NAME]);
- len = strlen(header);
- x = (EDITW_COLS - len) / 2;
- mvwaddstr(editw, 0, x, header);
- for(i = x; i < x + len; i++)
- mvwaddch(editw,1, i, '^');
+ mvwaddstr(editw, 0, (EDITW_COLS - strlen(header)) / 2,
+ header);
+
free(header);
}
static void
editor_print_data(int tab, int item)
{
- const int pos_x = EDITW_COLS > 70 ? 8:4;
- const int start_y = 4;
int i, j;
+ int y, x;
for(i = 0, j = 1; i < ITEM_FIELDS; i++) {
if(abook_fields[i].tab != tab)
int k;
char emails[MAX_EMAILS][MAX_EMAIL_LEN];
split_emailstr(item, emails);
- mvwaddstr(editw, 6, pos_x, "E-mail addresses:");
- for(k=0; k < MAX_EMAILS; k++)
- mvwprintw(editw, 7 + k, pos_x,
- "%c -\t\t%s", '2' + k, emails[k] );
+ getyx(editw, y, x);
+ mvwaddstr(editw, y+1, FIELDS_START_X,
+ "E-mail addresses:");
+ for(k = 0; k < MAX_EMAILS; k++) {
+ getyx(editw, y, x);
+ mvwprintw(editw, y+1, FIELDS_START_X,
+ "%c -", '2' + k);
+ mvwprintw(editw, y +1, TAB_COLON_POS,
+ ": %s", emails[k]);
+ }
continue;
}
- mvwprintw(editw, start_y + j, pos_x, "%d - %s",
+ if(j > 1) {
+ getyx(editw, y, x); y++;
+ } else
+ y = FIELDS_START_Y;
+
+ mvwprintw(editw, y, FIELDS_START_X, "%d - %s",
j,
abook_fields[i].name);
- mvwaddch(editw, start_y + j, 28, ':');
- mvwaddstr(editw, start_y + j, 30, safe_str(database[item][i]));
+ mvwaddch(editw, y, TAB_COLON_POS, ':');
+ mvwaddstr(editw, y, TAB_COLON_POS + 2,
+ safe_str(database[item][i]));
j++;
}
edit_emails(char c, int item)
{
char *field = NULL;
- char emails[4][MAX_EMAIL_LEN];
+ char emails[MAX_EMAILS][MAX_EMAIL_LEN];
char tmp[MAX_EMAILSTR_LEN] = "";
int i, len;
my_free(database[item][EMAIL]);
- for(i=0; i<4; i++) {
+ for(i = 0; i < MAX_EMAILS; i++) {
if( *emails[i] ) {
strcat(tmp, emails[i]);
strcat(tmp, ",");
int n = c - '1' + 1;
char *str;
- if(n < 1 || n > 6)
+ if(n < 1 || n > MAX_TAB_FIELDS)
return 0;
edit_undo(item, BACKUP_ITEM);
free_list_item(backup[0]);
my_free(backup);
}
- backup = abook_malloc(sizeof(list_item));
+ backup = (list_item *)abook_malloc(sizeof(list_item));
for(i = 0; i < ITEM_FIELDS; i++)
backup[0][i] = safe_strdup(database[item][i]);
break;