-rw-r--r-- | noncore/unsupported/mail2/bend/bend.cpp | 15 | ||||
-rw-r--r-- | noncore/unsupported/mail2/bend/bend.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/configdiagbase.ui | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/noncore/unsupported/mail2/bend/bend.cpp b/noncore/unsupported/mail2/bend/bend.cpp index b4da3ac..fe3b736 100644 --- a/noncore/unsupported/mail2/bend/bend.cpp +++ b/noncore/unsupported/mail2/bend/bend.cpp @@ -1,37 +1,41 @@ #include <qlayout.h> #include <qpixmap.h> #include <qlabel.h> +#include <qsound.h> #include <qtimer.h> #include <qdir.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/resource.h> #include <qpe/config.h> #include <stdlib.h> #include "configfile.h" #include "imapresponse.h" #include "imaphandler.h" #include "zaurusstuff.h" #include "bend.h" BenD::BenD(QWidget *parent, const char *name, WFlags fl) : QButton(parent, name, fl) { + _zaurus = false; + if (QFile("/dev/sharp_buz").exists()) _zaurus = true; + _config = new Config("mail"); _config->setGroup("Settings"); QVBoxLayout *layout = new QVBoxLayout(this); layout->addItem(new QSpacerItem(0,0)); QLabel *pixmap = new QLabel(this); pixmap->setPixmap(Resource::loadPixmap("mail/mailchecker")); layout->addWidget(pixmap); layout->addItem(new QSpacerItem(0,0)); hide(); connect(this, SIGNAL(clicked()), SLOT(slotClicked())); @@ -53,63 +57,70 @@ void BenD::slotClicked() QCopEnvelope e("QPE/System", "execute(QString)"); e << QString("mail"); if (_ledOn) { ZaurusStuff::blinkLedOff(); _ledOn = false; } } void BenD::slotCheck() { // Check wether the check interval has been changed. int newIntervalMs = _config->readNumEntry("CheckEvery", 5) * 60000; if (newIntervalMs != _intervalMs) { _intervalTimer->changeInterval(newIntervalMs); _intervalMs = newIntervalMs; +#ifndef QT_NO_DEBUG + qWarning("BenD: Detected interval change"); +#endif } QValueList<Account> acList = ConfigFile::getAccounts(); QValueList<Account>::Iterator ot; for (ot = acList.begin(); ot != acList.end(); ot++) { if (!((*ot).imapServer().isEmpty() || (*ot).imapPort().isEmpty() || (*ot).user().isEmpty() || (*ot).pass().isEmpty())) { if (!((*ot).imapSsl() && (*ot).imapSslPort().isEmpty())) { IMAPHandler *handler = new IMAPHandler(*ot); handler->iStatus("INBOX", "RECENT"); connect(handler, SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPStatus(IMAPResponse &))); } } } } void BenD::slotIMAPStatus(IMAPResponse &response) { disconnect(response.imapHandler(), SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPStatus(IMAPResponse &))); if (response.statusResponse().status() == IMAPResponseEnums::OK) { if (response.STATUS()[0].recent().toInt() > 0) { if (isHidden()) show(); if (_config->readBoolEntry("BlinkLed", true)) ZaurusStuff::blinkLedOn(); if (_config->readBoolEntry("PlaySound", false)) { - ZaurusStuff::buzzerOn(); - QTimer::singleShot(3000, this, SLOT(slotSoundOff())); + if (_zaurus) { + ZaurusStuff::buzzerOn(); + QTimer::singleShot(3000, this, SLOT(slotSoundOff())); + } else { + QSound::play(Resource::findSound("mail/newmail")); + } } } else { if (!isHidden()) hide(); if (!_ledOn) { ZaurusStuff::blinkLedOff(); _ledOn = false; } } response.imapHandler()->iLogout(); } else qWarning("BenD: WARNING: Couldn't retrieve INBOX status."); } void BenD::slotSoundOff() { ZaurusStuff::buzzerOff(); } diff --git a/noncore/unsupported/mail2/bend/bend.h b/noncore/unsupported/mail2/bend/bend.h index cf50bc5..7972929 100644 --- a/noncore/unsupported/mail2/bend/bend.h +++ b/noncore/unsupported/mail2/bend/bend.h @@ -17,22 +17,22 @@ public: protected: void drawButton(QPainter *); void drawButtonText(QPainter *); void gotNewMail(); QString rot13(const QString &input); protected slots: void slotCheck(); void slotClicked(); void slotSoundOff(); void slotIMAPStatus(IMAPResponse &response); private: Config *_config; QTimer *_intervalTimer; int _intervalMs; - bool _ledOn; + bool _zaurus, _ledOn; }; #endif diff --git a/noncore/unsupported/mail2/configdiagbase.ui b/noncore/unsupported/mail2/configdiagbase.ui index 754458a..dfe0db8 100644 --- a/noncore/unsupported/mail2/configdiagbase.ui +++ b/noncore/unsupported/mail2/configdiagbase.ui @@ -239,33 +239,33 @@ <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 (Zaurus only)</string> + <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><b>Check&nbsp;every</string> </property> </widget> <widget row="2" column="1" > <class>QSpinBox</class> <property stdset="1"> |