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

[Daniel Burrows]

Author: dburrows
Date: Thu Sep 22 19:32:16 2005
New Revision: 4179

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
   branches/aptitude-0.3/aptitude/src/defaults.cc
   branches/aptitude-0.3/aptitude/src/solution_screen.cc
Log:
s/accept/approve; don't overspecify solution action styles.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Sep 22 19:32:16 2005
@@ -1,5 +1,11 @@
 2005-09-22  Daniel Burrows  <dburrows at debian.org>
 
+	* doc/en/aptitude.xml, src/defaults.cc, src/solution_screen.cc:
+
+	  Modify the SolutionActionAccepted style and the
+	  SolutionActionAccept keybinding to conform to the new "approved"
+	  terminology; don't overspecify the SolutionAction styles.
+
 	* doc/en/aptitude.xml, doc/en/images/broken-snapshot.png, doc/en/images/solution-screen-snapshot.png, doc/en/images/solution-screen-snapshot2.png, doc/en/images/solution-screen-snapshot3.png, doc/en/images/solution-screen-snapshot4.png, doc/en/images/solution-screen-snapshot5.png:
 
 	  Update the broken packages tutorial.

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 19:32:16 2005
@@ -5768,12 +5768,12 @@
 	      </row>
 
 	      <row>
-		<entry><literal>SolutionActionAccept</literal></entry>
+		<entry><literal>SolutionActionApprove</literal></entry>
 		<entry><literal>a</literal></entry>
 		<entry>
 		  When viewing a solution, marks the currently
-		  selected action as "accepted" (only solutions
-		  containing it will be generated).
+		  selected action as "approved" (it will be included
+		  in future solutions whenever possible).
 		</entry>
 	      </row>
 
@@ -5782,8 +5782,8 @@
 		<entry><literal>r</literal></entry>
 		<entry>
 		  When viewing a solution, marks the currently
-		  selected action as "rejected" (only solutions not
-		  containing it will be generated).
+		  selected action as "rejected" (future solutions will
+		  not contain it).
 		</entry>
 	      </row>
 
@@ -6827,16 +6827,16 @@
 		</row>
 
 		<row>
-		  <entry><literal>SolutionActionAccepted</literal></entry>
-		  <entry><literal>fg white; bg green;</literal></entry>
+		  <entry><literal>SolutionActionApproved</literal></entry>
+		  <entry><literal>bg green;</literal></entry>
 		  <entry>
-		    The style of accepted actions in a solution.
+		    The style of approved actions in a solution.
 		  </entry>
 		</row>
 
 		<row>
 		  <entry><literal>SolutionActionRejected</literal></entry>
-		  <entry><literal>fg white; bg red;</literal></entry>
+		  <entry><literal>bg red;</literal></entry>
 		  <entry>
 		    The style of rejected actions in a solution.
 		  </entry>

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 19:32:16 2005
@@ -74,7 +74,7 @@
   global_bindings.set("DumpResolver", key(L'*', false));
 
   global_bindings.set("SolutionActionReject", key(L'r', false));
-  global_bindings.set("SolutionActionAccept", key(L'a', false));
+  global_bindings.set("SolutionActionApprove", key(L'a', false));
 
   pkg_tree::init_bindings();
   pkg_tree_node::init_bindings();
@@ -120,8 +120,8 @@
   set_style("Bullet", style_fg(COLOR_YELLOW)+style_attrs_on(A_BOLD));
   set_style("TrustWarning", style_fg(COLOR_RED)+style_bg(COLOR_BLACK)+style_attrs_on(A_BOLD));
 
-  set_style("SolutionActionRejected", style_fg(COLOR_WHITE)+style_bg(COLOR_RED));
-  set_style("SolutionActionAccepted", style_fg(COLOR_WHITE)+style_bg(COLOR_GREEN));
+  set_style("SolutionActionRejected", style_bg(COLOR_RED));
+  set_style("SolutionActionApproved", style_bg(COLOR_GREEN));
 }
 
 void init_defaults()

Modified: branches/aptitude-0.3/aptitude/src/solution_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_screen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/solution_screen.cc	Thu Sep 22 19:32:16 2005
@@ -270,7 +270,7 @@
     if(is_rejected())
       return get_style("SolutionActionRejected");
     else if(is_mandatory())
-      return get_style("SolutionActionAccepted");
+      return get_style("SolutionActionApproved");
     else
       return style();
   }
@@ -286,7 +286,7 @@
 
 	owner->line_down();
       }
-    else if(global_bindings.key_matches(k, "SolutionActionAccept"))
+    else if(global_bindings.key_matches(k, "SolutionActionApprove"))
       {
 	if(is_mandatory())
 	  unmandate();