[Aptitude-svn-commit] r4175 - in branches/aptitude-0.3/aptitude: . doc/en src

Daniel Burrows dburrows at costa.debian.org
Thu Sep 22 18:33:10 UTC 2005


Author: dburrows
Date: Thu Sep 22 18:33:06 2005
New Revision: 4175

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
   branches/aptitude-0.3/aptitude/src/defaults.cc
Log:
Don't explicitly set the background color in the package item styles.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Sep 22 18:33:06 2005
@@ -1,5 +1,11 @@
 2005-09-22  Daniel Burrows  <dburrows at debian.org>
 
+	* doc/en/aptitude.xml, src/defaults.cc:
+
+	  Don't explicitly set the background color in package colors, so
+	  the user can globally override the background color if he/she so
+	  desires.
+
 	* doc/en/aptitude.xml, src/defaults.cc, src/pkg_item.cc, src/pkg_item.h, src/reason_fragment.cc:
 
 	  Make a separate named style for each and every possible package

Modified: branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	Thu Sep 22 18:33:06 2005
@@ -6597,7 +6597,7 @@
 
 		<row>
 		  <entry><literal>PkgBroken</literal></entry>
-		  <entry><literal>fg black; bg red;</literal></entry>
+		  <entry><literal>fg red; flip reverse;</literal></entry>
 		  <entry>
 		    The style of packages in the package list which
 		    have unfulfilled dependencies.
@@ -6606,7 +6606,7 @@
 
 		<row>
 		  <entry><literal>PkgBrokenHighlighted</literal></entry>
-		  <entry><literal>fg red; bg black;</literal></entry>
+		  <entry><literal>fg red;</literal></entry>
 		  <entry>
 		    The style of highlighted packages in the package
 		    list which have unfulfilled dependencies.
@@ -6652,7 +6652,7 @@
 
 		<row>
 		  <entry><literal>PkgToHold</literal></entry>
-		  <entry><literal>fg black; bg white;</literal></entry>
+		  <entry><literal>fg white; flip reverse;</literal></entry>
 		  <entry>
 		    The style of packages in the package list which
 		    are <link linkend='pkgCmdHold'>on hold</link>.
@@ -6661,7 +6661,7 @@
 
 		<row>
 		  <entry><literal>PkgToHoldHighlighted</literal></entry>
-		  <entry><literal>fg white; bg black;</literal></entry>
+		  <entry><literal>fg white;</literal></entry>
 		  <entry>
 		    The style of highlighted packages in the package
 		    list which are <link linkend='pkgCmdHold'>on
@@ -6671,7 +6671,7 @@
 
 		<row>
 		  <entry><literal>PkgToInstall</literal></entry>
-		  <entry><literal>fg black; bg green;</literal></entry>
+		  <entry><literal>fg green; flip reverse;</literal></entry>
 		  <entry>
 		    The style of packages in the package list which
 		    are being <link
@@ -6683,7 +6683,7 @@
 
 		<row>
 		  <entry><literal>PkgToInstallHighlighted</literal></entry>
-		  <entry><literal>fg green; bg black;</literal></entry>
+		  <entry><literal>fg green;</literal></entry>
 		  <entry>
 		    The style of highlighted packages in the package
 		    list which are being <link
@@ -6695,7 +6695,7 @@
 
 		<row>
 		  <entry><literal>PkgToRemove</literal></entry>
-		  <entry><literal>fg black; bg magenta;</literal></entry>
+		  <entry><literal>fg magenta; flip reverse;</literal></entry>
 		  <entry>
 		    The style of packages in the package list which
 		    will be <link
@@ -6705,7 +6705,7 @@
 		</row>
 		<row>
 		  <entry><literal>PkgToRemoveHighlighted</literal></entry>
-		  <entry><literal>fg magenta; bg black;</literal></entry>
+		  <entry><literal>fg magenta;</literal></entry>
 		  <entry>
 		    The style of highlighted packages in the package
 		    list which will be <link
@@ -6716,7 +6716,7 @@
 
 		<row>
 		  <entry><literal>PkgToUpgrade</literal></entry>
-		  <entry><literal>fg black; bg cyan;</literal></entry>
+		  <entry><literal>fg cyan; flip reverse;</literal></entry>
 		  <entry>
 		    The style of packages in the package list which
 		    will be upgraded.
@@ -6725,7 +6725,7 @@
 
 		<row>
 		  <entry><literal>PkgToUpgradeHighlighted</literal></entry>
-		  <entry><literal>fg cyan; bg black;</literal></entry>
+		  <entry><literal>fg cyan;</literal></entry>
 		  <entry>
 		    The style of packages in the package list which
 		    will be upgraded.

Modified: branches/aptitude-0.3/aptitude/src/defaults.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/defaults.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/defaults.cc	Thu Sep 22 18:33:06 2005
@@ -85,11 +85,11 @@
 {
   set_style("PkgNotInstalled", style());
   set_style("PkgIsInstalled", style_attrs_on(A_BOLD));
-  set_style("PkgToHold", style_fg(COLOR_BLACK)+style_bg(COLOR_WHITE));
-  set_style("PkgToRemove", style_fg(COLOR_BLACK)+style_bg(COLOR_MAGENTA));
-  set_style("PkgBroken", style_fg(COLOR_BLACK)+style_bg(COLOR_RED));
-  set_style("PkgToInstall", style_fg(COLOR_BLACK)+style_bg(COLOR_GREEN));
-  set_style("PkgToUpgrade", style_fg(COLOR_BLACK)+style_bg(COLOR_CYAN));
+  set_style("PkgToHold", style_fg(COLOR_WHITE) + style_attrs_on(A_REVERSE));
+  set_style("PkgToRemove", style_fg(COLOR_MAGENTA) + style_attrs_on(A_REVERSE));
+  set_style("PkgBroken", style_fg(COLOR_RED) + style_attrs_on(A_REVERSE));
+  set_style("PkgToInstall", style_fg(COLOR_GREEN) + style_attrs_on(A_REVERSE));
+  set_style("PkgToUpgrade", style_fg(COLOR_CYAN) + style_attrs_on(A_REVERSE));
 
 
   set_style("PkgNotInstalledHighlighted",
@@ -97,15 +97,15 @@
   set_style("PkgIsInstalledHighlighted",
 	    style_attrs_on(A_BOLD) + style_attrs_flip(A_REVERSE));
   set_style("PkgToHoldHighlighted",
-	    style_fg(COLOR_WHITE) + style_bg(COLOR_BLACK));
+	    style_fg(COLOR_WHITE));
   set_style("PkgToRemoveHighlighted",
-	    style_fg(COLOR_MAGENTA) + style_bg(COLOR_BLACK));
+	    style_fg(COLOR_MAGENTA));
   set_style("PkgBrokenHighlighted",
-	    style_fg(COLOR_RED) + style_bg(COLOR_BLACK));
+	    style_fg(COLOR_RED));
   set_style("PkgToInstallHighlighted",
-	    style_fg(COLOR_GREEN) + style_bg(COLOR_BLACK));
+	    style_fg(COLOR_GREEN));
   set_style("PkgToUpgradeHighlighted",
-	    style_fg(COLOR_CYAN) + style_bg(COLOR_BLACK));
+	    style_fg(COLOR_CYAN));
 
 
 



More information about the Aptitude-svn-commit mailing list