]> git.lyx.org Git - features.git/commitdiff
Clean-up of paragraph dialog.
authorAngus Leeming <leeming@lyx.org>
Wed, 29 Aug 2001 12:52:41 +0000 (12:52 +0000)
committerAngus Leeming <leeming@lyx.org>
Wed, 29 Aug 2001 12:52:41 +0000 (12:52 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2615 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/xforms/ChangeLog
src/frontends/xforms/FormParagraph.C
src/frontends/xforms/FormParagraph.h
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/form_paragraph.h
src/frontends/xforms/forms/form_paragraph.fd

index 25069f11fa95832d0168c1219ff5115b4ea54383..29f83ff094251935431663406345f07ffa71f5e0 100644 (file)
@@ -1,3 +1,9 @@
+2001-08-29  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * FormParagraph.[Ch]:
+       * forms/form_paragraph.fd: clean up of dialog and of controlling
+       code.
+
 2001-08-29  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormBase.C (C_CutandPastePH): new function that can be used as a
index da150ee707b24ff4751e8625d4b27d7ebb866fc7..a573714a686e1d44b3914f85777ea2c782ae4f90 100644 (file)
@@ -89,12 +89,6 @@ void FormParagraph::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 );
 }
 
 
@@ -108,86 +102,57 @@ FL_FORM * FormParagraph::form() const
 void FormParagraph::build()
 {
     // the tabbed folder
-    dialog_.reset(build_tabbed_paragraph());
+    dialog_.reset(build_paragraph());
 
-    // 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_.setRestore(dialog_->button_restore);
-
-    // the general paragraph data form
-    general_.reset(build_paragraph_general());
-
-    fl_addto_choice(general_->choice_space_above,
+    fl_addto_choice(dialog_->choice_space_above,
                    _(" None | Defskip | Smallskip "
                      "| Medskip | Bigskip | VFill | Length "));
-    fl_addto_choice(general_->choice_space_below,
+    fl_addto_choice(dialog_->choice_space_below,
                    _(" None | Defskip | Smallskip "
                      "| Medskip | Bigskip | VFill | Length ")); 
 
-    fl_addto_choice(general_->choice_linespacing,
+    fl_addto_choice(dialog_->choice_linespacing,
                     _(" Default | Single | OneHalf | Double | Other "));
  
-    fl_set_input_return(general_->input_space_above, FL_RETURN_CHANGED);
-    fl_set_input_return(general_->input_space_below, FL_RETURN_CHANGED);
-    fl_set_input_return(general_->input_labelwidth, FL_RETURN_CHANGED);
-
-    bc_.addReadOnly (general_->group_radio_alignment);
-    // bc_.addReadOnly (general_->radio_align_right);
-    // bc_.addReadOnly (general_->radio_align_left);
-    // bc_.addReadOnly (general_->radio_align_block);
-    // bc_.addReadOnly (general_->radio_align_center);
-    bc_.addReadOnly (general_->check_lines_top);
-    bc_.addReadOnly (general_->check_lines_bottom);
-    bc_.addReadOnly (general_->check_pagebreaks_top);
-    bc_.addReadOnly (general_->check_pagebreaks_bottom);
-    bc_.addReadOnly (general_->choice_space_above);
-    bc_.addReadOnly (general_->input_space_above);
-    bc_.addReadOnly (general_->check_space_above);
-    bc_.addReadOnly (general_->choice_space_below);
-    bc_.addReadOnly (general_->input_space_below);
-    bc_.addReadOnly (general_->check_space_below);
-    bc_.addReadOnly (general_->choice_linespacing);
-    bc_.addReadOnly (general_->input_linespacing); 
-    bc_.addReadOnly (general_->check_noindent);
-    bc_.addReadOnly (general_->input_labelwidth);
-
-    fl_set_input_filter(general_->input_linespacing, fl_unsigned_float_filter);
-    // now make them fit together
-    fl_addto_tabfolder(dialog_->tabbed_folder,_("General"), general_->form);
-}
+    fl_set_input_return(dialog_->input_space_above, FL_RETURN_CHANGED);
+    fl_set_input_return(dialog_->input_space_below, FL_RETURN_CHANGED);
+    fl_set_input_return(dialog_->input_labelwidth, FL_RETURN_CHANGED);
 
+    fl_set_input_filter(dialog_->input_linespacing, fl_unsigned_float_filter);
 
-void FormParagraph::apply()
-{
-    if (!lv_->view()->available() || !dialog_.get())
-       return;
-
-    general_apply();
+    // 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_.setRestore(dialog_->button_restore);
 
-    lv_->view()->update(lv_->view()->text, 
-                       BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
-    lv_->buffer()->markDirty();
-    setMinibuffer(lv_, _("Paragraph layout set"));
+    bc_.addReadOnly (dialog_->group_radio_alignment);
+    // bc_.addReadOnly (dialog_->radio_align_right);
+    // bc_.addReadOnly (dialog_->radio_align_left);
+    // bc_.addReadOnly (dialog_->radio_align_block);
+    // bc_.addReadOnly (dialog_->radio_align_center);
+    bc_.addReadOnly (dialog_->check_lines_top);
+    bc_.addReadOnly (dialog_->check_lines_bottom);
+    bc_.addReadOnly (dialog_->check_pagebreaks_top);
+    bc_.addReadOnly (dialog_->check_pagebreaks_bottom);
+    bc_.addReadOnly (dialog_->choice_space_above);
+    bc_.addReadOnly (dialog_->input_space_above);
+    bc_.addReadOnly (dialog_->check_space_above);
+    bc_.addReadOnly (dialog_->choice_space_below);
+    bc_.addReadOnly (dialog_->input_space_below);
+    bc_.addReadOnly (dialog_->check_space_below);
+    bc_.addReadOnly (dialog_->choice_linespacing);
+    bc_.addReadOnly (dialog_->input_linespacing); 
+    bc_.addReadOnly (dialog_->check_noindent);
+    bc_.addReadOnly (dialog_->input_labelwidth);
 }
 
 
-void FormParagraph::update()
+void FormParagraph::apply()
 {
-    if (!dialog_.get())
-        return;
-
-    // Do this first; some objects may be de/activated subsequently.
-    bc_.readOnly(lv_->buffer()->isReadonly());
-
-    general_update();
-}
-
+    if (!lv_->view()->available() || !dialog_.get())
+       return;
 
-void FormParagraph::general_apply()
-{
     VSpace space_top, space_bottom;
     LyXAlignment align;
     string labelwidthstring;
@@ -195,23 +160,23 @@ void FormParagraph::general_apply()
 
     // If a vspace kind is "Length" but there's no text in
     // the input field, reset the kind to "None". 
-    if ((fl_get_choice (general_->choice_space_above) == 7) &&
-       !*(fl_get_input (general_->input_space_above)))
+    if ((fl_get_choice (dialog_->choice_space_above) == 7) &&
+       !*(fl_get_input (dialog_->input_space_above)))
     {
-       fl_set_choice (general_->choice_space_above, 1);
+       fl_set_choice (dialog_->choice_space_above, 1);
     }
-    if ((fl_get_choice (general_->choice_space_below) == 7) &&
-       !*(fl_get_input (general_->input_space_below)))
+    if ((fl_get_choice (dialog_->choice_space_below) == 7) &&
+       !*(fl_get_input (dialog_->input_space_below)))
     {
-       fl_set_choice (general_->choice_space_below, 1);
+       fl_set_choice (dialog_->choice_space_below, 1);
     }
    
-    bool line_top = fl_get_button(general_->check_lines_top);
-    bool line_bottom = fl_get_button(general_->check_lines_bottom);
-    bool pagebreak_top = fl_get_button(general_->check_pagebreaks_top);
-    bool pagebreak_bottom = fl_get_button(general_->check_pagebreaks_bottom);
+    bool line_top = fl_get_button(dialog_->check_lines_top);
+    bool line_bottom = fl_get_button(dialog_->check_lines_bottom);
+    bool pagebreak_top = fl_get_button(dialog_->check_pagebreaks_top);
+    bool pagebreak_bottom = fl_get_button(dialog_->check_pagebreaks_bottom);
     
-    switch (fl_get_choice (general_->choice_space_above)) {
+    switch (fl_get_choice (dialog_->choice_space_above)) {
     case 1:
        space_top = VSpace(VSpace::NONE);
        break;
@@ -232,12 +197,12 @@ void FormParagraph::general_apply()
        break;
     case 7:
        space_top =
-               VSpace(LyXGlueLength(fl_get_input(general_->input_space_above)));
+               VSpace(LyXGlueLength(fl_get_input(dialog_->input_space_above)));
        break;
     }
-    if (fl_get_button (general_->check_space_above))
+    if (fl_get_button (dialog_->check_space_above))
        space_top.setKeep (true);
-    switch (fl_get_choice (general_->choice_space_below)) {
+    switch (fl_get_choice (dialog_->choice_space_below)) {
     case 1:
        space_bottom = VSpace(VSpace::NONE);
        break;
@@ -258,33 +223,33 @@ void FormParagraph::general_apply()
        break;
     case 7:
        space_bottom =
-               VSpace(LyXGlueLength(fl_get_input(general_->input_space_below)));
+               VSpace(LyXGlueLength(fl_get_input(dialog_->input_space_below)));
        break;
     }
-    if (fl_get_button (general_->check_space_below))
+    if (fl_get_button (dialog_->check_space_below))
        space_bottom.setKeep (true);
 
-    if (fl_get_button(general_->radio_align_left))
+    if (fl_get_button(dialog_->radio_align_left))
        align = LYX_ALIGN_LEFT;
-    else if (fl_get_button(general_->radio_align_right))
+    else if (fl_get_button(dialog_->radio_align_right))
        align = LYX_ALIGN_RIGHT;
-    else if (fl_get_button(general_->radio_align_center))
+    else if (fl_get_button(dialog_->radio_align_center))
        align = LYX_ALIGN_CENTER;
     else 
        align = LYX_ALIGN_BLOCK;
    
-    labelwidthstring = fl_get_input(general_->input_labelwidth);
-    noindent = fl_get_button(general_->check_noindent);
+    labelwidthstring = fl_get_input(dialog_->input_labelwidth);
+    noindent = fl_get_button(dialog_->check_noindent);
     Spacing::Space linespacing;
     string other_linespacing;
-    switch (fl_get_choice(general_->choice_linespacing)) {
+    switch (fl_get_choice(dialog_->choice_linespacing)) {
         case 1: linespacing = Spacing::Default; break;
         case 2: linespacing = Spacing::Single; break;
         case 3: linespacing = Spacing::Onehalf; break;
         case 4: linespacing = Spacing::Double; break;
         case 5:
             linespacing = Spacing::Other;
-            other_linespacing = fl_get_input(general_->input_linespacing);
+            other_linespacing = fl_get_input(dialog_->input_linespacing);
             break;
     }
 
@@ -297,25 +262,35 @@ void FormParagraph::general_apply()
     text->setParagraph(lv_->view(), line_top, line_bottom, pagebreak_top,
                       pagebreak_bottom, space_top, space_bottom, spacing,
                        align, labelwidthstring, noindent);
+
+
+    // Actually apply these settings
+    lv_->view()->update(lv_->view()->text, 
+                       BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+    lv_->buffer()->markDirty();
+    setMinibuffer(lv_, _("Paragraph layout set"));
 }
 
 
-void FormParagraph::general_update()
+void FormParagraph::update()
 {
-    if (!general_.get())
+    if (!dialog_.get())
         return;
 
+    // Do this first; some objects may be de/activated subsequently.
+    bc_.readOnly(lv_->buffer()->isReadonly());
+
     Buffer * buf = lv_->view()->buffer();
 
     /// Record the paragraph
     par_ = getCurrentParagraph();
 
-    fl_set_input(general_->input_labelwidth,
+    fl_set_input(dialog_->input_labelwidth,
                 par_->getLabelWidthString().c_str());
-    fl_set_button(general_->radio_align_right, 0);
-    fl_set_button(general_->radio_align_left, 0);
-    fl_set_button(general_->radio_align_center, 0);
-    fl_set_button(general_->radio_align_block, 0);
+    fl_set_button(dialog_->radio_align_right, 0);
+    fl_set_button(dialog_->radio_align_left, 0);
+    fl_set_button(dialog_->radio_align_center, 0);
+    fl_set_button(dialog_->radio_align_block, 0);
 
     int align = par_->getAlign();
     if (align == LYX_ALIGN_LAYOUT)
@@ -324,16 +299,16 @@ void FormParagraph::general_update()
 
     switch (align) {
     case LYX_ALIGN_RIGHT:
-       fl_set_button(general_->radio_align_right, 1);
+       fl_set_button(dialog_->radio_align_right, 1);
        break;
     case LYX_ALIGN_LEFT:
-       fl_set_button(general_->radio_align_left, 1);
+       fl_set_button(dialog_->radio_align_left, 1);
        break;
     case LYX_ALIGN_CENTER:
-       fl_set_button(general_->radio_align_center, 1);
+       fl_set_button(dialog_->radio_align_center, 1);
        break;
     default:
-       fl_set_button(general_->radio_align_block, 1);
+       fl_set_button(dialog_->radio_align_block, 1);
        break;
     }
 
@@ -341,20 +316,20 @@ void FormParagraph::general_update()
            textclasslist.Style(buf->params.textclass,
                                par_->getLayout()).alignpossible;
 
-    setEnabled(general_->radio_align_block,  bool(alignpos & LYX_ALIGN_BLOCK));
-    setEnabled(general_->radio_align_center, bool(alignpos & LYX_ALIGN_CENTER));
-    setEnabled(general_->radio_align_left,   bool(alignpos & LYX_ALIGN_LEFT));
-    setEnabled(general_->radio_align_right,  bool(alignpos & LYX_ALIGN_RIGHT));
+    setEnabled(dialog_->radio_align_block,  bool(alignpos & LYX_ALIGN_BLOCK));
+    setEnabled(dialog_->radio_align_center, bool(alignpos & LYX_ALIGN_CENTER));
+    setEnabled(dialog_->radio_align_left,   bool(alignpos & LYX_ALIGN_LEFT));
+    setEnabled(dialog_->radio_align_right,  bool(alignpos & LYX_ALIGN_RIGHT));
     
-    fl_set_button(general_->check_lines_top,
+    fl_set_button(dialog_->check_lines_top,
                  par_->params().lineTop());
-    fl_set_button(general_->check_lines_bottom,
+    fl_set_button(dialog_->check_lines_bottom,
                  par_->params().lineBottom());
-    fl_set_button(general_->check_pagebreaks_top,
+    fl_set_button(dialog_->check_pagebreaks_top,
                  par_->params().pagebreakTop());
-    fl_set_button(general_->check_pagebreaks_bottom,
+    fl_set_button(dialog_->check_pagebreaks_bottom,
                  par_->params().pagebreakBottom());
-    fl_set_button(general_->check_noindent,
+    fl_set_button(dialog_->check_noindent,
                  par_->params().noindent());
 
     int linespacing;
@@ -377,7 +352,7 @@ void FormParagraph::general_update()
         case Spacing::Double: linespacing = 4; break;
         case Spacing::Other: linespacing = 5; break;
     }
-    fl_set_choice(general_->choice_linespacing, linespacing);
+    fl_set_choice(dialog_->choice_linespacing, linespacing);
     if (space.getSpace() == Spacing::Other) {
         string sp;
         
@@ -385,73 +360,73 @@ void FormParagraph::general_update()
             sp = tostr(lv_->buffer()->params.spacing.getValue());
         else 
             sp = tostr(space.getValue());
-        fl_set_input(general_->input_linespacing, sp.c_str());
-        setEnabled(general_->input_linespacing, true);
+        fl_set_input(dialog_->input_linespacing, sp.c_str());
+        setEnabled(dialog_->input_linespacing, true);
     } else {
-        fl_set_input(general_->input_linespacing, "");
-        setEnabled(general_->input_linespacing, false);
+        fl_set_input(dialog_->input_linespacing, "");
+        setEnabled(dialog_->input_linespacing, false);
     }
 
-    fl_set_input (general_->input_space_above, "");
+    fl_set_input (dialog_->input_space_above, "");
 
     switch (par_->params().spaceTop().kind()) {
     case VSpace::NONE:
-       fl_set_choice (general_->choice_space_above, 1);
+       fl_set_choice (dialog_->choice_space_above, 1);
        break;
     case VSpace::DEFSKIP:
-       fl_set_choice (general_->choice_space_above, 2);
+       fl_set_choice (dialog_->choice_space_above, 2);
        break;
     case VSpace::SMALLSKIP:
-       fl_set_choice (general_->choice_space_above, 3);
+       fl_set_choice (dialog_->choice_space_above, 3);
        break;
     case VSpace::MEDSKIP:
-       fl_set_choice (general_->choice_space_above, 4);
+       fl_set_choice (dialog_->choice_space_above, 4);
        break;
     case VSpace::BIGSKIP:
-       fl_set_choice (general_->choice_space_above, 5);
+       fl_set_choice (dialog_->choice_space_above, 5);
        break;
     case VSpace::VFILL:
-       fl_set_choice (general_->choice_space_above, 6);
+       fl_set_choice (dialog_->choice_space_above, 6);
        break;
     case VSpace::LENGTH:
-       fl_set_choice (general_->choice_space_above, 7);
-       fl_set_input(general_->input_space_above, par_->
+       fl_set_choice (dialog_->choice_space_above, 7);
+       fl_set_input(dialog_->input_space_above, par_->
                     params().spaceTop().length().asString().c_str());
        break;
     }
     
-    fl_set_button (general_->check_space_above,
+    fl_set_button (dialog_->check_space_above,
                   par_->params().spaceTop().keep());
-    fl_set_input (general_->input_space_below, "");
+    fl_set_input (dialog_->input_space_below, "");
 
     switch (par_->params().spaceBottom().kind()) {
     case VSpace::NONE:
-       fl_set_choice (general_->choice_space_below, 1);
+       fl_set_choice (dialog_->choice_space_below, 1);
        break;
     case VSpace::DEFSKIP:
-       fl_set_choice (general_->choice_space_below, 2);
+       fl_set_choice (dialog_->choice_space_below, 2);
        break;
     case VSpace::SMALLSKIP:
-       fl_set_choice (general_->choice_space_below, 3);
+       fl_set_choice (dialog_->choice_space_below, 3);
        break;
     case VSpace::MEDSKIP:
-       fl_set_choice (general_->choice_space_below, 4);
+       fl_set_choice (dialog_->choice_space_below, 4);
        break;
     case VSpace::BIGSKIP:
-       fl_set_choice (general_->choice_space_below, 5);
+       fl_set_choice (dialog_->choice_space_below, 5);
        break;
     case VSpace::VFILL:
-       fl_set_choice (general_->choice_space_below, 6);
+       fl_set_choice (dialog_->choice_space_below, 6);
        break;
     case VSpace::LENGTH:
-       fl_set_choice (general_->choice_space_below, 7);
-        fl_set_input(general_->input_space_below, par_->
+       fl_set_choice (dialog_->choice_space_below, 7);
+        fl_set_input(dialog_->input_space_below, par_->
                     params().spaceBottom().length().asString().c_str());
        break;
     }
-    fl_set_button(general_->check_space_below,
+    fl_set_button(dialog_->check_space_below,
                   par_->params().spaceBottom().keep());
-    fl_set_button(general_->check_noindent,
+    fl_set_button(dialog_->check_noindent,
                  par_->params().noindent());
 }
 
@@ -470,34 +445,34 @@ bool FormParagraph::input(FL_OBJECT * ob, long)
     // "Synchronize" the choices and input fields, making it
     // impossible to commit senseless data.
 
-    if (fl_get_choice (general_->choice_space_above) != 7)
-        fl_set_input (general_->input_space_above, "");
+    if (fl_get_choice (dialog_->choice_space_above) != 7)
+        fl_set_input (dialog_->input_space_above, "");
 
-    if (fl_get_choice (general_->choice_space_below) != 7)
-        fl_set_input (general_->input_space_below, "");
+    if (fl_get_choice (dialog_->choice_space_below) != 7)
+        fl_set_input (dialog_->input_space_below, "");
 
-    if (fl_get_choice (general_->choice_linespacing) == 4)
-        setEnabled (general_->input_linespacing, true);
+    if (fl_get_choice (dialog_->choice_linespacing) == 4)
+        setEnabled (dialog_->input_linespacing, true);
     else {
-        setEnabled (general_->input_linespacing, false);
-        fl_set_input (general_->input_linespacing, "");
+        setEnabled (dialog_->input_linespacing, false);
+        fl_set_input (dialog_->input_linespacing, "");
     }
  
     //
     // first the general form
     //
-    string input = fl_get_input (general_->input_space_above);
+    string input = fl_get_input (dialog_->input_space_above);
     bool invalid = false;
        
-    if (fl_get_choice(general_->choice_space_above)==7)
+    if (fl_get_choice(dialog_->choice_space_above)==7)
         invalid = !input.empty() && !isValidGlueLength(input);
 
-    input = fl_get_input (general_->input_space_below);
+    input = fl_get_input (dialog_->input_space_below);
 
-    if (fl_get_choice(general_->choice_space_below)==7)
+    if (fl_get_choice(dialog_->choice_space_below)==7)
         invalid = invalid || (!input.empty() && !isValidGlueLength(input));
     
-    if (ob == general_->input_space_above || ob == general_->input_space_below) {
+    if (ob == dialog_->input_space_above || ob == dialog_->input_space_below) {
         if (invalid) {
             fl_set_object_label(dialog_->text_warning,
                 _("Warning: Invalid Length (valid example: 10mm)"));
index 3fd36d7d30ace8f4615ff4af9f431507850a0b00..224b4b4a9ea871f94e5de561e998b0d307152e64 100644 (file)
@@ -22,9 +22,7 @@
 #include "FormBaseDeprecated.h"
 
 class Paragraph;
-struct FD_form_tabbed_paragraph;
-struct FD_form_paragraph_general;
-struct FD_form_paragraph_extra;
+struct FD_form_paragraph;
 
 /** This class provides an XForms implementation of the FormParagraph dialog.
  *           @author Jürgen Vigna
@@ -58,23 +56,15 @@ private:
        ///
        virtual FL_FORM * form() const;
        
-       ///
-       void general_update();
-       ///
-       void general_apply();
+       /// Fdesign generated method
+       FD_form_paragraph * build_paragraph();
 
-       /// Fdesign generated methods
-       FD_form_tabbed_paragraph * build_tabbed_paragraph();
-       ///
-       FD_form_paragraph_general * build_paragraph_general();
-       ///
-       FD_form_paragraph_extra * build_paragraph_extra();
        /// Real GUI implementation.
-       boost::scoped_ptr<FD_form_tabbed_paragraph> dialog_;
-       ///
-       boost::scoped_ptr<FD_form_paragraph_general> general_;
+       boost::scoped_ptr<FD_form_paragraph> dialog_;
+
        /// The ButtonController
        ButtonController<NoRepeatedApplyReadOnlyPolicy, xformsBC> bc_;
+
        /// Changed Paragraph connection.
        SigC::Connection cp_;
 
index 60ffaa23eea27959e36805d29ec668c2e6eccd7d..f7f914f8f40b73d2ca903795df26bf25ce0419d4 100644 (file)
 #include "form_paragraph.h"
 #include "FormParagraph.h"
 
-FD_form_paragraph_general::~FD_form_paragraph_general()
+FD_form_paragraph::~FD_form_paragraph()
 {
   if ( form->visible ) fl_hide_form( form );
   fl_free_form( form );
 }
 
 
-FD_form_paragraph_general * FormParagraph::build_paragraph_general()
+FD_form_paragraph * FormParagraph::build_paragraph()
 {
   FL_OBJECT *obj;
-  FD_form_paragraph_general *fdui = new FD_form_paragraph_general;
+  FD_form_paragraph *fdui = new FD_form_paragraph;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 490, 335);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 500, 395);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 490, 335, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 360, 260, 120, 40, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 110, 470, 120, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+  obj = fl_add_box(FL_UP_BOX, 0, 0, 500, 395, "");
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 20, 220, 75, _("Alignment"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 360, 20, 120, 70, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 210, 20, 140, 70, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 190, 70, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  {
-    char const * const dummy = N_("Label Width:|#d");
-    fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 100, 265, 250, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_gravity(obj, FL_West, FL_East);
-    fl_set_object_resize(obj, FL_RESIZE_X);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 370, 250, 60, 20, _("Indent"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  {
-    char const * const dummy = N_("Above|#b");
-    fdui->check_lines_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 30, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Below|#E");
-    fdui->check_lines_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 60, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Above|#o");
-    fdui->check_pagebreaks_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 30, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Below|#l");
-    fdui->check_pagebreaks_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 60, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("No Indent|#I");
-    fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 360, 265, 120, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
 
   fdui->group_radio_alignment = fl_bgn_group();
   {
     char const * const dummy = N_("Right|#R");
-    fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 30, 80, 30, idex(_(dummy)));
+    fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 15, 30, 80, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Left|#f");
-    fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 60, 80, 30, idex(_(dummy)));
+    fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 15, 60, 80, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Block|#c");
-    fdui->radio_align_block = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 30, 80, 30, idex(_(dummy)));
+    fdui->radio_align_block = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 115, 30, 80, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
     char const * const dummy = N_("Center|#n");
-    fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 100, 60, 80, 30, idex(_(dummy)));
+    fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 115, 60, 80, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   fl_end_group();
 
-  fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 180, 135, 90, 30, "");
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 240, 20, 120, 75, _("Lines"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 180, 185, 90, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
-    char const * const dummy = N_("Above:|#v");
-    fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 135, 100, 30, idex(_(dummy)));
+    char const * const dummy = N_("Above|#b");
+    fdui->check_lines_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 245, 30, 120, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
-    char const * const dummy = N_("Below:|#w");
-    fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 185, 100, 30, idex(_(dummy)));
+    char const * const dummy = N_("Below|#E");
+    fdui->check_lines_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 245, 60, 120, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 370, 10, 100, 20, _("Pagebreaks"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 20, 120, 75, _("Page breaks"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 230, 10, 50, 20, _("Lines"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 20, 10, 80, 20, _("Alignment"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 20, 100, 130, 20, _("Vertical Spaces"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
-    char const * const dummy = N_("Keep|#K");
-    fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 135, 40, 30, idex(_(dummy)));
+    char const * const dummy = N_("Above|#o");
+    fdui->check_pagebreaks_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 30, 120, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
-    char const * const dummy = N_("Keep|#p");
-    fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 185, 40, 30, idex(_(dummy)));
+    char const * const dummy = N_("Below|#l");
+    fdui->check_pagebreaks_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 60, 120, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->choice_linespacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 355, 150, 115, 30, "");
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 350, 125, 100, 20, _("Line Spacing"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  fdui->input_linespacing = obj = fl_add_input(FL_NORMAL_INPUT, 355, 190, 115, 30, "");
-    fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_paragraph_extra::~FD_form_paragraph_extra()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_paragraph_extra * FormParagraph::build_paragraph_extra()
-{
-  FL_OBJECT *obj;
-  FD_form_paragraph_extra *fdui = new FD_form_paragraph_extra;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 490, 250);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 490, 250, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 170, 100, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 350, 20, 100, 100, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 190, 20, 150, 100, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_text(FL_NORMAL_TEXT, 20, 10, 120, 20, _("Extra Options"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 110, 350, 120, _("Vertical spaces"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
-    char const * const dummy = N_("Length|#L");
-    fdui->input_pextra_width = obj = fl_add_input(FL_NORMAL_INPUT, 240, 30, 90, 30, idex(_(dummy)));
+    char const * const dummy = N_("Above:|#v");
+    fdui->choice_space_above = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 135, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    // xgettext:no-c-format
-    char const * const dummy = N_("or %|#o");
-    fdui->input_pextra_widthp = obj = fl_add_input(FL_INT_INPUT, 240, 70, 90, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
+  fdui->input_space_above = obj = fl_add_input(FL_NORMAL_INPUT, 180, 135, 90, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 200, 10, 60, 20, _("Width"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 350, 10, 90, 20, _("Alignment"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-
-  fdui->group_alignment = fl_bgn_group();
   {
-    char const * const dummy = N_("Top|#T");
-    fdui->radio_pextra_top = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 30, 80, 30, idex(_(dummy)));
+    char const * const dummy = N_("Keep|#K");
+    fdui->check_space_above = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 135, 40, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
-    char const * const dummy = N_("Middle|#d");
-    fdui->radio_pextra_middle = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 60, 80, 30, idex(_(dummy)));
+    char const * const dummy = N_("Below:|#w");
+    fdui->choice_space_below = obj = fl_add_choice(FL_NORMAL_CHOICE, 70, 185, 100, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Bottom|#B");
-    fdui->radio_pextra_bottom = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 360, 90, 80, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
+  fdui->input_space_below = obj = fl_add_input(FL_NORMAL_INPUT, 180, 185, 90, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_group();
-
   {
-    char const * const dummy = N_("HFill between Minipage paragraphs|#H");
-    fdui->radio_pextra_hfill = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 130, 300, 30, idex(_(dummy)));
+    char const * const dummy = N_("Keep|#p");
+    fdui->check_space_below = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 270, 185, 40, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  {
-    char const * const dummy = N_("Start new Minipage|#S");
-    fdui->radio_pextra_startmp = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 160, 260, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 110, 120, 120, _("Line spacing"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  fdui->choice_linespacing = obj = fl_add_choice(FL_NORMAL_CHOICE, 380, 135, 100, 30, "");
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-
-  fdui->group_extraopt = fl_bgn_group();
-  {
-    char const * const dummy = N_("Indented Paragraph|#I");
-    fdui->radio_pextra_indent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 30, 160, 30, idex(_(dummy)));
-    fl_set_button_shortcut(obj, scex(_(dummy)), 1);
-  }
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+  fdui->input_linespacing = obj = fl_add_input(FL_NORMAL_INPUT, 380, 185, 100, 30, "");
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
-    char const * const dummy = N_("Minipage|#M");
-    fdui->radio_pextra_minipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 60, 160, 30, idex(_(dummy)));
+    char const * const dummy = N_("Label Width:|#d");
+    fdui->input_labelwidth = obj = fl_add_input(FL_NORMAL_INPUT, 125, 250, 235, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_gravity(obj, FL_West, FL_East);
+    fl_set_object_resize(obj, FL_RESIZE_X);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 370, 245, 120, 45, _("Indent"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   {
-    char const * const dummy = N_("Floatflt|#F");
-    fdui->radio_pextra_floatflt = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 90, 160, 30, idex(_(dummy)));
+    char const * const dummy = N_("No Indent|#I");
+    fdui->check_noindent = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 375, 250, 115, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fl_end_group();
-
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_tabbed_paragraph::~FD_form_tabbed_paragraph()
-{
-  if ( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_tabbed_paragraph * FormParagraph::build_tabbed_paragraph()
-{
-  FL_OBJECT *obj;
-  FD_form_tabbed_paragraph *fdui = new FD_form_tabbed_paragraph;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 510, 350);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 510, 350, "");
-  fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 10, 490, 270, _("Tabbed folder"));
-    fl_set_object_resize(obj, FL_RESIZE_ALL);
   {
-    char const * const dummy = N_("Cancel|^[");
-    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 310, 100, 30, idex(_(dummy)));
+    char const * const dummy = N_("Restore|#R");
+    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 305, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
+    fl_set_object_callback(obj, C_FormBaseDeprecatedRestoreCB, 0);
+  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 200, 305, 90, 30, _("OK"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0);
   {
     char const * const dummy = N_("Apply|#A");
-    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 310, 100, 30, idex(_(dummy)));
+    fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 300, 305, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedApplyCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 180, 310, 100, 30, _("OK"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedOKCB, 0);
   {
-    char const * const dummy = N_("Restore|#R");
-    fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 310, 100, 30, idex(_(dummy)));
+    char const * const dummy = N_("Cancel|^[");
+    fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 305, 90, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseDeprecatedRestoreCB, 0);
-  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 280, 490, 30, "");
+    fl_set_object_callback(obj, C_FormBaseDeprecatedCancelCB, 0);
+  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 340, 480, 1, "");
+  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 10, 350, 480, 35, "");
+    fl_set_object_boxtype(obj, FL_NO_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
index 664649df39863135664c6b958170ddebaeeffb06..5e5dd57b00053e3f730767ffe8e6a5f44efe6134 100644 (file)
@@ -1,72 +1,46 @@
 // File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
 /** Header file generated with fdesign **/
 
-#ifndef FD_form_paragraph_general_h_
-#define FD_form_paragraph_general_h_
+#ifndef FD_form_paragraph_h_
+#define FD_form_paragraph_h_
 
 /** Callbacks, globals and object handlers **/
 extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/
-struct FD_form_paragraph_general {
-       ~FD_form_paragraph_general();
+struct FD_form_paragraph {
+       ~FD_form_paragraph();
 
        FL_FORM *form;
-       FL_OBJECT *input_labelwidth;
-       FL_OBJECT *check_lines_top;
-       FL_OBJECT *check_lines_bottom;
-       FL_OBJECT *check_pagebreaks_top;
-       FL_OBJECT *check_pagebreaks_bottom;
-       FL_OBJECT *check_noindent;
        FL_OBJECT *group_radio_alignment;
        FL_OBJECT *radio_align_right;
        FL_OBJECT *radio_align_left;
        FL_OBJECT *radio_align_block;
        FL_OBJECT *radio_align_center;
-       FL_OBJECT *input_space_above;
-       FL_OBJECT *input_space_below;
+       FL_OBJECT *check_lines_top;
+       FL_OBJECT *check_lines_bottom;
+       FL_OBJECT *check_pagebreaks_top;
+       FL_OBJECT *check_pagebreaks_bottom;
        FL_OBJECT *choice_space_above;
-       FL_OBJECT *choice_space_below;
+       FL_OBJECT *input_space_above;
        FL_OBJECT *check_space_above;
+       FL_OBJECT *choice_space_below;
+       FL_OBJECT *input_space_below;
        FL_OBJECT *check_space_below;
        FL_OBJECT *choice_linespacing;
        FL_OBJECT *input_linespacing;
-};
-struct FD_form_paragraph_extra {
-       ~FD_form_paragraph_extra();
-
-       FL_FORM *form;
-       FL_OBJECT *input_pextra_width;
-       FL_OBJECT *input_pextra_widthp;
-       FL_OBJECT *group_alignment;
-       FL_OBJECT *radio_pextra_top;
-       FL_OBJECT *radio_pextra_middle;
-       FL_OBJECT *radio_pextra_bottom;
-       FL_OBJECT *radio_pextra_hfill;
-       FL_OBJECT *radio_pextra_startmp;
-       FL_OBJECT *group_extraopt;
-       FL_OBJECT *radio_pextra_indent;
-       FL_OBJECT *radio_pextra_minipage;
-       FL_OBJECT *radio_pextra_floatflt;
-};
-struct FD_form_tabbed_paragraph {
-       ~FD_form_tabbed_paragraph();
-
-       FL_FORM *form;
-       FL_OBJECT *tabbed_folder;
-       FL_OBJECT *button_cancel;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_ok;
+       FL_OBJECT *input_labelwidth;
+       FL_OBJECT *check_noindent;
        FL_OBJECT *button_restore;
+       FL_OBJECT *button_ok;
+       FL_OBJECT *button_apply;
+       FL_OBJECT *button_cancel;
        FL_OBJECT *text_warning;
 };
 
-#endif /* FD_form_paragraph_general_h_ */
+#endif /* FD_form_paragraph_h_ */
index e56d7693b59ce51a651f08a85953f9c1ee71a617..bd4cf6eadf50cd8cf63de4c780f90b0f84d3cd3d 100644 (file)
@@ -3,21 +3,21 @@ Magic: 13000
 Internal Form Definition File
     (do not change)
 
-Number of forms: 3
+Number of forms: 1
 Unit of measure: FL_COORD_PIXEL
 SnapGrid: 5
 
 =============== FORM ===============
-Name: form_paragraph_general
-Width: 490
-Height: 335
-Number of Objects: 32
+Name: form_paragraph
+Width: 500
+Height: 395
+Number of Objects: 33
 
 --------------------
 class: FL_BOX
-type: FLAT_BOX
-box: 0 0 490 335
-boxtype: FL_FLAT_BOX
+type: UP_BOX
+box: 0 0 500 395
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
@@ -32,16 +32,16 @@ callback:
 argument: 
 
 --------------------
-class: FL_FRAME
+class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 360 260 120 40
+box: 10 20 220 75
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Alignment
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -50,106 +50,124 @@ callback:
 argument: 
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 110 470 120
+class: FL_BEGIN_GROUP
+type: 0
+box: 0 10 10 0
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
+name: group_radio_alignment
 callback: 
 argument: 
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 360 20 120 70
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 15 30 80 30
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Right|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_align_right
+callback: C_FormBaseDeprecatedInputCB
+argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 210 20 140 70
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 15 60 80 30
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Left|#f
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_align_left
+callback: C_FormBaseDeprecatedInputCB
+argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 20 190 70
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 115 30 80 30
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Block|#c
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_align_block
+callback: C_FormBaseDeprecatedInputCB
+argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 100 265 250 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 115 60 80 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Label Width:|#d
+label: Center|#n
 shortcut: 
-resize: FL_RESIZE_X
-gravity: FL_West FL_East
-name: input_labelwidth
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: radio_align_center
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 370 250 60 20
-boxtype: FL_FLAT_BOX
+class: FL_END_GROUP
+type: 0
+box: 0 0 0 0
+boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+alignment: FL_ALIGN_CENTER
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 240 20 120 75
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
 style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Indent
+label: Lines
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -160,7 +178,7 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 230 30 120 30
+box: 245 30 120 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -178,7 +196,7 @@ argument: 0
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 230 60 120 30
+box: 245 60 120 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -193,10 +211,28 @@ name: check_lines_bottom
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 370 20 120 75
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Page breaks
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 360 30 120 30
+box: 375 30 120 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -214,7 +250,7 @@ argument: 0
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 360 60 120 30
+box: 375 60 120 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -230,124 +266,142 @@ callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 360 265 120 30
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 10 110 350 120
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Vertical spaces
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 70 135 100 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: No Indent|#I
+label: Above:|#v
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_noindent
+name: choice_space_above
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_BEGIN_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 180 135 90 30
+boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_alignment
-callback: 
-argument: 
+name: input_space_above
+callback: C_FormBaseDeprecatedInputCB
+argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 30 80 30
+type: PUSH_BUTTON
+box: 270 135 40 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Right|#R
+label: Keep|#K
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_right
+name: check_space_above
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 60 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 70 185 100 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Left|#f
+label: Below:|#w
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_left
+name: choice_space_below
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 100 30 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 180 185 90 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Block|#c
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_block
+name: input_space_below
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 100 60 80 30
+type: PUSH_BUTTON
+box: 270 185 40 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Center|#n
+label: Keep|#p
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_center
+name: check_space_below
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_END_GROUP
-type: 0
-box: 0 0 0 0
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 370 110 120 120
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Line spacing
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -356,490 +410,70 @@ callback:
 argument: 
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 180 135 90 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 380 135 100 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_space_above
+name: choice_linespacing
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 180 185 90 30
+box: 380 185 100 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_space_below
+name: input_linespacing
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 70 135 100 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 125 250 235 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Above:|#v
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: choice_space_above
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 70 185 100 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Below:|#w
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: choice_space_below
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 370 10 100 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Pagebreaks
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 230 10 50 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Lines
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 20 10 80 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Alignment
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 20 100 130 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Vertical Spaces
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 270 135 40 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Keep|#K
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: check_space_above
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 270 185 40 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Keep|#p
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: check_space_below
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 355 150 115 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: choice_linespacing
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 350 125 100 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Line Spacing
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 355 190 115 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_linespacing
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
-=============== FORM ===============
-Name: form_paragraph_extra
-Width: 490
-Height: 250
-Number of Objects: 21
-
---------------------
-class: FL_BOX
-type: FLAT_BOX
-box: 0 0 490 250
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 20 170 100
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 350 20 100 100
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 190 20 150 100
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 20 10 120 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Extra Options
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 240 30 90 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Length|#L
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_pextra_width
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_INPUT
-type: INT_INPUT
-box: 240 70 90 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: or %|#o
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_pextra_widthp
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 200 10 60 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Width
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 350 10 90 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Alignment
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_BEGIN_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: group_alignment
-callback: 
-argument: 
-
---------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 360 30 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Top|#T
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_top
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 360 60 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Middle|#d
+label: Label Width:|#d
 shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_middle
+resize: FL_RESIZE_X
+gravity: FL_West FL_East
+name: input_labelwidth
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 360 90 80 30
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 370 245 120 45
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bottom|#B
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_bottom
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_END_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
+label: Indent
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -850,193 +484,61 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 10 130 300 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: HFill between Minipage paragraphs|#H
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_hfill
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 160 260 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Start new Minipage|#S
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_startmp
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_BEGIN_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: group_extraopt
-callback: 
-argument: 
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 30 160 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Indented Paragraph|#I
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_indent
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 60 160 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Minipage|#M
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_minipage
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 90 160 30
+box: 375 250 115 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Floatflt|#F
+label: No Indent|#I
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_floatflt
+name: check_noindent
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_END_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
-=============== FORM ===============
-Name: form_tabbed_paragraph
-Width: 510
-Height: 350
-Number of Objects: 7
-
---------------------
-class: FL_BOX
-type: UP_BOX
-box: 0 0 510 350
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 10 305 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TABFOLDER
-type: TOP_TABFOLDER
-box: 10 10 490 270
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Tabbed folder
+label: Restore|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: tabbed_folder
-callback: 
-argument: 
+name: button_restore
+callback: C_FormBaseDeprecatedRestoreCB
+argument: 0
 
 --------------------
 class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 400 310 100 30
+type: RETURN_BUTTON
+box: 200 305 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel|^[
-shortcut: 
+label: OK
+shortcut: ^M
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
-callback: C_FormBaseDeprecatedCancelCB
+name: button_ok
+callback: C_FormBaseDeprecatedOKCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 290 310 100 30
+box: 300 305 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -1053,45 +555,45 @@ argument: 0
 
 --------------------
 class: FL_BUTTON
-type: RETURN_BUTTON
-box: 180 310 100 30
+type: NORMAL_BUTTON
+box: 400 305 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: OK
-shortcut: ^M
+label: Cancel|^[
+shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_ok
-callback: C_FormBaseDeprecatedOKCB
+name: button_cancel
+callback: C_FormBaseDeprecatedCancelCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 10 310 100 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+class: FL_FRAME
+type: ENGRAVED_FRAME
+box: 10 340 480 1
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Restore|#R
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_restore
-callback: C_FormBaseDeprecatedRestoreCB
-argument: 0
+name:
+callback:
+argument:
 
 --------------------
 class: FL_TEXT
 type: NORMAL_TEXT
-box: 10 280 490 30
-boxtype: FL_FLAT_BOX
+box: 10 350 480 35
+boxtype: FL_NO_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_BOLD_STYLE