add child item factory to allow subclasses adding custom data items

4 files changed, 64 insertions, 27 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
@@ -123,6 +123,11 @@ void OListView::setColumnSeparator( const QPen& p )
     repaint();
 }
 
+OListViewItem* OListView::childFactory()
+{
+    return new OListViewItem( this );
+}
+
 #ifndef QT_NO_DATASTREAM
 void OListView::serializeTo( QDataStream& s ) const
 {
@@ -180,7 +185,7 @@ void OListView::serializeFrom( QDataStream& s )
 
     for ( int i = 0; i < items; ++i )
     {
-        OListViewItem* item = new OListViewItem( this );
+        OListViewItem* item = childFactory();
         s >> *item;
     }
 
@@ -337,6 +342,11 @@ void OListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, in
     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
 {
@@ -388,7 +398,7 @@ void OListViewItem::serializeFrom( QDataStream& s )
 
     for ( int i = 0; i < items; ++i )
     {
-        OListViewItem* item = new OListViewItem( this );
+        OListViewItem* item = childFactory();
         s >> (*item);
     }
 
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
@@ -38,7 +38,7 @@
 #include <qpen.h>
 #include <qdatastream.h>
 
-class OListViewFactory;
+class OListViewItem;
 
 /**
  * A @ref QListView variant featuring visual and functional enhancements
@@ -115,6 +115,12 @@ class OListViewFactory;
     */
     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
@@ -129,22 +135,10 @@ class OListViewFactory;
     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
@@ -201,6 +195,12 @@ class OListViewItem: public QListViewItem
     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
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
@@ -53,6 +53,11 @@ MScanListView::~MScanListView()
 {
 };
 
+OListViewItem* MScanListView::childFactory()
+{
+    return new MScanListItem( this );
+}
+
 void MScanListView::serializeTo( QDataStream& s) const
 {
     qDebug( "serializing MScanListView" );
@@ -198,14 +203,34 @@ MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid
     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 )
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
@@ -33,6 +33,7 @@ class MScanListView: public OListView
 
     void setManufacturerDB( ManufacturerDB* manufacturerdb );
 
+    virtual OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
@@ -50,20 +51,20 @@ 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:
@@ -86,6 +87,7 @@ class MScanListItem: public OListViewItem
 
     void setManufacturer( const QString& manufacturer );
 
+    virtual OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );