[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [declarative-plasmoids] microblog: authorization via service starts to work, sort out status display
From: Sebastian_Kügler <sebas () kde ! org>
Date: 2012-02-01 1:50:01
Message-ID: 20120201015001.1B39BA60B9 () git ! kde ! org
[Download RAW message or body]
Git commit 8d818cefec68c84ad75431a2dc17c588d7468bff by Sebastian Kügler.
Committed on 28/01/2012 at 04:43.
Pushed by sebas into branch 'master'.
authorization via service starts to work, sort out status display now
M +1 -0 microblog/contents/config/main.xml
M +1 -1 microblog/contents/ui/BasicComponents/qmldir
M +1 -1 microblog/contents/ui/MainWidget/qmldir
M +7 -11 microblog/contents/ui/main.qml
A +41 -0 microblog/platformcontents/application/tablet/ui/MainWidget/AuthorizationWidget.qml \
[License: LGPL (v2+)] M +2 -1 \
microblog/platformcontents/application/tablet/ui/MainWidget/qmldir
http://commits.kde.org/declarative-plasmoids/8d818cefec68c84ad75431a2dc17c588d7468bff
diff --git a/microblog/contents/config/main.xml b/microblog/contents/config/main.xml
index 37015c5..d11078c 100644
--- a/microblog/contents/config/main.xml
+++ b/microblog/contents/config/main.xml
@@ -12,6 +12,7 @@
</entry>
<entry name="userName" type="String">
<label>User name</label>
+ <default>PlasmaActive</default>
</entry>
<entry name="password" type="String">
<label>Password</label>
diff --git a/microblog/contents/ui/BasicComponents/qmldir \
b/microblog/contents/ui/BasicComponents/qmldir index 5fe1aad..60c1b51 100644
--- a/microblog/contents/ui/BasicComponents/qmldir
+++ b/microblog/contents/ui/BasicComponents/qmldir
@@ -1,3 +1,3 @@
MessageWidget 1.0 MessageWidget.qml
PostingWidget 1.0 PostingWidget.qml
-ListItem 1.0 ListItem.qml
\ No newline at end of file
+ListItem 1.0 ListItem.qml
diff --git a/microblog/contents/ui/MainWidget/qmldir \
b/microblog/contents/ui/MainWidget/qmldir index 8134d44..043dd8c 100644
--- a/microblog/contents/ui/MainWidget/qmldir
+++ b/microblog/contents/ui/MainWidget/qmldir
@@ -1 +1 @@
-MainWidget 1.0 MainWidget.qml
\ No newline at end of file
+MainWidget 1.0 MainWidget.qml
diff --git a/microblog/contents/ui/main.qml b/microblog/contents/ui/main.qml
index ac36512..8fd6ce3 100644
--- a/microblog/contents/ui/main.qml
+++ b/microblog/contents/ui/main.qml
@@ -24,6 +24,7 @@ import org.kde.qtextracomponents 0.1 as QtExtraComponents
import "plasmapackage:/code/logic.js" as Logic
import "plasmapackage:/ui/MainWidget"
+import "plasmapackage:/ui/BasicComponents"
Item {
id: main
@@ -31,7 +32,7 @@ Item {
height: 300
property string serviceUrl: "https://twitter.com/"
- property string userName: "PlasmaActive" // FIXME: remove until config doesn't \
get nuked all the time + property string userName//: "sebasje" // FIXME: remove \
until config doesn't get nuked all the time property string password
signal replyAsked(string id, string message)
@@ -83,7 +84,7 @@ Item {
interval: 100
repeat: false
onTriggered: {
- //print(" Logging in ..." + password);
+ print(" XXXX Logging in ..." + password);
var service = \
microblogSource.serviceForSource(microblogSource.connectedSources[0]) var operation \
= service.operationDescription("auth"); operation.password = password
@@ -135,9 +136,9 @@ Item {
onDataChanged: {
if (statusSource.data["Status:"+serviceUrl]) {
print(" status: " + statusSource.data);
- authStatusLabel.text = \
statusSource.data["Status:"+serviceUrl]["Authorization"]; + \
authStatusWidget.statusMessage = \
statusSource.data["Status:"+serviceUrl]["Authorization"] + ": " + \
statusSource.data["Status:"+serviceUrl]["AuthorizationMessage"] ; } else {
- authStatusLabel.text = "Unknown status"
+ authStatusWidget.statusMessage = "Unknown status"
}
}
Component.onCompleted: statusSource.connectSource("Status:"+serviceUrl);
@@ -148,13 +149,8 @@ Item {
anchors.fill: main
}
- PlasmaComponents.Label {
- id: authStatusLabel
- width: 300
- height: 48
- //text: statusSource.data["Status:https://twitter.com/"]["Authorization"]
- //text: "Status:" + \
statusSource.data["Status:https://twitter.com/"]["Authorization"]
- text: "Status..."
+ AuthorizationWidget {
+ id: authStatusWidget
anchors { left: parent.left; right: parent.right; }
}
}
diff --git a/microblog/platformcontents/application/tablet/ui/MainWidget/AuthorizationWidget.qml \
b/microblog/platformcontents/application/tablet/ui/MainWidget/AuthorizationWidget.qml \
new file mode 100644 index 0000000..4897a5d
--- /dev/null
+++ b/microblog/platformcontents/application/tablet/ui/MainWidget/AuthorizationWidget.qml
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012 Sebastian Kügler <sebas@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+import QtQuick 1.1
+import org.kde.plasma.core 0.1 as PlasmaCore
+import org.kde.plasma.components 0.1 as PlasmaComponents
+import org.kde.plasma.mobilecomponents 0.1 as MobileComponents
+import org.kde.qtextracomponents 0.1 as QtExtraComponents
+
+import "plasmapackage:/ui/ComplexComponents"
+import "plasmapackage:/ui/BasicComponents"
+Item {
+ property alias statusMessage: statusLabel.text
+ property string status;
+
+ PlasmaComponents.Label {
+ id: statusLabel
+ width: 300
+ height: 48
+ //text: statusSource.data["Status:https://twitter.com/"]["Authorization"]
+ //text: "Status:" + \
statusSource.data["Status:https://twitter.com/"]["Authorization"] + text: \
"Status..." + }
+}
+
diff --git a/microblog/platformcontents/application/tablet/ui/MainWidget/qmldir \
b/microblog/platformcontents/application/tablet/ui/MainWidget/qmldir index \
798f487..092d2a9 100644
--- a/microblog/platformcontents/application/tablet/ui/MainWidget/qmldir
+++ b/microblog/platformcontents/application/tablet/ui/MainWidget/qmldir
@@ -1,2 +1,3 @@
MainWidget 1.0 MainWidget.qml
-MessageWidgetDetails 1.0 MessageWidgetDetails.qml
\ No newline at end of file
+MessageWidgetDetails 1.0 MessageWidgetDetails.qml
+AuthorizationWidget 1.0 AuthorizationWidget.qml
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic