Backport.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@27937 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2008-12-20 14:04:24 +00:00
parent 674e9fa168
commit 46a6e652ed

View File

@ -511,10 +511,13 @@ void GuiExternal::updateContents()
draftCB->setChecked(params_.draft);
displayGB->setChecked(params_.display);
displayscaleED->setEnabled(params_.display && !isBufferReadonly());
displayscaleED->setText(QString::number(params_.lyxscale));
bool scaled = params_.display && !isBufferReadonly() &&
(params_.preview_mode != PREVIEW_INSTANT);
displayscaleED->setEnabled(scaled);
scaleLA->setEnabled(scaled);
displayGB->setEnabled(lyxrc.display_graphics);
displayscaleED->setEnabled(params_.preview_mode != PREVIEW_INSTANT);
setRotation(*angleED, *originCO, params_.rotationdata);
@ -556,7 +559,11 @@ void GuiExternal::updateTemplate()
found = std::find(tr_begin, tr_end, external::Extra) != tr_end;
optionsGB->setEnabled(found);
displayscaleED->setEnabled(templ.preview_mode != PREVIEW_INSTANT);
bool scaled = displayGB->isChecked() && displayGB->isEnabled() &&
!isBufferReadonly() && (templ.preview_mode != PREVIEW_INSTANT);
displayscaleED->setEnabled(scaled);
scaleLA->setEnabled(scaled);
if (!found)
return;