From 0ed071b57c83a64823548d387cbc90560a5d5d83 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 30 Nov 2019 09:44:32 +0100 Subject: [PATCH 1/3] GIT_SILENT: Prepare 5.13.0 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9a6ab33f..dee880d85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.12.90") +set(KDEPIM_VERSION_NUMBER "5.13.0") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) @@ -32,8 +32,8 @@ include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) # Do NOT add quote -set(KDEPIM_DEV_VERSION rc) -set(KDE_APPLICATIONS_VERSION "19.11.80") +set(KDEPIM_DEV_VERSION) +set(KDE_APPLICATIONS_VERSION "19.12.0") # add an extra space if(DEFINED KDEPIM_DEV_VERSION) From e4640fc1e98839dc293468f3d7b30f0bdc747a5b Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 1 Dec 2019 10:25:10 +0100 Subject: [PATCH 2/3] GIT_SILENT: Prepare 5.13.0 --- CMakeLists.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dee880d85..0cf4bc772 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,17 +43,17 @@ endif() set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION} (${KDE_APPLICATIONS_VERSION})") -set(AKONADI_MIMELIB_VERSION "5.12.90") -set(AKONADI_CONTACT_VERSION "5.12.90") -set(CALENDARUTILS_LIB_VERSION "5.12.90") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.12.90") -set(KLDAP_LIB_VERSION "5.12.90") -set(KMAILTRANSPORT_LIB_VERSION "5.12.90") -set(KONTACTINTERFACE_LIB_VERSION "5.12.90") -set(KMIME_LIB_VERSION "5.12.90") -set(KPIMTEXTEDIT_LIB_VERSION "5.12.90") -set(AKONADI_VERSION "5.12.90") -set(KTNEF_LIB_VERSION "5.12.90") +set(AKONADI_MIMELIB_VERSION "5.13.0") +set(AKONADI_CONTACT_VERSION "5.13.0") +set(CALENDARUTILS_LIB_VERSION "5.13.0") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.13.0") +set(KLDAP_LIB_VERSION "5.13.0") +set(KMAILTRANSPORT_LIB_VERSION "5.13.0") +set(KONTACTINTERFACE_LIB_VERSION "5.13.0") +set(KMIME_LIB_VERSION "5.13.0") +set(KPIMTEXTEDIT_LIB_VERSION "5.13.0") +set(AKONADI_VERSION "5.13.0") +set(KTNEF_LIB_VERSION "5.13.0") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -64,18 +64,18 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets) -set(LIBGRAVATAR_VERSION_LIB "5.12.90") -set(MAILCOMMON_LIB_VERSION_LIB "5.12.90") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.12.90") -set(MESSAGELIB_LIB_VERSION_LIB "5.12.90") -set(LIBKLEO_LIB_VERSION_LIB "5.12.90") -set(PIMCOMMON_LIB_VERSION_LIB "5.12.90") -set(LIBKDEPIM_LIB_VERSION_LIB "5.12.90") -set(LIBKSIEVE_LIB_VERSION_LIB "5.12.90") +set(LIBGRAVATAR_VERSION_LIB "5.13.0") +set(MAILCOMMON_LIB_VERSION_LIB "5.13.0") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.13.0") +set(MESSAGELIB_LIB_VERSION_LIB "5.13.0") +set(LIBKLEO_LIB_VERSION_LIB "5.13.0") +set(PIMCOMMON_LIB_VERSION_LIB "5.13.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.13.0") +set(LIBKSIEVE_LIB_VERSION_LIB "5.13.0") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.12.90" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.13.0" CONFIG REQUIRED) set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") set(GPGMEPP_LIB_VERSION "1.11.1") From 3c07e090f4806e66c7bc17336c9e110e18f695f8 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 2 Dec 2019 08:06:24 +0100 Subject: [PATCH 3/3] Fix invalid fcc warning when we restore mail Bug found by david --- src/editor/kmcomposerwin.cpp | 1 + .../incorrectidentityfolderwarning.cpp | 17 +++++++++++++++-- .../incorrectidentityfolderwarning.h | 1 + 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index 3bdeb1cc0..5ee61a6ab 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -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; diff --git a/src/editor/warningwidgets/incorrectidentityfolderwarning.cpp b/src/editor/warningwidgets/incorrectidentityfolderwarning.cpp index 4377a68b1..2c8ec4ac0 100644 --- a/src/editor/warningwidgets/incorrectidentityfolderwarning.cpp +++ b/src/editor/warningwidgets/incorrectidentityfolderwarning.cpp @@ -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() diff --git a/src/editor/warningwidgets/incorrectidentityfolderwarning.h b/src/editor/warningwidgets/incorrectidentityfolderwarning.h index afdffbc02..41f804e74 100644 --- a/src/editor/warningwidgets/incorrectidentityfolderwarning.h +++ b/src/editor/warningwidgets/incorrectidentityfolderwarning.h @@ -33,6 +33,7 @@ public: void fccIsInvalid(); void identityInvalid(); void dictionaryInvalid(); + void clearFccInvalid(); private: void addNewLine(QString &str);