kmail: Rename TLS to STARTTLS and SSL to SSL/TLSr14.1.4

Avoid confusion between TLS and STARTTLS in the UI when configuring
accounts.

The values of EncryptionMethods (private) match the ID of the radio
buttons, and since the button order changed, the values need to as well.

Signed-off-by: mio <stigma@disroot.org>
(cherry picked from commit 625d3c38cd3a49d07b6e1f511fe06d0792440791)

5 files changed, 32 insertions, 32 deletions

diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index c8ac7e29..60fed5d6 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -782,11 +782,11 @@ void AccountDialog::makePopAccountPage()
     i18n("Encryption"), page2 );
   mPop.encryptionNone =
     new TQRadioButton( i18n("&None"), mPop.encryptionGroup );
-  mPop.encryptionSSL =
-    new TQRadioButton( i18n("Use &SSL for secure mail download"),
-    mPop.encryptionGroup );
   mPop.encryptionTLS =
-    new TQRadioButton( i18n("Use &TLS for secure mail download"),
+    new TQRadioButton( i18n("Use &StartTLS"),
+    mPop.encryptionGroup );
+  mPop.encryptionSSL =
+    new TQRadioButton( i18n("Enforce SSL/&TLS"),
     mPop.encryptionGroup );
   connect(mPop.encryptionGroup, TQ_SIGNAL(clicked(int)),
     TQ_SLOT(slotPopEncryptionChanged(int)));
@@ -1097,11 +1097,11 @@ void AccountDialog::makeImapAccountPage( bool connected )
     i18n("Encryption"), page2 );
   mImap.encryptionNone =
     new TQRadioButton( i18n("&None"), mImap.encryptionGroup );
-  mImap.encryptionSSL =
-    new TQRadioButton( i18n("Use &SSL for secure mail download"),
-    mImap.encryptionGroup );
   mImap.encryptionTLS =
-    new TQRadioButton( i18n("Use &TLS for secure mail download"),
+    new TQRadioButton( i18n("Use &StartTLS"),
+    mImap.encryptionGroup );
+  mImap.encryptionSSL =
+    new TQRadioButton( i18n("Enforce SSL/&TLS"),
     mImap.encryptionGroup );
   connect(mImap.encryptionGroup, TQ_SIGNAL(clicked(int)),
     TQ_SLOT(slotImapEncryptionChanged(int)));
@@ -1499,12 +1499,12 @@ void AccountDialog::slotPopEncryptionChanged(int id)
 {
   kdDebug(5006) << "slotPopEncryptionChanged( " << id << " )" << endl;
   // adjust port
-  if ( id == SSL || mPop.portEdit->text() == "995" )
-    mPop.portEdit->setText( ( id == SSL ) ? "995" : "110" );
+  if ( id == EnforceSSL || mPop.portEdit->text() == "995" )
+    mPop.portEdit->setText( ( id == EnforceSSL ) ? "995" : "110" );
 
   // switch supported auth methods
-  mCurCapa = ( id == TLS ) ? mCapaTLS
-                           : ( id == SSL ) ? mCapaSSL
+  mCurCapa = ( id == StartTLS ) ? mCapaTLS
+                           : ( id == EnforceSSL ) ? mCapaSSL
                                            : mCapaNormal;
   enablePopFeatures( mCurCapa );
   const TQButton *old = mPop.authGroup->selected();
@@ -1517,12 +1517,12 @@ void AccountDialog::slotImapEncryptionChanged(int id)
 {
   kdDebug(5006) << "slotImapEncryptionChanged( " << id << " )" << endl;
   // adjust port
-  if ( id == SSL || mImap.portEdit->text() == "993" )
-    mImap.portEdit->setText( ( id == SSL ) ? "993" : "143" );
+  if ( id == EnforceSSL || mImap.portEdit->text() == "993" )
+    mImap.portEdit->setText( ( id == EnforceSSL ) ? "993" : "143" );
 
   // switch supported auth methods
-  int authMethods = ( id == TLS ) ? mCapaTLS
-                                  : ( id == SSL ) ? mCapaSSL
+  int authMethods = ( id == StartTLS ) ? mCapaTLS
+                                  : ( id == EnforceSSL ) ? mCapaSSL
                                                   : mCapaNormal;
   enableImapAuthMethods( authMethods );
   TQButton *old = mImap.authGroup->selected();
diff --git a/kmail/accountdialog.h b/kmail/accountdialog.h
index 417d0e28..e80dbb61 100644
--- a/kmail/accountdialog.h
+++ b/kmail/accountdialog.h
@@ -273,8 +273,8 @@ class AccountDialog : public KDialogBase
     KMServerTest *mServerTest;
     enum EncryptionMethods {
       NoEncryption = 0,
-      SSL = 1,
-      TLS = 2
+      StartTLS = 1,
+      EnforceSSL = 2
     };
     enum Capabilities {
       Plain      =   1,
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index b050275c..aec50b7c 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -276,7 +276,7 @@ void AccountWizard::setupServerInformationPage()
 
   mIncomingServerWdg = new TQVBox( mServerInformationPage );
   mIncomingServer = new KLineEdit( mIncomingServerWdg );
-  mIncomingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mIncomingServerWdg );
+  mIncomingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL/TLS)" ), mIncomingServerWdg );
 
   mIncomingLocationWdg = new TQHBox( mServerInformationPage );
   mIncomingLocation = new KLineEdit( mIncomingLocationWdg );
@@ -296,7 +296,7 @@ void AccountWizard::setupServerInformationPage()
   layout->addWidget( label, 1, 0 );
   layout->addWidget( mOutgoingServer, 1, 1 );
 
-  mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL)" ), mServerInformationPage );
+  mOutgoingUseSSL = new TQCheckBox( i18n( "Use secure connection (SSL/TLS)" ), mServerInformationPage );
   layout->addWidget( mOutgoingUseSSL, 2, 1 );
 
   mLocalDelivery = new TQCheckBox( i18n( "Use local delivery" ),
@@ -516,7 +516,7 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port )
   connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
            this, TQ_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) );
 
-  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
+  mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) );
 }
 
 void AccountWizard::checkImapCapabilities( const TQString &server, int port )
@@ -527,7 +527,7 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port )
   connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ),
            this, TQ_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) );
 
-  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
+  mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) );
 }
 
 void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
@@ -540,7 +540,7 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port )
            this, TQ_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&,
                                          const TQString&, const TQString&, const TQString& ) ) );
 
-  mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) );
+  mAuthInfoLabel = createInfoLabel( i18n( "Checking for supported security capabilities of %1..." ).arg( server ) );
 }
 
 void AccountWizard::popCapabilities( const TQStringList &capaNormalList,
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 764c1720..44c8b3f0 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -502,10 +502,10 @@ void KMTransportDialog::makeSmtpPage()
     i18n("Encryption"), page2 );
   mSmtp.encryptionNone =
     new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup );
-  mSmtp.encryptionSSL =
-    new TQRadioButton( i18n("&SSL"), mSmtp.encryptionGroup );
   mSmtp.encryptionTLS =
-    new TQRadioButton( i18n("&TLS"), mSmtp.encryptionGroup );
+    new TQRadioButton( i18n("Use &StartTLS"), mSmtp.encryptionGroup );
+  mSmtp.encryptionSSL =
+    new TQRadioButton( i18n("Enforce SSL/&TLS"), mSmtp.encryptionGroup );
   connect(mSmtp.encryptionGroup, TQ_SIGNAL(clicked(int)),
     TQ_SLOT(slotSmtpEncryptionChanged(int)));
   vlay->addWidget( mSmtp.encryptionGroup );
@@ -652,13 +652,13 @@ void KMTransportDialog::slotRequiresAuthClicked()
 void KMTransportDialog::slotSmtpEncryptionChanged(int id)
 {
   kdDebug(5006) << "KMTransportDialog::slotSmtpEncryptionChanged( " << id << " )" << endl;
-  // adjust SSL port:
-  if (id == SSL || mSmtp.portEdit->text() == "465")
-    mSmtp.portEdit->setText((id == SSL) ? "465" : "25");
+  // adjust SSL/TLS port:
+  if (id == EnforceSSL || mSmtp.portEdit->text() == "465")
+    mSmtp.portEdit->setText((id == EnforceSSL) ? "465" : "25");
 
   // switch supported auth methods:
   TQButton * old = mSmtp.authGroup->selected();
-  int authMethods = id == TLS ? mAuthTLS : id == SSL ? mAuthSSL : mAuthNone ;
+  int authMethods = id == StartTLS ? mAuthTLS : id == EnforceSSL ? mAuthSSL : mAuthNone ;
   enableAuthMethods( authMethods );
   if ( !old->isEnabled() )
     checkHighest( mSmtp.authGroup );
diff --git a/kmail/kmtransport.h b/kmail/kmtransport.h
index 7f0cd41b..e6c05160 100644
--- a/kmail/kmtransport.h
+++ b/kmail/kmtransport.h
@@ -151,8 +151,8 @@ private:
   KMTransportInfo *mTransportInfo;
   enum EncryptionMethods {
     NoEncryption = 0,
-    SSL = 1,
-    TLS = 2
+    StartTLS = 1,
+    EnforceSSL = 2
   };
   enum AuthMethods {
     NoAuth = 0,