gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r34057 - in gnunet-qt/SecureShare: . qml qml/images
Date: Sat, 26 Jul 2014 06:36:04 +0200

Author: bratao
Date: 2014-07-26 06:36:04 +0200 (Sat, 26 Jul 2014)
New Revision: 34057

Added:
   gnunet-qt/SecureShare/qml/GroupConversation.qml
   gnunet-qt/SecureShare/qml/SingleConversation.qml
   gnunet-qt/SecureShare/qml/images/join.png
   gnunet-qt/SecureShare/qml/images/settings_dark.png
Removed:
   gnunet-qt/SecureShare/qml/ConversationTab.qml
Modified:
   gnunet-qt/SecureShare/qml.qrc
   gnunet-qt/SecureShare/qml/About.qml
   gnunet-qt/SecureShare/qml/Settings.qml
   gnunet-qt/SecureShare/qml/images/settings.png
   gnunet-qt/SecureShare/qml/joinRoom.qml
   gnunet-qt/SecureShare/qml/main.qml
Log:
Towards implementing a full screen gui


Modified: gnunet-qt/SecureShare/qml/About.qml
===================================================================
--- gnunet-qt/SecureShare/qml/About.qml 2014-07-25 18:02:46 UTC (rev 34056)
+++ gnunet-qt/SecureShare/qml/About.qml 2014-07-26 04:36:04 UTC (rev 34057)
@@ -18,6 +18,7 @@
         Label {
             text: "Entrance designed by Stefan Parnarov from the Noun Project
             Add designed by Factorio.us collective from the Noun Project
+            Gear designed by P.J. Onori from the thenounproject.com
             GLYPHICONS FREE are released under the Creative Commons 
Attribution 3.0 Unported (CC BY 3.0) (http://glyphicons.com/).
 "
 

Deleted: gnunet-qt/SecureShare/qml/ConversationTab.qml
===================================================================
--- gnunet-qt/SecureShare/qml/ConversationTab.qml       2014-07-25 18:02:46 UTC 
(rev 34056)
+++ gnunet-qt/SecureShare/qml/ConversationTab.qml       2014-07-26 04:36:04 UTC 
(rev 34057)
@@ -1,110 +0,0 @@
-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
-
-
-
-Tab {
-    anchors.fill: parent
-
-
-
-    ColumnLayout{
-        anchors.fill:parent
-
-        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"
-            }
-
-        }
-
-
-        SplitView {
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            orientation: Qt.Horizontal
-
-
-
-
-                TextArea {
-                    id: centerItem
-                    Layout.minimumWidth: 50
-                    Layout.fillWidth: true
-                    textFormat: TextEdit.RichText
-                    readOnly: true
-                    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"
-                }
-
-
-
-
-            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{
-            Layout.fillWidth: true
-            Layout.minimumHeight: 70
-            Layout.preferredHeight: 70
-
-        }
-
-    }
-}

Added: gnunet-qt/SecureShare/qml/GroupConversation.qml
===================================================================
--- gnunet-qt/SecureShare/qml/GroupConversation.qml                             
(rev 0)
+++ gnunet-qt/SecureShare/qml/GroupConversation.qml     2014-07-26 04:36:04 UTC 
(rev 34057)
@@ -0,0 +1,110 @@
+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
+    color: "steelblue"
+
+
+    ColumnLayout{
+        anchors.fill:parent
+
+        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"
+            }
+
+        }
+
+
+        SplitView {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            orientation: Qt.Horizontal
+
+
+
+
+                TextArea {
+                    id: centerItem
+                    Layout.minimumWidth: 50
+                    Layout.fillWidth: true
+                    textFormat: TextEdit.RichText
+                    readOnly: true
+                    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"
+                }
+
+
+
+
+            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{
+            Layout.fillWidth: true
+            Layout.minimumHeight: 70
+            Layout.preferredHeight: 70
+
+        }
+
+    }
+}

