Allow user to prevent notices from triggering the notifier

Fixes https://svn.kvirc.de/kvirc/ticket/1476

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

4 files changed, 14 insertions, 7 deletions

diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index 4c107579d..4c33ac1a7 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -330,7 +330,8 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("CaseSensitiveHighlighting",false,KviOption_sectFlagIrcView),
 	BOOL_OPTION("MinimizeInTray",false,KviOption_sectFlagFrame | KviOption_resetUpdateGui),
 	BOOL_OPTION("DisplayNotifierOnPrimaryScreen",true,KviOption_sectFlagFrame),
-	BOOL_OPTION("ShowDialogOnChannelCtcpPage",false,KviOption_sectFlagCtcp)
+	BOOL_OPTION("ShowDialogOnChannelCtcpPage",false,KviOption_sectFlagCtcp),
+	BOOL_OPTION("PopupNotifierOnNewNotices",true,KviOption_sectFlagFrame)
 };
 
 #define STRING_OPTION(_txt,_val,_flags) KviStringOption(KVI_STRING_OPTIONS_PREFIX _txt,_val,_flags)
diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h
index 03c1eb00f..7ed1b0c5a 100644
--- a/src/kvirc/kernel/KviOptions.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -350,8 +350,9 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KviOption_boolMinimizeInTray 255                                    /* interface */
 #define KviOption_boolDisplayNotifierOnPrimaryScreen 256                 /* notifier */
 #define KviOption_boolShowDialogOnChannelCtcpPage 257
+#define KviOption_boolPopupNotifierOnNewNotices 258                      /* query */
 
-#define KVI_NUM_BOOL_OPTIONS 258
+#define KVI_NUM_BOOL_OPTIONS 259
 
 
 #define KVI_STRING_OPTIONS_PREFIX "string"
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index 8ebd2850c..4ce70e69c 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -1353,7 +1353,7 @@ output_to_query_window:
 						iFlags |= KviConsoleWindow::NoWindowFlashing;
 						query->demandAttention();
 					}
-					if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewQueryMessages))
+					if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewNotices))
 					{
 						// don't send the message twice to the notifier
 						iFlags |= KviConsoleWindow::NoNotifier;
diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index d9d113745..ddfdd227b 100644
--- a/src/modules/options/OptionsWidget_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -82,17 +82,22 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent)
 		__tr2qs_ctx("<center>This option causes a small notifier window to pop up " \
 			"in the low right corner of the screen when a new message is received " \
 			"and the KVIrc window is not active.</center>","options"));
-	b = addBoolSelector(0,5,1,5, __tr2qs_ctx("Show information about query target at the top of the query","options"),KviOption_boolShowExtendedInfoInQueryLabel);
+	b = addBoolSelector(0,5,1,5, __tr2qs_ctx("Popup notifier on new notice","options"),KviOption_boolPopupNotifierOnNewNotices);
+	mergeTip(b,
+		__tr2qs_ctx("<center>This option causes a small notifier window to pop up " \
+			"in the low right corner of the screen when a new notice is received " \
+			"and the KVIrc window is not active.</center>","options"));
+	b = addBoolSelector(0,6,1,6, __tr2qs_ctx("Show information about query target at the top of the query","options"),KviOption_boolShowExtendedInfoInQueryLabel);
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option enables query window information " \
 			"label. It can show you known information about query target at the top of the window.<br>" \
 			"Uncheck if you think,that it wastes your query space" \
 			"</center>","options"));
 
-	b = addBoolSelector(0,6,1,6,__tr2qs_ctx("Paste last query log","options"),KviOption_boolPasteLastLogOnQueryJoin);
+	b = addBoolSelector(0,7,1,7,__tr2qs_ctx("Paste last query log","options"),KviOption_boolPasteLastLogOnQueryJoin);
 
 	KviTalHBox * box = new KviTalHBox(this);
-	addWidgetToLayout(box,0,7,1,7);
+	addWidgetToLayout(box,0,8,1,8);
 
 	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"));
@@ -103,7 +108,7 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent)
 	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,1,8);
+	addRowSpacer(0,9,1,9);
 }
 
 OptionsWidget_query::~OptionsWidget_query()