filetranferwindow: fixed update of tranfers status

nicklist: changed male/female icons (they're self explanative now), please comment change

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

9 files changed, 41 insertions, 67 deletions

diff --git a/data/pics/kvi_icon_female.png b/data/pics/kvi_icon_female.png
index 44e6a38d4..b29d286c9 100644
--- a/data/pics/kvi_icon_female.png
+++ b/data/pics/kvi_icon_female.png
diff --git a/data/pics/kvi_icon_male.png b/data/pics/kvi_icon_male.png
index 27a56a46b..ee5156316 100644
--- a/data/pics/kvi_icon_male.png
+++ b/data/pics/kvi_icon_male.png
diff --git a/src/kvilib/tal/kvi_tal_tablewidget.h b/src/kvilib/tal/kvi_tal_tablewidget.h
index 0c28d85fe..facad7e1b 100644
--- a/src/kvilib/tal/kvi_tal_tablewidget.h
+++ b/src/kvilib/tal/kvi_tal_tablewidget.h
@@ -86,44 +86,20 @@ public:
 
 	KviTalTableWidgetItem(const KviTalTableWidgetItem & other)
 	: QTableWidgetItem(other) {};
-	void repaint()
-	{
-		if(tableWidget())
-			tableWidget()->viewport()->repaint(tableWidget()->visualItemRect(this));
-	};
-/*
-	KviTalTableWidgetItem(KviTalTableWidgetItem * pParent,const QString &szLabel)
-	: QTableWidgetItem(pParent) {
-		setText(0,szLabel);
-	};
-	KviTalTableWidgetItem(KviTalTableWidget * pParent,const QString &szLabel)
-		: QTableWidgetItem(pParent) {
-	setText(0,szLabel);
-	};
+};
+
+class KVILIB_API KviTalTableWidgetItemEx : public KviTalTableWidgetItem
+{
+public:
+	KviTalTableWidgetItemEx(KviTalTableWidget * pParent)
+	: KviTalTableWidgetItem(pParent) {};
 
-	KviTalTreeWidgetItem(KviTalTreeWidget * pParent,const QString &szLabel, const QString &szLabel1, const QString &szLabel2, const QString &szLabel3 )
-	: QTreeWidgetItem(pParent) {
-	setText(0,szLabel);
-	setText(1,szLabel1);
-	setText(2,szLabel2);
-	setText(3,szLabel3);
+	KviTalTableWidgetItemEx(KviTalTableWidget * pParent, int row, int column)
+	: KviTalTableWidgetItem(pParent, row, column) {};
 
-	};
-	KviTalTreeWidgetItem(KviTalTreeWidget * pParent,const QString &szLabel, const QString &szLabel1, const QString &szLabel2, const QString &szLabel3, const QString &szLabel4 )
-	: QTreeWidgetItem(pParent) {
-	setText(0,szLabel);
-	setText(1,szLabel1);
-	setText(2,szLabel2);
-	setText(3,szLabel3);
-	setText(4,szLabel4);
-	};
-		int compare ( KviTalTreeWidgetItem * i, int col, bool ascending ) const
-	{
-		QString key=text(col);
-		return key.localeAwareCompare(i->text(col));
-	};
-	KviTalTreeWidget* treeWidget() { return (KviTalTreeWidget*) QTreeWidgetItem::treeWidget(); };
-*/
+	KviTalTableWidgetItemEx(const KviTalTableWidgetItem & other)
+	: KviTalTableWidgetItem(other) {};
+	virtual void displayUpdate() = 0;
 };
 
 #endif // _KVI_TAL_TABLEWIDGET_H_
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index 53f89edc8..185d017e3 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -186,5 +186,5 @@ int KviFileTransfer::displayHeight(int iLineSpacing)
 
 void KviFileTransfer::displayUpdate()
 {
-	if(m_pDisplayItem)m_pDisplayItem->repaint();
+	if(m_pDisplayItem)m_pDisplayItem->displayUpdate();
 }
diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h
index 6cf489366..a8dd22ef2 100644
--- a/src/kvirc/kernel/kvi_filetransfer.h
+++ b/src/kvirc/kernel/kvi_filetransfer.h
@@ -74,7 +74,6 @@ signals:
 #define COLUMN_FILEINFO 1
 #define COLUMN_PROGRESS 2
 
-
 class KVIRC_API KviFileTransfer : public QObject
 {
 	Q_OBJECT
@@ -83,10 +82,10 @@ public:
 	~KviFileTransfer();
 protected:
 	int              m_iId;
-	KviTalTableWidgetItem  * m_pDisplayItem;
+	KviTalTableWidgetItemEx  * m_pDisplayItem;
 public:
 	// This is called by KviFileTransferItem at any time
-	void setDisplayItem(KviTalTableWidgetItem * i){ m_pDisplayItem = i; };
+	void setDisplayItem(KviTalTableWidgetItemEx * i){ m_pDisplayItem = i; };
 	int id(){ return m_iId; };
 	// this is just a convenience function : it's equivalent to !active()
 	bool terminated();
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 0af24a365..5c61ed1fe 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -919,6 +919,7 @@ void KviTreeTaskBarTreeWidget::mouseMoveEvent ( QMouseEvent * e )
 		setCursor(Qt::ArrowCursor);
 	}
 }
