Commit 240551be authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/19.12'

parents 02c72402 3c07e090
......@@ -1801,6 +1801,7 @@ void KMComposerWin::setFcc(const QString &idString)
if (col.isValid()) {
mComposerBase->setFcc(col);
mFccFolder->setCollection(col);
mIncorrectIdentityFolderWarning->clearFccInvalid();
} else {
mIncorrectIdentityFolderWarning->fccIsInvalid();
qCWarning(KMAIL_LOG) << "setFcc: collection invalid " << idString;
......
......@@ -58,6 +58,14 @@ void IncorrectIdentityFolderWarning::dictionaryInvalid()
updateText();
}
void IncorrectIdentityFolderWarning::clearFccInvalid()
{
if (mFccIsInvalid) {
mFccIsInvalid = false;
updateText();
}
}
void IncorrectIdentityFolderWarning::addNewLine(QString &str)
{
if (!str.isEmpty()) {
......@@ -83,8 +91,13 @@ void IncorrectIdentityFolderWarning::updateText()
addNewLine(text);
text += i18n("Dictionary was not found. Please verify that you will use a correct dictionary.");
}
setText(text);
animatedShow();
if (text.isEmpty()) {
animatedHide();
setText(QString());
} else {
setText(text);
animatedShow();
}
}
void IncorrectIdentityFolderWarning::slotHideAnnimationFinished()
......
......@@ -33,6 +33,7 @@ public:
void fccIsInvalid();
void identityInvalid();
void dictionaryInvalid();
void clearFccInvalid();
private:
void addNewLine(QString &str);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment