X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=5944a2264f9631015bed901e9bc62fdea5a31d53;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=35de35677d3fae42c493a8d3a475379186f2b8b6;hpb=34694773c6a1b68fb52e367aaa949828bdbe8df1;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 35de35677d..5944a2264f 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -35,9 +35,9 @@ #include "lyx_main.h" // for lastfiles #include "lyxfunc.h" #include "lyxlex.h" -#include "toc.h" - -#include "frontends/Application.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; } @@ -141,15 +141,15 @@ docstring const MenuItem::binding() const // 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 from_utf8(bindings.begin()->print()); } else { lyxerr[Debug::KBMAP] << "No binding for " << lyxaction.getActionName(func_.action) - << '(' << lyx::to_utf8(func_.argument()) << ')' << endl; + << '(' << to_utf8(func_.argument()) << ')' << endl; return docstring(); } @@ -168,10 +168,8 @@ Menu & Menu::addWithStatusCheck(MenuItem const & i) switch (i.kind()) { case MenuItem::Command: { - FuncStatus status = - theApp->lyxFunc().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); @@ -220,6 +218,7 @@ Menu & Menu::read(LyXLex & lex) md_item = 1, md_branches, md_documents, + md_bookmarks, md_charstyles, md_endmenu, md_exportformats, @@ -235,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 }, @@ -255,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 } }; @@ -298,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; @@ -330,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; @@ -341,7 +351,7 @@ Menu & Menu::read(LyXLex & lex) lex.next(true); docstring const mlabel = _(lex.getString()); lex.next(true); - docstring const mname = lyx::from_utf8(lex.getString()); + docstring const mname = from_utf8(lex.getString()); add(MenuItem(MenuItem::Submenu, mlabel, mname, optional)); optional = false; @@ -387,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; } @@ -419,9 +429,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) + "..."; @@ -432,13 +442,13 @@ string const limit_string_length(string const & str) 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(". ") + docstring const label = convert(ii) + ". " + makeDisplayPath((*lfit), 30) + char_type('|') + convert(ii); tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit)))); @@ -449,7 +459,7 @@ void expandLastfiles(Menu & tomenu) 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!"), @@ -463,12 +473,28 @@ void expandDocuments(Menu & tomenu) for (; docit != end; ++docit, ++ii) { docstring label = makeDisplayPath(*docit, 20); if (ii < 10) - label = convert(ii) + lyx::from_ascii(". ") + label + char_type('|') + convert(ii); + 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, 20) + + char_type('|') + convert(i); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BOOKMARK_GOTO, + convert(i)))); + } + } +} + + void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) { if (!buf && kind != MenuItem::ImportFormats) { @@ -506,7 +532,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) 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: @@ -514,7 +540,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) label = _("Plain Text as Lines"); else if ((*fit)->name() == "textparagraph") label = _("Plain Text as Paragraphs"); - label += lyx::from_ascii("..."); + label += "..."; break; case MenuItem::ViewFormats: case MenuItem::ExportFormats: @@ -527,7 +553,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) break; } if (!(*fit)->shortcut().empty()) - label += char_type('|') + lyx::from_utf8((*fit)->shortcut()); + label += char_type('|') + from_utf8((*fit)->shortcut()); if (buf) tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, @@ -597,7 +623,7 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf) CharStyles::iterator cit = charstyles.begin(); CharStyles::iterator end = charstyles.end(); for (; cit != end; ++cit) { - docstring const label = lyx::from_utf8(cit->name); + docstring const label = from_utf8(cit->name); tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_CHARSTYLE_INSERT, cit->name))); @@ -608,24 +634,24 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf) 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) @@ -635,20 +661,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()))); @@ -679,21 +705,30 @@ void expandToc(Menu & tomenu, Buffer const * buf) 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()))); @@ -705,7 +740,7 @@ void expandToc(Menu & tomenu, Buffer const * buf) } // Handle normal TOC - cit = toc_list.find("TOC"); + cit = toc_list.find("tableofcontents"); if (cit == end) { tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, _("No Table of contents"), @@ -721,19 +756,45 @@ void expandPasteRecent(Menu & tomenu, Buffer const * buf) if (!buf) return; - vector const sel = - lyx::cap::availableSelections(*buf); + 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 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 can not + // 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) @@ -745,9 +806,9 @@ void expandBranches(Menu & tomenu, Buffer const * buf) 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); + label = convert(ii) + ". " + label + char_type('|') + convert(ii); tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BRANCH_INSERT, cit->getBranch()))); @@ -775,6 +836,10 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, expandDocuments(tomenu); break; + case MenuItem::Bookmarks: + expandBookmarks(tomenu); + break; + case MenuItem::ImportFormats: case MenuItem::ViewFormats: case MenuItem::UpdateFormats: @@ -798,6 +863,10 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, expandPasteRecent(tomenu, buf); break; + case MenuItem::Toolbars: + expandToolbars(tomenu); + break; + case MenuItem::Branches: expandBranches(tomenu, buf); break; @@ -870,7 +939,7 @@ void MenuBackend::read(LyXLex & lex) break; case md_menu: { lex.next(true); - docstring const name = lyx::from_utf8(lex.getString()); + docstring const name = from_utf8(lex.getString()); if (hasMenu(name)) { getMenu(name).read(lex); } else { @@ -909,7 +978,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); } @@ -919,7 +988,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); } @@ -929,3 +998,6 @@ Menu const & MenuBackend::getMenubar() const { return menubar_; } + + +} // namespace lyx