[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34159 - in gnunet-qt/SecureShare: . core/social preference
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r34159 - in gnunet-qt/SecureShare: . core/social preferences qml |
|
Date: |
Sat, 16 Aug 2014 21:23:38 +0200 |
Author: bratao
Date: 2014-08-16 21:23:37 +0200 (Sat, 16 Aug 2014)
New Revision: 34159
Modified:
gnunet-qt/SecureShare/core/social/place.cpp
gnunet-qt/SecureShare/core/social/socialservice.cpp
gnunet-qt/SecureShare/main.cpp
gnunet-qt/SecureShare/preferences/preferences.h
gnunet-qt/SecureShare/qml/GroupConversation.qml
gnunet-qt/SecureShare/qml/Settings.qml
gnunet-qt/SecureShare/qml/joinRoom.qml
gnunet-qt/SecureShare/qml/main.qml
Log:
Finish Settings
Modified: gnunet-qt/SecureShare/core/social/place.cpp
===================================================================
--- gnunet-qt/SecureShare/core/social/place.cpp 2014-08-16 13:40:38 UTC (rev
34158)
+++ gnunet-qt/SecureShare/core/social/place.cpp 2014-08-16 19:23:37 UTC (rev
34159)
@@ -48,6 +48,9 @@
void Place::addConversationSlot(QString text)
{
+ if(text.length() < 1)
+ return;
+
m_content += text + "<br/>";
emit contentChanged(m_content);
Modified: gnunet-qt/SecureShare/core/social/socialservice.cpp
===================================================================
--- gnunet-qt/SecureShare/core/social/socialservice.cpp 2014-08-16 13:40:38 UTC
(rev 34158)
+++ gnunet-qt/SecureShare/core/social/socialservice.cpp 2014-08-16 19:23:37 UTC
(rev 34159)
@@ -17,6 +17,8 @@
QObject(parent)
{
+
+ //Connect slots
connect(this,&SocialService::createPlaceSignal,
this,&SocialService::createPlaceSlot, Qt::QueuedConnection);
@@ -29,7 +31,7 @@
/**
- * @brief Identity::start
+ * @brief Should be called when the GNUnet service is connected to start
everything
* @param config
*/
void SocialService::start(struct GNUNET_CONFIGURATION_Handle *config)
@@ -38,7 +40,7 @@
this->m_config = config;
- //Grab selected identity
+ //Grab selected identity at home screen
Identity* iden = theApp->identity();
m_hostEgo = iden->ego();
@@ -46,7 +48,6 @@
}
-
void SocialService::createPlace()
{
emit createPlaceSignal();
@@ -476,21 +477,32 @@
tmit->env = NULL;
+ /*
tmit->data[0] = "zzz xxx yyy";
tmit->data[1] = "zyx wvu tsr qpo";
tmit->data[2] = "testing ten nine eight";
- tmit->data_count = 3;
+ tmit->data_count = 3;*/
-/*
- tmit->data[0] = (char *)text.toStdString().c_str();
- tmit->data_count = 1;*/
+ std::string stdText = text.toStdString();
+ tmit->data[0] = new char[stdText.size()+1];
+ //tmit->data[1] = new char[1];
+ tmit->data[1] = "";
+ strcpy( tmit->data[0], stdText.c_str() );
+ //strcpy( tmit->data[1], stdText.c_str() );
+ tmit->data_count = 2;
+
+
+ place->addConversation(text);
+
+
tmit->guest_talk
= GNUNET_SOCIAL_guest_talk (place->socialGuest(),
"_message_guest", NULL,
¬ify_data, tmit,
GNUNET_SOCIAL_TALK_NONE);
+
}
void
@@ -500,12 +512,27 @@
TransmitClosure* tmit = new TransmitClosure();
tmit->env = NULL;
+ /*
tmit->data[0] = "aaa bbb ccc";
tmit->data[1] = "abc def ghi jkl";
tmit->data[2] = "testing one two three";
tmit->data[3] = "four five";
- tmit->data_count = 4;
+ tmit->data_count = 4;*/
+
+ std::string stdText = text.toStdString();
+
+
+
+ tmit->data[0] = new char[stdText.size()+1];
+ //tmit->data[1] = new char[1];
+ tmit->data[1] = "";
+
+ strcpy( tmit->data[0], stdText.c_str() );
+ //strcpy( tmit->data[1], stdText.c_str() );
+
+ tmit->data_count = 2;
+
tmit->host_ann
= GNUNET_SOCIAL_host_announce (place->host(), "_message_host", tmit->env,
¬ify_data, tmit,
Modified: gnunet-qt/SecureShare/main.cpp
===================================================================
--- gnunet-qt/SecureShare/main.cpp 2014-08-16 13:40:38 UTC (rev 34158)
+++ gnunet-qt/SecureShare/main.cpp 2014-08-16 19:23:37 UTC (rev 34159)
@@ -25,7 +25,7 @@
qWarning("Error: Your root item has to be a Window.");
return -1;
}
- QObject::connect(&engine, SIGNAL(quit()), &app, SLOT(quit()));
+ QObject::connect(&engine, SIGNAL(quit()), &theApp, SLOT(quit()));
psyc.registerImageProvider(&engine);
Modified: gnunet-qt/SecureShare/preferences/preferences.h
===================================================================
--- gnunet-qt/SecureShare/preferences/preferences.h 2014-08-16 13:40:38 UTC
(rev 34158)
+++ gnunet-qt/SecureShare/preferences/preferences.h 2014-08-16 19:23:37 UTC
(rev 34159)
@@ -29,28 +29,32 @@
class Preferences : public QSettings
{
- Q_OBJECT
- Q_DISABLE_COPY (Preferences)
+ Q_OBJECT
+ Q_DISABLE_COPY (Preferences)
- /*
+ /*
*
* GENERAL
*
*
*/
- Q_PROPERTY(bool minimizeToTray READ minimizeToTray WRITE setMinimizeToTray
NOTIFY minimizeToTrayChangedSignal)
+ Q_PROPERTY(bool minimizeToTray READ minimizeToTray WRITE setMinimizeToTray
NOTIFY minimizeToTrayChangedSignal)
+ Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChangedSignal)
+ Q_PROPERTY(QString status READ status WRITE setStatus NOTIFY
statusChangedSignal)
+ Q_PROPERTY(bool saveRoom READ saveRoom WRITE setSaveRoom NOTIFY
saveRoomChangedSignal)
+
public:
- explicit Preferences(QObject *parent = 0);
+ explicit Preferences(QObject *parent = 0);
- /*
+ /*
*
* GENERAL
*
@@ -58,34 +62,77 @@
*/
- bool minimizeToTray()
- {
+ bool minimizeToTray()
+ {
- return value("core/minimizeToTray",true).toBool();
- }
+ return value("core/minimizeToTray",true).toBool();
+ }
- void setMinimizeToTray(bool flag)
- {
+ void setMinimizeToTray(bool flag)
+ {
- setValue("core/minimizeToTray",flag);
- emit minimizeToTrayChangedSignal(flag);
- }
+ setValue("core/minimizeToTray",flag);
+ emit minimizeToTrayChangedSignal(flag);
+ }
+ QString name()
+ {
- Q_INVOKABLE void save();
+ return value("core/name","My Username").toString();
+ }
+ void setName(QString name)
+ {
+
+ setValue("core/name",name);
+ emit nameChangedSignal(name);
+ }
+
+ QString status()
+ {
+
+ return value("core/status","My Status").toString();
+ }
+
+ void setStatus(QString status)
+ {
+
+ setValue("core/status",status);
+ emit statusChangedSignal(status);
+ }
+
+ bool saveRoom()
+ {
+
+ return value("core/saveRoom",true).toBool();
+ }
+
+ void setSaveRoom(bool flag)
+ {
+
+ setValue("core/saveRoom",flag);
+ emit saveRoomChangedSignal(flag);
+ }
+
+
+ Q_INVOKABLE void save();
+
signals:
- /*
+ /*
*
* GENERAL
*
*
*/
- void minimizeToTrayChangedSignal(bool flag);
+ void minimizeToTrayChangedSignal(bool flag);
+ void nameChangedSignal(QString name);
+ void statusChangedSignal(QString status);
+ void saveRoomChangedSignal(bool flag);
+
public slots:
Modified: gnunet-qt/SecureShare/qml/GroupConversation.qml
===================================================================
--- gnunet-qt/SecureShare/qml/GroupConversation.qml 2014-08-16 13:40:38 UTC
(rev 34158)
+++ gnunet-qt/SecureShare/qml/GroupConversation.qml 2014-08-16 19:23:37 UTC
(rev 34159)
@@ -141,7 +141,8 @@
width: 40
text: "Send"
onClicked: {
- place.talk("oi")
+ place.talk(textField.text)
+ textField.text = ""
}
}
Modified: gnunet-qt/SecureShare/qml/Settings.qml
===================================================================
--- gnunet-qt/SecureShare/qml/Settings.qml 2014-08-16 13:40:38 UTC (rev
34158)
+++ gnunet-qt/SecureShare/qml/Settings.qml 2014-08-16 19:23:37 UTC (rev
34159)
@@ -3,6 +3,7 @@
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.2
+import Psyc 1.0
Rectangle {
anchors.fill: parent
@@ -70,6 +71,10 @@
anchors.left: parent.left
anchors.right: parent.right
height: 20
+ text:Preferences.name
+ onTextChanged: {
+ Preferences.name = text
+ }
}
Label{
@@ -81,8 +86,45 @@
anchors.left: parent.left
anchors.right: parent.right
height: 20
+ text:Preferences.status
+ onTextChanged: {
+ Preferences.status = text
+ }
}
+
+ Label{
+ id:saveRoomLabel
+ text: "Save created rooms ( The private key will be saved as
clear text):"
+ }
+ CheckBox{
+ id:saveRoomCheckBox
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 20
+ checked: Preferences.saveRoom
+ onCheckedChanged: {
+ Preferences.saveRoom = checked
+ }
+
+ }
+
+ Label{
+ id:closeToTrayLabel
+ text: "Close to tray:"
+ }
+ CheckBox{
+ id:closeToTrayCheckBox
+ anchors.left: parent.left
+ anchors.right: parent.right
+ height: 20
+ checked: Preferences.minimizeToTray
+ onCheckedChanged: {
+ Preferences.minimizeToTray = checked
+ }
+
+ }
+
}
}
Modified: gnunet-qt/SecureShare/qml/joinRoom.qml
===================================================================
--- gnunet-qt/SecureShare/qml/joinRoom.qml 2014-08-16 13:40:38 UTC (rev
34158)
+++ gnunet-qt/SecureShare/qml/joinRoom.qml 2014-08-16 19:23:37 UTC (rev
34159)
@@ -173,7 +173,7 @@
spacing: 2
Label {
id: originLabel
- text: "Origin:"
+ text: "Origin (Empty will join local peer):"
width: 100
}
Modified: gnunet-qt/SecureShare/qml/main.qml
===================================================================
--- gnunet-qt/SecureShare/qml/main.qml 2014-08-16 13:40:38 UTC (rev 34158)
+++ gnunet-qt/SecureShare/qml/main.qml 2014-08-16 19:23:37 UTC (rev 34159)
@@ -161,7 +161,7 @@
anchors.left: contact.right
anchors.leftMargin: 10
anchors.top: contact.top
- text: "Bruno"
+ text: Preferences.name
color: "white"
font.pixelSize: 14
font.family: ubuntuFont.name
@@ -172,7 +172,7 @@
anchors.topMargin: 1
anchors.left: contact.right
anchors.leftMargin: 10
- text: "My Status"
+ text: Preferences.status
color: "white"
font.pixelSize: 12
font.family: ubuntuFont.name
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34159 - in gnunet-qt/SecureShare: . core/social preferences qml,
gnunet <=