[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=e6b0cd5

The following commit has been merged in the master branch:
commit e6b0cd5f5b9d915398b9b4c0c95553d16aafa6e1
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Dec 28 15:12:32 2011 +0000

    Update to use aysnc setting of account manager in account model creation.
    
    Simplifies code a lot.
    Reviewed by: Martin Klapetek
---
 contact-list-widget.cpp | 37 +++++++++++++--------------
 main-widget.cpp         | 66 +++++++++++++++++++++++--------------------------
 2 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 53bd04a..74eaea7 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -73,6 +73,24 @@ ContactListWidget::ContactListWidget(QWidget *parent)
     d->delegate = new ContactDelegate(this);
     d->compactDelegate = new ContactDelegateCompact(this);
 
+    d->model = new AccountsModel(this);
+    d->groupsModel = new GroupsModel(d->model, this);
+    d->modelFilter = new AccountsFilterModel(this);
+    d->modelFilter->setDynamicSortFilter(true);
+    d->modelFilter->clearFilterString();
+    d->modelFilter->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    d->modelFilter->setSortRole(Qt::DisplayRole);
+
+    setModel(d->modelFilter);
+    setSortingEnabled(true);
+    sortByColumn(0, Qt::AscendingOrder);
+
+    connect(d->modelFilter, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(onNewGroupModelItemsInserted(QModelIndex,int,int)));
+
+    connect(d->groupsModel, SIGNAL(operationFinished(Tp::PendingOperation*)),
+            this, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
+
     header()->hide();
     setRootIsDecorated(false);
     setSortingEnabled(true);
@@ -112,29 +130,12 @@ ContactListWidget::~ContactListWidget()
 void ContactListWidget::setAccountManager(const Tp::AccountManagerPtr &accountManager)
 {
     Q_D(ContactListWidget);
-
+    d->model->setAccountManager(accountManager);
 
     connect(accountManager.data(), SIGNAL(newAccount(Tp::AccountPtr)),
                 this, SLOT(onNewAccountAdded(Tp::AccountPtr)));
 
 
-    d->model = new AccountsModel(accountManager, this);
-    d->groupsModel = new GroupsModel(d->model, this);
-    d->modelFilter = new AccountsFilterModel(this);
-    d->modelFilter->setDynamicSortFilter(true);
-    d->modelFilter->clearFilterString();
-    d->modelFilter->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    d->modelFilter->setSortRole(Qt::DisplayRole);
-
-    setModel(d->modelFilter);
-    setSortingEnabled(true);
-    sortByColumn(0, Qt::AscendingOrder);
-
-    connect(d->modelFilter, SIGNAL(rowsInserted(QModelIndex,int,int)),
-            this, SLOT(onNewGroupModelItemsInserted(QModelIndex,int,int)));
-
-    connect(d->groupsModel, SIGNAL(operationFinished(Tp::PendingOperation*)),
-            this, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
 
     QList<Tp::AccountPtr> accounts = accountManager->allAccounts();
 
diff --git a/main-widget.cpp b/main-widget.cpp
index d95304f..d45ac03 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -213,33 +213,6 @@ MainWidget::MainWidget(QWidget *parent)
         toggleSearchWidget(true);
         m_searchContactAction->setChecked(true);
     }
-}
-
-MainWidget::~MainWidget()
-{
-    //save the state of the filter bar, pinned or not
-    KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup configGroup(config, "GUI");
-    configGroup.writeEntry("pin_filterbar", m_searchContactAction->isChecked());
-    configGroup.writeEntry("use_groups", m_groupContactsAction->isChecked());
-    configGroup.writeEntry("show_offline", m_showOfflineAction->isChecked());
-    configGroup.writeEntry("sort_by_presence", m_sortByPresenceAction->isActive());
-    configGroup.config()->sync();
-}
-
-void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
-{
-    if (op->isError()) {
-        kDebug() << op->errorName();
-        kDebug() << op->errorMessage();
-
-        KMessageBox::error(this,
-                           i18n("Something unexpected happened to the core part of your Instant Messaging system "
-                           "and it couldn't be initialized. Try restarting the Contact List."),
-                           i18n("IM system failed to initialize"));
-
-                           return;
-    }
 
     connect(m_showOfflineAction, SIGNAL(toggled(bool)),
             m_contactsListView, SLOT(toggleOfflineContacts(bool)));
@@ -259,12 +232,6 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     connect(m_contactsListView, SIGNAL(genericOperationFinished(Tp::PendingOperation*)),
             this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 
-    m_accountButtons->setAccountManager(m_accountManager);
-    m_presenceChooser->setAccountManager(m_accountManager);
-
-    KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup guiConfigGroup(config, "GUI");
-
     bool useGroups = guiConfigGroup.readEntry("use_groups", true);
     m_groupContactsAction->setChecked(useGroups);
 
@@ -274,13 +241,42 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     bool sortByPresence = guiConfigGroup.readEntry("sort_by_presence", true);
     m_sortByPresenceAction->setActive(sortByPresence);
 
-
-    m_contactsListView->setAccountManager(m_accountManager);
     m_contactsListView->toggleGroups(useGroups);
     m_contactsListView->toggleOfflineContacts(showOffline);
     m_contactsListView->toggleSortByPresence(sortByPresence);
 }
 
+MainWidget::~MainWidget()
+{
+    //save the state of the filter bar, pinned or not
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup configGroup(config, "GUI");
+    configGroup.writeEntry("pin_filterbar", m_searchContactAction->isChecked());
+    configGroup.writeEntry("use_groups", m_groupContactsAction->isChecked());
+    configGroup.writeEntry("show_offline", m_showOfflineAction->isChecked());
+    configGroup.writeEntry("sort_by_presence", m_sortByPresenceAction->isActive());
+    configGroup.config()->sync();
+}
+
+void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
+{
+    if (op->isError()) {
+        kDebug() << op->errorName();
+        kDebug() << op->errorMessage();
+
+        KMessageBox::error(this,
+                           i18n("Something unexpected happened to the core part of your Instant Messaging system "
+                           "and it couldn't be initialized. Try restarting the Contact List."),
+                           i18n("IM system failed to initialize"));
+
+                           return;
+    }
+
+    m_accountButtons->setAccountManager(m_accountManager);
+    m_presenceChooser->setAccountManager(m_accountManager);
+    m_contactsListView->setAccountManager(m_accountManager);
+}
+
 void MainWidget::showMessageToUser(const QString& text, const MainWidget::SystemMessageType type)
 {
     //The pointer is automatically deleted when the event is closed

-- 
ktp-contact-list packaging