diff options
Diffstat (limited to 'src/modules/options/optw_avatar.cpp')
| -rw-r--r-- | src/modules/options/optw_avatar.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index c3dd5c8f3..59657e1b6 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -27,7 +27,6 @@ #include "kvi_locale.h" #include "kvi_selectors.h" #include "kvi_options.h" - #include "kvi_tal_tooltip.h" KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) @@ -39,12 +38,11 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) // 1st Box KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Scaling in userlist","options")); KviBoolSelector *b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images in userlist (recommended)","options"),KviOption_boolScaleAvatars); -#ifdef COMPILE_INFO_TIPS KviTalToolTip::add(b,__tr2qs_ctx("<center>This option will force KVIrc to scale avatars" \ " shown in the userlist.<br>" \ "Avatars will be scaled to fit the " \ "constraints set below. Better keep this option on. :)</center>","options")); -#endif + addBoolSelector(g,__tr2qs_ctx("Do not scale avatar if it is less than required size","options"),KviOption_boolDoNotStretchAvatars); KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintAvatarScaleWidth,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); @@ -66,22 +64,18 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) KviBoolSelector * bs = addBoolSelector(g,__tr2qs_ctx("Request missing avatars","options"),KviOption_boolRequestMissingAvatars); KviUIntSelector * us = addUIntSelector(g,__tr2qs_ctx("Maximum requested file size:","options"),KviOption_uintMaximumRequestedAvatarSize,0,1048576,102400,KVI_OPTION_BOOL(KviOption_boolRequestMissingAvatars)); -#ifdef COMPILE_INFO_TIPS mergeTip(bs, __tr2qs_ctx("<center>This option will cause KVIrc to send a DCC GET request " \ "when someone sets an avatar and there is no cached copy available.</center>","options")); -#endif us->setSuffix(__tr2qs_ctx(" bytes","options")); -#ifdef COMPILE_INFO_TIPS + mergeTip(us, __tr2qs_ctx("<center>This is the maximum size for avatar images that " \ "will be automatically requested.<br>" \ "A reasonable value might be 102400 bytes (100 K).</center>","options")); -#endif connect(bs,SIGNAL(toggled(bool)),us,SLOT(setEnabled(bool))); bs = addBoolSelector(gs,__tr2qs_ctx("Automatically accept incoming avatars","options"),KviOption_boolAutoAcceptIncomingAvatars); -#ifdef COMPILE_INFO_TIPS mergeTip( bs, __tr2qs_ctx("<center>This option will cause KVIrc to auto-accept " \ @@ -89,20 +83,15 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) "If you're using the \"Request missing avatars\" option " \ "above, enabling this may by useful.<br>" \ "Avatars will be saved in the local KVIrc directory.</center>","options")); -#endif bs = addBoolSelector(gs,__tr2qs_ctx("Remember avatars for registered users","options"),KviOption_boolSetLastAvatarAsDefaultForRegisteredUsers); - -#ifdef COMPILE_INFO_TIPS mergeTip( bs, __tr2qs_ctx("<center>Use a user's last known avatar by default " \ "(only for users that are registered).</center>","options")); -#endif us = addUIntSelector(gs,__tr2qs_ctx("Avatar offer timeout:","options"),KviOption_uintAvatarOfferTimeoutInSecs,1,99999,60); us->setSuffix(__tr2qs_ctx(" sec","options")); -#ifdef COMPILE_INFO_TIPS mergeTip(us, __tr2qs_ctx("<center>This is the amount of time to make an avatar available for transfer when requested.<br>" \ "When someone sends a CTCP AVATAR request, " \ @@ -110,15 +99,12 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) "of your avatar image.<br>" \ "A time-limited file offer is added for the image file " \ "to the requesting user.</center>","options")); -#endif bs = addBoolSelector(gs,__tr2qs_ctx("Ignore requests if no avatar is set","options"),KviOption_boolIgnoreChannelAvatarRequestsWhenNoAvatarSet); -#ifdef COMPILE_INFO_TIPS mergeTip(bs, __tr2qs_ctx("This option will cause KVIrc to ignore channel CTCP AVATAR requests " \ "when you have no avatar set. This is usually a good practice since " \ "it helps in reducing traffic by not sending a reply that would be empty.","options")); -#endif addRowSpacer(0,3,0,3); } |