[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Merge remote-tracking branch 'origin/KDE/4.14'
From:       Montel Laurent <montel () kde ! org>
Date:       2015-05-05 4:57:47
Message-ID: E1YpUvT-0001P7-Ai () scm ! kde ! org
[Download RAW message or body]

Git commit b0fcb58d7db3f62af496a0ec6cfddac7f644d560 by Montel Laurent.
Committed on 05/05/2015 at 04:57.
Pushed by mlaurent into branch 'master'.

Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	mailcommon/filter/kmfilterdialog.cpp
	mailcommon/filter/kmfilterlistbox.cpp
	mailcommon/filter/kmfilterlistbox.h
	pimcommon/baloodebug/baloosyntaxhighlighter.cpp

M  +10   -8    mailcommon/filter/kmfilterdialog.cpp
M  +13   -18   mailcommon/filter/kmfilterlistbox.cpp
M  +1    -1    mailcommon/filter/kmfilterlistbox.h
M  +3    -0    pimcommon/baloodebug/baloodebugsearchpathcombobox.cpp
M  +2    -1    pimcommon/baloodebug/baloodebugsearchpathcombobox.h
M  +5    -0    pimcommon/baloodebug/baloosyntaxhighlighter.cpp

http://commits.kde.org/kdepim/b0fcb58d7db3f62af496a0ec6cfddac7f644d560

diff --cc mailcommon/filter/kmfilterlistbox.cpp
index 8860977,e20adec..90fc448
--- a/mailcommon/filter/kmfilterlistbox.cpp
+++ b/mailcommon/filter/kmfilterlistbox.cpp
@@@ -376,14 -364,15 +376,15 @@@ void KMFilterListBox::applyFilterChange
      // by now all edit widgets should have written back
      // their widget's data into our filter list.
  
-     const QList<MailFilter *> newFilters = filtersForSaving(closeAfterSaving);
- 
-     MailCommon::FilterManager::instance()->setFilters(newFilters);
+     bool wasCanceled = false;
+     const QList<MailFilter*> newFilters = filtersForSaving( closeAfterSaving, \
wasCanceled ); +     if (!wasCanceled)
+         MailCommon::FilterManager::instance()->setFilters( newFilters );
  }
  
- QList<MailFilter *> KMFilterListBox::filtersForSaving(bool closeAfterSaving) const
+ QList<MailFilter *> KMFilterListBox::filtersForSaving( bool closeAfterSaving, bool \
&wasCanceled ) const  {
 -    const_cast<KMFilterListBox*>( this )->applyWidgets(); // signals aren't const
 +    const_cast<KMFilterListBox *>(this)->applyWidgets();  // signals aren't const
      QList<MailFilter *> filters;
      QStringList emptyFilters;
      QVector<MailCommon::InvalidFilterInfo> listInvalidFilters;
@@@ -406,12 -395,13 +407,13 @@@
      }
  
      // report on invalid filters:
 -    if ( !emptyFilters.empty() ) {
 -        if ( closeAfterSaving ) {
 -            QPointer<MailCommon::InvalidFilterDialog> dlg = new \
MailCommon::InvalidFilterDialog(0);  +    if (!emptyFilters.empty()) {
 +        if (closeAfterSaving) {
 +            QPointer<MailCommon::InvalidFilterDialog> dlg = new \
MailCommon::InvalidFilterDialog(Q_NULLPTR);  \
dlg->setInvalidFilters(listInvalidFilters);  if (!dlg->exec()) {
-                 Q_EMIT abortClosing();
+                 emit abortClosing();
+                 wasCanceled = true;
              }
              delete dlg;
          } else {
diff --cc mailcommon/filter/kmfilterlistbox.h
index 6e8b6c5,7d71d07..f691cab
--- a/mailcommon/filter/kmfilterlistbox.h
+++ b/mailcommon/filter/kmfilterlistbox.h
@@@ -108,11 -109,11 +108,11 @@@ public
       * @param closeAfterSaving If true user is given option to continue editing
       * after being warned about invalid filters. Otherwise, user is just warned.
       */
-     QList<MailCommon::MailFilter *> filtersForSaving(bool closeAfterSaving) const;
+     QList<MailCommon::MailFilter *> filtersForSaving(bool closeAfterSaving , bool \
&wasCanceled) const;  
 -    QStringList selectedFilterId( SearchRule::RequiredPart &requiredPart, const \
QString& resource ) const;  +    QStringList \
selectedFilterId(SearchRule::RequiredPart &requiredPart, const QString &resource) \
const;  
 -signals:
 +Q_SIGNALS:
      /**
       * Emitted when a new filter has been selected by the user or if the
       * current filter has changed after a 'new' or 'delete' operation.
diff --cc pimcommon/baloodebug/baloodebugsearchpathcombobox.h
index 1eebe41,88fb9ef..d1adcad
--- a/pimcommon/baloodebug/baloodebugsearchpathcombobox.h
+++ b/pimcommon/baloodebug/baloodebugsearchpathcombobox.h
@@@ -31,8 -29,10 +31,9 @@@ public
          Contacts = 0,
          ContactCompleter,
          Emails,
-         Notes
+         Notes,
+         Calendars
      };
 -    explicit BalooDebugSearchPathComboBox(QWidget *parent=0);
      ~BalooDebugSearchPathComboBox();
  
      QString searchPath() const;
diff --cc pimcommon/baloodebug/baloosyntaxhighlighter.cpp
index 8b1bb33,5d25d05..259af04
--- a/pimcommon/baloodebug/baloosyntaxhighlighter.cpp
+++ b/pimcommon/baloodebug/baloosyntaxhighlighter.cpp
@@@ -68,13 -68,19 +68,18 @@@ void BalooSyntaxHighlighter::init(
  
      //Contacts:
      //Name
 -    testType << QLatin1String("\\bNA");
 +    testType << QStringLiteral("\\bNA");
      //NickName
 -    testType << QLatin1String("\\bNI");
 +    testType << QStringLiteral("\\bNI");
  
+     //Calendar
+     testType << QLatin1String("\\bO");
+     testType << QLatin1String("\\bPS");
+     testType << QLatin1String("\\bS");
+     testType << QLatin1String("\\bL");
 -
 -    Q_FOREACH ( const QString &s, testType ) {
 -        const QRegExp regex( s, Qt::CaseSensitive );
 -        m_rules.append( Rule( regex, testFormat ) );
 +    Q_FOREACH (const QString &s, testType) {
 +        const QRegExp regex(s, Qt::CaseSensitive);
 +        m_rules.append(Rule(regex, testFormat));
      }
  }
  


[prev in list] [next in list] [prev in thread] [next in thread]