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

[Daniel Burrows]

Author: dburrows
Date: Tue Jun  7 05:56:18 2005
New Revision: 3355

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
   branches/aptitude-0.3/aptitude/src/pkg_ver_item.h
Log:
Use styles, not colors, to render version items.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 05:56:18 2005
@@ -1,10 +1,15 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
-	* src/pkg_ver_item.cc:
+	* src/pkg_ver_item.cc, src/pkg_ver_item.h:
+
+	Adjust the attribute-selection methods to work with styles instead
+	of colors.
+
+	* src/pkg_ver_item.h:
 
 	Also fill in the virtual "paint" method of pkg_vertree_generic.
 
-	* src/pkg_ver_item.cc:
+	* src/pkg_ver_item.cc, src/pkg_ver_item.h:
 
 	Fill in the virtual method "paint" of pkg_ver_item.
 

Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc	Tue Jun  7 05:56:18 2005
@@ -460,12 +460,12 @@
   return new pkg_grouppolicy_ver(sig, desc_sig);
 }
 
-int pkg_ver_item::get_normal_attr()
+int pkg_ver_item::get_normal_style()
 {
-  return ver_attr(version, vs_treeitem::get_normal_attr());
+  return ver_style(version, vs_treeitem::get_normal_style());
 }
 
-int pkg_ver_item::ver_attr(pkgCache::VerIterator version, int normal_attr)
+style pkg_ver_item::ver_style(pkgCache::VerIterator version)
 {
   pkgCache::PkgIterator pkg=version.ParentPkg();
   pkgDepCache::StateCache &state=(*apt_cache_file)[pkg];
@@ -475,26 +475,26 @@
       (state.Install() &&
        !state.InstBroken() &&
        state.InstVerIter(*apt_cache_file)!=version)))
-    return get_color("PkgToRemove");
+    return get_style("PkgToRemove");
 
   else if(((state.NewInstall() || state.Install()) &&
 	   !state.InstBroken() &&
 	   state.InstVerIter(*apt_cache_file)==version) ||
 	  (version==version.ParentPkg().CurrentVer() &&
 	   state.iFlags&pkgDepCache::ReInstall))
-    return get_color("PkgToInstall");
+    return get_style("PkgToInstall");
 
   else if(state.InstBroken() && state.InstVerIter(*apt_cache_file)==version)
-    return get_color("PkgBroken");
+    return get_style("PkgBroken");
 
   else if(pkg.CurrentVer()!=version)
-    return normal_attr;
+    return style();
 
   else if(state.NowBroken())
-    return get_color("PkgBroken");
+    return get_style("PkgBroken");
 
   else
-    return A_BOLD|normal_attr;
+    return style_attrs_on(A_BOLD);
 }
 
 void pkg_ver_item::paint(vs_tree *win, int y, bool hierarchical,

Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.h	(original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.h	Tue Jun  7 05:56:18 2005
@@ -49,7 +49,7 @@
   pkgCache::PkgIterator get_package() const {return version.ParentPkg();}
   const pkgCache::VerIterator &get_version() const {return version;}
 
-  virtual int get_normal_attr();
+  virtual int get_normal_style();
   virtual void paint(vs_tree *win, int y, bool hierarchical,
 		     const style &st);
 
@@ -75,7 +75,7 @@
 
   pkg_ver_item *get_sig();
 
-  static int ver_attr(pkgCache::VerIterator version, int normal_attr);
+  static style ver_style(pkgCache::VerIterator version);
 };
 
 class versort:public sortpolicy