--- a/wlanutilities/wlansniffer/mainapplication/src/wsfdetailsviewmodel.cpp Mon Mar 15 12:44:54 2010 +0200
+++ b/wlanutilities/wlansniffer/mainapplication/src/wsfdetailsviewmodel.cpp Wed Mar 31 23:17:49 2010 +0300
@@ -490,7 +490,7 @@
void CWsfDetailsViewModel::FormatAndAppenSpeedL()
{
LOG_ENTERFN( "CWsfDetailsViewModel::FormatAndAppenSpeedL" );
- HBufC* speed = FormatSpeedLC();
+ HBufC* speed = FormatTechnologyLC();
HBufC* listBoxItem = FormatListBoxItemLC(
R_QTN_SNIFFER_HEADING_WLAN_NW_MAX_RATE,
*speed );
@@ -651,24 +651,45 @@
}
}
-// ---------------------------------------------------------------------------
-// CWsfDetailsViewModel::FormatSpeedLC
-// ---------------------------------------------------------------------------
+// ---------------------------------------------------------
+// CWsfDetailsViewModel::FormatTechnologyLC
+// ---------------------------------------------------------
//
-HBufC* CWsfDetailsViewModel::FormatSpeedLC()
+HBufC* CWsfDetailsViewModel::FormatTechnologyLC()
{
- LOG_ENTERFN( "CWsfDetailsViewModel::FormatSpeedLC" );
- //if data rate is allowed to be a fraction,
- //rewrite this format string
- _LIT( KRateFmt, "%d" );
+ LOG_ENTERFN( "CWsfDetailsViewModel::FormatTechnologyLC" );
+ TInt resourceId( 0 );
+
+ switch( iWlanInfo.iTransferRate )
+ {
+
+ case 1:
+ {
+ resourceId = R_QTN_SNIFFER_WLAN_SETT_TECHNOLOGY_802_11B;
+ break;
+ }
+ case 2:
+ {
+ resourceId = R_QTN_SNIFFER_WLAN_SETT_TECHNOLOGY_802_11G;
+ break;
+ }
+ case 4:
+ {
+ resourceId = R_QTN_SNIFFER_WLAN_SETT_TECHNOLOGY_802_11BG;
+ break;
+ }
+ case 8:
+ {
+ resourceId = R_QTN_SNIFFER_WLAN_SETT_TECHNOLOGY_802_11N;
+ break;
+ }
+ default:
+ {
+ return KNullDesC().AllocLC();
+ }
+ }
- const TInt KMaxRateStringWidth = 8;
- TBuf<KMaxRateStringWidth> rate;
- rate.Format( KRateFmt, iWlanInfo.iTransferRate );
- AknTextUtils::DisplayTextLanguageSpecificNumberConversion( rate );
-
- return StringLoader::LoadLC( R_QTN_SNIFFER_WLAN_MAX_DATA_RATE,
- rate, iCoeEnv );
+ return StringLoader::LoadLC( resourceId );
}
// ---------------------------------------------------------------------------