implemented #102;

splitted optw_irc;
added doxygen comments;
bumped sources date;
update ChangeLog and TODO;
fixes around;


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

11 files changed, 356 insertions, 261 deletions

diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 855b07bc7..099b14c50 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1012,8 +1012,8 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 	{
 		if(ch->hasChannelLimit())
 		{
-			lim=ch->channelLimit().ptr();
-			limit=lim.toInt();
+			lim = ch->channelLimit().toUtf8().data();
+			limit = lim.toInt();
 		}
 		c->returnValue()->setInteger(limit);
 	}
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index 0afe2d7f1..e80fab100 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -161,7 +161,7 @@ KVIRC_MODULE(
 	"KVIrc Log Viewer Widget",
 	"4.0.0",
 	"Juanjo Alvarez <juanjux@yahoo.es>",
-	"An structured log file viewer",
+	"A structured log file viewer",
 	logview_module_init,
 	logview_module_can_unload,
 	0,
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 181a5d184..edf3da0c8 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -411,7 +411,7 @@ KviLogFile::KviLogFile(const QString& name)
 		szTmpName.chop(3);
 	}
 	QString typeToken = szTmpName.section('_',0,0);
-    // Ignore non-logs files, this includes '.' and '..'
+	// Ignore non-logs files, this includes '.' and '..'
 	if( KviQString::equalCI(typeToken,"channel") )
 		m_type = Channel;
 	else if( KviQString::equalCI(typeToken,"console") )
diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
index 5993b9119..3312c8a0d 100644
--- a/src/modules/options/CMakeLists.txt
+++ b/src/modules/options/CMakeLists.txt
@@ -6,6 +6,7 @@ SET(kvioptions_MOC_HDRS
 	instances.h
 	optw_antispam.h
 	optw_avatar.h
+	optw_channel.h
 	optw_connection.h
 	optw_ctcp.h
 	optw_ctcpfloodprotection.h
@@ -50,6 +51,7 @@ SET(kvioptions_SRCS
 	instances.cpp
 	optw_antispam.cpp
 	optw_avatar.cpp
+	optw_channel.cpp
 	optw_connection.cpp
 	optw_ctcp.cpp
 	optw_ctcpfloodprotection.cpp
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index 04819033c..80999eec4 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -33,6 +33,7 @@
 #include "optw_antispam.h"
 #include "optw_avatar.h"
 #include "optw_away.h"
+#include "optw_channel.h"
 #include "optw_connection.h"
 #include "optw_ctcp.h"
 #include "optw_ctcpfloodprotection.h"
@@ -89,6 +90,21 @@ KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(QWidget * parent
 	return new KviAwayOptionsWidget(parent);
 }
 
+KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(QWidget * parent)
+{
+	return new KviChannelOptionsWidget(parent);
+}
+
+KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(QWidget * parent)
+{
+	return new KviChannelGeneralOptionsWidget(parent);
+}
+
+KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
+{
+	return new KviChannelAdvancedOptionsWidget(parent);
+}
+
 KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(QWidget * parent)
 {
 	return new KviConnectionOptionsWidget(parent);
@@ -264,21 +280,6 @@ KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(QWidget *
 	return new KviIrcAdvancedOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(QWidget * parent)
-{
-	return new KviChannelOptionsWidget(parent);
-}
-
-KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(QWidget * parent)
-{
-	return new KviChannelGeneralOptionsWidget(parent);
-}
-
-KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
-{
-	return new KviChannelAdvancedOptionsWidget(parent);
-}
-
 KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(QWidget * parent)
 {
 	return new KviIrcOutputOptionsWidget(parent);
@@ -492,6 +493,12 @@ static const char * g_szName_KviAvatarAdvancedOptionsWidget = KVI_OPTIONS_WIDGET
 static const char * g_szClassName_KviAvatarAdvancedOptionsWidget = "KviAvatarAdvancedOptionsWidget";
 static const char * g_szName_KviAwayOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAwayOptionsWidget;
 static const char * g_szClassName_KviAwayOptionsWidget = "KviAwayOptionsWidget";
+static const char * g_szName_KviChannelOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget;
+static const char * g_szClassName_KviChannelOptionsWidget = "KviChannelOptionsWidget";
+static const char * g_szName_KviChannelGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget;
+static const char * g_szClassName_KviChannelGeneralOptionsWidget = "KviChannelGeneralOptionsWidget";
+static const char * g_szName_KviChannelAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget;
+static const char * g_szClassName_KviChannelAdvancedOptionsWidget = "KviChannelAdvancedOptionsWidget";
 static const char * g_szName_KviConnectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviConnectionOptionsWidget;
 static const char * g_szClassName_KviConnectionOptionsWidget = "KviConnectionOptionsWidget";
 static const char * g_szName_KviConnectionAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviConnectionAdvancedOptionsWidget;
@@ -562,12 +569,6 @@ static const char * g_szName_KviIrcGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAM
 static const char * g_szClassName_KviIrcGeneralOptionsWidget = "KviIrcGeneralOptionsWidget";
 static const char * g_szName_KviIrcAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcAdvancedOptionsWidget;
 static const char * g_szClassName_KviIrcAdvancedOptionsWidget = "KviIrcAdvancedOptionsWidget";
-static const char * g_szName_KviChannelOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget;
-static const char * g_szClassName_KviChannelOptionsWidget = "KviChannelOptionsWidget";
-static const char * g_szName_KviChannelGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget;
-static const char * g_szClassName_KviChannelGeneralOptionsWidget = "KviChannelGeneralOptionsWidget";
-static const char * g_szName_KviChannelAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget;
-static const char * g_szClassName_KviChannelAdvancedOptionsWidget = "KviChannelAdvancedOptionsWidget";
 static const char * g_szName_KviIrcOutputOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcOutputOptionsWidget;
 static const char * g_szClassName_KviIrcOutputOptionsWidget = "KviIrcOutputOptionsWidget";
 static const char * g_szName_KviIrcViewThemeOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewThemeOptionsWidget;
@@ -1941,74 +1942,6 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->pChildList->setAutoDelete(true);
 
 		e1 = new KviOptionsWidgetInstanceEntry;
-		e1->createProc = &classKviIrcGeneralOptionsWidget_createInstanceProc;
-		e1->pWidget = 0;
-		e1->szClassName = g_szClassName_KviIrcGeneralOptionsWidget;
-		e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcGeneralOptionsWidget;
-		#ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcGeneralOptionsWidget
-		e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcGeneralOptionsWidget;
-		#else
-		e1->iPriority = 0;
-		#endif
-		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcGeneralOptionsWidget
-		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcGeneralOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
-		#endif
-		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcGeneralOptionsWidget
-		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcGeneralOptionsWidget;
-		#else
-		e1->szGroup = "general";
-		#endif
-		#ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcGeneralOptionsWidget
-		e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcGeneralOptionsWidget;
-		#else
-		e1->bIsContainer = false;
-		#endif
-		#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcGeneralOptionsWidget
-		e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcGeneralOptionsWidget;
-		#else
-		e1->bIsNotContained = false;
-		#endif
-		e1->szNameNoLocale = g_szName_KviIrcGeneralOptionsWidget;
-		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcGeneralOptionsWidget,"options");
-		e0->pChildList->append(e1);
-		e1->pChildList = 0;
-
-		e1 = new KviOptionsWidgetInstanceEntry;
-		e1->createProc = &classKviIrcAdvancedOptionsWidget_createInstanceProc;
-		e1->pWidget = 0;
-		e1->szClassName = g_szClassName_KviIrcAdvancedOptionsWidget;
-		e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcAdvancedOptionsWidget;
-		#ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcAdvancedOptionsWidget
-		e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcAdvancedOptionsWidget;
-		#else
-		e1->iPriority = 0;
-		#endif
-		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcAdvancedOptionsWidget
-		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcAdvancedOptionsWidget;
-		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
-		#endif
-		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcAdvancedOptionsWidget
-		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcAdvancedOptionsWidget;
-		#else
-		e1->szGroup = "general";
-		#endif
-		#ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcAdvancedOptionsWidget
-		e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcAdvancedOptionsWidget;
-		#else
-		e1->bIsContainer = false;
-		#endif
-		#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcAdvancedOptionsWidget
-		e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcAdvancedOptionsWidget;
-		#else
-		e1->bIsNotContained = false;
-		#endif
-		e1->szNameNoLocale = g_szName_KviIrcAdvancedOptionsWidget;
-		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcAdvancedOptionsWidget,"options");
-		e0->pChildList->append(e1);
-		e1->pChildList = 0;
-
-		e1 = new KviOptionsWidgetInstanceEntry;
 		e1->createProc = &classKviChannelOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviChannelOptionsWidget;
@@ -2113,6 +2046,74 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e2->pChildList = 0;
 
 		e1 = new KviOptionsWidgetInstanceEntry;
+		e1->createProc = &classKviIrcGeneralOptionsWidget_createInstanceProc;
+		e1->pWidget = 0;
+		e1->szClassName = g_szClassName_KviIrcGeneralOptionsWidget;
+		e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcGeneralOptionsWidget;
+		#ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcGeneralOptionsWidget
+		e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcGeneralOptionsWidget;
+		#else
+		e1->iPriority = 0;
+		#endif
+		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcGeneralOptionsWidget
+		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcGeneralOptionsWidget;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
+		#endif
+		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcGeneralOptionsWidget
+		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcGeneralOptionsWidget;
+		#else
+		e1->szGroup = "general";
+		#endif
+		#ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcGeneralOptionsWidget
+		e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcGeneralOptionsWidget;
+		#else
+		e1->bIsContainer = false;
+		#endif
+		#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcGeneralOptionsWidget
+		e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcGeneralOptionsWidget;
+		#else
+		e1->bIsNotContained = false;
+		#endif
+		e1->szNameNoLocale = g_szName_KviIrcGeneralOptionsWidget;
+		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcGeneralOptionsWidget,"options");
+		e0->pChildList->append(e1);
+		e1->pChildList = 0;
+
+		e1 = new KviOptionsWidgetInstanceEntry;
+		e1->createProc = &classKviIrcAdvancedOptionsWidget_createInstanceProc;
+		e1->pWidget = 0;
+		e1->szClassName = g_szClassName_KviIrcAdvancedOptionsWidget;
+		e1->iIcon = KVI_OPTIONS_WIDGET_ICON_KviIrcAdvancedOptionsWidget;
+		#ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIrcAdvancedOptionsWidget
+		e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIrcAdvancedOptionsWidget;
+		#else
+		e1->iPriority = 0;
+		#endif
+		#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcAdvancedOptionsWidget
+		e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcAdvancedOptionsWidget;
+		e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options");;
+		#endif
+		#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIrcAdvancedOptionsWidget
+		e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIrcAdvancedOptionsWidget;
+		#else
+		e1->szGroup = "general";
+		#endif
+		#ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIrcAdvancedOptionsWidget
+		e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIrcAdvancedOptionsWidget;
+		#else
+		e1->bIsContainer = false;
+		#endif
+		#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcAdvancedOptionsWidget
+		e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIrcAdvancedOptionsWidget;
+		#else
+		e1->bIsNotContained = false;
+		#endif
+		e1->szNameNoLocale = g_szName_KviIrcAdvancedOptionsWidget;
+		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcAdvancedOptionsWidget,"options");
+		e0->pChildList->append(e1);
+		e1->pChildList = 0;
+
+		e1 = new KviOptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcOutputOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcOutputOptionsWidget;
diff --git a/src/modules/options/optw_channel.cpp b/src/modules/options/optw_channel.cpp
new file mode 100644
index 000000000..f7a752350
--- /dev/null
+++ b/src/modules/options/optw_channel.cpp
@@ -0,0 +1,161 @@
+//=============================================================================
+//
+//   File : optw_channel.cpp
+//   Creation date : Sat Sep 27 19:30:02 2008 GMT by Elvio Basello
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2008 Elvio Basello (hellvis69 at netsons dot org)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//=============================================================================
+//
+// This file was originally part of optw_irc.cpp
+//
+//=============================================================================
+
+
+#include "optw_channel.h"
+
+#include "kvi_options.h"
+#include "kvi_locale.h"
+#include "kvi_settings.h"
+#include "kvi_ircmask.h"
+
+#include <QComboBox>
+
+KviChannelOptionsWidget::KviChannelOptionsWidget(QWidget * pParent)
+: KviOptionsWidget(pParent)
+{
+}
+
+KviChannelOptionsWidget::~KviChannelOptionsWidget()
+{
+}
+
+KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent)
+: KviOptionsWidget(pParent)
+{
+	createLayout();
+
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Channel Kick","options"));
+
+ 	KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Rejoin channel","options"),KviOption_boolRejoinChannelOnKick);
+	mergeTip(b,
+		__tr2qs_ctx("<center>This option will cause KVIrc to attempt " \
+		"to rejoin a channel after being kicked.</center>","options"));
+	b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnKick);
+	mergeTip(b,
+		__tr2qs_ctx("<center>This option will cause KVIrc to keep " \
+			"the channel window open after being kicked.<br>" \
+			"It might be a good idea to also enable the " \
+			"\"Rejoin channel\" option.</center>","options"));
+
+	g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("On Channel Part","options"));
+
+	b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnPart);
+	mergeTip(b,
+		__tr2qs_ctx("<center>This option will cause KVIrc to keep " \
+			"the channel window open after leaving it.</center>","options"));
+
+	b = addBoolSelector(0,2,0,2,__tr2qs_ctx("Automatically join channel on invite","options"),KviOption_boolAutoJoinOnInvite);
+	mergeTip(b,
+		__tr2qs_ctx("<center>This option will cause KVIrc to automatically " \
+			"join a channel when an INVITE message for that channel is received.<br>" \
+			"<b>Warning:</b> This may help spammers harass you. :)</center>","options"));
+
+	b = addBoolSelector(0,3,0,3, __tr2qs_ctx("Always open channels as minimized","options"),KviOption_boolCreateMinimizedChannels);
+	mergeTip(b,
+		__tr2qs_ctx("<center>This option causes newly created " \
+			"channel windows to be immediately minimized.<br>" \
+			"Enable this if you don't like channels " \
+			"popping up while you're typing something in a channel. :D</center>","options"));
+
+	addRowSpacer(0,4,0,4);
+}
+
+KviChannelGeneralOptionsWidget::~KviChannelGeneralOptionsWidget()
+{
+}
+
+
+KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pParent)
+: KviOptionsWidget(pParent)
+{
+	createLayout();
+
+	KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory);
+	
+	addLabel(0,1,0,1,__tr2qs_ctx("Default ban mask:","options"));
+	
+	m_pBanTypeCombo = new QComboBox(this);
+	addWidgetToLayout(m_pBanTypeCombo,1,1,4,1);
+	
+	KviIrcMask hostmask("nick!user@machine.host.top");
+	KviIrcMask ipmask("nick!user@192.168.1.2");
+	QString tmp1;
+	QString tmp2;
+	for(int i=0;i<=26;i++)
+	{
+		
+		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
+		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
+		m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1).arg(tmp2));
+	}
+	m_pBanTypeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
+
+	KviTalGroupBox * g = addGroupBox(0,2,4,2,Qt::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);
+ 	addBoolSelector(g,__tr2qs_ctx("Do not request invite list","options"),KviOption_boolDisableInviteListRequestOnJoin);
+	addBoolSelector(g,__tr2qs_ctx("Echo channel topic","options"),KviOption_boolEchoNumericTopic);
+	addBoolSelector(g,__tr2qs_ctx("Show channel sync time","options"),KviOption_boolShowChannelSyncTime);
+
+	b = addBoolSelector(g,__tr2qs_ctx("Paste last channel log","options"),KviOption_boolPasteLastLogOnChannelJoin);
+
+	KviTalHBox * box = new KviTalHBox(g);
+	KviUIntSelector * u = addUIntSelector(box,__tr2qs_ctx("Paste up to:","options"),KviOption_uintLinesToPasteOnChannelJoin,0,50,10,KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnChannelJoin));
+	u->setSuffix(__tr2qs_ctx(" lines","options"));
+	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 lines</b><br>Maximum value: <b>50 lines</b></center>","options"));
+	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	u = addUIntSelector(box,__tr2qs_ctx("Interval:","options"),KviOption_uintDaysIntervalToPasteOnChannelJoin,1,10,10,KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnChannelJoin));
+	u->setSuffix(__tr2qs_ctx(" days","options"));
+	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 days</b><br>Maximum value: <b>10 days</b></center>","options"));
+	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+
+ 	b = addBoolSelector(0,3,4,3,__tr2qs_ctx("Keep away list updated by sending WHO requests","options"),KviOption_boolEnableAwayListUpdates);
+	mergeTip(b,
+		__tr2qs_ctx("<center>KVIrc sends out a channel /WHO message every now and then to keep " \
+			"the channel away list in sync. Use this option to disable this feature (and to save " \
+			"your IRC bandwidth.</center>","options"));
+
+	addRowSpacer(0,5,4,5);
+}
+
+KviChannelAdvancedOptionsWidget::~KviChannelAdvancedOptionsWidget()
+{
+}
+
+void KviChannelAdvancedOptionsWidget::commit()
+{
+	KVI_OPTION_UINT(KviOption_uintDefaultBanType)=m_pBanTypeCombo->currentIndex();
+	if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)<0 )|| (KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7;
+	KviOptionsWidget::commit();
+}
+
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
+#include "m_optw_channel.moc"
+#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_channel.h b/src/modules/options/optw_channel.h
new file mode 100644
index 000000000..5ccc2c6af
--- /dev/null
+++ b/src/modules/options/optw_channel.h
@@ -0,0 +1,79 @@
+#ifndef _OPTW_CHANNEL_H_
+#define _OPTW_CHANNEL_H_
+//=============================================================================
+//
+//   File : optw_channel.h
+//   Creation date : Sat Sep 27 19:30:02 2008 GMT by Elvio Basello
+//
+//   This file is part of the KVirc irc client distribution
+//   Copyright (C) 2008 Elvio Basello (hellvis69 at netsons dot org)
+//
+//   This program is FREE software. You can redistribute it and/or
+//   modify it under the terms of the GNU General Public License
+//   as published by the Free Software Foundation; either version 2
+//   of the License, or (at your opinion) any later version.
+//
+//   This program is distributed in the HOPE that it will be USEFUL,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//   See the GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program. If not, write to the Free Software Foundation,
+//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+//=============================================================================
+//
+// This file was originally part of optw_irc.h
+//
+//=============================================================================
+
+#include "kvi_optionswidget.h"
+
+class QComboBox;
+
+#define KVI_OPTIONS_WIDGET_ICON_KviChannelOptionsWidget KVI_SMALLICON_CHANNEL
+#define KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget __tr2qs_no_lookup("Channel")
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_CONTAINER_KviChannelOptionsWidget true
+#define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelOptionsWidget true
+#define KVI_OPTIONS_WIDGET_PRIORITY_KviChannelOptionsWidget 90000
+
+class KviChannelOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+public:
+	KviChannelOptionsWidget(QWidget * parent);
+	~KviChannelOptionsWidget();
+};
+
+
+#define KVI_OPTIONS_WIDGET_ICON_KviChannelGeneralOptionsWidget KVI_SMALLICON_CHANNEL
+#define KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget __tr2qs_no_lookup("General")
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelGeneralOptionsWidget KviChannelOptionsWidget
+
+class KviChannelGeneralOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+public:
+	KviChannelGeneralOptionsWidget(QWidget * parent);
+	~KviChannelGeneralOptionsWidget();
+};
+
+#define KVI_OPTIONS_WIDGET_ICON_KviChannelAdvancedOptionsWidget KVI_SMALLICON_CHANNEL
+#define KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelAdvancedOptionsWidget KviChannelOptionsWidget
+
+class KviChannelAdvancedOptionsWidget : public KviOptionsWidget
+{
+	Q_OBJECT
+public:
+	KviChannelAdvancedOptionsWidget(QWidget * parent);
+	~KviChannelAdvancedOptionsWidget();
+public:
+	virtual void commit();
+protected:
+	QComboBox * m_pBanTypeCombo;
+};
+
+#endif // _OPTW_CHANNEL_H_
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 482ce4878..d71ad41ed 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -29,8 +29,6 @@
 #include "kvi_options.h"
 #include "kvi_ircmask.h"
 
