X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormUrl.C;h=f14e32633935b742d2cc2cd49c23a67636d7f046;hb=eba67bc3120dc301bf193c3f3b570f51f00a4654;hp=9b4c966b824a48d0d5c633af3aea5f6b7e9ad07a;hpb=db47e6bc7773b26f0f74c37a02df496c17eff444;p=lyx.git

diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index 9b4c966b82..f14e326339 100644
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -18,21 +18,16 @@
 #endif
 
 
-#include "gettext.h"
-#include "BufferView.h"
 #include "Dialogs.h"
 #include "FormUrl.h"
 #include "LyXView.h"
 #include "buffer.h"
 #include "form_url.h"
 #include "lyxfunc.h"
-#include "xform_macros.h"
-#include "insets/insetcommand.h"
-#include "insets/inseturl.h"
-#include "support/filetools.h"
 
 FormUrl::FormUrl(LyXView * lv, Dialogs * d)
-	: FormCommand(lv, d, _("Url"))
+	: FormCommand(lv, d, _("Url"), new NoRepeatedApplyReadOnlyPolicy),
+	  dialog_(0)
 {
 	// let the dialog be shown
 	// These are permanent connections so we won't bother
@@ -44,89 +39,82 @@ FormUrl::FormUrl(LyXView * lv, Dialogs * d)
 
 FormUrl::~FormUrl()
 {
-	free();
 	delete dialog_;
 }
 
 
-void FormUrl::build()
+FL_FORM * FormUrl::form() const
 {
-	dialog_ = build_url();
+	if (dialog_) return dialog_->form;
+	return 0;
 }
 
 
-FL_FORM * const FormUrl::form() const
+void FormUrl::connect()
 {
-	if( dialog_ && dialog_->form_url )
-		return dialog_->form_url;
-	else
-		return 0;
+	fl_set_form_maxsize(form(), 2 * minw_, minh_);
+	FormCommand::connect();
 }
+	
 
-
-void FormUrl::update()
+void FormUrl::build()
 {
-	static int ow = -1, oh;
+	dialog_ = build_url();
 
-	if (ow < 0) {
-		ow = dialog_->form_url->w;
-		oh = dialog_->form_url->h;
+	// Workaround dumb xforms sizing bug
+	minw_ = form()->w;
+	minh_ = form()->h;
 
-		fl_set_form_minsize(dialog_->form_url, ow, oh);
-		fl_set_form_maxsize(dialog_->form_url, 2*ow, oh);
-	}
+	fl_set_input_return(dialog_->name, FL_RETURN_CHANGED);
+	fl_set_input_return(dialog_->url,  FL_RETURN_CHANGED);
 
-	fl_freeze_form( dialog_->form_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();
 
+	bc_.addReadOnly(dialog_->name);
+	bc_.addReadOnly(dialog_->url);
+	bc_.addReadOnly(dialog_->radio_html);
+}
+
+
+void FormUrl::update()
+{
 	fl_set_input(dialog_->url,  params.getContents().c_str());
 	fl_set_input(dialog_->name, params.getOptions().c_str());
 
-	if ( params.getCmdName() == "url" )
+	if (params.getCmdName() == "url")
 		fl_set_button(dialog_->radio_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_->ok );
-		fl_set_object_lcol( dialog_->ok, FL_INACTIVE );
-	} else {
-		fl_activate_object( dialog_->url );
-		fl_activate_object( dialog_->name );
-		fl_activate_object( dialog_->radio_html );
-		fl_activate_object( dialog_->ok );
-		fl_set_object_lcol( dialog_->ok, FL_BLACK );
-	}
-
-	fl_unfreeze_form( dialog_->form_url );
+	bc_.readOnly(lv_->buffer()->isReadonly());
 }
 
 
 void FormUrl::apply()
 {
-	if( lv_->buffer()->isReadonly() ) return;
+	if (lv_->buffer()->isReadonly()) return;
 
-	params.setContents( fl_get_input(dialog_->url) );
-	params.setOptions( fl_get_input(dialog_->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");
 	else
 		params.setCmdName("url");
 
-	if( inset_ != 0 )
-	{
+	if (inset_ != 0) {
 		// Only update if contents have changed
-		if( params.getCmdName()  != inset_->getCmdName()  ||
-		    params.getContents() != inset_->getContents() ||
-		    params.getOptions()  != inset_->getOptions() ) {
-			inset_->setParams( params );
-			lv_->view()->updateInset( inset_, true );
+		if (params != inset_->params()) {
+			inset_->setParams(params);
+			lv_->view()->updateInset(inset_, true);
 		}
 	} else {
-		lv_->getLyXFunc()->Dispatch( LFUN_INSERT_URL,
-					     params.getAsString().c_str() );
+		lv_->getLyXFunc()->Dispatch(LFUN_INSERT_URL,
+					    params.getAsString());
 	}
 }