From dee5f6c5a3bd982913d0b234fb9392ce68d5df63 Mon Sep 17 00:00:00 2001 From: conber Date: Wed, 19 Jun 2002 13:58:18 +0000 Subject: some small fixes --- 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 @@ -27,6 +27,10 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) 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); @@ -44,10 +48,6 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) 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); 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 @@ -12,7 +12,6 @@ #include #include "accounteditor.h" -#include "zaurusstuff.h" #include "configdiag.h" #include "defines.h" @@ -49,8 +48,6 @@ ConfigDiag::ConfigDiag(QWidget *parent, const char *name, bool modal, WFlags fl) connect(accountEdit, SIGNAL(clicked()), SLOT(slotEditAccount())); connect(accountDelete, SIGNAL(clicked()), SLOT(slotDelAccount())); - connect(testbutton, SIGNAL(clicked()), SLOT(slotTestSettings())); - slotFillLists(); } @@ -126,20 +123,3 @@ void ConfigDiag::slotDelAccount() 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 @@ -37,8 +37,6 @@ protected slots: void slotNewAccount(); void slotEditAccount(); void slotDelAccount(); - void slotTestSettings(); - void slotEndTest(); private: Config *_configBenD; 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 @@ -233,17 +233,6 @@ Blink LED - - QToolButton - - name - testbutton - - - text - Test - - QCheckBox 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 @@ -30,6 +30,10 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) 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); @@ -51,10 +55,6 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) 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); -- cgit v0.9.0.2