-#include <QComboBox>
-
 
 KviIrcOptionsWidget::KviIrcOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
@@ -84,118 +82,6 @@ KviIrcAdvancedOptionsWidget::~KviIrcAdvancedOptionsWidget()
 {
 }
 
-
-KviChannelOptionsWidget::KviChannelOptionsWidget(QWidget * pParent)
-: KviOptionsWidget(pParent)
-{
-}
-
-KviChannelOptionsWidget::~KviChannelOptionsWidget()
-{
-}
-
-
-KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent)
-: KviOptionsWidget(pParent)
-{
-	createLayout();
-
-	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Channel Kick","options"));
-
- 	KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Rejoin channel","options"),KviOption_boolRejoinChannelOnKick);
-	mergeTip(b,
-		__tr2qs_ctx("<center>This option will cause KVIrc to attempt " \
-		"to rejoin a channel after being kicked.</center>","options"));
-	b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnKick);
-	mergeTip(b,
-		__tr2qs_ctx("<center>This option will cause KVIrc to keep " \
-			"the channel window open after being kicked.<br>" \
-			"It might be a good idea to also enable the " \
-			"\"Rejoin channel\" option.</center>","options"));
-
-	g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("On Channel Part","options"));
-
-	b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnPart);
-	mergeTip(b,
-		__tr2qs_ctx("<center>This option will cause KVIrc to keep " \
-			"the channel window open after leaving it.</center>","options"));
-
-	b = addBoolSelector(0,2,0,2,__tr2qs_ctx("Automatically join channel on invite","options"),KviOption_boolAutoJoinOnInvite);
-	mergeTip(b,
-		__tr2qs_ctx("<center>This option will cause KVIrc to automatically " \
-			"join a channel when an INVITE message for that channel is received.<br>" \
-			"<b>Warning:</b> This may help spammers harass you. :)</center>","options"));
-
-	b = addBoolSelector(0,3,0,3, __tr2qs_ctx("Always open channels as minimized","options"),KviOption_boolCreateMinimizedChannels);
-	mergeTip(b,
-		__tr2qs_ctx("<center>This option causes newly created " \
-			"channel windows to be immediately minimized.<br>" \
-			"Enable this if you don't like channels " \
-			"popping up while you're typing something in a channel. :D</center>","options"));
-
-	addRowSpacer(0,4,0,4);
-}
-
-KviChannelGeneralOptionsWidget::~KviChannelGeneralOptionsWidget()
-{
-}
-
-
-KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pParent)
-: KviOptionsWidget(pParent)
-{
-	createLayout();
-
-	KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory);
-	
-	addLabel(0,1,0,1,__tr2qs_ctx("Default ban mask:","options"));
-	
-	m_pBanTypeCombo=new QComboBox(this);
-	addWidgetToLayout(m_pBanTypeCombo,1,1,4,1);
-	
-	KviIrcMask hostmask("nick!user@machine.host.top");
-	KviIrcMask ipmask("nick!user@192.168.1.2");
-	QString tmp1;
-	QString tmp2;
-	for(int i=0;i<=26;i++)
-	{
-		
-		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
-		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
-		m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1).arg(tmp2));
-	}
-	m_pBanTypeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
-
-	KviTalGroupBox * g = addGroupBox(0,2,4,2,Qt::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);
- 	addBoolSelector(g,__tr2qs_ctx("Do not request invite list","options"),KviOption_boolDisableInviteListRequestOnJoin);
-
- 	b = addBoolSelector(0,3,4,3,__tr2qs_ctx("Keep away list updated by sending WHO requests","options"),KviOption_boolEnableAwayListUpdates);
-	mergeTip(b,
-		__tr2qs_ctx("<center>KVIrc sends out a channel /WHO message every now and then to keep " \
-			"the channel away list in sync. Use this option to disable this feature (and to save " \
-			"your IRC bandwidth.</center>","options"));
-
-	g = addGroupBox(0,4,4,4,Qt::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);
-
-	addRowSpacer(0,5,4,5);
-}
-
-KviChannelAdvancedOptionsWidget::~KviChannelAdvancedOptionsWidget()
-{
-}
-
-void KviChannelAdvancedOptionsWidget::commit()
-{
-	KVI_OPTION_UINT(KviOption_uintDefaultBanType)=m_pBanTypeCombo->currentIndex();
-	if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)<0 )|| (KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7;
-	KviOptionsWidget::commit();
-}
-
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_optw_irc.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_irc.h b/src/modules/options/optw_irc.h
index c33c2b81f..edf39c5e9 100644
--- a/src/modules/options/optw_irc.h
+++ b/src/modules/options/optw_irc.h
@@ -26,8 +26,6 @@
 
 #include "kvi_optionswidget.h"
 
