Use QMessageBox for toggleWarning if possible

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

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 035fab40e38f74eb64f05fc3ae16679f32eb08e3..3773fd9d7af01a2081d96578da47b6838e6d521c 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1123,7 +1123,7 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
                                add(MenuItem(MenuItem::Command, toqstr(lbl), FuncRequest(action)));
                                continue;
                        }
-               // fall through
+                       break;
                case MenuItem::ExportFormats:
                        if (!f->inExportMenu())
                                continue;
@@ -1865,7 +1865,6 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv,
                return;
 
        pit_type pit = bv->cursor().selBegin().pit();
-       pos_type pos = bv->cursor().selBegin().pos();
        Paragraph const & par = text->getPar(pit);
        docstring const curlayout = par.layout().name();
        docstring outerlayout;
@@ -1898,15 +1897,17 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv,
                add(MenuItem(MenuItem::Command, toqstr(label),
                             FuncRequest(LFUN_ENVIRONMENT_SPLIT,
                                         from_ascii("before"))));
-               if (!par.layout().keepempty || pos > 0 || !text->isFirstInSequence(pit)) {
-                       label = contextmenu ?
-                                       bformat(_("Insert Separated %1$s Below"),
-                                               translateIfPossible(curlayout)):
-                                       bformat(_("Separated %1$s Below"),
-                                               translateIfPossible(curlayout));
+               label = contextmenu ?
+                               bformat(_("Insert Separated %1$s Below"),
+                                       translateIfPossible(curlayout)):
+                               bformat(_("Separated %1$s Below"),
+                                       translateIfPossible(curlayout));
+               // We use command-alternatives here since this is how the binding is defined
+               // (otherwise, the binding is not displayed in the menu)
+               if (getStatus(FuncRequest(LFUN_ENVIRONMENT_SPLIT)).enabled())
                        add(MenuItem(MenuItem::Command, toqstr(label),
-                                    FuncRequest(LFUN_ENVIRONMENT_SPLIT)));
-               }
+                                    FuncRequest(LFUN_COMMAND_ALTERNATIVES,
+                                                from_ascii("environment-split ; environment-split previous"))));
        }
        else if (!prevlayout.empty()) {
                docstring const label = contextmenu ?
@@ -1914,9 +1915,12 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv,
                                translateIfPossible(prevlayout)) :
                        bformat(_("Separated %1$s Below"),
                                translateIfPossible(prevlayout));
-               add(MenuItem(MenuItem::Command, toqstr(label),
-                            FuncRequest(LFUN_ENVIRONMENT_SPLIT,
-                                        from_ascii("previous"))));
+               // We use command-alternatives here since this is how the binding is defined
+               // (otherwise, the binding is not displayed in the menu)
+               if (getStatus(FuncRequest(LFUN_ENVIRONMENT_SPLIT)).enabled())
+                       add(MenuItem(MenuItem::Command, toqstr(label),
+                                    FuncRequest(LFUN_COMMAND_ALTERNATIVES,
+                                                from_ascii("environment-split ; environment-split previous"))));
        }
        if (!outerlayout.empty()) {
                docstring label;