From 51d6846ecbf3164947f38aa85a31027ec7b3a263 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 27 Mar 2002 23:27:12 +0000 Subject: [PATCH] small fixes to menu backend git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3857 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 7 +++++++ src/MenuBackend.C | 8 ++++++++ src/lyxfunc.C | 5 +++++ 3 files changed, 20 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 93cff1cac0..31874f4331 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2002-03-27 Jean-Marc Lasgouttes + + * lyxfunc.C (getStatus): return 'disabled' early for LFUN_NOACTION + + * MenuBackend.C (expand): fix export/view/update when there is no + document open. + 2002-03-27 Herbert Voss * lengthcommon.C: change c%, l%, p% t% to col%, line%, page% diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 356b550d60..7c7cd00ffb 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -314,6 +314,14 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const case MenuItem::ViewFormats: case MenuItem::UpdateFormats: case MenuItem::ExportFormats: { + + if (!buf && cit->kind() != MenuItem::ImportFormats) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Documents Open!"), + LFUN_NOACTION)); + continue; + } + typedef vector Formats; Formats formats; diff --git a/src/lyxfunc.C b/src/lyxfunc.C index f3d292f67d..63afaf34d7 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -354,6 +354,11 @@ FuncStatus LyXFunc::getStatus(kb_action action, FuncStatus flag; Buffer * buf = owner->buffer(); + if (action == LFUN_NOACTION) { + setStatusMessage(N_("Nothing to do")); + return flag.disabled(true); + } + if (action == LFUN_UNKNOWN_ACTION) { setStatusMessage(N_("Unknown action")); return flag.unknown(true); -- 2.39.2