author | harlekin <harlekin> | 2002-06-14 10:17:34 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-14 10:17:34 (UTC) |
commit | cf54bc85d0e9846d64ca2a2af55fffc3d4e2f4ad (patch) (unidiff) | |
tree | 42616657f00051e0a13e06f6d9fa07c5ba838bea /core/applets | |
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 | |||
@@ -44,2 +44,3 @@ | |||
44 | #include <qtimer.h> | 44 | #include <qtimer.h> |
45 | #include <qtextstream.h> | ||
45 | #include <qpopupmenu.h> | 46 | #include <qpopupmenu.h> |
@@ -130,2 +131,23 @@ int IrdaApplet::setIrdaDiscoveryStatus(int d) { | |||
130 | 131 | ||
132 | void IrdaApplet::showDiscovered() { | ||
133 | QFile discovery("/proc/net/irda/discovery"); | ||
134 | |||
135 | if (discovery.open(IO_ReadOnly) ) { | ||
136 | QStringList list; | ||
137 | // since it is /proc we _must_ use QTextStream | ||
138 | QTextStream stream ( &discovery); | ||
139 | QString streamIn; | ||
140 | streamIn = stream.read(); | ||
141 | list = QStringList::split("\n", streamIn); | ||
142 | |||
143 | for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { | ||
144 | if( (*line).startsWith("nickname:") ){ | ||
145 | discoveredDevice = (*line).mid(((*line).find(':'))+1,(*line).find(',')-(*line).find(':')-1); | ||
146 | qDebug(discoveredDevice); | ||
147 | } | ||
148 | } | ||
149 | } | ||
150 | |||
151 | } | ||
152 | |||
131 | void IrdaApplet::mousePressEvent( QMouseEvent *) { | 153 | void IrdaApplet::mousePressEvent( QMouseEvent *) { |
@@ -134,2 +156,3 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) { | |||
134 | int ret=0; | 156 | int ret=0; |
157 | showDiscovered(); | ||
135 | 158 | ||
@@ -139,11 +162,24 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) { | |||
139 | //menu->insertItem( tr("More..."), 4 ); | 162 | //menu->insertItem( tr("More..."), 4 ); |
140 | if (irdaactive) | 163 | |
164 | menu->insertItem( tr("Discovered Device:"), 9); | ||
165 | |||
166 | if ( !discoveredDevice.isEmpty() ) { | ||
167 | menu->insertItem( discoveredDevice ,7 ); | ||
168 | } else { | ||
169 | menu->insertItem( tr("None"), 8); | ||
170 | } | ||
171 | |||
172 | menu->insertSeparator(); | ||
173 | |||
174 | if (irdaactive) { | ||
141 | menu->insertItem( tr("Disable IrDA"), 0 ); | 175 | menu->insertItem( tr("Disable IrDA"), 0 ); |
142 | else | 176 | } else { |
143 | menu->insertItem( tr("Enable IrDA"), 1 ); | 177 | menu->insertItem( tr("Enable IrDA"), 1 ); |
178 | } | ||
144 | 179 | ||
145 | if (irdaDiscoveryActive) | 180 | if (irdaDiscoveryActive) { |
146 | menu->insertItem( tr("Disable Discovery"), 2 ); | 181 | menu->insertItem( tr("Disable Discovery"), 2 ); |
147 | else | 182 | } else { |
148 | menu->insertItem( tr("Enable Discovery"), 3 ); | 183 | menu->insertItem( tr("Enable Discovery"), 3 ); |
184 | } | ||
149 | 185 | ||
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 | |||
@@ -44,2 +44,3 @@ private: | |||
44 | int setIrdaDiscoveryStatus(int); | 44 | int setIrdaDiscoveryStatus(int); |
45 | void showDiscovered(); | ||
45 | int sockfd; | 46 | int sockfd; |
@@ -51,2 +52,3 @@ private: | |||
51 | QPixmap receiveActivePixmap; | 52 | QPixmap receiveActivePixmap; |
53 | QString discoveredDevice; | ||
52 | int irdaactive; // bool and bitfields later bool irdaactive :1 ; | 54 | int irdaactive; // bool and bitfields later bool irdaactive :1 ; |