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

The following commit has been merged in the master branch:
commit efd94d06b695ce6102731d1218d9fcbc1e704cfc
Author: Lasath Fernando <kde at lasath.org>
Date:   Tue Dec 6 11:45:10 2011 +1100

    Fixed binding loop for ConversationDelegate.size
---
 lib/messages-model.cpp                        |  9 ++++-----
 plasmoid/contents/ui/ChatWidget.qml           |  1 +
 plasmoid/contents/ui/ConversationDelegate.qml | 21 ++++++++++++++-------
 plasmoid/metadata.desktop                     |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/lib/messages-model.cpp b/lib/messages-model.cpp
index bc85936..e377a84 100644
--- a/lib/messages-model.cpp
+++ b/lib/messages-model.cpp
@@ -96,7 +96,7 @@ void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
 
 void MessagesModel::onMessageReceived(Tp::ReceivedMessage message)
 {
-    kDebug();
+    kDebug() << "unreadMessagesCount = " << d->textChannel->messageQueue().size();
     int length = rowCount();
     beginInsertRows(QModelIndex(), length, length);
 
@@ -131,12 +131,9 @@ void MessagesModel::onMessageSent(Tp::Message message, Tp::MessageSendingFlags f
 
 QVariant MessagesModel::data(const QModelIndex& index, int role) const
 {
-    kDebug();
     QVariant result;
 
-    if(!index.isValid()) {
-        kError() << "Attempting to access data at invalid index (" << index << ")";
-    } else {
+    if(index.row() < d->messages.size()) {
         MessageItem* requestedData = &d->messages[index.row()];
 
         switch(role) {
@@ -153,6 +150,8 @@ QVariant MessagesModel::data(const QModelIndex& index, int role) const
                 result = requestedData->time;
                 break;
         };
+    } else {
+        kError() << "Attempting to access data at invalid index (" << index << ")";
     }
 
     return result;
diff --git a/plasmoid/contents/ui/ChatWidget.qml b/plasmoid/contents/ui/ChatWidget.qml
index af1dc4e..24231f3 100644
--- a/plasmoid/contents/ui/ChatWidget.qml
+++ b/plasmoid/contents/ui/ChatWidget.qml
@@ -95,6 +95,7 @@ Item {
             }
 
             flickableItem: view
+            interactive: true
             width: 16
             opacity: 1
             orientation: Qt.Vertical
diff --git a/plasmoid/contents/ui/ConversationDelegate.qml b/plasmoid/contents/ui/ConversationDelegate.qml
index 6ddffeb..da0c4a8 100644
--- a/plasmoid/contents/ui/ConversationDelegate.qml
+++ b/plasmoid/contents/ui/ConversationDelegate.qml
@@ -15,7 +15,8 @@ Item {
 //         anchors.margins: 5
     }
 //     height: icon.height + 10
-    width: icon.width + 10
+//     width: icon.width + 10
+    width: height
 
     PlasmaCore.Dialog {
         id: dialog
@@ -36,17 +37,23 @@ Item {
         icon: model.conversation.target.presenceIcon
 //         anchors {
 //             top: parent.top
-//             left: parent.left
+//             bottom: parent.bottom
+// //             left: parent.left
 //         }
         anchors.fill: parent
         anchors.margins: 5
+//         width: height
 
 //         size: "32x32"
-        size: {
-            console.log("height = " + parent.height);
-            console.log("width = " + parent.width);
-            return Qt.size(parent.height, parent.height);
-        }
+//         size: {
+//             console.log("height = " + parent.height);
+//             console.log("width = " + parent.width);
+//             return Qt.size(icon.height, icon.height);
+//         }
+//         Component.onCompleted: {
+//             console.log("height = " + parent.height);
+//             console.log("width = " + parent.width);
+//         }
     }
 
     MouseArea {
diff --git a/plasmoid/metadata.desktop b/plasmoid/metadata.desktop
index 75d4f67..88d345e 100644
--- a/plasmoid/metadata.desktop
+++ b/plasmoid/metadata.desktop
@@ -5,7 +5,7 @@ Icon=kde-telepathy
 
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
-X-Plasma-DefaultSize=300,48
+X-Plasma-DefaultSize=300,68
 # X-Plasma-RequiredExtensions=LaunchApp
 
 X-KDE-PluginInfo-Author=Frederik Gladhorn

-- 
ktp-text-ui packaging