| -rw-r--r-- | noncore/net/wellenreiter/TODO | 2 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/main.cpp | 8 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO index b6ec617..01e731f 100644 --- a/noncore/net/wellenreiter/TODO +++ b/noncore/net/wellenreiter/TODO @@ -48,8 +48,10 @@ ENGINE - tree view - beep over headphone / customizable +- count/display number of wireless networks / APs since last start/stop + --------- FILES --------- diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index d32b362..8ef62e9 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp @@ -71,16 +71,18 @@ int main( int argc, char **argv ) QMessageBox::Yes, QMessageBox::No ); if ( result == QMessageBox::No ) return -1; } - if ( OProcess::processPID( "dhcpc" ) ) + int dhcpid = OProcess::processPID( "dhcpc" ); + + if ( dhcpid ) { result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n" - "This can severly limit scanning!\nShould I kill it for you?" ), + "(PID = %1)\nThis can severly limit scanning!\nShould I kill it for you?" ).arg( dhcpid ), QMessageBox::Yes, QMessageBox::No ); if ( result == QMessageBox::Yes ) { - if ( -1 == ::kill( OProcess::processPID( "dhcpc" ), SIGTERM ) ) + if ( -1 == ::kill( dhcpid, SIGTERM ) ) qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) ); else killed = true; } diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index b462afd..72624f7 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp @@ -241,9 +241,9 @@ void WellenreiterMainWindow::demoReadFromGps() GPS* gps = new GPS( this ); gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); GpsLocation loc = gps->position(); - QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n$1" ).arg( loc.dmsPosition() ) ); + QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) ); } QString WellenreiterMainWindow::getFileName( bool save ) |