Some fix/improvements in objects module

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

1 files changed, 38 insertions, 55 deletions

diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/class_datetimeedit.cpp
index 12d84005e..037b8e474 100644
--- a/src/modules/objects/class_datetimeedit.cpp
+++ b/src/modules/objects/class_datetimeedit.cpp
@@ -59,10 +59,10 @@
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_datetimeedit,"datetimeedit","widget")
 
         KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,date)
-        /*KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,text)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,clickEvent)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,setImage)
-*/
+        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,setDate)
+        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,setTime)
+        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,time)
+
 KVSO_END_REGISTERCLASS(KviKvsObject_datetimeedit)
 
 KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_datetimeedit,KviKvsObject_widget)
@@ -79,7 +79,6 @@ bool KviKvsObject_datetimeedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
         QDateTimeEdit *obj=new QDateTimeEdit(QDate::currentDate(),parentScriptWidget());
         obj->setObjectName(getName());
         setObject(obj,true);
-//	connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked()));
 	return true;
 }
 
@@ -96,63 +95,47 @@ KVSO_CLASS_FUNCTION(datetimeedit,date)
 
         return true;
 }
-/*
-KVSO_CLASS_FUNCTION(button,setText)
+KVSO_CLASS_FUNCTION(datetimeedit,setDate)
 {
-	CHECK_INTERNAL_POINTER(widget())
-	QString szText;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
-	KVSO_PARAMETERS_END(c)
-	((QPushButton *)widget())->setText(szText);
-	return true;
-}
 
-KVSO_CLASS_FUNCTION(datetimeedit,setImage)
-{
-	CHECK_INTERNAL_POINTER(widget())
-	KviKvsVariant icon;
-	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("icon_or_hobject",KVS_PT_VARIANT,0,icon)
-	KVSO_PARAMETERS_END(c)
-	if(icon.isHObject())
-	{
-		kvs_hobject_t hObj;
-		icon.asHObject(hObj);
-		KviKvsObject *pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObj);
-		if (!pObject)
-		{
-			c->warning(__tr2qs_ctx("Pixmap parameter is not an object!","objects"));
-			return true;
-		}
-		if(pObject->inheritsClass("pixmap"))
-			((QPushButton *)widget())->setIcon(QIcon(*((KviKvsObject_pixmap *)pObject)->getPixmap()));
-		else{
-			c->warning(__tr2qs_ctx("Object Pixmap required!","object"));
-		}
-		return true;
-	}
-	QString szIcon;
-	icon.asString(szIcon);
-	QPixmap * pix = g_pIconManager->getImage(szIcon);
-	if(pix)	((QPushButton *)widget())->setIcon(*pix);
-	else((QPushButton *)widget())->setIcon(QIcon());
-	return true;
+        CHECK_INTERNAL_POINTER(widget())
+        QString szFormat,szDate;
+        KVSO_PARAMETERS_BEGIN(c)
+                KVSO_PARAMETER("format",KVS_PT_STRING,0,szFormat)
+                KVSO_PARAMETER("date",KVS_PT_STRING,0,szDate)
+        KVSO_PARAMETERS_END(c)
+        QDate date;
+        date=date.fromString(szDate,szFormat);
+        ((QDateTimeEdit *)widget())->setDate(date);
+        return true;
 }
-KVSO_CLASS_FUNCTION(button,clickEvent)
+KVSO_CLASS_FUNCTION(datetimeedit,time)
 {
-	emitSignal("clicked",c);
-	return true;
-}
 
-// slots
-void KviKvsObject_datetimeedit::slotClicked()
-{
-	KviKvsVariantList *params=0;
-	callFunction(this,"clickEvent",params);
+        CHECK_INTERNAL_POINTER(widget())
+        QString szFormat;
+        KVSO_PARAMETERS_BEGIN(c)
+                KVSO_PARAMETER("format",KVS_PT_STRING,0,szFormat)
+        KVSO_PARAMETERS_END(c)
+
+        c->returnValue()->setString(((QDateTimeEdit *)widget())->time().toString(szFormat));
+
+        return true;
 }
-*/
+KVSO_CLASS_FUNCTION(datetimeedit,setTime)
+{
 
+        CHECK_INTERNAL_POINTER(widget())
+        QString szFormat,szTime;
+        KVSO_PARAMETERS_BEGIN(c)
+                KVSO_PARAMETER("format",KVS_PT_STRING,0,szFormat)
+                KVSO_PARAMETER("date",KVS_PT_STRING,0,szTime)
+        KVSO_PARAMETERS_END(c)
+        QTime time;
+        time=time.fromString(szTime,szFormat);
+        ((QDateTimeEdit *)widget())->setTime(time);
+        return true;
+}
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_class_datetimeedit.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES