commit 8318473227fd0b3b37ae63dc0ecf9fafc7137814
Author: Juergen Spitzmueller <[email protected]>
Date: Sun May 29 12:32:53 2016 +0200
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 cbe65a8..f1a0eaf 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 48551db..b65257a 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";
}