Some fixes in object modules

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

3 files changed, 4 insertions, 22 deletions

diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp
index 2d0480cf3..af695e34f 100644
--- a/src/modules/objects/class_tablewidget.cpp
+++ b/src/modules/objects/class_tablewidget.cpp
@@ -675,22 +675,6 @@ KVSO_CLASS_FUNCTION(tablewidget,cellDoubleClickedEvent)
 	emitSignal("cellDoubleClicked",c,c->params());
 	return true;
 }
-
-KVSO_CLASS_FUNCTION(tablewidget,customContextMenuRequestedEvent)
-{
-	emitSignal("rightButtonClicked",c,c->params());
-	emitSignal("customContextMenuRequested",c,c->params());
-	return true;
-}
-
-void KviKvsObject_tablewidget::slotCustomContextMenuRequested(const QPoint & pnt)
-{
-	KviKvsVariant *xpos=new KviKvsVariant((kvs_int_t)pnt.x());
-	KviKvsVariant *ypos=new KviKvsVariant((kvs_int_t)pnt.y());
-	KviKvsVariantList params(xpos,ypos);
-	callFunction(this,"customContextMenuRequestedEvent",0,&params);
-}
-
 bool KviKvsObject_tablewidget::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index)
 {
 	p->save();
@@ -731,7 +715,7 @@ void KviCellItemDelegate::paint(QPainter * pPainter, const QStyleOptionViewItem
 QSize KviCellItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex & index) const
 {
 	KviKvsVariant *sizeret=new KviKvsVariant();
-	debug("sizehint cell");
+	//debug("sizehint cell");
 	KviKvsVariantList parameters(new KviKvsVariant((kvs_int_t) index.row()),new KviKvsVariant((kvs_int_t) index.column()));
 	m_pParentScript->callFunction(m_pParentScript,"sizeHintCellRequestEvent",sizeret,&parameters);
 	if (sizeret->isArray())
diff --git a/src/modules/objects/class_tablewidget.h b/src/modules/objects/class_tablewidget.h
index 6685fce81..f188be39b 100644
--- a/src/modules/objects/class_tablewidget.h
+++ b/src/modules/objects/class_tablewidget.h
@@ -98,12 +98,10 @@ protected:
 	bool showColumn(KviKvsObjectFunctionCall *c);
 	bool hideRow(KviKvsObjectFunctionCall *c);
 	bool showRow(KviKvsObjectFunctionCall *c);
-	bool customContextMenuRequestedEvent(KviKvsObjectFunctionCall *c);
 	bool resizeRowsToContents(KviKvsObjectFunctionCall *c);
 	bool resizeColumnsToContents(KviKvsObjectFunctionCall *c);
 protected slots:
 	void slotItemEntered(QTableWidgetItem *);
-	void slotCustomContextMenuRequested(const QPoint &pnt);
 	void cellActivated(int iRow,int iCol);
 	void cellDoubleClicked(int iRow,int iCol);
 };
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/class_treewidget.cpp
index 622337f35..a56e4d147 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/class_treewidget.cpp
@@ -65,7 +65,7 @@
                 that items can be selected by the mouse actions: experiment with the two modes :).
                 The NoSelection mode has obviously no selection at all.
         @functions:
-                !fn: $addColumn(<text_label:string> <width:unsigned integer>)
+		!fn: $addColumn(<text_label:string>,[<width:integer>])
                 Adds a width pixels wide column with the column header label to the list view.
 
                 !fn: $setSorting(<column:integer>,<sort_order:string>)
@@ -318,12 +318,12 @@ KVSO_CLASS_FUNCTION(treewidget,addColumn)
 	kvs_int_t iW;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("label",KVS_PT_STRING,0,szLabel)
-		KVSO_PARAMETER("width",KVS_PT_INT,0,iW)
+		KVSO_PARAMETER("width",KVS_PT_INT,KVS_PF_OPTIONAL,iW)
 	KVSO_PARAMETERS_END(c)
 	int col=((QTreeWidget *)widget())->columnCount();
 	QTreeWidgetItem *header=((QTreeWidget *)widget())->headerItem();
 	header->setText(col,szLabel);
-	((QTreeWidget *)widget())->setColumnWidth(col,iW);
+	if(iW) ((QTreeWidget *)widget())->setColumnWidth(col,iW);
 	col++;
 	((QTreeWidget *)widget())->setColumnCount(col);
 	//col++;