+
 void KviTreeTaskBarTreeWidget::leaveEvent(QEvent *)
 {
 	if(m_pPrevItem) m_pPrevItem->mouseLeave();
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index a026e2d38..6d505da9d 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -68,7 +68,7 @@ extern KviFileTransferWindow * g_pFileTransferWindow;
 
 
 KviFileTransferItem::KviFileTransferItem(KviFileTransferWidget * v,KviFileTransfer * t)
-: KviTalTableWidgetItem(v)
+: KviTalTableWidgetItemEx(v)
 {
 	m_pTransfer = t;
 	m_pTransfer->setDisplayItem(this);
@@ -87,6 +87,14 @@ KviFileTransferItem::~KviFileTransferItem()
 	delete col2Item;
 }
 
+void KviFileTransferItem::displayUpdate()
+{
+	int dummy = (int) time(NULL);
+	tableWidget()->model()->setData(tableWidget()->model()->index(row(),0), dummy, Qt::DisplayRole);
+	tableWidget()->model()->setData(tableWidget()->model()->index(row(),1), dummy, Qt::DisplayRole);
+	tableWidget()->model()->setData(tableWidget()->model()->index(row(),2), dummy, Qt::DisplayRole);
+}
+
 QString KviFileTransferItem::key(int column,bool bAcending) const
 {
 	QString ret;
@@ -209,8 +217,8 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 	//TODO
 	//connect(tp,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
 
-	//m_pTableWidget->setFocusPolicy(NoFocus);
-	//m_pTableWidget->viewport()->setFocusPolicy(NoFocus);
+	m_pTableWidget->setFocusPolicy(Qt::NoFocus);
+	m_pTableWidget->viewport()->setFocusPolicy(Qt::NoFocus);
 
 	//connect(m_pTableWidget,SIGNAL(rightButtonPressed(KviTalTableWidgetItem *,const QPoint &,int)),
 	// this,SLOT(showHostPopup(KviTalTableWidgetItem *,const QPoint &,int)));
@@ -667,32 +675,21 @@ void KviFileTransferWindow::openLocalFileFolder()
 
 void KviFileTransferWindow::heartbeat()
 {
-/*
-notice to the author: thank you for not have commented this code
-
-	if(m_pTableWidget->rowCount() < 1)return;
-
-	KviFileTransferItem * i1;
-	KviFileTransferItem * i2;
-
-	i1 = (KviFileTransferItem *) m_pTableWidget->itemAt(QPoint(1,1));
-	if(!i1)
-	{
-		m_pTableWidget->viewport()->update();
-		return;
-	}
-	i2 = (KviFileTransferItem *) m_pTableWidget->itemAt(QPoint(1,m_pTableWidget->viewport()->height() - 2));
-	if(i2)i2 = i2->nextSibling();
+	int i;
+	QModelIndex index;
+	KviFileTransferItem* it;
+	int dummy = (int) time(NULL);
 
-	while(i1 && (i1 != i2))
+	for(i=0;i<m_pTableWidget->rowCount();i++)
 	{
-		if(((KviFileTransferItem *)i1)->transfer()->active())
+		it = (KviFileTransferItem *)m_pTableWidget->item(i,0);
+		if(it->transfer()->active())
 		{
-			m_pTableWidget->repaintItem(i1);
+			m_pTableWidget->model()->setData(m_pTableWidget->model()->index(i,0), dummy, Qt::DisplayRole);
+			m_pTableWidget->model()->setData(m_pTableWidget->model()->index(i,1), dummy, Qt::DisplayRole);
+			m_pTableWidget->model()->setData(m_pTableWidget->model()->index(i,2), dummy, Qt::DisplayRole);
 		}
-		i1 = i1->nextSibling();
 	}
-*/
 }
 
 void KviFileTransferWindow::clearAll()
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
index 8a0ee5264..9e7457f50 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/filetransferwindow.h
@@ -44,13 +44,15 @@ class KviFileTransferWidget : public KviTalTableWidget
 {
 	friend class KviFileTransferItemDelegate;
 	Q_OBJECT
+	Q_PROPERTY(int TransparencyCapable READ dummyRead)
 public:
 	KviFileTransferWidget(QWidget * pParent) : KviTalTableWidget(pParent) {};
 	~KviFileTransferWidget() {};
 	void paintEvent(QPaintEvent * event);
+	int dummyRead() const { return 0; };
 };
 
-class KviFileTransferItem : public KviTalTableWidgetItem
+class KviFileTransferItem : public KviTalTableWidgetItemEx
 {
 public:
 	KviFileTransferItem(KviFileTransferWidget * v,KviFileTransfer * t);
@@ -62,6 +64,7 @@ protected:
 public:
 	KviFileTransfer * transfer(){ return m_pTransfer; };
 	virtual QString key(int column,bool bAcending) const;
+	virtual void displayUpdate();
 };
 
 class KviFileTransferItemDelegate : public KviTalIconAndRichTextItemDelegate
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 23697d426..19900a2aa 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -225,7 +225,6 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 			int iLeftHalf = (iW - 2) / 2;
 			int iRightHalf = iW - (iLeftHalf + 1);
 			int iLineSpacing = fm.lineSpacing() + 2;
-
 			/*
 			txt = __tr2qs_ctx("Spd:","dcc");
 			txt += " ";
@@ -238,7 +237,6 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 				txt += "? B/s";
 			}
 			*/
-
 			txt = __tr2qs_ctx("Avg:","dcc");
 			txt += " ";
 			if(iAvgSpeed >= 0)