some small fixes

5 files changed, 8 insertions, 41 deletions

diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index ff00a73..c456ae5 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -1,211 +1,211 @@
 #include <qmultilineedit.h>
 #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 "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 );
         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);
 
-        QLabel *spacer = new QLabel(toolbar);
-        spacer->setBackgroundMode(QWidget::PaletteButton);
-        toolbar->setStretchableWidget(spacer);
-
         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)));
 
         QHBoxLayout *fromLayout = new QHBoxLayout();
         layout->addLayout(fromLayout, 0, 1);
 
         from = new QComboBox(main);
         fromLayout->addWidget(from);
 
         replyto = new QLineEdit(main);
         replyto->hide();
         fromLayout->addWidget(replyto);
 
         receiversBox = new QComboBox(main);
         receiversBox->insertItem(tr("To"), POPUP_RECV_TO);
         receiversBox->insertItem(tr("Cc"), POPUP_RECV_CC);
         receiversBox->insertItem(tr("Bcc"), POPUP_RECV_BCC);
         layout->addWidget(receiversBox, 1, 0);
 
         connect(receiversBox, SIGNAL(activated(int)), SLOT(slotReceiverMenuChanged(int)));
 
         QHBoxLayout *receiverLayout = new QHBoxLayout();
         layout->addLayout(receiverLayout, 1, 1);
 
         to = new QLineEdit(main);
         receiverLayout->addWidget(to);
 
         cc = new QLineEdit(main);
         cc->hide();
         receiverLayout->addWidget(cc);
 
         bcc = new QLineEdit(main);
         bcc->hide();
         receiverLayout->addWidget(bcc);
 
         subjectBox = new QComboBox(main);
         subjectBox->insertItem(tr("Subj."), POPUP_SUBJ_SUBJECT);
         subjectBox->insertItem(tr("Prio."), POPUP_SUBJ_PRIORITY);
         layout->addWidget(subjectBox, 2, 0);
         connect(subjectBox, SIGNAL(activated(int)), SLOT(slotSubjectMenuChanged(int)));
 
         QHBoxLayout *subjectLayout = new QHBoxLayout();
         layout->addLayout(subjectLayout, 2, 1);
 
         subject = new QLineEdit(main);
         subjectLayout->addWidget(subject);
 
         priority = new QComboBox(main);
         priority->insertItem(tr("Low"), POPUP_PRIO_LOW);
         priority->insertItem(tr("Normal"), POPUP_PRIO_NORMAL);
         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->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);
 
         QLabel *attachSpacer = new QLabel(attachToolbar);
         attachSpacer->setBackgroundMode(QWidget::PaletteButton);
         attachToolbar->setStretchableWidget(attachSpacer);
 
         attachWindow->addToolBar(attachToolbar, QMainWindow::Left);
 
         attachView = new ListViewPlus(attachWindow);
         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);
 }
 
 void ComposerBase::slotAttachfileChanged(bool toggled)
 {
         if (toggled) {
                 if (attachWindow->isHidden()) attachWindow->show();
         } else {
                 if (!attachWindow->isHidden()) attachWindow->hide();
         }
 }
 
 void ComposerBase::slotFromMenuChanged(int id)
 {
         if (POPUP_FROM_FROM == id) {
                 if (from->isHidden()) from->show();
                 if (!replyto->isHidden()) replyto->hide();
         } else if (POPUP_FROM_REPLYTO == id) {
                 if (!from->isHidden()) from->hide();
                 if (replyto->isHidden()) replyto->show();
         }
 }
 
 void ComposerBase::slotReceiverMenuChanged(int id)
 {
         if (POPUP_RECV_TO == id) {
                 if (to->isHidden()) to->show();
                 if (!cc->isHidden()) cc->hide();
                 if (!bcc->isHidden()) bcc->hide();
         } else if (POPUP_RECV_CC == id) {
                 if (!to->isHidden()) to->hide();
                 if (cc->isHidden()) cc->show();
                 if (!bcc->isHidden()) bcc->hide();
         } else if (POPUP_RECV_BCC == id) {
                 if (!to->isHidden()) to->hide();
                 if (!cc->isHidden()) cc->hide();
                 if (bcc->isHidden()) bcc->show();
         }
 }
 
 void ComposerBase::slotSubjectMenuChanged(int id)
 {
         if (POPUP_SUBJ_SUBJECT == id) {
                 if (subject->isHidden()) subject->show();
                 if (!priority->isHidden()) priority->hide();
         } else if (POPUP_SUBJ_PRIORITY == id) {
                 if (!subject->isHidden()) subject->hide();
                 if (priority->isHidden()) priority->show();
         }
 }
