X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=ui.c;h=3d7e01a8f7469ae640e014509808b1802a371167;hb=24be624311cedd42ed09acfc605cdf51546bb5ab;hp=b15d8ba1f756d0e59d03baa2ff94f754e187ad8b;hpb=f23af6b90ad6dbe1180c0e660112739be70fd86a;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index b15d8ba..3d7e01a 100644
--- a/ui.c
+++ b/ui.c
@@ -59,7 +59,6 @@ bool can_resize = FALSE;
 WINDOW *top = NULL, *bottom = NULL;
 
 
-
 static void
 init_windows()
 {
@@ -239,7 +238,7 @@ statusline_addstr(char *str)
 }
 
 char *
-ui_readline(char *prompt, char *s, int limit, int use_completion)
+ui_readline(char *prompt, char *s, int limit, bool use_completion)
 {
 	int y, x;
 	char *ret;
@@ -250,9 +249,6 @@ ui_readline(char *prompt, char *s, int limit, int use_completion)
 
 	ret = abook_readline(bottom, y, x, s, limit, use_completion);
 
-	if(ret && !*ret)
-		my_free(ret);
-
 	if(ret)
 		strtrim(ret);
 
@@ -387,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 '?':
@@ -399,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':
@@ -424,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;
@@ -541,7 +540,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() )
@@ -589,7 +588,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();