Diffstat (limited to 'noncore/net/wellenreiter/gui/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 27ecae3..868b0b0 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -9,16 +9,17 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "configwindow.h" | 16 | #include "configwindow.h" |
17 | #include "gps.h" | ||
17 | #include "logwindow.h" | 18 | #include "logwindow.h" |
18 | #include "hexwindow.h" | 19 | #include "hexwindow.h" |
19 | #include "mainwindow.h" | 20 | #include "mainwindow.h" |
20 | #include "wellenreiter.h" | 21 | #include "wellenreiter.h" |
21 | #include "scanlist.h" | 22 | #include "scanlist.h" |
22 | 23 | ||
23 | #include <qcombobox.h> | 24 | #include <qcombobox.h> |
24 | #include <qdatastream.h> | 25 | #include <qdatastream.h> |
@@ -213,21 +214,21 @@ WellenreiterMainWindow::~WellenreiterMainWindow() | |||
213 | delete startIconSet; | 214 | delete startIconSet; |
214 | delete stopIconSet; | 215 | delete stopIconSet; |
215 | }; | 216 | }; |
216 | 217 | ||
217 | void WellenreiterMainWindow::demoAddStations() | 218 | void WellenreiterMainWindow::demoAddStations() |
218 | { | 219 | { |
219 | //mw = 0; // test SIGSGV handling | 220 | //mw = 0; // test SIGSGV handling |
220 | 221 | ||
221 | mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80 ); | 222 | mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 10.10, 20.20 ) ); |
222 | mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10 ); | 223 | mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) ); |
223 | mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:A0:F8:E7:16:22"), false, 3, 10 ); | 224 | mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:A0:F8:E7:16:22"), false, 3, 10, GpsLocation( 5.5, 2.3 ) ); |
224 | mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:AA:01:E7:56:62"), false, 3, 15 ); | 225 | mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:AA:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) ); |
225 | mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:B0:8E:E7:56:E2"), false, 3, 20 ); | 226 | mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:B0:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.5 ) ); |
226 | } | 227 | } |
227 | 228 | ||
228 | 229 | ||
229 | QString WellenreiterMainWindow::getFileName( bool save ) | 230 | QString WellenreiterMainWindow::getFileName( bool save ) |
230 | { | 231 | { |
231 | QMap<QString, QStringList> map; | 232 | QMap<QString, QStringList> map; |
232 | map.insert( tr("All"), QStringList() ); | 233 | map.insert( tr("All"), QStringList() ); |
233 | QStringList text; | 234 | QStringList text; |