mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-19 22:40:26 +00:00
Further BC fixes to GuiCharacter
This commit is contained in:
parent
39596ab558
commit
7be3805a65
@ -595,7 +595,6 @@ void ButtonPolicy::Private::initOkApplyCancelAutoReadOnly()
|
||||
state_machine_[INVALID][SMI_INVALID] = INVALID;
|
||||
state_machine_[INVALID][SMI_READ_WRITE] = INVALID;
|
||||
state_machine_[INVALID][SMI_VALID] = VALID;
|
||||
state_machine_[INVALID][SMI_OKAY] = INITIAL;
|
||||
state_machine_[INVALID][SMI_RESTORE] = INITIAL;
|
||||
state_machine_[INVALID][SMI_READ_ONLY] = RO_INVALID;
|
||||
state_machine_[INVALID][SMI_AUTOAPPLY] = AUTOAPPLY_CHANGED;
|
||||
@ -609,6 +608,7 @@ void ButtonPolicy::Private::initOkApplyCancelAutoReadOnly()
|
||||
state_machine_[APPLIED][SMI_AUTOAPPLY] = AUTOAPPLY_INITIAL;
|
||||
// State::AUTOAPPLY_INITIAL
|
||||
state_machine_[AUTOAPPLY_INITIAL][SMI_AUTOAPPLY] = APPLIED;
|
||||
state_machine_[AUTOAPPLY_INITIAL][SMI_APPLY] = AUTOAPPLY_INITIAL;
|
||||
state_machine_[AUTOAPPLY_INITIAL][SMI_READ_ONLY] = RO_AUTOAPPLY;
|
||||
state_machine_[AUTOAPPLY_INITIAL][SMI_VALID] = AUTOAPPLY_CHANGED;
|
||||
state_machine_[AUTOAPPLY_INITIAL][SMI_INVALID] = AUTOAPPLY_CHANGED;
|
||||
|
@ -526,9 +526,6 @@ void GuiCharacter::paramsToDialog(Font const & font)
|
||||
QString const lang = (font.language() == reset_language)
|
||||
? "reset" : toqstr(font.language()->lang());
|
||||
langCO->setCurrentIndex(findPos2nd(language, lang));
|
||||
// disable the OK/Apply buttons, since we have no changes yet
|
||||
if (!autoapplyCB->isChecked())
|
||||
bc().setValid(false);
|
||||
}
|
||||
|
||||
|
||||
@ -568,6 +565,9 @@ bool GuiCharacter::initialiseParams(string const &)
|
||||
setButtonsValid(true);
|
||||
|
||||
paramsToDialog(font_);
|
||||
// Make sure that the bc is in the INITIAL state
|
||||
if (bc().policy().buttonStatus(ButtonPolicy::OKAY))
|
||||
bc().restore();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user