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

@@ -1,3 +1,7 @@
+2002-02-06  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* lyxfunc.C (getStatus): fix status message for disabled commands. 
+
 2002-02-01  John Levon  <moz@compsoc.man.ac.uk>
 
 	* BufferView_pimpl.C: fix crash on close buffer 

src/frontends/controllers/ChangeLog

@@ -1,3 +1,8 @@
+2002-02-06  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* ControlRef.C (getBufferName): new method to get a real buffer
+	name from an index.
+
 2002-02-05  Juergen Spitzmueller <j.spitzmueller@gmx.de>
 
 	* ControlTexInfo.[Ch]: Removed Help functions.

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];
+}

src/frontends/controllers/ControlRef.h

@@ -38,7 +38,8 @@ public:
 	std::vector<string> 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. */

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);
 		}
 

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)) {