X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.cpp;h=fec705230dd64dddca6ce2f7518f36575a1abc3b;hb=2417d9d911dbca181c48f45d1aad26d31c9aa815;hp=6250e49d4660d5248435e5d9c7932fbfd748293b;hpb=1d6c4787f9392169b78cac3a924818f2ebe1145d;p=lyx.git diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp index 6250e49d46..fec705230d 100644 --- a/src/MenuBackend.cpp +++ b/src/MenuBackend.cpp @@ -218,6 +218,8 @@ Menu & Menu::read(Lexer & lex) md_documents, md_bookmarks, md_charstyles, + md_custom, + md_elements, md_endmenu, md_exportformats, md_importformats, @@ -240,7 +242,9 @@ Menu & Menu::read(Lexer & lex) { "bookmarks", md_bookmarks }, { "branches", md_branches }, { "charstyles", md_charstyles }, + { "custom", md_custom }, { "documents", md_documents }, + { "elements", md_elements }, { "end", md_endmenu }, { "exportformats", md_exportformats }, { "floatinsert", md_floatinsert }, @@ -294,6 +298,14 @@ Menu & Menu::read(Lexer & lex) add(MenuItem(MenuItem::CharStyles)); break; + case md_custom: + add(MenuItem(MenuItem::Custom)); + break; + + case md_elements: + add(MenuItem(MenuItem::Elements)); + break; + case md_documents: add(MenuItem(MenuItem::Documents)); break; @@ -456,24 +468,27 @@ void expandLastfiles(Menu & tomenu) void expandDocuments(Menu & tomenu) { - typedef vector Strings; - Strings const names = theBufferList().getFileNames(); - - if (names.empty()) { + Buffer * first = theBufferList().first(); + if (first) { + Buffer * b = first; + int ii = 1; + + // We cannot use a for loop as the buffer list cycles. + do { + docstring label = makeDisplayPath(b->fileName(), 20); + if (!b->isClean()) label = label + "*"; + if (ii < 10) + label = convert(ii) + ". " + label + '|' + convert(ii); + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, b->fileName()))); + + b = theBufferList().next(b); + ++ii; + } while (b != first); + } else { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), - FuncRequest(LFUN_NOACTION))); + FuncRequest(LFUN_NOACTION))); return; } - - int ii = 1; - Strings::const_iterator docit = names.begin(); - Strings::const_iterator end = names.end(); - for (; docit != end; ++docit, ++ii) { - docstring label = makeDisplayPath(*docit, 20); - if (ii < 10) - label = convert(ii) + ". " + label + char_type('|') + convert(ii); - tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BUFFER_SWITCH, *docit))); - } } @@ -486,7 +501,7 @@ void expandBookmarks(Menu & tomenu) 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, + tomenu.add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BOOKMARK_GOTO, convert(i)))); } } @@ -497,7 +512,7 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf) { if (!buf && kind != MenuItem::ImportFormats) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), + _("No Document Open!"), FuncRequest(LFUN_NOACTION))); return; } @@ -569,13 +584,13 @@ void expandFloatListInsert(Menu & tomenu, Buffer const * buf) { if (!buf) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), + _("No Document Open!"), FuncRequest(LFUN_NOACTION))); return; } FloatList const & floats = - buf->params().getLyXTextClass().floats(); + buf->params().getTextClass().floats(); FloatList::const_iterator cit = floats.begin(); FloatList::const_iterator end = floats.end(); for (; cit != end; ++cit) { @@ -591,13 +606,13 @@ void expandFloatInsert(Menu & tomenu, Buffer const * buf) { if (!buf) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), + _("No Document Open!"), FuncRequest(LFUN_NOACTION))); return; } FloatList const & floats = - buf->params().getLyXTextClass().floats(); + buf->params().getTextClass().floats(); FloatList::const_iterator cit = floats.begin(); FloatList::const_iterator end = floats.end(); for (; cit != end; ++cit) { @@ -610,22 +625,23 @@ void expandFloatInsert(Menu & tomenu, Buffer const * buf) } -void expandCharStyleInsert(Menu & tomenu, Buffer const * buf) +void expandFlexInsert(Menu & tomenu, Buffer const * buf, std::string s) { if (!buf) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), + _("No Document Open!"), FuncRequest(LFUN_NOACTION))); return; } - CharStyles & charstyles = - buf->params().getLyXTextClass().charstyles(); - CharStyles::iterator cit = charstyles.begin(); - CharStyles::iterator end = charstyles.end(); + InsetLayouts const & insetlayouts = + buf->params().getTextClass().insetlayouts(); + InsetLayouts::const_iterator cit = insetlayouts.begin(); + InsetLayouts::const_iterator end = insetlayouts.end(); for (; cit != end; ++cit) { - docstring const label = from_utf8(cit->name); - tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_CHARSTYLE_INSERT, + docstring const label = cit->first; + if (cit->second.lyxtype == s) + tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, + label, FuncRequest(LFUN_FLEX_INSERT, label))); } } @@ -700,11 +716,15 @@ void expandToc(Menu & tomenu, Buffer const * buf) if (!buf) { tomenu.add(MenuItem(MenuItem::Command, - _("No Documents Open!"), + _("No Document Open!"), FuncRequest(LFUN_NOACTION))); return; } + Buffer* cbuf = const_cast(buf); + cbuf->tocBackend().update(); + cbuf->structureChanged(); + // Add an entry for the master doc if this is a child doc Buffer const * const master = buf->getMasterBuffer(); if (buf != master) { @@ -714,7 +734,7 @@ void expandToc(Menu & tomenu, Buffer const * buf) tomenu.add(MenuItem(MenuItem::Command, _("Master Document"), f)); } - FloatList const & floatlist = buf->params().getLyXTextClass().floats(); + FloatList const & floatlist = buf->params().getTextClass().floats(); TocList const & toc_list = buf->tocBackend().tocs(); TocList::const_iterator cit = toc_list.begin(); TocList::const_iterator end = toc_list.end(); @@ -734,7 +754,18 @@ void expandToc(Menu & tomenu, Buffer const * buf) FuncRequest(ccit->action()))); } string const & floatName = floatlist.getType(cit->first).listName(); - MenuItem item(MenuItem::Submenu, _(floatName)); + docstring label; + if (!floatName.empty()) + label = _(floatName); + // BUG3633: listings is not a proper float so its name + // is not shown in floatlist. + else if (cit->first == "listing") + label = _("List of listings"); + // this should not happen now, but if something else like + // listings is added later, this can avoid an empty menu name. + else + label = _("Other floats"); + MenuItem item(MenuItem::Submenu, label); item.submenu(menu.release()); tomenu.add(item); } @@ -778,29 +809,40 @@ void expandToolbars(Menu & tomenu) 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 + // 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 + // and // review (auto) // in the case of auto. if (cit->flags & ToolbarInfo::AUTO) label += _(" (auto)"); tomenu.add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, cit->name))); + FuncRequest(LFUN_TOOLBAR_TOGGLE, cit->name + " allowauto"))); } } void expandBranches(Menu & tomenu, Buffer const * buf) { - if (!buf) + if (!buf) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Document Open!"), + FuncRequest(LFUN_NOACTION))); return; + } BufferParams const & params = buf->getMasterBuffer()->params(); + if (params.branchlist().empty()) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Branch in Document!"), + FuncRequest(LFUN_NOACTION))); + return; + } BranchList::const_iterator cit = params.branchlist().begin(); BranchList::const_iterator end = params.branchlist().end(); @@ -848,7 +890,15 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu, break; case MenuItem::CharStyles: - expandCharStyleInsert(tomenu, buf); + expandFlexInsert(tomenu, buf, "charstyle"); + break; + + case MenuItem::Custom: + expandFlexInsert(tomenu, buf, "custom"); + break; + + case MenuItem::Elements: + expandFlexInsert(tomenu, buf, "element"); break; case MenuItem::FloatListInsert: