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

diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index fc0ac2b40a..f14e326339 100644
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -26,7 +26,8 @@
 #include "lyxfunc.h"
 
 FormUrl::FormUrl(LyXView * lv, Dialogs * d)
-	: FormCommand(lv, d, _("Url")), dialog_(0)
+	: FormCommand(lv, d, _("Url"), new NoRepeatedApplyReadOnlyPolicy),
+	  dialog_(0)
 {
 	// let the dialog be shown
 	// These are permanent connections so we won't bother
@@ -44,14 +45,14 @@ FormUrl::~FormUrl()
 
 FL_FORM * FormUrl::form() const
 {
-	if ( dialog_ ) return dialog_->form;
+	if (dialog_) return dialog_->form;
 	return 0;
 }
 
 
 void FormUrl::connect()
 {
-	fl_set_form_maxsize( form(), 2*minw_, minh_ );
+	fl_set_form_maxsize(form(), 2 * minw_, minh_);
 	FormCommand::connect();
 }
 	
@@ -60,12 +61,23 @@ 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;
+
+	fl_set_input_return(dialog_->name, FL_RETURN_CHANGED);
+	fl_set_input_return(dialog_->url,  FL_RETURN_CHANGED);
+
+        // 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);
 }
 
 
@@ -74,24 +86,12 @@ 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_->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 );
-	}
+	bc_.readOnly(lv_->buffer()->isReadonly());
 }