X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=d490fc3b61c56019a41c398a9ed2710095f7ff74;hb=ea5b79b21b3e6b5d009dca4afcab7f3ed9cabdd5;hp=3286d21b4402a7b52a1b0482ee5c7b44b337bd78;hpb=3212da92838c056bcc1cafa57beaf26086e2ac96;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 3286d21..d490fc3 100644
--- a/ui.c
+++ b/ui.c
@@ -13,6 +13,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <ctype.h>
 #include "abook.h"
 #include "ui.h"
 #include "edit.h"
@@ -36,13 +37,6 @@
 #	include <sys/ioctl.h>
 #endif
 
-#ifdef USE_ASCII_ONLY
-#	define UI_HLINE_CHAR		'-'
-#else
-#	define UI_HLINE_CHAR		ACS_HLINE
-#endif
-
-
 /*
  * external variables
  */
@@ -278,6 +272,34 @@ statusline_getnstr(char *str, int n, int use_filesel)
 	return buf;
 }
 
+int
+statusline_ask_boolean(char *msg, int def)
+{
+	int ret;
+	char *msg2 = strconcat(msg,  def ? " (Y/n)?" : " (y/N)?", NULL);
+			
+	statusline_addstr(msg2);
+
+	free(msg2);
+
+	switch( tolower(getch()) ) {
+		case 'n':
+			ret = FALSE;
+			break;
+		case 'y':
+			ret = TRUE;
+			break;
+		default:
+			ret = def;
+			break;
+	}
+
+	clear_statusline();
+
+	return ret;
+}
+
+
 void
 refresh_statusline()
 {
@@ -443,11 +465,15 @@ get_commands()
 			case 'Z': move_curitem(MOVE_ITEM_DOWN);
 				break;
 
-			case 'm': launch_mutt(); break;
+			case 'm': launch_mutt(list_current_item());
+				  refresh_screen();
+				  break;
 
 			case 'p': ui_print_database(); break;
 
-			case 'u': launch_lynx(); break;
+			case 'u': launch_wwwbrowser(list_current_item());
+				  refresh_screen();
+				  break;
 		}
 	}
 }
@@ -456,20 +482,11 @@ get_commands()
 void
 ui_remove_items()
 {
-	if( items < 1 || curitem < 0 )
+	if(list_is_empty())
 		return;
 
-	statusline_addstr("Remove selected item(s) (Y/n)");
-	switch( getch() ) {
-		case '\r':
-		case 'y':
-		case 'Y': break;
-		default:
-			  clear_statusline();
-			  return;
-	}
-
-	remove_selected_items();
+	if(statusline_ask_boolean("Remove selected item(s)", TRUE))
+		remove_selected_items();
 
 	clear_statusline();	
 	refresh_list();
@@ -478,19 +495,10 @@ ui_remove_items()
 void
 ui_clear_database()
 {
-
-	statusline_addstr("Clear WHOLE database (y/N)");
-	switch( getch() ) {
-		case 'y':
-		case 'Y': break;
-		default:
-			clear_statusline();
-			return;
+	if(statusline_ask_boolean("Clear WHOLE database", FALSE)) {
+		close_database();
+		refresh_list();
 	}
-
-	close_database();
-
-	refresh_screen();
 }
 
 void
@@ -498,6 +506,7 @@ ui_find(int next)
 {
 	int item;
 	static char findstr[81];
+	int search_fields[] = {NAME, EMAIL, NICK, -1};
 
 	if(next) {
 		if( !*findstr )
@@ -509,7 +518,8 @@ ui_find(int next)
 		clear_statusline();
 	}
 
-	if( (item = find_item(findstr, next ? curitem+1 : curitem)) >= 0 ) {
+	if( (item = find_item(findstr, next ? curitem+1 : curitem,
+					search_fields )) >= 0 ) {
 		curitem = item;
 		refresh_list();
 	}
@@ -530,16 +540,10 @@ ui_print_number_of_items()
 void
 ui_read_database()
 {
-	if(items > 0) {
-		statusline_addstr("Your current data will be lost - Press 'y' to continue");
-		switch( getch() ) {
-			case 'y':
-			case 'Y': break;
-			default: clear_statusline();
-				 return;
-		}
-		clear_statusline();
-	}
+	if(items > 0)
+		if(!statusline_ask_boolean("Your current data will be lost - "
+				"Press 'y' to continue", FALSE))
+			return;
 
 	load_database(datafile);
 	refresh_list();
@@ -551,20 +555,35 @@ ui_print_database()
 {
 	FILE *handle;
 	char *command = options_get_str("print_command");
+	int mode;
 
-	statusline_addstr("Print addressbook? (y/N)");
-	switch( getch() ) {
-		case 'y':
-		case 'Y':
+	if( list_is_empty() )
+		return;
+
+	statusline_addstr("Print All/Selected/Cancel (a/s/C)?");
+
+	switch( tolower(getch()) ) {
+		case 'a':
+			mode = ENUM_ALL;
+			break;
+		case 's':
+			if( !selected_items() ) {
+				statusline_msg("No selected items");
+				return;
+			}
+			mode = ENUM_SELECTED;
 			break;
-		default: clear_statusline(); return;
+		default:
+			clear_statusline();
+			return;
 	}
+
 	clear_statusline();
 
 	if( ! *command || (handle = popen(command, "w")) == NULL)
 		return;
 
-	fexport("text", handle);
+	fexport("text", handle, mode);
 	
 	pclose(handle);
 }
@@ -584,15 +603,8 @@ ui_open_datafile()
 
 	if( options_get_int("autosave") )
 		save_database();
-	else {
-		statusline_addstr("Save current database (y/N)");
-		switch( getch() ) {
-			case 'y':
-			case 'Y':
-				save_database();
-			default: break;
-		}
-	}
+	else if(statusline_ask_boolean("Save current database", FALSE))
+		save_database();
 
 	close_database();