removed old options & code regarding window caption colors

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

32 files changed, 46 insertions, 512 deletions

diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 936d9cf63..384c2348e 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -294,7 +294,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("StripControlCodesInLogs",false,KviOption_sectFlagLogging),
 	BOOL_OPTION("EnableTrayIconFlashing",true,KviOption_sectFlagFrame),
 	BOOL_OPTION("UseFlatClassicWindowListButtons",false,KviOption_sectFlagWindowList | KviOption_resetUpdateGui | KviOption_groupTheme),
-	BOOL_OPTION("ShowTreeWindowListHeader",false,KviOption_sectFlagWindowList | KviOption_resetUpdateGui | KviOption_groupTheme),
+	BOOL_OPTION("StripMsgTypeInLogs",false,KviOption_sectFlagLogging),
 	BOOL_OPTION("UseLevelBasedTrayNotification",false,KviOption_sectFlagFrame),
 	BOOL_OPTION("MuteAllSounds",false,KviOption_sectFlagFrame),
 	BOOL_OPTION("CreateMinimizedChannels",false,KviOption_sectFlagFrame),
@@ -315,8 +315,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("PasteLastLogOnQueryJoin",false,KviOption_sectFlagLogging),
 	BOOL_OPTION("UseSpecifiedSmartColorForOwnNick",false,KviOption_sectFlagIrcView | KviOption_groupTheme),
 	BOOL_OPTION("UseFullWordHighlighting",false,KviOption_sectFlagIrcView),
-	BOOL_OPTION("ZshLikeNickCompletion",false,KviOption_sectFlagInput),
-	BOOL_OPTION("StripMsgTypeInLogs",false,KviOption_sectFlagLogging)
+	BOOL_OPTION("ZshLikeNickCompletion",false,KviOption_sectFlagInput)
 };
 
 #define STRING_OPTION(_txt,_val,_flags) KviStringOption(KVI_STRING_OPTIONS_PREFIX _txt,_val,_flags)
@@ -455,12 +454,12 @@ KviColorOption g_colorOptionsTable[KVI_NUM_COLOR_OPTIONS]=
 	COLOR_OPTION("WindowListHighlight1Text",0,16,144,KviOption_sectFlagWindowList),
 	COLOR_OPTION("WindowListHighlight2Text",32,0,255,KviOption_sectFlagWindowList),
 	COLOR_OPTION("WindowListProgressBar",180,180,180,KviOption_sectFlagWindowList),
