Angus, can you please apply this patch? It fixes a typo in
FormGraphics.C which is responsible for non-restoring the
height-choice AFAICS (copy & paste issue, I suppose).
Please delete the form_graphics.[fdC] stuff if you don't like it (the
framebox requested by Michael).
Thanks.
Jürgen
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.165
diff -u -r1.165 ChangeLog
--- src/frontends/xforms/ChangeLog 2001/09/13 11:44:06 1.165
+++ src/frontends/xforms/ChangeLog 2001/09/14 17:13:46
@@ -1,3 +1,9 @@
+2001-09-14 Jürgen Spitzmüller <[EMAIL PROTECTED]>
+
+ * FormGraphics.C: typo fix (choice_height_units was not reset
+ after "Restore").
+ * forms/form_graphics: cosmetics again...
+
2001-09-13 Angus Leeming <[EMAIL PROTECTED]>
* FormMathsBitmap.[Ch]: add d-tor to finally fix a memory leak.
Index: src/frontends/xforms/FormGraphics.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormGraphics.C,v
retrieving revision 1.33
diff -u -r1.33 FormGraphics.C
--- src/frontends/xforms/FormGraphics.C 2001/09/13 12:37:39 1.33
+++ src/frontends/xforms/FormGraphics.C 2001/09/13 16:48:28
@@ -254,7 +254,7 @@
default:
break;
}
- fl_set_choice(dialog_->choice_width_units, pos);
+ fl_set_choice(dialog_->choice_height_units, pos);
}
// Update the rotate angle
Index: src/frontends/xforms/form_graphics.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/form_graphics.C,v
retrieving revision 1.18
diff -u -r1.18 form_graphics.C
--- src/frontends/xforms/form_graphics.C 2001/09/13 12:37:40 1.18
+++ src/frontends/xforms/form_graphics.C 2001/09/13 16:48:30
@@ -29,13 +29,13 @@
fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast);
{
char const * const dummy = N_("File|#F");
- fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 90, 20, 280, 30, idex(_(dummy)));
+ fdui->input_filename = obj = fl_add_input(FL_NORMAL_INPUT, 90, 20, 270, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
{
char const * const dummy = N_("Browse|#B");
- fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 380, 20, 90, 30, idex(_(dummy)));
+ fdui->button_browse = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 20, 90, 30, idex(_(dummy)));
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseInputCB, 0);
@@ -120,6 +120,7 @@
fl_set_button_shortcut(obj, scex(_(dummy)), 1);
}
fl_set_object_callback(obj, C_FormBaseCancelCB, 0);
+ obj = fl_add_frame(FL_ENGRAVED_FRAME, 20, 10, 450, 50, "");
fl_end_form();
fdui->form->fdui = fdui;
Index: src/frontends/xforms/forms/form_graphics.fd
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/forms/form_graphics.fd,v
retrieving revision 1.11
diff -u -r1.11 form_graphics.fd
--- src/frontends/xforms/forms/form_graphics.fd 2001/09/13 12:37:40 1.11
+++ src/frontends/xforms/forms/form_graphics.fd 2001/09/13 16:48:31
@@ -10,7 +10,7 @@
Name: form_graphics
Width: 490
Height: 390
-Number of Objects: 22
+Number of Objects: 23
--------------------
class: FL_BOX
@@ -33,7 +33,7 @@
--------------------
class: FL_INPUT
type: NORMAL_INPUT
-box: 90 20 280 30
+box: 90 20 270 30
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_LEFT
@@ -51,7 +51,7 @@
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
-box: 380 20 90 30
+box: 370 20 90 30
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@@ -407,6 +407,24 @@
name: button_cancel
callback: C_FormBaseCancelCB
argument: 0
+
+--------------------
+class: FL_FRAME
+type: ENGRAVED_FRAME
+box: 20 10 450 50
+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:
==============================
create_the_forms
