[Aptitude-svn-commit] r4199 - in branches/aptitude-0.3/aptitude: .
src
Daniel Burrows
dburrows at costa.debian.org
Fri Sep 23 01:59:47 UTC 2005
Author: dburrows
Date: Fri Sep 23 01:59:44 2005
New Revision: 4199
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/menu_redirect.cc
branches/aptitude-0.3/aptitude/src/menu_redirect.h
branches/aptitude-0.3/aptitude/src/pkg_node.cc
branches/aptitude-0.3/aptitude/src/pkg_node.h
branches/aptitude-0.3/aptitude/src/solution_item.cc
branches/aptitude-0.3/aptitude/src/solution_item.h
Log:
Disable all menu commands in menu_redirect by default.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Fri Sep 23 01:59:44 2005
@@ -1,5 +1,11 @@
2005-09-22 Daniel Burrows <dburrows at debian.org>
+ * src/menu_redirect.cc, src/menu_redirect.h, src/pkg_node.cc, src/solution_item.cc:
+
+ Write default implementations for the menu_redirect methods that
+ cause all commands to be disabled; avoids lots of repetitive and
+ pointless code in subclasses.
+
* src/view_changelog.cc:
Make sure that the changelog pager's scroll bar occupies the
Modified: branches/aptitude-0.3/aptitude/src/menu_redirect.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/menu_redirect.cc (original)
+++ branches/aptitude-0.3/aptitude/src/menu_redirect.cc Fri Sep 23 01:59:44 2005
@@ -25,6 +25,39 @@
#include <vscreen/ref_ptr.h>
+bool menu_redirect::package_enabled() { return false; }
+bool menu_redirect::package_install() { return false; }
+bool menu_redirect::package_remove() { return false; }
+bool menu_redirect::package_purge() { return false; }
+bool menu_redirect::package_hold() { return false; }
+bool menu_redirect::package_keep() { return false; }
+bool menu_redirect::package_mark_auto() { return false; }
+bool menu_redirect::package_unmark_auto() { return false; }
+bool menu_redirect::package_forbid_enabled() { return false; }
+bool menu_redirect::package_forbid() { return false; }
+bool menu_redirect::package_information_enabled() { return false; }
+bool menu_redirect::package_information() { return false; }
+bool menu_redirect::package_changelog_enabled() { return false; }
+bool menu_redirect::package_changelog() { return false; }
+bool menu_redirect::resolver_toggle_approved() { return false;}
+bool menu_redirect::resolver_toggle_approved_enabled() { return false; }
+bool menu_redirect::resolver_toggle_rejected() { return false;}
+bool menu_redirect::resolver_toggle_rejected_enabled() { return false; }
+bool menu_redirect::resolver_view_target() { return false; }
+bool menu_redirect::resolver_view_target_enabled() { return false; }
+bool menu_redirect::find_search_enabled() { return false; }
+bool menu_redirect::find_search() { return false; }
+bool menu_redirect::find_search_back_enabled() { return false; }
+bool menu_redirect::find_search_back() { return false; }
+bool menu_redirect::find_research_enabled() { return false; }
+bool menu_redirect::find_research() { return false; }
+bool menu_redirect::find_limit_enabled() { return false; }
+bool menu_redirect::find_limit() { return false; }
+bool menu_redirect::find_reset_limit_enabled() { return false; }
+bool menu_redirect::find_reset_limit() { return false; }
+bool menu_redirect::find_broken_enabled() { return false; }
+bool menu_redirect::find_broken() { return false; }
+
static bool do_menu_test(vscreen_widget &viewBare,
menu_redirect *redirect,
bool (menu_redirect::* test)())
Modified: branches/aptitude-0.3/aptitude/src/menu_redirect.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/menu_redirect.h (original)
+++ branches/aptitude-0.3/aptitude/src/menu_redirect.h Fri Sep 23 01:59:44 2005
@@ -14,111 +14,111 @@
{
public:
/** \return \b true iff the package commands should be enabled. */
- virtual bool package_enabled()=0;
+ virtual bool package_enabled();
/** Install the selected package (if any).
*
* \return \b true to stop emission of the signal.
*/
- virtual bool package_install()=0;
+ virtual bool package_install();
/** Remove the selected package (if any). */
- virtual bool package_remove()=0;
+ virtual bool package_remove();
/** Purge the selected package (if any). */
- virtual bool package_purge()=0;
+ virtual bool package_purge();
/** Hold the selected package (if any). */
- virtual bool package_hold()=0;
+ virtual bool package_hold();
/** Keep the selected package (if any). */
- virtual bool package_keep()=0;
+ virtual bool package_keep();
/** Set the "automatic" flag on the selected package (if any). */
- virtual bool package_mark_auto()=0;
+ virtual bool package_mark_auto();
/** Clear the "automatic" flag on the selected package (if any). */
- virtual bool package_unmark_auto()=0;
+ virtual bool package_unmark_auto();
/** \return \b true if the selected item can be 'forbidden'. */
- virtual bool package_forbid_enabled()=0;
+ virtual bool package_forbid_enabled();
/** 'Forbid' the selected item: either forbid the candidate
* version of a package, or forbid the selected version.
*/
- virtual bool package_forbid()=0;
+ virtual bool package_forbid();
/** \return \b true if the selected item has information to view. */
- virtual bool package_information_enabled()=0;
+ virtual bool package_information_enabled();
/** View a package's information. Only works on a real package or a
* package version.
*/
- virtual bool package_information()=0;
+ virtual bool package_information();
/** \return \b true if the selected item has a changelog. */
- virtual bool package_changelog_enabled()=0;
+ virtual bool package_changelog_enabled();
/** View the changelog of the selected package. */
- virtual bool package_changelog()=0;
+ virtual bool package_changelog();
/** Toggle whether a solution action item is approved. */
- virtual bool resolver_toggle_approved() = 0;
+ virtual bool resolver_toggle_approved();
/** \return \b true if the selected item can be approved. */
- virtual bool resolver_toggle_approved_enabled() = 0;
+ virtual bool resolver_toggle_approved_enabled();
/** Toggle whether a solution action item is rejected. */
- virtual bool resolver_toggle_rejected() = 0;
+ virtual bool resolver_toggle_rejected();
/** \return \b true if the selected item can be approved. */
- virtual bool resolver_toggle_rejected_enabled() = 0;
+ virtual bool resolver_toggle_rejected_enabled();
/** View information about a solution action item. */
- virtual bool resolver_view_target() = 0;
+ virtual bool resolver_view_target();
/** \return \b true if the selected item can be approved. */
- virtual bool resolver_view_target_enabled() = 0;
+ virtual bool resolver_view_target_enabled();
/** \return \b true if this view knows how to search. */
- virtual bool find_search_enabled()=0;
+ virtual bool find_search_enabled();
/** Execute the 'search' menu command. */
- virtual bool find_search()=0;
+ virtual bool find_search();
/** \return \b true if this view knows how to search back. */
- virtual bool find_search_back_enabled() = 0;
+ virtual bool find_search_back_enabled();
/** Execute the 'search back' menu command. */
- virtual bool find_search_back() = 0;
+ virtual bool find_search_back();
/** \return \b true if this view knows how to search and there is
* a "previous search".
*/
- virtual bool find_research_enabled()=0;
+ virtual bool find_research_enabled();
/** Execute the 're-search' menu command. */
- virtual bool find_research()=0;
+ virtual bool find_research();
/** \return \b true if this view knows how to set a display limit. */
- virtual bool find_limit_enabled()=0;
+ virtual bool find_limit_enabled();
/** Execute the 'limit' menu command. */
- virtual bool find_limit()=0;
+ virtual bool find_limit();
/** \return \b true if this view knows how to clear a display limit. */
- virtual bool find_reset_limit_enabled()=0;
+ virtual bool find_reset_limit_enabled();
/** Execute the 'reset limit' menu command. */
- virtual bool find_reset_limit()=0;
+ virtual bool find_reset_limit();
/** \return \b true if this view knows how to find broken packages. */
- virtual bool find_broken_enabled()=0;
+ virtual bool find_broken_enabled();
/** Execute the 'find broken' menu command. */
- virtual bool find_broken()=0;
+ virtual bool find_broken();
virtual ~menu_redirect() {}
};
Modified: branches/aptitude-0.3/aptitude/src/pkg_node.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_node.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_node.cc Fri Sep 23 01:59:44 2005
@@ -137,123 +137,3 @@
{
return package_action(&pkg_tree_node::unmark_auto);
}
-
-bool pkg_tree_node::package_forbid_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::package_forbid()
-{
- return false;
-}
-
-bool pkg_tree_node::package_changelog_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::package_changelog()
-{
- return false;
-}
-
-bool pkg_tree_node::package_information_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::package_information()
-{
- return false;
-}
-
-bool pkg_tree_node::resolver_toggle_rejected()
-{
- return false;
-}
-
-bool pkg_tree_node::resolver_toggle_rejected_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::resolver_toggle_approved()
-{
- return false;
-}
-
-bool pkg_tree_node::resolver_toggle_approved_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::resolver_view_target()
-{
- return false;
-}
-
-bool pkg_tree_node::resolver_view_target_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::find_search_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::find_search()
-{
- return false;
-}
-
-bool pkg_tree_node::find_search_back_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::find_search_back()
-{
- return false;
-}
-
-bool pkg_tree_node::find_research_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::find_research()
-{
- return false;
-}
-
-bool pkg_tree_node::find_limit_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::find_limit()
-{
- return false;
-}
-
-bool pkg_tree_node::find_reset_limit_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::find_reset_limit()
-{
- return false;
-}
-
-bool pkg_tree_node::find_broken_enabled()
-{
- return false;
-}
-
-bool pkg_tree_node::find_broken()
-{
- return false;
-}
Modified: branches/aptitude-0.3/aptitude/src/pkg_node.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_node.h (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_node.h Fri Sep 23 01:59:44 2005
@@ -67,30 +67,6 @@
bool package_keep();
bool package_mark_auto();
bool package_unmark_auto();
- bool package_forbid_enabled();
- bool package_forbid();
- bool package_information_enabled();
- bool package_information();
- bool package_changelog_enabled();
- bool package_changelog();
- bool resolver_toggle_approved();
- bool resolver_toggle_approved_enabled();
- bool resolver_toggle_rejected();
- bool resolver_toggle_rejected_enabled();
- bool resolver_view_target();
- bool resolver_view_target_enabled();
- bool find_search_enabled();
- bool find_search();
- bool find_search_back_enabled();
- bool find_search_back();
- bool find_research_enabled();
- bool find_research();
- bool find_limit_enabled();
- bool find_limit();
- bool find_reset_limit_enabled();
- bool find_reset_limit();
- bool find_broken_enabled();
- bool find_broken();
};
#endif
Modified: branches/aptitude-0.3/aptitude/src/solution_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_item.cc (original)
+++ branches/aptitude-0.3/aptitude/src/solution_item.cc Fri Sep 23 01:59:44 2005
@@ -172,21 +172,6 @@
//////////////////////////// Menu Redirections //////////////////////////
-bool solution_item::package_enabled() { return false; }
-bool solution_item::package_install() { return false; }
-bool solution_item::package_remove() { return false; }
-bool solution_item::package_purge() { return false; }
-bool solution_item::package_hold() { return false; }
-bool solution_item::package_keep() { return false; }
-bool solution_item::package_mark_auto() { return false; }
-bool solution_item::package_unmark_auto() { return false; }
-bool solution_item::package_forbid_enabled() { return false; }
-bool solution_item::package_forbid() { return false; }
-bool solution_item::package_information_enabled() { return false; }
-bool solution_item::package_information() { return false; }
-bool solution_item::package_changelog_enabled() { return false; }
-bool solution_item::package_changelog() { return false; }
-
bool solution_item::resolver_toggle_approved()
{
toggle_mandated();
@@ -209,29 +194,6 @@
return true;
}
-bool solution_item::resolver_view_target()
-{
- return false;
-}
-
-bool solution_item::resolver_view_target_enabled()
-{
- return false;
-}
-
-bool solution_item::find_search_enabled() { return false; }
-bool solution_item::find_search() { return false; }
-bool solution_item::find_search_back_enabled() { return false; }
-bool solution_item::find_search_back() { return false; }
-bool solution_item::find_research_enabled() { return false; }
-bool solution_item::find_research() { return false; }
-bool solution_item::find_limit_enabled() { return false; }
-bool solution_item::find_limit() { return false; }
-bool solution_item::find_reset_limit_enabled() { return false; }
-bool solution_item::find_reset_limit() { return false; }
-bool solution_item::find_broken_enabled() { return false; }
-bool solution_item::find_broken() { return false; }
-
/////////////////////////////////////////////////////////////////////////
Modified: branches/aptitude-0.3/aptitude/src/solution_item.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_item.h (original)
+++ branches/aptitude-0.3/aptitude/src/solution_item.h Fri Sep 23 01:59:44 2005
@@ -79,38 +79,10 @@
bool dispatch_key(const key &k, vs_tree *owner);
// Menu redirections:
- bool package_enabled();
- bool package_install();
- bool package_remove();
- bool package_purge();
- bool package_hold();
- bool package_keep();
- bool package_mark_auto();
- bool package_unmark_auto();
- bool package_forbid_enabled();
- bool package_forbid();
- bool package_information_enabled();
- bool package_information();
- bool package_changelog_enabled();
- bool package_changelog();
bool resolver_toggle_approved();
bool resolver_toggle_approved_enabled();
bool resolver_toggle_rejected();
bool resolver_toggle_rejected_enabled();
- bool resolver_view_target();
- bool resolver_view_target_enabled();
- bool find_search_enabled();
- bool find_search();
- bool find_search_back_enabled();
- bool find_search_back();
- bool find_research_enabled();
- bool find_research();
- bool find_limit_enabled();
- bool find_limit();
- bool find_reset_limit_enabled();
- bool find_reset_limit();
- bool find_broken_enabled();
- bool find_broken();
};
class solution_act_item : public solution_item
More information about the Aptitude-svn-commit
mailing list