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

[Daniel Burrows]

Author: dburrows
Date: Fri Sep 30 00:38:30 2005
New Revision: 4352

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
   branches/aptitude-0.3/aptitude/src/ui_download_manager.cc
   branches/aptitude-0.3/aptitude/src/ui_download_manager.h
   branches/aptitude-0.3/aptitude/src/view_changelog.cc
Log:
When creating a download manager from the UI, be sure to set the title and other options.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep 30 00:38:30 2005
@@ -1,5 +1,12 @@
 2005-09-29  Daniel Burrows  <dburrows at debian.org>
 
+	* src/ui.cc, src/ui_download_manager.cc, src/ui_download_manager.h, src/view_changelog.cc:
+
+	  Require code that creates a ui_download_manager to set all the
+	  usual parameters for its internal download status widget, and
+	  change all the creation points to do so (resurrecting the
+	  various title strings that got lost earlier).
+
 	* src/cmdline/cmdline_changelog.cc:
 
 	  Fix the command-line changelog code: binding a reference doesn't

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	Fri Sep 30 00:38:30 2005
@@ -1037,7 +1037,10 @@
   m->pre_install_hook.connect(sigc::ptr_fun(&vscreen_suspend));
   m->post_install_hook.connect(sigc::ptr_fun(&finish_install_run));
 
-  (new ui_download_manager(m))->start();
+  (new ui_download_manager(m, false, false,
+			   _("Downloading packages"),
+			   _("View the progress of the package download"),
+			   _("Package Download")))->start();
 }
 
 /** Make sure that no trust violations are about to be committed.  If
@@ -1361,7 +1364,10 @@
   download_update_manager *m = new download_update_manager;
   m->pre_autoclean_hook.connect(sigc::bind(sigc::ptr_fun(lists_autoclean_msg),
 					   m));
-  (new ui_download_manager(m))->start();
+  (new ui_download_manager(m, false, true,
+			   _("Updating package lists"),
+			   _("View the progress of the package list update"),
+			   _("List Update")))->start();
 }
 
 void do_update_lists()

Modified: branches/aptitude-0.3/aptitude/src/ui_download_manager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui_download_manager.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui_download_manager.cc	Fri Sep 30 00:38:30 2005
@@ -29,13 +29,16 @@
 
 #include <sigc++/functors/mem_fun.h>
 
-ui_download_manager::ui_download_manager(download_manager *_manager)
+ui_download_manager::ui_download_manager(download_manager *_manager,
+					 bool force_noninvasive,
+					 bool list_update,
+					 const std::string &title,
+					 const std::string &longtitle,
+					 const std::string &tablabel)
   : manager(_manager),
     t(NULL),
-    log(gen_download_progress(false, false,
-			      _("Downloading packages"),
-			      _("View the progress of the package download"),
-			      _("Package Download"),
+    log(gen_download_progress(force_noninvasive, list_update,
+			      title, longtitle, tablabel,
 			      arg(sigc::mem_fun(abort_state,
 						&aborter::abort)))),
     st(log)

Modified: branches/aptitude-0.3/aptitude/src/ui_download_manager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui_download_manager.h	(original)
+++ branches/aptitude-0.3/aptitude/src/ui_download_manager.h	Fri Sep 30 00:38:30 2005
@@ -71,7 +71,12 @@
 
   void done(download_thread *, pkgAcquire::RunResult res);
 public:
-  ui_download_manager(download_manager *_manager);
+  ui_download_manager(download_manager *_manager,
+		      bool force_noninvasive,
+		      bool list_update,
+		      const std::string &title,
+		      const std::string &longtitle,
+		      const std::string &tablabel);
   ~ui_download_manager();
 
   void start();

Modified: branches/aptitude-0.3/aptitude/src/view_changelog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/view_changelog.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/view_changelog.cc	Fri Sep 30 00:38:30 2005
@@ -188,14 +188,8 @@
 					    sigc::bind(sigc::ptr_fun(&do_view_changelog), ver));
 
   if(manager != NULL)
-    (new ui_download_manager(manager))->start();
-
-#if 0
-  download_signal_log *widget=gen_download_progress(true,
-						    false,
-						    _("Downloading Changelog"),
-						    "",
-						    _("Download Changelog"),
-						    NULL);
-#endif
+    (new ui_download_manager(manager, true, false,
+			     _("Downloading Changelog"),
+			     _(""),
+			     _("Download Changelog")))->start();
 }