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

Fix #7021: the problem was that activating the border combo was triggering dialogToParams() and thus disallowed because of the empty value.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36712 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2010-12-04 10:55:03 +00:00
parent 58f1126355
commit ecc492a3ce
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,20 +64,14 @@ GuiTabular::GuiTabular(QWidget * parent)
this, SLOT(checkEnabled()));
connect(topspaceUnitCB, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(checkEnabled()));
connect(topspaceCO, SIGNAL(activated(int)),
this, SLOT(checkEnabled()));
connect(bottomspaceED, SIGNAL(editingFinished()),
this, SLOT(checkEnabled()));
connect(bottomspaceUnitCB, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(checkEnabled()));
connect(bottomspaceCO, SIGNAL(activated(int)),
this, SLOT(checkEnabled()));
connect(interlinespaceED, SIGNAL(editingFinished()),
this, SLOT(checkEnabled()));
connect(interlinespaceUnitCB, SIGNAL(selectionChanged(lyx::Length::UNIT)),
this, SLOT(checkEnabled()));
connect(interlinespaceCO, SIGNAL(activated(int)),
this, SLOT(checkEnabled()));
connect(booktabsRB, SIGNAL(clicked(bool)),
this, SLOT(checkEnabled()));
connect(borderDefaultRB, SIGNAL(clicked(bool)),
@ -168,6 +162,30 @@ GuiTabular::GuiTabular(QWidget * parent)
}
void GuiTabular::on_topspaceCO_activated(int index)
{
bool const enable = (index == 2);
topspaceED->setEnabled(enable);
topspaceUnitCB->setEnabled(enable);
}
void GuiTabular::on_bottomspaceCO_activated(int index)
{
bool const enable = (index == 2);
bottomspaceED->setEnabled(enable);
bottomspaceUnitCB->setEnabled(enable);
}
void GuiTabular::on_interlinespaceCO_activated(int index)
{
bool const enable = (index == 2);
interlinespaceED->setEnabled(enable);
interlinespaceUnitCB->setEnabled(enable);
}
void GuiTabular::checkEnabled()
{
// if there is a LaTeX argument, the width and alignment will be overwrtitten

3
src/frontends/qt4/GuiTabular.h
View File

@ -33,6 +33,9 @@ private Q_SLOTS:
void checkEnabled();
void borderSet_clicked();
void borderUnset_clicked();
void on_topspaceCO_activated(int index);
void on_bottomspaceCO_activated(int index);
void on_interlinespaceCO_activated(int index);
private:
/// \name InsetParamsWidget inherited methods