[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33659 - in gnunet-qt/SecureShare: . qml qml/images qml/thr
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33659 - in gnunet-qt/SecureShare: . qml qml/images qml/threadChat |
Date: |
Sat, 14 Jun 2014 23:05:43 +0200 |
Author: bratao
Date: 2014-06-14 23:05:43 +0200 (Sat, 14 Jun 2014)
New Revision: 33659
Added:
gnunet-qt/SecureShare/qml/About.qml
gnunet-qt/SecureShare/qml/createRoom.qml
gnunet-qt/SecureShare/qml/images/enter.png
gnunet-qt/SecureShare/qml/images/new.png
gnunet-qt/SecureShare/qml/joinRoom.qml
Modified:
gnunet-qt/SecureShare/qml.qrc
gnunet-qt/SecureShare/qml/main.qml
gnunet-qt/SecureShare/qml/threadChat/threadChat.qml
Log:
Add Join room and Create Room screens
Added: gnunet-qt/SecureShare/qml/About.qml
===================================================================
--- gnunet-qt/SecureShare/qml/About.qml (rev 0)
+++ gnunet-qt/SecureShare/qml/About.qml 2014-06-14 21:05:43 UTC (rev 33659)
@@ -0,0 +1,36 @@
+import QtQuick.Window 2.1;
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+import QtQuick.Layouts 1.1
+import Psyc 1.0
+
+Window {
+ title: "About";
+ width: 300;
+ height: 60;
+ id: aboutWnd
+
+
+ RowLayout{
+ anchors.fill: parent
+ anchors.margins: 10
+ spacing: 5
+ Label {
+ text: "Entrance designed by Stefan Parnarov from the Noun Project
+ Add designed by Factorio.us collective from the Noun Project"
+
+ }
+
+
+ Button{
+ text: "Ok"
+ onPressedChanged: {
+ aboutWnd.close();
+ }
+ }
+ }
+
+}
+
+
+
Added: gnunet-qt/SecureShare/qml/createRoom.qml
===================================================================
--- gnunet-qt/SecureShare/qml/createRoom.qml (rev 0)
+++ gnunet-qt/SecureShare/qml/createRoom.qml 2014-06-14 21:05:43 UTC (rev
33659)
@@ -0,0 +1,155 @@
+import QtQuick.Window 2.1;
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+import QtQuick.Layouts 1.1
+import Psyc 1.0
+
+Window {
+ title: "Create Room";
+ width: 400;
+ height: 200;
+ id: createRoomWnd
+
+ property var selected: 0
+
+
+ Item {
+ id: container
+ anchors.fill: parent
+
+ Item{
+ id:infoRow
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.margins: 10
+ height: (enterImg.height > infoLabel.height) ? enterImg.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.right: parent.right
+ wrapMode : Text.Wrap
+ text: "Please enter the appropriate information about the room
you would like to create."
+ }
+
+
+ }
+
+
+
+ ColumnLayout{
+ id:dataRow
+ anchors.top: infoRow.bottom
+ anchors.left: infoRow.left
+ anchors.right: infoRow.right
+ anchors.topMargin: 10
+
+ Row{
+ spacing: 2
+ Label {
+ id: nameLabel
+ text: "Name:"
+ width: 80
+ }
+
+ TextField{
+ id: nameField
+ height: 20
+ width: 150
+
+ }
+ }
+
+ Row{
+ spacing: 2
+ Label {
+ id: expirationLabel
+ text: "Expiration:"
+ width: 80
+ }
+
+ TextField{
+ id: expirationField
+ height: 20
+ width: 150
+ inputMethodHints: Qt.ImhDigitsOnly
+
+ }
+ }
+ Row{
+ spacing: 2
+ Label {
+ id: policyLabel
+ text: "Policy:"
+ width: 100
+ }
+
+ ComboBox {
+ id: policyCombo
+ currentIndex: 2
+ model: ListModel {
+ id: cbItems
+ ListElement { text: "Anonymous channel";}
+ ListElement { text: "Private channel"; }
+ ListElement { text: "Closed channel";}
+ ListElement { text: "Public channel";}
+ }
+ width: 200
+ }
+ }
+ Row{
+ spacing: 2
+ Label {
+ id: passwordLabel
+ text: "Password:"
+ width: 100
+ }
+
+ TextField{
+ id: passwordField
+ echoMode :TextInput.Password
+ height: 20
+ width: 200
+
+ }
+ }
+
+
+ }
+
+
+
+ Row{
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ spacing: 2
+ Button{
+ text: "Cancel"
+ onPressedChanged: {
+ createRoomWnd.close();
+ }
+ }
+ Button{
+ text: "Join"
+ onPressedChanged: {
+ createRoomWnd.close();
+ }
+ }
+ }
+ }
+
+}
Added: gnunet-qt/SecureShare/qml/images/enter.png
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/images/enter.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/enter.png 2014-06-14 04:50:46 UTC (rev
33658)
+++ gnunet-qt/SecureShare/qml/images/enter.png 2014-06-14 21:05:43 UTC (rev
33659)
Property changes on: gnunet-qt/SecureShare/qml/images/enter.png
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/new.png
===================================================================
(Binary files differ)
Index: gnunet-qt/SecureShare/qml/images/new.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/new.png 2014-06-14 04:50:46 UTC (rev
33658)
+++ gnunet-qt/SecureShare/qml/images/new.png 2014-06-14 21:05:43 UTC (rev
33659)
Property changes on: gnunet-qt/SecureShare/qml/images/new.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/joinRoom.qml
===================================================================
--- gnunet-qt/SecureShare/qml/joinRoom.qml (rev 0)
+++ gnunet-qt/SecureShare/qml/joinRoom.qml 2014-06-14 21:05:43 UTC (rev
33659)
@@ -0,0 +1,190 @@
+import QtQuick.Window 2.1;
+import QtQuick 2.2
+import QtQuick.Controls 1.1
+import QtQuick.Layouts 1.1
+import Psyc 1.0
+
+Window {
+ title: "Join Room";
+ width: 500;
+ height: 300;
+ id: joinRoomWnd
+
+ property var selected: 0
+
+
+ Item {
+ id: container
+ anchors.fill: parent
+
+ Item{
+ id:infoRow
+ anchors.top: parent.top
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.margins: 10
+ height: (enterImg.height > infoLabel.height) ? enterImg.height :
infoLabel.height
+
+ Image {
+ id: enterImg
+ source: "images/enter.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.right: parent.right
+ wrapMode : Text.Wrap
+ text: "Please enter the appropriate information about the chat
you would like to join."
+ }
+
+
+ }
+
+
+ Row{
+ id:typeRow
+ anchors.top: infoRow.bottom
+ anchors.left: infoRow.left
+ anchors.right: infoRow.right
+ anchors.topMargin: 10
+ spacing: 5
+
+
+ ExclusiveGroup { id: group
+
+ }
+
+
+ Label {
+ id: typeLabel
+ text: "Type: "
+ }
+
+ RadioButton {
+ text: qsTr("GNS")
+ exclusiveGroup: group
+ checked: true
+
+
+ onCheckedChanged: {
+ if(checked)
+ selected = 0
+ else
+ selected = 1
+ }
+ }
+ RadioButton {
+ text: qsTr("List of peers")
+ exclusiveGroup: group
+ }
+ }
+
+
+
+ ColumnLayout{
+ id:dataRow
+ anchors.top: typeRow.bottom
+ anchors.left: typeRow.left
+ anchors.right: typeRow.right
+ anchors.topMargin: 10
+
+ Row{
+ visible: (selected == 0) ? true : false
+ spacing: 2
+ Label {
+ id: gnsLabel
+ text: "GNS address:"
+ width: 80
+ }
+
+ TextField{
+ id: gnsField
+ height: 20
+ width: 150
+
+ }
+ }
+ Row{
+ visible: (selected == 1) ? true : false
+ spacing: 2
+ Label {
+ id: publicKeyLabel
+ text: "Public Key:"
+ width: 100
+ }
+
+ TextField{
+ id: publicKeyField
+ height: 20
+ width: 200
+
+ }
+ }
+ Row{
+ visible: (selected == 1) ? true : false
+ spacing: 2
+ Label {
+ id: originLabel
+ text: "Origin:"
+ width: 100
+ }
+
+ TextField{
+ id: originField
+ height: 20
+ width: 200
+
+ }
+ }
+
+ Row{
+ visible: (selected == 1) ? true : false
+ spacing: 2
+ Label {
+ id: relaysLabel
+ text: "Relays:"
+ width: 100
+ }
+
+ TextArea{
+ id: relaysField
+ height: 100
+ width: 200
+
+ }
+ }
+
+
+ }
+
+
+
+ Row{
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ spacing: 2
+ Button{
+ text: "Cancel"
+ onPressedChanged: {
+ joinRoomWnd.close();
+ }
+ }
+ Button{
+ text: "Join"
+ onPressedChanged: {
+ joinRoomWnd.close();
+ }
+ }
+ }
+ }
+
+}
Modified: gnunet-qt/SecureShare/qml/main.qml
===================================================================
--- gnunet-qt/SecureShare/qml/main.qml 2014-06-14 04:50:46 UTC (rev 33658)
+++ gnunet-qt/SecureShare/qml/main.qml 2014-06-14 21:05:43 UTC (rev 33659)
@@ -20,6 +20,23 @@
onTriggered: Qt.quit();
}
MenuItem {
+ text: qsTr("Create new Room")
+ onTriggered: {
+ var threadChat =
Qt.createComponent("qrc:///qml/createRoom.qml");
+ var threadChatWnd = threadChat.createObject();
+ threadChatWnd.show();
+ }
+ }
+ MenuItem {
+ text: qsTr("Join Room")
+ onTriggered: {
+ var threadChat =
Qt.createComponent("qrc:///qml/joinRoom.qml");
+ var threadChatWnd = threadChat.createObject();
+ threadChatWnd.show();
+ }
+ }
+
+ MenuItem {
text: qsTr("Threaded Chat")
onTriggered: {
var threadChat =
Qt.createComponent("qrc:///qml/threadChat/threadChat.qml");
Modified: gnunet-qt/SecureShare/qml/threadChat/threadChat.qml
===================================================================
--- gnunet-qt/SecureShare/qml/threadChat/threadChat.qml 2014-06-14 04:50:46 UTC
(rev 33658)
+++ gnunet-qt/SecureShare/qml/threadChat/threadChat.qml 2014-06-14 21:05:43 UTC
(rev 33659)
@@ -447,7 +447,8 @@
elide : Text.ElideRight
color: "white"
- font.family: ubuntuFont.name
+ font.family: ubuntuBIFont.name
+ font.letterSpacing : -1
}
Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc 2014-06-14 04:50:46 UTC (rev 33658)
+++ gnunet-qt/SecureShare/qml.qrc 2014-06-14 21:05:43 UTC (rev 33659)
@@ -22,5 +22,10 @@
<file>qml/threadChat/BebasNeue.otf</file>
<file>qml/threadChat/Ubuntu-R.ttf</file>
<file>qml/threadChat/Ubuntu-BI.ttf</file>
+ <file>qml/joinRoom.qml</file>
+ <file>qml/createRoom.qml</file>
+ <file>qml/About.qml</file>
+ <file>qml/images/enter.png</file>
+ <file>qml/images/new.png</file>
</qresource>
</RCC>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33659 - in gnunet-qt/SecureShare: . qml qml/images qml/threadChat,
gnunet <=