[Aptitude-devel] r3085 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Tue Apr 26 00:26:37 2005
New Revision: 3085

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Hook stuff up so an examination dialog appears.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Apr 26 00:26:37 2005
@@ -1,5 +1,9 @@
 2005-04-25  Daniel Burrows  <dburrows@debian.org>
 
+	* src/ui.cc:
+
+	  Pop up an examination dialog when the user presses 'e'.
+
 	* src/broken_indicator.cc, src/solution_dialog.cc, src/solution_dialog.h:
 
 	  Add a start on a dynamically updating solution dialog.  The

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	Tue Apr 26 00:26:37 2005
@@ -49,6 +49,7 @@
 #include "load_config.h"
 #include "load_grouppolicy.h"
 #include "load_pkgview.h"
+#include "solution_dialog.h"
 #include "solution_fragment.h"
 
 #include <vscreen/curses++.h>
@@ -1229,27 +1230,7 @@
 
 static void do_examine_solution()
 {
-  if(!apt_cache_file || !(*apt_cache_file)->resolver_exists())
-    return;
-  else
-    try
-      {
-	show_message(attr_fragment(solution_fragment((*apt_cache_file)->get_current_solution()),
-				   get_color("DefaultWidgetBackground")|A_REVERSE),
-		     NULL);
-      }
-    catch(NoMoreSolutions)
-      {
-	show_message(_("No solutions found."),
-		     NULL,
-		     get_color("Error"));
-      }
-    catch(NoMoreTime)
-      {
-	show_message(_("No solutions found before the time limit was exceeded."),
-		     NULL,
-		     get_color("Error"));
-      }
+  popup_widget(make_solution_dialog(), true);
 }
 
 // NOTE ON TRANSLATIONS!