[EMAIL PROTECTED] wrote:
> In the tabular dialog (xforms), it is impossible to specify
> a fixed width for multicolumn cells.
the attached patch fixes this. It also fixes bug 572 (hAlignment reset...).
http://bugzilla.lyx.org/show_bug.cgi?id=572
Michael, can you please test if both bugs are fixed for you?
Thanks,
Jürgen.
P.S.: Lars, I think at least the fix for the bug above should go in. It's just
a typo fix. The fix for bug 572 is also trivial.
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.644
diff -u -r1.644 ChangeLog
--- src/frontends/xforms/ChangeLog 2002/12/18 16:56:38 1.644
+++ src/frontends/xforms/ChangeLog 2002/12/20 11:44:05
@@ -1,3 +1,7 @@
+2002-12-20 Jürgen Spitzmüller <[EMAIL PROTECTED]>
+
+ * FormTabular.C: fix bug 572, fix ReadOnly logic.
+
2002-12-18 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* Menubar_pimpl.C (create_submenu): do not query the status of a
Index: src/frontends/xforms/FormTabular.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormTabular.C,v
retrieving revision 1.63
diff -u -r1.63 FormTabular.C
--- src/frontends/xforms/FormTabular.C 2002/12/01 22:59:21 1.63
+++ src/frontends/xforms/FormTabular.C 2002/12/20 11:44:10
@@ -188,12 +188,16 @@
}
pwidth = tabular->GetMColumnPWidth(cell);
align = tabular->GetAlignment(cell);
- if (align == LYX_ALIGN_LEFT)
- fl_set_button(cell_options_->radio_align_left, 1);
- else if (align == LYX_ALIGN_RIGHT)
+ // set the horiz. alignment, default is left here
+ fl_set_button(column_options_->radio_align_left, 0);
+ fl_set_button(column_options_->radio_align_right, 0);
+ fl_set_button(column_options_->radio_align_center, 0);
+ if (align == LYX_ALIGN_RIGHT)
fl_set_button(cell_options_->radio_align_right, 1);
- else
+ else if (align == LYX_ALIGN_CENTER)
fl_set_button(cell_options_->radio_align_center, 1);
+ else
+ fl_set_button(cell_options_->radio_align_left, 1);
align = tabular->GetVAlignment(cell);
fl_set_button(cell_options_->radio_valign_top, 0);
@@ -214,7 +218,7 @@
cell_options_->choice_value_mcolumn_width,
pwidth, default_unit);
- if (bc().bp().isReadOnly()) {
+ if (!bc().bp().isReadOnly()) {
setEnabled(cell_options_->input_special_multialign, true);
setEnabled(cell_options_->input_mcolumn_width, true);
setEnabled(cell_options_->choice_value_mcolumn_width, true);
