Now you can crash with Qt4 too :)

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

40 files changed, 114 insertions, 114 deletions

diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 5299e63a3..0bde7db8a 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -58,7 +58,7 @@
 #include <qpainter.h>
 #include <qheader.h>
 #include <qtabwidget.h>
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 #include <qvaluelist.h>
 #include <qlabel.h>
 
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index ce46cbe79..01f4ab52f 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -38,7 +38,7 @@
 #include <qlabel.h>
 #include <qlineedit.h>
 #include "kvi_tal_listview.h"
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
@@ -69,7 +69,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 	connect(m_pListView,SIGNAL(doubleClicked(KviTalListViewItem *)),this,SLOT(itemDoubleClicked(KviTalListViewItem *)));
 
 
-	m_pGroupBox = new QGroupBox(2,QGroupBox::Horizontal,__tr2qs("Channel" ),this);
+	m_pGroupBox = new KviTalGroupBox(2,KviTalGroupBox::Horizontal,__tr2qs("Channel" ),this);
 	QString szMsg = __tr2qs("Name");
 	szMsg.append(":");
 	QLabel * l = new QLabel(szMsg,m_pGroupBox);
diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h
index 5e76791a2..c2f6df70a 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.h
+++ b/src/modules/channelsjoin/channelsjoinwindow.h
@@ -29,7 +29,7 @@
 #include <qdialog.h>
 
 class KviConsole;
-class QGroupBox;
+class KviTalGroupBox;
 class QPushButton;
 class KviStyledCheckBox;
 class QLineEdit;
@@ -45,7 +45,7 @@ public:
 protected:
 	QLineEdit   * m_pChannelEdit; 
 	KviTalListView   * m_pListView;
-	QGroupBox   * m_pGroupBox;
+	KviTalGroupBox   * m_pGroupBox;
 	QLineEdit   * m_pPass;
 	KviStyledCheckBox   * m_pShowAtStartupCheck;
 	KviStyledCheckBox   * m_pCloseAfterJoinCheck;
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index e8ba76cb5..a82879a6c 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1099,7 +1099,7 @@ void KviCanvasView::contentsMouseMoveEvent(QMouseEvent *e)
 {
 //	QPoint p = inverseWorldMatrix().map(e->pos());
 	QPoint p = e->pos();
-	if(e->state() & LeftButton)
+	if(e->state() & Qt::LeftButton)
 	{
 		if((m_dragMode != None) && (m_pSelectedItem))
 		{
@@ -1173,7 +1173,7 @@ void KviCanvasView::contentsMouseReleaseEvent(QMouseEvent *e)
 
 void KviCanvasView::contentsMousePressEvent(QMouseEvent *e)
 {
-	if(e->button() & LeftButton)
+	if(e->button() & Qt::LeftButton)
 	{
 //	    QPoint p = inverseWorldMatrix().map(e->pos());
 		QPoint p = e->pos();
diff --git a/src/modules/dockwidget/libkvidockwidget.cpp b/src/modules/dockwidget/libkvidockwidget.cpp
index b15842c46..332b98fd8 100644
--- a/src/modules/dockwidget/libkvidockwidget.cpp
+++ b/src/modules/dockwidget/libkvidockwidget.cpp
@@ -370,8 +370,8 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const QPoint &pnt)
 
 void KviDockWidget::mousePressEvent(QMouseEvent *e)
 {
-	if(e->button() & LeftButton)toggleParentFrame();
-	else if(e->button() & RightButton)
+	if(e->button() & Qt::LeftButton)toggleParentFrame();
+	else if(e->button() & Qt::RightButton)
 		m_pContextPopup->popup(mapToGlobal(e->pos()));
 }
 
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index c2068daa4..9fac05923 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -27,7 +27,7 @@
 
 #include <qlayout.h>
 #include <qtoolbutton.h>
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 #include "kvi_tal_popupmenu.h"
 #include <qmessagebox.h>
 #include <qtimer.h>
@@ -166,7 +166,7 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * p
 	KviFontSelector * f = new KviFontSelector(this,__tr2qs_ctx("Font:","editor"),&g_fntNormal,true);
 	g->addMultiCellWidget(f,0,0,0,2);
 	m_pSelectorInterfaceList->append(f);
-	QGroupBox * gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs("Colors" ),this);
+	KviTalGroupBox * gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Colors" ),this);
 	g->addMultiCellWidget(gbox,1,1,0,2);
 	KviColorSelector * s = addColorSelector(gbox,__tr2qs_ctx("Background:","editor"),&g_clrBackground,true);
 	s = addColorSelector(gbox,__tr2qs_ctx("Normal text:","editor"),&g_clrNormalText,true);
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index 798c61d15..265faf5f5 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -21,7 +21,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 #include "class_groupbox.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
@@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox)
 
 bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new QGroupBox(parentScriptWidget(), name()), true);
+	setObject(new KviTalGroupBox(parentScriptWidget(), name()), true);
 	return true;
 }
 
@@ -195,12 +195,12 @@ bool KviKvsObject_groupbox::functionSetTitle(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("title",KVS_PT_STRING,0,szTitle)
 	KVSO_PARAMETERS_END(c)
 	if (widget())
-		((QGroupBox *)widget())->setTitle(szTitle);
+		((KviTalGroupBox *)widget())->setTitle(szTitle);
 	return true;
 }
 bool KviKvsObject_groupbox::functionTitle(KviKvsObjectFunctionCall *c)
 {
-	if (widget()) c->returnValue()->setString(((QGroupBox *)widget())->title());
+	if (widget()) c->returnValue()->setString(((KviTalGroupBox *)widget())->title());
 	return true;
 }
 bool KviKvsObject_groupbox::functionSetFlat(KviKvsObjectFunctionCall *c)
