Factored out non-gui data class

Added support for prompting

10 files changed, 643 insertions, 471 deletions

diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp
index bcef631..1e1270e 100644
--- a/noncore/settings/networksettings2/main.cpp
+++ b/noncore/settings/networksettings2/main.cpp
@@ -1,96 +1,119 @@
+#include "nsdata.h"
+#include "activateprofile.h"
 #include "networksettings.h"
 #include <qpe/qpeapplication.h>
 
 #include <opie/oapplicationfactory.h>
 
 #ifdef GONE
 
 OPIE_EXPORT_APP( OApplicationFactory<NetworkSettings> )
 
 #else
 
+// just standard GUI
 #define ACT_GUI         0
+// used by interfaces to request for allow of up/down
 #define ACT_REQUEST     1
+// regenerate config files
 #define ACT_REGEN       2
+// used by interfaces to request user prompt 
+#define ACT_PROMPT      3
 
 int main( int argc, char * argv[] ) {
         int rv = 0;
         int Action = ACT_GUI;
         // could be overruled by -qws
         QApplication::Type GuiType = QApplication::GuiClient; 
 
 #ifdef _WS_QWS_
         QPEApplication * TheApp;
 #else
         QApplication * TheApp;
 #endif
 
         for ( int i = 1; i < argc; i ++ ) {
           int rmv;
           rmv = 0;
           if( strcmp( argv[i], "--regen" ) == 0 ) {
             Action = ACT_REGEN;
             GuiType = QApplication::Tty;
             rmv = 1;
+          } else if( strcmp( argv[i], "--prompt" ) == 0 ) {
+            Action = ACT_PROMPT;
+            rmv = 1;
           }
           if( rmv ) {
             memmove( argv+i, argv+i+rmv, 
                 sizeof( char * ) * (argc-i-rmv) );
             i --;
             argc -= rmv;
           }
         }
 
         if( strstr( argv[0], "-request" ) ) {
           // called from system to request something
           GuiType = QApplication::Tty;
           Action = ACT_REQUEST;
         }
 
         // Start Qt
 #ifdef _WS_QWS_
         // because QPEApplication does not handle GuiType well
         if( GuiType == QApplication::Tty ) {
           // this cast is NOT correct but we do not use
           // TheApp anymore ...
           TheApp = (QPEApplication *)new QApplication( argc, argv, GuiType );
         } else {
           TheApp = new QPEApplication( argc, argv, GuiType );
         }
 #else
         TheApp = new QApplication( argc, argv, GuiType );
 #endif
 
         // init qt with app widget
-        if( GuiType != QApplication::Tty ) {
-          QWidget * W = 0;
-          W = new NetworkSettings(0);
+
+        switch( Action ) {
+          case ACT_REQUEST :
+            { NetworkSettingsData NS;
+              NS.canStart( argv[1] );
+            }
+            break;
+          case ACT_REGEN :
+            { NetworkSettingsData NS;
+              // regen returns 0 if OK
+              rv = (NS.regenerate()) ? 1 : 0;
+            }
+            break;
+          case ACT_PROMPT :
+            { ActivateProfile AP(argv[1]);
+              if( AP.exec() == QDialog::Accepted ) {
+                printf( "%s-c%d-allowed", AP.selectedProfile() );
+              } else {
+                printf( "%s-cNN-disallowed" );
+              }
+            }
+            break;
+          case ACT_GUI :
+            { QWidget * W = new NetworkSettings(0);
           TheApp->setMainWidget( W ); 
           W->show();
 #ifdef _WS_QWS_
           W->showMaximized();
 #else
           W->resize( W->sizeHint() );
 #endif
           rv = TheApp->exec();
           delete W;
-        } else {
-          switch( Action ) {
-            case ACT_REQUEST :
-              NetworkSettings::canStart( argv[1] );
-              break;
-            case ACT_REGEN :
-              // regen returns 0 if OK
-              rv = (NetworkSettings::regenerate()) ? 1 : 0;
-              break;
           }
+            break;
         }
 
         return rv;
 }
 
 #endif
 
 
 // main.cpp
 
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index ffe130c..f72fa8e 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -1,446 +1,93 @@
 #include <stdio.h>
 
 #include <qpe/qpeapplication.h>
 #include <qiconset.h>
 #include <qgroupbox.h>
 #include <qtimer.h>
 #include <qlistbox.h>
 #include <qmessagebox.h>
 #include <qlabel.h>
 #include <qiconview.h>
-#include <qtextstream.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
 #include <qtimer.h>
 #include <qpe/qpeapplication.h>
 #include <qtoolbutton.h>
 
 #include <asdevice.h>
 #include "networksettings.h"
 #include "netnode.h"
 #include "editconnection.h"
 
-static QString CfgFile;
-
-NetworkSettingsData::NetworkSettingsData( void ) {
-    // init global resources structure
-    new TheNSResources();
-
-    CfgFile.sprintf( "%s/NETCONFIG", getenv("HOME") );
-
-    // load settings
-    Force = 0;
-    loadSettings();
-}
-
-// saving is done by caller
-NetworkSettingsData::~NetworkSettingsData( void ) {
-    delete NSResources;
-}
-
-void NetworkSettingsData::loadSettings( void ) {
-    QString S;
-    ANetNodeInstance* NNI;
-    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();
-
-        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 );
-          if ( NC->count() == 0 ) {
-            if( QMessageBox::warning(
-                  0, 
-                  qApp->translate( "NetworkSettings2", "Invalid connection" ),
-                  qApp->translate( "NetworkSettings2", 
-                    "<p>Connection %1 contains unrecognized nodes and cannot be loaded</p>" ).arg(NC->name()), 
-                  qApp->translate( "NetworkSettings2", 
-                    "Remove node"),
-                  qApp->translate( "NetworkSettings2", 
-                    "Exit program") ) == 1 ) {
-              exit( 0 );
-            }
-            delete NC;
-          } else 
-            NSResources->addConnection( NC );
-        } else {
-          // load nodes
-          NNI = NSResources->createNodeInstance( S );
-          if( ! NNI ) {
-            printf( "SKIPPING %s\n", S.latin1() );
-          }
-
-          do {
-            S = TS.readLine();
-            if( S.isEmpty() ) {
-              // empty line
-              break;
-            }
-            // node found ?
-            if( NNI ) {
-              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 );
-            }
-
-          } while( 1 );
-          if( NNI ) {
-            // loading from file -> exists
-            NNI->setNew( FALSE );
-            NSResources->addNodeInstance( NNI );
-          }
-        }
-      }
-
-    } while( 0 );
-
-}
-
-QString NetworkSettingsData::saveSettings( void ) {
-    QString ErrS = "";
-
-    if( ! isModified() )
-      return ErrS;
-
-    QString S;
-    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 );
-    { 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
-          NNI = nit.current();
-          TS << '[' <<NNI->netNode()->nodeName() << ']' << endl;
-          NNI->saveAttributes( TS );
-          TS << endl;
-        }
-
-        TS << "[connection]" << endl;
-        it.current()->save(TS);
-      }
-    }
-
-    QDir D(".");
-    D.rename( CfgFile + ".bup", CfgFile );
-
-    //
-    // proper files AND system files regenerated
-    //
-
-    setModified( 0 );
-    return ErrS;
-}
-
-QString NetworkSettingsData::generateSettings( bool ForceReq ) {
-    bool ForceIt;
-    QString S = "";
-
-    // include own force flag
-    ForceIt = (Force) ? 1 : ForceReq;
-
-    if( ! ForceIt && ! isModified() )
-      return S;
-
-    // regenerate system files
-    printf( "Generating settings from %s\n", CfgFile.latin1() );
-
-    { Name2SystemFile_t & SFM = NSResources->systemFiles();
-      Name2Connection_t & M = NSResources->connections();
-      NodeCollection * NC;
-      ANetNodeInstance * NNI;
-      SystemFile * SF;
-      bool needToRegenerate = ForceIt;
-
-      //
-      // check if we need to generate at least one of the system files
-      //
-      if( ! ForceIt ) {
-        for( QDictIterator<SystemFile> sfit(SFM);
-             sfit.current();
-             ++sfit ) {
-          SF = sfit.current();
-
-          // check if there are nodes that are modified and require
-          // data for this system file
-
-          // for all connections
-          for( QDictIterator<NodeCollection> ncit(M);
-               ncit.current();
-               ++ncit ) {
-            NC = ncit.current();
-
-            if( NC->isModified() ) {
-              // does this connection 'touch' this system file ?
-              for( QListIterator<ANetNodeInstance> cncit(*NC); 
-                   cncit.current();
-                   ++cncit ) {
-                NNI = cncit.current();
-                if( NNI->netNode()->hasDataFor( SF->name() ) &&
-                    NNI->isModified() ) {
-                  needToRegenerate = 1;
-                  break;
-                }
-              }
-            }
-            if( needToRegenerate )
-              break;
-          }
-          if( needToRegenerate )
-            break;
-        }
-      }
-
-      // we cannot renumber with a FORCE request since
-      // we probably are NOT going to save the config
-      // e.g. when using --regen option
-      if( ! ForceReq && needToRegenerate ) {
-        NSResources->renumberConnections();
-        setModified(1);
-      }
-
-      //
-      // generate files proper to each netnodeinstance
-      //
-      { Name2Instance_t & NNIs = NSResources->netNodeInstances();
-        ANetNodeInstance * NNI;
-
-        for( QDictIterator<ANetNodeInstance> NNIIt(NNIs);
-             NNIIt.current();
-             ++NNIIt
-           ){
-          // for all nodes find those that are modified
-          NNI = NNIIt.current();
-
-          if( ForceIt || NNI->isModified() ) {
-            if( ! NNI->netNode()->generateProperFilesFor( NNI ) ) {
-              // problem generating
-              S = qApp->translate( "NetworkSettings", 
-                                   "<p>Cannot generate files proper to %1</p>" ).
-                      arg(NNI->netNode()->nodeName()) ;
-              return S;
-            }
-          }
-        }
-      }
-
-      //
-      // generate system files
-      //
-      for( QDictIterator<SystemFile> sfit(SFM);
-           sfit.current();
-           ++sfit ) {
-        SF = sfit.current();
-
-        // 
-        // regenerate current file
-        // 
-        printf( "Generating %s\n", SF->name().latin1() );
-        SF->open();
-
-        do { // so we can break;
-
-          if( SF->preSection() ) {
-            S = qApp->translate( "NetworkSettings", 
-                                 "<p>Error in preSection for file %1</p>" ).
-                arg( SF->name() );
-            return S;
-          }
-
-          for( QDictIterator<NodeCollection> ncit(M);
-               ncit.current();
-               ++ncit ) {
-            NC = ncit.current();
-
-            // get the netnode that serves as the device for this
-            // connection
-            AsDevice * Dev = NC->device();
-
-            // generate 'entry' for every possible device this profile handles
-
-            for( QListIterator<ANetNodeInstance> cncit(*NC); 
-                 cncit.current();
-                 ++cncit ) {
-              NNI = cncit.current();
-              for( int i = 0; i < Dev->count(); i ++ ) {
-                if( NNI->netNode()->hasDataFor( SF->name() ) ) {
-                  if( SF->preNodeSection( NNI, i ) ) {
-                    S = qApp->translate( "NetworkSettings", 
-                        "<p>Error in preNodeSection for file %1 and node %2</p>" ).
-                        arg( SF->name() ).
-                        arg( NNI->netNode()->nodeName() );
-                    return S;
-                  }
-
-                  if( NNI->netNode()->generateDataForCommonFile(*SF,i,NNI) ) {
-                    S = qApp->translate( "NetworkSettings", 
-                      "<p>Error in node part for file %1 and node %2</p>" ).
-                        arg( SF->name() ).
-                        arg( NNI->netNode()->nodeName() );
-                    return S;
-                  }
-
-                  if( SF->postNodeSection( NNI, i ) ) {
-                    S = qApp->translate( "NetworkSettings", 
-                        "<p>Error in postNodeSection for file %1 and node %2</p>" ).
-                            arg( SF->name() ).
-                            arg( NNI->netNode()->nodeName() );
-                    return S;
-                  }
-                }
-              }
-            }
-            *SF << endl;
-          }
-
-          if( SF->postSection() ) {
-            S = qApp->translate( "NetworkSettings", 
-                    "<p>Error in postSection for file %1</p>" ).
-                      arg( SF->name() );
-            return S;
-          }
-        } while( 0 );
-        SF->close();
-      }
-    }
-    Force = 0;
-    return S;
-}
-
-//
-// GUI part
-//
-
 NetworkSettings::NetworkSettings( QWidget *parent, 
                const char *name, 
                WFlags fl ) : NetworkSettingsGUI(parent,name,fl), 
                              NSD() {
 
     UpdateTimer = new QTimer( this );
     // set pixmaps 
     Add_TB->setPixmap( NSResources->getPixmap( "add" ) );
     Delete_TB->setPixmap( NSResources->getPixmap( "remove" ) );
     CheckState_TB->setPixmap( NSResources->getPixmap( "check" ) );
     Enable_TB->setPixmap( NSResources->getPixmap( "disabled" ) );
     GenConfig_TB->setPixmap( NSResources->getPixmap( "configure" ) );
 
     Connect_TB->setPixmap( NSResources->getPixmap( "connected" ) );
 
     On_TB->setPixmap( NSResources->getPixmap( "off" ) );
 
     // populate main Listbox
     Profiles_IV->clear();
     { Name2Connection_t & M = NSResources->connections();
       NodeCollection * NC;
       QIconViewItem * IVI;
 
       // for all connections
       for( QDictIterator<NodeCollection> it(M);
            it.current();
            ++it ) {
         NC = it.current();
         IVI = new QIconViewItem( Profiles_IV,
                                  NC->name(),
                                  NC->devicePixmap() );
       }
     }
 
     if( Profiles_IV->count() ) {
       Profiles_IV->setSelected( Profiles_IV->firstItem(), TRUE );
     }
 
     // if no profiles -> auto popup editing
     if( NSResources->connections().count() == 0 ) {
       QTimer::singleShot( 100, this, SLOT(SLOT_AddNode() ) );
     }
 
     UpdateTimer->start( 5000 );
     connect( UpdateTimer, SIGNAL( timeout() ),
              this, SLOT( SLOT_RefreshStates() ) );
+
+    /* Add QCopChannel */
+    connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
+             this, SLOT(SLOT_QCopMessage(const QCString&,const QByteArray&)) );
 }
 
 NetworkSettings::~NetworkSettings() {
     QString S;
 
     S = NSD.generateSettings();
     if( ! S.isEmpty() ) {
       QMessageBox::warning(
         0, 
         tr( "Generating system configuration" ),
         S 
       );
     }
 
     S = NSD.saveSettings();
     if( ! S.isEmpty() ) {
       // problem saving
       QMessageBox::warning(
             0, 
             tr( "Saving setup" ), S );
     }
 }
 
 void NetworkSettings::SLOT_RefreshStates( void ) {
@@ -732,89 +379,36 @@ void NetworkSettings::SLOT_Connect( void ) {
         // up interface
         rv = NC->setState( Up );
         break;
       case Off :
         // activate and bring up
         rv = ( NC->setState( Activate ) &&
                NC->setState( Up ) );
         break;
       default :
         // others no change
         return;
     } 
 
     if( ! rv ) {
       QMessageBox::warning(
           0, 
           tr( "Activating profile" ),
           tr( "Cannot enable profile" ) );
       return;
     }
 
     // we do not update the GUI but wait for the REAL upping of the device
 }
 
