summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--bin/kdepim/kopiemail/germantranslation.txt14
-rw-r--r--kmicromail/editaccounts.cpp12
-rw-r--r--kmicromail/opiemail.cpp8
-rw-r--r--kmicromail/selectsmtp.cpp2
5 files changed, 27 insertions, 11 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index a9b6c87..943aaef 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -5,12 +5,14 @@ Info about the changes in new versions of KDE-Pim/Pi
5Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter. 5Fixed a problem in the addressee select dialog and made it more user friendly by adding a minimize splitter.
6 6
7In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down". 7In the search dialog you can switch now the focus from search line edit to the list view by pressing key "arrow down".
8 8
9OM/Pi: 9OM/Pi:
10Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails. 10Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails.
11Added missing German translation.
12Added warning if path is specified in local folder settings of account config.
11 13
12********** VERSION 2.0.12 ************ 14********** VERSION 2.0.12 ************
13 15
14KO/Pi: 16KO/Pi:
15Fixed a bug in todo start/due date handling for non recurring todos with a start and due date. 17Fixed a bug in todo start/due date handling for non recurring todos with a start and due date.
16Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes. 18Fixed some layout problems in the KO/Pi agenda view when there were many conflicting itmes.
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 0d858a8..86a9569 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -262,13 +262,17 @@
262{ "Show info fields at startup","Zeige Info Felder beim Start" }, 262{ "Show info fields at startup","Zeige Info Felder beim Start" },
263{ "Show "Subject" info field","Zeige "Betreff" Info Feld" }, 263{ "Show "Subject" info field","Zeige "Betreff" Info Feld" },
264{ "Show "From" info field","Zeige "Von" Info Feld" }, 264{ "Show "From" info field","Zeige "Von" Info Feld" },
265{ "Show "To" info field","Zeige "An" Info Feld" }, 265{ "Show "To" info field","Zeige "An" Info Feld" },
266{ "Mail saved as draft!","Mail als Entwurf gespeichert!" }, 266{ "Mail saved as draft!","Mail als Entwurf gespeichert!" },
267{ "Save signature","Speichere Signatur" }, 267{ "Save signature","Speichere Signatur" },
268{ "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically.","Beim lokalen Verzeichnis\nsind keine Pfade erlaubt.\nBitte Verzeichnisnamen\nangeben oder leer lassen\num automatisch ein lokales\nVerzeichnis mit dem\nZugangsnamen anzulegen." },
269{ "Do you really want to\nsend all queued mails?","Möchten sie wirklich\nalle Mails im\nOutgoing-Ordner\nsenden?" },
270{ "Sending all mails","Senden aller Mails" },
271{ "SMTP Account:","SMTP Zugang:" },
272{ "Select SMTP Account","Wähle SMTP Zugang" },
273{ "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" },
274{ "Error sending mail","Fehler beim Mailversand" },
275{ "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." },
268{ "","" }, 276{ "","" },
269{ "","" }, 277{ "","" },
270{ "","" }, 278{ "","" }, \ No newline at end of file
271{ "","" },
272{ "","" },
273{ "","" },
274{ "","" },
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index 8253c91..f1075c0 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -378,12 +378,18 @@ void IMAPconfig::fillValues()
378 } 378 }
379 CheckBoxLeaveOn->setChecked( data->getLeaveOnServer() ); 379 CheckBoxLeaveOn->setChecked( data->getLeaveOnServer() );
380} 380}
381 381
382void IMAPconfig::accept() 382void IMAPconfig::accept()
383{ 383{
384 if ( localFolder->text().contains("/") ||localFolder->text().contains("\\") ) {
385 QMessageBox::information( this, i18n( "Error" ),
386 i18n( "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically." ),
387 i18n( "Ok" ) );
388 return;
389 }
384 data->setAccountName( accountLine->text() ); 390 data->setAccountName( accountLine->text() );
385 data->setServer( serverLine->text() ); 391 data->setServer( serverLine->text() );
386 data->setPort( portLine->text() ); 392 data->setPort( portLine->text() );
387 data->setConnectionType( ComboBox1->currentItem() ); 393 data->setConnectionType( ComboBox1->currentItem() );
388 data->setUser( userLine->text() ); 394 data->setUser( userLine->text() );
389 data->setPassword( passLine->text() ); 395 data->setPassword( passLine->text() );
@@ -451,12 +457,18 @@ void POP3config::fillValues()
451 } 457 }
452 CheckBoxLeaveOn->setChecked( data->getLeaveOnServer() ); 458 CheckBoxLeaveOn->setChecked( data->getLeaveOnServer() );
453} 459}
454 460
455void POP3config::accept() 461void POP3config::accept()
456{ 462{
463 if ( localFolder->text().contains("/") ||localFolder->text().contains("\\") ) {
464 QMessageBox::information( this, i18n( "Error" ),
465 i18n( "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically." ),
466 i18n( "Ok" ) );
467 return;
468 }
457 data->setAccountName( accountLine->text() ); 469 data->setAccountName( accountLine->text() );
458 data->setServer( serverLine->text() ); 470 data->setServer( serverLine->text() );
459 data->setPort( portLine->text() ); 471 data->setPort( portLine->text() );
460 data->setConnectionType( ComboBox1->currentItem() ); 472 data->setConnectionType( ComboBox1->currentItem() );
461 data->setUser( userLine->text() ); 473 data->setUser( userLine->text() );
462 data->setPassword( passLine->text() ); 474 data->setPassword( passLine->text() );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 197f7ec..b701446 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -202,29 +202,27 @@ void OpieMail::slotSendQueued()
202 smtp = static_cast<SMTPaccount *>(it); 202 smtp = static_cast<SMTPaccount *>(it);
203 smtpList.append(smtp); 203 smtpList.append(smtp);
204 } 204 }
205 } 205 }
206 if (smtpList.count()==0) 206 if (smtpList.count()==0)
207 { 207 {
208 QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n")); 208 QMessageBox::information(0,i18n("Info"),i18n("Define a smtp\n account first!\n"));
209 return; 209 return;
210 } 210 }
211 if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to send\nall queued mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) 211 if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to\nsend all queued mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
212 return; 212 return;
213 if (smtpList.count()==1) 213 if (smtpList.count()==1)
214 { 214 {
215 smtp = smtpList.at(0); 215 smtp = smtpList.at(0);
216 } 216 }
217 else 217 else
218 { 218 {
219 smtp = 0; 219 smtp = 0;
220 selectsmtp selsmtp; 220 selectsmtp selsmtp;
221 selsmtp.setSelectionlist(&smtpList); 221 selsmtp.setSelectionlist(&smtpList);
222#ifndef DESKTOP_VERSION 222 selsmtp.resize( selsmtp.sizeHint() );
223 selsmtp.showMaximized();
224#endif
225 if ( selsmtp.exec() == QDialog::Accepted ) 223 if ( selsmtp.exec() == QDialog::Accepted )
226 { 224 {
227 smtp = selsmtp.selected_smtp(); 225 smtp = selsmtp.selected_smtp();
228 } 226 }
229 } 227 }
230 if (smtp) 228 if (smtp)
diff --git a/kmicromail/selectsmtp.cpp b/kmicromail/selectsmtp.cpp
index ff8b524..10b6d79 100644
--- a/kmicromail/selectsmtp.cpp
+++ b/kmicromail/selectsmtp.cpp
@@ -16,13 +16,13 @@ selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl)
16 //m_smtpList.setAutoDelete(false); 16 //m_smtpList.setAutoDelete(false);
17 m_smtpList = 0; 17 m_smtpList = 0;
18 //headlabel->setText(i18n("<center>Select SMTP account to use</center>")); 18 //headlabel->setText(i18n("<center>Select SMTP account to use</center>"));
19 headlabel->hide(); 19 headlabel->hide();
20 folderSelection->hide(); 20 folderSelection->hide();
21 folderLabel->hide(); 21 folderLabel->hide();
22 accountlabel->setText("<center>SMTP Accounts</center>"); 22 //accountlabel->setText(i18n("SMTP\nAccount:"));
23 Line1->hide(); 23 Line1->hide();
24 newFoldersel->hide(); 24 newFoldersel->hide();
25 newFolderedit->hide(); 25 newFolderedit->hide();
26 newFolderLabel->hide(); 26 newFolderLabel->hide();
27 Line2->hide(); 27 Line2->hide();
28 selMove->hide(); 28 selMove->hide();