From cf54bc85d0e9846d64ca2a2af55fffc3d4e2f4ad Mon Sep 17 00:00:00 2001 From: harlekin Date: Fri, 14 Jun 2002 10:17:34 +0000 Subject: show discovered device --- diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index 28a79d1..e21f191 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -128,24 +129,59 @@ int IrdaApplet::setIrdaDiscoveryStatus(int d) { } +void IrdaApplet::showDiscovered() { + QFile discovery("/proc/net/irda/discovery"); + + if (discovery.open(IO_ReadOnly) ) { + QStringList list; + // since it is /proc we _must_ use QTextStream + QTextStream stream ( &discovery); + QString streamIn; + streamIn = stream.read(); + list = QStringList::split("\n", streamIn); + + for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { + if( (*line).startsWith("nickname:") ){ + discoveredDevice = (*line).mid(((*line).find(':'))+1,(*line).find(',')-(*line).find(':')-1); + qDebug(discoveredDevice); + } + } + } + +} + void IrdaApplet::mousePressEvent( QMouseEvent *) { QPopupMenu *menu = new QPopupMenu(); QString cmd; int ret=0; + showDiscovered(); /* Refresh active state */ timerEvent(NULL); // menu->insertItem( tr("More..."), 4 ); - if (irdaactive) + + menu->insertItem( tr("Discovered Device:"), 9); + + if ( !discoveredDevice.isEmpty() ) { + menu->insertItem( discoveredDevice ,7 ); + } else { + menu->insertItem( tr("None"), 8); + } + + menu->insertSeparator(); + + if (irdaactive) { menu->insertItem( tr("Disable IrDA"), 0 ); - else + } else { menu->insertItem( tr("Enable IrDA"), 1 ); + } - if (irdaDiscoveryActive) + if (irdaDiscoveryActive) { menu->insertItem( tr("Disable Discovery"), 2 ); - else + } else { menu->insertItem( tr("Enable Discovery"), 3 ); + } if( receiveActive ){ menu->insertItem( tr("Disable Receive"), 5 ); diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h index 002d295..5822afe 100644 --- a/core/applets/irdaapplet/irda.h +++ b/core/applets/irdaapplet/irda.h @@ -42,6 +42,7 @@ private: int setIrdaStatus(int); int checkIrdaDiscoveryStatus(); int setIrdaDiscoveryStatus(int); + void showDiscovered(); int sockfd; private: @@ -49,6 +50,7 @@ private: QPixmap irdaOffPixmap; QPixmap irdaDiscoveryOnPixmap; QPixmap receiveActivePixmap; + QString discoveredDevice; int irdaactive; // bool and bitfields later bool irdaactive :1 ; int irdaDiscoveryActive; bool receiveActive : 1; -- cgit v0.9.0.2