X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=5944a2264f9631015bed901e9bc62fdea5a31d53;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=6bd046ff3a834f15f9e84a74f065e8005ab7397a;hpb=eaa33dca6def75e9bf48582073c75b256821fd25;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 6bd046ff3a..5944a2264f 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -35,7 +35,8 @@ #include "lyx_main.h" // for lastfiles #include "lyxfunc.h" #include "lyxlex.h" -#include "toc.h" +#include "paragraph.h" +#include "TocBackend.h" #include "ToolbarBackend.h" #include "support/filetools.h" @@ -54,6 +55,7 @@ using support::compare_ascii_no_case; using support::contains; using support::makeDisplayPath; using support::token; +using support::uppercase; using boost::bind; @@ -106,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; } @@ -237,10 +239,10 @@ Menu & Menu::read(LyXLex & lex) }; struct keyword_item menutags[md_last - 1] = { + { "bookmarks", md_bookmarks }, { "branches", md_branches }, { "charstyles", md_charstyles }, { "documents", md_documents }, - { "bookmarks", md_bookmarks }, { "end", md_endmenu }, { "exportformats", md_exportformats }, { "floatinsert", md_floatinsert }, @@ -254,8 +256,8 @@ Menu & Menu::read(LyXLex & lex) { "separator", md_separator }, { "submenu", md_submenu }, { "toc", md_toc }, - { "updateformats", md_updateformats }, { "toolbars", md_toolbars }, + { "updateformats", md_updateformats }, { "viewformats", md_viewformats } }; @@ -632,22 +634,22 @@ 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 += limit_string_length(toc_list[i].str()); if (toc_list[i].depth() == depth @@ -659,9 +661,9 @@ 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; @@ -703,19 +705,28 @@ 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 = limit_string_length(ccit->str()); menu->add(MenuItem(MenuItem::Command, @@ -729,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"), @@ -758,31 +769,28 @@ void expandPasteRecent(Menu & tomenu, Buffer const * buf) } -void expandToolbars(Menu & tomenu, Buffer const * buf) +void expandToolbars(Menu & tomenu) { // // extracts the toolbars from the backend ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin(); ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end(); - int i = 1; - for (; cit != end; ++cit, ++i) { - docstring label = convert(i) + ". " + _(cit->name); - // frontend does not update ToolbarBackend::flags when it changes toolbar - // Therefore, I can not tell from the flags if the toolbar is on or off - // it is then less confusing to say: - // this is: always on/off/auto - // frontend toolbar change is temporary. + 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. // - if (cit->flags & ToolbarBackend::ON) - label += _(" (always on)"); - else if (cit->flags & ToolbarBackend::OFF) - label += _(" (always off)"); - else if (cit->flags & ToolbarBackend::AUTO) + // menu is displayed as + // on/off review + // and + // review (auto) + // in the case of auto. + if (cit->flags & ToolbarBackend::AUTO) label += _(" (auto)"); - label += char_type('|') + convert(i); tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, _(cit->name)))); + FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, cit->name))); } } @@ -798,7 +806,7 @@ void expandBranches(Menu & tomenu, Buffer const * buf) BranchList::const_iterator end = params.branchlist().end(); for (int ii = 1; cit != end; ++cit, ++ii) { - docstring label = from_utf8(cit->getBranch()); + docstring label = cit->getBranch(); if (ii < 10) label = convert(ii) + ". " + label + char_type('|') + convert(ii); tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, @@ -856,7 +864,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, break; case MenuItem::Toolbars: - expandToolbars(tomenu, buf); + expandToolbars(tomenu); break; case MenuItem::Branches: