[LyX/master] Further BC fixes to GuiCharacter

[Juergen Spitzmueller]

commit 7be3805a658fde0ed75e247f3a38368da984bea6
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sat May 5 17:24:09 2018 +0200

    Further BC fixes to GuiCharacter
---
 src/frontends/qt4/ButtonPolicy.cpp |    2 +-
 src/frontends/qt4/GuiCharacter.cpp |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/ButtonPolicy.cpp 
b/src/frontends/qt4/ButtonPolicy.cpp
index 5426271..3061d6a 100644
--- a/src/frontends/qt4/ButtonPolicy.cpp
+++ b/src/frontends/qt4/ButtonPolicy.cpp
@@ -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;
diff --git a/src/frontends/qt4/GuiCharacter.cpp 
b/src/frontends/qt4/GuiCharacter.cpp
index 5dd6dde..777ca1c 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -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;
 }