7 files changed, 53 insertions, 13 deletions

diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp
index c355f09..f132f56 100644
--- a/noncore/net/wellenreiter/gui/logwindow.cpp
+++ b/noncore/net/wellenreiter/gui/logwindow.cpp
@@ -24,7 +24,7 @@ MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f )
     
     // FIXME: Set properties( font, read-only, etc...)
     
-};
+}
 
 void MLogWindow::log( QString text )
 {
@@ -34,6 +34,9 @@ void MLogWindow::log( QString text )
     ledit->append( line );
     qDebug( line );
 
-};
-
+}
 
+const QString MLogWindow::getLog() const
+{
+    return ledit->text();
+}
diff --git a/noncore/net/wellenreiter/gui/logwindow.h b/noncore/net/wellenreiter/gui/logwindow.h
index 325f8d0..253defa 100644
--- a/noncore/net/wellenreiter/gui/logwindow.h
+++ b/noncore/net/wellenreiter/gui/logwindow.h
@@ -26,9 +26,10 @@ class MLogWindow: public QVBox
 
   public:
     MLogWindow( QWidget * parent = 0, const char * name = "MLogWindow", WFlags f = 0 );
-  
+
     void log( QString text );
-    
+    const QString getLog() const;
+
   protected:
     QMultiLineEdit* ledit;
 
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 2d5ecd2..cb003dd 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -14,16 +14,19 @@
 **********************************************************************/
 
 #include "configwindow.h"
+#include "logwindow.h"
 #include "mainwindow.h"
 #include "wellenreiter.h"
 
 #include "scanlist.h"
 
 #include <qcombobox.h>
+#include <qfile.h>
 #include <qiconset.h>
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qstatusbar.h>
+#include <qtextstream.h>
 #include <qtoolbutton.h>
 
 #ifdef QWS
@@ -79,11 +82,17 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     // setup menu bar
 
+    int id;
+
     QMenuBar* mb = menuBar();
 
+    QPopupMenu* fileSave = new QPopupMenu( mb );
+    fileSave->insertItem( "&Log", this, SLOT( fileSaveLog() ) );
+
     QPopupMenu* file = new QPopupMenu( mb );
-    file->insertItem( "&Load..." );
-    file->insertItem( "&Save..." );
+    id = file->insertItem( "&Load" );
+    file->setItemEnabled( id, false );
+    file->insertItem( "&Save", fileSave );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( "&Configure..." );
@@ -95,9 +104,7 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     QPopupMenu* demo = new QPopupMenu( mb );
     demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) );
 
-    int id;
     id = mb->insertItem( "&File", file );
-    mb->setItemEnabled( id, false );
     id = mb->insertItem( "&View", view );
     mb->setItemEnabled( id, false );
     id = mb->insertItem( "&Sniffer", sniffer );
@@ -172,3 +179,20 @@ void WellenreiterMainWindow::demoAddStations()
     mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 );
 }
 
+void WellenreiterMainWindow::fileSaveLog()
+{
+    const QString fname( "/tmp/log.txt" );
+    QFile f( fname );
+    if ( f.open(IO_WriteOnly) )
+    {
+        QTextStream t( &f );
+        t << mw->logWindow()->getLog();
+        f.close();
+        qDebug( "saved log in file '%s'", (const char*) fname );
+    }
+    else
+    {
+        qDebug( "Problem saving log in file '%s'", (const char*) fname );
+    }
+
+}
\ No newline at end of file
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index 22c21e8..03aa08a 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -46,6 +46,7 @@ class WellenreiterMainWindow: public QMainWindow
   public slots:
     void showConfigure();
     void demoAddStations();
+    void fileSaveLog();
 };
 
 #endif
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index ab19701..a689cca 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -41,6 +41,10 @@ MScanListView::MScanListView( QWidget* parent, const char* name )
     setColumnAlignment( 5, AlignCenter );
     addColumn( tr( "Manufacturer" ) );
     setColumnAlignment( 6, AlignCenter );
+    addColumn( tr( "First Seen" ) );
+    setColumnAlignment( 7, AlignCenter );
+    addColumn( tr( "Last Seen" ) );
+    setColumnAlignment( 8, AlignCenter );
     setRootIsDecorated( true );
     setAllColumnsShowFocus( true );
 };
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.cpp b/noncore/net/wellenreiter/gui/scanlistitem.cpp
index 15aef0c..dd33f5f 100644
--- a/noncore/net/wellenreiter/gui/scanlistitem.cpp
+++ b/noncore/net/wellenreiter/gui/scanlistitem.cpp
@@ -15,6 +15,7 @@
 
 #include "scanlistitem.h"
 #include <assert.h>
+#include <qdatetime.h>
 #include <qpixmap.h>
 
 #ifdef QWS
@@ -31,6 +32,8 @@ const int col_channel = 3;
 const int col_wep = 4;
 const int col_traffic = 5;
 const int col_manuf = 6;
+const int col_firstseen = 7;
+const int col_lastseen = 8;
 
 MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr,
                               bool wep, int channel, int signal )
@@ -65,17 +68,20 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
 
     // set icon for wep (wireless encryption protocol)
     if ( wep )
-        setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); // rename the pixmap!
+        setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
 
     // set channel and signal text
-    
+
     if ( signal != -1 )
         setText( col_sig, QString::number( signal ) );
     if ( channel != -1 )
         setText( col_channel, QString::number( channel ) );
 
+    setText( col_firstseen, QTime::currentTime().toString() );
+    //setText( col_lastseen, QTime::currentTime().toString() );
+
     listView()->triggerUpdate();
-    
+
     this->type = type;
 
 }
@@ -92,5 +98,5 @@ void MScanListItem::receivedBeacon()
     qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons );
     #endif
     setText( col_sig, QString::number( _beacons ) );
+    setText( col_lastseen, QTime::currentTime().toString() );
 }
-    
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index 61960d2..ff523d4 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -52,6 +52,7 @@ class Wellenreiter : public WellenreiterBase {
 
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
+    MLogWindow* logWindow() const { return logwindow; };
 
   protected:
     bool daemonRunning;