author | alwin <alwin> | 2005-03-12 22:14:03 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-12 22:14:03 (UTC) |
commit | 3cb4c3983ee738f3221ecb4cb154ea1252d69d64 (patch) (unidiff) | |
tree | 13357c046fd618b10546ad6d21992826eab3ad01 | |
parent | 9dddeb81d7db5da718f3f467bb1511b7e72b9caa (diff) | |
download | opie-3cb4c3983ee738f3221ecb4cb154ea1252d69d64.zip opie-3cb4c3983ee738f3221ecb4cb154ea1252d69d64.tar.gz opie-3cb4c3983ee738f3221ecb4cb154ea1252d69d64.tar.bz2 |
rework of the structure of the main menues, them depends now on state of current selected folder/server
on small screens some "Folder" and "Server" menu will get submenus of the menu-item "Mail" cause lack of space on screen - have no other idea.
-rw-r--r-- | noncore/net/mail/accountitem.cpp | 240 | ||||
-rw-r--r-- | noncore/net/mail/accountitem.h | 50 | ||||
-rw-r--r-- | noncore/net/mail/accountview.cpp | 29 | ||||
-rw-r--r-- | noncore/net/mail/accountview.h | 8 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 23 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.h | 12 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 41 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.h | 8 |
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 | |||
@@ -84,20 +84,14 @@ RECBODYP POP3viewItem::fetchBody( const RecMailP &mail ) | |||
84 | } | 84 | } |
85 | 85 | ||
86 | QPopupMenu * POP3viewItem::getContextMenu() | 86 | QMap<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 | ||
@@ -126,5 +120,5 @@ void POP3viewItem::setOnOffline() | |||
126 | } | 120 | } |
127 | 121 | ||
128 | void POP3viewItem::contextMenuSelected(int which) | 122 | bool POP3viewItem::contextMenuSelected(int which) |
129 | { | 123 | { |
130 | switch (which) | 124 | switch (which) |
@@ -137,4 +131,5 @@ void POP3viewItem::contextMenuSelected(int which) | |||
137 | break; | 131 | break; |
138 | } | 132 | } |
133 | return false; | ||
139 | } | 134 | } |
140 | 135 | ||
@@ -168,14 +163,11 @@ RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail) | |||
168 | } | 163 | } |
169 | 164 | ||
170 | QPopupMenu * POP3folderItem::getContextMenu() | 165 | QMap<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 | ||
@@ -187,5 +179,5 @@ void POP3folderItem::downloadMails() | |||
187 | } | 179 | } |
188 | 180 | ||
189 | void POP3folderItem::contextMenuSelected(int which) | 181 | bool POP3folderItem::contextMenuSelected(int which) |
190 | { | 182 | { |
191 | AccountView * view = (AccountView*)listView(); | 183 | AccountView * view = (AccountView*)listView(); |
@@ -206,4 +198,5 @@ void POP3folderItem::contextMenuSelected(int which) | |||
206 | break; | 198 | break; |
207 | } | 199 | } |
200 | return false; | ||
208 | } | 201 | } |
209 | 202 | ||
@@ -275,21 +268,16 @@ RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail ) | |||
275 | } | 268 | } |
276 | 269 | ||
277 | QPopupMenu * NNTPviewItem::getContextMenu() | 270 | QMap<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 | ||
@@ -327,5 +315,5 @@ void NNTPviewItem::setOnOffline() | |||
327 | } | 315 | } |
328 | 316 | ||
329 | void NNTPviewItem::contextMenuSelected(int which) | 317 | bool NNTPviewItem::contextMenuSelected(int which) |
330 | { | 318 | { |
331 | switch (which) | 319 | switch (which) |
@@ -341,4 +329,5 @@ void NNTPviewItem::contextMenuSelected(int which) | |||
341 | break; | 329 | break; |
342 | } | 330 | } |
331 | return false; | ||
343 | } | 332 | } |
344 | 333 | ||
@@ -372,13 +361,10 @@ RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail) | |||
372 | } | 361 | } |
373 | 362 | ||
374 | QPopupMenu * NNTPfolderItem::getContextMenu() | 363 | QMap<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 | ||
@@ -390,5 +376,5 @@ void NNTPfolderItem::downloadMails() | |||
390 | } | 376 | } |
391 | 377 | ||
392 | void NNTPfolderItem::contextMenuSelected(int which) | 378 | bool NNTPfolderItem::contextMenuSelected(int which) |
393 | { | 379 | { |
394 | AccountView * view = (AccountView*)listView(); | 380 | AccountView * view = (AccountView*)listView(); |
@@ -406,4 +392,5 @@ void NNTPfolderItem::contextMenuSelected(int which) | |||
406 | break; | 392 | break; |
407 | } | 393 | } |
394 | return false; | ||
408 | } | 395 | } |
409 | 396 | ||
@@ -492,23 +479,16 @@ void IMAPviewItem::refreshFolders(bool force) | |||
492 | } | 479 | } |
493 | 480 | ||
494 | QPopupMenu * IMAPviewItem::getContextMenu() | 481 | QMap<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 | ||
@@ -533,5 +513,5 @@ void IMAPviewItem::createNewFolder() | |||
533 | } | 513 | } |
534 | 514 | ||
535 | void IMAPviewItem::contextMenuSelected(int id) | 515 | bool IMAPviewItem::contextMenuSelected(int id) |
536 | { | 516 | { |
537 | odebug << "Id selected: " << id << "" << oendl; | 517 | odebug << "Id selected: " << id << "" << oendl; |
@@ -562,4 +542,5 @@ void IMAPviewItem::contextMenuSelected(int id) | |||
562 | break; | 542 | break; |
563 | } | 543 | } |
544 | return false; | ||
564 | } | 545 | } |
565 | 546 | ||
@@ -629,25 +610,19 @@ RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail) | |||
629 | } | 610 | } |
630 | 611 | ||
631 | QPopupMenu * IMAPfolderItem::getContextMenu() | 612 | QMap<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 | ||
@@ -667,5 +642,5 @@ void IMAPfolderItem::createNewFolder() | |||
667 | } | 642 | } |
668 | 643 | ||
669 | void IMAPfolderItem::deleteFolder() | 644 | bool 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), |
@@ -687,6 +662,8 @@ void IMAPfolderItem::deleteFolder() | |||
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 | ||
@@ -698,5 +675,5 @@ void IMAPfolderItem::downloadMails() | |||
698 | } | 675 | } |
699 | 676 | ||
700 | void IMAPfolderItem::contextMenuSelected(int id) | 677 | bool IMAPfolderItem::contextMenuSelected(int id) |
701 | { | 678 | { |
702 | odebug << "Selected id: " << id << "" << oendl; | 679 | odebug << "Selected id: " << id << "" << oendl; |
@@ -717,5 +694,5 @@ void IMAPfolderItem::contextMenuSelected(int id) | |||
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; |
@@ -726,4 +703,5 @@ void IMAPfolderItem::contextMenuSelected(int id) | |||
726 | break; | 703 | break; |
727 | } | 704 | } |
705 | return false; | ||
728 | } | 706 | } |
729 | 707 | ||
@@ -813,15 +791,19 @@ RECBODYP MHviewItem::fetchBody( const RecMailP &mail ) | |||
813 | } | 791 | } |
814 | 792 | ||
815 | QPopupMenu * MHviewItem::getContextMenu() | 793 | QMap<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); | 800 | QMap<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 | ||
@@ -851,5 +833,5 @@ QStringList MHviewItem::subFolders() | |||
851 | } | 833 | } |
852 | 834 | ||
853 | void MHviewItem::contextMenuSelected(int which) | 835 | bool MHviewItem::contextMenuSelected(int which) |
854 | { | 836 | { |
855 | AccountView*view = 0; | 837 | AccountView*view = 0; |
@@ -876,4 +858,5 @@ void MHviewItem::contextMenuSelected(int which) | |||
876 | break; | 858 | break; |
877 | } | 859 | } |
860 | return false; | ||
878 | } | 861 | } |
879 | 862 | ||
@@ -939,5 +922,5 @@ RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail) | |||
939 | } | 922 | } |
940 | 923 | ||
941 | void MHfolderItem::deleteFolder() | 924 | bool 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), |
@@ -959,20 +942,19 @@ void MHfolderItem::deleteFolder() | |||
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 | ||
965 | QPopupMenu * MHfolderItem::getContextMenu() | 950 | QMap<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 | ||
@@ -1005,5 +987,5 @@ void MHfolderItem::createFolder() | |||
1005 | } | 987 | } |
1006 | 988 | ||
1007 | void MHfolderItem::contextMenuSelected(int which) | 989 | bool MHfolderItem::contextMenuSelected(int which) |
1008 | { | 990 | { |
1009 | AccountView*view = 0; | 991 | AccountView*view = 0; |
@@ -1014,5 +996,5 @@ void MHfolderItem::contextMenuSelected(int which) | |||
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: |
@@ -1029,4 +1011,5 @@ void MHfolderItem::contextMenuSelected(int which) | |||
1029 | break; | 1011 | break; |
1030 | } | 1012 | } |
1013 | return false; | ||
1031 | } | 1014 | } |
1032 | 1015 | ||
@@ -1151,2 +1134,31 @@ bool AccountViewItem::isDraftfolder() | |||
1151 | return false; | 1134 | return false; |
1152 | } | 1135 | } |
1136 | |||
1137 | QMap<int,QString> AccountViewItem::serverMenu() | ||
1138 | { | ||
1139 | return QMap<int,QString>(); | ||
1140 | } | ||
1141 | |||
1142 | QMap<int,QString> AccountViewItem::folderMenu() | ||
1143 | { | ||
1144 | return QMap<int,QString>(); | ||
1145 | } | ||
1146 | |||
1147 | QPopupMenu * 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 | |||
@@ -2,7 +2,9 @@ | |||
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 | ||
8 | class POP3wrapper; | 10 | class POP3wrapper; |
@@ -32,6 +34,6 @@ public: | |||
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; |
@@ -39,7 +41,9 @@ public: | |||
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 | ||
45 | protected: | 49 | protected: |
@@ -62,7 +66,7 @@ public: | |||
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 | ||
68 | protected: | 72 | protected: |
@@ -82,7 +86,7 @@ public: | |||
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 | ||
88 | protected: | 92 | protected: |
@@ -101,7 +105,7 @@ public: | |||
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 | ||
107 | protected: | 111 | protected: |
@@ -122,8 +126,7 @@ public: | |||
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(); | |
128 | protected: | 131 | protected: |
129 | void downloadMails(); | 132 | void downloadMails(); |
@@ -142,10 +145,10 @@ public: | |||
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 | ||
151 | protected: | 154 | protected: |
@@ -165,11 +168,11 @@ public: | |||
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(); | ||
171 | protected: | 174 | protected: |
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; |
@@ -186,9 +189,10 @@ public: | |||
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 | ||
194 | protected: | 198 | protected: |
@@ -209,14 +213,14 @@ public: | |||
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 | ||
217 | protected: | 221 | protected: |
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; |
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 | |||
@@ -42,5 +42,4 @@ AccountView::~AccountView() | |||
42 | void AccountView::slotSelectionChanged(QListViewItem*item) | 42 | void 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); |
@@ -48,16 +47,36 @@ void AccountView::slotSelectionChanged(QListViewItem*item) | |||
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 | ||
52 | QMap<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 | |||
61 | QMap<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 | |||
54 | void AccountView::slotContextMenu(int id) | 70 | void 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 | ||
61 | void AccountView::slotRightButton(int button, QListViewItem * item,const QPoint&,int) | 80 | void AccountView::slotRightButton(int, QListViewItem * item,const QPoint&,int) |
62 | { | 81 | { |
63 | m_rightPressed = true; | 82 | m_rightPressed = true; |
@@ -72,5 +91,5 @@ void AccountView::slotRightButton(int button, QListViewItem * item,const QPoint& | |||
72 | } | 91 | } |
73 | 92 | ||
74 | void AccountView::slotLeftButton(int button, QListViewItem * item,const QPoint&,int) | 93 | void AccountView::slotLeftButton(int, QListViewItem *,const QPoint&,int) |
75 | { | 94 | { |
76 | m_rightPressed = false; | 95 | m_rightPressed = false; |
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 | |||
@@ -2,8 +2,9 @@ | |||
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 | ||
9 | class Selectstore; | 10 | class Selectstore; |
@@ -25,4 +26,6 @@ public: | |||
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 | ||
28 | public slots: | 31 | public slots: |
@@ -37,4 +40,5 @@ signals: | |||
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 | ||
40 | protected: | 44 | protected: |
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 | |||
@@ -22,5 +22,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
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 | ||
@@ -31,6 +30,15 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
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); |
@@ -41,6 +49,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
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); |
@@ -48,5 +54,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
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); |
@@ -174,9 +179,7 @@ MainWindow::~MainWindow() | |||
174 | } | 179 | } |
175 | 180 | ||
176 | void MainWindow::serverSelected(int m_isFolder) | 181 | void 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 | ||
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 | |||
@@ -2,15 +2,15 @@ | |||
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 | ||
16 | class RecMail; | 16 | class RecMail; |
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 | |||
@@ -109,4 +109,5 @@ OpieMail::OpieMail( QWidget *parent, const char *name, WFlags ) | |||
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 | ||
@@ -387,2 +388,42 @@ void OpieMail::reEditMail() | |||
387 | QPEApplication::execDialog( &compose ); | 388 | QPEApplication::execDialog( &compose ); |
388 | } | 389 | } |
390 | |||
391 | void 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 | |||
425 | void 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 | |||
@@ -4,7 +4,9 @@ | |||
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 | ||
10 | class OpieMail : public MainWindow | 12 | class OpieMail : public MainWindow |
@@ -22,5 +24,5 @@ public slots: | |||
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 | ||
25 | protected slots: | 27 | protected slots: |
26 | virtual void slotSendQueued(); | 28 | virtual void slotSendQueued(); |
@@ -36,4 +38,6 @@ protected slots: | |||
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 | ||
39 | protected: | 43 | protected: |