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

[Daniel Burrows]

Author: dburrows
Date: Thu Jul  7 15:47:31 2005
New Revision: 3635

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/mine/cmine.cc
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Use the new support to allow repeated searches in internal pagers.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Jul  7 15:47:31 2005
@@ -1,5 +1,10 @@
 2005-07-07  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmine.cc, src/ui.cc:
+
+	  Use the new support to add search repetition capabilities to all
+	  dialogs. (Closes: #270699)
+
 	* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
 
 	  Also add support for binding up a callback for the 'ReSearch'

Modified: branches/aptitude-0.3/aptitude/src/mine/cmine.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/mine/cmine.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/mine/cmine.cc	Thu Jul  7 15:47:31 2005
@@ -636,7 +636,7 @@
 	  encoding="UTF-8";
 	}
 
-      vscreen_widget *w=vs_dialog_fileview(buf, NULL, NULL, encoding);
+      vscreen_widget *w=vs_dialog_fileview(buf, NULL, NULL, NULL, encoding);
       w->show_all();
 
       popup_widget(w);

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Thu Jul  7 15:47:31 2005
@@ -192,6 +192,12 @@
 		NULL);
 }
 
+// similar
+static void pager_repeat_search(vs_pager *p)
+{
+  p->search_for(L"");
+}
+
 static vscreen_widget *make_error_dialog(vs_text_layout *layout)
 {
   vs_table *t=new vs_table;
@@ -665,7 +671,9 @@
 static void do_help_license()
 {
   vscreen_widget *w=vs_dialog_fileview(HELPDIR "/COPYING",
-				       NULL, arg(sigc::ptr_fun(pager_search)));
+				       NULL,
+				       arg(sigc::ptr_fun(pager_search)),
+				       arg(sigc::ptr_fun(pager_repeat_search)));
   w->show_all();
 
   popup_widget(w);
@@ -686,7 +694,9 @@
       encoding="UTF-8";
     }
 
-  vscreen_widget *w=vs_dialog_fileview(buf, NULL, arg(sigc::ptr_fun(pager_search)));
+  vscreen_widget *w=vs_dialog_fileview(buf, NULL,
+				       arg(sigc::ptr_fun(pager_search)),
+				       arg(sigc::ptr_fun(pager_repeat_search)));
   w->show_all();
 
   popup_widget(w);
@@ -707,7 +717,9 @@
       encoding="UTF-8";
     }
 
-  vscreen_widget *w=vs_dialog_fileview(buf, NULL, arg(sigc::ptr_fun(pager_search)),
+  vscreen_widget *w=vs_dialog_fileview(buf, NULL,
+				       arg(sigc::ptr_fun(pager_search)),
+				       arg(sigc::ptr_fun(pager_repeat_search)),
 				       encoding);
   w->show_all();
   popup_widget(w);
@@ -715,7 +727,9 @@
 
 static void do_help_faq()
 {
-  vscreen_widget *w=vs_dialog_fileview(HELPDIR "/FAQ", NULL, arg(sigc::ptr_fun(pager_search)));
+  vscreen_widget *w=vs_dialog_fileview(HELPDIR "/FAQ", NULL,
+				       arg(sigc::ptr_fun(pager_search)),
+				       arg(sigc::ptr_fun(pager_repeat_search)));
   w->show_all();
 
   popup_widget(w);
@@ -724,7 +738,9 @@
 // news isn't translated since it's just a changelog.
 static void do_help_news()
 {
-  vscreen_widget *w=vs_dialog_fileview(HELPDIR "/NEWS", NULL, arg(sigc::ptr_fun(pager_search)));
+  vscreen_widget *w=vs_dialog_fileview(HELPDIR "/NEWS", NULL,
+				       arg(sigc::ptr_fun(pager_search)),
+				       arg(sigc::ptr_fun(pager_repeat_search)));
   w->show_all();
 
   popup_widget(w);