-/*
-    Called by the system to see if interface can be brought UP
-
-    if allowed, echo Interface-allowed else Interface-disallowed
-*/
-
-void NetworkSettings::canStart( const char * Interface ) {
-    // load situation
-    NetworkSettingsData NSD;
-
-    { Name2Connection_t & M = NSResources->connections();
-      NodeCollection * NC;
+void NetworkSettings::SLOT_QCopMessage(const QCString &msg, const QByteArray &data) {
+  QDataStream stream( data, IO_ReadOnly );
 
-      // for all connections
-      for( QDictIterator<NodeCollection> it(M);
-           it.current();
-           ++it ) {
-        NC = it.current();
-        // check if this profile handles the requested interface
-        if( NC->handlesInterface( Interface ) ) {
-          switch( NC->state() ) {
-            case Unchecked :
-            case Unknown :
-            case Unavailable :
-            case Disabled :
-              // this profile does not allow interface to be UP
-              // -> try others
-              break;
-            case Off :
-              // try to UP the device
-              if( ! NC->setState( Activate ) ) {
-                // cannot bring device Online -> try other alters
-                break;
-              }
-              // FT
-            case Available :
-            case IsUp : // also called for 'down'
-              // device is ready -> done
-              printf( "%s-c%d-allowed\n", 
-                  Interface, NC->number() );
+  if( msg == "raise" ) {
+      raise();
               return;
-          }
-        }
-      }
-    }
-    // if we come here no alternatives are possible
-    printf( "%s-cnn-disallowed\n", Interface );
-}
-
-/*
-    Called by the system to regenerate config files
-*/
-
-bool NetworkSettings::regenerate( void ) {
-    QString S;
-    // load situation
-    NetworkSettingsData NSD;
-
-    S = NSD.generateSettings( TRUE );
-    if( ! S.isEmpty() ) {
-      fprintf( stdout, "%s\n", S.latin1() );
-      return 1;
-    }
-    return 0;
+  } /* if ( msg == "someMessage(int,int,int)" ) {
+    int a,b,c;
+    stream >> a >> b >> c;
+    ...
+  } */
 }
diff --git a/noncore/settings/networksettings2/networksettings.h b/noncore/settings/networksettings2/networksettings.h
index eb475a3..fadf81b 100644
--- a/noncore/settings/networksettings2/networksettings.h
+++ b/noncore/settings/networksettings2/networksettings.h
@@ -1,77 +1,49 @@
+#include "nsdata.h"
 #include "networksettingsGUI.h"
 #include "resources.h"
 
 class ANetNode;
 class ANetNodeInstance;
 class QTimer;
 class QIconViewItem;
 
-class NetworkSettingsData {
-
-public :
-
-      NetworkSettingsData( void );
-      ~NetworkSettingsData( void );
-
-      void loadSettings( void );
-      QString saveSettings( void );
-
-      QString generateSettings( bool Force = FALSE );
-
-      bool isModified( void ) 
-        { return IsModified; }
-      void setModified( bool m ) 
-        { IsModified = m; }
-
-      void forceGeneration( bool m ) 
-        { Force = m; }
-
-private :
-
-      bool IsModified;
-      bool Force;
-
-};
-
 class NetworkSettings : public NetworkSettingsGUI {
 
       Q_OBJECT
 
 public :
 
       NetworkSettings( QWidget *parent=0, 
                        const char *name=0, 
                        WFlags fl = 0 );
       ~NetworkSettings( void );
 
       static QString appName( void ) 
         { return QString::fromLatin1("networksettings"); }
 
-      static void canStart( const char * Interface );
-      static bool regenerate( void );
-
       bool isModified( void ) 
         { return NSD.isModified(); }
       void setModified( bool m ) 
         { NSD.setModified( m ); }
 
 public slots :
 
       void SLOT_AddNode( void );
       void SLOT_DeleteNode( void );
       void SLOT_ShowNode( QIconViewItem * );
       void SLOT_EditNode( QIconViewItem * );
       void SLOT_CheckState( void );
       void SLOT_Enable( void );
       void SLOT_On( void );
       void SLOT_Connect( void );
       void SLOT_GenerateConfig( void );
       void SLOT_RefreshStates( void );
+      void SLOT_QCopMessage( const QCString&,const QByteArray& );
 
 private :
 
       void updateProfileState( QIconViewItem * it );
       QTimer * UpdateTimer;
       NetworkSettingsData NSD;
 
 };
diff --git a/noncore/settings/networksettings2/networksettings.pro b/noncore/settings/networksettings2/networksettings.pro
index fb1f2cf..fe47971 100644
--- a/noncore/settings/networksettings2/networksettings.pro
+++ b/noncore/settings/networksettings2/networksettings.pro
@@ -1,16 +1,21 @@
 #
 CONFIG   = qt warn_on debug quick-app
 #CONFIG    = qt warn_on release
 HEADERS   = networksettings.h \
+            activateprofile.h \
             editconnection.h
 SOURCES   = main.cpp \
             networksettings.cpp \
+            nsdata.cpp \
+            activateprofile.cpp \
             editconnection.cpp
 INCLUDEPATH += $(OPIEDIR)/include networksettings2/
 DEPENDPATH  += $(OPIEDIR)/include networksettings2/
 LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings2 -lnetworksettings2 -lopie
-INTERFACES = networksettingsGUI.ui editconnectionGUI.ui
+INTERFACES = networksettingsGUI.ui \
+             editconnectionGUI.ui \
+             activateprofileGUI.ui
 TARGET    = networksettings2
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings2/networksettings2/netnode.cpp b/noncore/settings/networksettings2/networksettings2/netnode.cpp
index a5b572b..d36a1e5 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.cpp
+++ b/noncore/settings/networksettings2/networksettings2/netnode.cpp
@@ -255,24 +255,48 @@ QString NodeCollection::stateName( State_t S) {
       case IsUp :
         return qApp->translate( "networksettings2", "IsUp");
       case Unchecked : /* FT */
       default :
         break;
     }
     return QString("");
 }
 
 void NodeCollection::reassign( void ) {
     for( QListIterator<ANetNodeInstance> it(*this); 
          it.current();
          ++it ) {
       it.current()->setConnection( this );
     }
 }
 
 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 0ecd64e..56333c5 100644
