X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=ui.c;h=aa49d48d5e23b6f92d002a91dc7ee267315dd09e;hb=d041671666ce466d37068a937cab7245a5952687;hp=a7d1a5428322aa11503a484486f8c3685af7aecc;hpb=4128f78f5543bebc7cd1868736855207019f1f71;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index a7d1a54..aa49d48 100644
--- a/ui.c
+++ b/ui.c
@@ -59,7 +59,6 @@ bool can_resize = FALSE;
 WINDOW *top = NULL, *bottom = NULL;
 
 
-
 static void
 init_windows()
 {
@@ -384,7 +383,8 @@ get_commands()
 		can_resize = FALSE; /* it's not safe to resize anymore */
 		switch( ch ) {
 			case 'q': return;
-			case 'Q': print_stderr(selected_items() ?
+			case 'Q': quit_abook(QUIT_DONTSAVE);	break;
+			case 'P': print_stderr(selected_items() ?
 						  -1 : list_current_item());
 				  return;
 			case '?':
@@ -396,6 +396,7 @@ get_commands()
 			case KEY_DC:
 			case 'd':
 			case 'r': ui_remove_items();	break;
+			case 'D': duplicate_item();	break;
 			case 12: refresh_screen();	break;
 
 			case 'k':
@@ -421,8 +422,9 @@ get_commands()
 
 			case 'o': ui_open_datafile();	break;
 
-			case 's': sort_database();	break;
+			case 's': sort_by_field(NAME);	break;
 			case 'S': sort_surname();	break;
+			case 'F': sort_by_field(-1);	break;
 
 			case '/': ui_find(0);		break;
 			case '\\': ui_find(1);		break;
@@ -487,10 +489,12 @@ ui_clear_database()
 void
 ui_find(int next)
 {
-	int item;
+	int item = -1;
 	static char findstr[MAX_FIELD_LEN];
 	int search_fields[] = {NAME, EMAIL, NICK, -1};
 
+	clear_statusline();
+
 	if(next) {
 		if( !*findstr )
 			return;
@@ -502,12 +506,15 @@ ui_find(int next)
 		refresh_screen();
 	}
 
-	if( (item = find_item(findstr, curitem + !!next,
-					search_fields )) >= 0 ) {
+	if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0)
+		if((item = find_item(findstr, 0, search_fields)) >= 0)
+			statusline_addstr(
+				"Search hit bottom, continuing at top");
+
+	if(item >= 0) {
 		curitem = item;
 		refresh_list();
 	}
-
 }
 
 
@@ -538,7 +545,7 @@ void
 ui_print_database()
 {
 	FILE *handle;
-	char *command = options_get_str("print_command");
+	char *command = opt_get_str(STR_PRINT_COMMAND);
 	int mode;
 
 	if( list_is_empty() )
@@ -586,7 +593,7 @@ ui_open_datafile()
 		return;
 	}
 
-	if( options_get_int("autosave") )
+	if( opt_get_bool(BOOL_AUTOSAVE) )
 		save_database();
 	else if(statusline_ask_boolean("Save current database", FALSE))
 		save_database();