anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix handling of read-only in getStatus; fix handling of LFUN_FILE_INSERT_*

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8516 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-03-23 11:22:11 +00:00
parent aefbd97a16
commit 5a59ab2c37
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChangeLog
View File

@ -1,5 +1,8 @@
2004-03-22 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxfunc.C (getStatus): handle read-only buffers correctly;
handle LFUN_FILE_INSERT_*
* lyxrc.C (setDefaults, getDescription, output, read):
* lyxrc.h: remove ps_command

41
src/lyxfunc.C
View File

@ -287,25 +287,12 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
setStatusMessage(N_("Command disabled"));
// Check whether we need a buffer
if (!lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
// Yes we need a buffer, do we have one?
if (buf) {
// yes
// Can we use a readonly buffer?
if (buf->isReadonly() &&
!lyxaction.funcHasFlag(cmd.action,
LyXAction::ReadOnly)) {
// no
setStatusMessage(N_("Document is read-only"));
flag.enabled(false);
}
} else {
// no
setStatusMessage(N_("Command not allowed with"
"out any document open"));
flag.enabled(false);
return flag;
}
if (!lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer) && !buf) {
// no, exit directly
setStatusMessage(N_("Command not allowed with"
"out any document open"));
flag.enabled(false);
return flag;
}
// I would really like to avoid having this switch and rather try to
@ -503,15 +490,27 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
case LFUN_SET_COLOR:
case LFUN_MESSAGE:
case LFUN_EXTERNAL_EDIT:
case LFUN_FILE_INSERT:
case LFUN_FILE_INSERT_ASCII:
case LFUN_FILE_INSERT_ASCII_PARA:
// these are handled in our dispatch()
break;
default:
cur.getStatus(cmd, flag);
return flag;
}
flag.enabled(enable);
if (!enable)
flag.enabled(false);
// Can we use a readonly buffer?
if (buf && buf->isReadonly()
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
setStatusMessage(N_("Document is read-only"));
flag.enabled(false);
}
return flag;
}