X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=9dfede0ab1a081375c3d0c63398a7c1cef332917;hb=056550b31135c3812825c86719c4ceb7054910b5;hp=b2eb7ba10d3972215c88bac93894a1a0a8eb3bc4;hpb=b2cd9a9093fe95902584c33d520c49a91df40208;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index b2eb7ba10d..9dfede0ab1 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -30,14 +30,14 @@ #include "gettext.h" #include "importer.h" #include "kbmap.h" -#include "lastfiles.h" +#include "session.h" #include "LyXAction.h" #include "lyx_main.h" // for lastfiles #include "lyxfunc.h" #include "lyxlex.h" -#include "toc.h" - -#include "frontends/LyXView.h" +#include "paragraph.h" +#include "TocBackend.h" +#include "ToolbarBackend.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -47,10 +47,15 @@ #include -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; @@ -64,21 +69,18 @@ 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) + MenuNamesEqual(docstring const & name) : name_(name) {} bool operator()(Menu const & menu) const { return menu.name() == name_; } private: - string name_; + docstring name_; }; } // namespace anon @@ -93,8 +95,8 @@ MenuItem::MenuItem(Kind kind) {} -MenuItem::MenuItem(Kind kind, string const & label, - string const & submenu, bool optional) +MenuItem::MenuItem(Kind kind, docstring const & label, + docstring const & submenu, bool optional) : kind_(kind), label_(label), submenuname_(submenu), optional_(optional) { @@ -102,11 +104,11 @@ MenuItem::MenuItem(Kind kind, string const & label, } -MenuItem::MenuItem(Kind kind, string const & label, +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; } @@ -120,54 +122,54 @@ void MenuItem::submenu(Menu * menu) } -string const MenuItem::label() const +docstring const MenuItem::label() const { - return token(label_, '|', 0); + return token(label_, char_type('|'), 0); } -string const MenuItem::shortcut() const +docstring const MenuItem::shortcut() const { - return token(label_, '|', 1); + return token(label_, char_type('|'), 1); } -string const MenuItem::binding() const +docstring const MenuItem::binding(bool forgui) const { if (kind_ != Command) - return string(); + 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 bindings.begin()->print(); + return bindings.begin()->print(forgui); } else { lyxerr[Debug::KBMAP] << "No binding for " << lyxaction.getActionName(func_.action) - << '(' << func_.argument << ')' << endl; - return string(); + << '(' << 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); @@ -216,6 +218,7 @@ Menu & Menu::read(LyXLex & lex) md_item = 1, md_branches, md_documents, + md_bookmarks, md_charstyles, md_endmenu, md_exportformats, @@ -231,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 }, @@ -251,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 } }; @@ -269,7 +275,7 @@ Menu & Menu::read(LyXLex & lex) // fallback to md_item case md_item: { lex.next(true); - string const name = _(lex.getString()); + docstring const name = translateIfPossible(lex.getDocString()); lex.next(true); string const command = lex.getString(); FuncRequest func = lyxaction.lookupFunc(command); @@ -294,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; @@ -326,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; @@ -335,9 +349,9 @@ Menu & Menu::read(LyXLex & lex) // fallback to md_submenu case md_submenu: { lex.next(true); - string const mlabel = _(lex.getString()); + docstring const mlabel = translateIfPossible(lex.getDocString()); lex.next(true); - string const mname = lex.getString(); + docstring const mname = lex.getDocString(); add(MenuItem(MenuItem::Submenu, mlabel, mname, optional)); optional = false; @@ -378,19 +392,19 @@ 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(); + docstring shortcut = it1->shortcut(); if (shortcut.empty()) continue; if (!contains(it1->label(), shortcut)) lyxerr << "Menu warning: menu entry \"" - << it1->label() + << to_utf8(it1->label()) << "\" does not contain shortcut `" - << shortcut << "'." << endl; + << to_utf8(shortcut) << "'." << endl; for (const_iterator it2 = begin(); it2 != it1 ; ++it2) { - if (!compare_ascii_no_case(it2->shortcut(), shortcut)) { + if (!compare_no_case(it2->shortcut(), shortcut)) { lyxerr << "Menu warning: menu entries " - << '"' << it1->fulllabel() - << "\" and \"" << it2->fulllabel() + << '"' << to_utf8(it1->fulllabel()) + << "\" and \"" << to_utf8(it2->fulllabel()) << "\" share the same shortcut." << endl; } @@ -399,10 +413,9 @@ void Menu::checkShortcuts() const } -void MenuBackend::specialMenu(string const &name) +void MenuBackend::specialMenu(Menu const & menu) { - if (hasMenu(name)) - specialmenu_ = &getMenu(name); + specialmenu_ = menu; } @@ -415,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) + "..."; @@ -426,31 +439,31 @@ string const limit_string_length(string const & str) } -void expandLastfiles(Menu & tomenu, LyXView const * view) +void expandLastfiles(Menu & tomenu) { - LastFiles const & lastfiles = LyX::cref().lastfiles(); + lyx::LastFilesSection::LastFiles const & lf = LyX::cref().session().lastFiles().lastFiles(); + lyx::LastFilesSection::LastFiles::const_iterator lfit = lf.begin(); 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 = convert(ii) + ". " - + MakeDisplayPath((*lfit), 30) - + '|' + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit))), view); + for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) { + 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, file))); } } -void expandDocuments(Menu & tomenu, LyXView const * view) +void expandDocuments(Menu & tomenu) { typedef vector Strings; - Strings const names = 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; } @@ -458,21 +471,36 @@ void expandDocuments(Menu & tomenu, LyXView const * view) Strings::const_iterator docit = names.begin(); Strings::const_iterator end = names.end(); for (; docit != end; ++docit, ++ii) { - string label = MakeDisplayPath(*docit, 20); + docstring label = makeDisplayPath(*docit, 20); if (ii < 10) - label = convert(ii) + ". " + label + '|' + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_SWITCHBUFFER, *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; } @@ -483,19 +511,19 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) switch (kind) { case MenuItem::ImportFormats: formats = Importer::GetImportableFormats(); - action = LFUN_IMPORT; + action = LFUN_BUFFER_IMPORT; break; case MenuItem::ViewFormats: - formats = Exporter::GetExportableFormats(*view->buffer(), true); - action = LFUN_PREVIEW; + formats = Exporter::getExportableFormats(*buf, true); + action = LFUN_BUFFER_VIEW; break; case MenuItem::UpdateFormats: - formats = Exporter::GetExportableFormats(*view->buffer(), true); - action = LFUN_UPDATE; + formats = Exporter::getExportableFormats(*buf, true); + action = LFUN_BUFFER_UPDATE; break; default: - formats = Exporter::GetExportableFormats(*view->buffer(), false); - action = LFUN_EXPORT; + formats = Exporter::getExportableFormats(*buf, false); + action = LFUN_BUFFER_EXPORT; } sort(formats.begin(), formats.end(), compare_format()); @@ -504,97 +532,101 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) 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; + docstring label = from_utf8((*fit)->prettyname()); - if (kind == MenuItem::ImportFormats) { + switch (kind) { + case MenuItem::ImportFormats: if ((*fit)->name() == "text") - label = _("Plain Text as Lines"); + label = _("Plain Text"); else if ((*fit)->name() == "textparagraph") - label = _("Plain Text as Paragraphs"); + label = _("Plain Text, Join Lines"); label += "..."; + break; + case MenuItem::ViewFormats: + case MenuItem::ExportFormats: + case MenuItem::UpdateFormats: + if (!(*fit)->documentFormat()) + continue; + break; + default: + BOOST_ASSERT(false); + break; } if (!(*fit)->shortcut().empty()) - label += '|' + (*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 - string const label = _(cit->second.name()); - tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_INSET_FLOAT, - cit->second.type())), - view); + docstring const label = _(cit->second.name()); + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_FLOAT_INSERT, + 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) { - string const label = cit->name; - tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_INSERT_CHARSTYLE, - cit->name)), view); + docstring const label = from_utf8(cit->name); + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_CHARSTYLE_INSERT, + label))); } } @@ -602,47 +634,47 @@ 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) - min_depth = std::min(min_depth, toc_list[i].depth); + 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) { - string label(4 * max(0, toc_list[i].depth - depth),' '); - label += limit_string_length(toc_list[i].str); - if (toc_list[i].depth == depth + for (Toc::size_type i = from; i < to; ++i) { + docstring label(4 * max(0, toc_list[i].depth() - depth), char_type(' ')); + label += limit_string_length(toc_list[i].str()); + if (toc_list[i].depth() == depth && shortcut_count < 9) { - if (label.find(convert(shortcut_count + 1)) != string::npos) - label += '|' + convert(++shortcut_count); + if (label.find(convert(shortcut_count + 1)) != docstring::npos) + label += char_type('|') + convert(++shortcut_count); } tomenu.add(MenuItem(MenuItem::Command, label, 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) + 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 && + docstring 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(convert(shortcut_count + 1)) != string::npos) - label += '|' + convert(++shortcut_count); - } + 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()))); @@ -659,38 +691,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 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) { - string const label = limit_string_length(ccit->str); + docstring const label = limit_string_length(ccit->str()); menu->add(MenuItem(MenuItem::Command, label, FuncRequest(ccit->action()))); @@ -702,28 +740,27 @@ 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, *cit, @@ -732,23 +769,49 @@ void expandPasteRecent(Menu & tomenu, LyXView const * view) } -void expandBranches(Menu & tomenu, LyXView const * view) +void expandToolbars(Menu & tomenu) +{ + // + // 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 (!view || !view->buffer()) + if (!buf) return; - BufferParams const & params = view->buffer()->params(); + BufferParams const & params = buf->getMasterBuffer()->params(); - std::list::const_iterator cit = params.branchlist().begin(); - std::list::const_iterator end = params.branchlist().end(); + BranchList::const_iterator cit = params.branchlist().begin(); + BranchList::const_iterator end = params.branchlist().end(); for (int ii = 1; cit != end; ++cit, ++ii) { - string label = cit->getBranch(); + docstring label = cit->getBranch(); if (ii < 10) - label = convert(ii) + ". " + label + "|" + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_INSERT_BRANCH, - cit->getBranch())), view); + label = convert(ii) + ". " + label + char_type('|') + convert(ii); + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_BRANCH_INSERT, + cit->getBranch()))); } } @@ -757,67 +820,77 @@ 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(); + for (Menu::const_iterator cit = frommenu.begin(); 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); } } @@ -865,7 +938,7 @@ void MenuBackend::read(LyXLex & lex) break; case md_menu: { lex.next(true); - string const name = lex.getString(); + docstring const name = lex.getDocString(); if (hasMenu(name)) { getMenu(name).read(lex); } else { @@ -894,27 +967,27 @@ void MenuBackend::add(Menu const & menu) } -bool MenuBackend::hasMenu(string const & name) const +bool MenuBackend::hasMenu(docstring const & name) const { return find_if(begin(), end(), MenuNamesEqual(name)) != end(); } -Menu const & MenuBackend::getMenu(string const & name) const +Menu const & MenuBackend::getMenu(docstring const & name) const { const_iterator cit = find_if(begin(), end(), MenuNamesEqual(name)); if (cit == end()) - lyxerr << "No submenu named " << name << endl; + lyxerr << "No submenu named " << to_utf8(name) << endl; BOOST_ASSERT(cit != end()); return (*cit); } -Menu & MenuBackend::getMenu(string const & name) +Menu & MenuBackend::getMenu(docstring const & name) { iterator it = find_if(begin(), end(), MenuNamesEqual(name)); if (it == end()) - lyxerr << "No submenu named " << name << endl; + lyxerr << "No submenu named " << to_utf8(name) << endl; BOOST_ASSERT(it != end()); return (*it); } @@ -924,3 +997,6 @@ Menu const & MenuBackend::getMenubar() const { return menubar_; } + + +} // namespace lyx