[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33621 - in gnunet-qt/SecureShare: . qml qml/threadChat qml
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33621 - in gnunet-qt/SecureShare: . qml qml/threadChat qml/threadChat/assets |
|
Date: |
Tue, 10 Jun 2014 00:29:24 +0200 |
Author: bratao
Date: 2014-06-10 00:29:24 +0200 (Tue, 10 Jun 2014)
New Revision: 33621
Added:
gnunet-qt/SecureShare/qml/threadChat/
gnunet-qt/SecureShare/qml/threadChat/assets/
gnunet-qt/SecureShare/qml/threadChat/assets/Conffeti-background.jpg
gnunet-qt/SecureShare/qml/threadChat/assets/arp.jpg
gnunet-qt/SecureShare/qml/threadChat/assets/baila.jpg
gnunet-qt/SecureShare/qml/threadChat/assets/doll.jpg
gnunet-qt/SecureShare/qml/threadChat/assets/logo.png
gnunet-qt/SecureShare/qml/threadChat/assets/lynX.jpg
gnunet-qt/SecureShare/qml/threadChat/assets/popcorn-background.jpg
gnunet-qt/SecureShare/qml/threadChat/assets/ubuntu-wallpaper.jpg
gnunet-qt/SecureShare/qml/threadChat/threadChat.qml
Removed:
gnunet-qt/SecureShare/qml/Splash.qml.autosave
Modified:
gnunet-qt/SecureShare/qml.qrc
gnunet-qt/SecureShare/qml/main.qml
Log:
Implement Forum mockup
Deleted: gnunet-qt/SecureShare/qml/Splash.qml.autosave
===================================================================
--- gnunet-qt/SecureShare/qml/Splash.qml.autosave 2014-06-09 22:08:13 UTC
(rev 33620)
+++ gnunet-qt/SecureShare/qml/Splash.qml.autosave 2014-06-09 22:29:24 UTC
(rev 33621)
@@ -1,22 +0,0 @@
-import QtQuick 2.2
-import QtQuick.Controls 1.1
-import QtQuick.Layouts 1.1
-import Psyc 1.0
-
-ApplicationWindow {
- visible: true
- width: 444
- height: 400
- id:splashWnd
-
-
- ColumnLayout{
- Image {
- id: imageSplash
- source: "qrc:///assets/banner.png"
- }
-
- }
-
-
-}
Modified: gnunet-qt/SecureShare/qml/main.qml
===================================================================
--- gnunet-qt/SecureShare/qml/main.qml 2014-06-09 22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml/main.qml 2014-06-09 22:29:24 UTC (rev 33621)
@@ -19,6 +19,20 @@
text: qsTr("Exit")
onTriggered: Qt.quit();
}
+ MenuItem {
+ text: qsTr("Threaded Chat")
+ onTriggered: {
+ var threadChat =
Qt.createComponent("qrc:///qml/threadChat/threadChat.qml");
+ var threadChatWnd = threadChat.createObject();
+ threadChatWnd.show();
+ }
+ }
+
+
+
+
+
+
}
}
Added: gnunet-qt/SecureShare/qml/threadChat/assets/Conffeti-background.jpg
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/assets/Conffeti-background.jpg
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/assets/Conffeti-background.jpg
2014-06-09 22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml/threadChat/assets/Conffeti-background.jpg
2014-06-09 22:29:24 UTC (rev 33621)
Property changes on:
gnunet-qt/SecureShare/qml/threadChat/assets/Conffeti-background.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/assets/arp.jpg
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/assets/arp.jpg
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/assets/arp.jpg 2014-06-09 22:08:13 UTC
(rev 33620)
+++ gnunet-qt/SecureShare/qml/threadChat/assets/arp.jpg 2014-06-09 22:29:24 UTC
(rev 33621)
Property changes on: gnunet-qt/SecureShare/qml/threadChat/assets/arp.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/assets/baila.jpg
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/assets/baila.jpg
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/assets/baila.jpg 2014-06-09
22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml/threadChat/assets/baila.jpg 2014-06-09
22:29:24 UTC (rev 33621)
Property changes on: gnunet-qt/SecureShare/qml/threadChat/assets/baila.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/assets/doll.jpg
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/assets/doll.jpg
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/assets/doll.jpg 2014-06-09
22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml/threadChat/assets/doll.jpg 2014-06-09
22:29:24 UTC (rev 33621)
Property changes on: gnunet-qt/SecureShare/qml/threadChat/assets/doll.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/assets/logo.png
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/assets/logo.png
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/assets/logo.png 2014-06-09
22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml/threadChat/assets/logo.png 2014-06-09
22:29:24 UTC (rev 33621)
Property changes on: gnunet-qt/SecureShare/qml/threadChat/assets/logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/assets/lynX.jpg
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/assets/lynX.jpg
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/assets/lynX.jpg 2014-06-09
22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml/threadChat/assets/lynX.jpg 2014-06-09
22:29:24 UTC (rev 33621)
Property changes on: gnunet-qt/SecureShare/qml/threadChat/assets/lynX.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/assets/popcorn-background.jpg
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/assets/popcorn-background.jpg
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/assets/popcorn-background.jpg
2014-06-09 22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml/threadChat/assets/popcorn-background.jpg
2014-06-09 22:29:24 UTC (rev 33621)
Property changes on:
gnunet-qt/SecureShare/qml/threadChat/assets/popcorn-background.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/assets/ubuntu-wallpaper.jpg
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/threadChat/assets/ubuntu-wallpaper.jpg
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/assets/ubuntu-wallpaper.jpg
2014-06-09 22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml/threadChat/assets/ubuntu-wallpaper.jpg
2014-06-09 22:29:24 UTC (rev 33621)
Property changes on:
gnunet-qt/SecureShare/qml/threadChat/assets/ubuntu-wallpaper.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/threadChat/threadChat.qml
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/threadChat.qml
(rev 0)
+++ gnunet-qt/SecureShare/qml/threadChat/threadChat.qml 2014-06-09 22:29:24 UTC
(rev 33621)
@@ -0,0 +1,551 @@
+import QtQuick 2.1
+import QtQuick.Window 2.1
+import QtQuick.Controls 1.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.2
+
+import Psyc 1.0
+
+Window {
+ id: threadChatWnd
+ width: 1000
+ height: 700
+ color: "white"
+ title: "All conversations"
+
+ property var selectedItem: null
+
+
+
+ RowLayout{
+ anchors.fill: parent
+
+ ColumnLayout{
+
+ height: parent.height
+ width: 230
+
+
+ Image {
+ Layout.maximumWidth: 180
+ id: logoSecureShare
+ anchors.horizontalCenter: parent.horizontalCenter
+ width: 16
+ height: 100
+ source: "assets/logo.png"
+ fillMode: Image.PreserveAspectFit
+ }
+
+ Rectangle{
+ Layout.fillHeight: true
+ width: 200;
+ anchors.left: parent.left
+ anchors.leftMargin: 8
+
+
+
+ color: "#EB0C60"
+
+
+
+ Rectangle{
+ id: topicsTitle
+ color: "white"
+ height: 40
+
+
+
+ anchors.top: parent.top
+ anchors.topMargin: 20
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+ anchors.right: parent.right
+ anchors.rightMargin: 5
+
+ Text {
+ id: topicsTitleText
+ text: qsTr("TOPICS")
+ anchors.centerIn: parent
+ font.pointSize: 18
+ font.bold :true
+ }
+ }
+
+ ListModel {
+ id: topicsModel
+ ListElement {
+ name: "Things you knew this morning"
+ image: "assets/Conffeti-background.jpg"
+ }
+ ListElement {
+ name: "Did you see the NSA graffiti"
+ image: "assets/ubuntu-wallpaper.jpg"
+ }
+ ListElement {
+ name: "Popcorn"
+ image: "assets/popcorn-background.jpg"
+ }
+ }
+
+
+ ListView {
+ id: topicList
+ anchors.top: topicsTitle.bottom
+ anchors.topMargin: 30
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+
+ anchors.left: parent.left
+ anchors.leftMargin: 15
+
+ spacing: 15
+ clip: true
+
+ Component {
+ id: topicsDelegate
+ Rectangle {
+ id: wrapper
+ width: wrapper.ListView.isCurrentItem ? 186 : 170
+ height: 150
+ color: 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
+ 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"
+ }
+
+
+ MouseArea{
+ id:ma
+ anchors.fill: parent
+ onClicked: {
+ topicList.currentIndex = index
+ }
+ }
+ }
+ }
+
+ model: topicsModel
+ delegate: topicsDelegate
+ focus: true
+
+ onCurrentIndexChanged: {
+ selectedItem = model.get(currentIndex)
+ }
+ }
+
+
+
+ }
+
+
+ }
+
+
+ ColumnLayout{
+ Layout.fillWidth: true
+
+
+ Rectangle{
+ anchors.fill: parent
+ anchors.leftMargin: 10
+ anchors.rightMargin: 10
+ anchors.bottomMargin: 10
+ anchors.topMargin: 20
+ color: "white"
+
+
+ Image {
+ id: topicBackgroundImage
+ anchors.fill: parent
+ opacity: 0.5
+ fillMode: Image.Tile
+ clip: true
+ source: selectedItem.image
+ }
+
+ Rectangle{
+ id: forumTitleRectangle
+ color: "black"
+ height: 50
+ width: 500
+ opacity: 0.9
+ anchors.top: parent.top
+ anchors.topMargin: 20
+ Text {
+ id: forumTitleText
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.leftMargin: 10
+ text: qsTr("Forum for clandestine urban art")
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
+ color: "white"
+ font.bold: true
+ font.pointSize: 18
+ }
+ }
+
+
+ ListModel {
+ id: messagesModel
+ ListElement {
+ name: "Bailadora"
+ image: "assets/baila.jpg"
+ messagecontent: "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 !!"
+ }
+ ListElement {
+ name: "La Doll"
+ image: "assets/doll.jpg"
+
+ messagecontent: "Oh yeah, totally awesome! Was about
time somebody said that! And with style!"
+ }
+ ListElement {
+ name: "Arpeggio"
+ image: "assets/arp.jpg"
+ messagecontent: "What! What ? Guess I'll take an extra
detour on the bike to see that!"
+ }
+
+ }
+
+ ListView {
+ id: messagesList
+ anchors.top: forumTitleRectangle.bottom
+ anchors.topMargin: 30
+ anchors.bottom: replyField.top
+ anchors.right: parent.right
+
+ anchors.left: parent.left
+ anchors.leftMargin: 15
+
+ spacing: 15
+ clip: true
+
+ Component {
+ id: messagesDelegate
+ Item {
+ id: wrapper
+ width: parent.width
+ height: 150
+
+
+
+ Rectangle {
+ id: userWrapper
+ width: 100
+ height: 110
+ color: "black"
+ opacity: 1.0
+
+ Image {
+ id: messageMiniImage
+ source: image
+ fillMode: Image.PreserveAspectCrop
+ height: 80
+ width: 90
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+ anchors.top: parent.top
+ anchors.topMargin: 5
+
+ }
+
+ Text {
+ anchors.top: messageMiniImage.bottom
+ id: contactText
+ text: name
+ font.pointSize: 14
+ width: 90
+ height: 30
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
+ color: "white"
+ }
+
+
+ MouseArea{
+ id:ma
+ anchors.fill: parent
+ onClicked: {
+ messagesList.currentIndex = index
+ }
+ }
+ }
+
+
+ Rectangle{
+ anchors.left: userWrapper.right
+ anchors.right: parent.right
+ anchors.top: parent.top
+ anchors.leftMargin: 10
+ anchors.rightMargin: 10
+ anchors.topMargin: 0
+
+ height: content.contentHeight
+
+
+
+
+ Text {
+ id: content
+ anchors.fill: parent
+ text: messagecontent
+ font.pointSize: 14
+ wrapMode : Text.Wrap
+
+ }
+ }
+
+
+ }
+ }
+
+ model: messagesModel
+ delegate: messagesDelegate
+
+ }
+
+ Rectangle{
+ id: replyField
+ height: 60
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+
+
+
+ Rectangle {
+ id: userWrapper
+ width: 60
+ height: 60
+ color: "black"
+ opacity: 1.0
+
+ anchors.left: parent.left
+ anchors.top: parent.top
+
+ Image {
+ id: messageMiniImage
+ source: "assets/lynX.jpg"
+ fillMode: Image.PreserveAspectCrop
+ height: 40
+ width: 48
+ anchors.left: parent.left
+ anchors.top: parent.top
+
+ }
+
+ Text {
+ anchors.top: messageMiniImage.bottom
+ id: contactText
+ text: "lynX"
+ font.pointSize: 10
+ width: 55
+ height: 15
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
+ color: "white"
+ }
+
+
+ MouseArea{
+ id:ma
+ anchors.fill: parent
+ onClicked: {
+ messagesList.currentIndex = index
+ }
+ }
+ }
+
+
+
+ TextArea{
+
+ anchors.left: userWrapper.right
+ anchors.right: parent.right
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.leftMargin: 5
+
+ }
+ }
+
+
+ }
+
+
+
+
+
+
+
+
+ }
+
+
+ ColumnLayout{
+ Rectangle{
+ Layout.fillHeight: true
+ width: 200;
+ anchors.right: parent.right
+ anchors.rightMargin: 8
+ anchors.top: parent.top
+ anchors.topMargin: 20
+
+
+
+ color: "#EFC208"
+
+
+
+ Rectangle{
+ id: participantsTitle
+ color: "white"
+ height: 40
+
+
+
+ anchors.top: parent.top
+ anchors.topMargin: 20
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+ anchors.right: parent.right
+ anchors.rightMargin: 5
+
+ Text {
+ id: participantsTitleText
+ text: qsTr("PARTICIPANTS")
+ anchors.centerIn: parent
+ font.pointSize: 18
+ font.bold :true
+ }
+ }
+
+ ListModel {
+ id: participantsModel
+ ListElement {
+ name: "Bailadora"
+ image: "assets/baila.jpg"
+ }
+ ListElement {
+ name: "Arpeggio"
+ image: "assets/arp.jpg"
+ }
+ ListElement {
+ name: "La Doll"
+ image: "assets/doll.jpg"
+ }
+
+ ListElement {
+ name: "lynX"
+ image: "assets/lynX.jpg"
+ }
+ }
+
+
+ ListView {
+ id: participantsList
+ anchors.top: participantsTitle.bottom
+ anchors.topMargin: 30
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+
+ anchors.left: parent.left
+ anchors.leftMargin: 15
+
+ spacing: 15
+ clip: true
+
+ Component {
+ id: participantsDelegate
+ Rectangle {
+ id: wrapper
+ width: 170
+ height: 150
+ color: ListView.isCurrentItem ? "white" : "black"
+
+ Image {
+ id: threadMiniImage
+ source: image
+ fillMode: Image.PreserveAspectCrop
+ height: 110
+ 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: 40
+ anchors.left: parent.left
+ anchors.leftMargin: 5
+
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
+ color: wrapper.ListView.isCurrentItem ?
"black" : "white"
+ }
+
+
+ MouseArea{
+ id:ma
+ anchors.fill: parent
+ onClicked: {
+ participantsList.currentIndex = index
+ }
+ }
+ }
+ }
+
+ model: participantsModel
+ delegate: participantsDelegate
+ focus: true
+ }
+
+
+
+ }
+ }
+
+
+
+
+ }
+
+
+}
Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc 2014-06-09 22:08:13 UTC (rev 33620)
+++ gnunet-qt/SecureShare/qml.qrc 2014-06-09 22:29:24 UTC (rev 33621)
@@ -8,5 +8,14 @@
<file>qml/Splash.qml</file>
<file>assets/banner.png</file>
<file>qml/NewEgo.qml</file>
+ <file>qml/threadChat/threadChat.qml</file>
+ <file>qml/threadChat/assets/logo.png</file>
+ <file>qml/threadChat/assets/ubuntu-wallpaper.jpg</file>
+ <file>qml/threadChat/assets/arp.jpg</file>
+ <file>qml/threadChat/assets/baila.jpg</file>
+ <file>qml/threadChat/assets/doll.jpg</file>
+ <file>qml/threadChat/assets/lynX.jpg</file>
+ <file>qml/threadChat/assets/Conffeti-background.jpg</file>
+ <file>qml/threadChat/assets/popcorn-background.jpg</file>
</qresource>
</RCC>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33621 - in gnunet-qt/SecureShare: . qml qml/threadChat qml/threadChat/assets,
gnunet <=