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

List:       kde-commits
Subject:    kdereview/plasma/dataengines/networkmanager
From:       Christopher Blauvelt <cblauvelt () gmail ! com>
Date:       2008-05-16 10:08:48
Message-ID: 1210932528.867479.24878.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 808296 by cblauvelt:

Parse the wireless capabilities.



 M  +1 -1      networkmanagerengine.cpp  
 M  +24 -3     networkmanagerengine.h  


--- trunk/kdereview/plasma/dataengines/networkmanager/networkmanagerengine.cpp \
#808295:808296 @@ -183,7 +183,7 @@
     }
     
     setData(name, I18N_NOOP("Bit Rate"), iface->bitRate());
-    Solid::Control::WirelessNetworkInterface::Capabilities wirelessCapabilities() \
const; +    setData(name, I18N_NOOP("Wireless Capabilities"), \
wirelessCapabilitiesToStringList(wirelessCapabilities()));  
     setData(name, I18N_NOOP("Encryption"), wlan->isEncrypted());
 
--- trunk/kdereview/plasma/dataengines/networkmanager/networkmanagerengine.h \
#808295:808296 @@ -59,7 +59,7 @@
     QString determineSignalIcon(int strength);
     inline QString connectionStateToString(int state);
     inline QString statusToString(int status);
-    inline QString NetworkManageEngine::wirelessCapabilitiesToString(int \
capabilities); +    inline QStringList \
                NetworkManageEngine::wirelessCapabilitiesToStringList(int \
                capabilities);
     inline void updateActiveIface(Solid::Control::NetworkInterface iface);
     inline void updateConnectingIface(Solid::Control::NetworkInterface iface);
 
@@ -122,9 +122,30 @@
     return QString();
 }
 
-inline QString NetworkManageEngine::wirelessCapabilitiesToString(int capabilities)
+inline QStringList NetworkManageEngine::wirelessCapabilitiesToStringList(int \
capabilities)  {
-    
+    QStringList capabilityList;
+    if(capabilities & NoCapability) {
+        capabilityList << "No Capability";
+    }
+    if(capabilities & Wep40){
+        capabilityList << "WEP 40";
+    }
+    if(capabilities & Wep104) {
+        capabilityList << "WEP 104";
+    }
+    if(capabilities & Tkip) {
+        capabilityList << "TKIP";
+    }
+    if(capabilities & Ccmp) {
+        capabilityList << "CCMP"
+    }
+    if(capabilities & Wpa) {
+        capabilityList << "WPA";
+    }
+    if(capabilities & Rsn) {
+        capabilityList << "RSN";
+    }
 }
 
 inline void NetworkManagerEngine::updateActiveIface(Solid::Control::NetworkInterface \
iface)


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