summaryrefslogtreecommitdiff
Unidiff
Diffstat (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
@@ -5,4 +5,6 @@
5#include <qvbox.h> 5#include <qvbox.h>
6#include <qpopupmenu.h>
6 7
7#include <qpe/qpetoolbar.h> 8#include <qpe/qpetoolbar.h>
9#include <qpe/qpemenubar.h>
8#include <qpe/resource.h> 10#include <qpe/resource.h>
@@ -19,2 +21,6 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
19 toolbar = new QPEToolBar(this); 21 toolbar = new QPEToolBar(this);
22 menubar = new QPEMenuBar( toolbar );
23 mailmenu = new QPopupMenu( menubar );
24 menubar->insertItem( tr( "Mail" ), mailmenu );
25
20 toolbar->setHorizontalStretchable(true); 26 toolbar->setHorizontalStretchable(true);
@@ -22,4 +28,9 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
22 28
29 QLabel *spacer = new QLabel(toolbar);
30 spacer->setBackgroundMode(QWidget::PaletteButton);
31 toolbar->setStretchableWidget(spacer);
32
23 reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this); 33 reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
24 reply->addTo(toolbar); 34 reply->addTo(toolbar);
35 reply->addTo(mailmenu);
25 36
@@ -27,2 +38,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
27 forward->addTo(toolbar); 38 forward->addTo(toolbar);
39 forward->addTo(mailmenu);
28 40
@@ -30,2 +42,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
30 attachbutton->addTo(toolbar); 42 attachbutton->addTo(toolbar);
43 attachbutton->addTo(mailmenu);
31 connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); 44 connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
@@ -34,6 +47,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
34 deleteMail->addTo(toolbar); 47 deleteMail->addTo(toolbar);
35 48 deleteMail->addTo(mailmenu);
36 QLabel *spacer = new QLabel(toolbar);
37 spacer->setBackgroundMode(QWidget::PaletteButton);
38 toolbar->setStretchableWidget(spacer);
39 49
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
@@ -10,2 +10,4 @@ class QPEToolBar;
10class QTextBrowser; 10class QTextBrowser;
11class QPEMenuBar;
12class QPopupMenu;
11 13
@@ -24,2 +26,4 @@ protected:
24 OpenDiag *openDiag; 26 OpenDiag *openDiag;
27 QPEMenuBar *menubar;
28 QPopupMenu *mailmenu;
25 29