--- a/noncore/settings/networksettings2/networksettings2/netnode.h
+++ b/noncore/settings/networksettings2/networksettings2/netnode.h
@@ -1,29 +1,30 @@
 #ifndef NETNODE_H
 #define NETNODE_H
 
 #include <qtextstream.h>
 #include <qlist.h>
+#include <qdict.h>
 #include <qpixmap.h>
 #include <qobject.h>
 #include <time.h>
 
 // difference feature interfaces
 class AsDevice;
 class AsLine;
 class AsConnection;
 class AsFullSetup;
 
 // needed for plugin creation function
 #include <qlist.h>
 
 class ANetNode;
 class ANetNodeInstance;
 class NodeCollection;
 class QTextStream;
 class RuntimeInfo;
 class InterfaceInfo;
 
 extern QString & deQuote( QString & X );
 extern QString quote( QString X );
 
 #include "systemfile.h"
@@ -337,25 +338,103 @@ public :
       static void resetMaxNr( void )
         { MaxNr = -1; }
 
 private :
 
       int compareItems ( QCollection::Item item1, 
                          QCollection::Item item2 );
 
       static long MaxNr;
       long Number;
 
       // state of this connection
       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 generateDataForCommonFile( 
+      SystemFile & , long , ANetNodeInstance * )
+    {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; }
+
+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.cpp b/noncore/settings/networksettings2/networksettings2/resources.cpp
index ff6e457..15e1b64 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.cpp
+++ b/noncore/settings/networksettings2/networksettings2/resources.cpp
@@ -1,28 +1,29 @@
 #include <qpixmap.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
 #include <qdir.h>
