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

[Daniel Burrows]

Author: dburrows
Date: Tue Jun  7 05:36:40 2005
New Revision: 3351

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/broken_indicator.cc
Log:
Update the broken indicator to use styles properly.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 05:36:40 2005
@@ -1,5 +1,9 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* src/broken_indicator.cc:
+
+	Update for styles.
+
 	* src/apt_options.cc:
 
 	Update the option dialog generation to use styles.

Modified: branches/aptitude-0.3/aptitude/src/broken_indicator.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/broken_indicator.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/broken_indicator.cc	Tue Jun  7 05:36:40 2005
@@ -70,7 +70,7 @@
     cache_closed.connect(sigc::mem_fun(*this, &broken_indicator::update));
     cache_reloaded.connect(sigc::mem_fun(*this, &broken_indicator::handle_cache_reload));
 
-    set_bg(get_color("Error"));
+    set_bg_style(get_style("Error"));
 
     update();
   }
@@ -103,7 +103,7 @@
 
 	if(sol.get_actions().empty())
 	  {
-	    set_fragment(fragf("%C%s", get_color("Error"), _("Internal error: unexpected null solution.")));
+	    set_fragment(fragf("%s", _("Internal error: unexpected null solution.")));
 	    show();
 	    return;
 	  }
@@ -224,20 +224,17 @@
 					       "  "));
 
 	    fragment *f=sequence_fragment(fragments);
-	    f->set_attr(get_color("Error"));
 	    set_fragment(hardwrapbox(f));
 	  }
       }
     catch(NoMoreTime)
       {
-	set_fragment(fragf(_("%CSolution search failed.  %s: try harder"),
-			   "Error",
+	set_fragment(fragf(_("Solution search failed.  %s: try harder"),
 			   next.c_str()));
       }
     catch(NoMoreSolutions)
       {
-	set_fragment(fragf(_("%CUnable to resolve dependencies."),
-			   "Error"));
+	set_fragment(fragf(_("Unable to resolve dependencies.")));
       }
 
     show();