Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index d1ace46..9c8630f 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -154,25 +154,37 @@ void Wellenreiter::addNewItem( QString type, QString essid, QString macaddr, boo | |||
154 | 154 | ||
155 | // search, if we had an item with this essid once before | 155 | // search, if we had an item with this essid once before |
156 | 156 | ||
157 | QListViewItem* item = netview->firstChild(); | 157 | //MScanListItem* item = dynamic_cast<MScanListItem*>( netview->firstChild() ); |
158 | MScanListItem* item = static_cast<MScanListItem*>( netview->firstChild() ); | ||
158 | 159 | ||
159 | while ( item && ( item->text( 0 ) != essid ) ) | 160 | while ( item && ( item->text( 0 ) != essid ) ) |
160 | { | 161 | { |
161 | qDebug( "itemtext: %s", (const char*) item->text( 0 ) ); | 162 | qDebug( "itemtext: %s", (const char*) item->text( 0 ) ); |
162 | item = item->itemBelow(); | 163 | item = dynamic_cast<MScanListItem*>( item->itemBelow() ); |
163 | } | 164 | } |
164 | if ( item ) | 165 | if ( item ) |
165 | { | 166 | { |
166 | qDebug( "found!" ); | 167 | qDebug( "found!" ); |
167 | 168 | ||
168 | if ( macaddr != item->text( 2 ) ) | 169 | // check, if it is the same item (based on MACaddr) |
170 | |||
171 | if ( macaddr == item->text( 2 ) ) | ||
172 | { | ||
173 | qDebug( "already had item with mac %s", (const char*) item->text( 2 ) ); | ||
174 | return; | ||
175 | } | ||
176 | |||
177 | // another item belonging to the same net, so: insert the new item as child | ||
178 | |||
169 | new MScanListItem( item, type, essid, macaddr, wep, channel, signal ); | 179 | new MScanListItem( item, type, essid, macaddr, wep, channel, signal ); |
170 | else | ||
171 | qDebug( "already there. ignoring..." ); | ||
172 | } | 180 | } |
181 | |||
173 | else | 182 | else |
174 | { | 183 | { |
175 | new MScanListItem( netview, type, essid, macaddr, wep, channel, signal ); | 184 | qDebug( "inserting new network" ); |
185 | MScanListItem* network = new MScanListItem( netview, "networks", essid, QString::null, 0, 0, 0 ); | ||
186 | |||
187 | new MScanListItem( network, type, essid, macaddr, wep, channel, signal ); | ||
176 | } | 188 | } |
177 | } | 189 | } |
178 | 190 | ||
@@ -183,13 +195,16 @@ void Wellenreiter::buttonClicked() | |||
183 | 195 | ||
184 | button->setText( "Stop Scanning" ); | 196 | button->setText( "Stop Scanning" ); |
185 | 197 | ||
186 | // add some icons, so that we can see if this works | 198 | // add some test stations, so that we can see if the GUI part works |
187 | 199 | ||
188 | addNewItem( "managed", "DummyNet", "04:00:20:EF:A6:43", true, 6, 80 ); | 200 | addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 ); |
189 | addNewItem( "adhoc", "DummyNet", "40:03:A3:E7:56:22", false, 11, 30 ); | 201 | addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 ); |
202 | addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 ); | ||
203 | addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 ); | ||
204 | addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 ); | ||
190 | 205 | ||
191 | QString command ("98"); | 206 | QString command ("98"); |
192 | 207 | ||
193 | sendcomm( DAEMONADDR, DAEMONPORT, (const char*) command ); | 208 | //sendcomm( DAEMONADDR, DAEMONPORT, (const char*) command ); |
194 | 209 | ||
195 | } | 210 | } |