X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=5419f6d8b718fb8ffa923724cd6e2073d18e3481;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=6c85230a470fe310c3a9e4f6557bb7e8e6411aa9;hpb=1396c7326234f0ee41488e8b8e3d9c57c6a0a2d0;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 6c85230a47..5419f6d8b7 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -19,6 +19,7 @@ #include "BranchList.h" #include "buffer.h" +#include "bufferlist.h" #include "bufferparams.h" #include "CutAndPaste.h" #include "debug.h" @@ -34,10 +35,9 @@ #include "lyx_main.h" // for lastfiles #include "lyxfunc.h" #include "lyxlex.h" -#include "toc.h" - -#include "frontends/Application.h" -#include "frontends/LyXView.h" +#include "paragraph.h" +#include "TocBackend.h" +#include "ToolbarBackend.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -47,13 +47,15 @@ #include -using lyx::char_type; -using lyx::docstring; -using lyx::support::compare_no_case; -using lyx::support::compare_ascii_no_case; -using lyx::support::contains; -using lyx::support::makeDisplayPath; -using lyx::support::token; + +namespace lyx { + +using support::compare_no_case; +using support::compare_ascii_no_case; +using support::contains; +using support::makeDisplayPath; +using support::token; +using support::uppercase; using boost::bind; @@ -67,8 +69,6 @@ using std::string; using std::vector; -extern boost::scoped_ptr toplevel_keymap; - namespace { class MenuNamesEqual : public std::unary_function { @@ -108,7 +108,7 @@ MenuItem::MenuItem(Kind kind, docstring const & label, FuncRequest const & func, bool optional) : kind_(kind), label_(label), func_(func), optional_(optional) { - func_.origin = FuncRequest::UI; + func_.origin = FuncRequest::MENU; } @@ -134,42 +134,42 @@ docstring const MenuItem::shortcut() const } -docstring const MenuItem::binding() const +docstring const MenuItem::binding(bool forgui) const { if (kind_ != Command) return docstring(); // Get the keys bound to this action, but keep only the // first one later - kb_keymap::Bindings bindings = toplevel_keymap->findbindings(func_); + kb_keymap::Bindings bindings = theTopLevelKeymap().findbindings(func_); if (bindings.size()) { - return lyx::from_utf8(bindings.begin()->print()); + return bindings.begin()->print(forgui); } else { lyxerr[Debug::KBMAP] << "No binding for " << lyxaction.getActionName(func_.action) - << '(' << lyx::to_utf8(func_.argument()) << ')' << endl; + << '(' << to_utf8(func_.argument()) << ')' << endl; return docstring(); } } -Menu & Menu::add(MenuItem const & i, LyXView const * view) +Menu & Menu::add(MenuItem const & i) { - if (!view) { - items_.push_back(i); - return *this; - } + items_.push_back(i); + return *this; +} + +Menu & Menu::addWithStatusCheck(MenuItem const & i) +{ switch (i.kind()) { case MenuItem::Command: { - FuncStatus status = - view->getLyXFunc().getStatus(i.func()); - if (status.unknown() - || (!status.enabled() && i.optional())) + FuncStatus status = lyx::getStatus(i.func()); + if (status.unknown() || (!status.enabled() && i.optional())) break; items_.push_back(i); items_.back().status(status); @@ -218,6 +218,7 @@ Menu & Menu::read(LyXLex & lex) md_item = 1, md_branches, md_documents, + md_bookmarks, md_charstyles, md_endmenu, md_exportformats, @@ -233,10 +234,12 @@ Menu & Menu::read(LyXLex & lex) md_floatlistinsert, md_floatinsert, md_pasterecent, + md_toolbars, md_last }; struct keyword_item menutags[md_last - 1] = { + { "bookmarks", md_bookmarks }, { "branches", md_branches }, { "charstyles", md_charstyles }, { "documents", md_documents }, @@ -253,6 +256,7 @@ Menu & Menu::read(LyXLex & lex) { "separator", md_separator }, { "submenu", md_submenu }, { "toc", md_toc }, + { "toolbars", md_toolbars }, { "updateformats", md_updateformats }, { "viewformats", md_viewformats } }; @@ -271,7 +275,7 @@ Menu & Menu::read(LyXLex & lex) // fallback to md_item case md_item: { lex.next(true); - docstring const name = _(lex.getString()); + docstring const name = translateIfPossible(lex.getDocString()); lex.next(true); string const command = lex.getString(); FuncRequest func = lyxaction.lookupFunc(command); @@ -296,6 +300,10 @@ Menu & Menu::read(LyXLex & lex) add(MenuItem(MenuItem::Documents)); break; + case md_bookmarks: + add(MenuItem(MenuItem::Bookmarks)); + break; + case md_toc: add(MenuItem(MenuItem::Toc)); break; @@ -328,6 +336,10 @@ Menu & Menu::read(LyXLex & lex) add(MenuItem(MenuItem::PasteRecent)); break; + case md_toolbars: + add(MenuItem(MenuItem::Toolbars)); + break; + case md_branches: add(MenuItem(MenuItem::Branches)); break; @@ -337,9 +349,9 @@ Menu & Menu::read(LyXLex & lex) // fallback to md_submenu case md_submenu: { lex.next(true); - docstring const mlabel = _(lex.getString()); + docstring const mlabel = translateIfPossible(lex.getDocString()); lex.next(true); - docstring const mname = lyx::from_utf8(lex.getString()); + docstring const mname = lex.getDocString(); add(MenuItem(MenuItem::Submenu, mlabel, mname, optional)); optional = false; @@ -385,14 +397,14 @@ void Menu::checkShortcuts() const continue; if (!contains(it1->label(), shortcut)) lyxerr << "Menu warning: menu entry \"" - << lyx::to_utf8(it1->label()) + << to_utf8(it1->label()) << "\" does not contain shortcut `" - << lyx::to_utf8(shortcut) << "'." << endl; + << to_utf8(shortcut) << "'." << endl; for (const_iterator it2 = begin(); it2 != it1 ; ++it2) { if (!compare_no_case(it2->shortcut(), shortcut)) { lyxerr << "Menu warning: menu entries " - << '"' << lyx::to_utf8(it1->fulllabel()) - << "\" and \"" << lyx::to_utf8(it2->fulllabel()) + << '"' << to_utf8(it1->fulllabel()) + << "\" and \"" << to_utf8(it2->fulllabel()) << "\" share the same shortcut." << endl; } @@ -401,10 +413,9 @@ void Menu::checkShortcuts() const } -void MenuBackend::specialMenu(docstring const &name) +void MenuBackend::specialMenu(Menu const & menu) { - if (hasMenu(name)) - specialmenu_ = &getMenu(name); + specialmenu_ = menu; } @@ -417,9 +428,9 @@ public: } }; -string const limit_string_length(string const & str) +docstring const limit_string_length(docstring const & str) { - string::size_type const max_item_length = 45; + docstring::size_type const max_item_length = 45; if (str.size() > max_item_length) return str.substr(0, max_item_length - 3) + "..."; @@ -428,30 +439,31 @@ string const limit_string_length(string const & str) } -void expandLastfiles(Menu & tomenu, LyXView const * view) +void expandLastfiles(Menu & tomenu) { - lyx::Session::LastFiles const & lf = LyX::cref().session().lastFiles(); - lyx::Session::LastFiles::const_iterator lfit = lf.begin(); + lyx::LastFilesSection::LastFiles const & lf = LyX::cref().session().lastFiles().lastFiles(); + lyx::LastFilesSection::LastFiles::const_iterator lfit = lf.begin(); int ii = 1; for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) { - docstring const label = convert(ii) + lyx::from_ascii(". ") - + makeDisplayPath((*lfit), 30) + string const file = lfit->absFilename(); + docstring const label = convert(ii) + ". " + + makeDisplayPath(file, 30) + char_type('|') + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, file))); } } -void expandDocuments(Menu & tomenu, LyXView const * view) +void expandDocuments(Menu & tomenu) { typedef vector Strings; - Strings const names = theApp->bufferList().getFileNames(); + Strings const names = theBufferList().getFileNames(); if (names.empty()) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), - FuncRequest(LFUN_NOACTION)), view); + FuncRequest(LFUN_NOACTION))); return; } @@ -461,19 +473,34 @@ void expandDocuments(Menu & tomenu, LyXView const * view) for (; docit != end; ++docit, ++ii) { docstring label = makeDisplayPath(*docit, 20); if (ii < 10) - label = convert(ii) + lyx::from_ascii(". ") + label + char_type('|') + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit)), view); + label = convert(ii) + ". " + label + char_type('|') + convert(ii); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit))); + } +} + + +void expandBookmarks(Menu & tomenu) +{ + lyx::BookmarksSection const & bm = LyX::cref().session().bookmarks(); + + for (size_t i = 1; i <= bm.size(); ++i) { + if (bm.isValid(i)) { + docstring const label = convert(i) + ". " + + makeDisplayPath(bm.bookmark(i).filename.absFilename(), 20) + + char_type('|') + convert(i); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BOOKMARK_GOTO, + convert(i)))); + } } } -void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) +void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) { - if (!view->buffer() && kind != MenuItem::ImportFormats) { + if (!buf && kind != MenuItem::ImportFormats) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), - FuncRequest(LFUN_NOACTION)), - view); + FuncRequest(LFUN_NOACTION))); return; } @@ -487,15 +514,15 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) action = LFUN_BUFFER_IMPORT; break; case MenuItem::ViewFormats: - formats = Exporter::getExportableFormats(*view->buffer(), true); + formats = Exporter::getExportableFormats(*buf, true); action = LFUN_BUFFER_VIEW; break; case MenuItem::UpdateFormats: - formats = Exporter::getExportableFormats(*view->buffer(), true); + formats = Exporter::getExportableFormats(*buf, true); action = LFUN_BUFFER_UPDATE; break; default: - formats = Exporter::getExportableFormats(*view->buffer(), false); + formats = Exporter::getExportableFormats(*buf, false); action = LFUN_BUFFER_EXPORT; } sort(formats.begin(), formats.end(), compare_format()); @@ -505,15 +532,17 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) for (; fit != end ; ++fit) { if ((*fit)->dummy()) continue; - docstring label = lyx::from_utf8((*fit)->prettyname()); + docstring label = from_utf8((*fit)->prettyname()); switch (kind) { case MenuItem::ImportFormats: + // FIXME: This is a hack, we should rather solve + // FIXME: bug 2488 instead. if ((*fit)->name() == "text") - label = _("Plain Text as Lines"); + label = _("Plain Text"); else if ((*fit)->name() == "textparagraph") - label = _("Plain Text as Paragraphs"); - label += lyx::from_ascii("..."); + label = _("Plain Text, Join Lines"); + label += "..."; break; case MenuItem::ViewFormats: case MenuItem::ExportFormats: @@ -526,82 +555,80 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) break; } if (!(*fit)->shortcut().empty()) - label += char_type('|') + lyx::from_utf8((*fit)->shortcut()); + label += char_type('|') + from_utf8((*fit)->shortcut()); - tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(action, (*fit)->name())), - view); + if (buf) + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, + FuncRequest(action, (*fit)->name()))); + else + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(action, (*fit)->name()))); } } -void expandFloatListInsert(Menu & tomenu, LyXView const * view) +void expandFloatListInsert(Menu & tomenu, Buffer const * buf) { - if (!view->buffer()) { + if (!buf) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), - FuncRequest(LFUN_NOACTION)), - view); + FuncRequest(LFUN_NOACTION))); return; } FloatList const & floats = - view->buffer()->params().getLyXTextClass().floats(); + buf->params().getLyXTextClass().floats(); FloatList::const_iterator cit = floats.begin(); FloatList::const_iterator end = floats.end(); for (; cit != end; ++cit) { - tomenu.add(MenuItem(MenuItem::Command, + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, _(cit->second.listName()), FuncRequest(LFUN_FLOAT_LIST, - cit->second.type())), - view); + cit->second.type()))); } } -void expandFloatInsert(Menu & tomenu, LyXView const * view) +void expandFloatInsert(Menu & tomenu, Buffer const * buf) { - if (!view->buffer()) { + if (!buf) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), - FuncRequest(LFUN_NOACTION)), - view); + FuncRequest(LFUN_NOACTION))); return; } FloatList const & floats = - view->buffer()->params().getLyXTextClass().floats(); + buf->params().getLyXTextClass().floats(); FloatList::const_iterator cit = floats.begin(); FloatList::const_iterator end = floats.end(); for (; cit != end; ++cit) { // normal float docstring const label = _(cit->second.name()); - tomenu.add(MenuItem(MenuItem::Command, label, + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FLOAT_INSERT, - cit->second.type())), - view); + cit->second.type()))); } } -void expandCharStyleInsert(Menu & tomenu, LyXView const * view) +void expandCharStyleInsert(Menu & tomenu, Buffer const * buf) { - if (!view->buffer()) { + if (!buf) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), - FuncRequest(LFUN_NOACTION)), - view); + FuncRequest(LFUN_NOACTION))); return; } CharStyles & charstyles = - view->buffer()->params().getLyXTextClass().charstyles(); + buf->params().getLyXTextClass().charstyles(); CharStyles::iterator cit = charstyles.begin(); CharStyles::iterator end = charstyles.end(); for (; cit != end; ++cit) { - docstring const label = lyx::from_utf8(cit->name); - tomenu.add(MenuItem(MenuItem::Command, label, + docstring const label = from_utf8(cit->name); + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_CHARSTYLE_INSERT, - cit->name)), view); + label))); } } @@ -609,24 +636,24 @@ void expandCharStyleInsert(Menu & tomenu, LyXView const * 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) + Toc const & toc_list, + Toc::size_type from, + Toc::size_type to, int depth) { int shortcut_count = 0; // check whether depth is smaller than the smallest depth in toc. int min_depth = 1000; - for (lyx::toc::Toc::size_type i = from; i < to; ++i) + for (Toc::size_type i = from; i < to; ++i) min_depth = std::min(min_depth, toc_list[i].depth()); if (min_depth > depth) depth = min_depth; if (to - from <= max_number_of_items) { - for (lyx::toc::Toc::size_type i = from; i < to; ++i) { + for (Toc::size_type i = from; i < to; ++i) { docstring label(4 * max(0, toc_list[i].depth() - depth), char_type(' ')); - label += lyx::from_utf8(limit_string_length(toc_list[i].str())); + label += limit_string_length(toc_list[i].str()); if (toc_list[i].depth() == depth && shortcut_count < 9) { if (label.find(convert(shortcut_count + 1)) != docstring::npos) @@ -636,20 +663,20 @@ void expandToc2(Menu & tomenu, FuncRequest(toc_list[i].action()))); } } else { - lyx::toc::Toc::size_type pos = from; + Toc::size_type pos = from; while (pos < to) { - lyx::toc::Toc::size_type new_pos = pos + 1; + Toc::size_type new_pos = pos + 1; while (new_pos < to && toc_list[new_pos].depth() > depth) ++new_pos; docstring label(4 * max(0, toc_list[pos].depth() - depth), ' '); - label += lyx::from_utf8(limit_string_length(toc_list[pos].str())); + label += limit_string_length(toc_list[pos].str()); if (toc_list[pos].depth() == depth && shortcut_count < 9) { if (label.find(convert(shortcut_count + 1)) != docstring::npos) label += char_type('|') + convert(++shortcut_count); - } + } if (new_pos == pos + 1) { tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(toc_list[pos].action()))); @@ -666,38 +693,44 @@ void expandToc2(Menu & tomenu, } -void expandToc(Menu & tomenu, LyXView const * view) +void expandToc(Menu & tomenu, Buffer const * buf) { - // To make things very cleanly, we would have to pass view to + // To make things very cleanly, we would have to pass buf 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) - - Buffer const * buf = view->buffer(); if (!buf) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), - FuncRequest(LFUN_NOACTION)), - view); + FuncRequest(LFUN_NOACTION))); return; } + // Add an entry for the master doc if this is a child doc + Buffer const * const master = buf->getMasterBuffer(); + if (buf != master) { + ParIterator const pit = par_iterator_begin(master->inset()); + string const arg = convert(pit->id()); + FuncRequest f(LFUN_PARAGRAPH_GOTO, arg); + tomenu.add(MenuItem(MenuItem::Command, _("Master Document"), f)); + } + FloatList const & floatlist = buf->params().getLyXTextClass().floats(); - lyx::toc::TocList const & toc_list = lyx::toc::getTocList(*buf); - lyx::toc::TocList::const_iterator cit = toc_list.begin(); - lyx::toc::TocList::const_iterator end = toc_list.end(); + TocList const & toc_list = buf->tocBackend().tocs(); + TocList::const_iterator cit = toc_list.begin(); + TocList::const_iterator end = toc_list.end(); for (; cit != end; ++cit) { // Handle this later - if (cit->first == "TOC") + if (cit->first == "tableofcontents") 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(); + TocIterator ccit = cit->second.begin(); + TocIterator eend = cit->second.end(); for (; ccit != eend; ++ccit) { - docstring const label = lyx::from_utf8(limit_string_length(ccit->str())); + docstring const label = limit_string_length(ccit->str()); menu->add(MenuItem(MenuItem::Command, label, FuncRequest(ccit->action()))); @@ -709,53 +742,78 @@ void expandToc(Menu & tomenu, LyXView const * view) } // Handle normal TOC - cit = toc_list.find("TOC"); + cit = toc_list.find("tableofcontents"); if (cit == end) { - tomenu.add(MenuItem(MenuItem::Command, + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, _("No Table of contents"), - FuncRequest()), - view); + FuncRequest())); } else { expandToc2(tomenu, cit->second, 0, cit->second.size(), 0); } } -void expandPasteRecent(Menu & tomenu, LyXView const * view) +void expandPasteRecent(Menu & tomenu, Buffer const * buf) { - if (!view || !view->buffer()) + if (!buf) return; - vector const sel = - lyx::cap::availableSelections(*view->buffer()); + vector const sel = + cap::availableSelections(*buf); - vector::const_iterator cit = sel.begin(); - vector::const_iterator end = sel.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, lyx::from_utf8(*cit), + tomenu.add(MenuItem(MenuItem::Command, *cit, FuncRequest(LFUN_PASTE, convert(index)))); } } -void expandBranches(Menu & tomenu, LyXView const * view) +void expandToolbars(Menu & tomenu) { - if (!view || !view->buffer()) + // + // extracts the toolbars from the backend + ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin(); + ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end(); + + for (; cit != end; ++cit) { + docstring label = _(cit->gui_name); + // frontends are not supposed to turn on/off toolbars, if they cannot + // update ToolbarBackend::flags. That is to say, ToolbarsBackend::flags + // should reflect the true state of toolbars. + // + // menu is displayed as + // on/off review + // and + // review (auto) + // in the case of auto. + if (cit->flags & ToolbarBackend::AUTO) + label += _(" (auto)"); + tomenu.add(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, cit->name))); + } +} + + +void expandBranches(Menu & tomenu, Buffer const * buf) +{ + if (!buf) return; - BufferParams const & params = view->buffer()->getMasterBuffer()->params(); + BufferParams const & params = buf->getMasterBuffer()->params(); BranchList::const_iterator cit = params.branchlist().begin(); BranchList::const_iterator end = params.branchlist().end(); for (int ii = 1; cit != end; ++cit, ++ii) { - docstring label = lyx::from_utf8(cit->getBranch()); + docstring label = cit->getBranch(); if (ii < 10) - label = convert(ii) + lyx::from_ascii(". ") + label + char_type('|') + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, + label = convert(ii) + ". " + label + char_type('|') + convert(ii); + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BRANCH_INSERT, - cit->getBranch())), view); + cit->getBranch()))); } } @@ -764,7 +822,7 @@ void expandBranches(Menu & tomenu, LyXView const * view) void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, - LyXView const * view) const + Buffer const * buf) const { if (!tomenu.empty()) tomenu.clear(); @@ -773,61 +831,68 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, cit != frommenu.end() ; ++cit) { switch (cit->kind()) { case MenuItem::Lastfiles: - expandLastfiles(tomenu, view); + expandLastfiles(tomenu); break; case MenuItem::Documents: - expandDocuments(tomenu, view); + expandDocuments(tomenu); + break; + + case MenuItem::Bookmarks: + expandBookmarks(tomenu); break; case MenuItem::ImportFormats: case MenuItem::ViewFormats: case MenuItem::UpdateFormats: case MenuItem::ExportFormats: - expandFormats(cit->kind(), tomenu, view); + expandFormats(cit->kind(), tomenu, buf); break; case MenuItem::CharStyles: - expandCharStyleInsert(tomenu, view); + expandCharStyleInsert(tomenu, buf); break; case MenuItem::FloatListInsert: - expandFloatListInsert(tomenu, view); + expandFloatListInsert(tomenu, buf); break; case MenuItem::FloatInsert: - expandFloatInsert(tomenu, view); + expandFloatInsert(tomenu, buf); break; case MenuItem::PasteRecent: - expandPasteRecent(tomenu, view); + expandPasteRecent(tomenu, buf); + break; + + case MenuItem::Toolbars: + expandToolbars(tomenu); break; case MenuItem::Branches: - expandBranches(tomenu, view); + expandBranches(tomenu, buf); break; case MenuItem::Toc: - expandToc(tomenu, view); + expandToc(tomenu, buf); break; case MenuItem::Submenu: { MenuItem item(*cit); item.submenu(new Menu(cit->submenuname())); expand(getMenu(cit->submenuname()), - *item.submenu(), view); - tomenu.add(item, view); + *item.submenu(), buf); + tomenu.addWithStatusCheck(item); } break; case MenuItem::Separator: - tomenu.add(*cit, view); + tomenu.addWithStatusCheck(*cit); break; case MenuItem::Command: - if (!specialmenu_ - || !specialmenu_->hasFunc(cit->func())) - tomenu.add(*cit, view); + if (!specialmenu_.hasFunc(cit->func())) + tomenu.addWithStatusCheck(*cit); } } @@ -875,7 +940,7 @@ void MenuBackend::read(LyXLex & lex) break; case md_menu: { lex.next(true); - docstring const name = lyx::from_utf8(lex.getString()); + docstring const name = lex.getDocString(); if (hasMenu(name)) { getMenu(name).read(lex); } else { @@ -914,7 +979,7 @@ Menu const & MenuBackend::getMenu(docstring const & name) const { const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name)); if (cit == end()) - lyxerr << "No submenu named " << lyx::to_utf8(name) << endl; + lyxerr << "No submenu named " << to_utf8(name) << endl; BOOST_ASSERT(cit != end()); return (*cit); } @@ -924,7 +989,7 @@ Menu & MenuBackend::getMenu(docstring const & name) { iterator it = find_if(begin(), end(), MenuNamesEqual(name)); if (it == end()) - lyxerr << "No submenu named " << lyx::to_utf8(name) << endl; + lyxerr << "No submenu named " << to_utf8(name) << endl; BOOST_ASSERT(it != end()); return (*it); } @@ -934,3 +999,6 @@ Menu const & MenuBackend::getMenubar() const { return menubar_; } + + +} // namespace lyx