Avoid extra space in tooltips

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

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index ecae50d5815166819b6a4a38e0a5fcf6dd88049f..3773fd9d7af01a2081d96578da47b6838e6d521c 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -193,6 +193,8 @@ public:
                SwitchCaptions,
                /** Commands to separate environments. */
                EnvironmentSeparators,
+               /** Commands to separate environments (context menu version). */
+               EnvironmentSeparatorsContext,
                /** This is the list of quotation marks available */
                SwitchQuotes
        };
@@ -368,7 +370,7 @@ public:
        void expandLanguageSelector(Buffer const * buf);
        void expandArguments(BufferView const *, bool switcharg = false);
        void expandCaptions(Buffer const * buf, bool switchcap = false);
-       void expandEnvironmentSeparators(BufferView const *);
+       void expandEnvironmentSeparators(BufferView const *, bool contextmenu = false);
        void expandQuotes(BufferView const *);
        ///
        ItemList items_;
@@ -484,6 +486,7 @@ void MenuDefinition::read(Lexer & lex)
                md_captions,
                md_switchcaptions,
                md_env_separators,
+               md_env_separatorscontext,
                md_switchquotes
        };
 
@@ -499,6 +502,7 @@ void MenuDefinition::read(Lexer & lex)
                { "elements", md_elements },
                { "end", md_endmenu },
                { "environmentseparators", md_env_separators },
+               { "environmentseparatorscontext", md_env_separatorscontext },
                { "exportformat", md_exportformat },
                { "exportformats", md_exportformats },
                { "floatinsert", md_floatinsert },
@@ -672,6 +676,10 @@ void MenuDefinition::read(Lexer & lex)
                        add(MenuItem(MenuItem::EnvironmentSeparators));
                        break;
 
+               case md_env_separatorscontext:
+                       add(MenuItem(MenuItem::EnvironmentSeparatorsContext));
+                       break;
+
                case md_switchquotes:
                        add(MenuItem(MenuItem::SwitchQuotes));
                        break;
@@ -1115,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;
@@ -1846,7 +1854,8 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
 }
 
 
-void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv)
+void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv,
+                                                bool contextmenu)
 {
        if (!bv)
                return;
@@ -1856,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;
@@ -1881,32 +1889,54 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv)
                        break;
        }
        if (par.layout().isEnvironment()) {
-               docstring label = bformat(_("Separated %1$s Above"),
-                               translateIfPossible(curlayout));
+               docstring label = contextmenu ?
+                                       bformat(_("Insert Separated %1$s Above"),
+                                               translateIfPossible(curlayout)) :
+                                       bformat(_("Separated %1$s Above"),
+                                               translateIfPossible(curlayout));
                add(MenuItem(MenuItem::Command, toqstr(label),
                             FuncRequest(LFUN_ENVIRONMENT_SPLIT,
                                         from_ascii("before"))));
-               if (!par.layout().keepempty || pos > 0 || !text->isFirstInSequence(pit)) {
-                       label = bformat(_("Separated %1$s Below"),
+               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 =
+               docstring const label = contextmenu ?
+                       bformat(_("Insert Separated %1$s Below"),
+                               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 const label = (outerlayout == curlayout) ?
-                       bformat(_("Separated Outer %1$s Below"),
-                               translateIfPossible(outerlayout)) :
-                       bformat(_("Separated %1$s Below"),
-                               translateIfPossible(outerlayout));
+               docstring label;
+               if (contextmenu) {
+                       label = (outerlayout == curlayout) ?
+                               bformat(_("Insert Separated Outer %1$s Below"),
+                                       translateIfPossible(outerlayout)) :
+                               bformat(_("Insert Separated %1$s Below"),
+                                       translateIfPossible(outerlayout));
+               } else {
+                       label = (outerlayout == curlayout) ?
+                               bformat(_("Separated Outer %1$s Below"),
+                                       translateIfPossible(outerlayout)) :
+                               bformat(_("Separated %1$s Below"),
+                                       translateIfPossible(outerlayout));
+               }
                add(MenuItem(MenuItem::Command, toqstr(label),
                             FuncRequest(LFUN_ENVIRONMENT_SPLIT,
                                         from_ascii("outer"))));
@@ -2312,6 +2342,10 @@ void Menus::Impl::expand(MenuDefinition const & frommenu,
                        tomenu.expandEnvironmentSeparators(bv);
                        break;
 
+               case MenuItem::EnvironmentSeparatorsContext:
+                       tomenu.expandEnvironmentSeparators(bv, true);
+                       break;
+
                case MenuItem::SwitchQuotes:
                        tomenu.expandQuotes(bv);
                        break;