[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34058 - gnunet-qt/SecureShare/qml
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r34058 - gnunet-qt/SecureShare/qml |
|
Date: |
Sat, 26 Jul 2014 16:39:53 +0200 |
Author: bratao
Date: 2014-07-26 16:39:53 +0200 (Sat, 26 Jul 2014)
New Revision: 34058
Modified:
gnunet-qt/SecureShare/qml/GroupConversation.qml
gnunet-qt/SecureShare/qml/Settings.qml
gnunet-qt/SecureShare/qml/SingleConversation.qml
gnunet-qt/SecureShare/qml/createRoom.qml
gnunet-qt/SecureShare/qml/main.qml
Log:
Finish the new GUI design
Modified: gnunet-qt/SecureShare/qml/GroupConversation.qml
===================================================================
--- gnunet-qt/SecureShare/qml/GroupConversation.qml 2014-07-26 04:36:04 UTC
(rev 34057)
+++ gnunet-qt/SecureShare/qml/GroupConversation.qml 2014-07-26 14:39:53 UTC
(rev 34058)
@@ -10,41 +10,70 @@
anchors.fill: parent
color: "steelblue"
+ FontLoader { id: ubuntuFont; source: "fonts/Ubuntu-R.ttf" }
- ColumnLayout{
- anchors.fill:parent
+ Rectangle{
+ id:headerBanner
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 60
+ color: "white"
- Item{
- id:header
- Layout.fillWidth: true
- Layout.minimumHeight: 30
- Image {
- id: icon
- source: "qrc:///qml/images/chat.png"
- height: 16
- width: 16
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.margins: 5
- }
- Text {
- id: name
- anchors.left: icon.right
- text: qsTr("#PSYC2")
- }
- Text {
- id: description
- anchors.left: icon.right
- anchors.top: name.bottom
- text: qsTr("ENCRYPTION IS ANTISOCIAL! http://secushare.org";)
- font.pointSize: 7
- color: "lightgrey"
- }
+ Image {
+ id: imageBanner
+ source: "images/group_dark.png"
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.margins: 10
+ height: 32
+ width: 32
+ fillMode: Image.PreserveAspectFit
}
+ Label{
+ id:name
+ text: "lynX Group"
+ anchors.left: imageBanner.right
+ anchors.leftMargin: 5
+ anchors.top: parent.top
+ anchors.topMargin: 5
+ font.family: ubuntuFont.name
+ font.pointSize: 16
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
+ }
+ Label {
+ id: description
+ anchors.left: name.left
+ anchors.top: name.bottom
+ text: qsTr("Look at my group, my group is amazing !")
+ font.pointSize: 10
+ color: "darkgrey"
+ }
+
+ }
+ Rectangle{
+ id:headerLine
+ anchors.top: headerBanner.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 1
+ color: "#D1D1D1"
+
+ }
+
+
+ ColumnLayout{
+ anchors.top: headerLine.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+
+
SplitView {
Layout.fillWidth: true
Layout.fillHeight: true
@@ -59,6 +88,7 @@
Layout.fillWidth: true
textFormat: TextEdit.RichText
readOnly: true
+ frameVisible: false
text: "
(12:23:22 PM) <b>lynX:</b> like me<br/>"+
"(12:23:26 PM) <b>tg:</b> if you know qml it's easier to do it directly in qml"
Modified: gnunet-qt/SecureShare/qml/Settings.qml
===================================================================
--- gnunet-qt/SecureShare/qml/Settings.qml 2014-07-26 04:36:04 UTC (rev
34057)
+++ gnunet-qt/SecureShare/qml/Settings.qml 2014-07-26 14:39:53 UTC (rev
34058)
@@ -57,8 +57,32 @@
anchors.top: headerBanner.bottom
anchors.left: parent.left
anchors.right: parent.right
- Label{
- text: "TODO"
+ anchors.margins: 10
+ ColumnLayout{
+ anchors.fill: parent
+ anchors.rightMargin: 30
+ Label{
+ id:nameLabel
+ text: "Name:"
+ }
+ TextField{
+ id:nameField
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 20
+
+ }
+ Label{
+ id:statusLabel
+ text: "Status:"
+ }
+ TextField{
+ id:statusField
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 20
+
+ }
}
}
Modified: gnunet-qt/SecureShare/qml/SingleConversation.qml
===================================================================
--- gnunet-qt/SecureShare/qml/SingleConversation.qml 2014-07-26 04:36:04 UTC
(rev 34057)
+++ gnunet-qt/SecureShare/qml/SingleConversation.qml 2014-07-26 14:39:53 UTC
(rev 34058)
@@ -10,41 +10,70 @@
anchors.fill: parent
color: "steelblue"
+ FontLoader { id: ubuntuFont; source: "fonts/Ubuntu-R.ttf" }
- ColumnLayout{
- anchors.fill:parent
+ Rectangle{
+ id:headerBanner
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 60
+ color: "white"
- Item{
- id:header
- Layout.fillWidth: true
- Layout.minimumHeight: 30
- Image {
- id: icon
- source: "qrc:///qml/images/chat.png"
- height: 16
- width: 16
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- anchors.margins: 5
- }
- Text {
- id: name
- anchors.left: icon.right
- text: qsTr("#PSYC2")
- }
- Text {
- id: description
- anchors.left: icon.right
- anchors.top: name.bottom
- text: qsTr("ENCRYPTION IS ANTISOCIAL! http://secushare.org";)
- font.pointSize: 7
- color: "lightgrey"
- }
+ Image {
+ id: imageBanner
+ source: "images/contact_dark.png"
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.margins: 10
+ height: 32
+ width: 32
+ fillMode: Image.PreserveAspectFit
}
+ Label{
+ id:name
+ text: "tg"
+ anchors.left: imageBanner.right
+ anchors.leftMargin: 5
+ anchors.top: parent.top
+ anchors.topMargin: 5
+ font.family: ubuntuFont.name
+ font.pointSize: 16
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
+ }
+ Label {
+ id: description
+ anchors.left: name.left
+ anchors.top: name.bottom
+ text: qsTr("I like to move, move !")
+ font.pointSize: 10
+ color: "darkgrey"
+ }
+
+ }
+ Rectangle{
+ id:headerLine
+ anchors.top: headerBanner.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 1
+ color: "#D1D1D1"
+
+ }
+
+
+ ColumnLayout{
+ anchors.top: headerLine.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+
+
SplitView {
Layout.fillWidth: true
Layout.fillHeight: true
@@ -59,6 +88,7 @@
Layout.fillWidth: true
textFormat: TextEdit.RichText
readOnly: true
+ frameVisible: false
text: "
(12:23:22 PM) <b>lynX:</b> like me<br/>"+
"(12:23:26 PM) <b>tg:</b> if you know qml it's easier to do it directly in qml"
@@ -67,36 +97,6 @@
- Rectangle {
- width: 200
- color: "gray"
- ColumnLayout{
- anchors.fill:parent
- Label {
- id: peopleNumber
- anchors.horizontalCenter: parent.horizontalCenter
- text: qsTr("3 people in room")
- color: "white"
- }
- TableView{
- id:users
- Layout.fillWidth: true
- Layout.fillHeight: true
- headerVisible:false
-
- TableViewColumn{ role: "title" ; title: "Title" ;
width: 100 }
- model:
- ListModel {
- ListElement{ title: "bratao1" }
- ListElement{ title: "lynX" }
- ListElement{ title: "tg" }
- }
-
- }
-
- }
-
- }
}
TextArea{
Modified: gnunet-qt/SecureShare/qml/createRoom.qml
===================================================================
--- gnunet-qt/SecureShare/qml/createRoom.qml 2014-07-26 04:36:04 UTC (rev
34057)
+++ gnunet-qt/SecureShare/qml/createRoom.qml 2014-07-26 14:39:53 UTC (rev
34058)
@@ -11,9 +11,58 @@
property var selected: 0
+ FontLoader { id: ubuntuFont; source: "fonts/Ubuntu-R.ttf" }
+
+ Rectangle{
+ id:headerBanner
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 60
+ color: "white"
+
+
+ Image {
+ id: imageBanner
+ source: "images/new.png"
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.margins: 5
+ height: 42
+ width: 42
+ fillMode: Image.PreserveAspectFit
+
+ }
+
+ Label{
+ text: "Create Chat"
+ anchors.left: imageBanner.right
+ anchors.leftMargin: 5
+ anchors.top: parent.top
+ anchors.topMargin: 10
+ font.family: ubuntuFont.name
+ font.pointSize: 22
+ wrapMode : Text.Wrap
+ elide : Text.ElideRight
+ }
+
+ }
+ Rectangle{
+ anchors.top: headerBanner.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 1
+ color: "#D1D1D1"
+
+ }
+
+
Item {
id: container
- anchors.fill: parent
+ anchors.top: headerBanner.bottom
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
Item{
id:infoRow
@@ -21,24 +70,14 @@
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: 10
- height: (enterImg.height > infoLabel.height) ? enterImg.height :
infoLabel.height
+ height: infoLabel.height
- Image {
- id: enterImg
- source: "images/new.png"
- fillMode: Image.PreserveAspectFit
- clip: true
- Layout.maximumHeight: 60
- Layout.maximumWidth: 60
- height: 60
- width: 60
- }
+
Label {
id: infoLabel
- anchors.top: enterImg.top
- anchors.left: enterImg.right
- anchors.leftMargin: 10
+ anchors.top: parent.top
+ anchors.left: parent.left
anchors.right: parent.right
wrapMode : Text.Wrap
text: "Please enter the appropriate information about the room
you would like to create."
@@ -132,21 +171,14 @@
Row{
- anchors.bottom: parent.bottom
- anchors.right: parent.right
+ anchors.top: dataRow.bottom
+ anchors.left: parent.left
spacing: 2
+
Button{
- text: "Cancel"
- onPressedChanged: {
- createRoomWnd.close();
- }
+ text: "Create"
+ width: 200
}
- Button{
- text: "Join"
- onPressedChanged: {
- createRoomWnd.close();
- }
- }
}
}
Modified: gnunet-qt/SecureShare/qml/main.qml
===================================================================
--- gnunet-qt/SecureShare/qml/main.qml 2014-07-26 04:36:04 UTC (rev 34057)
+++ gnunet-qt/SecureShare/qml/main.qml 2014-07-26 14:39:53 UTC (rev 34058)
@@ -24,31 +24,7 @@
text: qsTr("Exit")
onTriggered: Qt.quit();
}
- MenuItem {
- text: qsTr("Create new Room")
- onTriggered: {
- var createRoom =
Qt.createComponent("qrc:///qml/CreateRoom.qml");
- var createRoomWnd = createRoom.createObject();
- createRoomWnd.show();
- }
- }
- MenuItem {
- text: qsTr("Join Room")
- onTriggered: {
- var joinRoom =
Qt.createComponent("qrc:///qml/JoinRoom.qml");
- var joinRoomWnd = joinRoom.createObject();
- joinRoomWnd.show();
- }
- }
- MenuItem {
- text: qsTr("Threaded Chat")
- onTriggered: {
- var threadChat =
Qt.createComponent("qrc:///qml/ThreadChat.qml");
- var threadChatWnd = threadChat.createObject();
- threadChatWnd.show();
- }
- }
MenuItem {
text: qsTr("Import Ego")
@@ -75,16 +51,8 @@
profileWnd.show();
}
}
- MenuItem {
- text: qsTr("Conversation")
- onTriggered: {
- conversationWnd.show()
- }
- }
-
-
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34058 - gnunet-qt/SecureShare/qml,
gnunet <=