anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renaming CharStyle -> Flex, finishing touch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20076 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2007-09-05 18:40:56 +00:00
parent c1e4304322
commit fe0f7858c2
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LyXAction.cpp
View File

@ -238,7 +238,7 @@ void LyXAction::init()
{ LFUN_MENU_SEPARATOR_INSERT, "menu-separator-insert", Noop }, { LFUN_MENU_SEPARATOR_INSERT, "menu-separator-insert", Noop },
{ LFUN_META_PREFIX, "meta-prefix", NoBuffer }, { LFUN_META_PREFIX, "meta-prefix", NoBuffer },
{ LFUN_BRANCH_INSERT, "branch-insert", Noop }, { 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_NOTE_INSERT, "note-insert", Noop },
{ LFUN_BOX_INSERT, "box-insert", Noop }, { LFUN_BOX_INSERT, "box-insert", Noop },
{ LFUN_NOTE_NEXT, "note-next", ReadOnly }, { LFUN_NOTE_NEXT, "note-next", ReadOnly },

8
src/MenuBackend.cpp
View File

@ -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) { if (!buf) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
@ -635,7 +635,7 @@ void expandCharStyleInsert(Menu & tomenu, Buffer const * buf, std::string s)
docstring const label = cit->first; docstring const label = cit->first;
if (cit->second.lyxtype == s) if (cit->second.lyxtype == s)
tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, tomenu.addWithStatusCheck(MenuItem(MenuItem::Command,
label, FuncRequest(LFUN_CHARSTYLE_INSERT, label, FuncRequest(LFUN_FLEX_INSERT,
label))); label)));
} }
} }
@ -884,11 +884,11 @@ void MenuBackend::expand(Menu const & frommenu, Menu & tomenu,
break; break;
case MenuItem::CharStyles: case MenuItem::CharStyles:
expandCharStyleInsert(tomenu, buf, "charstyle"); expandFlexInsert(tomenu, buf, "charstyle");
break; break;
case MenuItem::Custom: case MenuItem::Custom:
expandCharStyleInsert(tomenu, buf, "custom"); expandFlexInsert(tomenu, buf, "custom");
break; break;
case MenuItem::FloatListInsert: case MenuItem::FloatListInsert:

4
src/Text3.cpp
View File

@ -1126,7 +1126,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
updateLabels(bv->buffer()); updateLabels(bv->buffer());
break; break;
case LFUN_NOTE_INSERT: case LFUN_NOTE_INSERT:
case LFUN_CHARSTYLE_INSERT: case LFUN_FLEX_INSERT:
case LFUN_BOX_INSERT: case LFUN_BOX_INSERT:
case LFUN_BRANCH_INSERT: case LFUN_BRANCH_INSERT:
case LFUN_BIBITEM_INSERT: case LFUN_BIBITEM_INSERT:
@ -1680,7 +1680,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_NOTE_INSERT: case LFUN_NOTE_INSERT:
code = Inset::NOTE_CODE; code = Inset::NOTE_CODE;
break; break;
case LFUN_CHARSTYLE_INSERT: case LFUN_FLEX_INSERT:
code = Inset::FLEX_CODE; code = Inset::FLEX_CODE;
if (cur.buffer().params().getTextClass().insetlayouts().empty()) if (cur.buffer().params().getTextClass().insetlayouts().empty())
enable = false; enable = false;

2
src/factory.cpp
View File

@ -102,7 +102,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
case LFUN_CLEARDOUBLEPAGE_INSERT: case LFUN_CLEARDOUBLEPAGE_INSERT:
return new InsetClearDoublePage; return new InsetClearDoublePage;
case LFUN_CHARSTYLE_INSERT: { case LFUN_FLEX_INSERT: {
string s = cmd.getArg(0); string s = cmd.getArg(0);
TextClass tclass = params.getTextClass(); TextClass tclass = params.getTextClass();
InsetLayout il = tclass.insetlayout(from_utf8(s)); InsetLayout il = tclass.insetlayout(from_utf8(s));

2
src/insets/InsetERT.cpp
View File

@ -340,7 +340,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_MENU_OPEN: case LFUN_MENU_OPEN:
case LFUN_MENU_SEPARATOR_INSERT: case LFUN_MENU_SEPARATOR_INSERT:
case LFUN_BRANCH_INSERT: case LFUN_BRANCH_INSERT:
case LFUN_CHARSTYLE_INSERT: case LFUN_FLEX_INSERT:
case LFUN_NOTE_INSERT: case LFUN_NOTE_INSERT:
case LFUN_BOX_INSERT: case LFUN_BOX_INSERT:
case LFUN_NOTE_NEXT: case LFUN_NOTE_NEXT:

2
src/insets/InsetTabular.cpp
View File

@ -3711,7 +3711,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
// disable these with multiple cells selected // disable these with multiple cells selected
case LFUN_INSET_INSERT: case LFUN_INSET_INSERT:
case LFUN_TABULAR_INSERT: case LFUN_TABULAR_INSERT:
case LFUN_CHARSTYLE_INSERT: case LFUN_FLEX_INSERT:
case LFUN_FLOAT_INSERT: case LFUN_FLOAT_INSERT:
case LFUN_FLOAT_WIDE_INSERT: case LFUN_FLOAT_WIDE_INSERT:
case LFUN_FOOTNOTE_INSERT: case LFUN_FOOTNOTE_INSERT:

2
src/lfuns.h
View File

@ -346,7 +346,7 @@ enum kb_action {
LFUN_FINISHED_LEFT, LFUN_FINISHED_LEFT,
// 245 // 245
LFUN_FINISHED_RIGHT, LFUN_FINISHED_RIGHT,
LFUN_CHARSTYLE_INSERT, LFUN_FLEX_INSERT,
LFUN_WORD_FIND, LFUN_WORD_FIND,
LFUN_WORD_REPLACE, LFUN_WORD_REPLACE,
LFUN_BUFFER_EXPORT_CUSTOM, LFUN_BUFFER_EXPORT_CUSTOM,