implemented #121 (change font for the Tree Taskbar)

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

4 files changed, 13 insertions, 17 deletions

diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 427c5e60e..20250e9ed 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -641,7 +641,8 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 	FONT_OPTION("Label","Arial",9,KviOption_sectFlagLabel | KviOption_resetUpdateGui),
 	FONT_OPTION("Application","Arial",9,KviOption_sectFlagGui | KviOption_resetUpdateAppFont),
 	FONT_OPTION("IrcToolBarApplet","Arial",9,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui),
-	FONT_OPTION("Taskbar","Arial",9,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar)
+	FONT_OPTION("Taskbar","Arial",9,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar),
+	FONT_OPTION("TreeTaskbar","Arial",9,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar)
 #else
 	FONT_OPTION("IrcView","Monospace",10,KviOption_sectFlagIrcView | KviOption_resetUpdateGui),
 	FONT_OPTION("Input","Sans Serif",12,KviOption_sectFlagInput | KviOption_resetUpdateGui),
@@ -649,7 +650,8 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 	FONT_OPTION("Label","Sans Serif",10,KviOption_sectFlagLabel | KviOption_resetUpdateGui),
 	FONT_OPTION("Application","Sans Serif",10,KviOption_sectFlagGui | KviOption_resetUpdateAppFont),
 	FONT_OPTION("IrcToolBarApplet","Sans Serif",10,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui),
-	FONT_OPTION("Taskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar)
+	FONT_OPTION("Taskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar),
+	FONT_OPTION("TreeTaskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar)
 #endif
 };
 
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 59a8a7351..2d56b816f 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -582,10 +582,9 @@ namespace KviIdentdOutputMode {
 #define KviOption_fontApplication 4                                  /* interface::look::global */
 #define KviOption_fontIrcToolBarApplet 5                             /* theme::tool bar applet */
 #define KviOption_fontTaskbar 6                                      /* interface::look::taskbar::classic taskbar */
+#define KviOption_fontTreeTaskbar 7                                  /* interface::look::taskbar::tree taskbar */
 
-/* fixme: taskbar font ? */
-
-#define KVI_NUM_FONT_OPTIONS 7
+#define KVI_NUM_FONT_OPTIONS 8
 
 
 
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 61f702e39..99fbdcb5d 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -476,15 +476,6 @@ void KviClassicTaskBar::orientationChangedSlot(Qt::Orientation o)
 	doLayout();
 }
 
-/*
-void KviClassicTaskBar::fontChange(const QFont &old)
-{
-	calcButtonHeight();
-	doLayout();
-	QToolBar::fontChange(old);
-}
-*/
-
 void KviClassicTaskBar::updateActivityMeter()
 {
 	if(KVI_OPTION_BOOL(KviOption_boolUseTaskBarActivityMeter))
@@ -1261,6 +1252,8 @@ void KviTreeTaskBarItemDelegate::paint(QPainter * p, const QStyleOptionViewItem
 	KviTreeTaskBarItem* item = (KviTreeTaskBarItem*) treeWidget->itemFromIndex(index);
 	KviWindow* pWindow = item->kviWindow();
 
+	p->setFont(KVI_OPTION_FONT(KviOption_fontTreeTaskbar));
+
 	//paint cell background	
 	if (option.state & QStyle::State_Selected)
 	{
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index 2ebb42e57..b8b3de437 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -73,8 +73,10 @@ KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(QWi
 : KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 	createLayout();
+
+	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTreeTaskbar);
 	
-	KviTalGroupBox *g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
+	KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
 	
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarForeground);
 	addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveForeground);
@@ -84,9 +86,9 @@ KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(QWi
 	addColorSelector(g,__tr2qs_ctx("Alert Level 4:","options"),KviOption_colorTreeTaskBarHighlight4Foreground);
 	addColorSelector(g,__tr2qs_ctx("Alert Level 5:","options"),KviOption_colorTreeTaskBarHighlight5Foreground);
 
-	addColorSelector(0,1,0,1,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorTreeTaskBarProgress);
+	addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorTreeTaskBarProgress);
 
-	addRowSpacer(0,2,0,2);
+	addRowSpacer(0,3,0,3);
 }