-class QComboBox;
-
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcOptionsWidget KVI_SMALLICON_IRC
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcOptionsWidget __tr2qs_no_lookup("IRC")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOptionsWidget 80000
@@ -68,49 +66,4 @@ public:
 	~KviIrcAdvancedOptionsWidget();
 };
 
-
-#define KVI_OPTIONS_WIDGET_ICON_KviChannelOptionsWidget KVI_SMALLICON_CHANNEL
-#define KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget __tr2qs_no_lookup("Channel")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelOptionsWidget KviIrcOptionsWidget
-#define KVI_OPTIONS_WIDGET_CONTAINER_KviChannelOptionsWidget true
-#define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelOptionsWidget true
-#define KVI_OPTIONS_WIDGET_PRIORITY_KviChannelOptionsWidget 90000
-
-class KviChannelOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-public:
-	KviChannelOptionsWidget(QWidget * parent);
-	~KviChannelOptionsWidget();
-};
-
-
-#define KVI_OPTIONS_WIDGET_ICON_KviChannelGeneralOptionsWidget KVI_SMALLICON_CHANNEL
-#define KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget __tr2qs_no_lookup("General")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelGeneralOptionsWidget KviChannelOptionsWidget
-
-class KviChannelGeneralOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-public:
-	KviChannelGeneralOptionsWidget(QWidget * parent);
-	~KviChannelGeneralOptionsWidget();
-};
-
-#define KVI_OPTIONS_WIDGET_ICON_KviChannelAdvancedOptionsWidget KVI_SMALLICON_CHANNEL
-#define KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelAdvancedOptionsWidget KviChannelOptionsWidget
-
-class KviChannelAdvancedOptionsWidget : public KviOptionsWidget
-{
-	Q_OBJECT
-public:
-	KviChannelAdvancedOptionsWidget(QWidget * parent);
-	~KviChannelAdvancedOptionsWidget();
-public:
-	virtual void commit();
-protected:
-	QComboBox * m_pBanTypeCombo;
-};
-
 #endif //_OPTW_IRC_H_
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index 8a96812c2..8e88d593d 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -39,8 +39,8 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
 
 	createLayout();
 
