Fix numbers and strings for several KviOption defines. (#1979)

2 files changed, 11 insertions, 11 deletions

diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index ac51a0152..43bed59d2 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -135,7 +135,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS] = {
 	BOOL_OPTION("NotifyListSendUserhostForOnlineUsers", true, KviOption_sectFlagConnection),
 	BOOL_OPTION("UseIntelligentNotifyListManager", true, KviOption_sectFlagConnection | KviOption_resetRestartNotifyList),
 	BOOL_OPTION("UseWatchListIfAvailable", true, KviOption_sectFlagConnection),
-	BOOL_OPTION("UseTreeWindowList", true, KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList | KviOption_groupTheme),
+	BOOL_OPTION("UseTreeWindowListWindowList", true, KviOption_sectFlagWindowList | KviOption_resetUpdateWindowList | KviOption_groupTheme),
 	BOOL_OPTION("BindIrcIPv4ConnectionsToSpecifiedAddress", false, KviOption_sectFlagConnection),
 	BOOL_OPTION("BindIrcIPv6ConnectionsToSpecifiedAddress", false, KviOption_sectFlagConnection),
 	BOOL_OPTION("UseAntiSpamOnNotice", false, KviOption_sectFlagAntiSpam),
@@ -182,7 +182,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS] = {
 	BOOL_OPTION("ReopenQueriesAfterReconnect", true, KviOption_sectFlagFrame),
 	BOOL_OPTION("EnableQueryTracing", true, KviOption_sectFlagConnection),
 	BOOL_OPTION("OperatorMessagesToActiveWindow", false, KviOption_sectFlagConnection),
-	BOOL_OPTION("InviteToActiveWindow", true, KviOption_sectFlagConnection),
+	BOOL_OPTION("InvitesToActiveWindow", true, KviOption_sectFlagConnection),
 	BOOL_OPTION("ShowChannelUserFlagInPrivmsgView", true, KviOption_sectFlagConnection),
 	BOOL_OPTION("DccSendFakeAddressByDefault", false, KviOption_sectFlagDcc),
 	BOOL_OPTION("UseWindowListActivityMeter", false, KviOption_sectFlagWindowList | KviOption_resetUpdateGui | KviOption_groupTheme),
@@ -213,7 +213,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS] = {
 	BOOL_OPTION("DccAddressByIrcDns", false, KviOption_sectFlagFrame),
 	BOOL_OPTION("HighlightOnlyNormalMsg", false, KviOption_sectFlagFrame),
 	BOOL_OPTION("HighlightOnlyNormalMsgQueryToo", false, KviOption_sectFlagFrame),
-	BOOL_OPTION("HighlightOnlyNormalMsgNickinChanToo", false, KviOption_sectFlagFrame),
+	BOOL_OPTION("HighlightOnlyNormalMsgHighlightInChanToo", false, KviOption_sectFlagFrame),
 	BOOL_OPTION("HighlightOnlyAtCustomHighlightLevel", false, KviOption_sectFlagFrame),
 	BOOL_OPTION("DccBrokenBouncerHack", false, KviOption_sectFlagDcc),
 	BOOL_OPTION("ExternalMessagesToActiveWindow", true, KviOption_sectFlagConnection),
@@ -474,7 +474,7 @@ KviColorOption g_colorOptionsTable[KVI_NUM_COLOR_OPTIONS] = {
 	COLOR_OPTION("NotifierForeground", 0, 0, 0, 255, KviOption_sectFlagNotifier),
 	COLOR_OPTION("NotifierTitleForeground", 255, 255, 255, 255, KviOption_sectFlagNotifier),
 	COLOR_OPTION("IrcViewBackground", 255, 255, 255, 255, KviOption_sectFlagIrcView),
-	COLOR_OPTION("InputBackgroundColor", 255, 255, 255, 255, KviOption_sectFlagInput),
+	COLOR_OPTION("InputBackground", 255, 255, 255, 255, KviOption_sectFlagInput),
 	COLOR_OPTION("InputSelectionBackground", 0, 0, 0, 255, KviOption_sectFlagInput),
 	COLOR_OPTION("InputSelectionForeground", 255, 255, 255, 255, KviOption_sectFlagInput),
 	COLOR_OPTION("InputCursor", 0, 0, 0, 255, KviOption_sectFlagInput),
@@ -846,7 +846,7 @@ static const char * options_section_table[KVI_NUM_OPTION_SECT_FLAGS] = {
 	"User", "UserListView", "Label", "Modules",
 	"Ctcp", "Dcc", "Gui", "IrcToolBar",
 	"Logging", "AntiSpam", "Avatar", "Url",
-	"Recent", "Geometry"
+	"Recent", "Geometry", "Notifier"
 };
 
 static void config_set_section(int flag, KviConfigurationFile * cfg)
diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h
index 01046e4ed..7e218536c 100644
--- a/src/kvirc/kernel/KviOptions.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -157,7 +157,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption, QStringList)
 #define KviOption_boolAutoLogQueries 66                                        /* ircengine::logging */
 #define KviOption_boolAutoLogChannels 67                                       /* ircendine::logging */
 #define KviOption_boolAutoLogDccChat 68                                        /* ircengine::logging */
-#define KviOption_boolAutoLogConsole 79                                        /* ircengine::logging */
+#define KviOption_boolAutoLogConsole 69                                        /* ircengine::logging */
 #define KviOption_boolSilentAntiSpam 70                                        /* ircengine::antispam */
 #define KviOption_boolUseIncomingDccMediaTypeSavePath 71                       /* dcc::send */
 #define KviOption_boolNotifyListSendUserhostForOnlineUsers 72                  /* ircengine::notifylist */
@@ -187,7 +187,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption, QStringList)
 #define KviOption_boolColorNicks 96                                            /* interface::features::components::ircview */
 #define KviOption_boolBoldedNicks 97                                           /* interface::features::components::ircview */
 #define KviOption_boolDccListenOnSpecifiedInterfaceByDefault 98                /* dcc */
