The reference dialog now disconnects from the inset on Apply. Its behaviour

[lyx.git] / src / frontends / controllers / ControlBibitem.C

diff --git a/src/frontends/controllers/ControlBibitem.C b/src/frontends/controllers/ControlBibitem.C
index 416983a992a13aaeeeba233860b2aab60c0439a8..2f57feb3872fb067583947fe0a3381f282ba44c2 100644 (file)
--- a/src/frontends/controllers/ControlBibitem.C
+++ b/src/frontends/controllers/ControlBibitem.C
@@ -1,14 +1,14 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
  *           LyX, The Document Processor
  *
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2001 The LyX Team.
  *
  * ======================================================
  *
  * \file ControlBibitem.C
+ * \author John Levon, moz@compsoc.man.ac.uk
  * \author Angus Leeming <a.leeming@ic.ac.uk>
  */
 
@@ -19,9 +19,12 @@
 #endif
 
 #include <config.h>
+#include "ViewBase.h"
+#include "ButtonControllerBase.h"
 #include "ControlBibitem.h"
 #include "Dialogs.h"
 #include "LyXView.h"
+#include "buffer.h"
 #include "BufferView.h"
 
 using SigC::slot;
@@ -32,24 +35,20 @@ ControlBibitem::ControlBibitem(LyXView & lv, Dialogs & d)
        d_.showBibitem.connect(slot(this, &ControlBibitem::showInset));
 }
 
-void ControlBibitem::apply()
+
+void ControlBibitem::applyParamsToInset()
 {
-       view().apply();
-
-       if (inset_ && params() != inset_->params()) {
-               // FIXME:
-               // confirm, is this only necessary for FormBibTeX ???
-               if (params().getContents() != inset_->params().getContents())
-                       lv_.view()->ChangeCitationsIfUnique(
-                               inset_->params().getContents(),
-                               params().getContents());
-
-               inset_->setParams(params());
-               lv_.view()->updateInset(inset_, true);
-
-               // We need to do a redraw because the maximum
-               // InsetBibKey width could have changed
-               lv_.view()->redraw();
-               lv_.view()->fitCursor(lv_.view()->getLyXText());
-       }
+       // FIXME:
+       // confirm, is this only necessary for FormBibTeX ???
+       if (params().getContents() != inset()->params().getContents())
+               lv_.view()->ChangeCitationsIfUnique(inset()->params().getContents(),
+                                                   params().getContents());
+
+       inset()->setParams(params());
+       lv_.view()->updateInset(inset(), true);
+
+       // We need to do a redraw because the maximum
+       // InsetBibKey width could have changed
+       lv_.view()->redraw();
+       lv_.view()->fitCursor();
 }