-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 | |||
@@ -49,6 +49,8 @@ ENGINE | |||
49 | 49 | ||
50 | - beep over headphone / customizable | 50 | - beep over headphone / customizable |
51 | 51 | ||
52 | - count/display number of wireless networks / APs since last start/stop | ||
53 | |||
52 | --------- | 54 | --------- |
53 | FILES | 55 | FILES |
54 | --------- | 56 | --------- |
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 | |||
@@ -72,14 +72,16 @@ int main( int argc, char **argv ) | |||
72 | if ( result == QMessageBox::No ) return -1; | 72 | if ( result == QMessageBox::No ) return -1; |
73 | } | 73 | } |
74 | 74 | ||
75 | if ( OProcess::processPID( "dhcpc" ) ) | 75 | int dhcpid = OProcess::processPID( "dhcpc" ); |
76 | |||
77 | if ( dhcpid ) | ||
76 | { | 78 | { |
77 | result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n" | 79 | result = QMessageBox::warning( w, " - Wellenreiter II - (dhcp)", QObject::tr( "You have a dhcp client running.\n" |
78 | "This can severly limit scanning!\nShould I kill it for you?" ), | 80 | "(PID = %1)\nThis can severly limit scanning!\nShould I kill it for you?" ).arg( dhcpid ), |
79 | QMessageBox::Yes, QMessageBox::No ); | 81 | QMessageBox::Yes, QMessageBox::No ); |
80 | if ( result == QMessageBox::Yes ) | 82 | if ( result == QMessageBox::Yes ) |
81 | { | 83 | { |
82 | if ( -1 == ::kill( OProcess::processPID( "dhcpc" ), SIGTERM ) ) | 84 | if ( -1 == ::kill( dhcpid, SIGTERM ) ) |
83 | qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) ); | 85 | qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) ); |
84 | else | 86 | else |
85 | killed = true; | 87 | 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 | |||
@@ -242,7 +242,7 @@ void WellenreiterMainWindow::demoReadFromGps() | |||
242 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); | 242 | gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); |
243 | GpsLocation loc = gps->position(); | 243 | GpsLocation loc = gps->position(); |
244 | 244 | ||
245 | QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n$1" ).arg( loc.dmsPosition() ) ); | 245 | QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) ); |
246 | } | 246 | } |
247 | 247 | ||
248 | 248 | ||