From 74659abee1f79da324b2222808392f5782aa8123 Mon Sep 17 00:00:00 2001
From: Morten Sorvig <msorvig@trolltech.com>
Date: Fri, 4 Sep 2009 15:35:31 +0200
Subject: no need for a separate widget type, just set the imagehash attribute
 and test for that

---
 src/eventhandler.js | 24 +-----------------------
 src/eventqueue.cpp  |  6 +-----
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/eventhandler.js b/src/eventhandler.js
index ca57b7b..24b189d 100644
--- a/src/eventhandler.js
+++ b/src/eventhandler.js
@@ -31,24 +31,6 @@ function createWidgetElement(pointer)
     return element;
 }
 
-function createStaticWidgetElement(pointer)
-{
-    var element = document.createElement("img");
-    element.id = this.elmentId(pointer);
-    element["pointer"] = pointer;
-    element.className = "divWidgetStatic";
-    element.imageLoaded = false;
-    hideElement(element);
-    document.body.appendChild(element);
-
-    dojo.connect(element, 'onmousedown', this, sendMousePressedPreventDefault);
-    dojo.connect(element, 'onmouseup', this, sendMouseReleased);
-    dojo.connect(element, 'ondblclick', this, sendMouseDoubleClick);
-    dojo.connect(element, 'onkeypress', this, sendKeyPress);
-    dojo.connect(element, 'onload', this, imageLoaded);
-    return element;
-}
-
 function createInputElement(pointer, type)
 {
     var inputElement = document.createElement("input");
@@ -151,8 +133,6 @@ function createElement(widgetType, id)
         dojo.connect(element, 'onmousedown', this, dragBegin);
     } else if (widgetType == "skippedwidget") {
         element = createNoopElement(id);
-    } else if (widgetType == "genericstatic") {
-        element = this.createStaticWidgetElement(id);
     } else {
         element = this.createWidgetElement(id);
     }
@@ -295,9 +275,8 @@ function eventHandler(text)
 //            alert("update" + widget);
 
             var source;
-            console.log("update " + widgetType + element.qtclassName);
 
-            if (widgetType == "genericstatic") {
+            if (array[key].imagehash) {
                 var imagehash = array[key].imagehash;
                 source = this.jsonUrl + JSON.stringify({ "type" : "img-static", "id" : widget, "imagehash" : imagehash });
                 console.log(source);
@@ -503,7 +482,6 @@ function setUpWebClientObject(webclientObject)
     // ...surely there is a more ideomatic way :)
     webclientObject.elmentId = elmentId
     webclientObject.createWidgetElement = createWidgetElement
-    webclientObject.createStaticWidgetElement = createStaticWidgetElement
     webclientObject.createInputElement = createInputElement
     webclientObject.createLabelElement = createLabelElement
     webclientObject.createTextareaElement = createTextareaElement
diff --git a/src/eventqueue.cpp b/src/eventqueue.cpp
index 6f010b7..abffaea 100644
--- a/src/eventqueue.cpp
+++ b/src/eventqueue.cpp
@@ -357,12 +357,8 @@ json_object *EventQueue::toJsonWidgetType(QWidget *widget) const
         return json_object_new_string("midisubwindow");
     if (qobject_cast<QPushButton *>(widget))
         return json_object_new_string("pusbutton");
-
-    if (m_session->m_server->testHint(widget, WebClient::StaticWidget)) {
-        return json_object_new_string("genericstatic");
-    } else {
+    else
         return json_object_new_string("generic");
-    }
 }
 
 QByteArray EventQueue::pngCompress(const QImage &image)
-- 
cgit v1.2.3