[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36393 - gnunet-qt/secushare/qml
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36393 - gnunet-qt/secushare/qml |
Date: |
Thu, 1 Oct 2015 00:23:34 +0200 |
Author: lynx
Date: 2015-10-01 00:23:34 +0200 (Thu, 01 Oct 2015)
New Revision: 36393
Modified:
gnunet-qt/secushare/qml/ConversationWindow.qml
gnunet-qt/secushare/qml/SingleConversation.qml
gnunet-qt/secushare/qml/ThreadChat.qml
Log:
adding FIXMEs about mock-up fakes
Modified: gnunet-qt/secushare/qml/ConversationWindow.qml
===================================================================
--- gnunet-qt/secushare/qml/ConversationWindow.qml 2015-09-30 21:08:04 UTC
(rev 36392)
+++ gnunet-qt/secushare/qml/ConversationWindow.qml 2015-09-30 22:23:34 UTC
(rev 36393)
@@ -1,3 +1,6 @@
+// FIXME/deprecated: Conversations happen in a TOPIC in ThreadChat.
+
+
import QtQuick 2.1
import QtQuick.Window 2.1
import QtQuick.Controls 1.2
Modified: gnunet-qt/secushare/qml/SingleConversation.qml
===================================================================
--- gnunet-qt/secushare/qml/SingleConversation.qml 2015-09-30 21:08:04 UTC
(rev 36392)
+++ gnunet-qt/secushare/qml/SingleConversation.qml 2015-09-30 22:23:34 UTC
(rev 36393)
@@ -1,3 +1,6 @@
+// FIXME/deprecated: Conversations happen in a TOPIC in ThreadChat.
+
+
import QtQuick 2.1
import QtQuick.Window 2.1
import QtQuick.Controls 1.2
Modified: gnunet-qt/secushare/qml/ThreadChat.qml
===================================================================
--- gnunet-qt/secushare/qml/ThreadChat.qml 2015-09-30 21:08:04 UTC (rev
36392)
+++ gnunet-qt/secushare/qml/ThreadChat.qml 2015-09-30 22:23:34 UTC (rev
36393)
@@ -20,20 +20,13 @@
FontLoader { id: ubuntuFont; source: "fonts/Ubuntu-R.ttf" }
FontLoader { id: ubuntuBIFont; source: "fonts/Ubuntu-BI.ttf" }
-
-
-
-
-
RowLayout{
anchors.fill: parent
ColumnLayout{
-
height: parent.height
width: 230
-
Image {
Layout.maximumWidth: 180
id: logoSecureShare
@@ -49,20 +42,13 @@
width: 200;
anchors.left: parent.left
anchors.leftMargin: 8
-
-
-
color: "#EB0C60"
-
-
Rectangle{
id: topicsTitle
color: "white"
height: 30
-
-
anchors.top: parent.top
anchors.topMargin: 15
anchors.left: parent.left
@@ -82,6 +68,11 @@
ListModel {
id: topicsModel
+ //
+ // FIXME: These topics are just mock-ups, they
+ // should actually be coming from the
+ // user's subscribed channels! -lynX
+ //
ListElement {
name: "Things you knew this morning"
image: "images/demo/Conffeti-background.jpg"
@@ -96,7 +87,6 @@
}
}
-
ListView {
id: topicList
anchors.top: topicsTitle.bottom
@@ -113,15 +103,11 @@
Component {
id: topicsDelegate
-
Item {
id: wrapper
width: wrapper.ListView.isCurrentItem ? 186 : 170
height: 170
-
-
-
Rectangle {
id: wrapperInside
anchors.fill: parent
@@ -140,7 +126,6 @@
anchors.leftMargin: 5
anchors.top: parent.top
anchors.topMargin: 5
-
}
Text {
@@ -161,10 +146,6 @@
font.letterSpacing : -2
}
-
-
-
-
MouseArea{
id:ma
anchors.fill: parent
@@ -174,7 +155,6 @@
}
}
Rectangle{
-
id:indicator
radius: 35
@@ -189,7 +169,6 @@
width: 35
visible: wrapper.ListView.isCurrentItem ?
false: true
-
Text {
anchors.centerIn: parent
id: numberNewTopics
@@ -196,13 +175,10 @@
text: "12"
font.family: ubuntuFont.name
font.pointSize: 14
-
}
}
-
}
}
-
model: topicsModel
delegate: topicsDelegate
focus: true
@@ -211,19 +187,12 @@
selectedItem = model.get(currentIndex)
}
}
-
-
-
}
-
-
}
-
ColumnLayout{
Layout.fillWidth: true
-
Rectangle{
anchors.fill: parent
anchors.leftMargin: 20
@@ -231,7 +200,6 @@
anchors.topMargin: 20
color: "white"
-
Image {
id: topicBackgroundImage
anchors.fill: parent
@@ -264,9 +232,13 @@
}
}
-
ListModel {
id: messagesModel
+ //
+ // FIXME: These users are just mock-ups, they
+ // should actually be coming from the
+ // channel's participant list! -lynX
+ //
ListElement {
name: "Bailadora"
image: "images/demo/baila.jpg"
@@ -283,7 +255,6 @@
image: "images/demo/arp.jpg"
messagecontent: "What! What ? Guess I'll take an extra
detour on the bike to see that!"
}
-
}
ListView {
@@ -306,8 +277,6 @@
width: parent.width - 100
height: (contentWrapper.height >
userWrapper.height) ? contentWrapper.height : userWrapper.height
-
-
Rectangle {
id: userWrapper
width: (index == 0) ? 140 : 90
@@ -328,7 +297,6 @@
anchors.leftMargin: 5
anchors.top: parent.top
anchors.topMargin: 5
-
}
Text {
@@ -336,7 +304,6 @@
id: contactText
text: name
-
width: (index == 0) ? 135 : 85
height: 30
anchors.left: parent.left
@@ -348,10 +315,8 @@
font.family: ubuntuBIFont.name
font.pointSize: (index == 0) ? 16 : 12
font.letterSpacing : -2
-
}
-
MouseArea{
id:ma
anchors.fill: parent
@@ -361,9 +326,7 @@
}
}
-
Rectangle{
-
id: contentWrapper
anchors.left: userWrapper.right
@@ -375,9 +338,6 @@
height: content.contentHeight + 20
-
-
-
Text {
id: content
anchors.fill: parent
@@ -388,17 +348,13 @@
wrapMode : Text.Wrap
font.family: ubuntuFont.name
-
}
}
-
-
}
}
model: messagesModel
delegate: messagesDelegate
-
}
Item{
@@ -408,8 +364,6 @@
anchors.right: parent.right
anchors.bottom: parent.bottom
-
-
Rectangle {
id: userWrapper
width: 60
@@ -421,7 +375,6 @@
anchors.leftMargin: 5
anchors.top: parent.top
-
Image {
id: messageMiniImage
source: "images/demo/lynX.jpg"
@@ -431,7 +384,6 @@
anchors.left: parent.left
anchors.top: parent.top
anchors.margins: 3
-
}
Text {
@@ -451,14 +403,9 @@
font.family: ubuntuBIFont.name
font.letterSpacing : -1
}
-
-
}
-
-
TextArea{
-
anchors.left: userWrapper.right
anchors.right: parent.right
anchors.top: userWrapper.top
@@ -465,7 +412,6 @@
anchors.bottom: userWrapper.bottom
anchors.rightMargin: 10
anchors.leftMargin: 10
-
}
/*Rectangle{
@@ -481,25 +427,11 @@
anchors.margins: 10
}
-
}*/
-
-
}
-
-
}
-
-
-
-
-
-
-
-
}
-
ColumnLayout{
Rectangle{
Layout.fillHeight: true
@@ -509,19 +441,13 @@
anchors.top: parent.top
anchors.topMargin: 20
-
-
color: "#EFC208"
-
-
Rectangle{
id: participantsTitle
color: "white"
height: 30
-
-
anchors.top: parent.top
anchors.topMargin: 15
anchors.left: parent.left
@@ -541,6 +467,8 @@
ListModel {
id: participantsModel
+
+ // FIXME: again, mock-up data here
ListElement {
name: "Bailadora"
image: "images/demo/baila.jpg"
@@ -553,7 +481,6 @@
name: "La Doll"
image: "images/demo/doll.jpg"
}
-
ListElement {
name: "lynX"
image: "images/demo/lynX.jpg"
@@ -560,7 +487,6 @@
}
}
-
ListView {
id: participantsList
anchors.top: participantsTitle.bottom
@@ -592,7 +518,6 @@
anchors.leftMargin: 5
anchors.top: parent.top
anchors.topMargin: 5
-
}
Text {
@@ -615,7 +540,6 @@
}
-
MouseArea{
id:ma
anchors.fill: parent
@@ -630,16 +554,7 @@
delegate: participantsDelegate
focus: true
}
-
-
-
}
}
-
-
-
-
}
-
-
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36393 - gnunet-qt/secushare/qml,
gnunet <=