[Aptitude-devel] r3134 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 03:22:47 2005
New Revision: 3134

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Flow the menu descriptions; eliminate some literal newlines.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 03:22:47 2005
@@ -1,5 +1,11 @@
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
+	* src/ui.cc:
+
+	  Wrap the menu descriptions in the status area and eliminate some
+	  literal newlines (need to get rid of other literal newlines
+	  elsewhere in the program...)
+
 	* src/vscreen/vs_label.cc:
 
 	  Implement the fragment set_text and fix a memory leak.

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Wed Apr 27 03:22:47 2005
@@ -1293,7 +1293,7 @@
 	       N_("Waste time trying to find mines"), sigc::ptr_fun(do_sweep)),
 
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^Become root"), NULL,
-	       N_("Run 'su' to become root; this will restart the program, but your\nsettings will be preserved"), sigc::bind(sigc::ptr_fun(do_su_to_root), ""), sigc::ptr_fun(su_to_root_enabled)),
+	       N_("Run 'su' to become root; this will restart the program, but your settings will be preserved"), sigc::bind(sigc::ptr_fun(do_su_to_root), ""), sigc::ptr_fun(su_to_root_enabled)),
 
 #ifdef WITH_RELOAD_CACHE
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^Reload package cache"), NULL,
@@ -1339,15 +1339,15 @@
 	       sigc::hide_return(package_hold.make_slot()),
 	       package_menu_enabled.make_slot()),
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("Mark ^Auto"), "SetAuto",
-	       N_("Mark the selected package as having been automatically installed;\nit will automatically be removed if no other packages depend on it"),
+	       N_("Mark the selected package as having been automatically installed; it will automatically be removed if no other packages depend on it"),
 	       sigc::hide_return(package_mark_auto.make_slot()),
 	       package_menu_enabled.make_slot()),
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("Mark ^Manual"), "ClearAuto",
-	       N_("Mark the selected package as having been manually installed;\nit will not be removed unless you manually remove it"),
+	       N_("Mark the selected package as having been manually installed; it will not be removed unless you manually remove it"),
 	       sigc::hide_return(package_unmark_auto.make_slot()),
 	       package_menu_enabled.make_slot()),
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^Forbid Version"), "ForbidUpgrade",
-	       N_("Forbid the candidate version of the selected package from being installed;\nnewer versions of the package will be installed as usual"),
+	       N_("Forbid the candidate version of the selected package from being installed; newer versions of the package will be installed as usual"),
 	       sigc::hide_return(package_forbid.make_slot()),
 	       package_forbid_enabled.make_slot()),
   VS_MENU_SEPARATOR,
@@ -1488,7 +1488,8 @@
   if(item && item->get_description().size()>0)
     {
       label->show();
-      label->set_text(item->get_description());
+      label->set_text(wrapbox(text_fragment(item->get_description(),
+					    label->get_bg())));
     }
   else
     {