Add save of node specific config data

27 files changed, 224 insertions, 135 deletions

diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
index 3d1aa69..4579e37 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
@@ -7,24 +7,25 @@
 // BLUETOOTH PAN/NAP node
 //
 //
 
 static const char * BluetoothBNEPNeeds[] = 
     { 0
     };
 
 /**
  * Constructor, find all of the possible interfaces
  */
 BluetoothBNEPNetNode::BluetoothBNEPNetNode() : ANetNode() {
+      InstanceCount = 7; // default
 }
 
 /**
  * Delete any interfaces that we own.
  */
 BluetoothBNEPNetNode::~BluetoothBNEPNetNode(){
 }
 
 const QString BluetoothBNEPNetNode::nodeDescription(){
       return tr("\
 <p>Sets up a bluetooth link using the bluetooth Network profile.</p>\
 <p>Use this to connect two computing devices.</p>\
@@ -55,27 +56,40 @@ bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) {
 
 bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 1;
 }
 
 QString BluetoothBNEPNetNode::genNic( long nr ) { 
       QString S; 
       return S.sprintf( "bnep%ld", nr );
 }
 
+
+void BluetoothBNEPNetNode::setSpecificAttribute( QString & A, QString & V ) {
+      if( A == "interfacecount" ) {
+        InstanceCount = V.toLong();
+      }
+}
+
+void BluetoothBNEPNetNode::saveSpecificAttribute( QTextStream & TS) {
+      TS << "interfacecount="
+         << InstanceCount
+         << endl;
+}
+
 //
 //
-// BLUETOOTH PAN/NAP node
+// BLUETOOTH RFCOMM
 //
 //
 
 static const char * BluetoothRFCOMMNeeds[] = 
     { 0
     };
 
 BluetoothRFCOMMNetNode::BluetoothRFCOMMNetNode() : ANetNode() {
 }
 
 BluetoothRFCOMMNetNode::~BluetoothRFCOMMNetNode(){
 }
@@ -106,18 +120,24 @@ bool BluetoothRFCOMMNetNode::generateProperFilesFor(
 }
 
 bool BluetoothRFCOMMNetNode::hasDataFor( const QString &  ) {
       return 0;
 }
 
 bool BluetoothRFCOMMNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 0;
 }
 
+void BluetoothRFCOMMNetNode::setSpecificAttribute( QString &, QString & ) {
+}
+
+void BluetoothRFCOMMNetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new BluetoothBNEPNetNode() );
       PNN.append( new BluetoothRFCOMMNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
index 5cd6c52..882d2e3 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.h
@@ -24,29 +24,35 @@ public:
 
     virtual ANetNodeInstance * createInstance( void );
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & S );
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & , long DevNr );
 
     virtual long instanceCount( void )
-      { return 7; }
+      { return InstanceCount; }
     virtual QString genNic( long );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
+
+      // number of interfaces for this device
+      long InstanceCount;
+
 };
 
 class BluetoothRFCOMMNetNode : public ANetNode {
 
     Q_OBJECT
 
 public:
 
     BluetoothRFCOMMNetNode();
     virtual ~BluetoothRFCOMMNetNode();
 
     virtual const QString pixmapName() 
@@ -60,20 +66,22 @@ public:
     virtual ANetNodeInstance * createInstance( void );
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & S );
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & , long );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp
index a6be4d5..dd41c1f 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NN.cpp
@@ -38,17 +38,23 @@ const char * CableNetNode::provides( void ) {
 
 bool CableNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
       return 1;
 }
 
 bool CableNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 1;
 }
 
+void CableNetNode::setSpecificAttribute( QString & , QString &  ) {
+}
+
+void CableNetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new CableNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/cable/cable_NN.h b/noncore/settings/networksettings2/cable/cable_NN.h
index 83b98e0..b37f31a 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.h
+++ b/noncore/settings/networksettings2/cable/cable_NN.h
@@ -26,20 +26,22 @@ public:
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & )
       { return 0; }
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr);
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/irda/irda_NN.cpp b/noncore/settings/networksettings2/irda/irda_NN.cpp
index 96327a5..49b7707 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.cpp
+++ b/noncore/settings/networksettings2/irda/irda_NN.cpp
@@ -38,17 +38,23 @@ const char * IRDANetNode::provides( void ) {
 
 bool IRDANetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
       return 1;
 }
 
 bool IRDANetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 1;
 }
 
