Renaming CharStyle -> Flex, finishing touch

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

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index fcdb81b8c10839dbf8914eca7c0f37382d1319f0..fe2369cac8654ff088a7f0608d4c6f643097dbed 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -238,7 +238,7 @@ void LyXAction::init()
                { LFUN_MENU_SEPARATOR_INSERT, "menu-separator-insert", Noop },
                { LFUN_META_PREFIX, "meta-prefix", NoBuffer },
                { LFUN_BRANCH_INSERT, "branch-insert", Noop },
-               { LFUN_CHARSTYLE_INSERT, "charstyle-insert", Noop },
+               { LFUN_FLEX_INSERT, "flex-insert", Noop },
                { LFUN_NOTE_INSERT, "note-insert", Noop },
                { LFUN_BOX_INSERT, "box-insert", Noop },
                { LFUN_NOTE_NEXT, "note-next", ReadOnly },

diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp
index 4ed3506e1e6b5dd4d6afd6d3b7f632d67e9db4f0..e9d2509e81baf086006e936abefc9792cb8c340a 100644 (file)
--- a/src/MenuBackend.cpp
+++ b/src/MenuBackend.cpp
@@ -619,7 +619,7 @@ void expandFloatInsert(Menu & tomenu, Buffer const * buf)
 }
 
 
-void expandCharStyleInsert(Menu & tomenu, Buffer const * buf, std::string s)
+void expandFlexInsert(Menu & tomenu, Buffer const * buf, std::string s)
 {
        if (!buf) {
                tomenu.add(MenuItem(MenuItem::Command,
@@ -635,7 +635,7 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf, std::string s)
                docstring const label = cit->first;
                if (cit->second.lyxtype == s)
                        tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, 
-                               label, FuncRequest(LFUN_CHARSTYLE_INSERT,
+                               label, FuncRequest(LFUN_FLEX_INSERT,
                                                label)));
        }
 }
@@ -884,11 +884,11 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
                        break;
 
                case MenuItem::CharStyles:
-                       expandCharStyleInsert(tomenu, buf, "charstyle");
+                       expandFlexInsert(tomenu, buf, "charstyle");
                        break;
 
                case MenuItem::Custom:
-                       expandCharStyleInsert(tomenu, buf, "custom");
+                       expandFlexInsert(tomenu, buf, "custom");
                        break;
 
                case MenuItem::FloatListInsert:

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 9b826581d7a57c0357adeadee1b43877aa4a1773..14b4b946f555c3eaf8ff47c998d22ab83a6b3a99 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1126,7 +1126,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                updateLabels(bv->buffer());
                break;
        case LFUN_NOTE_INSERT:
-       case LFUN_CHARSTYLE_INSERT:
+       case LFUN_FLEX_INSERT:
        case LFUN_BOX_INSERT:
        case LFUN_BRANCH_INSERT:
        case LFUN_BIBITEM_INSERT:
@@ -1680,7 +1680,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_NOTE_INSERT:
                code = Inset::NOTE_CODE;
                break;
-       case LFUN_CHARSTYLE_INSERT:
+       case LFUN_FLEX_INSERT:
                code = Inset::FLEX_CODE;
                if (cur.buffer().params().getTextClass().insetlayouts().empty())
                        enable = false;

diff --git a/src/factory.cpp b/src/factory.cpp
index f3c85532d80777decfdb0aecb0ff493c911623d8..f8afea83366df81108fa1be90d082a0d127bc3cd 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -102,7 +102,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                case LFUN_CLEARDOUBLEPAGE_INSERT:
                        return new InsetClearDoublePage;
 
-               case LFUN_CHARSTYLE_INSERT: {
+               case LFUN_FLEX_INSERT: {
                        string s = cmd.getArg(0);
                        TextClass tclass = params.getTextClass();
                        InsetLayout il = tclass.insetlayout(from_utf8(s));

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 9a3e4eb320ac9537c62a2d62267b287376b0202c..cdb783ed1ecdb48b0db9953f20aaa3e6db5c8c09 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -340,7 +340,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
                case LFUN_MENU_OPEN:
                case LFUN_MENU_SEPARATOR_INSERT:
                case LFUN_BRANCH_INSERT:
-               case LFUN_CHARSTYLE_INSERT:
+               case LFUN_FLEX_INSERT:
                case LFUN_NOTE_INSERT:
                case LFUN_BOX_INSERT:
                case LFUN_NOTE_NEXT:

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 110031134b21966180d43be0dd68b8ba67d4fc32..ff89ddd931bc79b265dd8b576b6d6015bfab2108 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3711,7 +3711,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
        // disable these with multiple cells selected
        case LFUN_INSET_INSERT:
        case LFUN_TABULAR_INSERT:
-       case LFUN_CHARSTYLE_INSERT:
+       case LFUN_FLEX_INSERT:
        case LFUN_FLOAT_INSERT:
        case LFUN_FLOAT_WIDE_INSERT:
        case LFUN_FOOTNOTE_INSERT:

diff --git a/src/lfuns.h b/src/lfuns.h
index b9c06a977428e64b963af0ec1dca2199f2ace15f..4a6295abf69ed7f3ed2b33fde251bdab1eb06136 100644 (file)
--- a/src/lfuns.h
+++ b/src/lfuns.h
@@ -346,7 +346,7 @@ enum kb_action {
        LFUN_FINISHED_LEFT,
        // 245
        LFUN_FINISHED_RIGHT,
-       LFUN_CHARSTYLE_INSERT,
+       LFUN_FLEX_INSERT,
        LFUN_WORD_FIND,
        LFUN_WORD_REPLACE,
        LFUN_BUFFER_EXPORT_CUSTOM,