summaryrefslogtreecommitdiffabout
path: root/kmicromail
Unidiff
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/composemail.cpp28
1 files changed, 20 insertions, 8 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index c1b58a4..9060364 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -72,8 +72,16 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
72 smtpAccountBox->insertItem( smtp->getAccountName() ); 72 smtpAccountBox->insertItem( smtp->getAccountName() );
73 smtpAccounts.append( smtp ); 73 smtpAccounts.append( smtp );
74 } 74 }
75 } 75 }
76 if ( smtpAccounts.count() > 0 ) {
77 fillValues( smtpAccountBox->currentItem() );
78 } else {
79 QMessageBox::information( 0, tr( "Problem" ),
80 tr( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ),
81 tr( "Ok" ) );
82 return;
83 }
76 connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) ); 84 connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) );
77 connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) ); 85 connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) );
78 connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) ); 86 connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) );
79 connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) ); 87 connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
@@ -82,16 +90,9 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
82 connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) ); 90 connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
83 connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) ); 91 connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) );
84 mMail = 0; 92 mMail = 0;
85 warnAttach = true; 93 warnAttach = true;
86 if ( smtpAccounts.count() > 0 ) { 94
87 fillValues( smtpAccountBox->currentItem() );
88 } else {
89 QMessageBox::information( 0, tr( "Problem" ),
90 tr( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ),
91 tr( "Ok" ) );
92 return;
93 }
94} 95}
95void ComposeMail::saveAsDraft() 96void ComposeMail::saveAsDraft()
96{ 97{
97 98
@@ -255,8 +256,14 @@ void ComposeMail::removeAttachment()
255} 256}
256 257
257void ComposeMail::accept() 258void ComposeMail::accept()
258{ 259{
260 if ( smtpAccountBox->count() == 0 ) {
261
262 reject();
263 return;
264 }
265
259 if (! checkBoxLater->isChecked() ) { 266 if (! checkBoxLater->isChecked() ) {
260 int yesno = QMessageBox::warning(0,tr("Stop editing message"), 267 int yesno = QMessageBox::warning(0,tr("Stop editing message"),
261 tr("Send this message?"), 268 tr("Send this message?"),
262 tr("Yes"), 269 tr("Yes"),
@@ -326,8 +333,13 @@ void ComposeMail::reject()
326 tr("No")); 333 tr("No"));
327 334
328 //qDebug("button %d ", yesno); 335 //qDebug("button %d ", yesno);
329 if (yesno == 0) { 336 if (yesno == 0) {
337 if ( toLine->text().isEmpty() ) {
338 QMessageBox::warning(0,tr("Sending mail"),
339 tr("No Receiver spezified" ) );
340 return;
341 }
330 saveAsDraft(); 342 saveAsDraft();
331 } 343 }
332 if (yesno == 2) { 344 if (yesno == 2) {
333 qDebug("return "); 345 qDebug("return ");