* stdmenus.inc:

* src/insets/InsetCollapsable.inc:
	- specific context menu for conglomerate insets

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23940 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 97ac8aa2b612a6d16fda67125d1ba91e2d1ca23a..caba4d118453ac21599b9455a1b5aeed8fce1c44 100644 (file)
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -578,6 +578,12 @@ Menuset
                OptItem "Settings...|S" "inset-settings"
        End
 
+       Menu "context-conglomerate"
+               Item "Toggle Label|L" "next-inset-toggle"
+               Separator
+               OptItem "Settings...|S" "inset-settings"
+       End
+
 #
 # InsetBox context menu
 #

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 37d9b0a7d4330390bb996a5320d5ee76e274f293..a5461e868eafaf0999377c0a834f70bc56168d9c 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -45,6 +45,8 @@ namespace lyx {
 
 InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 {
+       if (decoration() == InsetLayout::Conglomerate)
+               return status_;
        return autoOpen_ ? Open : status_;
 }
 
@@ -749,9 +751,9 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
 
        case LFUN_INSET_TOGGLE:
                if ((cmd.argument() == "open" && status_ != Open)
-                       || (cmd.argument() == "close" && status_ == Open)
-                       || cmd.argument() == "toggle" || cmd.argument().empty())
-                       flag.enabled(true);
+                     || (cmd.argument() == "close" && status_ == Open)
+                     || cmd.argument() == "toggle" || cmd.argument().empty())
+                               flag.enabled(true);
                else
                        flag.enabled(false);
                return true;
@@ -882,6 +884,9 @@ bool InsetCollapsable::undefined() const
 docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
        int y) const
 {
+       if (decoration() == InsetLayout::Conglomerate)
+               return from_ascii("context-conglomerate");
+
        if (geometry() == NoButton)
                return from_ascii("context-collapsable");