added menu and fix send queued

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
@@ -9,2 +9,3 @@
 #include <qpe/qpetoolbar.h>
+#include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
@@ -22,2 +23,8 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         toolbar = new QPEToolBar(this);
+  menubar = new QPEMenuBar( toolbar );
+  mailmenu = new QPopupMenu( menubar );
+  servermenu = new QPopupMenu( menubar );
+  menubar->insertItem( tr( "Mail" ), mailmenu );
+  menubar->insertItem( tr( "Servers" ), servermenu );
+
         addToolBar(toolbar);
@@ -27,2 +34,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         compose->addTo(toolbar);
+        compose->addTo(mailmenu);
 
@@ -30,2 +38,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
   sendQueue->addTo(toolbar);
+  sendQueue->addTo(mailmenu);
 
@@ -33,2 +42,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         folders->addTo(toolbar);
+        folders->addTo(servermenu);
         connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool)));
@@ -37,2 +47,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         findmails->addTo(toolbar);
+        findmails->addTo(mailmenu);
 
@@ -40,2 +51,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         configure->addTo(toolbar);
+        configure->addTo(servermenu);