1 files changed, 113 insertions, 17 deletions

diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index cdc2c48..58a04fb 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -16,8 +16,6 @@
 #include "scanlist.h"
-#include "scanlistitem.h"
 
 #include <assert.h>
-
 #include "manufacturers.h"
-
+#include <qdatetime.h>
 #include <qtextstream.h>
@@ -52,3 +50,3 @@ MScanListView::MScanListView( QWidget* parent, const char* name )
 };
-    
+
 MScanListView::~MScanListView()
@@ -57,2 +55,14 @@ MScanListView::~MScanListView()
 
+void MScanListView::serializeTo( QDataStream& s) const
+{
+    qDebug( "serializing MScanListView" );
+    OListView::serializeTo( s );
+}
+
+void MScanListView::serializeFrom( QDataStream& s)
+{
+    qDebug( "serializing MScanListView" );
+    OListView::serializeFrom( s );
+}
+
 void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb )
@@ -71,5 +81,5 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
         channel );
-        
+
     // search, if we already have seen this net
-      
+
     QString s;
@@ -100,5 +110,5 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
         item->setPixmap( 0, *nextpixmap ); */
-        
+
         //qDebug( "current pixmap %d, next %d", pixmap, nextpixmap );
-        
+
         // we have already seen this net, check all childs if MAC exists
@@ -115,3 +125,3 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
         }
-        
+
         if ( item )
@@ -155,13 +165,99 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
 
-void MScanListView::dump( QTextStream& t ) const
+#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 )
+               :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
+                _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
+                _channel( channel ), _signal( signal ), _beacons( 0 )
 {
-    qDebug( "dumping scanlist..." );
+    qDebug( "creating scanlist item" );
+    decorateItem( type, essid, macaddr, wep, channel, signal );
+}
 
-    QListViewItemIterator it( const_cast<MScanListView*>( this ) );
-    for ( ; it.current(); ++it )
-    {
-        static_cast<MScanListItem*>( it.current() )->dump( t );
-    }
+MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr,
+                              bool wep, int channel, int signal )
+               :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
+{
+    qDebug( "creating scanlist item" );
+    decorateItem( type, essid, macaddr, wep, channel, signal );
+}
 
-    qDebug( "dump finished." );
+void MScanListItem::serializeTo( QDataStream& s ) const
+{
+    OListViewItem::serializeTo( s );
+}
+
+void MScanListItem::serializeFrom( QDataStream& s )
+{
+    OListViewItem::serializeFrom( s );
 }
+
+void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
+{
+    qDebug( "decorating scanlist item %s / %s / %s [%d]",
+        (const char*) type,
+        (const char*) essid,
+        (const char*) macaddr,
+        channel );
+
+    // 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" ) ); //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;
+    _type = type;
+    _essid = essid;
+    _macaddr = macaddr;
+    _channel = channel;
+    _beacons = 0;
+    _signal = 0;
+}
+
+void MScanListItem::setManufacturer( const QString& manufacturer )
+{
+    setText( col_manuf, 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() );
+}
+