X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FMenus.cpp;h=8de4f83257d98e75c7508b816216b44b04262085;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=4ea1e0d27ceed72c870816a7e5bd0dba2f42090f;hpb=5d112c185c8feaf24f87002b09746b0b5e3373d2;p=lyx.git diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 4ea1e0d27c..8de4f83257 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -5,9 +5,9 @@ * * \author John Levon * \author Asger Alstrup - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes - * \author André Pönitz + * \author André Pönitz * \author Dekel Tsur * \author Martin Vermeer * @@ -23,10 +23,12 @@ #include "GuiView.h" #include "qt_helpers.h" +#include "BiblioInfo.h" #include "BranchList.h" #include "Buffer.h" #include "BufferList.h" #include "BufferParams.h" +#include "BufferView.h" #include "Converter.h" #include "CutAndPaste.h" #include "Floating.h" @@ -34,19 +36,29 @@ #include "Format.h" #include "FuncRequest.h" #include "FuncStatus.h" +#include "IndicesList.h" #include "KeyMap.h" #include "Lexer.h" #include "LyXAction.h" #include "LyX.h" // for lastfiles #include "LyXFunc.h" +#include "LyXRC.h" #include "Paragraph.h" +#include "ParIterator.h" #include "Session.h" #include "TextClass.h" #include "TocBackend.h" -#include "ToolbarBackend.h" +#include "Toolbars.h" +#include "WordLangTuple.h" +#include "insets/Inset.h" +#include "insets/InsetCitation.h" +#include "insets/InsetGraphics.h" + +#include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" +#include "support/docstring_list.h" #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" @@ -57,8 +69,9 @@ #include #include +#include + #include -#include #include using namespace std; @@ -85,6 +98,15 @@ public: Submenu, /// Separator, + /** This type of item explains why something is unavailable. If this + menuitem is in a submenu, the submenu is enabled to make sure the + user sees the information. */ + Help, + /** This type of item merely shows that there might be a list or + something alike at this position, but the list is still empty. + If this item is in a submenu, the submenu will not always be + enabled. */ + Info, /** This is the list of last opened file, typically for the File menu. */ Lastfiles, @@ -128,7 +150,21 @@ public: /** toolbars */ Toolbars, /** Available branches in document */ - Branches + Branches, + /** Available indices in document */ + Indices, + /** Context menu for indices in document */ + IndicesContext, + /** Available index lists in document */ + IndicesLists, + /** Context menu for available indices lists in document */ + IndicesListsContext, + /** Available citation styles for a given citation */ + CiteStyles, + /** Available graphics groups */ + GraphicsGroups, + /// Words suggested by the spellchecker. + SpellingSuggestions }; explicit MenuItem(Kind kind) : kind_(kind), optional_(false) {} @@ -139,16 +175,17 @@ public: bool optional = false) : kind_(kind), label_(label), submenuname_(submenu), optional_(optional) { - BOOST_ASSERT(kind == Submenu); + LASSERT(kind == Submenu || kind == Help || kind == Info, /**/); } MenuItem(Kind kind, QString const & label, FuncRequest const & func, - bool optional = false) + bool optional = false, + FuncRequest::Origin origin = FuncRequest::MENU) : kind_(kind), label_(label), func_(func), optional_(optional) { - func_.origin = FuncRequest::MENU; + func_.origin = origin; } // boost::shared_ptr needs this apprently... @@ -199,7 +236,7 @@ public: /// set the description of the submenu void submenuname(QString const & name) { submenuname_ = name; } /// - bool hasSubmenu() const { return submenu_.isEmpty(); } + bool hasSubmenu() const { return !submenu_.isEmpty(); } /// MenuDefinition const & submenu() const { return submenu_.at(0); } MenuDefinition & submenu() { return submenu_[0]; } @@ -256,7 +293,7 @@ public: // search for func in this menu iteratively, and put menu // names in a stack. - bool searchMenu(FuncRequest const & func, std::vector & names) + bool searchMenu(FuncRequest const & func, docstring_list & names) const; /// bool hasFunc(FuncRequest const &) const; @@ -274,12 +311,17 @@ public: void expandFormats(MenuItem::Kind kind, Buffer const * buf); void expandFloatListInsert(Buffer const * buf); void expandFloatInsert(Buffer const * buf); - void expandFlexInsert(Buffer const * buf, std::string s); + void expandFlexInsert(Buffer const * buf, InsetLayout::InsetLyXType type); void expandToc2(Toc const & toc_list, size_t from, size_t to, int depth); void expandToc(Buffer const * buf); - void expandPasteRecent(); + void expandPasteRecent(Buffer const * buf); void expandToolbars(); void expandBranches(Buffer const * buf); + void expandIndices(Buffer const * buf, bool listof = false); + void expandIndicesContext(Buffer const * buf, bool listof = false); + void expandCiteStyles(BufferView const *); + void expandGraphicsGroups(BufferView const *); + void expandSpellingSuggestions(BufferView const *); /// ItemList items_; /// @@ -323,24 +365,24 @@ void MenuDefinition::addWithStatusCheck(MenuItem const & i) } case MenuItem::Submenu: { + bool enabled = false; if (i.hasSubmenu()) { - bool enabled = false; for (const_iterator cit = i.submenu().begin(); - cit != i.submenu().end(); ++cit) { + cit != i.submenu().end(); ++cit) { + // Only these kind of items affect the status of the submenu if ((cit->kind() == MenuItem::Command - || cit->kind() == MenuItem::Submenu) + || cit->kind() == MenuItem::Submenu + || cit->kind() == MenuItem::Help) && cit->status().enabled()) { enabled = true; break; } } - if (enabled || !i.optional()) { - items_.push_back(i); - items_.back().status().enabled(enabled); - } } - else + if (enabled || !i.optional()) { items_.push_back(i); + items_.back().status().setEnabled(enabled); + } break; } @@ -357,9 +399,10 @@ void MenuDefinition::addWithStatusCheck(MenuItem const & i) void MenuDefinition::read(Lexer & lex) { - enum Menutags { + enum { md_item = 1, md_branches, + md_citestyles, md_documents, md_bookmarks, md_charstyles, @@ -368,6 +411,10 @@ void MenuDefinition::read(Lexer & lex) md_endmenu, md_exportformats, md_importformats, + md_indices, + md_indicescontext, + md_indiceslists, + md_indiceslistscontext, md_lastfiles, md_optitem, md_optsubmenu, @@ -380,13 +427,15 @@ void MenuDefinition::read(Lexer & lex) md_floatinsert, md_pasterecent, md_toolbars, - md_last + md_graphicsgroups, + md_spellingsuggestions }; - struct keyword_item menutags[md_last - 1] = { + LexerKeyword menutags[] = { { "bookmarks", md_bookmarks }, { "branches", md_branches }, { "charstyles", md_charstyles }, + { "citestyles", md_citestyles }, { "custom", md_custom }, { "documents", md_documents }, { "elements", md_elements }, @@ -394,13 +443,19 @@ void MenuDefinition::read(Lexer & lex) { "exportformats", md_exportformats }, { "floatinsert", md_floatinsert }, { "floatlistinsert", md_floatlistinsert }, + { "graphicsgroups", md_graphicsgroups }, { "importformats", md_importformats }, + { "indices", md_indices }, + { "indicescontext", md_indicescontext }, + { "indiceslists", md_indiceslists }, + { "indiceslistscontext", md_indiceslistscontext }, { "item", md_item }, { "lastfiles", md_lastfiles }, { "optitem", md_optitem }, { "optsubmenu", md_optsubmenu }, { "pasterecent", md_pasterecent }, { "separator", md_separator }, + { "spellingsuggestions", md_spellingsuggestions }, { "submenu", md_submenu }, { "toc", md_toc }, { "toolbars", md_toolbars }, @@ -408,9 +463,8 @@ void MenuDefinition::read(Lexer & lex) { "viewformats", md_viewformats } }; - lex.pushTable(menutags, md_last - 1); - if (lyxerr.debugging(Debug::PARSER)) - lex.printTable(lyxerr); + lex.pushTable(menutags); + lex.setContext("MenuDefinition::read: "); bool quit = false; bool optional = false; @@ -426,7 +480,10 @@ void MenuDefinition::read(Lexer & lex) lex.next(true); string const command = lex.getString(); FuncRequest func = lyxaction.lookupFunc(command); - add(MenuItem(MenuItem::Command, toqstr(name), func, optional)); + FuncRequest::Origin origin = FuncRequest::MENU; + if (name_.startsWith("context-toc-")) + origin = FuncRequest::TOC; + add(MenuItem(MenuItem::Command, toqstr(name), func, optional, origin)); optional = false; break; } @@ -499,6 +556,34 @@ void MenuDefinition::read(Lexer & lex) add(MenuItem(MenuItem::Branches)); break; + case md_citestyles: + add(MenuItem(MenuItem::CiteStyles)); + break; + + case md_graphicsgroups: + add(MenuItem(MenuItem::GraphicsGroups)); + break; + + case md_spellingsuggestions: + add(MenuItem(MenuItem::SpellingSuggestions)); + break; + + case md_indices: + add(MenuItem(MenuItem::Indices)); + break; + + case md_indicescontext: + add(MenuItem(MenuItem::IndicesContext)); + break; + + case md_indiceslists: + add(MenuItem(MenuItem::IndicesLists)); + break; + + case md_indiceslistscontext: + add(MenuItem(MenuItem::IndicesListsContext)); + break; + case md_optsubmenu: optional = true; // fallback to md_submenu @@ -518,8 +603,7 @@ void MenuDefinition::read(Lexer & lex) break; default: - lex.printError("MenuDefinition::read: " - "Unknown menu tag: `$$Token'"); + lex.printError("Unknown menu tag"); break; } } @@ -551,24 +635,23 @@ void MenuDefinition::checkShortcuts() const if (shortcut.isEmpty()) continue; if (!it1->label().contains(shortcut)) - lyxerr << "Menu warning: menu entry \"" - << fromqstr(it1->label()) + LYXERR0("Menu warning: menu entry \"" + << it1->label() << "\" does not contain shortcut `" - << fromqstr(shortcut) << "'." << endl; + << shortcut << "'."); for (const_iterator it2 = begin(); it2 != it1 ; ++it2) { if (!it2->shortcut().compare(shortcut, Qt::CaseInsensitive)) { - lyxerr << "Menu warning: menu entries " - << '"' << fromqstr(it1->fulllabel()) - << "\" and \"" << fromqstr(it2->fulllabel()) - << "\" share the same shortcut." - << endl; + LYXERR0("Menu warning: menu entries " + << '"' << it1->fulllabel() + << "\" and \"" << it2->fulllabel() + << "\" share the same shortcut."); } } } } -bool MenuDefinition::searchMenu(FuncRequest const & func, vector & names) const +bool MenuDefinition::searchMenu(FuncRequest const & func, docstring_list & names) const { const_iterator m = begin(); const_iterator m_end = end(); @@ -581,8 +664,7 @@ bool MenuDefinition::searchMenu(FuncRequest const & func, vector & na names.push_back(qstring_to_ucs4(m->label())); if (!m->hasSubmenu()) { LYXERR(Debug::GUI, "Warning: non existing sub menu label=" - << fromqstr(m->label()) - << " name=" << fromqstr(m->submenuname())); + << m->label() << " name=" << m->submenuname()); names.pop_back(); continue; } @@ -612,17 +694,82 @@ QString limitStringLength(docstring const & str) } +void MenuDefinition::expandGraphicsGroups(BufferView const * bv) +{ + if (!bv) + return; + set grp; + graphics::getGraphicsGroups(bv->buffer(), grp); + if (grp.empty()) + return; + + set::const_iterator it = grp.begin(); + set::const_iterator end = grp.end(); + add(MenuItem(MenuItem::Command, qt_("No Group"), + FuncRequest(LFUN_SET_GRAPHICS_GROUP))); + for (; it != end; it++) { + addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(*it), + FuncRequest(LFUN_SET_GRAPHICS_GROUP, *it))); + } +} + + +void MenuDefinition::expandSpellingSuggestions(BufferView const * bv) +{ + if (!bv) + return; + WordLangTuple wl; + docstring_list suggestions; + pos_type from = bv->cursor().pos(); + pos_type to = from; + Paragraph const & par = bv->cursor().paragraph(); + if (!par.spellCheck(from, to, wl, suggestions)) + return; + LYXERR(Debug::GUI, "Misspelled Word! Suggested Words = "); + size_t i = 0; + MenuItem item(MenuItem::Submenu, qt_("More Spelling Suggestions")); + item.setSubmenu(MenuDefinition(qt_("More Spelling Suggestions"))); + for (; i != suggestions.size(); ++i) { + docstring const & suggestion = suggestions[i]; + LYXERR(Debug::GUI, suggestion); + MenuItem w(MenuItem::Command, toqstr(suggestion), + FuncRequest(LFUN_WORD_REPLACE, suggestion)); + if (i < 10) + add(w); + else + item.submenu().add(w); + } + if (i >= 10) + add(item); + if (i > 0) + add(MenuItem(MenuItem::Separator)); + docstring arg = wl.word() + " " + from_ascii(wl.lang_code()); + if (!wl.lang_variety().empty()) + arg += from_ascii("-") + from_ascii(wl.lang_variety()); + add(MenuItem(MenuItem::Command, qt_("Add to personal dictionary|c"), + FuncRequest(LFUN_SPELLING_ADD, arg))); + add(MenuItem(MenuItem::Command, qt_("Ignore all|I"), + FuncRequest(LFUN_SPELLING_IGNORE, arg))); + +} + + void MenuDefinition::expandLastfiles() { - LastFilesSection::LastFiles const & lf = LyX::cref().session().lastFiles().lastFiles(); + LastFilesSection::LastFiles const & lf = theSession().lastFiles().lastFiles(); LastFilesSection::LastFiles::const_iterator lfit = lf.begin(); - int ii = 1; + unsigned int ii = 1; - for (; lfit != lf.end() && ii < 10; ++lfit, ++ii) { + for (; lfit != lf.end() && ii <= lyxrc.num_lastfiles; ++lfit, ++ii) { string const file = lfit->absFilename(); - QString const label = QString("%1. %2|%3").arg(ii) - .arg(toqstr(makeDisplayPath(file, 30))).arg(ii); + QString label; + if (ii < 10) + label = QString("%1. %2|%3").arg(ii) + .arg(toqstr(makeDisplayPath(file, 30))).arg(ii); + else + label = QString("%1. %2").arg(ii) + .arg(toqstr(makeDisplayPath(file, 30))); add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_FILE_OPEN, file))); } } @@ -630,35 +777,48 @@ void MenuDefinition::expandLastfiles() void MenuDefinition::expandDocuments() { + MenuItem item(MenuItem::Submenu, qt_("Invisible")); + item.setSubmenu(MenuDefinition(qt_("Invisible"))); + Buffer * first = theBufferList().first(); if (first) { Buffer * b = first; - int ii = 1; + int vis = 1; + int invis = 1; // We cannot use a for loop as the buffer list cycles. do { QString label = toqstr(b->fileName().displayName(20)); if (!b->isClean()) label += "*"; + bool const shown = guiApp->currentView() + ? guiApp->currentView()->workArea(*b) : false; + int ii = shown ? vis : invis; if (ii < 10) label = QString::number(ii) + ". " + label + '|' + QString::number(ii); - add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_BUFFER_SWITCH, b->absFileName()))); - + if (shown) { + add(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_BUFFER_SWITCH, b->absFileName()))); + ++vis; + } else { + item.submenu().add(MenuItem(MenuItem::Command, label, + FuncRequest(LFUN_BUFFER_SWITCH, b->absFileName()))); + ++invis; + } b = theBufferList().next(b); - ++ii; } while (b != first); - } else { - add(MenuItem(MenuItem::Command, qt_("No Documents Open!"), - FuncRequest(LFUN_NOACTION))); - } + if (!item.submenu().empty()) + add(item); + } else + add(MenuItem(MenuItem::Info, qt_(""))); } void MenuDefinition::expandBookmarks() { - lyx::BookmarksSection const & bm = LyX::cref().session().bookmarks(); + lyx::BookmarksSection const & bm = theSession().bookmarks(); + bool empty = true; for (size_t i = 1; i <= bm.size(); ++i) { if (bm.isValid(i)) { string const file = bm.bookmark(i).filename.absFilename(); @@ -666,23 +826,22 @@ void MenuDefinition::expandBookmarks() .arg(toqstr(makeDisplayPath(file, 20))).arg(i); add(MenuItem(MenuItem::Command, label, FuncRequest(LFUN_BOOKMARK_GOTO, convert(i)))); + empty = false; } } + if (empty) + add(MenuItem(MenuItem::Info, qt_(""))); } void MenuDefinition::expandFormats(MenuItem::Kind kind, Buffer const * buf) { - if (!buf && kind != MenuItem::ImportFormats) { - add(MenuItem(MenuItem::Command, - qt_("No Document Open!"), - FuncRequest(LFUN_NOACTION))); + if (!buf && kind != MenuItem::ImportFormats) return; - } typedef vector Formats; Formats formats; - kb_action action; + FuncCode action; switch (kind) { case MenuItem::ImportFormats: @@ -703,59 +862,89 @@ void MenuDefinition::expandFormats(MenuItem::Kind kind, Buffer const * buf) } sort(formats.begin(), formats.end(), &compareFormat); + bool const view_update = (kind == MenuItem::ViewFormats + || kind == MenuItem::UpdateFormats); + + QString smenue; + if (view_update) + smenue = (kind == MenuItem::ViewFormats ? + qt_("View (Other Formats)|F") + : qt_("Update (Other Formats)|p")); + MenuItem item(MenuItem::Submenu, smenue); + item.setSubmenu(MenuDefinition(smenue)); + Formats::const_iterator fit = formats.begin(); Formats::const_iterator end = formats.end(); for (; fit != end ; ++fit) { if ((*fit)->dummy()) continue; - QString label = toqstr((*fit)->prettyname()); - QString const shortcut = toqstr((*fit)->shortcut()); + + docstring lab = from_utf8((*fit)->prettyname()); + docstring scut = from_utf8((*fit)->shortcut()); + docstring const tmplab = lab; + + if (!scut.empty()) + lab += char_type('|') + scut; + docstring lab_i18n = translateIfPossible(lab); + bool const untranslated = (lab == lab_i18n); + QString const shortcut = toqstr(split(lab_i18n, lab, '|')); + QString label = toqstr(lab); + if (untranslated) + // this might happen if the shortcut + // has been redefined + label = toqstr(translateIfPossible(tmplab)); switch (kind) { case MenuItem::ImportFormats: - // FIXME: This is a hack, we should rather solve - // FIXME: bug 2488 instead. - if ((*fit)->name() == "text") - label = qt_("Plain Text"); - else if ((*fit)->name() == "textparagraph") - label = qt_("Plain Text, Join Lines"); label += "..."; break; case MenuItem::ViewFormats: - case MenuItem::ExportFormats: case MenuItem::UpdateFormats: + if ((*fit)->name() == buf->getDefaultOutputFormat()) { + docstring lbl = (kind == MenuItem::ViewFormats ? + bformat(_("View [%1$s]|V"), qstring_to_ucs4(label)) + : bformat(_("Update [%1$s]|U"), qstring_to_ucs4(label))); + MenuItem w(MenuItem::Command, toqstr(lbl), + FuncRequest(action, (*fit)->name())); + add(w); + continue; + } + case MenuItem::ExportFormats: if (!(*fit)->documentFormat()) continue; break; default: - BOOST_ASSERT(false); + LASSERT(false, /**/); break; } - // FIXME: if we had proper support for translating the - // format names defined in configure.py, there would - // not be a need to check whether the shortcut is - // correct. If we add it uncondiitonally, it would - // create useless warnings on bad shortcuts - if (!shortcut.isEmpty() && label.contains(shortcut)) + if (!shortcut.isEmpty()) label += '|' + shortcut; - if (buf) - addWithStatusCheck(MenuItem(MenuItem::Command, label, - FuncRequest(action, (*fit)->name()))); - else - add(MenuItem(MenuItem::Command, label, - FuncRequest(action, (*fit)->name()))); + if (view_update) { + if (buf) + item.submenu().addWithStatusCheck(MenuItem(MenuItem::Command, label, + FuncRequest(action, (*fit)->name()))); + else + item.submenu().add(MenuItem(MenuItem::Command, label, + FuncRequest(action, (*fit)->name()))); + } else { + if (buf) + addWithStatusCheck(MenuItem(MenuItem::Command, label, + FuncRequest(action, (*fit)->name()))); + else + add(MenuItem(MenuItem::Command, label, + FuncRequest(action, (*fit)->name()))); + } } + if (view_update) + add(item); } void MenuDefinition::expandFloatListInsert(Buffer const * buf) { - if (!buf) { - add(MenuItem(MenuItem::Command, qt_("No Document Open!"), - FuncRequest(LFUN_NOACTION))); + if (!buf) return; - } FloatList const & floats = buf->params().documentClass().floats(); FloatList::const_iterator cit = floats.begin(); @@ -763,7 +952,7 @@ void MenuDefinition::expandFloatListInsert(Buffer const * buf) for (; cit != end; ++cit) { addWithStatusCheck(MenuItem(MenuItem::Command, qt_(cit->second.listName()), - FuncRequest(LFUN_FLOAT_LIST, + FuncRequest(LFUN_FLOAT_LIST_INSERT, cit->second.type()))); } } @@ -771,11 +960,8 @@ void MenuDefinition::expandFloatListInsert(Buffer const * buf) void MenuDefinition::expandFloatInsert(Buffer const * buf) { - if (!buf) { - add(MenuItem(MenuItem::Command, qt_("No Document Open!"), - FuncRequest(LFUN_NOACTION))); + if (!buf) return; - } FloatList const & floats = buf->params().documentClass().floats(); FloatList::const_iterator cit = floats.begin(); @@ -790,24 +976,27 @@ void MenuDefinition::expandFloatInsert(Buffer const * buf) } -void MenuDefinition::expandFlexInsert(Buffer const * buf, string s) +void MenuDefinition::expandFlexInsert( + Buffer const * buf, InsetLayout::InsetLyXType type) { - if (!buf) { - add(MenuItem(MenuItem::Command, qt_("No Document Open!"), - FuncRequest(LFUN_NOACTION))); + if (!buf) return; - } + TextClass::InsetLayouts const & insetLayouts = buf->params().documentClass().insetLayouts(); TextClass::InsetLayouts::const_iterator cit = insetLayouts.begin(); TextClass::InsetLayouts::const_iterator end = insetLayouts.end(); for (; cit != end; ++cit) { - docstring const label = cit->first; - if (cit->second.lyxtype() == s) + if (cit->second.lyxtype() == type) { + docstring const label = cit->first; addWithStatusCheck(MenuItem(MenuItem::Command, - toqstr(label), FuncRequest(LFUN_FLEX_INSERT, - label))); + toqstr(translateIfPossible(label)), + FuncRequest(LFUN_FLEX_INSERT, Lexer::quoteString(label)))); + } } + // FIXME This is a little clunky. + if (items_.empty() && type == InsetLayout::CUSTOM) + add(MenuItem(MenuItem::Help, qt_("No Custom Insets Defined!"))); } @@ -875,15 +1064,10 @@ void MenuDefinition::expandToc(Buffer const * buf) // OK, so we avoid this unnecessary overhead (JMarc) if (!buf) { - add(MenuItem(MenuItem::Command, qt_("No Document Open!"), - FuncRequest(LFUN_NOACTION))); + add(MenuItem(MenuItem::Info, qt_(""))); 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->masterBuffer(); if (buf != master) { @@ -904,42 +1088,7 @@ void MenuDefinition::expandToc(Buffer const * buf) if (cit->first == "tableofcontents") continue; - string const & floatName = floatlist.getType(cit->first).listName(); - QString label; - bool in_other_list = true; - if (!floatName.empty()) { - label = qt_(floatName); - in_other_list = false; - } - else if (cit->first == "child") { - label = qt_("Child Documents"); - in_other_list = false; - } else if (cit->first == "embedded") - label = qt_("Embedded Files"); - else if (cit->first == "graphics") - label = qt_("List of Graphics"); - else if (cit->first == "equation") - label = qt_("List of Equations"); - else if (cit->first == "index") - label = qt_("List of Indexes"); - else if (cit->first == "listing") - label = qt_("List of Listings"); - else if (cit->first == "marginalnote") - label = qt_("List of Marginal notes"); - else if (cit->first == "note") - label = qt_("List of Notes"); - else if (cit->first == "footnote") - label = qt_("List of Foot notes"); - else if (cit->first == "label") - label = qt_("Labels and References"); - else if (cit->first == "citation") - label = qt_("List of Citations"); - else - // This should not happen unless the entry is missing above. - label = qt_("Other floats: ") + toqstr(cit->first); - MenuDefinition submenu; - if (cit->second.size() >= 30) { FuncRequest f(LFUN_DIALOG_SHOW, "toc " + cit->first); submenu.add(MenuItem(MenuItem::Command, qt_("Open Navigator..."), f)); @@ -947,20 +1096,20 @@ void MenuDefinition::expandToc(Buffer const * buf) TocIterator ccit = cit->second.begin(); TocIterator eend = cit->second.end(); for (; ccit != eend; ++ccit) { - QString const label = limitStringLength(ccit->str()); - submenu.add(MenuItem(MenuItem::Command, label, + submenu.add(MenuItem(MenuItem::Command, + limitStringLength(ccit->str()), FuncRequest(ccit->action()))); } } - MenuItem item(MenuItem::Submenu, label); + MenuItem item(MenuItem::Submenu, guiName(cit->first, buf->params())); item.setSubmenu(submenu); - if (in_other_list) - other_lists.add(item); - else { + if (floatlist.typeExist(cit->first) || cit->first == "child") { + // Those two types deserve to be in the main menu. item.setSubmenu(submenu); add(item); - } + } else + other_lists.add(item); } if (!other_lists.empty()) { MenuItem item(MenuItem::Submenu, qt_("Other Lists")); @@ -968,25 +1117,25 @@ void MenuDefinition::expandToc(Buffer const * buf) add(item); } - // Handle normal TOC cit = toc_list.find("tableofcontents"); - if (cit == end) { - addWithStatusCheck(MenuItem(MenuItem::Command, - qt_("No Table of contents"), - FuncRequest())); - } else { - expandToc2(cit->second, 0, cit->second.size(), 0); + if (cit == end) + LYXERR(Debug::GUI, "No table of contents."); + else { + if (cit->second.size() > 0 ) + expandToc2(cit->second, 0, cit->second.size(), 0); + else + add(MenuItem(MenuItem::Info, qt_(""))); } } -void MenuDefinition::expandPasteRecent() +void MenuDefinition::expandPasteRecent(Buffer const * buf) { - vector const sel = cap::availableSelections(); + docstring_list const sel = cap::availableSelections(buf); - vector::const_iterator cit = sel.begin(); - vector::const_iterator end = sel.end(); + docstring_list::const_iterator cit = sel.begin(); + docstring_list::const_iterator end = sel.end(); for (unsigned int index = 0; cit != end; ++cit, ++index) { add(MenuItem(MenuItem::Command, toqstr(*cit), @@ -997,58 +1146,189 @@ void MenuDefinition::expandPasteRecent() void MenuDefinition::expandToolbars() { - // + MenuDefinition other_lists; // extracts the toolbars from the backend - ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin(); - ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end(); - + Toolbars::Infos::const_iterator cit = guiApp->toolbars().begin(); + Toolbars::Infos::const_iterator end = guiApp->toolbars().end(); for (; cit != end; ++cit) { - QString label = qt_(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 & ToolbarInfo::AUTO) - label += qt_(" (auto)"); - add(MenuItem(MenuItem::Command, label, - FuncRequest(LFUN_TOOLBAR_TOGGLE, cit->name + " allowauto"))); + MenuItem const item(MenuItem::Command, toqstr(cit->gui_name), + FuncRequest(LFUN_TOOLBAR_TOGGLE, cit->name)); + if (guiApp->toolbars().isMainToolbar(cit->name)) + add(item); + else + other_lists.add(item); + } + + if (!other_lists.empty()) { + MenuItem item(MenuItem::Submenu, qt_("Other Toolbars")); + item.setSubmenu(other_lists); + add(item); } } void MenuDefinition::expandBranches(Buffer const * buf) { - if (!buf) { - add(MenuItem(MenuItem::Command, - qt_("No Document Open!"), - FuncRequest(LFUN_NOACTION))); + if (!buf) + return; + + BufferParams const & master_params = buf->masterBuffer()->params(); + BufferParams const & params = buf->params(); + if (params.branchlist().empty() && master_params.branchlist().empty() ) { + add(MenuItem(MenuItem::Help, qt_("No Branches Set for Document!"))); + return; + } + + BranchList::const_iterator cit = master_params.branchlist().begin(); + BranchList::const_iterator end = master_params.branchlist().end(); + + for (int ii = 1; cit != end; ++cit, ++ii) { + docstring label = cit->branch(); + if (ii < 10) { + label = convert(ii) + ". " + label + + char_type('|') + convert(ii); + } + addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label), + FuncRequest(LFUN_BRANCH_INSERT, + cit->branch()))); + } + + if (buf == buf->masterBuffer()) return; + + MenuDefinition child_branches; + + BranchList::const_iterator ccit = params.branchlist().begin(); + BranchList::const_iterator cend = params.branchlist().end(); + + for (int ii = 1; ccit != cend; ++ccit, ++ii) { + docstring label = ccit->branch(); + if (ii < 10) { + label = convert(ii) + ". " + label + + char_type('|') + convert(ii); + } + child_branches.addWithStatusCheck(MenuItem(MenuItem::Command, + toqstr(label), + FuncRequest(LFUN_BRANCH_INSERT, + ccit->branch()))); } + + if (!child_branches.empty()) { + MenuItem item(MenuItem::Submenu, qt_("Child Document")); + item.setSubmenu(child_branches); + add(item); + } +} + + +void MenuDefinition::expandIndices(Buffer const * buf, bool listof) +{ + if (!buf) + return; BufferParams const & params = buf->masterBuffer()->params(); - if (params.branchlist().empty()) { + if (!params.use_indices) { + if (listof) + addWithStatusCheck(MenuItem(MenuItem::Command, + qt_("Index List|I"), + FuncRequest(LFUN_INDEX_PRINT, + from_ascii("idx")))); + else + addWithStatusCheck(MenuItem(MenuItem::Command, + qt_("Index Entry|d"), + FuncRequest(LFUN_INDEX_INSERT, + from_ascii("idx")))); + return; + } + + if (params.indiceslist().empty()) + return; + + IndicesList::const_iterator cit = params.indiceslist().begin(); + IndicesList::const_iterator end = params.indiceslist().end(); + + for (int ii = 1; cit != end; ++cit, ++ii) { + if (listof) + addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(cit->index()), + FuncRequest(LFUN_INDEX_PRINT, + cit->shortcut()))); + else { + docstring label = _("Index Entry"); + label += " (" + cit->index() + ")"; + addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label), + FuncRequest(LFUN_INDEX_INSERT, + cit->shortcut()))); + } + } +} + + +void MenuDefinition::expandIndicesContext(Buffer const * buf, bool listof) +{ + if (!buf) + return; + + BufferParams const & params = buf->masterBuffer()->params(); + if (!params.use_indices || params.indiceslist().empty()) + return; + + IndicesList::const_iterator cit = params.indiceslist().begin(); + IndicesList::const_iterator end = params.indiceslist().end(); + + for (int ii = 1; cit != end; ++cit, ++ii) { + if (listof) { + InsetCommandParams p(INDEX_PRINT_CODE); + p["type"] = cit->shortcut(); + string const data = InsetCommand::params2string("index_print", p); + addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(cit->index()), + FuncRequest(LFUN_INSET_MODIFY, data))); + } else { + docstring label = _("Index Entry"); + label += " (" + cit->index() + ")"; + addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label), + FuncRequest(LFUN_INSET_MODIFY, + from_ascii("changetype ") + cit->shortcut()))); + } + } +} + + +void MenuDefinition::expandCiteStyles(BufferView const * bv) +{ + if (!bv) + return; + + Inset const * inset = bv->cursor().nextInset(); + if (!inset || inset->lyxCode() != CITE_CODE) { add(MenuItem(MenuItem::Command, - qt_("No Branch in Document!"), + qt_("No Citation in Scope!"), FuncRequest(LFUN_NOACTION))); return; } + InsetCommand const * citinset = + static_cast(inset); + + Buffer const * buf = &bv->buffer(); + docstring key = citinset->getParam("key"); + // we can only handle one key currently + if (contains(key, ',')) + key = qstring_to_ucs4(toqstr(key).split(',')[0]); - BranchList::const_iterator cit = params.branchlist().begin(); - BranchList::const_iterator end = params.branchlist().end(); + vector citeStyleList = citeStyles(buf->params().citeEngine()); + docstring_list citeStrings = + buf->masterBibInfo().getCiteStrings(key, bv->buffer()); + + docstring_list::const_iterator cit = citeStrings.begin(); + docstring_list::const_iterator end = citeStrings.end(); for (int ii = 1; cit != end; ++cit, ++ii) { - docstring label = cit->getBranch(); - if (ii < 10) - label = convert(ii) + ". " + label + char_type('|') + convert(ii); + docstring label = *cit; + CitationStyle cs; + CiteStyle cst = citeStyleList[ii - 1]; + cs.style = cst; addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label), - FuncRequest(LFUN_BRANCH_INSERT, - cit->getBranch()))); + FuncRequest(LFUN_INSET_MODIFY, + "changetype " + from_utf8(citationStyleToString(cs))))); } } @@ -1098,9 +1378,9 @@ static QString label(MenuItem const & mi) void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu) { - LYXERR(Debug::GUI, "populating menu " << fromqstr(menu.name())); + LYXERR(Debug::GUI, "populating menu " << menu.name()); if (menu.size() == 0) { - LYXERR(Debug::GUI, "\tERROR: empty menu " << fromqstr(menu.name())); + LYXERR(Debug::GUI, "\tERROR: empty menu " << menu.name()); return; } LYXERR(Debug::GUI, " ***** menu entries " << menu.size()); @@ -1112,6 +1392,7 @@ void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu) else if (m->kind() == MenuItem::Submenu) { QMenu * subMenu = qMenu.addMenu(label(*m)); populate(*subMenu, m->submenu()); + subMenu->setEnabled(m->status().enabled()); } else { // we have a MenuItem::Command qMenu.addAction(new Action(view, QIcon(), label(*m), @@ -1125,7 +1406,7 @@ void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu) ///////////////////////////////////////////////////////////////////// Menu::Menu(GuiView * gv, QString const & name, bool top_level) -: d(new Menu::Impl) +: QMenu(gv), d(new Menu::Impl) { d->top_level_menu = top_level? new MenuDefinition : 0; d->view = gv; @@ -1164,10 +1445,10 @@ struct Menus::Impl { /// Expands some special entries of the menu /** The entries with the following kind are expanded to a sequence of Command MenuItems: Lastfiles, Documents, - ViewFormats, ExportFormats, UpdateFormats, Branches + ViewFormats, ExportFormats, UpdateFormats, Branches, Indices */ void expand(MenuDefinition const & frommenu, MenuDefinition & tomenu, - Buffer const *) const; + BufferView const *) const; /// Initialize specific MACOS X menubar void macxMenuBarInit(GuiView * view, QMenuBar * qmb); @@ -1175,21 +1456,30 @@ struct Menus::Impl { /// Mac special menu. /** This defines a menu whose entries list the FuncRequests that will be removed by expand() in other menus. This is - used by the Qt/Mac code + used by the Qt/Mac code. + + NOTE: Qt does not remove the menu items when clearing a QMenuBar, + such that the items will keep accessing the FuncRequests in + the MenuDefinition. While Menus::Impl might be recreated, + we keep mac_special_menu_ in memory by making it static. */ - MenuDefinition specialmenu_; + static MenuDefinition mac_special_menu_; /// MenuList menulist_; /// MenuDefinition menubar_; - typedef QMap > NameMap; + typedef QMap > NameMap; /// name to menu for \c menu() method. NameMap name_map_; }; + +MenuDefinition Menus::Impl::mac_special_menu_; + + /* Here is what the Qt documentation says about how a menubar is chosen: @@ -1213,12 +1503,6 @@ struct Menus::Impl { */ void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb) { - // The Mac menubar initialisation must be done only once! - static bool done = false; - if (done) - return; - done = true; - /* Since Qt 4.2, the qt/mac menu code has special code for specifying the role of a menu entry. However, it does not work very well with our scheme of creating menus on demand, @@ -1234,7 +1518,7 @@ void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb) * the hassle, though. (JMarc) */ struct MacMenuEntry { - kb_action action; + FuncCode action; char const * arg; char const * label; QAction::MenuRole role; @@ -1251,18 +1535,21 @@ void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb) }; const size_t num_entries = sizeof(entries) / sizeof(entries[0]); - // the special menu for Menus. - for (size_t i = 0 ; i < num_entries ; ++i) { - FuncRequest const func(entries[i].action, - from_utf8(entries[i].arg)); - specialmenu_.add(MenuItem(MenuItem::Command, entries[i].label, func)); + // the special menu for Menus. Fill it up only once. + if (mac_special_menu_.size() == 0) { + for (size_t i = 0 ; i < num_entries ; ++i) { + FuncRequest const func(entries[i].action, + from_utf8(entries[i].arg)); + mac_special_menu_.add(MenuItem(MenuItem::Command, + entries[i].label, func)); + } } - + // add the entries to a QMenu that will eventually be empty // and therefore invisible. QMenu * qMenu = qmb->addMenu("special"); - MenuDefinition::const_iterator cit = specialmenu_.begin(); - MenuDefinition::const_iterator end = specialmenu_.end(); + MenuDefinition::const_iterator cit = mac_special_menu_.begin(); + MenuDefinition::const_iterator end = mac_special_menu_.end(); for (size_t i = 0 ; cit != end ; ++cit, ++i) { Action * action = new Action(view, QIcon(), cit->label(), cit->func(), QString(), qMenu); @@ -1272,14 +1559,15 @@ void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb) } -void Menus::Impl::expand(MenuDefinition const & frommenu, MenuDefinition & tomenu, - Buffer const * buf) const +void Menus::Impl::expand(MenuDefinition const & frommenu, + MenuDefinition & tomenu, BufferView const * bv) const { if (!tomenu.empty()) tomenu.clear(); for (MenuDefinition::const_iterator cit = frommenu.begin(); cit != frommenu.end() ; ++cit) { + Buffer const * buf = bv ? &bv->buffer() : 0; switch (cit->kind()) { case MenuItem::Lastfiles: tomenu.expandLastfiles(); @@ -1301,15 +1589,15 @@ void Menus::Impl::expand(MenuDefinition const & frommenu, MenuDefinition & tomen break; case MenuItem::CharStyles: - tomenu.expandFlexInsert(buf, "charstyle"); + tomenu.expandFlexInsert(buf, InsetLayout::CHARSTYLE); break; case MenuItem::Custom: - tomenu.expandFlexInsert(buf, "custom"); + tomenu.expandFlexInsert(buf, InsetLayout::CUSTOM); break; case MenuItem::Elements: - tomenu.expandFlexInsert(buf, "element"); + tomenu.expandFlexInsert(buf, InsetLayout::ELEMENT); break; case MenuItem::FloatListInsert: @@ -1321,7 +1609,7 @@ void Menus::Impl::expand(MenuDefinition const & frommenu, MenuDefinition & tomen break; case MenuItem::PasteRecent: - tomenu.expandPasteRecent(); + tomenu.expandPasteRecent(buf); break; case MenuItem::Toolbars: @@ -1332,24 +1620,54 @@ void Menus::Impl::expand(MenuDefinition const & frommenu, MenuDefinition & tomen tomenu.expandBranches(buf); break; + case MenuItem::Indices: + tomenu.expandIndices(buf); + break; + + case MenuItem::IndicesContext: + tomenu.expandIndicesContext(buf); + break; + + case MenuItem::IndicesLists: + tomenu.expandIndices(buf, true); + break; + + case MenuItem::IndicesListsContext: + tomenu.expandIndicesContext(buf, true); + break; + + case MenuItem::CiteStyles: + tomenu.expandCiteStyles(bv); + break; + case MenuItem::Toc: tomenu.expandToc(buf); break; + case MenuItem::GraphicsGroups: + tomenu.expandGraphicsGroups(bv); + break; + + case MenuItem::SpellingSuggestions: + tomenu.expandSpellingSuggestions(bv); + break; + case MenuItem::Submenu: { MenuItem item(*cit); item.setSubmenu(MenuDefinition(cit->submenuname())); - expand(getMenu(cit->submenuname()), item.submenu(), buf); + expand(getMenu(cit->submenuname()), item.submenu(), bv); tomenu.addWithStatusCheck(item); } break; + case MenuItem::Info: + case MenuItem::Help: case MenuItem::Separator: tomenu.addWithStatusCheck(*cit); break; case MenuItem::Command: - if (!specialmenu_.hasFunc(cit->func())) + if (!mac_special_menu_.hasFunc(cit->func())) tomenu.addWithStatusCheck(*cit); } } @@ -1375,8 +1693,8 @@ MenuDefinition const & Menus::Impl::getMenu(QString const & name) const const_iterator cit = find_if(menulist_.begin(), menulist_.end(), MenuNamesEqual(name)); if (cit == menulist_.end()) - lyxerr << "No submenu named " << fromqstr(name) << endl; - BOOST_ASSERT(cit != menulist_.end()); + LYXERR0("No submenu named " << name); + LASSERT(cit != menulist_.end(), /**/); return (*cit); } @@ -1386,42 +1704,54 @@ MenuDefinition & Menus::Impl::getMenu(QString const & name) iterator it = find_if(menulist_.begin(), menulist_.end(), MenuNamesEqual(name)); if (it == menulist_.end()) - lyxerr << "No submenu named " << fromqstr(name) << endl; - BOOST_ASSERT(it != menulist_.end()); + LYXERR0("No submenu named " << name); + LASSERT(it != menulist_.end(), /**/); return (*it); } + ///////////////////////////////////////////////////////////////////// -// Menus implementation +// +// Menus +// ///////////////////////////////////////////////////////////////////// -Menus::Menus(): d(new Impl) {} +Menus::Menus() : d(new Impl) {} + + +Menus::~Menus() +{ + delete d; +} + + +void Menus::reset() +{ + delete d; + d = new Impl; +} void Menus::read(Lexer & lex) { - enum Menutags { - md_menu = 1, + enum { + md_menu, md_menubar, md_endmenuset, - md_last }; - struct keyword_item menutags[md_last - 1] = { + LexerKeyword menutags[] = { { "end", md_endmenuset }, { "menu", md_menu }, { "menubar", md_menubar } }; - //consistency check - if (compare_ascii_no_case(lex.getString(), "menuset")) { - lyxerr << "Menubackend::read: ERROR wrong token:`" - << lex.getString() << '\'' << endl; - } + // consistency check + if (compare_ascii_no_case(lex.getString(), "menuset")) + LYXERR0("Menus::read: ERROR wrong token: `" << lex.getString() << '\''); - lex.pushTable(menutags, md_last - 1); - if (lyxerr.debugging(Debug::PARSER)) - lex.printTable(lyxerr); + lex.pushTable(menutags); + lex.setContext("Menus::read"); bool quit = false; @@ -1446,8 +1776,7 @@ void Menus::read(Lexer & lex) quit = true; break; default: - lex.printError("menubackend::read: " - "Unknown menu tag: `$$Token'"); + lex.printError("Unknown menu tag"); break; } } @@ -1456,7 +1785,7 @@ void Menus::read(Lexer & lex) bool Menus::searchMenu(FuncRequest const & func, - vector & names) const + docstring_list & names) const { MenuDefinition menu; d->expand(d->menubar_, menu, 0); @@ -1464,33 +1793,36 @@ bool Menus::searchMenu(FuncRequest const & func, } -void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view) +void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial) { - // Clear all menubar contents before filling it. - qmb->clear(); - + if (initial) { #ifdef Q_WS_MACX - // setup special mac specific menu item - d->macxMenuBarInit(view, qmb); + // setup special mac specific menu items, but only do this + // the first time a QMenuBar is created. Otherwise Qt will + // create duplicate items in the application menu. It seems + // that Qt does not remove them when the QMenubar is cleared. + LYXERR(Debug::GUI, "Creating Mac OS X special menu bar"); + d->macxMenuBarInit(view, qmb); #endif + } else { + // Clear all menubar contents before filling it. + qmb->clear(); + } - LYXERR(Debug::GUI, "populating menu bar" << fromqstr(d->menubar_.name())); + LYXERR(Debug::GUI, "populating menu bar" << d->menubar_.name()); if (d->menubar_.size() == 0) { LYXERR(Debug::GUI, "\tERROR: empty menu bar" - << fromqstr(d->menubar_.name())); + << d->menubar_.name()); return; } - else { - LYXERR(Debug::GUI, "menu bar entries " - << d->menubar_.size()); - } + LYXERR(Debug::GUI, "menu bar entries " << d->menubar_.size()); MenuDefinition menu; - Buffer * buf = 0; + BufferView * bv = 0; if (view) - buf = view->buffer(); - d->expand(d->menubar_, menu, buf); + bv = view->currentBufferView(); + d->expand(d->menubar_, menu, bv); MenuDefinition::const_iterator m = menu.begin(); MenuDefinition::const_iterator end = menu.end(); @@ -1498,16 +1830,16 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view) for (; m != end; ++m) { if (m->kind() != MenuItem::Submenu) { - LYXERR(Debug::GUI, "\tERROR: not a submenu " << fromqstr(m->label())); + LYXERR(Debug::GUI, "\tERROR: not a submenu " << m->label()); continue; } - LYXERR(Debug::GUI, "menu bar item " << fromqstr(m->label()) - << " is a submenu named " << fromqstr(m->submenuname())); + LYXERR(Debug::GUI, "menu bar item " << m->label() + << " is a submenu named " << m->submenuname()); QString name = m->submenuname(); if (!d->hasMenu(name)) { - LYXERR(Debug::GUI, "\tERROR: " << fromqstr(name) + LYXERR(Debug::GUI, "\tERROR: " << name << " submenu has no menu!"); continue; } @@ -1523,37 +1855,34 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view) void Menus::updateMenu(Menu * qmenu) { - LYXERR(Debug::GUI, "Triggered menu: " << fromqstr(qmenu->d->name)); + LYXERR(Debug::GUI, "Triggered menu: " << qmenu->d->name); qmenu->clear(); if (qmenu->d->name.isEmpty()) return; - // Here, We make sure that theLyXFunc points to the correct LyXView. - theLyXFunc().setLyXView(qmenu->d->view); - if (!d->hasMenu(qmenu->d->name)) { - qmenu->addAction(qt_("No action defined!")); + qmenu->addAction(qt_("No Action Defined!")); LYXERR(Debug::GUI, "\tWARNING: non existing menu: " - << fromqstr(qmenu->d->name)); + << qmenu->d->name); return; } MenuDefinition const & fromLyxMenu = d->getMenu(qmenu->d->name); - Buffer * buf = 0; + BufferView * bv = 0; if (qmenu->d->view) - buf = qmenu->d->view->buffer(); - d->expand(fromLyxMenu, *qmenu->d->top_level_menu, buf); + bv = qmenu->d->view->currentBufferView(); + d->expand(fromLyxMenu, *qmenu->d->top_level_menu, bv); qmenu->d->populate(*qmenu, *qmenu->d->top_level_menu); } Menu * Menus::menu(QString const & name, GuiView & view) { - LYXERR(Debug::GUI, "Context menu requested: " << fromqstr(name)); + LYXERR(Debug::GUI, "Context menu requested: " << name); Menu * menu = d->name_map_[&view].value(name, 0); if (!menu && !name.startsWith("context-")) { - LYXERR0("requested context menu not found: " << fromqstr(name)); + LYXERR0("requested context menu not found: " << name); return 0; } @@ -1565,4 +1894,4 @@ Menu * Menus::menu(QString const & name, GuiView & view) } // namespace frontend } // namespace lyx -#include "Menus_moc.cpp" +#include "moc_Menus.cpp"