Add an option to allow the use of smart nickname colours with no background (#2284)

diff --git a/src/kvilib/ext/KviNickColors.cpp b/src/kvilib/ext/KviNickColors.cpp
index 974252d1d8b9552e7cc9c41a6a25648ddc55ef02..0ab76e70a06b48f41974ff56b465362be3827ed4 100644 (file)
--- a/src/kvilib/ext/KviNickColors.cpp
+++ b/src/kvilib/ext/KviNickColors.cpp
@@ -30,12 +30,10 @@
 
 namespace KviNickColors
 {
-
-#define KVI_NUM_NICK_COLORS 95
-
        // FIXME: Maybe make this table settable via options?
        //        Or maybe a kvc file...
-       static const char * g_nickColors[KVI_NUM_NICK_COLORS] = {
+       static const int g_numNickColors = 95;
+       static const char * g_nickColors[g_numNickColors] = {
                "0,1", "0,2", "0,3", "0,4", "0,5", "0,6", "0,10", "0,12", "0,14",        //9
                "1,0", "1,4", "1,7", "1,8", "1,9", "1,11", "1,15",                       //7
                "2,0", "2,4", "2,7", "2,8", "2,9", "2,11", "2,15",                       //7
@@ -53,6 +51,10 @@ namespace KviNickColors
                "14,0", "14,8", "14,11", "14,15",                                        //4
                "15,1", "15,2", "15,3", "15,6", "15,14"                                  //5
        };
+       static const int g_numNickColorsNoBg = 8;
+       static const char * g_nickColorsNoBg[g_numNickColorsNoBg] = {
+               "2", "3", "4", "5", "6", "7", "10", "12"                                 //8
+       };
 
        int getSmartColorForNick(QString * szNick)
        {
@@ -69,9 +71,12 @@ namespace KviNickColors
                return sum;
        }
 
-       const char * getSmartColor(int iPos)
+       const char * getSmartColor(int iPos, bool bWithBg)
        {
-               return g_nickColors[iPos % KVI_NUM_NICK_COLORS];
+               if(bWithBg)
+                       return g_nickColors[iPos % g_numNickColors];
+               else
+                       return g_nickColorsNoBg[iPos % g_numNickColorsNoBg];
        }
 
        int getSmartColorIntByMircColor(unsigned char iFore, unsigned char iBack)
@@ -86,7 +91,7 @@ namespace KviNickColors
                snprintf(comb, 6, "%d,%d", iFore % 16, iBack % 16);
 #endif
                //              qDebug("Nick color %s",comb);
-               for(int i = 0; i < KVI_NUM_NICK_COLORS; ++i)
+               for(int i = 0; i < g_numNickColors; ++i)
                {
                        int numc = 0;
                        // strcmp

diff --git a/src/kvilib/ext/KviNickColors.h b/src/kvilib/ext/KviNickColors.h
index f4fdf89eaf51dfd863f84cfb66d1784eac6781a7..b29d0891c45a2feeab4aa7d098e39cac745bdcce 100644 (file)
--- a/src/kvilib/ext/KviNickColors.h
+++ b/src/kvilib/ext/KviNickColors.h
@@ -32,7 +32,7 @@ namespace KviNickColors
 {
        extern KVILIB_API int getSmartColorForNick(QString * szNick);
 
-       extern KVILIB_API const char * getSmartColor(int iPos);
+       extern KVILIB_API const char * getSmartColor(int iPos, bool bWithBg);
 
        extern KVILIB_API int getSmartColorIntByMircColor(unsigned char iFore, unsigned char iBack);
 }

diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index 92656081644723c00f93929e2714410746a26df3..f75678107d7986c103a01a3635e48feedc1e57ba 100644 (file)
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -126,7 +126,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS] = {
        BOOL_OPTION("CreateMinimizedDccSendWhenAutoAccepted", true, KviOption_sectFlagDcc),
        BOOL_OPTION("CreateMinimizedDccChatWhenAutoAccepted", true, KviOption_sectFlagDcc),
        BOOL_OPTION("DccGuessIpFromServerWhenLocalIsUnroutable", true, KviOption_sectFlagDcc),
-       BOOL_OPTION("ShowRegisteredUsersDialogAsToplevel", true, KviOption_sectFlagFrame),  //UNUSED
+       BOOL_OPTION("ColorNicksWithBackground", false, KviOption_sectFlagIrcView | KviOption_groupTheme),
        BOOL_OPTION("AutoLogQueries", true, KviOption_sectFlagLogging), /* this options enabled by default in mIRC,XChat and irssi. People are confused while they want to see logs, but see empty dir*/
        BOOL_OPTION("AutoLogChannels", true, KviOption_sectFlagLogging),
        BOOL_OPTION("AutoLogDccChat", false, KviOption_sectFlagLogging),

diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h
index 0944891b165cf6868895abcfc95285f71476f088..e22b807ea362761f014fb368882431788f3822c6 100644 (file)
--- a/src/kvirc/kernel/KviOptions.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -154,7 +154,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption, QStringList)
 #define KviOption_boolCreateMinimizedDccSendWhenAutoAccepted 62                /* dcc::send */
 #define KviOption_boolCreateMinimizedDccChatWhenAutoAccepted 63                /* dcc::chat */
 #define KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable 64             /* dcc */
-//#define KviOption_boolShowRegisteredUsersDialogAsToplevel 65                   /* interface::features::global */ //UNUSED
+#define KviOption_boolColorNicksWithBackground 65                              /* interface::features::components::ircview */
 #define KviOption_boolAutoLogQueries 66                                        /* ircengine::logging */
 #define KviOption_boolAutoLogChannels 67                                       /* ircendine::logging */
 #define KviOption_boolAutoLogDccChat 68                                        /* ircengine::logging */

diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 4f8efcacc8b1a8a919c46717a9e4025e38a34013..8e2c3b70ebca8e995d03750abd859a9e6c2ee9b7 100644 (file)
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -799,13 +799,13 @@ void KviConsoleWindow::outputPrivmsg(KviWindow * wnd,
                                        if(KVI_OPTION_BOOL(KviOption_boolUseSpecifiedSmartColorForOwnNick))
                                        {
                                                //avoid the use of the color specifier for own nickname
-                                               if(m_szOwnSmartColor == KviNickColors::getSmartColor(sum))
+                                               if(m_szOwnSmartColor == KviNickColors::getSmartColor(sum, KVI_OPTION_BOOL(KviOption_boolColorNicksWithBackground)))
                                                        sum++;
                                        }
                                        pUserEntry->setSmartNickColor(sum);
                                }
 
-                               szNick.prepend(KviNickColors::getSmartColor(sum));
+                               szNick.prepend(KviNickColors::getSmartColor(sum, KVI_OPTION_BOOL(KviOption_boolColorNicksWithBackground)));
                        }
                        else
                        {
@@ -819,10 +819,10 @@ void KviConsoleWindow::outputPrivmsg(KviWindow * wnd,
                                if(KVI_OPTION_BOOL(KviOption_boolUseSpecifiedSmartColorForOwnNick))
                                {
                                        //avoid the use of the color specifier for own nickname
-                                       if(m_szOwnSmartColor == KviNickColors::getSmartColor(sum))
+                                       if(m_szOwnSmartColor == KviNickColors::getSmartColor(sum, KVI_OPTION_BOOL(KviOption_boolColorNicksWithBackground)))
                                                sum++;
                                }
-                               szNick.prepend(KviNickColors::getSmartColor(sum));
+                               szNick.prepend(KviNickColors::getSmartColor(sum, KVI_OPTION_BOOL(KviOption_boolColorNicksWithBackground)));
                        }
                }
                szNick.prepend(KviControlCodes::Color);

diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index d9fa9cd85e486e834f2b7e3cccc4c3e2e783010b..002f88c259691baf8066fdd778a0d13880908431 100644 (file)
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -73,6 +73,8 @@ OptionsWidget_privmsg::OptionsWidget_privmsg(QWidget * parent)
 
        m_pUseSmartColorSelector = addBoolSelector(g, __tr2qs_ctx("Smart nickname colors", "options"), KviOption_boolColorNicks);
 
+       m_pUseSmartColorWithBackgroundSelector = addBoolSelector(g, __tr2qs_ctx("Use a background color for smart nickname colors", "options"), KviOption_boolColorNicksWithBackground);
+
        KviTalHBox * hb = new KviTalHBox(g);
        hb->setSpacing(4);
        m_pSpecialSmartColorSelector = addBoolSelector(hb, __tr2qs_ctx("Use specified colors for own nick:", "options"), KviOption_boolUseSpecifiedSmartColorForOwnNick, KVI_OPTION_BOOL(KviOption_boolColorNicks));
@@ -81,6 +83,7 @@ OptionsWidget_privmsg::OptionsWidget_privmsg(QWidget * parent)
 
        connect(m_pSpecialSmartColorSelector, SIGNAL(toggled(bool)), this, SLOT(enableDisableSmartColorSelector(bool)));
        connect(m_pUseSmartColorSelector, SIGNAL(toggled(bool)), m_pSpecialSmartColorSelector, SLOT(setEnabled(bool)));
+       connect(m_pUseSmartColorSelector, SIGNAL(toggled(bool)), m_pUseSmartColorWithBackgroundSelector, SLOT(setEnabled(bool)));
 
        KviBoolSelector * b2 = addBoolSelector(g, __tr2qs_ctx("Use same colors as in the userlist", "options"), KviOption_boolUseUserListColorsAsNickColors, !KVI_OPTION_BOOL(KviOption_boolColorNicks));
        connect(m_pUseSmartColorSelector, SIGNAL(toggled(bool)), b2, SLOT(setNotEnabled(bool)));

diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h
index b080edc79e49c7a6a59134aeb09dc5f77489601d..188a09389914575791d834e329eb42b19cf1a0e0 100644 (file)
--- a/src/modules/options/OptionsWidget_message.h
+++ b/src/modules/options/OptionsWidget_message.h
@@ -66,6 +66,7 @@ public:
 public:
        KviBoolSelector * m_pUseSmartColorSelector;
        KviBoolSelector * m_pSpecialSmartColorSelector;
+       KviBoolSelector * m_pUseSmartColorWithBackgroundSelector;
        KviMircTextColorSelector * m_pSmartColorSelector;
 protected slots:
        void enableDisableSmartColorSelector(bool);