fixed kvithemedtreewidget usage (links and list windows)

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

5 files changed, 19 insertions, 13 deletions

diff --git a/src/kvirc/ui/kvi_themedtreewidget.cpp b/src/kvirc/ui/kvi_themedtreewidget.cpp
index 96936d663..dd2042d65 100644
--- a/src/kvirc/ui/kvi_themedtreewidget.cpp
+++ b/src/kvirc/ui/kvi_themedtreewidget.cpp
@@ -31,8 +31,6 @@
 #include "kvi_out.h"
 #include "kvi_mdimanager.h"
 
-#include <QPainter>
-
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	extern QPixmap * g_pShadedChildGlobalDesktopBackground;
 #endif
@@ -74,16 +72,16 @@ void KviThemedTreeWidget::applyOptions()
 void KviThemedTreeWidget::paintEvent(QPaintEvent *e)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
-	QPainter *p = new QPainter(this);
+	QPainter *p = new QPainter(this->viewport());
 	if(KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency) && g_pApp->supportsCompositing())
 	{
 		p->setCompositionMode(QPainter::CompositionMode_Source);
 		QColor col=KVI_OPTION_COLOR(KviOption_colorGlobalTransparencyFade);
 		col.setAlphaF((float)((float)KVI_OPTION_UINT(KviOption_uintGlobalTransparencyChildFadeFactor) / (float)100));
-		p->fillRect(contentsRect(), col);
+		p->fillRect(viewport()->contentsRect(), col);
 	} else if(g_pShadedChildGlobalDesktopBackground)
 	{
-		QPoint pnt = m_pKviWindow->mdiParent() ? mapTo(g_pFrame, contentsRect().topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : mapTo(m_pKviWindow, contentsRect().topLeft());
+		QPoint pnt = m_pKviWindow->mdiParent() ? viewport()->mapTo(g_pFrame, contentsRect().topLeft() + viewport()->contentsRect().topLeft() + g_pFrame->mdiManager()->scrollBarsOffset()) : viewport()->mapTo(m_pKviWindow, contentsRect().topLeft() + viewport()->contentsRect().topLeft());
 		p->drawTiledPixmap(contentsRect(),*(g_pShadedChildGlobalDesktopBackground), pnt);
 	}
 	delete p;
diff --git a/src/kvirc/ui/kvi_themedtreewidget.h b/src/kvirc/ui/kvi_themedtreewidget.h
index aa7451c2b..8fc05e13b 100644
--- a/src/kvirc/ui/kvi_themedtreewidget.h
+++ b/src/kvirc/ui/kvi_themedtreewidget.h
@@ -1,5 +1,5 @@
-#ifndef _KVI_THEMEDLINEEDIT_H_
-#define _KVI_THEMEDLINEEDIT_H_
+#ifndef _KVI_THEMEDTREEWIDGET_H_
+#define _KVI_THEMEDTREEWIDGET_H_
 //=============================================================================
 //
 //   File : kvi_themedlineedit.h
@@ -27,6 +27,7 @@
 #include "kvi_settings.h"
 
 #include <QTreeWidget>
+#include <QPainter>
 
 class KviWindow;
 
@@ -37,7 +38,7 @@ class KVIRC_API KviThemedTreeWidget : public QTreeWidget
 public:
 	KviThemedTreeWidget(QWidget * par, KviWindow * pWindow, const char * name);
 	~KviThemedTreeWidget();
-private:
+protected:
 	KviWindow * m_pKviWindow;
 protected:
 	virtual void paintEvent ( QPaintEvent * event );
@@ -46,4 +47,4 @@ public:
 	void applyOptions();
 };
 
-#endif //_KVI_THEMEDLINEEDIT_H_
+#endif //_KVI_THEMEDTREEWIDGET_H_
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 86022c245..76efdddaf 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -460,6 +460,8 @@ void KviLinksWindow::processData(KviIrcMessage *msg)
 
 void KviLinksWindow::applyOptions()
 {
+	m_pListView->applyOptions();
+	m_pInfoLabel->applyOptions();
 	m_pIrcView->applyOptions();
 	KviWindow::applyOptions();
 }
@@ -483,8 +485,9 @@ void KviLinksListView::mousePressEvent (QMouseEvent *e)
 		QTreeWidgetItem *i=itemAt(e->pos());
 		if (i) emit rightButtonPressed(i,QCursor::pos());
 	}
-	QTreeWidget::mousePressEvent(e);
+	KviThemedTreeWidget::mousePressEvent(e);
 }
+
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_linkswindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index e448c6591..2680e0b12 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -44,6 +44,7 @@
 #include "kvi_fileextensions.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_tooltip.h"
+#include "kvi_themedlineedit.h"
 
 #include <QTimer>
 #include <QPainter>
@@ -152,7 +153,6 @@ void KviChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionVie
 	}
 }
 
-
 KviListWindow::KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LIST,lpFrm,"list",lpConsole), KviExternalServerDataParser()
 {
@@ -205,7 +205,7 @@ KviListWindow::KviListWindow(KviFrame * lpFrm, KviConsole * lpConsole)
 	KviTalToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download"));
 	connect(m_pStopListDownloadButton,SIGNAL(clicked()),this,SLOT(stoplistdownload()));
 
-	m_pParamsEdit = new QLineEdit(pBox);
+	m_pParamsEdit = new KviThemedLineEdit(pBox, this, "lineedit");
 	pBox->setStretchFactor(m_pParamsEdit,1);
 	KviTalToolTip::add(m_pParamsEdit,__tr2qs("<center><b>/LIST command parameters:</b><br>Many servers accept special parameters that " \
 		"allow you to filter the returned entries.<br>" \
@@ -574,7 +574,10 @@ void KviListWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 
 void KviListWindow::applyOptions()
 {
+	m_pTreeWidget->applyOptions();
 	m_pIrcView->applyOptions();
+	m_pParamsEdit->applyOptions();
+	m_pInfoLabel->applyOptions();
 	KviWindow::applyOptions();
 }
 
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index 31e252bbb..664394b10 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -39,6 +39,7 @@
 #include <QItemDelegate>
 
 class KviThemedLabel;
+class KviThemedLineEdit;
 
 class KviChannelTreeWidgetItemDelegate : public QItemDelegate
 {
@@ -86,7 +87,7 @@ protected:
 	QSplitter                                    * m_pVertSplitter;
 	QSplitter                                    * m_pTopSplitter;
 	KviThemedTreeWidget                          * m_pTreeWidget;
-	QLineEdit                                    * m_pParamsEdit;
+	KviThemedLineEdit                            * m_pParamsEdit;
 	QToolButton                                  * m_pRequestButton;
 	QToolButton                                  * m_pStopListDownloadButton;
 	QToolButton                                  * m_pOpenButton;