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

[Daniel Burrows]

Author: dburrows
Date: Sat Jul  2 03:14:02 2005
New Revision: 3519

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/defaults.cc
Log:
Update how defaults are set for wide characters.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jul  2 03:14:02 2005
@@ -1,5 +1,10 @@
 2005-07-01  Daniel Burrows  <dburrows@debian.org>
 
+	* src/defaults.cc:
+
+	  Change the default setting initializations to use the new
+	  wide-character interfaces.
+
 	* src/broken_indicator.cc:
 
 	  Convert the broken indicator to handle wide characters.

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	Sat Jul  2 03:14:02 2005
@@ -14,62 +14,62 @@
 
 static void init_keybindings()
 {
-  global_bindings.set("CycleNext", KEY_F(6));
-  global_bindings.set("CyclePrev", KEY_F(7));
+  global_bindings.set("CycleNext", key(KEY_F(6), true));
+  global_bindings.set("CyclePrev", key(KEY_F(7), true));
 
-  global_bindings.set("QuitProgram", "Q"[0]);
+  global_bindings.set("QuitProgram", key(L'Q', false));
 
-  global_bindings.set("UpdatePackageList", "u"[0]);
-  global_bindings.set("MarkUpgradable", "U"[0]);
-  global_bindings.set("ForgetNewPackages", "f"[0]);
-  global_bindings.set("ChangePkgTreeLimit", "l"[0]);
-  global_bindings.set("ChangePkgTreeGrouping", "G"[0]);
-  global_bindings.set("ChangePkgTreeSorting", "S"[0]);
-
-  global_bindings.set("Install", '+');
-  global_bindings.set("Remove", '-');
-  global_bindings.set("Hold", '=');
-  global_bindings.set("Purge", '_');
-  global_bindings.set("Keep", ':');
-  global_bindings.set("SetAuto", 'M');
-  global_bindings.set("ClearAuto", 'm');
-  global_bindings.set("ForbidUpgrade", 'F');
-  global_bindings.set("Reinstall", 'L');
-
-  global_bindings.set("Dependencies", "d"[0]);
-  global_bindings.set("ReverseDependencies", "r"[0]);
-  global_bindings.set("InfoScreen", KEY_ENTER);
-  global_bindings.set("Versions", "v"[0]);
-  global_bindings.set("Changelog", "C"[0]);
-
-  global_bindings.set("DoInstallRun", "g"[0]);
-  global_bindings.set("InstallSingle", "I"[0]);
-  global_bindings.set("ChangePkgDisplayFormat", "p"[0]);
-  global_bindings.set("ChangePkgStatusFormat", "s"[0]);
-
-  global_bindings.set("ToggleColumnHeaders", "h"[0]);
-
-  global_bindings.set("ShowHideDescription", "D"[0]);
-
-  global_bindings.set("DescriptionUp", "a"[0]);
-  global_bindings.set("DescriptionDown", "z"[0]);
-  global_bindings.set("DescriptionCycle", "i"[0]);
+  global_bindings.set("UpdatePackageList", key(L'u', false));
+  global_bindings.set("MarkUpgradable", key(L'U', false));
+  global_bindings.set("ForgetNewPackages", key(L'f', false));
+  global_bindings.set("ChangePkgTreeLimit", key(L'l', false));
+  global_bindings.set("ChangePkgTreeGrouping", key(L'G', false));
+  global_bindings.set("ChangePkgTreeSorting", key(L'S', false));
+
+  global_bindings.set("Install", key(L'+', false));
+  global_bindings.set("Remove", key(L'-', false));
+  global_bindings.set("Hold", key(L'=', false));
+  global_bindings.set("Purge", key(L'_', false));
+  global_bindings.set("Keep", key(L':', false));
+  global_bindings.set("SetAuto", key(L'M', false));
+  global_bindings.set("ClearAuto", key(L'm', false));
+  global_bindings.set("ForbidUpgrade", key(L'F', false));
+  global_bindings.set("Reinstall", key(L'L', false));
+
+  global_bindings.set("Dependencies", key(L'd', false));
+  global_bindings.set("ReverseDependencies", key(L'r', false));
+  global_bindings.set("InfoScreen", key(KEY_ENTER, true));
+  global_bindings.set("Versions", key(L'v', false));
+  global_bindings.set("Changelog", key(L'C', false));
+
+  global_bindings.set("DoInstallRun", key(L'g', false));
+  global_bindings.set("InstallSingle", key(L'I', false));
+  global_bindings.set("ChangePkgDisplayFormat", key(L'p', false));
+  global_bindings.set("ChangePkgStatusFormat", key(L's', false));
+
+  global_bindings.set("ToggleColumnHeaders", key(L'h', false));
+
+  global_bindings.set("ShowHideDescription", key(L'D', false));
+
+  global_bindings.set("DescriptionUp", key(L'a', false));
+  global_bindings.set("DescriptionDown", key(L'z', false));
+  global_bindings.set("DescriptionCycle", key(L'i', false));
 
-  global_bindings.set("DpkgReconfigure", "R"[0]);
-  global_bindings.set("BugReport", "B"[0]);
+  global_bindings.set("DpkgReconfigure", key(L'R', false));
+  global_bindings.set("BugReport", key(L'B', false));
 
   // Hierarchy editor
-  global_bindings.set("Commit", "N"[0]);
-  global_bindings.set("SaveHier", "S"[0]);
-  global_bindings.set("EditHier", "E"[0]);
-
-  global_bindings.set("SearchBroken", "b"[0]);
-
-  global_bindings.set("NextSolution", '.');
-  global_bindings.set("PrevSolution", ',');
-  global_bindings.set("ExamineSolution", 'e');
-  global_bindings.set("ApplySolution", '!');
-  global_bindings.set("DumpResolver", KEY_F(6));
+  global_bindings.set("Commit", key(L'N', false));
+  global_bindings.set("SaveHier", key(L'S', false));
+  global_bindings.set("EditHier", key(L'E', false));
+
+  global_bindings.set("SearchBroken", key(L'b', false));
+
+  global_bindings.set("NextSolution", key(L'.', false));
+  global_bindings.set("PrevSolution", key(L',', false));
+  global_bindings.set("ExamineSolution", key(L'e', false));
+  global_bindings.set("ApplySolution", key(L'!', false));
+  global_bindings.set("DumpResolver", key(L'*', false));
 
   pkg_tree::init_bindings();
   pkg_tree_node::init_bindings();