-	COLOR_OPTION("MdiCaptionActive",113,125,190,KviOption_sectFlagMdi),
-	COLOR_OPTION("MdiCaptionInactive",180,180,180,KviOption_sectFlagMdi),
-	COLOR_OPTION("CaptionTextActive",255,255,255,KviOption_sectFlagWindows),
-	COLOR_OPTION("CaptionTextActive2",255,30,30,KviOption_sectFlagWindows),
-	COLOR_OPTION("CaptionTextInactive",0,0,0,KviOption_sectFlagWindows),
-	COLOR_OPTION("CaptionTextInactive2",30,30,30,KviOption_sectFlagWindows),
+	COLOR_OPTION("UserListViewAwayForeground",143,143,143,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewOwnForeground",255,255,0,KviOption_sectFlagUserListView),
+	COLOR_OPTION("UserListViewIrcOpForeground",200,0,0,KviOption_sectFlagUserListView),
+	COLOR_OPTION("NotifierBackground",255,255,255,KviOption_sectFlagNotifier),
+	COLOR_OPTION("NotifierForeground",0,0,0,KviOption_sectFlagNotifier),
+	COLOR_OPTION("NotifierTitleForeground",255,255,255,KviOption_sectFlagNotifier),
 	COLOR_OPTION("IrcViewBackground",255,255,255,KviOption_sectFlagIrcView),
 	COLOR_OPTION("InputBackgroundColor",255,255,255,KviOption_sectFlagInput),
 	COLOR_OPTION("InputSelectionBackground",0,0,0,KviOption_sectFlagInput),
@@ -502,13 +501,7 @@ KviColorOption g_colorOptionsTable[KVI_NUM_COLOR_OPTIONS]=
 	COLOR_OPTION("UserListViewUserOpForeground",0,127,178,KviOption_sectFlagUserListView),
 	COLOR_OPTION("UserListViewGrid",110,110,110,KviOption_sectFlagUserListView),
 	COLOR_OPTION("UserListViewChanOwnerForeground",81,87,111,KviOption_sectFlagUserListView),
-	COLOR_OPTION("IrcViewMarkLine",40,40,40,KviOption_sectFlagIrcView),
-	COLOR_OPTION("UserListViewAwayForeground",143,143,143,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewOwnForeground",255,255,0,KviOption_sectFlagUserListView),
-	COLOR_OPTION("UserListViewIrcOpForeground",200,0,0,KviOption_sectFlagUserListView),
-	COLOR_OPTION("NotifierBackground",255,255,255,KviOption_sectFlagNotifier),
-	COLOR_OPTION("NotifierForeground",0,0,0,KviOption_sectFlagNotifier),
-	COLOR_OPTION("NotifierTitleForeground",255,255,255,KviOption_sectFlagNotifier)
+	COLOR_OPTION("IrcViewMarkLine",40,40,40,KviOption_sectFlagIrcView)
 };
 
 
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 09528d1fa..8bc951934 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -301,7 +301,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_boolStripControlCodesInLogs 207			/* log */
 #define KviOption_boolEnableTrayIconFlashing 208
 #define KviOption_boolUseFlatClassicWindowListButtons 209
-#define KviOption_boolShowTreeWindowListHeader 210   //UNUSED
+#define KviOption_boolStripMsgTypeInLogs 210				/* log */
 #define KviOption_boolUseLevelBasedTrayNotification 211
 #define KviOption_boolMuteAllSounds 212
 #define KviOption_boolCreateMinimizedChannels 213
@@ -323,10 +323,8 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_boolUseSpecifiedSmartColorForOwnNick 229 /* interface::ircview */
 #define KviOption_boolUseFullWordHighlighting 230 /* highlight */
 #define KviOption_boolZshLikeNickCompletion 231
-#define KviOption_boolStripMsgTypeInLogs 232			/* log */
 
-//210 is unused, fell free to use it instead of adding a new one
-#define KVI_NUM_BOOL_OPTIONS 233
+#define KVI_NUM_BOOL_OPTIONS 232
 
 
 #define KVI_STRING_OPTIONS_PREFIX "string"
@@ -418,18 +416,18 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KVI_COLOR_OPTIONS_PREFIX "color"
 #define KVI_COLOR_OPTIONS_PREFIX_LEN 5
 
-#define KviOption_colorMdiBackground 0              /* ?? look & feel : gui elements : mdi manager */
-#define KviOption_colorWindowListNormalText 1                                        /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorWindowListMinimizedText 2                                     /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorWindowListHighlight1Text 3                                    /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorWindowListHighlight2Text 4                                    /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorWindowListProgressBar 5                                       /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorMdiCaptionActive 6                                         /* theme::mdicaptions */
-#define KviOption_colorMdiCaptionInactive 7                                       /* theme::mdicaptions */
-#define KviOption_colorCaptionTextActive 8                                        /* theme::mdicaptions */
-#define KviOption_colorCaptionTextActive2 9                                       /* theme::mdicaptions */
-#define KviOption_colorCaptionTextInactive 10                                     /* theme::mdicaptions */
-#define KviOption_colorCaptionTextInactive2 11                                    /* theme::mdicaptions */
+#define KviOption_colorMdiBackground 0                                            /* ?? look & feel : gui elements : mdi manager */
+#define KviOption_colorWindowListNormalText 1                                     /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorWindowListMinimizedText 2                                  /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorWindowListHighlight1Text 3                                 /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorWindowListHighlight2Text 4                                 /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorWindowListProgressBar 5                                    /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorUserListViewAwayForeground 6                               /* look & feel::interface look::userlist */
+#define KviOption_colorUserListViewOwnForeground 7                                /* look & feel::interface look::userlist */
+#define KviOption_colorUserListViewIrcOpForeground 8                              /* look & feel::interface look::userlist */
+#define KviOption_colorNotifierBackground 9                                       /* look & feel::interface look::notifier */
+#define KviOption_colorNotifierForeground 10                                      /* look & feel::interface look::notifier */
+#define KviOption_colorNotifierTitleForeground 11                                 /* look & feel::interface look::notifier */
 #define KviOption_colorIrcViewBackground 12                                       /* look & feel::interface look::ircview */
 #define KviOption_colorInputBackground 13                                         /* look & feel::interface look::input */
 #define KviOption_colorInputSelectionBackground 14                                /* look & feel::interface look::input */
@@ -453,33 +451,27 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_colorIrcToolBarAppletForegroundHighContrastInactive2 32         /* theme::tool bar applets */
 #define KviOption_colorIrcToolBarAppletForegroundHighContrastActive1 33           /* theme::tool bar applets */
 #define KviOption_colorIrcToolBarAppletForegroundHighContrastActive2 34           /* theme::tool bar applets */
-#define KviOption_colorTreeWindowListBackground 35                                   /* look & feel::interface look::WindowList::tree WindowList */
-#define KviOption_colorTreeWindowListActiveBackground 36                             /* look & feel::interface look::WindowList::tree WindowList */
-#define KviOption_colorTreeWindowListForeground 37                                   /* look & feel::interface look::WindowList::tree WindowList */
-#define KviOption_colorTreeWindowListActiveForeground 38                             /* look & feel::interface look::WindowList::tree WindowList */
-#define KviOption_colorTreeWindowListHighlight1Foreground 39                         /* look & feel::interface look::WindowList::tree WindowList */
-#define KviOption_colorTreeWindowListHighlight2Foreground 40                         /* look & feel::interface look::WindowList::tree WindowList */
-#define KviOption_colorTreeWindowListProgress 41                                     /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListBackground 35                                /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListActiveBackground 36                          /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListForeground 37                                /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListActiveForeground 38                          /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListHighlight1Foreground 39                      /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListHighlight2Foreground 40                      /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListProgress 41                                  /* look & feel::interface look::WindowList::tree WindowList */
 #define KviOption_colorUserListViewHalfOpForeground 42                            /* look & feel::interface look::userlist */
-#define KviOption_colorWindowListHighlight3Text 43                                   /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorWindowListHighlight4Text 44                                   /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorWindowListHighlight5Text 45                                   /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorTreeWindowListHighlight3Foreground 46                         /* look & feel::interface look::WindowList::tree WindowList */
-#define KviOption_colorTreeWindowListHighlight4Foreground 47                         /* look & feel::interface look::WindowList::tree WindowList */
-#define KviOption_colorTreeWindowListHighlight5Foreground 48                         /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorWindowListHighlight3Text 43                                /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorWindowListHighlight4Text 44                                /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorWindowListHighlight5Text 45                                /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorTreeWindowListHighlight3Foreground 46                      /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListHighlight4Foreground 47                      /* look & feel::interface look::WindowList::tree WindowList */
+#define KviOption_colorTreeWindowListHighlight5Foreground 48                      /* look & feel::interface look::WindowList::tree WindowList */
 #define KviOption_colorUserListViewChanAdminForeground 49                         /* look & feel::interface look::userlist */
 #define KviOption_colorUserListViewUserOpForeground 50                            /* look & feel::interface look::userlist */
 #define KviOption_colorUserListViewGrid 51                                        /* look & feel::interface look::userlist */
 #define KviOption_colorUserListViewChanOwnerForeground 52                         /* look & feel::interface look::userlist */
 #define KviOption_colorIrcViewMarkLine 53                                         /* look & feel::interface look::ircvew */
-#define KviOption_colorUserListViewAwayForeground 54                              /* look & feel::interface look::userlist */
-#define KviOption_colorUserListViewOwnForeground 55                              /* look & feel::interface look::userlist */
-#define KviOption_colorUserListViewIrcOpForeground 56                                /* look & feel::interface look::userlist */
-#define KviOption_colorNotifierBackground 57                                         /* look & feel::interface look::notifier */
-#define KviOption_colorNotifierForeground 58                                         /* look & feel::interface look::notifier */
-#define KviOption_colorNotifierTitleForeground 59                                    /* look & feel::interface look::notifier */
 
-#define KVI_NUM_COLOR_OPTIONS 60
+#define KVI_NUM_COLOR_OPTIONS 54
 
 
 
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 70383280e..d25c97bc2 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -982,12 +982,6 @@ void KviChannel::getWindowListTipText(QString & szBuffer)
 
 void KviChannel::fillCaptionBuffers()
 {
-	static QString szBegin("<nobr><font color=\"");
-	static QString szBoldBegin("\"><b>");
-	static QString szBoldEnd("</b></font> <font color=\"");
-	static QString szFontEnd("\">");
-	static QString szEnd("</font></nobr>");
-
 	if(!connection())
 	{
 		QString szDead = __tr2qs("[Dead channel]");
@@ -998,25 +992,6 @@ void KviChannel::fillCaptionBuffers()
 		m_szPlainTextCaption += " : ";
 		m_szPlainTextCaption += szDead;
 
-		m_szHtmlActiveCaption = szBegin;
-		m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-		m_szHtmlActiveCaption += szBoldBegin;
-		m_szHtmlActiveCaption += m_szName;
-		m_szHtmlActiveCaption += szBoldEnd;
-		m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name();
-		m_szHtmlActiveCaption += szFontEnd;
-		m_szHtmlActiveCaption += szDead;
-		m_szHtmlActiveCaption += szEnd;
-
-		m_szHtmlInactiveCaption = szBegin;
-		m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-		m_szHtmlInactiveCaption += szBoldBegin;
-		m_szHtmlInactiveCaption += m_szName;
-		m_szHtmlInactiveCaption += szBoldEnd;
-		m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name();
-		m_szHtmlInactiveCaption += szFontEnd;
-		m_szHtmlInactiveCaption += szDead;
-		m_szHtmlInactiveCaption += szEnd;
 		return;
 	}
 
@@ -1050,26 +1025,6 @@ void KviChannel::fillCaptionBuffers()
 
 	m_szPlainTextCaption += QChar(' ');
 	m_szPlainTextCaption += szNickOnServer;
-
-	m_szHtmlActiveCaption = szBegin;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += szBoldBegin;
-	m_szHtmlActiveCaption += m_szNameWithUserFlag;
-	m_szHtmlActiveCaption += szBoldEnd;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name();
-	m_szHtmlActiveCaption += szFontEnd;
-	m_szHtmlActiveCaption += szNickOnServer;
-	m_szHtmlActiveCaption += szEnd;
-
-	m_szHtmlInactiveCaption = szBegin;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += szBoldBegin;
-	m_szHtmlInactiveCaption += m_szNameWithUserFlag;
-	m_szHtmlInactiveCaption += szBoldEnd;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name();
-	m_szHtmlInactiveCaption += szFontEnd;
-	m_szHtmlInactiveCaption += szNickOnServer;
-	m_szHtmlInactiveCaption += szEnd;
 }
 
 void KviChannel::ownMessage(const QString & szBuffer)
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index bf45c3d1d..4a3197333 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -1144,36 +1144,10 @@ void KviConsole::fillCaptionBuffers()
 {
 	fillStatusString();
 
-	static QString begin("<nobr><font color=\"");
-	static QString boldbegin("\"><b>");
-	static QString endofbold("</b></font> <font color=\"");
-	static QString endoffont("\">");
-	static QString end("</font></nobr>");
-
 	m_szPlainTextCaption = windowName();
 	m_szPlainTextCaption += " [";
 	m_szPlainTextCaption += m_szStatusString;
 	m_szPlainTextCaption += QChar(']');
-
-	m_szHtmlActiveCaption = begin;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += boldbegin;
-	m_szHtmlActiveCaption += windowName();
-	m_szHtmlActiveCaption += endofbold;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name();
-	m_szHtmlActiveCaption += endoffont;
-	m_szHtmlActiveCaption += m_szStatusString;
-	m_szHtmlActiveCaption += end;
-
-	m_szHtmlInactiveCaption = begin;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += boldbegin;
-	m_szHtmlInactiveCaption += windowName();
-	m_szHtmlInactiveCaption += endofbold;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name();
-	m_szHtmlInactiveCaption += endoffont;
-	m_szHtmlInactiveCaption += m_szStatusString;
-	m_szHtmlInactiveCaption += end;
 }
 
 QPixmap * KviConsole::myIconPtr()
diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp
index c11db813b..d2ca0e2f7 100644
--- a/src/kvirc/ui/kvi_debugwindow.cpp
+++ b/src/kvirc/ui/kvi_debugwindow.cpp
@@ -91,23 +91,7 @@ void KviDebugWindow::loadProperties(KviConfig *cfg)
 
 void KviDebugWindow::fillCaptionBuffers()
 {
-	static QString begin("<nobr><font color=\"");
-	static QString boldbegin("\"><b>");
-	static QString end("</b></font></nobr>");
-
 	m_szPlainTextCaption = windowName();
-
-	m_szHtmlActiveCaption = begin;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += boldbegin;
-	m_szHtmlActiveCaption += windowName();
-	m_szHtmlActiveCaption += end;
-
-	m_szHtmlInactiveCaption = begin;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += boldbegin;
-	m_szHtmlInactiveCaption += windowName();
-	m_szHtmlInactiveCaption += end;
 }
 
 QPixmap * KviDebugWindow::myIconPtr()
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index be0a22c81..009e9a2b8 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -159,11 +159,9 @@ bool KviMdiChild::closeEnabled()
 	return m_bCloseEnabled;
 }
 
