X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.cpp;h=05aa0b461de1e5833d62a5567ca3ff43d18f251b;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=5c20906999387af23a63ef1325b2ae729881f36d;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp index 5c20906999..05aa0b461d 100644 --- a/src/MenuBackend.cpp +++ b/src/MenuBackend.cpp @@ -23,11 +23,9 @@ #include "BufferParams.h" #include "Converter.h" #include "CutAndPaste.h" -#include "support/debug.h" #include "Floating.h" #include "FloatList.h" #include "Format.h" -#include "support/gettext.h" #include "KeyMap.h" #include "Session.h" #include "LyXAction.h" @@ -39,9 +37,13 @@ #include "TocBackend.h" #include "ToolbarBackend.h" +#include "frontends/Application.h" + +#include "support/convert.h" +#include "support/debug.h" #include "support/filetools.h" +#include "support/gettext.h" #include "support/lstrings.h" -#include "support/convert.h" #include @@ -50,17 +52,13 @@ using namespace std; using boost::bind; +using namespace lyx::support; namespace lyx { -using support::compare_ascii_no_case; -using support::contains; -using support::makeDisplayPath; -using support::token; - namespace { -class MenuNamesEqual : public std::unary_function { +class MenuNamesEqual : public unary_function { public: MenuNamesEqual(docstring const & name) : name_(name) {} @@ -74,10 +72,6 @@ private: } // namespace anon -// This is the global menu definition -MenuBackend menubackend; - - MenuItem::MenuItem(Kind kind) : kind_(kind), optional_(false) {} @@ -122,7 +116,7 @@ docstring const MenuItem::shortcut() const } -docstring const MenuItem::binding(bool forgui) const +docstring const MenuItem::binding() const { if (kind_ != Command) return docstring(); @@ -379,7 +373,7 @@ MenuItem const & Menu::operator[](size_type i) const bool Menu::hasFunc(FuncRequest const & func) const { return find_if(begin(), end(), - bind(std::equal_to(), + bind(equal_to(), bind(&MenuItem::func, _1), func)) != end(); } @@ -410,7 +404,7 @@ void Menu::checkShortcuts() const } -bool Menu::searchFunc(FuncRequest & func, stack & names) +bool Menu::searchFunc(FuncRequest & func, stack & names) const { const_iterator m = begin(); const_iterator m_end = end(); @@ -420,7 +414,7 @@ bool Menu::searchFunc(FuncRequest & func, stack & names) return true; } else if (m->kind() == MenuItem::Submenu) { names.push(m->label()); - Menu submenu = menubackend.getMenu(m->submenuname()); + Menu submenu = theApp()->menuBackend().getMenu(m->submenuname()); if (submenu.searchFunc(func, names)) return true; else @@ -555,6 +549,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) if ((*fit)->dummy()) continue; docstring label = from_utf8((*fit)->prettyname()); + docstring const shortcut = from_utf8((*fit)->shortcut()); switch (kind) { case MenuItem::ImportFormats: @@ -576,8 +571,13 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) BOOST_ASSERT(false); break; } - if (!(*fit)->shortcut().empty()) - label += char_type('|') + from_utf8((*fit)->shortcut()); + // FIXME: if we had proper support for translating the + // format names defined in configure.py, there would + // not be a need to check whether the shortcut is + // correct. If we add it uncondiitonally, it would + // create useless warnings on bad shortcuts + if (!shortcut.empty() && contains(label, shortcut)) + label += char_type('|') + shortcut; if (buf) tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, @@ -599,7 +599,7 @@ void expandFloatListInsert(Menu & tomenu, Buffer const * buf) } FloatList const & floats = - buf->params().getTextClass().floats(); + buf->params().textClass().floats(); FloatList::const_iterator cit = floats.begin(); FloatList::const_iterator end = floats.end(); for (; cit != end; ++cit) { @@ -621,7 +621,7 @@ void expandFloatInsert(Menu & tomenu, Buffer const * buf) } FloatList const & floats = - buf->params().getTextClass().floats(); + buf->params().textClass().floats(); FloatList::const_iterator cit = floats.begin(); FloatList::const_iterator end = floats.end(); for (; cit != end; ++cit) { @@ -634,7 +634,7 @@ void expandFloatInsert(Menu & tomenu, Buffer const * buf) } -void expandFlexInsert(Menu & tomenu, Buffer const * buf, std::string s) +void expandFlexInsert(Menu & tomenu, Buffer const * buf, string s) { if (!buf) { tomenu.add(MenuItem(MenuItem::Command, @@ -642,13 +642,13 @@ void expandFlexInsert(Menu & tomenu, Buffer const * buf, std::string s) FuncRequest(LFUN_NOACTION))); return; } - InsetLayouts const & insetlayouts = - buf->params().getTextClass().insetlayouts(); - InsetLayouts::const_iterator cit = insetlayouts.begin(); - InsetLayouts::const_iterator end = insetlayouts.end(); + InsetLayouts const & insetLayouts = + buf->params().textClass().insetLayouts(); + InsetLayouts::const_iterator cit = insetLayouts.begin(); + InsetLayouts::const_iterator end = insetLayouts.end(); for (; cit != end; ++cit) { docstring const label = cit->first; - if (cit->second.lyxtype == s) + if (cit->second.lyxtype() == s) tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FLEX_INSERT, label))); @@ -668,7 +668,7 @@ void expandToc2(Menu & tomenu, // check whether depth is smaller than the smallest depth in toc. int min_depth = 1000; for (Toc::size_type i = from; i < to; ++i) - min_depth = std::min(min_depth, toc_list[i].depth()); + min_depth = min(min_depth, toc_list[i].depth()); if (min_depth > depth) depth = min_depth; @@ -743,7 +743,7 @@ void expandToc(Menu & tomenu, Buffer const * buf) tomenu.add(MenuItem(MenuItem::Command, _("Master Document"), f)); } - FloatList const & floatlist = buf->params().getTextClass().floats(); + FloatList const & floatlist = buf->params().textClass().floats(); TocList const & toc_list = buf->tocBackend().tocs(); TocList::const_iterator cit = toc_list.begin(); TocList::const_iterator end = toc_list.end(); @@ -768,8 +768,18 @@ void expandToc(Menu & tomenu, Buffer const * buf) label = _(floatName); // BUG3633: listings is not a proper float so its name // is not shown in floatlist. + else if (cit->first == "equation") + label = _("List of Equations"); + else if (cit->first == "index") + label = _("List of Indexes"); else if (cit->first == "listing") - label = _("List of listings"); + label = _("List of Listings"); + else if (cit->first == "marginalnote") + label = _("List of Marginal notes"); + else if (cit->first == "note") + label = _("List of Notes"); + else if (cit->first == "footnote") + label = _("List of Foot notes"); // this should not happen now, but if something else like // listings is added later, this can avoid an empty menu name. else