@@ -210,12 +210,12 @@ bool KviKvsObject_groupbox::functionSetFlat(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled)
 	KVSO_PARAMETERS_END(c)
 	if(widget())
-		((QGroupBox *)widget())->setFlat(bEnabled);
+		((KviTalGroupBox *)widget())->setFlat(bEnabled);
 	return true;
 }
 bool KviKvsObject_groupbox::functionIsFlat(KviKvsObjectFunctionCall *c)
 {
-	if (widget()) c->returnValue()->setBoolean(((QGroupBox *)widget())->isFlat());
+	if (widget()) c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isFlat());
 	return true;
 }
 bool KviKvsObject_groupbox::functionSetCheckable(KviKvsObjectFunctionCall *c)
@@ -225,12 +225,12 @@ bool KviKvsObject_groupbox::functionSetCheckable(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled)
 	KVSO_PARAMETERS_END(c)
 	if(widget())
-		((QGroupBox *)widget())->setCheckable(bEnabled);
+		((KviTalGroupBox *)widget())->setCheckable(bEnabled);
 	return true;
 }
 bool KviKvsObject_groupbox::functionIsCheckable(KviKvsObjectFunctionCall *c)
 {
-	if (widget()) c->returnValue()->setBoolean(((QGroupBox *)widget())->isCheckable());
+	if (widget()) c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isCheckable());
 	return true;
 }
 bool KviKvsObject_groupbox::functionSetChecked(KviKvsObjectFunctionCall *c)
@@ -240,12 +240,12 @@ bool KviKvsObject_groupbox::functionSetChecked(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("bFlag",KVS_PT_BOOL,0,bEnabled)
 	KVSO_PARAMETERS_END(c)
 	if(widget())
-		((QGroupBox *)widget())->setChecked(bEnabled);
+		((KviTalGroupBox *)widget())->setChecked(bEnabled);
 	return true;
 }
 bool KviKvsObject_groupbox::functionIsChecked(KviKvsObjectFunctionCall *c)
 {
-	if (widget()) c->returnValue()->setBoolean(((QGroupBox *)widget())->isChecked());
+	if (widget()) c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isChecked());
 	return true;
 }
 bool KviKvsObject_groupbox::functionSetInsideMargin(KviKvsObjectFunctionCall *c)
@@ -254,12 +254,12 @@ bool KviKvsObject_groupbox::functionSetInsideMargin(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QGroupBox *)widget())->setInsideMargin(uMargin);
+    if (widget()) ((KviTalGroupBox *)widget())->setInsideMargin(uMargin);
 	return true;
 }
 bool KviKvsObject_groupbox::functionInsideMargin(KviKvsObjectFunctionCall *c)
 {
-	if (widget()) c->returnValue()->setInteger(((QGroupBox *)widget())->insideMargin());
+	if (widget()) c->returnValue()->setInteger(((KviTalGroupBox *)widget())->insideMargin());
 	return true;
 }
 bool KviKvsObject_groupbox::functionSetInsideSpacing(KviKvsObjectFunctionCall *c)
@@ -268,12 +268,12 @@ bool KviKvsObject_groupbox::functionSetInsideSpacing(KviKvsObjectFunctionCall *c
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QGroupBox *)widget())->setInsideSpacing(uSpacing);
+    if (widget()) ((KviTalGroupBox *)widget())->setInsideSpacing(uSpacing);
 	return true;
 }
 bool KviKvsObject_groupbox::functionInsideSpacing(KviKvsObjectFunctionCall *c)
 {
-	if (widget()) c->returnValue()->setInteger(((QGroupBox *)widget())->insideSpacing());
+	if (widget()) c->returnValue()->setInteger(((KviTalGroupBox *)widget())->insideSpacing());
 	return true;
 }
 bool KviKvsObject_groupbox::functionSetColumns(KviKvsObjectFunctionCall *c)
@@ -282,12 +282,12 @@ bool KviKvsObject_groupbox::functionSetColumns(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("colums",KVS_PT_UNSIGNEDINTEGER,0,uColums)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QGroupBox *)widget())->setColumns(uColums);
+    if (widget()) ((KviTalGroupBox *)widget())->setColumns(uColums);
 	return true;
 }
 bool KviKvsObject_groupbox::functionColumns(KviKvsObjectFunctionCall *c)
 {
-	if (widget()) c->returnValue()->setInteger(((QGroupBox *)widget())->columns());
+	if (widget()) c->returnValue()->setInteger(((KviTalGroupBox *)widget())->columns());
 	return true;
 }
 bool KviKvsObject_groupbox::functionAddSpace(KviKvsObjectFunctionCall *c)
@@ -296,7 +296,7 @@ bool KviKvsObject_groupbox::functionAddSpace(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("colums",KVS_PT_UNSIGNEDINTEGER,0,iSpace)
 	KVSO_PARAMETERS_END(c)
-	if (widget()) (((QGroupBox *)widget())->addSpace(iSpace));
+	if (widget()) (((KviTalGroupBox *)widget())->addSpace(iSpace));
 	return true;
 }
 
@@ -311,7 +311,7 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c)
 	{
 		if(KviQString::equalCI(szAlign, align_tbl[i]))
 		{
-			((QGroupBox *)widget())->setAlignment(align_cod[i]);
+			((KviTalGroupBox *)widget())->setAlignment(align_cod[i]);
 			return true;
 		}
 	}
@@ -320,7 +320,7 @@ bool KviKvsObject_groupbox::functionSetAlignment(KviKvsObjectFunctionCall *c)
 }
 bool KviKvsObject_groupbox::functionAlignment(KviKvsObjectFunctionCall *c)
 {
-	int mode = ((QGroupBox *)widget())->alignment();
+	int mode = ((KviTalGroupBox *)widget())->alignment();
 	QString szAlignment="";
 	for(unsigned int i = 0; i < align_num; i++)
 	{
@@ -342,10 +342,10 @@ bool KviKvsObject_groupbox::functionSetOrientation(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_END(c)
 	if(!widget())return true;
 	if(KviQString::equalCI(szMode, "Horizontal"))
-		((QGroupBox *)widget())->setOrientation(Qt::Horizontal);
+		((KviTalGroupBox *)widget())->setOrientation(Qt::Horizontal);
 	else
 	if(KviQString::equalCI(szMode, "Vertical"))
-		((QGroupBox *)widget())->setOrientation(Qt::Vertical);
+		((KviTalGroupBox *)widget())->setOrientation(Qt::Vertical);
 	else c->warning( __tr2qs("Unknown orientation: "));
 	return true;
 }
@@ -360,10 +360,10 @@ bool KviKvsObject_groupbox::functionSetColumnLayout(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_END(c)
 	if(!widget())return true;
 	if(szMode=="Horizontal")
-		((QGroupBox *)widget())->setColumnLayout(uCol,Qt::Horizontal);
+		((KviTalGroupBox *)widget())->setColumnLayout(uCol,Qt::Horizontal);
 	else
 		if(szMode=="Vertical")
-			((QGroupBox *)widget())->setColumnLayout(uCol,Qt::Vertical);
+			((KviTalGroupBox *)widget())->setColumnLayout(uCol,Qt::Vertical);
 		else c->warning( __tr2qs("Unknown orientation: "));
 	return true;
 }
diff --git a/src/modules/objects/class_groupbox.h b/src/modules/objects/class_groupbox.h
index d1a9a38d6..08329dd64 100644
--- a/src/modules/objects/class_groupbox.h
+++ b/src/modules/objects/class_groupbox.h
@@ -25,7 +25,7 @@
 
 
 
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 #include "class_widget.h"
 #include "object_macros.h"
 
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index c20de62dc..a78e62306 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -732,27 +732,27 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e)
 			}
 			break;
 			case QEvent::MouseButtonPress:
-					if(((QMouseEvent *)e)->button() & LeftButton)aparam = 0;
+					if(((QMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0;
 				else {
-					if(((QMouseEvent *)e)->button() & RightButton)aparam = 1;
+					if(((QMouseEvent *)e)->button() & Qt::RightButton)aparam = 1;
 					else aparam = 2;
 				}
 				if(!callFunction(this,"mousePressEvent",new KviKvsVariant(ret),new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y())
 				))) ret = ""; // ignore results of a broken event handler
 		break;
 			case QEvent::MouseButtonRelease:
-				if(((QMouseEvent *)e)->button() & LeftButton)aparam = 0;
+				if(((QMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0;
 				else {
-					if(((QMouseEvent *)e)->button() & RightButton)aparam = 1;
+					if(((QMouseEvent *)e)->button() & Qt::RightButton)aparam = 1;
 					else aparam = 2;
 				}
 				if(!callFunction(this,"mouseReleaseEvent",new KviKvsVariant(ret),new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y())
 				))) ret = ""; // ignore results of a broken event handler
 			break;
 			case QEvent::MouseButtonDblClick:
-				if(( (QMouseEvent *)e)->button() & LeftButton)aparam = 0;
+				if(( (QMouseEvent *)e)->button() & Qt::LeftButton)aparam = 0;
 				else {
-					if(((QMouseEvent *)e)->button() & RightButton)aparam = 1;
+					if(((QMouseEvent *)e)->button() & Qt::RightButton)aparam = 1;
 					else aparam = 2;
 				}
 					if(!callFunction(this,"mouseDoubleClickEvent",new KviKvsVariant(ret),new KviKvsVariantList(new KviKvsVariant((kvs_int_t)aparam),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x()),new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y())
@@ -760,13 +760,13 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e)
 
 			break;
 			case QEvent::MouseMove:
-				if( (((QMouseEvent *)e)->state()) & LeftButton) aparam = 0;
+				if( (((QMouseEvent *)e)->state()) & Qt::LeftButton) aparam = 0;
 				else
 				{
-					if(((QMouseEvent *)e)->state() & RightButton)aparam = 1;
+					if(((QMouseEvent *)e)->state() & Qt::RightButton)aparam = 1;
 					else
 						{
-							if(((QMouseEvent *)e)->state() & MidButton)aparam = 2;
+							if(((QMouseEvent *)e)->state() & Qt::MidButton)aparam = 2;
 							else aparam = -1;
 						}
 				}
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 7a938f665..010c06b58 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -45,7 +45,7 @@
 #include "kvi_tal_popupmenu.h"
 #include <qtoolbutton.h>
 #include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 #include <qtooltip.h>
 #include <qobjectlist.h>
 #include <qpainter.h>
@@ -325,7 +325,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 			QString szText;
 			if(o->inherits("QLabel"))szText = ((QLabel *)o)->text();
 			else if(o->inherits("QCheckBox"))szText = ((QCheckBox *)o)->text();
-			else if(o->inherits("QGroupBox"))szText = ((QGroupBox *)o)->title();
+			else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title();
 #ifdef COMPILE_INFO_TIPS
 			if(o->inherits("QWidget"))
 				szText.append(QToolTip::textFor((QWidget*)o));
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index b7b63cb8b..a087a769b 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -36,7 +36,7 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent)
 {
 	createLayout(3,1);
 
-	QGroupBox *g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options"));
+	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options"));
 	m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg);
 	connect(m_b1,SIGNAL(toggled(bool)),this,SLOT(reenableStuff(bool)));
 	m_b2 = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolUseAntiSpamOnNotice);
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index fd009bf77..57e5e1302 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -37,7 +37,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 	// AVATAR
 
 	// 1st Box
