gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r34164 - in gnunet-qt/SecureShare: . core core/social model


From: gnunet
Subject: [GNUnet-SVN] r34164 - in gnunet-qt/SecureShare: . core core/social models preferences qml qml/images
Date: Mon, 18 Aug 2014 05:53:56 +0200

Author: bratao
Date: 2014-08-18 05:53:55 +0200 (Mon, 18 Aug 2014)
New Revision: 34164

Added:
   gnunet-qt/SecureShare/qml/images/button_default.png
   gnunet-qt/SecureShare/qml/images/button_pressed.png
   gnunet-qt/SecureShare/qml/images/send.png
Modified:
   gnunet-qt/SecureShare/core/psyccore.cpp
   gnunet-qt/SecureShare/core/psyccore.h
   gnunet-qt/SecureShare/core/social/place.cpp
   gnunet-qt/SecureShare/core/social/place.h
   gnunet-qt/SecureShare/core/social/socialservice.cpp
   gnunet-qt/SecureShare/core/social/socialservice.h
   gnunet-qt/SecureShare/main.cpp
   gnunet-qt/SecureShare/models/PlacesModel.cpp
   gnunet-qt/SecureShare/models/PlacesModel.h
   gnunet-qt/SecureShare/preferences/preferences.cpp
   gnunet-qt/SecureShare/preferences/preferences.h
   gnunet-qt/SecureShare/qml.qrc
   gnunet-qt/SecureShare/qml/About.qml
   gnunet-qt/SecureShare/qml/GroupConversation.qml
   gnunet-qt/SecureShare/qml/SingleConversation.qml
   gnunet-qt/SecureShare/qml/ThreadChat.qml
   gnunet-qt/SecureShare/qml/createRoom.qml
   gnunet-qt/SecureShare/qml/main.qml
Log:
Implementing last minutes functionality 

Modified: gnunet-qt/SecureShare/core/psyccore.cpp
===================================================================
--- gnunet-qt/SecureShare/core/psyccore.cpp     2014-08-17 16:54:24 UTC (rev 
34163)
+++ gnunet-qt/SecureShare/core/psyccore.cpp     2014-08-18 03:53:55 UTC (rev 
34164)
@@ -129,3 +129,21 @@
     emit setIdentitySignal();
 
 }
+
+
+/**
+ * @brief PsycCore::setTrayMessage , will only show if the Window is hidden
+ * @param message
+ */
+void PsycCore::setTrayMessage(QString room, QString message)
+{
+
+
+    if(!theWindow->isVisible()){
+
+        m_tray->showMessage(room, message);
+
+    }
+
+
+}

Modified: gnunet-qt/SecureShare/core/psyccore.h
===================================================================
--- gnunet-qt/SecureShare/core/psyccore.h       2014-08-17 16:54:24 UTC (rev 
34163)
+++ gnunet-qt/SecureShare/core/psyccore.h       2014-08-18 03:53:55 UTC (rev 
34164)
@@ -80,6 +80,7 @@
 
 public slots:
     void trayActivated(QSystemTrayIcon::ActivationReason reason);
+    void setTrayMessage(QString room, QString message);
 };
 
 //Those are the externals visible to the whole application ( globals)

Modified: gnunet-qt/SecureShare/core/social/place.cpp
===================================================================
--- gnunet-qt/SecureShare/core/social/place.cpp 2014-08-17 16:54:24 UTC (rev 
34163)
+++ gnunet-qt/SecureShare/core/social/place.cpp 2014-08-18 03:53:55 UTC (rev 
34164)
@@ -1,8 +1,16 @@
 #include "place.h"
 
+#include "core/psyccore.h"
+
 #include <QApplication>
 #include <QClipboard>
+#include <QTime>
 
+/**
+ * @brief Place::Place , constructor should receive the public key as title
+ * @param key
+ * @param parent
+ */
 Place::Place(QString key, QObject *parent) :
     QObject(parent)
 {
@@ -14,9 +22,16 @@
 
     connect(this,&Place::addConversationSignal,
             this,&Place::addConversationSlot, Qt::QueuedConnection);
+
+    connect(this,&Place::setTrayMessageSignal,
+            theApp,&PsycCore::setTrayMessage, Qt::QueuedConnection);
+
+
 }
 
-
+/**
+ * @brief Place::copyToClipboard , copy the key to clipboard
+ */
 void Place::copyToClipboard()
 {
     QClipboard *clipboard = QApplication::clipboard();
@@ -24,6 +39,10 @@
     clipboard->setText(m_key);
 }
 
+/**
+ * @brief Place::talk , talk in the room
+ * @param text
+ */
 void Place::talk(QString text)
 {
 
@@ -36,22 +55,36 @@
         emit guestTalkSignal(this,text);
     }
 
-
 }
 
-
+/**
+ * @brief Place::addConversation , signal to the slot to add the conversation 
to place
+ * @param text
+ */
 void Place::addConversation(QString text)
 {
     emit addConversationSignal(text);
+
+    //Set tray message
+    if(text.length() > 1)
+        emit setTrayMessageSignal(m_key,text);
 }
 
+
+/**
+ * @brief Place::addConversationSlot , Slot to add the conversation to place
+ * @param text
+ */
 void Place::addConversationSlot(QString text)
 {
 
     if(text.length() < 1)
         return;
 
-    m_content += text + "<br/>";
+    //Add Ttimestamp befor text
+    QString current = QTime::currentTime().toString("hh:mm:ss ap");
 
+    m_content += "<small>("+ current + ")</small> : " + text + "<br/>";
+
     emit contentChanged(m_content);
 }

Modified: gnunet-qt/SecureShare/core/social/place.h
===================================================================
--- gnunet-qt/SecureShare/core/social/place.h   2014-08-17 16:54:24 UTC (rev 
34163)
+++ gnunet-qt/SecureShare/core/social/place.h   2014-08-18 03:53:55 UTC (rev 
34164)
@@ -76,9 +76,15 @@
         m_isHost = true;
     }
 
+    //Is Host ?
+    bool isHost() const
+    { return m_isHost; }
+
     //Private Key
     struct GNUNET_CRYPTO_EddsaPrivateKey* privateKey() const
     { return m_placeKey; }
+
+
     void setPrivateKey(struct GNUNET_CRYPTO_EddsaPrivateKey* key)
     {
         m_placeKey = key;
@@ -136,6 +142,7 @@
     void hostTalkSignal (Place* place, QString text);
 
     void addConversationSignal(QString text);
+    void setTrayMessageSignal (QString room, QString text);
 
 
 public slots:

Modified: gnunet-qt/SecureShare/core/social/socialservice.cpp
===================================================================
--- gnunet-qt/SecureShare/core/social/socialservice.cpp 2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/core/social/socialservice.cpp 2014-08-18 03:53:55 UTC 
(rev 34164)
@@ -6,6 +6,8 @@
 #include "models/PlacesModel.h"
 
 #include "core/gnunet/gnunet.h"
+#include "psyc.h"
+#include "preferences/preferences.h"
 
 #include "core/social/place.h"
 
@@ -44,23 +46,29 @@
     Identity* iden = theApp->identity();
     m_hostEgo = iden->ego();
 
+    //Load rooms
+    theApp->models()->placesModel()->load();
 
 }
 
 
-void SocialService::createPlace()
+void SocialService::createPlace(QString name)
 {
-    emit createPlaceSignal();
+    emit createPlaceSignal(name);
 }
 
-void SocialService::createPlaceSlot()
+void SocialService::createPlaceSlot(QString name)
 {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Creating a New Place.\n");
 
 
-    GNUNET_CRYPTO_EddsaPrivateKey *placeKey = GNUNET_CRYPTO_eddsa_key_create 
();
+    QString filename = thePrefs->getFolder() + "/places/" + name + ".private";
+
+    GNUNET_CRYPTO_EddsaPrivateKey *placeKey = 
GNUNET_CRYPTO_eddsa_key_create_from_file(filename.toStdString().c_str());
     GNUNET_CRYPTO_EddsaPublicKey *placePubKey= new 
GNUNET_CRYPTO_EddsaPublicKey;
 
+
+
     GNUNET_CRYPTO_eddsa_key_get_public (placeKey, placePubKey);
 
     char* id = GNUNET_CRYPTO_eddsa_public_key_to_string (placePubKey);
@@ -94,6 +102,10 @@
     connect(newPlace,&Place::hostTalkSignal,
             this,&SocialService::hostTalk, Qt::QueuedConnection);
 
+
+    //Save hosts
+    theApp->models()->placesModel()->save();
+
 }
 
 

