X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=158f2ed1f586552732c81ff3186b656d79ace4ed;hb=ea5caf0b6ea903f82d448f90cf5005f2a68cfaab;hp=9ef3ee6ac3b850119db2b9435f1072276286fb16;hpb=9c91aba7c7f7e47ec1a90b58d7f238c6b043dac1;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 9ef3ee6..158f2ed 100644
--- a/ui.c
+++ b/ui.c
@@ -139,7 +139,7 @@ ui_init_curses()
 		ui_enable_mouse(TRUE);
 	}
 	keypad(stdscr, TRUE);
-	if(opt_get_bool(BOOL_USE_COLORS)) {
+	if(opt_get_bool(BOOL_USE_COLORS) && has_colors()) {
 		start_color();
 		use_default_colors();
 		ui_init_color_pairs_user();
@@ -577,7 +577,9 @@ get_commands()
 			case KEY_DC:
 			case 'd':
 			case 'r': ui_remove_items();	break;
+			case 'M': ui_merge_items();	break;
 			case 'D': duplicate_item();	break;
+			case 'U': ui_remove_duplicates(); break;
 			case 12: refresh_screen();	break;
 
 			case 'k':
@@ -608,6 +610,7 @@ get_commands()
 			case 'F': sort_by_field(NULL);	break;
 
 			case '/': ui_find(0);		break;
+			case 'n':
 			case '\\': ui_find(1);		break;
 
 			case ' ': if(list_get_curitem() >= 0) {
@@ -657,6 +660,25 @@ ui_remove_items()
 	refresh_list();
 }
 
+void
+ui_merge_items()
+{
+	if(statusline_ask_boolean(_("Merge selected items"), TRUE))
+		merge_selected_items();
+
+	clear_statusline();
+	refresh_list();
+}
+
+void		ui_remove_duplicates()
+{
+	if(statusline_ask_boolean(_("Remove duplicates"), TRUE))
+		remove_duplicates();
+	
+	clear_statusline();
+	refresh_list();
+}
+
 void
 ui_clear_database()
 {