-	QGroupBox *g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Scaling","options"));
+	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Scaling","options"));
 	KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images (recommended)","options"),KviOption_boolScaleAvatars);
 #ifdef COMPILE_INFO_TIPS	
 	QToolTip::add(b,__tr2qs_ctx("<center>This option will force KVIrc to scale avatars" \
@@ -53,7 +53,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 
 	// 2st Box
-	QGroupBox *gs = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Request CTCP","options"));
+	KviTalGroupBox *gs = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Request CTCP","options"));
 	KviBoolSelector * bs = addBoolSelector(g,__tr2qs_ctx("Request missing avatars","options"),KviOption_boolRequestMissingAvatars);
 	KviUIntSelector * us = addUIntSelector(g,__tr2qs_ctx("Maximum requested file size:","options"),KviOption_uintMaximumRequestedAvatarSize,0,1048576,102400,KVI_OPTION_BOOL(KviOption_boolRequestMissingAvatars));
 
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index ef312fd82..abf6bc52a 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -40,7 +40,7 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
 
 	addBoolSelector(0,1,0,1, __tr2qs_ctx("User input exits away mode","options"), KviOption_boolExitAwayOnInput);
 
-	QGroupBox *g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("Away Nickname","options"));
+	KviTalGroupBox *g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Away Nickname","options"));
 	m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway);	
 	connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool)));
 	
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 1a9b3f786..def9bc658 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -35,7 +35,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
 {
 
 	createLayout(2,1);
-	QGroupBox *gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("On Disconnect","options"));
+	KviTalGroupBox *gbox = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Disconnect","options"));
 
 
 	KviBoolSelector *b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnDisconnect,true);
@@ -48,7 +48,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
 	mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to keep queries open after disconnect.</center>","options"));
 #endif
 
-	 gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options"));
+	 gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options"));
 
 
 	b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnUnexpectedDisconnect,true);
@@ -70,7 +70,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
 	mergeTip(b1,__tr2qs_ctx("<center>This option will cause KVIrc to reopen query windows after a successful reconnect attempt.</center>","options"));
 #endif
 
-//	gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options"));
+//	gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options"));
 	KviBoolSelector * b = addBoolSelector(gbox,__tr2qs_ctx("Automatically reconnect","options"),KviOption_boolAutoReconnectOnUnexpectedDisconnect);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b,__tr2qs_ctx("<center>This option will enable auto-reconnecting after an unexpected disconnect. " \
@@ -119,7 +119,7 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
 #ifdef COMPILE_SSL_SUPPORT
 	createLayout(3,1);
 
-	QGroupBox * gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Certificate","options"));
+	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Certificate","options"));
 
 	KviBoolSelector * b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL certificate (PEM format only)","options"),
 		&(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)),true);
@@ -130,7 +130,7 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
 		&(KVI_OPTION_STRING(KviOption_stringSSLCertificatePass)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate));
 	connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool)));
 
-	gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Private Key","options"));
+	gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Private Key","options"));
 	b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL private key","options"),
 		&(KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)),true);
 	f = addFileSelector(gbox,__tr2qs_ctx("Private key location:","options"),
@@ -161,7 +161,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
 	createLayout(5,1);
 	KviUIntSelector * u;
 	
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Timeout Values","options"),this);
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Timeout Values","options"),this);
 	u = addUIntSelector(g,__tr2qs_ctx("Connect timeout:","options"),KviOption_uintIrcSocketTimeout,5,6000,60);
 	u->setSuffix(__tr2qs_ctx(" sec","options"));
 	u = addUIntSelector(g,__tr2qs_ctx("Outgoing data queue flush timeout:","options"),KviOption_uintSocketQueueFlushTimeout,100,2000,500);
@@ -175,7 +175,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
 #endif
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 
-	g = addGroupBox(0,3,0,3,2,QGroupBox::Horizontal,__tr2qs_ctx("Network Interfaces","options"));
+	g = addGroupBox(0,3,0,3,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Network Interfaces","options"));
 	
 	b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress);
 	KviStringSelector * s = addStringSelector(g,"",KviOption_stringIpV4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress));
@@ -209,7 +209,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 	m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService);
 	connect(m_pEnableIdent,SIGNAL(toggled(bool)),this,SLOT(enableIpv4InIpv6(bool)));
 
-	QGroupBox * gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
+	KviTalGroupBox * gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	
 	KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Enable ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect);
 	connect(m_pEnableIdent,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool)));
@@ -223,7 +223,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 	connect(m_pEnableIdent,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 	connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool)));
 
-	gbox = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
+	gbox = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService));
 	m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"),
 		KviOption_boolIdentdEnableIpV6,
 		KVI_OPTION_BOOL(KviOption_boolUseIdentService));
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index d46398616..0476f2eb8 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -44,7 +44,7 @@ KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
 					"<br><br></p>","options"));
 
 
-	QGroupBox *gs = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("CTCP Replies","options"));
+	KviTalGroupBox *gs = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("CTCP Replies","options"));
 	KviStringSelector * s = addStringSelector(gs, __tr2qs_ctx("Append to VERSION reply:","options"),KviOption_stringCtcpVersionPostfix);
 
 #ifdef COMPILE_INFO_TIPS
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index 59d5f57de..736bef317 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -93,7 +93,7 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget
 #endif
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 
-	QGroupBox * g = addGroupBox(0,2,1,2,2,QGroupBox::Horizontal,__tr2qs_ctx("Ignored Requests","options"));
+	KviTalGroupBox * g = addGroupBox(0,2,1,2,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Ignored Requests","options"));
 	addBoolSelector(g,__tr2qs_ctx("PING","options"),KviOption_boolIgnoreCtcpPing);
 	addBoolSelector(g,__tr2qs_ctx("FINGER","options"),KviOption_boolIgnoreCtcpFinger);
 	addBoolSelector(g,__tr2qs_ctx("CLIENTINFO","options"),KviOption_boolIgnoreCtcpClientinfo);
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 86c1801ab..356e15d60 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -70,7 +70,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 {
 	createLayout(5,1);
 
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Network Properties","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Network Properties","options"));
 	
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Use user-defined address or network interface","options"),KviOption_boolDccListenOnSpecifiedInterfaceByDefault);
 
@@ -195,18 +195,18 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
 
 	KviBoolSelector * b;
 
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("On Incoming File","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Incoming File","options"));
 	KviBoolSelector * b2 = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccSend);
 	KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Open transfer window as minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccSendWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend));
 	KviBoolSelector * b4 = addBoolSelector(g,__tr2qs_ctx("Automatically resume when auto-accepted","options"),KviOption_boolAutoResumeDccSendWhenAutoAccepted,KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend));
 
