gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r34052 - in gnunet-qt/SecureShare: . qml qml/images qml/ima


From: gnunet
Subject: [GNUnet-SVN] r34052 - in gnunet-qt/SecureShare: . qml qml/images qml/images/status
Date: Fri, 25 Jul 2014 05:59:27 +0200

Author: bratao
Date: 2014-07-25 05:59:27 +0200 (Fri, 25 Jul 2014)
New Revision: 34052

Added:
   gnunet-qt/SecureShare/qml/Settings.qml
   gnunet-qt/SecureShare/qml/images/add.png
   gnunet-qt/SecureShare/qml/images/contact.png
   gnunet-qt/SecureShare/qml/images/contact_dark.png
   gnunet-qt/SecureShare/qml/images/create_room.png
   gnunet-qt/SecureShare/qml/images/group.png
   gnunet-qt/SecureShare/qml/images/group_dark.png
   gnunet-qt/SecureShare/qml/images/settings.png
   gnunet-qt/SecureShare/qml/images/status/
   gnunet-qt/SecureShare/qml/images/status/dot_away.png
   gnunet-qt/SecureShare/qml/images/status/dot_busy.png
   gnunet-qt/SecureShare/qml/images/status/dot_idle.png
   gnunet-qt/SecureShare/qml/images/status/dot_online.png
   gnunet-qt/SecureShare/qml/images/thread.png
   gnunet-qt/SecureShare/qml/images/threadChat.png
   gnunet-qt/SecureShare/qml/images/thread_dark.png
   gnunet-qt/SecureShare/qml/images/transfer.png
Modified:
   gnunet-qt/SecureShare/qml.qrc
   gnunet-qt/SecureShare/qml/ThreadChat.qml
   gnunet-qt/SecureShare/qml/createRoom.qml
   gnunet-qt/SecureShare/qml/joinRoom.qml
   gnunet-qt/SecureShare/qml/main.qml
Log:
Towards implementing a full screen gui

Added: gnunet-qt/SecureShare/qml/Settings.qml
===================================================================
--- gnunet-qt/SecureShare/qml/Settings.qml                              (rev 0)
+++ gnunet-qt/SecureShare/qml/Settings.qml      2014-07-25 03:59:27 UTC (rev 
34052)
@@ -0,0 +1,14 @@
+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
+
+Rectangle {
+    anchors.fill: parent
+
+    Label{
+        text: "oi"
+    }
+
+}

Modified: gnunet-qt/SecureShare/qml/ThreadChat.qml
===================================================================
--- gnunet-qt/SecureShare/qml/ThreadChat.qml    2014-07-25 03:30:04 UTC (rev 
34051)
+++ gnunet-qt/SecureShare/qml/ThreadChat.qml    2014-07-25 03:59:27 UTC (rev 
34052)
@@ -6,13 +6,14 @@
 
 import Psyc 1.0
 