+void IRDANetNode::setSpecificAttribute( QString & , QString & ) {
+}
+
+void IRDANetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new IRDANetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/irda/irda_NN.h b/noncore/settings/networksettings2/irda/irda_NN.h
index a5b6cc5..2dcef74 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.h
+++ b/noncore/settings/networksettings2/irda/irda_NN.h
@@ -26,20 +26,22 @@ public:
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & )
         { return 0; }
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.cpp b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
index 480ddf9..ba1c1f8 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NN.cpp
+++ b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
@@ -1,22 +1,23 @@
 #include "lancard_NN.h"
 #include "lancard_NNI.h"
 
 static const char * LanCardNeeds[] = 
     { 0 };
 
 /**
  * Constructor, find all of the possible interfaces
  */
 LanCardNetNode::LanCardNetNode() : ANetNode() {
+    InstanceCount = 2;
 }
 
 /**
  * Delete any interfaces that we own.
  */
 LanCardNetNode::~LanCardNetNode(){
 }
 
 const QString LanCardNetNode::nodeDescription(){
       return tr("\
 <p>Sets up a wired regular LAN card.</p>\
 <p>Use this to set up 10/100/1000 MBit LAN cards.</p>\
@@ -56,17 +57,29 @@ bool LanCardNetNode::generateDeviceDataForCommonFile(
         S << "# check if " << NIC << " can be brought UP" << endl;
         S << "mapping " << NIC << endl;
         S << "  script networksettings2-request" << endl << endl;
       }
       return 0;
 }
 
 QString LanCardNetNode::genNic( long nr ) { 
       QString S; 
       return S.sprintf( "eth%ld", nr );
 }
 
+void LanCardNetNode::setSpecificAttribute( QString & A, QString & V ) {
+      if( A == "interfacecount" ) {
+        InstanceCount = V.toLong();
+      }
+}
+
+void LanCardNetNode::saveSpecificAttribute( QTextStream & TS) {
+      TS << "interfacecount="
+         << InstanceCount
+         << endl;
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new LanCardNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.h b/noncore/settings/networksettings2/lancard/lancard_NN.h
index dcdd0da..5f2b25d 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NN.h
+++ b/noncore/settings/networksettings2/lancard/lancard_NN.h
@@ -24,26 +24,32 @@ public:
 
     virtual ANetNodeInstance * createInstance( void );
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & S );
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr );
 
     virtual long instanceCount( void )
-      { return 2; }
+      { return InstanceCount; }
 
     virtual QString genNic( long );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
+
+      // number of interfaces for this device
+      long InstanceCount;
+
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/modem/modem_NN.cpp b/noncore/settings/networksettings2/modem/modem_NN.cpp
index 65b06ee..1cc8524 100644
--- a/noncore/settings/networksettings2/modem/modem_NN.cpp
+++ b/noncore/settings/networksettings2/modem/modem_NN.cpp
@@ -39,17 +39,23 @@ const char * ModemNetNode::provides( void ) {
 
 bool ModemNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
       return 1;
 }
 
 bool ModemNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 1;
 }
 
+void ModemNetNode::setSpecificAttribute( QString & , QString & ) {
+}
+
+void ModemNetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new ModemNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/modem/modem_NN.h b/noncore/settings/networksettings2/modem/modem_NN.h
index 49244b2..849f928 100644
--- a/noncore/settings/networksettings2/modem/modem_NN.h
+++ b/noncore/settings/networksettings2/modem/modem_NN.h
@@ -26,20 +26,22 @@ public:
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & )
       { return 0; }
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index 4a77e6a..d27d54a 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -40,17 +40,23 @@ const char * NetworkNetNode::provides( void ) {
 
 bool NetworkNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
       return 1;
 }
 
 bool NetworkNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 1;
 }
 
