author | mickeyl <mickeyl> | 2004-02-15 18:08:39 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-15 18:08:39 (UTC) |
commit | 4d467f290f7f42717be14bb0f269570fe5dd07bc (patch) (side-by-side diff) | |
tree | 9c50cc710f7f69f57eceece17635b0b5e5b3a0b9 /noncore/net | |
parent | 76be6ccdc364c609e86d74e6daa72438bc92e911 (diff) | |
download | opie-4d467f290f7f42717be14bb0f269570fe5dd07bc.zip opie-4d467f290f7f42717be14bb0f269570fe5dd07bc.tar.gz opie-4d467f290f7f42717be14bb0f269570fe5dd07bc.tar.bz2 |
s/$1/%1/
-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 @@ -46,12 +46,14 @@ ENGINE - revamp hex window, make it more sophisticated than just a QMultiLineEdit - tree view - beep over headphone / customizable +- count/display number of wireless networks / APs since last start/stop + --------- FILES --------- - write kismet-like .network format and format to be importable into AutoRoute 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 @@ -69,20 +69,22 @@ int main( int argc, char **argv ) result = QMessageBox::warning( w, " - Wellenreiter II - (non-root)", QObject::tr( "You have started Wellenreiter II\n" "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ), 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 @@ -239,13 +239,13 @@ void WellenreiterMainWindow::demoReadFromGps() { WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance(); 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 ) { QMap<QString, QStringList> map; |