Modified: gnunet-qt/SecureShare/core/social/socialservice.h
===================================================================
--- gnunet-qt/SecureShare/core/social/socialservice.h   2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/core/social/socialservice.h   2014-08-18 03:53:55 UTC 
(rev 34164)
@@ -99,13 +99,13 @@
 
 
     void start(GNUNET_CONFIGURATION_Handle *config);
-    Q_INVOKABLE void createPlace();
-    void createPlaceSlot();
+    Q_INVOKABLE void createPlace(QString name);
+    void createPlaceSlot(QString name);
     Q_INVOKABLE void enterRoom(QString pubKey, QString peerIdentity);
 
 
 signals:
-    void createPlaceSignal();
+    void createPlaceSignal(QString name);
     void enterRoomSignal(QString pubKey, QString peerIdentity);
 public slots:
 

Modified: gnunet-qt/SecureShare/main.cpp
===================================================================
--- gnunet-qt/SecureShare/main.cpp      2014-08-17 16:54:24 UTC (rev 34163)
+++ gnunet-qt/SecureShare/main.cpp      2014-08-18 03:53:55 UTC (rev 34164)
@@ -25,7 +25,7 @@
         qWarning("Error: Your root item has to be a Window.");
         return -1;
     }
-    QObject::connect(&engine, SIGNAL(quit()), &theApp, SLOT(quit()));
+    QObject::connect(&engine, SIGNAL(quit()), &app, SLOT(quit()));
 
 
     psyc.registerImageProvider(&engine);

Modified: gnunet-qt/SecureShare/models/PlacesModel.cpp
===================================================================
--- gnunet-qt/SecureShare/models/PlacesModel.cpp        2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/models/PlacesModel.cpp        2014-08-18 03:53:55 UTC 
(rev 34164)
@@ -24,6 +24,13 @@
 #include "models/PlacesModel.h"
 #include "core/social/place.h"
 
+#include "core/psyccore.h"
+#include "psyc.h"
+#include "preferences/preferences.h"
+#include "core/social/socialservice.h"
+
+#include "core/gnunet/gnunet.h"
+
 #include <QQmlEngine>
 
 
@@ -34,7 +41,65 @@
     connect(this, &PlacesModel::addNewPeerSignal, this, 
&PlacesModel::addNewPeerSlot);
 }
 
+PlacesModel::~PlacesModel()
+{
 
+}
+
+/**
+ * @brief PlacesModel::save, will save the list of places
+ */
+void PlacesModel::save(){
+    QString filename = thePrefs->getFolder() + "/rooms.keys";
+    QFile file(filename);
+
+    if(!file.open(QIODevice::WriteOnly))
+    {
+        qDebug() << "Could not open " << filename;
+        return;
+    }
+
+    QDataStream out(&file);
+    //out.setVersion(QDataStream::Qt_5_1);
+
+
+    foreach (Place* place, m_data) {
+        out << place->name();
+        out << place->isHost();
+
+    }
+}
+
+void PlacesModel::load(){
+
+    QString filename = thePrefs->getFolder() + "/rooms.keys";
+    QFile file(filename);
+
+    if(!file.open(QIODevice::ReadOnly))
+    {
+        qDebug() << "Could not open " << filename;
+        return;
+    }
+
+    QDataStream in(&file);
+    //out.setVersion(QDataStream::Qt_5_1);
+
+
+    while (!in.atEnd()) {
+        QString publicKey;
+        bool isHost;
+
+        in >> publicKey >> isHost;
+
+
+        qWarning() << publicKey << "  Is host:" << isHost ;
+
+        theApp->gnunet()->social()->enterRoom(publicKey,"");
+    }
+
+}
+
+
 int PlacesModel::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);
@@ -131,6 +196,7 @@
 
         m_lookupIndex[key] = index;
         endInsertRows();
+        save();
         return item;
     }
 