+void NetworkNetNode::setSpecificAttribute( QString & , QString & ) {
+}
+
+void NetworkNetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new NetworkNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/network/network_NN.h b/noncore/settings/networksettings2/network/network_NN.h
index 59f0526..0f87e1b 100644
--- a/noncore/settings/networksettings2/network/network_NN.h
+++ b/noncore/settings/networksettings2/network/network_NN.h
@@ -26,20 +26,22 @@ public:
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & )
       { return 0; }
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp
index fcc6044..3691e5a 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.cpp
+++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp
@@ -36,27 +36,42 @@ QString quote( QString X ) {
 
       X.replace( QRegExp("\""), "\\\"" );
       X.replace( QRegExp("\\"), "\\\\" );
       X.replace( QRegExp(" "), "\\ " );
 
       OutString += X;
       OutString += "\"";
       X = OutString;
     }
     return X;
 }
 
+
+//
+//
+// ANETNODE
 //
 //
+
+void ANetNode::saveAttributes( QTextStream & TS ) {
+    saveSpecificAttribute( TS );
+}
+
+void ANetNode::setAttribute( QString & Attr, QString & Value ){
+    setSpecificAttribute( Attr, Value );
+}
+
+//
 //
+// ANETNODEINSTANCE
 //
 //
 
 long ANetNodeInstance::InstanceCounter = -1;
 
 void ANetNodeInstance::initialize( void ) {
     if( InstanceCounter == -1 )
       InstanceCounter = time(0);
     // set name
     QString N;
     N.sprintf( "-%ld", InstanceCounter++ );
     N.prepend( NodeType->nodeName() );
@@ -73,25 +88,25 @@ void ANetNodeInstance::setAttribute( QString & Attr, QString & Value ){
 
 void ANetNodeInstance::saveAttributes( QTextStream & TS ) {
     TS << "name=" << quote( NodeName ) << endl;
     saveSpecificAttribute( TS );
 }
 
 ANetNodeInstance * ANetNodeInstance::nextNode( void ) {
     return connection()->findNext( this );
 }
 
 //
 //
-//
+// NODECOLLECTION
 //
 //
 
 long NodeCollection::MaxNr = -1;
 
 NodeCollection::NodeCollection( void ) : QList<ANetNodeInstance>() {
     IsModified = 0;
     Index = -1;
     Name="";
     IsNew = 1;
     CurrentState = Unchecked;
 }
@@ -260,43 +275,25 @@ QString NodeCollection::stateName( State_t S) {
     }
     return QString("");
 }
 
 void NodeCollection::reassign( void ) {
     for( QListIterator<ANetNodeInstance> it(*this); 
          it.current();
          ++it ) {
       it.current()->setConnection( this );
     }
 }
 
+//
+//
+// RUNTIMEINFO
+//
+//
+
 InterfaceInfo * RuntimeInfo::assignedInterface( void ) { 
     return netNode()->nextNode()->runtime()->assignedInterface(); 
 }
 
 AsDevice * RuntimeInfo::device( void ) { 
     return netNode()->nextNode()->runtime()->device(); 
 }
-
-ANetNodeInstance * FakeNetNode::createInstance( void ) {
-    return new FakeNetNodeInstance( this );
-}
-
-void FakeNetNodeInstance::setSpecificAttribute( 
-      QString & A, QString & V ) {
-      ValAttrPairs.insert( A, new QString(V) );
-}
-
-void FakeNetNodeInstance::saveSpecificAttribute( QTextStream &TS ) {
-        for( QDictIterator<QString> it( ValAttrPairs ); 
-             it.current();
-             ++ it ) {
-            TS << it.currentKey().latin1() 
-               << "=" 
-               << quote( *(it.current())) 
-               << endl ;
-            ++it;
-        }
-}
-
-// collects all info that no plugin acceps
-FakeNetNode * FakeNode = 0; 
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.h b/noncore/settings/networksettings2/networksettings2/netnode.h
index 9681c6e..6ec9ef6 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -106,35 +106,43 @@ public:
     { return strcmp( provides(), "fullsetup") == 0 ; }
 
   // generate NIC name based on instance nr
   // only relevant if node instances are devices
   virtual QString genNic( long ) 
     { return QString(""); }
 
   // max number of instances for this node type
   // only relevant if node instances are devices
   virtual long instanceCount( void ) 
     { return 1; }
 
+  // set the value of an attribute
+  void setAttribute( QString & Attr, QString & Value ) ;
+  void saveAttributes( QTextStream & TS ) ;
+
   // compiled references to 'needed' NetNodes -> needs list
   void setAlternatives( NetNodeList * Alt )
     { Alternatives = Alt; }
   NetNodeList & alternatives( void ) 
     { return *Alternatives; }
 
 protected :
 
   NetNodeList * Alternatives;
 
 private :
+
+  virtual void setSpecificAttribute( QString & , QString & ) = 0;
+  virtual void saveSpecificAttribute( QTextStream & ) = 0;
+
 };
 
 class ANetNodeInstance : public QObject {
 
 public:
 
   ANetNodeInstance( ANetNode * NN ) : QObject()
       { IsModified=0; NodeType = NN; IsNew = TRUE; }
   virtual ~ANetNodeInstance( void ) { }
 
   virtual RuntimeInfo * runtime( void ) = 0;
 
@@ -369,97 +377,13 @@ private :
       State_t CurrentState;
 
       QString Name;
       // true if this collection was just created (and not
       // loaded from file
       bool    IsNew;
       // index in listbox
       int Index;
       bool    IsModified;
 
 };
 
