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

[Daniel Burrows]

Author: dburrows
Date: Tue Jun  7 05:41:17 2005
New Revision: 3352

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/defaults.cc
Log:
Set default styles, not default colors.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jun  7 05:41:17 2005
@@ -1,5 +1,10 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* src/defaults.cc:
+
+	Change the assignment of default colors to an assignment of
+	default styles.
+
 	* src/broken_indicator.cc:
 
 	Update for styles.

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	Tue Jun  7 05:41:17 2005
@@ -12,7 +12,7 @@
 #include "pkg_tree.h"
 #include "pkg_node.h"
 
-void init_keybindings()
+static void init_keybindings()
 {
   global_bindings.set("CycleNext", KEY_F(6));
   global_bindings.set("CyclePrev", KEY_F(7));
@@ -76,27 +76,27 @@
   cmine::init_bindings();
 }
 
-void init_colors()
+static void init_styles()
 {
-  set_color("PkgToHold", COLOR_BLACK, COLOR_WHITE, 0);
-  set_color("PkgToRemove", COLOR_BLACK, COLOR_MAGENTA, 0);
-  set_color("PkgBroken", COLOR_BLACK, COLOR_RED, 0);
-  set_color("PkgToInstall", COLOR_BLACK, COLOR_GREEN, 0);
-  set_color("PkgToUpgrade", COLOR_BLACK, COLOR_CYAN, 0);
-
-  set_color("DepBroken", COLOR_BLACK, COLOR_RED, 0);
-
-  set_color("MediaChange", COLOR_YELLOW, COLOR_RED, A_BOLD);
-  set_color("Progress", COLOR_BLUE, COLOR_YELLOW, 0);
-  set_color("DownloadProgress", COLOR_BLUE, COLOR_YELLOW, 0);
-  set_color("DownloadHit", COLOR_BLACK, COLOR_GREEN, 0);
+  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("DepBroken", style_fg(COLOR_BLACK)+style_bg(COLOR_RED));
+
+  set_style("MediaChange", style_fg(COLOR_YELLOW)+style_bg(COLOR_RED)+style_attrs_on(A_BOLD));
+  set_style("Progress", style_fg(COLOR_BLUE)+style_bg(COLOR_YELLOW));
+  set_style("DownloadProgress", style_fg(COLOR_BLUE)+style_bg(COLOR_YELLOW));
+  set_style("DownloadHit", style_fg(COLOR_BLACK)+style_bg(COLOR_GREEN));
 
-  set_color("Bullet", COLOR_YELLOW, COLOR_BLACK, A_BOLD);
-  set_color("TrustWarning", COLOR_RED, COLOR_BLACK, A_BOLD);
+  set_style("Bullet", style_fg(COLOR_YELLOW)+style_bg(COLOR_BLACK)+style_attrs_on(A_BOLD));
+  set_style("TrustWarning", style_fg(COLOR_RED)+style_bg(COLOR_BLACK)+style_attrs_on(A_BOLD));
 }
 
 void init_defaults()
 {
   init_keybindings();
-  init_colors();
+  init_styles();
 }