Diffstat (limited to 'noncore/net/wellenreiter/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 72624f7..3729ed0 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -45,12 +45,14 @@ using namespace Opie; | |||
45 | #else | 45 | #else |
46 | #include "resource.h" | 46 | #include "resource.h" |
47 | #include <qapplication.h> | 47 | #include <qapplication.h> |
48 | #include <qfiledialog.h> | 48 | #include <qfiledialog.h> |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #include <unistd.h> | ||
52 | |||
51 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) | 53 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) |
52 | :QMainWindow( parent, name, f ) | 54 | :QMainWindow( parent, name, f ) |
53 | { | 55 | { |
54 | cw = new WellenreiterConfigWindow( this ); | 56 | cw = new WellenreiterConfigWindow( this ); |
55 | mw = new Wellenreiter( this ); | 57 | mw = new Wellenreiter( this ); |
56 | mw->setConfigWindow( cw ); | 58 | mw->setConfigWindow( cw ); |
@@ -131,13 +133,13 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
131 | sniffer->setItemEnabled( startID, false ); | 133 | sniffer->setItemEnabled( startID, false ); |
132 | stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); | 134 | stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); |
133 | sniffer->setItemEnabled( stopID, false ); | 135 | sniffer->setItemEnabled( stopID, false ); |
134 | 136 | ||
135 | QPopupMenu* demo = new QPopupMenu( mb ); | 137 | QPopupMenu* demo = new QPopupMenu( mb ); |
136 | demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); | 138 | demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); |
137 | demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) ); | 139 | //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) ); |
138 | 140 | ||
139 | id = mb->insertItem( tr( "&File" ), file ); | 141 | id = mb->insertItem( tr( "&File" ), file ); |
140 | //id = mb->insertItem( tr( "&View" ), view ); | 142 | //id = mb->insertItem( tr( "&View" ), view ); |
141 | //mb->setItemEnabled( id, false ); | 143 | //mb->setItemEnabled( id, false ); |
142 | id = mb->insertItem( tr( "&Sniffer" ), sniffer ); | 144 | id = mb->insertItem( tr( "&Sniffer" ), sniffer ); |
143 | 145 | ||
@@ -216,13 +218,13 @@ void WellenreiterMainWindow::changedSniffingState() | |||
216 | } | 218 | } |
217 | } | 219 | } |
218 | 220 | ||
219 | 221 | ||
220 | WellenreiterMainWindow::~WellenreiterMainWindow() | 222 | WellenreiterMainWindow::~WellenreiterMainWindow() |
221 | { | 223 | { |
222 | qDebug( "Wellenreiter:: bye." ); | 224 | qDebug( "Wellenreiter: bye." ); |
223 | }; | 225 | }; |
224 | 226 | ||
225 | 227 | ||
226 | void WellenreiterMainWindow::demoAddStations() | 228 | void WellenreiterMainWindow::demoAddStations() |
227 | { | 229 | { |
228 | //mw = 0; // test SIGSEGV handling | 230 | //mw = 0; // test SIGSEGV handling |
@@ -236,16 +238,17 @@ void WellenreiterMainWindow::demoAddStations() | |||
236 | 238 | ||
237 | 239 | ||
238 | void WellenreiterMainWindow::demoReadFromGps() | 240 | void WellenreiterMainWindow::demoReadFromGps() |
239 | { | 241 | { |
240 | WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance(); | 242 | WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance(); |
241 | GPS* gps = new GPS( this ); | 243 | GPS* gps = new GPS( this ); |
244 | qDebug( "Wellenreiter::demoReadFromGps(): url=gps://%s:%d/", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | ||
242 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | 245 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); |
243 | GpsLocation loc = gps->position(); | 246 | GpsLocation loc = gps->position(); |
244 | |||
245 | QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) ); | 247 | QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) ); |
248 | delete gps; | ||
246 | } | 249 | } |
247 | 250 | ||
248 | 251 | ||
249 | QString WellenreiterMainWindow::getFileName( bool save ) | 252 | QString WellenreiterMainWindow::getFileName( bool save ) |
250 | { | 253 | { |
251 | QMap<QString, QStringList> map; | 254 | QMap<QString, QStringList> map; |