X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=7eb3166240c89da740ae6fb440557141c30e2617;hb=de3c8e5b80effa940c92980032389c868f377d6b;hp=d3b9e8a205f3bbc2df90f7c86d4d2cb7ad384a4e;hpb=495cd0eea03f9f5471a247e60ce70abfd1114ada;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index d3b9e8a205..7eb3166240 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -40,10 +40,11 @@ #include "frontends/LyXView.h" #include "support/filetools.h" -#include "support/lyxfunctional.h" #include "support/lstrings.h" #include "support/tostr.h" +#include + #include using lyx::support::compare_ascii_no_case; @@ -51,17 +52,38 @@ using lyx::support::contains; using lyx::support::MakeDisplayPath; using lyx::support::token; +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; @@ -120,9 +142,10 @@ string const MenuItem::binding() const if (!bindings.empty()) { return bindings.substr(1, bindings.find(']') - 1); } else { - lyxerr << "No bindings for " - << lyxaction.getActionName(func_.action) - << '(' << func_.argument << ')' << endl; + lyxerr[Debug::KBMAP] + << "No bindings for " + << lyxaction.getActionName(func_.action) + << '(' << func_.argument << ')' << endl; return string(); } @@ -137,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.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); } @@ -189,6 +214,7 @@ Menu & Menu::read(LyXLex & lex) md_item = 1, md_branches, md_documents, + md_charstyles, md_endmenu, md_exportformats, md_importformats, @@ -208,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 }, @@ -257,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; @@ -374,9 +405,11 @@ 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) + ". " @@ -520,6 +553,28 @@ void expandFloatInsert(Menu & tomenu, LyXView const * 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); + } +} + + Menu::size_type const max_number_of_items = 25; void expandToc2(Menu & tomenu, @@ -533,8 +588,9 @@ void expandToc2(Menu & tomenu, 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, FuncRequest(toc_list[i].action()))); @@ -550,9 +606,10 @@ void expandToc2(Menu & tomenu, 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, FuncRequest(toc_list[pos].action()))); @@ -593,7 +650,7 @@ 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) { @@ -605,7 +662,7 @@ void expandToc(Menu & tomenu, LyXView const * view) 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); } @@ -627,11 +684,11 @@ 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) { tomenu.add(MenuItem(MenuItem::Command, *cit, @@ -685,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; @@ -731,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 } @@ -802,15 +876,13 @@ 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; BOOST_ASSERT(cit != end()); @@ -820,10 +892,10 @@ Menu const & MenuBackend::getMenu(string const & name) const Menu & MenuBackend::getMenu(string const & name) { - MenuList::iterator it = - find_if(menulist_.begin(), menulist_.end(), - lyx::compare_memfun(&Menu::name, name)); - BOOST_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); }