- write simple log

- record first seen / last seen per item

7 files changed, 49 insertions, 9 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
@@ -19,21 +19,24 @@
 
 MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f )
            :QVBox( parent, name, f )
 {
     ledit = new QMultiLineEdit( this );
     
     // FIXME: Set properties( font, read-only, etc...)
     
-};
+}
 
 void MLogWindow::log( QString text )
 {
     QTime time = QTime::currentTime();
     QString line;
     line.sprintf( "[%s] %s", (const char*) time.toString(), (const char*) 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
@@ -23,16 +23,17 @@ class QMultiLineEdit;
 
 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;
 
 };
 
 #endif
 
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
@@ -9,26 +9,29 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #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
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
@@ -74,35 +77,39 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     QToolButton* d = new QToolButton( 0 );
     d->setAutoRaise( true );
     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( "&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..." );
 
     QPopupMenu* sniffer = new QPopupMenu( mb );
     sniffer->insertItem( "&Configure..." );
     sniffer->insertSeparator();
 
     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 );
     mb->setItemEnabled( id, false );
     id = mb->insertItem( "&Demo", demo );
     mb->setItemEnabled( id, true );
 
     #ifdef QWS
@@ -167,8 +174,25 @@ void WellenreiterMainWindow::demoAddStations()
 {
     mw->netView()->addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 );
     mw->netView()->addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 );
     mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 );
     mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 );
     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
@@ -41,11 +41,12 @@ class WellenreiterMainWindow: public QMainWindow
     const QIconSet* settingsIconSet;
     const QIconSet* cancelIconSet;
 
     QToolButton* startStopButton;
 
   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
@@ -36,16 +36,20 @@ MScanListView::MScanListView( QWidget* parent, const char* name )
     addColumn( tr( "Chn" ) );
     setColumnAlignment( 3, AlignCenter );
     addColumn( tr( "W" ) );
     setColumnAlignment( 4, AlignCenter );
     addColumn( tr( "T" ) );
     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 );
 };
     
 MScanListView::~MScanListView()
 {
 };
 
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
@@ -10,32 +10,35 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "scanlistitem.h"
 #include <assert.h>
+#include <qdatetime.h>
 #include <qpixmap.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 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 )
                :QListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 0 )
 {
     qDebug( "creating scanlist item" );
@@ -60,25 +63,28 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr,
 
     // set icon for managed or adhoc mode
     QString name;
     name.sprintf( "wellenreiter/%s", (const char*) type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
 
     // 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;
 
 }
 
 void MScanListItem::setManufacturer( const QString& manufacturer )
 {
@@ -87,10 +93,10 @@ void MScanListItem::setManufacturer( const QString& manufacturer )
 
 void MScanListItem::receivedBeacon()
 {
     _beacons++;
     #ifdef DEBUG
     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
@@ -47,16 +47,17 @@ class Wellenreiter : public WellenreiterBase {
     Q_OBJECT
 
   public:
     Wellenreiter( QWidget* parent = 0 );
     ~Wellenreiter();
 
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
+    MLogWindow* logWindow() const { return logwindow; };
 
   protected:
     bool daemonRunning;
 
   public slots:
     void dataReceived();
     void startStopClicked();