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

[Daniel Burrows]

Author: dburrows
Date: Tue Apr 26 01:38:30 2005
New Revision: 3091

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/solution_dialog.cc
Log:
Adjust the coloring of the solution dialog, but not in a very satisfactory way..blah..

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Apr 26 01:38:30 2005
@@ -1,5 +1,11 @@
 2005-04-25  Daniel Burrows  <dburrows@debian.org>
 
+	* src/solution_dialog.cc:
+
+	  Disable reverse-video for now, till I get proper support for
+	  cascading video attributes (otherwise I lose the bold attribute
+	  on the headers of the various sections, if that makes sense..)
+
 	* src/vscreen/fragment.cc:
 
 	  Make the max-width calculation more obviously correct.

Modified: branches/aptitude-0.3/aptitude/src/solution_dialog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_dialog.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_dialog.cc	Tue Apr 26 01:38:30 2005
@@ -61,8 +61,6 @@
     cache_closed.connect(sigc::mem_fun(*this, &solution_dialog::update));
     cache_reloaded.connect(sigc::mem_fun(*this, &solution_dialog::handle_cache_reload));
 
-    set_bg(get_color("DefaultWidgetBackground")|A_REVERSE);
-
     update();
   }
 
@@ -70,7 +68,7 @@
   {
     if(!apt_cache_file)
       {
-	set_fragment(fragf("%R%s", _("The package cache is not available.")));
+	set_fragment(fragf("%s", _("The package cache is not available.")));
 	last_sol.nullify();
 	return;
       }
@@ -78,7 +76,7 @@
     if(!(*apt_cache_file)->resolver_exists())
       {
 	// This makes ASS-U-MPTIONS about how resolver_exists works.
-	set_fragment(fragf("%R%s", _("No packages are broken.")));
+	set_fragment(fragf("%s", _("No packages are broken.")));
 	last_sol.nullify();
 	return;
       }
@@ -93,18 +91,17 @@
 	last_sol=sol;
 
 	if(sol.get_actions().empty())
-	  set_fragment(fragf("%R%s", _("Internal error: unexpected null solution.")));
+	  set_fragment(fragf("%s", _("Internal error: unexpected null solution.")));
 	else
-	  set_fragment(attr_fragment(solution_fragment(sol),
-				     get_color("DefaultWidgetBackground") | A_REVERSE));
+	  set_fragment(solution_fragment(sol));
       }
     catch(NoMoreSolutions)
       {
-	set_fragment(fragf("%R%s", _("No resolution found.")));
+	set_fragment(fragf("%s", _("No resolution found.")));
       }
     catch(NoMoreTime)
       {
-	set_fragment(fragf(_("%RTime exhausted while searching for a solution (you can select \"Next Solution\" or press %s to try harder)."),
+	set_fragment(fragf(_("Time exhausted while searching for a solution (you can select \"Next Solution\" or press %s to try harder)."),
 			   global_bindings.keyname("NextSolution").c_str()));
       }
   }
@@ -120,7 +117,7 @@
 		     vs_table::EXPAND | vs_table::FILL,
 		     vs_table::FILL | vs_table::SHRINK);
 
-  t->set_bg(get_color("DefaultWidgetBackground")|A_REVERSE);
+  //t->set_bg(get_color("DefaultWidgetBackground")|A_REVERSE);
 
   // TODO: for dialogs like this, I really should have support for
   // "wrapping" lines of buttons if they get too long, like fragments.