Author: rgheck
Date: Sat Jun 5 00:53:44 2010
New Revision: 34597
URL: http://www.lyx.org/trac/changeset/34597
Log:
Rename LFUN_OPTIONAL_INSERT as LFUN_ARGUMENT_INSERT.
Modified:
lyx-devel/trunk/RELEASE-NOTES
lyx-devel/trunk/lib/ui/classic.ui
lyx-devel/trunk/lib/ui/stdcontext.inc
lyx-devel/trunk/lib/ui/stdmenus.inc
lyx-devel/trunk/src/FuncCode.h
lyx-devel/trunk/src/LyXAction.cpp
lyx-devel/trunk/src/Text3.cpp
lyx-devel/trunk/src/factory.cpp
lyx-devel/trunk/src/insets/InsetCaption.cpp
lyx-devel/trunk/src/insets/InsetTabular.cpp
Modified: lyx-devel/trunk/RELEASE-NOTES
==============================================================================
--- lyx-devel/trunk/RELEASE-NOTES Sat Jun 5 00:44:58 2010 (r34596)
+++ lyx-devel/trunk/RELEASE-NOTES Sat Jun 5 00:53:44 2010 (r34597)
@@ -126,6 +126,9 @@
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:
-----------------------------------
Modified: lyx-devel/trunk/lib/ui/classic.ui
==============================================================================
--- lyx-devel/trunk/lib/ui/classic.ui Sat Jun 5 00:44:58 2010 (r34596)
+++ lyx-devel/trunk/lib/ui/classic.ui Sat Jun 5 00:53:44 2010 (r34597)
@@ -219,7 +219,7 @@
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"
Modified: lyx-devel/trunk/lib/ui/stdcontext.inc
==============================================================================
--- lyx-devel/trunk/lib/ui/stdcontext.inc Sat Jun 5 00:44:58 2010
(r34596)
+++ lyx-devel/trunk/lib/ui/stdcontext.inc Sat Jun 5 00:53:44 2010
(r34597)
@@ -308,7 +308,7 @@
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"
Modified: lyx-devel/trunk/lib/ui/stdmenus.inc
==============================================================================
--- lyx-devel/trunk/lib/ui/stdmenus.inc Sat Jun 5 00:44:58 2010 (r34596)
+++ lyx-devel/trunk/lib/ui/stdmenus.inc Sat Jun 5 00:53:44 2010 (r34597)
@@ -362,7 +362,7 @@
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"
Modified: lyx-devel/trunk/src/FuncCode.h
==============================================================================
--- lyx-devel/trunk/src/FuncCode.h Sat Jun 5 00:44:58 2010 (r34596)
+++ lyx-devel/trunk/src/FuncCode.h Sat Jun 5 00:53:44 2010 (r34597)
@@ -274,7 +274,7 @@
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
Modified: lyx-devel/trunk/src/LyXAction.cpp
==============================================================================
--- lyx-devel/trunk/src/LyXAction.cpp Sat Jun 5 00:44:58 2010 (r34596)
+++ lyx-devel/trunk/src/LyXAction.cpp Sat Jun 5 00:53:44 2010 (r34597)
@@ -317,13 +317,13 @@
*/
{ 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.
Modified: lyx-devel/trunk/src/Text3.cpp
==============================================================================
--- lyx-devel/trunk/src/Text3.cpp Sat Jun 5 00:44:58 2010 (r34596)
+++ lyx-devel/trunk/src/Text3.cpp Sat Jun 5 00:53:44 2010 (r34597)
@@ -1570,7 +1570,7 @@
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 @@
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;
Modified: lyx-devel/trunk/src/factory.cpp
==============================================================================
--- lyx-devel/trunk/src/factory.cpp Sat Jun 5 00:44:58 2010 (r34596)
+++ lyx-devel/trunk/src/factory.cpp Sat Jun 5 00:53:44 2010 (r34597)
@@ -144,7 +144,7 @@
case LFUN_MARGINALNOTE_INSERT:
return new InsetMarginal(buf);
- case LFUN_OPTIONAL_INSERT:
+ case LFUN_ARGUMENT_INSERT:
return new InsetArgument(buf);
case LFUN_FLOAT_INSERT:
Modified: lyx-devel/trunk/src/insets/InsetCaption.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetCaption.cpp Sat Jun 5 00:44:58 2010
(r34596)
+++ lyx-devel/trunk/src/insets/InsetCaption.cpp Sat Jun 5 00:53:44 2010
(r34597)
@@ -198,7 +198,7 @@
status.setEnabled(false);
return true;
- case LFUN_OPTIONAL_INSERT:
+ case LFUN_ARGUMENT_INSERT:
status.setEnabled(cur.paragraph().insetList().find(ARG_CODE) ==
-1);
return true;
Modified: lyx-devel/trunk/src/insets/InsetTabular.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetTabular.cpp Sat Jun 5 00:44:58 2010
(r34596)
+++ lyx-devel/trunk/src/insets/InsetTabular.cpp Sat Jun 5 00:53:44 2010
(r34597)
@@ -4296,7 +4296,7 @@
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:
