From bc1582b0b1d24d1429227ea5f4afdc0ffb4e0f4e Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Fri, 14 Jul 2006 08:11:23 +0000 Subject: [PATCH] remove LFUN_INSET_DIALOG_SHOW git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14450 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LyXAction.C | 1 - src/insets/insetcommand.C | 2 -- src/insets/insetinclude.C | 2 -- src/lfuns.h | 17 ++++++++--------- src/mathed/ref_inset.C | 2 -- src/text3.C | 28 ---------------------------- 6 files changed, 8 insertions(+), 44 deletions(-) diff --git a/src/LyXAction.C b/src/LyXAction.C index ddef58b000..b420559653 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -332,7 +332,6 @@ void LyXAction::init() { LFUN_INSET_MODIFY, "", Noop }, { LFUN_INSET_DIALOG_UPDATE, "", Noop }, { LFUN_INSET_SETTINGS, "inset-settings", ReadOnly }, - { LFUN_INSET_DIALOG_SHOW, "inset-dialog-show", Noop }, { LFUN_PARAGRAPH_PARAMS_APPLY, "paragraph-params-apply", Noop }, { LFUN_PARAGRAPH_UPDATE, "", Noop }, { LFUN_EXTERNAL_EDIT, "external-edit", Noop }, diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 33701ad89c..7f47611bb3 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -120,7 +120,6 @@ void InsetCommand::doDispatch(LCursor & cur, FuncRequest & cmd) InsetCommandMailer(cmd.argument, *this).updateDialog(&cur.bv()); break; - case LFUN_INSET_DIALOG_SHOW: case LFUN_MOUSE_RELEASE: { if (!mailer_name_.empty()) InsetCommandMailer(mailer_name_, *this).showDialog(&cur.bv()); @@ -147,7 +146,6 @@ bool InsetCommand::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_INSET_REFRESH: case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: - case LFUN_INSET_DIALOG_SHOW: status.enabled(true); return true; default: diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index 4620c52c27..fc39245feb 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -141,7 +141,6 @@ void InsetInclude::doDispatch(LCursor & cur, FuncRequest & cmd) break; case LFUN_MOUSE_RELEASE: - case LFUN_INSET_DIALOG_SHOW: InsetIncludeMailer(*this).showDialog(&cur.bv()); break; @@ -159,7 +158,6 @@ bool InsetInclude::getStatus(LCursor & cur, FuncRequest const & cmd, case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: - case LFUN_INSET_DIALOG_SHOW: flag.enabled(true); return true; diff --git a/src/lfuns.h b/src/lfuns.h index e98ee0b926..c286ed6e96 100644 --- a/src/lfuns.h +++ b/src/lfuns.h @@ -320,52 +320,51 @@ enum kb_action { LFUN_PARAGRAPH_UPDATE, LFUN_EXTERNAL_EDIT, LFUN_BRANCH_INSERT, - LFUN_INSET_DIALOG_SHOW, LFUN_BOX_INSERT, - // 245 LFUN_LINE_INSERT, + // 245 LFUN_PAGEBREAK_INSERT, LFUN_REPEAT, LFUN_FINISHED_LEFT, LFUN_FINISHED_RIGHT, - // 250 LFUN_FINISHED_UP, + // 250 LFUN_FINISHED_DOWN, LFUN_CHARSTYLE_INSERT, LFUN_WORD_FIND, LFUN_WORD_REPLACE, - // 255 LFUN_BUFFER_EXPORT_CUSTOM, + // 255 LFUN_BUFFER_PRINT, LFUN_NEXT_INSET_TOGGLE, LFUN_ALL_INSETS_TOGGLE, LFUN_BUFFER_LANGUAGE, - // 260 LFUN_TEXTCLASS_APPLY, + // 260 LFUN_TEXTCLASS_LOAD, LFUN_BUFFER_SAVE_AS_DEFAULT, LFUN_BUFFER_PARAMS_APPLY, LFUN_LYXRC_APPLY, - // 265 LFUN_GRAPHICS_EDIT, + // 265 LFUN_INSET_REFRESH, LFUN_BUFFER_NEXT, LFUN_BUFFER_PREVIOUS, LFUN_WORDS_COUNT, - // 270 LFUN_CHANGES_OUTPUT, // jspitzm 20050121 + // 270 LFUN_BIBTEX_DATABASE_ADD, LFUN_BIBTEX_DATABASE_DEL, LFUN_CITATION_INSERT, LFUN_OUTLINE_UP, // Vermeer 20060323 - // 275 LFUN_OUTLINE_DOWN, + // 275 LFUN_OUTLINE_IN, LFUN_OUTLINE_OUT, LFUN_PARAGRAPH_MOVE_DOWN, // Edwin 20060408 LFUN_PARAGRAPH_MOVE_UP, // Edwin 20060408 - // 280 LFUN_BUFFER_TOGGLE_COMPRESSION, // bpeng 20060427 + // 280 LFUN_MATH_BIGDELIM, LFUN_CLIPBOARD_PASTE, diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C index 8d9438cc20..5a419886d9 100644 --- a/src/mathed/ref_inset.C +++ b/src/mathed/ref_inset.C @@ -78,7 +78,6 @@ void RefInset::doDispatch(LCursor & cur, FuncRequest & cmd) break; } - case LFUN_INSET_DIALOG_SHOW: case LFUN_MOUSE_RELEASE: if (cmd.button() == mouse_button::button3) { lyxerr << "trying to goto ref '" << asString(cell(0)) << "'" << endl; @@ -113,7 +112,6 @@ bool RefInset::getStatus(LCursor & cur, FuncRequest const & cmd, // we handle these case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: - case LFUN_INSET_DIALOG_SHOW: case LFUN_MOUSE_RELEASE: case LFUN_MOUSE_PRESS: case LFUN_MOUSE_MOTION: diff --git a/src/text3.C b/src/text3.C index 5b2aecec62..f2c952590b 100644 --- a/src/text3.C +++ b/src/text3.C @@ -1462,15 +1462,6 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd) break; } - case LFUN_INSET_DIALOG_SHOW: { - InsetBase * inset = cur.nextInset(); - if (inset) { - FuncRequest fr(LFUN_INSET_DIALOG_SHOW); - inset->dispatch(cur, fr); - } - break; - } - case LFUN_ESCAPE: if (cur.selection()) { cur.selection() = false; @@ -1669,25 +1660,6 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd, code = InsetBase::SPACE_CODE; break; -#ifdef WITH_WARNINGS -#warning This LFUN is not used anymore and should be nuked (JMarc 29/10/2005) -#endif -#if 0 - case LFUN_INSET_DIALOG_SHOW: { - InsetBase * inset = cur.nextInset(); - enable = inset; - if (inset) { - code = inset->lyxCode(); - if (!(code == InsetBase::INCLUDE_CODE - || code == InsetBase::BIBTEX_CODE - || code == InsetBase::FLOAT_LIST_CODE - || code == InsetBase::TOC_CODE)) - enable = false; - } - break; - } -#endif - case LFUN_INSET_MODIFY: // We need to disable this, because we may get called for a // tabular cell via