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

List:       kde-commits
Subject:    [kdepim/KDE/4.14] libkdepim/addressline: improve completionconfiguredialog
From:       Montel Laurent <montel () kde ! org>
Date:       2015-03-02 12:42:39
Message-ID: E1YSPgF-0004cT-Nv () scm ! kde ! org
[Download RAW message or body]

Git commit 2de900edc45f2f6403d31b930b2de1bb0911b668 by Montel Laurent.
Committed on 02/03/2015 at 12:40.
Pushed by mlaurent into branch 'KDE/4.14'.

improve completionconfiguredialog

M  +14   -4    libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.cpp
 M  +5    -0    libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.h
 M  +3    -1    libkdepim/addressline/completionorder/completionordereditor.cpp
M  +12   -7    libkdepim/addressline/completionorder/completionorderwidget.cpp
M  +3    -2    libkdepim/addressline/completionorder/completionorderwidget.h

http://commits.kde.org/kdepim/2de900edc45f2f6403d31b930b2de1bb0911b668

diff --git a/libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.cpp \
b/libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.cpp index \
                4e3328c..4b80f4c 100644
--- a/libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.cpp
+++ b/libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.cpp
@@ -27,6 +27,7 @@
 #include <KConfigGroup>
 #include <KGlobal>
 #include <KSharedConfig>
+#include <ldap/ldapclientsearch.h>
 #include <addressline/completionorder/completionorderwidget.h>
 #include <addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.h>
  #include <addressline/recentaddress/recentaddresswidget.h>
@@ -44,7 +45,8 @@ CompletionConfigureDialog::CompletionConfigureDialog(QWidget \
*parent)  mTabWidget->setObjectName(QLatin1String("tabwidget"));
     mainLayout->addWidget(mTabWidget);
 
-    //TODO mCompletionOrderWidget = new KPIM::CompletionOrderWidget();
+    mCompletionOrderWidget = new KPIM::CompletionOrderWidget();
+    mCompletionOrderWidget->setObjectName(QLatin1String("completionorder_widget"));
 
     mRecentaddressWidget = new KPIM::RecentAddressWidget;
     mRecentaddressWidget->setObjectName(QLatin1String("recentaddress_widget"));
@@ -62,7 +64,6 @@ CompletionConfigureDialog::CompletionConfigureDialog(QWidget \
*parent)  readConfig();
 }
 
-
 CompletionConfigureDialog::~CompletionConfigureDialog()
 {
     writeConfig();
@@ -84,10 +85,19 @@ void CompletionConfigureDialog::writeConfig()
     group.sync();
 }
 
+void CompletionConfigureDialog::setRecentAddresses(const QStringList &lst)
+{
+    mRecentaddressWidget->setAddresses( lst );
+}
+
+void CompletionConfigureDialog::setLdapClientSearch(KLDAP::LdapClientSearch \
*ldapSearch) +{
+    mCompletionOrderWidget->setLdapClientSearch(ldapSearch);
+}
+
 void CompletionConfigureDialog::load()
 {
-    //mRecentaddressWidget->setAddresses( const QStringList &addrs );
-    //TODO
+    mCompletionOrderWidget->loadCompletionItems();
 }
 
 void CompletionConfigureDialog::slotSave()
diff --git a/libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.h \
b/libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.h index \
                d66ed5a..c95d98b 100644
--- a/libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.h
+++ b/libkdepim/addressline/completionconfiguredialog/completionconfiguredialog.h
@@ -25,6 +25,9 @@
 
 #include <QDialog>
 class QTabWidget;
