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/irdaapplet/irda.cpp | |
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
Diffstat (limited to 'core/applets/irdaapplet/irda.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 28 |
1 files changed, 15 insertions, 13 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 @@ -41,12 +41,13 @@ #include <qpixmap.h> #include <qstring.h> #include <qfile.h> #include <qtimer.h> #include <qtextstream.h> #include <qpopupmenu.h> +#include <qsound.h> #include <net/if.h> #include <netinet/in.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> @@ -61,18 +62,21 @@ IrdaApplet::IrdaApplet( QWidget *parent, const char *name ) sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); 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; } } void IrdaApplet::popup(QString message, QString icon="") { @@ -203,35 +207,37 @@ void IrdaApplet::showDiscovered() { //qDebug("IrdaMon: " + it.currentKey()); //qDebug(" =" + *devicesAvailable[it.currentKey()] ); ++it; } 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) ); - //qDebug("IrdaMon: " + deviceAddr + "=" + *devicesAvailable[deviceAddr] ); + // qDebug("IrdaMon: " + deviceAddr + "=" + *devicesAvailable[deviceAddr] ); } } 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; } /* XXX if( qcopsend ) { QCopEnvelope e("QPE/Network", "irdaSend(bool)" ); @@ -248,14 +254,13 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) { /* Refresh active state */ timerEvent(NULL); // menu->insertItem( tr("More..."), 4 ); if (irdaactive && devicesAvailable.count() > 0) { - menu->insertItem( tr("Discovered Device:"), 9); - + menu->insertItem( tr("Discovered Device:"), 9); QDictIterator<QString> it( devicesAvailable ); while ( it.current() ) { menu->insertItem( *devicesAvailable[it.currentKey()]); ++it; } menu->insertSeparator(); @@ -313,15 +318,12 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) { } case 5: { // disable receive setIrdaReceiveStatus(1); 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 } void IrdaApplet::timerEvent( QTimerEvent * ) { int oldactive = irdaactive; @@ -346,13 +348,13 @@ 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) { p.drawPixmap( 0, 0, irdaOnPixmap ); } else { p.drawPixmap( 0, 0, irdaOffPixmap ); |