[Aptitude-devel] r3136 - in branches/aptitude-0.3/aptitude: . src
Daniel Burrows
dburrows@costa.debian.org
Wed, 27 Apr 2005 03:28:50 +0000
Author: dburrows
Date: Wed Apr 27 03:28:47 2005
New Revision: 3136
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/download_bar.cc
Log:
Flow the media-change question.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Wed Apr 27 03:28:47 2005
@@ -1,5 +1,9 @@
2005-04-26 Daniel Burrows <dburrows@debian.org>
+ * src/download_bar.cc:
+
+ Flow the media-change question.
+
* src/ui.cc:
Also flow the query regarding switching to the root account.
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 03:28:47 2005
@@ -1,6 +1,6 @@
// download_bar.cc
//
-// Copyright 1999,2000 Daniel Burrows
+// Copyright 1999-2000, 2004-2005 Daniel Burrows
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
#include <vscreen/config/keybindings.h>
#include <vscreen/config/colors.h>
+#include <vscreen/fragment.h>
#include <vscreen/vs_minibuf_win.h>
#include <vscreen/vs_util.h>
@@ -52,12 +53,12 @@
{
CRITICAL_ENTER
- char buf[512];
- snprintf(buf, 512,
- _("Please insert the following disc into the drive \"%s\":\n%s"),
- drive.c_str(), media.c_str());
+ fragment *f=wrapbox(fragf(_("Please insert the following disc into the drive \"%s\":%n%s"),
+ drive.c_str(), media.c_str()));
- vscreen_widget *w=vs_dialog_ok(buf, arg(sigc::ptr_fun(vscreen_exitmain)),
+ f->set_attr(get_color("MediaChange"));
+
+ vscreen_widget *w=vs_dialog_ok(f, arg(sigc::ptr_fun(vscreen_exitmain)),
get_color("MediaChange"));
w->show_all();
popup_widget(w);