-rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 2 | ||||
-rw-r--r-- | kmicromail/mainwindow.cpp | 2 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp index 88545f8..673f288 100644 --- a/kmicromail/libmailwrapper/abstractmail.cpp +++ b/kmicromail/libmailwrapper/abstractmail.cpp | |||
@@ -176,16 +176,17 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe | |||
176 | { | 176 | { |
177 | QMessageBox::critical(0,tr("Error creating new Folder"), | 177 | QMessageBox::critical(0,tr("Error creating new Folder"), |
178 | tr("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName)); | 178 | tr("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName)); |
179 | return; | 179 | return; |
180 | } | 180 | } |
181 | QValueList<RecMailP> t; | 181 | QValueList<RecMailP> t; |
182 | listMessages(fromFolder->getName(),t,acc->getMaxMailSize() ); | 182 | listMessages(fromFolder->getName(),t,acc->getMaxMailSize() ); |
183 | if ( t.count() == 0 ) { | 183 | if ( t.count() == 0 ) { |
184 | qDebug("There are no new messages %s", fromFolder->getName().latin1()); | ||
184 | Global::statusMessage(tr("There are no new messages")); | 185 | Global::statusMessage(tr("There are no new messages")); |
185 | return; | 186 | return; |
186 | } | 187 | } |
187 | QValueList<RecMailP> e; | 188 | QValueList<RecMailP> e; |
188 | targetMail->listMessages(lfName,e,acc->getMaxMailSize() ); | 189 | targetMail->listMessages(lfName,e,acc->getMaxMailSize() ); |
189 | //qDebug("target has mails %d ", e.count()); | 190 | //qDebug("target has mails %d ", e.count()); |
190 | QValueList<RecMailP> n; | 191 | QValueList<RecMailP> n; |
191 | int iii = 0; | 192 | int iii = 0; |
@@ -204,16 +205,17 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe | |||
204 | ++jjj; | 205 | ++jjj; |
205 | } | 206 | } |
206 | if ( !found ) { | 207 | if ( !found ) { |
207 | //qDebug("AAAdate *%s* ", r->isodate.latin1() ); | 208 | //qDebug("AAAdate *%s* ", r->isodate.latin1() ); |
208 | n.append( r ); | 209 | n.append( r ); |
209 | } | 210 | } |
210 | ++iii; | 211 | ++iii; |
211 | } | 212 | } |
213 | qDebug("Downloaded %d messages ",n.count() ); | ||
212 | if ( n.count() == 0 ) { | 214 | if ( n.count() == 0 ) { |
213 | Global::statusMessage(tr("There are no new messages")); | 215 | Global::statusMessage(tr("There are no new messages")); |
214 | return; | 216 | return; |
215 | } | 217 | } |
216 | mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer()); | 218 | mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer()); |
217 | Global::statusMessage(tr("Downloaded %1 messages").arg(n.count())); | 219 | Global::statusMessage(tr("Downloaded %1 messages").arg(n.count())); |
218 | 220 | ||
219 | #if 0 | 221 | #if 0 |
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 2a67e39..ddded2a 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -29,17 +29,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
29 | menuBar = new QPEMenuBar( toolBar ); | 29 | menuBar = new QPEMenuBar( toolBar ); |
30 | mailMenu = new QPopupMenu( menuBar ); | 30 | mailMenu = new QPopupMenu( menuBar ); |
31 | menuBar->insertItem( tr( "Mail" ), mailMenu ); | 31 | menuBar->insertItem( tr( "Mail" ), mailMenu ); |
32 | settingsMenu = new QPopupMenu( menuBar ); | 32 | settingsMenu = new QPopupMenu( menuBar ); |
33 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); | 33 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); |
34 | 34 | ||
35 | addToolBar( toolBar ); | 35 | addToolBar( toolBar ); |
36 | toolBar->setHorizontalStretchable( true ); | 36 | toolBar->setHorizontalStretchable( true ); |
37 | QAction* getMail = new QAction( tr( "Get all new mails" ), SmallIcon("add"), | 37 | QAction* getMail = new QAction( tr( "Get all new mails" ), SmallIcon("enter"), |
38 | 0, 0, this ); | 38 | 0, 0, this ); |
39 | connect(getMail, SIGNAL( activated() ), | 39 | connect(getMail, SIGNAL( activated() ), |
40 | SLOT( slotGetAllMail() ) ); | 40 | SLOT( slotGetAllMail() ) ); |
41 | getMail->addTo( mailMenu ); | 41 | getMail->addTo( mailMenu ); |
42 | 42 | ||
43 | getMail = new QAction( tr( "Get new messages" ), SmallIcon("add"), | 43 | getMail = new QAction( tr( "Get new messages" ), SmallIcon("add"), |
44 | 0, 0, this ); | 44 | 0, 0, this ); |
45 | getMail->addTo( toolBar ); | 45 | getMail->addTo( toolBar ); |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 3cbac8e..9a1a750 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -260,18 +260,16 @@ void OpieMail::slotGetAllMail() | |||
260 | ((AccountViewItem *)item)->contextMenuSelected( 101 ); | 260 | ((AccountViewItem *)item)->contextMenuSelected( 101 ); |
261 | item = item->nextSibling (); | 261 | item = item->nextSibling (); |
262 | } | 262 | } |
263 | } | 263 | } |
264 | void OpieMail::slotGetMail() | 264 | void OpieMail::slotGetMail() |
265 | { | 265 | { |
266 | QListViewItem * item = folderView->currentItem(); | 266 | QListViewItem * item = folderView->currentItem(); |
267 | if ( ! item ) return; | 267 | if ( ! item ) return; |
268 | while ( item->parent () ) | ||
269 | item = item->parent (); | ||
270 | ((AccountViewItem *)item)->contextMenuSelected( 101 ); | 268 | ((AccountViewItem *)item)->contextMenuSelected( 101 ); |
271 | } | 269 | } |
272 | void OpieMail::slotDeleteMail() | 270 | void OpieMail::slotDeleteMail() |
273 | { | 271 | { |
274 | if (!mailView->currentItem()) return; | 272 | if (!mailView->currentItem()) return; |
275 | RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data(); | 273 | RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data(); |
276 | if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | 274 | if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) |
277 | { | 275 | { |