anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TabularUi: follow our naming convention

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30483 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-07-11 14:43:30 +00:00
parent 8a3a2baf6d
commit c5f225ce63
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontends/qt4/GuiTabular.cpp
View File

@ -127,7 +127,7 @@ GuiTabular::GuiTabular(GuiView & lv)
this, SLOT(specialAlignment_changed())); this, SLOT(specialAlignment_changed()));
connect(widthED, SIGNAL(editingFinished()), connect(widthED, SIGNAL(editingFinished()),
this, SLOT(width_changed())); this, SLOT(width_changed()));
connect(widthUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)), connect(widthUnitCB, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(width_changed())); this, SLOT(width_changed()));
connect(closePB, SIGNAL(clicked()), connect(closePB, SIGNAL(clicked()),
this, SLOT(close_clicked())); this, SLOT(close_clicked()));
@ -173,7 +173,7 @@ GuiTabular::GuiTabular(GuiView & lv)
bc().addReadOnly(rotateTabularCB); bc().addReadOnly(rotateTabularCB);
bc().addReadOnly(specialAlignmentED); bc().addReadOnly(specialAlignmentED);
bc().addReadOnly(widthED); bc().addReadOnly(widthED);
bc().addReadOnly(widthUnit); bc().addReadOnly(widthUnitCB);
bc().addReadOnly(hAlignCB); bc().addReadOnly(hAlignCB);
bc().addReadOnly(vAlignCB); bc().addReadOnly(vAlignCB);
bc().addReadOnly(TableAlignCB); bc().addReadOnly(TableAlignCB);
@ -382,7 +382,7 @@ void GuiTabular::specialAlignment_changed()
void GuiTabular::width_changed() void GuiTabular::width_changed()
{ {
changed(); changed();
string const width = widgetsToLength(widthED, widthUnit); string const width = widgetsToLength(widthED, widthUnitCB);
setWidth(width); setWidth(width);
} }
@ -771,11 +771,11 @@ void GuiTabular::updateContents()
string colwidth; string colwidth;
if (!pwidth.zero()) if (!pwidth.zero())
colwidth = pwidth.asString(); colwidth = pwidth.asString();
lengthToWidgets(widthED, widthUnit, lengthToWidgets(widthED, widthUnitCB,
colwidth, default_unit); colwidth, default_unit);
widthED->setEnabled(!isReadonly); widthED->setEnabled(!isReadonly);
widthUnit->setEnabled(!isReadonly); widthUnitCB->setEnabled(!isReadonly);
hAlignCB->clear(); hAlignCB->clear();
hAlignCB->addItem(qt_("Left")); hAlignCB->addItem(qt_("Left"));
@ -1016,7 +1016,7 @@ void GuiTabular::closeGUI()
// apply the fixed width values // apply the fixed width values
size_t const cell = getActiveCell(); size_t const cell = getActiveCell();
bool const multicol = tabular_.isMultiColumn(cell); bool const multicol = tabular_.isMultiColumn(cell);
string width = widgetsToLength(widthED, widthUnit); string width = widgetsToLength(widthED, widthUnitCB);
string width2; string width2;
Length llen = getColumnPWidth(tabular_, cell); Length llen = getColumnPWidth(tabular_, cell);

4
src/frontends/qt4/ui/TabularUi.ui
View File

@ -214,7 +214,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="LengthCombo" name="widthUnit"/> <widget class="LengthCombo" name="widthUnitCB"/>
</item> </item>
<item row="1" column="3"> <item row="1" column="3">
<spacer name="spacer_3"> <spacer name="spacer_3">
@ -1490,7 +1490,7 @@
<tabstop>TabWidget</tabstop> <tabstop>TabWidget</tabstop>
<tabstop>hAlignCB</tabstop> <tabstop>hAlignCB</tabstop>
<tabstop>widthED</tabstop> <tabstop>widthED</tabstop>
<tabstop>widthUnit</tabstop> <tabstop>widthUnitCB</tabstop>
<tabstop>vAlignCB</tabstop> <tabstop>vAlignCB</tabstop>
<tabstop>multicolumnCB</tabstop> <tabstop>multicolumnCB</tabstop>
<tabstop>rotateTabularCB</tabstop> <tabstop>rotateTabularCB</tabstop>