[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [declarative-plasmoids] microblog: various fixups in prep for posting
From:       Sebastian_Kügler <sebas () kde ! org>
Date:       2012-02-01 1:50:01
Message-ID: 20120201015001.3C66FA60C9 () git ! kde ! org
[Download RAW message or body]

Git commit 7e1f638bc17c1982f0324b1c271392bac2895ff1 by Sebastian Kügler.
Committed on 01/02/2012 at 02:48.
Pushed by sebas into branch 'master'.

various fixups in prep for posting

M  +7    -3    microblog/contents/code/logic.js
M  +1    -1    microblog/contents/config/main.xml
M  +5    -4    microblog/contents/ui/main.qml
M  +8    -2    microblog/platformcontents/application/generic/ui/BasicComponents/AuthorizationWidget.qml
 M  +4    -2    microblog/platformcontents/application/generic/ui/BasicComponents/PostingWidget.qml


http://commits.kde.org/declarative-plasmoids/7e1f638bc17c1982f0324b1c271392bac2895ff1

diff --git a/microblog/contents/code/logic.js b/microblog/contents/code/logic.js
index 8b0af1f..0abf255 100644
--- a/microblog/contents/code/logic.js
+++ b/microblog/contents/code/logic.js
@@ -20,21 +20,25 @@
 .pragma library
 
 var messagesDataSource
-
+var userName
+var serviceUrl
 
 function refresh()
 {
-    var service = messagesDataSource.serviceForSource(messagesDataSource.connectedSources[0])
 +    var src = "TimelineWithFriends" + userName + "@" + serviceUrl;
+    var service = messagesDataSource.serviceForSource(src)
     var operation = service.operationDescription("refresh");
     service.startOperationCall(operation);
 }
 
 function update(status, inReplyToStatusId)
 {
-    var service = messagesDataSource.serviceForSource(messagesDataSource.connectedSources[0])
 +    var src = "TimelineWithFriends:" + userName + "@" + serviceUrl;
+    var service = messagesDataSource.serviceForSource(src)
     var operation = service.operationDescription("update");
     operation.status = status;
     operation.in_reply_to_status_id = inReplyToStatusId
+    print(" ... > messagesDataSource: " + src)
     service.startOperationCall(operation);
 }
 
diff --git a/microblog/contents/config/main.xml b/microblog/contents/config/main.xml
index 09d0e24..d11078c 100644
--- a/microblog/contents/config/main.xml
+++ b/microblog/contents/config/main.xml
@@ -8,7 +8,7 @@
   <group name="General">
     <entry name="serviceUrl" type="String">
       <label>Microblog service</label>
-      <default>https://identi.ca/api/</default>
+      <default>https://twitter.com/</default>
     </entry>
     <entry name="userName" type="String">
       <label>User name</label>
diff --git a/microblog/contents/ui/main.qml b/microblog/contents/ui/main.qml
index 0b46a55..a2b9daf 100644
--- a/microblog/contents/ui/main.qml
+++ b/microblog/contents/ui/main.qml
@@ -31,7 +31,7 @@ Item {
     width: 200
     height: 300
 
-    property string serviceUrl//: "https://twitter.com/"
+    property string serviceUrl: "https://twitter.com/"
     property string userName//: "sebasje" // FIXME: remove until config doesn't get \
nuked all the time  property string password
 
@@ -63,13 +63,13 @@ Item {
             password = plasmoid.readConfig("password")
         }
         if (s) {
-            serviceUrl = plasmoid.readConfig("serviceUrl")
             imageSource.connectSource("UserImages:"+serviceUrl)
         } else {
             serviceUrl = "https://identi.ca/api/"
             //serviceUrl = "https://twitter.com/"
         }
         if (serviceUrl && userName) {
+            print("Requesting ... " + userName + "@" + serviceUrl);
             microblogSource.connectSource("TimelineWithFriends:"+userName+"@"+serviceUrl)
  }
         //microblogSource.connectSource("UserImages:"+serviceUrl)
@@ -84,8 +84,9 @@ Item {
         interval: 100
         repeat: false
         onTriggered: {
-            print(" XXXX Logging in ..." + password);
-            var service = \
microblogSource.serviceForSource(microblogSource.connectedSources[0]) +            \
var src = "TimelineWithFriends:" + userName + "@" + serviceUrl; +            print(" \
XXXX Logging in ..." + password + " source: " + src); +            var service = \
microblogSource.serviceForSource(src)  var operation = \
service.operationDescription("auth");  operation.password = password
             service.startOperationCall(operation);
diff --git a/microblog/platformcontents/application/generic/ui/BasicComponents/AuthorizationWidget.qml \
b/microblog/platformcontents/application/generic/ui/BasicComponents/AuthorizationWidget.qml
 index 0edfdd9..876c991 100644
--- a/microblog/platformcontents/application/generic/ui/BasicComponents/AuthorizationWidget.qml
                
+++ b/microblog/platformcontents/application/generic/ui/BasicComponents/AuthorizationWidget.qml
 @@ -35,6 +35,10 @@ Item {
 //     width: childrenRect.width
 //     height: childrenRect.height
 
+    onStatusChanged: {
+        print(" status changed to " + status);
+    }
+
     PlasmaComponents.BusyIndicator {
         id: busyIndicator
         width: authStatusWidget.height; height: width
@@ -81,6 +85,7 @@ Item {
 //                 authStatusWidget.status = "Idle"
 
             }
+            print(" -----> dataChagned");
         }
         Component.onCompleted: statusSource.connectSource("Status:"+serviceUrl);
     }
@@ -88,8 +93,9 @@ Item {
     Connections {
         target: main
         onServiceUrlChanged: {
-            print("C O N N E C T E D");
-            statusSource.connectSource("Status:"+serviceUrl);
+            var src = "Status:"+serviceUrl;
+            print("C O N N E C T E D to " + src);
+            statusSource.connectSource(src);
         }
     }
 }
diff --git a/microblog/platformcontents/application/generic/ui/BasicComponents/PostingWidget.qml \
b/microblog/platformcontents/application/generic/ui/BasicComponents/PostingWidget.qml \
                index fd3f4f6..dba390d 100644
--- a/microblog/platformcontents/application/generic/ui/BasicComponents/PostingWidget.qml
                
+++ b/microblog/platformcontents/application/generic/ui/BasicComponents/PostingWidget.qml
 @@ -87,8 +87,10 @@ Item {
                 characterCountLabel.characterCount = txt.length;
                 //yes, TextEdit doesn't have returnPressed sadly
                 if (txt[txt.length-1] == "\n") {
-                    //Logic.update(txt, inReplyToStatusId);
-                    //refresh();
+                    Logic.userName = userName;
+                    Logic.serviceUrl = serviceUrl;
+                    Logic.update(txt, inReplyToStatusId);
+                    refresh();
                     print(" RETURN ");
                 } else if (txt.length == 0) {
                     inReplyToStatusId = ""


[prev in list] [next in list] [prev in thread] [next in thread]