diff --git a/noncore/unsupported/mail2/configdiag.cpp b/noncore/unsupported/mail2/configdiag.cpp
index b89b937..e2b2f13 100644
--- a/noncore/unsupported/mail2/configdiag.cpp
+++ b/noncore/unsupported/mail2/configdiag.cpp
@@ -1,145 +1,125 @@
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qgroupbox.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlabel.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include "accounteditor.h"
-#include "zaurusstuff.h"
 #include "configdiag.h"
 #include "defines.h"
 
 AccountListItem::AccountListItem(QListView *parent, Account &account)
         : QListViewItem(parent), _account(account)
 {
         QString displayText;
         if (!_account.realName().isEmpty() && !_account.email().isEmpty())
                 setText(0, _account.realName() + " <" + _account.email() + ">");
         else if (_account.realName().isEmpty() && !_account.email().isEmpty())
                 setText(0, _account.email());
         else if (!_account.realName().isEmpty() && _account.email().isEmpty())
                 setText(0, _account.realName());
         else 
                 setText(0, QObject::tr("(no name)"));
 
         setPixmap(0, Resource::loadPixmap("mail/inbox"));
 }
 
 ConfigDiag::ConfigDiag(QWidget *parent, const char *name, bool modal, WFlags fl)
         : ConfigDiagBase(parent, name, modal, fl)
 {
         _configBenD = new Config("mail");
         _configBenD->setGroup("Settings");
         disabled->setChecked(_configBenD->readBoolEntry("Disabled", false));
         playSound->setChecked(_configBenD->readBoolEntry("PlaySound", false));
         blinkLed->setChecked(_configBenD->readBoolEntry("BlinkLed", true));
         checkDelay->setValue(_configBenD->readNumEntry("CheckDelay", 5));
 
         accountList->header()->hide();
         disclaimer->setText(disclaimer->text().arg(VERSION));
 
         connect(accountNew, SIGNAL(clicked()), SLOT(slotNewAccount()));
         connect(accountEdit, SIGNAL(clicked()), SLOT(slotEditAccount()));
         connect(accountDelete, SIGNAL(clicked()), SLOT(slotDelAccount()));
 
-        connect(testbutton, SIGNAL(clicked()), SLOT(slotTestSettings()));
-
         slotFillLists();
 }
 
 void ConfigDiag::accept()
 {
         _configBenD->setGroup("Settings");
         _configBenD->writeEntry("Disabled", disabled->isChecked());
         _configBenD->writeEntry("PlaySound", playSound->isChecked());
         _configBenD->writeEntry("BlinkLed", blinkLed->isChecked());
         _configBenD->writeEntry("CheckDelay", checkDelay->value());
         _configBenD->write();
 
         QDialog::accept();
 }
 
 void ConfigDiag::slotFillLists()
 {
         accountList->clear();
 
         QValueList<Account> accounts = ConfigFile::getAccounts();
 
         QValueList<Account>::Iterator it;
         for (it = accounts.begin(); it != accounts.end(); it++)
                 (void) new AccountListItem(accountList, *it);
 }
 
 void ConfigDiag::slotNewAccount()
 {
         Account account;
         AccountEditor editor(account, 0, 0, true);
         editor.showMaximized();
         editor.show();
 
         if (QDialog::Accepted == editor.exec()) {
                 ConfigFile::updateAccount(editor._account);
                 slotFillLists();
                 emit changed();
         }
 }
 
 void ConfigDiag::slotEditAccount()
 {
         if (!accountList->currentItem()) {
                 QMessageBox::information(this, tr("Error"), tr("<p>You have to select an account first.</p>"), tr("Ok"));
                 return;
         }
         Account account = ((AccountListItem *)accountList->currentItem())->account();
 
         AccountEditor editor(account, 0, 0, true);
         editor.showMaximized();
         editor.show();
 
         if (QDialog::Accepted == editor.exec()) {
                 ConfigFile::updateAccount(editor._account);
                 slotFillLists();
                 emit changed();
         }
 }
 
 void ConfigDiag::slotDelAccount()
 {
         if (!accountList->currentItem()) { 
                 QMessageBox::information(this, tr("Error"), tr("<p>You have to select an account first.</p>"), tr("Ok"));
                 return;
         }
         Account account = ((AccountListItem *)accountList->currentItem())->account();
 
         int ret = QMessageBox::information(this, tr("Question"), tr("<p>Do you relly want to delete the selected account?</p>"), tr("Yes"), tr("No"));
         if (1 == ret) return;
 
         ConfigFile::deleteAccount(account);
         slotFillLists();
         emit changed();
 }
 
-void ConfigDiag::slotTestSettings()
-{
-        testbutton->setEnabled(false);
-
-        if (blinkLed->isChecked()) ZaurusStuff::blinkLedOn();
-        if (playSound->isChecked()) ZaurusStuff::buzzerOn();
-        QTimer::singleShot(3000, this, SLOT(slotEndTest()));
-}
-
-void ConfigDiag::slotEndTest()
-{
-        if (playSound->isChecked()) ZaurusStuff::buzzerOff();
-        if (blinkLed->isChecked()) ZaurusStuff::blinkLedOff();
-
-        testbutton->setEnabled(true);
-}
-
diff --git a/noncore/unsupported/mail2/configdiag.h b/noncore/unsupported/mail2/configdiag.h
index f70ba7f..cbc9b22 100644
--- a/noncore/unsupported/mail2/configdiag.h
+++ b/noncore/unsupported/mail2/configdiag.h
@@ -1,48 +1,46 @@
 #ifndef CONFIGDIAG_H
 #define CONFIGDIAG_H
 
 #include <qlistview.h>
 
 #include "configdiagbase.h"
 #include "configfile.h"
 
 class Config;
 class Account;
 
 class AccountListItem : public QListViewItem
 {
 public:
         AccountListItem(QListView *parent, Account &account);
 
         Account account() { return _account; }
 
 protected:
         Account _account;
 
 };
 
 class ConfigDiag : public ConfigDiagBase
 {
         Q_OBJECT
 
 public:
         ConfigDiag(QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags fl = 0);
 
 signals:
         void changed();
 
 protected slots:
         void accept();
         void slotFillLists();
         void slotNewAccount();
         void slotEditAccount();
         void slotDelAccount();
-        void slotTestSettings();
-        void slotEndTest();
 
 private:
         Config *_configBenD;
 
 };
 
 #endif
diff --git a/noncore/unsupported/mail2/configdiagbase.ui b/noncore/unsupported/mail2/configdiagbase.ui
index 182fedc..8b225fe 100644
--- a/noncore/unsupported/mail2/configdiagbase.ui
+++ b/noncore/unsupported/mail2/configdiagbase.ui
@@ -1,352 +1,341 @@
 <!DOCTYPE UI><UI>
 <class>ConfigDiagBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>ConfigDiagBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>260</width>
             <height>344</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Configuration</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>0</number>
         </property>
         <widget row="0"  column="0" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TabWidget2</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Accounts</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget row="1"  column="1" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>accountEdit</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Edit</string>
                         </property>
                     </widget>
                     <widget row="1"  column="2" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>accountDelete</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Delete</string>
                         </property>
                     </widget>
                     <widget row="0"  column="0"  rowspan="1"  colspan="3" >
                         <class>QListView</class>
                         <column>
                             <property>
                                 <name>text</name>
                                 <string>[Hidden]</string>
                             </property>
                             <property>
                                 <name>clickable</name>
                                 <bool>true</bool>
                             </property>
                             <property>
                                 <name>resizeable</name>
                                 <bool>true</bool>
                             </property>
                         </column>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>accountList</cstring>
                         </property>
                     </widget>
                     <widget row="1"  column="0" >
                         <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>accountNew</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>New</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>General</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <spacer row="1"  column="0" >
                         <property>
                             <name>name</name>
                             <cstring>Spacer5</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
                             <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
                             <name>sizeType</name>
                             <enum>Expanding</enum>
                         </property>
                         <property>
                             <name>sizeHint</name>
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
                     <widget row="0"  column="0" >
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>notificationGroup</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Mail notification</string>
                         </property>
                         <property>
                             <name>layoutMargin</name>
                         </property>
                         <property>
                             <name>layoutSpacing</name>
                         </property>
                         <grid>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>4</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>3</number>
                             </property>
                             <widget row="1"  column="0" >
                                 <class>QFrame</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Frame3</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShape</name>
                                     <enum>NoFrame</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>frameShadow</name>
                                     <enum>Raised</enum>
                                 </property>
                                 <property>
                                     <name>layoutMargin</name>
                                 </property>
                                 <property>
                                     <name>layoutSpacing</name>
                                 </property>
                                 <grid>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>0</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
                                         <number>3</number>
                                     </property>
                                     <widget row="1"  column="0"  rowspan="1"  colspan="3" >
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>blinkLed</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>sizePolicy</name>
                                             <sizepolicy>
                                                 <hsizetype>3</hsizetype>
                                                 <vsizetype>0</vsizetype>
                                             </sizepolicy>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Blink LED</string>
                                         </property>
                                     </widget>
