Adopt the "show/hide header" option from treewindowlist in classic window list, too

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

5 files changed, 40 insertions, 32 deletions

diff --git a/src/kvirc/ui/kvi_windowlist.cpp b/src/kvirc/ui/kvi_windowlist.cpp
index 03fa8dd12..daba85634 100644
--- a/src/kvirc/ui/kvi_windowlist.cpp
+++ b/src/kvirc/ui/kvi_windowlist.cpp
@@ -63,6 +63,11 @@ KviWindowListBase::KviWindowListBase()
 	// FIXME: this timer should be started only if KVI_OPTION_BOOL(KviOption_boolUseWindowListActivityMeter)
 	setObjectName(__tr2qs("windowlist"));
 	setFeatures(QDockWidget::DockWidgetMovable);
+
+	// to hide the title bar completely must replace the default widget with a generic one
+	m_pTitleWidget = new KviWindowListTitleWidget();
+	setTitleBarWidget( m_pTitleWidget );
+
 	m_pActivityMeterTimer = new QTimer();
 	connect(m_pActivityMeterTimer,SIGNAL(timeout()),this,SLOT(updateActivityMeter()));
 	connect(this, SIGNAL(dockLocationChanged(Qt::DockWidgetArea)),this, SLOT(updateDockLocation(Qt::DockWidgetArea)));
@@ -71,6 +76,9 @@ KviWindowListBase::KviWindowListBase()
 
 KviWindowListBase::~KviWindowListBase()
 {
+	if(m_pTitleWidget)
+		delete m_pTitleWidget;
+
 	delete m_pActivityMeterTimer;
 }
 
@@ -153,6 +161,18 @@ void KviWindowListBase::updateDockLocation(Qt::DockWidgetArea newArea)
 	currentArea = newArea;
 }
 
