Dissolve CharStyle initial implementation.

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

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 64c50e83da1ea5afb62fe2f48e6b0df6ef367027..d658f25a137c6b63942fb9431882160624f7f1e9 100644 (file)
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -140,6 +140,7 @@ Menuset
        End
 
        Menu "edit_textstyles"
+               Item "Dissolve CharStyle" "inset-dissolve charstyle"
                CharStyles
                Elements
                Separator

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 1f7157a48e9e6d74650b0368fc387b09d2b0d3a6..c5795bfb557faf7105fdf2586b63e4191475cf91 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1840,7 +1840,13 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                break;
 
        case LFUN_INSET_DISSOLVE:
-               enable = !isMainText(cur.bv().buffer()) && cur.inset().nargs() == 1;
+               if (!cmd.argument().empty()) {
+                       InsetLayout il = cur.inset().getLayout(cur.buffer().params());
+                       enable = (cur.inset().lyxCode() == FLEX_CODE) 
+                             && (il.lyxtype == to_utf8(cmd.argument()));
+               } else
+                       enable = !isMainText(cur.bv().buffer()) 
+                               && cur.inset().nargs() == 1;
                break;
 
        case LFUN_CHANGE_ACCEPT:

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index eba3503fb2e12c599fbca9dfbdce366a7478309e..51e1ec44c5737e108d11091d488ad50da66636fe 100644 (file)
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -40,6 +40,8 @@ public:
        InsetFlex(BufferParams const &, InsetLayout);
        ///
        docstring name() const { return from_ascii("Flex"); }
+       ///
+       InsetLayout const & getLayout(BufferParams const &) const { return layout_; } 
        /// Is this character style defined in the document's textclass?
        /// May be wrong after textclass change or paste from another document
        bool undefined() const;