1 files changed, 20 insertions, 12 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index c061319..62bda91 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -159,29 +159,33 @@ void Wellenreiter::receivePacket(OPacket* p)
             qDebug( "Wellenreiter::invalid frame detected: '%s'", (const char*) p->dump( 16 ) );
             return;
         }
 
         OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
         QString essid = ssid ? ssid->ID() : QString("<unknown>");
         OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
         int channel = ds ? ds->channel() : -1;
 
         OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
         netView()->addNewItem( type, essid, header->macAddress2().toString(), beacon->canPrivacy(), channel, 0 );
 
-        // do we have a prism header?
-        OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
-        if ( ds && prism )
-            graphwindow->traffic( ds->channel(), prism->signalStrength() );
-
+        // update graph window
+        if ( ds )
+        {
+            OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
+            if ( prism )
+                graphwindow->traffic( ds->channel(), prism->signalStrength() );
+            else
+                graphwindow->traffic( ds->channel(), 95 );
+        }
         return;
     }
 
     // check for a data frame
     OWaveLanDataPacket* data = static_cast<OWaveLanDataPacket*>( p->child( "802.11 Data" ) );
     if ( data )
     {
         OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
         if ( wlan->fromDS() && !wlan->toDS() )
         {
             qDebug( "FromDS traffic: '%s' -> '%s' via '%s'",
                 (const char*) wlan->macAddress3().toString(true),
@@ -250,103 +254,107 @@ void Wellenreiter::stopClicked()
         iface->setMonitorMode( false );
         // switch off promisc flag
         iface->setPromiscuousMode( false );
 
         system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess
     }
 
     logwindow->log( "(i) Stopped Scanning." );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" );
 
     // message the user
-    QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." );
+    QMessageBox::information( this, "Wellenreiter II",
+                              tr( "Your wireless card\nshould now be usable again." ) );
 
     sniffing = false;
     emit( stoppedSniffing() );
 
     // print out statistics
     for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it )
        statwindow->updateCounter( it.key(), it.data() );
 }
 
 
 void Wellenreiter::startClicked()
 {
     // get configuration from config window
 
     const QString& interface = configwindow->interfaceName->currentText();
     const int cardtype = configwindow->daemonDeviceType();
     const int interval = configwindow->daemonHopInterval();
 
     if ( ( interface == "" ) || ( cardtype == 0 ) )
     {
-        QMessageBox::information( this, "Wellenreiter II", "Your device is not\nproperly configured. Please reconfigure!" );
+        QMessageBox::information( this, "Wellenreiter II",
+                                  tr( "Your device is not\nproperly configured. Please reconfigure!" ) );
         return;
     }
 
     // configure device
 
     ONetwork* net = ONetwork::instance();
     iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface ));
 
     // set monitor mode
 
     switch ( cardtype )
     {
         case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break;
         case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break;
         case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break;
         case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break;
-        case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", "Bring your device into\nmonitor mode now." ); break;
+        case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
         case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break;
         default: assert( 0 ); // shouldn't reach this
     }
 
     // switch device into monitor mode
     if ( cardtype < DEVTYPE_FILE )
     {
         if ( cardtype != DEVTYPE_MANUAL )
             iface->setMonitorMode( true );
         if ( !iface->monitorMode() )
         {
-            QMessageBox::warning( this, "Wellenreiter II", "Can't set device into monitor mode." );
+            QMessageBox::warning( this, "Wellenreiter II",
+                                  tr( "Can't set device into monitor mode." ) );
             return;
         }
     }
 
     // open pcap and start sniffing
     if ( cardtype != DEVTYPE_FILE )
     {
-        if ( configwindow->writeCaptureFile->isEnabled() )
+        if ( configwindow->writeCaptureFile->isEnabled() ) //FIXME: bug!?
         {
             QString dumpname( configwindow->captureFileName->text() );
             dumpname.append( '-' );
             dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
             dumpname.append( ".wellenreiter" );
             pcap->open( interface, dumpname );
         }
         else
         {
             pcap->open( interface );
         }
     }
     else
     {
         pcap->open( QFile( interface ) );
     }
 
     if ( !pcap->isOpen() )
     {
-        QMessageBox::warning( this, "Wellenreiter II", "Can't open packet capturer:\n" + QString(strerror( errno ) ));
+        QMessageBox::warning( this, "Wellenreiter II",
+                              tr( "Can't open packet capturer:\n" ) + QString(strerror( errno ) ));
         return;
     }
 
     // set capturer to non-blocking mode
     pcap->setBlocking( false );
 
     // start channel hopper
     if ( cardtype != DEVTYPE_FILE )
         iface->setChannelHopping( 1000 ); //use interval from config window
 
     if ( cardtype != DEVTYPE_FILE )
     {
@@ -358,25 +366,25 @@ void Wellenreiter::startClicked()
     {
         // start timer for reading packets
         startTimer( 100 );
     }
 
     logwindow->log( "(i) Started Scanning." );
     sniffing = true;
     emit( startedSniffing() );
     if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
     else
     {
         assert( parent() );
-        ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II - replaying capture file..." );
+        ( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) );
     }
 }
 
 
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
     qDebug( "Wellenreiter::timerEvent()" );
     OPacket* p = pcap->next();
     if ( !p ) // no more packets available
     {
         stopClicked();
     }