[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=6eed896

The following commit has been merged in the master branch:
commit 6eed8968b3437dcbfbf53a8263a0b1ce0aa248d6
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Mar 10 03:10:58 2011 +0000

    Restore functionality updating tab text when title changes.
---
 app/chat-window.cpp | 36 ++++++++++++++++++++++--------------
 app/chat-window.h   |  4 +++-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index f5c695b..c0e825c 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -87,9 +87,11 @@ void ChatWindow::startChat(Tp::TextChannelPtr incomingTextChannel)
     // got new chat, create it
     if(!duplicateTab) {
         ChatTab *chatTab = new ChatTab(incomingTextChannel, m_tabWidget);
-        connect(chatTab, SIGNAL(titleChanged(QString)), this, SLOT(updateTabText(QString)));
-        connect(chatTab, SIGNAL(iconChanged(KIcon)), this, SLOT(updateTabIcon(KIcon)));
-        connect(chatTab, SIGNAL(userTypingChanged(bool)), this, SLOT(onUserTypingChanged(bool)));
+        connect(chatTab, SIGNAL(titleChanged(QString)), this, SLOT(onTabTextChanged(QString)));
+        connect(chatTab, SIGNAL(iconChanged(KIcon)), this, SLOT(onTabIconChanged(KIcon)));
+        connect(chatTab, SIGNAL(userTypingChanged(bool)), this, SLOT(onTabStateChanged()));
+        connect(chatTab, SIGNAL(unreadMessagesChanged(int)), this, SLOT(onTabStateChanged()));
+        connect(chatTab, SIGNAL(contactPresenceChanged(Tp::Presence)), this, SLOT(onTabStateChanged()));
 
         m_tabWidget->addTab(chatTab, chatTab->icon(), chatTab->title());
         m_tabWidget->setCurrentWidget(chatTab);
@@ -145,30 +147,36 @@ void ChatWindow::onCurrentIndexChanged(int index)
     ChatTab* currentChatTab = qobject_cast<ChatTab*>(m_tabWidget->widget(index));
     setWindowTitle(currentChatTab->title());
     setWindowIcon(currentChatTab->icon());
-
 }
 
-void ChatWindow::onContactPresenceChanged(const Tp::Presence& presence)
+void ChatWindow::onTabStateChanged()
 {
     kDebug();
 
     ChatTab* sender = qobject_cast<ChatTab*>(QObject::sender());
     if (sender) {
-        int tabIndexToChange = m_tabWidget->indexOf(sender);
-        setTabIcon(tabIndexToChange, sender->icon());
-        setTabText(tabIndexToChange, sender->title());
-        setTabTextColor(tabIndexToChange, sender->titleColor());
+        int tabIndex = m_tabWidget->indexOf(sender);
+        setTabTextColor(tabIndex, sender->titleColor());
     }
 }
 
-void ChatWindow::onTabStateChanged()
+void ChatWindow::onTabIconChanged(const KIcon & newIcon)
 {
-    kDebug();
+    //find out which widget made the call, and update the correct tab.
+    QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
+    if (sender) {
+        int tabIndexToChange = m_tabWidget->indexOf(sender);
+        setTabIcon(tabIndexToChange, newIcon);
+    }
+}
 
-    ChatTab* sender = qobject_cast<ChatTab*>(QObject::sender());
+void ChatWindow::onTabTextChanged(const QString &newTitle)
+{
+    //find out which widget made the call, and update the correct tab.
+    QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
     if (sender) {
-        int tabIndex = m_tabWidget->indexOf(sender);
-        setTabTextColor(tabIndex, sender->titleColor());
+        int tabIndexToChange = m_tabWidget->indexOf(sender);
+        setTabText(tabIndexToChange, newTitle);
     }
 }
 
diff --git a/app/chat-window.h b/app/chat-window.h
index 76598d0..cde19e4 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -49,9 +49,11 @@ public:
 
 public slots:
     void removeTab(QWidget *chatWidget);
+private slots:
     void onCurrentIndexChanged(int index);
-    void onContactPresenceChanged(const Tp::Presence &presence);
     void onTabStateChanged();
+    void onTabTextChanged(const QString &newTitle);
+    void onTabIconChanged(const KIcon &newIcon);
 
 protected slots:
     void showSettingsDialog();

-- 
ktp-text-ui packaging