More work on webkit(wip)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6004 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 29 insertions, 5 deletions

diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index f522feade..af3e02d7b 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -372,7 +372,8 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_webView,"webview","widget")
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,jsChangeEvent)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,jsSubmitEvent)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,jsClickEvent)
-
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,jsMouseOverEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,jsMouseOutEvent)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,linkClickedEvent)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,loadFinishedEvent)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_webView,loadProgressEvent)
@@ -552,7 +553,7 @@ KVSO_CLASS_FUNCTION(webView,findAll)
 	}
 	QWebElementCollection elementCollection=element.findAll(szQuery);
 	if(!elementCollection.count()) return true;
-	qDebug("collection %i",elementCollection.count());
+	//qDebug("collection %i",elementCollection.count());
 	int idx=0;
 	pArray=new KviKvsArray();
 	for(int i=0;i<elementCollection.count();i++)
@@ -1261,10 +1262,19 @@ KVSO_CLASS_FUNCTION(webView,jsClickEvent)
 	emitSignal("jsclick",c,c->params());
 	return true;
 }
-
+KVSO_CLASS_FUNCTION(webView,jsMouseOverEvent)
+{
+	emitSignal("jsmouseover",c,c->params());
+	return true;
+}
+KVSO_CLASS_FUNCTION(webView,jsMouseOutEvent)
+{
+	emitSignal("jsmouseout",c,c->params());
+	return true;
+}
 void KvsObject_webView::slotOnChange(QString szParam)
 {
-	qDebug("change");
+	//qDebug("change");
 	KviKvsVariantList params(new KviKvsVariant(szParam));
 	callFunction(this,"jsChangeEvent",&params);
 }
@@ -1272,7 +1282,7 @@ void KvsObject_webView::slotOnChange(QString szParam)
 void KvsObject_webView::slotOnSubmit(QString szParam)
 {
 	// ,QString szParam2,QString szParam3
-	qDebug("slotonsubmit");
+	//qDebug("slotonsubmit");
 	KviKvsVariantList params(new KviKvsVariant(szParam));
 	callFunction(this,"jsSubmitEvent",&params);
 }
@@ -1282,6 +1292,18 @@ void KvsObject_webView::slotOnClick(QString szParam)
 	KviKvsVariantList params(new KviKvsVariant(szParam));
 	callFunction(this,"jsClickEvent",&params);
 }
+void KvsObject_webView::slotOnMouseOver(QString szParam)
+{
+	//qDebug("mouse over");
+	KviKvsVariantList params(new KviKvsVariant(szParam));
+	callFunction(this,"jsMouseOverEvent",&params);
+}
+void KvsObject_webView::slotOnMouseOut(QString szParam)
+{
+	//qDebug("mouse out");
+	KviKvsVariantList params(new KviKvsVariant(szParam));
+	callFunction(this,"jsMouseOutEvent",&params);
+}
 
 
 /*KVSO_CLASS_FUNCTION(webView,jsWindowObjectClearedEvent)
diff --git a/src/modules/objects/KvsObject_webView.h b/src/modules/objects/KvsObject_webView.h
index 1ef9644c8..47ccbacbd 100644
--- a/src/modules/objects/KvsObject_webView.h
+++ b/src/modules/objects/KvsObject_webView.h
@@ -138,6 +138,8 @@ protected:
 	bool jsChangeEvent(KviKvsObjectFunctionCall * c);
 	bool jsSubmitEvent(KviKvsObjectFunctionCall * c);
 	bool jsClickEvent(KviKvsObjectFunctionCall * c);
+	bool jsMouseOverEvent(KviKvsObjectFunctionCall * c);
+	bool jsMouseOutEvent(KviKvsObjectFunctionCall * c);
 protected slots:
 	void slotLoadFinished(bool);
 	void slotLoadProgress(int);