author | zautrix <zautrix> | 2004-09-16 23:29:24 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-16 23:29:24 (UTC) |
commit | eebe4409884ccd4dedb7cb697a800f74b33eb292 (patch) (unidiff) | |
tree | cd0a235edcab08ee8512c738624dcebac9502749 /kmicromail | |
parent | af411746b1480e7b331ea7d163f39d2507cf7264 (diff) | |
download | kdepimpi-eebe4409884ccd4dedb7cb697a800f74b33eb292.zip kdepimpi-eebe4409884ccd4dedb7cb697a800f74b33eb292.tar.gz kdepimpi-eebe4409884ccd4dedb7cb697a800f74b33eb292.tar.bz2 |
Fixes in ompi
-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 | |||
@@ -160,76 +160,78 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target) | |||
160 | deleteMail(mail); | 160 | deleteMail(mail); |
161 | ++iii; | 161 | ++iii; |
162 | } | 162 | } |
163 | } | 163 | } |
164 | 164 | ||
165 | void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targetMail ) | 165 | void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targetMail ) |
166 | { | 166 | { |
167 | //qDebug("AbstractMail::downloadNewMails %s ", fromFolder->getName().latin1()); | 167 | //qDebug("AbstractMail::downloadNewMails %s ", fromFolder->getName().latin1()); |
168 | // get local folder | 168 | // get local folder |
169 | Account * acc = getAccount(); | 169 | Account * acc = getAccount(); |
170 | if ( !acc ) return; | 170 | if ( !acc ) return; |
171 | QString lfName = acc->getLocalFolder(); | 171 | QString lfName = acc->getLocalFolder(); |
172 | if ( lfName.isEmpty() ) | 172 | if ( lfName.isEmpty() ) |
173 | lfName = acc->getAccountName(); | 173 | lfName = acc->getAccountName(); |
174 | // create local folder | 174 | // create local folder |
175 | if ( !targetMail->createMbox(lfName)) | 175 | if ( !targetMail->createMbox(lfName)) |
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; |
192 | int count = t.count(); | 193 | int count = t.count(); |
193 | while (iii < count ) { | 194 | while (iii < count ) { |
194 | RecMailP r = (*t.at( iii )); | 195 | RecMailP r = (*t.at( iii )); |
195 | bool found = false; | 196 | bool found = false; |
196 | int jjj = 0; | 197 | int jjj = 0; |
197 | int countE = e.count(); | 198 | int countE = e.count(); |
198 | while (jjj < countE ) { | 199 | while (jjj < countE ) { |
199 | RecMailP re = (*e.at( jjj )); | 200 | RecMailP re = (*e.at( jjj )); |
200 | if ( re->isEqual(r) ) { | 201 | if ( re->isEqual(r) ) { |
201 | found = true; | 202 | found = true; |
202 | break; | 203 | break; |
203 | } | 204 | } |
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 |
220 | QValueList<RecMailP> t; | 222 | QValueList<RecMailP> t; |
221 | listMessages(fromFolder->getName(),t, maxSizeInKb); | 223 | listMessages(fromFolder->getName(),t, maxSizeInKb); |
222 | mvcpMailList( t,targetFolder,targetWrapper,moveit); | 224 | mvcpMailList( t,targetFolder,targetWrapper,moveit); |
223 | #endif | 225 | #endif |
224 | 226 | ||
225 | } | 227 | } |
226 | void AbstractMail::mvcpAllMails(const FolderP&fromFolder, | 228 | void AbstractMail::mvcpAllMails(const FolderP&fromFolder, |
227 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb) | 229 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb) |
228 | { | 230 | { |
229 | QValueList<RecMailP> t; | 231 | QValueList<RecMailP> t; |
230 | listMessages(fromFolder->getName(),t, maxSizeInKb); | 232 | listMessages(fromFolder->getName(),t, maxSizeInKb); |
231 | mvcpMailList( t,targetFolder,targetWrapper,moveit); | 233 | mvcpMailList( t,targetFolder,targetWrapper,moveit); |
232 | 234 | ||
233 | } | 235 | } |
234 | void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, | 236 | void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, |
235 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 237 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 2a67e39..ddded2a 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -13,49 +13,49 @@ | |||
13 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
14 | #endif | 14 | #endif |
15 | #include "defines.h" | 15 | #include "defines.h" |
16 | #include "mainwindow.h" | 16 | #include "mainwindow.h" |
17 | #include <KDGanttMinimizeSplitter.h> | 17 | #include <KDGanttMinimizeSplitter.h> |
18 | 18 | ||
19 | 19 | ||
20 | #include <kabc/stdaddressbook.h> | 20 | #include <kabc/stdaddressbook.h> |
21 | 21 | ||
22 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 22 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
23 | : QMainWindow( parent, name ) //, flags ) | 23 | : QMainWindow( parent, name ) //, flags ) |
24 | { | 24 | { |
25 | setCaption( tr( "KOpieMail/Pi" ) ); | 25 | setCaption( tr( "KOpieMail/Pi" ) ); |
26 | setToolBarsMovable( false ); | 26 | setToolBarsMovable( false ); |
27 | //KABC::StdAddressBook::self(); | 27 | //KABC::StdAddressBook::self(); |
28 | toolBar = new QToolBar( this ); | 28 | toolBar = new QToolBar( this ); |
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 ); |
46 | getMail->addTo( mailMenu ); | 46 | getMail->addTo( mailMenu ); |
47 | connect(getMail, SIGNAL( activated() ), | 47 | connect(getMail, SIGNAL( activated() ), |
48 | SLOT( slotGetMail() ) ); | 48 | SLOT( slotGetMail() ) ); |
49 | 49 | ||
50 | composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"), | 50 | composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"), |
51 | 0, 0, this ); | 51 | 0, 0, this ); |
52 | composeMail->addTo( toolBar ); | 52 | composeMail->addTo( toolBar ); |
53 | composeMail->addTo( mailMenu ); | 53 | composeMail->addTo( mailMenu ); |
54 | 54 | ||
55 | sendQueued = new QAction( tr( "Send queued mails" ), SmallIcon("sendqueued") , | 55 | sendQueued = new QAction( tr( "Send queued mails" ), SmallIcon("sendqueued") , |
56 | 0, 0, this ); | 56 | 0, 0, this ); |
57 | sendQueued->addTo( toolBar ); | 57 | sendQueued->addTo( toolBar ); |
58 | sendQueued->addTo( mailMenu ); | 58 | sendQueued->addTo( mailMenu ); |
59 | 59 | ||
60 | /* | 60 | /* |
61 | syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, | 61 | syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC, |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 3cbac8e..9a1a750 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -244,50 +244,48 @@ void OpieMail::displayMail() | |||
244 | readMail.showMaximized(); | 244 | readMail.showMaximized(); |
245 | readMail.exec(); | 245 | readMail.exec(); |
246 | 246 | ||
247 | if ( readMail.deleted ) | 247 | if ( readMail.deleted ) |
248 | { | 248 | { |
249 | folderView->refreshCurrent(); | 249 | folderView->refreshCurrent(); |
250 | } | 250 | } |
251 | else | 251 | else |
252 | { | 252 | { |
253 | ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); | 253 | ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() ); |
254 | } | 254 | } |
255 | } | 255 | } |
256 | void OpieMail::slotGetAllMail() | 256 | void OpieMail::slotGetAllMail() |
257 | { | 257 | { |
258 | QListViewItem * item = folderView->firstChild(); | 258 | QListViewItem * item = folderView->firstChild(); |
259 | while ( item ){ | 259 | while ( item ){ |
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 | { |
278 | mail->Wrapper()->deleteMail( mail ); | 276 | mail->Wrapper()->deleteMail( mail ); |
279 | folderView->refreshCurrent(); | 277 | folderView->refreshCurrent(); |
280 | } | 278 | } |
281 | } | 279 | } |
282 | void OpieMail::slotDeleteAllMail() | 280 | void OpieMail::slotDeleteAllMail() |
283 | { | 281 | { |
284 | 282 | ||
285 | QValueList<RecMailP> t; | 283 | QValueList<RecMailP> t; |
286 | if ( QMessageBox::warning(this, tr("Delete All Mails"), tr("Do you really want to delete\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | 284 | if ( QMessageBox::warning(this, tr("Delete All Mails"), tr("Do you really want to delete\nall selected mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) |
287 | { | 285 | { |
288 | MailListViewItem* item = (MailListViewItem*)mailView->firstChild (); | 286 | MailListViewItem* item = (MailListViewItem*)mailView->firstChild (); |
289 | while ( item ) { | 287 | while ( item ) { |
290 | if ( item->isSelected() ) { | 288 | if ( item->isSelected() ) { |
291 | t.append( item->data() ); | 289 | t.append( item->data() ); |
292 | } | 290 | } |
293 | item = (MailListViewItem*)item->nextSibling(); | 291 | item = (MailListViewItem*)item->nextSibling(); |