X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=9dfede0ab1a081375c3d0c63398a7c1cef332917;hb=056550b31135c3812825c86719c4ceb7054910b5;hp=38c77e0f72142515233b81fb1d73bdb29c5f4b72;hpb=bff0d2affbe3a2f107f07b536c164e410bf63ddd;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 38c77e0f72..9dfede0ab1 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" @@ -107,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; } @@ -133,7 +134,7 @@ docstring const MenuItem::shortcut() const } -docstring const MenuItem::binding() const +docstring const MenuItem::binding(bool forgui) const { if (kind_ != Command) return docstring(); @@ -143,7 +144,7 @@ docstring const MenuItem::binding() const kb_keymap::Bindings bindings = theTopLevelKeymap().findbindings(func_); if (bindings.size()) { - return from_utf8(bindings.begin()->print()); + return bindings.begin()->print(forgui); } else { lyxerr[Debug::KBMAP] << "No binding for " @@ -238,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 }, @@ -255,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 } }; @@ -274,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); @@ -348,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 = from_utf8(lex.getString()); + docstring const mname = lex.getDocString(); add(MenuItem(MenuItem::Submenu, mlabel, mname, optional)); optional = false; @@ -412,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; } @@ -447,10 +447,11 @@ void expandLastfiles(Menu & tomenu) int ii = 1; for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) { + string const file = lfit->absFilename(); docstring const label = convert(ii) + ". " - + makeDisplayPath((*lfit), 30) + + makeDisplayPath(file, 30) + char_type('|') + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, (*lfit)))); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, file))); } } @@ -485,7 +486,7 @@ void expandBookmarks(Menu & tomenu) for (size_t i = 1; i <= bm.size(); ++i) { if (bm.isValid(i)) { docstring const label = convert(i) + ". " - + makeDisplayPath(bm.bookmark(i).filename, 20) + + makeDisplayPath(bm.bookmark(i).filename.absFilename(), 20) + char_type('|') + convert(i); tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BOOKMARK_GOTO, convert(i)))); @@ -536,9 +537,9 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) 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: @@ -625,7 +626,7 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf) docstring const label = from_utf8(cit->name); tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_CHARSTYLE_INSERT, - cit->name))); + label))); } } @@ -633,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 @@ -660,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; @@ -704,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, @@ -730,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"), @@ -759,17 +769,16 @@ 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 = char_type(uppercase(cit->name[0])) + _(cit->name.substr(1)); - // frontends are not supposed to turn on/off toolbars, if they can not + 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. // @@ -781,7 +790,7 @@ void expandToolbars(Menu & tomenu, Buffer const * buf) if (cit->flags & ToolbarBackend::AUTO) label += _(" (auto)"); tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, _(cit->name)))); + FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, cit->name))); } } @@ -797,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, @@ -855,7 +864,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, break; case MenuItem::Toolbars: - expandToolbars(tomenu, buf); + expandToolbars(tomenu); break; case MenuItem::Branches: @@ -880,8 +889,7 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, break; case MenuItem::Command: - if (!specialmenu_ - || !specialmenu_->hasFunc(cit->func())) + if (!specialmenu_.hasFunc(cit->func())) tomenu.addWithStatusCheck(*cit); } } @@ -930,7 +938,7 @@ void MenuBackend::read(LyXLex & lex) break; case md_menu: { lex.next(true); - docstring const name = from_utf8(lex.getString()); + docstring const name = lex.getDocString(); if (hasMenu(name)) { getMenu(name).read(lex); } else {