]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/Menus.cpp
* fix spelling in comments to please John.
[lyx.git] / src / frontends / qt4 / Menus.cpp
index 934f6dd11e6a8de046fa6f0a1275f2a650dee986..8de4f83257d98e75c7508b816216b44b04262085 100644 (file)
 #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 "Toolbars.h"
+#include "WordLangTuple.h"
 
 #include "insets/Inset.h"
 #include "insets/InsetCitation.h"
@@ -95,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,
@@ -139,10 +151,20 @@ public:
                Toolbars,
                /** Available branches in document */
                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
+               GraphicsGroups,
+               /// Words suggested by the spellchecker.
+               SpellingSuggestions
        };
 
        explicit MenuItem(Kind kind) : kind_(kind), optional_(false) {}
@@ -153,16 +175,17 @@ public:
                 bool optional = false)
                : kind_(kind), label_(label), submenuname_(submenu), optional_(optional)
        {
-               LASSERT(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<MenuDefinition> needs this apprently...
@@ -294,8 +317,11 @@ public:
        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_;
        ///
@@ -339,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().setEnabled(enabled);
-                       }
                }
-               else
+               if (enabled || !i.optional()) {
                        items_.push_back(i);
+                       items_.back().status().setEnabled(enabled);
+               }
                break;
        }
 
@@ -385,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,
@@ -397,7 +427,8 @@ void MenuDefinition::read(Lexer & lex)
                md_floatinsert,
                md_pasterecent,
                md_toolbars,
-               md_graphicsgroups
+               md_graphicsgroups,
+               md_spellingsuggestions
        };
 
        LexerKeyword menutags[] = {
@@ -414,12 +445,17 @@ void MenuDefinition::read(Lexer & lex)
                { "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 },
@@ -444,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;
                }
@@ -525,6 +564,26 @@ void MenuDefinition::read(Lexer & lex)
                        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
@@ -654,17 +713,63 @@ void MenuDefinition::expandGraphicsGroups(BufferView const * bv)
        }
 }
 
+
+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 = 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)));
        }
 }
@@ -672,28 +777,40 @@ 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_("<No Documents Open>")));
 }
 
 
@@ -701,6 +818,7 @@ void MenuDefinition::expandBookmarks()
 {
        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();
@@ -708,19 +826,18 @@ void MenuDefinition::expandBookmarks()
                                .arg(toqstr(makeDisplayPath(file, 20))).arg(i);
                        add(MenuItem(MenuItem::Command, label,
                                FuncRequest(LFUN_BOOKMARK_GOTO, convert<docstring>(i))));
+                       empty = false;
                }
        }
+       if (empty)
+               add(MenuItem(MenuItem::Info, qt_("<No Bookmarks Saved Yet>")));
 }
 
 
 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<Format const *> Formats;
        Formats formats;
@@ -745,6 +862,17 @@ 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) {
@@ -771,8 +899,17 @@ void MenuDefinition::expandFormats(MenuItem::Kind kind, Buffer const * buf)
                        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;
@@ -783,23 +920,31 @@ void MenuDefinition::expandFormats(MenuItem::Kind kind, Buffer const * buf)
                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();
@@ -815,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();
@@ -837,11 +979,9 @@ void MenuDefinition::expandFloatInsert(Buffer const * buf)
 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();
@@ -851,14 +991,12 @@ void MenuDefinition::expandFlexInsert(
                        docstring const label = cit->first;
                        addWithStatusCheck(MenuItem(MenuItem::Command, 
                                toqstr(translateIfPossible(label)),
-                               FuncRequest(LFUN_FLEX_INSERT, '"' + label + '"')));
+                               FuncRequest(LFUN_FLEX_INSERT, Lexer::quoteString(label))));
                }
        }
        // FIXME This is a little clunky.
        if (items_.empty() && type == InsetLayout::CUSTOM)
-               add(MenuItem(MenuItem::Command,
-                                   qt_("No custom insets defined!"),
-                                   FuncRequest(LFUN_NOACTION)));
+               add(MenuItem(MenuItem::Help, qt_("No Custom Insets Defined!")));
 }
 
 
@@ -926,8 +1064,7 @@ 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_("<No Document Open>")));
                return;
        }
 
@@ -982,12 +1119,14 @@ void MenuDefinition::expandToc(Buffer const * buf)
 
        // 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_("<Empty Table of Contents>")));
+       }
 }
 
 
@@ -1030,23 +1169,18 @@ void MenuDefinition::expandToolbars()
 
 void MenuDefinition::expandBranches(Buffer const * buf)
 {
-       if (!buf) {
-               add(MenuItem(MenuItem::Command,
-                                   qt_("No Document Open!"),
-                                   FuncRequest(LFUN_NOACTION)));
+       if (!buf)
                return;
-       }
 
-       BufferParams const & params = buf->masterBuffer()->params();
-       if (params.branchlist().empty()) {
-               add(MenuItem(MenuItem::Command,
-                                   qt_("No Branch in Document!"),
-                                   FuncRequest(LFUN_NOACTION)));
+       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 = params.branchlist().begin();
-       BranchList::const_iterator end = params.branchlist().end();
+       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();
@@ -1058,17 +1192,111 @@ void MenuDefinition::expandBranches(Buffer const * buf)
                                    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<docstring>(ii) + ". " + label
+                               + char_type('|') + convert<docstring>(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::expandCiteStyles(BufferView const * bv)
+void MenuDefinition::expandIndices(Buffer const * buf, bool listof)
 {
-       if (!bv) {
-               add(MenuItem(MenuItem::Command,
-                                   qt_("No Document Open!"),
-                                   FuncRequest(LFUN_NOACTION)));
+       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) {
@@ -1099,7 +1327,7 @@ void MenuDefinition::expandCiteStyles(BufferView const * bv)
                CiteStyle cst = citeStyleList[ii - 1];
                cs.style = cst;
                addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(label),
-                                   FuncRequest(LFUN_NEXT_INSET_MODIFY,
+                                   FuncRequest(LFUN_INSET_MODIFY,
                                                "changetype " + from_utf8(citationStyleToString(cs)))));
        }
 }
@@ -1164,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), 
@@ -1216,7 +1445,7 @@ 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,
                BufferView const *) const;
@@ -1391,6 +1620,22 @@ void Menus::Impl::expand(MenuDefinition const & frommenu,
                        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;
@@ -1403,6 +1648,10 @@ void Menus::Impl::expand(MenuDefinition const & frommenu,
                        tomenu.expandGraphicsGroups(bv);
                        break;
 
+               case MenuItem::SpellingSuggestions:
+                       tomenu.expandSpellingSuggestions(bv);
+                       break;
+
                case MenuItem::Submenu: {
                        MenuItem item(*cit);
                        item.setSubmenu(MenuDefinition(cit->submenuname()));
@@ -1411,6 +1660,8 @@ void Menus::Impl::expand(MenuDefinition const & frommenu,
                }
                break;
 
+               case MenuItem::Info:
+               case MenuItem::Help:
                case MenuItem::Separator:
                        tomenu.addWithStatusCheck(*cit);
                        break;
@@ -1570,7 +1821,7 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial)
        MenuDefinition menu;
        BufferView * bv = 0;
        if (view)
-               bv = view->view();
+               bv = view->currentBufferView();
        d->expand(d->menubar_, menu, bv);
 
        MenuDefinition::const_iterator m = menu.begin();
@@ -1610,11 +1861,8 @@ void Menus::updateMenu(Menu * qmenu)
        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: "
                        << qmenu->d->name);
                return;
@@ -1623,7 +1871,7 @@ void Menus::updateMenu(Menu * qmenu)
        MenuDefinition const & fromLyxMenu = d->getMenu(qmenu->d->name);
        BufferView * bv = 0;
        if (qmenu->d->view)
-               bv = qmenu->d->view->view();
+               bv = qmenu->d->view->currentBufferView();
        d->expand(fromLyxMenu, *qmenu->d->top_level_menu, bv);
        qmenu->d->populate(*qmenu, *qmenu->d->top_level_menu);
 }