-	g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Save Location","options"));
+	g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Save Location","options"));
 	addDirectorySelector(g,__tr2qs_ctx("Download folder:","options"),KviOption_stringIncomingPath);
 	addBoolSelector(g,__tr2qs_ctx("Sort saved files by nicknames (create subfolders)","options"),KviOption_boolSortReceivedByDccFilesByNicks);
 	addBoolSelector(g,__tr2qs_ctx("Guess save path from media type","options"),KviOption_boolUseIncomingDccMediaTypeSavePath);
 
 
-	g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("On Download Completion","options"));
+	g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Download Completion","options"));
 	addBoolSelector(g,__tr2qs_ctx("Notify completion in console","options"),KviOption_boolNotifyDccSendSuccessInConsole);
 	addBoolSelector(g,__tr2qs_ctx("Notify completion in notifier","options"),KviOption_boolNotifyDccSendSuccessInNotifier);
 	b = addBoolSelector(g,__tr2qs_ctx("Automatically clear transfer","options"),KviOption_boolAutoCloseDccSendOnSuccess);
@@ -235,7 +235,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 {
 	createLayout(4,1);
 
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Bug Compatibility","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Bug Compatibility","options"));
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Send ACK for byte 0","options"),KviOption_boolSendZeroAckInDccRecv);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
@@ -259,7 +259,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 #endif //COMPILE_INFO_TIPS
 
 
-	g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Limits","options"));
+	g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Limits","options"));
 
 	KviTalHBox * hb = new KviTalHBox(g);
 	b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed);
@@ -280,7 +280,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
 #endif
 
-	g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("Tweaks","options"));
+	g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Tweaks","options"));
 
 	b = addBoolSelector(g,__tr2qs_ctx("Use fast send (send ahead)","options"),KviOption_boolUseFastDccSend);
 #ifdef COMPILE_INFO_TIPS
@@ -346,7 +346,7 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
 {
 	createLayout(3,1);
 
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("On Chat Request","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Chat Request","options"));
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat);
 	b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat));
 
@@ -367,7 +367,7 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget(
 	createLayout(8, 1);
 
 	KviBoolSelector * b1 = addBoolSelector(0,0,0,0,__tr2qs_ctx("Open all minimized","options"),KviOption_boolCreateMinimizedDccVoice);
-	QGroupBox * g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("On Voice Request","options"));
+	KviTalGroupBox * g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Voice Request","options"));
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccVoice);
 
 	b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice));
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index ac4aab973..950453c1d 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -88,7 +88,7 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
 
 	KviBoolSelector * b;
 
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Alert Restrictions","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Alert Restrictions","options"));
 	KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Restrict alert","options"),KviOption_boolHighlightOnlyNormalMsg);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b3, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the taskbar only if a normal message is received in a channel.<br>Actions like joins, parts and mode changes will be ignored.<br> This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.</center>","options"));
diff --git a/src/modules/options/optw_ident.cpp b/src/modules/options/optw_ident.cpp
index 9644b9897..5a393a695 100644
--- a/src/modules/options/optw_ident.cpp
+++ b/src/modules/options/optw_ident.cpp
@@ -24,7 +24,7 @@
 
 #include "optw_ident.h"
 
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index fb56518e9..65ff00b63 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -313,7 +313,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	createLayout(3,1);
 	layout()->setMargin(10);
 
-	QGroupBox * gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Basic Properties","options"));
+	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Basic Properties","options"));
 	KviTalHBox * hb = new KviTalHBox(gbox);
 	hb->setSpacing(3);
 
@@ -353,7 +353,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	QString szCenterEnd("</center>");
 	QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd;
 
-	gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Profile","options"));
+	gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Profile","options"));
 
 	hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
@@ -677,12 +677,12 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(QWidget * par
 	createLayout(2,1);
 	layout()->setMargin(10);
 
-	QGroupBox * gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("User Mode","options"));
+	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("User Mode","options"));
 	m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI);
 	m_pSSelector = addBoolSelector(gbox,__tr2qs_ctx("Server notices (+s)","options"),&m_bS);
 	m_pWSelector = addBoolSelector(gbox,__tr2qs_ctx("Wallops (+w)","options"),&m_bW);
 