+#include <opie2/odebug.h>
 #include <qtopia/resource.h>
 
 #include "netnode.h"
 #include "resources.h"
 
 #define PLUGINDIR "plugins/networksettings2"
 #define ICONDIR "/pics/networksettings2/"
 
 // single resources instance
 TheNSResources * _NSResources = 0;
 
 TheNSResources::TheNSResources( void ) : NodeTypeNameMap(),
         ConnectionsMap() {
 
     _NSResources = this;
 
     // load available netnodes
     findAvailableNetNodes(QPEApplication::qpeDir() + PLUGINDIR );
 
     // compile provides and needs lists
     { const char ** NeedsRun;
       QDictIterator<NetNode_t> OuterIt( AllNodeTypes );
       bool Done;
 
@@ -111,65 +112,59 @@ void TheNSResources::findAvailableNetNodes(const QString &path){
                     ".qm";
 
           if( trans->load( fn ) )
               qApp->installTranslator( trans );
           else
               delete trans;
         }
       }
       ++it;
     }
 }
 
 /**
  * Attempt to load a function and resolve a function.
  * @param pluginFileName - the name of the file in which to attempt to load
  * @param resolveString - function pointer to resolve
  * @return true of loading is successful
  */
 bool TheNSResources::loadNetNode(
       const QString &pluginFileName, const QString &resolveString){
 
     QLibrary *lib = new QLibrary(pluginFileName);
     void * res = lib->resolve(resolveString);
     if( ! res ){
-#ifdef DEBUG
-      qDebug("loadNetNode: Warning: %s is not a plugin", pluginFileName.latin1());
-#endif
       delete lib;
       return 0;
     }
 
     GetNetNodeListFt_t getNetNodeList = (GetNetNodeListFt_t)res;
     
     // Try to get an object.
     QList<ANetNode> PNN;
 
     getNetNodeList( PNN );
     if( PNN.isEmpty() ) {
-#ifdef DEBUG
-      qDebug("loadNetNode: Couldn't get node list, but did load library!");
-#endif
       delete lib;
       return 0;
     }
 
     ANetNode * NNP;
     for( QListIterator<ANetNode> it(PNN);
          it.current();
          ++it ) {
       NetNode_t * NN;
 
       NNP = it.current();
       NN = new NetNode_t;
       NN->NetNode = NNP;
       NN->TheLibrary = lib;
       NN->NodeCountInLib = PNN.count();
 
       // store mapping
       AllNodeTypes.insert( NN->NetNode->nodeName(), NN );
     }
 
     return 1;
 }
 
 QPixmap TheNSResources::getPixmap( const QString & QS ) {
diff --git a/noncore/settings/networksettings2/networksettings2/resources.h b/noncore/settings/networksettings2/networksettings2/resources.h
index cfa0b7a..4df3ce3 100644
--- a/noncore/settings/networksettings2/networksettings2/resources.h
+++ b/noncore/settings/networksettings2/networksettings2/resources.h
@@ -31,52 +31,57 @@ class TheNSResources {
 
 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; }
 
     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];
