Hello community, here is the log from the commit of package mailcommon for openSUSE:Factory checked in at 2016-06-20 10:57:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailcommon (Old) and /work/SRC/openSUSE:Factory/.mailcommon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailcommon" Changes: -------- --- /work/SRC/openSUSE:Factory/mailcommon/mailcommon.changes 2016-05-31 12:22:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mailcommon.new/mailcommon.changes 2016-06-20 10:57:24.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 10 17:49:37 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.04.2 + * KDE Applications 16.04.2 + * https://www.kde.org/announcements/announce-applications-16.04.2.php + + +------------------------------------------------------------------- Old: ---- mailcommon-16.04.1.tar.xz New: ---- mailcommon-16.04.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailcommon.spec ++++++ --- /var/tmp/diff_new_pack.boV7Ph/_old 2016-06-20 10:57:25.000000000 +0200 +++ /var/tmp/diff_new_pack.boV7Ph/_new 2016-06-20 10:57:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: mailcommon -Version: 16.04.1 +Version: 16.04.2 Release: 0 Summary: Base package of kdepim License: GPL-2.0 and LGPL-2.1+ ++++++ mailcommon-16.04.1.tar.xz -> mailcommon-16.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-16.04.1/CMakeLists.txt new/mailcommon-16.04.2/CMakeLists.txt --- old/mailcommon-16.04.1/CMakeLists.txt 2016-05-04 01:58:26.000000000 +0200 +++ new/mailcommon-16.04.2/CMakeLists.txt 2016-05-20 18:01:46.000000000 +0200 @@ -18,7 +18,7 @@ include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -set(MAILCOMMON_LIB_VERSION "5.2.1") +set(MAILCOMMON_LIB_VERSION "5.2.2") set(KF5_VERSION "5.19.0") set(KDEPIMLIBS_LIB_VERSION "5.2.0") set(MESSAGELIB_LIB_VERSION "5.2.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-16.04.1/src/folder/accountconfigorderdialog.cpp new/mailcommon-16.04.2/src/folder/accountconfigorderdialog.cpp --- old/mailcommon-16.04.1/src/folder/accountconfigorderdialog.cpp 2016-05-04 01:58:26.000000000 +0200 +++ new/mailcommon-16.04.2/src/folder/accountconfigorderdialog.cpp 2016-05-20 18:01:46.000000000 +0200 @@ -214,6 +214,7 @@ } } } + instanceList.sort(Qt::CaseInsensitive); const int numberOfList(listOrderAccount.count()); for (int i = 0; i < numberOfList; ++i) { instanceList.removeOne(listOrderAccount.at(i)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-16.04.1/src/folder/foldercollection.cpp new/mailcommon-16.04.2/src/folder/foldercollection.cpp --- old/mailcommon-16.04.1/src/folder/foldercollection.cpp 2016-05-04 01:58:26.000000000 +0200 +++ new/mailcommon-16.04.2/src/folder/foldercollection.cpp 2016-05-20 18:01:46.000000000 +0200 @@ -64,6 +64,7 @@ FolderCollection::FolderCollection(const Akonadi::Collection &col, bool writeconfig) : mCollection(col), + mFormatMessage(MessageViewer::Viewer::Unknown), mPutRepliesInSameFolder(false), mHideInSelectionDialog(false), mWriteConfig(writeconfig) @@ -76,6 +77,16 @@ this, SLOT(slotIdentitiesChanged())); } +MessageViewer::Viewer::DisplayFormatMessage FolderCollection::formatMessage() const +{ + return mFormatMessage; +} + +void FolderCollection::setFormatMessage(MessageViewer::Viewer::DisplayFormatMessage formatMessage) +{ + mFormatMessage = formatMessage; +} + FolderCollection::~FolderCollection() { //qCDebug(MAILCOMMON_LOG)<<" FolderCollection::~FolderCollection"<<this; @@ -205,6 +216,9 @@ QKeySequence sc(shortcut); setShortcut(sc); } + + mFormatMessage = static_cast<MessageViewer::Viewer::DisplayFormatMessage>(configGroup.readEntry("displayFormatOverride", + static_cast<int>(MessageViewer::Viewer::UseGlobalSetting))); } bool FolderCollection::isValid() const @@ -255,6 +269,14 @@ } else { configGroup.deleteEntry("Shortcut"); } + + if (mFormatMessage != MessageViewer::Viewer::Unknown) { + if (mFormatMessage == MessageViewer::Viewer::UseGlobalSetting) { + configGroup.deleteEntry("displayFormatOverride"); + } else { + configGroup.writeEntry("displayFormatOverride", static_cast<int>(mFormatMessage)); + } + } } void FolderCollection::setShortcut(const QKeySequence &sc) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-16.04.1/src/folder/foldercollection.h new/mailcommon-16.04.2/src/folder/foldercollection.h --- old/mailcommon-16.04.1/src/folder/foldercollection.h 2016-05-04 01:58:26.000000000 +0200 +++ new/mailcommon-16.04.2/src/folder/foldercollection.h 2016-05-20 18:01:46.000000000 +0200 @@ -19,6 +19,7 @@ #define MAILCOMMON_FOLDERCOLLECTION_H #include "mailcommon_export.h" +#include <MessageViewer/Viewer> #include <MessageCore/MailingList> using MessageCore::MailingList; @@ -138,6 +139,9 @@ QString mailingListPostAddress() const; uint fallBackIdentity() const; + MessageViewer::Viewer::DisplayFormatMessage formatMessage() const; + void setFormatMessage(MessageViewer::Viewer::DisplayFormatMessage formatMessage); + protected Q_SLOTS: void slotIdentitiesChanged(); @@ -153,6 +157,7 @@ bool mUseDefaultIdentity; uint mIdentity; + MessageViewer::Viewer::DisplayFormatMessage mFormatMessage; /** Should replies to messages in this folder be put in here? */ bool mPutRepliesInSameFolder;
