Diffstat (limited to 'noncore/net/mail/editaccounts.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/editaccounts.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp index 9fc97e8..1cb202e 100644 --- a/noncore/net/mail/editaccounts.cpp +++ b/noncore/net/mail/editaccounts.cpp | |||
@@ -266,13 +266,22 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, | |||
266 | 266 | ||
267 | fillValues(); | 267 | fillValues(); |
268 | 268 | ||
269 | connect( sslBox, SIGNAL( toggled( bool ) ), SLOT( slotSSL( bool ) ) ); | 269 | connect( ComboBox1, SIGNAL( activated( int ) ), SLOT( slotConnectionToggle( int ) ) ); |
270 | ComboBox1->insertItem( "Only if available", 0 ); | ||
271 | ComboBox1->insertItem( "Always, Negotiated", 1 ); | ||
272 | ComboBox1->insertItem( "Connect on secure port", 2 ); | ||
273 | ComboBox1->insertItem( "Run command instead", 3 ); | ||
274 | CommandEdit->hide(); | ||
275 | ComboBox1->setCurrentItem( data->ConnectionType() ); | ||
270 | } | 276 | } |
271 | 277 | ||
272 | void IMAPconfig::slotSSL( bool enabled ) | 278 | void IMAPconfig::slotConnectionToggle( int index ) |
273 | { | 279 | { |
274 | if ( enabled ) { | 280 | if ( index == 2 ) { |
275 | portLine->setText( IMAP_SSL_PORT ); | 281 | portLine->setText( IMAP_SSL_PORT ); |
282 | } else if ( index == 3 ) { | ||
283 | portLine->setText( IMAP_PORT ); | ||
284 | CommandEdit->show(); | ||
276 | } else { | 285 | } else { |
277 | portLine->setText( IMAP_PORT ); | 286 | portLine->setText( IMAP_PORT ); |
278 | } | 287 | } |
@@ -283,7 +292,7 @@ void IMAPconfig::fillValues() | |||
283 | accountLine->setText( data->getAccountName() ); | 292 | accountLine->setText( data->getAccountName() ); |
284 | serverLine->setText( data->getServer() ); | 293 | serverLine->setText( data->getServer() ); |
285 | portLine->setText( data->getPort() ); | 294 | portLine->setText( data->getPort() ); |
286 | sslBox->setChecked( data->getSSL() ); | 295 | ComboBox1->setCurrentItem( data->ConnectionType() ); |
287 | userLine->setText( data->getUser() ); | 296 | userLine->setText( data->getUser() ); |
288 | passLine->setText( data->getPassword() ); | 297 | passLine->setText( data->getPassword() ); |
289 | prefixLine->setText(data->getPrefix()); | 298 | prefixLine->setText(data->getPrefix()); |
@@ -294,7 +303,7 @@ void IMAPconfig::accept() | |||
294 | data->setAccountName( accountLine->text() ); | 303 | data->setAccountName( accountLine->text() ); |
295 | data->setServer( serverLine->text() ); | 304 | data->setServer( serverLine->text() ); |
296 | data->setPort( portLine->text() ); | 305 | data->setPort( portLine->text() ); |
297 | data->setSSL( sslBox->isChecked() ); | 306 | data->setConnectionType( ComboBox1->currentItem() ); |
298 | data->setUser( userLine->text() ); | 307 | data->setUser( userLine->text() ); |
299 | data->setPassword( passLine->text() ); | 308 | data->setPassword( passLine->text() ); |
300 | data->setPrefix(prefixLine->text()); | 309 | data->setPrefix(prefixLine->text()); |