add child item factory to allow subclasses adding custom data items

4 files changed, 68 insertions, 31 deletions

diff --git a/noncore/net/wellenreiter/cornucopia/olistview.cpp b/noncore/net/wellenreiter/cornucopia/olistview.cpp
index f2d3730..c292eb9 100644
--- a/noncore/net/wellenreiter/cornucopia/olistview.cpp
+++ b/noncore/net/wellenreiter/cornucopia/olistview.cpp
@@ -118,16 +118,21 @@ const QPen& OListView::columnSeparator() const
 }
 
 void OListView::setColumnSeparator( const QPen& p )
 {
     m_columnSeparator = p;
     repaint();
 }
 
+OListViewItem* OListView::childFactory()
+{
+    return new OListViewItem( this );
+}
+
 #ifndef QT_NO_DATASTREAM
 void OListView::serializeTo( QDataStream& s ) const
 {
     #warning Caution... the binary format is still under construction...
     qDebug( "storing OListView..." );
 
     // store number of columns and the labels
     s << columns();
@@ -175,17 +180,17 @@ void OListView::serializeFrom( QDataStream& s )
     }
 
     int items;
     s >> items;
     qDebug( "read number of items = %d", items );
 
     for ( int i = 0; i < items; ++i )
     {
-        OListViewItem* item = new OListViewItem( this );
+        OListViewItem* item = childFactory();
         s >> *item;
     }
 
     qDebug( "OListView loaded." );
 
 }
 
 QDataStream& operator<<( QDataStream& s, const OListView& lv )
@@ -332,16 +337,21 @@ void OListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, in
 
     //FIXME: Use styling here!
 
     const QPen& pen = static_cast<OListView*>( listView() )->columnSeparator();
     p->setPen( pen );
     p->drawLine( width-1, 0, width-1, height() );
 }
 
+OListViewItem* OListViewItem::childFactory()
+{
+    return new OListViewItem( this );
+}
+
 #ifndef QT_NO_DATASTREAM
 void OListViewItem::serializeTo( QDataStream& s ) const
 {
     #warning Caution... the binary format is still under construction...
     qDebug( "storing OListViewItem..." );
 
     // store item text
     for ( int i = 0; i < listView()->columns(); ++i )
@@ -383,17 +393,17 @@ void OListViewItem::serializeFrom( QDataStream& s )
     }
 
     int items;
     s >> items;
     qDebug( "read number of items = %d", items );
 
     for ( int i = 0; i < items; ++i )
     {
-        OListViewItem* item = new OListViewItem( this );
+        OListViewItem* item = childFactory();
         s >> (*item);
     }
 
     qDebug( "OListViewItem loaded." );
 }
 
 QDataStream& operator<<( QDataStream& s, const OListViewItem& lvi )
 {
diff --git a/noncore/net/wellenreiter/cornucopia/olistview.h b/noncore/net/wellenreiter/cornucopia/olistview.h
index 9df5500..8911e22 100644
--- a/noncore/net/wellenreiter/cornucopia/olistview.h
+++ b/noncore/net/wellenreiter/cornucopia/olistview.h
@@ -33,17 +33,17 @@
 #ifndef OLISTVIEW_H
 #define OLISTVIEW_H
 
 #include <qcolor.h>
 #include <qlistview.h>
 #include <qpen.h>
 #include <qdatastream.h>
 
-class OListViewFactory;
+class OListViewItem;
 
 /**
  * A @ref QListView variant featuring visual and functional enhancements
  * like an alternate background for odd rows, an autostretch mode
  * for the width of the widget ( >= Qt 3 only ) and persistence capabilities.
  *
  * @author Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
  * @short OListView list/tree widget.
@@ -110,46 +110,40 @@ class OListViewFactory;
     */
     const QColor& alternateBackground() const;
 
    /**
     * @return the column separator pen
     */
     const QPen& columnSeparator() const;
 
+   /**
+    * create a list view item as child of this object
+    * @return the new object
+    */
+    virtual OListViewItem* childFactory();
+
     #ifndef QT_NO_DATASTREAM
    /**
     * serialize this object to a @ref QDataStream
     * @param s the stream used to serialize this object.
     */
     virtual void serializeTo( QDataStream& s ) const;
 
    /**
     * serialize this object from a @ref QDataStream
     * @param s the stream used to serialize this object.
     */
     virtual void serializeFrom( QDataStream& s );
     #endif
 
-   /**
-    * returns a factory for OListView classes
-    * creates one on the fly if it doesn't exist
-    * @return the XML Factory
-    */
-    #ifndef QT_NO_XML
-    //OListViewFactory* Factory();
-    #endif
-
   private:
     QColor m_alternateBackground;
     bool m_fullWidth;
     QPen m_columnSeparator;
-    #ifndef QT_NO_XML
-    //OListViewFactory* m_Factory;
-    #endif
 };
 
 #ifndef QT_NO_DATASTREAM
 /**
   * \relates QListView
   * Writes a listview to the stream and returns a reference to the stream.
   */
 QDataStream& operator<<( QDataStream& s, const OListView& lv );
@@ -196,16 +190,22 @@ class OListViewItem: public QListViewItem
 
     virtual ~OListViewItem();
 
     const QColor& backgroundColor();
     bool isAlternate();
     void paintCell( QPainter *p, const QColorGroup &cg, int column, int width, int alignment );
     void init();
 
