fix bug 1950: Spellchecker runs twice

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10367 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/controllers/ChangeLog

@@ -1,3 +1,15 @@
+2005-07-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	bug 1950.
+	
+	* Dialog.h (exitEarly): virtual function, returns false as a
+	default. 
+
+	* ControlSpellchecker.h (exitEarly): return exitEarly_
+
+	* ControlSpellchecker.C (check): set exitEarly_ to true when
+	spell-checking is finished, false otherwise.
+
 2005-07-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* ControlBibtex.C: sort bst files (bug 1936)

src/frontends/controllers/ControlSpellchecker.C

@@ -54,7 +54,7 @@ namespace frontend {
 
 
 ControlSpellchecker::ControlSpellchecker(Dialog & parent)
-	: Dialog::Controller(parent),
+	: Dialog::Controller(parent), exitEarly_(false),
 	  oldval_(0), newvalue_(0), count_(0)
 {}
 
@@ -202,6 +202,7 @@ void ControlSpellchecker::check()
 		++start;
 
 	BufferParams & bufferparams = kernel().buffer().params();
+	exitEarly_ = false;
 
 	while (res == SpellBase::OK || res == SpellBase::IGNORED_WORD) {
 		word_ = nextWord(cur, start, bufferparams);
@@ -209,6 +210,7 @@ void ControlSpellchecker::check()
 		// end of document
 		if (getWord().empty()) {
 			showSummary();
+			exitEarly_ = true;
 			return;
 		}
 

src/frontends/controllers/ControlSpellchecker.h

@@ -40,6 +40,8 @@ public:
 	virtual void dispatchParams() {}
 	///
 	virtual bool isBufferDependent() const { return true; }
+	///
+	virtual bool exitEarly() const { return exitEarly_; }
 
 	/// replace word with replacement
 	void replace(std::string const &);
@@ -76,6 +78,10 @@ private:
 	/// show count of checked words at normal exit
 	void showSummary();
 
+private:
+	/// set to true when spellchecking is finished
+	bool exitEarly_;
+
 	/// current word being checked and lang code
 	WordLangTuple word_;
 

src/frontends/controllers/Dialog.h

@@ -186,6 +186,12 @@ public:
 	 *  return true.
 	 */
 	virtual bool disconnectOnApply() const { return false; }
+
+	/** \return true if Dialog::View::show() should not display the dialog
+	 *   after running update. Currently, only ControlSpellchecker 
+	 *   makes use of that.
+	*/
+	virtual bool exitEarly() const { return false; }
 	//@}
 
 protected:

src/frontends/gtk/ChangeLog

@@ -1,3 +1,8 @@
+2005-07-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* GViewBase.C (show): exit after update if Controller::exitEarly()
+	is true. (bug 1950)
+
 2005-07-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* GTexInfo.C: Load and display full-path and no-path

src/frontends/gtk/GViewBase.C

@@ -62,6 +62,9 @@ void GViewBase::show()
 		build();
 	}
 	update();
+	if (dialog().controller().exitEarly())
+		return;
+
 	window()->show();
 }
 

src/frontends/qt2/ChangeLog

@@ -1,3 +1,8 @@
+2005-07-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* QDialogView.C (show): exit after update if Controller::exitEarly()
+	is true. (bug 1950)
+
 2005-07-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* QBibTeX.C: Do not insert empty items to bst combo.

src/frontends/qt2/QDialogView.C

@@ -51,6 +51,8 @@ void QDialogView::show()
 	form()->setMinimumSize(form()->sizeHint());
 
 	update();  // make sure its up-to-date
+	if (dialog().controller().exitEarly())
+		return;
 
 	form()->setCaption(toqstr("LyX: " + getTitle()));
 

src/frontends/xforms/ChangeLog

@@ -1,3 +1,8 @@
+2005-07-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* FormDialogView.C (show): exit after update if Controller::exitEarly()
+	is true. (bug 1950)
+
 2005-07-27  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* FormTexInfo.C: Load and display full-path and no-path

src/frontends/xforms/FormDialogView.C

@@ -145,6 +145,8 @@ void FormDialogView::show()
 	fl_freeze_form(form());
 	update();
 	fl_unfreeze_form(form());
+	if (dialog().controller().exitEarly())
+		return;
 
 	if (form()->visible) {
 		fl_raise_form(form());