-rw-r--r-- | kmicromail/opiemail.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index e296d9c..75a75b9 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -496,101 +496,105 @@ void OpieMail::selectAll() | |||
496 | while ( item ) { | 496 | while ( item ) { |
497 | mailView->setSelected ( item, true ); | 497 | mailView->setSelected ( item, true ); |
498 | item = item->nextSibling(); | 498 | item = item->nextSibling(); |
499 | } | 499 | } |
500 | } | 500 | } |
501 | 501 | ||
502 | void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) | 502 | void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) |
503 | { | 503 | { |
504 | if (!mailView->currentItem()) return; | 504 | if (!mailView->currentItem()) return; |
505 | MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType(); | 505 | MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType(); |
506 | /* just the RIGHT button - or hold on pda */ | 506 | /* just the RIGHT button - or hold on pda */ |
507 | if (button!=2) {return;} | 507 | if (button!=2) {return;} |
508 | if (!item) return; | 508 | if (!item) return; |
509 | QPopupMenu *m = new QPopupMenu(0); | 509 | QPopupMenu *m = new QPopupMenu(0); |
510 | if (m) | 510 | if (m) |
511 | { | 511 | { |
512 | if (mailtype==MAILLIB::A_NNTP) { | 512 | if (mailtype==MAILLIB::A_NNTP) { |
513 | m->insertItem(i18n("Read this posting"),this,SLOT(displayMail())); | 513 | m->insertItem(i18n("Read this posting"),this,SLOT(displayMail())); |
514 | m->insertItem(i18n("Copy this posting"),this,SLOT(slotMoveCopyMail())); | 514 | m->insertItem(i18n("Copy this posting"),this,SLOT(slotMoveCopyMail())); |
515 | m->insertSeparator(); | 515 | m->insertSeparator(); |
516 | m->insertItem(i18n("Copy all selected postings"),this,SLOT(slotMoveCopyAllMail())); | 516 | m->insertItem(i18n("Copy all selected postings"),this,SLOT(slotMoveCopyAllMail())); |
517 | m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection())); | 517 | m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection())); |
518 | } else { | 518 | } else { |
519 | if (folderView->currentisDraft()) { | 519 | if (folderView->currentisDraft()) { |
520 | m->insertItem(i18n("Edit this mail"),this,SLOT(reEditMail())); | 520 | m->insertItem(i18n("Edit this mail"),this,SLOT(reEditMail())); |
521 | } | 521 | } |
522 | m->insertItem(i18n("Reply to this mail"),this,SLOT(replyMail())); | 522 | m->insertItem(i18n("Reply to this mail"),this,SLOT(replyMail())); |
523 | m->insertItem(i18n("Read this mail"),this,SLOT(displayMail())); | 523 | m->insertItem(i18n("Read this mail"),this,SLOT(displayMail())); |
524 | m->insertSeparator(); | 524 | m->insertSeparator(); |
525 | m->insertItem(i18n("Move/Copy this mail"),this,SLOT(slotMoveCopyMail())); | 525 | m->insertItem(i18n("Move/Copy this mail"),this,SLOT(slotMoveCopyMail())); |
526 | m->insertItem(i18n("Delete this mail"),this,SLOT(slotDeleteMail())); | 526 | m->insertItem(i18n("Delete this mail"),this,SLOT(slotDeleteMail())); |
527 | m->insertSeparator(); | 527 | m->insertSeparator(); |
528 | m->insertItem(i18n("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail())); | 528 | m->insertItem(i18n("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail())); |
529 | m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail())); | 529 | m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail())); |
530 | m->insertSeparator(); | 530 | m->insertSeparator(); |
531 | m->insertItem(i18n("Select all"),this,SLOT(selectAll())); | 531 | m->insertItem(i18n("Select all"),this,SLOT(selectAll())); |
532 | m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection())); | 532 | m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection())); |
533 | } | 533 | } |
534 | m->setFocus(); | 534 | m->setFocus(); |
535 | m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); | 535 | m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); |
536 | delete m; | 536 | delete m; |
537 | } | 537 | } |
538 | } | 538 | } |
539 | 539 | ||
540 | void OpieMail::slotShowFolders( bool show ) | 540 | void OpieMail::slotShowFolders( bool show ) |
541 | { | 541 | { |
542 | if ( show && folderView->isHidden() ) | 542 | if ( show && folderView->isHidden() ) |
543 | { | 543 | { |
544 | slotAdjustColumns(); | ||
544 | folderView->show(); | 545 | folderView->show(); |
546 | //slotAdjustColumns(); | ||
545 | } | 547 | } |
546 | else if ( !show && !folderView->isHidden() ) | 548 | else if ( !show && !folderView->isHidden() ) |
547 | { | 549 | { |
550 | slotAdjustColumnsWide(); | ||
548 | folderView->hide(); | 551 | folderView->hide(); |
552 | //slotAdjustColumnsWide(); | ||
549 | } | 553 | } |
550 | } | 554 | } |
551 | 555 | ||
552 | void OpieMail::refreshMailView(const QValueList<RecMailP>&list) | 556 | void OpieMail::refreshMailView(const QValueList<RecMailP>&list) |
553 | { | 557 | { |
554 | MailListViewItem*item = 0; | 558 | MailListViewItem*item = 0; |
555 | mailView->clear(); | 559 | mailView->clear(); |
556 | 560 | ||
557 | QValueList<RecMailP>::ConstIterator it; | 561 | QValueList<RecMailP>::ConstIterator it; |
558 | for (it = list.begin(); it != list.end();++it) | 562 | for (it = list.begin(); it != list.end();++it) |
559 | { | 563 | { |
560 | item = new MailListViewItem(mailView,item); | 564 | item = new MailListViewItem(mailView,item); |
561 | item->storeData((*it)); | 565 | item->storeData((*it)); |
562 | item->showEntry(); | 566 | item->showEntry(); |
563 | } | 567 | } |
564 | mailView->setSorting ( 4, false ); | 568 | mailView->setSorting ( 4, false ); |
565 | } | 569 | } |
566 | 570 | ||
567 | void OpieMail::mailLeftClicked( QListViewItem *item ) | 571 | void OpieMail::mailLeftClicked( QListViewItem *item ) |
568 | { | 572 | { |
569 | mailView->clearSelection(); | 573 | mailView->clearSelection(); |
570 | /* just LEFT button - or tap with stylus on pda */ | 574 | /* just LEFT button - or tap with stylus on pda */ |
571 | //if (button!=1) return; | 575 | //if (button!=1) return; |
572 | if (!item) return; | 576 | if (!item) return; |
573 | if (folderView->currentisDraft()) { | 577 | if (folderView->currentisDraft()) { |
574 | reEditMail(); | 578 | reEditMail(); |
575 | } else { | 579 | } else { |
576 | displayMail(); | 580 | displayMail(); |
577 | } | 581 | } |
578 | } | 582 | } |
579 | 583 | ||
580 | void OpieMail::slotMoveCopyMail() | 584 | void OpieMail::slotMoveCopyMail() |
581 | { | 585 | { |
582 | if (!mailView->currentItem()) return; | 586 | if (!mailView->currentItem()) return; |
583 | RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data(); | 587 | RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data(); |
584 | AbstractMail*targetMail = 0; | 588 | AbstractMail*targetMail = 0; |
585 | QString targetFolder = ""; | 589 | QString targetFolder = ""; |
586 | Selectstore sels; | 590 | Selectstore sels; |
587 | folderView->setupFolderselect(&sels); | 591 | folderView->setupFolderselect(&sels); |
588 | if (!sels.exec()) return; | 592 | if (!sels.exec()) return; |
589 | targetMail = sels.currentMail(); | 593 | targetMail = sels.currentMail(); |
590 | targetFolder = sels.currentFolder(); | 594 | targetFolder = sels.currentFolder(); |
591 | if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) || | 595 | if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) || |
592 | targetFolder.isEmpty()) | 596 | targetFolder.isEmpty()) |
593 | { | 597 | { |
594 | return; | 598 | return; |
595 | } | 599 | } |
596 | if (sels.newFolder() && !targetMail->createMbox(targetFolder)) | 600 | if (sels.newFolder() && !targetMail->createMbox(targetFolder)) |