summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/accountitem.cpp240
-rw-r--r--noncore/net/mail/accountitem.h50
-rw-r--r--noncore/net/mail/accountview.cpp29
-rw-r--r--noncore/net/mail/accountview.h8
-rw-r--r--noncore/net/mail/mainwindow.cpp23
-rw-r--r--noncore/net/mail/mainwindow.h12
-rw-r--r--noncore/net/mail/opiemail.cpp41
-rw-r--r--noncore/net/mail/opiemail.h8
8 files changed, 249 insertions, 162 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index 10db2c6..f7fdccd 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -82,24 +82,18 @@ RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
82 odebug << "POP3 fetchBody" << oendl; 82 odebug << "POP3 fetchBody" << oendl;
83 return wrapper->fetchBody( mail ); 83 return wrapper->fetchBody( mail );
84} 84}
85 85
86QPopupMenu * POP3viewItem::getContextMenu() 86QMap<int,QString> POP3viewItem::serverMenu()
87{ 87{
88 QPopupMenu *m = new QPopupMenu(0); 88 QMap<int,QString> _entries;
89 if (m) 89 if (!account->getOffline()) {
90 { 90 _entries[SERVER_MENU_DISCONNECT]=QObject::tr("Disconnect",contextName);
91 if (!account->getOffline()) 91 _entries[SERVER_MENU_OFFLINE]=QObject::tr("Set offline",contextName);
92 { 92 } else {
93 m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT); 93 _entries[SERVER_MENU_OFFLINE]=QObject::tr("Set online",contextName);
94 m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE);
95 }
96 else
97 {
98 m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE);
99 }
100 } 94 }
101 return m; 95 return _entries;
102} 96}
103 97
104void POP3viewItem::disconnect() 98void POP3viewItem::disconnect()
105{ 99{
@@ -124,9 +118,9 @@ void POP3viewItem::setOnOffline()
124 SETPIX(PIXMAP_POP3FOLDER); 118 SETPIX(PIXMAP_POP3FOLDER);
125 refresh(); 119 refresh();
126} 120}
127 121
128void POP3viewItem::contextMenuSelected(int which) 122bool POP3viewItem::contextMenuSelected(int which)
129{ 123{
130 switch (which) 124 switch (which)
131 { 125 {
132 case SERVER_MENU_DISCONNECT: 126 case SERVER_MENU_DISCONNECT:
@@ -135,8 +129,9 @@ void POP3viewItem::contextMenuSelected(int which)
135 case SERVER_MENU_OFFLINE: 129 case SERVER_MENU_OFFLINE:
136 setOnOffline(); 130 setOnOffline();
137 break; 131 break;
138 } 132 }
133 return false;
139} 134}
140 135
141POP3folderItem::~POP3folderItem() 136POP3folderItem::~POP3folderItem()
142{} 137{}
@@ -166,18 +161,15 @@ RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail)
166{ 161{
167 return pop3->getWrapper()->fetchBody(aMail); 162 return pop3->getWrapper()->fetchBody(aMail);
168} 163}
169 164
170QPopupMenu * POP3folderItem::getContextMenu() 165QMap<int,QString> POP3folderItem::folderMenu()
171{ 166{
172 QPopupMenu *m = new QPopupMenu(0); 167 QMap<int,QString> _entries;
173 if (m) 168 _entries[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
174 { 169 _entries[FOLDER_MENU_DELETE_ALL_MAILS]=QObject::tr("Delete all mails",contextName);
175 m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER); 170 _entries[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Move/Copie all mails",contextName);
176 m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS); 171 return _entries;
177 m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS);
178 }
179 return m;
180} 172}
181 173
182void POP3folderItem::downloadMails() 174void POP3folderItem::downloadMails()
183{ 175{
@@ -185,9 +177,9 @@ void POP3folderItem::downloadMails()
185 if (!bl) return; 177 if (!bl) return;
186 bl->downloadMails(folder,pop3->getWrapper()); 178 bl->downloadMails(folder,pop3->getWrapper());
187} 179}
188 180
189void POP3folderItem::contextMenuSelected(int which) 181bool POP3folderItem::contextMenuSelected(int which)
190{ 182{
191 AccountView * view = (AccountView*)listView(); 183 AccountView * view = (AccountView*)listView();
192 switch (which) 184 switch (which)
193 { 185 {
@@ -204,8 +196,9 @@ void POP3folderItem::contextMenuSelected(int which)
204 break; 196 break;
205 default: 197 default:
206 break; 198 break;
207 } 199 }
200 return false;
208} 201}
209 202
210/** 203/**
211 * NNTP Account stuff 204 * NNTP Account stuff
@@ -273,25 +266,20 @@ RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
273 odebug << "NNTP fetchBody" << oendl; 266 odebug << "NNTP fetchBody" << oendl;
274 return wrapper->fetchBody( mail ); 267 return wrapper->fetchBody( mail );
275} 268}
276 269
277QPopupMenu * NNTPviewItem::getContextMenu() 270QMap<int,QString> NNTPviewItem::serverMenu()
278{ 271{
279 QPopupMenu *m = new QPopupMenu(0); 272 QMap<int,QString> _entries;
280 if (m) 273 if (!account->getOffline())
281 { 274 {
282 if (!account->getOffline()) 275 _entries[SERVER_MENU_DISCONNECT]=QObject::tr("Disconnect",contextName);
283 { 276 _entries[SERVER_MENU_OFFLINE]=QObject::tr("Set offline",contextName);
284 m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT); 277 _entries[SERVER_MENU_SUBSCRIBE]=QObject::tr("(Un-)Subscribe groups",contextName);
285 m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE); 278 } else {
286 m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),SERVER_MENU_SUBSCRIBE); 279 _entries[SERVER_MENU_OFFLINE]=QObject::tr("Set online",contextName);
287 }
288 else
289 {
290 m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE);
291 }
292 } 280 }
293 return m; 281 return _entries;
294} 282}
295 283
296void NNTPviewItem::subscribeGroups() 284void NNTPviewItem::subscribeGroups()
297{ 285{
@@ -325,9 +313,9 @@ void NNTPviewItem::setOnOffline()
325 SETPIX(PIXMAP_POP3FOLDER); 313 SETPIX(PIXMAP_POP3FOLDER);
326 refresh(); 314 refresh();
327} 315}
328 316
329void NNTPviewItem::contextMenuSelected(int which) 317bool NNTPviewItem::contextMenuSelected(int which)
330{ 318{
331 switch (which) 319 switch (which)
332 { 320 {
333 case SERVER_MENU_DISCONNECT: 321 case SERVER_MENU_DISCONNECT:
@@ -339,8 +327,9 @@ void NNTPviewItem::contextMenuSelected(int which)
339 case SERVER_MENU_SUBSCRIBE: 327 case SERVER_MENU_SUBSCRIBE:
340 subscribeGroups(); 328 subscribeGroups();
341 break; 329 break;
342 } 330 }
331 return false;
343} 332}
344 333
345NNTPfolderItem::~NNTPfolderItem() 334NNTPfolderItem::~NNTPfolderItem()
346{} 335{}
@@ -370,17 +359,14 @@ RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail)
370{ 359{
371 return nntp->getWrapper()->fetchBody(aMail); 360 return nntp->getWrapper()->fetchBody(aMail);
372} 361}
373 362
374QPopupMenu * NNTPfolderItem::getContextMenu() 363QMap<int,QString> NNTPfolderItem::folderMenu()
375{ 364{
376 QPopupMenu *m = new QPopupMenu(0); 365 QMap<int,QString> _entries;
377 if (m) 366 _entries[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
378 { 367 _entries[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Copy all postings",contextName);
379 m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER); 368 return _entries;
380 m->insertItem(QObject::tr("Copy all postings",contextName),FOLDER_MENU_MOVE_MAILS);
381 }
382 return m;
383} 369}
384 370
385void NNTPfolderItem::downloadMails() 371void NNTPfolderItem::downloadMails()
386{ 372{
@@ -388,9 +374,9 @@ void NNTPfolderItem::downloadMails()
388 if (!bl) return; 374 if (!bl) return;
389 bl->downloadMails(folder,nntp->getWrapper()); 375 bl->downloadMails(folder,nntp->getWrapper());
390} 376}
391 377
392void NNTPfolderItem::contextMenuSelected(int which) 378bool NNTPfolderItem::contextMenuSelected(int which)
393{ 379{
394 AccountView * view = (AccountView*)listView(); 380 AccountView * view = (AccountView*)listView();
395 switch (which) 381 switch (which)
396 { 382 {
@@ -404,8 +390,9 @@ void NNTPfolderItem::contextMenuSelected(int which)
404 break; 390 break;
405 default: 391 default:
406 break; 392 break;
407 } 393 }
394 return false;
408} 395}
409 396
410/** 397/**
411 * IMAP Account stuff 398 * IMAP Account stuff
@@ -490,27 +477,20 @@ void IMAPviewItem::refreshFolders(bool force)
490 } 477 }
491 delete folders; 478 delete folders;
492} 479}
493 480
494QPopupMenu * IMAPviewItem::getContextMenu() 481QMap<int,QString> IMAPviewItem::serverMenu()
495{ 482{
496 QPopupMenu *m = new QPopupMenu(0); 483 QMap<int,QString> e;
497 if (m) 484 if (!account->getOffline()) {
498 { 485 e[SERVER_MENU_DISCONNECT]=QObject::tr("Disconnect",contextName);
499 if (!account->getOffline()) 486 e[SERVER_MENU_OFFLINE]=QObject::tr("Set offline",contextName);
500 { 487 e[SERVER_MENU_REFRESH_FOLDER]=QObject::tr("Refresh folder list",contextName);
501 m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT); 488 e[SERVER_MENU_CREATE_FOLDER]=QObject::tr("Create new folder",contextName);
502 m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE); 489 } else {
503 m->insertSeparator(); 490 e[SERVER_MENU_OFFLINE]=QObject::tr("Set online",contextName);
504 m->insertItem(QObject::tr("Refresh folder list",contextName),SERVER_MENU_REFRESH_FOLDER);
505 m->insertItem(QObject::tr("Create new folder",contextName),SERVER_MENU_CREATE_FOLDER);
506 }
507 else
508 {
509 m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE);
510 }
511 } 491 }
512 return m; 492 return e;
513} 493}
514 494
515void IMAPviewItem::createNewFolder() 495void IMAPviewItem::createNewFolder()
516{ 496{
@@ -531,9 +511,9 @@ void IMAPviewItem::createNewFolder()
531 } 511 }
532 } 512 }
533} 513}
534 514
535void IMAPviewItem::contextMenuSelected(int id) 515bool IMAPviewItem::contextMenuSelected(int id)
536{ 516{
537 odebug << "Id selected: " << id << "" << oendl; 517 odebug << "Id selected: " << id << "" << oendl;
538 switch (id) 518 switch (id)
539 { 519 {
@@ -560,8 +540,9 @@ void IMAPviewItem::contextMenuSelected(int id)
560 break; 540 break;
561 default: 541 default:
562 break; 542 break;
563 } 543 }
544 return false;
564} 545}
565 546
566RECBODYP IMAPviewItem::fetchBody(const RecMailP&) 547RECBODYP IMAPviewItem::fetchBody(const RecMailP&)
567{ 548{
@@ -627,29 +608,23 @@ RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail)
627{ 608{
628 return imap->getWrapper()->fetchBody(aMail); 609 return imap->getWrapper()->fetchBody(aMail);
629} 610}
630 611
631QPopupMenu * IMAPfolderItem::getContextMenu() 612QMap<int,QString> IMAPfolderItem::folderMenu()
632{ 613{
633 QPopupMenu *m = new QPopupMenu(0); 614 QMap<int,QString> e;
634 if (m) 615 if (folder->may_select()) {
635 { 616 e[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
636 if (folder->may_select()) 617 e[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Move/Copy all mails",contextName);
637 { 618 e[FOLDER_MENU_DELETE_ALL_MAILS]=QObject::tr("Delete all mails",contextName);
638 m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER);
639 m->insertItem(QObject::tr("Move/Copy all mails",contextName),FOLDER_MENU_MOVE_MAILS);
640 m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS);
641 }
642 if (folder->no_inferior()==false)
643 {
644 m->insertItem(QObject::tr("Create new subfolder",contextName),FOLDER_MENU_NEW_SUBFOLDER);
645 }
646 if (folder->getDisplayName().lower()!="inbox")
647 {
648 m->insertItem(QObject::tr("Delete folder",contextName),FOLDER_MENU_DELETE_FOLDER);
649 }
650 } 619 }
651 return m; 620 if (folder->no_inferior()==false) {
621 e[FOLDER_MENU_NEW_SUBFOLDER]=QObject::tr("Create new subfolder",contextName);
622 }
623 if (folder->getDisplayName().lower()!="inbox") {
624 e[FOLDER_MENU_DELETE_FOLDER]=QObject::tr("Delete folder",contextName);
625 }
626 return e;
652} 627}
653 628
654void IMAPfolderItem::createNewFolder() 629void IMAPfolderItem::createNewFolder()
655{ 630{
@@ -665,9 +640,9 @@ void IMAPfolderItem::createNewFolder()
665 } 640 }
666 } 641 }
667} 642}
668 643
669void IMAPfolderItem::deleteFolder() 644bool IMAPfolderItem::deleteFolder()
670{ 645{
671 int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName), 646 int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
672 QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()), 647 QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
673 QObject::tr("Yes",contextName), 648 QObject::tr("Yes",contextName),
@@ -685,10 +660,12 @@ void IMAPfolderItem::deleteFolder()
685 if (v) 660 if (v)
686 { 661 {
687 v->setSelected(box,true); 662 v->setSelected(box,true);
688 } 663 }
664 return true;
689 } 665 }
690 } 666 }
667 return false;
691} 668}
692 669
693void IMAPfolderItem::downloadMails() 670void IMAPfolderItem::downloadMails()
694{ 671{
@@ -696,9 +673,9 @@ void IMAPfolderItem::downloadMails()
696 if (!bl) return; 673 if (!bl) return;
697 bl->downloadMails(folder,imap->getWrapper()); 674 bl->downloadMails(folder,imap->getWrapper());
698} 675}
699 676
700void IMAPfolderItem::contextMenuSelected(int id) 677bool IMAPfolderItem::contextMenuSelected(int id)
701{ 678{
702 odebug << "Selected id: " << id << "" << oendl; 679 odebug << "Selected id: " << id << "" << oendl;
703 AccountView * view = (AccountView*)listView(); 680 AccountView * view = (AccountView*)listView();
704 switch(id) 681 switch(id)
@@ -715,17 +692,18 @@ void IMAPfolderItem::contextMenuSelected(int id)
715 } 692 }
716 break; 693 break;
717 case FOLDER_MENU_DELETE_FOLDER: 694 case FOLDER_MENU_DELETE_FOLDER:
718 if (folder->getDisplayName().lower()!="inbox") { 695 if (folder->getDisplayName().lower()!="inbox") {
719 deleteFolder(); 696 return deleteFolder();
720 } 697 }
721 break; 698 break;
722 case FOLDER_MENU_MOVE_MAILS: 699 case FOLDER_MENU_MOVE_MAILS:
723 downloadMails(); 700 downloadMails();
724 break; 701 break;
725 default: 702 default:
726 break; 703 break;
727 } 704 }
705 return false;
728} 706}
729 707
730/** 708/**
731 * MH Account stuff 709 * MH Account stuff
@@ -811,19 +789,23 @@ RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
811 odebug << "MH fetchBody" << oendl; 789 odebug << "MH fetchBody" << oendl;
812 return wrapper->fetchBody( mail ); 790 return wrapper->fetchBody( mail );
813} 791}
814 792
815QPopupMenu * MHviewItem::getContextMenu() 793QMap<int,QString> MHviewItem::serverMenu()
816{ 794{
817 QPopupMenu *m = new QPopupMenu(0); 795 QMap<int,QString> e;
818 if (m) 796 e[SERVER_MENU_REFRESH_FOLDER]=QObject::tr("Refresh folder list",contextName);
819 { 797 return e;
820 m->insertItem(QObject::tr("Refresh folder list",contextName),SERVER_MENU_REFRESH_FOLDER); 798}
821 m->insertItem(QObject::tr("Create new folder",contextName),FOLDER_MENU_NEW_SUBFOLDER); 799
822 m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS); 800QMap<int,QString> MHviewItem::folderMenu()
823 m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS); 801{
824 } 802 QMap<int,QString> e;
825 return m; 803 e[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
804 e[FOLDER_MENU_NEW_SUBFOLDER]=QObject::tr("Create new folder",contextName);
805 e[FOLDER_MENU_DELETE_ALL_MAILS]=QObject::tr("Delete all mails",contextName);
806 e[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Move/Copie all mails",contextName);
807 return e;
826} 808}
827 809
828void MHviewItem::createFolder() 810void MHviewItem::createFolder()
829{ 811{
@@ -849,9 +831,9 @@ QStringList MHviewItem::subFolders()
849{ 831{
850 return currentFolders; 832 return currentFolders;
851} 833}
852 834
853void MHviewItem::contextMenuSelected(int which) 835bool MHviewItem::contextMenuSelected(int which)
854{ 836{
855 AccountView*view = 0; 837 AccountView*view = 0;
856 838
857 switch (which) 839 switch (which)
@@ -874,8 +856,9 @@ void MHviewItem::contextMenuSelected(int which)
874 break; 856 break;
875 default: 857 default:
876 break; 858 break;
877 } 859 }
860 return false;
878} 861}
879 862
880MHfolderItem::~MHfolderItem() 863MHfolderItem::~MHfolderItem()
881{} 864{}
@@ -937,9 +920,9 @@ RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail)
937{ 920{
938 return mbox->getWrapper()->fetchBody(aMail); 921 return mbox->getWrapper()->fetchBody(aMail);
939} 922}
940 923
941void MHfolderItem::deleteFolder() 924bool MHfolderItem::deleteFolder()
942{ 925{
943 int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName), 926 int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
944 QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()), 927 QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
945 QObject::tr("Yes",contextName), 928 QObject::tr("Yes",contextName),
@@ -957,24 +940,23 @@ void MHfolderItem::deleteFolder()
957 if (v) 940 if (v)
958 { 941 {
959 v->setSelected(box,true); 942 v->setSelected(box,true);
960 } 943 }
944 return true;
961 } 945 }
962 } 946 }
947 return false;
963} 948}
964 949
965QPopupMenu * MHfolderItem::getContextMenu() 950QMap<int,QString> MHfolderItem::folderMenu()
966{ 951{
967 QPopupMenu *m = new QPopupMenu(0); 952 QMap<int,QString> e;
968 if (m) 953 e[FOLDER_MENU_NEW_SUBFOLDER]=QObject::tr("Create new subfolder",contextName);
969 { 954 e[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
970 m->insertItem(QObject::tr("Create new subfolder",contextName),FOLDER_MENU_NEW_SUBFOLDER); 955 e[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Move/Copie all mails",contextName);
971 m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER); 956 e[FOLDER_MENU_DELETE_ALL_MAILS]=QObject::tr("Delete all mails",contextName);
972 m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS); 957 e[FOLDER_MENU_DELETE_FOLDER]=QObject::tr("Delete folder",contextName);
973 m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS); 958 return e;
974 m->insertItem(QObject::tr("Delete folder",contextName),FOLDER_MENU_DELETE_FOLDER);
975 }
976 return m;
977} 959}
978 960
979void MHfolderItem::downloadMails() 961void MHfolderItem::downloadMails()
980{ 962{
@@ -1003,18 +985,18 @@ void MHfolderItem::createFolder()
1003 } 985 }
1004 } 986 }
1005} 987}
1006 988
1007void MHfolderItem::contextMenuSelected(int which) 989bool MHfolderItem::contextMenuSelected(int which)
1008{ 990{
1009 AccountView*view = 0; 991 AccountView*view = 0;
1010 switch(which) 992 switch(which)
1011 { 993 {
1012 case FOLDER_MENU_DELETE_ALL_MAILS: 994 case FOLDER_MENU_DELETE_ALL_MAILS:
1013 deleteAllMail(mbox->getWrapper(),folder); 995 deleteAllMail(mbox->getWrapper(),folder);
1014 break; 996 break;
1015 case FOLDER_MENU_DELETE_FOLDER: 997 case FOLDER_MENU_DELETE_FOLDER:
1016 deleteFolder(); 998 return deleteFolder();
1017 break; 999 break;
1018 case FOLDER_MENU_MOVE_MAILS: 1000 case FOLDER_MENU_MOVE_MAILS:
1019 downloadMails(); 1001 downloadMails();
1020 break; 1002 break;
@@ -1027,8 +1009,9 @@ void MHfolderItem::contextMenuSelected(int which)
1027 break; 1009 break;
1028 default: 1010 default:
1029 break; 1011 break;
1030 } 1012 }
1013 return false;
1031} 1014}
1032 1015
1033bool MHfolderItem::isDraftfolder() 1016bool MHfolderItem::isDraftfolder()
1034{ 1017{
@@ -1149,4 +1132,33 @@ AccountViewItem*AccountViewItem::findSubItem(const QString&path,AccountViewItem*
1149bool AccountViewItem::isDraftfolder() 1132bool AccountViewItem::isDraftfolder()
1150{ 1133{
1151 return false; 1134 return false;
1152} 1135}
1136
1137QMap<int,QString> AccountViewItem::serverMenu()
1138{
1139 return QMap<int,QString>();
1140}
1141
1142QMap<int,QString> AccountViewItem::folderMenu()
1143{
1144 return QMap<int,QString>();
1145}
1146
1147QPopupMenu * AccountViewItem::getContextMenu()
1148{
1149 QPopupMenu *m = new QPopupMenu(0);
1150 if (m)
1151 {
1152 QMap<int,QString> entries;
1153 entries = folderMenu();
1154 QMap<int,QString>::Iterator it;
1155 for (it=entries.begin();it!=entries.end();++it) {
1156 m->insertItem(it.data(),it.key());
1157 }
1158 entries = serverMenu();
1159 for (it=entries.begin();it!=entries.end();++it) {
1160 m->insertItem(it.data(),it.key());
1161 }
1162 }
1163 return m;
1164}
diff --git a/noncore/net/mail/accountitem.h b/noncore/net/mail/accountitem.h
index b2c50a1..6518899 100644
--- a/noncore/net/mail/accountitem.h
+++ b/noncore/net/mail/accountitem.h
@@ -1,10 +1,12 @@
1#ifndef __ACCOUNT_ITEM 1#ifndef __ACCOUNT_ITEM
2#define __ACCOUNT_ITEM 2#define __ACCOUNT_ITEM
3 3
4#include <opie2/osmartpointer.h>
5
4#include <qlistview.h> 6#include <qlistview.h>
5#include <qlist.h> 7#include <qlist.h>
6#include <opie2/osmartpointer.h> 8#include <qmap.h>
7 9
8class POP3wrapper; 10class POP3wrapper;
9class RecMail; 11class RecMail;
10class RecBody; 12class RecBody;
@@ -30,18 +32,20 @@ public:
30 32
31 virtual ~AccountViewItem(); 33 virtual ~AccountViewItem();
32 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0; 34 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0;
33 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0; 35 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0;
34 virtual QPopupMenu * getContextMenu(){return 0;}; 36 virtual QPopupMenu * getContextMenu();
35 virtual void contextMenuSelected(int){} 37 virtual bool contextMenuSelected(int){return false;}
36 virtual AccountView*accountView(); 38 virtual AccountView*accountView();
37 virtual bool matchName(const QString&name)const; 39 virtual bool matchName(const QString&name)const;
38 virtual bool isDraftfolder(); 40 virtual bool isDraftfolder();
39 /* 1 - server 41 /* 1 - server
40 * 2 - folder 42 * 2 - folder
41 * 3 - beides 43 * 3 - both
42 */ 44 */
43 virtual int isServer()const=0; 45 virtual int isServer()const=0;
46 virtual QMap<int,QString> serverMenu();
47 virtual QMap<int,QString> folderMenu();
44 48
45protected: 49protected:
46 AccountViewItem*findSubItem(const QString&path,AccountViewItem*start=0); 50 AccountViewItem*findSubItem(const QString&path,AccountViewItem*start=0);
47 virtual void init(); 51 virtual void init();
@@ -60,11 +64,11 @@ public:
60 virtual ~POP3viewItem(); 64 virtual ~POP3viewItem();
61 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); 65 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
62 virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); 66 virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
63 AbstractMail *getWrapper(); 67 AbstractMail *getWrapper();
64 virtual QPopupMenu * getContextMenu(); 68 virtual bool contextMenuSelected(int);
65 virtual void contextMenuSelected(int);
66 virtual int isServer()const{return 1;} 69 virtual int isServer()const{return 1;}
70 virtual QMap<int,QString> serverMenu();
67 71
68protected: 72protected:
69 POP3account *account; 73 POP3account *account;
70 virtual void refresh(); 74 virtual void refresh();
@@ -80,11 +84,11 @@ public:
80 POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after ); 84 POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after );
81 virtual ~POP3folderItem(); 85 virtual ~POP3folderItem();
82 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); 86 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
83 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); 87 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
84 virtual QPopupMenu * getContextMenu(); 88 virtual bool contextMenuSelected(int);
85 virtual void contextMenuSelected(int);
86 virtual int isServer()const{return 2;} 89 virtual int isServer()const{return 2;}
90 virtual QMap<int,QString> folderMenu();
87 91
88protected: 92protected:
89 void downloadMails(); 93 void downloadMails();
90 POP3viewItem *pop3; 94 POP3viewItem *pop3;
@@ -99,11 +103,11 @@ public:
99 virtual ~NNTPviewItem(); 103 virtual ~NNTPviewItem();
100 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); 104 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
101 virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); 105 virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
102 AbstractMail *getWrapper(); 106 AbstractMail *getWrapper();
103 virtual QPopupMenu * getContextMenu(); 107 virtual bool contextMenuSelected(int);
104 virtual void contextMenuSelected(int);
105 virtual int isServer()const{return 1;} 108 virtual int isServer()const{return 1;}
109 virtual QMap<int,QString> serverMenu();
106 110
107protected: 111protected:
108 NNTPaccount *account; 112 NNTPaccount *account;
109 virtual void refresh(); 113 virtual void refresh();
@@ -120,12 +124,11 @@ public:
120 NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after ); 124 NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after );
121 virtual ~NNTPfolderItem(); 125 virtual ~NNTPfolderItem();
122 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); 126 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
123 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); 127 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
124 virtual QPopupMenu * getContextMenu(); 128 virtual bool contextMenuSelected(int);
125 virtual void contextMenuSelected(int);
126 virtual int isServer()const{return 2;} 129 virtual int isServer()const{return 2;}
127 130 virtual QMap<int,QString> folderMenu();
128protected: 131protected:
129 void downloadMails(); 132 void downloadMails();
130 NNTPviewItem *nntp; 133 NNTPviewItem *nntp;
131}; 134};
@@ -140,14 +143,14 @@ public:
140 virtual ~IMAPviewItem(); 143 virtual ~IMAPviewItem();
141 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); 144 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
142 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); 145 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
143 AbstractMail *getWrapper(); 146 AbstractMail *getWrapper();
144 virtual QPopupMenu * getContextMenu(); 147 virtual bool contextMenuSelected(int);
145 virtual void contextMenuSelected(int);
146 const QStringList&subFolders(); 148 const QStringList&subFolders();
147 virtual void refreshFolders(bool force=false); 149 virtual void refreshFolders(bool force=false);
148 virtual int isServer()const{return 1;} 150 virtual int isServer()const{return 1;}
149 bool offline(); 151 bool offline();
152 virtual QMap<int,QString> serverMenu();
150 153
151protected: 154protected:
152 virtual void createNewFolder(); 155 virtual void createNewFolder();
153 IMAPaccount *account; 156 IMAPaccount *account;
@@ -163,15 +166,15 @@ public:
163 IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master ); 166 IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master );
164 virtual ~IMAPfolderItem(); 167 virtual ~IMAPfolderItem();
165 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); 168 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
166 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); 169 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
167 virtual QPopupMenu * getContextMenu(); 170 virtual bool contextMenuSelected(int);
168 virtual void contextMenuSelected(int);
169 virtual const QString& Delemiter()const; 171 virtual const QString& Delemiter()const;
170 virtual int isServer()const{return 2;} 172 virtual int isServer()const{return 2;}
173 virtual QMap<int,QString> folderMenu();
171protected: 174protected:
172 virtual void createNewFolder(); 175 virtual void createNewFolder();
173 virtual void deleteFolder(); 176 virtual bool deleteFolder();
174 virtual void downloadMails(); 177 virtual void downloadMails();
175 IMAPviewItem *imap; 178 IMAPviewItem *imap;
176}; 179};
177 180
@@ -184,13 +187,14 @@ public:
184 virtual ~MHviewItem(); 187 virtual ~MHviewItem();
185 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); 188 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
186 virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); 189 virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
187 AbstractMail *getWrapper(); 190 AbstractMail *getWrapper();
188 virtual QPopupMenu * getContextMenu(); 191 virtual bool contextMenuSelected(int);
189 virtual void contextMenuSelected(int);
190 QStringList subFolders(); 192 QStringList subFolders();
191 virtual void refresh(bool force=false); 193 virtual void refresh(bool force=false);
192 virtual int isServer()const{return 3;} 194 virtual int isServer()const{return 3;}
195 virtual QMap<int,QString> serverMenu();
196 virtual QMap<int,QString> folderMenu();
193 197
194protected: 198protected:
195 void downloadMails(); 199 void downloadMails();
196 virtual void createFolder(); 200 virtual void createFolder();
@@ -207,18 +211,18 @@ public:
207 MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master); 211 MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master);
208 virtual ~MHfolderItem(); 212 virtual ~MHfolderItem();
209 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); 213 virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
210 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&); 214 virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
211 virtual QPopupMenu * getContextMenu(); 215 virtual bool contextMenuSelected(int);
212 virtual void contextMenuSelected(int);
213 virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const; 216 virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const;
214 virtual bool isDraftfolder(); 217 virtual bool isDraftfolder();
215 virtual int isServer()const{return 2;} 218 virtual int isServer()const{return 2;}
219 virtual QMap<int,QString> folderMenu();
216 220
217protected: 221protected:
218 void downloadMails(); 222 void downloadMails();
219 virtual void createFolder(); 223 virtual void createFolder();
220 virtual void deleteFolder(); 224 virtual bool deleteFolder();
221 void initName(); 225 void initName();
222 MHviewItem *mbox; 226 MHviewItem *mbox;
223}; 227};
224 228
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index faa42c3..1183704 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -40,26 +40,45 @@ AccountView::~AccountView()
40} 40}
41 41
42void AccountView::slotSelectionChanged(QListViewItem*item) 42void AccountView::slotSelectionChanged(QListViewItem*item)
43{ 43{
44 odebug << "AccountView: Selection changed" << oendl;
45 if (!item) { 44 if (!item) {
46 emit serverSelected(0); 45 emit serverSelected(0);
47 return; 46 return;
48 } 47 }
49 AccountViewItem *view = static_cast<AccountViewItem *>(item); 48 AccountViewItem *view = static_cast<AccountViewItem *>(item);
50
51 emit serverSelected(view->isServer()); 49 emit serverSelected(view->isServer());
52} 50}
53 51
52QMap<int,QString> AccountView::currentServerMenu()const
53{
54 QMap<int,QString> smap;
55 AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
56 if (!view)return smap;
57 smap = view->serverMenu();
58 return smap;
59}
60
61QMap<int,QString> AccountView::currentFolderMenu()const
62{
63 QMap<int,QString> fmap;
64 AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
65 if (!view)return fmap;
66 fmap = view->folderMenu();
67 return fmap;
68}
69
54void AccountView::slotContextMenu(int id) 70void AccountView::slotContextMenu(int id)
55{ 71{
56 AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); 72 AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
57 if (!view) return; 73 if (!view) return;
58 view->contextMenuSelected(id); 74 bool del = view->contextMenuSelected(id);
75 if (!del && view->isServer()!=2) {
76 emit refreshMenues(view->isServer());
77 }
59} 78}
60 79
61void AccountView::slotRightButton(int button, QListViewItem * item,const QPoint&,int) 80void AccountView::slotRightButton(int, QListViewItem * item,const QPoint&,int)
62{ 81{
63 m_rightPressed = true; 82 m_rightPressed = true;
64 if (!item) return; 83 if (!item) return;
65 AccountViewItem *view = static_cast<AccountViewItem *>(item); 84 AccountViewItem *view = static_cast<AccountViewItem *>(item);
@@ -70,9 +89,9 @@ void AccountView::slotRightButton(int button, QListViewItem * item,const QPoint&
70 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); 89 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
71 delete m; 90 delete m;
72} 91}
73 92
74void AccountView::slotLeftButton(int button, QListViewItem * item,const QPoint&,int) 93void AccountView::slotLeftButton(int, QListViewItem *,const QPoint&,int)
75{ 94{
76 m_rightPressed = false; 95 m_rightPressed = false;
77} 96}
78 97
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index ae24dce..5c4b559 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -1,11 +1,12 @@
1#ifndef ACCOUNTVIEW_H 1#ifndef ACCOUNTVIEW_H
2#define ACCOUNTVIEW_H 2#define ACCOUNTVIEW_H
3 3
4#include <libmailwrapper/mailtypes.h>
5#include <opie2/osmartpointer.h>
4#include <qlistview.h> 6#include <qlistview.h>
5#include <qlist.h> 7#include <qlist.h>
6#include <opie2/osmartpointer.h> 8#include <qmap.h>
7#include <libmailwrapper/mailtypes.h>
8 9
9class Selectstore; 10class Selectstore;
10class Folder; 11class Folder;
11class AbstractMail; 12class AbstractMail;
@@ -23,8 +24,10 @@ public:
23 virtual void populate( QList<Account> list ); 24 virtual void populate( QList<Account> list );
24 virtual RecBodyP fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail); 25 virtual RecBodyP fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail);
25 virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper); 26 virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
26 virtual bool currentisDraft(); 27 virtual bool currentisDraft();
28 QMap<int,QString> currentServerMenu()const;
29 QMap<int,QString> currentFolderMenu()const;
27 30
28public slots: 31public slots:
29 virtual void refreshAll(); 32 virtual void refreshAll();
30 virtual void refresh(QListViewItem *item); 33 virtual void refresh(QListViewItem *item);
@@ -35,8 +38,9 @@ public slots:
35 38
36signals: 39signals:
37 void refreshMailview(const QValueList<RecMailP>& ); 40 void refreshMailview(const QValueList<RecMailP>& );
38 void serverSelected(int); 41 void serverSelected(int);
42 void refreshMenues(int);
39 43
40protected: 44protected:
41 QListViewItem* m_currentItem; 45 QListViewItem* m_currentItem;
42 QValueList<IMAPviewItem*> imapAccounts; 46 QValueList<IMAPviewItem*> imapAccounts;
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 81c8fee..3689352 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -20,35 +20,40 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
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
25 menuBar = new QMenuBar( toolBar ); 24 menuBar = new QMenuBar( toolBar );
26 25
27 mailMenu = new QPopupMenu( menuBar ); 26 mailMenu = new QPopupMenu( menuBar );
28 menuBar->insertItem( tr( "Mail" ), mailMenu ); 27 menuBar->insertItem( tr( "Mail" ), mailMenu );
29 28
30 settingsMenu = new QPopupMenu( menuBar ); 29 settingsMenu = new QPopupMenu( menuBar );
31 menuBar->insertItem( tr( "Settings" ), settingsMenu ); 30 menuBar->insertItem( tr( "Settings" ), settingsMenu );
32 31
33 serverMenu = new QPopupMenu( menuBar ); 32 if (QApplication::desktop()->width()<330) {
34 m_ServerMenuId = menuBar->insertItem( tr( "Server" ), serverMenu ); 33 serverMenu = new QPopupMenu( mailMenu );
34 folderMenu = new QPopupMenu( mailMenu );
35 m_ServerMenuId = mailMenu->insertItem( tr( "Server" ), serverMenu );
36 m_FolderMenuId = mailMenu->insertItem( tr( "Folder" ), folderMenu );
37 } else {
38 serverMenu = new QPopupMenu( menuBar );
39 folderMenu = new QPopupMenu( menuBar );
40 m_FolderMenuId = menuBar->insertItem( tr( "Folder" ), folderMenu );
41 m_ServerMenuId = menuBar->insertItem( tr( "Server" ), serverMenu );
42 }
35 serverMenu->insertItem(tr("Disconnect"),SERVER_MENU_DISCONNECT); 43 serverMenu->insertItem(tr("Disconnect"),SERVER_MENU_DISCONNECT);
36 serverMenu->insertItem(tr("Set on/offline"),SERVER_MENU_OFFLINE); 44 serverMenu->insertItem(tr("Set on/offline"),SERVER_MENU_OFFLINE);
37 serverMenu->insertSeparator(); 45 serverMenu->insertSeparator();
38 serverMenu->insertItem(tr("Refresh folder list"),SERVER_MENU_REFRESH_FOLDER); 46 serverMenu->insertItem(tr("Refresh folder list"),SERVER_MENU_REFRESH_FOLDER);
39 serverMenu->insertItem(tr("Create new folder"),SERVER_MENU_CREATE_FOLDER); 47 serverMenu->insertItem(tr("Create new folder"),SERVER_MENU_CREATE_FOLDER);
40 serverMenu->insertSeparator(); 48 serverMenu->insertSeparator();
41 serverMenu->insertItem(tr("(Un-)Subscribe groups"),SERVER_MENU_SUBSCRIBE); 49 serverMenu->insertItem(tr("(Un-)Subscribe groups"),SERVER_MENU_SUBSCRIBE);
42 50
43 folderMenu = new QPopupMenu( menuBar );
44 m_FolderMenuId = menuBar->insertItem( tr( "Folder" ), folderMenu );
45 folderMenu->insertItem(tr("Refresh headerlist"),FOLDER_MENU_REFRESH_HEADER); 51 folderMenu->insertItem(tr("Refresh headerlist"),FOLDER_MENU_REFRESH_HEADER);
46 folderMenu->insertItem(tr("Delete all mails"),FOLDER_MENU_DELETE_ALL_MAILS); 52 folderMenu->insertItem(tr("Delete all mails"),FOLDER_MENU_DELETE_ALL_MAILS);
47 folderMenu->insertItem(tr("New subfolder"),FOLDER_MENU_NEW_SUBFOLDER); 53 folderMenu->insertItem(tr("New subfolder"),FOLDER_MENU_NEW_SUBFOLDER);
48 folderMenu->insertItem(tr("Delete folder"),FOLDER_MENU_DELETE_FOLDER); 54 folderMenu->insertItem(tr("Delete folder"),FOLDER_MENU_DELETE_FOLDER);
49 folderMenu->insertItem(tr("Move/Copie all mails"),FOLDER_MENU_MOVE_MAILS); 55 folderMenu->insertItem(tr("Move/Copie all mails"),FOLDER_MENU_MOVE_MAILS);
50
51 menuBar->setItemEnabled(m_ServerMenuId,false); 56 menuBar->setItemEnabled(m_ServerMenuId,false);
52 menuBar->setItemEnabled(m_FolderMenuId,false); 57 menuBar->setItemEnabled(m_FolderMenuId,false);
53 58
54 addToolBar( toolBar ); 59 addToolBar( toolBar );
@@ -172,13 +177,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
172MainWindow::~MainWindow() 177MainWindow::~MainWindow()
173{ 178{
174} 179}
175 180
176void MainWindow::serverSelected(int m_isFolder) 181void MainWindow::serverSelected(int)
177{ 182{
178 mailView->clear(); 183 odebug << "slotShowFolders not reached" << oendl;
179 menuBar->setItemEnabled(m_ServerMenuId,m_isFolder&1);
180 menuBar->setItemEnabled(m_FolderMenuId,m_isFolder&2);
181} 184}
182 185
183void MainWindow::systemMessage( const QCString& msg, const QByteArray& data ) 186void MainWindow::systemMessage( const QCString& msg, const QByteArray& data )
184{ 187{
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index 409f160..b781d62 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -1,18 +1,18 @@
1#ifndef MAINWINDOW_H 1#ifndef MAINWINDOW_H
2#define MAINWINDOW_H 2#define MAINWINDOW_H
3 3
4#include "accountview.h"
5#include <libmailwrapper/mailtypes.h>
6
7#include <opie2/osmartpointer.h>
8
4#include <qmainwindow.h> 9#include <qmainwindow.h>
5#include <qlistview.h> 10#include <qlistview.h>
6#include <qaction.h> 11#include <qaction.h>
7
8#include <qtoolbar.h> 12#include <qtoolbar.h>
9#include <qmenubar.h> 13#include <qmenubar.h>
10 14#include <qmap.h>
11#include "accountview.h"
12
13#include <libmailwrapper/mailtypes.h>
14#include <opie2/osmartpointer.h>
15 15
16class RecMail; 16class RecMail;
17class QCopChannel; 17class QCopChannel;
18 18
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 7c6d314..1bc81e4 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -107,8 +107,9 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags )
107{ 107{
108 setup_signalblocking(); 108 setup_signalblocking();
109 settings = new Settings(); 109 settings = new Settings();
110 folderView->populate( settings->getAccounts() ); 110 folderView->populate( settings->getAccounts() );
111 connect(folderView,SIGNAL(refreshMenues(int)),this,SLOT(refreshMenu(int)));
111} 112}
112 113
113OpieMail::~OpieMail() 114OpieMail::~OpieMail()
114{ 115{
@@ -385,4 +386,44 @@ void OpieMail::reEditMail()
385 compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); 386 compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
386 compose.slotAdjustColumns(); 387 compose.slotAdjustColumns();
387 QPEApplication::execDialog( &compose ); 388 QPEApplication::execDialog( &compose );
388} 389}
390
391void OpieMail::refreshMenu(int m_isFolder)
392{
393 if (QApplication::desktop()->width()<330) {
394 mailMenu->setItemEnabled(m_ServerMenuId,m_isFolder&1);
395 mailMenu->setItemEnabled(m_FolderMenuId,m_isFolder&2);
396 } else {
397 menuBar->setItemEnabled(m_ServerMenuId,m_isFolder&1);
398 menuBar->setItemEnabled(m_FolderMenuId,m_isFolder&2);
399 }
400
401 QMap<int,QString>::ConstIterator it;
402 QMap<int,QString> server_entries=folderView->currentServerMenu();
403 QMap<int,QString> folder_entries=folderView->currentFolderMenu();
404
405 int id;
406 unsigned int i;
407 for (i=0; i<folderMenu->count();++i) {
408 id = folderMenu->idAt(i);
409 folderMenu->setItemEnabled(id,false);
410 }
411 for (it=folder_entries.begin();it!=folder_entries.end();++it) {
412 folderMenu->changeItem(it.key(),it.data());
413 folderMenu->setItemEnabled(it.key(),true);
414 }
415 for (i=0; i<serverMenu->count();++i) {
416 id = serverMenu->idAt(i);
417 serverMenu->setItemEnabled(id,false);
418 }
419 for (it=server_entries.begin();it!=server_entries.end();++it) {
420 serverMenu->changeItem(it.key(),it.data());
421 serverMenu->setItemEnabled(it.key(),true);
422 }
423}
424
425void OpieMail::serverSelected(int m_isFolder)
426{
427 mailView->clear();
428 refreshMenu(m_isFolder);
429}
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h
index c9d758d..75a0b2d 100644
--- a/noncore/net/mail/opiemail.h
+++ b/noncore/net/mail/opiemail.h
@@ -2,11 +2,13 @@
2#define OPIEMAIL_H 2#define OPIEMAIL_H
3 3
4#include "mainwindow.h" 4#include "mainwindow.h"
5#include <libmailwrapper/settings.h> 5#include <libmailwrapper/settings.h>
6#include <libmailwrapper/mailtypes.h>
6 7
7#include <opie2/osmartpointer.h> 8#include <opie2/osmartpointer.h>
8#include <libmailwrapper/mailtypes.h> 9
10#include <qmap.h>
9 11
10class OpieMail : public MainWindow 12class OpieMail : public MainWindow
11{ 13{
12 Q_OBJECT 14 Q_OBJECT
@@ -20,9 +22,9 @@ public slots:
20 virtual void slotwriteMail(const QString&name,const QString&email); 22 virtual void slotwriteMail(const QString&name,const QString&email);
21 virtual void slotComposeMail(); 23 virtual void slotComposeMail();
22 virtual void appMessage(const QCString &msg, const QByteArray &data); 24 virtual void appMessage(const QCString &msg, const QByteArray &data);
23 void setDocument(const QString&); 25 void setDocument(const QString&);
24 26
25protected slots: 27protected slots:
26 virtual void slotSendQueued(); 28 virtual void slotSendQueued();
27 virtual void slotSearchMails(); 29 virtual void slotSearchMails();
28 virtual void slotEditSettings(); 30 virtual void slotEditSettings();
@@ -34,8 +36,10 @@ protected slots:
34 virtual void refreshMailView(const QValueList<RecMailP>&); 36 virtual void refreshMailView(const QValueList<RecMailP>&);
35 virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int ); 37 virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int );
36 virtual void slotMoveCopyMail(); 38 virtual void slotMoveCopyMail();
37 virtual void reEditMail(); 39 virtual void reEditMail();
40 virtual void serverSelected(int);
41 virtual void refreshMenu(int);
38 42
39protected: 43protected:
40 void setup_signalblocking(); 44 void setup_signalblocking();
41 45