[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/wifi/kcmwifi
From:       Stefan Winter <mail () stefan-winter ! de>
Date:       2005-04-16 10:19:26
Message-ID: 20050416101926.B0C943CA () office ! kde ! org
[Download RAW message or body]

CVS commit by winter: 

porting bugfixes from 3_4_BRANCH:
- new speeds in the combobox (up to 54 MBit/s)
- fix WEP key management
- split iwconfig command to prevent premature end of command


  M +40 -0     ifconfigpagebase.ui   1.3
  M +35 -3     kcmwifi.cpp   1.3
  M +1 -1      wificonfig.cpp   1.2
  M +1 -1      wificonfig.h   1.2


--- kdenetwork/wifi/kcmwifi/ifconfigpagebase.ui  #1.2:1.3
@@ -168,7 +168,47 @@
             <item>
                 <property name="text">
+                    <string>6 Mb/s</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>9 Mb/s</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
                     <string>11 Mb/s</string>
                 </property>
             </item>
+            <item>
+                <property name="text">
+                    <string>12 Mb/s</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>18 Mb/s</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>24 Mb/s</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>36 Mb/s</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>48 Mb/s</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>54 Mb/s</string>
+                </property>
+            </item>
             <property name="name">
                 <cstring>cmb_speed</cstring>

--- kdenetwork/wifi/kcmwifi/kcmwifi.cpp  #1.2:1.3
@@ -135,4 +135,5 @@ void KCMWifi::activate()
        << config->m_interface
        << "down";
+  kdDebug() << "Command: " << proc.args() << endl;
   proc.start (KProcess::Block);
 
@@ -142,8 +144,30 @@ void KCMWifi::activate()
   proc << "essid"
        << ifconfig.m_networkName;
+
+  kdDebug() << "Command: " << proc.args() << endl;
+  proc.start (KProcess::Block);
+  proc.clearArguments();
+
+  proc << "iwconfig"
+       << config->m_interface;
   proc << "mode"
        << ifconfig.wifimodeAsString();
+
+  kdDebug() << "Command: " << proc.args() << endl;
+  proc.start (KProcess::Block);
+  proc.clearArguments();
+
+  proc << "iwconfig"
+       << config->m_interface;
   proc << "rate"
        << ifconfig.speedAsString();
+
+  kdDebug() << "Command: " << proc.args() << endl;
+  proc.start (KProcess::Block);
+  proc.clearArguments();
+
+  proc << "iwconfig"
+       << config->m_interface;
+
   if (!ifconfig.m_useCrypto )
   {
@@ -158,6 +182,6 @@ void KCMWifi::activate()
       {
         proc << "key"
-             << QString( "[%1] %2" ).arg( ifconfig.m_activeKey )
-                  .arg( ifconfig.m_keys[ i ].rawKey() );
+             << QString( "[%1]").arg( i+1 )
+             << QString( "%1").arg( ifconfig.m_keys[ i ].rawKey() );
       }
     }
@@ -174,4 +198,11 @@ void KCMWifi::activate()
   }
 
+  kdDebug() << "Command: " << proc.args() << endl;
+  proc.start (KProcess::Block);
+  proc.clearArguments();
+
+  proc << "iwconfig"
+       << config->m_interface;
+
   if ( !ifconfig.m_pmEnabled )
   {
@@ -196,4 +227,5 @@ void KCMWifi::activate()
        << "up";
 
+  kdDebug() << "Command: " << proc.args() << endl;
   proc.start (KProcess::Block);
 

--- kdenetwork/wifi/kcmwifi/wificonfig.cpp  #1.1:1.2
@@ -64,5 +64,5 @@ void Key::setKey( const QString &key )
 IfConfig::IfConfig()
 {
-  speedList << "Auto" << "1M" << "2M" << "5.5M" << "11M";
+  speedList << "Auto" << "1M" << "2M" << "5.5M" << "6M" << "9M" << "11M" << "12M" << \
"18M" << "24M" << "36M" << "48M" << "54M";  wifiModeList << "AdHoc" << "Managed" << \
"Repeater"  << "Master" << "Secondary";

--- kdenetwork/wifi/kcmwifi/wificonfig.h  #1.1:1.2
@@ -53,5 +53,5 @@ class IfConfig
     IfConfig();
 
-    enum Speed { AUTO=0, M1, M2, M55, M11 };
+    enum Speed { AUTO=0, M1, M2, M55, M6, M9, M11, M12, M18, M24, M36, M48, M54 };
     enum WifiMode { AdHoc=0, Managed, Repeater, Master, Secondary };
     enum PowerMode { AllPackets=0, UnicastOnly, MulticastOnly };


[prev in list] [next in list] [prev in thread] [next in thread]