Get rid of LFUN_LINE_INSERT: we use LFUN_INSET_INSERT "line".

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dfe50f3d2bf59eaf480930d75b7bd52d8c14967c..bad8a6ba805085dab21629c51c35f04a6895c70a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -117,6 +117,8 @@ The following LyX functions have been removed:
 
 - LFUN_TABULAR_FEATURE ("tabular-feature"): use "inset-modify" instead.
 
+- LFUN_LINE_INSERT ("line-insert"): use "inset-insert line" instead.
+
 
 The following LyX functions have been changed:
 

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 75d3980cc9e267b8d5b2abb5d51ffb84850ef959..31b7a33ad843f565dd3352f2b733cfd382b9e2d9 100644 (file)
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -390,7 +390,7 @@ Menuset
                Item "Interword Space|w" "space-insert normal"
                Item "Thin Space|T" "space-insert thin"
                Item "Horizontal Space...|o" "dialog-show-new-inset space"
-               Item "Horizontal Line|L" "line-insert"
+               Item "Horizontal Line...|L" "dialog-show-new-inset line"
                Item "Vertical Space...|V" "dialog-show-new-inset vspace"
                Submenu "Phantom" "insert_phantom"
                Separator

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 1eae3b3a3ff9a4094e74762edb751359d039195c..357fd778459b477357eb6222b3fc54548782d2c3 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1027,7 +1027,6 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 
        case LFUN_FONT_STATE:
        case LFUN_LABEL_INSERT:
-       case LFUN_LINE_INSERT:
        case LFUN_INFO_INSERT:
        case LFUN_PARAGRAPH_GOTO:
        case LFUN_NOTE_NEXT:

diff --git a/src/FuncCode.h b/src/FuncCode.h
index 8867ce1c7a170800766bd338e4612ff912d05ed3..e74abf5e9df368ec554ba76a1315428b46c90b52 100644 (file)
--- a/src/FuncCode.h
+++ b/src/FuncCode.h
@@ -310,7 +310,7 @@ enum FuncCode
        LFUN_INSET_EDIT,                // JSpitzm 20080427
        LFUN_BRANCH_INSERT,
        LFUN_BOX_INSERT,
-       LFUN_LINE_INSERT,
+       LFUN_BUFFER_TOGGLE_OUTPUT_SYNC,
        // 235
        LFUN_NEWPAGE_INSERT,            // uwestoehr, 20071124
        LFUN_REPEAT,
@@ -448,7 +448,6 @@ enum FuncCode
        LFUN_PREVIEW_INSERT,            // vfr, 20100328
        LFUN_FORWARD_SEARCH,
        LFUN_INSET_COPY_AS,             // vfr, 20100419
-       LFUN_BUFFER_TOGGLE_OUTPUT_SYNC,
 
        LFUN_LASTACTION                 // end of the table
 };

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 1a55e24044db3f76c3cb512b911a8a5e3d924d2a..c7f5b8ea401680d06f3b549bfad5bfc696e70cf6 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -324,14 +324,6 @@ void LyXAction::init()
  * \endvar
  */
                { LFUN_ARGUMENT_INSERT, "argument-insert", Noop, Edit },
-/*!
- * \var lyx::FuncCode lyx::LFUN_LINE_INSERT
- * \li Action: Inserts a horizontal line.
- * \li Syntax: line-insert
- * \li Origin: Andre, Oct 27 2003
- * \endvar
- */
-               { LFUN_LINE_INSERT, "line-insert", Noop, Edit },
 /*!
  * \var lyx::FuncCode lyx::LFUN_NEWPAGE_INSERT
  * \li Action: Inserts a new page.
@@ -2317,7 +2309,7 @@ void LyXAction::init()
  * \li Action: Insert new inset (type given by the parameters).
  * \li Syntax: inset-insert <INSET> <ARGS>
  * \li Params: <INSET>: <bibitem|bibtex|cite|ert|listings|external|graphics|tabular
-                         hyperlink|include|index|label|nomencl|vspace|ref|toc>\n
+                         hyperlink|include|index|label|nomencl|line|vspace|ref|toc>\n
                <ARGS>: depends on the given inset. Use "lyx -dbg action" to explore.
  * \li Sample: inset-insert ref LatexCommand <Format> reference "<label name>"\end_inset \n
                where <label name> is the name of the referenced label and

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 75ad2c0733c0117d10acef817711773d9580cb77..ea770e519cb3aa6f7758166758a7b3d474737ecb 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1548,22 +1548,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_LINE_INSERT: {
-               InsetCommandParams p(LINE_CODE);
-               p["offset"] = from_ascii(".5ex");
-               p["width"] = from_ascii("100col%");
-               p["height"] = from_ascii("1pt");
-               string const data = InsetCommand::params2string("line", p);
-
-               if (cmd.argument().empty()) {
-                       bv->showDialog("line", data);
-               } else {
-                       FuncRequest fr(LFUN_INSET_INSERT, data);
-                       dispatch(cur, fr);
-               }
-               break;
-       }
-
        case LFUN_INFO_INSERT: {
                Inset * inset;
                if (cmd.argument().empty() && cur.selection()) {
@@ -2377,9 +2361,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_LABEL_INSERT:
                code = LABEL_CODE;
                break;
-       case LFUN_LINE_INSERT:
-               code = LINE_CODE;
-               break;
        case LFUN_INFO_INSERT:
                code = INFO_CODE;
                break;