-//
-// special node that is used to remember entries for plugins
-// that seem missing.  This way we never loose data
-//
-
-class FakeNetNode : public ANetNode {
-
-public:
-
-  FakeNetNode( ) { };
-  virtual ~FakeNetNode(){};
-
-  const QString pixmapName() 
-    { return QString(""); }
-  const QString nodeName() 
-    { return QString("Fake node" ); }
-  const QString nodeDescription()
-    { return QString("Fake node" ); }
-  ANetNodeInstance * createInstance( void );
-  const char * provides( void )
-    { return ""; }
-  virtual const char ** needs( void )
-    { return 0; }
-  virtual bool generateProperFilesFor( ANetNodeInstance * )
-    { return 0; }
-  virtual bool hasDataFor( const QString & )
-    { return 0; }
-  virtual bool generateDeviceDataForCommonFile( 
-      SystemFile & , long )
-    {return 1; }
-
-private :
-
-};
-
-class FakeNetNodeInstance : public ANetNodeInstance {
-
-public:
-
-  FakeNetNodeInstance( ANetNode * NN ) : 
-        ANetNodeInstance( NN ), ValAttrPairs() { }
-  virtual ~FakeNetNodeInstance( void ) { }
-
-  virtual RuntimeInfo * runtime( void )
-    { return 0; }
-
-  // create edit widget under parent
-  virtual QWidget * edit( QWidget * )
-    { return 0; }
-  // is given data acceptable
-  virtual QString acceptable( void ) 
-    { return QString(""); }
-
-  // get data from GUI and store in node
-  virtual void commit( void ) {}
-
-  // get next node
-  ANetNodeInstance * nextNode()
-    { return 0; }
-  // return NetNode this is an instance of
-
-  // intialize am instance of a net node
-  void initialize( void ){}
-
-  // returns node specific data -> only useful for 'buddy'
-  virtual void * data( void ) 
-    { return 0; }
-
-  virtual bool hasDataFor( const QString & )
-    { return 0; }
-
-  virtual bool generateDataForCommonFile( SystemFile & , long )
-    { return 1; }
-
-protected :
-
-  virtual void setSpecificAttribute( QString & , QString & );
-  virtual void saveSpecificAttribute( QTextStream & );
-
-  QDict<QString>        ValAttrPairs;
-};
-
-extern FakeNetNode * FakeNode;
-
 #endif
diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h
index 3048fb3..7050f10 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.h
+++ b/noncore/settings/networksettings2/networksettings2/resources.h
@@ -46,41 +46,41 @@ public :
     TheNSResources( void );
     ~TheNSResources( );
 
     System & system()
       { return *TheSystem; }
 
     QPixmap getPixmap( const QString & Name );
 
     Name2NetNode_t & netNodes( void ) 
       { return AllNodeTypes; }
     bool netNodeExists( const QString & X )
       { return AllNodeTypes.find(X)!=0; }