-void KviMdiChild::setWindowTitle(const QString & plain,const QString & xmlActive,const QString & xmlInactive)
+void KviMdiChild::setWindowTitle(const QString & plain)
 {
 	m_szPlainCaption = plain;
-	m_szXmlActiveCaption = xmlActive;
-	m_szXmlInactiveCaption = xmlInactive;
 	QMdiSubWindow::setWindowTitle(plain);
 }
 
diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h
index 679877b40..9e9d43668 100644
--- a/src/kvirc/ui/kvi_mdichild.h
+++ b/src/kvirc/ui/kvi_mdichild.h
@@ -93,10 +93,6 @@ private:
 	MdiChildState   m_LastState;
 	/// Contains the current window Icon
 	QPixmap         m_pIcon;
-	/// XML-Version of active Caption.
-	QString         m_szXmlActiveCaption;
-	/// XML-Version of inactive Caption.
-	QString         m_szXmlInactiveCaption;
 	/// Caption as plain text.
 	QString         m_szPlainCaption;
 	/// If window can be closed or not
@@ -156,25 +152,13 @@ public:
 	const QString & plainCaption() { return m_szPlainCaption; };
 
 	/**
-	* \brief Returns XML-caption string for active caption
-	* \return const QString &
-	*/
-	const QString & xmlActiveCaption() { return m_szXmlActiveCaption; };
-
-	/**
-	* \brief Returns XML-caption string for inactive caption
-	* \return const QString &
-	*/
-	const QString & xmlInactiveCaption() { return m_szXmlInactiveCaption; };
-
-	/**
 	* \brief Sets the window title
 	* \param plain Plain text of caption
 	* \param xmlActive not used
 	* \param xmlInactive not used
 	* \return void
 	*/