Modified: gnunet-qt/SecureShare/qml/Settings.qml
===================================================================
--- gnunet-qt/SecureShare/qml/Settings.qml      2014-07-25 18:02:46 UTC (rev 
34056)
+++ gnunet-qt/SecureShare/qml/Settings.qml      2014-07-26 04:36:04 UTC (rev 
34057)
@@ -7,8 +7,62 @@
 Rectangle {
     anchors.fill: parent
 
-    Label{
-        text: "oi"
+
+
+    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/settings_dark.png"
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.margins: 5
+            height: 42
+            width: 42
+            fillMode: Image.PreserveAspectFit
+        }
+        Label{
+            text: "Settings"
+            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"
 
+    }
+
+    Rectangle{
+        id: content
+        anchors.top: headerBanner.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        Label{
+            text: "TODO"
+        }
+    }
+
+
+
+
 }

Added: gnunet-qt/SecureShare/qml/SingleConversation.qml
===================================================================
--- gnunet-qt/SecureShare/qml/SingleConversation.qml                            
(rev 0)
+++ gnunet-qt/SecureShare/qml/SingleConversation.qml    2014-07-26 04:36:04 UTC 
(rev 34057)
@@ -0,0 +1,110 @@
+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
+    color: "steelblue"
+
+
+    ColumnLayout{
+        anchors.fill:parent
+
+        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"
+            }
+
+        }
+
+
+        SplitView {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            orientation: Qt.Horizontal
+
+
+
+
+                TextArea {
+                    id: centerItem
+                    Layout.minimumWidth: 50
+                    Layout.fillWidth: true
+                    textFormat: TextEdit.RichText
+                    readOnly: true
+                    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"
+                }
+
+
+
+
+            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{
+            Layout.fillWidth: true
+            Layout.minimumHeight: 70
+            Layout.preferredHeight: 70
+
+        }
+
+    }
+}

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

Index: gnunet-qt/SecureShare/qml/images/join.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/join.png   2014-07-25 18:02:46 UTC (rev 
34056)
+++ gnunet-qt/SecureShare/qml/images/join.png   2014-07-26 04:36:04 UTC (rev 
34057)

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

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

Index: gnunet-qt/SecureShare/qml/images/settings_dark.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/settings_dark.png  2014-07-25 18:02:46 UTC 
(rev 34056)
+++ gnunet-qt/SecureShare/qml/images/settings_dark.png  2014-07-26 04:36:04 UTC 
(rev 34057)

Property changes on: gnunet-qt/SecureShare/qml/images/settings_dark.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: gnunet-qt/SecureShare/qml/joinRoom.qml
===================================================================
--- gnunet-qt/SecureShare/qml/joinRoom.qml      2014-07-25 18:02:46 UTC (rev 
34056)
+++ gnunet-qt/SecureShare/qml/joinRoom.qml      2014-07-26 04:36:04 UTC (rev 
34057)
@@ -4,6 +4,8 @@
 import QtQuick.Layouts 1.1
 import Psyc 1.0
 
+
+
 Rectangle {
 
     anchors.fill: parent
@@ -12,9 +14,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/enter.png"
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.margins: 5
+            height: 42
+            width: 42
+            fillMode: Image.PreserveAspectFit
+
+        }
+
+        Label{
+            text: "Join 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
@@ -22,24 +73,13 @@
             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/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.top: parent.top
+                anchors.left: parent.left
                 anchors.right: parent.right
                 wrapMode : Text.Wrap
                 text: "Please enter the appropriate information about the chat 
you would like to join."
@@ -168,20 +208,15 @@
 
 
         Row{
-            anchors.bottom: parent.bottom
+            anchors.top: dataRow.bottom
+            anchors.topMargin: 10
             anchors.right: parent.right
+            anchors.left: parent.left
             spacing: 2
+
             Button{
-                text: "Cancel"
-                onPressedChanged: {
-                    joinRoomWnd.close();
-                }
-            }
-            Button{
                 text: "Join"
-                onPressedChanged: {
-                    joinRoomWnd.close();
-                }
+                width: 200
             }
         }
     }

Modified: gnunet-qt/SecureShare/qml/main.qml
===================================================================
--- gnunet-qt/SecureShare/qml/main.qml  2014-07-25 18:02:46 UTC (rev 34056)
+++ gnunet-qt/SecureShare/qml/main.qml  2014-07-26 04:36:04 UTC (rev 34057)
@@ -90,15 +90,7 @@
 
 
 
-    ConversationWindow{
-        id: conversationWnd
-    }
 
