[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=2c8ff0f

The following commit has been merged in the master branch:
commit 2c8ff0f0648920b1d1f46db7b4b042786e479fbf
Author: Daniel Cohen <analoguecolour at gmail.com>
Date:   Tue Aug 13 11:01:27 2013 +0100

    Removal of 'Typing...' in chat window title to avoid confusing UX
    
    When a user is talking to multiple people, it is confusing to have 'Typing... Bob', when it's actually Fred in another tab who is typing.
    
    The presence of the both the chat tab status-icon change combined with the tab name text colour change is sufficient to denote activity and removes this confusion which is exacerbated with the more chat tabs that you have open.
---
 app/chat-window.cpp | 24 ------------------------
 app/chat-window.h   |  1 -
 2 files changed, 25 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index d829125..c698204 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -320,9 +320,6 @@ void ChatWindow::onCurrentIndexChanged(int index)
         setWindowIcon(currentChatTab->icon());
     }
 
-    //call this to update the "Typing.." in window title
-    onUserTypingChanged(currentChatTab->remoteChatState());
-
     kDebug() << "Current spell dictionary is" << currentChatTab->spellDictionary();
     m_spellDictCombo->setCurrentByDictionary(currentChatTab->spellDictionary());
 
@@ -615,7 +612,6 @@ void ChatWindow::removeChatTabSignals(ChatTab *chatTab)
 {
     disconnect(chatTab, SIGNAL(titleChanged(QString)), this, SLOT(onTabTextChanged(QString)));
     disconnect(chatTab, SIGNAL(iconChanged(KIcon)), this, SLOT(onTabIconChanged(KIcon)));
-    disconnect(chatTab, SIGNAL(userTypingChanged(Tp::ChannelChatState)), this, SLOT(onTabStateChanged()));
     disconnect(chatTab, SIGNAL(unreadMessagesChanged()), this, SLOT(onTabStateChanged()));
     disconnect(chatTab, SIGNAL(contactPresenceChanged(Tp::Presence)), this, SLOT(onTabStateChanged()));
     disconnect(chatTab->chatSearchBar(), SIGNAL(enableSearchButtonsSignal(bool)), this, SLOT(onEnableSearchActions(bool)));
@@ -642,7 +638,6 @@ void ChatWindow::setupChatTabSignals(ChatTab *chatTab)
     connect(chatTab, SIGNAL(titleChanged(QString)), this, SLOT(onTabTextChanged(QString)));
     connect(chatTab, SIGNAL(iconChanged(KIcon)), this, SLOT(onTabIconChanged(KIcon)));
     connect(chatTab, SIGNAL(userTypingChanged(Tp::ChannelChatState)), this, SLOT(onTabStateChanged()));
-    connect(chatTab, SIGNAL(userTypingChanged(Tp::ChannelChatState)), this, SLOT(onUserTypingChanged(Tp::ChannelChatState)));
     connect(chatTab, SIGNAL(unreadMessagesChanged()), this, SLOT(onTabStateChanged()));
     connect(chatTab, SIGNAL(contactPresenceChanged(KTp::Presence)), this, SLOT(onTabStateChanged()));
     connect(chatTab->chatSearchBar(), SIGNAL(enableSearchButtonsSignal(bool)), this, SLOT(onEnableSearchActions(bool)));
@@ -846,25 +841,6 @@ void ChatWindow::startShareDesktop(const Tp::AccountPtr& account, const Tp::Cont
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }
 
-void ChatWindow::onUserTypingChanged(Tp::ChannelChatState state)
-{
-    ChatWidget *currChat =  qobject_cast<ChatWidget*>(m_tabWidget->currentWidget());
-    Q_ASSERT(currChat);
-    QString title = currChat->title();
-
-    if (TextChatConfig::instance()->showOthersTyping()) {
-        if (state == Tp::ChannelChatStateComposing) {
-            setWindowTitle(i18nc("String prepended in window title, arg is contact's name", "Typing... %1", title));
-        } else if (state == Tp::ChannelChatStatePaused) {
-            setWindowTitle(i18nc("String appended in window title, arg is contact's name", "%1 has entered text", title));
-        } else {
-            setWindowTitle(title);
-        }
-    } else {
-        setWindowTitle(title);
-    }
-}
-
 bool ChatWindow::event(QEvent *e)
 {
     if (e->type() == QEvent::WindowActivate) {
diff --git a/app/chat-window.h b/app/chat-window.h
index 3a5b6ba..30981d0 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -96,7 +96,6 @@ private Q_SLOTS:
     void onTabTextChanged(const QString &newTitle);
     void onTabIconChanged(const KIcon &newIcon);
     void onVideoCallTriggered();                                /** start a video call */
-    void onUserTypingChanged(Tp::ChannelChatState state);
     void onUnblockContactTriggered();                           /** Unblocks contact when already blocked */
     void onShareDesktopTriggered();                             /** start a desktop share */
     void onOpenLogTriggered();                                  /** Starts ktp-log-viewer accountId contactId */

-- 
ktp-text-ui packaging