[Aptitude-svn-commit] r4367 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 30 16:14:09 2005
New Revision: 4367

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/menu_text_layout.cc
   branches/aptitude-0.3/aptitude/src/menu_text_layout.h
Log:
Make the search keystrokes active in menu_text_layout.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep 30 16:14:09 2005
@@ -1,5 +1,10 @@
 2005-09-30  Daniel Burrows  <dburrows at debian.org>
 
+	* src/menu_text_layout.cc, src/menu_text_layout.h:
+
+	  Make the search keystrokes active in the menu_text_layout
+	  widget.
+
 	* src/view_changelog.cc:
 
 	  Use a menu_text_layout instead of a vs_text_layout to display

Modified: branches/aptitude-0.3/aptitude/src/menu_text_layout.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/menu_text_layout.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/menu_text_layout.cc	Fri Sep 30 16:14:09 2005
@@ -24,6 +24,8 @@
 
 #include <generic/util/slotarg.h>
 
+#include <vscreen/config/keybindings.h>
+
 bool menu_text_layout::find_search_enabled()
 {
   return true;
@@ -102,3 +104,17 @@
 
   return true;
 }
+
+bool menu_text_layout::handle_key(const key &k)
+{
+  if(global_bindings.key_matches(k, "Search"))
+    find_search();
+  else if(global_bindings.key_matches(k, "SearchBack"))
+    find_search_back();
+  else if(global_bindings.key_matches(k, "ReSearch"))
+    find_research();
+  else
+    return vs_text_layout::handle_key(k);
+
+  return true;
+}

Modified: branches/aptitude-0.3/aptitude/src/menu_text_layout.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/menu_text_layout.h	(original)
+++ branches/aptitude-0.3/aptitude/src/menu_text_layout.h	Fri Sep 30 16:14:09 2005
@@ -69,6 +69,8 @@
     return rval;
   }
 
+  bool handle_key(const key &k);
+
   bool find_search_enabled();
   bool find_search();
   bool find_search_back_enabled();