+namespace KLDAP {
+class LdapClientSearch;
+}
 namespace KPIM {
 class CompletionOrderWidget;
 class BlackListBalooEmailCompletionWidget;
@@ -38,6 +41,8 @@ public:
 
     void load();
     void setEmailBlackList(const QStringList &lst);
+    void setLdapClientSearch(KLDAP::LdapClientSearch *ldapSearch);
+    void setRecentAddresses(const QStringList &lst);
 private slots:
     void slotSave();
 
diff --git a/libkdepim/addressline/completionorder/completionordereditor.cpp \
b/libkdepim/addressline/completionorder/completionordereditor.cpp index \
                b65107d..bd3313d 100644
--- a/libkdepim/addressline/completionorder/completionordereditor.cpp
+++ b/libkdepim/addressline/completionorder/completionordereditor.cpp
@@ -68,11 +68,13 @@ CompletionOrderEditor::CompletionOrderEditor( \
KLDAP::LdapClientSearch* ldapSearc  setModal( true );
     showButtonSeparator( true );
 
-    mCompletionOrderWidget = new CompletionOrderWidget(ldapSearch, this);
+    mCompletionOrderWidget = new CompletionOrderWidget(this);
     setMainWidget( mCompletionOrderWidget );
 
+    mCompletionOrderWidget->setLdapClientSearch(ldapSearch);
     connect( this, SIGNAL(okClicked()), this, SLOT(slotOk()));
 
+    mCompletionOrderWidget->loadCompletionItems();
     readConfig();
 }
 
diff --git a/libkdepim/addressline/completionorder/completionorderwidget.cpp \
b/libkdepim/addressline/completionorder/completionorderwidget.cpp index \
                1c84828..d6ec81a 100644
--- a/libkdepim/addressline/completionorder/completionorderwidget.cpp
+++ b/libkdepim/addressline/completionorder/completionorderwidget.cpp
@@ -183,10 +183,10 @@ private:
 };
 
 
-CompletionOrderWidget::CompletionOrderWidget( KLDAP::LdapClientSearch* ldapSearch, \
QWidget *parent) +CompletionOrderWidget::CompletionOrderWidget(QWidget *parent)
     : QWidget(parent),
       mConfig( QLatin1String("kpimcompletionorder") ),
-      mLdapSearch( ldapSearch ),
+      mLdapSearch( 0 ),
       mDirty( false )
 {
     new CompletionOrderEditorAdaptor( this );
@@ -229,8 +229,6 @@ CompletionOrderWidget::CompletionOrderWidget( \
KLDAP::LdapClientSearch* ldapSearc  SLOT(slotSelectionChanged()) );
     connect( mUpButton, SIGNAL(clicked()), this, SLOT(slotMoveUp()) );
     connect( mDownButton, SIGNAL(clicked()), this, SLOT(slotMoveDown()) );
-
-    loadCompletionItems();
 }
 
 CompletionOrderWidget::~CompletionOrderWidget()
@@ -278,9 +276,11 @@ void CompletionOrderWidget::addCompletionItemForCollection( \
const QModelIndex &i  
 void CompletionOrderWidget::loadCompletionItems()
 {
-    // The first step is to gather all the data, creating CompletionItem objects
-    foreach ( KLDAP::LdapClient *client, mLdapSearch->clients() ) {
-        new CompletionViewItem( mListView, new LDAPCompletionItem( client ), 0 );
+    if (mLdapSearch) {
+        // The first step is to gather all the data, creating CompletionItem objects
+        foreach ( KLDAP::LdapClient *client, mLdapSearch->clients() ) {
+            new CompletionViewItem( mListView, new LDAPCompletionItem( client ), 0 \
); +        }
     }
 
     Akonadi::ChangeRecorder *monitor = new Akonadi::ChangeRecorder( this );
@@ -315,6 +315,11 @@ void CompletionOrderWidget::loadCompletionItems()
     mListView->sortItems( 0, Qt::AscendingOrder );
 }
 
+void CompletionOrderWidget::setLdapClientSearch(KLDAP::LdapClientSearch *ldapSearch)
+{
+    mLdapSearch = ldapSearch;
+}
+
 void CompletionOrderWidget::rowsInserted( const QModelIndex &parent, int start, int \
end )  {
     for ( int row = start; row <= end; ++row )
diff --git a/libkdepim/addressline/completionorder/completionorderwidget.h \
b/libkdepim/addressline/completionorder/completionorderwidget.h index \
                b476458..723279a 100644
--- a/libkdepim/addressline/completionorder/completionorderwidget.h
+++ b/libkdepim/addressline/completionorder/completionorderwidget.h
@@ -67,11 +67,13 @@ class KDEPIM_EXPORT CompletionOrderWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit CompletionOrderWidget(KLDAP::LdapClientSearch *ldapSearch, QWidget \
*parent = 0); +    explicit CompletionOrderWidget(QWidget *parent = 0);
     ~CompletionOrderWidget();
     void save();
 
     KConfig* configFile() { return &mConfig; }
+    void loadCompletionItems();
+    void setLdapClientSearch(KLDAP::LdapClientSearch *ldapSearch);
 
 Q_SIGNALS:
     void completionOrderChanged();
@@ -85,7 +87,6 @@ private Q_SLOTS:
 private:
     void readConfig();
     void writeConfig();
-    void loadCompletionItems();
     void addRecentAddressItem();
     void addCompletionItemForCollection( const QModelIndex& );
 


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