-                                    <widget row="2"  column="2" >
-                                        <class>QToolButton</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>testbutton</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string> Test </string>
-                                        </property>
-                                    </widget>
                                     <widget row="0"  column="0"  rowspan="1"  colspan="3" >
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>playSound</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Play sound</string>
                                         </property>
                                     </widget>
                                     <widget row="2"  column="0" >
                                         <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>TextLabel1</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>&lt;b&gt;Check&amp;nbsp;every</string>
                                         </property>
                                     </widget>
                                     <widget row="2"  column="1" >
                                         <class>QSpinBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>checkDelay</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>sizePolicy</name>
                                             <sizepolicy>
                                                 <hsizetype>3</hsizetype>
                                                 <vsizetype>0</vsizetype>
                                             </sizepolicy>
                                         </property>
                                         <property stdset="1">
                                             <name>suffix</name>
                                             <string> min</string>
                                         </property>
                                         <property stdset="1">
                                             <name>maxValue</name>
                                             <number>30</number>
                                         </property>
                                         <property stdset="1">
                                             <name>minValue</name>
                                             <number>1</number>
                                         </property>
                                         <property stdset="1">
                                             <name>value</name>
                                             <number>1</number>
                                         </property>
                                     </widget>
                                 </grid>
                             </widget>
                             <widget row="0"  column="0" >
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>disabled</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Disable mail notification</string>
                                 </property>
                             </widget>
                         </grid>
                     </widget>
                     <widget row="2"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>disclaimer</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </string>
                         </property>
                     </widget>
                 </grid>
             </widget>
         </widget>
     </grid>
 </widget>
 <connections>
     <connection>
         <sender>disabled</sender>
         <signal>toggled(bool)</signal>
         <receiver>Frame3</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
 </connections>
 <tabstops>
     <tabstop>TabWidget2</tabstop>
     <tabstop>accountList</tabstop>
     <tabstop>accountNew</tabstop>
     <tabstop>accountEdit</tabstop>
     <tabstop>accountDelete</tabstop>
     <tabstop>disabled</tabstop>
     <tabstop>playSound</tabstop>
     <tabstop>blinkLed</tabstop>
     <tabstop>checkDelay</tabstop>
 </tabstops>
 </UI>
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 9ffe6f0..d61899b 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -1,90 +1,90 @@
 #include <qprogressbar.h>
 #include <qtoolbutton.h>
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qvbox.h>
 
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
 
 #include "mainwindowbase.h"
 #include "folderwidget.h"
 #include "mailtable.h"
 
 MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         : QMainWindow(parent, name, fl)
 {
         setCaption(tr("E-Mail"));
         setToolBarsMovable(false);
 
         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);
         toolbar->setHorizontalStretchable(true);
 
+        QLabel *spacer = new QLabel(toolbar);
+        spacer->setBackgroundMode(QWidget::PaletteButton);
+        toolbar->setStretchableWidget(spacer);
+
         compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
         compose->addTo(toolbar);
         compose->addTo(mailmenu);
 
          sendQueue = new QAction(tr("Send queued mails"), QIconSet(Resource::loadPixmap("mail/sendqueue")), 0, 0, this);
   sendQueue->addTo(toolbar);
   sendQueue->addTo(mailmenu);
 
         folders = new QAction(tr("Show/hide folders"), QIconSet(Resource::loadPixmap("mail/folder")), 0, 0, this, 0, true);
         folders->addTo(toolbar);
         folders->addTo(servermenu);
         connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool)));
 
         findmails = new QAction(tr("Search mails"), QIconSet(Resource::loadPixmap("mail/find")), 0, 0, this); 
         findmails->addTo(toolbar);
         findmails->addTo(mailmenu);
 
         configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this);
         configure->addTo(toolbar);
         configure->addTo(servermenu);
 
-        QLabel *spacer = new QLabel(toolbar);
-        spacer->setBackgroundMode(QWidget::PaletteButton);
-        toolbar->setStretchableWidget(spacer);
-
         stop = new QAction(tr("Abort"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this);
         stop->addTo(toolbar);
 
         QVBox *view = new QVBox(this);
         setCentralWidget(view);
 
         folderView = new FolderWidget(view);
         folderView->setMinimumHeight(90);
         folderView->setMaximumHeight(90);
         folderView->hide();
 
         mailView = new MailTable(view);
         mailView->setMinimumHeight(50);
 
         QHBox *status = new QHBox(view);
 
         statusLabel = new QLabel(status);
         QFont tmpFont = statusLabel->font();
         tmpFont.setPixelSize(8);
         statusLabel->setFont(tmpFont);
 
         statusProgress = new QProgressBar(status);
         statusProgress->setCenterIndicator(true);
         statusProgress->setMaximumHeight(15);
         statusProgress->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 }
 
 void MainWindowBase::slotFoldersToggled(bool toggled)
 {
         if (folderView->isHidden() && toggled) folderView->show();
         if (!folderView->isHidden() && !toggled) folderView->hide();
 }