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

The following commit has been merged in the master branch:
commit 17457964c00fc79a72bc7feb8679df254d719680
Author: Tarun Mall <c2tarun at gmail.com>
Date:   Fri May 13 13:00:09 2011 +0100

    Ability to close a tab using the standard key combination
    
    REVIEW: 101352
    BUG: 272098
---
 app/chat-window.cpp | 7 +++++++
 app/chat-window.h   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index a456e44..149608d 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -43,6 +43,7 @@
 ChatWindow::ChatWindow()
 {
     //setup actions
+    KStandardAction::close(this,SLOT(closeCurrentTab()),actionCollection());
     KStandardAction::quit(KApplication::instance(), SLOT(quit()), actionCollection());
     KStandardAction::preferences(this, SLOT(showSettingsDialog()), actionCollection());
     KStandardAction::configureNotifications(this, SLOT(showNotificationsDialog()), actionCollection());
@@ -154,6 +155,11 @@ void ChatWindow::setTabTextColor(int index, const QColor& color)
     m_tabWidget->setTabTextColor(index, color);
 }
 
+void ChatWindow::closeCurrentTab()
+{
+    removeTab(m_tabWidget->currentWidget());
+}
+
 void ChatWindow::onCurrentIndexChanged(int index)
 {
     kDebug() << index;
@@ -287,4 +293,5 @@ void ChatWindow::setupChatTabSignals(ChatTab *chatTab)
     connect(chatTab, SIGNAL(contactPresenceChanged(Tp::Presence)), this, SLOT(onTabStateChanged()));
     connect(chatTab->chatSearchBar(), SIGNAL(enableSearchButtonsSignal(bool)), this, SLOT(onEnableSearchActions(bool)));
 }
+
 #include "chat-window.moc"
diff --git a/app/chat-window.h b/app/chat-window.h
index 62ccdd5..f9c07da 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -51,6 +51,7 @@ public slots:
     void removeTab(QWidget *chatWidget);
 
 private slots:
+    void closeCurrentTab();
     void onCurrentIndexChanged(int index);
     void onEnableSearchActions(bool enable);    /** enables/disables menu search actions */
     void onFindNextText();                      /** go to next text the user is searching for */

-- 
ktp-text-ui packaging