Rename LFUN_OPTIONAL_INSERT as LFUN_ARGUMENT_INSERT.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34597 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-06-04 22:53:44 +00:00
parent 8480d1dd9a
commit 319ca06167
10 changed files with 16 additions and 13 deletions

View File

@ -126,6 +126,9 @@ The following LyX functions have been changed:
arguments have been inverted in order to allow the replacement of the word
at current cursor position, even if it is not selected.
- LFUN_OPTIONAL_INSERT ("optional-insert") has been renamed LFUN_ARGUMENT_INSERT
("argument-insert").
New external programs and libaries:
-----------------------------------

View File

@ -219,7 +219,7 @@ Menuset
Item "Label...|L" "label-insert"
Item "Footnote|F" "footnote-insert"
Item "Marginal Note|M" "marginalnote-insert"
Item "Short Title" "optional-insert"
Item "Short Title" "argument-insert"
Item "Index Entry|I" "index-insert"
Item "Nomenclature Entry" "nomencl-insert"
Item "URL...|U" "url-insert"

View File

@ -308,7 +308,7 @@ Menuset
OptItem "Demote Section|m" "outline-in"
OptItem "Move Section Down|D" "outline-down"
OptItem "Move Section Up|U" "outline-up"
OptItem "Insert Short Title|T" "optional-insert"
OptItem "Insert Short Title|T" "argument-insert"
OptSubMenu "Insert Regular Expression..." "context-edit-regexp"
Separator
OptItem "Accept Change|c" "change-accept"

View File

@ -362,7 +362,7 @@ Menuset
Item "Hyperlink...|k" "href-insert"
Item "Footnote|F" "footnote-insert"
Item "Marginal Note|M" "marginalnote-insert"
Item "Short Title|S" "optional-insert"
Item "Short Title|S" "argument-insert"
Item "TeX Code|X" "ert-insert"
Item "Program Listing[[Menu]]" "listing-insert"
Item "Date" "date-insert"

View File

@ -274,7 +274,7 @@ enum FuncCode
LFUN_CHARS_TRANSPOSE, // Lgb 20010425
LFUN_ESCAPE, // Lgb 20010517
LFUN_THESAURUS_ENTRY, // Levon 20010720
LFUN_OPTIONAL_INSERT, // Martin 12 Aug 2002
LFUN_ARGUMENT_INSERT, // Martin 12 Aug 2002
// 205
LFUN_MOUSE_PRESS, // André 9 Aug 2002
LFUN_MOUSE_MOTION, // André 9 Aug 2002

View File

@ -317,13 +317,13 @@ void LyXAction::init()
*/
{ LFUN_WRAP_INSERT, "wrap-insert", Noop, Edit },
/*!
* \var lyx::FuncCode lyx::LFUN_OPTIONAL_INSERT
* \li Action: Inserts an optional-argument (short title) inset.
* \li Syntax: optional-insert
* \var lyx::FuncCode lyx::LFUN_ARGUMENT_INSERT
* \li Action: Inserts an argument (short title) inset.
* \li Syntax: argument-insert
* \li Origin: vermeer, 12 Aug 2002
* \endvar
*/
{ LFUN_OPTIONAL_INSERT, "optional-insert", Noop, Edit },
{ LFUN_ARGUMENT_INSERT, "argument-insert", Noop, Edit },
/*!
* \var lyx::FuncCode lyx::LFUN_LINE_INSERT
* \li Action: Inserts a horizontal line.

View File

@ -1570,7 +1570,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_ERT_INSERT:
case LFUN_LISTING_INSERT:
case LFUN_MARGINALNOTE_INSERT:
case LFUN_OPTIONAL_INSERT:
case LFUN_ARGUMENT_INSERT:
case LFUN_INDEX_INSERT:
case LFUN_PREVIEW_INSERT:
// Open the inset, and move the current selection
@ -2341,7 +2341,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_INFO_INSERT:
code = INFO_CODE;
break;
case LFUN_OPTIONAL_INSERT: {
case LFUN_ARGUMENT_INSERT: {
code = ARG_CODE;
Layout const & lay = cur.paragraph().layout();
int const numargs = lay.reqargs + lay.optargs;

View File

@ -144,7 +144,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
case LFUN_MARGINALNOTE_INSERT:
return new InsetMarginal(buf);
case LFUN_OPTIONAL_INSERT:
case LFUN_ARGUMENT_INSERT:
return new InsetArgument(buf);
case LFUN_FLOAT_INSERT:

View File

@ -198,7 +198,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
status.setEnabled(false);
return true;
case LFUN_OPTIONAL_INSERT:
case LFUN_ARGUMENT_INSERT:
status.setEnabled(cur.paragraph().insetList().find(ARG_CODE) == -1);
return true;

View File

@ -4296,7 +4296,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_MATH_MUTATE:
case LFUN_MATH_DISPLAY:
case LFUN_NOTE_INSERT:
case LFUN_OPTIONAL_INSERT:
case LFUN_ARGUMENT_INSERT:
case LFUN_BOX_INSERT:
case LFUN_BRANCH_INSERT:
case LFUN_PHANTOM_INSERT: