Diffstat (limited to 'noncore/unsupported/mail2/mainwindowbase.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp index 24f030f..9ffe6f0 100644 --- a/noncore/unsupported/mail2/mainwindowbase.cpp +++ b/noncore/unsupported/mail2/mainwindowbase.cpp | |||
@@ -1,52 +1,64 @@ | |||
1 | #include <qprogressbar.h> | 1 | #include <qprogressbar.h> |
2 | #include <qtoolbutton.h> | 2 | #include <qtoolbutton.h> |
3 | #include <qpopupmenu.h> | 3 | #include <qpopupmenu.h> |
4 | #include <qaction.h> | 4 | #include <qaction.h> |
5 | #include <qheader.h> | 5 | #include <qheader.h> |
6 | #include <qlabel.h> | 6 | #include <qlabel.h> |
7 | #include <qvbox.h> | 7 | #include <qvbox.h> |
8 | 8 | ||
9 | #include <qpe/qpetoolbar.h> | 9 | #include <qpe/qpetoolbar.h> |
10 | #include <qpe/qpemenubar.h> | ||
10 | #include <qpe/resource.h> | 11 | #include <qpe/resource.h> |
11 | 12 | ||
12 | #include "mainwindowbase.h" | 13 | #include "mainwindowbase.h" |
13 | #include "folderwidget.h" | 14 | #include "folderwidget.h" |
14 | #include "mailtable.h" | 15 | #include "mailtable.h" |
15 | 16 | ||
16 | MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | 17 | MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) |
17 | : QMainWindow(parent, name, fl) | 18 | : QMainWindow(parent, name, fl) |
18 | { | 19 | { |
19 | setCaption(tr("E-Mail")); | 20 | setCaption(tr("E-Mail")); |
20 | setToolBarsMovable(false); | 21 | setToolBarsMovable(false); |
21 | 22 | ||
22 | toolbar = new QPEToolBar(this); | 23 | toolbar = new QPEToolBar(this); |
24 | menubar = new QPEMenuBar( toolbar ); | ||
25 | mailmenu = new QPopupMenu( menubar ); | ||
26 | servermenu = new QPopupMenu( menubar ); | ||
27 | menubar->insertItem( tr( "Mail" ), mailmenu ); | ||
28 | menubar->insertItem( tr( "Servers" ), servermenu ); | ||
29 | |||
23 | addToolBar(toolbar); | 30 | addToolBar(toolbar); |
24 | toolbar->setHorizontalStretchable(true); | 31 | toolbar->setHorizontalStretchable(true); |
25 | 32 | ||
26 | compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); | 33 | compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); |
27 | compose->addTo(toolbar); | 34 | compose->addTo(toolbar); |
35 | compose->addTo(mailmenu); | ||
28 | 36 | ||
29 | sendQueue = new QAction(tr("Send queued mails"), QIconSet(Resource::loadPixmap("mail/sendqueue")), 0, 0, this); | 37 | sendQueue = new QAction(tr("Send queued mails"), QIconSet(Resource::loadPixmap("mail/sendqueue")), 0, 0, this); |
30 | sendQueue->addTo(toolbar); | 38 | sendQueue->addTo(toolbar); |
39 | sendQueue->addTo(mailmenu); | ||
31 | 40 | ||
32 | folders = new QAction(tr("Show/hide folders"), QIconSet(Resource::loadPixmap("mail/folder")), 0, 0, this, 0, true); | 41 | folders = new QAction(tr("Show/hide folders"), QIconSet(Resource::loadPixmap("mail/folder")), 0, 0, this, 0, true); |
33 | folders->addTo(toolbar); | 42 | folders->addTo(toolbar); |
43 | folders->addTo(servermenu); | ||
34 | connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool))); | 44 | connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool))); |
35 | 45 | ||
36 | findmails = new QAction(tr("Search mails"), QIconSet(Resource::loadPixmap("mail/find")), 0, 0, this); | 46 | findmails = new QAction(tr("Search mails"), QIconSet(Resource::loadPixmap("mail/find")), 0, 0, this); |
37 | findmails->addTo(toolbar); | 47 | findmails->addTo(toolbar); |
48 | findmails->addTo(mailmenu); | ||
38 | 49 | ||
39 | configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this); | 50 | configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this); |
40 | configure->addTo(toolbar); | 51 | configure->addTo(toolbar); |
52 | configure->addTo(servermenu); | ||
41 | 53 | ||
42 | QLabel *spacer = new QLabel(toolbar); | 54 | QLabel *spacer = new QLabel(toolbar); |
43 | spacer->setBackgroundMode(QWidget::PaletteButton); | 55 | spacer->setBackgroundMode(QWidget::PaletteButton); |
44 | toolbar->setStretchableWidget(spacer); | 56 | toolbar->setStretchableWidget(spacer); |
45 | 57 | ||
46 | stop = new QAction(tr("Abort"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this); | 58 | stop = new QAction(tr("Abort"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this); |
47 | stop->addTo(toolbar); | 59 | stop->addTo(toolbar); |
48 | 60 | ||
49 | QVBox *view = new QVBox(this); | 61 | QVBox *view = new QVBox(this); |
50 | setCentralWidget(view); | 62 | setCentralWidget(view); |
51 | 63 | ||
52 | folderView = new FolderWidget(view); | 64 | folderView = new FolderWidget(view); |