From a648c39b70a85d8b9fd7a98c2501bec8fcb77ab1 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Sun, 12 Sep 2010 07:01:24 +0000 Subject: [PATCH] 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 --- RELEASE-NOTES | 2 ++ lib/ui/stdmenus.inc | 2 +- src/BufferView.cpp | 1 - src/FuncCode.h | 3 +-- src/LyXAction.cpp | 10 +--------- src/Text3.cpp | 19 ------------------- 6 files changed, 5 insertions(+), 32 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index dfe50f3d2b..bad8a6ba80 100644 --- 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 75d3980cc9..31b7a33ad8 100644 --- 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 1eae3b3a3f..357fd77845 100644 --- 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 8867ce1c7a..e74abf5e9d 100644 --- 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 1a55e24044..c7f5b8ea40 100644 --- 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 * \li Params: : \n + hyperlink|include|index|label|nomencl|line|vspace|ref|toc>\n : depends on the given inset. Use "lyx -dbg action" to explore. * \li Sample: inset-insert ref LatexCommand reference "