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

The following commit has been merged in the master branch:
commit 1036247bf9afebfa59816c270a8f5867e87adfc0
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Sep 20 11:58:13 2010 +0000

    Further theme support:
     - source name in header
     - put in template rendering code for when status is not presence
     - fix fallback for user icon path
    
    svn path=/trunk/playground/network/telepathy-chat-handler/; revision=1177498
---
 lib/chatview.cpp                 | 4 +++-
 lib/chatwindow.cpp               | 4 ++--
 lib/telepathychatmessageinfo.cpp | 6 ++++++
 lib/telepathychatmessageinfo.h   | 7 ++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/chatview.cpp b/lib/chatview.cpp
index 59ff3d5..a6493c0 100644
--- a/lib/chatview.cpp
+++ b/lib/chatview.cpp
@@ -226,9 +226,11 @@ void ChatView::addMessage(const TelepathyChatMessageInfo &message)
     styleHtml.replace("%senderScreenName%", message.senderScreenName());
     styleHtml.replace("%time%", KGlobal::locale()->formatTime(message.time().time(), true));
     styleHtml.replace("%shortTime%", KGlobal::locale()->formatTime(message.time().time(), false));
-    styleHtml.replace("%userIconPath%", "Outgoing/buddy_icon.png");// this fallback should be done in the messageinfo
+    styleHtml.replace("%userIconPath%", "outgoing_icon.png");// this fallback should be done in the messageinfo
     styleHtml.replace("%messageClasses%", message.messageClasses());
     styleHtml.replace("%service%", message.service());
+    styleHtml.replace("%userIcons%", message.userIcons());
+    styleHtml.replace("%status%", "idle");
 
 
     // Look for %time{X}%
diff --git a/lib/chatwindow.cpp b/lib/chatwindow.cpp
index 0aff46a..ca2d4bc 100644
--- a/lib/chatwindow.cpp
+++ b/lib/chatwindow.cpp
@@ -217,6 +217,8 @@ void ChatWindow::updateEnabledState(bool enable)
             info.setChatName("Group Chat");
         }
 
+        info.setSourceName(m_chatConnection->connection()->protocolName());
+
         //set up anything related to 'self'
         info.setOutgoingIconPath(m_chatConnection->channel()->groupSelfContact()->avatarToken());
         info.setTimeOpened(QDateTime::currentDateTime());
@@ -224,8 +226,6 @@ void ChatWindow::updateEnabledState(bool enable)
 
         //inform anyone using the class of the new name for this chat.
         Q_EMIT titleChanged(info.chatName());
-
-
     }
 }
 
diff --git a/lib/telepathychatmessageinfo.cpp b/lib/telepathychatmessageinfo.cpp
index 5f53c12..5d7217b 100644
--- a/lib/telepathychatmessageinfo.cpp
+++ b/lib/telepathychatmessageinfo.cpp
@@ -25,3 +25,9 @@ TelepathyChatMessageInfo::TelepathyChatMessageInfo(MessageType type)
 {
     m_type = type;
 }
+
+QString TelepathyChatMessageInfo::userIcons() const
+{
+    //FIXME read config, return correct value.
+    return QString("showIcons");
+}
diff --git a/lib/telepathychatmessageinfo.h b/lib/telepathychatmessageinfo.h
index 1cb965f..6e26f52 100644
--- a/lib/telepathychatmessageinfo.h
+++ b/lib/telepathychatmessageinfo.h
@@ -125,7 +125,9 @@ public:
         return classes.join(" ");
     }
 
-
+    /** Will be replaced with "showIcons" if the "Show user icons" checkbox is selected, and will be replaced with "hideIcons" if the checkbox is deselected.*/
+    //This is pure style - do in the chat view instead?
+    QString userIcons() const;
 
 private:
     //descriptions come from the data we need for Adium theme templates
@@ -144,8 +146,7 @@ private:
     /** A human readable description for the messaging service associated with this message, such as "AIM" or "MSN". */
     QString m_service;
 
-    /** Will be replaced with "showIcons" if the "Show user icons" checkbox is selected, and will be replaced with "hideIcons" if the checkbox is deselected.*/
-    //This is pure style - do in the chat view instead?
+
     QString m_userIcons;
 
     /** A space separated list of type information for messages, suitable for use as a class attribute. Currently available types are listed below. */

-- 
ktp-text-ui packaging