Move disabling LFUNS from ERT to Collapsable

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index d9355d870a9bddaf5ebf0b3a100359bf041b9dc9..e6a4f741b4b2565a38e6b78f76709da9ca7cf4a2 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -556,6 +556,103 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action) {
+               // suppress these
+               case LFUN_ACCENT_ACUTE:
+               case LFUN_ACCENT_BREVE:
+               case LFUN_ACCENT_CARON:
+               case LFUN_ACCENT_CEDILLA:
+               case LFUN_ACCENT_CIRCLE:
+               case LFUN_ACCENT_CIRCUMFLEX:
+               case LFUN_ACCENT_DOT:
+               case LFUN_ACCENT_GRAVE:
+               case LFUN_ACCENT_HUNGARIAN_UMLAUT:
+               case LFUN_ACCENT_MACRON:
+               case LFUN_ACCENT_OGONEK:
+               case LFUN_ACCENT_SPECIAL_CARON:
+               case LFUN_ACCENT_TIE:
+               case LFUN_ACCENT_TILDE:
+               case LFUN_ACCENT_UMLAUT:
+               case LFUN_ACCENT_UNDERBAR:
+               case LFUN_ACCENT_UNDERDOT:
+               case LFUN_APPENDIX:
+               case LFUN_BIBITEM_INSERT:
+               case LFUN_BOX_INSERT:
+               case LFUN_BRANCH_INSERT:
+               case LFUN_BREAK_LINE:
+               case LFUN_CAPTION_INSERT:
+               case LFUN_CLEARPAGE_INSERT:
+               case LFUN_CLEARDOUBLEPAGE_INSERT:
+               case LFUN_DEPTH_DECREMENT:
+               case LFUN_DEPTH_INCREMENT:
+               case LFUN_DOTS_INSERT:
+               case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
+               case LFUN_ENVIRONMENT_INSERT:
+               case LFUN_ERT_INSERT:
+               case LFUN_FILE_INSERT:
+               case LFUN_FLEX_INSERT:
+               case LFUN_FLOAT_INSERT:
+               case LFUN_FLOAT_LIST:
+               case LFUN_FLOAT_WIDE_INSERT:
+               case LFUN_FONT_BOLD:
+               case LFUN_FONT_TYPEWRITER:
+               case LFUN_FONT_DEFAULT:
+               case LFUN_FONT_EMPH:
+               case LFUN_FONT_FREE_APPLY:
+               case LFUN_FONT_FREE_UPDATE:
+               case LFUN_FONT_NOUN:
+               case LFUN_FONT_ROMAN:
+               case LFUN_FONT_SANS:
+               case LFUN_FONT_FRAK:
+               case LFUN_FONT_ITAL:
+               case LFUN_FONT_SIZE:
+               case LFUN_FONT_STATE:
+               case LFUN_FONT_UNDERLINE:
+               case LFUN_FOOTNOTE_INSERT:
+               case LFUN_HFILL_INSERT:
+               case LFUN_HYPERLINK_INSERT:
+               case LFUN_HYPHENATION_POINT_INSERT:
+               case LFUN_INDEX_INSERT:
+               case LFUN_INDEX_PRINT:
+               case LFUN_INSET_INSERT:
+               case LFUN_LABEL_GOTO:
+               case LFUN_LABEL_INSERT:
+               case LFUN_LIGATURE_BREAK_INSERT:
+               case LFUN_LINE_INSERT:
+               case LFUN_PAGEBREAK_INSERT:
+               case LFUN_LANGUAGE:
+               case LFUN_LAYOUT:
+               case LFUN_LAYOUT_PARAGRAPH:
+               case LFUN_LAYOUT_TABULAR:
+               case LFUN_MARGINALNOTE_INSERT:
+               case LFUN_MATH_DISPLAY:
+               case LFUN_MATH_INSERT:
+               case LFUN_MATH_MATRIX:
+               case LFUN_MATH_MODE:
+               case LFUN_MENU_OPEN:
+               case LFUN_MENU_SEPARATOR_INSERT:
+               case LFUN_NOACTION:
+               case LFUN_NOMENCL_INSERT:
+               case LFUN_NOMENCL_PRINT:
+               case LFUN_NOTE_INSERT:
+               case LFUN_NOTE_NEXT:
+               case LFUN_OPTIONAL_INSERT:
+               case LFUN_PARAGRAPH_PARAMS:
+               case LFUN_PARAGRAPH_PARAMS_APPLY:
+               case LFUN_PARAGRAPH_SPACING:
+               case LFUN_PARAGRAPH_UPDATE:
+               case LFUN_REFERENCE_NEXT:
+               case LFUN_SERVER_GOTO_FILE_ROW:
+               case LFUN_SERVER_NOTIFY:
+               case LFUN_SERVER_SET_XY:
+               case LFUN_SPACE_INSERT:
+               case LFUN_TABULAR_INSERT:
+               case LFUN_TOC_INSERT:
+               case LFUN_WRAP_INSERT:
+               if (layout_.verbatim) {
+                       flag.enabled(false);
+                       return true;
+               } else
+                       return InsetText::getStatus(cur, cmd, flag);
 
        case LFUN_INSET_TOGGLE:
                if (cmd.argument() == "open" || cmd.argument() == "close" ||

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 9c18419350673dc25d59b121848365d9a78c545d..a30d609d7cbf419ef8e6c824aedfee076263395f 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -251,101 +251,6 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
        switch (cmd.action) {
-               // suppress these
-               case LFUN_ACCENT_ACUTE:
-               case LFUN_ACCENT_BREVE:
-               case LFUN_ACCENT_CARON:
-               case LFUN_ACCENT_CEDILLA:
-               case LFUN_ACCENT_CIRCLE:
-               case LFUN_ACCENT_CIRCUMFLEX:
-               case LFUN_ACCENT_DOT:
-               case LFUN_ACCENT_GRAVE:
-               case LFUN_ACCENT_HUNGARIAN_UMLAUT:
-               case LFUN_ACCENT_MACRON:
-               case LFUN_ACCENT_OGONEK:
-               case LFUN_ACCENT_SPECIAL_CARON:
-               case LFUN_ACCENT_TIE:
-               case LFUN_ACCENT_TILDE:
-               case LFUN_ACCENT_UMLAUT:
-               case LFUN_ACCENT_UNDERBAR:
-               case LFUN_ACCENT_UNDERDOT:
-               case LFUN_APPENDIX:
-               case LFUN_BIBITEM_INSERT:
-               case LFUN_BOX_INSERT:
-               case LFUN_BRANCH_INSERT:
-               case LFUN_BREAK_LINE:
-               case LFUN_CAPTION_INSERT:
-               case LFUN_CLEARPAGE_INSERT:
-               case LFUN_CLEARDOUBLEPAGE_INSERT:
-               case LFUN_DEPTH_DECREMENT:
-               case LFUN_DEPTH_INCREMENT:
-               case LFUN_DOTS_INSERT:
-               case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
-               case LFUN_ENVIRONMENT_INSERT:
-               case LFUN_ERT_INSERT:
-               case LFUN_FILE_INSERT:
-               case LFUN_FLEX_INSERT:
-               case LFUN_FLOAT_INSERT:
-               case LFUN_FLOAT_LIST:
-               case LFUN_FLOAT_WIDE_INSERT:
-               case LFUN_FONT_BOLD:
-               case LFUN_FONT_TYPEWRITER:
-               case LFUN_FONT_DEFAULT:
-               case LFUN_FONT_EMPH:
-               case LFUN_FONT_FREE_APPLY:
-               case LFUN_FONT_FREE_UPDATE:
-               case LFUN_FONT_NOUN:
-               case LFUN_FONT_ROMAN:
-               case LFUN_FONT_SANS:
-               case LFUN_FONT_FRAK:
-               case LFUN_FONT_ITAL:
-               case LFUN_FONT_SIZE:
-               case LFUN_FONT_STATE:
-               case LFUN_FONT_UNDERLINE:
-               case LFUN_FOOTNOTE_INSERT:
-               case LFUN_HFILL_INSERT:
-               case LFUN_HYPERLINK_INSERT:
-               case LFUN_HYPHENATION_POINT_INSERT:
-               case LFUN_INDEX_INSERT:
-               case LFUN_INDEX_PRINT:
-               case LFUN_INSET_INSERT:
-               case LFUN_LABEL_GOTO:
-               case LFUN_LABEL_INSERT:
-               case LFUN_LIGATURE_BREAK_INSERT:
-               case LFUN_LINE_INSERT:
-               case LFUN_PAGEBREAK_INSERT:
-               case LFUN_LANGUAGE:
-               case LFUN_LAYOUT:
-               case LFUN_LAYOUT_PARAGRAPH:
-               case LFUN_LAYOUT_TABULAR:
-               case LFUN_MARGINALNOTE_INSERT:
-               case LFUN_MATH_DISPLAY:
-               case LFUN_MATH_INSERT:
-               case LFUN_MATH_MATRIX:
-               case LFUN_MATH_MODE:
-               case LFUN_MENU_OPEN:
-               case LFUN_MENU_SEPARATOR_INSERT:
-               case LFUN_NOACTION:
-               case LFUN_NOMENCL_INSERT:
-               case LFUN_NOMENCL_PRINT:
-               case LFUN_NOTE_INSERT:
-               case LFUN_NOTE_NEXT:
-               case LFUN_OPTIONAL_INSERT:
-               case LFUN_PARAGRAPH_PARAMS:
-               case LFUN_PARAGRAPH_PARAMS_APPLY:
-               case LFUN_PARAGRAPH_SPACING:
-               case LFUN_PARAGRAPH_UPDATE:
-               case LFUN_REFERENCE_NEXT:
-               case LFUN_SERVER_GOTO_FILE_ROW:
-               case LFUN_SERVER_NOTIFY:
-               case LFUN_SERVER_SET_XY:
-               case LFUN_SPACE_INSERT:
-               case LFUN_TABULAR_INSERT:
-               case LFUN_TOC_INSERT:
-               case LFUN_WRAP_INSERT:
-                       status.enabled(false);
-                       return true;
-
                case LFUN_CLIPBOARD_PASTE:
                case LFUN_INSET_MODIFY:
                case LFUN_PASTE: