author | alwin <alwin> | 2004-03-12 14:12:00 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-03-12 14:12:00 (UTC) |
commit | d1929ef43f0eaaa17aa42196384d1ed925132873 (patch) (unidiff) | |
tree | eff911f93fe7919d7820e5a2e68b72f2f76143da /noncore/net/mail/accountitem.cpp | |
parent | d38384a6edb0110117e0297864f813b379d52789 (diff) | |
download | opie-d1929ef43f0eaaa17aa42196384d1ed925132873.zip opie-d1929ef43f0eaaa17aa42196384d1ed925132873.tar.gz opie-d1929ef43f0eaaa17aa42196384d1ed925132873.tar.bz2 |
some pointers embedded into osmart_pointer handling
Diffstat (limited to 'noncore/net/mail/accountitem.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/accountitem.cpp | 115 |
1 files changed, 54 insertions, 61 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp index 396dcb7..3e12563 100644 --- a/noncore/net/mail/accountitem.cpp +++ b/noncore/net/mail/accountitem.cpp | |||
@@ -48,41 +48,39 @@ AbstractMail *POP3viewItem::getWrapper() | |||
48 | { | 48 | { |
49 | return wrapper; | 49 | return wrapper; |
50 | } | 50 | } |
51 | 51 | ||
52 | void POP3viewItem::refresh( QList<RecMail> & ) | 52 | void POP3viewItem::refresh( QList<RecMail> & ) |
53 | { | 53 | { |
54 | refresh(); | 54 | refresh(); |
55 | } | 55 | } |
56 | 56 | ||
57 | void POP3viewItem::refresh() | 57 | void POP3viewItem::refresh() |
58 | { | 58 | { |
59 | if (account->getOffline()) return; | 59 | if (account->getOffline()) return; |
60 | QList<Folder> *folders = wrapper->listFolders(); | 60 | QValueList<FolderP> *folders = wrapper->listFolders(); |
61 | QListViewItem *child = firstChild(); | 61 | QListViewItem *child = firstChild(); |
62 | while ( child ) | 62 | while ( child ) |
63 | { | 63 | { |
64 | QListViewItem *tmp = child; | 64 | QListViewItem *tmp = child; |
65 | child = child->nextSibling(); | 65 | child = child->nextSibling(); |
66 | delete tmp; | 66 | delete tmp; |
67 | } | 67 | } |
68 | Folder *it; | 68 | QValueList<FolderP>::ConstIterator it; |
69 | QListViewItem*item = 0; | 69 | QListViewItem*item = 0; |
70 | for ( it = folders->first(); it; it = folders->next() ) | 70 | for ( it = folders->begin(); it!=folders->end(); ++it) |
71 | { | 71 | { |
72 | item = new POP3folderItem( it, this , item ); | 72 | item = new POP3folderItem( (*it), this , item ); |
73 | item->setSelectable(it->may_select()); | 73 | item->setSelectable( (*it)->may_select()); |
74 | } | 74 | } |
75 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
76 | folders->setAutoDelete(false); | ||
77 | delete folders; | 75 | delete folders; |
78 | } | 76 | } |
79 | 77 | ||
80 | RecBody POP3viewItem::fetchBody( const RecMail &mail ) | 78 | RecBody POP3viewItem::fetchBody( const RecMail &mail ) |
81 | { | 79 | { |
82 | qDebug( "POP3 fetchBody" ); | 80 | qDebug( "POP3 fetchBody" ); |
83 | return wrapper->fetchBody( mail ); | 81 | return wrapper->fetchBody( mail ); |
84 | } | 82 | } |
85 | 83 | ||
86 | QPopupMenu * POP3viewItem::getContextMenu() | 84 | QPopupMenu * POP3viewItem::getContextMenu() |
87 | { | 85 | { |
88 | QPopupMenu *m = new QPopupMenu(0); | 86 | QPopupMenu *m = new QPopupMenu(0); |
@@ -132,28 +130,27 @@ void POP3viewItem::contextMenuSelected(int which) | |||
132 | case 0: | 130 | case 0: |
133 | disconnect(); | 131 | disconnect(); |
134 | break; | 132 | break; |
135 | case 1: | 133 | case 1: |
136 | setOnOffline(); | 134 | setOnOffline(); |
137 | break; | 135 | break; |
138 | } | 136 | } |
139 | } | 137 | } |
140 | 138 | ||
141 | POP3folderItem::~POP3folderItem() | 139 | POP3folderItem::~POP3folderItem() |
142 | {} | 140 | {} |
143 | 141 | ||
144 | POP3folderItem::POP3folderItem( Folder *folderInit, POP3viewItem *parent , QListViewItem*after ) | 142 | POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after ) |
145 | : AccountViewItem( parent,after ) | 143 | : AccountViewItem(folderInit,parent,after ) |
146 | { | 144 | { |
147 | folder = folderInit; | ||
148 | pop3 = parent; | 145 | pop3 = parent; |
149 | if (folder->getDisplayName().lower()!="inbox") | 146 | if (folder->getDisplayName().lower()!="inbox") |
150 | { | 147 | { |
151 | setPixmap( 0, PIXMAP_POP3FOLDER ); | 148 | setPixmap( 0, PIXMAP_POP3FOLDER ); |
152 | } | 149 | } |
153 | else | 150 | else |
154 | { | 151 | { |
155 | setPixmap( 0, PIXMAP_INBOXFOLDER); | 152 | setPixmap( 0, PIXMAP_INBOXFOLDER); |
156 | } | 153 | } |
157 | setText( 0, folder->getDisplayName() ); | 154 | setText( 0, folder->getDisplayName() ); |
158 | } | 155 | } |
159 | 156 | ||
@@ -241,41 +238,40 @@ AbstractMail *NNTPviewItem::getWrapper() | |||
241 | { | 238 | { |
242 | return wrapper; | 239 | return wrapper; |
243 | } | 240 | } |
244 | 241 | ||
245 | void NNTPviewItem::refresh( QList<RecMail> & ) | 242 | void NNTPviewItem::refresh( QList<RecMail> & ) |
246 | { | 243 | { |
247 | refresh(); | 244 | refresh(); |
248 | } | 245 | } |
249 | 246 | ||
250 | void NNTPviewItem::refresh() | 247 | void NNTPviewItem::refresh() |
251 | { | 248 | { |
252 | if (account->getOffline()) return; | 249 | if (account->getOffline()) return; |
253 | QList<Folder> *folders = wrapper->listFolders(); | 250 | QValueList<FolderP> *folders = wrapper->listFolders(); |
251 | |||
254 | QListViewItem *child = firstChild(); | 252 | QListViewItem *child = firstChild(); |
255 | while ( child ) | 253 | while ( child ) |
256 | { | 254 | { |
257 | QListViewItem *tmp = child; | 255 | QListViewItem *tmp = child; |
258 | child = child->nextSibling(); | 256 | child = child->nextSibling(); |
259 | delete tmp; | 257 | delete tmp; |
260 | } | 258 | } |
261 | Folder *it; | 259 | QValueList<FolderP>::ConstIterator it; |
262 | QListViewItem*item = 0; | 260 | QListViewItem*item = 0; |
263 | for ( it = folders->first(); it; it = folders->next() ) | 261 | for ( it = folders->begin(); it!=folders->end(); ++it) |
264 | { | 262 | { |
265 | item = new NNTPfolderItem( it, this , item ); | 263 | item = new NNTPfolderItem( (*it), this , item ); |
266 | item->setSelectable(it->may_select()); | 264 | item->setSelectable( (*it)->may_select()); |
267 | } | 265 | } |
268 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
269 | folders->setAutoDelete(false); | ||
270 | delete folders; | 266 | delete folders; |
271 | } | 267 | } |
272 | 268 | ||
273 | RecBody NNTPviewItem::fetchBody( const RecMail &mail ) | 269 | RecBody NNTPviewItem::fetchBody( const RecMail &mail ) |
274 | { | 270 | { |
275 | qDebug( "NNTP fetchBody" ); | 271 | qDebug( "NNTP fetchBody" ); |
276 | return wrapper->fetchBody( mail ); | 272 | return wrapper->fetchBody( mail ); |
277 | } | 273 | } |
278 | 274 | ||
279 | QPopupMenu * NNTPviewItem::getContextMenu() | 275 | QPopupMenu * NNTPviewItem::getContextMenu() |
280 | { | 276 | { |
281 | QPopupMenu *m = new QPopupMenu(0); | 277 | QPopupMenu *m = new QPopupMenu(0); |
@@ -338,28 +334,27 @@ void NNTPviewItem::contextMenuSelected(int which) | |||
338 | case 1: | 334 | case 1: |
339 | setOnOffline(); | 335 | setOnOffline(); |
340 | break; | 336 | break; |
341 | case 2: | 337 | case 2: |
342 | subscribeGroups(); | 338 | subscribeGroups(); |
343 | break; | 339 | break; |
344 | } | 340 | } |
345 | } | 341 | } |
346 | 342 | ||
347 | NNTPfolderItem::~NNTPfolderItem() | 343 | NNTPfolderItem::~NNTPfolderItem() |
348 | {} | 344 | {} |
349 | 345 | ||
350 | NNTPfolderItem::NNTPfolderItem( Folder *folderInit, NNTPviewItem *parent , QListViewItem*after ) | 346 | NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after ) |
351 | : AccountViewItem( parent,after ) | 347 | : AccountViewItem( folderInit, parent,after ) |
352 | { | 348 | { |
353 | folder = folderInit; | ||
354 | nntp = parent; | 349 | nntp = parent; |
355 | if (folder->getDisplayName().lower()!="inbox") | 350 | if (folder->getDisplayName().lower()!="inbox") |
356 | { | 351 | { |
357 | setPixmap( 0, PIXMAP_POP3FOLDER ); | 352 | setPixmap( 0, PIXMAP_POP3FOLDER ); |
358 | } | 353 | } |
359 | else | 354 | else |
360 | { | 355 | { |
361 | setPixmap( 0, PIXMAP_INBOXFOLDER); | 356 | setPixmap( 0, PIXMAP_INBOXFOLDER); |
362 | } | 357 | } |
363 | setText( 0, folder->getDisplayName() ); | 358 | setText( 0, folder->getDisplayName() ); |
364 | } | 359 | } |
365 | 360 | ||
@@ -441,65 +436,63 @@ void IMAPviewItem::refresh(QList<RecMail>&) | |||
441 | const QStringList&IMAPviewItem::subFolders() | 436 | const QStringList&IMAPviewItem::subFolders() |
442 | { | 437 | { |
443 | return currentFolders; | 438 | return currentFolders; |
444 | } | 439 | } |
445 | 440 | ||
446 | void IMAPviewItem::refreshFolders(bool force) | 441 | void IMAPviewItem::refreshFolders(bool force) |
447 | { | 442 | { |
448 | if (childCount()>0 && force==false) return; | 443 | if (childCount()>0 && force==false) return; |
449 | if (account->getOffline()) return; | 444 | if (account->getOffline()) return; |
450 | 445 | ||
451 | removeChilds(); | 446 | removeChilds(); |
452 | currentFolders.clear(); | 447 | currentFolders.clear(); |
453 | QList<Folder> *folders = wrapper->listFolders(); | 448 | QValueList<FolderP> * folders = wrapper->listFolders(); |
454 | 449 | ||
455 | Folder *it; | 450 | QValueList<FolderP>::Iterator it; |
456 | QListViewItem*item = 0; | 451 | QListViewItem*item = 0; |
457 | QListViewItem*titem = 0; | 452 | QListViewItem*titem = 0; |
458 | QString fname,del,search; | 453 | QString fname,del,search; |
459 | int pos; | 454 | int pos; |
460 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
461 | folders->setAutoDelete(false); | ||
462 | 455 | ||
463 | for ( it = folders->first(); it; it = folders->next() ) | 456 | for ( it = folders->begin(); it!=folders->end(); ++it) |
464 | { | 457 | { |
465 | if (it->getDisplayName().lower()=="inbox") | 458 | if ((*it)->getDisplayName().lower()=="inbox") |
466 | { | 459 | { |
467 | item = new IMAPfolderItem( it, this , item ); | 460 | item = new IMAPfolderItem( (*it), this , item ); |
468 | folders->remove(it); | 461 | folders->remove(it); |
469 | qDebug("inbox found"); | 462 | qDebug("inbox found"); |
470 | break; | 463 | break; |
471 | } | 464 | } |
472 | } | 465 | } |
473 | for ( it = folders->first(); it; it = folders->next() ) | 466 | for ( it = folders->begin(); it!=folders->end(); ++it) |
474 | { | 467 | { |
475 | fname = it->getDisplayName(); | 468 | fname = (*it)->getDisplayName(); |
476 | currentFolders.append(it->getName()); | 469 | currentFolders.append((*it)->getName()); |
477 | pos = fname.findRev(it->Separator()); | 470 | pos = fname.findRev((*it)->Separator()); |
478 | if (pos != -1) | 471 | if (pos != -1) |
479 | { | 472 | { |
480 | fname = fname.left(pos); | 473 | fname = fname.left(pos); |
481 | } | 474 | } |
482 | IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname); | 475 | IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname); |
483 | if (pitem) | 476 | if (pitem) |
484 | { | 477 | { |
485 | titem = item; | 478 | titem = item; |
486 | item = new IMAPfolderItem(it,pitem,pitem->firstChild(),this); | 479 | item = new IMAPfolderItem( (*it),pitem,pitem->firstChild(),this); |
487 | /* setup the short name */ | 480 | /* setup the short name */ |
488 | item->setText(0,it->getDisplayName().right(it->getDisplayName().length()-pos-1)); | 481 | item->setText(0,(*it)->getDisplayName().right((*it)->getDisplayName().length()-pos-1)); |
489 | item = titem; | 482 | item = titem; |
490 | } | 483 | } |
491 | else | 484 | else |
492 | { | 485 | { |
493 | item = new IMAPfolderItem( it, this , item ); | 486 | item = new IMAPfolderItem( (*it), this , item ); |
494 | } | 487 | } |
495 | } | 488 | } |
496 | delete folders; | 489 | delete folders; |
497 | } | 490 | } |
498 | 491 | ||
499 | QPopupMenu * IMAPviewItem::getContextMenu() | 492 | QPopupMenu * IMAPviewItem::getContextMenu() |
500 | { | 493 | { |
501 | QPopupMenu *m = new QPopupMenu(0); | 494 | QPopupMenu *m = new QPopupMenu(0); |
502 | if (m) | 495 | if (m) |
503 | { | 496 | { |
504 | if (!account->getOffline()) | 497 | if (!account->getOffline()) |
505 | { | 498 | { |
@@ -569,44 +562,42 @@ void IMAPviewItem::contextMenuSelected(int id) | |||
569 | } | 562 | } |
570 | 563 | ||
571 | RecBody IMAPviewItem::fetchBody(const RecMail&) | 564 | RecBody IMAPviewItem::fetchBody(const RecMail&) |
572 | { | 565 | { |
573 | return RecBody(); | 566 | return RecBody(); |
574 | } | 567 | } |
575 | 568 | ||
576 | bool IMAPviewItem::offline() | 569 | bool IMAPviewItem::offline() |
577 | { | 570 | { |
578 | return account->getOffline(); | 571 | return account->getOffline(); |
579 | } | 572 | } |
580 | 573 | ||
581 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after ) | 574 | IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , QListViewItem*after ) |
582 | : AccountViewItem( parent , after ) | 575 | : AccountViewItem( folderInit, parent , after ) |
583 | { | 576 | { |
584 | folder = folderInit; | ||
585 | imap = parent; | 577 | imap = parent; |
586 | if (folder->getDisplayName().lower()!="inbox") | 578 | if (folder->getDisplayName().lower()!="inbox") |
587 | { | 579 | { |
588 | setPixmap( 0, PIXMAP_IMAPFOLDER ); | 580 | setPixmap( 0, PIXMAP_IMAPFOLDER ); |
589 | } | 581 | } |
590 | else | 582 | else |
591 | { | 583 | { |
592 | setPixmap( 0, PIXMAP_INBOXFOLDER); | 584 | setPixmap( 0, PIXMAP_INBOXFOLDER); |
593 | } | 585 | } |
594 | setText( 0, folder->getDisplayName() ); | 586 | setText( 0, folder->getDisplayName() ); |
595 | } | 587 | } |
596 | 588 | ||
597 | IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master ) | 589 | IMAPfolderItem::IMAPfolderItem(const FolderP &folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master ) |
598 | : AccountViewItem( parent,after ) | 590 | : AccountViewItem(folderInit, parent,after ) |
599 | { | 591 | { |
600 | folder = folderInit; | ||
601 | imap = master; | 592 | imap = master; |
602 | if (folder->getDisplayName().lower()!="inbox") | 593 | if (folder->getDisplayName().lower()!="inbox") |
603 | { | 594 | { |
604 | setPixmap( 0, PIXMAP_IMAPFOLDER ); | 595 | setPixmap( 0, PIXMAP_IMAPFOLDER ); |
605 | } | 596 | } |
606 | else | 597 | else |
607 | { | 598 | { |
608 | setPixmap( 0, PIXMAP_INBOXFOLDER); | 599 | setPixmap( 0, PIXMAP_INBOXFOLDER); |
609 | } | 600 | } |
610 | setText( 0, folder->getDisplayName() ); | 601 | setText( 0, folder->getDisplayName() ); |
611 | } | 602 | } |
612 | 603 | ||
@@ -759,63 +750,61 @@ AbstractMail *MHviewItem::getWrapper() | |||
759 | 750 | ||
760 | void MHviewItem::refresh( QList<RecMail> & target) | 751 | void MHviewItem::refresh( QList<RecMail> & target) |
761 | { | 752 | { |
762 | refresh(false); | 753 | refresh(false); |
763 | getWrapper()->listMessages( "",target ); | 754 | getWrapper()->listMessages( "",target ); |
764 | } | 755 | } |
765 | 756 | ||
766 | void MHviewItem::refresh(bool force) | 757 | void MHviewItem::refresh(bool force) |
767 | { | 758 | { |
768 | if (childCount()>0 && force==false) return; | 759 | if (childCount()>0 && force==false) return; |
769 | removeChilds(); | 760 | removeChilds(); |
770 | currentFolders.clear(); | 761 | currentFolders.clear(); |
771 | QList<Folder> *folders = wrapper->listFolders(); | 762 | QValueList<FolderP> *folders = wrapper->listFolders(); |
772 | Folder *it; | 763 | QValueList<FolderP>::ConstIterator it; |
773 | MHfolderItem*item = 0; | 764 | MHfolderItem*item = 0; |
774 | MHfolderItem*pmaster = 0; | 765 | MHfolderItem*pmaster = 0; |
775 | QString fname = ""; | 766 | QString fname = ""; |
776 | int pos; | 767 | int pos; |
777 | for ( it = folders->first(); it; it = folders->next() ) | 768 | for ( it = folders->begin(); it!=folders->end(); ++it) |
778 | { | 769 | { |
779 | fname = it->getDisplayName(); | 770 | fname = (*it)->getDisplayName(); |
780 | /* this folder itself */ | 771 | /* this folder itself */ |
781 | if (fname=="/") | 772 | if (fname=="/") |
782 | { | 773 | { |
783 | currentFolders.append(fname); | 774 | currentFolders.append(fname); |
784 | folder = it; | 775 | folder = (*it); |
785 | continue; | 776 | continue; |
786 | } | 777 | } |
787 | currentFolders.append(fname); | 778 | currentFolders.append(fname); |
788 | pos = fname.findRev("/"); | 779 | pos = fname.findRev("/"); |
789 | if (pos > 0) | 780 | if (pos > 0) |
790 | { | 781 | { |
791 | fname = fname.left(pos); | 782 | fname = fname.left(pos); |
792 | pmaster = (MHfolderItem*)findSubItem(fname); | 783 | pmaster = (MHfolderItem*)findSubItem(fname); |
793 | } | 784 | } |
794 | else | 785 | else |
795 | { | 786 | { |
796 | pmaster = 0; | 787 | pmaster = 0; |
797 | } | 788 | } |
798 | if (pmaster) | 789 | if (pmaster) |
799 | { | 790 | { |
800 | item = new MHfolderItem( it, pmaster, item, this ); | 791 | item = new MHfolderItem( (*it), pmaster, item, this ); |
801 | } | 792 | } |
802 | else | 793 | else |
803 | { | 794 | { |
804 | item = new MHfolderItem( it, this , item ); | 795 | item = new MHfolderItem( (*it), this , item ); |
805 | } | 796 | } |
806 | item->setSelectable(it->may_select()); | 797 | item->setSelectable((*it)->may_select()); |
807 | } | 798 | } |
808 | // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
809 | folders->setAutoDelete(false); | ||
810 | delete folders; | 799 | delete folders; |
811 | } | 800 | } |
812 | 801 | ||
813 | RecBody MHviewItem::fetchBody( const RecMail &mail ) | 802 | RecBody MHviewItem::fetchBody( const RecMail &mail ) |
814 | { | 803 | { |
815 | qDebug( "MH fetchBody" ); | 804 | qDebug( "MH fetchBody" ); |
816 | return wrapper->fetchBody( mail ); | 805 | return wrapper->fetchBody( mail ); |
817 | } | 806 | } |
818 | 807 | ||
819 | QPopupMenu * MHviewItem::getContextMenu() | 808 | QPopupMenu * MHviewItem::getContextMenu() |
820 | { | 809 | { |
821 | QPopupMenu *m = new QPopupMenu(0); | 810 | QPopupMenu *m = new QPopupMenu(0); |
@@ -869,34 +858,33 @@ void MHviewItem::contextMenuSelected(int which) | |||
869 | break; | 858 | break; |
870 | case 3: | 859 | case 3: |
871 | downloadMails(); | 860 | downloadMails(); |
872 | break; | 861 | break; |
873 | default: | 862 | default: |
874 | break; | 863 | break; |
875 | } | 864 | } |
876 | } | 865 | } |
877 | 866 | ||
878 | MHfolderItem::~MHfolderItem() | 867 | MHfolderItem::~MHfolderItem() |
879 | {} | 868 | {} |
880 | 869 | ||
881 | MHfolderItem::MHfolderItem( Folder *folderInit, MHviewItem *parent , QListViewItem*after ) | 870 | MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after ) |
882 | : AccountViewItem( parent,after ) | 871 | : AccountViewItem(folderInit, parent,after ) |
883 | { | 872 | { |
884 | folder = folderInit; | ||
885 | mbox = parent; | 873 | mbox = parent; |
886 | initName(); | 874 | initName(); |
887 | } | 875 | } |
888 | 876 | ||
889 | MHfolderItem::MHfolderItem( Folder *folderInit, MHfolderItem *parent, QListViewItem*after, MHviewItem*master) | 877 | MHfolderItem::MHfolderItem(const FolderP& folderInit, MHfolderItem *parent, QListViewItem*after, MHviewItem*master) |
890 | : AccountViewItem( parent,after ) | 878 | : AccountViewItem(folderInit, parent,after ) |
891 | { | 879 | { |
892 | folder = folderInit; | 880 | folder = folderInit; |
893 | mbox = master; | 881 | mbox = master; |
894 | initName(); | 882 | initName(); |
895 | } | 883 | } |
896 | 884 | ||
897 | void MHfolderItem::initName() | 885 | void MHfolderItem::initName() |
898 | { | 886 | { |
899 | QString bName = folder->getDisplayName(); | 887 | QString bName = folder->getDisplayName(); |
900 | if (bName.startsWith("/")&&bName.length()>1) | 888 | if (bName.startsWith("/")&&bName.length()>1) |
901 | { | 889 | { |
902 | bName.replace(0,1,""); | 890 | bName.replace(0,1,""); |
@@ -912,25 +900,25 @@ void MHfolderItem::initName() | |||
912 | } | 900 | } |
913 | else if (bName.lower() == "inbox") | 901 | else if (bName.lower() == "inbox") |
914 | { | 902 | { |
915 | setPixmap( 0, PIXMAP_INBOXFOLDER); | 903 | setPixmap( 0, PIXMAP_INBOXFOLDER); |
916 | } else if (bName.lower() == "drafts") { | 904 | } else if (bName.lower() == "drafts") { |
917 | setPixmap(0, Resource::loadPixmap("inline/edit")); | 905 | setPixmap(0, Resource::loadPixmap("inline/edit")); |
918 | } else { | 906 | } else { |
919 | setPixmap( 0, PIXMAP_MBOXFOLDER ); | 907 | setPixmap( 0, PIXMAP_MBOXFOLDER ); |
920 | } | 908 | } |
921 | setText( 0, bName ); | 909 | setText( 0, bName ); |
922 | } | 910 | } |
923 | 911 | ||
924 | Folder*MHfolderItem::getFolder() | 912 | const FolderP&MHfolderItem::getFolder()const |
925 | { | 913 | { |
926 | return folder; | 914 | return folder; |
927 | } | 915 | } |
928 | 916 | ||
929 | void MHfolderItem::refresh(QList<RecMail>&target) | 917 | void MHfolderItem::refresh(QList<RecMail>&target) |
930 | { | 918 | { |
931 | if (folder->may_select()) | 919 | if (folder->may_select()) |
932 | mbox->getWrapper()->listMessages( folder->getName(),target ); | 920 | mbox->getWrapper()->listMessages( folder->getName(),target ); |
933 | } | 921 | } |
934 | 922 | ||
935 | RecBody MHfolderItem::fetchBody(const RecMail&aMail) | 923 | RecBody MHfolderItem::fetchBody(const RecMail&aMail) |
936 | { | 924 | { |
@@ -1034,52 +1022,57 @@ bool MHfolderItem::isDraftfolder() | |||
1034 | */ | 1022 | */ |
1035 | 1023 | ||
1036 | const QString AccountViewItem::contextName="AccountViewItem"; | 1024 | const QString AccountViewItem::contextName="AccountViewItem"; |
1037 | 1025 | ||
1038 | AccountViewItem::AccountViewItem( AccountView *parent ) | 1026 | AccountViewItem::AccountViewItem( AccountView *parent ) |
1039 | : QListViewItem( parent ) | 1027 | : QListViewItem( parent ) |
1040 | { | 1028 | { |
1041 | init(); | 1029 | init(); |
1042 | m_Backlink = parent; | 1030 | m_Backlink = parent; |
1043 | } | 1031 | } |
1044 | 1032 | ||
1045 | AccountViewItem::AccountViewItem( QListViewItem *parent) | 1033 | AccountViewItem::AccountViewItem( QListViewItem *parent) |
1046 | : QListViewItem( parent) | 1034 | : QListViewItem( parent),folder(0) |
1047 | { | 1035 | { |
1048 | init(); | 1036 | init(); |
1049 | } | 1037 | } |
1050 | 1038 | ||
1051 | AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after ) | 1039 | AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after ) |
1052 | :QListViewItem( parent,after ) | 1040 | :QListViewItem( parent,after ),folder(0) |
1041 | { | ||
1042 | init(); | ||
1043 | } | ||
1044 | |||
1045 | AccountViewItem::AccountViewItem( const Opie::osmart_pointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after ) | ||
1046 | :QListViewItem( parent,after ),folder(folderInit) | ||
1053 | { | 1047 | { |
1054 | init(); | 1048 | init(); |
1055 | } | 1049 | } |
1056 | 1050 | ||
1057 | void AccountViewItem::init() | 1051 | void AccountViewItem::init() |
1058 | { | 1052 | { |
1059 | m_Backlink = 0; | 1053 | m_Backlink = 0; |
1060 | folder = 0; | ||
1061 | } | 1054 | } |
1062 | 1055 | ||
1063 | AccountViewItem::~AccountViewItem() | 1056 | AccountViewItem::~AccountViewItem() |
1064 | { | 1057 | { |
1065 | if (folder) delete folder; | 1058 | folder = 0; |
1066 | } | 1059 | } |
1067 | 1060 | ||
1068 | AccountView*AccountViewItem::accountView() | 1061 | AccountView*AccountViewItem::accountView() |
1069 | { | 1062 | { |
1070 | return m_Backlink; | 1063 | return m_Backlink; |
1071 | } | 1064 | } |
1072 | 1065 | ||
1073 | void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder) | 1066 | void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder) |
1074 | { | 1067 | { |
1075 | if (!wrapper) return; | 1068 | if (!wrapper) return; |
1076 | QString fname=""; | 1069 | QString fname=""; |
1077 | if (folder) fname = folder->getDisplayName(); | 1070 | if (folder) fname = folder->getDisplayName(); |
1078 | int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), | 1071 | int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), |
1079 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName). | 1072 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName). |
1080 | arg(fname), | 1073 | arg(fname), |
1081 | QObject::tr("Yes",contextName), | 1074 | QObject::tr("Yes",contextName), |
1082 | QObject::tr("No",contextName),QString::null,1,1); | 1075 | QObject::tr("No",contextName),QString::null,1,1); |
1083 | qDebug("Auswahl: %i",yesno); | 1076 | qDebug("Auswahl: %i",yesno); |
1084 | if (yesno == 0) | 1077 | if (yesno == 0) |
1085 | { | 1078 | { |