[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=74f966c

The following commit has been merged in the master branch:
commit 74f966c4d4f872d33b730a61a7fddef937e68591
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Dec 28 16:27:21 2011 +0100

    Use new icons for "Sort by presence" and "Sort by name" actions.
    
    Reviewed-by: David Edmundson
    REVIEW: 103063
---
 icons/hi22-action-sort-name.png     | Bin 0 -> 925 bytes
 icons/hi22-action-sort-presence.png | Bin 0 -> 1064 bytes
 main-widget.cpp                     |   8 +++++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/icons/hi22-action-sort-name.png b/icons/hi22-action-sort-name.png
new file mode 100644
index 0000000..a696912
Binary files /dev/null and b/icons/hi22-action-sort-name.png differ
diff --git a/icons/hi22-action-sort-presence.png b/icons/hi22-action-sort-presence.png
new file mode 100644
index 0000000..8a63050
Binary files /dev/null and b/icons/hi22-action-sort-presence.png differ
diff --git a/main-widget.cpp b/main-widget.cpp
index 5c4eb84..d95304f 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -130,9 +130,11 @@ MainWidget::MainWidget(QWidget *parent)
 
     m_toolBar->addAction(m_showOfflineAction);
 
-    m_sortByPresenceAction = new KDualAction(i18n("Sort by presence"), i18n("Sort by name"), this);
-    m_sortByPresenceAction->setActiveIcon(KIcon("user-online"));
-    m_sortByPresenceAction->setInactiveIcon(KIcon("view-sort-ascending"));
+    m_sortByPresenceAction = new KDualAction(i18n("List is sorted by name. Click to sort by presence."),
+                                             i18n("List is sorted by presence. Click to sort by name."), 
+                                             this);
+    m_sortByPresenceAction->setActiveIcon(KIcon("sort-presence"));
+    m_sortByPresenceAction->setInactiveIcon(KIcon("sort-name"));
 
     m_toolBar->addAction(m_sortByPresenceAction);
 

-- 
ktp-contact-list packaging