+void KviWindowListBase::applyOptions()
+{
+	if(KVI_OPTION_BOOL(KviOption_boolShowTreeWindowListHeader))
+	{
+		m_pTitleWidget->setText(__tr2qs("Window List"));
+		m_pTitleWidget->setMargin(2);
+		m_pTitleWidget->setIndent(4);
+	} else {
+		m_pTitleWidget->setText("");
+	}
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // KviWindowListItem
 //
@@ -637,6 +657,8 @@ void KviClassicWindowList::doLayout()
 
 void KviClassicWindowList::applyOptions()
 {
+	KviWindowListBase::applyOptions();
+
 	for(KviWindowListButton * b = m_pButtonList->first();b;b = m_pButtonList->next())
 	{
 		b->setFlat(KVI_OPTION_BOOL(KviOption_boolUseFlatClassicWindowListButtons));
diff --git a/src/kvirc/ui/kvi_windowlist.h b/src/kvirc/ui/kvi_windowlist.h
index 945281a0a..ea8449e97 100644
--- a/src/kvirc/ui/kvi_windowlist.h
+++ b/src/kvirc/ui/kvi_windowlist.h
@@ -31,6 +31,7 @@
 #include <QPushButton>
 #include <QFrame>
 #include <QDockWidget>
+#include <QLabel>
 
 class QPixmap;
 class KviWindow;
@@ -65,6 +66,15 @@ public:
 	int highlightLevel(){ return m_iHighlightLevel; };
 };
 
+class KVIRC_API KviWindowListTitleWidget : public QLabel
+{
+	Q_OBJECT
+public:
+	KviWindowListTitleWidget() {};
+	~KviWindowListTitleWidget() {};
+	QSize sizeHint() const { return text().isEmpty() ? QSize(4,4): QLabel::sizeHint(); };
+};
+
 //
 // KviWindowListBase
 //
@@ -81,6 +91,7 @@ public:
 protected:
 	KviFrame * m_pFrm;
 	QTimer   * m_pActivityMeterTimer;
+	KviWindowListTitleWidget  * m_pTitleWidget;
 	Qt::DockWidgetArea currentArea;
 public:
 	virtual KviWindowListItem * addItem(KviWindow *){ return 0; };
@@ -94,7 +105,7 @@ public:
 	virtual bool setIterationPointer(KviWindowListItem *){ return false; };
 	virtual void switchWindow(bool bNext,bool bInContextOnly,bool bHighlightedOnly=false);
 	virtual void updatePseudoTransparency(){};
-	virtual void applyOptions(){};
+	virtual void applyOptions();
 	virtual void wheelEvent(QWheelEvent *e);
 	static void getTextForConsole(QString &szText,KviConsole * pConsole);
 	Qt::DockWidgetArea currentDockArea() { return currentArea; };
diff --git a/src/kvirc/ui/kvi_windowlist_tree.cpp b/src/kvirc/ui/kvi_windowlist_tree.cpp
index 9c00a0bec..5dcae5231 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.cpp
+++ b/src/kvirc/ui/kvi_windowlist_tree.cpp
@@ -287,10 +287,6 @@ void KviTreeWindowListTreeWidget::paintEvent(QPaintEvent * event)
 KviTreeWindowList::KviTreeWindowList()
 : KviWindowListBase()
 {
-	// to hide the title bar completely must replace the default widget with a generic one
-	m_pTitleWidget = new KviTreeWindowListTitleWidget();
-	setTitleBarWidget( m_pTitleWidget );
-	
 	m_pTreeWidget = new KviTreeWindowListTreeWidget(this);
 	m_pTreeWidget->setColumnWidth(0,135);
 	m_pTreeWidget->header()->hide();
@@ -324,8 +320,6 @@ KviTreeWindowList::KviTreeWindowList()
 
 KviTreeWindowList::~KviTreeWindowList()
 {
-	if(m_pTitleWidget)
-		delete m_pTitleWidget;
 }
 
 void KviTreeWindowList::updatePseudoTransparency()
@@ -463,14 +457,7 @@ bool KviTreeWindowList::setIterationPointer(KviWindowListItem * it)
 
 void KviTreeWindowList::applyOptions()
 {
-	if(KVI_OPTION_BOOL(KviOption_boolShowTreeWindowListHeader))
-	{
-		m_pTitleWidget->setText(__tr2qs("Window List"));
-		m_pTitleWidget->setMargin(2);
-		m_pTitleWidget->setIndent(4);
-	} else {
-		m_pTitleWidget->setText("");
-	}
+	KviWindowListBase::applyOptions();
 }
 
 // KviTreeWindowListItemDelegate
diff --git a/src/kvirc/ui/kvi_windowlist_tree.h b/src/kvirc/ui/kvi_windowlist_tree.h
index fc599985d..5813f63a5 100644
--- a/src/kvirc/ui/kvi_windowlist_tree.h
+++ b/src/kvirc/ui/kvi_windowlist_tree.h
@@ -28,7 +28,6 @@
 #include <QTreeWidget>
 #include <QStyledItemDelegate>
 #include <QAbstractItemView>
-#include <QLabel>
 
 class KviTreeWindowList;
 class KviTreeWindowListItemInternal;
@@ -77,15 +76,6 @@ public slots:
 	void reverseSort();
 };
 
-class KVIRC_API KviTreeWindowListTitleWidget : public QLabel
-{
-	Q_OBJECT
-public:
-	KviTreeWindowListTitleWidget() {};
-	~KviTreeWindowListTitleWidget() {};
-	QSize sizeHint() const { return text().isEmpty() ? QSize(4,4): QLabel::sizeHint(); };
-};
-
 class KVIRC_API KviTreeWindowList : public KviWindowListBase
 {
 	Q_OBJECT
@@ -97,7 +87,6 @@ private:
 	KviTreeWindowListItem         * m_pCurrentItem;
 	KviDynamicToolTip             * m_pToolTip;
 	QStyledItemDelegate           * m_pItemDelegate;
-	KviTreeWindowListTitleWidget  * m_pTitleWidget;
 public:
 	virtual KviWindowListItem * addItem(KviWindow *);
 	virtual bool removeItem(KviWindowListItem *);
diff --git a/src/modules/options/optw_windowlist.cpp b/src/modules/options/optw_windowlist.cpp
index e14cbc37c..5b75a5ff6 100644
--- a/src/modules/options/optw_windowlist.cpp
+++ b/src/modules/options/optw_windowlist.cpp
@@ -49,7 +49,8 @@ KviWindowListOptionsWidget::KviWindowListOptionsWidget(QWidget * parent)
 		"activity causes the indicator to be shaded blue.</center>","options"));
 	addBoolSelector(0,4,0,4,__tr2qs_ctx("Show IRC context indicator in window list","options"),KviOption_boolUseWindowListIrcContextIndicator);
 	addBoolSelector(0,5,0,5,__tr2qs_ctx("Enable window tooltips","options"),KviOption_boolShowWindowListToolTips);
-	addRowSpacer(0,6,0,6);
+	addBoolSelector(0,6,0,6,__tr2qs_ctx("Show header","options"),KviOption_boolShowTreeWindowListHeader);
+	addRowSpacer(0,7,0,7);
 }
 
 
@@ -219,12 +220,10 @@ KviTreeWindowListFeaturesOptionsWidget::KviTreeWindowListFeaturesOptionsWidget(Q
 
 	createLayout();
 
-	addBoolSelector(0,1,0,1,__tr2qs_ctx("Show header","options"),KviOption_boolShowTreeWindowListHeader);
-	
-	addUIntSelector(0,2,0,2,__tr2qs_ctx("Minimum width:","options"),KviOption_uintTreeWindowListMinimumWidth,24,1024,125);
-	addUIntSelector(0,3,0,3,__tr2qs_ctx("Maximum width:","options"),KviOption_uintTreeWindowListMaximumWidth,24,9999,125);
+	addUIntSelector(0,1,0,1,__tr2qs_ctx("Minimum width:","options"),KviOption_uintTreeWindowListMinimumWidth,24,1024,125);
+	addUIntSelector(0,2,0,2,__tr2qs_ctx("Maximum width:","options"),KviOption_uintTreeWindowListMaximumWidth,24,9999,125);
 
-	addRowSpacer(0,4,0,4);
+	addRowSpacer(0,3,0,3);
 }