From 0433852c16aeff5c4fe0eeea1c39ffd25d85fae3 Mon Sep 17 00:00:00 2001 From: Alexey Uzhva Date: Thu, 31 Jul 2008 23:47:27 +0000 Subject: some option names tweaks: changed some 'disabledSomething' features to 'enableSomething', option names better describes their actions git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2147 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/notifier/libkvinotifier.cpp | 4 ++-- src/modules/notifier/notifierwindow.cpp | 6 +++--- src/modules/options/optw_input.cpp | 2 +- src/modules/options/optw_interfacelookglobal.cpp | 2 +- src/modules/options/optw_irc.cpp | 2 +- src/modules/options/optw_notify.cpp | 6 +++--- src/modules/options/optw_userlist.cpp | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/modules') 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("
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 = "
"; 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 += "
"; 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); -- cgit v1.3.1-10-gc9f91