-#define KviOption_boolChangeNickAway 199                                       /* ircengine::away */
+#define KviOption_boolChangeNickAway 99                                        /* ircengine::away */
 #define KviOption_boolAutoGeneratedAwayNick 100                                /* ircengine::away */
 #define KviOption_boolExitAwayOnInput 101                                      /* ircengine::away */
 #define KviOption_boolAlwaysHighlightNick 102                                  /* ircengine::outputcontrol::highlighting */
@@ -417,7 +417,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption, QStringList)
 #define KviOption_stringDefaultSrvEncoding 56                                  /* server encoding */ // empty string means guess from locale
 #define KviOption_stringLogsPath 57                                            /* logfolder */
 #define KviOption_stringLogsDynamicPath 58                                     /* logfolder */
-#define KviOption_stringLogsExportPath 69                                      /* logview module log export */
+#define KviOption_stringLogsExportPath 59                                      /* logview module log export */
 
 #define KVI_NUM_STRING_OPTIONS 60
 
@@ -478,7 +478,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption, QStringList)
 #define KviOption_colorTreeWindowListProgress 36                               /* look & feel::interface look::WindowList::tree WindowList */
 #define KviOption_colorUserListViewHalfOpForeground 37                         /* look & feel::interface look::userlist */
 #define KviOption_colorWindowListHighlight3Text 38                             /* look & feel::interface look::WindowList::classic WindowList */
-#define KviOption_colorWindowListHighlight4Text 49                             /* look & feel::interface look::WindowList::classic WindowList */
+#define KviOption_colorWindowListHighlight4Text 39                             /* look & feel::interface look::WindowList::classic WindowList */
 #define KviOption_colorWindowListHighlight5Text 40                             /* look & feel::interface look::WindowList::classic WindowList */
 #define KviOption_colorTreeWindowListHighlight3Foreground 41                   /* look & feel::interface look::WindowList::tree WindowList */
 #define KviOption_colorTreeWindowListHighlight4Foreground 42                   /* look & feel::interface look::WindowList::tree WindowList */
@@ -688,8 +688,8 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST
 #define KviOption_sectFlagNone 0
 #define KviOption_sectFlagFrame 1
 #define KviOption_sectFlagMdi 2
-#define KviOption_sectFlagWindowList 3
-#define KviOption_sectFlagWindows 4
+#define KviOption_sectFlagWindows 3
+#define KviOption_sectFlagWindowList 4
 #define KviOption_sectFlagIrcView 5
 #define KviOption_sectFlagMsgType 6
 #define KviOption_sectFlagMircColor 7