summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-04-13 01:03:40 (UTC)
committer mickeyl <mickeyl>2003-04-13 01:03:40 (UTC)
commit64d6b3e723b9b2fc3b1f3eea6da6344c5f26ce1e (patch) (unidiff)
tree86ab7afb2d22626c4f8a68e6353bd318770480f7
parent0a2d3731e93a4738a4a3e4b2fce8d011a43b0966 (diff)
downloadopie-64d6b3e723b9b2fc3b1f3eea6da6344c5f26ce1e.zip
opie-64d6b3e723b9b2fc3b1f3eea6da6344c5f26ce1e.tar.gz
opie-64d6b3e723b9b2fc3b1f3eea6da6344c5f26ce1e.tar.bz2
adjust for new icon size
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 1ef24d2..a8cadd8 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -145,49 +145,49 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
145 network = item; 145 network = item;
146 146
147 item = static_cast<MScanListItem*> ( item->firstChild() ); 147 item = static_cast<MScanListItem*> ( item->firstChild() );
148 assert( item ); // this shouldn't fail 148 assert( item ); // this shouldn't fail
149 149
150 while ( item && ( item->text( 2 ) != macaddr ) ) 150 while ( item && ( item->text( 2 ) != macaddr ) )
151 { 151 {
152 qDebug( "subitemtext: %s", (const char*) item->text( 2 ) ); 152 qDebug( "subitemtext: %s", (const char*) item->text( 2 ) );
153 item = static_cast<MScanListItem*> ( item->itemBelow() ); 153 item = static_cast<MScanListItem*> ( item->itemBelow() );
154 } 154 }
155 155
156 if ( item ) 156 if ( item )
157 { 157 {
158 // we have already seen this item, it's a dupe 158 // we have already seen this item, it's a dupe
159 #ifdef DEBUG 159 #ifdef DEBUG
160 qDebug( "%s is a dupe - ignoring...", (const char*) macaddr ); 160 qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
161 #endif 161 #endif
162 item->receivedBeacon(); 162 item->receivedBeacon();
163 return; 163 return;
164 } 164 }
165 } 165 }
166 else 166 else
167 { 167 {
168 s.sprintf( "(i) new network: '%s'", (const char*) essid ); 168 s.sprintf( "(i) new network: '%s'", (const char*) essid );
169 network = new MScanListItem( this, "networks", essid, QString::null, 0, 0, 0 ); 169 network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 );
170 } 170 }
171 171
172 172
173 // insert new station as child from network 173 // insert new station as child from network
174 174
175 // no essid to reduce clutter, maybe later we have a nick or stationname to display!? 175 // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
176 176
177 qDebug( "inserting new station %s", (const char*) macaddr ); 177 qDebug( "inserting new station %s", (const char*) macaddr );
178 178
179 MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); 179 MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
180 if ( _manufacturerdb ) 180 if ( _manufacturerdb )
181 station->setManufacturer( _manufacturerdb->lookup( macaddr ) ); 181 station->setManufacturer( _manufacturerdb->lookup( macaddr ) );
182 182
183 if ( type == "managed" ) 183 if ( type == "managed" )
184 { 184 {
185 s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); 185 s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel );
186 } 186 }
187 else 187 else
188 { 188 {
189 s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); 189 s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel );
190 } 190 }
191 191
192} 192}
193 193
@@ -229,49 +229,49 @@ void MScanListView::traffic( QString type, QString from, QString to, QString via
229 } 229 }
230 230
231 // Hey, it seems to be a new item :-D 231 // Hey, it seems to be a new item :-D
232 MScanListItem* station = new MScanListItem( item->parent(), "adhoc", /* network->text( col_essid ) */ "", from, false, -1, -1 ); 232 MScanListItem* station = new MScanListItem( item->parent(), "adhoc", /* network->text( col_essid ) */ "", from, false, -1, -1 );
233 if ( _manufacturerdb ) 233 if ( _manufacturerdb )
234 station->setManufacturer( _manufacturerdb->lookup( from ) ); 234 station->setManufacturer( _manufacturerdb->lookup( from ) );
235 } 235 }
236 else 236 else
237 { 237 {
238 qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in alpha-4 version :-D" ); 238 qDebug( "D'Oh! Station without AP... ignoring for now... will handle this in alpha-4 version :-D" );
239 } 239 }
240} 240}
241 241
242//============================================================ 242//============================================================
243// MScanListItem 243// MScanListItem
244//============================================================ 244//============================================================
245 245
246MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr, 246MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr,
247 bool wep, int channel, int signal ) 247 bool wep, int channel, int signal )
248 :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), 248 :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
249 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), 249 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
250 _channel( channel ), _signal( signal ), _beacons( 1 ) 250 _channel( channel ), _signal( signal ), _beacons( 1 )
251{ 251{
252 qDebug( "creating scanlist item" ); 252 qDebug( "creating scanlist item" );
253 if ( WellenreiterConfigWindow::instance() && type == "networks" ) 253 if ( WellenreiterConfigWindow::instance() && type == "network" )
254 playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() ); 254 playSound( WellenreiterConfigWindow::instance()->soundOnNetwork() );
255 decorateItem( type, essid, macaddr, wep, channel, signal ); 255 decorateItem( type, essid, macaddr, wep, channel, signal );
256} 256}
257 257
258MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr, 258MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr,
259 bool wep, int channel, int signal ) 259 bool wep, int channel, int signal )
260 :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ) 260 :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
261{ 261{
262 qDebug( "creating scanlist item" ); 262 qDebug( "creating scanlist item" );
263 decorateItem( type, essid, macaddr, wep, channel, signal ); 263 decorateItem( type, essid, macaddr, wep, channel, signal );
264} 264}
265 265
266OListViewItem* MScanListItem::childFactory() 266OListViewItem* MScanListItem::childFactory()
267{ 267{
268 return new MScanListItem( this ); 268 return new MScanListItem( this );
269} 269}
270 270
271void MScanListItem::serializeTo( QDataStream& s ) const 271void MScanListItem::serializeTo( QDataStream& s ) const
272{ 272{
273 qDebug( "serializing MScanListItem" ); 273 qDebug( "serializing MScanListItem" );
274 OListViewItem::serializeTo( s ); 274 OListViewItem::serializeTo( s );
275 275
276 s << _type; 276 s << _type;
277 s << (Q_UINT8) ( _wep ? 'y' : 'n' ); 277 s << (Q_UINT8) ( _wep ? 'y' : 'n' );