| -rw-r--r-- | kmicromail/editaccounts.cpp | 12 | ||||
| -rw-r--r-- | kmicromail/opiemail.cpp | 8 | ||||
| -rw-r--r-- | kmicromail/selectsmtp.cpp | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp index 8253c91..f1075c0 100644 --- a/kmicromail/editaccounts.cpp +++ b/kmicromail/editaccounts.cpp @@ -381,6 +381,12 @@ void IMAPconfig::fillValues() 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() ); @@ -454,6 +460,12 @@ void POP3config::fillValues() 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() ); diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 197f7ec..b701446 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -205,10 +205,10 @@ void OpieMail::slotSendQueued() } if (smtpList.count()==0) { - QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n")); + QMessageBox::information(0,i18n("Info"),i18n("Define a smtp\n account first!\n")); return; } - if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to send\nall queued mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) + if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to\nsend all queued mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) return; if (smtpList.count()==1) { @@ -219,9 +219,7 @@ void OpieMail::slotSendQueued() smtp = 0; selectsmtp selsmtp; selsmtp.setSelectionlist(&smtpList); -#ifndef DESKTOP_VERSION - selsmtp.showMaximized(); -#endif + selsmtp.resize( selsmtp.sizeHint() ); if ( selsmtp.exec() == QDialog::Accepted ) { smtp = selsmtp.selected_smtp(); diff --git a/kmicromail/selectsmtp.cpp b/kmicromail/selectsmtp.cpp index ff8b524..10b6d79 100644 --- a/kmicromail/selectsmtp.cpp +++ b/kmicromail/selectsmtp.cpp @@ -19,7 +19,7 @@ selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl) headlabel->hide(); folderSelection->hide(); folderLabel->hide(); - accountlabel->setText("<center>SMTP Accounts</center>"); + //accountlabel->setText(i18n("SMTP\nAccount:")); Line1->hide(); newFoldersel->hide(); newFolderedit->hide(); |