-	KviTalGroupBox *g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Open Query For","options"));
-	KviBoolSelector *b  = addBoolSelector(g, __tr2qs_ctx("Private messages","options"),KviOption_boolCreateQueryOnPrivmsg);
+	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Open Query For","options"));
+	KviBoolSelector * b  = addBoolSelector(g, __tr2qs_ctx("Private messages","options"),KviOption_boolCreateQueryOnPrivmsg);
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option enables query window creation " \
 			"when a private message (PRIVMSG) is received.<br>" \
@@ -89,7 +89,21 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
 			"Uncheck if you think,that it wastes your query space/" \
 			"</center>","options"));
 
-	addRowSpacer(0,6,0,6);
+	b = addBoolSelector(0,6,0,6,__tr2qs_ctx("Paste last channel log","options"),KviOption_boolPasteLastLogOnQueryJoin);
+
+	KviTalHBox * box = new KviTalHBox(this);
+	addWidgetToLayout(box,0,7,1,7);
+
+	KviUIntSelector * u = addUIntSelector(box,__tr2qs_ctx("Paste up to:","options"),KviOption_uintLinesToPasteOnQueryJoin,0,50,10,KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnQueryJoin));
+	u->setSuffix(__tr2qs_ctx(" lines","options"));
+	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 lines</b><br>Maximum value: <b>50 lines</b></center>","options"));
+	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+	u = addUIntSelector(box,__tr2qs_ctx("Interval:","options"),KviOption_uintDaysIntervalToPasteOnQueryJoin,1,10,10,KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnQueryJoin));
+	u->setSuffix(__tr2qs_ctx(" days","options"));
+	mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 days</b><br>Maximum value: <b>10 days</b></center>","options"));
+	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
+
+	addRowSpacer(0,8,0,8);
 }
 
 KviQueryOptionsWidget::~KviQueryOptionsWidget()
@@ -99,4 +113,4 @@ KviQueryOptionsWidget::~KviQueryOptionsWidget()
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_optw_query.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_query.h b/src/modules/options/optw_query.h
index de939dbe2..ea1fe491e 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/optw_query.h
@@ -39,7 +39,6 @@ class KviQueryOptionsWidget : public KviOptionsWidget
 public:
 	KviQueryOptionsWidget(QWidget * parent);
 	~KviQueryOptionsWidget();
-protected: 
 };
 
-#endif //_OPTW_away_H_
+#endif //_OPTW_QUERY_H_