-Window {
+Rectangle {
     id: threadChatWnd
     width: 1000
     height: 700
     color: "white"
-    title: "All conversations"
 
+    anchors.fill: parent
+
     property var selectedItem: null
 
     FontLoader { id: bebasFont; source: "fonts/BebasNeue.otf" }

Modified: gnunet-qt/SecureShare/qml/createRoom.qml
===================================================================
--- gnunet-qt/SecureShare/qml/createRoom.qml    2014-07-25 03:30:04 UTC (rev 
34051)
+++ gnunet-qt/SecureShare/qml/createRoom.qml    2014-07-25 03:59:27 UTC (rev 
34052)
@@ -4,10 +4,8 @@
 import QtQuick.Layouts 1.1
 import Psyc 1.0
 
-Window {
-    title: "Create Room";
-    width: 400;
-    height: 200;
+Rectangle {
+    anchors.fill: parent
     id: createRoomWnd
 
     property var selected: 0

Added: gnunet-qt/SecureShare/qml/images/add.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/add.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/add.png    2014-07-25 03:30:04 UTC (rev 
34051)
+++ gnunet-qt/SecureShare/qml/images/add.png    2014-07-25 03:59:27 UTC (rev 
34052)

Property changes on: gnunet-qt/SecureShare/qml/images/add.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/contact.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/contact.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/contact.png        2014-07-25 03:30:04 UTC 
(rev 34051)
+++ gnunet-qt/SecureShare/qml/images/contact.png        2014-07-25 03:59:27 UTC 
(rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/contact.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/contact_dark.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/contact_dark.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/contact_dark.png   2014-07-25 03:30:04 UTC 
(rev 34051)
+++ gnunet-qt/SecureShare/qml/images/contact_dark.png   2014-07-25 03:59:27 UTC 
(rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/contact_dark.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/create_room.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/create_room.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/create_room.png    2014-07-25 03:30:04 UTC 
(rev 34051)
+++ gnunet-qt/SecureShare/qml/images/create_room.png    2014-07-25 03:59:27 UTC 
(rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/create_room.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/group.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/group.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/group.png  2014-07-25 03:30:04 UTC (rev 
34051)
+++ gnunet-qt/SecureShare/qml/images/group.png  2014-07-25 03:59:27 UTC (rev 
34052)

Property changes on: gnunet-qt/SecureShare/qml/images/group.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/group_dark.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/group_dark.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/group_dark.png     2014-07-25 03:30:04 UTC 
(rev 34051)
+++ gnunet-qt/SecureShare/qml/images/group_dark.png     2014-07-25 03:59:27 UTC 
(rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/group_dark.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/settings.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/settings.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/settings.png       2014-07-25 03:30:04 UTC 
(rev 34051)
+++ gnunet-qt/SecureShare/qml/images/settings.png       2014-07-25 03:59:27 UTC 
(rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/settings.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/status/dot_away.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/status/dot_away.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/status/dot_away.png        2014-07-25 
03:30:04 UTC (rev 34051)
+++ gnunet-qt/SecureShare/qml/images/status/dot_away.png        2014-07-25 
03:59:27 UTC (rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/status/dot_away.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/status/dot_busy.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/status/dot_busy.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/status/dot_busy.png        2014-07-25 
03:30:04 UTC (rev 34051)
+++ gnunet-qt/SecureShare/qml/images/status/dot_busy.png        2014-07-25 
03:59:27 UTC (rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/status/dot_busy.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/status/dot_idle.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/status/dot_idle.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/status/dot_idle.png        2014-07-25 
03:30:04 UTC (rev 34051)
+++ gnunet-qt/SecureShare/qml/images/status/dot_idle.png        2014-07-25 
03:59:27 UTC (rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/status/dot_idle.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/status/dot_online.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/status/dot_online.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/status/dot_online.png      2014-07-25 
03:30:04 UTC (rev 34051)
+++ gnunet-qt/SecureShare/qml/images/status/dot_online.png      2014-07-25 
03:59:27 UTC (rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/status/dot_online.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/thread.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/thread.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/thread.png 2014-07-25 03:30:04 UTC (rev 
34051)
+++ gnunet-qt/SecureShare/qml/images/thread.png 2014-07-25 03:59:27 UTC (rev 
34052)

Property changes on: gnunet-qt/SecureShare/qml/images/thread.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/threadChat.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/threadChat.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/threadChat.png     2014-07-25 03:30:04 UTC 
(rev 34051)
+++ gnunet-qt/SecureShare/qml/images/threadChat.png     2014-07-25 03:59:27 UTC 
(rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/threadChat.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/thread_dark.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/thread_dark.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/thread_dark.png    2014-07-25 03:30:04 UTC 
(rev 34051)
+++ gnunet-qt/SecureShare/qml/images/thread_dark.png    2014-07-25 03:59:27 UTC 
(rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/thread_dark.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Added: gnunet-qt/SecureShare/qml/images/transfer.png
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/qml/images/transfer.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/transfer.png       2014-07-25 03:30:04 UTC 
(rev 34051)
+++ gnunet-qt/SecureShare/qml/images/transfer.png       2014-07-25 03:59:27 UTC 
(rev 34052)

Property changes on: gnunet-qt/SecureShare/qml/images/transfer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: gnunet-qt/SecureShare/qml/joinRoom.qml
===================================================================
--- gnunet-qt/SecureShare/qml/joinRoom.qml      2014-07-25 03:30:04 UTC (rev 
34051)
+++ gnunet-qt/SecureShare/qml/joinRoom.qml      2014-07-25 03:59:27 UTC (rev 
34052)
@@ -4,10 +4,9 @@
 import QtQuick.Layouts 1.1
 import Psyc 1.0
 
-Window {
-    title: "Join Room";
-    width: 500;
-    height: 300;
+Rectangle {
+
+    anchors.fill: parent
     id: joinRoomWnd
 
     property var selected: 0

Modified: gnunet-qt/SecureShare/qml/main.qml
===================================================================
--- gnunet-qt/SecureShare/qml/main.qml  2014-07-25 03:30:04 UTC (rev 34051)
+++ gnunet-qt/SecureShare/qml/main.qml  2014-07-25 03:59:27 UTC (rev 34052)
@@ -6,13 +6,17 @@
 import Psyc 1.0
 
 ApplicationWindow {
-    width: 300
+    width: 1200
     height: 600
     id: mainWnd
 
     property var firstRun: true
     property var splashWnd
 
+
+    FontLoader { id: ubuntuFont; source: "fonts/Ubuntu-R.ttf" }
+    FontLoader { id: ubuntuBIFont; source: "fonts/Ubuntu-BI.ttf" }
+
     menuBar: MenuBar {
         Menu {
             title: qsTr("File")
@@ -23,7 +27,7 @@
             MenuItem {
                 text: qsTr("Create new Room")
                 onTriggered: {
-                    var createRoom = 
Qt.createComponent("qrc:///qml/createRoom.qml");
+                    var createRoom = 
Qt.createComponent("qrc:///qml/CreateRoom.qml");
                     var createRoomWnd = createRoom.createObject();
                     createRoomWnd.show();
                 }
@@ -31,7 +35,7 @@
             MenuItem {
                 text: qsTr("Join Room")
                 onTriggered: {
-                    var joinRoom = 
Qt.createComponent("qrc:///qml/joinRoom.qml");
+                    var joinRoom = 
Qt.createComponent("qrc:///qml/JoinRoom.qml");
                     var joinRoomWnd = joinRoom.createObject();
                     joinRoomWnd.show();
                 }
@@ -71,6 +75,12 @@
                     profileWnd.show();
                 }
             }
+            MenuItem {
+                text: qsTr("Conversation")
+                onTriggered: {
+                    conversationWnd.show()
+                }
+            }
 
 
 
@@ -78,16 +88,17 @@
         }
     }
 
-    Profile{
 
-    }
 
-
     ConversationWindow{
         id: conversationWnd
     }
 
+    Settings{
 
+    }
+
+
     onActiveChanged: {
         if(firstRun){
             visible = false;
@@ -101,6 +112,409 @@
 
 
 
+
+    ListModel {
+        id: contactsModel
+        ListElement {
+            name: "Thread Chat"
+            type: "thread"
+            status: "My awesome status message"
+        }
+        ListElement {
+            name: "lynX group"
+            type: "group"
+            status: "Look at my group, my group is amazing!"
+        }
+        ListElement {
+            name: "tg"
+            type: "single"
+            status: "I like to move, move !"
+        }
+    }
+
+
+
+    Rectangle{
+        id: container
+        anchors.fill: parent
+
+        Rectangle{
+            id: sidebar
+            color: "#1C1C1C"
+            anchors.left: parent.left
+            anchors.top:parent.top
+            anchors.bottom: parent.bottom
+
+            width: 220
+
+            Rectangle{
+                id:topBar
+                anchors.left: parent.left
+                anchors.right: parent.right
+                color: "#1C1C1C"
+                height: 60
+
+                Image {
+                    id: contact
+                    source: "images/contact.png"
+                    anchors.left: parent.left
+                    anchors.leftMargin: 10
+                    anchors.top: parent.top
+                    anchors.topMargin: 10
+                }
+                Label{
+                    id: myName
+                    anchors.left: contact.right
+                    anchors.leftMargin: 10
+                    anchors.top: contact.top
+                    text: "Bruno"
+                    color: "white"
+                    font.pixelSize: 14
+                    font.family: ubuntuFont.name
+                }
+                Label{
+                    id: myStatus
+                    anchors.top: myName.bottom
+                    anchors.topMargin: 1
+                    anchors.left: contact.right
+                    anchors.leftMargin: 10
+                    text: "My Status"
+                    color: "white"
+                    font.pixelSize: 12
+                    font.family: ubuntuFont.name
+                }
+
+                Rectangle{
+                    id:statusButton
+                    radius: 5
+                    color: "#414141"
+                    width: 22
+                    height: 40
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    anchors.rightMargin: 10
+                    anchors.topMargin: 10
+
+                    Image {
+                        id: imageStatus
+                        source: "images/status/dot_online.png"
+                        anchors.centerIn: parent
+                    }
+
+                    MouseArea{
+                        id:statusMa
+                        anchors.fill: parent
+                        hoverEnabled: true
+
+                        onClicked: setStatusMenu.popup()
+
+                        Menu {
+                            id: setStatusMenu
+                            title: "Set Status"
+
+                            MenuItem {
+                                iconSource : "images/status/dot_online.png"
+                                text: qsTr("Online")
+                                onTriggered: imageStatus.source = 
"images/status/dot_online.png"
+                            }
+                            MenuItem {
+                                iconSource : "images/status/dot_away.png"
+                                text: qsTr("Away")
+                                onTriggered: imageStatus.source = 
"images/status/dot_away.png"
+                            }
+                            MenuItem {
+                                iconSource : "images/status/dot_busy.png"
+                                text: qsTr("Busy")
+                                onTriggered: imageStatus.source = 
"images/status/dot_busy.png"
+                            }
+                        }
+
+                        onContainsMouseChanged: {
+                            if(containsMouse){
+                                statusButton.color = "#4B4B4B"
+                                cursorShape: Qt.PointingHandCursor
+                            }
+                            else
+                            {
+                                statusButton.color = "#414141"
+                                cursorShape: Qt.ArrowCursor
+                            }
+                        }
+
+
+                    }
+                }
+
+            }
+
+            //The contact list
+            Rectangle {
+                id:rectContactList
+
+                anchors.top: topBar.bottom
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.bottom: bottonBar.top
+                color: "#414141"
+
+                ListView {
+                    id:contactList
+                    anchors.fill: parent
+                    model: contactsModel
+                    delegate: contactDelegate
+                    focus: true
+
+                        Component {
+                        id: contactDelegate
+
+
+                        Item {
+                            id: wrapper
+                            width: 220
+
+                            height: 48
+                            Rectangle{
+                                id: contactBackground
+                                anchors.fill: parent
+                                color: "#414141"
+
+                                Image {
+                                    id: contactPic
+                                    anchors.top: parent.top
+                                    anchors.left: parent.left
+                                    anchors.topMargin: 9
+                                    anchors.leftMargin: 14
+                                    source: {
+                                        if (type == "thread")
+                                            "images/thread.png"
+                                        else if (type == "group")
+                                            "images/group.png"
+                                        else
+                                            "images/contact.png"
+                                    }
+
+
+                                }
+
+                                Label{
+                                    id: contactName
+                                    anchors.left: contactPic.right
+                                    anchors.top: contactPic.top
+                                    width: contactBackground.width
+                                    anchors.leftMargin: 5
+                                    text: name
+                                    font.family: ubuntuFont.name
+                                    font.pointSize: 10
+                                    wrapMode : Text.Wrap
+                                    elide : Text.ElideRight
+                                    color: "white"
+
+                                }
+                                Label{
+                                    id: contactStatus
+                                    anchors.left: contactName.left
+                                    anchors.top: contactName.bottom
+                                    width: contactBackground.width
+                                    text: status
+                                    font.family: ubuntuFont.name
+                                    font.pointSize: 8
+                                    wrapMode : Text.Wrap
+                                    elide : Text.ElideRight
+                                    color: "white"
+
+                                }
+
+
+                                MouseArea{
+                                    anchors.fill: parent
+
+                                    hoverEnabled: true
+
+                                    onContainsMouseChanged: {
+                                        if(containsMouse){
+                                            contactBackground.color = "#505050"
+                                        }
+                                        else
+                                        {
+                                            contactBackground.color = "#414141"
+                                        }
+                                    }
+
+                                }
+                            }
+                        }
+
+                    }
+                }
+            }
+
+            Rectangle{
+                id:bottonBar
+                color: "#1C1C1C"
+                height: 35
+                anchors.bottom: parent.bottom
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                Rectangle{
+                    id:addButton
+                    anchors.left: parent.left
+                    anchors.top: parent.top
+                    width: 54
+                    color: "#414141"
+                    height: parent.height
+
+                    Image {
+                        id: addButtonImage
+                        source: "images/add.png"
+                        anchors.centerIn: parent
+                    }
+                    MouseArea{
+                        id:addButtonMa
+                        anchors.fill: parent
+                        hoverEnabled: true
+
+                        onClicked: main.currentIndex = 0
+
+                        onContainsMouseChanged: {
+                            if(containsMouse){
+                                addButton.color = "#282828"
+                                cursorShape: Qt.PointingHandCursor
+                            }
+                            else
+                            {
+                                addButton.color = "#414141"
+                                cursorShape: Qt.ArrowCursor
+                            }
+                        }
+                    }
+                }
+                Rectangle{
+                    id:createButton
+                    anchors.left: addButton.right
+                    anchors.top: parent.top
+                    width: 54
+                    color: "#414141"
+                    height: parent.height
+
+                    Image {
+                        id: createButtonImage
+                        source: "images/create_room.png"
+                        anchors.centerIn: parent
+                    }
+                    MouseArea{
+                        id:createButtonMa
+                        anchors.fill: parent
+                        hoverEnabled: true
+
+                        onClicked: main.currentIndex = 1
+                        onContainsMouseChanged: {
+                            if(containsMouse){
+                                createButton.color = "#282828"
+                                cursorShape: Qt.PointingHandCursor
+                            }
+                            else
+                            {
+                                createButton.color = "#414141"
+                                cursorShape: Qt.ArrowCursor
+                            }
+                        }
+                    }
+                }
+                Rectangle{
+                    id:configButton
+                    anchors.left: createButton.right
+                    anchors.top: parent.top
+                    width: 54
+                    color: "#414141"
+                    height: parent.height
+
+                    Image {
+                        id: configButtonImage
+                        source: "images/settings.png"
+                        anchors.centerIn: parent
+                    }
+                    MouseArea{
+                        id:configButtonMa
+                        anchors.fill: parent
+                        hoverEnabled: true
+
+                        onClicked: main.currentIndex = 2
+                        onContainsMouseChanged: {
+                            if(containsMouse){
+                                configButton.color = "#282828"
+                                cursorShape: Qt.PointingHandCursor
+                            }
+                            else
+                            {
+                                configButton.color = "#414141"
+                                cursorShape: Qt.ArrowCursor
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+
+
+
+        TabView {
+            id: main
+            anchors.left: sidebar.right
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.right: parent.right
+            // Implements back key navigation
+            focus: true
+            tabsVisible: true
+
+
+            Tab{
+                title: "Join Room"
+                JoinRoom{
+                    //anchors.fill: parent
+                }
+            }
+
+            Tab{
+                title: "CreateRoom"
+                CreateRoom{
+                    //anchors.fill: parent
+                }
+            }
+
+
+
+            Tab{
+                title: "Settings"
+                Settings{
+                    //anchors.fill: parent
+                }
+            }
+
+            Tab{
+                title: "TreadChat"
+                ThreadChat{
+                    //anchors.fill: parent
+                }
+            }
+
+
+
+
+
+
+        }
+
+
+
+    }
+
+
+
+
+    /*
     TableView {
         TableViewColumn{ role: "title"  ; title: "Title" ; width: 100 }
         model: Psyc.models.placesModel
@@ -151,6 +565,6 @@
 
 
     }
+*/
 
-
 }

Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc       2014-07-25 03:30:04 UTC (rev 34051)
+++ gnunet-qt/SecureShare/qml.qrc       2014-07-25 03:59:27 UTC (rev 34052)
@@ -10,8 +10,8 @@
         <file>qml/NewEgo.qml</file>
         <file>assets/icon.png</file>
         <file>assets/icon.ico</file>
-        <file>qml/joinRoom.qml</file>
-        <file>qml/createRoom.qml</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>
@@ -41,5 +41,18 @@
         <file>qml/images/demo/brazil.png</file>
         <file>qml/images/demo/gnunet.png</file>
         <file>qml/images/demo/secushare.png</file>
+        <file>qml/images/contact.png</file>
+        <file>qml/images/status/dot_away.png</file>
+        <file>qml/images/status/dot_busy.png</file>
+        <file>qml/images/status/dot_idle.png</file>
+        <file>qml/images/status/dot_online.png</file>
+        <file>qml/images/add.png</file>
+        <file>qml/images/settings.png</file>
+        <file>qml/Settings.qml</file>
+        <file>qml/images/thread.png</file>
+        <file>qml/images/thread_dark.png</file>
+        <file>qml/images/group.png</file>
+        <file>qml/images/group_dark.png</file>
+        <file>qml/images/create_room.png</file>
     </qresource>
 </RCC>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]