Modified: gnunet-qt/SecureShare/models/PlacesModel.h
===================================================================
--- gnunet-qt/SecureShare/models/PlacesModel.h  2014-08-17 16:54:24 UTC (rev 
34163)
+++ gnunet-qt/SecureShare/models/PlacesModel.h  2014-08-18 03:53:55 UTC (rev 
34164)
@@ -47,6 +47,9 @@
     Place *get(QModelIndex index);
     Place *get(QString key);
 
+    void save();
+    void load();
+    ~PlacesModel();
 signals:
     void addNewPeerSignal(Place* item, QString key);
     

Modified: gnunet-qt/SecureShare/preferences/preferences.cpp
===================================================================
--- gnunet-qt/SecureShare/preferences/preferences.cpp   2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/preferences/preferences.cpp   2014-08-18 03:53:55 UTC 
(rev 34164)
@@ -37,9 +37,20 @@
   sync();
 }
 
+QString Preferences::getFolder()
+{
+  QString filepath = fileName();
+  QFileInfo fi(filepath);
 
+  QDir fileDir = fi.dir();
+  QString fileDirStr = fileDir.absolutePath();
 
+  return fileDirStr;
+}
 
 
 
 
+
+
+

Modified: gnunet-qt/SecureShare/preferences/preferences.h
===================================================================
--- gnunet-qt/SecureShare/preferences/preferences.h     2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/preferences/preferences.h     2014-08-18 03:53:55 UTC 
(rev 34164)
@@ -117,6 +117,7 @@
 
     Q_INVOKABLE void save();
 
