1 files changed, 49 insertions, 18 deletions

diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index a331925..d255c6a 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -57,22 +57,25 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
 
-    // try to guess device type
-    QFile m( "/proc/modules" );
-    if ( m.open( IO_ReadOnly ) )
+    if ( !load() ) // no configuration present
     {
-        int devicetype(0);
-        QString line;
-        QTextStream modules( &m );
-        while( !modules.atEnd() && !devicetype )
+        // try to guess device type
+        QFile m( "/proc/modules" );
+        if ( m.open( IO_ReadOnly ) )
         {
-            modules >> line;
-            if ( line.contains( "cisco" ) ) devicetype = DEVTYPE_CISCO;
-            else if ( line.contains( "hostap" ) ) devicetype = DEVTYPE_HOSTAP;
-            else if ( line.contains( "prism" ) ) devicetype = DEVTYPE_WLAN_NG;
-            else if ( line.contains( "orinoco" ) ) devicetype = DEVTYPE_ORINOCO;
-        }
-        if ( devicetype )
-        {
-            deviceType->setCurrentItem( devicetype );
-            _guess = devicetype;
-            qDebug( "Wellenreiter: guessed device type to be #%d", devicetype );
+            int devicetype(0);
+            QString line;
+            QTextStream modules( &m );
+            while( !modules.atEnd() && !devicetype )
+            {
+                modules >> line;
+                if ( line.contains( "cisco" ) ) devicetype = DEVTYPE_CISCO;
+                else if ( line.contains( "hostap" ) ) devicetype = DEVTYPE_HOSTAP;
+                else if ( line.contains( "prism" ) ) devicetype = DEVTYPE_WLAN_NG;
+                else if ( line.contains( "orinoco" ) ) devicetype = DEVTYPE_ORINOCO;
+            }
+            if ( devicetype )
+            {
+                deviceType->setCurrentItem( devicetype );
+                _guess = devicetype;
+                qDebug( "Wellenreiter: guessed device type to be #%d", devicetype );
+            }
         }
@@ -97,2 +100,8 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
 
+WellenreiterConfigWindow::~WellenreiterConfigWindow()
+{
+    save();
+}
+
+
 int WellenreiterConfigWindow::driverType() const
@@ -210 +219,23 @@ int WellenreiterConfigWindow::gpsPort() const
 }
+
+
+bool WellenreiterConfigWindow::load()
+{
+#ifdef Q_WS_X11
+    #warning Persistent Configuration not yet implemented for standalone X11 build
+    return false;
+#else
+    qDebug( "loading configuration settings..." );
+    return true;
+#endif
+}
+
+
+void WellenreiterConfigWindow::save()
+{
+#ifdef Q_WS_X11
+    #warning Persistent Configuration not yet implemented for standalone X11 build
+#else
+    qDebug( "saving configuration settings..." );
+#endif
+}