Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

[lyx.git] / src / frontends / xforms / FormBibitem.C

diff --git a/src/frontends/xforms/FormBibitem.C b/src/frontends/xforms/FormBibitem.C
index 887c28f7a6ed7044ed145148ea1a7c145a6084fc..0b85396a77120cb9b43a1cef3f9f83830a7579bf 100644 (file)
--- a/src/frontends/xforms/FormBibitem.C
+++ b/src/frontends/xforms/FormBibitem.C
@@ -3,124 +3,66 @@
  * Copyright 2001 the LyX Team
  * Read the file COPYING
  *
- * \author Angus Leeming
- * \author John Levon
+ * \author Angus Leeming, a.leeming@ic.ac.uk 
+ * \author John Levon, moz@compsoc.man.ac.uk
  */
 
-#include <config.h>
-
-#include FORMS_H_LOCATION
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-
-#include "Dialogs.h"
+#include <config.h>
+#include "xformsBC.h"
+#include "ControlBibitem.h"
 #include "FormBibitem.h"
-#include "LyXView.h"
-#include "buffer.h"
 #include "form_bibitem.h"
-#include "lyxfunc.h"
-#include "debug.h"
+#include "gettext.h"
+#include "support/lstrings.h" // compare
 
-using std::endl;
-
-FormBibitem::FormBibitem(LyXView * lv, Dialogs * d)
-       : FormCommand(lv, d, _("Bibliography Entry"), new OkCancelReadOnlyPolicy),
-         dialog_(0)
-{
-       d->showBibitem.connect(slot(this, &FormBibitem::showInset));
-}
+typedef FormCB<ControlBibitem, FormDB<FD_form_bibitem> > base_class;
 
+FormBibitem::FormBibitem(ControlBibitem & c)
+       : base_class(c, _("Bibliography Entry"))
+{}
 
-FormBibitem::~FormBibitem()
-{
-       delete dialog_;
-}
-
-
-FL_FORM * FormBibitem::form() const
-{
-       if (dialog_)
-               return dialog_->form;
-       return 0;
-}
-
-
-void FormBibitem::connect()
-{
-       fl_set_form_maxsize(form(), 2 * minw_, minh_);
-       FormCommand::connect();
-}
-       
 
 void FormBibitem::build()
 {
-       dialog_ = build_bibitem();
-
-       // Workaround dumb xforms sizing bug
-       minw_ = form()->w;
-       minh_ = form()->h;
+       dialog_.reset(build_bibitem());
 
-       fl_set_input_return(dialog_->key, FL_RETURN_CHANGED);
+       fl_set_input_return(dialog_->key,   FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->label, FL_RETURN_CHANGED);
 
         // Manage the ok, apply, restore and cancel/close buttons
-       bc_.setOK(dialog_->button_ok);
-       bc_.setCancel(dialog_->button_cancel);
-       bc_.refresh();
+       bc().setOK(dialog_->button_ok);
+       bc().setCancel(dialog_->button_cancel);
 
-       bc_.addReadOnly(dialog_->key);
-       bc_.addReadOnly(dialog_->label);
+       bc().addReadOnly(dialog_->key);
+       bc().addReadOnly(dialog_->label);
 }
 
 
-bool FormBibitem::input(FL_OBJECT *, long)
+ButtonPolicy::SMInput FormBibitem::input(FL_OBJECT *, long)
 {
        // minimal validation 
        if (!compare(fl_get_input(dialog_->key), ""))
-               return false;
+               return ButtonPolicy::SMI_NOOP;
 
-       return true;
+       return ButtonPolicy::SMI_VALID;
 }
 
 
 void FormBibitem::update()
 {
-       fl_set_input(dialog_->key, params.getContents().c_str());
-       fl_set_input(dialog_->label, params.getOptions().c_str());
-       // Surely, this should reset the buttons to their original state?
-       // It doesn't. Instead "Restore" becomes a "Close"
-       //bc_.refresh();
-       bc_.readOnly(lv_->buffer()->isReadonly());
+       fl_set_input(dialog_->key,
+                    controller().params().getContents().c_str());
+       fl_set_input(dialog_->label,
+                    controller().params().getOptions().c_str());
 }
 
 
 void FormBibitem::apply()
 {
-       if (lv_->buffer()->isReadonly())
-               return;
-
-       params.setContents(fl_get_input(dialog_->key));
-       params.setOptions(fl_get_input(dialog_->label));
-
-       if (inset_ != 0) {
-               // Only update if contents have changed
-               if (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());
-               }
-       } else
-               lyxerr[Debug::GUI] << "Editing non-existent bibitem !" << endl;
+       controller().params().setContents(fl_get_input(dialog_->key));
+       controller().params().setOptions(fl_get_input(dialog_->label));
 }