-    Settings{
-
-    }
-
-
     onActiveChanged: {
         if(firstRun){
             visible = false;
@@ -127,7 +119,7 @@
         }
         ListElement {
             name: "tg"
-            type: "single"
+            type: "contact"
             status: "I like to move, move !"
         }
     }
@@ -264,7 +256,7 @@
                     delegate: contactDelegate
                     focus: true
 
-                        Component {
+                    Component {
                         id: contactDelegate
 
 
@@ -277,23 +269,46 @@
                                 id: contactBackground
                                 anchors.fill: parent
                                 color: "#414141"
+                                state: "NORMAL"
 
+                                states: [
+                                    State {
+                                        name: "NORMAL"
+                                        when:((!ma.containsMouse) && 
(main.currentIndex !==  3+index))
+                                        PropertyChanges { target: 
contactBackground; color: "#414141"}
+                                        PropertyChanges { target: contactName; 
color: "white"}
+                                        PropertyChanges { target: 
contactStatus; color: "white"}
+                                        PropertyChanges { target: contactPic; 
source: "images/" + type + ".png"}
+                                    },
+                                    State {
+                                        name: "HOVER"
+                                        when: ((ma.containsMouse) && 
(main.currentIndex !==  3+index))
+                                        PropertyChanges { target: 
contactBackground; color: "#505050"}
+                                        PropertyChanges { target: contactName; 
color: "white"}
+                                        PropertyChanges { target: 
contactStatus; color: "white"}
+                                        PropertyChanges { target: contactPic; 
source: "images/" + type + ".png"}
+                                    },
+                                    State {
+                                        name: "PRESSED"
+                                        when: (main.currentIndex == 3+index)
+                                        PropertyChanges { target: 
contactBackground; color: "#FFFFFF"}
+                                        PropertyChanges { target: contactName; 
color: "#1C1C1C"}
+                                        PropertyChanges { target: 
contactStatus; color: "#1C1C1C"}
+                                        PropertyChanges { target: contactPic; 
source: "images/" + type + "_dark.png"}
+
+                                    }
+                                ]
+
                                 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"
-                                    }
+                                    source: "images/" + type + "_dark.png"
 
 
+
                                 }
 
                                 Label{
@@ -326,20 +341,14 @@
 
 
                                 MouseArea{
+                                    id:ma
                                     anchors.fill: parent
 
                                     hoverEnabled: true
 
-                                    onContainsMouseChanged: {
-                                        if(containsMouse){
-                                            contactBackground.color = "#505050"
-                                        }
-                                        else
-                                        {
-                                            contactBackground.color = "#414141"
-                                        }
-                                    }
+                                    onClicked: main.currentIndex =  3+index
 
+
                                 }
                             }
                         }
@@ -361,9 +370,28 @@
                     anchors.left: parent.left
                     anchors.top: parent.top
                     width: 54
-                    color: "#414141"
                     height: parent.height
+                    color: "#1C1C1C"
+                    state: "NORMAL"
 
