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

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 21:50:44 2005
New Revision: 4303

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Gray out the install-run menu item if the apt cache is not available.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 21:50:44 2005
@@ -2,6 +2,11 @@
 
 	* src/ui.cc:
 
+	  Gray out the install-run menu item whenever the apt cache file
+	  isn't available.
+
+	* src/ui.cc:
+
 	  Also clear the 'active download' flag after a download that
 	  failed up-front.
 

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	Mon Sep 26 21:50:44 2005
@@ -1309,6 +1309,11 @@
   return !active_download;
 }
 
+static bool can_start_download_and_install()
+{
+  return !active_download && apt_cache_file != NULL;
+}
+
 void do_package_run()
 {
   if(apt_cache_file)
@@ -1871,7 +1876,7 @@
   //SigC::bind(SigC::slot(&silly_test_error), "This is a test error item.")},
 
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^Install/remove packages"), "DoInstallRun",
-	       N_("Perform all pending installs and removals"), sigc::ptr_fun(do_package_run), sigc::ptr_fun(can_start_download)),
+	       N_("Perform all pending installs and removals"), sigc::ptr_fun(do_package_run), sigc::ptr_fun(can_start_download_and_install)),
 
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^Update package list"), "UpdatePackageList",
 	       N_("Check for new versions of packages"), sigc::ptr_fun(do_update_lists), sigc::ptr_fun(can_start_download)),
@@ -1887,11 +1892,11 @@
 
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("Clean ^obsolete files"), NULL,
 	       N_("Delete package files which can no longer be downloaded"),
-	       sigc::ptr_fun(do_autoclean)),
+	       sigc::ptr_fun(do_autoclean), sigc::ptr_fun(do_autoclean_enabled)),
 
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("Mark ^Upgradable"), "MarkUpgradable",
 	       N_("Mark all upgradable packages which are not held for upgrade"),
-	       sigc::ptr_fun(do_mark_upgradable)),
+	       sigc::ptr_fun(do_mark_upgradable), sigc::ptr_fun(do_mark_upgradable_enabled)),
 
   vs_menu_info(vs_menu_info::VS_MENU_ITEM, N_("^Play Minesweeper"), NULL,
 	       N_("Waste time trying to find mines"), sigc::ptr_fun(do_sweep)),