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

Further BC fixes to GuiCharacter

Browse Source
This commit is contained in:
Juergen Spitzmueller 2018-05-05 17:24:09 +02:00
parent 39596ab558
commit 7be3805a65
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/ButtonPolicy.cpp
View File

@ -595,7 +595,6 @@ void ButtonPolicy::Private::initOkApplyCancelAutoReadOnly()
state_machine_[INVALID][SMI_INVALID] = INVALID; state_machine_[INVALID][SMI_INVALID] = INVALID;
state_machine_[INVALID][SMI_READ_WRITE] = INVALID; state_machine_[INVALID][SMI_READ_WRITE] = INVALID;
state_machine_[INVALID][SMI_VALID] = VALID; state_machine_[INVALID][SMI_VALID] = VALID;
state_machine_[INVALID][SMI_OKAY] = INITIAL;
state_machine_[INVALID][SMI_RESTORE] = INITIAL; state_machine_[INVALID][SMI_RESTORE] = INITIAL;
state_machine_[INVALID][SMI_READ_ONLY] = RO_INVALID; state_machine_[INVALID][SMI_READ_ONLY] = RO_INVALID;
state_machine_[INVALID][SMI_AUTOAPPLY] = AUTOAPPLY_CHANGED; state_machine_[INVALID][SMI_AUTOAPPLY] = AUTOAPPLY_CHANGED;
@ -609,6 +608,7 @@ void ButtonPolicy::Private::initOkApplyCancelAutoReadOnly()
state_machine_[APPLIED][SMI_AUTOAPPLY] = AUTOAPPLY_INITIAL; state_machine_[APPLIED][SMI_AUTOAPPLY] = AUTOAPPLY_INITIAL;
// State::AUTOAPPLY_INITIAL // State::AUTOAPPLY_INITIAL
state_machine_[AUTOAPPLY_INITIAL][SMI_AUTOAPPLY] = APPLIED; 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_READ_ONLY] = RO_AUTOAPPLY;
state_machine_[AUTOAPPLY_INITIAL][SMI_VALID] = AUTOAPPLY_CHANGED; state_machine_[AUTOAPPLY_INITIAL][SMI_VALID] = AUTOAPPLY_CHANGED;
state_machine_[AUTOAPPLY_INITIAL][SMI_INVALID] = AUTOAPPLY_CHANGED; state_machine_[AUTOAPPLY_INITIAL][SMI_INVALID] = AUTOAPPLY_CHANGED;

6
src/frontends/qt4/GuiCharacter.cpp
View File

@ -526,9 +526,6 @@ void GuiCharacter::paramsToDialog(Font const & font)
QString const lang = (font.language() == reset_language) QString const lang = (font.language() == reset_language)
? "reset" : toqstr(font.language()->lang()); ? "reset" : toqstr(font.language()->lang());
langCO->setCurrentIndex(findPos2nd(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); setButtonsValid(true);
paramsToDialog(font_); paramsToDialog(font_);
// Make sure that the bc is in the INITIAL state
if (bc().policy().buttonStatus(ButtonPolicy::OKAY))
bc().restore();
return true; return true;
} }