[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33658 - in gnunet-qt/SecureShare: . qml/threadChat
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33658 - in gnunet-qt/SecureShare: . qml/threadChat |
|
Date: |
Sat, 14 Jun 2014 06:50:46 +0200 |
Author: bratao
Date: 2014-06-14 06:50:46 +0200 (Sat, 14 Jun 2014)
New Revision: 33658
Added:
gnunet-qt/SecureShare/qml/threadChat/BebasNeue.otf
gnunet-qt/SecureShare/qml/threadChat/Ubuntu-BI.ttf
gnunet-qt/SecureShare/qml/threadChat/Ubuntu-R.ttf
Modified:
gnunet-qt/SecureShare/qml.qrc
gnunet-qt/SecureShare/qml/threadChat/threadChat.qml
Log:
Fixed Thread Chat
Added: gnunet-qt/SecureShare/qml/threadChat/BebasNeue.otf
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/BebasNeue.otf
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/BebasNeue.otf 2014-06-12 17:36:20 UTC
(rev 33657)
+++ gnunet-qt/SecureShare/qml/threadChat/BebasNeue.otf 2014-06-14 04:50:46 UTC
(rev 33658)
Property changes on: gnunet-qt/SecureShare/qml/threadChat/BebasNeue.otf
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/vnd.ms-opentype
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/Ubuntu-BI.ttf
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/Ubuntu-BI.ttf
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/Ubuntu-BI.ttf 2014-06-12 17:36:20 UTC
(rev 33657)
+++ gnunet-qt/SecureShare/qml/threadChat/Ubuntu-BI.ttf 2014-06-14 04:50:46 UTC
(rev 33658)
Property changes on: gnunet-qt/SecureShare/qml/threadChat/Ubuntu-BI.ttf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-font-ttf
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/Ubuntu-R.ttf
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/Ubuntu-R.ttf
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/Ubuntu-R.ttf 2014-06-12 17:36:20 UTC
(rev 33657)
+++ gnunet-qt/SecureShare/qml/threadChat/Ubuntu-R.ttf 2014-06-14 04:50:46 UTC
(rev 33658)
Property changes on: gnunet-qt/SecureShare/qml/threadChat/Ubuntu-R.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
Modified: gnunet-qt/SecureShare/qml/threadChat/threadChat.qml
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/threadChat.qml 2014-06-12 17:36:20 UTC
(rev 33657)
+++ gnunet-qt/SecureShare/qml/threadChat/threadChat.qml 2014-06-14 04:50:46 UTC
(rev 33658)
@@ -15,8 +15,15 @@
property var selectedItem: null
+ FontLoader { id: bebasFont; source: "BebasNeue.otf" }
+ FontLoader { id: ubuntuFont; source: "Ubuntu-R.ttf" }
+ FontLoader { id: ubuntuBIFont; source: "Ubuntu-BI.ttf" }
+
+
+
+
RowLayout{
anchors.fill: parent
@@ -51,12 +58,12 @@
Rectangle{
id: topicsTitle
color: "white"
- height: 40
+ height: 30
anchors.top: parent.top
- anchors.topMargin: 20
+ anchors.topMargin: 15
anchors.left: parent.left
anchors.leftMargin: 5
anchors.right: parent.right
@@ -66,8 +73,9 @@
id: topicsTitleText
text: qsTr("TOPICS")
anchors.centerIn: parent
- font.pointSize: 18
- font.bold :true
+ font.pointSize: 22
+ //font.bold :true
+ font.family: bebasFont.name
}
}
@@ -103,48 +111,94 @@
Component {
id: topicsDelegate
- Rectangle {
+
+
+ Item {
id: wrapper
width: wrapper.ListView.isCurrentItem ? 186 : 170
- height: 150
- color: ListView.isCurrentItem ? "white" : "black"
+ height: 170
- Image {
- id: threadMiniImage
- source: image
- fillMode: Image.PreserveAspectCrop
- height: 60
- width: 160
- anchors.left: parent.left
- anchors.leftMargin: 5
- anchors.top: parent.top
- anchors.topMargin: 5
- }
- Text {
- anchors.top: threadMiniImage.bottom
- id: contactInfo
- text: name
- font.pointSize: 18
- width: 160
- height: 80
- anchors.left: parent.left
- anchors.leftMargin: 5
- wrapMode : Text.Wrap
- elide : Text.ElideRight
- color: wrapper.ListView.isCurrentItem ?
"black" : "white"
+ Rectangle {
+ id: wrapperInside
+ anchors.fill: parent
+ anchors.topMargin: 20
+ opacity: 1.0
+
+ color: wrapper.ListView.isCurrentItem ?
"white" : "black"
+
+ Image {
+ id: threadMiniImage
+ source: image
+ fillMode: Image.PreserveAspectCrop
+ height: 60
+ width: 160
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+ anchors.top: parent.top
+ anchors.topMargin: 5
+
+ }
+
+ Text {
+ anchors.top: threadMiniImage.bottom
+ id: contactInfo
+ text: name
+ width: 160
+ height: 80
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
+ color: wrapper.ListView.isCurrentItem ?
"black" : "white"
+
+ font.family: ubuntuBIFont.name
+ font.pointSize: 18
+ font.letterSpacing : -2
+ }
+
+
+
+
+
+ MouseArea{
+ id:ma
+ anchors.fill: parent
+ onClicked: {
+ topicList.currentIndex = index
+ }
+ }
}
+ Rectangle{
+ id:indicator
- MouseArea{
- id:ma
- anchors.fill: parent
- onClicked: {
- topicList.currentIndex = index
+ radius: 35
+ color: "#EFC208"
+ anchors.left: wrapperInside.left
+ anchors.leftMargin: 125
+ anchors.top: parent.top
+ anchors.topMargin: 10
+ border.color: "black"
+ border.width: 3
+ height: 35
+ width: 35
+ visible: wrapper.ListView.isCurrentItem ?
false: true
+
+
+ Text {
+ anchors.centerIn: parent
+ id: numberNewTopics
+ text: "12"
+ font.family: ubuntuFont.name
+ font.pointSize: 14
+
}
}
+
}
}
@@ -171,9 +225,8 @@
Rectangle{
anchors.fill: parent
- anchors.leftMargin: 10
- anchors.rightMargin: 10
- anchors.bottomMargin: 10
+ anchors.leftMargin: 20
+ anchors.rightMargin: 20
anchors.topMargin: 20
color: "white"
@@ -199,13 +252,14 @@
id: forumTitleText
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
- anchors.leftMargin: 10
+ anchors.leftMargin: 20
text: qsTr("Forum for clandestine urban art")
wrapMode : Text.Wrap
elide : Text.ElideRight
color: "white"
- font.bold: true
- font.pointSize: 18
+ //font.bold: true
+ font.pointSize: 22
+ font.family: bebasFont.name
}
}
@@ -248,15 +302,18 @@
id: messagesDelegate
Item {
id: wrapper
- width: parent.width
- height: 150
+ width: parent.width - 100
+ height: (contentWrapper.height >
userWrapper.height) ? contentWrapper.height : userWrapper.height
Rectangle {
id: userWrapper
- width: 100
- height: 110
+ width: (index == 0) ? 140 : 90
+ height: (index == 0) ? 140 : 90
+ anchors.left: parent.left
+ anchors.leftMargin: (index == 0) ? 0 : 50
+
color: "black"
opacity: 1.0
@@ -264,8 +321,8 @@
id: messageMiniImage
source: image
fillMode: Image.PreserveAspectCrop
- height: 80
- width: 90
+ height: (index == 0) ? 100 : 60
+ width: (index == 0) ? 130 : 80
anchors.left: parent.left
anchors.leftMargin: 5
anchors.top: parent.top
@@ -277,15 +334,20 @@
anchors.top: messageMiniImage.bottom
id: contactText
text: name
- font.pointSize: 14
- width: 90
+
+
+ width: (index == 0) ? 135 : 85
height: 30
anchors.left: parent.left
- anchors.leftMargin: 5
+ anchors.leftMargin: 10
wrapMode : Text.Wrap
elide : Text.ElideRight
color: "white"
+ font.family: ubuntuBIFont.name
+ font.pointSize: (index == 0) ? 16 : 12
+ font.letterSpacing : -2
+
}
@@ -300,6 +362,9 @@
Rectangle{
+
+ id: contentWrapper
+
anchors.left: userWrapper.right
anchors.right: parent.right
anchors.top: parent.top
@@ -307,7 +372,7 @@
anchors.rightMargin: 10
anchors.topMargin: 0
- height: content.contentHeight
+ height: content.contentHeight + 20
@@ -315,10 +380,14 @@
Text {
id: content
anchors.fill: parent
+ anchors.margins: 10
+
text: messagecontent
- font.pointSize: 14
+ font.pointSize: 12
wrapMode : Text.Wrap
+ font.family: ubuntuFont.name
+
}
}
@@ -331,9 +400,9 @@
}
- Rectangle{
+ Item{
id: replyField
- height: 60
+ height: 70
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
@@ -348,8 +417,10 @@
opacity: 1.0
anchors.left: parent.left
+ anchors.leftMargin: 5
anchors.top: parent.top
+
Image {
id: messageMiniImage
source: "assets/lynX.jpg"
@@ -358,6 +429,7 @@
width: 48
anchors.left: parent.left
anchors.top: parent.top
+ anchors.margins: 3
}
@@ -374,16 +446,11 @@
wrapMode : Text.Wrap
elide : Text.ElideRight
color: "white"
+
+ font.family: ubuntuFont.name
}
- MouseArea{
- id:ma
- anchors.fill: parent
- onClicked: {
- messagesList.currentIndex = index
- }
- }
}
@@ -392,11 +459,30 @@
anchors.left: userWrapper.right
anchors.right: parent.right
+ anchors.top: userWrapper.top
+ anchors.bottom: userWrapper.bottom
+ anchors.rightMargin: 10
+ anchors.leftMargin: 10
+
+ }
+
+ /*Rectangle{
+ anchors.left: userWrapper.right
+ anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.leftMargin: 5
- }
+ TextArea{
+
+ anchors.fill: parent
+ anchors.margins: 10
+
+ }
+
+ }*/
+
+
}
@@ -430,12 +516,12 @@
Rectangle{
id: participantsTitle
color: "white"
- height: 40
+ height: 30
anchors.top: parent.top
- anchors.topMargin: 20
+ anchors.topMargin: 15
anchors.left: parent.left
anchors.leftMargin: 5
anchors.right: parent.right
@@ -445,8 +531,9 @@
id: participantsTitleText
text: qsTr("PARTICIPANTS")
anchors.centerIn: parent
- font.pointSize: 18
- font.bold :true
+ font.pointSize: 22
+ //font.bold :true
+ font.family: bebasFont.name
}
}
@@ -510,7 +597,7 @@
anchors.top: threadMiniImage.bottom
id: contactInfo
text: name
- font.pointSize: 18
+
width: 160
height: 40
anchors.left: parent.left
@@ -519,6 +606,11 @@
wrapMode : Text.Wrap
elide : Text.ElideRight
color: wrapper.ListView.isCurrentItem ?
"black" : "white"
+
+ font.family: ubuntuBIFont.name
+ font.pointSize: 18
+ font.letterSpacing : -2
+
}
Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc 2014-06-12 17:36:20 UTC (rev 33657)
+++ gnunet-qt/SecureShare/qml.qrc 2014-06-14 04:50:46 UTC (rev 33658)
@@ -19,5 +19,8 @@
<file>qml/threadChat/assets/popcorn-background.jpg</file>
<file>assets/icon.png</file>
<file>assets/icon.ico</file>
+ <file>qml/threadChat/BebasNeue.otf</file>
+ <file>qml/threadChat/Ubuntu-R.ttf</file>
+ <file>qml/threadChat/Ubuntu-BI.ttf</file>
</qresource>
</RCC>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33658 - in gnunet-qt/SecureShare: . qml/threadChat,
gnunet <=