[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=5840f26

The following commit has been merged in the master branch:
commit 5840f26c98431f287ece853aec40b438be7538aa
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Dec 3 00:13:19 2011 +1100

    Added a dialog
    
    Plus optimization in MessagesModel
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml | 132 ++++++++++++-----------
 1 file changed, 68 insertions(+), 64 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 71b0bfd..d966f32 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -3,7 +3,7 @@ import org.kde.telepathy.declarativeplugins 0.1
 import org.kde.plasma.core 0.1 as PlasmaCore
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 
-Item {
+/*PlasmaCore.Dialog {
     id:main
 
     function derp() {
@@ -11,85 +11,89 @@ Item {
         return true;
     }
 
+
+    mainItem: */
+Item {
     property Conversation conv
 
-    PlasmaWidgets.IconWidget {
-        id: title
-        text: conv.nick
-        icon: conv.avatar
-        anchors.top: parent.top
-        anchors.left: parent.left; anchors.right: parent.right
-//         anchors.bottom: chatArea.top
-        height: 12
-        orientation: Qt.Horizontal
-    }
+        PlasmaWidgets.IconWidget {
+            id: title
+            text: conv.target.nick
+            icon: conv.target.avatar
+            anchors.top: parent.top
+            anchors.left: parent.left; anchors.right: parent.right
+    //         anchors.bottom: chatArea.top
+            height: 12
+            orientation: Qt.Horizontal
+        }
 
-    Item {
-        id:chatArea
+        Item {
+            id:chatArea
 
-//         anchors.top: parent.top
-        anchors.top: title.bottom
-        anchors.left: parent.left; anchors.right: parent.right
-        anchors.bottom: input.top
-        anchors.margins: 5
+    //         anchors.top: parent.top
+            anchors.top: title.bottom
+            anchors.left: parent.left; anchors.right: parent.right
+            anchors.bottom: input.top
+            anchors.margins: 5
 
-        Rectangle {
-            anchors.fill: chatArea
-        }
+            Rectangle {
+                anchors.fill: chatArea
+            }
 
-        ListView {
-            id: view
+            ListView {
+                id: view
 
-            anchors.fill: parent
-            clip: true
+                anchors.fill: parent
+                clip: true
 
-            delegate: TextDelegate {}
-            model: conv.model
-            ListView.onAdd: {
-                derp();
+                delegate: TextDelegate {}
+                model: conv.model
+                ListView.onAdd: {
+                    derp();
+                }
             }
-        }
 
-        //used states here because it'll make a scrollbar (dis)appear later on
-        states: [
-            State {
-                name: "static"
-            },
-            State {
-                name: "auto-scrolling"
-                PropertyChanges {
-                    target: view.model
-                    restoreEntryValues: true
-                    onRowsInserted: {
-                        view.positionViewAtEnd();
+            //used states here because it'll make a scrollbar (dis)appear later on
+            states: [
+                State {
+                    name: "static"
+                },
+                State {
+                    name: "auto-scrolling"
+                    PropertyChanges {
+                        target: view.model
+                        restoreEntryValues: true
+                        onRowsInserted: {
+                            view.positionViewAtEnd();
+                        }
                     }
                 }
-            }
-        ]
+            ]
 
-    }
+        }
 
-    PlasmaWidgets.LineEdit {
-        id: input
+        PlasmaWidgets.LineEdit {
+            id: input
 
-//         anchors.top: view.bottom
-        anchors.left: parent.left; anchors.right: parent.right
-        anchors.bottom: parent.bottom
+    //         anchors.top: view.bottom
+            anchors.left: parent.left; anchors.right: parent.right
+            anchors.bottom: parent.bottom
 
-        onReturnPressed: {
-            view.model.sendNewMessage(text);
-            text = "";
+            onReturnPressed: {
+                view.model.sendNewMessage(text);
+                text = "";
+            }
         }
     }
 
-    ConversationWatcher {
-        id:watcher
-        onNewConversation: {
-            console.log("New Convo!");
-            conv = con;
-//             conv.model = con.model;
-//             view.model.rowsInserted.connect(view.positionViewAtEnd);
-            chatArea.state = "auto-scrolling";
-        }
-    }
-}
\ No newline at end of file
+//     ConversationWatcher {
+//         id:watcher
+//         onNewConversation: {
+//             console.log("New Convo!");
+//             conv = con;
+// //             conv.model = con.model;
+// //             view.model.rowsInserted.connect(view.positionViewAtEnd);
+//             chatArea.state = "auto-scrolling";
+//         }
+//     }
+// }
\ No newline at end of file

-- 
ktp-contact-applet packaging