+    QString getFolder();
 signals:
     /*
    *

Modified: gnunet-qt/SecureShare/qml/About.qml
===================================================================
--- gnunet-qt/SecureShare/qml/About.qml 2014-08-17 16:54:24 UTC (rev 34163)
+++ gnunet-qt/SecureShare/qml/About.qml 2014-08-18 03:53:55 UTC (rev 34164)
@@ -6,8 +6,8 @@
 
 Window {
     title: "About";
-    width: 300;
-    height: 60;
+    width: 800;
+    height: 400;
     id: aboutWnd
 
 
@@ -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
+            Send designed by Javier Sánchez - javyliu from the 
thenounproject.com
             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/).
 "

Modified: gnunet-qt/SecureShare/qml/GroupConversation.qml
===================================================================
--- gnunet-qt/SecureShare/qml/GroupConversation.qml     2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/qml/GroupConversation.qml     2014-08-18 03:53:55 UTC 
(rev 34164)
@@ -84,15 +84,15 @@
 
 
 
-                TextArea {
-                    id: centerItem
-                    Layout.minimumWidth: 50
-                    Layout.fillWidth: true
-                    textFormat: TextEdit.RichText
-                    readOnly: true
-                    frameVisible: false
-                    text: place.content
-                }
+            TextArea {
+                id: centerItem
+                Layout.minimumWidth: 50
+                Layout.fillWidth: true
+                textFormat: TextEdit.RichText
+                readOnly: true
+                frameVisible: false
+                text: place.content
+            }
 
 
 
@@ -117,10 +117,10 @@
                         TableViewColumn{ role: "title"  ; title: "Title" ; 
width: 100 }
                         model:
                             ListModel {
-                               ListElement{ title: "bratao1" }
-                               ListElement{ title: "lynX" }
-                               ListElement{ title: "tg"  }
-                            }
+                            ListElement{ title: "bratao1" }
+                            ListElement{ title: "lynX" }
+                            ListElement{ title: "tg"  }
+                        }
 
                     }
 
@@ -129,22 +129,75 @@
             }
         }
 
-        TextArea{
-            id: textField
+        RowLayout{
             Layout.fillWidth: true
-            Layout.minimumHeight: 70
-            Layout.preferredHeight: 70
+            spacing: 5
+            TextArea{
+                id: textField
+                Layout.fillWidth: true
+                Layout.minimumHeight: 70
+                Layout.preferredHeight: 70
 
-        }
-        Button{
-            height: 40
-            width: 40
-            text: "Send"
-            onClicked: {
-                place.talk(textField.text)
-                textField.text = ""
             }
+            Button{
+
+                style: touchStyle
+
+                text: "Send"
+                onClicked: {
+                    place.talk(textField.text)
+                    textField.text = ""
+                }
+            }
+
+            Component {
+                id: touchStyle
+                ButtonStyle {
+                    panel: Item {
+                        implicitHeight: 40
+                        implicitWidth: 100
+                        BorderImage {
+                            anchors.fill: parent
+                            anchors.rightMargin: 5
+                            antialiasing: true
+                            border.bottom: 8
+                            border.top: 8
+                            border.left: 8
+                            border.right: 8
+                            anchors.margins: control.pressed ? -4 : 0
+
+                            Image {
+                                id: icon
+                                source: "images/send.png"
+                                height: 28
+                                width: 28
+                                fillMode: Image.PreserveAspectFit
+                                anchors.verticalCenter: parent.verticalCenter
+
+                                anchors.left: parent.left
+                                anchors.leftMargin: 5
+
+                            }
+
+
+                            source: control.pressed ? 
"images/button_pressed.png" : "images/button_default.png"
+                            Text {
+                                text: control.text
+                                anchors.verticalCenter: parent.verticalCenter
+
+                                anchors.left: icon.right
+                                anchors.leftMargin: 5
+                                color: "white"
+                                font.pixelSize: 20
+                                renderType: Text.NativeRendering
+                            }
+                        }
+                    }
+                }
+            }
         }
 
+
+
     }
 }

Modified: gnunet-qt/SecureShare/qml/SingleConversation.qml
===================================================================
--- gnunet-qt/SecureShare/qml/SingleConversation.qml    2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/qml/SingleConversation.qml    2014-08-18 03:53:55 UTC 
(rev 34164)
@@ -6,9 +6,11 @@
 
 
 
-Rectangle {
-    anchors.fill: parent
+Window {
+    //anchors.fill: parent
     color: "steelblue"
+    width: 1000
+    height: 700
 
     FontLoader { id: ubuntuFont; source: "fonts/Ubuntu-R.ttf" }
 

Modified: gnunet-qt/SecureShare/qml/ThreadChat.qml
===================================================================
--- gnunet-qt/SecureShare/qml/ThreadChat.qml    2014-08-17 16:54:24 UTC (rev 
34163)
+++ gnunet-qt/SecureShare/qml/ThreadChat.qml    2014-08-18 03:53:55 UTC (rev 
34164)
@@ -6,13 +6,13 @@
 
 import Psyc 1.0
 
-Rectangle {
+Window {
     id: threadChatWnd
     width: 1000
     height: 700
     color: "white"
 
-    anchors.fill: parent
+    //anchors.fill: parent
 
     property var selectedItem: null
 

Modified: gnunet-qt/SecureShare/qml/createRoom.qml
===================================================================
--- gnunet-qt/SecureShare/qml/createRoom.qml    2014-08-17 16:54:24 UTC (rev 
34163)
+++ gnunet-qt/SecureShare/qml/createRoom.qml    2014-08-18 03:53:55 UTC (rev 
34164)
@@ -180,7 +180,7 @@
                 width: 200
 
                 onClicked: {
-                    Psyc.gnunet.social.createPlace()
+                    Psyc.gnunet.social.createPlace(nameField.text)
                 }
             }
         }

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

Index: gnunet-qt/SecureShare/qml/images/button_default.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/button_default.png 2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/qml/images/button_default.png 2014-08-18 03:53:55 UTC 
(rev 34164)

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

Index: gnunet-qt/SecureShare/qml/images/button_pressed.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/button_pressed.png 2014-08-17 16:54:24 UTC 
(rev 34163)
+++ gnunet-qt/SecureShare/qml/images/button_pressed.png 2014-08-18 03:53:55 UTC 
(rev 34164)

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

Index: gnunet-qt/SecureShare/qml/images/send.png
===================================================================
--- gnunet-qt/SecureShare/qml/images/send.png   2014-08-17 16:54:24 UTC (rev 
34163)
+++ gnunet-qt/SecureShare/qml/images/send.png   2014-08-18 03:53:55 UTC (rev 
34164)

Property changes on: gnunet-qt/SecureShare/qml/images/send.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: gnunet-qt/SecureShare/qml/main.qml
===================================================================
--- gnunet-qt/SecureShare/qml/main.qml  2014-08-17 16:54:24 UTC (rev 34163)
+++ gnunet-qt/SecureShare/qml/main.qml  2014-08-18 03:53:55 UTC (rev 34164)
@@ -18,8 +18,15 @@
     FontLoader { id: ubuntuFont; source: "fonts/Ubuntu-R.ttf" }
     FontLoader { id: ubuntuBIFont; source: "fonts/Ubuntu-BI.ttf" }
 
+    onClosing: {
 
+        if(Preferences.minimizeToTray){
+            close.accepted = false;
+            Psyc.onClose();
+        }
+    }
 
+
     Action {
         id: copyLink
         text: "Copy Link"
@@ -79,19 +86,29 @@
             MenuItem {
                 text: qsTr("Threaded Chat")
                 onTriggered: {
-                    var threaded = 
Qt.createComponent("qrc:///qml/TreadChat.qml");
+                    var threaded = 
Qt.createComponent("qrc:///qml/ThreadChat.qml");
                     var threadedWnd = threaded.createObject();
                     threadedWnd.show();
                 }
             }
 
+            MenuItem {
+                text: qsTr("About")
+                onTriggered: {
+                    var threaded = Qt.createComponent("qrc:///qml/About.qml");
+                    var threadedWnd = threaded.createObject();
+                    threadedWnd.show();
+                }
+            }
 
+
         }
     }
 
 
 
 
+
     onActiveChanged: {
         if(firstRun){
             visible = false;
@@ -508,7 +525,6 @@
         }
 
 
-
         Repeater
         {
             id: repeater
@@ -561,7 +577,6 @@
             }
 
 
-
             Tab{
                 title: "Settings"
                 Settings{
@@ -570,33 +585,6 @@
             }
 
 
-/*
-            Tab{
-                title: "TreadChat"
-                ThreadChat{
-                    //anchors.fill: parent
-                }
-            }
-
-            Tab{
-                title: "Group Chat"
-                GroupConversation{
-                    //anchors.fill: parent
-                }
-            }
-
-            Tab{
-                title: "Single Chat"
-                SingleConversation{
-                    //anchors.fill: parent
-                }
-            }
-
-*/
-
-
-
-
         }
 
 
@@ -604,59 +592,4 @@
     }
 
 
-
-
-    /*
-    TableView {
-        TableViewColumn{ role: "title"  ; title: "Title" ; width: 100 }
-        model: Psyc.models.placesModel
-        anchors.fill: parent
-        headerVisible: false
-
-        rowDelegate: BorderImage {
-            visible: styleData.selected || styleData.alternate
-            source: "image://__tablerow/" + (styleData.alternate ? 
"alternate_" : "")
-                    + (styleData.selected ? "selected_" : "")
-                    + (styleData.hasActiveFocus ? "active" : "")
-            height: 30
-            border.left: 4 ; border.right: 4
-        }
-
-        itemDelegate: Item {
-            anchors.fill: parent
-
-            Image {
-                id: icon
-                anchors.left: parent.left
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.margins: 5
-
-                source: "qrc:///qml/images/chat.png"
-                fillMode: Image.PreserveAspectFit
-                clip: true
-            }
-
-            Text {
-                anchors.left: icon.right
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.margins: 5
-
-                color: styleData.textColor
-                elide: styleData.elideMode
-                text: styleData.value
-            }
-
-
-        }
-
-        onDoubleClicked:{
-            conversationWnd.show()
-
-        }
-
-
-
-    }
-*/
-
 }

Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc       2014-08-17 16:54:24 UTC (rev 34163)
+++ gnunet-qt/SecureShare/qml.qrc       2014-08-18 03:53:55 UTC (rev 34164)
@@ -57,5 +57,8 @@
         <file>qml/SingleConversation.qml</file>
         <file>qml/images/contact_dark.png</file>
         <file>qml/images/settings_dark.png</file>
+        <file>qml/images/send.png</file>
+        <file>qml/images/button_default.png</file>
+        <file>qml/images/button_pressed.png</file>
     </qresource>
 </RCC>




reply via email to

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