X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormDocument.C;h=b144834f81f986e5e7b8d1a036d0d9f372b05045;hb=eba67bc3120dc301bf193c3f3b570f51f00a4654;hp=e05395849d63eebced5f516d16380eee53a9ab20;hpb=adaef99e60e28eba8c413a3472cc71e234718af0;p=lyx.git

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index e05395849d..b144834f81 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -73,6 +73,19 @@ FormDocument::~FormDocument()
 }
 
 
+void FormDocument::redraw()
+{
+	if( form() && form()->visible )
+		fl_redraw_form( form() );
+	else
+		return;
+
+	FL_FORM * outer_form = fl_get_active_folder(dialog_->tabbed_folder);
+	if (outer_form && outer_form->visible)
+		fl_redraw_form( outer_form );
+}
+
+
 FL_FORM * FormDocument::form() const
 {
     if (dialog_) return dialog_->form;
@@ -87,7 +100,7 @@ void FormDocument::build()
     // the tabbed folder
     dialog_ = build_tabbed_document();
 
-    // manage the restore, ok, apply and cancel/close buttons
+    // Manage the restore, ok, apply, restore and cancel/close buttons
     bc_.setOK(dialog_->button_ok);
     bc_.setApply(dialog_->button_apply);
     bc_.setCancel(dialog_->button_cancel);
@@ -108,15 +121,15 @@ void FormDocument::build()
 		      "| A4 small Margins (only portrait) "
 		      "| A4 very small Margins (only portrait) "
 		      "| A4 very wide margins (only portrait) "));
-    fl_set_input_return(paper_->input_custom_width, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_custom_height, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_top_margin, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_bottom_margin, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_left_margin, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_right_margin, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_head_height, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_head_sep, FL_RETURN_ALWAYS);
-    fl_set_input_return(paper_->input_foot_skip, FL_RETURN_ALWAYS);
+    fl_set_input_return(paper_->input_custom_width, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_custom_height, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_top_margin, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_bottom_margin, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_left_margin, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_right_margin, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_head_height, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_head_sep, FL_RETURN_CHANGED);
+    fl_set_input_return(paper_->input_foot_skip, FL_RETURN_CHANGED);
 
     bc_.addReadOnly (paper_->choice_paperpackage);
     bc_.addReadOnly (paper_->greoup_radio_orientation);
@@ -143,7 +156,8 @@ void FormDocument::build()
     obj = class_->choice_doc_class;
     fl_addto_form(class_->form);
     combo_doc_class = new Combox(FL_COMBOX_DROPLIST);
-    combo_doc_class->add(obj->x, obj->y, obj->w, obj->h, 400);
+    combo_doc_class->add(obj->x, obj->y, obj->w, obj->h, 400,
+	 		 dialog_->tabbed_folder);
     combo_doc_class->shortcut("#C",1);
     combo_doc_class->setcallback(ComboInputCB, this);
     fl_end_form();
@@ -170,8 +184,9 @@ void FormDocument::build()
 		    "default|empty|plain|headings|fancy");
     fl_addto_choice(class_->choice_doc_skip,
 		    _(" Smallskip | Medskip | Bigskip | Length "));
-    fl_set_input_return(class_->input_doc_skip, FL_RETURN_ALWAYS);
-    fl_set_input_return(class_->input_doc_spacing, FL_RETURN_ALWAYS);
+    fl_set_input_return(class_->input_doc_extra, FL_RETURN_CHANGED);
+    fl_set_input_return(class_->input_doc_skip, FL_RETURN_CHANGED);
+    fl_set_input_return(class_->input_doc_spacing, FL_RETURN_CHANGED);
 
     bc_.addReadOnly (class_->radio_doc_indent);
     bc_.addReadOnly (class_->radio_doc_skip);
@@ -201,7 +216,8 @@ void FormDocument::build()
     obj = language_->choice_language;
     fl_addto_form(language_->form);
     combo_language = new Combox(FL_COMBOX_DROPLIST);
-    combo_language->add(obj->x, obj->y, obj->w, obj->h, 400);
+    combo_language->add(obj->x, obj->y, obj->w, obj->h, 400,
+			dialog_->tabbed_folder);
     combo_language->shortcut("#L",1);
     combo_language->setcallback(ComboInputCB, this);
     fl_end_form();
@@ -223,6 +239,7 @@ void FormDocument::build()
 
     // the document options form
     options_ = build_doc_options();
+    fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
     fl_set_counter_bounds(options_->slider_secnumdepth,-2,5);
     fl_set_counter_bounds(options_->slider_tocdepth,-1,5);
     fl_set_counter_step(options_->slider_secnumdepth,1,1);
@@ -816,6 +833,7 @@ void FormDocument::checkReadOnly()
 
 void FormDocument::checkMarginValues()
 {
+#if 0
     int const allEmpty = (!strlen(fl_get_input(paper_->input_top_margin)) &&
 		!strlen(fl_get_input(paper_->input_bottom_margin)) &&
 		!strlen(fl_get_input(paper_->input_left_margin)) &&
@@ -827,8 +845,10 @@ void FormDocument::checkMarginValues()
 		!strlen(fl_get_input(paper_->input_custom_height)));
     if (!allEmpty)
 	fl_set_button(paper_->push_use_geometry, 1);
+#endif
 }
 
+
 bool FormDocument::CheckDocumentInput(FL_OBJECT * ob, long)
 {
     string str;