From 08bd2da77d08b57f222b5877e59e58a605af0754 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sun, 9 Jan 2011 13:31:06 +0000
Subject: implemented #1067
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5321 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
src/kvirc/kernel/KviOptions.cpp | 3 ++-
src/kvirc/kernel/KviOptions.h | 3 ++-
src/kvirc/ui/KviConsoleWindow.cpp | 10 ++++++----
src/modules/options/OptionsWidget_alertsAndHighlighting.cpp | 8 +++++---
4 files changed, 15 insertions(+), 9 deletions(-)
(limited to 'src')
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index c1ec252d4..e8e30faf5 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -336,7 +336,8 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
BOOL_OPTION("EnableChannelLinkToolTip",true,KviOption_sectFlagGui),
BOOL_OPTION("EnableEscapeLinkToolTip",true,KviOption_sectFlagGui),
BOOL_OPTION("UseDBusNotifier",false,KviOption_sectFlagConnection),
- BOOL_OPTION("UseKDENotifier",false,KviOption_sectFlagConnection)
+ BOOL_OPTION("UseKDENotifier",false,KviOption_sectFlagConnection),
+ BOOL_OPTION("CaseSensitiveHighlighting",false,KviOption_sectFlagIrcView),
};
#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 5b0c0316b..097257bd7 100644
--- a/src/kvirc/kernel/KviOptions.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -345,8 +345,9 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
#define KviOption_boolEnableEscapeLinkToolTip 251 /* ircview output */
#define KviOption_boolUseDBusNotifier 252 /* notifier */
#define KviOption_boolUseKDENotifier 253 /* notifier */
+#define KviOption_boolCaseSensitiveHighlighting 254 /* highlight */
-#define KVI_NUM_BOOL_OPTIONS 254
+#define KVI_NUM_BOOL_OPTIONS 255
#define KVI_STRING_OPTIONS_PREFIX "string"
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 31d8b2793..6948534a9 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -580,11 +580,13 @@ int KviConsoleWindow::applyHighlighting(KviWindow *wnd,int type,const QString &n
QString szSource;
QString szStripMsg=KviMircCntrl::stripControlBytes(szMsg);
QRegExp rgxHlite;
+ Qt::CaseSensitivity cs = KVI_OPTION_BOOL(KviOption_boolCaseSensitiveHighlighting) ? Qt::CaseSensitive : Qt::CaseInsensitive;
+
if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection())
{
if(KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting))
{
- if(szStripMsg.contains(connection()->userInfo()->nickName()))
+ if(szStripMsg.contains(connection()->userInfo()->nickName()), cs)
return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName());
} else {
if(!szPattern.isEmpty())
@@ -599,7 +601,7 @@ int KviConsoleWindow::applyHighlighting(KviWindow *wnd,int type,const QString &n
QRegExp::escape(connection()->userInfo()->nickName())
)
);
- rgxHlite.setCaseSensitivity(Qt::CaseInsensitive);
+ rgxHlite.setCaseSensitivity(cs);
if(szStripMsg.contains(rgxHlite))
return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName());
}
@@ -615,7 +617,7 @@ int KviConsoleWindow::applyHighlighting(KviWindow *wnd,int type,const QString &n
if(KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting))
{
- if(szStripMsg.contains(*it))
+ if(szStripMsg.contains(*it), cs)
return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it);
} else {
if(!szPattern.isEmpty())
@@ -630,7 +632,7 @@ int KviConsoleWindow::applyHighlighting(KviWindow *wnd,int type,const QString &n
QRegExp::escape(*it)
)
);
- rgxHlite.setCaseSensitivity(Qt::CaseInsensitive);
+ rgxHlite.setCaseSensitivity(cs);
if(szStripMsg.contains(rgxHlite))
return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it);
}
diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
index 2ea8ec8dc..c011c1574 100644
--- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
@@ -61,8 +61,10 @@ OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent)
b = addBoolSelector(0,2,0,2,__tr2qs_ctx("Highlight messages containing my nickname","options"),KviOption_boolAlwaysHighlightNick);
mergeTip(b,__tr2qs_ctx("If this option is enabled, KVIrc will highlight any user message containing your current nickname","options"));
+ b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Words/Nick matching is case sensitive ","options"),KviOption_boolCaseSensitiveHighlighting);
+ mergeTip(b,__tr2qs_ctx("If this option is enabled, KVIrc will match your nick and/or the words you specified in a case sensitive manner","options"));
- KviTalGroupBox * gbox = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Highlighting Method","options"));
+ KviTalGroupBox * gbox = addGroupBox(0,4,0,4,Qt::Horizontal,__tr2qs_ctx("Highlighting Method","options"));
QGridLayout * g = new QGridLayout(gbox);
gbox->setLayout(g);
@@ -84,14 +86,14 @@ OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent)
connect(m_pHighlightWholeWordsOnlyRadioButton,SIGNAL(toggled(bool)),m_pWordSplitterCharactersEdit,SLOT(setEnabled(bool)));
- gbox = addGroupBox(0,4,0,4,Qt::Horizontal,__tr2qs_ctx("Alert Options","options"));
+ gbox = addGroupBox(0,5,0,5,Qt::Horizontal,__tr2qs_ctx("Alert Options","options"));
b = addBoolSelector(gbox,__tr2qs_ctx("Flash the system taskbar entry on highlighted messages","options"),KviOption_boolFlashWindowOnHighlightedMessages);
mergeTip(b,__tr2qs_ctx("If this option is enabled, KVIrc will (attempt to) flash the system taskbar entry when a highlighted message is printed and KVIrc is not the active window","options"));
b = addBoolSelector(gbox,__tr2qs_ctx("Popup the notifier window on highlighted messages","options"),KviOption_boolPopupNotifierOnHighlightedMessages);
mergeTip(b,__tr2qs_ctx("If this option is enabled, KVIrc will popup a little notifier window in the low right corner of your desktop when a highlighted message is printed and KVIrc is not the active window","options"));
- addRowSpacer(0,5,0,5);
+ addRowSpacer(0,6,0,6);
}
OptionsWidget_highlighting::~OptionsWidget_highlighting()
--
cgit v1.3.1-10-gc9f91