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

[Daniel Burrows]

Author: dburrows
Date: Thu Jul  7 15:43:18 2005
New Revision: 3634

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_util.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h
Log:
Add support for easily binding the ReSearch command for standard file viewers.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Jul  7 15:43:18 2005
@@ -1,5 +1,10 @@
 2005-07-07  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
+
+	  Also add support for binding up a callback for the 'ReSearch'
+	  keystroke.
+
 	* src/reason_fragment.cc:
 
 	  Remove a no longer necessary %S escape.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_util.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_util.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_util.cc	Thu Jul  7 15:43:18 2005
@@ -241,7 +241,8 @@
 
 vscreen_widget *vs_dialog_fileview(string fn,
 				   slot0arg okslot,
-				   slotarg<sigc::slot1<void, vs_pager *> > searchslot,
+				   slotarg<sigc::slot1<void, vs_pager *> > search_slot,
+				   slotarg<sigc::slot1<void, vs_pager *> > repeat_search_slot,
 				   const style &st,
 				   const char *encoding)
 {
@@ -262,18 +263,22 @@
   p->do_line_signal();
   scrollbar->scrollbar_interaction.connect(sigc::mem_fun(*p, &vs_pager::scroll_page));
 
-  if(searchslot)
-    p->connect_key("Search", &global_bindings, sigc::bind(*searchslot, p));
+  if(search_slot)
+    p->connect_key("Search", &global_bindings, sigc::bind(*search_slot, p));
+
+  if(repeat_search_slot)
+    p->connect_key("ReSearch", &global_bindings, sigc::bind(*repeat_search_slot, p));
 
   return vs_dialog_ok(t, okslot, transcode(_("Ok")), st);
 }
 
 vscreen_widget *vs_dialog_fileview(string fn,
 				   slot0arg okslot,
-				   slotarg<sigc::slot1<void, vs_pager *> > searchslot,
+				   slotarg<sigc::slot1<void, vs_pager *> > search_slot,
+				   slotarg<sigc::slot1<void, vs_pager *> > repeat_search_slot,
 				   const char *encoding)
 {
-  return vs_dialog_fileview(fn, okslot, searchslot,
+  return vs_dialog_fileview(fn, okslot, search_slot, repeat_search_slot,
 			    style_attrs_flip(A_REVERSE),
 			    encoding);
 }

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_util.h	Thu Jul  7 15:43:18 2005
@@ -109,14 +109,15 @@
 				const style &st,
 				bool deflt=true);
 
-// The "searchslot" is called when a search is being conducted.
 vscreen_widget *vs_dialog_fileview(std::string fn,
 				   slot0arg okslot=NULL,
-				   slotarg<sigc::slot1<void, vs_pager *> > searchslot=NULL,
+				   slotarg<sigc::slot1<void, vs_pager *> > search_slot=NULL,
+				   slotarg<sigc::slot1<void, vs_pager *> > repeat_search_slot=NULL,
 				   const char *encoding=NULL);
 vscreen_widget *vs_dialog_fileview(std::string fn,
 				   slot0arg okslot,
-				   slotarg<sigc::slot1<void, vs_pager *> > searchslot,
+				   slotarg<sigc::slot1<void, vs_pager *> > search_slot,
+				   slotarg<sigc::slot1<void, vs_pager *> > repeat_search_slot,
 				   const style &st,
 				   const char *encoding=NULL);