X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=7eb3166240c89da740ae6fb440557141c30e2617;hb=de3c8e5b80effa940c92980032389c868f377d6b;hp=d043b8313cdd86f1bb694c33923797a4befae768;hpb=f9c1cafbe6b7095bb520891de9b93a2495e3a9a8;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index d043b8313c..7eb3166240 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -40,68 +40,71 @@ #include "frontends/LyXView.h" #include "support/filetools.h" -#include "support/LAssert.h" -#include "support/lyxfunctional.h" #include "support/lstrings.h" #include "support/tostr.h" +#include + #include -extern BufferList bufferlist; -extern boost::scoped_ptr toplevel_keymap; +using lyx::support::compare_ascii_no_case; +using lyx::support::contains; +using lyx::support::MakeDisplayPath; +using lyx::support::token; -using namespace lyx::support; +using boost::bind; +using std::auto_ptr; using std::endl; +using std::equal_to; using std::find_if; using std::max; using std::sort; - +using std::string; using std::vector; + +extern BufferList bufferlist; +extern boost::scoped_ptr toplevel_keymap; + +namespace { + +class MenuNamesEqual : public std::unary_function { +public: + MenuNamesEqual(string const & name) + : name_(name) {} + bool operator()(Menu const & menu) const + { + return menu.name() == name_; + } +private: + string name_; +}; + +} // namespace anon + + // This is the global menu definition MenuBackend menubackend; +MenuItem::MenuItem(Kind kind) + : kind_(kind), optional_(false) +{} + + MenuItem::MenuItem(Kind kind, string const & label, - string const & command, bool optional) - : kind_(kind), label_(label), optional_(optional) + string const & submenu, bool optional) + : kind_(kind), label_(label), + submenuname_(submenu), optional_(optional) { - switch (kind) { - case Separator: - case Documents: - case Lastfiles: - case Toc: - case ViewFormats: - case UpdateFormats: - case ExportFormats: - case ImportFormats: - case FloatListInsert: - case FloatInsert: - case PasteRecent: - case Branches: - break; - case Command: - action_ = lyxaction.LookupFunc(command); - - if (action_ == LFUN_UNKNOWN_ACTION) { - lyxerr << "MenuItem(): LyX command `" - << command << "' does not exist." << endl; - } - if (optional_) - lyxerr[Debug::GUI] << "Optional item " - << command << endl; - break; - case Submenu: - submenuname_ = command; - break; - } + BOOST_ASSERT(kind == Submenu); } -MenuItem::MenuItem(Kind kind, string const & label, int action, bool optional) - : kind_(kind), label_(label), action_(action), submenuname_(), - optional_(optional) +MenuItem::MenuItem(Kind kind, string const & label, + FuncRequest const & func, bool optional) + : kind_(kind), label_(label), func_(func), optional_(optional) {} @@ -126,6 +129,7 @@ string const MenuItem::shortcut() const return token(label_, '|', 1); } + string const MenuItem::binding() const { if (kind_ != Command) @@ -133,12 +137,18 @@ string const MenuItem::binding() const // Get the keys bound to this action, but keep only the // first one later - string bindings = toplevel_keymap->findbinding(action_); + string bindings = toplevel_keymap->findbinding(func_); if (!bindings.empty()) { return bindings.substr(1, bindings.find(']') - 1); - } else + } else { + lyxerr[Debug::KBMAP] + << "No bindings for " + << lyxaction.getActionName(func_.action) + << '(' << func_.argument << ')' << endl; return string(); + } + } @@ -150,44 +160,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.action()); + 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); } @@ -202,6 +214,7 @@ Menu & Menu::read(LyXLex & lex) md_item = 1, md_branches, md_documents, + md_charstyles, md_endmenu, md_exportformats, md_importformats, @@ -221,6 +234,7 @@ Menu & Menu::read(LyXLex & lex) struct keyword_item menutags[md_last - 1] = { { "branches", md_branches }, + { "charstyles", md_charstyles }, { "documents", md_documents }, { "end", md_endmenu }, { "exportformats", md_exportformats }, @@ -256,8 +270,8 @@ Menu & Menu::read(LyXLex & lex) string const name = _(lex.getString()); lex.next(true); string const command = lex.getString(); - add(MenuItem(MenuItem::Command, name, - command, optional)); + FuncRequest func = lyxaction.lookupFunc(command); + add(MenuItem(MenuItem::Command, name, func, optional)); optional = false; break; } @@ -270,6 +284,10 @@ Menu & Menu::read(LyXLex & lex) add(MenuItem(MenuItem::Lastfiles)); break; + case md_charstyles: + add(MenuItem(MenuItem::CharStyles)); + break; + case md_documents: add(MenuItem(MenuItem::Documents)); break; @@ -387,18 +405,17 @@ string const limit_string_length(string const & str) void expandLastfiles(Menu & tomenu, LyXView const * view) { + LastFiles const & lastfiles = LyX::cref().lastfiles(); + int ii = 1; - LastFiles::const_iterator lfit = lastfiles->begin(); - LastFiles::const_iterator end = lastfiles->end(); + LastFiles::const_iterator lfit = lastfiles.begin(); + LastFiles::const_iterator end = lastfiles.end(); for (; lfit != end && ii < 10; ++lfit, ++ii) { string const label = tostr(ii) + ". " + MakeDisplayPath((*lfit), 30) + '|' + tostr(ii); - int const action = lyxaction. - getPseudoAction(LFUN_FILE_OPEN, - (*lfit)); - tomenu.add(MenuItem(MenuItem::Command, label, action), view); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view); } } @@ -409,7 +426,7 @@ void expandDocuments(Menu & tomenu, LyXView const * view) if (names.empty()) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), - LFUN_NOACTION), view); + FuncRequest(LFUN_NOACTION)), view); return; } @@ -417,12 +434,10 @@ void expandDocuments(Menu & tomenu, LyXView const * view) Strings::const_iterator docit = names.begin(); Strings::const_iterator end = names.end(); for (; docit != end; ++docit, ++ii) { - int const action = - lyxaction.getPseudoAction(LFUN_SWITCHBUFFER, *docit); string label = MakeDisplayPath(*docit, 20); if (ii < 10) label = tostr(ii) + ". " + label + '|' + tostr(ii); - tomenu.add(MenuItem(MenuItem::Command, label, action), view); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view); } } @@ -431,7 +446,8 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) { if (!view->buffer() && kind != MenuItem::ImportFormats) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), LFUN_NOACTION), + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), view); return; } @@ -480,9 +496,9 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) } if (!(*fit)->shortcut().empty()) label += '|' + (*fit)->shortcut(); - int const action2 = lyxaction. - getPseudoAction(action, (*fit)->name()); - tomenu.add(MenuItem(MenuItem::Command, label, action2), + + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(action, (*fit)->name())), view); } } @@ -492,7 +508,8 @@ void expandFloatListInsert(Menu & tomenu, LyXView const * view) { if (!view->buffer()) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), LFUN_NOACTION), + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), view); return; } @@ -502,10 +519,10 @@ void expandFloatListInsert(Menu & tomenu, LyXView const * view) FloatList::const_iterator cit = floats.begin(); FloatList::const_iterator end = floats.end(); for (; cit != end; ++cit) { - int const action = lyxaction - .getPseudoAction(LFUN_FLOAT_LIST, cit->second.type()); tomenu.add(MenuItem(MenuItem::Command, - _(cit->second.listName()), action), + _(cit->second.listName()), + FuncRequest(LFUN_FLOAT_LIST, + cit->second.type())), view); } } @@ -515,7 +532,8 @@ void expandFloatInsert(Menu & tomenu, LyXView const * view) { if (!view->buffer()) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), LFUN_NOACTION), + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), view); return; } @@ -526,12 +544,33 @@ void expandFloatInsert(Menu & tomenu, LyXView const * view) FloatList::const_iterator end = floats.end(); for (; cit != end; ++cit) { // normal float - int const action = - lyxaction.getPseudoAction(LFUN_INSET_FLOAT, - cit->second.type()); string const label = _(cit->second.name()); - tomenu.add(MenuItem(MenuItem::Command, label, action), + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_INSET_FLOAT, + cit->second.type())), + view); + } +} + + +void expandCharStyleInsert(Menu & tomenu, LyXView const * view) +{ + if (!view->buffer()) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), view); + return; + } + CharStyles & charstyles = + view->buffer()->params().getLyXTextClass().charstyles(); + CharStyles::iterator cit = charstyles.begin(); + CharStyles::iterator end = charstyles.end(); + for (; cit != end; ++cit) { + string const label = cit->name; + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_INSERT_CHARSTYLE, + cit->name)), view); } } @@ -546,14 +585,15 @@ void expandToc2(Menu & tomenu, int shortcut_count = 0; if (to - from <= max_number_of_items) { for (lyx::toc::Toc::size_type i = from; i < to; ++i) { - int const action = toc_list[i].action(); string label(4 * max(0, toc_list[i].depth - depth),' '); label += limit_string_length(toc_list[i].str); if (toc_list[i].depth == depth - && ++shortcut_count <= 9) { - label += '|' + tostr(shortcut_count); + && shortcut_count < 9) { + if (label.find(tostr(shortcut_count + 1)) != string::npos) + label += '|' + tostr(++shortcut_count); } - tomenu.add(MenuItem(MenuItem::Command, label, action)); + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(toc_list[i].action()))); } } else { lyx::toc::Toc::size_type pos = from; @@ -563,16 +603,16 @@ void expandToc2(Menu & tomenu, toc_list[new_pos].depth > depth) ++new_pos; - int const action = toc_list[pos].action(); string label(4 * max(0, toc_list[pos].depth - depth), ' '); label += limit_string_length(toc_list[pos].str); if (toc_list[pos].depth == depth && - ++shortcut_count <= 9) - label += '|' + tostr(shortcut_count); - + shortcut_count < 9) { + if (label.find(tostr(shortcut_count + 1)) != string::npos) + label += '|' + tostr(++shortcut_count); + } if (new_pos == pos + 1) { tomenu.add(MenuItem(MenuItem::Command, - label, action)); + label, FuncRequest(toc_list[pos].action()))); } else { MenuItem item(MenuItem::Submenu, label); item.submenu(new Menu); @@ -595,7 +635,8 @@ void expandToc(Menu & tomenu, LyXView const * view) if (!view->buffer()) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), LFUN_NOACTION), + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), view); return; } @@ -609,18 +650,19 @@ void expandToc(Menu & tomenu, LyXView const * view) continue; // All the rest is for floats - Menu * menu = new Menu; + auto_ptr menu(new Menu); lyx::toc::Toc::const_iterator ccit = cit->second.begin(); lyx::toc::Toc::const_iterator eend = cit->second.end(); for (; ccit != eend; ++ccit) { string const label = limit_string_length(ccit->str); menu->add(MenuItem(MenuItem::Command, - label, ccit->action())); + label, + FuncRequest(ccit->action()))); } string const & floatName = cit->first; // Is the _(...) really needed here? (Lgb) MenuItem item(MenuItem::Submenu, _(floatName)); - item.submenu(menu); + item.submenu(menu.release()); tomenu.add(item); } @@ -628,7 +670,8 @@ void expandToc(Menu & tomenu, LyXView const * view) cit = toc_list.find("TOC"); if (cit == end) { tomenu.add(MenuItem(MenuItem::Command, - _("No Table of contents")), + _("No Table of contents"), + FuncRequest()), view); } else { expandToc2(tomenu, cit->second, 0, cit->second.size(), 0); @@ -641,16 +684,15 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view) if (!view || !view->buffer()) return; - vector const selL = - CutAndPaste::availableSelections(*view->buffer()); + vector const sel = + lyx::cap::availableSelections(*view->buffer()); - vector::const_iterator cit = selL.begin(); - vector::const_iterator end = selL.end(); + vector::const_iterator cit = sel.begin(); + vector::const_iterator end = sel.end(); for (unsigned int index = 0; cit != end; ++cit, ++index) { - int const action = lyxaction.getPseudoAction(LFUN_PASTE, - tostr(index)); - tomenu.add(MenuItem(MenuItem::Command, *cit, action)); + tomenu.add(MenuItem(MenuItem::Command, *cit, + FuncRequest(LFUN_PASTE, tostr(index)))); } } @@ -667,12 +709,11 @@ void expandBranches(Menu & tomenu, LyXView const * view) for (int ii = 1; cit != end; ++cit, ++ii) { string label = cit->getBranch(); - int const action = lyxaction. - getPseudoAction(LFUN_INSERT_BRANCH, - (cit->getBranch())); if (ii < 10) label = tostr(ii) + ". " + label + "|" + tostr(ii); - tomenu.add(MenuItem(MenuItem::Command, label, action), view); + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_INSERT_BRANCH, + cit->getBranch())), view); } } @@ -701,6 +742,10 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, expandFormats(cit->kind(), tomenu, view); break; + case MenuItem::CharStyles: + expandCharStyleInsert(tomenu, view); + break; + case MenuItem::FloatListInsert: expandFloatListInsert(tomenu, view); break; @@ -747,9 +792,22 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, bool Menu::hasSubmenu(string const & name) const { +#if 1 return find_if(begin(), end(), - lyx::compare_memfun(&MenuItem::submenuname, - name)) != end(); + bind(std::equal_to(), + 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 } @@ -818,28 +876,26 @@ void MenuBackend::add(Menu const & menu) bool MenuBackend::hasMenu(string const & name) const { - return find_if(begin(), end(), - lyx::compare_memfun(&Menu::name, name)) != end(); + return find_if(begin(), end(), MenuNamesEqual(name)) != end(); } Menu const & MenuBackend::getMenu(string const & name) const { - const_iterator cit = find_if(begin(), end(), - lyx::compare_memfun(&Menu::name, name)); + const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name)); if (cit == end()) lyxerr << "No submenu named " << name << endl; - Assert(cit != end()); + BOOST_ASSERT(cit != end()); return (*cit); } Menu & MenuBackend::getMenu(string const & name) { - MenuList::iterator it = - find_if(menulist_.begin(), menulist_.end(), - lyx::compare_memfun(&Menu::name, name)); - Assert(it != menulist_.end()); + iterator it = find_if(begin(), end(), MenuNamesEqual(name)); + if (it == end()) + lyxerr << "No submenu named " << name << endl; + BOOST_ASSERT(it != end()); return (*it); }