Introduce LFUN_PRINT.

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

diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index bcea4376949f224a986dc411a58a80ed8f4aba46..9d52023ac98915d318de207cadb3eda311e673c2 100644 (file)
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -1,74 +1,74 @@
-/* \file FormUrl.C
- * This file is part of
- * ====================================================== 
+/**
+ * \file FormUrl.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-2001 The LyX Team.
- *
- * ======================================================
- * 
- * \author Angus Leeming, a.leeming@ic.ac.uk 
+ * Full author contact details are available in file CREDITS.
  */
 
+
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include "FormUrl.h"
+#include "ControlCommand.h"
+#include "forms/form_url.h"
 
 #include "xformsBC.h"
-#include "ControlUrl.h"
-#include "FormUrl.h"
-#include "form_url.h"
 
-typedef FormCB<ControlUrl, FormDB<FD_form_url> > base_class;
+#include "lyx_forms.h"
 
-FormUrl::FormUrl(ControlUrl & c)
-       : base_class(c, _("Url"))
+
+typedef  FormController<ControlCommand, FormView<FD_url> > base_class;
+
+FormUrl::FormUrl(Dialog & parent)
+       : base_class(parent, _("URL"))
 {}
 
 
 void FormUrl::build()
 {
-       dialog_.reset(build_url());
+       dialog_.reset(build_url(this));
+
+       fl_set_input_return(dialog_->input_name, FL_RETURN_CHANGED);
+       fl_set_input_return(dialog_->input_url,  FL_RETURN_CHANGED);
 
-       fl_set_input_return(dialog_->name, FL_RETURN_CHANGED);
-       fl_set_input_return(dialog_->url,  FL_RETURN_CHANGED);
+       setPrehandler(dialog_->input_name);
+       setPrehandler(dialog_->input_url);
 
-        // Manage the ok, apply, restore and cancel/close buttons
-       bc().setOK(dialog_->button_ok);
-       bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_cancel);
-       bc().setUndoAll(dialog_->button_restore);
-       bc().refresh();
+       // Manage the ok, apply, restore and cancel/close buttons
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
+       bcview().setRestore(dialog_->button_restore);
 
-       bc().addReadOnly(dialog_->name);
-       bc().addReadOnly(dialog_->url);
-       bc().addReadOnly(dialog_->radio_html);
+       bcview().addReadOnly(dialog_->input_name);
+       bcview().addReadOnly(dialog_->input_url);
+       bcview().addReadOnly(dialog_->check_html);
 }
 
 
 void FormUrl::update()
 {
-       fl_set_input(dialog_->url,
+       fl_set_input(dialog_->input_url,
                     controller().params().getContents().c_str());
-       fl_set_input(dialog_->name,
+       fl_set_input(dialog_->input_name,
                     controller().params().getOptions().c_str());
 
        if (controller().params().getCmdName() == "url")
-               fl_set_button(dialog_->radio_html, 0);
+               fl_set_button(dialog_->check_html, 0);
        else
-               fl_set_button(dialog_->radio_html, 1);
+               fl_set_button(dialog_->check_html, 1);
 }
 
 
 void FormUrl::apply()
 {
-       controller().params().setContents(fl_get_input(dialog_->url));
-       controller().params().setOptions(fl_get_input(dialog_->name));
+       controller().params().setContents(fl_get_input(dialog_->input_url));
+       controller().params().setOptions(fl_get_input(dialog_->input_name));
 
-       if (fl_get_button(dialog_->radio_html))
+       if (fl_get_button(dialog_->check_html))
                controller().params().setCmdName("htmlurl");
        else
                controller().params().setCmdName("url");