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

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 12:14:38 2005
New Revision: 3137

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/download_bar.cc
   branches/aptitude-0.3/aptitude/src/download_list.cc
Log:
More media-change flowing.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 12:14:38 2005
@@ -1,3 +1,12 @@
+2005-04-27  Daniel Burrows  <dburrows@debian.org>
+
+	* src/download_bar.cc, src/download_list.cc:
+
+	  Flow the other media-change question, and get rid of an
+	  unnecessary newline in both media-change questions (since the
+	  text is wrapped now, there's no need to break after the first
+	  half).
+
 2005-04-26  Daniel Burrows  <dburrows@debian.org>
 
 	* src/download_bar.cc:

Modified: branches/aptitude-0.3/aptitude/src/download_bar.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_bar.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/download_bar.cc	Wed Apr 27 12:14:38 2005
@@ -53,7 +53,7 @@
 {
   CRITICAL_ENTER
 
-    fragment *f=wrapbox(fragf(_("Please insert the following disc into the drive \"%s\":%n%s"),
+    fragment *f=wrapbox(fragf(_("Please insert the following disc into the drive \"%s\": %s"),
 			      drive.c_str(), media.c_str()));
 
   f->set_attr(get_color("MediaChange"));

Modified: branches/aptitude-0.3/aptitude/src/download_list.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_list.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/download_list.cc	Wed Apr 27 12:14:38 2005
@@ -259,13 +259,13 @@
 bool download_list::MediaChange(string media, string drive,
 				download_manager &manager)
 {
-  char buf[512];
+  fragment *f=wrapbox(fragf(
+			    _("Please insert the following disc into the drive \"%s\": %s"),
+			    drive.c_str(), media.c_str()));
 
-  snprintf(buf, 512,
-	   _("Please insert the following disc into the drive \"%s\":\n%s"),
-	   drive.c_str(), media.c_str());
+  f->set_attr(get_color("MediaChange"));
 
-  vscreen_widget *w=vs_dialog_ok(buf, arg(sigc::ptr_fun(vscreen_exitmain)),
+  vscreen_widget *w=vs_dialog_ok(f, arg(sigc::ptr_fun(vscreen_exitmain)),
 				 get_color("MediaChange"));
   w->show_all();
   popup_widget(w);