implemented feature request #171

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

10 files changed, 23 insertions, 11 deletions

diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 767c98406..2ed4f3ee8 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -999,7 +999,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con
 				szMsg += szLocalFileName;
 				szMsg += ")";
 			}
-			notifierMessage(0,iIconId,Qt::escape(szMsg),30);
+			notifierMessage(0,iIconId,Qt::escape(szMsg),KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 		}
 		return;
 	}
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index 57c921770..85b895301 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -212,7 +212,7 @@ void KviNotifyListManager::notifyOnLine(const QString &nick,const QString &user,
 			szWho += nick;
 			szWho += "</b>";
 			KviQString::sprintf(szMsg,szFmt,&szWho);
-			g_pApp->notifierMessage(0,KVI_OPTION_MSGTYPE(KVI_OUT_NOTIFYONLINE).pixId(),szMsg,15);
+			g_pApp->notifierMessage(0,KVI_OPTION_MSGTYPE(KVI_OUT_NOTIFYONLINE).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 		}
 	}
 }
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index f53dbcd9b..91cb3a0a4 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -627,7 +627,8 @@ KviUIntOption g_uintOptionsTable[KVI_NUM_UINT_OPTIONS]=
 	UINT_OPTION("NotifierInactiveTransparency",40,KviOption_sectFlagFrame),
 	UINT_OPTION("IrcViewMarkerStyle",0,KviOption_sectFlagIrcView | KviOption_groupTheme),
 	UINT_OPTION("IrcViewMarkerSize",1,KviOption_sectFlagIrcView | KviOption_groupTheme),
-	UINT_OPTION("UrlMouseClickNum",2,KviOption_sectFlagUrl)
+	UINT_OPTION("UrlMouseClickNum",2,KviOption_sectFlagUrl),
+	UINT_OPTION("NotifierAutoHideTime",30,KviOption_sectFlagModules)
 };
 
 #define FONT_OPTION(_name,_face,_size,_flags) \
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 210a48740..a9de2d972 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -566,8 +566,9 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_uintIrcViewMarkerStyle 65
 #define KviOption_uintIrcViewMarkerSize 66
 #define KviOption_uintUrlMouseClickNum 67
+#define KviOption_uintNotifierAutoHideTime 68
 
-#define KVI_NUM_UINT_OPTIONS 68
+#define KVI_NUM_UINT_OPTIONS 69
 
 namespace KviIdentdOutputMode {
 	enum Mode {
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index ce99dc54e..5ec0ed867 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1441,7 +1441,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 				szMsg += "</b> ";
 				szMsg += Qt::escape(szData);
 				//debug("kvi_sp_ctcp.cpp:975 debug: %s",szMsg.data());
-				g_pApp->notifierMessage(pOut,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,90);
+				g_pApp->notifierMessage(pOut,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 			}
 		}
 	}
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index d443fa6b4..fe7827d33 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -919,7 +919,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
 						iFlags |= KviConsole::NoNotifier;
 						QString szMsg = Qt::escape(szMsgText);
 						//debug("kvi_sp_literal.cpp:908 debug: %s",szMsgText.data());
-						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,1800);
+						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYPRIVMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 					}
 				}
 				console->outputPrivmsg(query,msgtype,szNick,szUser,szHost,szMsgText,iFlags);
@@ -1273,7 +1273,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 						iFlags |= KviConsole::NoNotifier;
 						QString szMsg = Qt::escape(szMsgText);
 						//debug("kvi_sp_literal.cpp:1262 debug: %s",szMsgText.data());
-						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,1800);
+						g_pApp->notifierMessage(query,KVI_SMALLICON_QUERYNOTICE,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 					}
 				}
 
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index d29ee5937..b53b884a9 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -732,7 +732,7 @@ void KviConsole::outputPrivmsg(KviWindow *wnd,
 					szMsg += "&gt;</b> ";
 					szMsg += Qt::escape(szDecodedMessage);
 					//debug("kvi_console.cpp:629 debug: %s",szMsg.data());
-					g_pApp->notifierMessage(wnd,KVI_OPTION_MSGTYPE(iSaveType).pixId(),szMsg,90);
+					g_pApp->notifierMessage(wnd,KVI_OPTION_MSGTYPE(iSaveType).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 				}
 			}
 		}
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 65884ded4..f45157683 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1627,7 +1627,7 @@ bool KviDccFileTransfer::event(QEvent *e)
 				{
 					QString szMsg;
 					KviQString::sprintf(szMsg,__tr2qs_ctx(""));
-					g_pApp->notifierMessage(0,KVI_SMALLICON_DCCMSG,szMsg,30);
+					g_pApp->notifierMessage(0,KVI_SMALLICON_DCCMSG,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 				}
 				*/
 				if(m_pDescriptor->bRecvFile)g_pApp->fileDownloadTerminated(true,m_pDescriptor->szFileName.toUtf8().data(),m_pDescriptor->szLocalFileName.toUtf8().data(),m_pDescriptor->szNick.toUtf8().data());
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index 24f547f15..9e7bbb5e2 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -136,7 +136,7 @@ static bool notifier_kvs_cmd_message(KviKvsModuleCommandCall * c)
 		}
 	}
 	c->switches()->getAsStringIfExisting('i',"icon",szIco);
-	kvs_int_t uTime=0;
+	kvs_int_t uTime=KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime);
 	if(c->hasSwitch('t',"timeout"))
 	{
 		KviKvsVariant *time=c->getSwitch('t',"timeout");
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index fcd785c2c..26768d669 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -120,7 +120,17 @@ KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable notifier window flashing","options"),KviOption_boolNotifierFlashing);
 	addBoolSelector(0,2,0,2,__tr2qs_ctx("Enable notifier window fade effect","options"),KviOption_boolNotifierFading);
 
-	addRowSpacer(0,3,0,3);
+	KviTalGroupBox *g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Advanced configuration","options"));
+	connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
+
+	connect(b,
+		SIGNAL(toggled(bool)),
+		addUIntSelector(g,__tr2qs_ctx("Default auto hiding time for messages (0 to disable)","options"),
+				KviOption_uintNotifierAutoHideTime,
+				0,86400,30,KVI_OPTION_BOOL(KviOption_boolEnableNotifier)),
+		SLOT(setEnabled(bool)));
+
+	addRowSpacer(0,4,0,4);
 }
 
 KviNotifierOptionsWidget::~KviNotifierOptionsWidget()