start with persistent configuration

3 files changed, 113 insertions, 66 deletions

diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index d9a0aea..d7ab3bb 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>286</width>
-            <height>280</height>
+            <width>303</width>
+            <height>287</height>
         </rect>
@@ -629,3 +629,3 @@
                 </attribute>
-                <grid>
+                <vbox>
                     <property stdset="1">
@@ -638,3 +638,57 @@
                     </property>
-                    <widget row="3"  column="0" >
+                    <widget>
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>lookupVendor</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Lookup MAC vendor names</string>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>openTree</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Open Tree On New Station</string>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QCheckBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>disablePM</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Disable Power Management</string>
+                        </property>
+                    </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer3</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget>
                         <class>QGroupBox</class>
@@ -713,46 +767,3 @@
                     </widget>
-                    <spacer row="2"  column="0" >
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer3</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Vertical</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget row="0"  column="0" >
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>lookupVendor</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Lookup MAC vendor names</string>
-                        </property>
-                    </widget>
-                    <widget row="1"  column="0" >
-                        <class>QCheckBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>openTree</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Open Tree On New Station</string>
-                        </property>
-                    </widget>
-                </grid>
+                </vbox>
             </widget>
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
+}
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
index 8f160b1..2986320 100644
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/noncore/net/wellenreiter/gui/configwindow.h
@@ -39,2 +39,4 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
     WellenreiterConfigWindow( QWidget * parent = 0, const char * name = "WellenreiterConfigWindow", WFlags f = 0 );
+    ~WellenreiterConfigWindow();
+    
     int driverType() const;
@@ -52,2 +54,5 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
 
+    void save();
+    bool load();
+
   public slots: