Juergen Spitzmueller wrote:
> 3.) The keyboard focus is always on "add column". This means, when the user
> presses enter to "apply" e.g. a width value, a column is also added.
fixed.
> 4.) hAlign: outside a multicolumn, block alignment is allowed, but not
> inside a multicolumn (at least in the xforms gui). In the hAlign combo,
> however, you can always chose block (without any effect in multicol,
> though)
fixed: Block is now only in the combo if we have a fixed width column.
Also fixed: Enabling of vAlign wrt fixed width.
Jürgen.
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.321
diff -u -r1.321 ChangeLog
--- src/frontends/qt2/ChangeLog 2002/11/27 18:47:09 1.321
+++ src/frontends/qt2/ChangeLog 2002/11/27 19:52:11
@@ -1,6 +1,12 @@
2002-11-27 Juergen Spitzmueller <[EMAIL PROTECTED]>
* ui/TabularDialog.ui
+ * QTabular.C
+ * QTabularDialog.C: ui fixes.
+
+2002-11-27 Juergen Spitzmueller <[EMAIL PROTECTED]>
+
+ * ui/TabularDialog.ui
* QTabular.[Ch]
* QTabularDialog.[Ch]: implement most functions
* qsetborder.[Ch]: fixes
Index: src/frontends/qt2/QTabular.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/QTabular.C,v
retrieving revision 1.5
diff -u -r1.5 QTabular.C
--- src/frontends/qt2/QTabular.C 2002/11/27 18:47:09 1.5
+++ src/frontends/qt2/QTabular.C 2002/11/27 19:52:12
@@ -136,18 +136,31 @@
}
dialog_->widthED->setEnabled(!isReadonly);
dialog_->widthUnit->setEnabled(!isReadonly);
+
+ dialog_->hAlignCB->clear();
+ dialog_->hAlignCB->insertItem(_("Left"));
+ dialog_->hAlignCB->insertItem(_("Center"));
+ dialog_->hAlignCB->insertItem(_("Right"));
+ if (!multicol && !pwidth.zero())
+ dialog_->hAlignCB->insertItem(_("Block"));
int align = 0;
switch(tabular->GetAlignment(cell)) {
case LYX_ALIGN_LEFT:
- align = 1;
+ align = 0;
break;
case LYX_ALIGN_CENTER:
- align = 2;
+ align = 1;
break;
case LYX_ALIGN_RIGHT:
- align = 3;
+ align = 2;
+ break;
+ case LYX_ALIGN_BLOCK:
+ {
+ if (!multicol && !pwidth.zero())
+ align = 3;
break;
+ }
default:
align = 0;
break;
Index: src/frontends/qt2/QTabularDialog.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/QTabularDialog.C,v
retrieving revision 1.3
diff -u -r1.3 QTabularDialog.C
--- src/frontends/qt2/QTabularDialog.C 2002/11/27 18:47:09 1.3
+++ src/frontends/qt2/QTabularDialog.C 2002/11/27 19:52:12
@@ -83,6 +83,7 @@
form_->controller().set(LyXTabular::SET_ALL_LINES);
form_->update_borders();
form_->changed();
+ //FIXME: qsetborder widget not updated
}
void QTabularDialog::borderUnset_clicked()
@@ -90,6 +91,7 @@
form_->controller().set(LyXTabular::UNSET_ALL_LINES);
form_->update_borders();
form_->changed();
+ //FIXME: qsetborder widget not updated
}
void QTabularDialog::leftBorder_changed()
@@ -139,19 +141,22 @@
void QTabularDialog::width_changed()
{
- string const width =
- LyXLength(widthED->text().toDouble(),
- widthUnit->currentLengthItem()).asString();
+ string const width =
+ LyXLength(widthED->text().toDouble(),
+ widthUnit->currentLengthItem()).asString();
if (form_->controller().isMulticolumnCell())
form_->controller().set(LyXTabular::SET_MPWIDTH, width);
else
form_->controller().set(LyXTabular::SET_PWIDTH, width);
+ form_->changed();
+ form_->update_contents();
}
void QTabularDialog::multicolumn_clicked()
{
form_->controller().set(LyXTabular::MULTICOLUMN);
form_->changed();
+ form_->update_contents();
}
void QTabularDialog::rotateTabular_checked(int state)
@@ -192,27 +197,27 @@
switch(align) {
case 0:
{
- num = LyXTabular::ALIGN_BLOCK;
- //FIXME: multi_num no equivalent
- break;
- }
- case 1:
- {
num = LyXTabular::ALIGN_LEFT;
multi_num = LyXTabular::M_ALIGN_LEFT;
break;
}
- case 2:
+ case 1:
{
num = LyXTabular::ALIGN_CENTER;
multi_num = LyXTabular::M_ALIGN_CENTER;
break;
}
- case 3:
+ case 2:
{
num = LyXTabular::ALIGN_RIGHT;
multi_num = LyXTabular::M_ALIGN_RIGHT;
break;
+ case 3:
+ {
+ num = LyXTabular::ALIGN_BLOCK;
+ //multi_num: no equivalent
+ break;
+ }
}
}
if (form_->controller().isMulticolumnCell())
Index: src/frontends/qt2/ui/QTabularDialog.ui
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/ui/QTabularDialog.ui,v
retrieving revision 1.5
diff -u -r1.5 QTabularDialog.ui
--- src/frontends/qt2/ui/QTabularDialog.ui 2002/11/27 18:47:09 1.5
+++ src/frontends/qt2/ui/QTabularDialog.ui 2002/11/27 19:52:18
@@ -186,6 +186,10 @@
<name>text</name>
<string>A&dd</string>
</property>
+ <property stdset="1">
+ <name>autoDefault</name>
+ <bool>false</bool>
+ </property>
<property>
<name>toolTip</name>
<string>Append column (right)</string>
@@ -201,6 +205,10 @@
<name>text</name>
<string>De&lete</string>
</property>
+ <property stdset="1">
+ <name>autoDefault</name>
+ <bool>false</bool>
+ </property>
<property>
<name>toolTip</name>
<string>Delete current column</string>
@@ -237,6 +245,10 @@
<name>text</name>
<string>&Add</string>
</property>
+ <property stdset="1">
+ <name>autoDefault</name>
+ <bool>false</bool>
+ </property>
<property>
<name>toolTip</name>
<string>Append row (below)</string>
@@ -251,6 +263,10 @@
<property stdset="1">
<name>text</name>
<string>Dele&te</string>
+ </property>
+ <property stdset="1">
+ <name>autoDefault</name>
+ <bool>false</bool>
</property>
<property>
<name>toolTip</name>
