Diffstat (limited to 'noncore/net/wellenreiter/gui/scanlist.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 1cf49e0..3a6aa15 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -50,15 +50,15 @@ MScanListView::MScanListView( QWidget* parent, const char* name ) | |||
50 | 50 | ||
51 | setFrameShape( QListView::StyledPanel ); | 51 | setFrameShape( QListView::StyledPanel ); |
52 | setFrameShadow( QListView::Sunken ); | 52 | setFrameShadow( QListView::Sunken ); |
53 | 53 | ||
54 | addColumn( tr( "Net/Station" ) ); | 54 | addColumn( tr( "Net/Station" ) ); |
55 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); | 55 | setColumnAlignment( 0, AlignLeft || AlignVCenter ); |
56 | addColumn( tr( "B" ) ); | 56 | addColumn( tr( "#" ) ); |
57 | setColumnAlignment( 1, AlignCenter ); | 57 | setColumnAlignment( 1, AlignCenter ); |
58 | addColumn( tr( "AP" ) ); | 58 | addColumn( tr( "MAC" ) ); |
59 | setColumnAlignment( 2, AlignCenter ); | 59 | setColumnAlignment( 2, AlignCenter ); |
60 | addColumn( tr( "Chn" ) ); | 60 | addColumn( tr( "Chn" ) ); |
61 | setColumnAlignment( 3, AlignCenter ); | 61 | setColumnAlignment( 3, AlignCenter ); |
62 | addColumn( tr( "W" ) ); | 62 | addColumn( tr( "W" ) ); |
63 | setColumnAlignment( 4, AlignCenter ); | 63 | setColumnAlignment( 4, AlignCenter ); |
64 | addColumn( tr( "T" ) ); | 64 | addColumn( tr( "T" ) ); |
@@ -145,18 +145,18 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
145 | return; | 145 | return; |
146 | } | 146 | } |
147 | } | 147 | } |
148 | else | 148 | else |
149 | { | 149 | { |
150 | s.sprintf( "(i) new network: '%s'", (const char*) essid ); | 150 | s.sprintf( "(i) new network: '%s'", (const char*) essid ); |
151 | //TODO send s to logwindow | ||
151 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); | 152 | network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0 ); |
152 | } | 153 | } |
153 | 154 | ||
154 | 155 | ||
155 | // insert new station as child from network | 156 | // insert new station as child from network |
156 | |||
157 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? | 157 | // no essid to reduce clutter, maybe later we have a nick or stationname to display!? |
158 | 158 | ||
159 | qDebug( "inserting new station %s", (const char*) macaddr ); | 159 | qDebug( "inserting new station %s", (const char*) macaddr ); |
160 | 160 | ||
161 | MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); | 161 | MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal ); |
162 | if ( _manufacturerdb ) | 162 | if ( _manufacturerdb ) |
@@ -167,12 +167,13 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo | |||
167 | s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); | 167 | s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel ); |
168 | } | 168 | } |
169 | else | 169 | else |
170 | { | 170 | { |
171 | s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); | 171 | s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel ); |
172 | } | 172 | } |
173 | //TODO send s to logwindow | ||
173 | 174 | ||
174 | } | 175 | } |
175 | 176 | ||
176 | 177 | ||
177 | void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type ) | 178 | void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, const QString& type ) |
178 | { | 179 | { |
@@ -195,12 +196,23 @@ void MScanListView::addIfNotExisting( MScanListItem* network, QString addr, cons | |||
195 | } | 196 | } |
196 | 197 | ||
197 | // Hey, it seems to be a new item :-D | 198 | // Hey, it seems to be a new item :-D |
198 | MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 ); | 199 | MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr, false, -1, -1 ); |
199 | if ( _manufacturerdb ) | 200 | if ( _manufacturerdb ) |
200 | station->setManufacturer( _manufacturerdb->lookup( addr ) ); | 201 | station->setManufacturer( _manufacturerdb->lookup( addr ) ); |
202 | |||
203 | QString s; | ||
204 | if ( type == "station" ) | ||
205 | { | ||
206 | s.sprintf( "(i) new station in '%s' [??]", (const char*) network->text( col_essid ) ); | ||
207 | } | ||
208 | else | ||
209 | { | ||
210 | s.sprintf( "(i) new wireless station in '%s' [??]", (const char*) network->text( col_essid ) ); | ||
211 | } | ||
212 | //TODO send s to logwindow | ||
201 | } | 213 | } |
202 | 214 | ||
203 | 215 | ||
204 | void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ) | 216 | void MScanListView::WDStraffic( QString from, QString to, QString viaFrom, QString viaTo ) |
205 | { | 217 | { |
206 | QString s; | 218 | QString s; |