mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 21:40:19 +00:00
Disable colsep box when single column.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23060 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
4ab6f265e9
commit
bfe96fb61e
@ -536,6 +536,8 @@ GuiDocument::GuiDocument(GuiView & lv)
|
|||||||
this, SLOT(enableSkip(bool)));
|
this, SLOT(enableSkip(bool)));
|
||||||
connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
|
connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
|
||||||
this, SLOT(change_adaptor()));
|
this, SLOT(change_adaptor()));
|
||||||
|
connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
|
||||||
|
this, SLOT(setColSep()));
|
||||||
connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
|
connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
|
||||||
this, SLOT(change_adaptor()));
|
this, SLOT(change_adaptor()));
|
||||||
connect(textLayoutModule->bypassCB, SIGNAL(clicked()),
|
connect(textLayoutModule->bypassCB, SIGNAL(clicked()),
|
||||||
@ -1090,6 +1092,12 @@ void GuiDocument::setCustomPapersize(int papersize)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void GuiDocument::setColSep()
|
||||||
|
{
|
||||||
|
setCustomMargins(marginsModule->marginCB->checkState() == Qt::Checked);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void GuiDocument::setCustomMargins(bool custom)
|
void GuiDocument::setCustomMargins(bool custom)
|
||||||
{
|
{
|
||||||
marginsModule->topL->setEnabled(!custom);
|
marginsModule->topL->setEnabled(!custom);
|
||||||
@ -1120,9 +1128,11 @@ void GuiDocument::setCustomMargins(bool custom)
|
|||||||
marginsModule->footskipLE->setEnabled(!custom);
|
marginsModule->footskipLE->setEnabled(!custom);
|
||||||
marginsModule->footskipUnit->setEnabled(!custom);
|
marginsModule->footskipUnit->setEnabled(!custom);
|
||||||
|
|
||||||
marginsModule->columnsepL->setEnabled(!custom);
|
bool const enableColSep = !custom &&
|
||||||
marginsModule->columnsepLE->setEnabled(!custom);
|
textLayoutModule->twoColumnCB->checkState() == Qt::Checked;
|
||||||
marginsModule->columnsepUnit->setEnabled(!custom);
|
marginsModule->columnsepL->setEnabled(enableColSep);
|
||||||
|
marginsModule->columnsepLE->setEnabled(enableColSep);
|
||||||
|
marginsModule->columnsepUnit->setEnabled(enableColSep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -131,6 +131,7 @@ private Q_SLOTS:
|
|||||||
void setLSpacing(int);
|
void setLSpacing(int);
|
||||||
void setMargins(bool);
|
void setMargins(bool);
|
||||||
void setCustomPapersize(int);
|
void setCustomPapersize(int);
|
||||||
|
void setColSep();
|
||||||
void setCustomMargins(bool);
|
void setCustomMargins(bool);
|
||||||
void romanChanged(int);
|
void romanChanged(int);
|
||||||
void sansChanged(int);
|
void sansChanged(int);
|
||||||
|
Loading…
Reference in New Issue
Block a user