1 files changed, 22 insertions, 21 deletions

diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 6cd364c..c4a8fbc 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -81,102 +81,102 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     stopButton->setEnabled( false );
     connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
 
     QToolButton* c = new QToolButton( 0 );
     #ifdef QWS
     c->setAutoRaise( true );
     #endif
     c->setIconSet( *infoIconSet );
     c->setEnabled( false );
 
     QToolButton* d = new QToolButton( 0 );
     #ifdef QWS
     d->setAutoRaise( true );
     #endif
     d->setIconSet( *settingsIconSet );
     connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
 
     // setup menu bar
 
     int id;
 
     QMenuBar* mb = menuBar();
 
     QPopupMenu* fileSave = new QPopupMenu( mb );
-    fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) );
-    fileSave->insertItem( "&Text Log...", this, SLOT( fileSaveLog() ) );
-    fileSave->insertItem( "&Hex Log...", this, SLOT( fileSaveHex() ) );
+    fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) );
+    fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) );
+    fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) );
 
     QPopupMenu* fileLoad = new QPopupMenu( mb );
-    fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) );
+    fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) );
     //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
 
     QPopupMenu* file = new QPopupMenu( mb );
-    file->insertItem( "&New", this, SLOT( fileNew() ) );
-    id = file->insertItem( "&Load", fileLoad );
-    file->insertItem( "&Save", fileSave );
+    file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
+    id = file->insertItem( tr( "&Load" ), fileLoad );
+    file->insertItem( tr( "&Save" ), fileSave );
     file->insertSeparator();
-    file->insertItem( "&Exit", qApp, SLOT( quit() ) );
+    file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
 
     QPopupMenu* view = new QPopupMenu( mb );
-    view->insertItem( "&Configure..." );
+    view->insertItem( tr( "&Configure..." ) );
 
     QPopupMenu* sniffer = new QPopupMenu( mb );
-    sniffer->insertItem( "&Configure...", this, SLOT( showConfigure() ) );
+    sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
     sniffer->insertSeparator();
-    startID = sniffer->insertItem( "&Start", mw, SLOT( startClicked() ) );
+    startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
     sniffer->setItemEnabled( startID, false );
-    stopID = sniffer->insertItem( "Sto&p", mw, SLOT( stopClicked() ) );
+    stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
     sniffer->setItemEnabled( stopID, false );
 
     QPopupMenu* demo = new QPopupMenu( mb );
-    demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) );
+    demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
 
-    id = mb->insertItem( "&File", file );
-    id = mb->insertItem( "&View", view );
+    id = mb->insertItem( tr( "&File" ), file );
+    id = mb->insertItem( tr( "&View" ), view );
     mb->setItemEnabled( id, false );
-    id = mb->insertItem( "&Sniffer", sniffer );
-    id = mb->insertItem( "&Demo", demo );
+    id = mb->insertItem( tr( "&Sniffer" ), sniffer );
+    id = mb->insertItem( tr( "&Demo" ), demo );
     mb->setItemEnabled( id, true );
 
     #ifdef QWS
     mb->insertItem( startButton );
     mb->insertItem( stopButton );
     mb->insertItem( c );
     mb->insertItem( d );
     #else // Qt3 changed the insertion order. It's now totally random :(
     mb->insertItem( d );
     mb->insertItem( c );
     mb->insertItem( stopButton );
     mb->insertItem( startButton );
     #endif
 
     updateToolButtonState();
 
     // setup status bar (for now only on X11)
 
     #ifndef QWS
-    statusBar()->message( "Ready." );
+    statusBar()->message( tr( "Ready." ) );
     #endif
 
     connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) );
     connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) );
 };
 
 
 
 void WellenreiterMainWindow::showConfigure()
 {
     qDebug( "show configure..." );
     cw->setCaption( tr( "Configure" ) );
     #ifdef QWS
     cw->showMaximized();
     #endif
     int result = cw->exec();
 
     if ( result ) updateToolButtonState();
 }
 
 
 
 void WellenreiterMainWindow::updateToolButtonState()
 {
@@ -209,51 +209,51 @@ void WellenreiterMainWindow::changedSniffingState()
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
     delete infoIconSet;
     delete settingsIconSet;
     delete startIconSet;
     delete stopIconSet;
 };
 
 void WellenreiterMainWindow::demoAddStations()
 {
     mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 );
     mw->netView()->addNewItem( "managed", "Vanille", "00:30:6D:EF:A6:23", true, 11, 10 );
     mw->netView()->addNewItem( "adhoc", "ELAN", "00:A0:F8:E7:16:22", false, 3, 10 );
     mw->netView()->addNewItem( "adhoc", "ELAN", "00:AA:01:E7:56:62", false, 3, 15 );
     mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 );
 }
 
 
 QString WellenreiterMainWindow::getFileName( bool save )
 {
     QMap<QString, QStringList> map;
     map.insert( tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
-    map.insert(tr("Text"), text );
+    map.insert( tr("Text"), text );
     text << "*";
-    map.insert(tr("All"), text );
+    map.insert( tr("All"), text );
 
     QString str;
     if ( save )
     {
         #ifdef QWS
         str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getSaveFileName();
         #endif
         if ( str.isEmpty() || QFileInfo(str).isDir() )
             return "";
     }
     else
     {
         #ifdef QWS
         str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getOpenFileName();
         #endif
         if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )
             return "";
     }
     return str;
 }
@@ -330,32 +330,33 @@ void WellenreiterMainWindow::fileLoadSession()
         {
             QDataStream t( &f );
             t >> *mw->netView();
             f.close();
             qDebug( "Loaded session from file '%s'", (const char*) fname );
         }
         else
         {
             qDebug( "Problem loading session from file '%s'", (const char*) fname );
         }
     }
 }
 
 void WellenreiterMainWindow::fileNew()
 {
     mw->netView()->clear();
     mw->logWindow()->clear();
     mw->hexWindow()->clear();
 }
 
 void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
 {
     if ( mw->isDaemonRunning() )
     {
-        QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." );
+        QMessageBox::warning( this, "Wellenreiter/Opie",
+                              tr( "Sniffing in progress!\nPlease stop sniffing before closing." ) );
         e->ignore();
     }
     else
     {
         QMainWindow::closeEvent( e );
     }
 }