author | alwin <alwin> | 2005-03-09 14:40:43 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-09 14:40:43 (UTC) |
commit | 84f237fb3b83400a031bf7c2d3025f78c02f28a8 (patch) (unidiff) | |
tree | fbe8992bea9ddda02129d4c3aa4facc4ec38e00c /noncore/net/mail | |
parent | e62e4a9111d9f5cfe4f004f1b21d377b92018b33 (diff) | |
download | opie-84f237fb3b83400a031bf7c2d3025f78c02f28a8.zip opie-84f237fb3b83400a031bf7c2d3025f78c02f28a8.tar.gz opie-84f237fb3b83400a031bf7c2d3025f78c02f28a8.tar.bz2 |
cleanups/fixed potential crashers
context menus are displayed in mainmenu, too.
-rw-r--r-- | noncore/net/mail/accountitem.cpp | 133 | ||||
-rw-r--r-- | noncore/net/mail/accountitem.h | 13 | ||||
-rw-r--r-- | noncore/net/mail/accountview.cpp | 52 | ||||
-rw-r--r-- | noncore/net/mail/accountview.h | 11 | ||||
-rw-r--r-- | noncore/net/mail/defines.h | 13 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 35 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.h | 5 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 4 |
8 files changed, 199 insertions, 67 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp index c1574fd..4869df8 100644 --- a/noncore/net/mail/accountitem.cpp +++ b/noncore/net/mail/accountitem.cpp | |||
@@ -81,30 +81,30 @@ RECBODYP POP3viewItem::fetchBody( const RecMailP &mail ) | |||
81 | { | 81 | { |
82 | odebug << "POP3 fetchBody" << oendl; | 82 | odebug << "POP3 fetchBody" << oendl; |
83 | return wrapper->fetchBody( mail ); | 83 | return wrapper->fetchBody( mail ); |
84 | } | 84 | } |
85 | 85 | ||
86 | QPopupMenu * POP3viewItem::getContextMenu() | 86 | QPopupMenu * POP3viewItem::getContextMenu() |
87 | { | 87 | { |
88 | QPopupMenu *m = new QPopupMenu(0); | 88 | QPopupMenu *m = new QPopupMenu(0); |
89 | if (m) | 89 | if (m) |
90 | { | 90 | { |
91 | if (!account->getOffline()) | 91 | if (!account->getOffline()) |
92 | { | 92 | { |
93 | m->insertItem(QObject::tr("Disconnect",contextName),0); | 93 | m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT); |
94 | m->insertItem(QObject::tr("Set offline",contextName),1); | 94 | m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE); |
95 | } | 95 | } |
96 | else | 96 | else |
97 | { | 97 | { |
98 | m->insertItem(QObject::tr("Set online",contextName),1); | 98 | m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE); |
99 | } | 99 | } |
100 | } | 100 | } |
101 | return m; | 101 | return m; |
102 | } | 102 | } |
103 | 103 | ||
104 | void POP3viewItem::disconnect() | 104 | void POP3viewItem::disconnect() |
105 | { | 105 | { |
106 | QListViewItem *child = firstChild(); | 106 | QListViewItem *child = firstChild(); |
107 | while ( child ) | 107 | while ( child ) |
108 | { | 108 | { |
109 | QListViewItem *tmp = child; | 109 | QListViewItem *tmp = child; |
110 | child = child->nextSibling(); | 110 | child = child->nextSibling(); |
@@ -120,28 +120,28 @@ void POP3viewItem::setOnOffline() | |||
120 | disconnect(); | 120 | disconnect(); |
121 | } | 121 | } |
122 | account->setOffline(!account->getOffline()); | 122 | account->setOffline(!account->getOffline()); |
123 | account->save(); | 123 | account->save(); |
124 | SETPIX(PIXMAP_POP3FOLDER); | 124 | SETPIX(PIXMAP_POP3FOLDER); |
125 | refresh(); | 125 | refresh(); |
126 | } | 126 | } |
127 | 127 | ||
128 | void POP3viewItem::contextMenuSelected(int which) | 128 | void POP3viewItem::contextMenuSelected(int which) |
129 | { | 129 | { |
130 | switch (which) | 130 | switch (which) |
131 | { | 131 | { |
132 | case 0: | 132 | case SERVER_MENU_DISCONNECT: |
133 | disconnect(); | 133 | disconnect(); |
134 | break; | 134 | break; |
135 | case 1: | 135 | case SERVER_MENU_OFFLINE: |
136 | setOnOffline(); | 136 | setOnOffline(); |
137 | break; | 137 | break; |
138 | } | 138 | } |
139 | } | 139 | } |
140 | 140 | ||
141 | POP3folderItem::~POP3folderItem() | 141 | POP3folderItem::~POP3folderItem() |
142 | {} | 142 | {} |
143 | 143 | ||
144 | POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after ) | 144 | POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after ) |
145 | : AccountViewItem(folderInit,parent,after ) | 145 | : AccountViewItem(folderInit,parent,after ) |
146 | { | 146 | { |
147 | pop3 = parent; | 147 | pop3 = parent; |
@@ -163,52 +163,52 @@ void POP3folderItem::refresh(QValueList<RecMailP>&target) | |||
163 | } | 163 | } |
164 | 164 | ||
165 | RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail) | 165 | RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail) |
166 | { | 166 | { |
167 | return pop3->getWrapper()->fetchBody(aMail); | 167 | return pop3->getWrapper()->fetchBody(aMail); |
168 | } | 168 | } |
169 | 169 | ||
170 | QPopupMenu * POP3folderItem::getContextMenu() | 170 | QPopupMenu * POP3folderItem::getContextMenu() |
171 | { | 171 | { |
172 | QPopupMenu *m = new QPopupMenu(0); | 172 | QPopupMenu *m = new QPopupMenu(0); |
173 | if (m) | 173 | if (m) |
174 | { | 174 | { |
175 | m->insertItem(QObject::tr("Refresh header list",contextName),0); | 175 | m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER); |
176 | m->insertItem(QObject::tr("Delete all mails",contextName),1); | 176 | m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS); |
177 | m->insertItem(QObject::tr("Move/Copie all mails",contextName),2); | 177 | m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS); |
178 | } | 178 | } |
179 | return m; | 179 | return m; |
180 | } | 180 | } |
181 | 181 | ||
182 | void POP3folderItem::downloadMails() | 182 | void POP3folderItem::downloadMails() |
183 | { | 183 | { |
184 | AccountView*bl = pop3->accountView(); | 184 | AccountView*bl = pop3->accountView(); |
185 | if (!bl) return; | 185 | if (!bl) return; |
186 | bl->downloadMails(folder,pop3->getWrapper()); | 186 | bl->downloadMails(folder,pop3->getWrapper()); |
187 | } | 187 | } |
188 | 188 | ||
189 | void POP3folderItem::contextMenuSelected(int which) | 189 | void POP3folderItem::contextMenuSelected(int which) |
190 | { | 190 | { |
191 | AccountView * view = (AccountView*)listView(); | 191 | AccountView * view = (AccountView*)listView(); |
192 | switch (which) | 192 | switch (which) |
193 | { | 193 | { |
194 | case 0: | 194 | case FOLDER_MENU_REFRESH_HEADER: |
195 | /* must be 'cause pop3 lists are cached */ | 195 | /* must be 'cause pop3 lists are cached */ |
196 | pop3->getWrapper()->logout(); | 196 | pop3->getWrapper()->logout(); |
197 | view->refreshCurrent(); | 197 | view->refreshCurrent(); |
198 | break; | 198 | break; |
199 | case 1: | 199 | case FOLDER_MENU_DELETE_ALL_MAILS: |
200 | deleteAllMail(pop3->getWrapper(),folder); | 200 | deleteAllMail(pop3->getWrapper(),folder); |
201 | break; | 201 | break; |
202 | case 2: | 202 | case FOLDER_MENU_MOVE_MAILS: |
203 | downloadMails(); | 203 | downloadMails(); |
204 | break; | 204 | break; |
205 | default: | 205 | default: |
206 | break; | 206 | break; |
207 | } | 207 | } |
208 | } | 208 | } |
209 | 209 | ||
210 | /** | 210 | /** |
211 | * NNTP Account stuff | 211 | * NNTP Account stuff |
212 | */ | 212 | */ |
213 | NNTPviewItem::NNTPviewItem( NNTPaccount *a, AccountView *parent ) | 213 | NNTPviewItem::NNTPviewItem( NNTPaccount *a, AccountView *parent ) |
214 | : AccountViewItem( parent ) | 214 | : AccountViewItem( parent ) |
@@ -272,31 +272,31 @@ RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail ) | |||
272 | { | 272 | { |
273 | odebug << "NNTP fetchBody" << oendl; | 273 | odebug << "NNTP fetchBody" << oendl; |
274 | return wrapper->fetchBody( mail ); | 274 | return wrapper->fetchBody( mail ); |
275 | } | 275 | } |
276 | 276 | ||
277 | QPopupMenu * NNTPviewItem::getContextMenu() | 277 | QPopupMenu * NNTPviewItem::getContextMenu() |
278 | { | 278 | { |
279 | QPopupMenu *m = new QPopupMenu(0); | 279 | QPopupMenu *m = new QPopupMenu(0); |
280 | if (m) | 280 | if (m) |
281 | { | 281 | { |
282 | if (!account->getOffline()) | 282 | if (!account->getOffline()) |
283 | { | 283 | { |
284 | m->insertItem(QObject::tr("Disconnect",contextName),0); | 284 | m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT); |
285 | m->insertItem(QObject::tr("Set offline",contextName),1); | 285 | m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE); |
286 | m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),2); | 286 | m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),SERVER_MENU_SUBSCRIBE); |
287 | } | 287 | } |
288 | else | 288 | else |
289 | { | 289 | { |
290 | m->insertItem(QObject::tr("Set online",contextName),1); | 290 | m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE); |
291 | } | 291 | } |
292 | } | 292 | } |
293 | return m; | 293 | return m; |
294 | } | 294 | } |
295 | 295 | ||
296 | void NNTPviewItem::subscribeGroups() | 296 | void NNTPviewItem::subscribeGroups() |
297 | { | 297 | { |
298 | NNTPGroupsDlg dlg(account); | 298 | NNTPGroupsDlg dlg(account); |
299 | if (QPEApplication::execDialog(&dlg)== QDialog::Accepted ){ | 299 | if (QPEApplication::execDialog(&dlg)== QDialog::Accepted ){ |
300 | refresh(); | 300 | refresh(); |
301 | } | 301 | } |
302 | } | 302 | } |
@@ -321,31 +321,31 @@ void NNTPviewItem::setOnOffline() | |||
321 | } | 321 | } |
322 | account->setOffline(!account->getOffline()); | 322 | account->setOffline(!account->getOffline()); |
323 | account->save(); | 323 | account->save(); |
324 | //FIXME | 324 | //FIXME |
325 | SETPIX(PIXMAP_POP3FOLDER); | 325 | SETPIX(PIXMAP_POP3FOLDER); |
326 | refresh(); | 326 | refresh(); |
327 | } | 327 | } |
328 | 328 | ||
329 | void NNTPviewItem::contextMenuSelected(int which) | 329 | void NNTPviewItem::contextMenuSelected(int which) |
330 | { | 330 | { |
331 | switch (which) | 331 | switch (which) |
332 | { | 332 | { |
333 | case 0: | 333 | case SERVER_MENU_DISCONNECT: |
334 | disconnect(); | 334 | disconnect(); |
335 | break; | 335 | break; |
336 | case 1: | 336 | case SERVER_MENU_OFFLINE: |
337 | setOnOffline(); | 337 | setOnOffline(); |
338 | break; | 338 | break; |
339 | case 2: | 339 | case SERVER_MENU_SUBSCRIBE: |
340 | subscribeGroups(); | 340 | subscribeGroups(); |
341 | break; | 341 | break; |
342 | } | 342 | } |
343 | } | 343 | } |
344 | 344 | ||
345 | NNTPfolderItem::~NNTPfolderItem() | 345 | NNTPfolderItem::~NNTPfolderItem() |
346 | {} | 346 | {} |
347 | 347 | ||
348 | NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after ) | 348 | NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after ) |
349 | : AccountViewItem( folderInit, parent,after ) | 349 | : AccountViewItem( folderInit, parent,after ) |
350 | { | 350 | { |
351 | nntp = parent; | 351 | nntp = parent; |
@@ -367,48 +367,48 @@ void NNTPfolderItem::refresh(QValueList<RecMailP>&target) | |||
367 | } | 367 | } |
368 | 368 | ||
369 | RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail) | 369 | RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail) |
370 | { | 370 | { |
371 | return nntp->getWrapper()->fetchBody(aMail); | 371 | return nntp->getWrapper()->fetchBody(aMail); |
372 | } | 372 | } |
373 | 373 | ||
374 | QPopupMenu * NNTPfolderItem::getContextMenu() | 374 | QPopupMenu * NNTPfolderItem::getContextMenu() |
375 | { | 375 | { |
376 | QPopupMenu *m = new QPopupMenu(0); | 376 | QPopupMenu *m = new QPopupMenu(0); |
377 | if (m) | 377 | if (m) |
378 | { | 378 | { |
379 | m->insertItem(QObject::tr("Refresh header list",contextName),0); | 379 | m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER); |
380 | m->insertItem(QObject::tr("Copy all postings",contextName),1); | 380 | m->insertItem(QObject::tr("Copy all postings",contextName),FOLDER_MENU_MOVE_MAILS); |
381 | } | 381 | } |
382 | return m; | 382 | return m; |
383 | } | 383 | } |
384 | 384 | ||
385 | void NNTPfolderItem::downloadMails() | 385 | void NNTPfolderItem::downloadMails() |
386 | { | 386 | { |
387 | AccountView*bl = nntp->accountView(); | 387 | AccountView*bl = nntp->accountView(); |
388 | if (!bl) return; | 388 | if (!bl) return; |
389 | bl->downloadMails(folder,nntp->getWrapper()); | 389 | bl->downloadMails(folder,nntp->getWrapper()); |
390 | } | 390 | } |
391 | 391 | ||
392 | void NNTPfolderItem::contextMenuSelected(int which) | 392 | void NNTPfolderItem::contextMenuSelected(int which) |
393 | { | 393 | { |
394 | AccountView * view = (AccountView*)listView(); | 394 | AccountView * view = (AccountView*)listView(); |
395 | switch (which) | 395 | switch (which) |
396 | { | 396 | { |
397 | case 0: | 397 | case FOLDER_MENU_REFRESH_HEADER: |
398 | /* must be 'cause pop3 lists are cached */ | 398 | /* must be 'cause nntp lists are cached */ |
399 | nntp->getWrapper()->logout(); | 399 | nntp->getWrapper()->logout(); |
400 | view->refreshCurrent(); | 400 | view->refreshCurrent(); |
401 | break; | 401 | break; |
402 | case 1: | 402 | case FOLDER_MENU_MOVE_MAILS: |
403 | downloadMails(); | 403 | downloadMails(); |
404 | break; | 404 | break; |
405 | default: | 405 | default: |
406 | break; | 406 | break; |
407 | } | 407 | } |
408 | } | 408 | } |
409 | 409 | ||
410 | /** | 410 | /** |
411 | * IMAP Account stuff | 411 | * IMAP Account stuff |
412 | */ | 412 | */ |
413 | IMAPviewItem::IMAPviewItem( IMAPaccount *a, AccountView *parent ) | 413 | IMAPviewItem::IMAPviewItem( IMAPaccount *a, AccountView *parent ) |
414 | : AccountViewItem( parent ) | 414 | : AccountViewItem( parent ) |
@@ -489,33 +489,33 @@ void IMAPviewItem::refreshFolders(bool force) | |||
489 | } | 489 | } |
490 | } | 490 | } |
491 | delete folders; | 491 | delete folders; |
492 | } | 492 | } |
493 | 493 | ||
494 | QPopupMenu * IMAPviewItem::getContextMenu() | 494 | QPopupMenu * IMAPviewItem::getContextMenu() |
495 | { | 495 | { |
496 | QPopupMenu *m = new QPopupMenu(0); | 496 | QPopupMenu *m = new QPopupMenu(0); |
497 | if (m) | 497 | if (m) |
498 | { | 498 | { |
499 | if (!account->getOffline()) | 499 | if (!account->getOffline()) |
500 | { | 500 | { |
501 | m->insertItem(QObject::tr("Refresh folder list",contextName),0); | 501 | m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT); |
502 | m->insertItem(QObject::tr("Create new folder",contextName),1); | 502 | m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE); |
503 | m->insertSeparator(); | 503 | m->insertSeparator(); |
504 | m->insertItem(QObject::tr("Disconnect",contextName),2); | 504 | m->insertItem(QObject::tr("Refresh folder list",contextName),SERVER_MENU_REFRESH_FOLDER); |
505 | m->insertItem(QObject::tr("Set offline",contextName),3); | 505 | m->insertItem(QObject::tr("Create new folder",contextName),SERVER_MENU_CREATE_FOLDER); |
506 | } | 506 | } |
507 | else | 507 | else |
508 | { | 508 | { |
509 | m->insertItem(QObject::tr("Set online",contextName),3); | 509 | m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE); |
510 | } | 510 | } |
511 | } | 511 | } |
512 | return m; | 512 | return m; |
513 | } | 513 | } |
514 | 514 | ||
515 | void IMAPviewItem::createNewFolder() | 515 | void IMAPviewItem::createNewFolder() |
516 | { | 516 | { |
517 | Newmdirdlg ndirdlg; | 517 | Newmdirdlg ndirdlg; |
518 | if ( QPEApplication::execDialog( &ndirdlg )) | 518 | if ( QPEApplication::execDialog( &ndirdlg )) |
519 | { | 519 | { |
520 | QString ndir = ndirdlg.Newdir(); | 520 | QString ndir = ndirdlg.Newdir(); |
521 | bool makesubs = ndirdlg.subpossible(); | 521 | bool makesubs = ndirdlg.subpossible(); |
@@ -528,35 +528,35 @@ void IMAPviewItem::createNewFolder() | |||
528 | if (wrapper->createMbox(ndir,0,delemiter,makesubs)) | 528 | if (wrapper->createMbox(ndir,0,delemiter,makesubs)) |
529 | { | 529 | { |
530 | refreshFolders(true); | 530 | refreshFolders(true); |
531 | } | 531 | } |
532 | } | 532 | } |
533 | } | 533 | } |
534 | 534 | ||
535 | void IMAPviewItem::contextMenuSelected(int id) | 535 | void IMAPviewItem::contextMenuSelected(int id) |
536 | { | 536 | { |
537 | odebug << "Id selected: " << id << "" << oendl; | 537 | odebug << "Id selected: " << id << "" << oendl; |
538 | switch (id) | 538 | switch (id) |
539 | { | 539 | { |
540 | case 0: | 540 | case SERVER_MENU_REFRESH_FOLDER: |
541 | refreshFolders(true); | 541 | refreshFolders(true); |
542 | break; | 542 | break; |
543 | case 1: | 543 | case SERVER_MENU_CREATE_FOLDER: |
544 | createNewFolder(); | 544 | createNewFolder(); |
545 | break; | 545 | break; |
546 | case 2: | 546 | case SERVER_MENU_DISCONNECT: |
547 | removeChilds(); | 547 | removeChilds(); |
548 | wrapper->logout(); | 548 | wrapper->logout(); |
549 | break; | 549 | break; |
550 | case 3: | 550 | case SERVER_MENU_OFFLINE: |
551 | if (account->getOffline()==false) | 551 | if (account->getOffline()==false) |
552 | { | 552 | { |
553 | removeChilds(); | 553 | removeChilds(); |
554 | wrapper->logout(); | 554 | wrapper->logout(); |
555 | } | 555 | } |
556 | account->setOffline(!account->getOffline()); | 556 | account->setOffline(!account->getOffline()); |
557 | account->save(); | 557 | account->save(); |
558 | SETPIX(PIXMAP_IMAPFOLDER); | 558 | SETPIX(PIXMAP_IMAPFOLDER); |
559 | refreshFolders(false); | 559 | refreshFolders(false); |
560 | break; | 560 | break; |
561 | default: | 561 | default: |
562 | break; | 562 | break; |
@@ -626,35 +626,35 @@ void IMAPfolderItem::refresh(QValueList<RecMailP>&target) | |||
626 | RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail) | 626 | RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail) |
627 | { | 627 | { |
628 | return imap->getWrapper()->fetchBody(aMail); | 628 | return imap->getWrapper()->fetchBody(aMail); |
629 | } | 629 | } |
630 | 630 | ||
631 | QPopupMenu * IMAPfolderItem::getContextMenu() | 631 | QPopupMenu * IMAPfolderItem::getContextMenu() |
632 | { | 632 | { |
633 | QPopupMenu *m = new QPopupMenu(0); | 633 | QPopupMenu *m = new QPopupMenu(0); |
634 | if (m) | 634 | if (m) |
635 | { | 635 | { |
636 | if (folder->may_select()) | 636 | if (folder->may_select()) |
637 | { | 637 | { |
638 | m->insertItem(QObject::tr("Refresh header list",contextName),0); | 638 | m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER); |
639 | m->insertItem(QObject::tr("Move/Copie all mails",contextName),4); | 639 | m->insertItem(QObject::tr("Move/Copy all mails",contextName),FOLDER_MENU_MOVE_MAILS); |
640 | m->insertItem(QObject::tr("Delete all mails",contextName),1); | 640 | m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS); |
641 | } | 641 | } |
642 | if (folder->no_inferior()==false) | 642 | if (folder->no_inferior()==false) |
643 | { | 643 | { |
644 | m->insertItem(QObject::tr("Create new subfolder",contextName),2); | 644 | m->insertItem(QObject::tr("Create new subfolder",contextName),FOLDER_MENU_NEW_SUBFOLDER); |
645 | } | 645 | } |
646 | if (folder->getDisplayName().lower()!="inbox") | 646 | if (folder->getDisplayName().lower()!="inbox") |
647 | { | 647 | { |
648 | m->insertItem(QObject::tr("Delete folder",contextName),3); | 648 | m->insertItem(QObject::tr("Delete folder",contextName),FOLDER_MENU_DELETE_FOLDER); |
649 | } | 649 | } |
650 | } | 650 | } |
651 | return m; | 651 | return m; |
652 | } | 652 | } |
653 | 653 | ||
654 | void IMAPfolderItem::createNewFolder() | 654 | void IMAPfolderItem::createNewFolder() |
655 | { | 655 | { |
656 | Newmdirdlg ndirdlg; | 656 | Newmdirdlg ndirdlg; |
657 | if ( QPEApplication::execDialog( &ndirdlg ) ) | 657 | if ( QPEApplication::execDialog( &ndirdlg ) ) |
658 | { | 658 | { |
659 | QString ndir = ndirdlg.Newdir(); | 659 | QString ndir = ndirdlg.Newdir(); |
660 | bool makesubs = ndirdlg.subpossible(); | 660 | bool makesubs = ndirdlg.subpossible(); |
@@ -694,37 +694,41 @@ void IMAPfolderItem::downloadMails() | |||
694 | { | 694 | { |
695 | AccountView*bl = imap->accountView(); | 695 | AccountView*bl = imap->accountView(); |
696 | if (!bl) return; | 696 | if (!bl) return; |
697 | bl->downloadMails(folder,imap->getWrapper()); | 697 | bl->downloadMails(folder,imap->getWrapper()); |
698 | } | 698 | } |
699 | 699 | ||
700 | void IMAPfolderItem::contextMenuSelected(int id) | 700 | void IMAPfolderItem::contextMenuSelected(int id) |
701 | { | 701 | { |
702 | odebug << "Selected id: " << id << "" << oendl; | 702 | odebug << "Selected id: " << id << "" << oendl; |
703 | AccountView * view = (AccountView*)listView(); | 703 | AccountView * view = (AccountView*)listView(); |
704 | switch(id) | 704 | switch(id) |
705 | { | 705 | { |
706 | case 0: | 706 | case FOLDER_MENU_REFRESH_HEADER: |
707 | view->refreshCurrent(); | 707 | view->refreshCurrent(); |
708 | break; | 708 | break; |
709 | case 1: | 709 | case FOLDER_MENU_DELETE_ALL_MAILS: |
710 | deleteAllMail(imap->getWrapper(),folder); | 710 | deleteAllMail(imap->getWrapper(),folder); |
711 | break; | 711 | break; |
712 | case 2: | 712 | case FOLDER_MENU_NEW_SUBFOLDER: |
713 | if (folder->no_inferior()==false) { | ||
713 | createNewFolder(); | 714 | createNewFolder(); |
715 | } | ||
714 | break; | 716 | break; |
715 | case 3: | 717 | case FOLDER_MENU_DELETE_FOLDER: |
718 | if (folder->getDisplayName().lower()!="inbox") { | ||
716 | deleteFolder(); | 719 | deleteFolder(); |
720 | } | ||
717 | break; | 721 | break; |
718 | case 4: | 722 | case FOLDER_MENU_MOVE_MAILS: |
719 | downloadMails(); | 723 | downloadMails(); |
720 | break; | 724 | break; |
721 | default: | 725 | default: |
722 | break; | 726 | break; |
723 | } | 727 | } |
724 | } | 728 | } |
725 | 729 | ||
726 | /** | 730 | /** |
727 | * MH Account stuff | 731 | * MH Account stuff |
728 | */ | 732 | */ |
729 | /* MH is a little bit different - the top folder can contains messages other than in IMAP and | 733 | /* MH is a little bit different - the top folder can contains messages other than in IMAP and |
730 | POP3 and MBOX */ | 734 | POP3 and MBOX */ |
@@ -750,24 +754,25 @@ AbstractMail *MHviewItem::getWrapper() | |||
750 | return wrapper; | 754 | return wrapper; |
751 | } | 755 | } |
752 | 756 | ||
753 | void MHviewItem::refresh( QValueList<RecMailP> & target) | 757 | void MHviewItem::refresh( QValueList<RecMailP> & target) |
754 | { | 758 | { |
755 | refresh(false); | 759 | refresh(false); |
756 | getWrapper()->listMessages( "",target ); | 760 | getWrapper()->listMessages( "",target ); |
757 | } | 761 | } |
758 | 762 | ||
759 | void MHviewItem::refresh(bool force) | 763 | void MHviewItem::refresh(bool force) |
760 | { | 764 | { |
761 | if (childCount()>0 && force==false) return; | 765 | if (childCount()>0 && force==false) return; |
766 | odebug << "Refresh mh folders" << oendl; | ||
762 | removeChilds(); | 767 | removeChilds(); |
763 | currentFolders.clear(); | 768 | currentFolders.clear(); |
764 | QValueList<FolderP> *folders = wrapper->listFolders(); | 769 | QValueList<FolderP> *folders = wrapper->listFolders(); |
765 | QValueList<FolderP>::ConstIterator it; | 770 | QValueList<FolderP>::ConstIterator it; |
766 | MHfolderItem*item = 0; | 771 | MHfolderItem*item = 0; |
767 | MHfolderItem*pmaster = 0; | 772 | MHfolderItem*pmaster = 0; |
768 | QString fname = ""; | 773 | QString fname = ""; |
769 | int pos; | 774 | int pos; |
770 | for ( it = folders->begin(); it!=folders->end(); ++it) | 775 | for ( it = folders->begin(); it!=folders->end(); ++it) |
771 | { | 776 | { |
772 | fname = (*it)->getDisplayName(); | 777 | fname = (*it)->getDisplayName(); |
773 | /* this folder itself */ | 778 | /* this folder itself */ |
@@ -803,28 +808,28 @@ void MHviewItem::refresh(bool force) | |||
803 | 808 | ||
804 | RECBODYP MHviewItem::fetchBody( const RecMailP &mail ) | 809 | RECBODYP MHviewItem::fetchBody( const RecMailP &mail ) |
805 | { | 810 | { |
806 | odebug << "MH fetchBody" << oendl; | 811 | odebug << "MH fetchBody" << oendl; |
807 | return wrapper->fetchBody( mail ); | 812 | return wrapper->fetchBody( mail ); |
808 | } | 813 | } |
809 | 814 | ||
810 | QPopupMenu * MHviewItem::getContextMenu() | 815 | QPopupMenu * MHviewItem::getContextMenu() |
811 | { | 816 | { |
812 | QPopupMenu *m = new QPopupMenu(0); | 817 | QPopupMenu *m = new QPopupMenu(0); |
813 | if (m) | 818 | if (m) |
814 | { | 819 | { |
815 | m->insertItem(QObject::tr("Refresh folder list",contextName),0); | 820 | m->insertItem(QObject::tr("Refresh folder list",contextName),SERVER_MENU_REFRESH_FOLDER); |
816 | m->insertItem(QObject::tr("Create new folder",contextName),1); | 821 | m->insertItem(QObject::tr("Create new folder",contextName),FOLDER_MENU_NEW_SUBFOLDER); |
817 | m->insertItem(QObject::tr("Delete all mails",contextName),2); | 822 | m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS); |
818 | m->insertItem(QObject::tr("Move/Copie all mails",contextName),3); | 823 | m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS); |
819 | } | 824 | } |
820 | return m; | 825 | return m; |
821 | } | 826 | } |
822 | 827 | ||
823 | void MHviewItem::createFolder() | 828 | void MHviewItem::createFolder() |
824 | { | 829 | { |
825 | Newmdirdlg ndirdlg(0,0,true); | 830 | Newmdirdlg ndirdlg(0,0,true); |
826 | if ( QPEApplication::execDialog( &ndirdlg ) ) | 831 | if ( QPEApplication::execDialog( &ndirdlg ) ) |
827 | { | 832 | { |
828 | QString ndir = ndirdlg.Newdir(); | 833 | QString ndir = ndirdlg.Newdir(); |
829 | if (wrapper->createMbox(ndir)) | 834 | if (wrapper->createMbox(ndir)) |
830 | { | 835 | { |
@@ -838,38 +843,44 @@ void MHviewItem::downloadMails() | |||
838 | AccountView*bl = accountView(); | 843 | AccountView*bl = accountView(); |
839 | if (!bl) return; | 844 | if (!bl) return; |
840 | bl->downloadMails(folder,getWrapper()); | 845 | bl->downloadMails(folder,getWrapper()); |
841 | } | 846 | } |
842 | 847 | ||
843 | QStringList MHviewItem::subFolders() | 848 | QStringList MHviewItem::subFolders() |
844 | { | 849 | { |
845 | return currentFolders; | 850 | return currentFolders; |
846 | } | 851 | } |
847 | 852 | ||
848 | void MHviewItem::contextMenuSelected(int which) | 853 | void MHviewItem::contextMenuSelected(int which) |
849 | { | 854 | { |
855 | AccountView*view = 0; | ||
856 | |||
850 | switch (which) | 857 | switch (which) |
851 | { | 858 | { |
852 | case 0: | 859 | case SERVER_MENU_REFRESH_FOLDER: |
853 | refresh(true); | 860 | refresh(true); |
854 | break; | 861 | break; |
855 | case 1: | 862 | case FOLDER_MENU_NEW_SUBFOLDER: |
856 | createFolder(); | 863 | createFolder(); |
857 | break; | 864 | break; |
858 | case 2: | 865 | case FOLDER_MENU_DELETE_ALL_MAILS: |
859 | deleteAllMail(getWrapper(),folder); | 866 | deleteAllMail(getWrapper(),folder); |
860 | break; | 867 | break; |
861 | case 3: | 868 | case FOLDER_MENU_MOVE_MAILS: |
862 | downloadMails(); | 869 | downloadMails(); |
863 | break; | 870 | break; |
871 | case FOLDER_MENU_REFRESH_HEADER: | ||
872 | view = (AccountView*)listView(); | ||
873 | if (view) view->refreshCurrent(); | ||
874 | break; | ||
864 | default: | 875 | default: |
865 | break; | 876 | break; |
866 | } | 877 | } |
867 | } | 878 | } |
868 | 879 | ||
869 | MHfolderItem::~MHfolderItem() | 880 | MHfolderItem::~MHfolderItem() |
870 | {} | 881 | {} |
871 | 882 | ||
872 | MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after ) | 883 | MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after ) |
873 | : AccountViewItem(folderInit, parent,after ) | 884 | : AccountViewItem(folderInit, parent,after ) |
874 | { | 885 | { |
875 | mbox = parent; | 886 | mbox = parent; |
@@ -947,28 +958,29 @@ void MHfolderItem::deleteFolder() | |||
947 | { | 958 | { |
948 | v->setSelected(box,true); | 959 | v->setSelected(box,true); |
949 | } | 960 | } |
950 | } | 961 | } |
951 | } | 962 | } |
952 | } | 963 | } |
953 | 964 | ||
954 | QPopupMenu * MHfolderItem::getContextMenu() | 965 | QPopupMenu * MHfolderItem::getContextMenu() |
955 | { | 966 | { |
956 | QPopupMenu *m = new QPopupMenu(0); | 967 | QPopupMenu *m = new QPopupMenu(0); |
957 | if (m) | 968 | if (m) |
958 | { | 969 | { |
959 | m->insertItem(QObject::tr("Move/Copie all mails",contextName),2); | 970 | m->insertItem(QObject::tr("Create new subfolder",contextName),FOLDER_MENU_NEW_SUBFOLDER); |
960 | m->insertItem(QObject::tr("Delete all mails",contextName),0); | 971 | m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER); |
961 | m->insertItem(QObject::tr("Create new subfolder",contextName),3); | 972 | m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS); |
962 | m->insertItem(QObject::tr("Delete folder",contextName),1); | 973 | m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS); |
974 | m->insertItem(QObject::tr("Delete folder",contextName),FOLDER_MENU_DELETE_FOLDER); | ||
963 | } | 975 | } |
964 | return m; | 976 | return m; |
965 | } | 977 | } |
966 | 978 | ||
967 | void MHfolderItem::downloadMails() | 979 | void MHfolderItem::downloadMails() |
968 | { | 980 | { |
969 | AccountView*bl = mbox->accountView(); | 981 | AccountView*bl = mbox->accountView(); |
970 | if (!bl) return; | 982 | if (!bl) return; |
971 | bl->downloadMails(folder,mbox->getWrapper()); | 983 | bl->downloadMails(folder,mbox->getWrapper()); |
972 | } | 984 | } |
973 | 985 | ||
974 | void MHfolderItem::createFolder() | 986 | void MHfolderItem::createFolder() |
@@ -985,38 +997,43 @@ void MHfolderItem::createFolder() | |||
985 | * any member of it after that call!!*/ | 997 | * any member of it after that call!!*/ |
986 | mbox->refresh(true); | 998 | mbox->refresh(true); |
987 | if (v) | 999 | if (v) |
988 | { | 1000 | { |
989 | v->setSelected(box,true); | 1001 | v->setSelected(box,true); |
990 | } | 1002 | } |
991 | } | 1003 | } |
992 | } | 1004 | } |
993 | } | 1005 | } |
994 | 1006 | ||
995 | void MHfolderItem::contextMenuSelected(int which) | 1007 | void MHfolderItem::contextMenuSelected(int which) |
996 | { | 1008 | { |
1009 | AccountView*view = 0; | ||
997 | switch(which) | 1010 | switch(which) |
998 | { | 1011 | { |
999 | case 0: | 1012 | case FOLDER_MENU_DELETE_ALL_MAILS: |
1000 | deleteAllMail(mbox->getWrapper(),folder); | 1013 | deleteAllMail(mbox->getWrapper(),folder); |
1001 | break; | 1014 | break; |
1002 | case 1: | 1015 | case FOLDER_MENU_DELETE_FOLDER: |
1003 | deleteFolder(); | 1016 | deleteFolder(); |
1004 | break; | 1017 | break; |
1005 | case 2: | 1018 | case FOLDER_MENU_MOVE_MAILS: |
1006 | downloadMails(); | 1019 | downloadMails(); |
1007 | break; | 1020 | break; |
1008 | case 3: | 1021 | case FOLDER_MENU_NEW_SUBFOLDER: |
1009 | createFolder(); | 1022 | createFolder(); |
1010 | break; | 1023 | break; |
1024 | case FOLDER_MENU_REFRESH_HEADER: | ||
1025 | view = (AccountView*)listView(); | ||
1026 | if (view) view->refreshCurrent(); | ||
1027 | break; | ||
1011 | default: | 1028 | default: |
1012 | break; | 1029 | break; |
1013 | } | 1030 | } |
1014 | } | 1031 | } |
1015 | 1032 | ||
1016 | bool MHfolderItem::isDraftfolder() | 1033 | bool MHfolderItem::isDraftfolder() |
1017 | { | 1034 | { |
1018 | if (folder && folder->getName()==AbstractMail::defaultLocalfolder()+"/"+AbstractMail::draftFolder()) return true; | 1035 | if (folder && folder->getName()==AbstractMail::defaultLocalfolder()+"/"+AbstractMail::draftFolder()) return true; |
1019 | return false; | 1036 | return false; |
1020 | } | 1037 | } |
1021 | 1038 | ||
1022 | /** | 1039 | /** |
diff --git a/noncore/net/mail/accountitem.h b/noncore/net/mail/accountitem.h index f125eeb..b2c50a1 100644 --- a/noncore/net/mail/accountitem.h +++ b/noncore/net/mail/accountitem.h | |||
@@ -27,186 +27,199 @@ public: | |||
27 | AccountViewItem( QListViewItem *parent); | 27 | AccountViewItem( QListViewItem *parent); |
28 | AccountViewItem( QListViewItem *parent , QListViewItem*after ); | 28 | AccountViewItem( QListViewItem *parent , QListViewItem*after ); |
29 | AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after ); | 29 | AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after ); |
30 | 30 | ||
31 | virtual ~AccountViewItem(); | 31 | virtual ~AccountViewItem(); |
32 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0; | 32 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0; |
33 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0; | 33 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0; |
34 | virtual QPopupMenu * getContextMenu(){return 0;}; | 34 | virtual QPopupMenu * getContextMenu(){return 0;}; |
35 | virtual void contextMenuSelected(int){} | 35 | virtual void contextMenuSelected(int){} |
36 | virtual AccountView*accountView(); | 36 | virtual AccountView*accountView(); |
37 | virtual bool matchName(const QString&name)const; | 37 | virtual bool matchName(const QString&name)const; |
38 | virtual bool isDraftfolder(); | 38 | virtual bool isDraftfolder(); |
39 | /* 1 - server | ||
40 | * 2 - folder | ||
41 | * 3 - beides | ||
42 | */ | ||
43 | virtual int isServer()const=0; | ||
39 | 44 | ||
40 | protected: | 45 | protected: |
41 | AccountViewItem*findSubItem(const QString&path,AccountViewItem*start=0); | 46 | AccountViewItem*findSubItem(const QString&path,AccountViewItem*start=0); |
42 | virtual void init(); | 47 | virtual void init(); |
43 | virtual void removeChilds(); | 48 | virtual void removeChilds(); |
44 | virtual void deleteAllMail(AbstractMail*wrapper,const Opie::Core::OSmartPointer<Folder>&f); | 49 | virtual void deleteAllMail(AbstractMail*wrapper,const Opie::Core::OSmartPointer<Folder>&f); |
45 | static const QString contextName; | 50 | static const QString contextName; |
46 | AccountView*m_Backlink; | 51 | AccountView*m_Backlink; |
47 | Opie::Core::OSmartPointer<Folder> folder; | 52 | Opie::Core::OSmartPointer<Folder> folder; |
48 | }; | 53 | }; |
49 | 54 | ||
50 | class POP3viewItem : public AccountViewItem | 55 | class POP3viewItem : public AccountViewItem |
51 | { | 56 | { |
52 | 57 | ||
53 | public: | 58 | public: |
54 | POP3viewItem( POP3account *a, AccountView *parent ); | 59 | POP3viewItem( POP3account *a, AccountView *parent ); |
55 | virtual ~POP3viewItem(); | 60 | virtual ~POP3viewItem(); |
56 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); | 61 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); |
57 | virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); | 62 | virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); |
58 | AbstractMail *getWrapper(); | 63 | AbstractMail *getWrapper(); |
59 | virtual QPopupMenu * getContextMenu(); | 64 | virtual QPopupMenu * getContextMenu(); |
60 | virtual void contextMenuSelected(int); | 65 | virtual void contextMenuSelected(int); |
66 | virtual int isServer()const{return 1;} | ||
61 | 67 | ||
62 | protected: | 68 | protected: |
63 | POP3account *account; | 69 | POP3account *account; |
64 | virtual void refresh(); | 70 | virtual void refresh(); |
65 | AbstractMail *wrapper; | 71 | AbstractMail *wrapper; |
66 | void disconnect(); | 72 | void disconnect(); |
67 | void setOnOffline(); | 73 | void setOnOffline(); |
68 | }; | 74 | }; |
69 | 75 | ||
70 | class POP3folderItem : public AccountViewItem | 76 | class POP3folderItem : public AccountViewItem |
71 | { | 77 | { |
72 | 78 | ||
73 | public: | 79 | public: |
74 | POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after ); | 80 | POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after ); |
75 | virtual ~POP3folderItem(); | 81 | virtual ~POP3folderItem(); |
76 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); | 82 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
77 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); | 83 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
78 | virtual QPopupMenu * getContextMenu(); | 84 | virtual QPopupMenu * getContextMenu(); |
79 | virtual void contextMenuSelected(int); | 85 | virtual void contextMenuSelected(int); |
86 | virtual int isServer()const{return 2;} | ||
80 | 87 | ||
81 | protected: | 88 | protected: |
82 | void downloadMails(); | 89 | void downloadMails(); |
83 | POP3viewItem *pop3; | 90 | POP3viewItem *pop3; |
84 | }; | 91 | }; |
85 | 92 | ||
86 | 93 | ||
87 | class NNTPviewItem : public AccountViewItem | 94 | class NNTPviewItem : public AccountViewItem |
88 | { | 95 | { |
89 | 96 | ||
90 | public: | 97 | public: |
91 | NNTPviewItem( NNTPaccount *a, AccountView *parent ); | 98 | NNTPviewItem( NNTPaccount *a, AccountView *parent ); |
92 | virtual ~NNTPviewItem(); | 99 | virtual ~NNTPviewItem(); |
93 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); | 100 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); |
94 | virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); | 101 | virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); |
95 | AbstractMail *getWrapper(); | 102 | AbstractMail *getWrapper(); |
96 | virtual QPopupMenu * getContextMenu(); | 103 | virtual QPopupMenu * getContextMenu(); |
97 | virtual void contextMenuSelected(int); | 104 | virtual void contextMenuSelected(int); |
105 | virtual int isServer()const{return 1;} | ||
98 | 106 | ||
99 | protected: | 107 | protected: |
100 | NNTPaccount *account; | 108 | NNTPaccount *account; |
101 | virtual void refresh(); | 109 | virtual void refresh(); |
102 | AbstractMail *wrapper; | 110 | AbstractMail *wrapper; |
103 | void disconnect(); | 111 | void disconnect(); |
104 | void setOnOffline(); | 112 | void setOnOffline(); |
105 | void subscribeGroups(); | 113 | void subscribeGroups(); |
106 | }; | 114 | }; |
107 | 115 | ||
108 | class NNTPfolderItem : public AccountViewItem | 116 | class NNTPfolderItem : public AccountViewItem |
109 | { | 117 | { |
110 | 118 | ||
111 | public: | 119 | public: |
112 | NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after ); | 120 | NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after ); |
113 | virtual ~NNTPfolderItem(); | 121 | virtual ~NNTPfolderItem(); |
114 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); | 122 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
115 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); | 123 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
116 | virtual QPopupMenu * getContextMenu(); | 124 | virtual QPopupMenu * getContextMenu(); |
117 | virtual void contextMenuSelected(int); | 125 | virtual void contextMenuSelected(int); |
126 | virtual int isServer()const{return 2;} | ||
118 | 127 | ||
119 | protected: | 128 | protected: |
120 | void downloadMails(); | 129 | void downloadMails(); |
121 | NNTPviewItem *nntp; | 130 | NNTPviewItem *nntp; |
122 | }; | 131 | }; |
123 | 132 | ||
124 | 133 | ||
125 | 134 | ||
126 | class IMAPviewItem : public AccountViewItem | 135 | class IMAPviewItem : public AccountViewItem |
127 | { | 136 | { |
128 | friend class IMAPfolderItem; | 137 | friend class IMAPfolderItem; |
129 | public: | 138 | public: |
130 | IMAPviewItem( IMAPaccount *a, AccountView *parent ); | 139 | IMAPviewItem( IMAPaccount *a, AccountView *parent ); |
131 | virtual ~IMAPviewItem(); | 140 | virtual ~IMAPviewItem(); |
132 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); | 141 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
133 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); | 142 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
134 | AbstractMail *getWrapper(); | 143 | AbstractMail *getWrapper(); |
135 | virtual QPopupMenu * getContextMenu(); | 144 | virtual QPopupMenu * getContextMenu(); |
136 | virtual void contextMenuSelected(int); | 145 | virtual void contextMenuSelected(int); |
137 | const QStringList&subFolders(); | 146 | const QStringList&subFolders(); |
138 | virtual void refreshFolders(bool force=false); | 147 | virtual void refreshFolders(bool force=false); |
148 | virtual int isServer()const{return 1;} | ||
139 | bool offline(); | 149 | bool offline(); |
140 | 150 | ||
141 | protected: | 151 | protected: |
142 | virtual void createNewFolder(); | 152 | virtual void createNewFolder(); |
143 | IMAPaccount *account; | 153 | IMAPaccount *account; |
144 | AbstractMail *wrapper; | 154 | AbstractMail *wrapper; |
145 | QStringList currentFolders; | 155 | QStringList currentFolders; |
146 | }; | 156 | }; |
147 | 157 | ||
148 | class IMAPfolderItem : public AccountViewItem | 158 | class IMAPfolderItem : public AccountViewItem |
149 | { | 159 | { |
150 | 160 | ||
151 | public: | 161 | public: |
152 | IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPviewItem *parent , QListViewItem*after ); | 162 | IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPviewItem *parent , QListViewItem*after ); |
153 | IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master ); | 163 | IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master ); |
154 | virtual ~IMAPfolderItem(); | 164 | virtual ~IMAPfolderItem(); |
155 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); | 165 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
156 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); | 166 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
157 | virtual QPopupMenu * getContextMenu(); | 167 | virtual QPopupMenu * getContextMenu(); |
158 | virtual void contextMenuSelected(int); | 168 | virtual void contextMenuSelected(int); |
159 | virtual const QString& Delemiter()const; | 169 | virtual const QString& Delemiter()const; |
170 | virtual int isServer()const{return 2;} | ||
160 | protected: | 171 | protected: |
161 | virtual void createNewFolder(); | 172 | virtual void createNewFolder(); |
162 | virtual void deleteFolder(); | 173 | virtual void deleteFolder(); |
163 | virtual void downloadMails(); | 174 | virtual void downloadMails(); |
164 | IMAPviewItem *imap; | 175 | IMAPviewItem *imap; |
165 | }; | 176 | }; |
166 | 177 | ||
167 | class MHviewItem : public AccountViewItem | 178 | class MHviewItem : public AccountViewItem |
168 | { | 179 | { |
169 | friend class MHfolderItem; | 180 | friend class MHfolderItem; |
170 | 181 | ||
171 | public: | 182 | public: |
172 | MHviewItem( const QString&aMboxPath, AccountView *parent ); | 183 | MHviewItem( const QString&aMboxPath, AccountView *parent ); |
173 | virtual ~MHviewItem(); | 184 | virtual ~MHviewItem(); |
174 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); | 185 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); |
175 | virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); | 186 | virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); |
176 | AbstractMail *getWrapper(); | 187 | AbstractMail *getWrapper(); |
177 | virtual QPopupMenu * getContextMenu(); | 188 | virtual QPopupMenu * getContextMenu(); |
178 | virtual void contextMenuSelected(int); | 189 | virtual void contextMenuSelected(int); |
179 | QStringList subFolders(); | 190 | QStringList subFolders(); |
180 | virtual void refresh(bool force=false); | 191 | virtual void refresh(bool force=false); |
192 | virtual int isServer()const{return 3;} | ||
181 | 193 | ||
182 | protected: | 194 | protected: |
183 | void downloadMails(); | 195 | void downloadMails(); |
184 | virtual void createFolder(); | 196 | virtual void createFolder(); |
185 | QString m_Path; | 197 | QString m_Path; |
186 | AbstractMail *wrapper; | 198 | AbstractMail *wrapper; |
187 | QStringList currentFolders; | 199 | QStringList currentFolders; |
188 | }; | 200 | }; |
189 | 201 | ||
190 | class MHfolderItem : public AccountViewItem | 202 | class MHfolderItem : public AccountViewItem |
191 | { | 203 | { |
192 | 204 | ||
193 | public: | 205 | public: |
194 | MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHviewItem *parent , QListViewItem*after ); | 206 | MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHviewItem *parent , QListViewItem*after ); |
195 | MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master); | 207 | MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master); |
196 | virtual ~MHfolderItem(); | 208 | virtual ~MHfolderItem(); |
197 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); | 209 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
198 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); | 210 | virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
199 | virtual QPopupMenu * getContextMenu(); | 211 | virtual QPopupMenu * getContextMenu(); |
200 | virtual void contextMenuSelected(int); | 212 | virtual void contextMenuSelected(int); |
201 | virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const; | 213 | virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const; |
202 | virtual bool isDraftfolder(); | 214 | virtual bool isDraftfolder(); |
215 | virtual int isServer()const{return 2;} | ||
203 | 216 | ||
204 | protected: | 217 | protected: |
205 | void downloadMails(); | 218 | void downloadMails(); |
206 | virtual void createFolder(); | 219 | virtual void createFolder(); |
207 | virtual void deleteFolder(); | 220 | virtual void deleteFolder(); |
208 | void initName(); | 221 | void initName(); |
209 | MHviewItem *mbox; | 222 | MHviewItem *mbox; |
210 | }; | 223 | }; |
211 | 224 | ||
212 | #endif | 225 | #endif |
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index c747a8b..d01d6bb 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -11,55 +11,97 @@ | |||
11 | /* OPIE */ | 11 | /* OPIE */ |
12 | #include <opie2/odebug.h> | 12 | #include <opie2/odebug.h> |
13 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
14 | 14 | ||
15 | /* QT */ | 15 | /* QT */ |
16 | #include <qmessagebox.h> | 16 | #include <qmessagebox.h> |
17 | #include <qpopupmenu.h> | 17 | #include <qpopupmenu.h> |
18 | 18 | ||
19 | using namespace Opie::Core; | 19 | using namespace Opie::Core; |
20 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) | 20 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) |
21 | : QListView( parent, name, flags ) | 21 | : QListView( parent, name, flags ) |
22 | { | 22 | { |
23 | setSorting(0); | ||
24 | setSelectionMode(Single); | ||
25 | m_rightPressed = false; | ||
26 | |||
23 | connect( this, SIGNAL( selectionChanged(QListViewItem*) ), | 27 | connect( this, SIGNAL( selectionChanged(QListViewItem*) ), |
24 | SLOT( refresh(QListViewItem*) ) ); | 28 | SLOT( slotSelectionChanged(QListViewItem*) ) ); |
25 | connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, | 29 | connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, |
26 | SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) ); | 30 | SLOT( slotMouseButton(int,QListViewItem*,const QPoint&,int) ) ); |
27 | setSorting(0); | 31 | connect( this, SIGNAL(clicked(QListViewItem*) ),this, |
32 | SLOT( slotMouseClicked(QListViewItem*) ) ); | ||
33 | m_currentItem = 0; | ||
28 | } | 34 | } |
29 | 35 | ||
30 | AccountView::~AccountView() | 36 | AccountView::~AccountView() |
31 | { | 37 | { |
32 | imapAccounts.clear(); | 38 | imapAccounts.clear(); |
33 | mhAccounts.clear(); | 39 | mhAccounts.clear(); |
34 | } | 40 | } |
35 | 41 | ||
42 | void AccountView::slotSelectionChanged(QListViewItem*item) | ||
43 | { | ||
44 | odebug << "AccountView: Selection changed" << oendl; | ||
45 | if (!item) { | ||
46 | emit serverSelected(0); | ||
47 | return; | ||
48 | } | ||
49 | AccountViewItem *view = static_cast<AccountViewItem *>(item); | ||
50 | |||
51 | emit serverSelected(view->isServer()); | ||
52 | } | ||
53 | |||
36 | void AccountView::slotContextMenu(int id) | 54 | void AccountView::slotContextMenu(int id) |
37 | { | 55 | { |
38 | AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); | 56 | AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); |
39 | if (!view) return; | 57 | if (!view) return; |
40 | view->contextMenuSelected(id); | 58 | view->contextMenuSelected(id); |
41 | } | 59 | } |
42 | 60 | ||
43 | void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int) | 61 | void AccountView::slotRightButton(int button, QListViewItem * item,const QPoint&,int) |
44 | { | 62 | { |
45 | if (button==1) {return;} | 63 | m_rightPressed = true; |
46 | if (!item) return; | 64 | if (!item) return; |
47 | AccountViewItem *view = static_cast<AccountViewItem *>(item); | 65 | AccountViewItem *view = static_cast<AccountViewItem *>(item); |
48 | QPopupMenu*m = view->getContextMenu(); | 66 | QPopupMenu*m = view->getContextMenu(); |
49 | if (!m) return; | 67 | if (!m) return; |
50 | connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int))); | 68 | connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int))); |
51 | m->setFocus(); | 69 | m->setFocus(); |
52 | m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); | 70 | m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); |
53 | delete m; | 71 | delete m; |
72 | setSelected(item,true); | ||
73 | } | ||
74 | |||
75 | void AccountView::slotLeftButton(int button, QListViewItem * item,const QPoint&,int) | ||
76 | { | ||
77 | m_rightPressed = false; | ||
78 | } | ||
79 | |||
80 | void AccountView::slotMouseClicked(QListViewItem*item) | ||
81 | { | ||
82 | if (m_rightPressed) return; | ||
83 | if (!item || m_currentItem == item) return; | ||
84 | /* ### ToDo check settings if on single tab it should open */ | ||
85 | m_currentItem = item; | ||
86 | refresh(m_currentItem); | ||
87 | } | ||
88 | |||
89 | void AccountView::slotMouseButton(int button, QListViewItem * item,const QPoint&pos,int column) | ||
90 | { | ||
91 | if (button==1) { | ||
92 | slotLeftButton(button,item,pos,column); | ||
93 | } else if (button==2) { | ||
94 | slotRightButton(button,item,pos,column); | ||
95 | } | ||
54 | } | 96 | } |
55 | 97 | ||
56 | void AccountView::populate( QList<Account> list ) | 98 | void AccountView::populate( QList<Account> list ) |
57 | { | 99 | { |
58 | clear(); | 100 | clear(); |
59 | 101 | ||
60 | imapAccounts.clear(); | 102 | imapAccounts.clear(); |
61 | mhAccounts.clear(); | 103 | mhAccounts.clear(); |
62 | mhAccounts.append(new MHviewItem(AbstractMail::defaultLocalfolder(),this)); | 104 | mhAccounts.append(new MHviewItem(AbstractMail::defaultLocalfolder(),this)); |
63 | 105 | ||
64 | Account *it; | 106 | Account *it; |
65 | for ( it = list.first(); it; it = list.next() ) { | 107 | for ( it = list.first(); it; it = list.next() ) { |
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h index 787b0b0..ae24dce 100644 --- a/noncore/net/mail/accountview.h +++ b/noncore/net/mail/accountview.h | |||
@@ -20,26 +20,35 @@ class AccountView : public QListView | |||
20 | public: | 20 | public: |
21 | AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); | 21 | AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); |
22 | virtual ~AccountView(); | 22 | virtual ~AccountView(); |
23 | virtual void populate( QList<Account> list ); | 23 | virtual void populate( QList<Account> list ); |
24 | virtual RecBodyP fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail); | 24 | virtual RecBodyP fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail); |
25 | virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper); | 25 | virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper); |
26 | virtual bool currentisDraft(); | 26 | virtual bool currentisDraft(); |
27 | 27 | ||
28 | public slots: | 28 | public slots: |
29 | virtual void refreshAll(); | 29 | virtual void refreshAll(); |
30 | virtual void refresh(QListViewItem *item); | 30 | virtual void refresh(QListViewItem *item); |
31 | virtual void refreshCurrent(); | 31 | virtual void refreshCurrent(); |
32 | virtual void slotHold(int, QListViewItem *,const QPoint&,int); | ||
33 | virtual void slotContextMenu(int id); | 32 | virtual void slotContextMenu(int id); |
33 | |||
34 | void setupFolderselect(Selectstore*sels); | 34 | void setupFolderselect(Selectstore*sels); |
35 | 35 | ||
36 | signals: | 36 | signals: |
37 | void refreshMailview(const QValueList<RecMailP>& ); | 37 | void refreshMailview(const QValueList<RecMailP>& ); |
38 | void serverSelected(int); | ||
38 | 39 | ||
39 | protected: | 40 | protected: |
40 | QListViewItem* m_currentItem; | 41 | QListViewItem* m_currentItem; |
41 | QValueList<IMAPviewItem*> imapAccounts; | 42 | QValueList<IMAPviewItem*> imapAccounts; |
42 | QValueList<MHviewItem*> mhAccounts; | 43 | QValueList<MHviewItem*> mhAccounts; |
44 | bool m_rightPressed:1; | ||
45 | |||
46 | protected slots: | ||
47 | virtual void slotRightButton(int, QListViewItem *,const QPoint&,int); | ||
48 | virtual void slotLeftButton(int, QListViewItem *,const QPoint&,int); | ||
49 | virtual void slotMouseButton(int, QListViewItem *,const QPoint&,int); | ||
50 | virtual void slotMouseClicked(QListViewItem*); | ||
51 | virtual void slotSelectionChanged(QListViewItem*); | ||
43 | }; | 52 | }; |
44 | 53 | ||
45 | #endif | 54 | #endif |
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h index d840f09..5fcbf0f 100644 --- a/noncore/net/mail/defines.h +++ b/noncore/net/mail/defines.h | |||
@@ -45,13 +45,26 @@ | |||
45 | 45 | ||
46 | /* used for decoding imapfoldername */ | 46 | /* used for decoding imapfoldername */ |
47 | #define UNDEFINED 64 | 47 | #define UNDEFINED 64 |
48 | #define MAXLINE 76 | 48 | #define MAXLINE 76 |
49 | #define UTF16MASK 0x03FFUL | 49 | #define UTF16MASK 0x03FFUL |
50 | #define UTF16SHIFT 10 | 50 | #define UTF16SHIFT 10 |
51 | #define UTF16BASE 0x10000UL | 51 | #define UTF16BASE 0x10000UL |
52 | #define UTF16HIGHSTART 0xD800UL | 52 | #define UTF16HIGHSTART 0xD800UL |
53 | #define UTF16HIGHEND 0xDBFFUL | 53 | #define UTF16HIGHEND 0xDBFFUL |
54 | #define UTF16LOSTART 0xDC00UL | 54 | #define UTF16LOSTART 0xDC00UL |
55 | #define UTF16LOEND 0xDFFFUL | 55 | #define UTF16LOEND 0xDFFFUL |
56 | 56 | ||
57 | /* used for making menuids transparent */ | ||
58 | #define FOLDER_MENU_REFRESH_HEADER 0 | ||
59 | #define FOLDER_MENU_DELETE_ALL_MAILS 1 | ||
60 | #define FOLDER_MENU_NEW_SUBFOLDER 2 | ||
61 | #define FOLDER_MENU_DELETE_FOLDER 3 | ||
62 | #define FOLDER_MENU_MOVE_MAILS 4 | ||
63 | |||
64 | #define SERVER_MENU_DISCONNECT 5 | ||
65 | #define SERVER_MENU_OFFLINE 6 | ||
66 | #define SERVER_MENU_REFRESH_FOLDER 7 | ||
67 | #define SERVER_MENU_CREATE_FOLDER 8 | ||
68 | #define SERVER_MENU_SUBSCRIBE 9 | ||
69 | |||
57 | #endif | 70 | #endif |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 0a45445..81c8fee 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -12,30 +12,54 @@ | |||
12 | #include "mainwindow.h" | 12 | #include "mainwindow.h" |
13 | 13 | ||
14 | using namespace Opie::Core; | 14 | using namespace Opie::Core; |
15 | 15 | ||
16 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 16 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
17 | : QMainWindow( parent, name, flags ) | 17 | : QMainWindow( parent, name, flags ) |
18 | { | 18 | { |
19 | 19 | ||
20 | setCaption( tr( "Mail" ) ); | 20 | setCaption( tr( "Mail" ) ); |
21 | setToolBarsMovable( false ); | 21 | setToolBarsMovable( false ); |
22 | 22 | ||
23 | toolBar = new QToolBar( this ); | 23 | toolBar = new QToolBar( this ); |
24 | |||
24 | menuBar = new QMenuBar( toolBar ); | 25 | menuBar = new QMenuBar( toolBar ); |
26 | |||
25 | mailMenu = new QPopupMenu( menuBar ); | 27 | mailMenu = new QPopupMenu( menuBar ); |
26 | menuBar->insertItem( tr( "Mail" ), mailMenu ); | 28 | menuBar->insertItem( tr( "Mail" ), mailMenu ); |
29 | |||
27 | settingsMenu = new QPopupMenu( menuBar ); | 30 | settingsMenu = new QPopupMenu( menuBar ); |
28 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); | 31 | menuBar->insertItem( tr( "Settings" ), settingsMenu ); |
29 | 32 | ||
33 | serverMenu = new QPopupMenu( menuBar ); | ||
34 | m_ServerMenuId = menuBar->insertItem( tr( "Server" ), serverMenu ); | ||
35 | serverMenu->insertItem(tr("Disconnect"),SERVER_MENU_DISCONNECT); | ||
36 | serverMenu->insertItem(tr("Set on/offline"),SERVER_MENU_OFFLINE); | ||
37 | serverMenu->insertSeparator(); | ||
38 | serverMenu->insertItem(tr("Refresh folder list"),SERVER_MENU_REFRESH_FOLDER); | ||
39 | serverMenu->insertItem(tr("Create new folder"),SERVER_MENU_CREATE_FOLDER); | ||
40 | serverMenu->insertSeparator(); | ||
41 | serverMenu->insertItem(tr("(Un-)Subscribe groups"),SERVER_MENU_SUBSCRIBE); | ||
42 | |||
43 | folderMenu = new QPopupMenu( menuBar ); | ||
44 | m_FolderMenuId = menuBar->insertItem( tr( "Folder" ), folderMenu ); | ||
45 | folderMenu->insertItem(tr("Refresh headerlist"),FOLDER_MENU_REFRESH_HEADER); | ||
46 | folderMenu->insertItem(tr("Delete all mails"),FOLDER_MENU_DELETE_ALL_MAILS); | ||
47 | folderMenu->insertItem(tr("New subfolder"),FOLDER_MENU_NEW_SUBFOLDER); | ||
48 | folderMenu->insertItem(tr("Delete folder"),FOLDER_MENU_DELETE_FOLDER); | ||
49 | folderMenu->insertItem(tr("Move/Copie all mails"),FOLDER_MENU_MOVE_MAILS); | ||
50 | |||
51 | menuBar->setItemEnabled(m_ServerMenuId,false); | ||
52 | menuBar->setItemEnabled(m_FolderMenuId,false); | ||
53 | |||
30 | addToolBar( toolBar ); | 54 | addToolBar( toolBar ); |
31 | toolBar->setHorizontalStretchable( true ); | 55 | toolBar->setHorizontalStretchable( true ); |
32 | 56 | ||
33 | QLabel *spacer = new QLabel( toolBar ); | 57 | QLabel *spacer = new QLabel( toolBar ); |
34 | spacer->setBackgroundMode( QWidget::PaletteButton ); | 58 | spacer->setBackgroundMode( QWidget::PaletteButton ); |
35 | toolBar->setStretchableWidget( spacer ); | 59 | toolBar->setStretchableWidget( spacer ); |
36 | 60 | ||
37 | composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL, | 61 | composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL, |
38 | 0, 0, this ); | 62 | 0, 0, this ); |
39 | composeMail->addTo( toolBar ); | 63 | composeMail->addTo( toolBar ); |
40 | composeMail->addTo( mailMenu ); | 64 | composeMail->addTo( mailMenu ); |
41 | 65 | ||
@@ -81,24 +105,28 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
81 | 0, 0, this ); | 105 | 0, 0, this ); |
82 | editAccounts->addTo( settingsMenu ); | 106 | editAccounts->addTo( settingsMenu ); |
83 | 107 | ||
84 | 108 | ||
85 | QWidget *view = new QWidget( this ); | 109 | QWidget *view = new QWidget( this ); |
86 | setCentralWidget( view ); | 110 | setCentralWidget( view ); |
87 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); | 111 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); |
88 | 112 | ||
89 | folderView = new AccountView( view ); | 113 | folderView = new AccountView( view ); |
90 | folderView->header()->hide(); | 114 | folderView->header()->hide(); |
91 | folderView->setRootIsDecorated( true ); | 115 | folderView->setRootIsDecorated( true ); |
92 | folderView->addColumn( tr( "Mailbox" ) ); | 116 | folderView->addColumn( tr( "Mailbox" ) ); |
117 | connect(folderView,SIGNAL(serverSelected(int)),this,SLOT(serverSelected(int))); | ||
118 | connect(serverMenu,SIGNAL(activated(int)),folderView,SLOT(slotContextMenu(int))); | ||
119 | connect(folderMenu,SIGNAL(activated(int)),folderView,SLOT(slotContextMenu(int))); | ||
120 | |||
93 | 121 | ||
94 | layout->addWidget( folderView ); | 122 | layout->addWidget( folderView ); |
95 | 123 | ||
96 | mailView = new QListView( view ); | 124 | mailView = new QListView( view ); |
97 | mailView->addColumn( "" ); | 125 | mailView->addColumn( "" ); |
98 | mailView->addColumn( tr( "Subject" ),QListView::Manual ); | 126 | mailView->addColumn( tr( "Subject" ),QListView::Manual ); |
99 | mailView->addColumn( tr( "Sender" ),QListView::Manual ); | 127 | mailView->addColumn( tr( "Sender" ),QListView::Manual ); |
100 | mailView->addColumn( tr( "Size" ),QListView::Manual); | 128 | mailView->addColumn( tr( "Size" ),QListView::Manual); |
101 | mailView->addColumn( tr( "Date" )); | 129 | mailView->addColumn( tr( "Date" )); |
102 | mailView->setAllColumnsShowFocus(true); | 130 | mailView->setAllColumnsShowFocus(true); |
103 | mailView->setShowSortIndicator(true); | 131 | mailView->setShowSortIndicator(true); |
104 | mailView->setSorting(4,false); | 132 | mailView->setSorting(4,false); |
@@ -136,24 +164,31 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
136 | m_sysChannel = new QCopChannel( "QPE/System", this ); | 164 | m_sysChannel = new QCopChannel( "QPE/System", this ); |
137 | connect( m_sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ), | 165 | connect( m_sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ), |
138 | this, SLOT( systemMessage(const QCString&,const QByteArray&) ) ); | 166 | this, SLOT( systemMessage(const QCString&,const QByteArray&) ) ); |
139 | #endif | 167 | #endif |
140 | 168 | ||
141 | QTimer::singleShot( 10, this, SLOT( slotAdjustColumns() ) ); | 169 | QTimer::singleShot( 10, this, SLOT( slotAdjustColumns() ) ); |
142 | } | 170 | } |
143 | 171 | ||
144 | MainWindow::~MainWindow() | 172 | MainWindow::~MainWindow() |
145 | { | 173 | { |
146 | } | 174 | } |
147 | 175 | ||
176 | void MainWindow::serverSelected(int m_isFolder) | ||
177 | { | ||
178 | mailView->clear(); | ||
179 | menuBar->setItemEnabled(m_ServerMenuId,m_isFolder&1); | ||
180 | menuBar->setItemEnabled(m_FolderMenuId,m_isFolder&2); | ||
181 | } | ||
182 | |||
148 | void MainWindow::systemMessage( const QCString& msg, const QByteArray& data ) | 183 | void MainWindow::systemMessage( const QCString& msg, const QByteArray& data ) |
149 | { | 184 | { |
150 | int _newrotation; | 185 | int _newrotation; |
151 | QDataStream stream( data, IO_ReadOnly ); | 186 | QDataStream stream( data, IO_ReadOnly ); |
152 | if ( msg == "setCurrentRotation(int)" ) | 187 | if ( msg == "setCurrentRotation(int)" ) |
153 | { | 188 | { |
154 | stream >> _newrotation; | 189 | stream >> _newrotation; |
155 | if (m_Rotate != _newrotation) { | 190 | if (m_Rotate != _newrotation) { |
156 | slotAdjustLayout(); | 191 | slotAdjustLayout(); |
157 | m_Rotate = _newrotation; | 192 | m_Rotate = _newrotation; |
158 | } | 193 | } |
159 | } | 194 | } |
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h index ad71a54..409f160 100644 --- a/noncore/net/mail/mainwindow.h +++ b/noncore/net/mail/mainwindow.h | |||
@@ -32,27 +32,30 @@ public slots: | |||
32 | 32 | ||
33 | protected slots: | 33 | protected slots: |
34 | virtual void slotSendQueued(); | 34 | virtual void slotSendQueued(); |
35 | virtual void slotEditAccounts(); | 35 | virtual void slotEditAccounts(); |
36 | virtual void slotShowFolders( bool show ); | 36 | virtual void slotShowFolders( bool show ); |
37 | virtual void refreshMailView(const QValueList<RecMailP>&); | 37 | virtual void refreshMailView(const QValueList<RecMailP>&); |
38 | virtual void displayMail(); | 38 | virtual void displayMail(); |
39 | virtual void slotDeleteMail(); | 39 | virtual void slotDeleteMail(); |
40 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); | 40 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); |
41 | virtual void slotAdjustLayout(); | 41 | virtual void slotAdjustLayout(); |
42 | virtual void slotEditSettings(); | 42 | virtual void slotEditSettings(); |
43 | virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int ); | 43 | virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int ); |
44 | virtual void serverSelected(int); | ||
44 | 45 | ||
45 | protected: | 46 | protected: |
46 | QToolBar *toolBar; | 47 | QToolBar *toolBar; |
47 | QMenuBar *menuBar; | 48 | QMenuBar *menuBar; |
48 | QPopupMenu *mailMenu, *settingsMenu; | 49 | QPopupMenu *mailMenu, *settingsMenu,*serverMenu,*folderMenu; |
50 | |||
49 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, | 51 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, |
50 | *editSettings, *editAccounts, *syncFolders; | 52 | *editSettings, *editAccounts, *syncFolders; |
51 | AccountView *folderView; | 53 | AccountView *folderView; |
52 | QListView *mailView; | 54 | QListView *mailView; |
53 | QBoxLayout *layout; | 55 | QBoxLayout *layout; |
54 | int m_Rotate; | 56 | int m_Rotate; |
55 | QCopChannel* m_sysChannel; | 57 | QCopChannel* m_sysChannel; |
58 | int m_ServerMenuId,m_FolderMenuId; | ||
56 | }; | 59 | }; |
57 | 60 | ||
58 | #endif | 61 | #endif |
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index 9eba23e..7c6d314 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -71,26 +71,26 @@ ValueExplode::ValueExplode(const QString&aCommand,const char aDelemiter,const ch | |||
71 | m2Delemiter = a2Delemiter; | 71 | m2Delemiter = a2Delemiter; |
72 | splitit(); | 72 | splitit(); |
73 | } | 73 | } |
74 | 74 | ||
75 | void ValueExplode::splitit() | 75 | void ValueExplode::splitit() |
76 | { | 76 | { |
77 | QString iLine; | 77 | QString iLine; |
78 | m_LastParsed.clear(); | 78 | m_LastParsed.clear(); |
79 | if (mDelemiter.isEmpty()||m2Delemiter.isEmpty()) { | 79 | if (mDelemiter.isEmpty()||m2Delemiter.isEmpty()) { |
80 | m_LastParsed.append(tkeyvalues(m_Command,"")); | 80 | m_LastParsed.append(tkeyvalues(m_Command,"")); |
81 | return; | 81 | return; |
82 | } | 82 | } |
83 | int pos,pos2,startpos; | 83 | int pos,pos2; |
84 | startpos = 0; | 84 | unsigned startpos = 0; |
85 | iLine = m_Command; | 85 | iLine = m_Command; |
86 | while ( (pos = iLine.find(mDelemiter,startpos))!=-1) { | 86 | while ( (pos = iLine.find(mDelemiter,startpos))!=-1) { |
87 | pos2 = iLine.find(m2Delemiter,startpos); | 87 | pos2 = iLine.find(m2Delemiter,startpos); |
88 | if (pos2==-1||pos2>pos) { | 88 | if (pos2==-1||pos2>pos) { |
89 | m_LastParsed.append(tkeyvalues(iLine.mid(startpos,pos-startpos),"")); | 89 | m_LastParsed.append(tkeyvalues(iLine.mid(startpos,pos-startpos),"")); |
90 | } else { | 90 | } else { |
91 | m_LastParsed.append(tkeyvalues(iLine.mid(startpos,pos2-startpos),iLine.mid(pos2+1,pos-pos2-1))); | 91 | m_LastParsed.append(tkeyvalues(iLine.mid(startpos,pos2-startpos),iLine.mid(pos2+1,pos-pos2-1))); |
92 | } | 92 | } |
93 | startpos = pos+1; | 93 | startpos = pos+1; |
94 | } | 94 | } |
95 | if (startpos<iLine.length()) { | 95 | if (startpos<iLine.length()) { |
96 | pos2 = iLine.find(m2Delemiter,startpos); | 96 | pos2 = iLine.find(m2Delemiter,startpos); |