summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sorvig <msorvig@trolltech.com>2009-08-21 16:04:06 +0200
committerMorten Sorvig <msorvig@trolltech.com>2009-08-21 16:04:06 +0200
commit70e576f0ab0eff8b8d2ef596a4d73992d15259b9 (patch)
treed49ac82d3b0e80615a447d66665caaca43c395a7
parent541b7c36250aa0338665a83fab6abf3bd30e36b2 (diff)
Send over the class and object name to the client
-rw-r--r--src/eventhandler.js4
-rw-r--r--src/eventqueue.cpp7
2 files changed, 10 insertions, 1 deletions
diff --git a/src/eventhandler.js b/src/eventhandler.js
index cca4e96..3705199 100644
--- a/src/eventhandler.js
+++ b/src/eventhandler.js
@@ -283,6 +283,10 @@ function eventHandler(text)
hideElement(element);
} else if (type == "show") {
showElement(element);
+ element.qtobjectName = event.objectName;
+ element.qtclassName = event.className;
+ element.structureElement.qtobjectName = event.objectName;
+ element.structureElement.qtclassName = event.className;
} else if (type == "parentChange") {
// alert("parentChange");
var parentPointer = array[key].parent;
diff --git a/src/eventqueue.cpp b/src/eventqueue.cpp
index db5b87c..6a6e2b0 100644
--- a/src/eventqueue.cpp
+++ b/src/eventqueue.cpp
@@ -229,9 +229,14 @@ json_object *EventQueue::toJson(const EventEntry &event) const
json_object *EventQueue::jsonShowEvent(const EventEntry &event) const
{
struct json_object *obj = json_object_new_object();
+ QWidget *widget = (QWidget *)event.id;
json_object_object_add(obj, "type", json_object_new_string("show"));
json_object_object_add(obj, "id", json_object_new_int(event.id));
- json_object_object_add(obj, "widgetType", toJsonWidgetType((QWidget *)event.id));
+ json_object_object_add(obj, "widgetType", toJsonWidgetType(widget));
+ json_object_object_add(obj, "className",
+ json_object_new_string(const_cast<char *>(widget->metaObject()->className())));
+ json_object_object_add(obj, "objectName",
+ json_object_new_string(widget->objectName().toAscii().data()));
return obj;
}