1 files changed, 32 insertions, 24 deletions

diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 868b0b0..ab7e0c7 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -54,51 +54,45 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     #ifndef QWS
     setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
     setIconText( "Wellenreiter/X11" );
     #endif
 
-    // setup icon sets
-
-    infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) );
-    settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) );
-    startIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) );
-    stopIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) );
-
     // setup tool buttons
 
     startButton = new QToolButton( 0 );
     #ifdef QWS
     startButton->setAutoRaise( true );
     #endif
-    startButton->setIconSet( *startIconSet );
+    startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) );
     startButton->setEnabled( false );
     connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
 
     stopButton = new QToolButton( 0 );
     #ifdef QWS
     stopButton->setAutoRaise( true );
     #endif
-    stopButton->setIconSet( *stopIconSet );
+    stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) );
     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 );
+    d->setIconSet( Resource::loadIconSet( "wellenreiter/SettingsIcon" ) );
     connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
 
+    uploadButton = new QToolButton( 0 );
+    #ifdef QWS
+    uploadButton->setAutoRaise( true );
+    #endif
+    uploadButton->setIconSet( Resource::loadIconSet( "up" ) );
+    uploadButton->setEnabled( false );
+    connect( uploadButton, SIGNAL( clicked() ), this, SLOT( uploadSession() ) );
+
     // setup menu bar
 
     int id;
 
     QMenuBar* mb = menuBar();
 
@@ -113,12 +107,14 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     QPopupMenu* file = new QPopupMenu( mb );
     file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
     id = file->insertItem( tr( "&Load" ), fileLoad );
     file->insertItem( tr( "&Save" ), fileSave );
     file->insertSeparator();
+    uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) );
+    file->insertSeparator();
     file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( tr( "&Configure..." ) );
 
     QPopupMenu* sniffer = new QPopupMenu( mb );
@@ -136,21 +132,22 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     //id = mb->insertItem( tr( "&View" ), view );
     //mb->setItemEnabled( id, false );
     id = mb->insertItem( tr( "&Sniffer" ), sniffer );
 
     id = mb->insertItem( tr( "&Demo" ), demo );
     mb->setItemEnabled( id, true );
+    mb->setItemEnabled( uploadID, false );
 
     #ifdef QWS
     mb->insertItem( startButton );
     mb->insertItem( stopButton );
-    mb->insertItem( c );
+    mb->insertItem( uploadButton );
     mb->insertItem( d );
     #else // Qt3 changed the insertion order. It's now totally random :(
     mb->insertItem( d );
-    mb->insertItem( c );
+    mb->insertItem( uploadButton );
     mb->insertItem( stopButton );
     mb->insertItem( startButton );
     #endif
 
     updateToolButtonState();
 
@@ -176,13 +173,12 @@ void WellenreiterMainWindow::showConfigure()
     int result = cw->exec();
 
     if ( result ) updateToolButtonState();
 }
 
 
-
 void WellenreiterMainWindow::updateToolButtonState()
 {
     const QString& interface = cw->interfaceName->currentText();
     const int cardtype = cw->driverType();
 
     if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
@@ -201,23 +197,27 @@ void WellenreiterMainWindow::updateToolButtonState()
 void WellenreiterMainWindow::changedSniffingState()
 {
     startButton->setEnabled( !mw->sniffing );
     menuBar()->setItemEnabled( startID, !mw->sniffing );
     stopButton->setEnabled( mw->sniffing );
     menuBar()->setItemEnabled( stopID, mw->sniffing );
+
+    if ( !mw->sniffing )
+    {
+        menuBar()->setItemEnabled( uploadID, true );
+        uploadButton->setEnabled( true );
+    }
 }
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
-    delete infoIconSet;
-    delete settingsIconSet;
-    delete startIconSet;
-    delete stopIconSet;
+    qDebug( "Wellenreiter:: bye." );
 };
 
+
 void WellenreiterMainWindow::demoAddStations()
 {
     //mw = 0; // test SIGSGV handling
 
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 10.10, 20.20 ) );
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) );
@@ -340,19 +340,21 @@ void WellenreiterMainWindow::fileLoadSession()
         {
             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",
                               tr( "Sniffing in progress!\nPlease stop sniffing before closing." ) );
@@ -362,6 +364,12 @@ void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
     {
         QMainWindow::closeEvent( e );
     }
 }
 
 
+void WellenreiterMainWindow::uploadSession()
+{
+    QMessageBox::warning( this, "Wellenreiter/Opie",
+                        tr( "This feature is\nunder construction... ;-)" ) );
+}
+