-   	gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Default Messages","options"));
+   	gbox = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Default Messages","options"));
 
 
 	KviStringSelector * sel = addStringSelector(gbox, __tr2qs_ctx("Part message:","options"),KviOption_stringPartMessage);
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index 43eef61ce..7435ebe97 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -35,7 +35,7 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent)
 {
 	createLayout(3,1);
 
-	QGroupBox *g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Enable Ignore For","options"));
+	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Enable Ignore For","options"));
 	m_pIgnorePrivmsg = addBoolSelector(g,__tr2qs_ctx("Private/channel messages","options"),KviOption_boolEnableIgnoreOnPrivMsg);
 	m_pIgnoreNotice  = addBoolSelector(g,__tr2qs_ctx("Private/channel notices","options"),KviOption_boolEnableIgnoreOnNotice);
 
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index 7ab383297..569d14f81 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -141,7 +141,7 @@ KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd);
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable the input history window and it's log memory.","options"),KviOption_boolDisableInputHistory); //G&N 2005
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input toolbuttons by default","options"),KviOption_boolHideInputToolButtons);
-	QGroupBox * g = addGroupBox(0,3,0,3,1,QGroupBox::Horizontal,__tr2qs_ctx("Nick completion","options"));
+	KviTalGroupBox * g = addGroupBox(0,3,0,3,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Nick completion","options"));
 	addBoolSelector(g,__tr2qs_ctx("Use bash-like nick completion","options"),KviOption_boolBashLikeNickCompletion);
 	addStringSelector(g,__tr2qs_ctx("Nick completion postfix string","options"),KviOption_stringNickCompletionPostfix);
 	addBoolSelector(g,__tr2qs_ctx("Use the completion postfix string for the first word only","options"),KviOption_boolUseNickCompletionPostfixForFirstWordOnly);
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index 48b77997a..1be849e81 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -54,7 +54,7 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p
 	addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects);
 	addBoolSelector(0,5,0,5,__tr2qs_ctx("Hide Channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons);
 	
-	QGroupBox * g = addGroupBox(0,6,0,6,1,QGroupBox::Horizontal,__tr2qs_ctx("Open Dialog Window For","options"));
+	KviTalGroupBox * g = addGroupBox(0,6,0,6,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Open Dialog Window For","options"));
 	addBoolSelector(g,__tr2qs_ctx("Preferences","options"),KviOption_boolShowGeneralOptionsDialogAsToplevel);
 	addBoolSelector(g,__tr2qs_ctx("Registered Users","options"),KviOption_boolShowRegisteredUsersDialogAsToplevel);
 	addBoolSelector(g,__tr2qs_ctx("Identity","options"),KviOption_boolShowIdentityDialogAsToplevel);
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 1a6396126..2864b1341 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -107,7 +107,7 @@ KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent
 {
 	createLayout(5,1);
 
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("On Channel Kick","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Channel Kick","options"));
 
  	KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Rejoin channel","options"),KviOption_boolRejoinChannelOnKick);
 #ifdef COMPILE_INFO_TIPS
@@ -124,7 +124,7 @@ KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent
 			"\"Rejoin channel\" option.</center>","options"));
 #endif 
 
-	g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("On Channel Part","options"));
+	g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Channel Part","options"));
 
 	b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnPart);
 #ifdef COMPILE_INFO_TIPS
@@ -185,7 +185,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare
 	}
 	m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
 
-	QGroupBox * g = addGroupBox(0,2,4,2,1,QGroupBox::Horizontal,__tr2qs_ctx("On Channel Join","options"));
+	KviTalGroupBox * g = addGroupBox(0,2,4,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Channel Join","options"));
 	addBoolSelector(g,__tr2qs_ctx("Do not send /WHO request","options"),KviOption_boolDisableWhoRequestOnJoin);
   	addBoolSelector(g,__tr2qs_ctx("Do not request ban list","options"),KviOption_boolDisableBanListRequestOnJoin);
   	addBoolSelector(g,__tr2qs_ctx("Do not request ban exception list","options"),KviOption_boolDisableBanExceptionListRequestOnJoin);
@@ -199,7 +199,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare
 			"your IRC bandwidth.</center>","options"));
 #endif
 
-	g = addGroupBox(0,4,4,4,1,QGroupBox::Horizontal,__tr2qs_ctx("On Channel Join","options"));
+	g = addGroupBox(0,4,4,4,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("On Channel Join","options"));
 	addBoolSelector(g,__tr2qs_ctx("Echo channel topic","options"),KviOption_boolEchoNumericTopic);
 	addBoolSelector(g,__tr2qs_ctx("Show channel sync time","options"),KviOption_boolShowChannelSyncTime);
 
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index c912295f5..d674eb4bc 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -56,7 +56,7 @@ KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent)
 		KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL;
 	m_pVerbosityCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel));
 
