]> git.lyx.org Git - lyx.git/commitdiff
Big cleanup of xforms popups from Angus
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Thu, 26 Oct 2000 09:36:33 +0000 (09:36 +0000)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Thu, 26 Oct 2000 09:36:33 +0000 (09:36 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1161 a592a061-630c-0410-9148-cb99ea01b6c8

33 files changed:
ChangeLog
src/frontends/xforms/form_citation.C
src/frontends/xforms/form_copyright.C
src/frontends/xforms/form_document.C
src/frontends/xforms/form_error.C
src/frontends/xforms/form_graphics.C
src/frontends/xforms/form_index.C
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/form_preferences.C
src/frontends/xforms/form_preferences.h
src/frontends/xforms/form_print.C
src/frontends/xforms/form_ref.C
src/frontends/xforms/form_tabular.C
src/frontends/xforms/form_tabular.h
src/frontends/xforms/form_tabular_create.C
src/frontends/xforms/form_toc.C
src/frontends/xforms/form_url.C
src/frontends/xforms/forms/README
src/frontends/xforms/forms/form_citation.fd
src/frontends/xforms/forms/form_copyright.fd
src/frontends/xforms/forms/form_document.fd
src/frontends/xforms/forms/form_error.fd
src/frontends/xforms/forms/form_graphics.fd
src/frontends/xforms/forms/form_index.fd
src/frontends/xforms/forms/form_paragraph.fd
src/frontends/xforms/forms/form_preferences.fd
src/frontends/xforms/forms/form_print.fd
src/frontends/xforms/forms/form_ref.fd
src/frontends/xforms/forms/form_tabular.fd
src/frontends/xforms/forms/form_tabular_create.fd
src/frontends/xforms/forms/form_toc.fd
src/frontends/xforms/forms/form_url.fd
src/minibuffer.C

index 54cff84e755fee25fee6024b4d4fc6a09f612e58..420c73a3a58721db8a59ad9158f144d20e9482d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-10-26  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/minibuffer.C: add "using SigC::slot" statement.
+
+2000-10-25  Angus Leeming <a.leeming@ic.ac.uk>
+
+       * src/frontends/xforms/forms/README: updated section about make.
+
+       * src/frontends/xforms/forms/form_*.fd: lots and lots of shortcuts.
+       Tidied some forms up, made two of form_tabular's tabs more
+       self-consistent, fixed Jean-Marc's size problem in form_preferences,
+       fixed translation problem with "Column".
+       
 2000-10-25  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/minibuffer.h: use Timeout instead of the xforms timer
index 564b68f6be8fd4d52a843ea5da628750975cda17..4d60323bde050a77e7322bec31c926267aef045e 100644 (file)
@@ -49,18 +49,21 @@ FD_form_citation * FormCitation::build_citation()
   fdui->infoBrsr = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 360, 410, 80, _("Info"));
     fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
     fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->style = obj = fl_add_choice(FL_NORMAL_CHOICE, 160, 470, 130, 30, _("Citation style"));
+  fdui->style = obj = fl_add_choice(FL_NORMAL_CHOICE, 160, 470, 130, 30, idex(_("Citation style|#s")));
+    fl_set_button_shortcut(obj, scex(_("Citation style|#s")), 1);
     fl_set_object_boxtype(obj, FL_DOWN_BOX);
     fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->textBefore = obj = fl_add_input(FL_NORMAL_INPUT, 100, 520, 250, 30, _("Text before"));
+  fdui->textBefore = obj = fl_add_input(FL_NORMAL_INPUT, 100, 520, 250, 30, idex(_("Text before|#b")));
+    fl_set_button_shortcut(obj, scex(_("Text before|#b")), 1);
     fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->textAftr = obj = fl_add_input(FL_NORMAL_INPUT, 100, 570, 250, 30, _("Text after"));
+  fdui->textAftr = obj = fl_add_input(FL_NORMAL_INPUT, 100, 570, 250, 30, idex(_("Text after|#a")));
+    fl_set_button_shortcut(obj, scex(_("Text after|#a")), 1);
     fl_set_object_resize(obj, FL_RESIZE_X);
   fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 230, 630, 90, 30, _("OK"));
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 630, 90, 30, _("Cancel"));
-    fl_set_button_shortcut(obj, _("^["), 1);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 630, 90, 30, idex(_("Cancel|#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   fl_end_form();
index 981942a654d44d2c599d940378ee1e49fd3c597f..6604843a4b3d7c8da2070ba19e489fcea6e4fd47 100644 (file)
@@ -34,7 +34,8 @@ FD_form_copyright * FormCopyright::build_copyright()
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 160, 390, 140, 30, _("OK"));
+  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 160, 390, 140, 30, idex(_("Close|#C^[^M")));
+    fl_set_button_shortcut(obj, scex(_("Close|#C^[^M")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_South, FL_South);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
index ca83c71967c00ab844c0e6eb422d8138b856fbf4..3a00bb83867f1b8551254c3344b03f7a929b5725 100644 (file)
@@ -29,8 +29,8 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document()
   obj = fl_add_box(FL_UP_BOX, 0, 0, 465, 450, "");
   fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder"));
     fl_set_object_resize(obj, FL_RESIZE_ALL);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 410, 100, 30, idex(_("Cancel|^[")));
-    fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 410, 100, 30, idex(_("Cancel|#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, INPUT);
   fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 245, 410, 100, 30, idex(_("Apply|#A")));
@@ -193,7 +193,7 @@ FD_form_doc_class * FormDocument::build_doc_class()
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 200, 120, 80, _("Separation"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 110, 120, 70, _("Columns"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 110, 120, 70, _("Page cols"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 300, 20, 120, 70, _("Sides"));
index 7bd23ef3547fa8d9c62b8110b3963529961df44d..e503369cad73ea15a6481bf77b723569fe22c383 100644 (file)
@@ -27,7 +27,8 @@ FD_form_error * FormError::build_error()
   obj = fl_add_box(FL_UP_BOX, 0, 0, 400, 240, "");
   fdui->message = obj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, "");
     fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-  obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, _("Close"));
+  obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_("Close|#C^[^M")));
+    fl_set_button_shortcut(obj, scex(_("Close|#C^[^M")), 1);
     fl_set_object_gravity(obj, FL_South, FL_South);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
index a7e724e98d3e4f2a7277632a90ddfedd1dcd1726..c78a6f83b428a03b52a85f1812dd583936926228 100644 (file)
@@ -22,85 +22,92 @@ FD_form_graphics * FormGraphics::build_graphics()
   FL_OBJECT *obj;
   FD_form_graphics *fdui = new FD_form_graphics;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 410, 390);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 490, 390);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 410, 390, "");
+  obj = fl_add_box(FL_UP_BOX, 0, 0, 490, 390, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 310, 390, 30, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 230, 250, 170, 50, "");
-  fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 90, 20, 210, 30, idex(_("Graphics File|F#F")));
-    fl_set_button_shortcut(obj, scex(_("Graphics File|F#F")), 1);
+  obj = fl_add_frame(FL_ENGRAVED_FRAME, 20, 310, 138, 30, "");
+  obj = fl_add_frame(FL_ENGRAVED_FRAME, 279, 250, 201, 50, "");
+  fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 150, 20, 210, 30, idex(_("Graphics File|#F")));
+    fl_set_button_shortcut(obj, scex(_("Graphics File|#F")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 310, 20, 90, 30, idex(_("Browse|B#B")));
-    fl_set_button_shortcut(obj, scex(_("Browse|B#B")), 1);
+  fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 20, 90, 30, idex(_("Browse|#B")));
+    fl_set_button_shortcut(obj, scex(_("Browse|#B")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, BROWSE);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 70, 200, 160, _("Width"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 70, 240, 160, _("Width"));
     fl_set_object_lalign(obj, FL_ALIGN_CENTER);
-  obj = fl_add_text(FL_NORMAL_TEXT, 130, 60, 50, 20, _("Height"));
+  obj = fl_add_text(FL_NORMAL_TEXT, 164, 60, 60, 20, _("Height"));
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 20, 190, 90, 30, "");
+  fdui->input_width = obj = fl_add_input(FL_NORMAL_INPUT, 32, 190, 108, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->input_height = obj = fl_add_input(FL_NORMAL_INPUT, 120, 190, 80, 30, "");
+  fdui->input_height = obj = fl_add_input(FL_NORMAL_INPUT, 152, 190, 96, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 230, 70, 170, 160, _("Display"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 270, 70, 210, 160, _("Display"));
     fl_set_object_lalign(obj, FL_ALIGN_CENTER);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 10, 350, 70, 30, _("Ok"));
+  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 190, 350, 90, 30, _("Ok"));
     fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 100, 350, 70, 30, idex(_("Apply|A#A")));
-    fl_set_button_shortcut(obj, scex(_("Apply|A#A")), 1);
+  fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 350, 90, 30, idex(_("Apply|#A")));
+    fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 190, 350, 70, 30, idex(_("Cancel|C#C^[")));
-    fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 390, 350, 90, 30, idex(_("Cancel|^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
 
   fdui->radio_button_group_width = fl_bgn_group();
-  fdui->radio_width_percent_page = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 140, 80, 30, _("% of Page"));
+  fdui->radio_width_percent_page = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 140, 80, 30, _("% of Page"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->radio_width_default = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 80, 80, 30, _("Default"));
+  fdui->radio_width_default = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 80, 80, 30, _("Default"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
     fl_set_button(obj, 1);
-  fdui->radio_width_cm = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 100, 80, 30, _("cm"));
+  fdui->radio_width_cm = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 100, 80, 30, _("cm"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->radio_width_inch = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 120, 80, 30, _("Inch"));
+  fdui->radio_width_inch = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 120, 80, 30, _("Inch"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->radio_width_percent_column = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 10, 160, 80, 30, _("% of Column"));
+  fdui->radio_width_percent_column = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 20, 160, 96, 30, _("% of Column"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
   fl_end_group();
 
 
   fdui->radio_button_group_height = fl_bgn_group();
-  fdui->radio_height_percent_page = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 140, 80, 30, _("% of Page"));
+  fdui->radio_height_percent_page = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 140, 140, 96, 30, _("% of Page"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->radio_height_inch = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 120, 80, 30, _("Inch"));
+  fdui->radio_height_inch = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 140, 120, 96, 30, _("Inch"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->radio_height_cm = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 100, 80, 30, _("cm"));
+  fdui->radio_height_cm = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 140, 100, 80, 30, _("cm"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->radio_height_default = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 110, 80, 80, 30, _("Default"));
+  fdui->radio_height_default = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 140, 80, 96, 30, _("Default"));
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
     fl_set_button(obj, 1);
   fl_end_group();
 
 
   fdui->radio_button_group_display = fl_bgn_group();
-  fdui->radio_display_monochrome = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 250, 80, 80, 30, _("in Monochrome"));
+  fdui->radio_display_monochrome = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 80, 98, 30, idex(_("in Monochrome|#M")));
+    fl_set_button_shortcut(obj, scex(_("in Monochrome|#M")), 1);
     fl_set_button(obj, 1);
-  fdui->radio_display_grayscale = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 250, 110, 80, 30, _("in Grayscale"));
-  fdui->radio_display_color = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 250, 140, 80, 30, _("in Color"));
-  fdui->radio_no_display = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 250, 170, 80, 30, _("Don't display"));
+  fdui->radio_display_grayscale = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 110, 98, 30, idex(_("in Grayscale|#G")));
+    fl_set_button_shortcut(obj, scex(_("in Grayscale|#G")), 1);
+  fdui->radio_display_color = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 140, 98, 30, idex(_("in Color|#C")));
+    fl_set_button_shortcut(obj, scex(_("in Color|#C")), 1);
+  fdui->radio_no_display = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 295, 170, 98, 30, idex(_("Don't display|#D")));
+    fl_set_button_shortcut(obj, scex(_("Don't display|#D")), 1);
   fl_end_group();
 
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 10, 250, 200, 50, _("Rotate"));
-  fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 70, 260, 80, 30, _("Angle"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 250, 236, 50, _("Rotate"));
+  fdui->input_rotate_angle = obj = fl_add_input(FL_INT_INPUT, 91, 260, 94, 30, idex(_("Angle|#A")));
+    fl_set_button_shortcut(obj, scex(_("Angle|#A")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->check_inline = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 230, 260, 170, 30, _("Inline Figure"));
+  fdui->check_inline = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 279, 260, 201, 30, idex(_("Inline Figure|#I")));
+    fl_set_button_shortcut(obj, scex(_("Inline Figure|#I")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 120, 310, 280, 30, "");
+  fdui->input_subcaption = obj = fl_add_input(FL_NORMAL_INPUT, 158, 310, 322, 30, "");
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
-  fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 310, 110, 30, idex(_("Subcaption|S#S")));
-    fl_set_button_shortcut(obj, scex(_("Subcaption|S#S")), 1);
+  fdui->check_subcaption = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 120, 310, 30, 30, idex(_("Subcaption|#S")));
+    fl_set_button_shortcut(obj, scex(_("Subcaption|#S")), 1);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, CHECKINPUT);
   fl_end_form();
 
index 09dd429713576f36cd8950e34bb47618abede771..729e5a981f84fa03b92c0f891986ba62316ea88a 100644 (file)
@@ -26,11 +26,11 @@ FD_form_index * FormIndex::build_index()
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 100, "");
   fdui->key = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 420, 30, _("Keyword"));
-    fl_set_input_shortcut(obj, scex(_("Keyword|#K#k")), 1);
+    fl_set_input_shortcut(obj, scex(_("Keyword|#K")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, _("Cancel"));
-    fl_set_button_shortcut(obj, _("^["), 1);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_("Cancel|#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
index 02db2a00905dd48e73367ff74c39066d7aec5e30..04a3113e1fe5e60f420ef0e1249427890dd5d1a2 100644 (file)
@@ -240,8 +240,8 @@ FD_form_tabbed_paragraph * FormParagraph::build_tabbed_paragraph()
   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);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 310, 100, 30, idex(_("Cancel|^[")));
-    fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 310, 100, 30, idex(_("Cancel|C#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 290, 310, 100, 30, idex(_("Apply|#A")));
index 412c6afc82ce61079f7e5ac72420f570fa689605..9324279edeed1c47a9e95bf1266699d1f2ccb082 100644 (file)
 #include "form_preferences.h"
 #include "FormPreferences.h"
 
-FD_form_lnf_general::~FD_form_lnf_general()
+FD_form_preferences::~FD_form_preferences()
 {
   if( form->visible ) fl_hide_form( form );
   fl_free_form( form );
 }
 
 
-FD_form_lnf_general * FormPreferences::build_lnf_general()
+FD_form_preferences * FormPreferences::build_preferences()
 {
   FL_OBJECT *obj;
-  FD_form_lnf_general *fdui = new FD_form_lnf_general;
+  FD_form_preferences *fdui = new FD_form_preferences;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 470, 500);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
-  fdui->check_banner = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 15, 310, 30, idex(_("Show banner|#S")));
-    fl_set_button_shortcut(obj, scex(_("Show banner|#S")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->check_auto_region_delete = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 45, 310, 30, idex(_("Auto region delete|#A")));
-    fl_set_button_shortcut(obj, scex(_("Auto region delete|#A")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->check_exit_confirm = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 75, 310, 30, idex(_("Exit confirmation|#E")));
-    fl_set_button_shortcut(obj, scex(_("Exit confirmation|#E")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->check_display_shortcuts = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 105, 310, 30, _("Display keyboard shortcuts"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->counter_autosave = obj = fl_add_counter(FL_SIMPLE_COUNTER, 320, 255, 115, 30, _("Autosave interval"));
+  obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 500, "");
+  fdui->tabfolder_prefs = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 10, 455, 375, "");
+    fl_set_object_boxtype(obj, FL_FLAT_BOX);
+  fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 390, 90, 30, idex(_("Apply|#A")));
+    fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 1200);
-    fl_set_counter_value(obj, 300);
-    fl_set_counter_step(obj, 1, 1);
-  fdui->check_ask_new_file = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 135, 310, 30, idex(_("File->New asks for name|#N")));
-    fl_set_button_shortcut(obj, scex(_("File->New asks for name|#N")), 1);
+    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_("Cancel|C#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->check_cursor_follows_scrollbar = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 165, 310, 30, idex(_("Cursor follows scrollbar|#C")));
-    fl_set_button_shortcut(obj, scex(_("Cursor follows scrollbar|#C")), 1);
+    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
+  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 170, 390, 90, 30, _("Save"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->counter_wm_jump = obj = fl_add_counter(FL_SIMPLE_COUNTER, 320, 225, 115, 30, _("Wheel mouse jump"));
+    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
+  fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 390, 90, 30, idex(_("Restore|#R")));
+    fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 250);
-    fl_set_counter_value(obj, 100);
-    fl_set_counter_step(obj, 1, 1);
+    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
+  obj = fl_add_frame(FL_ENGRAVED_FRAME, 0, 425, 470, 1, "");
+  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 5, 430, 460, 70, "");
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+  fl_end_form();
+
+  fdui->form->fdui = fdui;
+
+  return fdui;
+}
+/*---------------------------------------*/
+
+FD_form_outer_tab::~FD_form_outer_tab()
+{
+  if( form->visible ) fl_hide_form( form );
+  fl_free_form( form );
+}
+
+
+FD_form_outer_tab * FormPreferences::build_outer_tab()
+{
+  FL_OBJECT *obj;
+  FD_form_outer_tab *fdui = new FD_form_outer_tab;
+
+  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375);
+  fdui->form->u_vdata = this;
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
+  fdui->tabfolder_outer = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 455, 375, "");
+    fl_set_object_boxtype(obj, FL_FLAT_BOX);
   fl_end_form();
 
   fdui->form->fdui = fdui;
@@ -90,9 +90,9 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
   FL_OBJECT *obj;
   FD_form_screen_fonts *fdui = new FD_form_screen_fonts;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 345);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 345, "");
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
   fdui->input_roman = obj = fl_add_input(FL_NORMAL_INPUT, 210, 5, 200, 30, _("Roman"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@@ -110,8 +110,9 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
     fl_set_counter_bounds(obj, 0, 999);
     fl_set_counter_value(obj, 150);
     fl_set_counter_step(obj, 1, 1);
-  fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 50, 125, 160, 30, _("Allow scaling"));
+  fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 168, 125, 33, 31, _("Allow scaling"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
     fl_set_button(obj, 1);
   fdui->input_screen_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 210, 95, 200, 30, _("Encoding"));
@@ -155,6 +156,168 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
 }
 /*---------------------------------------*/
 
+FD_form_outputs_general::~FD_form_outputs_general()
+{
+  if( form->visible ) fl_hide_form( form );
+  fl_free_form( form );
+}
+
+
+FD_form_outputs_general * FormPreferences::build_outputs_general()
+{
+  FL_OBJECT *obj;
+  FD_form_outputs_general *fdui = new FD_form_outputs_general;
+
+  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375);
+  fdui->form->u_vdata = this;
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
+  fdui->counter_line_len = obj = fl_add_counter(FL_SIMPLE_COUNTER, 295, 50, 120, 30, idex(_("Ascii line length|#A")));
+    fl_set_button_shortcut(obj, scex(_("Ascii line length|#A")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_counter_precision(obj, 0);
+    fl_set_counter_bounds(obj, 0, 120);
+    fl_set_counter_value(obj, 75);
+    fl_set_counter_step(obj, 1, 1);
+  fdui->input_tex_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 216, 95, 200, 30, _("TeX encoding"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->choice_default_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 217, 142, 199, 29, _("Default paper size"));
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+  fl_end_form();
+
+  fdui->form->fdui = fdui;
+
+  return fdui;
+}
+/*---------------------------------------*/
+
+FD_form_spellchecker::~FD_form_spellchecker()
+{
+  if( form->visible ) fl_hide_form( form );
+  fl_free_form( form );
+}
+
+
+FD_form_spellchecker * FormPreferences::build_spellchecker()
+{
+  FL_OBJECT *obj;
+  FD_form_spellchecker *fdui = new FD_form_spellchecker;
+
+  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 375);
+  fdui->form->u_vdata = this;
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 375, "");
+  fdui->choice_spell_command = obj = fl_add_choice(FL_NORMAL_CHOICE, 141, 47, 171, 34, _("Spell command"));
+    fl_set_object_boxtype(obj, FL_FRAME_BOX);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_TOP);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_alt_lang = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 100, 30, 30, _("Use alternative language"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->input_alt_lang = obj = fl_add_input(FL_NORMAL_INPUT, 239, 100, 170, 30, "");
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_escape_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 130, 30, 30, _("Use escape characters"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->input_escape_chars = obj = fl_add_input(FL_NORMAL_INPUT, 239, 130, 170, 30, "");
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_personal_dict = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 160, 30, 30, _("Use personal dictionary"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->input_personal_dict = obj = fl_add_input(FL_NORMAL_INPUT, 239, 160, 170, 30, "");
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->button_personal_dict = obj = fl_add_button(FL_NORMAL_BUTTON, 239, 190, 89, 30, _("Browse..."));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_compound_words = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 230, 30, 30, _("Accept compound words"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->check_input_enc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 260, 30, 30, _("Use input encoding"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fl_end_form();
+
+  fdui->form->fdui = fdui;
+
+  return fdui;
+}
+/*---------------------------------------*/
+
+FD_form_lnf_general::~FD_form_lnf_general()
+{
+  if( form->visible ) fl_hide_form( form );
+  fl_free_form( form );
+}
+
+
+FD_form_lnf_general * FormPreferences::build_lnf_general()
+{
+  FL_OBJECT *obj;
+  FD_form_lnf_general *fdui = new FD_form_lnf_general;
+
+  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
+  fdui->form->u_vdata = this;
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
+  fdui->check_banner = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 15, 310, 30, idex(_("Show banner|#S")));
+    fl_set_button_shortcut(obj, scex(_("Show banner|#S")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_button(obj, 1);
+  fdui->check_auto_region_delete = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 45, 310, 30, idex(_("Auto region delete|#A")));
+    fl_set_button_shortcut(obj, scex(_("Auto region delete|#A")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_button(obj, 1);
+  fdui->check_exit_confirm = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 75, 310, 30, idex(_("Exit confirmation|#E")));
+    fl_set_button_shortcut(obj, scex(_("Exit confirmation|#E")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_button(obj, 1);
+  fdui->check_display_shortcuts = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 105, 310, 30, _("Display keyboard shortcuts"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_button(obj, 1);
+  fdui->counter_autosave = obj = fl_add_counter(FL_SIMPLE_COUNTER, 320, 255, 115, 30, _("Autosave interval"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_counter_precision(obj, 0);
+    fl_set_counter_bounds(obj, 0, 1200);
+    fl_set_counter_value(obj, 300);
+    fl_set_counter_step(obj, 1, 1);
+  fdui->check_ask_new_file = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 135, 310, 30, idex(_("File->New asks for name|#N")));
+    fl_set_button_shortcut(obj, scex(_("File->New asks for name|#N")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_button(obj, 1);
+  fdui->check_cursor_follows_scrollbar = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 165, 310, 30, idex(_("Cursor follows scrollbar|#C")));
+    fl_set_button_shortcut(obj, scex(_("Cursor follows scrollbar|#C")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_button(obj, 1);
+  fdui->counter_wm_jump = obj = fl_add_counter(FL_SIMPLE_COUNTER, 320, 225, 115, 30, _("Wheel mouse jump"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_counter_precision(obj, 0);
+    fl_set_counter_bounds(obj, 0, 250);
+    fl_set_counter_value(obj, 100);
+    fl_set_counter_step(obj, 1, 1);
+  fl_end_form();
+
+  fdui->form->fdui = fdui;
+
+  return fdui;
+}
+/*---------------------------------------*/
+
 FD_form_interface::~FD_form_interface()
 {
   if( form->visible ) fl_hide_form( form );
@@ -167,9 +330,9 @@ FD_form_interface * FormPreferences::build_interface()
   FL_OBJECT *obj;
   FD_form_interface *fdui = new FD_form_interface;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
   fdui->input_popup_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 30, _("Popup Font"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@@ -216,9 +379,9 @@ FD_form_printer * FormPreferences::build_printer()
   FL_OBJECT *obj;
   FD_form_printer *fdui = new FD_form_printer;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
   fdui->input_command = obj = fl_add_input(FL_NORMAL_INPUT, 130, 75, 80, 30, _("command"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@@ -295,9 +458,9 @@ FD_form_paths * FormPreferences::build_paths()
   FL_OBJECT *obj;
   FD_form_paths *fdui = new FD_form_paths;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
   fdui->input_default_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 10, 170, 30, _("Default path"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@@ -316,30 +479,24 @@ FD_form_paths * FormPreferences::build_paths()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->button_template_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 40, 90, 30, _("Browse..."));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->check_last_files = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 290, 130, 140, 30, _("Check last files"));
+  fdui->check_last_files = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 100, 30, 30, _("Check last files"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
     fl_set_button(obj, 1);
-  fdui->input_temp_dir = obj = fl_add_input(FL_NORMAL_INPUT, 170, 70, 170, 30, _("Temp dir"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->button_temp_dir_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 70, 90, 30, _("Browse..."));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->input_lastfiles = obj = fl_add_input(FL_NORMAL_INPUT, 170, 100, 170, 30, _("Lastfiles"));
+  fdui->input_lastfiles = obj = fl_add_input(FL_NORMAL_INPUT, 170, 100, 170, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->button_lastfiles_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 100, 90, 30, _("Browse..."));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->check_use_temp_dir = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 35, 70, 50, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_button(obj, 1);
-  fdui->check_make_backups = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 170, 40, 30, "");
+  fdui->check_make_backups = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 170, 30, 30, _("Backup path"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
     fl_set_button(obj, 1);
-  fdui->input_backup_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 170, 170, 30, _("Backup path"));
+  fdui->input_backup_path = obj = fl_add_input(FL_NORMAL_INPUT, 170, 170, 170, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->button_backup_path_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 170, 90, 30, _("Browse..."));
@@ -349,168 +506,14 @@ FD_form_paths * FormPreferences::build_paths()
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->button_serverpipe_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 339, 217, 90, 30, _("Browse..."));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_preferences::~FD_form_preferences()
-{
-  if( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_preferences * FormPreferences::build_preferences()
-{
-  FL_OBJECT *obj;
-  FD_form_preferences *fdui = new FD_form_preferences;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 470, 475);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 475, "");
-  fdui->button_apply = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 380, 90, 30, idex(_("Apply|#A")));
-    fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 380, 90, 30, idex(_("Cancel|^[")));
-    fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 170, 380, 90, 30, _("Save"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  fdui->tabfolder_prefs = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 5, 10, 455, 365, "");
-    fl_set_object_boxtype(obj, FL_FLAT_BOX);
-  fdui->button_restore = obj = fl_add_button(FL_NORMAL_BUTTON, 5, 380, 90, 30, idex(_("Restore|#R")));
-    fl_set_button_shortcut(obj, scex(_("Restore|#R")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseRestoreCB, 0);
-  fdui->text_warning = obj = fl_add_text(FL_NORMAL_TEXT, 5, 420, 460, 55, "");
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 0, 415, 470, 1, "");
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_outer_tab::~FD_form_outer_tab()
-{
-  if( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_outer_tab * FormPreferences::build_outer_tab()
-{
-  FL_OBJECT *obj;
-  FD_form_outer_tab *fdui = new FD_form_outer_tab;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 345);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 345, "");
-  fdui->tabfolder_outer = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 455, 345, "");
-    fl_set_object_boxtype(obj, FL_FLAT_BOX);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_outputs_general::~FD_form_outputs_general()
-{
-  if( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_outputs_general * FormPreferences::build_outputs_general()
-{
-  FL_OBJECT *obj;
-  FD_form_outputs_general *fdui = new FD_form_outputs_general;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 455, 345);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 345, "");
-  fdui->counter_line_len = obj = fl_add_counter(FL_SIMPLE_COUNTER, 295, 50, 120, 30, idex(_("Ascii line length|#A")));
-    fl_set_button_shortcut(obj, scex(_("Ascii line length|#A")), 1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-    fl_set_counter_precision(obj, 0);
-    fl_set_counter_bounds(obj, 0, 120);
-    fl_set_counter_value(obj, 75);
-    fl_set_counter_step(obj, 1, 1);
-  fdui->input_tex_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 216, 95, 200, 30, _("TeX encoding"));
+  fdui->input_temp_dir = obj = fl_add_input(FL_NORMAL_INPUT, 170, 70, 170, 30, "");
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->choice_default_papersize = obj = fl_add_choice(FL_NORMAL_CHOICE, 217, 142, 199, 29, _("Default paper size"));
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-  fl_end_form();
-
-  fdui->form->fdui = fdui;
-
-  return fdui;
-}
-/*---------------------------------------*/
-
-FD_form_spellchecker::~FD_form_spellchecker()
-{
-  if( form->visible ) fl_hide_form( form );
-  fl_free_form( form );
-}
-
-
-FD_form_spellchecker * FormPreferences::build_spellchecker()
-{
-  FL_OBJECT *obj;
-  FD_form_spellchecker *fdui = new FD_form_spellchecker;
-
-  fdui->form = fl_bgn_form(FL_NO_BOX, 450, 320);
-  fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 320, "");
-  fdui->choice_spell_command = obj = fl_add_choice(FL_NORMAL_CHOICE, 141, 47, 171, 34, _("Spell command"));
-    fl_set_object_boxtype(obj, FL_FRAME_BOX);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_TOP);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->check_alt_lang = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 100, 30, 30, _("Use alternative language"));
+  fdui->check_use_temp_dir = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 134, 70, 30, 30, _("Temp dir"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_alt_lang = obj = fl_add_input(FL_NORMAL_INPUT, 239, 100, 170, 30, "");
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->check_escape_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 130, 30, 30, _("Use escape characters"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_escape_chars = obj = fl_add_input(FL_NORMAL_INPUT, 239, 130, 170, 30, "");
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->check_personal_dict = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 208, 160, 30, 30, _("Use personal dictionary"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_personal_dict = obj = fl_add_input(FL_NORMAL_INPUT, 239, 160, 170, 30, "");
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->button_personal_dict = obj = fl_add_button(FL_NORMAL_BUTTON, 239, 190, 89, 30, _("Browse..."));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->check_compound_words = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 230, 30, 30, _("Accept compound words"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->check_input_enc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 130, 260, 30, 30, _("Use input encoding"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+    fl_set_button(obj, 1);
   fl_end_form();
 
   fdui->form->fdui = fdui;
index ff248282566202d8b8f8ce465ed0040c078bce8f..7fb946baae19803cc0ed5f169c7671a4e2317098 100644 (file)
@@ -1,13 +1,15 @@
 // File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
 /** Header file generated with fdesign **/
 
-#ifndef FD_form_lnf_general_h_
-#define FD_form_lnf_general_h_
+#ifndef FD_form_preferences_h_
+#define FD_form_preferences_h_
 
 /** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
 extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
@@ -15,11 +17,9 @@ extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
 extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
 extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
@@ -27,18 +27,22 @@ extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/
-struct FD_form_lnf_general {
-       ~FD_form_lnf_general();
+struct FD_form_preferences {
+       ~FD_form_preferences();
 
        FL_FORM *form;
-       FL_OBJECT *check_banner;
-       FL_OBJECT *check_auto_region_delete;
-       FL_OBJECT *check_exit_confirm;
-       FL_OBJECT *check_display_shortcuts;
-       FL_OBJECT *counter_autosave;
-       FL_OBJECT *check_ask_new_file;
-       FL_OBJECT *check_cursor_follows_scrollbar;
-       FL_OBJECT *counter_wm_jump;
+       FL_OBJECT *tabfolder_prefs;
+       FL_OBJECT *button_apply;
+       FL_OBJECT *button_cancel;
+       FL_OBJECT *button_ok;
+       FL_OBJECT *button_restore;
+       FL_OBJECT *text_warning;
+};
+struct FD_form_outer_tab {
+       ~FD_form_outer_tab();
+
+       FL_FORM *form;
+       FL_OBJECT *tabfolder_outer;
 };
 struct FD_form_screen_fonts {
        ~FD_form_screen_fonts();
@@ -61,6 +65,42 @@ struct FD_form_screen_fonts {
        FL_OBJECT *input_huge;
        FL_OBJECT *input_huger;
 };
+struct FD_form_outputs_general {
+       ~FD_form_outputs_general();
+
+       FL_FORM *form;
+       FL_OBJECT *counter_line_len;
+       FL_OBJECT *input_tex_encoding;
+       FL_OBJECT *choice_default_papersize;
+};
+struct FD_form_spellchecker {
+       ~FD_form_spellchecker();
+
+       FL_FORM *form;
+       FL_OBJECT *choice_spell_command;
+       FL_OBJECT *check_alt_lang;
+       FL_OBJECT *input_alt_lang;
+       FL_OBJECT *check_escape_chars;
+       FL_OBJECT *input_escape_chars;
+       FL_OBJECT *check_personal_dict;
+       FL_OBJECT *input_personal_dict;
+       FL_OBJECT *button_personal_dict;
+       FL_OBJECT *check_compound_words;
+       FL_OBJECT *check_input_enc;
+};
+struct FD_form_lnf_general {
+       ~FD_form_lnf_general();
+
+       FL_FORM *form;
+       FL_OBJECT *check_banner;
+       FL_OBJECT *check_auto_region_delete;
+       FL_OBJECT *check_exit_confirm;
+       FL_OBJECT *check_display_shortcuts;
+       FL_OBJECT *counter_autosave;
+       FL_OBJECT *check_ask_new_file;
+       FL_OBJECT *check_cursor_follows_scrollbar;
+       FL_OBJECT *counter_wm_jump;
+};
 struct FD_form_interface {
        ~FD_form_interface();
 
@@ -107,56 +147,16 @@ struct FD_form_paths {
        FL_OBJECT *input_template_path;
        FL_OBJECT *button_template_browse;
        FL_OBJECT *check_last_files;
-       FL_OBJECT *input_temp_dir;
        FL_OBJECT *button_temp_dir_browse;
        FL_OBJECT *input_lastfiles;
        FL_OBJECT *button_lastfiles_browse;
-       FL_OBJECT *check_use_temp_dir;
        FL_OBJECT *check_make_backups;
        FL_OBJECT *input_backup_path;
        FL_OBJECT *button_backup_path_browse;
        FL_OBJECT *input_serverpipe;
        FL_OBJECT *button_serverpipe_browse;
-};
-struct FD_form_preferences {
-       ~FD_form_preferences();
-
-       FL_FORM *form;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_cancel;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *tabfolder_prefs;
-       FL_OBJECT *button_restore;
-       FL_OBJECT *text_warning;
-};
-struct FD_form_outer_tab {
-       ~FD_form_outer_tab();
-
-       FL_FORM *form;
-       FL_OBJECT *tabfolder_outer;
-};
-struct FD_form_outputs_general {
-       ~FD_form_outputs_general();
-
-       FL_FORM *form;
-       FL_OBJECT *counter_line_len;
-       FL_OBJECT *input_tex_encoding;
-       FL_OBJECT *choice_default_papersize;
-};
-struct FD_form_spellchecker {
-       ~FD_form_spellchecker();
-
-       FL_FORM *form;
-       FL_OBJECT *choice_spell_command;
-       FL_OBJECT *check_alt_lang;
-       FL_OBJECT *input_alt_lang;
-       FL_OBJECT *check_escape_chars;
-       FL_OBJECT *input_escape_chars;
-       FL_OBJECT *check_personal_dict;
-       FL_OBJECT *input_personal_dict;
-       FL_OBJECT *button_personal_dict;
-       FL_OBJECT *check_compound_words;
-       FL_OBJECT *check_input_enc;
+       FL_OBJECT *input_temp_dir;
+       FL_OBJECT *check_use_temp_dir;
 };
 
-#endif /* FD_form_lnf_general_h_ */
+#endif /* FD_form_preferences_h_ */
index 7c824efaeafadfe7a75b10702a531294639cf0af..6078fee5ac7f5259d210a4e2b70059458551a8ff 100644 (file)
@@ -60,8 +60,8 @@ FD_form_print * FormPrint::build_print()
     fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 315, 100, 30, idex(_("Cancel|^[")));
-    fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 315, 100, 30, idex(_("Cancel|C#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|C#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
 
index 7a77d8998912623d0fc597dd042139cff4a760da..932494f9343bb98114f25daaba31986c94a17062 100644 (file)
@@ -26,35 +26,39 @@ FD_form_ref * FormRef::build_ref()
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_UP_BOX, 0, 0, 530, 340, "");
   fdui->browser = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 10, 270, 280, "");
+    fl_set_object_lalign(obj, FL_ALIGN_TOP);
     fl_set_object_gravity(obj, FL_NorthWest, FL_NoGravity);
     fl_set_object_resize(obj, FL_RESIZE_X);
     fl_set_object_callback(obj, C_FormBaseInputCB, 2);
-  fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 40, 300, 90, 30, _("Update"));
-    fl_set_button_shortcut(obj, scex(_("Update|#U#u")), 1);
+  fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 40, 300, 90, 30, idex(_("Update|#U")));
+    fl_set_button_shortcut(obj, scex(_("Update|#U")), 1);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 3);
-  fdui->sort = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 170, 300, 30, 30, _("Sort"));
+  fdui->sort = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 170, 300, 30, 30, idex(_("Sort|#S")));
+    fl_set_button_shortcut(obj, scex(_("Sort|#S")), 1);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_resize(obj, FL_RESIZE_NONE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 3);
-  fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 370, 10, 150, 40, _("Name:"));
+  fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 370, 10, 150, 40, idex(_("Name:|#N")));
+    fl_set_button_shortcut(obj, scex(_("Name:|#N")), 1);
     fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  fdui->ref = obj = fl_add_input(FL_NORMAL_INPUT, 370, 60, 150, 40, _("Reference:"));
+  fdui->ref = obj = fl_add_input(FL_NORMAL_INPUT, 370, 60, 150, 40, _("Ref:"));
     fl_set_object_gravity(obj, FL_NorthEast, FL_NorthEast);
-  fdui->type = obj = fl_add_choice(FL_NORMAL_CHOICE, 340, 140, 140, 40, _("Reference type"));
-    fl_set_object_shortcut(obj, scex(_("Reference type|#t")), 1);
+  fdui->type = obj = fl_add_choice(FL_NORMAL_CHOICE, 340, 140, 140, 40, idex(_("Reference type|#R")));
+    fl_set_button_shortcut(obj, scex(_("Reference type|#R")), 1);
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_lalign(obj, FL_ALIGN_TOP);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseInputCB, 4);
-  fdui->button_go = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 200, 140, 40, _("Goto reference"));
+  fdui->button_go = obj = fl_add_button(FL_NORMAL_BUTTON, 340, 200, 140, 40, idex(_("Goto reference|#G")));
     fl_set_button_shortcut(obj, scex(_("Goto reference|#G")), 1);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseInputCB, 1);
   fdui->button_ok = obj = fl_add_button(FL_RETURN_BUTTON, 330, 300, 90, 30, _("OK"));
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseOKCB, 0);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 300, 90, 30, _("Cancel"));
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 300, 90, 30, idex(_("Cancel|#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   fl_end_form();
index afe2ebe91d311591d9220a6d684cbb1f21cdb276..d2239f39e7b2a2f5469d8baba73670cd9cac937a 100644 (file)
@@ -27,8 +27,8 @@ FD_form_tabular * FormTabular::build_tabular()
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 510, 295, "");
   fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 505, 250, _("Tabbed folder"));
     fl_set_object_resize(obj, FL_RESIZE_ALL);
-  fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 260, 90, 30, idex(_("Close|#C")));
-    fl_set_button_shortcut(obj, scex(_("Close|#C")), 1);
+  fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 260, 90, 30, idex(_("Close|#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Close|#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   fdui->input_tabular_column = obj = fl_add_input(FL_NORMAL_INPUT, 65, 260, 60, 30, "");
@@ -61,11 +61,9 @@ FD_form_tabular_options * FormTabular::build_tabular_options()
   FL_OBJECT *obj;
   FD_form_tabular_options *fdui = new FD_form_tabular_options;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 505, 227);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 505, 225);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 227, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 280, 20, 120, 75, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 225, "");
   fdui->button_append_column = obj = fl_add_button(FL_NORMAL_BUTTON, 10, 40, 120, 30, idex(_("Append Column|#A")));
     fl_set_button_shortcut(obj, scex(_("Append Column|#A")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -90,14 +88,13 @@ FD_form_tabular_options * FormTabular::build_tabular_options()
     fl_set_button_shortcut(obj, scex(_("Unset Borders|#U")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, _("Longtable"));
+  fdui->radio_longtable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 30, 90, 25, idex(_("Longtable|#L")));
+    fl_set_button_shortcut(obj, scex(_("Longtable|#L")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fdui->radio_rotate_tabular = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 280, 55, 90, 25, idex(_("Rotate 90°|#9")));
     fl_set_button_shortcut(obj, scex(_("Rotate 90°|#9")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 285, 10, 100, 20, _("Spec. Table"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 280, 20, 120, 75, _("Spec. Table"));
     fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   fl_end_form();
 
@@ -122,13 +119,6 @@ FD_form_column_options * FormTabular::build_column_options()
   fdui->form = fl_bgn_form(FL_NO_BOX, 505, 227);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 227, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 20, 20, 170, 105, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 25, 10, 70, 20, _("Borders"));
-    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->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_("Top|#t")));
     fl_set_button_shortcut(obj, scex(_("Top|#t")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -149,12 +139,6 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 200, 20, 130, 105, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_text(FL_NORMAL_TEXT, 205, 10, 115, 20, _("H. 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->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 30, 110, 25, idex(_("Left|#e")));
     fl_set_button_shortcut(obj, scex(_("Left|#e")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -167,25 +151,6 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_button_shortcut(obj, scex(_("Center|#c")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->input_column_width = obj = fl_add_input(FL_NORMAL_INPUT, 375, 150, 95, 30, _("Width of column:"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 340, 20, 130, 105, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_text(FL_NORMAL_TEXT, 345, 10, 115, 20, _("V. 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_frame(FL_ENGRAVED_FRAME, 20, 140, 220, 50, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->input_special_alignment = obj = fl_add_input(FL_NORMAL_INPUT, 30, 150, 200, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 25, 130, 170, 20, _("Special Column 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->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 30, 125, 25, idex(_("Top|#p")));
     fl_set_button_shortcut(obj, scex(_("Top|#p")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
@@ -198,6 +163,29 @@ FD_form_column_options * FormTabular::build_column_options()
     fl_set_button_shortcut(obj, scex(_("Bottom|#o")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 20, 170, 105, _("Borders"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 200, 20, 130, 105, _("H. Alignment"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 340, 20, 130, 105, _("V. Alignment"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  fdui->input_column_width = obj = fl_add_input(FL_NORMAL_INPUT, 320, 170, 95, 30, idex(_("Width|#W")));
+    fl_set_button_shortcut(obj, scex(_("Width|#W")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_TOP);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->input_special_alignment = obj = fl_add_input(FL_NORMAL_INPUT, 85, 170, 215, 30, idex(_("Alignment|#A")));
+    fl_set_button_shortcut(obj, scex(_("Alignment|#A")), 1);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_TOP);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 135, 450, 80, _("Special column"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lalign(obj, FL_ALIGN_TOP);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   fl_end_form();
 
   fdui->form->fdui = fdui;
@@ -218,97 +206,83 @@ FD_form_cell_options * FormTabular::build_cell_options()
   FL_OBJECT *obj;
   FD_form_cell_options *fdui = new FD_form_cell_options;
 
-  fdui->form = fl_bgn_form(FL_NO_BOX, 505, 227);
+  fdui->form = fl_bgn_form(FL_NO_BOX, 505, 225);
   fdui->form->u_vdata = this;
-  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 227, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 335, 115, 155, 100, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 115, 180, 100, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  obj = fl_add_text(FL_NORMAL_TEXT, 15, 105, 70, 20, _("Borders"));
-    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_frame(FL_ENGRAVED_FRAME, 195, 115, 130, 100, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-  obj = fl_add_text(FL_NORMAL_TEXT, 200, 105, 115, 20, _("H. 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, 345, 105, 115, 20, _("V. 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_frame(FL_ENGRAVED_FRAME, 10, 15, 150, 90, "");
-  obj = fl_add_text(FL_NORMAL_TEXT, 15, 5, 140, 20, _("Special Cell"));
-    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->radio_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 25, 145, 25, idex(_("Multicolumn|#M")));
-    fl_set_button_shortcut(obj, scex(_("Multicolumn|#M")), 1);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 75, 145, 25, _("Rotate 90°"));
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 165, 15, 325, 90, "");
-    fl_set_object_color(obj, FL_COL1, FL_COL1);
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-  fdui->input_special_multialign = obj = fl_add_input(FL_NORMAL_INPUT, 175, 30, 310, 30, "");
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_text(FL_NORMAL_TEXT, 170, 5, 290, 20, _("Special Multicolumn 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->input_mcolumn_width = obj = fl_add_input(FL_NORMAL_INPUT, 360, 65, 125, 30, _("Width of multi-column:"));
-    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 140, 25, 25, idex(_("Top|#t")));
+  obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 225, "");
+  fdui->radio_border_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 45, 25, 25, idex(_("Top|#t")));
     fl_set_button_shortcut(obj, scex(_("Top|#t")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_TOP_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 75, 170, 25, 25, idex(_("Bottom|#b")));
+  fdui->radio_border_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 85, 75, 25, 25, idex(_("Bottom|#b")));
     fl_set_button_shortcut(obj, scex(_("Bottom|#b")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_BOTTOM_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 55, 155, 25, 25, idex(_("Left|#l")));
+  fdui->radio_border_left = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 65, 60, 25, 25, idex(_("Left|#l")));
     fl_set_button_shortcut(obj, scex(_("Left|#l")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 155, 25, 25, idex(_("Right|#r")));
+  fdui->radio_border_right = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 105, 60, 25, 25, idex(_("Right|#r")));
     fl_set_button_shortcut(obj, scex(_("Right|#r")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 195, 125, 110, 25, idex(_("Left|#e")));
+  fdui->radio_align_left = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 30, 110, 25, idex(_("Left|#e")));
     fl_set_button_shortcut(obj, scex(_("Left|#e")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 195, 175, 115, 25, idex(_("Right|#i")));
+  fdui->radio_align_right = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 80, 115, 25, idex(_("Right|#i")));
     fl_set_button_shortcut(obj, scex(_("Right|#i")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 195, 150, 115, 25, idex(_("Center|#c")));
+  fdui->radio_align_center = obj = fl_add_checkbutton(FL_RADIO_BUTTON, 205, 55, 115, 25, idex(_("Center|#c")));
     fl_set_button_shortcut(obj, scex(_("Center|#c")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 125, 140, 25, idex(_("Top|#p")));
+  fdui->radio_valign_top = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 30, 125, 25, idex(_("Top|#p")));
     fl_set_button_shortcut(obj, scex(_("Top|#p")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_valign_center = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 150, 140, 25, idex(_("Center|#n")));
+  fdui->radio_valign_center = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 55, 125, 25, idex(_("Center|#n")));
     fl_set_button_shortcut(obj, scex(_("Center|#n")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_valign_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 175, 140, 25, idex(_("Bottom|#o")));
+  fdui->radio_valign_bottom = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 345, 80, 120, 25, idex(_("Bottom|#o")));
     fl_set_button_shortcut(obj, scex(_("Bottom|#o")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 50, 145, 25, idex(_("Use Minipage|#s")));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 20, 170, 105, _("Borders"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 200, 20, 130, 105, _("H. Alignment"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 340, 20, 130, 105, _("V. Alignment"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  fdui->input_mcolumn_width = obj = fl_add_input(FL_NORMAL_INPUT, 280, 180, 175, 30, idex(_("Width|#W")));
+    fl_set_button_shortcut(obj, scex(_("Width|#W")), 1);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->input_special_multialign = obj = fl_add_input(FL_NORMAL_INPUT, 280, 145, 175, 30, idex(_("Alignment|#A")));
+    fl_set_button_shortcut(obj, scex(_("Alignment|#A")), 1);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->radio_multicolumn = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 140, 130, 25, idex(_("Multicolumn|#M")));
+    fl_set_button_shortcut(obj, scex(_("Multicolumn|#M")), 1);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->radio_useminipage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 165, 130, 25, idex(_("Use Minipage|#s")));
     fl_set_button_shortcut(obj, scex(_("Use Minipage|#s")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->radio_rotate_cell = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 190, 130, 25, idex(_("Rotate 90°|#9")));
+    fl_set_button_shortcut(obj, scex(_("Rotate 90°|#9")), 1);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 135, 150, 80, _("Special Cell"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 180, 135, 290, 80, _("Special Multicolumn"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
   fl_end_form();
 
   fdui->form->fdui = fdui;
@@ -332,31 +306,30 @@ FD_form_longtable_options * FormTabular::build_longtable_options()
   fdui->form = fl_bgn_form(FL_NO_BOX, 505, 227);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 505, 227, "");
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 10, 20, 100, 75, "");
-  obj = fl_add_text(FL_NORMAL_TEXT, 15, 10, 85, 20, _("Header"));
-    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->radio_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 30, 90, 25, _("First Head"));
+  fdui->radio_lt_firsthead = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 55, 90, 25, idex(_("1st Head|#1")));
+    fl_set_button_shortcut(obj, scex(_("1st Head|#1")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 15, 60, 90, 25, _("Head"));
+  fdui->radio_lt_head = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 30, 30, 90, 25, idex(_("Head|#H")));
+    fl_set_button_shortcut(obj, scex(_("Head|#H")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 130, 20, 100, 75, "");
-  obj = fl_add_text(FL_NORMAL_TEXT, 135, 10, 85, 20, _("Footer"));
-    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->radio_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 30, 90, 25, _("Foot"));
+  fdui->radio_lt_foot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 195, 30, 90, 25, idex(_("Foot|#F")));
+    fl_set_button_shortcut(obj, scex(_("Foot|#F")), 1);
+    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
+  fdui->radio_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 195, 55, 90, 25, idex(_("Last Foot|#L")));
+    fl_set_button_shortcut(obj, scex(_("Last Foot|#L")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  fdui->radio_lt_lastfoot = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 135, 60, 90, 25, _("Last Foot"));
+  fdui->radio_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 355, 25, 90, 25, idex(_("New Page|#N")));
+    fl_set_button_shortcut(obj, scex(_("New Page|#N")), 1);
     fl_set_object_callback(obj, C_FormBaseInputCB, 0);
-  obj = fl_add_frame(FL_ENGRAVED_FRAME, 245, 20, 95, 75, "");
-  obj = fl_add_text(FL_NORMAL_TEXT, 250, 10, 85, 20, _("Special"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 20, 20, 150, 75, _("Header"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 185, 20, 150, 75, _("Footer"));
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
+    fl_set_object_lstyle(obj, FL_BOLD_STYLE);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 345, 20, 150, 75, _("Special"));
     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->radio_lt_newpage = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 250, 30, 90, 25, _("New Page"));
-    fl_set_object_callback(obj, C_FormBaseInputCB, 0);
   fl_end_form();
 
   fdui->form->fdui = fdui;
index b888f02f7eda5a38146805707e81daca0754a67c..d8e25ee9a5e5a8d587e237ff4328774b9512d3dd 100644 (file)
@@ -51,20 +51,16 @@ struct FD_form_column_options {
        FL_OBJECT *radio_align_left;
        FL_OBJECT *radio_align_right;
        FL_OBJECT *radio_align_center;
-       FL_OBJECT *input_column_width;
-       FL_OBJECT *input_special_alignment;
        FL_OBJECT *radio_valign_top;
        FL_OBJECT *radio_valign_center;
        FL_OBJECT *radio_valign_bottom;
+       FL_OBJECT *input_column_width;
+       FL_OBJECT *input_special_alignment;
 };
 struct FD_form_cell_options {
        ~FD_form_cell_options();
 
        FL_FORM *form;
-       FL_OBJECT *radio_multicolumn;
-       FL_OBJECT *radio_rotate_cell;
-       FL_OBJECT *input_special_multialign;
-       FL_OBJECT *input_mcolumn_width;
        FL_OBJECT *radio_border_top;
        FL_OBJECT *radio_border_bottom;
        FL_OBJECT *radio_border_left;
@@ -75,7 +71,11 @@ struct FD_form_cell_options {
        FL_OBJECT *radio_valign_top;
        FL_OBJECT *radio_valign_center;
        FL_OBJECT *radio_valign_bottom;
+       FL_OBJECT *input_mcolumn_width;
+       FL_OBJECT *input_special_multialign;
+       FL_OBJECT *radio_multicolumn;
        FL_OBJECT *radio_useminipage;
+       FL_OBJECT *radio_rotate_cell;
 };
 struct FD_form_longtable_options {
        ~FD_form_longtable_options();
index 18b72f8b744b9bae1ef5c098a4e8d8f36add1cf7..2f94d7bebb4ea0cd56f2b1831856f68e85316269 100644 (file)
@@ -32,8 +32,8 @@ FD_form_tabular_create * FormTabularCreate::build_tabular_create()
     fl_set_button_shortcut(obj, scex(_("Apply|#A")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_("Cancel|^[")));
-    fl_set_button_shortcut(obj, scex(_("Cancel|^[")), 1);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_("Cancel|#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
   fdui->slider_columns = obj = fl_add_valslider(FL_HOR_SLIDER, 80, 50, 220, 30, _("Columns"));
index d6339d7faae077f1ccbbaac9edd72b40ac7e48ac..40e1247de6ce34ec64d9d029056b459d1755ad9e 100644 (file)
@@ -28,17 +28,18 @@ FD_form_toc * FormToc::build_toc()
   fdui->browser = obj = fl_add_browser(FL_HOLD_BROWSER, 10, 10, 400, 280, "");
     fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, _("Close"));
+  obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_("Close|#C^[^M")));
+    fl_set_button_shortcut(obj, scex(_("Close|#C^[^M")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
-  obj = fl_add_button(FL_NORMAL_BUTTON, 200, 300, 100, 30, _("Update"));
-    fl_set_button_shortcut(obj, scex(_("Update|#U#u")), 1);
+  obj = fl_add_button(FL_NORMAL_BUTTON, 200, 300, 100, 30, idex(_("Update|#U")));
+    fl_set_button_shortcut(obj, scex(_("Update|#U")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
-  fdui->type = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, _("Type"));
-    fl_set_object_shortcut(obj, scex(_("Type|#T#t")), 1);
+  fdui->type = obj = fl_add_choice(FL_NORMAL_CHOICE, 60, 300, 130, 30, idex(_("Type|#T")));
+    fl_set_button_shortcut(obj, scex(_("Type|#T")), 1);
     fl_set_object_boxtype(obj, FL_FRAME_BOX);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseApplyCB, 0);
index f11f1d9a560375fba5c0f3502bc88514f623ab60..b35d9c4a7098d459bca929f521ccc96e60de2d8d 100644 (file)
@@ -25,23 +25,23 @@ FD_form_url * FormUrl::build_url()
   fdui->form = fl_bgn_form(FL_NO_BOX, 520, 140);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 140, "");
-  fdui->url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 20, 440, 30, _("URL"));
-    fl_set_input_shortcut(obj, scex(_("Url|#U")), 1);
+  fdui->url = obj = fl_add_input(FL_NORMAL_INPUT, 70, 20, 440, 30, idex(_("URL|#U")));
+    fl_set_button_shortcut(obj, scex(_("URL|#U")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
     fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 60, 440, 30, _("Name"));
-    fl_set_input_shortcut(obj, scex(_("Name|#N")), 1);
+  fdui->name = obj = fl_add_input(FL_NORMAL_INPUT, 70, 60, 440, 30, idex(_("Name|#N")));
+    fl_set_button_shortcut(obj, scex(_("Name|#N")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
     fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->radio_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 70, 100, 230, 30, _("HTML type"));
+  fdui->radio_html = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 70, 100, 230, 30, idex(_("HTML type|#H")));
     fl_set_button_shortcut(obj, scex(_("HTML type|#H")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_NorthWest, FL_NorthEast);
     fl_set_object_resize(obj, FL_RESIZE_X);
-  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 100, 100, 30, _("Cancel"));
-    fl_set_button_shortcut(obj, _("^["), 1);
+  fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 100, 100, 30, idex(_("Cancel|#C^[")));
+    fl_set_button_shortcut(obj, scex(_("Cancel|#C^[")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast);
     fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
index 273d06b4a6162b4421a2e9aa3d3efe710fd99036..3297e18fe2cc32a920ff9f5b34610c951118b0a8 100644 (file)
@@ -39,13 +39,13 @@ can will be converted as the FormXxxx::build_xxxx method without any extra
 editting to make it work.  Every forms implementation will thereby follow a very
 simple pattern and make it easier to maintain.
 
-All the forms are rebuild by running `make updatesrc`.  This will generate all
-the form_xxxx.[Ch] files. You should run `make install` to install them in the
-parent directory.  `make install` will also regenerate all the files for you
-so you don't have to do the `make updatesrc` step unless, for example, you are
-testing the conversion scripts. The fdfix.sh, fdfixh.sed and makefile contain
-the necessary smarts to convert the generated code into something that can be
-used directly in the LyX codebase..
+All the forms are rebuild by running `make test`.  This will generate all
+the form_xxxx.[Ch] files. You should run `make updatesrc` to install them in the
+parent directory.  `make updatesrc` will also regenerate all the files for you
+so you don't have to do the `make test` step unless, for example, you are
+testing the conversion scripts. The files fdfix.sh, fdfixc.sed, fdfixh.sed and
+makefile contain the necessary smarts to convert the generated code into
+something that can be used directly in the LyX codebase.
 
 The easiest way to fit into the pattern is to copy an existing dialogs
 implementation and adjust it to suit, keeping the variable names the same.
index 4032ca1fc54eff04a91a3e048fe942dc5bcc26e6..e7171197509af931a0a0299179a2a66c41d54b3b 100644 (file)
@@ -166,7 +166,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Citation style
+label: Citation style|#s
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity
@@ -184,7 +184,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Text before
+label: Text before|#b
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity
@@ -202,7 +202,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Text after
+label: Text after|#a
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity
@@ -238,8 +238,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Cancel
-shortcut: ^[
+label: Cancel|#C^[
+shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthEast FL_SouthEast
 name: button_cancel
index 7a3be2570780c5e0158b0f5b71282ded213ddba2..1524ced452d6eb199ace9f5c79719d1dfe9a475b 100644 (file)
@@ -76,8 +76,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: OK
-shortcut: ^M
+label: Close|#C^[^M
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_South FL_South
 name: button_ok
index 90596355a8e3898b3a86d580d7fb2e781990c94a..11e2ddbf4d662a3d8986eeffb401c46c5321972a 100644 (file)
@@ -59,7 +59,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel|^[
+label: Cancel|#C^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -701,7 +701,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Columns
+label: Page cols
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
index f452762ca9301ae15641a9d89e1aa552d1c0fd6e..bf34c868eb12f885be5761396dec50ef9a377759 100644 (file)
@@ -58,8 +58,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Close
-shortcut: ^M
+label: Close|#C^[^M
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_South FL_South
 name: 
index 8c188871805f02974af1f11842b998fe498edab6..a291f2f2486502809e962f5f928d727770ad2a7b 100644 (file)
@@ -8,14 +8,14 @@ Unit of measure: FL_COORD_PIXEL
 
 =============== FORM ===============
 Name: form_graphics
-Width: 410
+Width: 490
 Height: 390
 Number of Objects: 37
 
 --------------------
 class: FL_BOX
 type: UP_BOX
-box: 0 0 410 390
+box: 0 0 490 390
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -33,7 +33,7 @@ argument:
 --------------------
 class: FL_FRAME
 type: ENGRAVED_FRAME
-box: 10 310 390 30
+box: 20 310 138 30
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -51,7 +51,7 @@ argument:
 --------------------
 class: FL_FRAME
 type: ENGRAVED_FRAME
-box: 230 250 170 50
+box: 279 250 201 50
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -69,14 +69,14 @@ argument:
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 90 20 210 30
+box: 150 20 210 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: Graphics File|F#F
+label: Graphics File|#F
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -87,14 +87,14 @@ argument: CHECKINPUT
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 310 20 90 30
+box: 370 20 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: Browse|B#B
+label: Browse|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -105,7 +105,7 @@ argument: BROWSE
 --------------------
 class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 10 70 200 160
+box: 20 70 240 160
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -123,7 +123,7 @@ argument:
 --------------------
 class: FL_TEXT
 type: NORMAL_TEXT
-box: 130 60 50 20
+box: 164 60 60 20
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
@@ -141,7 +141,7 @@ argument:
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 20 190 90 30
+box: 32 190 108 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -159,7 +159,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 120 190 80 30
+box: 152 190 96 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -177,7 +177,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 230 70 170 160
+box: 270 70 210 160
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -195,7 +195,7 @@ argument:
 --------------------
 class: FL_BUTTON
 type: RETURN_BUTTON
-box: 10 350 70 30
+box: 190 350 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -213,14 +213,14 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 100 350 70 30
+box: 290 350 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: Apply|A#A
+label: Apply|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -231,14 +231,14 @@ argument: 0
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 190 350 70 30
+box: 390 350 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: Cancel|C#C^[
+label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -267,7 +267,7 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 10 140 80 30
+box: 20 140 80 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -285,7 +285,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 10 80 80 30
+box: 20 80 80 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -304,7 +304,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 10 100 80 30
+box: 20 100 80 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -322,7 +322,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 10 120 80 30
+box: 20 120 80 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -340,7 +340,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 10 160 80 30
+box: 20 160 96 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -394,7 +394,7 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 110 140 80 30
+box: 140 140 96 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -412,7 +412,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 110 120 80 30
+box: 140 120 96 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -430,7 +430,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 110 100 80 30
+box: 140 100 80 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -448,7 +448,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 110 80 80 30
+box: 140 80 96 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
@@ -503,14 +503,14 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 250 80 80 30
+box: 295 80 98 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: in Monochrome
+label: in Monochrome|#M
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -522,14 +522,14 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 250 110 80 30
+box: 295 110 98 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: in Grayscale
+label: in Grayscale|#G
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -540,14 +540,14 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 250 140 80 30
+box: 295 140 98 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: in Color
+label: in Color|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -558,14 +558,14 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 250 170 80 30
+box: 295 170 98 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Don't display
+label: Don't display|#D
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -594,7 +594,7 @@ argument:
 --------------------
 class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 10 250 200 50
+box: 20 250 236 50
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
@@ -612,14 +612,14 @@ argument:
 --------------------
 class: FL_INPUT
 type: INT_INPUT
-box: 70 260 80 30
+box: 91 260 94 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: Angle
+label: Angle|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -630,14 +630,14 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 230 260 170 30
+box: 279 260 201 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Inline Figure
+label: Inline Figure|#I
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -648,7 +648,7 @@ argument: CHECKINPUT
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 120 310 280 30
+box: 158 310 322 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
@@ -666,14 +666,14 @@ argument: CHECKINPUT
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 10 310 110 30
+box: 120 310 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Subcaption|S#S
+label: Subcaption|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
index 84494759bb2db1ff83be99aaa1a97e04a56fd159..3a2ba9b1ac7ca762e292156e7932c71a3c05096b 100644 (file)
@@ -41,7 +41,7 @@ style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: Keyword
-shortcut: Keyword|#K#k
+shortcut: Keyword|#K
 resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity
 name: key
@@ -58,8 +58,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel
-shortcut: ^[
+label: Cancel|#C^[
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: button_cancel
index 6e692984c1f92913e1daa91263fbedd71c1043ab..5f3c8ef97dc652e2c4e746fa9a9f6a9efb9abe5b 100644 (file)
@@ -970,7 +970,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel|^[
+label: Cancel|C#C^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
index 3453bd8a2d9db57fa0c280075ca124ea5af04721..0ca904243c368c60caf848cc4d767a0dc00cf2b4 100644 (file)
@@ -8,16 +8,16 @@ Unit of measure: FL_COORD_PIXEL
 SnapGrid: 1
 
 =============== FORM ===============
-Name: form_lnf_general
-Width: 450
-Height: 320
-Number of Objects: 9
+Name: form_preferences
+Width: 470
+Height: 500
+Number of Objects: 8
 
 --------------------
 class: FL_BOX
-type: FLAT_BOX
-box: 0 0 450 320
-boxtype: FL_FLAT_BOX
+type: UP_BOX
+box: 0 0 470 500
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
@@ -32,173 +32,183 @@ callback:
 argument: 
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 15 15 310 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_TABFOLDER
+type: TOP_TABFOLDER
+box: 5 10 455 375
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Show banner|#S
+label: 
 shortcut: 
-resize: FL_RESIZE_ALL
+resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
-name: check_banner
-callback: C_FormBaseInputCB
-argument: 0
-       value: 1
+name: tabfolder_prefs
+callback: 
+argument: 
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 15 45 310 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 270 390 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: Auto region delete|#A
+label: Apply|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_auto_region_delete
-callback: C_FormBaseInputCB
+name: button_apply
+callback: C_FormBaseApplyCB
 argument: 0
-       value: 1
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 15 75 310 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 370 390 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: Exit confirmation|#E
+label: Cancel|C#C^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_exit_confirm
-callback: C_FormBaseInputCB
+name: button_cancel
+callback: C_FormBaseCancelCB
 argument: 0
-       value: 1
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 15 105 310 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
+class: FL_BUTTON
+type: RETURN_BUTTON
+box: 170 390 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: Display keyboard shortcuts
-shortcut: 
+label: Save
+shortcut: ^M
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_display_shortcuts
-callback: C_FormBaseInputCB
+name: button_ok
+callback: C_FormBaseOKCB
 argument: 0
-       value: 1
 
 --------------------
-class: FL_COUNTER
-type: SIMPLE_COUNTER
-box: 320 255 115 30
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 5 390 90 30
 boxtype: FL_UP_BOX
-colors: FL_COL1 FL_BLUE
-alignment: FL_ALIGN_LEFT
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Autosave interval
+label: Restore|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: counter_autosave
-callback: C_FormBaseInputCB
+name: button_restore
+callback: C_FormBaseRestoreCB
 argument: 0
-  bounds: 0 1200
-  precision: 0
-  value: 300
-  sstep: 1
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 15 135 310 30
+class: FL_FRAME
+type: ENGRAVED_FRAME
+box: 0 425 470 1
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
+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: File->New asks for name|#N
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_ask_new_file
-callback: C_FormBaseInputCB
-argument: 0
-       value: 1
+name: 
+callback: 
+argument: 
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 15 165 310 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_TEXT
+type: NORMAL_TEXT
+box: 5 430 460 70
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Cursor follows scrollbar|#C
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_cursor_follows_scrollbar
-callback: C_FormBaseInputCB
-argument: 0
-       value: 1
+name: text_warning
+callback: 
+argument: 
+
+=============== FORM ===============
+Name: form_outer_tab
+Width: 455
+Height: 375
+Number of Objects: 2
 
 --------------------
-class: FL_COUNTER
-type: SIMPLE_COUNTER
-box: 320 225 115 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_BLUE
-alignment: FL_ALIGN_LEFT
+class: FL_BOX
+type: FLAT_BOX
+box: 0 0 455 375
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Wheel mouse jump
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: counter_wm_jump
-callback: C_FormBaseInputCB
-argument: 0
-  bounds: 0 250
-  precision: 0
-  value: 100
-  sstep: 1
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_TABFOLDER
+type: TOP_TABFOLDER
+box: 0 0 455 375
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: 
+shortcut: 
+resize: FL_RESIZE_NONE
+gravity: FL_NoGravity FL_NoGravity
+name: tabfolder_outer
+callback: 
+argument: 
 
 =============== FORM ===============
 Name: form_screen_fonts
 Width: 455
-Height: 345
+Height: 375
 Number of Objects: 17
 
 --------------------
 class: FL_BOX
 type: FLAT_BOX
-box: 0 0 455 345
+box: 0 0 455 375
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -292,10 +302,10 @@ argument: 0
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 50 125 160 30
+box: 168 125 33 31
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
@@ -507,15 +517,15 @@ callback: C_FormBaseInputCB
 argument: 0
 
 =============== FORM ===============
-Name: form_interface
-Width: 450
-Height: 320
-Number of Objects: 9
+Name: form_outputs_general
+Width: 455
+Height: 375
+Number of Objects: 4
 
 --------------------
 class: FL_BOX
 type: FLAT_BOX
-box: 0 0 450 320
+box: 0 0 455 375
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -531,163 +541,130 @@ callback:
 argument: 
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 230 30 200 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_COUNTER
+type: SIMPLE_COUNTER
+box: 295 50 120 30
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_BLUE
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Popup Font
+label: Ascii line length|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_popup_font
+name: counter_line_len
 callback: C_FormBaseInputCB
 argument: 0
+  bounds: 0 120
+  precision: 0
+  value: 75
+  sstep: 1
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 230 60 200 30
+box: 216 95 200 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: Menu Font
+label: TeX encoding
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_menu_font
+name: input_tex_encoding
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 230 90 200 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 217 142 199 29
+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: Popup Encoding
+label: Default paper size
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_popup_encoding
-callback: C_FormBaseInputCB
-argument: 0
+name: choice_default_papersize
+callback: 
+argument: 
+
+=============== FORM ===============
+Name: form_spellchecker
+Width: 450
+Height: 375
+Number of Objects: 11
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 160 178 190 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: Bind file|#B
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_bind_file
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 350 178 80 30
-boxtype: FL_UP_BOX
+class: FL_BOX
+type: FLAT_BOX
+box: 0 0 450 375
+boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Browse...
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_bind_file_browse
+name: 
 callback: 
 argument: 
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 160 148 190 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 141 47 171 34
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: User Interface file|#U
+label: Spell command
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_ui_file
+name: choice_spell_command
 callback: C_FormBaseInputCB
 argument: 0
 
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 350 148 80 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: Browse...
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_ui_file_browse
-callback: 
-argument: 
-
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 24 230 310 30
+box: 208 100 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Override X-Windows dead-keys|#O
+label: Use alternative language
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_override_x_dead_keys
+name: check_alt_lang
 callback: C_FormBaseInputCB
 argument: 0
-       value: 1
-
-=============== FORM ===============
-Name: form_printer
-Width: 450
-Height: 320
-Number of Objects: 20
 
 --------------------
-class: FL_BOX
-type: FLAT_BOX
-box: 0 0 450 320
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 239 100 170 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
@@ -695,362 +672,328 @@ label:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: input_alt_lang
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 130 75 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 208 130 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: command
+label: Use escape characters
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_command
+name: check_escape_chars
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 130 105 80 30
+box: 239 130 170 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: page range
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_page_range
+name: input_escape_chars
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 130 135 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 208 160 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: copies
+label: Use personal dictionary
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_copies
+name: check_personal_dict
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 130 165 80 30
+box: 239 160 170 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: reverse
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_reverse
+name: input_personal_dict
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 130 195 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 239 190 89 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: to printer
+label: Browse...
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_to_printer
+name: button_personal_dict
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 130 225 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 130 230 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: file extension
+label: Accept compound words
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_file_extension
+name: check_compound_words
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 130 255 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 130 260 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: spool command
+label: Use input encoding
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_spool_command
+name: check_input_enc
 callback: C_FormBaseInputCB
 argument: 0
 
+=============== FORM ===============
+Name: form_lnf_general
+Width: 450
+Height: 350
+Number of Objects: 9
+
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 130 285 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_BOX
+type: FLAT_BOX
+box: 0 0 450 350
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: paper type
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_paper_type
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 360 75 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 15 15 310 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: even pages
+label: Show banner|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_even_pages
+name: check_banner
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 360 105 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 15 45 310 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: odd pages
+label: Auto region delete|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_odd_pages
+name: check_auto_region_delete
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 360 135 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 15 75 310 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: collated
+label: Exit confirmation|#E
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_collated
+name: check_exit_confirm
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 360 165 80 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: landscape
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_landscape
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 360 195 80 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: to file
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_to_file
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 360 225 80 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: extra options
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_extra_options
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 360 255 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 15 105 310 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: spool printer prefix
+label: Display keyboard shortcuts
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_spool_prefix
+name: check_display_shortcuts
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 360 285 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_COUNTER
+type: SIMPLE_COUNTER
+box: 320 255 115 30
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_BLUE
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: paper size
+label: Autosave interval
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_paper_size
+name: counter_autosave
 callback: C_FormBaseInputCB
 argument: 0
+  bounds: 0 1200
+  precision: 0
+  value: 300
+  sstep: 1
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 130 10 80 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 15 135 310 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: name
+label: File->New asks for name|#N
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_name
+name: check_ask_new_file
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 240 10 120 30
+box: 15 165 310 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: adapt output
+label: Cursor follows scrollbar|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_adapt_output
+name: check_cursor_follows_scrollbar
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 --------------------
-class: FL_LABELFRAME
-type: ENGRAVED_FRAME
-box: 0 60 452 260
-boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
+class: FL_COUNTER
+type: SIMPLE_COUNTER
+box: 320 225 115 30
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_BLUE
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Printer Command and Flags
+label: Wheel mouse jump
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: counter_wm_jump
+callback: C_FormBaseInputCB
+argument: 0
+  bounds: 0 250
+  precision: 0
+  value: 100
+  sstep: 1
 
 =============== FORM ===============
-Name: form_paths
+Name: form_interface
 Width: 450
-Height: 320
-Number of Objects: 17
+Height: 350
+Number of Objects: 9
 
 --------------------
 class: FL_BOX
 type: FLAT_BOX
-box: 0 0 450 320
+box: 0 0 450 350
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -1068,138 +1011,79 @@ argument:
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 170 10 170 30
+box: 230 30 200 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: Default path
+label: Popup Font
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_default_path
+name: input_popup_font
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 340 10 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: Browse...
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_document_browse
-callback: 
-argument: 
-
---------------------
-class: FL_COUNTER
-type: SIMPLE_COUNTER
-box: 170 130 90 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_BLUE
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 230 60 200 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: Last file count
+label: Menu Font
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: counter_lastfiles
+name: input_menu_font
 callback: C_FormBaseInputCB
 argument: 0
-  bounds: 0 9
-  precision: 0
-  value: 4
-  sstep: 1
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 170 40 170 30
+box: 230 90 200 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: Template path
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_template_path
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 340 40 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: Browse...
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_template_browse
-callback: 
-argument: 
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 290 130 140 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: Check last files
+label: Popup Encoding
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_last_files
+name: input_popup_encoding
 callback: C_FormBaseInputCB
 argument: 0
-       value: 1
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 170 70 170 30
+box: 160 178 190 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: Temp dir
+label: Bind file|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_temp_dir
+name: input_bind_file
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 340 70 90 30
+box: 350 178 80 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -1210,32 +1094,32 @@ label: Browse...
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_temp_dir_browse
+name: button_bind_file_browse
 callback: 
 argument: 
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 170 100 170 30
+box: 160 148 190 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: Lastfiles
+label: User Interface file|#U
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_lastfiles
+name: input_ui_file
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 340 100 90 30
+box: 350 148 80 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -1246,263 +1130,388 @@ label: Browse...
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_lastfiles_browse
+name: button_ui_file_browse
 callback: 
 argument: 
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 35 70 50 30
+box: 24 230 310 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: Override X-Windows dead-keys|#O
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_use_temp_dir
+name: check_override_x_dead_keys
 callback: C_FormBaseInputCB
 argument: 0
        value: 1
 
+=============== FORM ===============
+Name: form_printer
+Width: 450
+Height: 350
+Number of Objects: 20
+
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 30 170 40 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+class: FL_BOX
+type: FLAT_BOX
+box: 0 0 450 350
+boxtype: FL_FLAT_BOX
+colors: FL_COL1 FL_COL1
+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: check_make_backups
+name: 
+callback: 
+argument: 
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 130 75 80 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: command
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_command
 callback: C_FormBaseInputCB
 argument: 0
-       value: 1
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 170 170 170 30
+box: 130 105 80 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: Backup path
+label: page range
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_backup_path
+name: input_page_range
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 340 170 90 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 130 135 80 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: Browse...
+label: copies
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_backup_path_browse
-callback: 
-argument: 
+name: input_copies
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 169 217 170 30
+box: 130 165 80 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: LyXServer pipe
+label: reverse
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_serverpipe
+name: input_reverse
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 339 217 90 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 130 195 80 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: Browse...
+label: to printer
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_serverpipe_browse
-callback: 
-argument: 
+name: input_to_printer
+callback: C_FormBaseInputCB
+argument: 0
 
-=============== FORM ===============
-Name: form_preferences
-Width: 470
-Height: 475
-Number of Objects: 8
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 130 225 80 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: file extension
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_file_extension
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_BOX
-type: UP_BOX
-box: 0 0 470 475
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 130 255 80 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: spool command
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: input_spool_command
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 270 380 90 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 130 285 80 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: Apply|#A
+label: paper type
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_apply
-callback: C_FormBaseApplyCB
+name: input_paper_type
+callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 370 380 90 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 360 75 80 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: Cancel|^[
+label: even pages
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
-callback: C_FormBaseCancelCB
+name: input_even_pages
+callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_BUTTON
-type: RETURN_BUTTON
-box: 170 380 90 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 360 105 80 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: Save
-shortcut: ^M
+label: odd pages
+shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_ok
-callback: C_FormBaseOKCB
+name: input_odd_pages
+callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_TABFOLDER
-type: TOP_TABFOLDER
-box: 5 10 455 365
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 360 135 80 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: collated
 shortcut: 
-resize: FL_RESIZE_NONE
+resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: tabfolder_prefs
-callback: 
-argument: 
+name: input_collated
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 5 380 90 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 360 165 80 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: Restore|#R
+label: landscape
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_restore
-callback: C_FormBaseRestoreCB
+name: input_landscape
+callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 5 420 460 55
-boxtype: FL_FLAT_BOX
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 360 195 80 30
+boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: to file
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_to_file
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 360 225 80 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: extra options
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_extra_options
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 360 255 80 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: spool printer prefix
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_spool_prefix
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 360 285 80 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: paper size
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_paper_size
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 130 10 80 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: name
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_name
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 240 10 120 30
+boxtype: FL_NO_BOX
+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: adapt output
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: text_warning
-callback: 
-argument: 
+name: check_adapt_output
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_FRAME
+class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 0 415 470 1
+box: 0 60 452 260
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Printer Command and Flags
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1511,15 +1520,15 @@ callback:
 argument: 
 
 =============== FORM ===============
-Name: form_outer_tab
-Width: 455
-Height: 345
-Number of Objects: 2
+Name: form_paths
+Width: 450
+Height: 350
+Number of Objects: 17
 
 --------------------
 class: FL_BOX
 type: FLAT_BOX
-box: 0 0 455 345
+box: 0 0 450 350
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -1535,259 +1544,249 @@ callback:
 argument: 
 
 --------------------
-class: FL_TABFOLDER
-type: TOP_TABFOLDER
-box: 0 0 455 345
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 170 10 170 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Default path
 shortcut: 
-resize: FL_RESIZE_NONE
+resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: tabfolder_outer
-callback: 
-argument: 
-
-=============== FORM ===============
-Name: form_outputs_general
-Width: 455
-Height: 345
-Number of Objects: 4
+name: input_default_path
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_BOX
-type: FLAT_BOX
-box: 0 0 455 345
-boxtype: FL_FLAT_BOX
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 340 10 90 30
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Browse...
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
+name: button_document_browse
 callback: 
 argument: 
 
 --------------------
 class: FL_COUNTER
 type: SIMPLE_COUNTER
-box: 295 50 120 30
+box: 170 130 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_BLUE
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Ascii line length|#A
+label: Last file count
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: counter_line_len
+name: counter_lastfiles
 callback: C_FormBaseInputCB
 argument: 0
-  bounds: 0 120
+  bounds: 0 9
   precision: 0
-  value: 75
+  value: 4
   sstep: 1
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 216 95 200 30
+box: 170 40 170 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: TeX encoding
+label: Template path
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_tex_encoding
+name: input_template_path
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 217 142 199 29
-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: Default paper size
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: choice_default_papersize
-callback: 
-argument: 
-
-=============== FORM ===============
-Name: form_spellchecker
-Width: 450
-Height: 320
-Number of Objects: 11
-
---------------------
-class: FL_BOX
-type: FLAT_BOX
-box: 0 0 450 320
-boxtype: FL_FLAT_BOX
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 340 40 90 30
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Browse...
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
+name: button_template_browse
 callback: 
 argument: 
 
 --------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 141 47 171 34
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_TOP
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 134 100 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Spell command
+label: Check last files
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: choice_spell_command
+name: check_last_files
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 208 100 30 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_LEFT
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 340 70 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: Use alternative language
+label: Browse...
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_alt_lang
-callback: C_FormBaseInputCB
-argument: 0
+name: button_temp_dir_browse
+callback: 
+argument: 
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 239 100 170 30
+box: 170 100 170 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 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: input_alt_lang
+name: input_lastfiles
 callback: C_FormBaseInputCB
 argument: 0
 
+--------------------
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 340 100 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: Browse...
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: button_lastfiles_browse
+callback: 
+argument: 
+
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 208 130 30 30
+box: 134 170 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Use escape characters
+label: Backup path
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_escape_chars
+name: check_make_backups
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 239 130 170 30
+box: 170 170 170 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 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: input_escape_chars
+name: input_backup_path
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 208 160 30 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_LEFT
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 340 170 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: Use personal dictionary
+label: Browse...
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_personal_dict
-callback: C_FormBaseInputCB
-argument: 0
+name: button_backup_path_browse
+callback: 
+argument: 
 
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 239 160 170 30
+box: 169 217 170 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: LyXServer pipe
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_personal_dict
+name: input_serverpipe
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_BUTTON
 type: NORMAL_BUTTON
-box: 239 190 89 30
+box: 339 217 90 30
 boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -1798,45 +1797,46 @@ label: Browse...
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: button_personal_dict
-callback: C_FormBaseInputCB
-argument: 0
+name: button_serverpipe_browse
+callback: 
+argument: 
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 130 230 30 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_RIGHT
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 170 70 170 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: Accept compound words
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_compound_words
+name: input_temp_dir
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 130 260 30 30
+box: 134 70 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_RIGHT
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Use input encoding
+label: Temp dir
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_input_enc
+name: check_use_temp_dir
 callback: C_FormBaseInputCB
 argument: 0
+       value: 1
 
 ==============================
 create_the_forms
index cb3c222bde7bc7eba5211f42caef617577a73f40..f3387ad841da114a3231327ca950107d6032cdd1 100644 (file)
@@ -256,7 +256,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel|^[
+label: Cancel|C#C^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
index c0ecc1c7f54ba65e4c17e6befe1a1a308f76a094..1852217867994343cb3ed635b69322561498e495 100644 (file)
@@ -36,7 +36,7 @@ type: HOLD_BROWSER
 box: 10 10 270 280
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_BOTTOM
+alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
@@ -58,8 +58,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Update
-shortcut: Update|#U#u
+label: Update|#U
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
 name: button_update
@@ -76,7 +76,7 @@ alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Sort
+label: Sort|#S
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
@@ -94,7 +94,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Name:
+label: Name:|#N
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NorthEast FL_NorthEast
@@ -112,7 +112,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Reference:
+label: Ref:
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NorthEast FL_NorthEast
@@ -130,8 +130,8 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Reference type
-shortcut: Reference type|#t
+label: Reference type|#R
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: type
@@ -148,8 +148,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Goto reference
-shortcut: Goto reference|#G
+label: Goto reference|#G
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: button_go
@@ -184,7 +184,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Cancel
+label: Cancel|#C^[
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
index c5a51a3ef55e3a4986153b9315b87e78ae1feb3e..1e65285999c3a0ff1857dcad42945b891d004ddd 100644 (file)
@@ -59,7 +59,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Close|#C
+label: Close|#C^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -124,13 +124,13 @@ argument:
 =============== FORM ===============
 Name: form_tabular_options
 Width: 505
-Height: 227
-Number of Objects: 11
+Height: 225
+Number of Objects: 10
 
 --------------------
 class: FL_BOX
 type: FLAT_BOX
-box: 0 0 505 227
+box: 0 0 505 225
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
@@ -145,24 +145,6 @@ name:
 callback: 
 argument: 
 
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 280 20 120 75
-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_BUTTON
 type: NORMAL_BUTTON
@@ -281,7 +263,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Longtable
+label: Longtable|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -308,14 +290,14 @@ callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 285 10 100 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 280 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
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
 label: Spec. Table
 shortcut: 
@@ -329,7 +311,7 @@ argument:
 Name: form_column_options
 Width: 505
 Height: 227
-Number of Objects: 21
+Number of Objects: 17
 
 --------------------
 class: FL_BOX
@@ -349,42 +331,6 @@ name:
 callback: 
 argument: 
 
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 20 20 170 105
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_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: 25 10 70 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: Borders
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
@@ -458,124 +404,124 @@ callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 200 20 130 105
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 205 30 110 25
 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|#e
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_align_left
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 205 10 115 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 205 80 115 25
+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: H. Alignment
+label: Right|#i
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_align_right
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: RADIO_BUTTON
-box: 205 30 110 25
+box: 205 55 115 25
 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: Left|#e
+label: Center|#c
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_left
+name: radio_align_center
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 205 80 115 25
+type: PUSH_BUTTON
+box: 345 30 125 25
 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|#i
+label: Top|#p
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_right
+name: radio_valign_top
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 205 55 115 25
+type: PUSH_BUTTON
+box: 345 55 125 25
 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|#c
+label: Center|#n
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_center
+name: radio_valign_center
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 375 150 95 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 345 80 120 25
+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: Width of column:
+label: Bottom|#o
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_column_width
+name: radio_valign_bottom
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_FRAME
+class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 340 20 130 105
+box: 20 20 170 105
 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: Borders
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -584,16 +530,16 @@ callback:
 argument: 
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 345 10 115 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 200 20 130 105
+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: V. Alignment
+label: H. Alignment
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -602,16 +548,16 @@ callback:
 argument: 
 
 --------------------
-class: FL_FRAME
+class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 20 140 220 50
+box: 340 20 130 105
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-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: 
+label: V. Alignment
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -622,32 +568,74 @@ argument:
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 30 150 200 30
+box: 320 170 95 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Width|#W
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_special_alignment
+name: input_column_width
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 25 130 170 20
-boxtype: FL_FLAT_BOX
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 85 170 215 30
+boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+alignment: FL_ALIGN_TOP
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: Alignment|#A
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: input_special_alignment
+callback: C_FormBaseInputCB
+argument: 0
+
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 20 135 450 80
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP
 style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Special Column Alignment
+label: Special column
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
+=============== FORM ===============
+Name: form_cell_options
+Width: 505
+Height: 225
+Number of Objects: 21
+
+--------------------
+class: FL_BOX
+type: FLAT_BOX
+box: 0 0 505 225
+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
@@ -658,272 +646,194 @@ argument:
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 345 30 125 25
+box: 85 45 25 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Top|#p
+label: Top|#t
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_valign_top
+name: radio_border_top
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 345 55 125 25
+box: 85 75 25 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_BOTTOM_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Center|#n
+label: Bottom|#b
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_valign_center
+name: radio_border_bottom
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 345 80 120 25
+box: 65 60 25 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bottom|#o
+label: Left|#l
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_valign_bottom
+name: radio_border_left
 callback: C_FormBaseInputCB
 argument: 0
 
-=============== FORM ===============
-Name: form_cell_options
-Width: 505
-Height: 227
-Number of Objects: 26
-
 --------------------
-class: FL_BOX
-type: FLAT_BOX
-box: 0 0 505 227
-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: 335 115 155 100
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 105 60 25 25
 boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_CENTER
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_RIGHT
 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_border_right
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 115 180 100
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 205 30 110 25
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_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: 15 105 70 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: Borders
+label: Left|#e
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_align_left
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 195 115 130 100
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 205 80 115 25
 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
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 200 105 115 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: H. Alignment
+label: Right|#i
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_align_right
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 345 105 115 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
+class: FL_CHECKBUTTON
+type: RADIO_BUTTON
+box: 205 55 115 25
+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: V. Alignment
+label: Center|#c
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_align_center
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 15 150 90
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 345 30 125 25
 boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
+colors: FL_COL1 FL_YELLOW
 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: 15 5 140 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: Special Cell
+label: Top|#p
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_valign_top
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 10 25 145 25
+box: 345 55 125 25
 boxtype: FL_NO_BOX
 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: Multicolumn|#M
+label: Center|#n
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_multicolumn
+name: radio_valign_center
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 10 75 145 25
+box: 345 80 120 25
 boxtype: FL_NO_BOX
 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: Rotate 90°
+label: Bottom|#o
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_rotate_cell
+name: radio_valign_bottom
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_FRAME
+class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 165 15 325 90
+box: 20 20 170 105
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-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: 
+label: Borders
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -932,34 +842,34 @@ callback:
 argument: 
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 175 30 310 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 200 20 130 105
+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: 
+label: H. Alignment
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_special_multialign
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 170 5 290 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 340 20 130 105
+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: Special Multicolumn Alignment
+label: V. Alignment
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -970,14 +880,14 @@ argument:
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
-box: 360 65 125 30
+box: 280 180 175 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: Width of multi-column:
+label: Width|#W
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -986,208 +896,118 @@ callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 75 140 25 25
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_TOP_LEFT
-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_border_top
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 75 170 25 25
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_BOTTOM_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Bottom|#b
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_border_bottom
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 55 155 25 25
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 280 145 175 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: Left|#l
+label: Alignment|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_border_left
+name: input_special_multialign
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 95 155 25 25
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_RIGHT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Right|#r
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_border_right
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 195 125 110 25
-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: Left|#e
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_align_left
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 195 175 115 25
+box: 30 140 130 25
 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|#i
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_align_right
-callback: C_FormBaseInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 195 150 115 25
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Center|#c
+label: Multicolumn|#M
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_center
+name: radio_multicolumn
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 345 125 140 25
+box: 30 165 130 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Top|#p
+label: Use Minipage|#s
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_valign_top
+name: radio_useminipage
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 345 150 140 25
+box: 30 190 130 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Center|#n
+label: Rotate 90°|#9
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_valign_center
+name: radio_rotate_cell
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 345 175 140 25
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 20 135 150 80
 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|#o
+label: Special Cell
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_valign_bottom
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 50 145 25
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 180 135 290 80
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-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: Use Minipage|#s
+label: Special Multicolumn
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_useminipage
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
 
 =============== FORM ===============
 Name: form_longtable_options
 Width: 505
 Height: 227
-Number of Objects: 12
+Number of Objects: 9
 
 --------------------
 class: FL_BOX
@@ -1207,53 +1027,17 @@ name:
 callback: 
 argument: 
 
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 20 100 75
-boxtype: FL_NO_BOX
-colors: FL_BLACK 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: 15 10 85 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: Header
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 15 30 90 25
+box: 30 55 90 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: First Head
+label: 1st Head|#1
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1264,14 +1048,14 @@ argument: 0
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 15 60 90 25
+box: 30 30 90 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Head
+label: Head|#H
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1280,88 +1064,70 @@ callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 130 20 100 75
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 195 30 90 25
 boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
+colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: 
+label: Foot|#F
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 135 10 85 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: Footer
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: radio_lt_foot
+callback: C_FormBaseInputCB
+argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 135 30 90 25
+box: 195 55 90 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Foot
+label: Last Foot|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_lt_foot
+name: radio_lt_lastfoot
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 135 60 90 25
+box: 355 25 90 25
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Last Foot
+label: New Page|#N
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_lt_lastfoot
+name: radio_lt_newpage
 callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_FRAME
+class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 245 20 95 75
+box: 20 20 150 75
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Header
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1370,16 +1136,16 @@ callback:
 argument: 
 
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 250 10 85 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 185 20 150 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: Special
+label: Footer
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1388,22 +1154,22 @@ callback:
 argument: 
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 250 30 90 25
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 345 20 150 75
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-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: New Page
+label: Special
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_lt_newpage
-callback: C_FormBaseInputCB
-argument: 0
+name: 
+callback: 
+argument: 
 
 ==============================
 create_the_forms
index 838c000b14206c5a878a1e294fffb97b7f529383..96aa461e58b73b26ef72a738a37ca07f9c905823 100644 (file)
@@ -77,7 +77,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel|^[
+label: Cancel|#C^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
index 637d61c8ab4d3571598d101cf3f699c3fe3e1d07..1dac62c82884c54db27aebf3f5b75db768767a5b 100644 (file)
@@ -58,8 +58,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Close
-shortcut: ^M
+label: Close|#C^[^M
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: 
@@ -76,8 +76,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Update
-shortcut: Update|#U#u
+label: Update|#U
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: 
@@ -94,8 +94,8 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Type
-shortcut: Type|#T#t
+label: Type|#T
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: type
index 9c90c9c7e7981b5be50b3cddb1e93818cc42f9f3..d068619c56a5aa4b70732954721e46006aecde2b 100644 (file)
@@ -40,8 +40,8 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: URL
-shortcut: Url|#U
+label: URL|#U
+shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NorthWest FL_NorthEast
 name: url
@@ -58,8 +58,8 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Name
-shortcut: Name|#N
+label: Name|#N
+shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NorthWest FL_NorthEast
 name: name
@@ -76,8 +76,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: HTML type
-shortcut: HTML type|#H
+label: HTML type|#H
+shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NorthWest FL_NorthEast
 name: radio_html
@@ -94,8 +94,8 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Cancel
-shortcut: ^[
+label: Cancel|#C^[
+shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthEast FL_SouthEast
 name: button_cancel
index 01152a1b331460a599b6a64c308eabe6409ead26..c0638c20fa3e162f09d912e8106401fdd97feb71 100644 (file)
@@ -29,6 +29,7 @@
 #include "buffer.h"
 
 using std::endl;
+using SigC::slot;
 
 extern bool keyseqUncomplete();
 extern string keyseqOptions(int l = 190);