Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index a610600ff8efa088bc725972cc9189a865283d55..0c073e076dcc3c21724fd5eed15dbfdcd5df668c 100644 (file)
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -1,121 +1,79 @@
-// -*- 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 The LyX Team.
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include FORMS_H_LOCATION
+#include "FormUrl.h"
+#include "ControlCommand.h"
+#include "forms/form_url.h"
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include "xformsBC.h"
 
+#include "lyx_forms.h"
 
-#include "Dialogs.h"
-#include "FormUrl.h"
-#include "LyXView.h"
-#include "buffer.h"
-#include "form_url.h"
-#include "lyxfunc.h"
-
-FormUrl::FormUrl(LyXView * lv, Dialogs * d)
-       : FormCommand(lv, d, _("Url"), new OkCancelReadOnlyPolicy),
-         dialog_(0)
-{
-       // let the dialog be shown
-       // These are permanent connections so we won't bother
-       // storing a copy because we won't be disconnecting.
-       d->showUrl.connect(slot(this, &FormUrl::showInset));
-       d->createUrl.connect(slot(this, &FormUrl::createInset));
-}
+namespace lyx {
+namespace frontend {
 
+typedef  FormController<ControlCommand, FormView<FD_url> > base_class;
 
-FormUrl::~FormUrl()
-{
-       delete dialog_;
-}
+FormUrl::FormUrl(Dialog & parent)
+       : base_class(parent, _("URL"))
+{}
 
 
-FL_FORM * FormUrl::form() const
+void FormUrl::build()
 {
-       if (dialog_ ) return dialog_->form;
-       return 0;
-}
+       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);
 
-void FormUrl::connect()
-{
-       fl_set_form_maxsize(form(), 2 * minw_, minh_);
-       FormCommand::connect();
-}
-       
+       setPrehandler(dialog_->input_name);
+       setPrehandler(dialog_->input_url);
 
-void FormUrl::build()
-{
-       dialog_ = build_url();
-
-#ifdef WITH_WARNINGS
-#warning use the buttoncontroller
-#endif
-       // Workaround dumb xforms sizing bug
-       minw_ = form()->w;
-       minh_ = form()->h;
+       // 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);
+
+       bcview().addReadOnly(dialog_->input_name);
+       bcview().addReadOnly(dialog_->input_url);
+       bcview().addReadOnly(dialog_->check_html);
 }
 
 
 void FormUrl::update()
 {
-       fl_set_input(dialog_->url,  params.getContents().c_str());
-       fl_set_input(dialog_->name, params.getOptions().c_str());
+       fl_set_input(dialog_->input_url,
+                    controller().params().getContents().c_str());
+       fl_set_input(dialog_->input_name,
+                    controller().params().getOptions().c_str());
 
-       if (params.getCmdName() == "url")
-               fl_set_button(dialog_->radio_html, 0);
+       if (controller().params().getCmdName() == "url")
+               fl_set_button(dialog_->check_html, 0);
        else
-               fl_set_button(dialog_->radio_html, 1);
-
-       if (lv_->buffer()->isReadonly()) {
-               fl_deactivate_object(dialog_->url);
-               fl_deactivate_object(dialog_->name);
-               fl_deactivate_object(dialog_->radio_html);
-               fl_deactivate_object(dialog_->button_ok);
-               fl_set_object_lcol(dialog_->button_ok, FL_INACTIVE);
-       } else {
-               fl_activate_object(dialog_->url);
-               fl_activate_object(dialog_->name);
-               fl_activate_object(dialog_->radio_html);
-               fl_activate_object(dialog_->button_ok);
-               fl_set_object_lcol(dialog_->button_ok, FL_BLACK);
-       }
+               fl_set_button(dialog_->check_html, 1);
 }
 
 
 void FormUrl::apply()
 {
-       if (lv_->buffer()->isReadonly()) return;
+       controller().params().setContents(fl_get_input(dialog_->input_url));
+       controller().params().setOptions(fl_get_input(dialog_->input_name));
 
-       params.setContents(fl_get_input(dialog_->url));
-       params.setOptions(fl_get_input(dialog_->name));
-
-       if (fl_get_button(dialog_->radio_html))
-               params.setCmdName("htmlurl");
+       if (fl_get_button(dialog_->check_html))
+               controller().params().setCmdName("htmlurl");
        else
-               params.setCmdName("url");
-
-       if (inset_ != 0) {
-               // Only update if contents have changed
-               if (params != inset_->params()) {
-                       inset_->setParams(params);
-                       lv_->view()->updateInset(inset_, true);
-               }
-       } else {
-               lv_->getLyXFunc()->Dispatch(LFUN_INSERT_URL,
-                                           params.getAsString());
-       }
+               controller().params().setCmdName("url");
 }
+
+} // namespace frontend
+} // namespace lyx