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

List:       kde-commits
Subject:    [kdepim/KDE/4.14] libkdepim/addressline: Load blacklist
From:       Montel Laurent <montel () kde ! org>
Date:       2015-01-26 21:13:58
Message-ID: E1YFqys-0003w6-T9 () scm ! kde ! org
[Download RAW message or body]

Git commit 4dbade0a94a635abf97b911782e19538c5b5ba2b by Montel Laurent.
Committed on 26/01/2015 at 15:39.
Pushed by mlaurent into branch 'KDE/4.14'.

Load blacklist

M  +28   -2    libkdepim/addressline/addresseelineedit.cpp
M  +1    -0    libkdepim/addressline/addresseelineedit.h
M  +1    -1    libkdepim/addressline/blacklistbaloocompletion/autotests/blacklistbalooemaillisttest.cpp
 M  +5    -0    libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.cpp
 M  +2    -0    libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.h


http://commits.kde.org/kdepim/4dbade0a94a635abf97b911782e19538c5b5ba2b

diff --git a/libkdepim/addressline/addresseelineedit.cpp \
b/libkdepim/addressline/addresseelineedit.cpp index 1c53dc0..61a9f86 100644
--- a/libkdepim/addressline/addresseelineedit.cpp
+++ b/libkdepim/addressline/addresseelineedit.cpp
@@ -27,7 +27,7 @@
 #include "addresseelineedit.h"
 #include "ldap/ldapclientsearch.h"
 #include "completionordereditor.h"
-
+#include "addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.h"
  #include "kmailcompletion.h"
 
 #include <Akonadi/Contact/ContactSearchJob>
@@ -233,7 +233,7 @@ public:
         m_delayedQueryTimer.setSingleShot(true);
         connect( &m_delayedQueryTimer, SIGNAL(timeout()), q, \
SLOT(slotTriggerDelayedQueries()) );  }
-
+    void loadBalooBlackList();
     QStringList cleanupBalooContact(const QStringList &lst);
     void alternateColor();
     void init();
@@ -262,9 +262,11 @@ public:
     void searchInBaloo();
     void slotTriggerDelayedQueries();
     void slotShowOUChanged( bool );
+    void slotConfigureBalooBlackList();
     static KCompletion::CompOrder completionOrder();
 
     AddresseeLineEdit *q;
+    QStringList m_balooBlackList;
     QString m_previousAddresses;
     QString m_searchString;
     bool m_useCompletion;
@@ -336,6 +338,7 @@ void AddresseeLineEdit::Private::init()
 
         KConfigGroup group( KGlobal::config(), "AddressLineEdit" );
         m_showOU = group.readEntry( "ShowOU", false );
+        loadBalooBlackList();
     }
 }
 
@@ -364,6 +367,7 @@ void AddresseeLineEdit::Private::stopLDAPLookup()
     s_static->ldapLineEdit = 0;
 }
 
+
 QStringList AddresseeLineEdit::Private::cleanupBalooContact(const QStringList &lst)
 {
     if (lst.isEmpty())
@@ -1012,6 +1016,22 @@ void AddresseeLineEdit::Private::slotShowOUChanged(bool \
checked)  }
 }
 
+void AddresseeLineEdit::Private::slotConfigureBalooBlackList()
+{
+    QPointer<KPIM::BlackListBalooEmailCompletionDialog> dlg = new \
KPIM::BlackListBalooEmailCompletionDialog(q); +    \
dlg->setEmailBlackList(m_balooBlackList); +    if (dlg->exec()) {
+        loadBalooBlackList();
+    }
+    delete dlg;
+}
+
+void AddresseeLineEdit::Private::loadBalooBlackList()
+{
+    KConfigGroup group( KGlobal::config(), "AddressLineEdit" );
+    m_balooBlackList = group.readEntry( "Baloo Back List", QStringList() );
+}
+
 AddresseeLineEdit::AddresseeLineEdit( QWidget *parent, bool enableCompletion )
     : KLineEdit( parent ), d( new Private( this, enableCompletion ) )
 {
@@ -1368,6 +1388,12 @@ QMenu *AddresseeLineEdit::createStandardContextMenu()
         connect(showOU, SIGNAL(triggered(bool)), this, \
SLOT(slotShowOUChanged(bool)));  menu->addAction(showOU);
     }
