X-Git-Url: https://git.deb.at/w?p=pkg%2Fabook.git;a=blobdiff_plain;f=ui.c;h=e8798858270654eeccb9daa5a6dbee2e0b1479e9;hp=170583e096f8df917e5df1f336ff6c8418432b82;hb=HEAD;hpb=07db33653908d7145bd15c102d1c752ff153cad5

diff --git a/ui.c b/ui.c
index 170583e..e879885 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();
@@ -556,9 +556,9 @@ get_commands()
 						refresh_list();
 					}
 				} else if(event.bstate & BUTTON4_PRESSED) {
-					scroll_up();
+					scroll_list_up();
 				} else if(event.bstate & BUTTON5_PRESSED) {
-					scroll_down();
+					scroll_list_down();
 				}
 			}
 		}
@@ -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':
@@ -651,13 +653,32 @@ ui_remove_items()
 	if(list_is_empty())
 		return;
 
-	if(statusline_ask_boolean(_("Remove selected item(s)"), TRUE))
+	if(statusline_ask_boolean(_("Remove selected item(s)"), FALSE))
 		remove_selected_items();
 
 	clear_statusline();
 	refresh_list();
 }
 
+void
+ui_merge_items()
+{
+	if(statusline_ask_boolean(_("Merge selected items"), FALSE))
+		merge_selected_items();
+
+	clear_statusline();
+	refresh_list();
+}
+
+void		ui_remove_duplicates()
+{
+	if(statusline_ask_boolean(_("Remove duplicates"), FALSE))
+		remove_duplicates();
+	
+	clear_statusline();
+	refresh_list();
+}
+
 void
 ui_clear_database()
 {