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

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 23 00:34:39 2005
New Revision: 4196

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_screen.cc
Log:
Hook the menu up to the right part of the examiner.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep 23 00:34:39 2005
@@ -1,5 +1,10 @@
 2005-09-22  Daniel Burrows  <dburrows at debian.org>
 
+	* src/solution_screen.cc:
+
+	  D'oh, connect up the bindings to the examiner, not the info
+	  tree.
+
 	* src/menu_tree.cc, src/menu_tree.h:
 
 	  Implement the resolver commands.  This exposed some real

Modified: branches/aptitude-0.3/aptitude/src/solution_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_screen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_screen.cc	Fri Sep 23 00:34:39 2005
@@ -303,8 +303,8 @@
 {
   aptitude_solution last_sol;
 
-  vs_tree_ref solution_tree;
-  vs_tree_ref story_tree;
+  menu_tree_ref solution_tree;
+  menu_tree_ref story_tree;
 
   sigc::slot1<void, fragment *> set_short_description;
   sigc::slot1<void, aptitude_resolver_dep> set_active_dep;
@@ -368,7 +368,7 @@
   solution_examiner(const sigc::slot1<void, fragment *> &_set_short_description,
 		    const sigc::slot1<void, aptitude_resolver_dep> &_set_active_dep)
     : vs_multiplex(false),
-      solution_tree(vs_tree::create()), story_tree(vs_tree::create()),
+      solution_tree(menu_tree::create()), story_tree(menu_tree::create()),
       set_short_description(_set_short_description),
       set_active_dep(_set_active_dep)
   {
@@ -402,6 +402,12 @@
     return true;
   }
 public:
+  void connect_menu_signals(const vs_widget_ref &valve)
+  {
+    create_menu_bindings(story_tree.unsafe_get_ref(), valve);
+    create_menu_bindings(solution_tree.unsafe_get_ref(), valve);
+  }
+
   static ref_ptr<solution_examiner> create(const sigc::slot1<void, fragment *> &set_short_description,
 					   const sigc::slot1<void, aptitude_resolver_dep> &set_active_dep)
   {
@@ -511,9 +517,7 @@
   vs_table_ref rval     = vs_table::create();
 
   vs_label_ref l        = vs_label::create(L"");
-  menu_tree_ref info_tree = menu_tree::create();
-
-  create_menu_bindings(info_tree.unsafe_get_ref(), rval);
+  vs_tree_ref info_tree = vs_tree::create();
 
   solution_examiner_ref examiner
     = solution_examiner::create(sigc::mem_fun(l.unsafe_get_ref(),
@@ -522,6 +526,8 @@
 					   info_tree.unsafe_get_ref()));
 
 
+  examiner->connect_menu_signals(rval);
+
 
   info_tree->connect_key("ShowHideDescription", &global_bindings,
 			 sigc::mem_fun(info_tree.unsafe_get_ref(),