From f32944b35c0d7756165faddf57da5f977662cbf4 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 21 Nov 2016 06:47:25 +0100 Subject: [PATCH 1/6] GIT_SILENT: prepare future 5.4.0rc1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d8d78f..caa31de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -set(PIM_VERSION "5.3.80") +set(PIM_VERSION "5.3.90") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) set(AKONADIMIME_LIB_VERSION "5.3.80") set(MESSAGELIB_LIB_VERSION "5.3.80") From 70cc91428380029ca773619dd7f17e47465046e1 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 22 Nov 2016 13:12:22 +0100 Subject: [PATCH 2/6] GIT_SILENT: prepare 5.4.0rc1 --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index caa31de..fd5a5d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,17 +20,17 @@ include(ECMAddTests) set(PIM_VERSION "5.3.90") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.3.80") -set(MESSAGELIB_LIB_VERSION "5.3.80") +set(AKONADIMIME_LIB_VERSION "5.3.90") +set(MESSAGELIB_LIB_VERSION "5.3.90") set(QT_REQUIRED_VERSION "5.6.0") -set(KMIME_LIB_VERSION "5.3.80") -set(KMAILTRANSPORT_LIB_VERSION "5.3.80") -set(KLDAP_LIB_VERSION "5.3.80") -set(MAILIMPORTER_LIB_VERSION "5.3.80") -set(LIBKDEPIM_LIB_VERSION "5.3.80") -set(PIMCOMMON_LIB_VERSION "5.3.80") - -set(AKONADI_VERSION "5.3.80") +set(KMIME_LIB_VERSION "5.3.90") +set(KMAILTRANSPORT_LIB_VERSION "5.3.90") +set(KLDAP_LIB_VERSION "5.3.90") +set(MAILIMPORTER_LIB_VERSION "5.3.90") +set(LIBKDEPIM_LIB_VERSION "5.3.90") +set(PIMCOMMON_LIB_VERSION "5.3.90") + +set(AKONADI_VERSION "5.3.90") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From c66566d3a0746d6cc525d7299bf1413259b3c3a0 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 3 Dec 2016 07:58:00 +0100 Subject: [PATCH 3/6] GIT_SILENT: prepare 5.4.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd5a5d1..5659f26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -set(PIM_VERSION "5.3.90") +set(PIM_VERSION "5.4.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) set(AKONADIMIME_LIB_VERSION "5.3.90") set(MESSAGELIB_LIB_VERSION "5.3.90") From b7db67fa8307ebc7ac8d24230eedd633235db56b Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 8 Dec 2016 07:01:50 +0100 Subject: [PATCH 4/6] GIT_SILENT: 5.4.0 --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5659f26..91bcce4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,17 +20,17 @@ include(ECMAddTests) set(PIM_VERSION "5.4.0") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.3.90") -set(MESSAGELIB_LIB_VERSION "5.3.90") +set(AKONADIMIME_LIB_VERSION "5.4.0") +set(MESSAGELIB_LIB_VERSION "5.4.0") set(QT_REQUIRED_VERSION "5.6.0") -set(KMIME_LIB_VERSION "5.3.90") -set(KMAILTRANSPORT_LIB_VERSION "5.3.90") -set(KLDAP_LIB_VERSION "5.3.90") -set(MAILIMPORTER_LIB_VERSION "5.3.90") -set(LIBKDEPIM_LIB_VERSION "5.3.90") -set(PIMCOMMON_LIB_VERSION "5.3.90") - -set(AKONADI_VERSION "5.3.90") +set(KMIME_LIB_VERSION "5.4.0") +set(KMAILTRANSPORT_LIB_VERSION "5.4.0") +set(KLDAP_LIB_VERSION "5.4.0") +set(MAILIMPORTER_LIB_VERSION "5.4.0") +set(LIBKDEPIM_LIB_VERSION "5.4.0") +set(PIMCOMMON_LIB_VERSION "5.4.0") + +set(AKONADI_VERSION "5.4.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) From edc3d2780b0ec9484cf687589d28c50d2d0269ec Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 16 Dec 2016 14:47:01 +0100 Subject: [PATCH 5/6] GIT_SILENT: prepare future 5.4.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91bcce4..817bf91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -set(PIM_VERSION "5.4.0") +set(PIM_VERSION "5.4.1") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) set(AKONADIMIME_LIB_VERSION "5.4.0") set(MESSAGELIB_LIB_VERSION "5.4.0") From 8430e95bf1faf214080755af2953e25b3e8ea111 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 27 Dec 2016 08:10:58 +0100 Subject: [PATCH 6/6] Fix create multi tab. bug reported by David CCMAIL: faure@kde.org --- src/widgets/favoritecollectionwidget.cpp | 9 +++++++++ src/widgets/favoritecollectionwidget.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/src/widgets/favoritecollectionwidget.cpp b/src/widgets/favoritecollectionwidget.cpp index 72b3340..3f7a56d 100644 --- a/src/widgets/favoritecollectionwidget.cpp +++ b/src/widgets/favoritecollectionwidget.cpp @@ -30,6 +30,7 @@ #include #include +#include using namespace MailCommon; @@ -68,6 +69,14 @@ FavoriteCollectionWidget::~FavoriteCollectionWidget() delete d; } +void FavoriteCollectionWidget::mousePressEvent(QMouseEvent *e) +{ + const bool buttonPressedIsMiddle = (e->button() == Qt::MidButton); + Q_EMIT prefereCreateNewTab(buttonPressedIsMiddle); + Akonadi::EntityListView::mousePressEvent(e); +} + + void FavoriteCollectionWidget::updateMode() { switch (viewMode()) { diff --git a/src/widgets/favoritecollectionwidget.h b/src/widgets/favoritecollectionwidget.h index dac2749..1e62824 100644 --- a/src/widgets/favoritecollectionwidget.h +++ b/src/widgets/favoritecollectionwidget.h @@ -50,6 +50,10 @@ protected Q_SLOTS: protected: void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; +Q_SIGNALS: + void prefereCreateNewTab(bool); + private: void createMenu(KActionCollection *ac); class Private;