Skip to content

Commit

Permalink
A few fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mita committed May 22, 2014
1 parent 17737ab commit 74ac77f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 15 deletions.
2 changes: 0 additions & 2 deletions client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ void Client::newQMLCodeRecieved(const QString &QMLCode)

void Client::setUiData(const QString &data)
{
qDebug() << "UI Data changed!";
m_ui_data = data;
emit uiDataChanged();
}
Expand All @@ -39,7 +38,6 @@ void Client::connectToAddress(const QString &address, const QString &port)

void Client::emitSignal(const QString &signal_descriptor, const QString &data)
{
qDebug() << "Emiting signal: " << signal_descriptor;
this->connection->sendEventMessage(signal_descriptor, data);
}

Expand Down
2 changes: 1 addition & 1 deletion connection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ bool Connection::sendEventMessage(const QString &eventMessage, const QVariant &d

bool Connection::sendQMLRequest()
{
QString request = "{ \"type\" : \"QMLRequest\" }";
QString request = "{ \"type\" : \"eventMessage\", \"identifier\": \"QMLRequest\", \"data\": \"main\" }";

if(this->write(request.toUtf8()) == request.toUtf8().size())
return true;
Expand Down
31 changes: 19 additions & 12 deletions qml/TheMaster/MainStage.qml
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
import QtQuick 2.0

Rectangle {
anchors.fill: parent;
id: mainStage
//Main view rectangle
Rectangle {
anchors.fill: parent;
id: mainStage
}

property string ui_data
//A hidden item that manages the data change of the main view
Item {
property string ui_data

ui_data: client.ui_data
ui_data: client.ui_data

onUi_dataChanged:{
Qt.createQmlObject(client.ui_data, mainStage)
}
onUi_dataChanged:{
mainStage.data = {}
Qt.createQmlObject(client.ui_data, mainStage)
}

Component.onCompleted:
{
console.log("UML: " + client.ui_data);
//var component = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.1; Button { text: 'This is just a test'; onClicked: console.log('Test!'); }", mainStage);
var component = Qt.createQmlObject(client.ui_data, mainStage);
Component.onCompleted:
{
console.log("UML: " + client.ui_data);
//var component = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.1; Button { text: 'This is just a test'; onClicked: console.log('Test!'); }", mainStage);
var component = Qt.createQmlObject(client.ui_data, mainStage);
}
}
}
1 change: 1 addition & 0 deletions qml/TheMaster/main.qml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import QtQuick 2.0
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Dialogs 1.1

Rectangle {
Component.onCompleted: mainWindow.visible = true;
Expand Down

0 comments on commit 74ac77f

Please sign in to comment.