get rid of broken_header.h and some unneeded tests

[lyx.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 8c03ab0cb1acc9636f1351e23d6dfa27f3a27689..294599d1cf3e0042c23799418b6aea525c7b3c9b 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -105,7 +105,9 @@ MenuItem::MenuItem(Kind kind, string const & label,
 MenuItem::MenuItem(Kind kind, string const & label,
                   FuncRequest const & func, bool optional)
        : kind_(kind), label_(label), func_(func), optional_(optional)
-{}
+{
+       func_.origin = FuncRequest::UI;
+}
 
 
 MenuItem::~MenuItem()
@@ -137,13 +139,13 @@ string const MenuItem::binding() const
 
        // Get the keys bound to this action, but keep only the
        // first one later
-       string bindings = toplevel_keymap->findbinding(func_);
+       kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_);
 
-       if (!bindings.empty()) {
-               return bindings.substr(1, bindings.find(']') - 1);
+       if (bindings.size()) {
+               return bindings.begin()->print();
        } else {
                lyxerr[Debug::KBMAP]
-                       << "No bindings for "
+                       << "No binding for "
                        << lyxaction.getActionName(func_.action)
                        << '(' << func_.argument << ')' << endl;
                return string();
@@ -160,44 +162,46 @@ Menu & Menu::add(MenuItem const & i, LyXView const * view)
        }
 
        switch (i.kind()) {
-       case MenuItem::Command:
-       {
+
+       case MenuItem::Command: {
                FuncStatus status =
                        view->getLyXFunc().getStatus(i.func());
                if (status.unknown()
-                   || (status.disabled() && i.optional()))
+                   || (!status.enabled() && i.optional()))
                        break;
                items_.push_back(i);
                items_.back().status(status);
                break;
        }
-       case MenuItem::Submenu:
-       {
+
+       case MenuItem::Submenu: {
                if (i.submenu()) {
-                       bool disabled = true;
+                       bool enabled = false;
                        for (const_iterator cit = i.submenu()->begin();
                             cit != i.submenu()->end(); ++cit) {
                                if ((cit->kind() == MenuItem::Command
                                     || cit->kind() == MenuItem::Submenu)
-                                   && !cit->status().disabled()) {
-                                       disabled = false;
+                                   && cit->status().enabled()) {
+                                       enabled = true;
                                        break;
                                }
                        }
-                       if (!disabled || !i.optional()) {
+                       if (enabled || !i.optional()) {
                                items_.push_back(i);
-                               items_.back().status().disabled(disabled);
+                               items_.back().status().enabled(enabled);
                        }
                }
                else
                        items_.push_back(i);
                break;
        }
+
        case MenuItem::Separator:
                if (!items_.empty()
                    && items_.back().kind() != MenuItem::Separator)
                        items_.push_back(i);
                break;
+
        default:
                items_.push_back(i);
        }
@@ -355,6 +359,20 @@ Menu & Menu::read(LyXLex & lex)
 }
 
 
+MenuItem const & Menu::operator[](size_type i) const
+{
+       return items_[i];
+}
+
+
+bool Menu::hasFunc(FuncRequest const & func) const
+{
+       return find_if(begin(), end(),
+                      bind(std::equal_to<FuncRequest>(),
+                           bind(&MenuItem::func, _1),
+                           func)) != end();
+}
+
 void Menu::checkShortcuts() const
 {
        // This is a quadratic algorithm, but we do not care because
@@ -381,6 +399,13 @@ void Menu::checkShortcuts() const
 }
 
 
+void MenuBackend::specialMenu(string const &name)
+{
+       if (hasMenu(name))
+               specialmenu_ = &getMenu(name);
+}
+
+
 namespace {
 
 class compare_format {
@@ -682,11 +707,11 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view)
        if (!view || !view->buffer())
                return;
 
-       vector<string> const selL =
-               CutAndPaste::availableSelections(*view->buffer());
+       vector<string> const sel =
+               lyx::cap::availableSelections(*view->buffer());
 
-       vector<string>::const_iterator cit = selL.begin();
-       vector<string>::const_iterator end = selL.end();
+       vector<string>::const_iterator cit = sel.begin();
+       vector<string>::const_iterator end = sel.end();
 
        for (unsigned int index = 0; cit != end; ++cit, ++index) {
                tomenu.add(MenuItem(MenuItem::Command, *cit,
@@ -773,8 +798,14 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
                }
                break;
 
-               default:
+               case MenuItem::Separator:
                        tomenu.add(*cit, view);
+                       break;
+
+               case MenuItem::Command:
+                       if (!specialmenu_
+                           || !specialmenu_->hasFunc(cit->func()))
+                               tomenu.add(*cit, view);
                }
        }
 
@@ -788,27 +819,6 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
 }
 
 
-bool Menu::hasSubmenu(string const & name) const
-{
-#if 1
-       return find_if(begin(), end(),
-                      bind(std::equal_to<string>(),
-                           bind(&MenuItem::submenuname, _1),
-                           name)) != end();
-#else
-       // I would have prefered this, but I am not sure if it
-       // makes a difference. (Lgb)
-       return find_if(
-               make_transform_iterator(begin(),
-                                       bind(&MenuItem::submenuname, _1)),
-               make_transform_iterator(end(),
-                                       bind(&MenuItem::submenuname, _1)),
-               name
-               ).base() != end();
-#endif
-}
-
-
 void MenuBackend::read(LyXLex & lex)
 {
        enum Menutags {