-	QGroupBox * g = addGroupBox(0,1,1,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Show in active window","options"));
+	KviTalGroupBox * g = addGroupBox(0,1,1,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Show in active window","options"));
 	addBoolSelector(g,__tr2qs_ctx("External messages","options"),KviOption_boolExternalMessagesToActiveWindow);
 	addBoolSelector(g,__tr2qs_ctx("External CTCP replies","options"),KviOption_boolCtcpRepliesToActiveWindow);
 	addBoolSelector(g,__tr2qs_ctx("Whois replies","options"),KviOption_boolWhoisRepliesToActiveWindow);
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 9f4382a59..c40d35e4c 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -41,7 +41,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
 #ifdef COMPILE_INFO_TIPS
     mergeTip(pUse,__tr2qs_ctx("<center>This enables the lag meter engine, which checks at regular intervals how much lag (latency) the server has.</center>","options"));
 #endif
-    QGroupBox *g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
+    KviTalGroupBox *g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
     KviUIntSelector * pInterval = addUIntSelector(g, __tr2qs_ctx("Lag meter heartbeat:","options"),KviOption_uintLagMeterHeartbeat,2000,10000,5000,KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
     pInterval->setSuffix(__tr2qs_ctx(" msec","options"));
 #ifdef COMPILE_INFO_TIPS
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index ae5a5fcf2..648078c7a 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -36,7 +36,7 @@ KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
 {
 	createLayout(4,1);
 
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Automatically Log","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Automatically Log","options"));
 	addBoolSelector(g,__tr2qs_ctx("Query windows","options"),KviOption_boolAutoLogQueries);
 	addBoolSelector(g,__tr2qs_ctx("Channel windows","options"),KviOption_boolAutoLogChannels);
 	addBoolSelector(g,__tr2qs_ctx("DCC Chat windows","options"),KviOption_boolAutoLogDccChat);
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 316aa18a1..f3e6ffad5 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -76,7 +76,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 	KviBoolSelector * b1;
 	KviBoolSelector * b2;
 
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("General","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("General","options"));
 	
 	addBoolSelector(g,__tr2qs_ctx("Show message icons","options"),KviOption_boolIrcViewShowImages);
 	addBoolSelector(g,__tr2qs_ctx("Draw some emoticons (smileys) as pictures","options"),KviOption_boolDrawEmoticons);
@@ -85,7 +85,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 
 
 
-	g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Nicknames","options"));
+	g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Nicknames","options"));
 
 	b1 = addBoolSelector(g,__tr2qs_ctx("\"Smart\" nickname colors","options"),KviOption_boolColorNicks);
 	b2 = addBoolSelector(g,__tr2qs_ctx("Use same colors as in the userlist","options"),KviOption_boolUseUserListColorsAsNickColors,!KVI_OPTION_BOOL(KviOption_boolColorNicks));
@@ -119,7 +119,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 
 
 
-	g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("Timestamp","options"));
+	g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Timestamp","options"));
 
 	m_pUseTimestampSelector = addBoolSelector(g,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp);
 	
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index 40841868a..3d70c9f7c 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -37,7 +37,7 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
 	createLayout(5,1);
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList);
-	QGroupBox *g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"));
+	KviTalGroupBox *g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"));
 	connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
 
 	connect(b,
@@ -56,7 +56,7 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
 				KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)),
 		SLOT(setEnabled(bool)));
 
-	g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("Advanced configuration","options"));
+	g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Advanced configuration","options"));
 	connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
 
 	connect(b,
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 3aeb8dfc9..aeb35f559 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -34,7 +34,7 @@
 #include <qlineedit.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 #include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 #include <qtooltip.h>
@@ -103,7 +103,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
   vbox->setStretchFactor(lll,100);
 
 
-	QGroupBox * gbox = addGroupBox(0,2,1,2,2,QGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),this);
+	KviTalGroupBox * gbox = addGroupBox(0,2,1,2,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Configuration","options"),this);
 	//QGridLayout * gl = new QGridLayout(gbox->layout());
 	//gl->setMargin(2);
 	//gl->setSpacing(4);
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index 270494d71..4426fdd6a 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -39,7 +39,7 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
 {
 	createLayout(8,1);
 
-	QGroupBox *g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Open Query For","options"));
+	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Open Query For","options"));
 	KviBoolSelector *b  = addBoolSelector(g, __tr2qs_ctx("Private messages","options"),KviOption_boolCreateQueryOnPrivmsg);
 #ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index c2ffae5e8..2c11230d3 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -124,7 +124,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	QWidget * tab = new QWidget(tw);
 	QGridLayout * gl = new QGridLayout(tab,4,2,10,4);
 
-	QGroupBox *gbox = new QGroupBox(2,QGroupBox::Horizontal,__tr2qs_ctx("Properties","options"),tab);
+	KviTalGroupBox *gbox = new KviTalGroupBox(2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Properties","options"),tab);
 	gl->addMultiCellWidget(gbox,0,0,0,1);
 
 	l = new QLabel(__tr2qs_ctx("Username:","options"),gbox);
@@ -474,7 +474,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	QWidget * tab = new QWidget(tw);
 	QGridLayout * gl = new QGridLayout(tab,3,1,10,4);
 
-	QGroupBox *gbox = new QGroupBox(2,QGroupBox::Horizontal,__tr2qs_ctx("Properties","options"),tab);
+	KviTalGroupBox *gbox = new KviTalGroupBox(2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Properties","options"),tab);
 	gl->addWidget(gbox,0,0);
 
 	l = new QLabel(__tr2qs_ctx("Username:","options"),gbox);
@@ -514,7 +514,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 									"If you leave this field empty (most common case), KVIrc will first look if a real name is specified " \
 									"for the network that this server belongs to, and if that is empty the default \"real name\" (specified in the \"Identity\" settings) will be used.</center>","options"));
 #endif
-	gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs_ctx("User Mode","options"),tab);
+	gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs_ctx("User Mode","options"),tab);
 	gl->addWidget(gbox,1,0);
 	
 	m_pUseDefaultInitUMode = new KviStyledCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox);
@@ -1122,7 +1122,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	QFrame * lll = new QFrame(vbox);
 	vbox->setStretchFactor(lll,100);
 	
-	QGroupBox *gbox = addGroupBox(0,1,1,1,3,QGroupBox::Horizontal,__tr2qs_ctx("Active Configuration","options"));
+	KviTalGroupBox *gbox = addGroupBox(0,1,1,1,3,KviTalGroupBox::Horizontal,__tr2qs_ctx("Active Configuration","options"));
 	m_pSrvNetLabel = new QLabel(__tr2qs_ctx("Server:","options"),gbox);
 
 	m_pSrvNetEdit = new QLineEdit(gbox);
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index f66ed4800..8ced47d50 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -61,7 +61,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 #else
 	createLayout(3,1);
 #endif
