this, SLOT(specialAlignment_changed()));
connect(widthED, SIGNAL(editingFinished()),
this, SLOT(width_changed()));
this, SLOT(specialAlignment_changed()));
connect(widthED, SIGNAL(editingFinished()),
this, SLOT(width_changed()));
- connect(widthUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
+ connect(widthUnitCB, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(width_changed()));
connect(closePB, SIGNAL(clicked()),
this, SLOT(close_clicked()));
this, SLOT(width_changed()));
connect(closePB, SIGNAL(clicked()),
this, SLOT(close_clicked()));
bc().addReadOnly(rotateTabularCB);
bc().addReadOnly(specialAlignmentED);
bc().addReadOnly(widthED);
bc().addReadOnly(rotateTabularCB);
bc().addReadOnly(specialAlignmentED);
bc().addReadOnly(widthED);
- bc().addReadOnly(widthUnit);
+ bc().addReadOnly(widthUnitCB);
bc().addReadOnly(hAlignCB);
bc().addReadOnly(vAlignCB);
bc().addReadOnly(TableAlignCB);
bc().addReadOnly(hAlignCB);
bc().addReadOnly(vAlignCB);
bc().addReadOnly(TableAlignCB);
void GuiTabular::width_changed()
{
changed();
void GuiTabular::width_changed()
{
changed();
- string const width = widgetsToLength(widthED, widthUnit);
+ string const width = widgetsToLength(widthED, widthUnitCB);
string colwidth;
if (!pwidth.zero())
colwidth = pwidth.asString();
string colwidth;
if (!pwidth.zero())
colwidth = pwidth.asString();
- lengthToWidgets(widthED, widthUnit,
+ lengthToWidgets(widthED, widthUnitCB,
colwidth, default_unit);
widthED->setEnabled(!isReadonly);
colwidth, default_unit);
widthED->setEnabled(!isReadonly);
- widthUnit->setEnabled(!isReadonly);
+ widthUnitCB->setEnabled(!isReadonly);
hAlignCB->clear();
hAlignCB->addItem(qt_("Left"));
hAlignCB->clear();
hAlignCB->addItem(qt_("Left"));
// apply the fixed width values
size_t const cell = getActiveCell();
bool const multicol = tabular_.isMultiColumn(cell);
// apply the fixed width values
size_t const cell = getActiveCell();
bool const multicol = tabular_.isMultiColumn(cell);
- string width = widgetsToLength(widthED, widthUnit);
+ string width = widgetsToLength(widthED, widthUnitCB);
string width2;
Length llen = getColumnPWidth(tabular_, cell);
string width2;
Length llen = getColumnPWidth(tabular_, cell);
</widget>
</item>
<item row="1" column="2">
</widget>
</item>
<item row="1" column="2">
- <widget class="LengthCombo" name="widthUnit"/>
+ <widget class="LengthCombo" name="widthUnitCB"/>
</item>
<item row="1" column="3">
<spacer name="spacer_3">
</item>
<item row="1" column="3">
<spacer name="spacer_3">
<tabstop>TabWidget</tabstop>
<tabstop>hAlignCB</tabstop>
<tabstop>widthED</tabstop>
<tabstop>TabWidget</tabstop>
<tabstop>hAlignCB</tabstop>
<tabstop>widthED</tabstop>
- <tabstop>widthUnit</tabstop>
+ <tabstop>widthUnitCB</tabstop>
<tabstop>vAlignCB</tabstop>
<tabstop>multicolumnCB</tabstop>
<tabstop>rotateTabularCB</tabstop>
<tabstop>vAlignCB</tabstop>
<tabstop>multicolumnCB</tabstop>
<tabstop>rotateTabularCB</tabstop>