+    ANetNode * findNetNode( const QString & N )
+      { NetNode_t * NNT = AllNodeTypes.find(N);
+        return (NNT) ? NNT->NetNode : 0;
+      }
 
     Name2SystemFile_t & systemFiles( void )
       { return SystemFiles; }
     void addSystemFile( SystemFile * SF )
       { SystemFiles.insert( SF->name(), SF ); }
 
     ANetNodeInstance * createNodeInstance( const QString & S )
       { ANetNodeInstance * NNI = 0;
         NetNode_t * NNT = AllNodeTypes[S];
-        ANetNode * NN;
         if( ! NNT ) {
-          NN = FakeNode = 
-            ( FakeNode ) ?  FakeNode : new FakeNetNode();
-        } else {
-          NN = NNT->NetNode;
+          return 0;
         }
-        NNI = NN->createInstance();
+        NNI = NNT->NetNode->createInstance();
         NNI->initialize();
         return NNI;
       }
 
     Name2Instance_t & netNodeInstances( void ) 
       { return AllNodes; }
     void addNodeInstance( ANetNodeInstance * I )
       { AllNodes.insert( I->nodeName(), I ); }
     void removeNodeInstance( const QString & N )
       { AllNodes.remove( N );}
     ANetNodeInstance * findNodeInstance( const QString & S )
       { return (AllNodes.find(S)!=0) ? AllNodes[S] : 0; }
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index b4d9aaa..13979ce 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -22,99 +22,115 @@ NetworkSettingsData::NetworkSettingsData( void ) {
     // load settings
     Force = 0;
     IsModified = 0;
     loadSettings();
 }
 
 // saving is done by caller
 NetworkSettingsData::~NetworkSettingsData( void ) {
     delete NSResources;
 }
 
 void NetworkSettingsData::loadSettings( void ) {
-    QString S;
-    ANetNodeInstance* NNI;
+    QString Line, S;
     QString Attr, Value;
     long idx;
 
     QFile F( CfgFile );
     QTextStream TS( &F );
 
     do {
 
       if( ! F.open(IO_ReadOnly) )
         break;
 
       /* load the file ->
 
          FORMAT :
 
            [NETNODETYPE] 
            Entries ...
            <EMPTYLINE>
            [connection] 
            Name=Name
            Node=Name
            <EMPTYLINE>
       */
       while( ! TS.atEnd() ) {
-        S = TS.readLine();
+        S = Line = TS.readLine();
 
         if ( S.isEmpty() || S[0] != '[' )
           continue;
 
         S = S.mid( 1, S.length()-2 );
 
         if( ! NSResources ) {
           continue;
         }
 
         if( S == "connection" ) {
           // load connections -> collections of nodes
           NodeCollection * NC = new NodeCollection( TS );
           NSResources->addConnection( NC );
         } else {
-          // load nodes
-          NNI = NSResources->createNodeInstance( S );
-          if( ! NNI ) {
-            printf( "SKIPPING %s\n", S.latin1() );
+          ANetNode * NN = 0;
+          ANetNodeInstance* NNI = 0;
+          if( S.startsWith( "nodetype " ) ) {
+            S = S.mid( 9, S.length()-9-1 );
+            fprintf( stderr, "Node %s\n", S.latin1() );
+            // try to find netnode
+            NN = NSResources->findNetNode( S );
+          } else {
+            // try to find instance
+            NNI = NSResources->createNodeInstance( S );
           }
 
           do {
             S = TS.readLine();
-            if( S.isEmpty() ) {
-              // empty line
-              break;
-            }
-            // node found ?
-            if( NNI ) {
+
+            if( NN || NNI ) {
+              if( S.isEmpty() ) {
+                // empty line
+                break;
+              }
               idx = S.find( '=' );
               if( idx > 0 ) {
                 Attr = S.left( idx );
                 Value = S.mid( idx+1, S.length() );
               } else {
                 Value="";
                 Attr = S;
               }
 
               Value.stripWhiteSpace();
               Attr.stripWhiteSpace();
               Attr.lower();
               // dequote Attr
               Value = deQuote(Value);
 
-              // set the attribute
-              NNI->setAttribute( Attr, Value );
+              if( NN ) {
+                // set the attribute
+                NNI->setAttribute( Attr, Value );
+              } else {
+                // set the attribute
+                NNI->setAttribute( Attr, Value );
+              }
+            } else {
+              LeftOvers.append( Line );
+              // add empty line too as delimiter
+              if( S.isEmpty() ) {
+                // empty line
+                break;
+              }
             }
-
           } while( 1 );
           if( NNI ) {
             // loading from file -> exists
             NNI->setNew( FALSE );
             NSResources->addNodeInstance( NNI );
           }
         }
       }
 
     } while( 0 );
 
 }
@@ -129,24 +145,43 @@ QString NetworkSettingsData::saveSettings( void ) {
     QFile F( CfgFile + ".bup" );
 
     printf( "Saving settings to %s\n", CfgFile.latin1() );
     if( ! F.open( IO_WriteOnly | IO_Truncate ) ) {
       ErrS = qApp->translate( "NetworkSettings", 
               "<p>Could not save setup to \"%1\" !</p>" ).
         arg(CfgFile);
       // problem
       return ErrS;
     }
 
     QTextStream TS( &F );
+
+    // save leftovers
+    for ( QStringList::Iterator it = LeftOvers.begin(); 
+          it != LeftOvers.end(); ++it ) {
+      TS << (*it) << endl;
+    }
+
+    // save global configs
+    for( QDictIterator<NetNode_t> it( NSResources->netNodes() );
+        it.current();
+        ++it ) {
+        TS << "[nodetype "
+           << it.current()->NetNode->name()
+           << "]" 
+           << endl;
+
+        it.current()->NetNode->saveAttributes( TS );
+    }
+
     { Name2Connection_t & M = NSResources->connections();
       ANetNodeInstance * NNI;
 
       // for all connections
       for( QDictIterator<NodeCollection> it(M);
            it.current();
            ++it ) {
         // all nodes in those connections
         for( QListIterator<ANetNodeInstance> nit(*(it.current())); 
              nit.current();
              ++nit ) {
           // header
diff --git a/noncore/settings/networksettings2/nsdata.h b/noncore/settings/networksettings2/nsdata.h
index eb96930..57eb722 100644
--- a/noncore/settings/networksettings2/nsdata.h
+++ b/noncore/settings/networksettings2/nsdata.h
@@ -29,15 +29,18 @@ public :
         { Force = m; }
 
 private :
 
       QString NetworkSettingsData::generateSystemFileNode(
               SystemFile & SF,
               AsDevice * CurDev,
               ANetNodeInstance * DevNNI,
               long DevInstNr );
       bool IsModified;
       bool Force;
 
+      // collect strings in config file nobody wants
+      QStringList LeftOvers;
+
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
index b3f70c5..0bf415b 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
@@ -46,17 +46,23 @@ bool PPPNetNode::generateProperFilesFor(
 
 bool PPPNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 1;
 }
 
 QString PPPNetNode::genNic( long NicNr ) { 
       QString S; 
       return S.sprintf( "ppp%ld", NicNr ); 
 }
 
+void PPPNetNode::setSpecificAttribute( QString & , QString & ) {
+}
+
+void PPPNetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new PPPNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.h b/noncore/settings/networksettings2/ppp/ppp_NN.h
index c33f281..fbbbbe1 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.h
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.h
@@ -28,20 +28,22 @@ public:
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & )
       { return 0; }
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr );
 
     virtual QString genNic( long NicNr );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp
index 7609cdc..0f71dc7 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.cpp
+++ b/noncore/settings/networksettings2/profile/profile_NN.cpp
@@ -40,17 +40,23 @@ const char * ProfileNetNode::provides( void ) {
 
 bool ProfileNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
       return 1;
 }
 
 bool ProfileNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 1;
 }
 
+void ProfileNetNode::setSpecificAttribute( QString & , QString & ) {
+}
+
+void ProfileNetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new ProfileNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/profile/profile_NN.h b/noncore/settings/networksettings2/profile/profile_NN.h
index f7c2b22..1313ab2 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.h
+++ b/noncore/settings/networksettings2/profile/profile_NN.h
@@ -26,20 +26,22 @@ public:
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & )
       { return 0; }
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr);
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index 30c72db..d5971cf 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -55,17 +55,23 @@ bool USBNetNode::generateDeviceDataForCommonFile(
       // generate mapping stanza for this interface
       S << "# check if " << NIC << " can be brought UP" << endl;
       S << "mapping " << NIC << endl;
       S << "  script networksettings2-request" << endl << endl;
     }
     return 0;
 }
 
 QString USBNetNode::genNic( long ) {
     return QString( "usbf" ); 
 }
 
