From 8e3456ec01aa78f22ac6f456a0290b267d365847 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 6 Feb 2002 15:12:40 +0000 Subject: [PATCH] fix weird error message when a command is disabled ; fix switching buffer in xref dialog git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3494 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 4 ++++ src/frontends/controllers/ChangeLog | 5 +++++ src/frontends/controllers/ControlRef.C | 5 +++++ src/frontends/controllers/ControlRef.h | 3 ++- src/frontends/xforms/FormRef.C | 2 +- src/lyxfunc.C | 3 +++ 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0d81928b38..acaf6f920c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-02-06 Jean-Marc Lasgouttes + + * lyxfunc.C (getStatus): fix status message for disabled commands. + 2002-02-01 John Levon * BufferView_pimpl.C: fix crash on close buffer diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 39c51336e3..2c9d1004ff 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2002-02-06 Jean-Marc Lasgouttes + + * ControlRef.C (getBufferName): new method to get a real buffer + name from an index. + 2002-02-05 Juergen Spitzmueller * ControlTexInfo.[Ch]: Removed Help functions. diff --git a/src/frontends/controllers/ControlRef.C b/src/frontends/controllers/ControlRef.C index 32a83d1986..c500dd4a4c 100644 --- a/src/frontends/controllers/ControlRef.C +++ b/src/frontends/controllers/ControlRef.C @@ -87,3 +87,8 @@ int ControlRef::getBufferNum() const return 0; return cit - buffers.begin(); } + +string const ControlRef::getBufferName(int num) const +{ + return bufferlist.getFileNames()[num]; +} diff --git a/src/frontends/controllers/ControlRef.h b/src/frontends/controllers/ControlRef.h index 7e8dc44d4b..5ccaf74633 100644 --- a/src/frontends/controllers/ControlRef.h +++ b/src/frontends/controllers/ControlRef.h @@ -38,7 +38,8 @@ public: std::vector const getBufferList() const; /// int getBufferNum() const; - + /// + string const getBufferName(int num) const; private: /** disconnect from the inset when the Apply button is pressed. Allows easy insertion of multiple references. */ diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C index 3dae847468..388db8cd98 100644 --- a/src/frontends/xforms/FormRef.C +++ b/src/frontends/xforms/FormRef.C @@ -220,7 +220,7 @@ ButtonPolicy::SMInput FormRef::input(FL_OBJECT * ob, long) if (ob == dialog_->button_update || ob == dialog_->choice_buffer) { string const name = - frontStrip(strip(fl_get_choice_text(dialog_->choice_buffer))); + controller().getBufferName(fl_get_choice(dialog_->choice_buffer) - 1); refs_ = controller().getLabelList(name); } diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 5ca26ab257..ebdb24c6eb 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -357,6 +357,9 @@ FuncStatus LyXFunc::getStatus(kb_action action, setStatusMessage(N_("Unknown action")); return flag.unknown(true); } + + // the default error message if we disable the command + setStatusMessage(N_("Command disabled")); // Check whether we need a buffer if (!lyxaction.funcHasFlag(action, LyXAction::NoBuffer)) { -- 2.39.2