-	QGroupBox * g = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Sound System","options"),true);
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Sound System","options"),true);
 
 	QToolTip::add(g,__tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.","options"));
 
@@ -76,7 +76,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	connect(m_pSoundTestButton,SIGNAL(clicked()),this,SLOT(soundTest()));
 
 
-	g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Media Player","options"),true);
+	g = addGroupBox(0,1,0,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Media Player","options"),true);
 
 	QToolTip::add(g,__tr2qs_ctx("This allows you to select the preferred media player to be used with " \
 		"the mediaplayer.* module commands and functions.","options"));
@@ -99,7 +99,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	m_pSoundTestButton->setEnabled(false);
 	m_pMediaTestButton->setEnabled(false);
 
-	g = addGroupBox(0,2,0,2,1,QGroupBox::Horizontal,__tr2qs_ctx("ID3 tags' encoding","options"),true);
+	g = addGroupBox(0,2,0,2,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("ID3 tags' encoding","options"),true);
 
 	QToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options"));
 
@@ -122,7 +122,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	m_pTagsEncodingCombo->setCurrentItem(iMatch);
 
 #ifdef COMPILE_ON_WINDOWS
-	g = addGroupBox(0,3,0,3,1,QGroupBox::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true);
+	g = addGroupBox(0,3,0,3,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true);
 
 	QToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of winamp messages.","options"));
 
diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp
index 6368653d1..6242c3c4b 100644
--- a/src/modules/options/optw_ssl.cpp
+++ b/src/modules/options/optw_ssl.cpp
@@ -23,7 +23,7 @@
 #include "optw_ssl.h"
 
 #include <qlayout.h>
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index 9037c4bf0..32e9ff40b 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -77,7 +77,7 @@ KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(QWi
 {
 	createLayout(3,1);
 	
-	QGroupBox *g = addGroupBox(0,0,0,0,2,QGroupBox::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
+	KviTalGroupBox *g = addGroupBox(0,0,0,0,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
 	
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarForeground);
 	addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveForeground);
@@ -107,7 +107,7 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWi
 {
 	createLayout(4,2);
 	
-	QGroupBox * g = addGroupBox(0,0,1,0,2,QGroupBox::Horizontal,__tr2qs_ctx("Background Colors","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,1,0,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Background Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarBackground);
 	addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeTaskBarActiveBackground);
 
@@ -230,7 +230,7 @@ KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(QWidget * parent)
 {
 	createLayout(8,1);
 	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar);
-	QGroupBox *g = addGroupBox(0,1,0,1,2,QGroupBox::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
+	KviTalGroupBox *g = addGroupBox(0,1,0,1,2,KviTalGroupBox::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTaskBarNormalText);
 	addColorSelector(g,__tr2qs_ctx("Minimized:","options"), KviOption_colorTaskBarMinimizedText);
 	addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTaskBarHighlight1Text);
diff --git a/src/modules/options/optw_transport.cpp b/src/modules/options/optw_transport.cpp
index 432eacd94..656debbbf 100644
--- a/src/modules/options/optw_transport.cpp
+++ b/src/modules/options/optw_transport.cpp
@@ -22,7 +22,7 @@
 
 #include "optw_transport.h"
 
-#include <qgroupbox.h>
+#include <kvi_tal_groupbox.h>
 
 #include "kvi_options.h"
 #include "kvi_locale.h"
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 0a8205d99..08c5d58f3 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -44,7 +44,7 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
 	m_pEnableFlashing = addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable tray icon flashing","options"),KviOption_boolEnableTrayIconFlashing);
 	m_pLevelBasedNotify = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable level-based message notification (not a message-type based)","options"),KviOption_boolUseLevelBasedTrayNotification);
 	
-	m_pLevelsGroup = addGroupBox(0,5,0,5,1,QGroupBox::Horizontal,__tr2qs_ctx("Select message levels to notify","options"));
+	m_pLevelsGroup = addGroupBox(0,5,0,5,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Select message levels to notify","options"));
 	
 	addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages","options"),
 				KviOption_uintMinTrayLowLevelMessage,
diff --git a/src/modules/options/optw_tray.h b/src/modules/options/optw_tray.h
index 596459cf0..f6a87fd67 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/optw_tray.h
@@ -42,7 +42,7 @@ protected:
 	KviBoolSelector * m_pLevelBasedNotify;
 	KviBoolSelector * m_pMinimizeInTray;
 	KviBoolSelector * m_pCloseInTray;
-	QGroupBox * m_pLevelsGroup;
+	KviTalGroupBox * m_pLevelsGroup;
 protected slots:
 	void setEnabled(bool);
 };
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 5dd4881a0..df37f74b8 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -50,7 +50,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q
 
 	addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontUserListView);
 	
-	QGroupBox * g = addGroupBox(0,1,1,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Nickname Colors","options"));
+	KviTalGroupBox * g = addGroupBox(0,1,1,1,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Nickname Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewNormalForeground);
 	addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorUserListViewSelectionForeground);
 	addColorSelector(g,__tr2qs_ctx("Channel owner:","options"),KviOption_colorUserListViewChanOwnerForeground);
@@ -67,7 +67,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q
 	KviColorSelector * s = addColorSelector(hb,"",KviOption_colorUserListViewOwnForeground,KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick));
 	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
 
-	g = addGroupBox(0,3,1,3,1,QGroupBox::Horizontal,__tr2qs_ctx("Nickname Grid","options"));
+	g = addGroupBox(0,3,1,3,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Nickname Grid","options"));
 	b = addBoolSelector(g,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid);
 
 	s = addColorSelector(g,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
@@ -113,7 +113,7 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 {
 	createLayout(3,2);
 
-	QGroupBox * g = addGroupBox(0,0,1,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Background Colors","options"));
+	KviTalGroupBox * g = addGroupBox(0,0,1,0,1,KviTalGroupBox::Horizontal,__tr2qs_ctx("Background Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewBackground);
 	addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorUserListViewSelectionBackground);
 
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index c265d8aad..475debf85 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -311,7 +311,7 @@ KviSetupWizard::KviSetupWizard()
 	if(nick.isEmpty())nick = "newbie";
 	if(nick == "root")nick = "newbie";
 //m_pIdentity->m_pVBox
-	QGroupBox * gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs("Basic Properties"),m_pIdentity->m_pVBox);
+	KviTalGroupBox * gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Basic Properties"),m_pIdentity->m_pVBox);
 
 	m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true);
 	m_pNickSelector->setMinimumLabelWidth(120);
@@ -328,7 +328,7 @@ KviSetupWizard::KviSetupWizard()
 	QString szCenterEnd("</center>");
 	QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd;
 
-	gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox);
+	gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox);
 
 	KviTalHBox* hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);