+                    states: [
+                        State {
+                            name: "NORMAL"
+                            when:((!addButtonMa.containsMouse) && 
(main.currentIndex !== 0))
+                            PropertyChanges { target: addButton; color: 
"#1C1C1C"}
+                        },
+                        State {
+                            name: "HOVER"
+                            when: ((addButtonMa.containsMouse) && 
(main.currentIndex !== 0))
+                            PropertyChanges { target: addButton; color: 
"#282828"}
+                        },
+                        State {
+                            name: "PRESSED"
+                            when: (main.currentIndex == 0)
+                            PropertyChanges { target: addButton; color: 
"#414141"}
+                        }
+                    ]
+
                     Image {
                         id: addButtonImage
                         source: "images/add.png"
@@ -376,17 +404,6 @@
 
                         onClicked: main.currentIndex = 0
 
-                        onContainsMouseChanged: {
-                            if(containsMouse){
-                                addButton.color = "#282828"
-                                cursorShape: Qt.PointingHandCursor
-                            }
-                            else
-                            {
-                                addButton.color = "#414141"
-                                cursorShape: Qt.ArrowCursor
-                            }
-                        }
                     }
                 }
                 Rectangle{
@@ -394,9 +411,28 @@
                     anchors.left: addButton.right
                     anchors.top: parent.top
                     width: 54
-                    color: "#414141"
                     height: parent.height
+                    color: "#1C1C1C"
+                    state: "NORMAL"
 
+                    states: [
+                        State {
+                            name: "NORMAL"
+                            when:((!createButtonMa.containsMouse) && 
(main.currentIndex !== 1))
+                            PropertyChanges { target: createButton; color: 
"#1C1C1C"}
+                        },
+                        State {
+                            name: "HOVER"
+                            when: ((createButtonMa.containsMouse) && 
(main.currentIndex !== 1))
+                            PropertyChanges { target: createButton; color: 
"#282828"}
+                        },
+                        State {
+                            name: "PRESSED"
+                            when: (main.currentIndex == 1)
+                            PropertyChanges { target: createButton; color: 
"#414141"}
+                        }
+                    ]
+
                     Image {
                         id: createButtonImage
                         source: "images/create_room.png"
@@ -408,17 +444,7 @@
                         hoverEnabled: true
 
                         onClicked: main.currentIndex = 1
-                        onContainsMouseChanged: {
-                            if(containsMouse){
-                                createButton.color = "#282828"
-                                cursorShape: Qt.PointingHandCursor
-                            }
-                            else
-                            {
-                                createButton.color = "#414141"
-                                cursorShape: Qt.ArrowCursor
-                            }
-                        }
+
                     }
                 }
                 Rectangle{
@@ -426,9 +452,28 @@
                     anchors.left: createButton.right
                     anchors.top: parent.top
                     width: 54
-                    color: "#414141"
                     height: parent.height
+                    color: "#1C1C1C"
+                    state: "NORMAL"
 
+                    states: [
+                        State {
+                            name: "NORMAL"
+                            when:((!configButtonMa.containsMouse) && 
(main.currentIndex !== 2))
+                            PropertyChanges { target: configButton; color: 
"#1C1C1C"}
+                        },
+                        State {
+                            name: "HOVER"
+                            when: ((configButtonMa.containsMouse) && 
(main.currentIndex !== 2))
+                            PropertyChanges { target: configButton; color: 
"#282828"}
+                        },
+                        State {
+                            name: "PRESSED"
+                            when: (main.currentIndex == 2)
+                            PropertyChanges { target: configButton; color: 
"#414141"}
+                        }
+                    ]
+
                     Image {
                         id: configButtonImage
                         source: "images/settings.png"
@@ -440,17 +485,7 @@
                         hoverEnabled: true
 
                         onClicked: main.currentIndex = 2
-                        onContainsMouseChanged: {
-                            if(containsMouse){
-                                configButton.color = "#282828"
-                                cursorShape: Qt.PointingHandCursor
-                            }
-                            else
-                            {
-                                configButton.color = "#414141"
-                                cursorShape: Qt.ArrowCursor
-                            }
-                        }
+
                     }
                 }
             }
@@ -467,7 +502,8 @@
             anchors.right: parent.right
             // Implements back key navigation
             focus: true
-            tabsVisible: true
+            tabsVisible: false
+            frameVisible: false
 
 
             Tab{
@@ -500,11 +536,25 @@
                 }
             }
 
+            Tab{
+                title: "Group Chat"
+                GroupConversation{
+                    //anchors.fill: parent
+                }
+            }
 
+            Tab{
+                title: "Single Chat"
+                SingleConversation{
+                    //anchors.fill: parent
+                }
+            }
 
 
 
 
+
+
         }
 
 

Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc       2014-07-25 18:02:46 UTC (rev 34056)
+++ gnunet-qt/SecureShare/qml.qrc       2014-07-26 04:36:04 UTC (rev 34057)
@@ -4,7 +4,7 @@
         <file>qml/images/chat.png</file>
         <file>qml/images/person.png</file>
         <file>qml/ConversationWindow.qml</file>
-        <file>qml/ConversationTab.qml</file>
+        <file>qml/GroupConversation.qml</file>
         <file>qml/Splash.qml</file>
         <file>assets/banner.png</file>
         <file>qml/NewEgo.qml</file>
@@ -54,5 +54,8 @@
         <file>qml/images/group.png</file>
         <file>qml/images/group_dark.png</file>
         <file>qml/images/create_room.png</file>
+        <file>qml/SingleConversation.qml</file>
+        <file>qml/images/contact_dark.png</file>
+        <file>qml/images/settings_dark.png</file>
     </qresource>
 </RCC>




reply via email to

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