-	void setWindowTitle(const QString & szPlain, const QString & szXmlActive, const QString & szXmlInactive);
+	void setWindowTitle(const QString & szPlain);
 
 	/**
 	* \brief Sets the window icon
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h
index 0b9a75137..d56fa082e 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/kvi_mdimanager.h
@@ -77,7 +77,6 @@ class KviSdiButtonBox;
 class KVIRC_API KviMdiManager : public QMdiArea
 {
 	friend class KviMdiChild;
-	friend class KviMdiCaption;
 	Q_OBJECT
 public:
 	/**
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 8123e97a2..d82536f92 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -414,12 +414,6 @@ void KviQuery::notifyCommonChannels(const QString & szNick, const QString & szUs
 
 void KviQuery::fillCaptionBuffers()
 {
-	static QString szBegin("<nobr><font color=\"");
-	static QString szBoldBegin("\"><b>");
-	static QString szBoldEnd("</b></font> <font color=\"");
-	static QString szFontEnd("\">");
-	static QString szEnd("</font></nobr>");
-
 	if(!connection())
 	{
 		QString szDead = __tr2qs("[Dead query]");
@@ -428,26 +422,6 @@ void KviQuery::fillCaptionBuffers()
 		m_szPlainTextCaption += " : ";
 		m_szPlainTextCaption += szDead;
 
-		m_szHtmlActiveCaption = szBegin;
-		m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-		m_szHtmlActiveCaption += szBoldBegin;
-		m_szHtmlActiveCaption += windowName();
-		m_szHtmlActiveCaption += szBoldEnd;
-		m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name();
-		m_szHtmlActiveCaption += szFontEnd;
-		m_szHtmlActiveCaption += szDead;
-		m_szHtmlActiveCaption += szEnd;
-
-		m_szHtmlInactiveCaption = szBegin;
-		m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-		m_szHtmlInactiveCaption += szBoldBegin;
-		m_szHtmlInactiveCaption += windowName();
-		m_szHtmlInactiveCaption += szBoldEnd;
-		m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name();
-		m_szHtmlInactiveCaption += szFontEnd;
-		m_szHtmlInactiveCaption += szDead;
-		m_szHtmlInactiveCaption += szEnd;
-
 		return;
 	}
 
@@ -460,26 +434,6 @@ void KviQuery::fillCaptionBuffers()
 	m_szPlainTextCaption = windowName();
 	m_szPlainTextCaption += QChar(' ');
 	m_szPlainTextCaption += szNickOnServer;
-
-	m_szHtmlActiveCaption = szBegin;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += szBoldBegin;
-	m_szHtmlActiveCaption += windowName();
-	m_szHtmlActiveCaption += szBoldEnd;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name();
-	m_szHtmlActiveCaption += szFontEnd;
-	m_szHtmlActiveCaption += szNickOnServer;
-	m_szHtmlActiveCaption += szEnd;
-
-	m_szHtmlInactiveCaption = szBegin;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += szBoldBegin;
-	m_szHtmlInactiveCaption += windowName();
-	m_szHtmlInactiveCaption += szBoldEnd;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name();
-	m_szHtmlInactiveCaption += szFontEnd;
-	m_szHtmlInactiveCaption += szNickOnServer;
-	m_szHtmlInactiveCaption += szEnd;
 }
 
 bool KviQuery::nickChange(const QString & szOldNick, const QString & szNewNick)
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index fa88c4b05..6d17d0488 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -632,32 +632,16 @@ void KviWindow::fillCaptionBuffers()
 
 void KviWindow::fillSingleColorCaptionBuffers(const QString &szName)
 {
-	static QString p1("<nobr><font color=\"");
-	static QString p2("\"><b>");
-	static QString p3("</b></font></nobr>");
-
 	m_szPlainTextCaption = szName;
-
-	m_szHtmlActiveCaption = p1;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += p2;
-	m_szHtmlActiveCaption += szName;
-	m_szHtmlActiveCaption += p3;
-
-	m_szHtmlInactiveCaption = p1;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += p2;
-	m_szHtmlInactiveCaption += szName;
-	m_szHtmlInactiveCaption += p3;
 }
 
 void KviWindow::updateCaption()
 {
 	fillCaptionBuffers();
 	if(mdiParent())
-		mdiParent()->setWindowTitle(plainTextCaption(),htmlActiveCaption(),htmlInactiveCaption());
+		mdiParent()->setWindowTitle(m_szPlainTextCaption);
 	else
-		setWindowTitle(plainTextCaption());
+		setWindowTitle(m_szPlainTextCaption);
 	if(m_pWindowListItem)m_pWindowListItem->captionChanged();
 }
 
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index f6bac98d3..bbe667863 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -153,8 +153,6 @@ protected: // almost private: don't touch :D
 	KviWindowListItem                   * m_pWindowListItem;
 	QWidget                             * m_pFocusHandler;
 	QString                               m_szPlainTextCaption;
-	QString                               m_szHtmlActiveCaption;
-	QString                               m_szHtmlInactiveCaption;
 	KviIrcView                          * m_pIrcView;
 	KviInput                            * m_pInput;
 	QSplitter                           * m_pSplitter;
@@ -279,8 +277,6 @@ public:
 	virtual void ownMessage(const QString &){};
 	virtual void ownAction(const QString &){};
 	virtual const QString & plainTextCaption(){ return m_szPlainTextCaption; };
-	virtual const QString & htmlActiveCaption(){ return m_szHtmlActiveCaption; };
-	virtual const QString & htmlInactiveCaption(){ return m_szHtmlInactiveCaption; };
 	virtual void setFocus();
 
 	void internalOutput(KviIrcView * pView,int msg_type,const kvi_wchar_t * text,int iFlags=0);
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index d8d8a04f2..af74506fd 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -107,22 +107,6 @@ void KviCodeTesterWindow::resizeEvent(QResizeEvent *)
 void KviCodeTesterWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Script Tester","editor");
-
-	static QString p1("<nobr><font color=\"");
-	static QString p2("\"><b>");
-	static QString p3("</b></font></nobr>");
-
-	m_szHtmlActiveCaption = p1;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += p2;
-	m_szHtmlActiveCaption += m_szPlainTextCaption;
-	m_szHtmlActiveCaption += p3;
-
-	m_szHtmlInactiveCaption = p1;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += p2;
-	m_szHtmlInactiveCaption += m_szPlainTextCaption;
-	m_szHtmlInactiveCaption += p3;
 }
 
 void KviCodeTesterWindow::getConfigGroupName(QString &szName)
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index a5ff51837..621d4ab34 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -279,11 +279,6 @@ void KviDccChat::fillCaptionBuffers()
 		m_pDescriptor->szNick).arg(m_pDescriptor->szIp).arg(m_pDescriptor->szPort);
 
 	m_szPlainTextCaption = tmp;
-
-	m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),tmp.toUtf8().data());
-	m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),tmp.toUtf8().data());
 }
 
 QPixmap * KviDccChat::myIconPtr()
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 4bec06344..ac4bd6fa5 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -799,11 +799,6 @@ void KviDccVoice::fillCaptionBuffers()
 		m_pDescriptor->szLocalFileName.toUtf8().data());
 
 	m_szPlainTextCaption = tmp;
-
-	m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),tmp.ptr());
-	m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),tmp.ptr());
 }
 
 QPixmap * KviDccVoice::myIconPtr()
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index ab0819a05..5380019d3 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -559,22 +559,6 @@ void KviEventEditorWindow::resizeEvent(QResizeEvent *)
 void KviEventEditorWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Event Editor","editor");
-
-	static QString p1("<nobr><font color=\"");
-	static QString p2("\"><b>");
-	static QString p3("</b></font></nobr>");
-
-	m_szHtmlActiveCaption = p1;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += p2;
-	m_szHtmlActiveCaption += m_szPlainTextCaption;
-	m_szHtmlActiveCaption += p3;
-
-	m_szHtmlInactiveCaption = p1;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += p2;
-	m_szHtmlInactiveCaption += m_szPlainTextCaption;
-	m_szHtmlInactiveCaption += p3;
 }
 
 void KviEventEditorWindow::getConfigGroupName(QString &szName)
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index d8d5e3591..9a98af481 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -807,18 +807,6 @@ QSize KviFileTransferWindow::sizeHint() const
 void KviFileTransferWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("File Transfers","filetransferwindow");
-
-	m_szHtmlActiveCaption = "<nobr><font color=\"";
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += "\"><b>";
-	m_szHtmlActiveCaption += m_szPlainTextCaption;
-	m_szHtmlActiveCaption += "</b></font></nobr>";
-
-	m_szHtmlInactiveCaption = "<nobr><font color=\"";
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += "\"><b>";
-	m_szHtmlInactiveCaption += m_szPlainTextCaption;
-	m_szHtmlInactiveCaption += "</b></font></nobr>";
 }
 
 void KviFileTransferWindow::die()
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 71de0855d..8074c625e 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -279,18 +279,6 @@ void KviHelpWindow::resizeEvent(QResizeEvent *)
 void KviHelpWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs("Help Browser");
-
-	m_szHtmlActiveCaption = "<nobr><font color=\"";
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += "\"><b>";
-	m_szHtmlActiveCaption += m_szPlainTextCaption;
-	m_szHtmlActiveCaption += "</b></font></nobr>";
-
-	m_szHtmlInactiveCaption = "<nobr><font color=\"";
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += "\"><b>";
-	m_szHtmlInactiveCaption += m_szPlainTextCaption;
-	m_szHtmlInactiveCaption += "</b></font></nobr>";
 }
 
 
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index 3587d6046..badc4e89a 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -69,18 +69,6 @@ void KviIOGraphWindow::resizeEvent(QResizeEvent *)
 void KviIOGraphWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs("I/O Traffic Graph");
-
-	m_szHtmlActiveCaption = "<nobr><font color=\"";
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += "\"><b>";
-	m_szHtmlActiveCaption += m_szPlainTextCaption;
-	m_szHtmlActiveCaption += "</b></font></nobr>";
-
-	m_szHtmlInactiveCaption = "<nobr><font color=\"";
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += "\"><b>";
-	m_szHtmlInactiveCaption += m_szPlainTextCaption;
-	m_szHtmlInactiveCaption += "</b></font></nobr>";
 }
 
 void KviIOGraphWindow::die()
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 35613e370..923a46b2f 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -158,22 +158,6 @@ QSize KviLinksWindow::sizeHint() const
 void KviLinksWindow::fillCaptionBuffers()
 {
 	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Links for %Q [IRC Context %u]"),&m_szRootServer,m_pConsole->context()->id());
-
-	KviQString::sprintf(m_szHtmlActiveCaption,
-		__tr2qs("<nobr><font color=\"%s\"><b>Links for %Q</b></font> " \
-			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toUtf8().data(),
-		&m_szRootServer,
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toUtf8().data(),
-		m_pConsole->context()->id());
-
-	KviQString::sprintf(m_szHtmlInactiveCaption,
-		__tr2qs("<nobr><font color=\"%s\"><b>Links for %Q</b></font> " \
-			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toUtf8().data(),
-		&m_szRootServer,
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toUtf8().data(),
-		m_pConsole->context()->id());
 }
 
 void KviLinksWindow::die()
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 9352b3436..9ce19644e 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -305,20 +305,6 @@ QSize KviListWindow::sizeHint() const
 void KviListWindow::fillCaptionBuffers()
 {
 	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Channel List [IRC Context %u]"),m_pConsole->context()->id());
-
-	KviQString::sprintf(m_szHtmlActiveCaption,
-		__tr2qs("<nobr><font color=\"%s\"><b>Channel List</b></font> " \
-			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii().data(),
-		m_pConsole->context()->id());
-
-	KviQString::sprintf(m_szHtmlInactiveCaption,
-		__tr2qs("<nobr><font color=\"%s\"><b>Channel list</b></font> " \
-			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii().data(),
-		m_pConsole->context()->id());
 }
 
 void KviListWindow::die()
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index fff5c1cb3..eb94e28b6 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -205,14 +205,6 @@ void KviLogViewMDIWindow::resizeEvent(QResizeEvent *)
 void KviLogViewMDIWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview");
-
-	m_szHtmlActiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toUtf8().data());
-	m_szHtmlActiveCaption.append(m_szPlainTextCaption);
-	m_szHtmlActiveCaption.append("</b></font></nobr>");
-
-	m_szHtmlInactiveCaption = QString("<nobr><font color=\"%1\"><b>").arg(KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toUtf8().data());
-	m_szHtmlInactiveCaption.append(m_szPlainTextCaption);
-	m_szHtmlInactiveCaption.append("</b></font></nobr>");
 }
 
 void KviLogViewMDIWindow::die()
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index ecdec5347..114769457 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -256,11 +256,6 @@ KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(QWi
 	return new KviThemeTransparencyOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(QWidget * parent)
-{
-	return new KviThemeMdiCaptionsOptionsWidget(parent);
-}
-
 KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(QWidget * parent)
 {
 	return new KviThemeMdiAreaOptionsWidget(parent);
@@ -570,8 +565,6 @@ static const char * g_szName_KviThemeGeneralOptionsWidget = KVI_OPTIONS_WIDGET_N
 static const char * g_szClassName_KviThemeGeneralOptionsWidget = "KviThemeGeneralOptionsWidget";
 static const char * g_szName_KviThemeTransparencyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeTransparencyOptionsWidget;
 static const char * g_szClassName_KviThemeTransparencyOptionsWidget = "KviThemeTransparencyOptionsWidget";
-static const char * g_szName_KviThemeMdiCaptionsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeMdiCaptionsOptionsWidget;
-static const char * g_szClassName_KviThemeMdiCaptionsOptionsWidget = "KviThemeMdiCaptionsOptionsWidget";
 static const char * g_szName_KviThemeMdiAreaOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget;
 static const char * g_szClassName_KviThemeMdiAreaOptionsWidget = "KviThemeMdiAreaOptionsWidget";
 static const char * g_szName_KviThemeToolBarAppletsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeToolBarAppletsOptionsWidget;
@@ -1853,40 +1846,6 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->pChildList = 0;
 
 	e0 = new KviOptionsWidgetInstanceEntry;
-	e0->createProc = &classKviThemeMdiCaptionsOptionsWidget_createInstanceProc;
-	e0->pWidget = 0;
-	e0->szClassName = g_szClassName_KviThemeMdiCaptionsOptionsWidget;
-	e0->iIcon = KVI_OPTIONS_WIDGET_ICON_KviThemeMdiCaptionsOptionsWidget;
-	#ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviThemeMdiCaptionsOptionsWidget
-	e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviThemeMdiCaptionsOptionsWidget;
-	#else
-	e0->iPriority = 0;
-	#endif
-	#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget
-	e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget;
-	e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options");;
-	#endif
-	#ifdef KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget
-	e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget;
-	#else
-	e0->szGroup = "general";
-	#endif
-	#ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviThemeMdiCaptionsOptionsWidget
-	e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviThemeMdiCaptionsOptionsWidget;
-	#else
-	e0->bIsContainer = false;
-	#endif
-	#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeMdiCaptionsOptionsWidget
-	e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviThemeMdiCaptionsOptionsWidget;
-	#else
-	e0->bIsNotContained = false;
-	#endif
-	e0->szNameNoLocale = g_szName_KviThemeMdiCaptionsOptionsWidget;
-	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviThemeMdiCaptionsOptionsWidget,"options");
-	m_pInstanceTree->append(e0);
-	e0->pChildList = 0;
-
-	e0 = new KviOptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeMdiAreaOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeMdiAreaOptionsWidget;
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index c861c552e..63539a00d 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -152,28 +152,6 @@ void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(boo
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent)
-{
-	createLayout();
-
-	addColorSelector(0,0,0,0,__tr2qs_ctx("Active Background","options"),KviOption_colorMdiCaptionActive);
-	addColorSelector(0,1,0,1,__tr2qs_ctx("Inactive Background","options"),KviOption_colorMdiCaptionInactive);
-	addColorSelector(0,2,0,2,__tr2qs_ctx("Active Text (Primary)","options"),KviOption_colorCaptionTextActive);
-	addColorSelector(0,3,0,3,__tr2qs_ctx("Active Text (Secondary)","options"),KviOption_colorCaptionTextActive2);
-	addColorSelector(0,4,0,4,__tr2qs_ctx("Inactive Text (Primary)","options"),KviOption_colorCaptionTextInactive);
-	addColorSelector(0,5,0,5,__tr2qs_ctx("Inactive Text (Secondary)","options"),KviOption_colorCaptionTextInactive2);
-
-	addRowSpacer(0,6,0,6);
-}
-
-KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
 KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
index f21d6509e..da19fc819 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/optw_interfacelookglobal.h
@@ -70,20 +70,6 @@ protected slots:
 	void enableGlobalBackgroundPixmapSelector(bool);
 };
 
-
-#define KVI_OPTIONS_WIDGET_ICON_KviThemeMdiCaptionsOptionsWidget KVI_SMALLICON_CAPTION
-#define KVI_OPTIONS_WIDGET_NAME_KviThemeMdiCaptionsOptionsWidget __tr2qs_no_lookup("Window Captions")
-#define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiCaptionsOptionsWidget __tr2qs_no_lookup("theme,mdi")
-#define KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiCaptionsOptionsWidget "theme"
-
-class KviThemeMdiCaptionsOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-public:
-	KviThemeMdiCaptionsOptionsWidget(QWidget * parent);
-	~KviThemeMdiCaptionsOptionsWidget();
-};
-
 #define KVI_OPTIONS_WIDGET_ICON_KviThemeMdiAreaOptionsWidget KVI_SMALLICON_APPLET
 #define KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("Workspace")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("theme,mdi")
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 894083c42..69586d24a 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -1356,22 +1356,6 @@ void KviPopupEditorWindow::resizeEvent(QResizeEvent *)
 void KviPopupEditorWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Popup Editor","editor");
-
-	static QString p1("<nobr><font color=\"");
-	static QString p2("\"><b>");
-	static QString p3("</b></font></nobr>");
-
-	m_szHtmlActiveCaption = p1;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += p2;
-	m_szHtmlActiveCaption += m_szPlainTextCaption;
-	m_szHtmlActiveCaption += p3;
-
-	m_szHtmlInactiveCaption = p1;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += p2;
-	m_szHtmlInactiveCaption += m_szPlainTextCaption;
-	m_szHtmlInactiveCaption += p3;
 }
 
 
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 78724a477..5efe02d1e 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -532,23 +532,6 @@ void KviRawEditorWindow::resizeEvent(QResizeEvent *)
 void KviRawEditorWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Raw Editor","editor");
-
-	static QString p1("<nobr><font color=\"");
-	static QString p2("\"><b>");
-	static QString p3("</b></font></nobr>");
-
-	m_szHtmlActiveCaption = p1;
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += p2;
-	m_szHtmlActiveCaption += m_szPlainTextCaption;
-	m_szHtmlActiveCaption += p3;
-
-	m_szHtmlInactiveCaption = p1;
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += p2;
-	m_szHtmlInactiveCaption += m_szPlainTextCaption;
-	m_szHtmlInactiveCaption += p3;
-
 }
 
 void KviRawEditorWindow::getConfigGroupName(QString &szName)
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 67d9f4054..c1c3507bb 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -701,19 +701,6 @@ QSize KviSharedFilesWindow::sizeHint() const
 void KviSharedFilesWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Shared Files","sharedfileswindow");
-
-	m_szHtmlActiveCaption = "<nobr><font color=\"";
-	m_szHtmlActiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name();
-	m_szHtmlActiveCaption += "\"><b>";
-	m_szHtmlActiveCaption += m_szPlainTextCaption;
-	m_szHtmlActiveCaption += "</b></font></nobr>";
-
-	m_szHtmlInactiveCaption = "<nobr><font color=\"";
-	m_szHtmlInactiveCaption += KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name();
-	m_szHtmlInactiveCaption += "\"><b>";
-	m_szHtmlInactiveCaption += m_szPlainTextCaption;
-	m_szHtmlInactiveCaption += "</b></font></nobr>";
-
 }
 
 void KviSharedFilesWindow::die()
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index 4d88b309c..4a2db776b 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -81,20 +81,6 @@ void KviSocketSpyWindow::getBaseLogFileName(QString &buffer)
 void KviSocketSpyWindow::fillCaptionBuffers()
 {
 	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Socket Spy [IRC Context %u]"),m_pConsole->context()->id());
-
-	KviQString::sprintf(m_szHtmlActiveCaption,
-		__tr2qs("<nobr><font color=\"%s\"><b>Socket Spy</b></font> " \
-			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii().data(),
-		m_pConsole->context()->id());
-
-	KviQString::sprintf(m_szHtmlInactiveCaption,
-		__tr2qs("<nobr><font color=\"%s\"><b>Socket Spy</b></font> " \
-			"<font color=\"%s\">[IRC Context %u]</font></nobr>"),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii().data(),
-		m_pConsole->context()->id());
 }
 
 bool KviSocketSpyWindow::incomingMessage(const char * message)
diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp
index e0284ba27..d86004f36 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/termwindow.cpp
@@ -70,15 +70,6 @@
 	void KviTermWindow::fillCaptionBuffers()
 	{
 		m_szPlainTextCaption = __tr("Terminal");
-
-		m_szHtmlActiveCaption.sprintf(
-			__tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"),
-			KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),
-			KVI_OPTION_COLOR(KviOption_colorCaptionTextActive2).name().toAscii().data());
-		m_szHtmlInactiveCaption.sprintf(
-			__tr("<nobr><font color=\"%s\"><b>Terminal</b></font></nobr>"),
-			KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),
-			KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().toAscii().data());
 	}
 
 
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 86f3e6339..224c1c622 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -1159,7 +1159,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	@short:
 		Sets the caption of an user window
 	@syntax:
-		window.setWindowTitle [-q] <window_id> <plain_text_caption> [html_inactive_caption] [html_active_caption]
+		window.setWindowTitle [-q] <window_id> <plain_text_caption>
 	@switches:
 		!sw: -q | --quiet
 		Be quiet
@@ -1168,16 +1168,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 		If <window_id> is an empty string then the current window is assumed.[br]
 		The window must be of type userwnd and must have been created by [fnc]$window.open[/fnc]:
 		it is not possible to change the caption of other window types.[br]
-		If the window is not of the expected type then a warning is printed unless the -q switch is used.[br]
-		If [html_inactive_caption] and/or [html_active_caption] are given then
-		the html versions of the captions displayed in the window caption bars
-		are set too. If one of these parameters is missing then <plain_text_caption> is
-		used for the html versions too. The html captions can contain limited html code. In particular
-		you're allowed to use the &lt;nobr&gt;,&lt;font&gt;,&lt;b&gt; and &lt;i&gt; html tags.
-		It is better to avoid using colored fonts since you can't know which color scheme the
-		user will have set.[br]
-		If the windows get undocked, it will just use <plain_text_caption>, not the styled html captions.
-		If the specified window does not exist a warning is printed unless the -q switch is used.
+		If the window does not exists or is not of the expected type then a warning is printed unless the -q switch is used.[br]
 	@seealso:
 */
 
