From fe0f7858c2f05534fd1965119cad9eb7cbb0c761 Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Wed, 5 Sep 2007 18:40:56 +0000 Subject: [PATCH] Renaming CharStyle -> Flex, finishing touch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20076 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LyXAction.cpp | 2 +- src/MenuBackend.cpp | 8 ++++---- src/Text3.cpp | 4 ++-- src/factory.cpp | 2 +- src/insets/InsetERT.cpp | 2 +- src/insets/InsetTabular.cpp | 2 +- src/lfuns.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index fcdb81b8c1..fe2369cac8 100644 --- 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 4ed3506e1e..e9d2509e81 100644 --- 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 9b826581d7..14b4b946f5 100644 --- 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 f3c85532d8..f8afea8336 100644 --- 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 9a3e4eb320..cdb783ed1e 100644 --- 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 110031134b..ff89ddd931 100644 --- 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 b9c06a9774..4a6295abf6 100644 --- 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,