Some fixes in object module

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

3 files changed, 12 insertions, 15 deletions

diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/class_treewidgetitem.cpp
index 02e657261..80593a7e7 100644
--- a/src/modules/objects/class_treewidgetitem.cpp
+++ b/src/modules/objects/class_treewidgetitem.cpp
@@ -89,8 +89,8 @@ const char * const itemflags_tbl[] = {
 		Sets the pixmap in column column to pm, if pm is non-null and different from the current pixmap, and if column is non-negative.
 		Pixmap can be a Kvirc imageid, an image file or a [class]pixmap[/class] object.
 
-		!fn: $setRenameEnabled(<col:integer>,<bEnabled:boolean>)
-		If b is TRUE (1), this item can be in-place renamed in the column col by the user; otherwise it cannot be renamed in-place.
+                !fn: $setItemEditable(<bEnabled:boolean>)
+                If bEnabled is TRUE (1), this item can be in-place editable by the user; otherwise it cannot be editable in-place.
 
 		!fn: $setEnabled(<bEnabled:boolean>)
 		Enables or disables the item
@@ -136,7 +136,7 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidgetitem,"listviewitem","object")
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setText)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,text)
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setPixmap);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setRenameEnabled);
+        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setItemEditable);
 	//KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,"setEnabled",function_setEnabled);
 	//KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,"isEnabled",function_isEnabled);
 	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setOpen);
@@ -248,16 +248,14 @@ KVSO_CLASS_FUNCTION(treewidgetitem,nextSibling)
 	return true;
 }
 */
-KVSO_CLASS_FUNCTION(treewidgetitem,setRenameEnabled)
+KVSO_CLASS_FUNCTION(treewidgetitem,setItemEditable)
 {
-	kvs_uint_t uCol;
-	bool bEnabled;
+        bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
-		KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
-		KVSO_PARAMETERS_END(c)
+                KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled)
+        KVSO_PARAMETERS_END(c)
 	if(m_pTreeWidgetItem)
-		m_pTreeWidgetItem->setFlags(m_pTreeWidgetItem->flags()|Qt::ItemIsEditable);
+            m_pTreeWidgetItem->setFlags(bEnabled?m_pTreeWidgetItem->flags()|Qt::ItemIsEditable:m_pTreeWidgetItem->flags()&~Qt::ItemIsEditable);
 	return true;
 }
 
diff --git a/src/modules/objects/class_treewidgetitem.h b/src/modules/objects/class_treewidgetitem.h
index fa9754caa..e15c3bea9 100644
--- a/src/modules/objects/class_treewidgetitem.h
+++ b/src/modules/objects/class_treewidgetitem.h
@@ -44,7 +44,7 @@ protected:
 	bool setText(KviKvsObjectFunctionCall *c);
 	bool insertItem(KviKvsObjectFunctionCall *c);
 	bool setPixmap(KviKvsObjectFunctionCall *c);
-	bool setRenameEnabled(KviKvsObjectFunctionCall *c);
+        bool setItemEditable(KviKvsObjectFunctionCall *c);
 	bool setEnabled(KviKvsObjectFunctionCall *c);
 	bool isEnabled(KviKvsObjectFunctionCall *c);
 	bool setOpen(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 4c6fb6af8..cd5c89793 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -678,10 +678,9 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 			KviKvsVariant v;
 			v.setString(szTemp);
 			n->set(idx,new KviKvsVariant(v));
-			debug ("string %s",szTemp.toUtf8().data());
+                /*	debug ("string %s",szTemp.toUtf8().data());
 			debug ("class %s",szClass.toUtf8().data());
-			debug ("Obj %s",szObj.toUtf8().data());
-
+                        debug ("Obj %s",szObj.toUtf8().data());*/
 			idx++;
 
 			dumpChildObjects(cmd->window(), list.at(i), spacing.ptr(), bFlag,n,idx);
@@ -716,7 +715,7 @@ static void dumpChildObjects(KviWindow *pWnd, QObject *parent, const char *spaci
 			KviKvsVariant v;
 			v.setString(szTemp);
 			n->set(idx,new KviKvsVariant(v));
-			debug ("string %s",szTemp.toUtf8().data());
+                        //debug ("string %s",szTemp.toUtf8().data());
 			idx++;
 			dumpChildObjects(pWnd, list.at(i), sp.toUtf8().data(), bFlag, n, idx );
 		}