X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FMenus.cpp;h=8de4f83257d98e75c7508b816216b44b04262085;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=cdf6e6039c4c2c89b1a5862ad522cdd753d445ef;hpb=84622bc642e1c4f13a77cda6fccbf2b9a4f50c57;p=lyx.git diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index cdf6e6039c..8de4f83257 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -21,11 +21,14 @@ #include "Action.h" #include "GuiApplication.h" #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" @@ -33,33 +36,42 @@ #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 "qt_helpers.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" #include #include +#include #include #include #include #include -#include #include using namespace std; @@ -73,7 +85,7 @@ namespace { // MacOSX specific stuff is at the end. -class Menu; +class MenuDefinition; /// class MenuItem { @@ -86,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, @@ -129,27 +150,55 @@ 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); + explicit MenuItem(Kind kind) : kind_(kind), optional_(false) {} MenuItem(Kind kind, QString const & label, QString const & submenu = QString(), - bool optional = false); + bool optional = false) + : kind_(kind), label_(label), submenuname_(submenu), optional_(optional) + { + 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 = origin; + } + + // boost::shared_ptr needs this apprently... + ~MenuItem() {} - /// This one is just to please boost::shared_ptr<> - ~MenuItem(); /// The label of a given menuitem - QString label() const; + QString label() const { return label_.split('|')[0]; } + /// The keyboard shortcut (usually underlined in the entry) - QString shortcut() const; + QString shortcut() const + { + return label_.contains('|') ? label_.split('|')[1] : QString(); + } /// The complete label, with label and shortcut separated by a '|' QString fulllabel() const { return label_;} /// The kind of entry @@ -164,16 +213,39 @@ public: FuncStatus & status() { return status_; } /// returns the status of the lfun associated with this entry void status(FuncStatus const & status) { status_ = status; } + ///returns the binding associated to this action. - QString binding() const; + QString binding() const + { + if (kind_ != Command) + return QString(); + // Get the keys bound to this action, but keep only the + // first one later + KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func_); + if (bindings.size()) + return toqstr(bindings.begin()->print(KeySequence::ForGui)); + + LYXERR(Debug::KBMAP, "No binding for " + << lyxaction.getActionName(func_.action) + << '(' << func_.argument() << ')'); + return QString(); + } + /// the description of the submenu (if relevant) QString const & submenuname() const { return submenuname_; } /// set the description of the submenu void submenuname(QString const & name) { submenuname_ = name; } /// - Menu * submenu() const { return submenu_.get(); } + bool hasSubmenu() const { return !submenu_.isEmpty(); } /// - void setSubmenu(Menu * menu); + MenuDefinition const & submenu() const { return submenu_.at(0); } + MenuDefinition & submenu() { return submenu_[0]; } + /// + void setSubmenu(MenuDefinition const & menu) + { + submenu_.clear(); + submenu_.append(menu); + } private: /// @@ -188,19 +260,19 @@ private: bool optional_; /// FuncStatus status_; - /// - boost::shared_ptr submenu_; + /// contains 0 or 1 item. + QList submenu_; }; /// -class Menu { +class MenuDefinition { public: /// typedef std::vector ItemList; /// typedef ItemList::const_iterator const_iterator; /// - explicit Menu(QString const & name = QString()) : name_(name) {} + explicit MenuDefinition(QString const & name = QString()) : name_(name) {} /// void read(Lexer &); @@ -221,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; @@ -239,592 +311,278 @@ 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_; /// QString name_; }; -/// a submenu -class GuiPopupMenu : public QMenu -{ -public: - /// - GuiPopupMenu(GuiView * gv, MenuItem const & mi, bool top_level) - : QMenu(gv), top_level_menu(top_level? new Menu : 0), view(gv), - name(mi.submenuname()) - { - setTitle(label(mi)); - } - - /// populates the menu or one of its submenu - /// This is used as a recursive function - void populate(QMenu * qMenu, Menu * menu); - - /// Get a Menu item label from the menu backend - QString label(MenuItem const & mi) const; - - void showEvent(QShowEvent * ev) - { - if (top_level_menu) - guiApp->menus().updateMenu(name); - QMenu::showEvent(ev); - } - - /// Only needed for top level menus. - Menu * top_level_menu; - /// our owning view - GuiView * view; - /// the name of this menu - QString name; -}; - +/// Helper for std::find_if class MenuNamesEqual { public: MenuNamesEqual(QString const & name) : name_(name) {} - bool operator()(Menu const & menu) const { return menu.name() == name_; } + bool operator()(MenuDefinition const & menu) const { return menu.name() == name_; } private: QString name_; }; + /// -typedef std::vector MenuList; +typedef std::vector MenuList; /// typedef MenuList::const_iterator const_iterator; /// typedef MenuList::iterator iterator; +///////////////////////////////////////////////////////////////////// +// MenuDefinition implementation +///////////////////////////////////////////////////////////////////// -void GuiPopupMenu::populate(QMenu * qMenu, Menu * menu) +void MenuDefinition::addWithStatusCheck(MenuItem const & i) { - LYXERR(Debug::GUI, "populating menu " << fromqstr(menu->name())); - if (menu->size() == 0) { - LYXERR(Debug::GUI, "\tERROR: empty menu " << fromqstr(menu->name())); - return; + switch (i.kind()) { + + case MenuItem::Command: { + FuncStatus status = lyx::getStatus(i.func()); + if (status.unknown() || (!status.enabled() && i.optional())) + break; + items_.push_back(i); + items_.back().status(status); + break; } - LYXERR(Debug::GUI, " ***** menu entries " << menu->size()); - Menu::const_iterator m = menu->begin(); - Menu::const_iterator end = menu->end(); - for (; m != end; ++m) { - if (m->kind() == MenuItem::Separator) - qMenu->addSeparator(); - else if (m->kind() == MenuItem::Submenu) { - QMenu * subMenu = qMenu->addMenu(label(*m)); - populate(subMenu, m->submenu()); - } else { - // we have a MenuItem::Command - qMenu->addAction(new Action(*view, QIcon(), label(*m), m->func(), - QString())); + + case MenuItem::Submenu: { + bool enabled = false; + if (i.hasSubmenu()) { + for (const_iterator cit = i.submenu().begin(); + 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::Help) + && cit->status().enabled()) { + enabled = true; + break; + } + } } + if (enabled || !i.optional()) { + items_.push_back(i); + items_.back().status().setEnabled(enabled); + } + break; + } + + case MenuItem::Separator: + if (!items_.empty() && items_.back().kind() != MenuItem::Separator) + items_.push_back(i); + break; + + default: + items_.push_back(i); } } -QString GuiPopupMenu::label(MenuItem const & mi) const +void MenuDefinition::read(Lexer & lex) { - QString label = mi.label(); - label.replace("&", "&&"); + enum { + md_item = 1, + md_branches, + md_citestyles, + md_documents, + md_bookmarks, + md_charstyles, + md_custom, + md_elements, + md_endmenu, + md_exportformats, + md_importformats, + md_indices, + md_indicescontext, + md_indiceslists, + md_indiceslistscontext, + md_lastfiles, + md_optitem, + md_optsubmenu, + md_separator, + md_submenu, + md_toc, + md_updateformats, + md_viewformats, + md_floatlistinsert, + md_floatinsert, + md_pasterecent, + md_toolbars, + md_graphicsgroups, + md_spellingsuggestions + }; - QString shortcut = mi.shortcut(); - if (!shortcut.isEmpty()) { - int pos = label.indexOf(shortcut); - if (pos != -1) - //label.insert(pos, 1, char_type('&')); - label.replace(pos, 0, "&"); - } + LexerKeyword menutags[] = { + { "bookmarks", md_bookmarks }, + { "branches", md_branches }, + { "charstyles", md_charstyles }, + { "citestyles", md_citestyles }, + { "custom", md_custom }, + { "documents", md_documents }, + { "elements", md_elements }, + { "end", md_endmenu }, + { "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 }, + { "updateformats", md_updateformats }, + { "viewformats", md_viewformats } + }; - QString const binding = mi.binding(); - if (!binding.isEmpty()) - label += '\t' + binding; + lex.pushTable(menutags); + lex.setContext("MenuDefinition::read: "); - return label; -} + bool quit = false; + bool optional = false; -} // namespace anon + while (lex.isOK() && !quit) { + switch (lex.lex()) { + case md_optitem: + optional = true; + // fallback to md_item + case md_item: { + lex.next(true); + docstring const name = translateIfPossible(lex.getDocString()); + lex.next(true); + string const command = lex.getString(); + FuncRequest func = lyxaction.lookupFunc(command); + 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; + } + case md_separator: + add(MenuItem(MenuItem::Separator)); + break; -struct Menus::Impl { - /// - void add(Menu const &); - /// - bool hasMenu(QString const &) const; - /// - Menu & getMenu(QString const &); - /// - Menu const & getMenu(QString const &) const; + case md_lastfiles: + add(MenuItem(MenuItem::Lastfiles)); + break; - /// 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 - */ - void expand(Menu const & frommenu, Menu & tomenu, - Buffer const *) const; + case md_charstyles: + add(MenuItem(MenuItem::CharStyles)); + break; - /// Initialize specific MACOS X menubar - void macxMenuBarInit(GuiView * view); + case md_custom: + add(MenuItem(MenuItem::Custom)); + break; - /// 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 - */ - Menu specialmenu_; + case md_elements: + add(MenuItem(MenuItem::Elements)); + break; - /// - MenuList menulist_; - /// - Menu menubar_; + case md_documents: + add(MenuItem(MenuItem::Documents)); + break; - typedef QHash NameMap; + case md_bookmarks: + add(MenuItem(MenuItem::Bookmarks)); + break; - /// name to menu for \c menu() method. - NameMap name_map_; -}; + case md_toc: + add(MenuItem(MenuItem::Toc)); + break; + case md_viewformats: + add(MenuItem(MenuItem::ViewFormats)); + break; -Menus::Menus(): d(new Impl) {} + case md_updateformats: + add(MenuItem(MenuItem::UpdateFormats)); + break; + case md_exportformats: + add(MenuItem(MenuItem::ExportFormats)); + break; -bool Menus::searchMenu(FuncRequest const & func, - vector & names) const -{ - return d->menubar_.searchMenu(func, names); -} + case md_importformats: + add(MenuItem(MenuItem::ImportFormats)); + break; + case md_floatlistinsert: + add(MenuItem(MenuItem::FloatListInsert)); + break; -void Menus::fillMenuBar(GuiView * view) -{ - // Clear all menubar contents before filling it. - view->menuBar()->clear(); - -#ifdef Q_WS_MACX - // setup special mac specific menu item - macxMenuBarInit(view); -#endif + case md_floatinsert: + add(MenuItem(MenuItem::FloatInsert)); + break; - LYXERR(Debug::GUI, "populating menu bar" << fromqstr(d->menubar_.name())); + case md_pasterecent: + add(MenuItem(MenuItem::PasteRecent)); + break; - if (d->menubar_.size() == 0) { - LYXERR(Debug::GUI, "\tERROR: empty menu bar" - << fromqstr(d->menubar_.name())); - return; - } - else { - LYXERR(Debug::GUI, "menu bar entries " - << d->menubar_.size()); - } + case md_toolbars: + add(MenuItem(MenuItem::Toolbars)); + break; - Menu menu; - d->expand(d->menubar_, menu, view->buffer()); + case md_branches: + add(MenuItem(MenuItem::Branches)); + break; - Menu::const_iterator m = menu.begin(); - Menu::const_iterator end = menu.end(); + case md_citestyles: + add(MenuItem(MenuItem::CiteStyles)); + break; - for (; m != end; ++m) { + case md_graphicsgroups: + add(MenuItem(MenuItem::GraphicsGroups)); + break; - if (m->kind() != MenuItem::Submenu) { - LYXERR(Debug::GUI, "\tERROR: not a submenu " << fromqstr(m->label())); - continue; - } + case md_spellingsuggestions: + add(MenuItem(MenuItem::SpellingSuggestions)); + break; - LYXERR(Debug::GUI, "menu bar item " << fromqstr(m->label()) - << " is a submenu named " << fromqstr(m->submenuname())); + case md_indices: + add(MenuItem(MenuItem::Indices)); + break; - QString name = m->submenuname(); - if (!d->hasMenu(name)) { - LYXERR(Debug::GUI, "\tERROR: " << fromqstr(name) - << " submenu has no menu!"); - continue; - } + case md_indicescontext: + add(MenuItem(MenuItem::IndicesContext)); + break; - GuiPopupMenu * qmenu = new GuiPopupMenu(view, *m, true); - view->menuBar()->addMenu(qmenu); + case md_indiceslists: + add(MenuItem(MenuItem::IndicesLists)); + break; - d->name_map_[name] = qmenu; - } -} - - -void Menus::updateMenu(QString const & name) -{ - GuiPopupMenu * qmenu = d->name_map_[name]; - LYXERR(Debug::GUI, "GuiPopupMenu::updateView()" - << "\tTriggered menu: " << fromqstr(qmenu->name)); - qmenu->clear(); - - if (qmenu->name.isEmpty()) - return; - - // Here, We make sure that theLyXFunc points to the correct LyXView. - theLyXFunc().setLyXView(qmenu->view); - - Menu const & fromLyxMenu = d->getMenu(qmenu->name); - d->expand(fromLyxMenu, *qmenu->top_level_menu, qmenu->view->buffer()); - - if (!d->hasMenu(qmenu->top_level_menu->name())) { - LYXERR(Debug::GUI, "\tWARNING: menu seems empty" - << fromqstr(qmenu->top_level_menu->name())); - } - qmenu->populate(qmenu, qmenu->top_level_menu); -} - - -QMenu * Menus::menu(QString const & name) -{ - LYXERR(Debug::GUI, "Context menu requested: " << fromqstr(name)); - GuiPopupMenu * menu = d->name_map_.value(name, 0); - if (!menu) - LYXERR0("resquested context menu not found: " << fromqstr(name)); - return menu; -} - - -/// Some special Qt/Mac support hacks - -/* - Here is what the Qt documentation says about how a menubar is chosen: - - 1) If the window has a QMenuBar then it is used. 2) If the window - is a modal then its menubar is used. If no menubar is specified - then a default menubar is used (as documented below) 3) If the - window has no parent then the default menubar is used (as - documented below). - - The above 3 steps are applied all the way up the parent window - chain until one of the above are satisifed. If all else fails a - default menubar will be created, the default menubar on Qt/Mac is - an empty menubar, however you can create a different default - menubar by creating a parentless QMenuBar, the first one created - will thus be designated the default menubar, and will be used - whenever a default menubar is needed. - - Thus, for Qt/Mac, we add the menus to a free standing menubar, so - that this menubar will be used also when one of LyX' dialogs has - focus. (JMarc) -*/ - -void Menus::Impl::macxMenuBarInit(GuiView * view) -{ - // 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, - and therefore we need to put these entries in a special - invisible menu. (JMarc) - */ - - /* The entries of our special mac menu. If we add support for - * special entries in Menus, we could imagine something - * like - * SpecialItem About " "About LyX" "dialog-show aboutlyx" - * and therefore avoid hardcoding. I am not sure it is worth - * the hassle, though. (JMarc) - */ - struct MacMenuEntry { - kb_action action; - char const * arg; - char const * label; - QAction::MenuRole role; - }; - - MacMenuEntry entries[] = { - {LFUN_DIALOG_SHOW, "aboutlyx", "About LyX", - QAction::AboutRole}, - {LFUN_DIALOG_SHOW, "prefs", "Preferences", - QAction::PreferencesRole}, - {LFUN_RECONFIGURE, "", "Reconfigure", - QAction::ApplicationSpecificRole}, - {LFUN_LYX_QUIT, "", "Quit LyX", QAction::QuitRole} - }; - 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)); - } - - // add the entries to a QMenu that will eventually be empty - // and therefore invisible. - QMenu * qMenu = view->menuBar()->addMenu("special"); - Menu::const_iterator cit = specialmenu_.begin(); - Menu::const_iterator end = specialmenu_.end(); - for (size_t i = 0 ; cit != end ; ++cit, ++i) { - Action * action = new Action(*view, QIcon(), cit->label(), - cit->func(), QString()); - action->setMenuRole(entries[i].role); - qMenu->addAction(action); - } -} - - -MenuItem::MenuItem(Kind kind) - : kind_(kind), optional_(false) -{} - - -MenuItem::MenuItem(Kind kind, QString const & label, - QString const & submenu, bool optional) - : kind_(kind), label_(label), - submenuname_(submenu), optional_(optional) -{ - BOOST_ASSERT(kind == Submenu); -} - - -MenuItem::MenuItem(Kind kind, QString const & label, - FuncRequest const & func, bool optional) - : kind_(kind), label_(label), func_(func), optional_(optional) -{ - func_.origin = FuncRequest::MENU; -} - - -MenuItem::~MenuItem() -{} - - -void MenuItem::setSubmenu(Menu * menu) -{ - submenu_.reset(menu); -} - - -QString MenuItem::label() const -{ - return label_.split('|')[0]; -} - - -QString MenuItem::shortcut() const -{ - return label_.contains('|') ? label_.split('|')[1] : QString(); -} - - -QString MenuItem::binding() const -{ - if (kind_ != Command) - return QString(); - - // Get the keys bound to this action, but keep only the - // first one later - KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(func_); - - if (bindings.size()) - return toqstr(bindings.begin()->print(KeySequence::ForGui)); - - LYXERR(Debug::KBMAP, "No binding for " - << lyxaction.getActionName(func_.action) - << '(' << func_.argument() << ')'); - return QString(); -} - - -void Menu::addWithStatusCheck(MenuItem const & i) -{ - switch (i.kind()) { - - case MenuItem::Command: { - FuncStatus status = lyx::getStatus(i.func()); - if (status.unknown() || (!status.enabled() && i.optional())) - break; - items_.push_back(i); - items_.back().status(status); - break; - } - - case MenuItem::Submenu: { - if (i.submenu()) { - bool enabled = false; - for (const_iterator cit = i.submenu()->begin(); - cit != i.submenu()->end(); ++cit) { - if ((cit->kind() == MenuItem::Command - || cit->kind() == MenuItem::Submenu) - && cit->status().enabled()) { - enabled = true; - break; - } - } - if (enabled || !i.optional()) { - items_.push_back(i); - items_.back().status().enabled(enabled); - } - } - else - items_.push_back(i); - break; - } - - case MenuItem::Separator: - if (!items_.empty() && items_.back().kind() != MenuItem::Separator) - items_.push_back(i); - break; - - default: - items_.push_back(i); - } -} - - -void Menu::read(Lexer & lex) -{ - enum Menutags { - md_item = 1, - md_branches, - md_documents, - md_bookmarks, - md_charstyles, - md_custom, - md_elements, - md_endmenu, - md_exportformats, - md_importformats, - md_lastfiles, - md_optitem, - md_optsubmenu, - md_separator, - md_submenu, - md_toc, - md_updateformats, - md_viewformats, - 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 }, - { "custom", md_custom }, - { "documents", md_documents }, - { "elements", md_elements }, - { "end", md_endmenu }, - { "exportformats", md_exportformats }, - { "floatinsert", md_floatinsert }, - { "floatlistinsert", md_floatlistinsert }, - { "importformats", md_importformats }, - { "item", md_item }, - { "lastfiles", md_lastfiles }, - { "optitem", md_optitem }, - { "optsubmenu", md_optsubmenu }, - { "pasterecent", md_pasterecent }, - { "separator", md_separator }, - { "submenu", md_submenu }, - { "toc", md_toc }, - { "toolbars", md_toolbars }, - { "updateformats", md_updateformats }, - { "viewformats", md_viewformats } - }; - - lex.pushTable(menutags, md_last - 1); - if (lyxerr.debugging(Debug::PARSER)) - lex.printTable(lyxerr); - - bool quit = false; - bool optional = false; - - while (lex.isOK() && !quit) { - switch (lex.lex()) { - case md_optitem: - optional = true; - // fallback to md_item - case md_item: { - lex.next(true); - docstring const name = translateIfPossible(lex.getDocString()); - lex.next(true); - string const command = lex.getString(); - FuncRequest func = lyxaction.lookupFunc(command); - add(MenuItem(MenuItem::Command, toqstr(name), func, optional)); - optional = false; - break; - } - - case md_separator: - add(MenuItem(MenuItem::Separator)); - break; - - case md_lastfiles: - add(MenuItem(MenuItem::Lastfiles)); - break; - - case md_charstyles: - 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; - - case md_bookmarks: - add(MenuItem(MenuItem::Bookmarks)); - break; - - case md_toc: - add(MenuItem(MenuItem::Toc)); - break; - - case md_viewformats: - add(MenuItem(MenuItem::ViewFormats)); - break; - - case md_updateformats: - add(MenuItem(MenuItem::UpdateFormats)); - break; - - case md_exportformats: - add(MenuItem(MenuItem::ExportFormats)); - break; - - case md_importformats: - add(MenuItem(MenuItem::ImportFormats)); - break; - - case md_floatlistinsert: - add(MenuItem(MenuItem::FloatListInsert)); - break; - - case md_floatinsert: - add(MenuItem(MenuItem::FloatInsert)); - break; - - case md_pasterecent: - add(MenuItem(MenuItem::PasteRecent)); - break; - - case md_toolbars: - add(MenuItem(MenuItem::Toolbars)); - break; - - case md_branches: - add(MenuItem(MenuItem::Branches)); - break; + case md_indiceslistscontext: + add(MenuItem(MenuItem::IndicesListsContext)); + break; case md_optsubmenu: optional = true; @@ -845,8 +603,7 @@ void Menu::read(Lexer & lex) break; default: - lex.printError("Menu::read: " - "Unknown menu tag: `$$Token'"); + lex.printError("Unknown menu tag"); break; } } @@ -854,13 +611,13 @@ void Menu::read(Lexer & lex) } -MenuItem const & Menu::operator[](size_type i) const +MenuItem const & MenuDefinition::operator[](size_type i) const { return items_[i]; } -bool Menu::hasFunc(FuncRequest const & func) const +bool MenuDefinition::hasFunc(FuncRequest const & func) const { for (const_iterator it = begin(), et = end(); it != et; ++it) if (it->func() == func) @@ -869,7 +626,7 @@ bool Menu::hasFunc(FuncRequest const & func) const } -void Menu::checkShortcuts() const +void MenuDefinition::checkShortcuts() const { // This is a quadratic algorithm, but we do not care because // menus are short enough @@ -878,24 +635,23 @@ void Menu::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 Menu::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(); @@ -906,8 +662,13 @@ bool Menu::searchMenu(FuncRequest const & func, vector & names) const } if (m->kind() == MenuItem::Submenu) { names.push_back(qstring_to_ucs4(m->label())); - Menu const & submenu = *m->submenu(); - if (submenu.searchMenu(func, names)) + if (!m->hasSubmenu()) { + LYXERR(Debug::GUI, "Warning: non existing sub menu label=" + << m->label() << " name=" << m->submenuname()); + names.pop_back(); + continue; + } + if (m->submenu().searchMenu(func, names)) return true; names.pop_back(); } @@ -916,8 +677,6 @@ bool Menu::searchMenu(FuncRequest const & func, vector & names) const } -namespace { - bool compareFormat(Format const * p1, Format const * p2) { return *p1 < *p2; @@ -934,56 +693,132 @@ QString limitStringLength(docstring const & str) return toqstr(str); } -} // namespace anon +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 Menu::expandLastfiles() + +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))); } } -void Menu::expandDocuments() +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 Menu::expandBookmarks() +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(); @@ -991,23 +826,22 @@ void Menu::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 Menu::expandFormats(MenuItem::Kind kind, Buffer const * buf) +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: @@ -1028,59 +862,89 @@ void Menu::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 Menu::expandFloatListInsert(Buffer const * buf) +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(); @@ -1088,19 +952,16 @@ void Menu::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()))); } } -void Menu::expandFloatInsert(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(); @@ -1115,30 +976,33 @@ void Menu::expandFloatInsert(Buffer const * buf) } -void Menu::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!"))); } size_t const max_number_of_items = 25; -void Menu::expandToc2(Toc const & toc_list, +void MenuDefinition::expandToc2(Toc const & toc_list, size_t from, size_t to, int depth) { int shortcut_count = 0; @@ -1166,8 +1030,7 @@ void Menu::expandToc2(Toc const & toc_list, size_t pos = from; while (pos < to) { size_t new_pos = pos + 1; - while (new_pos < to && - toc_list[new_pos].depth() > depth) + while (new_pos < to && toc_list[new_pos].depth() > depth) ++new_pos; QString label(4 * max(0, toc_list[pos].depth() - depth), ' '); @@ -1181,9 +1044,10 @@ void Menu::expandToc2(Toc const & toc_list, add(MenuItem(MenuItem::Command, label, FuncRequest(toc_list[pos].action()))); } else { + MenuDefinition sub; + sub.expandToc2(toc_list, pos, new_pos, depth + 1); MenuItem item(MenuItem::Submenu, label); - item.setSubmenu(new Menu); - item.submenu()->expandToc2(toc_list, pos, new_pos, depth + 1); + item.setSubmenu(sub); add(item); } pos = new_pos; @@ -1192,173 +1056,518 @@ void Menu::expandToc2(Toc const & toc_list, } -void Menu::expandToc(Buffer const * buf) +void MenuDefinition::expandToc(Buffer const * buf) +{ + // To make things very cleanly, we would have to pass buf to + // all MenuItem constructors and to expandToc2. However, we + // know that all the entries in a TOC will be have status_ == + // OK, so we avoid this unnecessary overhead (JMarc) + + if (!buf) { + add(MenuItem(MenuItem::Info, qt_(""))); + return; + } + + // Add an entry for the master doc if this is a child doc + Buffer const * const master = buf->masterBuffer(); + if (buf != master) { + ParIterator const pit = par_iterator_begin(master->inset()); + string const arg = convert(pit->id()); + FuncRequest f(LFUN_PARAGRAPH_GOTO, arg); + add(MenuItem(MenuItem::Command, qt_("Master Document"), f)); + } + + MenuDefinition other_lists; + + FloatList const & floatlist = buf->params().documentClass().floats(); + 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 == "tableofcontents") + continue; + + MenuDefinition submenu; + if (cit->second.size() >= 30) { + FuncRequest f(LFUN_DIALOG_SHOW, "toc " + cit->first); + submenu.add(MenuItem(MenuItem::Command, qt_("Open Navigator..."), f)); + } else { + TocIterator ccit = cit->second.begin(); + TocIterator eend = cit->second.end(); + for (; ccit != eend; ++ccit) { + submenu.add(MenuItem(MenuItem::Command, + limitStringLength(ccit->str()), + FuncRequest(ccit->action()))); + } + } + + MenuItem item(MenuItem::Submenu, guiName(cit->first, buf->params())); + item.setSubmenu(submenu); + 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")); + item.setSubmenu(other_lists); + add(item); + } + + // Handle normal TOC + cit = toc_list.find("tableofcontents"); + 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(Buffer const * buf) +{ + docstring_list const sel = cap::availableSelections(buf); + + 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), + FuncRequest(LFUN_PASTE, convert(index)))); + } +} + + +void MenuDefinition::expandToolbars() +{ + MenuDefinition other_lists; + // extracts the toolbars from the backend + Toolbars::Infos::const_iterator cit = guiApp->toolbars().begin(); + Toolbars::Infos::const_iterator end = guiApp->toolbars().end(); + for (; cit != end; ++cit) { + 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) + 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.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 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]); + + 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; + CitationStyle cs; + CiteStyle cst = citeStyleList[ii - 1]; + cs.style = cst; + addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label), + FuncRequest(LFUN_INSET_MODIFY, + "changetype " + from_utf8(citationStyleToString(cs))))); + } +} + +} // namespace anon + + +///////////////////////////////////////////////////////////////////// +// Menu::Impl definition and implementation +///////////////////////////////////////////////////////////////////// + +struct Menu::Impl +{ + /// populates the menu or one of its submenu + /// This is used as a recursive function + void populate(QMenu & qMenu, MenuDefinition const & menu); + + /// Only needed for top level menus. + MenuDefinition * top_level_menu; + /// our owning view + GuiView * view; + /// the name of this menu + QString name; +}; + + + +/// Get a MenuDefinition item label from the menu backend +static QString label(MenuItem const & mi) +{ + QString label = mi.label(); + label.replace("&", "&&"); + + QString shortcut = mi.shortcut(); + if (!shortcut.isEmpty()) { + int pos = label.indexOf(shortcut); + if (pos != -1) + //label.insert(pos, 1, char_type('&')); + label.replace(pos, 0, "&"); + } + + QString const binding = mi.binding(); + if (!binding.isEmpty()) + label += '\t' + binding; + + return label; +} + +void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu) +{ + LYXERR(Debug::GUI, "populating menu " << menu.name()); + if (menu.size() == 0) { + LYXERR(Debug::GUI, "\tERROR: empty menu " << menu.name()); + return; + } + LYXERR(Debug::GUI, " ***** menu entries " << menu.size()); + MenuDefinition::const_iterator m = menu.begin(); + MenuDefinition::const_iterator end = menu.end(); + for (; m != end; ++m) { + if (m->kind() == MenuItem::Separator) + qMenu.addSeparator(); + 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), + m->func(), QString(), &qMenu)); + } + } +} + +///////////////////////////////////////////////////////////////////// +// Menu implementation +///////////////////////////////////////////////////////////////////// + +Menu::Menu(GuiView * gv, QString const & name, bool top_level) +: QMenu(gv), d(new Menu::Impl) { - // To make things very cleanly, we would have to pass buf to - // all MenuItem constructors and to expandToc2. However, we - // know that all the entries in a TOC will be have status_ == - // OK, so we avoid this unnecessary overhead (JMarc) + d->top_level_menu = top_level? new MenuDefinition : 0; + d->view = gv; + d->name = name; + setTitle(name); + if (d->top_level_menu) + connect(this, SIGNAL(aboutToShow()), this, SLOT(updateView())); +} - if (!buf) { - add(MenuItem(MenuItem::Command, qt_("No Document Open!"), - FuncRequest(LFUN_NOACTION))); - return; - } - Buffer* cbuf = const_cast(buf); - cbuf->tocBackend().update(); - cbuf->structureChanged(); +Menu::~Menu() +{ + delete d->top_level_menu; + delete d; +} - // Add an entry for the master doc if this is a child doc - Buffer const * const master = buf->masterBuffer(); - if (buf != master) { - ParIterator const pit = par_iterator_begin(master->inset()); - string const arg = convert(pit->id()); - FuncRequest f(LFUN_PARAGRAPH_GOTO, arg); - add(MenuItem(MenuItem::Command, qt_("Master Document"), f)); - } - FloatList const & floatlist = buf->params().documentClass().floats(); - 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 == "tableofcontents") - continue; +void Menu::updateView() +{ + guiApp->menus().updateMenu(this); +} - // All the rest is for floats - auto_ptr menu(new Menu); - TocIterator ccit = cit->second.begin(); - TocIterator eend = cit->second.end(); - for (; ccit != eend; ++ccit) { - QString const label = limitStringLength(ccit->str()); - menu->add(MenuItem(MenuItem::Command, label, - FuncRequest(ccit->action()))); - } - string const & floatName = floatlist.getType(cit->first).listName(); - QString label; - if (!floatName.empty()) - label = qt_(floatName); - // BUG3633: listings is not a proper float so its name - // is not shown in floatlist. - 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"); - // this should not happen now, but if something else like - // listings is added later, this can avoid an empty menu name. - else - label = qt_("Other floats"); - MenuItem item(MenuItem::Submenu, label); - item.setSubmenu(menu.release()); - 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); - } -} +///////////////////////////////////////////////////////////////////// +// Menus::Impl definition and implementation +///////////////////////////////////////////////////////////////////// +struct Menus::Impl { + /// + bool hasMenu(QString const &) const; + /// + MenuDefinition & getMenu(QString const &); + /// + MenuDefinition const & getMenu(QString const &) const; -void Menu::expandPasteRecent() -{ - vector const sel = cap::availableSelections(); + /// 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, Indices + */ + void expand(MenuDefinition const & frommenu, MenuDefinition & tomenu, + BufferView const *) const; - vector::const_iterator cit = sel.begin(); - vector::const_iterator end = sel.end(); + /// Initialize specific MACOS X menubar + void macxMenuBarInit(GuiView * view, QMenuBar * qmb); - for (unsigned int index = 0; cit != end; ++cit, ++index) { - add(MenuItem(MenuItem::Command, toqstr(*cit), - FuncRequest(LFUN_PASTE, convert(index)))); - } -} + /// 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. + 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. + */ + static MenuDefinition mac_special_menu_; -void Menu::expandToolbars() -{ - // - // extracts the toolbars from the backend - ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin(); - ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end(); + /// + MenuList menulist_; + /// + MenuDefinition menubar_; - 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"))); - } -} + 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: + + 1) If the window has a QMenuBar then it is used. 2) If the window + is a modal then its menubar is used. If no menubar is specified + then a default menubar is used (as documented below) 3) If the + window has no parent then the default menubar is used (as + documented below). + The above 3 steps are applied all the way up the parent window + chain until one of the above are satisifed. If all else fails a + default menubar will be created, the default menubar on Qt/Mac is + an empty menubar, however you can create a different default + menubar by creating a parentless QMenuBar, the first one created + will thus be designated the default menubar, and will be used + whenever a default menubar is needed. -void Menu::expandBranches(Buffer const * buf) + Thus, for Qt/Mac, we add the menus to a free standing menubar, so + that this menubar will be used also when one of LyX' dialogs has + focus. (JMarc) +*/ +void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb) { - if (!buf) { - add(MenuItem(MenuItem::Command, - qt_("No Document Open!"), - FuncRequest(LFUN_NOACTION))); - return; - } + /* 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, + and therefore we need to put these entries in a special + invisible menu. (JMarc) + */ - BufferParams const & params = buf->masterBuffer()->params(); - if (params.branchlist().empty()) { - add(MenuItem(MenuItem::Command, - qt_("No Branch in Document!"), - FuncRequest(LFUN_NOACTION))); - return; - } + /* The entries of our special mac menu. If we add support for + * special entries in Menus, we could imagine something + * like + * SpecialItem About " "About LyX" "dialog-show aboutlyx" + * and therefore avoid hardcoding. I am not sure it is worth + * the hassle, though. (JMarc) + */ + struct MacMenuEntry { + FuncCode action; + char const * arg; + char const * label; + QAction::MenuRole role; + }; - BranchList::const_iterator cit = params.branchlist().begin(); - BranchList::const_iterator end = params.branchlist().end(); + MacMenuEntry entries[] = { + {LFUN_DIALOG_SHOW, "aboutlyx", "About LyX", + QAction::AboutRole}, + {LFUN_DIALOG_SHOW, "prefs", "Preferences", + QAction::PreferencesRole}, + {LFUN_RECONFIGURE, "", "Reconfigure", + QAction::ApplicationSpecificRole}, + {LFUN_LYX_QUIT, "", "Quit LyX", QAction::QuitRole} + }; + const size_t num_entries = sizeof(entries) / sizeof(entries[0]); - for (int ii = 1; cit != end; ++cit, ++ii) { - docstring label = cit->getBranch(); - if (ii < 10) - label = convert(ii) + ". " + label + char_type('|') + convert(ii); - addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label), - FuncRequest(LFUN_BRANCH_INSERT, - cit->getBranch()))); + // 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 = 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); + action->setMenuRole(entries[i].role); + qMenu->addAction(action); } } -void Menus::Impl::expand(Menu const & frommenu, Menu & tomenu, - Buffer const * buf) const +void Menus::Impl::expand(MenuDefinition const & frommenu, + MenuDefinition & tomenu, BufferView const * bv) const { if (!tomenu.empty()) tomenu.clear(); - for (Menu::const_iterator cit = frommenu.begin(); + 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(); @@ -1380,15 +1589,15 @@ void Menus::Impl::expand(Menu const & frommenu, Menu & tomenu, 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: @@ -1400,7 +1609,7 @@ void Menus::Impl::expand(Menu const & frommenu, Menu & tomenu, break; case MenuItem::PasteRecent: - tomenu.expandPasteRecent(); + tomenu.expandPasteRecent(buf); break; case MenuItem::Toolbars: @@ -1411,25 +1620,54 @@ void Menus::Impl::expand(Menu const & frommenu, Menu & tomenu, 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(new Menu(cit->submenuname())); - expand(getMenu(cit->submenuname()), - *item.submenu(), buf); + item.setSubmenu(MenuDefinition(cit->submenuname())); + 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); } } @@ -1443,30 +1681,77 @@ void Menus::Impl::expand(Menu const & frommenu, Menu & tomenu, } +bool Menus::Impl::hasMenu(QString const & name) const +{ + return find_if(menulist_.begin(), menulist_.end(), + MenuNamesEqual(name)) != menulist_.end(); +} + + +MenuDefinition const & Menus::Impl::getMenu(QString const & name) const +{ + const_iterator cit = find_if(menulist_.begin(), menulist_.end(), + MenuNamesEqual(name)); + if (cit == menulist_.end()) + LYXERR0("No submenu named " << name); + LASSERT(cit != menulist_.end(), /**/); + return (*cit); +} + + +MenuDefinition & Menus::Impl::getMenu(QString const & name) +{ + iterator it = find_if(menulist_.begin(), menulist_.end(), + MenuNamesEqual(name)); + if (it == menulist_.end()) + LYXERR0("No submenu named " << name); + LASSERT(it != menulist_.end(), /**/); + return (*it); +} + + +///////////////////////////////////////////////////////////////////// +// +// Menus +// +///////////////////////////////////////////////////////////////////// + +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; @@ -1481,9 +1766,9 @@ void Menus::read(Lexer & lex) if (d->hasMenu(name)) d->getMenu(name).read(lex); else { - Menu menu(name); + MenuDefinition menu(name); menu.read(lex); - d->add(menu); + d->menulist_.push_back(menu); } break; } @@ -1491,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; } } @@ -1500,42 +1784,114 @@ void Menus::read(Lexer & lex) } -void Menus::Impl::add(Menu const & menu) +bool Menus::searchMenu(FuncRequest const & func, + docstring_list & names) const { - menulist_.push_back(menu); + MenuDefinition menu; + d->expand(d->menubar_, menu, 0); + return menu.searchMenu(func, names); } -bool Menus::Impl::hasMenu(QString const & name) const +void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial) { - return find_if(menulist_.begin(), menulist_.end(), - MenuNamesEqual(name)) != menulist_.end(); + if (initial) { +#ifdef Q_WS_MACX + // 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" << d->menubar_.name()); + + if (d->menubar_.size() == 0) { + LYXERR(Debug::GUI, "\tERROR: empty menu bar" + << d->menubar_.name()); + return; + } + LYXERR(Debug::GUI, "menu bar entries " << d->menubar_.size()); + + MenuDefinition menu; + BufferView * bv = 0; + if (view) + bv = view->currentBufferView(); + d->expand(d->menubar_, menu, bv); + + MenuDefinition::const_iterator m = menu.begin(); + MenuDefinition::const_iterator end = menu.end(); + + for (; m != end; ++m) { + + if (m->kind() != MenuItem::Submenu) { + LYXERR(Debug::GUI, "\tERROR: not a submenu " << m->label()); + continue; + } + + 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: " << name + << " submenu has no menu!"); + continue; + } + + Menu * menu = new Menu(view, m->submenuname(), true); + menu->setTitle(label(*m)); + qmb->addMenu(menu); + + d->name_map_[view][name] = menu; + } } -Menu const & Menus::Impl::getMenu(QString const & name) const +void Menus::updateMenu(Menu * qmenu) { - 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()); - return (*cit); + LYXERR(Debug::GUI, "Triggered menu: " << qmenu->d->name); + qmenu->clear(); + + if (qmenu->d->name.isEmpty()) + return; + + if (!d->hasMenu(qmenu->d->name)) { + qmenu->addAction(qt_("No Action Defined!")); + LYXERR(Debug::GUI, "\tWARNING: non existing menu: " + << qmenu->d->name); + return; + } + + MenuDefinition const & fromLyxMenu = d->getMenu(qmenu->d->name); + BufferView * bv = 0; + if (qmenu->d->view) + 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::Impl::getMenu(QString const & name) +Menu * Menus::menu(QString const & name, GuiView & view) { - 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()); - return (*it); -} + 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: " << name); + return 0; + } + menu = new Menu(&view, name, true); + d->name_map_[&view][name] = menu; + return menu; +} } // namespace frontend } // namespace lyx -#include "Menus_moc.cpp" +#include "moc_Menus.cpp"