fixed some things in the qt4 port of links module, updated todo

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

4 files changed, 41 insertions, 13 deletions

diff --git a/TODO-Qt4 b/TODO-Qt4
index 8f0ae70af..af51de790 100644
--- a/TODO-Qt4
+++ b/TODO-Qt4
@@ -33,10 +33,8 @@ src/modules
 		optw_proxy: segfault removing proxy from list (listwidget issue)
 		optw_server: buttons on the right are messed
 	torrent - broken
-	links 
 	help <-done, needs some fixing
 	list
-	logviewer <-done, needs fixing
 	notifier <-done, needs fixing
 	popupeditor
 	reguser
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index 66414ee64..67869634e 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -100,7 +100,7 @@ static bool links_module_can_unload(KviModule *m)
 KVIRC_MODULE(
 	"Links",                                             // module name
 	"4.0.0",                                                // module version
-	"Copyright (C) 2000-2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
+	"Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Links window extension",
 	links_module_init,
 	links_module_can_unload,
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index cb095c16d..227dee3eb 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -38,6 +38,7 @@
 #include <QSplitter>
 #include <QToolTip>
 #include <QLabel>
+#include <QMouseEvent>
 
 extern KviPointerList<KviLinksWindow> * g_pLinksWindowList;
 
@@ -72,14 +73,10 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter);
 	m_pVertSplitter->setObjectName("vsplitter");
 
-	m_pListView  = new KviTalTreeWidget(m_pVertSplitter);
-	m_pListView->setColumnCount(3);
-	m_pListView->setHeaderLabels(QStringList() << __tr2qs("Link") << __tr2qs("Hops") << __tr2qs("Description"));
+	m_pListView  = new KviLinksListView(m_pVertSplitter);
 
-	m_pListView->setRootIsDecorated(true);
-	m_pListView->setAllColumnsShowFocus(true);
-	connect(m_pListView,SIGNAL(rightButtonPressed(KviTalTreeWidgetItem *,const QPoint &,int)),
-			this,SLOT(showHostPopup(KviTalTreeWidgetItem *,const QPoint &,int)));
+	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,const QPoint &)),
+			this,SLOT(showHostPopup(QTreeWidgetItem *,const QPoint &)));
 
 	m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this);
 
@@ -307,6 +304,7 @@ void KviLinksWindow::endOfLinks()
 
 	while(!m_pLinkList->isEmpty())m_pLinkList->removeFirst();
 
+	m_pListView->resizeColumnToContents(0);
 	m_pListView->setUpdatesEnabled(true);
 	m_pListView->repaint();
 }
@@ -349,7 +347,7 @@ KviTalTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,KviTalTree
 	return 0;
 }
 
-void KviLinksWindow::showHostPopup(KviTalTreeWidgetItem *i,const QPoint &p,int)
+void KviLinksWindow::showHostPopup(QTreeWidgetItem *i,const QPoint &p)
 {
 	if(!i)return;
 	KviStr host=i->text(0);
@@ -486,6 +484,27 @@ void KviLinksWindow::applyOptions()
 	KviWindow::applyOptions();
 }
 
+KviLinksListView::KviLinksListView(QWidget * par)
+: KviTalTreeWidget(par)
+{
+	header()->setSortIndicatorShown(true);
+	setColumnCount(3);
+	setHeaderLabels(QStringList() << __tr2qs("Link") << __tr2qs("Hops") << __tr2qs("Description"));
+	setRootIsDecorated(true);
+	setAnimated(true);
+	setSortingEnabled(true);
+	setAllColumnsShowFocus(true);
+}
+
+void KviLinksListView::mousePressEvent (QMouseEvent *e)
+{
+	if (e->button() == Qt::RightButton)
+	{
+		QTreeWidgetItem *i=itemAt(e->pos());
+		if (i) emit rightButtonPressed(i,QCursor::pos());
+	}
+	QTreeWidget::mousePressEvent(e);
+}
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_linkswindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index c4a8b89eb..7962abd76 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -44,6 +44,17 @@ typedef struct _KviLink
 	KviStr description;
 } KviLink;
 
+class KviLinksListView : public KviTalTreeWidget
+{
+	Q_OBJECT
+public:
+	KviLinksListView(QWidget*);
+	~KviLinksListView(){};
+protected:
+	void mousePressEvent (QMouseEvent *e);
+signals:
+	void rightButtonPressed(QTreeWidgetItem *,QPoint);
+};
 
 class KviLinksWindow : public KviWindow, public KviExternalServerDataParser
 {
@@ -54,7 +65,7 @@ public:
 protected:
 	QSplitter      * m_pVertSplitter;
 	QSplitter      * m_pTopSplitter;
-	KviTalTreeWidget      * m_pListView;
+	KviLinksListView      * m_pListView;
 	KviPointerList<KviLink> * m_pLinkList;
 	KviTalPopupMenu     * m_pHostPopup;
 	QString          m_szRootServer;
@@ -73,7 +84,7 @@ protected:
 //	virtual void setProperties(KviWindowProperty *p);
 //	virtual void saveProperties();
 protected slots:
-	void showHostPopup(KviTalTreeWidgetItem *i,const QPoint &p,int c);
+	void showHostPopup(QTreeWidgetItem *i,const QPoint &p);
 	void hostPopupClicked(int id);
 	void requestLinks();
 	void connectionStateChange();