author | harlekin <harlekin> | 2002-06-24 21:05:01 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-24 21:05:01 (UTC) |
commit | 67b1be897a8c02b70b6e0805ff0c5ae19146905c (patch) (side-by-side diff) | |
tree | 02f0e45847959560f1912a06d31f5895618edc88 /core/applets | |
parent | 2751bb111d21a5672c7caa7a6c2c45d14a642dbd (diff) | |
download | opie-67b1be897a8c02b70b6e0805ff0c5ae19146905c.zip opie-67b1be897a8c02b70b6e0805ff0c5ae19146905c.tar.gz opie-67b1be897a8c02b70b6e0805ff0c5ae19146905c.tar.bz2 |
fixed a segfault if a device is discovered on opie start and added sounds
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 24 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.h | 3 | ||||
-rw-r--r-- | core/applets/irdaapplet/irdaapplet.pro | 31 | ||||
-rw-r--r-- | core/applets/irdaapplet/opie-irdaapplet.control | 2 |
4 files changed, 34 insertions, 26 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index c0f11c0..42bed5e 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp @@ -44,6 +44,7 @@ #include <qtimer.h> #include <qtextstream.h> #include <qpopupmenu.h> +#include <qsound.h> #include <net/if.h> #include <netinet/in.h> @@ -64,12 +65,15 @@ IrdaApplet::IrdaApplet( QWidget *parent, const char *name ) irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); receiveActivePixmap = Resource::loadPixmap("irdaapplet/receive"); receiveActive = false; - startTimer(5000); - timerEvent(NULL); popupMenu = 0; devicesAvailable.setAutoDelete(TRUE); } +void IrdaApplet::show() { + QWidget::show(); + startTimer(2000); +} + IrdaApplet::~IrdaApplet() { close(sockfd); if( popupMenu ) { delete popupMenu; } @@ -206,15 +210,16 @@ void IrdaApplet::showDiscovered() { } for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { - qDebug( (*line) ); + // qDebug( (*line) ); if( (*line).startsWith("nickname:") ){ discoveredDevice = (*line).mid(((*line).find(':'))+2,(*line).find(',')-(*line).find(':')-2); deviceAddr = (*line).mid( (*line).find( "daddr:" )+9, 8 ); - qDebug(discoveredDevice + "(" + deviceAddr + ")"); + // qDebug(discoveredDevice + "(" + deviceAddr + ")"); if( ! devicesAvailable.find(deviceAddr) ) { popup( tr("Found:") + " " + discoveredDevice ); + QSound::play(Resource::findSound("irdaapplet/irdaon")); qcopsend = TRUE; } devicesAvailable.replace( deviceAddr, new QString(discoveredDevice) ); @@ -224,11 +229,12 @@ void IrdaApplet::showDiscovered() { it.toFirst(); while ( it.current() ) { - qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?"); + // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?"); if ( (*it.current()).left(3) == "+++" ) { popup( tr("Lost:") + " " + (*devicesAvailable[it.currentKey()]).mid(3) ); + QSound::play(Resource::findSound("irdaapplet/irdaoff")); devicesAvailable.remove( it.currentKey() ); - qDebug("IrdaMon: delete " + it.currentKey() + "!"); + // qDebug("IrdaMon: delete " + it.currentKey() + "!"); qcopsend = TRUE; } ++it; @@ -252,7 +258,6 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) { if (irdaactive && devicesAvailable.count() > 0) { menu->insertItem( tr("Discovered Device:"), 9); - QDictIterator<QString> it( devicesAvailable ); while ( it.current() ) { menu->insertItem( *devicesAvailable[it.currentKey()]); @@ -316,9 +321,6 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) { timerEvent(NULL); break; } - case 6: - qDebug("FIXME: Bring up pretty menu...\n"); - // With table of currently-detected devices. } delete menu; // Can somebody explain why use a QPopupMenu* and not QPopupMenu nor QAction. with out delete we will leak cause QPopupMenu doesn't have a parent in this case } @@ -349,7 +351,7 @@ void IrdaApplet::timerEvent( QTimerEvent * ) { void IrdaApplet::paintEvent( QPaintEvent* ) { QPainter p(this); - qDebug("paint irda pixmap"); + // qDebug("paint irda pixmap"); p.eraseRect ( 0, 0, this->width(), this->height() ); if (irdaactive > 0) { diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h index 7b37847..e878946 100644 --- a/core/applets/irdaapplet/irda.h +++ b/core/applets/irdaapplet/irda.h @@ -47,6 +47,9 @@ private: void showDiscovered(); int sockfd; +public slots: + void show(); + private slots: void popupTimeout(); diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro index 035b0c1..47267f7 100644 --- a/core/applets/irdaapplet/irdaapplet.pro +++ b/core/applets/irdaapplet/irdaapplet.pro @@ -9,17 +9,20 @@ DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe VERSION = 1.0.0 -TRANSLATIONS = ../../i18n/de/libirdaapplet.ts -TRANSLATIONS += ../../i18n/en/libirdaapplet.ts -TRANSLATIONS += ../../i18n/es/libirdaapplet.ts -TRANSLATIONS += ../../i18n/fr/libirdaapplet.ts -TRANSLATIONS += ../../i18n/hu/libirdaapplet.ts -TRANSLATIONS += ../../i18n/ja/libirdaapplet.ts -TRANSLATIONS += ../../i18n/ko/libirdaapplet.ts -TRANSLATIONS += ../../i18n/no/libirdaapplet.ts -TRANSLATIONS += ../../i18n/pl/libirdaapplet.ts -TRANSLATIONS += ../../i18n/pt/libirdaapplet.ts -TRANSLATIONS += ../../i18n/pt_BR/libirdaapplet.ts -TRANSLATIONS += ../../i18n/sl/libirdaapplet.ts -TRANSLATIONS += ../../i18n/zh_CN/libirdaapplet.ts -TRANSLATIONS += ../../i18n/zh_TW/libirdaapplet.ts + + +TRANSLATIONS = ../../../i18n/de/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/en/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/es/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/fr/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/hu/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/ja/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/ko/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/no/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/pl/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/pt/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/pt_BR/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/sl/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/zh_CN/libirdaapplet.ts +TRANSLATIONS += ../../../i18n/zh_TW/libirdaapplet.ts + diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control index 85c3386..5b901de 100644 --- a/core/applets/irdaapplet/opie-irdaapplet.control +++ b/core/applets/irdaapplet/opie-irdaapplet.control @@ -1,4 +1,4 @@ -Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* +Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav Priority: optional Section: opie/system Maintainer: David Woodhouse <dwmw2@infradead.org> |