many fixed to filetrasferwindows / transfer modules

fixed a signal in kvitexticonwin

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

9 files changed, 40 insertions, 37 deletions

diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt
index d6954eb37..71da80ff6 100644
--- a/src/modules/dcc/CMakeLists.txt
+++ b/src/modules/dcc/CMakeLists.txt
@@ -52,6 +52,6 @@ IF(UNIX)
 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/)
 	ENDIF()
 ELSEIF(WIN32)
-	#INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/ ??? /${VERSION_BRANCH}/pics/)
+	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/)
 ENDIF()
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 67fe456d4..bc9e48394 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -893,11 +893,6 @@ const char * KviDccFileTransfer::dccMarshalOutputContextString()
 	return m_szTransferIdString.toUtf8().data();
 }
 
-void KviDccFileTransfer::die()
-{
-	delete this;
-}
-
 QString KviDccFileTransfer::localFileName()
 {
 	return m_pDescriptor->szLocalFileName;
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index bc55a953e..d5a7d0bbd 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -219,7 +219,6 @@ public:
 	virtual void fillContextPopup(KviTalPopupMenu * m);
 	virtual void fillStatusString(QString &szBuffer);
 	virtual bool active();
-	virtual void die();
 	virtual QString tipText();
 	virtual QString localFileName();
 	
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 0f9932f97..76530efb0 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -64,6 +64,8 @@
 	extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground;
 #endif
 
+#define FILETRANSFERW_CELLSIZE 70
+
 extern KviFileTransferWindow * g_pFileTransferWindow;
 
 
@@ -77,7 +79,7 @@ KviFileTransferItem::KviFileTransferItem(KviFileTransferWidget * v,KviFileTransf
 	col1Item = new KviTalTableWidgetItem(v, row(), 1);
 	col2Item = new KviTalTableWidgetItem(v, row(), 2);
 	//FIXME fixed row height
-	tableWidget()->setRowHeight( row(), 68 );
+	tableWidget()->setRowHeight( row(), FILETRANSFERW_CELLSIZE );
 }
 
 KviFileTransferItem::~KviFileTransferItem()
@@ -137,7 +139,7 @@ KviFileTransferWidget::KviFileTransferWidget(QWidget * pParent)
 	horizontalHeader()->setResizeMode(QHeaderView::Interactive);
 
 	//default column widths
-	setColumnWidth(0, 68);
+	setColumnWidth(0, FILETRANSFERW_CELLSIZE);
 	horizontalHeader()->setResizeMode(0, QHeaderView::Fixed);
 	horizontalHeader()->setResizeMode(1, QHeaderView::Stretch);
 	horizontalHeader()->setResizeMode(2, QHeaderView::Stretch);
@@ -246,13 +248,9 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 	m_pLocalFilePopup = 0;
 	m_pOpenFilePopup = 0;
 
-	m_pMemPixmap = new QPixmap(1,1);
-
 	m_pTimer = new QTimer(this);
 	connect(m_pTimer,SIGNAL(timeout()),this,SLOT(heartbeat()));
 
-	m_pInput   = new KviInput(this,0);
-
 	m_pSplitter = new QSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("transferwindow_hsplitter");
 	m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter);
@@ -285,8 +283,6 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 
 	KviFileTransferManager::instance()->setTransferWindow(this);
 
-	//setFocusHandler(m_pInput,this);
-
 	m_pTimer->start(2000);
 }
 
@@ -294,7 +290,6 @@ KviFileTransferWindow::~KviFileTransferWindow()
 {
 	KviFileTransferManager::instance()->setTransferWindow(0);
 	g_pFileTransferWindow = 0;
-	delete m_pMemPixmap;
 }
 
 bool KviFileTransferWindow::eventFilter( QObject *obj, QEvent *ev )
@@ -351,7 +346,10 @@ KviFileTransferItem * KviFileTransferWindow::findItem(KviFileTransfer * t)
 	for(i=0;i<m_pTableWidget->rowCount();i++)
 	{
 		it = (KviFileTransferItem *)m_pTableWidget->item(i,0);
-		if(it->transfer() == t)return it;
+		if(!it) continue;
+
+		if(it->transfer() == t)
+			return it;
 	}
 	return 0;
 }