+
+    //Add i18n in kf5
+    QAction *configureBalooBlackList = new QAction(QLatin1String( "Configure Email \
Blacklist" ),menu); +    connect(configureBalooBlackList, SIGNAL(triggered(bool)), \
this, SLOT(slotConfigureBalooBlackList(bool))); +    \
menu->addAction(configureBalooBlackList); +
     return menu;
 }
 #endif
diff --git a/libkdepim/addressline/addresseelineedit.h \
b/libkdepim/addressline/addresseelineedit.h index 5897bf2..352bec3 100644
--- a/libkdepim/addressline/addresseelineedit.h
+++ b/libkdepim/addressline/addresseelineedit.h
@@ -195,6 +195,7 @@ private:
     Q_PRIVATE_SLOT( d, void slotAkonadiSearchResult( KJob * ) )
     Q_PRIVATE_SLOT( d, void slotAkonadiCollectionsReceived( const \
Akonadi::Collection::List & ) )  Q_PRIVATE_SLOT( d, void slotTriggerDelayedQueries() \
) +    Q_PRIVATE_SLOT( d, void slotConfigureBalooBlackList() )
     //@endcond
 };
 
diff --git a/libkdepim/addressline/blacklistbaloocompletion/autotests/blacklistbalooemaillisttest.cpp \
b/libkdepim/addressline/blacklistbaloocompletion/autotests/blacklistbalooemaillisttest.cpp
 index e6426d7..6abc49b 100644
--- a/libkdepim/addressline/blacklistbaloocompletion/autotests/blacklistbalooemaillisttest.cpp
                
+++ b/libkdepim/addressline/blacklistbaloocompletion/autotests/blacklistbalooemaillisttest.cpp
 @@ -76,7 +76,7 @@ void \
BlackListBalooEmailListTest::shouldFillListWithAlreadyBlackListedEmail()  void \
BlackListBalooEmailListTest::shouldReturnChangedItems()  {
     KPIM::BlackListBalooEmailList blackList;
-    QStringList emails = QStringList() << QLatin1String("foo") << \
QLatin1String("bla") << QLatin1String("bli"); +    const QStringList emails = \
QStringList() << QLatin1String("foo") << QLatin1String("bla") << \
QLatin1String("bli");  blackList.setEmailBlackList(emails);
     blackList.slotEmailFound(emails);
     QListWidgetItem *item = blackList.item(1);
diff --git a/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.cpp \
b/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.cpp
 index 9202749..512979e 100644
--- a/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.cpp
                
+++ b/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.cpp
 @@ -79,6 +79,11 @@ BlackListBalooEmailCompletionDialog::~BlackListBalooEmailCompletionDialog()
  writeConfig();
 }
 
+void BlackListBalooEmailCompletionDialog::setEmailBlackList(const QStringList &list)
+{
+    mEmailList->setEmailBlackList(list);
+}
+
 void BlackListBalooEmailCompletionDialog::slotSearchLineEditChanged(const QString \
&text)  {
     mSearchButton->setEnabled(text.trimmed().count() > 2);
diff --git a/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.h \
b/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.h
 index 4a0c4fb..67b3c8a 100644
--- a/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.h
                
+++ b/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletiondialog.h
 @@ -34,6 +34,8 @@ public:
     explicit BlackListBalooEmailCompletionDialog(QWidget *parent=0);
     ~BlackListBalooEmailCompletionDialog();
 
+    void setEmailBlackList(const QStringList &list);
+
 private slots:
     void slotSave();
     void slotSearch();


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