1 files changed, 9 insertions, 3 deletions

diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index 49049f6..2c0f2d8 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -302,282 +302,288 @@ void EditAccounts::accept()
     settings->saveAccounts();
 
     QDialog::accept();
 }
 
 /**
  * SelectMailType
  */
 
 SelectMailType::SelectMailType( QString *selection, QWidget *parent, const char *name, bool modal, WFlags flags )
         : SelectMailTypeUI( parent, name, modal, flags )
 {
     selected = selection;
     selected->replace( 0, selected->length(), typeBox->currentText() );
     connect( typeBox, SIGNAL( activated(const QString&) ), SLOT( slotSelection(const QString&) ) );
 }
 
 void SelectMailType::slotSelection( const QString &sel )
 {
     selected->replace( 0, selected->length(), sel );
 }
 
 /**
  * IMAPconfig
  */
 
 IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
         : IMAPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     //fillValues();
 
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
     ComboBox1->insertItem( "Only if available", 0 );
     ComboBox1->insertItem( "Always, Negotiated", 1 );
     ComboBox1->insertItem( "Connect on secure port", 2 );
     ComboBox1->insertItem( "Run command instead", 3 );
     CommandEdit->hide();
     fillValues();
     // ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 
 void IMAPconfig::slotConnectionToggle( int index )
 {
     if ( index == 2 )
     {
         portLine->setText( IMAP_SSL_PORT );
+        CommandEdit->hide();
     }
     else if (  index == 3 )
     {
         portLine->setText( IMAP_PORT );
         CommandEdit->show();
     }
     else
     {
         portLine->setText( IMAP_PORT );
+        CommandEdit->hide();
     }
 }
 
 void IMAPconfig::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     ComboBox1->setCurrentItem( data->ConnectionType() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
     prefixLine->setText(data->getPrefix());
   localFolder->setText( data->getLocalFolder() );
     int max = data->getMaxMailSize() ;
     if ( max ) {
         CheckBoxDown->setChecked( true );
          SpinBoxDown->setValue ( max );
     } else {
         CheckBoxDown->setChecked( false );
          SpinBoxDown->setValue ( 5 );
     }
     CheckBoxLeaveOn->setChecked( data->getLeaveOnServer() );
 }
 
 void IMAPconfig::accept()
 {
     if ( localFolder->text().contains("/") ||localFolder->text().contains("\\") ) {
         QMessageBox::information( this, i18n( "Error" ),
                                   i18n( "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically." ),
                                   i18n( "Ok" ) );
         return;
     }
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setConnectionType( ComboBox1->currentItem() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
     data->setPrefix(prefixLine->text());  
     data->setLocalFolder( localFolder->text() );
     data->setMaxMailSize( CheckBoxDown->isChecked()?SpinBoxDown->value():0 ) ;
     data->setLeaveOnServer( CheckBoxLeaveOn->isChecked() );
 
     QDialog::accept();
 }
 
 /**
  * POP3config
  */
 
 POP3config::POP3config( POP3account *account, QWidget *parent, const char *name, bool modal, WFlags flags )
         : POP3configUI( parent, name, modal, flags )
 {
     data = account;
     //fillValues();
 
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
     ComboBox1->insertItem( "Only if available", 0 );
     ComboBox1->insertItem( "Always, Negotiated", 1 );
     ComboBox1->insertItem( "Connect on secure port", 2 );
     ComboBox1->insertItem( "Run command instead", 3 );
     CommandEdit->hide();
     fillValues();
     //ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 
 void POP3config::slotConnectionToggle( int index )
 {
     // 2 is ssl connection
     if ( index == 2 )
     {
         portLine->setText( POP3_SSL_PORT );
+        CommandEdit->hide();
     }
     else if (  index == 3 )
     {
         portLine->setText( POP3_PORT );
         CommandEdit->show();
     }
     else
     {
         portLine->setText( POP3_PORT );
+        CommandEdit->hide();
     }
 }
 
 void POP3config::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     ComboBox1->setCurrentItem( data->ConnectionType() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
     localFolder->setText( data->getLocalFolder() );
     int max = data->getMaxMailSize() ;
     if ( max ) {
         CheckBoxDown->setChecked( true );
          SpinBoxDown->setValue ( max );
     } else {
         CheckBoxDown->setChecked( false );
          SpinBoxDown->setValue ( 5 );
     }
     CheckBoxLeaveOn->setChecked( data->getLeaveOnServer() );
 }
 
 void POP3config::accept()
 {
     if ( localFolder->text().contains("/") ||localFolder->text().contains("\\") ) {
         QMessageBox::information( this, i18n( "Error" ),
                                   i18n( "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically." ),
                                   i18n( "Ok" ) );
         return;
     }
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setConnectionType( ComboBox1->currentItem() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
     data->setLocalFolder( localFolder->text() );
     data->setMaxMailSize( CheckBoxDown->isChecked()?SpinBoxDown->value():0 ) ;
     data->setLeaveOnServer( CheckBoxLeaveOn->isChecked() );
 
     QDialog::accept();
 }
 
 /**
  * SMTPconfig
  */
 
 SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
         : SMTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     connect( loginBox, SIGNAL( toggled(bool) ), userLine, SLOT( setEnabled(bool) ) );
     connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) );
 
     // fillValues();
     QIconSet icon;
     //icon = SmallIcon("fileexport");
     icon = SmallIcon("fileopen");
     SignaturButton->setText("");
     SignaturButton->setIconSet (icon ) ;
     SignaturButton->setMaximumSize ( SignaturButton->sizeHint().height()+4,SignaturButton->sizeHint().height()) ;
     connect( SignaturButton, SIGNAL( clicked() ), this, SLOT( chooseSig() ) );
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
     ComboBox1->insertItem( "No secure connection, no TLS", 0 );
     ComboBox1->insertItem( "Only if available, try TLS", 1 );
     ComboBox1->insertItem( "Always, use TLS", 2 );
     ComboBox1->insertItem( "Connect on secure port (SSL)", 3 );
     ComboBox1->insertItem( "Run command instead", 4 );
     CommandEdit->hide();
     fillValues();
     //ComboBox1->setCurrentItem( data->ConnectionType() );
 }
 void SMTPconfig::chooseSig()
 { 
     QString lnk = KFileDialog::getOpenFileName( "", "Choose Signatur File", this );
     if ( !lnk.isEmpty() ) {
         SignaturEdit->setText( lnk );
     }
 }
 void SMTPconfig::slotConnectionToggle( int index )
 {
-    // 2 is ssl connection
-    if ( index == 2 )
+    // 3 is ssl connection
+    if ( index == 3 )
     {
         portLine->setText( SMTP_SSL_PORT );
+        CommandEdit->hide();
     }
-    else if (  index == 3 )
+    else if (  index == 4 )
     {
         portLine->setText( SMTP_PORT );
         CommandEdit->show();
     }
     else
     {
         portLine->setText( SMTP_PORT );
+        CommandEdit->hide();
     }
 }
 
 void SMTPconfig::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     ComboBox1->setCurrentItem( data->ConnectionType() );
     loginBox->setChecked( data->getLogin() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
     SignaturEdit->setText( data->getSigFile() );
 }
 
 void SMTPconfig::accept()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setConnectionType( ComboBox1->currentItem() );
     data->setLogin( loginBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
     data->setSigFile( SignaturEdit->text() );
 
     QDialog::accept();
 }
 
 /**
  * NNTPconfig
  */
 
 NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
         : NNTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     connect( loginBox, SIGNAL( toggled(bool) ), userLine, SLOT( setEnabled(bool) ) );
     connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) );
     connect( GetNGButton,  SIGNAL( clicked() ), this, SLOT( slotGetNG() ) );
     connect( ShowSubcribed,  SIGNAL( clicked() ), this, SLOT( slotShowSub() ) );
     connect( FilterButton,  SIGNAL( clicked() ), this, SLOT( slotShowFilter() ) );
     fillValues();
 
     connect( sslBox, SIGNAL( toggled(bool) ), SLOT( slotSSL(bool) ) );
 }