remove defaults stuff, let Qt handle no toolbar

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

diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index 094d7188473c533ae39d09d2a107be76fdb23933..a99f7cc9488f499bbb588d2802e737650c1f6d8a 100644 (file)
--- a/src/frontends/xforms/FormError.C
+++ b/src/frontends/xforms/FormError.C
@@ -1,82 +1,42 @@
-// -*- C++ -*-
-/* This file is part of
- * ====================================================== 
+/**
+ * \file FormError.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Angus Leeming
  *
- *           Copyright 2000 The LyX Team.
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS
  */
 
-#include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
-#include "Dialogs.h"
+#include "xformsBC.h"
+#include "ControlError.h"
 #include "FormError.h"
-#include "form_error.h"
+#include "forms/form_error.h"
+#include "xforms_helpers.h" // formatted
+#include FORMS_H_LOCATION
 
-static int minh, minw;
+typedef FormController<ControlError, FormView<FD_error> > base_class;
 
-FormError::FormError(LyXView * lv, Dialogs * d)
-       : FormBase(lv, d, _("LaTeX Error")),
-         dialog_(0), ih_(0), message_("")
-{
-       // let the dialog be shown
-       // This is a permanent connection so we won't bother
-       // storing a copy because we won't be disconnecting.
-       d->showError.connect(slot(this, &FormError::showInset));
-}
-
-
-FormError::~FormError()
-{
-       delete dialog_;
-}
-
-
-void FormError::showInset( InsetError * const inset )
-{
-       if( dialogIsOpen || inset == 0 ) return;
-
-       ih_ = inset->hide.connect(slot(this, &FormError::hide));
-
-       message_ = inset->getContents();
-       show();
-}
-
-
-void FormError::update()
-{
-       fl_set_form_minsize(form(), minw, minh);
-       fl_set_object_label(dialog_->message, message_.c_str());
-}
+FormError::FormError(Dialog & parent)
+       : base_class(parent, _("LaTeX Error"))
+{}
 
 
 void FormError::build()
 {
-       dialog_ = build_error();
-
-       // XFORMS bug workaround
-       // Define the min/max dimensions. Actually applied in update()
-       minw = form()->w; minh = form()->h;
-}
+       dialog_.reset(build_error(this));
 
-
-void FormError::clearStore()
-{
-       ih_.disconnect();
-       message_.empty();
+       // Manage the cancel/close button
+       bcview().setCancel(dialog_->button_close);
 }
 
 
-FL_FORM * const FormError::form() const
+void FormError::update()
 {
-       if( dialog_ ) // no need to test for dialog_->form
-               return dialog_->form;
-       else
-               return 0;
+       string const txt = formatted(controller().params(),
+                                    dialog_->frame_message->w - 10);
+       fl_set_object_label(dialog_->frame_message, txt.c_str());
 }