1 files changed, 7 insertions, 13 deletions

diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index c456ae5..6f6ab8e 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -2,65 +2,62 @@
 #include <qpopupmenu.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
 
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
 
+#include "mailstatusbar.h"
 #include "listviewplus.h"
 #include "composerbase.h"
 
 ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
 	setCaption(tr("Compose Message"));
 	setToolBarsMovable(false);
 
 	toolbar = new QPEToolBar(this);
-  menubar = new QPEMenuBar( toolbar );
-  mailmenu = new QPopupMenu( menubar );
-  menubar->insertItem( tr( "Mail" ), mailmenu );
+	menubar = new QPEMenuBar( toolbar );
+	mailmenu = new QPopupMenu( menubar );
+	menubar->insertItem( tr( "Mail" ), mailmenu );
 	addToolBar(toolbar);
 	toolbar->setHorizontalStretchable(true);
 
 	QLabel *spacer = new QLabel(toolbar);
 	spacer->setBackgroundMode(QWidget::PaletteButton);
 	toolbar->setStretchableWidget(spacer);
 
 	sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this);
 	sendmail->addTo(toolbar);
 	sendmail->addTo(mailmenu);
 
 	queuemail = new QAction(tr("Queue the mail"), QIconSet(Resource::loadPixmap("mail/sendall")), 0, 0, this);
 	queuemail->addTo(toolbar);
 	queuemail->addTo(mailmenu);
 
 	attachfile = new QAction(tr("Attach a file"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
 	attachfile->addTo(toolbar);
 	attachfile->addTo(mailmenu);
 	connect(attachfile, SIGNAL(toggled(bool)), SLOT(slotAttachfileChanged(bool)));
 
 	addressbook = new QAction(tr("Addressbook"), QIconSet(Resource::loadPixmap("mail/addbook")), 0, 0, this);
 	addressbook->addTo(toolbar);
 	addressbook->addTo(mailmenu);
 
-	abort = new QAction(tr("Abort sending"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this);
-	abort->addTo(toolbar);
-	abort->addTo(mailmenu);
-
 	QWidget *main = new QWidget(this);
 	setCentralWidget(main);
 
 	QGridLayout *layout = new QGridLayout(main);
 
 	fromBox = new QComboBox(main);
 	fromBox->insertItem(tr("From"), POPUP_FROM_FROM);
 	fromBox->insertItem(tr("Reply"), POPUP_FROM_REPLYTO);
 	layout->addWidget(fromBox, 0, 0);
 
 	connect(fromBox, SIGNAL(activated(int)), SLOT(slotFromMenuChanged(int)));
 
@@ -114,26 +111,26 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	priority->insertItem(tr("High"), POPUP_PRIO_HIGH);
 	priority->setCurrentItem(POPUP_PRIO_NORMAL);
 	priority->hide();
 	subjectLayout->addWidget(priority);
 
 	QVBox *view = new QVBox(main);
 	layout->addMultiCellWidget(view, 3, 3, 0, 1);
 
 	message = new QMultiLineEdit(view);
 	message->setMinimumHeight(30);
 
 	attachWindow = new QMainWindow(view, 0, 0);
-	attachWindow->setMinimumHeight(100);
-	attachWindow->setMaximumHeight(100);
+	attachWindow->setMinimumHeight(80);
+	attachWindow->setMaximumHeight(80);
 	attachWindow->setToolBarsMovable(false);
 	attachWindow->hide();
 
 	attachToolbar = new QPEToolBar(attachWindow);
 	attachToolbar->setVerticalStretchable(true);
 	
 	addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
 	addattach->addTo(attachToolbar);
 
 	delattach = new QAction(tr("Remove Attachement"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
 	delattach->addTo(attachToolbar);
 
@@ -147,28 +144,25 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	attachView->addColumn(tr("Name"), 80);
 	attachView->addColumn(tr("Description"), 110);
 	attachView->setAllColumnsShowFocus(true);
 	attachWindow->setCentralWidget(attachView);
 
 	attachPopup = new QPopupMenu(attachView);
 	attachPopup->insertItem(tr("Rename"), POPUP_ATTACH_RENAME);
 	attachPopup->insertItem(tr("Change Description"), POPUP_ATTACH_DESC);
 	attachPopup->insertSeparator();
 	attachPopup->insertItem(tr("Remove"), POPUP_ATTACH_REMOVE);
 	attachView->setPopup(attachPopup);
 
-	status = new QLabel(view);
-	QFont tmpFont = status->font();
-	tmpFont.setPixelSize(8);
-	status->setFont(tmpFont);
+	status = new MailStatusBar(view);
 }
 
 void ComposerBase::slotAttachfileChanged(bool toggled)
 {
 	if (toggled) {
 		if (attachWindow->isHidden()) attachWindow->show();
 	} else {
 		if (!attachWindow->isHidden()) attachWindow->hide();
 	}
 }
 
 void ComposerBase::slotFromMenuChanged(int id)