From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 29 May 2016 10:32:53 +0000 (+0200)
Subject: Implement some forgotten context menu items for arguments
X-Git-Tag: 2.2.1~119
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8318473227fd0b3b37ae63dc0ecf9fafc7137814;p=features.git

Implement some forgotten context menu items for arguments

* Dissolve context menu
* Label toggle (for conglomerate-styled arguments)

Fixes: #10150
---

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index cbe65a8cee..f1a0eafd07 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -158,10 +158,19 @@ Menuset
 #
 # InsetArgument context menu
 #
+
 	Menu "context-argument"
+		Item "Dissolve Inset|D" "inset-dissolve"
+		Separator
 		SwitchArguments
 	End
 
+	Menu "context-argument-conglomerate"
+		Item "Show Label|L" "inset-toggle"
+		Item "Dissolve Inset|D" "inset-dissolve"
+		Separator
+		SwitchArguments
+	End
 
 #
 # InsetBox context menu
diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 48551db1f5..b65257af97 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -232,7 +232,10 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 string InsetArgument::contextMenuName() const
 {
-	return "context-argument";
+	if (decoration() == InsetLayout::CONGLOMERATE)
+		return "context-argument-conglomerate";
+	else
+		return "context-argument";
 }