From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 1 Jan 2018 12:40:49 +0000 (+0100)
Subject: Prepend "Insert " in the context menu for environment separators.
X-Git-Tag: 2.3.0rc2~109
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d60fa7f501509935608ce1b1ed73697d10e87229;p=features.git

Prepend "Insert " in the context menu for environment separators.

(cherry picked from commit 8f86feb26087305625cef3e66afabcdcb91a4057)
---

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index ccfd20065e..3e490927be 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -343,7 +343,7 @@ Menuset
 		Item "Move Paragraph Up|o" "paragraph-move-up"
 		Item "Move Paragraph Down|v" "paragraph-move-down"
 		Separator
-		EnvironmentSeparators
+		EnvironmentSeparatorsContext
 		Separator
 		OptItem "Promote Section|r" "outline-out"
 		OptItem "Demote Section|m" "outline-in"
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 1b79adb31b..e0a79ce40a 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -392,7 +392,9 @@ Menuset
 		Item "Hyperlink...|k" "href-insert"
 		Item "Footnote|F" "footnote-insert"
 		Item "Marginal Note|M" "marginalnote-insert"
+		Separator
 		EnvironmentSeparators
+		Separator
 		Arguments
 		Item "TeX Code" "ert-insert"
 		Item "Program Listing[[Menu]]" "listing-insert"
diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index ecae50d581..035fab40e3 100644
--- 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;
@@ -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;
@@ -1881,20 +1890,28 @@ 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"),
-					translateIfPossible(curlayout));
+			label = contextmenu ?
+					bformat(_("Insert Separated %1$s Below"),
+						translateIfPossible(curlayout)):
+					bformat(_("Separated %1$s Below"),
+						translateIfPossible(curlayout));
 			add(MenuItem(MenuItem::Command, toqstr(label),
 				     FuncRequest(LFUN_ENVIRONMENT_SPLIT)));
 		}
 	}
 	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),
@@ -1902,11 +1919,20 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv)
 					 from_ascii("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 +2338,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;