diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-06-17 15:04:58 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-06-17 15:05:06 +0200 |
| commit | 92f11c11999eebc35427a9c8a8789d851f34674e (patch) | |
| tree | d33616cc8d0855c90e8cd738cb655679d4a17a34 /kopete | |
| parent | 9ff4b6fdc36a74a858e4e00f87eee1e1f619bd82 (diff) | |
| download | tdenetwork-92f11c11999eebc35427a9c8a8789d851f34674e.tar.gz tdenetwork-92f11c11999eebc35427a9c8a8789d851f34674e.zip | |
kopete: Add descriptions for connection options
This relates to bug 2669
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 449164733b0a1a3096ca1bbd33efee178b95bd82)
Diffstat (limited to 'kopete')
| -rw-r--r-- | kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui | 56 | ||||
| -rw-r--r-- | kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp | 17 |
2 files changed, 70 insertions, 3 deletions
diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui index e0a14f1c..551d9322 100644 --- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui +++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui @@ -288,6 +288,34 @@ <string>Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server.</string> </property> </widget> + <widget class="TQLabel"> + <property name="name"> + <cstring>lblUseSSL</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>1</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string><dd>Select this only for old Jabber servers that use a separate SSL port. Newer servers use StartSSL and this option should not be required.</dd></string> + </property> + <property name="alignment"> + <set>WordBreak|AlignVCenter</set> + </property> + </widget> <widget class="TQCheckBox"> <property name="name"> <cstring>cbAllowPlainTextPassword</cstring> @@ -427,6 +455,34 @@ </widget> </hbox> </widget> + <widget class="TQLabel"> + <property name="name"> + <cstring>lblCustomServer</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>1</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string><dd>Newer Jabber servers may not work correctly if a server name and port are enforced, because this would prevent the use of StartSSL and a newer Jabber protocol.</dd></string> + </property> + <property name="alignment"> + <set>WordBreak|AlignVCenter</set> + </property> + </widget> </vbox> </widget> <widget class="TQGroupBox"> diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 4fecd6c4..82f9aaf0 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -93,6 +93,9 @@ void JabberEditAccountWidget::reopen () mServer->setText (account()->configGroup()->readEntry ("Server", TQString())); cbUseSSL->setChecked (account()->configGroup()->readBoolEntry( "UseSSL", false)); + if( cbUseSSL->isChecked() ) { + lblUseSSL->setEnabled(true); + } mPort->setValue (account()->configGroup()->readNumEntry("Port", 5222)); @@ -106,6 +109,7 @@ void JabberEditAccountWidget::reopen () mServer->setEnabled(true); labelPort->setEnabled(true); mPort->setEnabled(true); + lblCustomServer->setEnabled(true); } else { @@ -226,6 +230,7 @@ void JabberEditAccountWidget::updateServerField () mServer->setEnabled(false); labelPort->setEnabled(false); mPort->setEnabled(false); + lblCustomServer->setEnabled(false); } else { @@ -233,6 +238,7 @@ void JabberEditAccountWidget::updateServerField () mServer->setEnabled(true); labelPort->setEnabled(true); mPort->setEnabled(true); + lblCustomServer->setEnabled(true); } } @@ -274,11 +280,16 @@ void JabberEditAccountWidget::slotChangePasswordFinished () void JabberEditAccountWidget::sslToggled (bool value) { - if (value && (mPort->value() == 5222)) + if (value && (mPort->value() == 5222)) { mPort->stepUp (); - else - if(!value && (mPort->value() == 5223)) + } + else { + if(!value && (mPort->value() == 5223)) { mPort->stepDown (); + } + } + + lblUseSSL->setEnabled( value ); } #include "jabbereditaccountwidget.moc" |