diff options
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | src/kvilib/ext/KviOsInfo.cpp | 31 | ||||
| -rw-r--r-- | src/kvirc/kernel/KviApplication_filesystem.cpp | 10 | ||||
| -rw-r--r-- | src/modules/options/OptionsInstanceManager.cpp | 80 |
4 files changed, 75 insertions, 48 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 20d7c2b01..00dc2e79b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -119,7 +119,7 @@ build_script: - c:\cygwin\bin\ls -l release/ - ps: | $env:Path += ";c:/Qt/$env:qt_ver/bin" - windeployqt "--dir" "release/qt-plugins" "--libdir" "release/" "release/kvirc.exe" + windeployqt "-xml" "--dir" "release/qt-plugins" "--libdir" "release/" "release/kvirc.exe" # qt-plugins/platforms/qwindows.dll is needed during QApplication's constructor, but kvirc adds qt-plugins/ to library paths only in KviApplication::setup() # applicationDirPath() isn't available before QCoreApplication's constructor. # Alternatively, kvirc could detect its own directory without help of Qt. diff --git a/src/kvilib/ext/KviOsInfo.cpp b/src/kvilib/ext/KviOsInfo.cpp index 0ab2f453e..01973c493 100644 --- a/src/kvilib/ext/KviOsInfo.cpp +++ b/src/kvilib/ext/KviOsInfo.cpp @@ -48,7 +48,7 @@ typedef BOOL (WINAPI *PGETPRODUCTINFO)(DWORD,DWORD,DWORD,DWORD,PDWORD); #define BUFSIZE 1024 -// stolen from WinNT.h (last updated from 8.1 SDK) +// stolen from WinNT.h (last updated from 10.0.10240.0 SDK) // // Product types // This list grows with each OS release. @@ -165,8 +165,28 @@ typedef BOOL (WINAPI *PGETPRODUCTINFO)(DWORD,DWORD,DWORD,DWORD,PDWORD); #define PRODUCT_EMBEDDED_INDUSTRY_E_EVAL 0x0000006A #define PRODUCT_EMBEDDED_EVAL 0x0000006B #define PRODUCT_EMBEDDED_E_EVAL 0x0000006C -#define PRODUCT_CORE_SERVER 0x0000006D +#define PRODUCT_NANO_SERVER 0x0000006D #define PRODUCT_CLOUD_STORAGE_SERVER 0x0000006E +#define PRODUCT_CORE_CONNECTED 0x0000006F +#define PRODUCT_PROFESSIONAL_STUDENT 0x00000070 +#define PRODUCT_CORE_CONNECTED_N 0x00000071 +#define PRODUCT_PROFESSIONAL_STUDENT_N 0x00000072 +#define PRODUCT_CORE_CONNECTED_SINGLELANGUAGE 0x00000073 +#define PRODUCT_CORE_CONNECTED_COUNTRYSPECIFIC 0x00000074 +#define PRODUCT_CONNECTED_CAR 0x00000075 +#define PRODUCT_INDUSTRY_HANDHELD 0x00000076 +#define PRODUCT_PPI_PRO 0x00000077 +#define PRODUCT_ARM64_SERVER 0x00000078 +#define PRODUCT_EDUCATION 0x00000079 +#define PRODUCT_EDUCATION_N 0x0000007A +#define PRODUCT_IOTUAP 0x0000007B +#define PRODUCT_CLOUD_HOST_INFRASTRUCTURE_SERVER 0x0000007C +#define PRODUCT_ENTERPRISE_S 0x0000007D +#define PRODUCT_ENTERPRISE_S_N 0x0000007E +#define PRODUCT_PROFESSIONAL_S 0x0000007F +#define PRODUCT_PROFESSIONAL_S_N 0x00000080 +#define PRODUCT_ENTERPRISE_S_EVALUATION 0x00000081 +#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x00000082 #define PRODUCT_UNLICENSED 0xABCDABCD @@ -209,6 +229,13 @@ static QString queryWinInfo(QueryInfo info) case VER_PLATFORM_WIN32_NT: // Test for the specific product. + if ( osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 ) + { + if( osvi.wProductType == VER_NT_WORKSTATION ) + szVersion+= "Windows 10 "; + else szVersion+="Windows Server 2016"; + } + if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 3 ) { if( osvi.wProductType == VER_NT_WORKSTATION ) diff --git a/src/kvirc/kernel/KviApplication_filesystem.cpp b/src/kvirc/kernel/KviApplication_filesystem.cpp index 2063150d4..a098a3dbf 100644 --- a/src/kvirc/kernel/KviApplication_filesystem.cpp +++ b/src/kvirc/kernel/KviApplication_filesystem.cpp @@ -96,7 +96,7 @@ void KviApplication::getGlobalKvircDirectory(QString &szData,KvircSubdir dir,con case Tmp : qDebug("WARNING Global tmp directory requested!"); break; case Themes : szData.append("themes"); break; case Classes : szData.append("classes"); break; - case SmallIcons : szData.append("pics"KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; + case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; } if(!appendFile.isEmpty()) @@ -119,8 +119,8 @@ void KviApplication::getLocalKvircDirectory(QString &szData,KvircSubdir dir,cons case Pics : szData.append("pics"); break; case EasyPlugins : szData.append("easyplugins"); break; case Config : szData.append("config"); break; - case ConfigPlugins : szData.append("config"KVI_PATH_SEPARATOR"modules"); break; - case ConfigScripts : szData.append("config"KVI_PATH_SEPARATOR"scripts"); break; + case ConfigPlugins : szData.append("config" KVI_PATH_SEPARATOR "modules"); break; + case ConfigScripts : szData.append("config" KVI_PATH_SEPARATOR "scripts"); break; case Log : szData = KVI_OPTION_STRING(KviOption_stringLogsPath); // we should take special care here @@ -176,7 +176,7 @@ void KviApplication::getLocalKvircDirectory(QString &szData,KvircSubdir dir,cons } } break; - case HelpEN : szData.append("help"KVI_PATH_SEPARATOR"en"); break; + case HelpEN : szData.append("help" KVI_PATH_SEPARATOR "en"); break; case HelpNoIntl : szData.append("help"); break; case Audio : szData.append("audio"); break; case Scripts : szData.append("scripts"); break; @@ -193,7 +193,7 @@ void KviApplication::getLocalKvircDirectory(QString &szData,KvircSubdir dir,cons case Themes : szData.append("themes"); break; case DefScript : szData.append("defscript"); /* should never happen! */ break; case Classes : szData.append("classes"); break; - case SmallIcons : szData.append("pics"KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; + case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; } if(bCreateIfNeeded)KviFileUtils::makeDir(szData); diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp index 1a89d09cd..d80939ba4 100644 --- a/src/modules/options/OptionsInstanceManager.cpp +++ b/src/modules/options/OptionsInstanceManager.cpp @@ -860,7 +860,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_proxy - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_proxy; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_proxy; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy; #endif @@ -1226,7 +1226,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_mediaTypes - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_mediaTypes","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_mediaTypes; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_mediaTypes "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_mediaTypes; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_mediaTypes; #endif @@ -1300,7 +1300,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_soundGeneral - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_soundGeneral","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_soundGeneral; + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_soundGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_soundGeneral; #else e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_soundGeneral; #endif @@ -1336,7 +1336,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sounds - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sounds","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sounds; + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sounds "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sounds; #else e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sounds; #endif @@ -1372,7 +1372,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textEncoding - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textEncoding","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textEncoding; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textEncoding "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textEncoding; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textEncoding; #endif @@ -1408,7 +1408,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser; #endif @@ -1444,7 +1444,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers; #endif @@ -1662,7 +1662,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputLook - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputLook","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputLook; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputLook "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputLook; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputLook; #endif @@ -1772,7 +1772,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifier - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifier","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifier; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifier "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifier; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifier; #endif @@ -1808,7 +1808,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray; #endif @@ -2064,7 +2064,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircOutput - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircOutput","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircOutput; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircOutput "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircOutput; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircOutput; #endif @@ -2100,7 +2100,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_protection - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_protection; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_protection; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection; #endif @@ -2210,7 +2210,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ignore - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ignore","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ignore; + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ignore "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ignore; #else e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ignore; #endif @@ -2246,7 +2246,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_query - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_query","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_query; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_query "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_query; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_query; #endif @@ -2539,7 +2539,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_lag - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_lag","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_lag; + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_lag "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_lag; #else e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_lag; #endif @@ -2575,7 +2575,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_logging - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_logging","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_logging; + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_logging "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_logging; #else e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_logging; #endif @@ -2611,7 +2611,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_nickServ - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_nickServ","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_nickServ; + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_nickServ "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_nickServ; #else e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_nickServ; #endif @@ -2647,7 +2647,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify; + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify; #else e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify; #endif @@ -2683,7 +2683,7 @@ OptionsInstanceManager::OptionsInstanceManager() e2->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons; + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons; #else e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons; #endif @@ -2719,7 +2719,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewTheme - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewTheme","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewTheme; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewTheme "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewTheme; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewTheme; #endif @@ -2757,7 +2757,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewLook - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewLook","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewLook; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewLook "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewLook; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewLook; #endif @@ -2865,7 +2865,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_message - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_message","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_message; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_message "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_message; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_message; #endif @@ -2903,7 +2903,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_privmsg - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_privmsg; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_privmsg; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg; #endif @@ -2939,7 +2939,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_timestamp - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_timestamp","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_timestamp; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_timestamp "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_timestamp; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_timestamp; #endif @@ -2975,7 +2975,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_messageColors - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_messageColors","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_messageColors; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_messageColors "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_messageColors; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_messageColors; #endif @@ -3011,7 +3011,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_standardColors - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_standardColors","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_standardColors; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_standardColors "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_standardColors; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_standardColors; #endif @@ -3047,7 +3047,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifierLook - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifierLook","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifierLook; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifierLook "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifierLook; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifierLook; #endif @@ -3083,7 +3083,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_servers - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_servers","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_servers; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_servers "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_servers; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_servers; #endif @@ -3119,7 +3119,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_theme - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_theme","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_theme; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_theme "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_theme; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_theme; #endif @@ -3155,7 +3155,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeTransparency - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeTransparency","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeTransparency; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeTransparency "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeTransparency; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeTransparency; #endif @@ -3191,7 +3191,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeToolBarApplets - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeToolBarApplets","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeToolBarApplets; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeToolBarApplets "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeToolBarApplets; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeToolBarApplets; #endif @@ -3227,7 +3227,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_topicLabel - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_topicLabel","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_topicLabel; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_topicLabel "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_topicLabel; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_topicLabel; #endif @@ -3263,7 +3263,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userList - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userList","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userList; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userList "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userList; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userList; #endif @@ -3301,7 +3301,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground; #endif @@ -3337,7 +3337,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListForeground - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListForeground","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListForeground; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListForeground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListForeground; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListForeground; #endif @@ -3373,7 +3373,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListGrid - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListGrid","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListGrid; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListGrid "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListGrid; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListGrid; #endif @@ -3409,7 +3409,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListFeatures - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListFeatures","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListFeatures; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListFeatures; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListFeatures; #endif @@ -3445,7 +3445,7 @@ OptionsInstanceManager::OptionsInstanceManager() e0->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowList - e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowList","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowList; + e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowList "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowList; #else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowList; #endif @@ -3483,7 +3483,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTree - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTree","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTree; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTree "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTree; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTree; #endif @@ -3629,7 +3629,7 @@ OptionsInstanceManager::OptionsInstanceManager() e1->iPriority = 0; #endif #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListClassic - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListClassic","KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListClassic; + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListClassic "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListClassic; #else e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListClassic; #endif |