[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33952 - in gnunet-qt/SecureShare: . qml qml/fonts qml/imag
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33952 - in gnunet-qt/SecureShare: . qml qml/fonts qml/images/demo |
|
Date: |
Thu, 10 Jul 2014 22:27:53 +0200 |
Author: bratao
Date: 2014-07-10 22:27:53 +0200 (Thu, 10 Jul 2014)
New Revision: 33952
Added:
gnunet-qt/SecureShare/qml/fonts/Ubuntu-B.ttf
gnunet-qt/SecureShare/qml/images/demo/brazil.png
gnunet-qt/SecureShare/qml/images/demo/gnunet.png
gnunet-qt/SecureShare/qml/images/demo/secushare.png
Modified:
gnunet-qt/SecureShare/qml.qrc
gnunet-qt/SecureShare/qml/profile.qml
Log:
Finish Profile
Added: gnunet-qt/SecureShare/qml/fonts/Ubuntu-B.ttf
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/fonts/Ubuntu-B.ttf
===================================================================
--- gnunet-qt/SecureShare/qml/fonts/Ubuntu-B.ttf 2014-07-10 17:49:59 UTC
(rev 33951)
+++ gnunet-qt/SecureShare/qml/fonts/Ubuntu-B.ttf 2014-07-10 20:27:53 UTC
(rev 33952)
Property changes on: gnunet-qt/SecureShare/qml/fonts/Ubuntu-B.ttf
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/x-font-ttf
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/demo/brazil.png
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/images/demo/brazil.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/demo/brazil.png 2014-07-10 17:49:59 UTC
(rev 33951)
+++ gnunet-qt/SecureShare/qml/images/demo/brazil.png 2014-07-10 20:27:53 UTC
(rev 33952)
Property changes on: gnunet-qt/SecureShare/qml/images/demo/brazil.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/demo/gnunet.png
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/images/demo/gnunet.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/demo/gnunet.png 2014-07-10 17:49:59 UTC
(rev 33951)
+++ gnunet-qt/SecureShare/qml/images/demo/gnunet.png 2014-07-10 20:27:53 UTC
(rev 33952)
Property changes on: gnunet-qt/SecureShare/qml/images/demo/gnunet.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/demo/secushare.png
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/images/demo/secushare.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/demo/secushare.png 2014-07-10 17:49:59 UTC
(rev 33951)
+++ gnunet-qt/SecureShare/qml/images/demo/secushare.png 2014-07-10 20:27:53 UTC
(rev 33952)
Property changes on: gnunet-qt/SecureShare/qml/images/demo/secushare.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: gnunet-qt/SecureShare/qml/profile.qml
===================================================================
--- gnunet-qt/SecureShare/qml/profile.qml 2014-07-10 17:49:59 UTC (rev
33951)
+++ gnunet-qt/SecureShare/qml/profile.qml 2014-07-10 20:27:53 UTC (rev
33952)
@@ -17,6 +17,7 @@
FontLoader { id: bebasFont; source: "fonts/BebasNeue.otf" }
FontLoader { id: ubuntuFont; source: "fonts/Ubuntu-R.ttf" }
FontLoader { id: ubuntuBIFont; source: "fonts/Ubuntu-BI.ttf" }
+ FontLoader { id: ubuntuBFont; source: "fonts/Ubuntu-B.ttf" }
FontLoader { id: ubuntuLFont; source: "fonts/Ubuntu-L.ttf" }
@@ -30,7 +31,49 @@
property string site : "mysite.com"
property string email : "address@hidden"
property string image: "images/demo/baila.jpg"
- property string description: "Did you see that NSA graffiti on the
corner of Chaussestr. and Torstr. not only does it look amazing, it's algo such
a strong message !!"
+ property string description: "Augusta Ada King, Countess of Lovelace,
born Augusta Ada Byron and now commonly known as Ada Lovelace, was an English
mathematician and writer chiefly known for her work on Charles Babbage's early
mechanical general-purpose computer, the Analytical Engine."
+ property var extraInfo :
+ ListModel {
+ id: extraInfoModel
+
+ ListElement {
+ name: "Favorite Animals"
+ value: "Dogs and Cats"
+ }
+ ListElement {
+ name: "Favorite Music"
+ value: "Madonna; Psy"
+ }
+ ListElement {
+ name: "Language"
+ value: "Portuguese"
+ }
+ ListElement {
+ name: "Wedding date"
+ value: "27/11/1989"
+ }
+ }
+ property var community :
+ ListModel {
+ id: communityModel
+
+ ListElement {
+ name: "GNUnet"
+ image: "images/demo/gnunet.png"
+ }
+ ListElement {
+ name: "PSYC"
+ image: "images/demo/secushare.png"
+ }
+ ListElement {
+ name: "Brazil"
+ image: "images/demo/brazil.png"
+ }
+ ListElement {
+ name: "lynX Fanclub"
+ image: "images/demo/arp.jpg"
+ }
+ }
}
RowLayout{
@@ -195,6 +238,7 @@
id: title
anchors.top: parent.top
anchors.left: parent.left
+ anchors.right: trustRect.left
anchors.topMargin: 20
height: 60
@@ -202,9 +246,12 @@
text: "About " + person.name
font.pixelSize: 32
font.family: ubuntuFont.name
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
}
Rectangle{
+ id: trustRect
anchors.top: parent.top
anchors.topMargin: 20
@@ -215,8 +262,15 @@
height: 50
color: "#CBCBCB"
+ Label{
+ id: trustLabel
+ text: "Trust level:"
+
+ }
+
Slider {
id: slider1
+ anchors.top : trustLabel.bottom
value: 0.5
style: SliderStyle { }
implicitWidth: 150
@@ -229,31 +283,245 @@
Rectangle{
+ id: descriptionRect
anchors.top: title.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.rightMargin: 10
- height: 200
+ height: descriptionText.contentHeight +20
color: "#f1f1f1"
- Text{
+ Label{
+ id: descriptionText
anchors.fill: parent
anchors.leftMargin: 20
anchors.rightMargin: 20
anchors.topMargin: 10
wrapMode : Text.Wrap
- elide : Text.ElideRight
+ //elide : Text.ElideRight
color: "black"
font.family: ubuntuLFont.name
font.pixelSize: 16
- font.letterSpacing : -2
+ //font.letterSpacing : -2
- text: "Edward Joseph \"Ed\" Snowden (born June 21, 1983)
is an American computer professional. A former systems administrator for the
Central Intelligence Agency (CIA) and a counterintelligence trainer at the
Defense Intelligence Agency (DIA), he later went to work for the private
intelligence contractor Dell, inside a National Security Agency (NSA) outpost
in Japan. In early 2013, he joined the consulting firm Booz Allen Hamilton
inside the NSA center in Hawaii. In June 2013, he came to international
attention after disclosing to several media outlets thousands of classified
documents that he acquired while working as an NSA contractor for Dell and Booz
Allen Hamilton."
+ text: person.description
}
}
+ ListView {
+ id: moreList
+ anchors.top: descriptionRect.bottom
+ anchors.topMargin: 20
+
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.rightMargin: 20
+ state: "HIDDEN"
+
+ clip: true
+
+
+ model: person.extraInfo
+ delegate: Rectangle {
+ Rectangle{
+ color: "#DDDDDD"
+ height : 1
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ }
+
+ objectName: "delegate"
+ width: parent.width
+ height: 25
+ color: index % 2 ? "#F9F9F9" : "white"
+
+ Row{
+ anchors.verticalCenter: parent.verticalCenter
+ spacing: 5
+
+ Label {
+ color: "black"
+ text: name + ": "
+ font.family: ubuntuBFont.name
+ font.pixelSize: 14
+ }
+ Label {
+ color: "black"
+ text: value
+ font.family: ubuntuFont.name
+ font.pixelSize: 14
+ }
+
+ }
+
+
+ }
+
+ Behavior on height { PropertyAnimation {} }
+
+ states: [
+ State {
+ name: "SHOWN"
+ PropertyChanges { target: moreList; height: 110;
visible:true}
+ },
+ State {
+ name: "HIDDEN"
+ PropertyChanges { target: moreList; height: 0;
visible:false}
+ }
+ ]
+
+ }
+
+ Label{
+ id: showmoreLabel
+ anchors.top:moreList.bottom
+ anchors.topMargin: 10
+ text:"Show more information..."
+ color: "blue"
+
+ MouseArea{
+ id: ma
+ anchors.fill: parent
+ hoverEnabled: true
+
+
+ onContainsMouseChanged: {
+ if(containsMouse){
+ showmoreLabel.font.underline = true
+ cursorShape: Qt.PointingHandCursor
+ }
+ else
+ {
+ showmoreLabel.font.underline = false
+ cursorShape: Qt.ArrowCursor
+ }
+ }
+
+ onClicked: {
+ if(moreList.state == "HIDDEN")
+ {
+ moreList.state = "SHOWN"
+ showmoreLabel.text = "Hide more information..."
+ }
+ else
+ {
+ moreList.state = "HIDDEN"
+ showmoreLabel.text = "Show more information..."
+ }
+ }
+
+ }
+ }
+
+ Label{
+ id: channelsLabel
+ anchors.top:showmoreLabel.bottom
+ anchors.topMargin: 10
+ text: "Channels"
+ font.family: ubuntuLFont.name
+ font.pixelSize: 16
+ }
+ Rectangle{
+ color: "#DDDDDD"
+ height : 1
+ anchors.top: channelsLabel.bottom
+ anchors.topMargin: 5
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.rightMargin: 5
+ }
+
+ ListView {
+ id: channelsList
+ anchors.top: channelsLabel.bottom
+
+ anchors.topMargin: 20
+
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.rightMargin: 20
+
+ anchors.bottom: parent.bottom
+
+ clip: true
+
+ model: person.community
+ delegate: Rectangle {
+
+ id: rectItem
+ objectName: "delegate"
+ width: parent.width
+ height: 50
+
+
+
+ Image {
+ id: channelImage
+ source: image
+ fillMode: Image.PreserveAspectCrop
+ height: 45
+ width: 45
+ }
+ Label {
+ color: "black"
+ text: name
+ anchors.left: channelImage.right
+ anchors.leftMargin: 10
+ font.family: ubuntuFont.name
+ font.pixelSize: 16
+ }
+
+ Rectangle{
+ id:buttonRect
+ border.color: "#A7C9A1"
+ border.width: 1
+ height: 30
+ width: 80
+ anchors.right: parent.right
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.rightMargin: 10
+ visible: false
+
+ Text {
+ id: labelEnter
+ anchors.centerIn: parent
+ text: qsTr("Enter")
+ color: "#81A87B"
+ }
+ }
+
+ MouseArea{
+ id: maItem
+ anchors.fill: parent
+ hoverEnabled: true
+
+
+ onContainsMouseChanged: {
+ if(containsMouse){
+ rectItem.color = "#F9F9F9"
+ buttonRect.visible = true
+ }
+ else
+ {
+ rectItem.color = "white"
+ buttonRect.visible = false
+ }
+ }
+
+ }
+
+
+ }
+
+
+ }
+
+
+
+
}
Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc 2014-07-10 17:49:59 UTC (rev 33951)
+++ gnunet-qt/SecureShare/qml.qrc 2014-07-10 20:27:53 UTC (rev 33952)
@@ -37,5 +37,9 @@
<file>qml/images/location.png</file>
<file>qml/images/phone.png</file>
<file>qml/images/share.png</file>
+ <file>qml/fonts/Ubuntu-B.ttf</file>
+ <file>qml/images/demo/brazil.png</file>
+ <file>qml/images/demo/gnunet.png</file>
+ <file>qml/images/demo/secushare.png</file>
</qresource>
</RCC>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33952 - in gnunet-qt/SecureShare: . qml qml/fonts qml/images/demo,
gnunet <=