1 files changed, 31 insertions, 14 deletions

diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 6a56358..ef7329e 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -3,16 +3,18 @@
 
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
+#include <qlabel.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
+#include <qcombobox.h>
 
 /* system() */
 #include <stdlib.h>
 
 #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
 
@@ -36,12 +38,19 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
     file.close();
     settingsFileText = QStringList::split("\n", line, true);
     parseSettingFile();
   }
   else
     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);
 }
 
 /**
  * Change the profile for both wireless settings and network settings.
  */ 
 void WLANImp::setProfile(const QString &profile){
@@ -68,29 +77,25 @@ void WLANImp::parseSettingFile(){
       found = false;
     if(found){
       // write out scheme
       if(line.contains("ESSID=")){
         QString id = line.mid(line.find("ESSID=")+6, line.length());
         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);
         }
       }
       if(line.contains("MODE=")){
         QString mode = line.mid(line.find("MODE=")+5, line.length());
         if(mode == "Managed"){
-          network802->setChecked( false );
-          networkInfrastructure->setChecked( true );
+          networkType->setCurrentItem(0);
         }
         else{
-          network802->setChecked( true );
-          networkInfrastructure->setChecked( false );
+          networkType->setCurrentItem(0);
         }
       }
       if(line.contains("KEY0="))
         keyLineEdit0->setText(line.mid(5, line.length()));
       if(line.contains("KEY1="))
         keyLineEdit1->setText(line.mid(5, line.length()));
@@ -151,16 +156,23 @@ void WLANImp::changeAndSaveSettingFile(){
       // write out scheme
       found = true;
       output = false;
       
       if(!line.contains("esac"))
         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";
       stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
       stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
       stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
       
       if(wepEnabled->isChecked()){
@@ -172,13 +184,12 @@ void WLANImp::changeAndSaveSettingFile(){
         if(authOpen->isChecked())
           stream << " open";
         else
           stream << " restricted";
         stream << "\"\n";
       }
-      stream << "\tCHANNEL=" << networkChannel->value() << "\n";
       stream << "\tRATE=auto\n";
       if(line.contains("esac"))
         stream << line << "\n"; 
     }
     if(line.contains(";;"))
       output = true;
@@ -193,24 +204,30 @@ void WLANImp::changeAndSaveSettingFile(){
  * Save wireless.opts, save interfaces
  */
 void WLANImp::accept(){
   if(wepEnabled->isChecked()){
     if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
         {
-            QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok);
+            QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
             return;
         }
           }
   
+  if(essSpecificLineEdit->text().isEmpty()){
+    QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
+    return;
+  }
+  
   // Ok settings are good here, save
   changeAndSaveSettingFile();
   
   // Try to save the interfaces settings.
   if(!interfaceSetup->saveChanges())
     return;
  
+  return;
   // Restart the device now that the settings have changed
   QString initpath;
   if( QDir("/etc/rc.d/init.d").exists() )
     initpath = "/etc/rc.d/init.d";
   else if( QDir("/etc/init.d").exists() )
     initpath = "/etc/init.d";