author | harlekin <harlekin> | 2002-06-14 10:17:34 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-14 10:17:34 (UTC) |
commit | cf54bc85d0e9846d64ca2a2af55fffc3d4e2f4ad (patch) (side-by-side diff) | |
tree | 42616657f00051e0a13e06f6d9fa07c5ba838bea /core/applets/irdaapplet | |
parent | 1e09f5f7c691bff0d546dead1807a92c1a0b0303 (diff) | |
download | opie-cf54bc85d0e9846d64ca2a2af55fffc3d4e2f4ad.zip opie-cf54bc85d0e9846d64ca2a2af55fffc3d4e2f4ad.tar.gz opie-cf54bc85d0e9846d64ca2a2af55fffc3d4e2f4ad.tar.bz2 |
show discovered device
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 44 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.h | 2 |
2 files changed, 42 insertions, 4 deletions
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 @@ -33,24 +33,25 @@ #include <qpoint.h> #include <qpushbutton.h> #include <qpainter.h> #include <qcombobox.h> #include <qspinbox.h> #include <qslider.h> #include <qlayout.h> #include <qframe.h> #include <qpixmap.h> #include <qstring.h> #include <qfile.h> #include <qtimer.h> +#include <qtextstream.h> #include <qpopupmenu.h> #include <net/if.h> #include <netinet/in.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/ioctl.h> //=========================================================================== IrdaApplet::IrdaApplet( QWidget *parent, const char *name ) @@ -119,42 +120,77 @@ int IrdaApplet::setIrdaDiscoveryStatus(int d) { if (d) discovery.putch('1'); else discovery.putch('0'); discovery.close(); return 0; } +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 ); } else { menu->insertItem( tr("Enable Receive"), 4 ); } QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) ); ret = menu->exec(p, 2); qDebug("ret was %d\n", ret); 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 @@ -33,31 +33,33 @@ public: ~IrdaApplet(); protected: void timerEvent(QTimerEvent *te ); private: void mousePressEvent( QMouseEvent * ); void paintEvent( QPaintEvent* ); int checkIrdaStatus(); int setIrdaStatus(int); int checkIrdaDiscoveryStatus(); int setIrdaDiscoveryStatus(int); + void showDiscovered(); int sockfd; private: QPixmap irdaOnPixmap; QPixmap irdaOffPixmap; QPixmap irdaDiscoveryOnPixmap; QPixmap receiveActivePixmap; + QString discoveredDevice; int irdaactive; // bool and bitfields later bool irdaactive :1 ; int irdaDiscoveryActive; bool receiveActive : 1; bool receiveStateChanged; private slots: }; #endif // __SCREENSHOT_APPLET_H__ |