@@ -1185,14 +1176,10 @@ static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c)
 {
 	QString szWnd;
 	QString szPlain;
-	QString szInactive;
-	QString szActive;
 	KviWindow * pWnd;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window_id",KVS_PT_STRING,0,szWnd)
 		KVSM_PARAMETER("plain_text_caption",KVS_PT_STRING,0,szPlain)
-		KVSM_PARAMETER("html_inactive_caption",KVS_PT_STRING,KVS_PF_OPTIONAL,szInactive)
-		KVSM_PARAMETER("html_active_caption",KVS_PT_STRING,KVS_PF_OPTIONAL,szActive)
 	KVSM_PARAMETERS_END(c)
 
 	pWnd = g_pApp->findWindow(szWnd.toUtf8().data());
@@ -1205,7 +1192,7 @@ static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c)
 
 	if(pWnd->type() == KVI_WINDOW_TYPE_USERWINDOW)
 	{
-		((KviUserWindow *)pWnd)->setWindowTitleStrings(szPlain,szInactive,szActive);
+		((KviUserWindow *)pWnd)->setWindowTitleStrings(szPlain);
 	} else {
 		if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("The specified window is not of type \"userwnd\""));
 	}
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp
index 7a87f3e41..156c4104f 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/userwindow.cpp
@@ -94,12 +94,8 @@ void KviUserWindow::fillCaptionBuffers()
 	// nothing here
 }
 
-void KviUserWindow::setWindowTitleStrings(const QString &szPlainText,const QString &szHtmlInactive,const QString &szHtmlActive)
+void KviUserWindow::setWindowTitleStrings(const QString &szPlainText)
 {
 	m_szPlainTextCaption = szPlainText;
-	m_szHtmlActiveCaption = szHtmlActive;
-	m_szHtmlInactiveCaption = szHtmlInactive;
-	if(m_szHtmlActiveCaption.isEmpty())m_szHtmlActiveCaption = szPlainText;
-	if(m_szHtmlInactiveCaption.isEmpty())m_szHtmlInactiveCaption = szPlainText;
 	updateCaption();
 }
diff --git a/src/modules/window/userwindow.h b/src/modules/window/userwindow.h
index a658a91a1..21902aa3b 100644
--- a/src/modules/window/userwindow.h
+++ b/src/modules/window/userwindow.h
@@ -42,7 +42,7 @@ protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 public:
-	void setWindowTitleStrings(const QString &szPlainText,const QString &szHtmlInactive,const QString &szHtmlActive);
+	void setWindowTitleStrings(const QString &szPlainText);
 };
 
 #endif //!_USERWINDOW_H_