[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=8bd313d

The following commit has been merged in the master branch:
commit 8bd313dc7cd41d57ad9ef9e7088aa178b5c45972
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Jul 13 17:44:34 2011 +0200

    Save GUI config upon exit.
    
    BUG: 277216
    REVIEW: 101915
    Reviewed-by: Francesco Nwokeka
---
 main-widget.cpp | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 28c2d9a..0c676a0 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -284,6 +284,9 @@ MainWidget::~MainWidget()
     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->isChecked());
     configGroup.config()->sync();
 }
 
@@ -351,10 +354,29 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
         dialog->show();
     }
 
-    foreach (const Tp::AccountPtr account, accounts) {
+    foreach (const Tp::AccountPtr &account, accounts) {
         onNewAccountAdded(account);
     }
-//     m_contactsListView->expandAll();
+
+    m_contactsListView->expandAll();
+
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup guiConfigGroup(config, "GUI");
+
+    if (guiConfigGroup.readEntry("use_groups", true)) {
+        onGroupContacts(true);
+        m_groupContactsAction->setChecked(true);
+    }
+
+    if (guiConfigGroup.readEntry("show_offline", false)) {
+        m_modelFilter->showOfflineUsers(true);
+        m_showOfflineAction->setChecked(true);
+    }
+
+    if (guiConfigGroup.readEntry("sort_by_presence", true)) {
+        m_modelFilter->setSortByPresence(true);
+        m_sortByPresenceAction->setChecked(true);
+    }
 }
 
 void MainWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)

-- 
ktp-contact-list packaging