+void USBNetNode::setSpecificAttribute( QString & , QString & ) {
+}
+
+void USBNetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new USBNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/usb/usb_NN.h b/noncore/settings/networksettings2/usb/usb_NN.h
index ba22b1c..0b83ea6 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.h
+++ b/noncore/settings/networksettings2/usb/usb_NN.h
@@ -27,20 +27,22 @@ public:
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & S);
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr );
 
     virtual QString genNic( long nr );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
index d9aa892..307e9dd 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
@@ -40,17 +40,23 @@ const char * VPNNetNode::provides( void ) {
 
 bool VPNNetNode::generateProperFilesFor( 
             ANetNodeInstance * ) {
       return 1;
 }
 
 bool VPNNetNode::generateDeviceDataForCommonFile( 
                                 SystemFile & , 
                                 long ) {
       return 1;
 }
 
+void VPNNetNode::setSpecificAttribute( QString & , QString & ) {
+}
+
+void VPNNetNode::saveSpecificAttribute( QTextStream & ) {
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new VPNNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.h b/noncore/settings/networksettings2/vpn/vpn_NN.h
index 7ce8e3a..1cd3fcc 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.h
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.h
@@ -26,20 +26,22 @@ public:
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
     virtual bool hasDataFor( const QString & )
       { return 0; }
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
index 4e59ac1..e0c4db2 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
@@ -1,23 +1,24 @@
 #include "wlan_NN.h"
 #include "wlan_NNI.h"
 
 static const char * WLanNeeds[] = 
     { 0
     };
 
 /**
  * Constructor, find all of the possible interfaces
  */
 WLanNetNode::WLanNetNode() : ANetNode() {
+    InstanceCount = 2;
 }
 
 /**
  * Delete any interfaces that we own.
  */
 WLanNetNode::~WLanNetNode(){
 }
 
 const QString WLanNetNode::nodeDescription(){
       return tr("\
 <p>Configure Wi/Fi or WLan network cards.</p>\
 <p>Defines Wireless options for those cards</p>\
@@ -56,17 +57,29 @@ bool WLanNetNode::generateDeviceDataForCommonFile(
         S << "# check if " << NIC << " can be brought UP" << endl;
         S << "mapping " << NIC << endl;
         S << "  script networksettings2-request" << endl << endl;
       }
       return 0;
 }
 
 QString WLanNetNode::genNic( long nr ) { 
       QString S; 
       return S.sprintf( "wlan%ld", nr );
 }
 
+void WLanNetNode::setSpecificAttribute( QString & A, QString & V ) {
+      if( A == "interfacecount" ) {
+        InstanceCount = V.toLong();
+      }
+}
+
+void WLanNetNode::saveSpecificAttribute( QTextStream & TS ) {
+      TS << "interfacecount="
+         << InstanceCount
+         << endl;
+}
+
 extern "C" {
 void create_plugin( QList<ANetNode> & PNN ) {
       PNN.append( new WLanNetNode() );
 }
 }
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.h b/noncore/settings/networksettings2/wlan/wlan_NN.h
index f27e71c..e93a89a 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.h
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.h
@@ -25,26 +25,32 @@ public:
     virtual ANetNodeInstance * createInstance( void );
 
     virtual const char ** needs( void );
     virtual const char * provides( void );
 
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
 
     virtual bool hasDataFor( const QString & S );
     virtual bool generateDeviceDataForCommonFile( 
         SystemFile & SF, long DevNr );
 
     virtual long instanceCount( void )
-      { return 2; }
+      { return InstanceCount; }
 
     virtual QString genNic( long );
 
 private:
 
+      virtual void setSpecificAttribute( QString & Attr, QString & Value );
+      virtual void saveSpecificAttribute( QTextStream & TS );
+
+      // number of interfaces for this device
+      long InstanceCount;
+
 };
 
 extern "C"
 {
   void create_plugin( QList<ANetNode> & PNN );
 };
 
 #endif