On Mac, moving down a paragraph should place the cursor at the end of the current...

[lyx.git] / src / frontends / qt4 / Menus.cpp

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 1c641a020c7e417e14ede86b916629ceaabacbd7..d4a687b960e0f404818babbd5ed234e224d0a0b4 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -198,7 +198,7 @@ public:
                : kind_(kind), label_(label), submenuname_(submenu),
                  tooltip_(tooltip), optional_(optional)
        {
-               LASSERT(kind == Submenu || kind == Help || kind == Info, /**/);
+               LATTEST(kind == Submenu || kind == Help || kind == Info);
        }
 
        MenuItem(Kind kind,
@@ -517,14 +517,10 @@ void MenuDefinition::read(Lexer & lex)
        lex.pushTable(menutags);
        lex.setContext("MenuDefinition::read: ");
 
-       bool quit = false;
-       bool optional = false;
-
-       while (lex.isOK() && !quit) {
-               switch (lex.lex()) {
+       int md_type = 0;
+       while (lex.isOK() && md_type != md_endmenu) {
+               switch (md_type = lex.lex()) {
                case md_optitem:
-                       optional = true;
-                       // fallback to md_item
                case md_item: {
                        lex.next(true);
                        docstring const name = translateIfPossible(lex.getDocString());
@@ -534,8 +530,8 @@ void MenuDefinition::read(Lexer & lex)
                        FuncRequest::Origin origin = FuncRequest::MENU;
                        if (name_.startsWith("context-toc-"))
                                origin = FuncRequest::TOC;
+                       bool const optional = (md_type == md_optitem);
                        add(MenuItem(MenuItem::Command, toqstr(name), func, QString(), optional, origin));
-                       optional = false;
                        break;
                }
 
@@ -656,21 +652,18 @@ void MenuDefinition::read(Lexer & lex)
                        break;
 
                case md_optsubmenu:
-                       optional = true;
-                       // fallback to md_submenu
                case md_submenu: {
                        lex.next(true);
                        docstring const mlabel = translateIfPossible(lex.getDocString());
                        lex.next(true);
                        docstring const mname = lex.getDocString();
+                       bool const optional = (md_type == md_optsubmenu);
                        add(MenuItem(MenuItem::Submenu,
                                toqstr(mlabel), toqstr(mname), QString(), optional));
-                       optional = false;
                        break;
                }
 
                case md_endmenu:
-                       quit = true;
                        break;
 
                default:
@@ -1058,9 +1051,10 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
                action = LFUN_BUFFER_EXPORT;
                break;
        default:
-               LASSERT(false, /* */);
+               LATTEST(false);
                return;
        }
+       sort(formats.begin(), formats.end(), Format::formatSorter);
 
        bool const view_update = (kind == MenuItem::ViewFormats
                        || kind == MenuItem::UpdateFormats);
@@ -1110,7 +1104,8 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
                                continue;
                        break;
                default:
-                       LASSERT(false, /* */);
+                       // we already asserted earlier in this case
+                       // LATTEST(false);
                        continue;
                }
                if (!shortcut.empty())
@@ -1634,16 +1629,18 @@ void MenuDefinition::expandCaptions(Buffer const * buf, bool switchcap)
                docstring const type = split(*cit, dummy, ':');
                docstring const trtype = translateIfPossible(type);
                docstring const cmitem = bformat(_("Caption (%1$s)"), trtype);
-                       if (switchcap)
-                               addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(cmitem),
-                                            FuncRequest(LFUN_INSET_MODIFY,
-                                                        from_ascii("changetype ")
-                                                        + type), QString(), true));
-                       else
-                               captions.addWithStatusCheck(MenuItem(MenuItem::Command,
-                                                                    toqstr(trtype),
-                                                                    FuncRequest(LFUN_CAPTION_INSERT,
-                                                                    type), QString(), true));
+               // make menu item optional, otherwise we would also see
+               // forbidden caption types
+               if (switchcap)
+                       addWithStatusCheck(MenuItem(MenuItem::Command, toqstr(cmitem),
+                                    FuncRequest(LFUN_INSET_MODIFY,
+                                                from_ascii("changetype ")
+                                                + type), QString(), true));
+               else
+                       captions.addWithStatusCheck(MenuItem(MenuItem::Command,
+                                                            toqstr(trtype),
+                                                            FuncRequest(LFUN_CAPTION_INSERT,
+                                                            type), QString(), true));
        }
        if (!captions.empty()) {
                MenuItem item(MenuItem::Submenu, qt_("Caption"));
@@ -1715,7 +1712,7 @@ void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu)
                        subMenu->setEnabled(m->status().enabled());
                } else {
                        // we have a MenuItem::Command
-                       qMenu.addAction(new Action(view, QIcon(), label(*m),
+                       qMenu.addAction(new Action(QIcon(), label(*m),
                                m->func(), m->tooltip(), &qMenu));
                }
        }
@@ -1796,13 +1793,13 @@ struct Menus::Impl {
        /** The entries with the following kind are expanded to a
            sequence of Command MenuItems: Lastfiles, Documents,
            ViewFormats, ExportFormats, UpdateFormats, Branches,
-           Indices, Arguments, SwitchArguments, Captions, Switchcaptions
+           Indices, Arguments, SwitchArguments, Captions, SwitchCaptions
        */
        void expand(MenuDefinition const & frommenu, MenuDefinition & tomenu,
                BufferView const *) const;
 
        /// Initialize specific MACOS X menubar
-       void macxMenuBarInit(GuiView * view, QMenuBar * qmb);
+       void macxMenuBarInit(QMenuBar * qmb);
 
        /// Mac special menu.
        /** This defines a menu whose entries list the FuncRequests
@@ -1852,7 +1849,7 @@ MenuDefinition Menus::Impl::mac_special_menu_;
   that this menubar will be used also when one of LyX' dialogs has
   focus. (JMarc)
 */
-void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb)
+void Menus::Impl::macxMenuBarInit(QMenuBar * qmb)
 {
        /* Since Qt 4.2, the qt/mac menu code has special code for
           specifying the role of a menu entry. However, it does not
@@ -1875,7 +1872,7 @@ void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb)
                QAction::MenuRole role;
        };
 
-       MacMenuEntry entries[] = {
+       static MacMenuEntry entries[] = {
                {LFUN_DIALOG_SHOW, "aboutlyx", "About LyX",
                 QAction::AboutRole},
                {LFUN_DIALOG_SHOW, "prefs", "Preferences",
@@ -1905,13 +1902,13 @@ void Menus::Impl::macxMenuBarInit(GuiView * view, QMenuBar * qmb)
        for (size_t i = 0 ; cit != end ; ++cit, ++i) {
 #if defined(QT_MAC_USE_COCOA) && (QT_MAC_USE_COCOA > 0)
                if (first_call || entries[i].role != QAction::ApplicationSpecificRole) {
-                       Action * action = new Action(view, QIcon(), cit->label(),
+                       Action * action = new Action(QIcon(), cit->label(),
                                 cit->func(), QString(), qMenu);
                        action->setMenuRole(entries[i].role);
                        qMenu->addAction(action);
                }
 #else
-               Action * action = new Action(view, QIcon(), cit->label(),
+               Action * action = new Action(QIcon(), cit->label(),
                        cit->func(), QString(), qMenu);
                action->setMenuRole(entries[i].role);
                qMenu->addAction(action);
@@ -2073,9 +2070,10 @@ MenuDefinition const & Menus::Impl::getMenu(QString const & name) const
 {
        const_iterator cit = find_if(menulist_.begin(), menulist_.end(),
                MenuNamesEqual(name));
-       if (cit == menulist_.end())
+       if (cit == menulist_.end()) {
                LYXERR0("No submenu named " << name);
-       LASSERT(cit != menulist_.end(), /**/);
+               LASSERT(false, { static const MenuDefinition m; return m; });
+       }
        return (*cit);
 }
 
@@ -2084,9 +2082,10 @@ MenuDefinition & Menus::Impl::getMenu(QString const & name)
 {
        iterator it = find_if(menulist_.begin(), menulist_.end(),
                MenuNamesEqual(name));
-       if (it == menulist_.end())
+       if (it == menulist_.end()) {
                LYXERR0("No submenu named " << name);
-       LASSERT(it != menulist_.end(), /**/);
+               LASSERT(false, { static MenuDefinition m; return m; });
+       }
        return (*it);
 }
 
@@ -2183,7 +2182,7 @@ void Menus::fillMenuBar(QMenuBar * qmb, GuiView * view, bool initial)
                // 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);
+               d->macxMenuBarInit(qmb);
 #endif
        } else {
                // Clear all menubar contents before filling it.