@@ -493,6 +491,9 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo
 	for(i=0;i<m_pTableWidget->rowCount();i++)
 	{
 		item = (KviFileTransferItem *)m_pTableWidget->item(i,0);
+		if(!item)
+			continue;
+
 		if(item->transfer()->terminated())
 		{
 			bHaveTerminated = true;
@@ -732,14 +733,14 @@ void KviFileTransferWindow::heartbeat()
 	{
 		it = (KviFileTransferItem *)m_pTableWidget->item(i,0);
 
-		if(it)
+		if(!it)
+			continue;
+
+		if(it->transfer()->active())
 		{
-			if(it->transfer()->active())
-			{
-				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);
-			}
+			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);
 		}
 	}
 }
@@ -755,6 +756,9 @@ void KviFileTransferWindow::clearAll()
 	for(i=0;i<m_pTableWidget->rowCount();i++)
 	{
 		item = (KviFileTransferItem *)m_pTableWidget->item(i,0);
+		if(!item)
+			continue;
+
 		if(!item->transfer()->terminated())
 		{
 			bHaveAllTerminated = false;
@@ -789,9 +793,7 @@ QPixmap * KviFileTransferWindow::myIconPtr()
 
 void KviFileTransferWindow::resizeEvent(QResizeEvent *e)
 {
-	int h = m_pInput->heightHint();
-	m_pSplitter->setGeometry(0,0,width(),height() - h);
-	m_pInput->setGeometry(0,height() - h,width(),h);
+	m_pSplitter->setGeometry(0,0,width(),height());
 }
 
 QSize KviFileTransferWindow::sizeHint() const
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
index 3066cf926..ff9be522f 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/filetransferwindow.h
@@ -101,12 +101,10 @@ protected:
 	KviTalPopupMenu		* m_pLocalFilePopup;
 	KviTalPopupMenu		* m_pOpenFilePopup;
 	QTimer			* m_pTimer;
-	QPixmap			* m_pMemPixmap;
 	int			m_iLineSpacing; // cached fm value
 public: // Methods
 	virtual void die();
 protected:
-	QPixmap * memPixmap(){ return m_pMemPixmap; };
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 	virtual void applyOptions();
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 6794a0bba..3a92c7d8f 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -149,7 +149,7 @@ static bool filetransferwindow_module_can_unload(KviModule *m)
 KVIRC_MODULE(
 	"FileTransferWindow",
 	"4.0.0",
-	"Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net)",
+	"Copyright (C) 2008 Szymon Stefanek (pragma at kvirc dot net)",
 	"Links window extension",
 	filetransferwindow_module_init,
 	filetransferwindow_module_can_unload,
diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt
index 54b05d810..b3a48e052 100644
--- a/src/modules/http/CMakeLists.txt
+++ b/src/modules/http/CMakeLists.txt
@@ -9,8 +9,23 @@ SET(kvihttp_SRCS
 	httpfiletransfer.cpp
 )
 
+SET(files
+	kvi_httpicons.png
+)
+
 # After this call, files will be moc'ed to moc_kvi_*.cpp
 QT4_WRAP_CPP(kvihttp_MOC_SRCS ${kvihttp_MOC_HDRS})
 
 SET(kvi_module_name kvihttp)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
+
+IF(UNIX)
+	IF(APPLE)
+		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/)
+	ELSE()
+		# Assume linux
+		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/)
+	ENDIF()
+ELSEIF(WIN32)
+	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/)
+ENDIF()
\ No newline at end of file
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 4e2cd62a7..98986b260 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -88,11 +88,6 @@ void KviHttpFileTransfer::autoClean()
 	die();
 }
 
-void KviHttpFileTransfer::die()
-{
-	delete this;
-}
-
 QString KviHttpFileTransfer::localFileName()
 {
 	return m_pHttpRequest->fileName();
@@ -342,7 +337,7 @@ void KviHttpFileTransfer::init()
 
 	QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png", false);
 	if(pix)g_pHttpIcon = new QPixmap(*pix);
-	else g_pHttpIcon = new QPixmap(192,48);
+	else g_pHttpIcon = 0;
 }
 
 void KviHttpFileTransfer::done()
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index 2983ef43e..471236ab4 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -80,7 +80,6 @@ public:
 	virtual int displayHeight(int iLineSpacing);
 	virtual void fillContextPopup(KviTalPopupMenu * m);
 	virtual bool active();
-	virtual void die();
 	virtual QString tipText();
 	virtual QString localFileName();
 protected slots: