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

3 files changed, 25 insertions, 27 deletions

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)