X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=294599d1cf3e0042c23799418b6aea525c7b3c9b;hb=701b99ecd70ac472aa53c8b2317af44def4f9670;hp=1f77a866b03020a16cae0c0566ccbba0ce1c1d9f;hpb=aa5aac89dec42cb52415002f6de9c3532613e527;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 1f77a866b0..294599d1cf 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -1,65 +1,211 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor +/** + * \file MenuBackend.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * \author Asger Alstrup + * \author Lars Gullik Bjønnes + * \author Jean-Marc Lasgouttes + * \author André Pönitz + * \author Dekel Tsur + * \author Martin Vermeer * - * - * ====================================================== */ - -#ifdef __GNUG__ -#pragma implementation -#endif + * Full author contact details are available in file CREDITS. + */ #include -#include -#include "support/LAssert.h" + #include "MenuBackend.h" -#include "lyxlex.h" -#include "LyXAction.h" + +#include "BranchList.h" +#include "buffer.h" +#include "bufferlist.h" +#include "bufferparams.h" +#include "CutAndPaste.h" #include "debug.h" +#include "exporter.h" +#include "Floating.h" +#include "FloatList.h" +#include "format.h" #include "gettext.h" +#include "importer.h" +#include "kbmap.h" +#include "lastfiles.h" +#include "LyXAction.h" +#include "lyx_main.h" // for lastfiles +#include "lyxfunc.h" +#include "lyxlex.h" +#include "toc.h" -extern LyXAction lyxaction; +#include "frontends/LyXView.h" +#include "support/filetools.h" +#include "support/lstrings.h" +#include "support/tostr.h" + +#include + +#include + +using lyx::support::compare_ascii_no_case; +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; -MenuItem::MenuItem(Kind kind, string const & label, - string const & command, bool optional) - : kind_(kind), label_(label), optional_(optional) +MenuItem::MenuItem(Kind kind) + : kind_(kind), optional_(false) +{} + + +MenuItem::MenuItem(Kind kind, string const & label, + string const & submenu, bool optional) + : kind_(kind), label_(label), + submenuname_(submenu), optional_(optional) +{ + BOOST_ASSERT(kind == Submenu); +} + + +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() +{} + + +void MenuItem::submenu(Menu * menu) +{ + submenu_.reset(menu); +} + + +string const MenuItem::label() const { - switch(kind) { - case Separator: - case Documents: - case Lastfiles: + return token(label_, '|', 0); +} + + +string const MenuItem::shortcut() const +{ + return token(label_, '|', 1); +} + + +string const MenuItem::binding() const +{ + if (kind_ != Command) + return string(); + + // Get the keys bound to this action, but keep only the + // first one later + kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_); + + if (bindings.size()) { + return bindings.begin()->print(); + } else { + lyxerr[Debug::KBMAP] + << "No binding for " + << lyxaction.getActionName(func_.action) + << '(' << func_.argument << ')' << endl; + return string(); + } + +} + + +Menu & Menu::add(MenuItem const & i, LyXView const * view) +{ + if (!view) { + items_.push_back(i); + return *this; + } + + switch (i.kind()) { + + case MenuItem::Command: { + FuncStatus status = + view->getLyXFunc().getStatus(i.func()); + if (status.unknown() + || (!status.enabled() && i.optional())) + break; + items_.push_back(i); + items_.back().status(status); break; - case Command: - action_ = lyxaction.LookupFunc(command); + } - if (action_ == LFUN_UNKNOWN_ACTION) { - lyxerr << "MenuItem(): LyX command `" - << command << "' does not exist." << endl; + case MenuItem::Submenu: { + if (i.submenu()) { + 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().enabled()) { + enabled = true; + break; + } + } + if (enabled || !i.optional()) { + items_.push_back(i); + items_.back().status().enabled(enabled); + } } - if (optional_) - lyxerr[Debug::GUI] << "Optional item " - << command << endl; - break; - case Submenu: - submenu_ = command; + 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); + } -Menu & Menu::add(MenuItem const & i) -{ - items_.push_back(i); return *this; } @@ -68,23 +214,45 @@ Menu & Menu::read(LyXLex & lex) { enum Menutags { md_item = 1, + md_branches, md_documents, + md_charstyles, md_endmenu, + md_exportformats, + md_importformats, md_lastfiles, md_optitem, - md_submenu, + md_optsubmenu, md_separator, + md_submenu, + md_toc, + md_updateformats, + md_viewformats, + md_floatlistinsert, + md_floatinsert, + md_pasterecent, md_last }; - struct keyword_item menutags[md_last-1] = { + struct keyword_item menutags[md_last - 1] = { + { "branches", md_branches }, + { "charstyles", md_charstyles }, { "documents", md_documents }, { "end", md_endmenu }, + { "exportformats", md_exportformats }, + { "floatinsert", md_floatinsert }, + { "floatlistinsert", md_floatlistinsert }, + { "importformats", md_importformats }, { "item", md_item }, { "lastfiles", md_lastfiles }, - { "optitem", md_optitem }, + { "optitem", md_optitem }, + { "optsubmenu", md_optsubmenu }, + { "pasterecent", md_pasterecent }, { "separator", md_separator }, - { "submenu", md_submenu } + { "submenu", md_submenu }, + { "toc", md_toc }, + { "updateformats", md_updateformats }, + { "viewformats", md_viewformats } }; lex.pushTable(menutags, md_last - 1); @@ -94,47 +262,94 @@ Menu & Menu::read(LyXLex & lex) bool quit = false; bool optional = false; - while (lex.IsOK() && !quit) { - switch(lex.lex()) { + while (lex.isOK() && !quit) { + switch (lex.lex()) { case md_optitem: optional = true; // fallback to md_item case md_item: { - lex.next(); - char * tmp = strdup(lex.GetString().c_str()); - string name = _(tmp); - free(tmp); - lex.next(); - string command = lex.GetString(); - add(MenuItem(MenuItem::Command, name, - command, optional)); + lex.next(true); + string const name = _(lex.getString()); + lex.next(true); + string const command = lex.getString(); + FuncRequest func = lyxaction.lookupFunc(command); + add(MenuItem(MenuItem::Command, name, func, optional)); optional = false; break; } + case md_separator: add(MenuItem(MenuItem::Separator)); break; + case md_lastfiles: add(MenuItem(MenuItem::Lastfiles)); break; + + case md_charstyles: + add(MenuItem(MenuItem::CharStyles)); + break; + case md_documents: add(MenuItem(MenuItem::Documents)); break; + + case md_toc: + add(MenuItem(MenuItem::Toc)); + break; + + case md_viewformats: + add(MenuItem(MenuItem::ViewFormats)); + break; + + case md_updateformats: + add(MenuItem(MenuItem::UpdateFormats)); + break; + + case md_exportformats: + add(MenuItem(MenuItem::ExportFormats)); + break; + + case md_importformats: + add(MenuItem(MenuItem::ImportFormats)); + break; + + case md_floatlistinsert: + add(MenuItem(MenuItem::FloatListInsert)); + break; + + case md_floatinsert: + add(MenuItem(MenuItem::FloatInsert)); + break; + + case md_pasterecent: + add(MenuItem(MenuItem::PasteRecent)); + break; + + case md_branches: + add(MenuItem(MenuItem::Branches)); + break; + + case md_optsubmenu: + optional = true; + // fallback to md_submenu case md_submenu: { - lex.next(); - char * tmp = strdup(lex.GetString().c_str()); - string mlabel = _(tmp); - free(tmp); - lex.next(); - string mname = lex.GetString(); - add(MenuItem(MenuItem::Submenu, mlabel, mname)); + lex.next(true); + string const mlabel = _(lex.getString()); + lex.next(true); + string const mname = lex.getString(); + add(MenuItem(MenuItem::Submenu, mlabel, mname, + optional)); + optional = false; break; } + case md_endmenu: quit = true; break; + default: - lex.printError("menubar::read: " + lex.printError("Menu::read: " "Unknown menu tag: `$$Token'"); break; } @@ -144,6 +359,466 @@ 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(), + bind(&MenuItem::func, _1), + func)) != end(); +} + +void Menu::checkShortcuts() const +{ + // This is a quadratic algorithm, but we do not care because + // menus are short enough + for (const_iterator it1 = begin(); it1 != end(); ++it1) { + string shortcut = it1->shortcut(); + if (shortcut.empty()) + continue; + if (!contains(it1->label(), shortcut)) + lyxerr << "Menu warning: menu entry \"" + << it1->label() + << "\" does not contain shortcut `" + << shortcut << "'." << endl; + for (const_iterator it2 = begin(); it2 != it1 ; ++it2) { + if (!compare_ascii_no_case(it2->shortcut(), shortcut)) { + lyxerr << "Menu warning: menu entries " + << '"' << it1->fulllabel() + << "\" and \"" << it2->fulllabel() + << "\" share the same shortcut." + << endl; + } + } + } +} + + +void MenuBackend::specialMenu(string const &name) +{ + if (hasMenu(name)) + specialmenu_ = &getMenu(name); +} + + +namespace { + +class compare_format { +public: + bool operator()(Format const * p1, Format const * p2) { + return *p1 < *p2; + } +}; + +string const limit_string_length(string const & str) +{ + string::size_type const max_item_length = 45; + + if (str.size() > max_item_length) + return str.substr(0, max_item_length - 3) + "..."; + else + return 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(); + + for (; lfit != end && ii < 10; ++lfit, ++ii) { + string const label = tostr(ii) + ". " + + MakeDisplayPath((*lfit), 30) + + '|' + tostr(ii); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view); + } +} + +void expandDocuments(Menu & tomenu, LyXView const * view) +{ + typedef vector Strings; + Strings const names = bufferlist.getFileNames(); + + if (names.empty()) { + tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), view); + return; + } + + int ii = 1; + Strings::const_iterator docit = names.begin(); + Strings::const_iterator end = names.end(); + for (; docit != end; ++docit, ++ii) { + string label = MakeDisplayPath(*docit, 20); + if (ii < 10) + label = tostr(ii) + ". " + label + '|' + tostr(ii); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *docit)), view); + } +} + + +void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) +{ + if (!view->buffer() && kind != MenuItem::ImportFormats) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), + view); + return; + } + + typedef vector Formats; + Formats formats; + kb_action action; + + switch (kind) { + case MenuItem::ImportFormats: + formats = Importer::GetImportableFormats(); + action = LFUN_IMPORT; + break; + case MenuItem::ViewFormats: + formats = Exporter::GetExportableFormats(*view->buffer(), true); + action = LFUN_PREVIEW; + break; + case MenuItem::UpdateFormats: + formats = Exporter::GetExportableFormats(*view->buffer(), true); + action = LFUN_UPDATE; + break; + default: + formats = Exporter::GetExportableFormats(*view->buffer(), false); + action = LFUN_EXPORT; + } + sort(formats.begin(), formats.end(), compare_format()); + + Formats::const_iterator fit = formats.begin(); + Formats::const_iterator end = formats.end(); + for (; fit != end ; ++fit) { + if ((*fit)->dummy()) + continue; + string label = (*fit)->prettyname(); + // we need to hide the default graphic export formats + // from the external menu, because we need them only + // for the internal lyx-view and external latex run + if (label == "EPS" || label == "XPM" || label == "PNG") + continue; + + if (kind == MenuItem::ImportFormats) { + if ((*fit)->name() == "text") + label = _("ASCII text as lines"); + else if ((*fit)->name() == "textparagraph") + label = _("ASCII text as paragraphs"); + label += "..."; + } + if (!(*fit)->shortcut().empty()) + label += '|' + (*fit)->shortcut(); + + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(action, (*fit)->name())), + view); + } +} + + +void expandFloatListInsert(Menu & tomenu, LyXView const * view) +{ + if (!view->buffer()) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), + view); + return; + } + + FloatList const & floats = + view->buffer()->params().getLyXTextClass().floats(); + FloatList::const_iterator cit = floats.begin(); + FloatList::const_iterator end = floats.end(); + for (; cit != end; ++cit) { + tomenu.add(MenuItem(MenuItem::Command, + _(cit->second.listName()), + FuncRequest(LFUN_FLOAT_LIST, + cit->second.type())), + view); + } +} + + +void expandFloatInsert(Menu & tomenu, LyXView const * view) +{ + if (!view->buffer()) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), + view); + return; + } + + FloatList const & floats = + view->buffer()->params().getLyXTextClass().floats(); + FloatList::const_iterator cit = floats.begin(); + FloatList::const_iterator end = floats.end(); + for (; cit != end; ++cit) { + // normal float + string const label = _(cit->second.name()); + 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); + } +} + + +Menu::size_type const max_number_of_items = 25; + +void expandToc2(Menu & tomenu, + lyx::toc::Toc const & toc_list, + lyx::toc::Toc::size_type from, + lyx::toc::Toc::size_type to, int depth) +{ + int shortcut_count = 0; + if (to - from <= max_number_of_items) { + for (lyx::toc::Toc::size_type i = from; i < to; ++i) { + 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) { + if (label.find(tostr(shortcut_count + 1)) != string::npos) + label += '|' + tostr(++shortcut_count); + } + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(toc_list[i].action()))); + } + } else { + lyx::toc::Toc::size_type pos = from; + while (pos < to) { + lyx::toc::Toc::size_type new_pos = pos + 1; + while (new_pos < to && + toc_list[new_pos].depth > depth) + ++new_pos; + + 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) { + 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()))); + } else { + MenuItem item(MenuItem::Submenu, label); + item.submenu(new Menu); + expandToc2(*item.submenu(), + toc_list, pos, new_pos, depth + 1); + tomenu.add(item); + } + pos = new_pos; + } + } +} + + +void expandToc(Menu & tomenu, LyXView const * view) +{ + // To make things very cleanly, we would have to pass view to + // all MenuItem constructors and to expandToc2. However, we + // know that all the entries in a TOC will be have status_ == + // OK, so we avoid this unnecessary overhead (JMarc) + + if (!view->buffer()) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Documents Open!"), + FuncRequest(LFUN_NOACTION)), + view); + return; + } + + lyx::toc::TocList toc_list = lyx::toc::getTocList(*view->buffer()); + lyx::toc::TocList::const_iterator cit = toc_list.begin(); + lyx::toc::TocList::const_iterator end = toc_list.end(); + for (; cit != end; ++cit) { + // Handle this later + if (cit->first == "TOC") + continue; + + // All the rest is for floats + 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, + FuncRequest(ccit->action()))); + } + string const & floatName = cit->first; + // Is the _(...) really needed here? (Lgb) + MenuItem item(MenuItem::Submenu, _(floatName)); + item.submenu(menu.release()); + tomenu.add(item); + } + + // Handle normal TOC + cit = toc_list.find("TOC"); + if (cit == end) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Table of contents"), + FuncRequest()), + view); + } else { + expandToc2(tomenu, cit->second, 0, cit->second.size(), 0); + } +} + + +void expandPasteRecent(Menu & tomenu, LyXView const * view) +{ + if (!view || !view->buffer()) + return; + + vector const sel = + lyx::cap::availableSelections(*view->buffer()); + + 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, + FuncRequest(LFUN_PASTE, tostr(index)))); + } +} + + +void expandBranches(Menu & tomenu, LyXView const * view) +{ + if (!view || !view->buffer()) + return; + + BufferParams const & params = view->buffer()->params(); + + std::list::const_iterator cit = params.branchlist().begin(); + std::list::const_iterator end = params.branchlist().end(); + + for (int ii = 1; cit != end; ++cit, ++ii) { + string label = cit->getBranch(); + if (ii < 10) + label = tostr(ii) + ". " + label + "|" + tostr(ii); + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_INSERT_BRANCH, + cit->getBranch())), view); + } +} + + +} // namespace anon + + +void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, + LyXView const * view) const +{ + for (Menu::const_iterator cit = frommenu.begin(); + cit != frommenu.end() ; ++cit) { + switch (cit->kind()) { + case MenuItem::Lastfiles: + expandLastfiles(tomenu, view); + break; + + case MenuItem::Documents: + expandDocuments(tomenu, view); + break; + + case MenuItem::ImportFormats: + case MenuItem::ViewFormats: + case MenuItem::UpdateFormats: + case MenuItem::ExportFormats: + expandFormats(cit->kind(), tomenu, view); + break; + + case MenuItem::CharStyles: + expandCharStyleInsert(tomenu, view); + break; + + case MenuItem::FloatListInsert: + expandFloatListInsert(tomenu, view); + break; + + case MenuItem::FloatInsert: + expandFloatInsert(tomenu, view); + break; + + case MenuItem::PasteRecent: + expandPasteRecent(tomenu, view); + break; + + case MenuItem::Branches: + expandBranches(tomenu, view); + break; + + case MenuItem::Toc: + expandToc(tomenu, view); + break; + + case MenuItem::Submenu: { + MenuItem item(*cit); + item.submenu(new Menu(cit->submenuname())); + expand(getMenu(cit->submenuname()), + *item.submenu(), view); + tomenu.add(item, view); + } + break; + + case MenuItem::Separator: + tomenu.add(*cit, view); + break; + + case MenuItem::Command: + if (!specialmenu_ + || !specialmenu_->hasFunc(cit->func())) + tomenu.add(*cit, view); + } + } + + // we do not want the menu to end with a separator + if (!tomenu.empty() + && tomenu.items_.back().kind() == MenuItem::Separator) + tomenu.items_.pop_back(); + + // Check whether the shortcuts are unique + tomenu.checkShortcuts(); +} + + void MenuBackend::read(LyXLex & lex) { enum Menutags { @@ -160,38 +835,32 @@ void MenuBackend::read(LyXLex & lex) }; //consistency check - if (compare_no_case(lex.GetString(), "menuset")) + if (compare_ascii_no_case(lex.getString(), "menuset")) { lyxerr << "Menubackend::read: ERROR wrong token:`" - << lex.GetString() << '\'' << endl; + << lex.getString() << '\'' << endl; + } lex.pushTable(menutags, md_last - 1); if (lyxerr.debugging(Debug::PARSER)) lex.printTable(lyxerr); bool quit = false; - bool menubar = false; - while (lex.IsOK() && !quit) { - switch(lex.lex()) { - case md_menubar: - menubar = true; - // fallback to md_menu + while (lex.isOK() && !quit) { + switch (lex.lex()) { + case md_menubar: + menubar_.read(lex); + break; case md_menu: { - lex.next(); - string name = lex.GetString(); + lex.next(true); + string const name = lex.getString(); if (hasMenu(name)) { - if (getMenu(name).menubar() == menubar) { - getMenu(name).read(lex); - } else { - lex.printError("Cannot append to menu `$$Token' unless it is of the same type"); - return; - } - } else { - Menu menu(name, menubar); + getMenu(name).read(lex); + } else { + Menu menu(name); menu.read(lex); add(menu); } - menubar = false; break; } case md_endmenuset: @@ -207,65 +876,6 @@ void MenuBackend::read(LyXLex & lex) } -void MenuBackend::defaults() -{ - menulist_.clear(); - - lyxerr[Debug::GUI] << "MenuBackend::defaults: using default values" - << endl; - - Menu file("file"); - file - .add(MenuItem(MenuItem::Command, _("New...|N"), "buffer-new")) - .add(MenuItem(MenuItem::Command, _("Open...|O"), "buffer-open")) - .add(MenuItem(MenuItem::Submenu, _("Import|I"), "import")) - .add(MenuItem(MenuItem::Command, _("Quit|Q"), "lyx-quit")) - .add(MenuItem(MenuItem::Separator)) - .add(MenuItem(MenuItem::Lastfiles)); - add(file); - - Menu import("import"); - import - .add(MenuItem(MenuItem::Command, - _("LaTeX...|L"), "buffer-import latex")) - .add(MenuItem(MenuItem::Command, - _("LinuxDoc...|L"), "buffer-import linuxdoc")); - add(import); - - Menu edit("edit"); - edit - .add(MenuItem(MenuItem::Command, _("Cut"), "cut")) - .add(MenuItem(MenuItem::Command, _("Copy"), "copy")) - .add(MenuItem(MenuItem::Command, _("Paste"), "paste")) - .add(MenuItem(MenuItem::Command, _("Emphasize"), "font-emph")); - add(edit); - - Menu documents("documents"); - documents.add(MenuItem(MenuItem::Documents)); - add(documents); - - Menu main("main", true); - main - .add(MenuItem(MenuItem::Submenu, _("File|F"), "file")) - .add(MenuItem(MenuItem::Submenu, _("Edit|E"), "edit")) - .add(MenuItem(MenuItem::Submenu, - _("Documents|D"), "documents")); - add(main); - - Menu main_nobuffer("main_nobuffer", true); - main_nobuffer.add(MenuItem(MenuItem::Submenu, _("File|F"), "file")); - add(main_nobuffer); - - if (lyxerr.debugging(Debug::GUI)) { - for(const_iterator cit = begin(); - cit != end() ; ++cit) - lyxerr << "Menu name: " << cit->name() - << ", Menubar: " << cit->menubar() - << endl; - } -} - - void MenuBackend::add(Menu const & menu) { menulist_.push_back(menu); @@ -274,33 +884,31 @@ void MenuBackend::add(Menu const & menu) bool MenuBackend::hasMenu(string const & name) const { - for (const_iterator cit = begin(); cit != end(); ++cit) { - if ((*cit).name() == name) - return true; - } - return false; + return find_if(begin(), end(), MenuNamesEqual(name)) != end(); } Menu const & MenuBackend::getMenu(string const & name) const { - for (const_iterator cit = begin(); cit != end(); ++cit) { - if ((*cit).name() == name) - return (*cit); - } - Assert(false); // we actually require the name to exist. - return menulist_.front(); + const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name)); + if (cit == end()) + lyxerr << "No submenu named " << name << endl; + BOOST_ASSERT(cit != end()); + return (*cit); } Menu & MenuBackend::getMenu(string const & name) { - for (MenuList::iterator cit = menulist_.begin(); - cit != menulist_.end(); ++cit) { - if ((*cit).name() == name) - return (*cit); - } - Assert(false); // we actually require the name to exist. - return menulist_.front(); + iterator it = find_if(begin(), end(), MenuNamesEqual(name)); + if (it == end()) + lyxerr << "No submenu named " << name << endl; + BOOST_ASSERT(it != end()); + return (*it); } + +Menu const & MenuBackend::getMenubar() const +{ + return menubar_; +}