1 files changed, 31 insertions, 14 deletions

diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 6a56358..ef7329e 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -8,2 +8,3 @@
 #include <qlineedit.h>
+#include <qlabel.h>
 #include <qspinbox.h>
@@ -12,2 +13,3 @@
 #include <qtabwidget.h>
+#include <qcombobox.h>
 
@@ -41,2 +43,9 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
     qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1());
+  connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
+
+}
+
+void WLANImp::typeChanged(int mod){
+  networkChannel->setEnabled(mod);
+  channelLabel->setEnabled(mod);
 }
@@ -73,8 +82,6 @@ void WLANImp::parseSettingFile(){
         if(id == "any"){
-          essNon->setChecked(true);
-          essSpecific->setChecked(false);
+          essAny->setChecked(false);
         }else{ 
-          essSpecific->setChecked(true);
+          essAny->setChecked(true);
           essSpecificLineEdit->setText(id);
-          essNon->setChecked(false);
         }
@@ -84,8 +91,6 @@ void WLANImp::parseSettingFile(){
         if(mode == "Managed"){
-          network802->setChecked( false );
-          networkInfrastructure->setChecked( true );
+          networkType->setCurrentItem(0);
         }
         else{
-          network802->setChecked( true );
-          networkInfrastructure->setChecked( false );
+          networkType->setCurrentItem(0);
         }
@@ -156,6 +161,13 @@ void WLANImp::changeAndSaveSettingFile(){
         stream << line << "\n"; 
-      
-      stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n';
-      stream << "\tMODE=" << (networkInfrastructure->isChecked() == true  ? "Managed" : "ad-hoc") << '\n';
-      
+      if(!essAny->isChecked() == true){
+        stream << "\tESSID=any\n";
+        stream << "\tMODE=Managed\n";
+        stream << "\tCHANNEL=6\n";
+      }
+      else{
+        stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
+        stream << "\tMODE=" << ( networkType->currentItem() == 0  ? "Managed" : "ad-hoc") << '\n';
+        stream << "\tCHANNEL=" << networkChannel->value() << "\n";
+      } 
+
       stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
@@ -177,3 +189,2 @@ void WLANImp::changeAndSaveSettingFile(){
       }
-      stream << "\tCHANNEL=" << networkChannel->value() << "\n";
       stream << "\tRATE=auto\n";
@@ -198,3 +209,3 @@ void WLANImp::accept(){
         {
-            QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok);
+            QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
             return;
@@ -203,2 +214,7 @@ void WLANImp::accept(){
   
+  if(essSpecificLineEdit->text().isEmpty()){
+    QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
+    return;
+  }
+  
   // Ok settings are good here, save
@@ -210,2 +226,3 @@ void WLANImp::accept(){
  
+  return;
   // Restart the device now that the settings have changed