+   /**
+    * create a list view item as child of this object
+    * @return the new object
+    */
+    virtual OListViewItem* childFactory();
+
     #ifndef QT_NO_DATASTREAM
    /**
     * serialize this object to or from a @ref QDataStream
     * @param s the stream used to serialize this object.
     */
     virtual void serializeTo( QDataStream& s ) const;
 
    /**
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 58a04fb..be1245e 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -48,16 +48,21 @@ MScanListView::MScanListView( QWidget* parent, const char* name )
     setRootIsDecorated( true );
     setAllColumnsShowFocus( true );
 };
 
 MScanListView::~MScanListView()
 {
 };
 
+OListViewItem* MScanListView::childFactory()
+{
+    return new MScanListItem( this );
+}
+
 void MScanListView::serializeTo( QDataStream& s) const
 {
     qDebug( "serializing MScanListView" );
     OListView::serializeTo( s );
 }
 
 void MScanListView::serializeFrom( QDataStream& s)
 {
@@ -91,38 +96,38 @@ void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bo
         qDebug( "itemtext: %s", (const char*) item->text( 0 ) );
         item = static_cast<MScanListItem*> ( item->itemBelow() );
     }
     if ( item )
     {
         // animate the item
         
         /*
-        
+
         const QPixmap* pixmap = item->pixmap( 0 );
         const QPixmap* nextpixmap = ani2;
         if ( pixmap == ani1 )
             nextpixmap = ani2;
         else if ( pixmap == ani2 )
             nextpixmap = ani3;
         else if ( pixmap == ani3 )
             nextpixmap = ani4;
         else if ( pixmap == ani4 )
             nextpixmap = ani1;
         item->setPixmap( 0, *nextpixmap ); */
 
         //qDebug( "current pixmap %d, next %d", pixmap, nextpixmap );
 
         // we have already seen this net, check all childs if MAC exists
-        
+
         network = item;
-        
+
         item = static_cast<MScanListItem*> ( item->firstChild() );
         assert( item ); // this shouldn't fail
-        
+
         while ( item && ( item->text( 2 ) != macaddr ) )
         {
             qDebug( "subitemtext: %s", (const char*) item->text( 2 ) );
             item = static_cast<MScanListItem*> ( item->itemBelow() );
         }
 
         if ( item )
         {
@@ -193,24 +198,44 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS
 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 );
 }
 
+OListViewItem* MScanListItem::childFactory()
+{
+    return new MScanListItem( this );
+}
+
 void MScanListItem::serializeTo( QDataStream& s ) const
 {
+    qDebug( "serializing MScanListItem" );
     OListViewItem::serializeTo( s );
+
+    s << _type;
+    s << (Q_UINT8) _wep;
 }
 
 void MScanListItem::serializeFrom( QDataStream& s )
 {
+    qDebug( "serializing MScanListItem" );
     OListViewItem::serializeFrom( s );
+
+    s >> _type;
+    s >> (Q_UINT8) _wep;
+
+    QString name;
+    name.sprintf( "wellenreiter/%s", (const char*) _type );
+    setPixmap( col_type, Resource::loadPixmap( name ) );
+    if ( _wep )
+        setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
+    listView()->triggerUpdate();
 }
 
 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,
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 66c701b..222217c 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -28,16 +28,17 @@ class MScanListView: public OListView
   Q_OBJECT
 
   public:
     MScanListView( QWidget* parent = 0, const char* name = 0 );
     virtual ~MScanListView();
 
     void setManufacturerDB( ManufacturerDB* manufacturerdb );
 
+    virtual OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
   public slots:
     void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
 
   private:
     ManufacturerDB* _manufacturerdb;
@@ -45,30 +46,30 @@ class MScanListView: public OListView
 };
 
 //****************************** MScanListItem ****************************************************************
 
 class MScanListItem: public OListViewItem
 {
   public:
     MScanListItem::MScanListItem( QListView* parent,
-                                  QString type,
-                                  QString essid,
-                                  QString macaddr,
-                                  bool wep,
-                                  int channel,
-                                  int signal );
+                                  QString type = "unknown",
+                                  QString essid = "unknown",
+                                  QString macaddr = "unknown",
+                                  bool wep = false,
+                                  int channel = 0,
+                                  int signal = 0 );
 
     MScanListItem::MScanListItem( QListViewItem* parent,
-                                  QString type,
-                                  QString essid,
-                                  QString macaddr,
-                                  bool wep,
-                                  int channel,
-                                  int signal );
+                                  QString type = "unknown",
+                                  QString essid = "unknown",
+                                  QString macaddr = "unknown",
+                                  bool wep = false,
+                                  int channel = 0,
+                                  int signal = 0 );
 
 
   protected:
     virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
 
   public:
     QString type;
 
@@ -81,16 +82,17 @@ class MScanListItem: public OListViewItem
     int signal() { return _signal; };
     int beacons() { return _beacons; };
 
     void setSignal( int signal ) { /* TODO */ };
     void receivedBeacon();
 
     void setManufacturer( const QString& manufacturer );
 
+    virtual OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
   private:
     QString _type;
     QString _essid;
     QString _macaddr;
     bool _wep;