From: Jean-Marc Lasgouttes Date: Tue, 9 Mar 2010 23:04:35 +0000 (+0000) Subject: Restore some sanaity in InsetInfo lfuns (bug #6580) X-Git-Tag: 2.0.0~3851 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=19031e23457cd50623a4f7ffbe55daeb1299468c;p=features.git Restore some sanaity in InsetInfo lfuns (bug #6580) The context menu is wrong, I do not know why. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33689 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 05de030957..ce52ce8a62 100644 --- a/src/insets/InsetInfo.cpp +++ b/src/insets/InsetInfo.cpp @@ -193,20 +193,20 @@ bool InsetInfo::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { switch (cmd.action) { - case LFUN_MOUSE_PRESS: - case LFUN_MOUSE_RELEASE: - case LFUN_MOUSE_MOTION: - case LFUN_MOUSE_DOUBLE: - case LFUN_MOUSE_TRIPLE: - case LFUN_COPY: case LFUN_INSET_SETTINGS: return InsetCollapsable::getStatus(cur, cmd, flag); - + case LFUN_INSET_DIALOG_UPDATE: - case LFUN_INSET_MODIFY: flag.setEnabled(true); return true; - + + case LFUN_INSET_MODIFY: + if (validateModifyArgument(cmd.argument())) { + flag.setEnabled(true); + return true; + } + //fall back + default: return false; } @@ -217,19 +217,12 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd) { // allow selection, copy but not cut, delete etc switch (cmd.action) { - case LFUN_MOUSE_PRESS: - case LFUN_MOUSE_RELEASE: - case LFUN_MOUSE_MOTION: - case LFUN_MOUSE_DOUBLE: - case LFUN_MOUSE_TRIPLE: - case LFUN_COPY: case LFUN_INSET_SETTINGS: InsetCollapsable::doDispatch(cur, cmd); break; case LFUN_INSET_MODIFY: setInfo(to_utf8(cmd.argument())); - cur.pos() = 0; break; default: