2 files changed, 8 insertions, 28 deletions

diff --git a/noncore/settings/networksettings/wlan/info.ui b/noncore/settings/networksettings/wlan/info.ui
index 7a5bf0b..50ee540 100644
--- a/noncore/settings/networksettings/wlan/info.ui
+++ b/noncore/settings/networksettings/wlan/info.ui
@@ -107,215 +107,193 @@
                             <name>text</name>
                             <string>AP</string>
                         </property>
                     </widget>
                     <widget row="4"  column="1" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>apLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>Panel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Sunken</enum>
                         </property>
                     </widget>
                     <widget row="2"  column="1" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>modeLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>Panel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Sunken</enum>
                         </property>
                     </widget>
                     <widget row="1"  column="1" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>essidLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>Panel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Sunken</enum>
                         </property>
                     </widget>
                     <widget row="0"  column="1" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>stationLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>Panel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Sunken</enum>
                         </property>
                     </widget>
                     <widget row="3"  column="1" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>channelLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>Panel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Sunken</enum>
                         </property>
                     </widget>
                     <spacer row="9"  column="1" >
                         <property>
                             <name>name</name>
                             <cstring>Spacer7</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="5"  column="1" >
                         <class>QProgressBar</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>signalProgressBar</cstring>
                         </property>
                     </widget>
                     <widget row="6"  column="1" >
                         <class>QProgressBar</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>noiseProgressBar</cstring>
                         </property>
                     </widget>
                     <widget row="7"  column="1" >
                         <class>QProgressBar</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>qualityProgressBar</cstring>
                         </property>
                     </widget>
                     <widget row="8"  column="1" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>rateLabel</cstring>
                         </property>
                         <property stdset="1">
                             <name>sizePolicy</name>
                             <sizepolicy>
                                 <hsizetype>7</hsizetype>
                                 <vsizetype>1</vsizetype>
                             </sizepolicy>
                         </property>
                         <property stdset="1">
                             <name>frameShape</name>
                             <enum>Panel</enum>
                         </property>
                         <property stdset="1">
                             <name>frameShadow</name>
                             <enum>Sunken</enum>
                         </property>
                     </widget>
                     <widget row="8"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel4_2</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Rate</string>
                         </property>
                     </widget>
                     <widget row="7"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel3_2</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Quality</string>
                         </property>
                     </widget>
                     <widget row="6"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel2_2</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Noise</string>
                         </property>
                     </widget>
                     <widget row="5"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>TextLabel1_2</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Signal</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
         </widget>
     </vbox>
 </widget>
-<customwidgets>
-    <customwidget>
-        <class>QWidget</class>
-        <header location="local">qwidget.h</header>
-        <sizehint>
-            <width>100</width>
-            <height>100</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>7</hordata>
-            <verdata>7</verdata>
-        </sizepolicy>
-        <pixmap>image0</pixmap>
-    </customwidget>
-</customwidgets>
-<images>
-    <image>
-        <name>image0</name>
-        <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
-    </image>
-</images>
 </UI>
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 3797e22..57266bb 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -1,242 +1,244 @@
 #include "wlanimp.h"
 #include "interfacesetupimp.h"
 
 #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>
-#include <opie/oprocess.h>
+#ifdef QTE_VERSION 
+ #include <opie/oprocess.h>
+#else
+ #define OProcess KProcess
+ #include <kprocess.h>
+#endif
 
 #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
 
 /**
  * Constructor, read in the wireless.opts file for parsing later.
  */ 
 WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") {
   interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);
   tabWidget->insertTab(interfaceSetup, "TCP/IP");
 
   // Read in the config file.
   QString wlanFile = WIRELESS_OPTS;
   QFile file(wlanFile);
   if (file.open(IO_ReadOnly)){
     QTextStream stream( &file );
     QString line = "";
     while ( !stream.eof() ) {
       line += stream.readLine();
       line += "\n";
     }
     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){
   interfaceSetup->setProfile(profile);
   parseSettingFile();
 }
 
 /**
  * Parses the settings file that was read in and gets any setting from it.
  */ 
 void WLANImp::parseSettingFile(){
   bool foundCase = false;
   bool found = false;
   for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
     if(line.contains("case"))
       foundCase = true;
     // See if we found our scheme to write or the sceme couldn't be found
     if((foundCase && line.contains("esac")) || 
    (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#'))
       found = true;
 
     if(line.contains(";;"))
       found = false;
     if(found){
       // write out scheme
       if(line.contains("ESSID=")){
         QString id = line.mid(line.find("ESSID=")+6, line.length());
         if(id == "any"){
           essAny->setChecked(false);
         }else{ 
           essAny->setChecked(true);
           essSpecificLineEdit->setText(id);
         }
       }
       if(line.contains("MODE=")){
         QString mode = line.mid(line.find("MODE=")+5, line.length());
         if(mode == "Managed"){
           networkType->setCurrentItem(0);
           channelLabel->setEnabled(false);
           networkChannel->setEnabled(false);
         }
         else{
           networkType->setCurrentItem(1);
           networkChannel->setEnabled(true);
           channelLabel->setEnabled(true);
         }
       }
       if(line.contains("#KEY0="))
         keyLineEdit0->setText(line.mid(6, line.length()));
       if(line.contains("#KEY1="))
         keyLineEdit1->setText(line.mid(6, line.length()));
       if(line.contains("#KEY2="))
         keyLineEdit2->setText(line.mid(6, line.length()));
       if(line.contains("#KEY3="))
         keyLineEdit3->setText(line.mid(6, line.length()));
       
       if(line.contains("KEY=")){
         wepEnabled->setChecked(true);
         QString key;
         if(line.right(5) == (" open")){
           key = line.mid(4, line.length()-5);
           authOpen->setChecked(true);
           authShared->setChecked(false);
         }
         else{
           authOpen->setChecked(false);
           authShared->setChecked(true);
           key = line.mid(4, line.length());
         }
         if(key == keyLineEdit0->text()) keyRadio0->setChecked(true);
         if(key == keyLineEdit1->text()) keyRadio1->setChecked(true);
         if(key == keyLineEdit2->text()) keyRadio2->setChecked(true);
         if(key == keyLineEdit3->text()) keyRadio3->setChecked(true);
       }
       if(line.contains("CHANNEL=")){
         networkChannel->setValue(line.mid(line.find("CHANNEL=")+8, line.length()).toInt());
       }
     }
   }
 }
 
 /**
  * Saves settings to the wireless.opts file using the current profile
  */ 
 void WLANImp::changeAndSaveSettingFile(){
   QString wlanFile = WIRELESS_OPTS;
   QFile::remove(wlanFile);
   QFile file(wlanFile);
 
   if (!file.open(IO_ReadWrite)){
     qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1());
     return;
   }
   
   QTextStream stream( &file );
   bool foundCase = false;
   bool found = false;
   bool output = true;
   for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
     if(line.contains("case"))
       foundCase = true;
     // See if we found our scheme to write or the sceme couldn't be found
     if((foundCase && line.contains("esac") && !found) || 
    (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
       // write out scheme
       found = true;
       output = false;
       
       if(!line.contains("esac"))
         stream << line << "\n"; 
       if(!essAny->isChecked() == true){
         stream << "\tESSID=any\n";
         stream << "\tMODE=Managed\n";
       }
       else{
         stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
         stream << "\tMODE=" << ( networkType->currentItem() == 0  ? "Managed" : "ad-hoc") << '\n';
         stream << "\tCHANNEL=" << networkChannel->value() << "\n";
       } 
 
       stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
       stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
       stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
       stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
       
       if(wepEnabled->isChecked()){
         stream << "\tKEY=\"";
         if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
         if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
         if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
         if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
         if(authOpen->isChecked())
           stream << " open";
         else
           stream << " restricted";
         stream << "\"\n";
       }
       stream << "\tRATE=auto\n";
       if(line.contains("esac"))
         stream << line << "\n"; 
     }
     if(line.contains(";;"))
       output = true;
     if(output && (*it).length() )
       stream << (*it) << '\n';
   }
   file.close();
 }
 
 /**
  * Check to see if the current config is valid
  * 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, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
       return;
     }
           }
   
   if(essAny->isChecked() && 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;
 
-  OProcess insert(QString("sh"));
+  OProcess insert;
+  insert << "sh";
   insert << "-c";
   insert << "cardctl eject && cardctl insert";
 
   if (!insert.start(OProcess::DontCare, OProcess::NoCommunication) ) {
     qWarning("could not start cardctl");
   }
 
   // Close out the dialog
   QDialog::accept();
 }
 
-// wlanimp.cpp
-