-        if( NNT ) {
-          NNI = NNT->NetNode->createInstance();
-          NNI->initialize();
+        ANetNode * NN;
+        if( ! NNT ) {
+          NN = FakeNode = 
+            ( FakeNode ) ?  FakeNode : new FakeNetNode();
+        } else {
+          NN = NNT->NetNode;
         }
+        NNI = NN->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; }
 
     const QString & netNode2Name( const char * Type );
     const QString & netNode2Description( const char * Type );
 
     void renumberConnections( void );
     void addConnection( NodeCollection * NC );
     void removeConnection( const QString & N );
     NodeCollection * findConnection( const QString & N );
     Name2Connection_t & connections( void )
       { return ConnectionsMap; }
 
 private :
 
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
new file mode 100644
index 0000000..9b2ad3a
--- a/dev/null
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -0,0 +1,438 @@
+#include <stdlib.h>
+#include <qpe/qpeapplication.h>
+#include <qtextstream.h>
+#include <qdir.h>
+#include <qfile.h>
+#include <qfileinfo.h>
+
+#include "nsdata.h"
+#include <asdevice.h>
+#include <resources.h>
+
+static QString CfgFile;
+
+NetworkSettingsData::NetworkSettingsData( void ) {
+    // init global resources structure
+    new TheNSResources();
+
+    CfgFile.sprintf( "%s/NETCONFIG", getenv("HOME") );
+
+    // load settings
+    Force = 0;
+    loadSettings();
+}
+
+// saving is done by caller
+NetworkSettingsData::~NetworkSettingsData( void ) {
+    delete NSResources;
+}
+
+void NetworkSettingsData::loadSettings( void ) {
+    QString S;
+    ANetNodeInstance* NNI;
+    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();
+
+        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() );
+          }
+
+          do {
+            S = TS.readLine();
+            if( S.isEmpty() ) {
+              // empty line
+              break;
+            }
+            // node found ?
+            if( NNI ) {
+              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 );
+            }
+
+          } while( 1 );
+          if( NNI ) {
+            // loading from file -> exists
+            NNI->setNew( FALSE );
+            NSResources->addNodeInstance( NNI );
+          }
+        }
+      }
+
+    } while( 0 );
+
+}
+
+QString NetworkSettingsData::saveSettings( void ) {
+    QString ErrS = "";
+
+    if( ! isModified() )
+      return ErrS;
+
+    QString S;
+    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 );
+    { 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
+          NNI = nit.current();
+          TS << '[' <<NNI->netNode()->nodeName() << ']' << endl;
+          NNI->saveAttributes( TS );
+          TS << endl;
+        }
+
+        TS << "[connection]" << endl;
+        it.current()->save(TS);
+      }
+    }
+
+    QDir D(".");
+    D.rename( CfgFile + ".bup", CfgFile );
+
+    //
+    // proper files AND system files regenerated
+    //
+
+    setModified( 0 );
+    return ErrS;
+}
+
+QString NetworkSettingsData::generateSettings( bool ForceReq ) {
+    bool ForceIt;
+    QString S = "";
+
+    // include own force flag
+    ForceIt = (Force) ? 1 : ForceReq;
+
+    if( ! ForceIt && ! isModified() )
+      return S;
+
+    // regenerate system files
+    printf( "Generating settings from %s\n", CfgFile.latin1() );
+
+    { Name2SystemFile_t & SFM = NSResources->systemFiles();
+      Name2Connection_t & M = NSResources->connections();
+      NodeCollection * NC;
+      ANetNodeInstance * NNI;
+      SystemFile * SF;
+      bool needToRegenerate = ForceIt;
+
+      //
+      // check if we need to generate at least one of the system files
+      //
+      if( ! ForceIt ) {
+        for( QDictIterator<SystemFile> sfit(SFM);
+             sfit.current();
+             ++sfit ) {
+          SF = sfit.current();
+
+          // check if there are nodes that are modified and require
+          // data for this system file
+
+          // for all connections
+          for( QDictIterator<NodeCollection> ncit(M);
+               ncit.current();
+               ++ncit ) {
+            NC = ncit.current();
+
+            if( NC->isModified() ) {
+              // does this connection 'touch' this system file ?
+              for( QListIterator<ANetNodeInstance> cncit(*NC); 
+                   cncit.current();
+                   ++cncit ) {
+                NNI = cncit.current();
+                if( NNI->netNode()->hasDataFor( SF->name() ) &&
+                    NNI->isModified() ) {
+                  needToRegenerate = 1;
+                  break;
+                }
+              }
+            }
+            if( needToRegenerate )
+              break;
+          }
+          if( needToRegenerate )
+            break;
+        }
+      }
+
+      // we cannot renumber with a FORCE request since
+      // we probably are NOT going to save the config
+      // e.g. when using --regen option
+      if( ! ForceReq && needToRegenerate ) {
+        NSResources->renumberConnections();
+        setModified(1);
+      }
+
+      //
+      // generate files proper to each netnodeinstance
+      //
+      { Name2Instance_t & NNIs = NSResources->netNodeInstances();
+        ANetNodeInstance * NNI;
+
+        for( QDictIterator<ANetNodeInstance> NNIIt(NNIs);
+             NNIIt.current();
+             ++NNIIt
+           ){
+          // for all nodes find those that are modified
+          NNI = NNIIt.current();
+
+          if( ForceIt || NNI->isModified() ) {
+            if( ! NNI->netNode()->generateProperFilesFor( NNI ) ) {
+              // problem generating
+              S = qApp->translate( "NetworkSettings", 
+                                   "<p>Cannot generate files proper to %1</p>" ).
+                      arg(NNI->netNode()->nodeName()) ;
+              return S;
+            }
+          }
+        }
+      }
+
+      //
+      // generate system files
+      //
+      for( QDictIterator<SystemFile> sfit(SFM);
+           sfit.current();
+           ++sfit ) {
+        SF = sfit.current();
+
+        // 
+        // regenerate current file
+        // 
+        printf( "Generating %s\n", SF->name().latin1() );
+        SF->open();
+
+        do { // so we can break;
+
+          if( SF->preSection() ) {
+            S = qApp->translate( "NetworkSettings", 
+                                 "<p>Error in preSection for file %1</p>" ).
+                arg( SF->name() );
+            return S;
+          }
+
+          for( QDictIterator<NodeCollection> ncit(M);
+               ncit.current();
+               ++ncit ) {
+            NC = ncit.current();
+
+            // get the netnode that serves as the device for this
+            // connection
+            AsDevice * Dev = NC->device();
+
+            // generate 'entry' for every possible device this profile handles
+
+            for( QListIterator<ANetNodeInstance> cncit(*NC); 
+                 cncit.current();
+                 ++cncit ) {
+              NNI = cncit.current();
+              for( int i = 0; i < Dev->count(); i ++ ) {
+                if( NNI->netNode()->hasDataFor( SF->name() ) ) {
+                  if( SF->preNodeSection( NNI, i ) ) {
+                    S = qApp->translate( "NetworkSettings", 
+                        "<p>Error in preNodeSection for file %1 and node %2</p>" ).
+                        arg( SF->name() ).
+                        arg( NNI->netNode()->nodeName() );
+                    return S;
+                  }
+
+                  if( NNI->netNode()->generateDataForCommonFile(*SF,i,NNI) ) {
+                    S = qApp->translate( "NetworkSettings", 
+                      "<p>Error in node part for file %1 and node %2</p>" ).
+                        arg( SF->name() ).
+                        arg( NNI->netNode()->nodeName() );
+                    return S;
+                  }
+
+                  if( SF->postNodeSection( NNI, i ) ) {
+                    S = qApp->translate( "NetworkSettings", 
+                        "<p>Error in postNodeSection for file %1 and node %2</p>" ).
+                            arg( SF->name() ).
+                            arg( NNI->netNode()->nodeName() );
+                    return S;
+                  }
+                }
+              }
+            }
+            *SF << endl;
+          }
+
+          if( SF->postSection() ) {
+            S = qApp->translate( "NetworkSettings", 
+                    "<p>Error in postSection for file %1</p>" ).
+                      arg( SF->name() );
+            return S;
+          }
+        } while( 0 );
+        SF->close();
+      }
+    }
+    Force = 0;
+    return S;
+}
+
+QList<NodeCollection> NetworkSettingsData::collectPossible( const char * Interface ) {
+    // collect connections that can work on top of this interface
+    NodeCollection * NC;
+    QList<NodeCollection> PossibleConnections;
+    Name2Connection_t & M = NSResources->connections();
+
+    // for all connections
+    for( QDictIterator<NodeCollection> it(M);
+         it.current();
+         ++it ) {
+      NC = it.current();
+      // check if this profile handles the requested interface
+      if( NC->handlesInterface( Interface ) && // if different Intf.
+          NC->state() != Disabled && // if not enabled
+          NC->state() != IsUp  // if already used
+        ) {
+        PossibleConnections.append( NC );
+      }
+    }
+    return PossibleConnections;
+}
+
+
+/*
+    Called by the system to see if interface can be brought UP
+
+    if allowed, echo Interface-allowed else Interface-disallowed
+*/
+
+void NetworkSettingsData::canStart( const char * Interface ) {
+    // load situation
+    NodeCollection * NC = 0;
+    QList<NodeCollection> PossibleConnections;
+
+    PossibleConnections = collectPossible( Interface );
+
+    switch( PossibleConnections.count() ) {
+      case 0 : // no connections
+        break;
+      case 1 : // one connection
+        NC = PossibleConnections.first();
+        break;
+      default : // need to ask user ?
+        // are we connected to a server
+        // system( "su %d networksettings2 --prompt %s\n", 
+        //    "", Interface );
+        break;
+    }
+
+    if( NC ) {
+      switch( NC->state() ) {
+        case Unchecked :
+        case Unknown :
+        case Unavailable :
+        case Disabled :
+          // this profile does not allow interface to be UP
+          // -> try others
+          break;
+        case Off :
+          // try to UP the device
+          if( ! NC->setState( Activate ) ) {
+            // cannot bring device Online -> try other alters
+            break;
+          }
+          // FT
+        case Available :
+        case IsUp : // also called for 'ifdown'
+          // device is ready -> done
+          printf( "%s-c%d-allowed\n", Interface, NC->number() );
+          return;
+      }
+    } else {
+      // if we come here no alternatives are possible
+      printf( "%s-cnn-disallowed\n", Interface );
+    }
+}
+
+/*
+    Called by the system to regenerate config files
+*/
+
+bool NetworkSettingsData::regenerate( void ) {
+    QString S;
+    // load situation
+    S = generateSettings( TRUE );
+    if( ! S.isEmpty() ) {
+      fprintf( stdout, "%s\n", S.latin1() );
+      return 1;
+    }
+    return 0;
+}
+
diff --git a/noncore/settings/networksettings2/nsdata.h b/noncore/settings/networksettings2/nsdata.h
new file mode 100644
index 0000000..55f8c71
--- a/dev/null
+++ b/noncore/settings/networksettings2/nsdata.h
@@ -0,0 +1,37 @@
+#ifndef __NSDATA_H
+#define __NSDATA_H
+
+#include "netnode.h"
+
+class NetworkSettingsData {
+
+public :
+
+      NetworkSettingsData( void );
+      ~NetworkSettingsData( void );
+
+      void loadSettings( void );
+      QString saveSettings( void );
+
+      QString generateSettings( bool Force = FALSE );
+
+      bool isModified( void ) 
+        { return IsModified; }
+      void setModified( bool m ) 
+        { IsModified = m; }
+
+      QList<NodeCollection> collectPossible( const char * Interface );
+      void canStart( const char * Interface );
+      bool regenerate( void );
+
+      void forceGeneration( bool m ) 
+        { Force = m; }
+
+private :
+
+      bool IsModified;
+      bool Force;
+
+};
+
+#endif