[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=cd675e2

The following commit has been merged in the master branch:
commit cd675e2c4fb2f7055bdbb38b3ce6e844e1c30228
Author: Siddhartha Sahu <sh.siddhartha at gmail.com>
Date:   Sun Mar 30 10:26:10 2014 +0530

    Add option to open contact list from the toolbar
    
    REVIEW: 117177
    BUG: 313404
---
 app/chat-window.cpp | 9 +++++++++
 app/chat-window.h   | 1 +
 2 files changed, 10 insertions(+)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index a18731b..85779c4 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -658,6 +658,11 @@ void ChatWindow::onShowInfoTriggered()
     }
 }
 
+void ChatWindow::onOpenContactListTriggered()
+{
+    KToolInvocation::kdeinitExec(QLatin1String("ktp-contactlist"));
+}
+
 void ChatWindow::onOpenLogTriggered()
 {
     int index = m_tabWidget->currentIndex();
@@ -805,6 +810,9 @@ void ChatWindow::setupCustomActions()
     KAction *openLogAction = new KAction(KIcon(QLatin1String("view-pim-journal")), i18nc("Action to open the log viewer with a specified contact","&Previous Conversations"), this);
     connect(openLogAction, SIGNAL(triggered()), SLOT(onOpenLogTriggered()));
 
+    KAction *openContactListAction = new KAction(KIcon(QLatin1String("telepathy-kde")), i18nc("Action to open the contact list","Contact &List"), this);
+    connect(openContactListAction, SIGNAL(triggered()), SLOT(onOpenContactListTriggered()));
+
     KAction *accountIconAction = new KAction(KIcon(QLatin1String("telepathy-kde")), i18n("Account Icon"), this);
     m_accountIconLabel = new QLabel(this);
     accountIconAction->setDefaultWidget(m_accountIconLabel);
@@ -836,6 +844,7 @@ void ChatWindow::setupCustomActions()
     actionCollection()->addAction(QLatin1String("account-icon"), accountIconAction);
     actionCollection()->addAction(QLatin1String("block-contact"), blockContactAction);
     actionCollection()->addAction(QLatin1String("open-log"), openLogAction);
+    actionCollection()->addAction(QLatin1String("open-contact-list"), openContactListAction);
     actionCollection()->addAction(QLatin1String("clear-chat-view"), clearViewAction);
     actionCollection()->addAction(QLatin1String("emoticons"), addEmoticonAction);
     actionCollection()->addAction(QLatin1String("send-message"), m_sendMessage);
diff --git a/app/chat-window.h b/app/chat-window.h
index cab8cf0..72bbd1d 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -103,6 +103,7 @@ private Q_SLOTS:
     void onShareDesktopTriggered();                             /** start a desktop share */
     void onShowInfoTriggered();                                 /** show contact info */
     void onOpenLogTriggered();                                  /** Starts ktp-log-viewer accountId contactId */
+    void onOpenContactListTriggered();                          /** Opens contact list */
     void onClearViewTriggered();                                /** Clears current view */
     void setTabSpellDictionary(const QString &dict);            /** set the spelling language for the current chat tab*/
     void toggleBlockButton(bool contactIsBlocked);              /** Toggle block/unblock action according to the flag */

-- 
ktp-text-ui packaging