From 9b111ea5a6b245464f77a095b050d846e807a21a Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Fri, 10 Apr 2009 00:17:34 +0000 Subject: [PATCH] Make the insets accept LFUN_INSET_SETTINGS. For these insets, LFUN_INSET_SETTINGS was already used to show the settings dialog (in contrast to the insets in the next commit). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29175 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetBox.cpp | 1 + src/insets/InsetBranch.cpp | 1 + src/insets/InsetCommand.cpp | 4 ++++ src/insets/InsetERT.cpp | 1 + src/insets/InsetFloat.cpp | 1 + src/insets/InsetListings.cpp | 1 + src/insets/InsetNote.cpp | 1 + src/insets/InsetPhantom.cpp | 1 + src/insets/InsetTabular.cpp | 7 +++++++ src/insets/InsetWrap.cpp | 1 + 10 files changed, 19 insertions(+) diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index 43d29d8dcd..4882f78e4b 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -239,6 +239,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, return true; case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_SETTINGS: flag.setEnabled(true); return true; diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index fb599edbc5..649fcf603a 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -171,6 +171,7 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action) { case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_SETTINGS: flag.setEnabled(true); break; diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp index 4e82cfaa58..d4a03317a2 100644 --- a/src/insets/InsetCommand.cpp +++ b/src/insets/InsetCommand.cpp @@ -158,6 +158,7 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_ERT_INSERT: status.setEnabled(false); return true; + // we handle these case LFUN_INSET_MODIFY: if (cmd.getArg(0) == "changetype") { @@ -167,9 +168,12 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd, } status.setEnabled(true); return true; + + case LFUN_INSET_SETTINGS: case LFUN_INSET_DIALOG_UPDATE: status.setEnabled(true); return true; + default: return Inset::getStatus(cur, cmd, status); } diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp index bd59d14072..f6e99d8498 100644 --- a/src/insets/InsetERT.cpp +++ b/src/insets/InsetERT.cpp @@ -137,6 +137,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_PASTE: case LFUN_PRIMARY_SELECTION_PASTE: case LFUN_QUOTE_INSERT: + case LFUN_INSET_SETTINGS: status.setEnabled(true); return true; diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp index 37a247af44..07b5ece5b1 100644 --- a/src/insets/InsetFloat.cpp +++ b/src/insets/InsetFloat.cpp @@ -183,6 +183,7 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_SETTINGS: flag.setEnabled(true); return true; diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp index 0ce91d7b3e..d59679b906 100644 --- a/src/insets/InsetListings.cpp +++ b/src/insets/InsetListings.cpp @@ -381,6 +381,7 @@ bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action) { case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_SETTINGS: status.setEnabled(true); return true; case LFUN_CAPTION_INSERT: diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp index c773bf80e1..e0804ed8d5 100644 --- a/src/insets/InsetNote.cpp +++ b/src/insets/InsetNote.cpp @@ -211,6 +211,7 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd, } return true; + case LFUN_INSET_SETTINGS: case LFUN_INSET_DIALOG_UPDATE: flag.setEnabled(true); return true; diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp index 3a20037887..3ba99b1133 100644 --- a/src/insets/InsetPhantom.cpp +++ b/src/insets/InsetPhantom.cpp @@ -285,6 +285,7 @@ bool InsetPhantom::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action) { case LFUN_INSET_MODIFY: + case LFUN_INSET_SETTINGS: flag.setEnabled(true); return true; diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 427e7020b6..ed03034146 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -3742,6 +3742,12 @@ void InsetTabular::doDispatch(Cursor & cur, FuncRequest & cmd) cell(cur.idx())->dispatch(cur, cmd); break; } + + case LFUN_INSET_SETTINGS: + // relay this lfun to Inset, not to the cell. + Inset::doDispatch(cur, cmd); + break; + default: // we try to handle this event in the insets dispatch function. cell(cur.idx())->dispatch(cur, cmd); @@ -4068,6 +4074,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd, } return cell(cur.idx())->getStatus(cur, cmd, status); + case LFUN_INSET_SETTINGS: case LFUN_INSET_MODIFY: if (insetCode(cmd.getArg(0)) == TABULAR_CODE) { status.setEnabled(true); diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp index c21d222507..718ce4eefe 100644 --- a/src/insets/InsetWrap.cpp +++ b/src/insets/InsetWrap.cpp @@ -107,6 +107,7 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action) { case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: + case LFUN_INSET_SETTINGS: flag.setEnabled(true); return true; -- 2.39.2