From ea06d9bbbd8d8ef75034bfc3f62838f193537984 Mon Sep 17 00:00:00 2001 From: Robert Förster Date: Tue, 1 Sep 2009 22:12:36 +0000 Subject: - trailing whitespace cleanups all over the place - removed charset dependent manpages since it really makes no sense to distribute them, they are getting installed in non standard places and one manpage per language is enough - added SpotChat to the serverdb, happens to be my network anyway :P (someone should remind me to check all the networks and servers there so we can do a cleanup if needed git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3463 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/options/optw_avatar.cpp | 4 +-- src/modules/options/optw_away.cpp | 6 ++--- src/modules/options/optw_away.h | 2 +- src/modules/options/optw_connection.cpp | 10 +++---- src/modules/options/optw_ctcpfloodprotection.cpp | 2 +- src/modules/options/optw_dcc.cpp | 8 +++--- src/modules/options/optw_highlighting.cpp | 4 +-- src/modules/options/optw_identity.cpp | 4 +-- src/modules/options/optw_input.cpp | 12 ++++----- src/modules/options/optw_input.h | 2 +- src/modules/options/optw_interfacefeatures.cpp | 6 ++--- src/modules/options/optw_interfacelookglobal.cpp | 4 +-- src/modules/options/optw_irc.cpp | 2 +- src/modules/options/optw_ircoutput.cpp | 4 +-- src/modules/options/optw_lag.cpp | 4 +-- src/modules/options/optw_nickserv.cpp | 34 ++++++++++++------------ src/modules/options/optw_sound.cpp | 18 ++++++------- src/modules/options/optw_textencoding.cpp | 20 +++++++------- src/modules/options/optw_topiclabel.cpp | 2 +- src/modules/options/optw_urlhandlers.cpp | 2 +- src/modules/options/optw_windowlist.cpp | 20 +++++++------- src/modules/options/optw_windowlist.h | 2 +- 22 files changed, 86 insertions(+), 86 deletions(-) (limited to 'src/modules/options') diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index a13c4014c..3bd908a04 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -46,7 +46,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) "constraints set below. Better keep this option on. :)","options")); 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)); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintAvatarScaleHeight,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); @@ -55,7 +55,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent) //2nd g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Scaling on load (and in user tooltips)","options")); b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images on image load","options"),KviOption_boolScaleAvatarsOnLoad); - + u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintScaleAvatarsOnLoadWidth,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintScaleAvatarsOnLoadHeight,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index 6dfd53869..e3fdca9e0 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -41,13 +41,13 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent) addBoolSelector(0,1,0,1, __tr2qs_ctx("User input exits away mode","options"), KviOption_boolExitAwayOnInput); KviTalGroupBox *g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Away Nickname","options")); - m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway); + m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway); connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool))); - + m_pEnableCustomAwayNick = addBoolSelector(g,__tr2qs_ctx("Use automatic nickname ([5 letters]AWAY)","options"),KviOption_boolAutoGeneratedAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway)); connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,SLOT(setEnabled(bool))); connect(m_pEnableCustomAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool))); - + // m_p <-- stands for pointer // m_sz <-- stands for a string :) // m_szCustomAwayNick = addStringSelector(0,4,0,4,__tr2qs_ctx("Custom away nick","options"),KviOption_stringCustomAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway) && !(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick))); diff --git a/src/modules/options/optw_away.h b/src/modules/options/optw_away.h index 0ddf1a745..77e8afbc0 100644 --- a/src/modules/options/optw_away.h +++ b/src/modules/options/optw_away.h @@ -36,7 +36,7 @@ class KviAwayOptionsWidget : public KviOptionsWidget public: KviAwayOptionsWidget(QWidget * parent); ~KviAwayOptionsWidget(); -protected: +protected: KviBoolSelector * m_pEnableAwayNick; KviBoolSelector * m_pEnableCustomAwayNick; KviStringSelector * m_pCustomAwayNick; diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 7c8326b61..41779fabf 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -56,7 +56,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent) b1 = addBoolSelector(gbox,__tr2qs_ctx("Rejoin channels after reconnect","options"),KviOption_boolRejoinChannelsAfterReconnect,KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); mergeTip(b1,__tr2qs_ctx("
This option will cause KVIrc to rejoin channels after a successful reconnect attempt.
","options")); - + b1 = addBoolSelector(gbox,__tr2qs_ctx("Reopen queries after reconnect","options"),KviOption_boolReopenQueriesAfterReconnect,KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); mergeTip(b1,__tr2qs_ctx("
This option will cause KVIrc to reopen query windows after a successful reconnect attempt.
","options")); @@ -143,7 +143,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent) setObjectName("transport_options_widget"); createLayout(); KviUIntSelector * u; - + KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Timeout Values","options"),this); u = addUIntSelector(g,__tr2qs_ctx("Connect timeout:","options"),KviOption_uintIrcSocketTimeout,5,6000,60); u->setSuffix(__tr2qs_ctx(" sec","options")); @@ -157,7 +157,7 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent) connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Network Interfaces","options")); - + b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress); KviStringSelector * s = addStringSelector(g,"",KviOption_stringIPv4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress)); connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); @@ -215,14 +215,14 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent) } gbox = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - + KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Enable ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect); connect(m_pEnableIdent,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); KviStringSelector * s = addStringSelector(gbox,__tr2qs_ctx("Ident username:","options"), KviOption_stringIdentdUser,KVI_OPTION_BOOL(KviOption_boolUseIdentService)); connect(m_pEnableIdent,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); - + KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Service port:","options"), KviOption_uintIdentdPort,0,65535,113,KVI_OPTION_BOOL(KviOption_boolUseIdentService)); connect(m_pEnableIdent,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 1ffad69c3..e4dd2d4f8 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -87,7 +87,7 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget u->setSuffix(__tr2qs_ctx(" requests","options")); mergeTip(u,__tr2qs_ctx("
Minimum value: 0 requests
Maximum value: 10000 requests
","options")); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - + u = addUIntSelector(1,1,1,1,__tr2qs_ctx("within:","options"),KviOption_uintCtcpFloodCheckInterval,1,3600,6,KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection)); u->setSuffix(__tr2qs_ctx(" sec","options")); mergeTip(u,__tr2qs_ctx("
Minimum value: 1 sec
Maximum value: 3600 sec
","options")); diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index b497b0b73..4f5b7d75f 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -70,7 +70,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent) createLayout(); KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Network Properties","options")); - + KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Use user-defined address or network interface","options"),KviOption_boolDccListenOnSpecifiedInterfaceByDefault); @@ -121,7 +121,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent) mergeTip(b,__tr2qs_ctx("
When you're behind a dialup router and also tunneling through a psyBNC bouncer, " \ "you can use a bug in the bouncer to force KVIrc to bind the DCC connections to the dialup router's address.
" \ "It's an ugly hack - use it only if nothing else works.
","options")); - + connect(b2,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"),KviOption_boolNotifyFailedDccHandshakes); @@ -234,7 +234,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren KviUIntSelector * u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed)); u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options")); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - + hb = new KviTalHBox(g); b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to","options"),KviOption_boolLimitDccRecvSpeed); u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed)); @@ -266,7 +266,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren u = addUIntSelector(hb,"",KviOption_uintDccSendIdleStepInMSec,1,65536,30,KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep)); connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); u->setSuffix(__tr2qs_ctx(" msec","options")); - + mergeTip(u, __tr2qs_ctx("
This parameter controls the average delay between two packets sent or received.
" \ "A smaller interval will cause you to send data faster but will also " \ diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index 64a267661..86bfa9c9e 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -62,8 +62,8 @@ KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent) SIGNAL(toggled(bool)), addStringSelector(0,3,0,3,__tr2qs_ctx("Highlight only whole words using these word splitters:","options"),KviOption_stringWordSplitters,!KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting)), SLOT(setDisabled(bool))); - - + + // This can be used even without Word highlighting b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Highlight messages containing my nickname","options"),KviOption_boolAlwaysHighlightNick); mergeTip(b,__tr2qs_ctx("
If this option is enabled, KVIrc will highlight any user message containing your current nickname
","options")); diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 042a700bb..b567ffe31 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -912,7 +912,7 @@ KviIdentityProfileEditor::KviIdentityProfileEditor(QWidget * pParent) connect(m_pBtnOk,SIGNAL(clicked()),this,SLOT(okPressed())); pLayout->setColumnStretch(1,1); - + setMinimumWidth(250); } @@ -961,7 +961,7 @@ void KviIdentityProfileEditor::toggleButton(const QString & szText) (szText.isEmpty()) ) bEnabled = false; - + m_pBtnOk->setEnabled(bEnabled); } diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index 66df2bfa9..fdeb5a44b 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -48,21 +48,21 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent) addLabel(0,8,0,8,__tr2qs_ctx("Horizontal align:","options")); m_pHorizontalAlign=new QComboBox(this); addWidgetToLayout(m_pHorizontalAlign,1,8,1,8); - + addLabel(0,9,0,9,__tr2qs_ctx("Vertical align:","options")); m_pVerticalAlign=new QComboBox(this); addWidgetToLayout(m_pVerticalAlign,1,9,1,9); - + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); - + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); - + switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: @@ -77,7 +77,7 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent) default: m_pHorizontalAlign->setCurrentIndex(0); } - + switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: @@ -128,7 +128,7 @@ void KviInputLookOptionsWidget::commit() iFlags|=Qt::AlignVCenter; break; } - + KVI_OPTION_UINT(KviOption_uintInputPixmapAlign)=iFlags; KviOptionsWidget::commit(); } diff --git a/src/modules/options/optw_input.h b/src/modules/options/optw_input.h index 87ab1a91a..0d3fc38f3 100644 --- a/src/modules/options/optw_input.h +++ b/src/modules/options/optw_input.h @@ -43,7 +43,7 @@ private: public: KviInputLookOptionsWidget(QWidget * parent); ~KviInputLookOptionsWidget(); - + virtual void commit(); }; diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index eecb1b26c..9a05f0a09 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -51,10 +51,10 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p m_pDisableSplash = new QCheckBox(__tr2qs_ctx("Disable splash screen","options"),this); addWidgetToLayout(m_pDisableSplash,0,3,0,3); m_pDisableSplash->setChecked(bDisableSplash); - + addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects); addBoolSelector(0,5,0,5,__tr2qs_ctx("Hide Channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons); - + KviTalGroupBox * g = addGroupBox(0,6,0,6,Qt::Horizontal,__tr2qs_ctx("Open Dialog Window For","options")); addBoolSelector(g,__tr2qs_ctx("Preferences","options"),KviOption_boolShowGeneralOptionsDialogAsToplevel); addBoolSelector(g,__tr2qs_ctx("Registered Users","options"),KviOption_boolShowRegisteredUsersDialogAsToplevel); @@ -83,7 +83,7 @@ void KviInterfaceFeaturesOptionsWidget::commit() if(KviFileUtils::fileExists(szSplashDisableFile)) KviFileUtils::removeFile(szSplashDisableFile); } - + } #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index 63539a00d..6e08dc8bb 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -174,9 +174,9 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget : KviOptionsWidget(parent) { createLayout(); - + addFontSelector(0,0,0,0,__tr2qs_ctx("Font","options"),KviOption_fontIrcToolBarApplet); - + addColorSelector(0,1,0,1,__tr2qs_ctx("Background","options"),KviOption_colorIrcToolBarAppletBackground); addColorSelector(0,2,0,2,__tr2qs_ctx("Low-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundLowContrast); addColorSelector(0,3,0,3,__tr2qs_ctx("Mid-Contrast Foreground","options"),KviOption_colorIrcToolBarAppletForegroundMidContrast); diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 2abc75903..cd32fd5fe 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -66,7 +66,7 @@ KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent) { setObjectName("irc_advanced_options_widget"); createLayout(); - KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit); + KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit); mergeTip(b, __tr2qs_ctx("
This option causes KVIrc to close " \ "the connection immediately after sending the QUIT message.
" \ diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index ab6bafdcf..777356b2e 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -45,7 +45,7 @@ KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent) m_pVerbosityCombo = new QComboBox(this); addWidgetToLayout(m_pVerbosityCombo,1,0,1,0); - + m_pVerbosityCombo->addItem(__tr2qs_ctx("Mute","options")); m_pVerbosityCombo->addItem(__tr2qs_ctx("Quiet","options")); m_pVerbosityCombo->addItem(__tr2qs_ctx("Normal","options")); @@ -85,7 +85,7 @@ KviIrcOutputOptionsWidget::~KviIrcOutputOptionsWidget() void KviIrcOutputOptionsWidget::commit() { KviOptionsWidget::commit(); - + int i = m_pVerbosityCombo->currentIndex(); if((i < 0) || (i > KVI_VERBOSITY_LEVEL_PARANOIC))i = KVI_VERBOSITY_LEVEL_NORMAL; KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = i; diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 7a447a279..9bc5e8619 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -51,7 +51,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent) "the pings (if any) will be sent really less often. " \ "5000 is a reasonable value.
","options")); connect(pUse,SIGNAL(toggled(bool)),pInterval,SLOT(setEnabled(bool))); - + KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:","options"), KviOption_uintLagAlarmTime,5000,1000000,30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); pAlarm->setSuffix(__tr2qs_ctx(" msec","options")); mergeTip(pAlarm,__tr2qs_ctx("
This option controls the threshold for the " \ @@ -59,7 +59,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent) "the threshold OnLagAlarmTimeUp will be triggered and when the lag falls " \ "back below the threshold then OnLagAlarmTimeDown will be triggered
","options")); connect(pUse,SIGNAL(toggled(bool)),pAlarm,SLOT(setEnabled(bool))); - + KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display","options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); mergeTip(pShow,__tr2qs_ctx("
This makes the IRC context display applet show the current lag after the user's nickname (in seconds)
","options")); diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index ba89368cd..dfa6b7994 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -51,18 +51,18 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi QString html_center_end = "
"; QGridLayout * gl = new QGridLayout(this);//,bUseServerMaskField ? 7 : 6,4,10,5); - + QLabel * l = new QLabel(__tr2qs_ctx("Registered NickName","options"),this); gl->addWidget(l,0,0); - + m_pRegisteredNickEdit = new QLineEdit(this); KviTalToolTip::add(m_pRegisteredNickEdit,html_center_begin + __tr2qs_ctx("Put here the nickname that you have registered with NickServ","options") + html_center_end); gl->addWidget(m_pRegisteredNickEdit,0,1,1,3); // gl->addMultiCellWidget(m_pRegisteredNickEdit,0,0,1,3); - + l = new QLabel(__tr2qs_ctx("NickServ Mask","options"),this); gl->addWidget(l,1,0); - + m_pNickServMaskEdit = new QLineEdit(this); KviTalToolTip::add(m_pNickServMaskEdit, html_center_begin + __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. " \ @@ -72,7 +72,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi "the mask NickServ!*@* may be safe to use in this field.","options") + html_center_end); gl->addWidget(m_pNickServMaskEdit,1,1,1,3); // gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3); - + l = new QLabel(__tr2qs_ctx("Message Regexp","options"),this); gl->addWidget(l,2,0); @@ -105,7 +105,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi { l = new QLabel(__tr2qs_ctx("Server mask","options"),this); gl->addWidget(l,4,0); - + m_pServerMaskEdit = new QLineEdit(this); KviTalToolTip::add(m_pServerMaskEdit, html_center_begin + __tr2qs_ctx("This is the mask that the current server must match in order " \ @@ -138,7 +138,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi gl->setColumnStretch(1,1); gl->setRowStretch(bUseServerMaskField ? 5 : 4,1); - + setMinimumWidth(250); } @@ -149,24 +149,24 @@ KviNickServRuleEditor::~KviNickServRuleEditor() bool KviNickServRuleEditor::validate() { QString s = m_pRegisteredNickEdit->text(); - + QString m = __tr2qs_ctx("Invalid NickServ Rule","options"); QString o = __tr2qs_ctx("OK","options"); - + if(s.isEmpty()) { QMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't be empty!","options"),o); return false; } - + if(s.indexOf(QChar(' ')) != -1) { QMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't contain spaces!","options"),o); return false; } - + s = m_pNickServMaskEdit->text(); - + if(s.isEmpty()) { QMessageBox::warning(this,m,__tr2qs_ctx("The NickServ mask can't be empty!
You must put at least * there.","options"),o); @@ -174,7 +174,7 @@ bool KviNickServRuleEditor::validate() } s = m_pMessageRegexpEdit->text(); - + if(s.isEmpty()) { QMessageBox::warning(this,m,__tr2qs_ctx("The Message Regexp can't be empty!
You must put at least * there.","options"),o); @@ -182,13 +182,13 @@ bool KviNickServRuleEditor::validate() } s = m_pIdentifyCommandEdit->text(); - + if(s.isEmpty()) { QMessageBox::warning(this,m,__tr2qs_ctx("The Identify Command can't be empty!","options"),o); return false; } - + return true; } @@ -223,7 +223,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent) { createLayout(); setObjectName("nickserv_options_widget"); - + QGridLayout * gl = layout(); KviNickServRuleSet * rs = g_pNickServRuleSet; @@ -239,7 +239,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent) m_pNickServTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection); m_pNickServTreeWidget->setAllColumnsShowFocus(true); QStringList columnLabels; - + columnLabels.append(__tr2qs_ctx("Nickname","options")); columnLabels.append(__tr2qs_ctx("Server mask","options")); columnLabels.append(__tr2qs_ctx("NickServ Mask","options")); diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index c8079976f..6dc85013e 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -103,7 +103,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) int i = 0; int iMatch = 0; - + KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i); while(d->szName) { @@ -122,11 +122,11 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent) h = new KviTalHBox(g); m_pWinampEncodingCombo = new QComboBox(h); - + m_pWinampEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding","options")); i = 0; iMatch = 0; - + d = KviLocale::encodingDescription(i); while(d->szName) { @@ -253,7 +253,7 @@ void KviSoundGeneralOptionsWidget::commit() KviOptionsWidget::commit(); KVI_OPTION_STRING(KviOption_stringSoundSystem) = m_pSoundSystemBox->currentText(); KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) = m_pMediaPlayerBox->currentText(); - + int idx = m_pTagsEncodingCombo->currentIndex(); if(idx <= 0) { @@ -283,18 +283,18 @@ KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent) createLayout(); addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options")); addSoundSelector(1,0,1,0,"",KviOption_stringOnNewQueryOpenedSound); - + addLabel(0,1,0,1,__tr2qs_ctx("New message in inactive query","options")); addSoundSelector(1,1,1,1,"",KviOption_stringOnQueryMessageSound); - + addLabel(0,2,0,2,__tr2qs_ctx("Highlighted message in inactive window","options")); addSoundSelector(1,2,1,2,"",KviOption_stringOnHighlightedMessageSound); - + addLabel(0,3,0,3,__tr2qs_ctx("Me have been kicked","options")); addSoundSelector(1,3,1,3,"",KviOption_stringOnMeKickedSound); - + addRowSpacer(0,4,1,4); - + } KviSoundsOptionsWidget::~KviSoundsOptionsWidget() diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index 3dee0ea09..9b38a6af6 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -74,19 +74,19 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent) m_pTextEncodingCombo->setCurrentIndex(iTextMatch); m_pSrvEncodingCombo->setCurrentIndex(iSrvMatch); - + addLabel(0,2,0,2,__tr2qs_ctx("Force language:","options")); - + m_pForcedLocaleCombo = new QComboBox(this); - + addWidgetToLayout(m_pForcedLocaleCombo,1,2,1,2); - + QLabel * l = new QLabel(__tr2qs_ctx("Note: You need to restart KVirc to apply a language changing","options"),this); addWidgetToLayout(l,0,3,1,3); - + m_pForcedLocaleCombo->addItem(__tr2qs_ctx("Automatic detection","options")); m_pForcedLocaleCombo->addItem(__tr2qs_ctx("en","options")); - + QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homePath()); bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile); @@ -97,15 +97,15 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent) } else { m_szLanguage=KviLocale::localeName(); } - + QString szLocaleDir; g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApp::Locale); QStringList list=QDir(szLocaleDir).entryList(QStringList("kvirc_*.mo"),QDir::Files); - + i = 0; int iMatch = 0; - + for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { QString szTmp=*it; szTmp.replace("kvirc_",""); @@ -147,7 +147,7 @@ void KviTextEncodingOptionsWidget::commit() } else { KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding) = m_pSrvEncodingCombo->itemText(idx); } - + idx=m_pForcedLocaleCombo->currentIndex(); QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homePath()); if(idx==0) { diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp index bfc237237..8f0fdbecf 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -37,7 +37,7 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOp addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color","options"), KviOption_colorLabelForeground); addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color","options"), KviOption_colorLabelBackground); addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image","options"), KviOption_pixmapLabelBackground); - + layout()->setRowStretch(3, 1); } diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 75bad4124..8e01b1862 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -136,7 +136,7 @@ void KviUrlHandlersOptionsWidget::commit() KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\","@MAGIC@"); KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\","\\\\"); KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("@MAGIC@","\\\\"); - + //Check for escaped " in url handler ( \" ) KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\\"","\\\""); KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\\"","\\\""); diff --git a/src/modules/options/optw_windowlist.cpp b/src/modules/options/optw_windowlist.cpp index 0d4b93f3b..e9f7160ad 100644 --- a/src/modules/options/optw_windowlist.cpp +++ b/src/modules/options/optw_windowlist.cpp @@ -82,9 +82,9 @@ KviTreeWindowListForegroundOptionsWidget::KviTreeWindowListForegroundOptionsWidg createLayout(); addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTreeWindowList); - + KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); - + addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListForeground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveForeground); addColorSelector(g,__tr2qs_ctx("Alert Level 1:","options"),KviOption_colorTreeWindowListHighlight1Foreground); @@ -114,7 +114,7 @@ KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidg setObjectName("treewindowlist_options_widget"); createLayout(); - + KviTalGroupBox * g = addGroupBox(0,0,1,0,Qt::Horizontal,__tr2qs_ctx("Background Colors","options")); addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListBackground); addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveBackground); @@ -124,21 +124,21 @@ KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidg addLabel(0,2,0,2,__tr2qs_ctx("Horizontal align:","options")); m_pHorizontalAlign=new QComboBox(this); addWidgetToLayout(m_pHorizontalAlign,1,2,1,2); - + addLabel(0,3,0,3,__tr2qs_ctx("Vertical align:","options")); m_pVerticalAlign=new QComboBox(this); addWidgetToLayout(m_pVerticalAlign,1,3,1,3); - + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); - + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); - + switch( KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: @@ -153,7 +153,7 @@ KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidg default: m_pHorizontalAlign->setCurrentIndex(0); } - + switch( KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: @@ -206,7 +206,7 @@ void KviTreeWindowListBackgroundOptionsWidget::commit() iFlags|=Qt::AlignVCenter; break; } - + KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign)=iFlags; } @@ -218,7 +218,7 @@ KviTreeWindowListFeaturesOptionsWidget::KviTreeWindowListFeaturesOptionsWidget(Q setObjectName("treewindowlist_options_widget"); createLayout(); - + addUIntSelector(0,1,0,1,__tr2qs_ctx("Minimum width:","options"),KviOption_uintTreeWindowListMinimumWidth,24,1024,125); addUIntSelector(0,2,0,2,__tr2qs_ctx("Maximum width:","options"),KviOption_uintTreeWindowListMaximumWidth,24,9999,125); diff --git a/src/modules/options/optw_windowlist.h b/src/modules/options/optw_windowlist.h index 4e0b5cc7d..43ee60141 100644 --- a/src/modules/options/optw_windowlist.h +++ b/src/modules/options/optw_windowlist.h @@ -90,7 +90,7 @@ private: public: KviTreeWindowListBackgroundOptionsWidget(QWidget * parent); ~KviTreeWindowListBackgroundOptionsWidget(); - + virtual void commit(); }; -- cgit v1.3.1-10-gc9f91