aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kvirc/kernel/kvi_app.cpp2
-rw-r--r--src/kvirc/kernel/kvi_ircconnection.cpp2
-rw-r--r--src/kvirc/kernel/kvi_options.cpp146
-rw-r--r--src/kvirc/kernel/kvi_options.h16
-rw-r--r--src/kvirc/kvs/kvi_kvs_popupmenu.cpp2
-rw-r--r--src/kvirc/ui/kvi_input.cpp25
-rw-r--r--src/kvirc/ui/kvi_userlistview.cpp13
-rw-r--r--src/modules/notifier/libkvinotifier.cpp4
-rw-r--r--src/modules/notifier/notifierwindow.cpp6
-rw-r--r--src/modules/options/optw_input.cpp2
-rw-r--r--src/modules/options/optw_interfacelookglobal.cpp2
-rw-r--r--src/modules/options/optw_irc.cpp2
-rw-r--r--src/modules/options/optw_notify.cpp6
-rw-r--r--src/modules/options/optw_userlist.cpp4
14 files changed, 113 insertions, 119 deletions
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 5f8a568c1..ef9e10255 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -1414,7 +1414,7 @@ void KviApp::savePopups()
void KviApp::saveInputHistory()
{
- if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))
+ if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory))
{
QString tmp;
getLocalKvircDirectory(tmp,Config,KVI_CONFIGFILE_INPUTHISTORY);
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 999349d83..539f43583 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -1349,7 +1349,7 @@ void KviIrcConnection::heartbeat(kvi_time_t tNow)
{
if(m_eState == Connected)
{
- if(!KVI_OPTION_BOOL(KviOption_boolDisableAwayListUpdates))
+ if(KVI_OPTION_BOOL(KviOption_boolEnableAwayListUpdates))
{
// update the channel WHO lists (fixes users away state)
// first of all, we send our request not more often than every 50 secs
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index e216aa156..b5c9ce863 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -232,7 +232,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
BOOL_OPTION("DisableInviteListRequestOnJoin",true,KviOption_sectFlagConnection),
BOOL_OPTION("DisableWhoRequestOnJoin",false,KviOption_sectFlagConnection),
BOOL_OPTION("ShowDockExtension",true,KviOption_sectFlagFrame),
- BOOL_OPTION("GotAdressForDccByDnsMyNick",false,KviOption_sectFlagFrame),
+ BOOL_OPTION("DccAddressByIrcDns",false,KviOption_sectFlagFrame),
BOOL_OPTION("MinimizeConsoleAfterConnect",false,KviOption_sectFlagFrame),
BOOL_OPTION("HighlightOnlyNormalMsg",false,KviOption_sectFlagFrame),
BOOL_OPTION("HighlightOnlyNormalMsgQueryToo",false,KviOption_sectFlagFrame),
@@ -254,7 +254,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
BOOL_OPTION("ShowUserListViewToolTips",true,KviOption_sectFlagConnection),
BOOL_OPTION("WhoisRepliesToActiveWindow",true,KviOption_sectFlagConnection),
BOOL_OPTION("PopupNotifierOnNotifyOnLine",true,KviOption_sectFlagConnection),
- BOOL_OPTION("ForciblyDisableNotifier",false,KviOption_sectFlagConnection),
+ BOOL_OPTION("EnableNotifier",true,KviOption_sectFlagConnection),
BOOL_OPTION("DccSendForceIdleStep",false,KviOption_sectFlagDcc),
BOOL_OPTION("StatusBarVisible",true,KviOption_sectFlagFrame),
BOOL_OPTION("TrackLastReadTextViewLine",true,KviOption_sectFlagFrame),
@@ -264,19 +264,19 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
BOOL_OPTION("LimitDccSendSpeed",false,KviOption_sectFlagDcc),
BOOL_OPTION("LimitDccRecvSpeed",false,KviOption_sectFlagDcc),
BOOL_OPTION("IgnoreModuleVersions",false,KviOption_sectFlagFrame),
- BOOL_OPTION("DisableInputHistory",false,KviOption_sectFlagInput | KviOption_resetUpdateGui),
+ BOOL_OPTION("EnableInputHistory",true,KviOption_sectFlagInput | KviOption_resetUpdateGui),
BOOL_OPTION("UseSpecialColorForTimestamp",true,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
- BOOL_OPTION("DisableAwayListUpdates",false,KviOption_sectFlagFrame),
- BOOL_OPTION("DisableAvatars",false,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
- BOOL_OPTION("DisableUserListLabel",false,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
- BOOL_OPTION("DisablePopupIcons",false,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
+ BOOL_OPTION("EnableAwayListUpdates",true,KviOption_sectFlagFrame),
+ BOOL_OPTION("ShowAvatarsInUserlist",true,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
+ BOOL_OPTION("boolShowUserListStatisticLabel",true,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
+ BOOL_OPTION("ShowIconsInPopupMenus",true,KviOption_sectFlagIrcView | KviOption_resetUpdateGui | KviOption_groupTheme),
BOOL_OPTION("ScriptErrorsToDebugWindow",false,KviOption_sectFlagFrame),
BOOL_OPTION("ShowMinimizedDebugWindow",true,KviOption_sectFlagFrame),
BOOL_OPTION("ShowExtendedInfoInQueryLabel",true,KviOption_resetUpdateGui),
BOOL_OPTION("UseUserListColorsAsNickColors",true,KviOption_sectFlagIrcView | KviOption_groupTheme),
BOOL_OPTION("GzipLogs",false,KviOption_sectFlagLogging),
BOOL_OPTION("MinimizeInTray",false,KviOption_resetUpdateGui),
- BOOL_OPTION("DisableNotifierFlashing",false,KviOption_sectFlagFrame),
+ BOOL_OPTION("NotifierFlashing",true,KviOption_sectFlagFrame),
BOOL_OPTION("CommandlineInUserFriendlyModeByDefault",false,KviOption_sectFlagFrame), // this confuses existing users and is not mentioned in the docs where there are commandline examples : we need it to be off by default for now
BOOL_OPTION("EnableVisualEffects",true,KviOption_resetUpdateGui),
BOOL_OPTION("DCCFileTransferReplaceOutgoingSpacesWithUnderscores",true,KviOption_sectFlagDcc),
@@ -304,7 +304,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
BOOL_OPTION("UseIdentServiceOnlyOnConnect",true,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
BOOL_OPTION("UseSystemUrlHandlers",true,KviOption_sectFlagUrl),
BOOL_OPTION("ScaleAvatarsOnLoad",true,KviOption_sectFlagAvatar),
- BOOL_OPTION("DisableNotifierFadein",false,KviOption_sectFlagFrame),
+ BOOL_OPTION("NotifierFading",true,KviOption_sectFlagFrame),
BOOL_OPTION("UseAntiAliasing",true,KviOption_sectFlagGui | KviOption_resetUpdateGui),
BOOL_OPTION("PickRandomIpAddressForRoundRobinServers",true,KviOption_sectFlagConnection),
BOOL_OPTION("PrependAvatarInfoToRealname",true,KviOption_sectFlagConnection),
@@ -537,11 +537,11 @@ KviPixmapOption g_pixmapOptionsTable[KVI_NUM_PIXMAP_OPTIONS]=
PIXMAP_OPTION("GlobalTransparencyBackground",KviOption_sectFlagGui | KviOption_resetUpdatePseudoTransparency | KviOption_groupTheme)
};
-//#define INT_OPTION(_name,_value,_flags)
-// {
-// KVI_INT_OPTIONS_PREFIX _name ,
-// _value ,
-// _flags
+//#define INT_OPTION(_name,_value,_flags)
+// {
+// KVI_INT_OPTIONS_PREFIX _name ,
+// _value ,
+// _flags
// }
//
//KviIntOption g_intOptionsTable[KVI_NUM_INT_OPTIONS]=
@@ -872,14 +872,14 @@ void KviApp::loadOptions()
READ_OPTIONS(KVI_NUM_STRINGLIST_OPTIONS,g_stringlistOptionsTable,readStringListEntry)
READ_OPTIONS(KVI_NUM_MIRCCOLOR_OPTIONS,g_mirccolorOptionsTable,readColorEntry)
READ_OPTIONS(KVI_NUM_ICCOLOR_OPTIONS,g_iccolorOptionsTable,readColorEntry)
-
- for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
+
+ for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
{
if(g_stringOptionsTable[i].flags & KviOption_encodePath)
KviStringConversion::decodePath(g_stringOptionsTable[i].option);
- }
+ }
- for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++)
+ for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++)
{
if(g_stringlistOptionsTable[i].flags & KviOption_encodePath)
KviStringConversion::decodePath(g_stringlistOptionsTable[i].option);
@@ -892,12 +892,12 @@ void KviApp::loadOptions()
void KviApp::saveOptions()
{
QString buffer;
-
+
saveRecentChannels();
-
+
getLocalKvircDirectory(buffer,Config,KVI_CONFIGFILE_MAIN);
KviConfig cfg(buffer,KviConfig::Write);
-
+
int i;
#define WRITE_OPTIONS(_num,_table) \
@@ -909,14 +909,14 @@ void KviApp::saveOptions()
WRITE_OPTIONS(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable)
WRITE_OPTIONS(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable)
- for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
- {
+ for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
+ {
if(g_stringOptionsTable[i].flags & KviOption_encodePath)
KviStringConversion::encodePath(g_stringOptionsTable[i].option);
}
WRITE_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable)
- for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
- {
+ for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
+ {
if(g_stringOptionsTable[i].flags & KviOption_encodePath)
KviStringConversion::decodePath(g_stringOptionsTable[i].option);
}
@@ -925,14 +925,14 @@ void KviApp::saveOptions()
WRITE_OPTIONS(KVI_NUM_UINT_OPTIONS,g_uintOptionsTable)
WRITE_OPTIONS(KVI_NUM_FONT_OPTIONS,g_fontOptionsTable)
WRITE_OPTIONS(KVI_NUM_MSGTYPE_OPTIONS,g_msgtypeOptionsTable)
- for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++)
- {
+ for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++)
+ {
if(g_stringlistOptionsTable[i].flags & KviOption_encodePath)
KviStringConversion::encodePath(g_stringlistOptionsTable[i].option);
}
WRITE_OPTIONS(KVI_NUM_STRINGLIST_OPTIONS,g_stringlistOptionsTable)
- for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++)
- {
+ for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++)
+ {
if(g_stringlistOptionsTable[i].flags & KviOption_encodePath)
KviStringConversion::decodePath(g_stringlistOptionsTable[i].option);
}
@@ -959,13 +959,13 @@ namespace KviTheme
bool save(KviThemeInfo &options)
{
QString szD = options.absoluteDirectory();
-
+
if(szD.isEmpty())
{
options.setLastError(__tr2qs("Missing absolute directory for the theme information"));
return false;
}
-
+
if(!KviFileUtils::directoryExists(szD))
{
if(!KviFileUtils::makeDir(szD))
@@ -974,25 +974,25 @@ namespace KviTheme
return false;
}
}
-
+
szD.append(KVI_PATH_SEPARATOR_CHAR);
szD.append(KVI_THEMEINFO_FILE_NAME);
-
+
if(!options.save(szD))
{
return false;
}
-
+
szD = options.absoluteDirectory();
szD.append(KVI_PATH_SEPARATOR_CHAR);
szD.append(KVI_THEMEDATA_FILE_NAME);
-
+
KviConfig cfg(szD,KviConfig::Write);
-
+
cfg.setGroup(KVI_THEMEDATA_CONFIG_GROUP);
-
+
int i;
-
+
WRITE_OPTIONS(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable)
WRITE_OPTIONS(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable)
WRITE_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable)
@@ -1003,9 +1003,9 @@ namespace KviTheme
WRITE_OPTIONS(KVI_NUM_STRINGLIST_OPTIONS,g_stringlistOptionsTable)
WRITE_OPTIONS(KVI_NUM_MIRCCOLOR_OPTIONS,g_mirccolorOptionsTable)
WRITE_OPTIONS(KVI_NUM_ICCOLOR_OPTIONS,g_iccolorOptionsTable)
-
+
#undef WRITE_OPTIONS
-
+
// the pixmap options need special processing
for(i=0;i<KVI_NUM_PIXMAP_OPTIONS;i++)
{
@@ -1018,7 +1018,7 @@ namespace KviTheme
QString szPixName = g_pixmapOptionsTable[i].name;
szPixName += ".png";
szPixPath += szPixName;
-
+
if(g_pixmapOptionsTable[i].option.pixmap()->save(szPixPath,"PNG"))
{
cfg.writeEntry(g_pixmapOptionsTable[i].name,szPixName);
@@ -1032,16 +1032,16 @@ namespace KviTheme
}
}
}
-
+
cfg.writeEntry("stringIconThemeSubdir",options.subdirectory());
-
+
// find all the "kvi_bigicon" images that we can find in the main pics directory
QString szPicsPath;
-
+
g_pApp->getGlobalKvircDirectory(szPicsPath,KviApp::Pics);
QDir d(szPicsPath);
QStringList sl = d.entryList(QDir::nameFiltersFromString("kvi_bigicon_*.png"),QDir::Files);
-
+
for(QStringList::Iterator it=sl.begin();it != sl.end();it++)
{
KviCachedPixmap * p = g_pIconManager->getPixmapWithCache(*it);
@@ -1050,7 +1050,7 @@ namespace KviTheme
QString szPixPath = options.absoluteDirectory();
szPixPath.append(KVI_PATH_SEPARATOR_CHAR);
szPixPath += *it;
-
+
if(!KviFileUtils::copyFile(p->path(),szPixPath))
{
options.setLastError(__tr2qs("Failed to save one of the theme images"));
@@ -1058,26 +1058,26 @@ namespace KviTheme
}
}
}
-
-
+
+
szD = options.absoluteDirectory();
szD.append(KVI_PATH_SEPARATOR_CHAR);
szD.append(KVI_SMALLICONS_SUBDIRECTORY);
-
+
if(!KviFileUtils::makeDir(szD))
{
options.setLastError(__tr2qs("Failed to create the theme subdirectory"));
return false;
}
-
+
// We actually need to *save* the small icons since
// we have a compatibility mode that can load them from
// the old format kvi_smallicon_XY.png multiimage libraries.
-
+
for(int j=0;j<KVI_NUM_SMALL_ICONS;j++)
{
QPixmap * pix = g_pIconManager->getSmallIcon(j);
-
+
QString szPixPath = options.absoluteDirectory();
szPixPath.append(KVI_PATH_SEPARATOR_CHAR);
szPixPath.append(KVI_SMALLICONS_SUBDIRECTORY);
@@ -1085,25 +1085,25 @@ namespace KviTheme
szPixPath.append("kcs_");
szPixPath.append(g_pIconManager->getSmallIconName(j));
szPixPath.append(".png");
-
+
if(!pix->save(szPixPath,"PNG",90))
{
options.setLastError(__tr2qs("Failed to save one of the theme images"));
return false;
}
}
-
+
return true;
}
-
+
bool load(const QString &themeDir,KviThemeInfo &buffer)
{
if(!buffer.loadFromDirectory(themeDir))
return false; // makes sure that themedata exists too
-
+
// reset the current theme subdir
KVI_OPTION_STRING(KviOption_stringIconThemeSubdir) = "";
-
+
// reset the splash screen pointer
QString szPointerFile;
g_pApp->getLocalKvircDirectory(szPointerFile,KviApp::Themes,"current-splash");
@@ -1112,16 +1112,16 @@ namespace KviTheme
QString szD = themeDir;
KviQString::ensureLastCharIs(szD,KVI_PATH_SEPARATOR_CHAR);
szD.append(KVI_THEMEDATA_FILE_NAME);
-
+
KviConfig cfg(szD,KviConfig::Read);
-
+
cfg.setGroup(KVI_THEMEDATA_CONFIG_GROUP);
-
+
int i;
int iResetFlags = 0;
-
+
#undef READ_OPTIONS
-
+
#define READ_OPTIONS(_num,_table,_readFnc) \
for(i=0;i<_num;i++) \
{ \
@@ -1134,7 +1134,7 @@ namespace KviTheme
} \
} \
}
-
+
#define READ_ALL_OPTIONS(_num,_table,_readFnc) \
for(i=0;i<_num;i++) \
{ \
@@ -1144,7 +1144,7 @@ namespace KviTheme
_table[i].option = cfg._readFnc(_table[i].name,_table[i].option); \
} \
}
-
+
READ_OPTIONS(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable,readRectEntry)
READ_OPTIONS(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable,readBoolEntry)
READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readQStringEntry)
@@ -1155,12 +1155,12 @@ namespace KviTheme
READ_OPTIONS(KVI_NUM_STRINGLIST_OPTIONS,g_stringlistOptionsTable,readStringListEntry)
READ_OPTIONS(KVI_NUM_MIRCCOLOR_OPTIONS,g_mirccolorOptionsTable,readColorEntry)
READ_OPTIONS(KVI_NUM_ICCOLOR_OPTIONS,g_iccolorOptionsTable,readColorEntry)
-
+
#undef READ_OPTIONS
#undef READ_ALL_OPTIONS
KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).trimmed();
-
-
+
+
// the pixmap options need special processing
for(i=0;i<KVI_NUM_PIXMAP_OPTIONS;i++)
{
@@ -1177,19 +1177,19 @@ namespace KviTheme
} else {
szBuffer = szVal;
}
-
+
KviStringConversion::fromString(szBuffer,g_pixmapOptionsTable[i].option);
-
+
// reset anyway
iResetFlags |= g_pixmapOptionsTable[i].flags & KviOption_resetMask;
}
}
}
-
+
// create the splash screen pointer if this theme has some pixmaps in it
if(!KVI_OPTION_STRING(KviOption_stringIconThemeSubdir).isEmpty())
KviFileUtils::writeFile(szPointerFile,KVI_OPTION_STRING(KviOption_stringIconThemeSubdir));
-
+
// force reloading of images anyway
g_pApp->optionResetUpdate(iResetFlags | KviOption_resetReloadImages);
@@ -1305,7 +1305,7 @@ void KviApp::optionResetUpdate(int flags)
{
g_pApp->restartLagMeters();
}
-
+
if(flags & KviOption_resetRecentChannels)
{
g_pApp->buildRecentChannels();
@@ -1361,7 +1361,7 @@ bool KviApp::setOptionValue(const QString &optName,const QString &value)
for(int i=0;i < KVI_NUM_PIXMAP_OPTIONS;i++)
{
if(KviQString::equalCI(optName,g_pixmapOptionsTable[i].name))
- {
+ {
if(!KviStringConversion::fromString(szBuffer,g_pixmapOptionsTable[i].option))return false;
optionResetUpdate(g_pixmapOptionsTable[i].flags);
return true;
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 70107b606..0a76bb996 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -261,7 +261,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
#define KviOption_boolShowUserListViewToolTips 167 /* interface::features::global */
#define KviOption_boolWhoisRepliesToActiveWindow 168 /* irc::output */
#define KviOption_boolPopupNotifierOnNotifyOnLine 169 /* notify */
-#define KviOption_boolForciblyDisableNotifier 170 /* notifier */
+#define KviOption_boolEnableNotifier 170 /* notifier */
#define KviOption_boolDccSendForceIdleStep 171 /* dcc */
#define KviOption_boolStatusBarVisible 172 /* internal */
#define KviOption_boolTrackLastReadTextViewLine 173 /* ircview::features */
@@ -271,19 +271,19 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
#define KviOption_boolLimitDccSendSpeed 177 /* dcc::file transfers */
#define KviOption_boolLimitDccRecvSpeed 178 /* dcc::file transfers */
#define KviOption_boolIgnoreModuleVersions 179
-#define KviOption_boolDisableInputHistory 180 /* interface::input */
+#define KviOption_boolEnableInputHistory 180 /* interface::input */
#define KviOption_boolUseSpecialColorForTimestamp 181 /* interface::output */
-#define KviOption_boolDisableAwayListUpdates 182 /* irc::output */
-#define KviOption_boolDisableAvatars 183 /* interface::userlist */
-#define KviOption_boolDisableUserListLabel 184 /* interface::userlist */
-#define KviOption_boolDisablePopupIcons 185 /* themes::general */
+#define KviOption_boolEnableAwayListUpdates 182 /* irc::output */
+#define KviOption_boolShowAvatarsInUserlist 183 /* interface::userlist */
+#define KviOption_boolShowUserListStatisticLabel 184 /* interface::userlist */
+#define KviOption_boolShowIconsInPopupMenus 185 /* themes::general */
#define KviOption_boolScriptErrorsToDebugWindow 186 /* parser */
#define KviOption_boolShowMinimizedDebugWindow 187 /* parser */
#define KviOption_boolShowExtendedInfoInQueryLabel 188 /* irc::query */
#define KviOption_boolUseUserListColorsAsNickColors 189 /* irc::usermessages */
#define KviOption_boolGzipLogs 190 /* ircengine::logging */
#define KviOption_boolMinimizeInTray 191 /* interface */
-#define KviOption_boolDisableNotifierFlashing 192 /* interface::notifier */
+#define KviOption_boolNotifierFlashing 192 /* interface::notifier */
#define KviOption_boolCommandlineInUserFriendlyModeByDefault 193 /* interface::input */
#define KviOption_boolEnableVisualEffects 194 /* interface */
#define KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores 195
@@ -311,7 +311,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
#define KviOption_boolUseIdentServiceOnlyOnConnect 217 /* connection::ident */
#define KviOption_boolUseSystemUrlHandlers 218 /* Windoze only*/
#define KviOption_boolScaleAvatarsOnLoad 219
-#define KviOption_boolDisableNotifierFadein 220 /* interface::notifier */
+#define KviOption_boolNotifierFading 220 /* interface::notifier */
#define KviOption_boolUseAntiAliasing 221 /* qt4 only! */
#define KviOption_boolPickRandomIpAddressForRoundRobinServers 222
#define KviOption_boolPrependAvatarInfoToRealname 223
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 7084b8d72..75284df5b 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -206,7 +206,7 @@ KviKvsScript * KviKvsPopupMenuItemWithTextAndIcon::kvsText()
QPixmap * KviKvsPopupMenuItemWithTextAndIcon::evaluateIcon(KviKvsPopupMenuTopLevelData * pData)
{
- if(KVI_OPTION_BOOL(KviOption_boolDisablePopupIcons))return 0;
+ if(!KVI_OPTION_BOOL(KviOption_boolShowIconsInPopupMenus))return 0;
if(!m_pKvsIcon)return 0;
KviKvsVariant vRet;
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 9d36f670e..124c36a67 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -1459,7 +1459,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e)
}
break;
case Qt::Key_PageUp:
- if(KVI_OPTION_BOOL(KviOption_boolDisableInputHistory)) break;
+ if(!KVI_OPTION_BOOL(KviOption_boolEnableInputHistory)) break;
if(m_pInputParent->inherits("KviInput"))
((KviInput*)(m_pInputParent))->historyButtonClicked();
break;
@@ -2271,15 +2271,13 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
m_pHistoryButton->setIconSize(QSize(22,22));
//m_pHistoryButton->setUpdatesEnabled(TRUE); ???
QIcon is1;
- if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005
+ if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory))//G&N mar 2005
{
is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)));
m_pHistoryButton->setIcon(is1);
KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br>&lt;Ctrl+PageUp&gt;"));
connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked()));
- }
- else
- {
+ } else {
is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)));
m_pHistoryButton->setIcon(is1);
KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
@@ -2564,22 +2562,19 @@ void KviInput::applyOptions()
if(g_pLastFontMetrics) delete g_pLastFontMetrics;
g_pLastFontMetrics = 0;
- if(KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))//G&N mar 2005
- {
- QIcon is1;
- is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)));
- m_pHistoryButton->setIcon(is1);
- KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
- m_pHistoryButton->disconnect(SIGNAL(clicked()));
- }
-
- if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory))
+ if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory))//G&N mar 2005
{
QIcon is1;
is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)));
m_pHistoryButton->setIcon(is1);
KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br>&lt;Ctrl+PageUp&gt;"));
connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked()));
+ } else {
+ QIcon is1;
+ is1.addPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)));
+ m_pHistoryButton->setIcon(is1);
+ KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
+ m_pHistoryButton->disconnect(SIGNAL(clicked()));
}
m_pInputEditor->applyOptions();
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index b24f8c159..576a9ed31 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -130,7 +130,7 @@ void KviUserListEntry::updateAvatarData()
KviAvatar * av = m_pGlobalData->avatar();
- if(!KVI_OPTION_BOOL(KviOption_boolDisableAvatars))
+ if(KVI_OPTION_BOOL(KviOption_boolShowAvatarsInUserlist))
{
if(av)
{
@@ -223,7 +223,7 @@ void KviUserListEntry::recalcSize()
m_iHeight = m_pListView->m_iFontHeight;
if(KVI_OPTION_BOOL(KviOption_boolShowUserChannelIcons) && (m_iHeight < 20))m_iHeight = 20;
- if(!KVI_OPTION_BOOL(KviOption_boolDisableAvatars))//G&N 2005
+ if(KVI_OPTION_BOOL(KviOption_boolShowAvatarsInUserlist))//G&N 2005
{
if(av)
{
@@ -423,7 +423,7 @@ void KviUserListView::animatedAvatarUpdated()
{
//update();
if(!m_pTopItem)return;
- if(KVI_OPTION_BOOL(KviOption_boolDisableAvatars)) return;
+ if(!KVI_OPTION_BOOL(KviOption_boolShowAvatarsInUserlist)) return;
QRect rct;
int curTop = KVI_USERLIST_BORDER_WIDTH - m_pViewArea->m_iTopItemOffset;
KviUserListEntry * e = m_pTopItem;
@@ -1176,7 +1176,7 @@ bool KviUserListView::nickChange(const QString &oldNick,const QString &newNick)
void KviUserListView::updateUsersLabel()
{
- if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel))//G&N 2005
+ if(KVI_OPTION_BOOL(KviOption_boolShowUserListStatisticLabel))//G&N 2005
{
KviStr tmp;
tmp.sprintf("<nobr><b>[%u]</b>",m_pEntryDict->count());
@@ -1253,7 +1253,7 @@ void KviUserListView::partAll()
void KviUserListView::resizeEvent(QResizeEvent *)
{
int hght;
- if(!KVI_OPTION_BOOL(KviOption_boolDisableUserListLabel))//G&N 2005
+ if(KVI_OPTION_BOOL(KviOption_boolShowUserListStatisticLabel))//G&N 2005
{
hght = m_pUsersLabel->sizeHint().height();
if(hght < 16)hght = 16; // at least
@@ -1665,8 +1665,7 @@ void KviUserListViewArea::paintEvent(QPaintEvent *ev)
}
theY+=2;
- //TODO: avatar animations
- if(!KVI_OPTION_BOOL(KviOption_boolDisableAvatars))//G&N 2005
+ if(KVI_OPTION_BOOL(KviOption_boolShowAvatarsInUserlist))//G&N 2005
{
KviAvatar * av = e->m_pGlobalData->avatar();
if(av && KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth) && KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight))
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index 7a14610ab..24f547f15 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -248,7 +248,7 @@ static bool notifier_kvs_cmd_show(KviKvsModuleCommandCall * c)
static bool notifier_kvs_fnc_isEnabled(KviKvsModuleFunctionCall * c)
{
bool bCheck;
- if(KVI_OPTION_BOOL(KviOption_boolForciblyDisableNotifier))
+ if(!KVI_OPTION_BOOL(KviOption_boolEnableNotifier))
bCheck=false;
else
bCheck=g_tNotifierDisabledUntil < kvi_unixTime();
@@ -301,7 +301,7 @@ static bool notifier_module_ctrl(KviModule *,const char *operation,void *param)
g_pNotifierWindow = new KviNotifierWindow();
g_pNotifierWindow->addMessage(p->pWindow,p->szIcon,p->szMessage,p->uMessageLifetime);
- g_pNotifierWindow->doShow(KVI_OPTION_BOOL(KviOption_boolDisableNotifierFadein)?false:true);
+ g_pNotifierWindow->doShow(KVI_OPTION_BOOL(KviOption_boolNotifierFading)? true : false);
return true;
}
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index f2c50b792..8d9d21c87 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -280,7 +280,7 @@ void KviNotifierWindow::computeRect()
void KviNotifierWindow::doShow(bool bDoAnimate)
{
- if(KVI_OPTION_BOOL(KviOption_boolForciblyDisableNotifier))return;
+ if(!KVI_OPTION_BOOL(KviOption_boolEnableNotifier))return;
kvi_time_t tNow = kvi_unixTime();
if(g_tNotifierDisabledUntil > tNow)return;
@@ -541,7 +541,7 @@ void KviNotifierWindow::startBlinking()
stopBlinkTimer();
m_bBlinkOn = false;
- if(!KVI_OPTION_BOOL(KviOption_boolDisableNotifierFlashing))
+ if(KVI_OPTION_BOOL(KviOption_boolNotifierFlashing))
{
m_pBlinkTimer = new QTimer();
connect(m_pBlinkTimer,SIGNAL(timeout()),this,SLOT(blink()));
@@ -1267,7 +1267,7 @@ void KviNotifierWindow::disableUntilKVIrcRestarted()
void KviNotifierWindow::disablePermanently()
{
- KVI_OPTION_BOOL(KviOption_boolForciblyDisableNotifier) = true;
+ KVI_OPTION_BOOL(KviOption_boolEnableNotifier) = false;
hideNow();
}
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index 8fac7255a..f4bdef2d0 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -137,7 +137,7 @@ KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
createLayout();
addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd);
- addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable the input history window and it's log memory.","options"),KviOption_boolDisableInputHistory); //G&N 2005
+ addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable the input history logging","options"),KviOption_boolEnableInputHistory); //G&N 2005
addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input toolbuttons by default","options"),KviOption_boolHideInputToolButtons);
KviTalGroupBox * g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Nick completion","options"));
addBoolSelector(g,__tr2qs_ctx("Use bash-like nick completion","options"),KviOption_boolBashLikeNickCompletion);
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 658edc51c..5cc8d4afb 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -38,7 +38,7 @@ KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
KviBoolSelector * b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Use global application font","options"),KviOption_boolUseGlobalApplicationFont);
KviTalToolTip::add(b,__tr2qs_ctx("This option will force a static font for every widget that has no specific font setting","options"));
- KviBoolSelector * g = addBoolSelector(0,0,1,0,__tr2qs_ctx("Hide icons in Popup","options"),KviOption_boolDisablePopupIcons);
+ KviBoolSelector * g = addBoolSelector(0,0,1,0,__tr2qs_ctx("Show icons in popup menus","options"),KviOption_boolShowIconsInPopupMenus);
KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication,
KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont));
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 1029c9e84..7f108f63e 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -170,7 +170,7 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare
addBoolSelector(g,__tr2qs_ctx("Do not request ban exception list","options"),KviOption_boolDisableBanExceptionListRequestOnJoin);
addBoolSelector(g,__tr2qs_ctx("Do not request invite list","options"),KviOption_boolDisableInviteListRequestOnJoin);
- b = addBoolSelector(0,3,4,3,__tr2qs_ctx("Do not update the away list","options"),KviOption_boolDisableAwayListUpdates);
+ b = addBoolSelector(0,3,4,3,__tr2qs_ctx("Keep away list updated by sending WHO requests","options"),KviOption_boolEnableAwayListUpdates);
mergeTip(b,
__tr2qs_ctx("<center>KVIrc sends out a channel /WHO message every now and then to keep " \
"the channel away list in sync. Use this option to disable this feature (and to save " \
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index 052c3cfb1..851815096 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -104,7 +104,7 @@ KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
{
createLayout();
- KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Forcibly and completely disable the notifier","options"),KviOption_boolForciblyDisableNotifier);
+ KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable the notifier","options"),KviOption_boolEnableNotifier);
QString tip = "<center>";
tip += __tr2qs_ctx("This is an option for the impatient: it allows to forcibly and permanently disable " \
"the notifier window. Please note that if this option is activated then " \
@@ -113,8 +113,8 @@ KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
"will make all the /notifier.* commands fail silently.","options");
tip += "</center>";
mergeTip(b,tip);
- addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable notifier window flashing","options"),KviOption_boolDisableNotifierFlashing);
- addBoolSelector(0,2,0,2,__tr2qs_ctx("Disable notifier window fade effect","options"),KviOption_boolDisableNotifierFadein);
+ addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable notifier window flashing","options"),KviOption_boolNotifierFlashing);
+ addBoolSelector(0,2,0,2,__tr2qs_ctx("Enable notifier window fade effect","options"),KviOption_boolNotifierFading);
addRowSpacer(0,3,0,3);
}
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 592a3c3aa..74c2d93ec 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -228,9 +228,9 @@ KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * par
KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show gender icons","options"),KviOption_boolDrawGenderIcons);
b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Show user channel icons","options"),KviOption_boolShowUserChannelIcons);
b = addBoolSelector(0,2,0,2,__tr2qs_ctx("Show user channel activity indicator","options"),KviOption_boolShowUserChannelState);
- b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Hide users label","options"),KviOption_boolDisableUserListLabel);
+ b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Show label with userlist stats","options"),KviOption_boolShowUserListStatisticLabel);
b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable user tooltips","options"),KviOption_boolShowUserListViewToolTips);
- b = addBoolSelector(0,5,0,5,__tr2qs_ctx("Hide avatars","options"),KviOption_boolDisableAvatars);
+ b = addBoolSelector(0,5,0,5,__tr2qs_ctx("Show avatars in userlist","options"),KviOption_boolShowAvatarsInUserlist);
b = addBoolSelector(0,6,0,6,__tr2qs_ctx("Enable animated avatars","options"),KviOption_boolEnableAnimatedAvatars);
addRowSpacer(0,7,0,7);
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 06:25:54 +0000