[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=b4f51be

The following commit has been merged in the master branch:
commit b4f51bebb9d9c6a90867165a10c3c0338e2b9257
Author: Anant Kamath <kamathanant at gmail.com>
Date:   Wed Sep 4 00:03:18 2013 +0530

    Allow starting a chat with contact ids
---
 main-widget.cpp | 11 +++++++++++
 main-widget.h   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/main-widget.cpp b/main-widget.cpp
index d03fe2e..8b79a79 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -43,6 +43,7 @@
 #include <KTp/types.h>
 #include <KTp/Widgets/add-contact-dialog.h>
 #include <KTp/Widgets/join-chat-room-dialog.h>
+#include <KTp/Widgets/start-chat-dialog.h>
 
 #include <KDebug>
 #include <KDialog>
@@ -206,6 +207,14 @@ void MainWidget::onAddContactRequest()
     dialog->show();
 }
 
+void MainWidget::onStartChatRequest()
+{
+    KTp::StartChatDialog *dialog = new KTp::StartChatDialog(m_accountManager, this);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->show();
+}
+
+
 void MainWidget::onCustomContextMenuRequested(const QPoint &pos)
 {
     QModelIndex index = m_contactsListView->indexAt(pos);
@@ -449,6 +458,7 @@ void MainWidget::setupToolBar()
     m_toolBar->addAction(m_showOfflineAction);
     m_toolBar->addAction(m_sortByPresenceAction);
     m_toolBar->addAction(m_searchContactAction);
+    m_toolBar->addAction(m_startChatAction);
 
     QWidget *toolBarSpacer = new QWidget(this);
     toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -556,6 +566,7 @@ void MainWidget::setupActions(const KConfigGroup& guiConfigGroup)
     m_searchContactAction = createAction(i18n("Find Contact"), this, SLOT(toggleSearchWidget(bool)),
                                          guiConfigGroup.readEntry("pin_filterbar", true), KIcon("edit-find-user"));
     m_searchContactAction->setShortcut(KStandardShortcut::find());
+    m_startChatAction = createAction(i18n("Start a chat..."), this, SLOT(onStartChatRequest()), KIcon("telepathy-kde"));
 
     // Dual actions
     m_groupContactsAction = new KDualAction(i18n("Show Contacts by Groups"),
diff --git a/main-widget.h b/main-widget.h
index 8592cea..b6bb4d4 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -84,6 +84,7 @@ private Q_SLOTS:
     void hideSearchWidget();
     void onAccountManagerReady(Tp::PendingOperation* op);
     void onAddContactRequest();
+    void onStartChatRequest();
     void onUseGlobalPresenceTriggered();
     void onUsePerAccountPresenceTriggered();
     void onJoinChatRoomRequested();                 /** join chat room action is triggered */
@@ -120,6 +121,7 @@ private:
     KDualAction            *m_groupContactsAction;
     KDualAction            *m_showOfflineAction;
     KAction                *m_searchContactAction;
+    KAction                *m_startChatAction;
     KDualAction            *m_sortByPresenceAction;
     KAction                *m_quitAction;
 

-- 
ktp-contact-list packaging