summaryrefslogtreecommitdiff
path: root/noncore/unsupported
Side-by-side diff
Diffstat (limited to 'noncore/unsupported') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/viewmailbase.cpp18
-rw-r--r--noncore/unsupported/mail2/viewmailbase.h4
2 files changed, 18 insertions, 4 deletions
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index b650c88..a02f73a 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -3,8 +3,10 @@
#include <qaction.h>
#include <qlabel.h>
#include <qvbox.h>
+#include <qpopupmenu.h>
#include <qpe/qpetoolbar.h>
+#include <qpe/qpemenubar.h>
#include <qpe/resource.h>
#include "viewmailbase.h"
@@ -17,25 +19,33 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
setToolBarsMovable(false);
toolbar = new QPEToolBar(this);
+ menubar = new QPEMenuBar( toolbar );
+ mailmenu = new QPopupMenu( menubar );
+ menubar->insertItem( tr( "Mail" ), mailmenu );
+
toolbar->setHorizontalStretchable(true);
addToolBar(toolbar);
+ QLabel *spacer = new QLabel(toolbar);
+ spacer->setBackgroundMode(QWidget::PaletteButton);
+ toolbar->setStretchableWidget(spacer);
+
reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
reply->addTo(toolbar);
+ reply->addTo(mailmenu);
forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
forward->addTo(toolbar);
+ forward->addTo(mailmenu);
attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
attachbutton->addTo(toolbar);
+ attachbutton->addTo(mailmenu);
connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
deleteMail->addTo(toolbar);
-
- QLabel *spacer = new QLabel(toolbar);
- spacer->setBackgroundMode(QWidget::PaletteButton);
- toolbar->setStretchableWidget(spacer);
+ deleteMail->addTo(mailmenu);
QVBox *view = new QVBox(this);
setCentralWidget(view);
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index 9ddf2aa..ba82017 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -8,6 +8,8 @@ class OpenDiag;
class QListView;
class QPEToolBar;
class QTextBrowser;
+class QPEMenuBar;
+class QPopupMenu;
class ViewMailBase : public QMainWindow
{
@@ -22,6 +24,8 @@ protected:
QPEToolBar *toolbar;
QTextBrowser *browser;
OpenDiag *openDiag;
+ QPEMenuBar *menubar;
+ QPopupMenu *mailmenu;
protected slots:
void slotChangeAttachview(bool state);