summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/mail2/composerbase.cpp8
-rw-r--r--noncore/unsupported/mail2/configdiag.cpp20
-rw-r--r--noncore/unsupported/mail2/configdiag.h2
-rw-r--r--noncore/unsupported/mail2/configdiagbase.ui11
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp8
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
@@ -22,16 +22,20 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
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);
@@ -39,20 +43,16 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
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);
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
@@ -7,17 +7,16 @@
#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())
@@ -44,18 +43,16 @@ ConfigDiag::ConfigDiag(QWidget *parent, const char *name, bool modal, WFlags fl)
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());
@@ -121,25 +118,8 @@ void ConfigDiag::slotDelAccount()
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
@@ -32,17 +32,15 @@ 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
@@ -228,27 +228,16 @@
<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>
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
@@ -25,16 +25,20 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
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);
@@ -46,20 +50,16 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
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);