--- a/hotspotfw/hsclient/src/hssiaphandler.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/hotspotfw/hsclient/src/hssiaphandler.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -25,6 +25,7 @@
#include <es_enum.h>
#include <cmconnectionmethod.h>
+#include <cmpluginwlandef.h>
#include <cmconnectionmethoddef.h>
#include <cmmanager.h>
#include <cmmanagerdef.h>
@@ -109,14 +110,26 @@
if ( aSettings.Name.Length() > 0 )
{
- plugin.SetStringAttributeL( ECmName, aSettings.Name );
- plugin.UpdateL();
+ plugin.SetStringAttributeL( CMManager::ECmName, aSettings.Name );
+ }
+
+ if ( aSettings.iSSID.Length() > 0 )
+ {
+ plugin.SetStringAttributeL( CMManager::EWlanSSID, aSettings.iSSID );
}
+
+ plugin.SetIntAttributeL( CMManager::EWlanConnectionMode,
+ aSettings.iConnectionMode );
+ plugin.SetIntAttributeL( CMManager::EWlanChannelID, 0 );
+ plugin.SetIntAttributeL( CMManager::EWlanSecurityMode,
+ aSettings.iSecurityMode );
+
+ plugin.UpdateL();
CleanupStack::PopAndDestroy( &plugin );
CleanupStack::PopAndDestroy( &cmManager );
// CommsDat section starts
- CMDBSession* dbSession = CMDBSession::NewL(CMDBSession::LatestVersion());
+ CMDBSession* dbSession = CMDBSession::NewL( CMDBSession::LatestVersion() );
CleanupStack::PushL( dbSession );
iWLANRecord = static_cast<CMDBGenericRecord*>
( CCDRecordBase::RecordFactoryL( 0 ) );
@@ -124,37 +137,8 @@
iWLANRecord->InitializeL( KGenericTable(),NULL );
iWLANRecord->SetRecordId( serviceId );
iWLANRecord->LoadL( *dbSession );
-
- // Set Network Name
- if ( aSettings.iSSID.Length() > 0 )
- {
- CMDBField<TDesC>* textField =
- (CMDBField<TDesC>*)iWLANRecord->GetFieldByIdL( KCDTIdWlanSSID );
- textField->SetMaxLengthL( aSettings.iSSID.Length() );
- textField->SetL( aSettings.iSSID );
- }
- // Set Connection Mode
- *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL( KCDTIdWlanConnMode)) =
- aSettings.iConnectionMode;
-
- // Set Channel Id.
- *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL( KCDTIdWlanChannelID )) = 0;
-
- // Set Security Mode
- *((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL( KCDTIdWlanSecMode )) =
- aSettings.iSecurityMode;
-
- // Check if THssIapSettings is created wrong (dynamically).
- // -> Then default value is not set to security mode and it will be huge.
- // -> Destination can become unusable.
- TInt secMode = aSettings.iSecurityMode;
- if ( secMode > EHssWpa2Only )
- {
- secMode = EHssAllowUnsecure;
- }
-
- if( secMode == EHssWep )
+ if( aSettings.iSecurityMode == EHssWep )
{
DEBUG("CHssIapHandler::ChangeSettingsL -> SecurityMode == EHssWep");
*((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanAuthMode)) = aSettings.iAuthenticationMode;
@@ -167,7 +151,7 @@
*((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL( KCDTIdWlanFormatKey3 )) = aSettings.iWepKeyFormat[2];
*((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL( KCDTIdWlanFormatKey4 )) = aSettings.iWepKeyFormat[3];
}
- else if( secMode > EHssWep )
+ else if( aSettings.iSecurityMode > EHssWep )
{
DEBUG("CHssIapHandler::ChangeSettingsL -> SecurityMode > EHssWep");
if ( aSettings.iEnableWpaPsk ) // Use PreSharedKey
@@ -188,12 +172,13 @@
*((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanWpaKeyLength)) = aSettings.iWPAKeyLength;
*((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanEnableWpaPsk)) = aSettings.iEnableWpaPsk;
}
- else // Use EAP. EAP settings can be set with EAP API.
+ else // Use EAP. EAP settings can be set using EAP API.
{
DEBUG("CHssIapHandler::ChangeSettingsL -> SecurityMode > EHssWep -> EAP");
*((CMDBField<TUint32>*)iWLANRecord->GetFieldByIdL(KCDTIdWlanEnableWpaPsk)) = aSettings.iEnableWpaPsk;
}
}
+
// Update access point, be prepared that Commsdat might be locked
TInt errCode( KErrLocked );
TInt retryCount( 0 );
--- a/wlanutilities/eapwizard/resources/occ_eap_wizard_01_02_04.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/eapwizard/resources/occ_eap_wizard_01_02_04.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,48 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="occ_eap_wizard_01" type="HbWidget">
+ <!-- layout id: txt_occ_dblist_val_infrastructure_public -->
<widget name="list" type="HbRadioButtonList"/>
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="title" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignLeft|AlignTop|AlignLeading"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<layout type="anchor"/>
</widget>
<section name="portrait_section">
<widget name="occ_eap_wizard_01" type="HbWidget">
- <widget name="title" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="title" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="title" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="title" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="list" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="title" srcEdge="BOTTOM"/>
- <anchoritem dst="list" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="title" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="title" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="title" dstEdge="RIGHT" direction="NEGATIVE" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="LEFT" src="" srcEdge="LEFT"/>
+ <anchoritem dst="list" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="title" srcEdge="BOTTOM"/>
+ <anchoritem dst="list" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
</section>
<section name="landscape_section">
<widget name="occ_eap_wizard_01" type="HbWidget">
- <widget name="title" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint type="FIXED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="title" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="title" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="list" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="title" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="TOP" spacing="0un" src="title" srcEdge="TOP"/>
- <anchoritem dst="list" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="title" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="title" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="title" dstEdge="RIGHT" direction="NEGATIVE" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="list" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="title" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="TOP" src="" srcEdge="TOP"/>
+ <anchoritem dst="list" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
</section>
- <metadata activeUIState="landscape" display="NHD-3.2-inch_landscape" unit="un">
+ <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
<uistate name="landscape" sections="#common landscape_section"/>
<uistate name="portrait" sections="#common portrait_section"/>
--- a/wlanutilities/eapwizard/resources/occ_eap_wizard_03.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/eapwizard/resources/occ_eap_wizard_03.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,25 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="occ_eap_wizard_03" type="HbWidget">
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="setlabel_53" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
+ <!-- layout id: txt_occ_setlabel_user_name_val_generate_automatic -->
<widget name="setlabel_53_val" type="HbCheckBox">
<enums name="checkState" value="Checked"/>
<string locid="txt_occ_setlabel_user_name_val_generate_automatic" name="text" value="Generate automatically"/>
- <fontspec name="fontSpec" role="Secondary" textheight="0"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
</widget>
<widget name="lineEditUsername" type="HbLineEdit"/>
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="setlabel_54" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<string locid="txt_occ_setlabel_eap_realm" name="plainText" value="Realm"/>
<fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
+ <!-- layout id: txt_occ_setlabel_user_name_val_generate_automatic -->
<widget name="setlabel_54_val" type="HbCheckBox">
<enums name="checkState" value="Checked"/>
- <string locid="txt_occ_setlabel_eap_realm_val_generate_automatically" name="text" value="Generate automatically"/>
- <fontspec name="fontSpec" role="Secondary" textheight="0"/>
+ <string locid="txt_occ_setlabel_eap_realm_val_generate_automatic" name="text" value="Generate automatically"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
</widget>
<widget name="lineEditRealm" type="HbLineEdit"/>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
@@ -27,61 +33,55 @@
</widget>
<section name="portrait_section">
<widget name="occ_eap_wizard_03" type="HbWidget">
- <widget name="setlabel_53" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="setlabel_53" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_53" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="setlabel_53" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_53_val" dstEdge="LEFT" spacing="0un" src="setlabel_53" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_53_val" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="setlabel_53" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_53_val" dstEdge="RIGHT" spacing="0un" src="setlabel_53" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditUsername" dstEdge="LEFT" spacing="0un" src="setlabel_53" srcEdge="LEFT"/>
- <anchoritem dst="lineEditUsername" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)" src="setlabel_53_val" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditUsername" dstEdge="RIGHT" spacing="0un" src="setlabel_53" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_54" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_54" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-popup) + var(hb-param-margin-gene-bottom))" src="lineEditUsername" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_54" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_54_val" dstEdge="LEFT" spacing="0un" src="setlabel_53" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_54_val" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="setlabel_54" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_54_val" dstEdge="RIGHT" spacing="0un" src="setlabel_53" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditRealm" dstEdge="LEFT" spacing="0un" src="setlabel_53" srcEdge="LEFT"/>
- <anchoritem dst="lineEditRealm" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)" src="setlabel_54_val" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditRealm" dstEdge="RIGHT" spacing="0un" src="setlabel_53" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_53" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_53" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="setlabel_53" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_53_val" dstEdge="LEFT" src="setlabel_53" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_53_val" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="setlabel_53" srcEdge="BOTTOM"/>
+ <anchoritem dst="setlabel_53_val" dstEdge="RIGHT" src="setlabel_53" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditUsername" dstEdge="LEFT" src="setlabel_53" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditUsername" dstEdge="TOP" prefLength="var(hb-param-margin-gene-bottom)" src="setlabel_53_val" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditUsername" dstEdge="RIGHT" src="setlabel_53" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_54" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_54" dstEdge="TOP" prefLength="expr(var(hb-param-margin-gene-popup) + var(hb-param-margin-gene-bottom))" src="lineEditUsername" srcEdge="BOTTOM"/>
+ <anchoritem direction="NEGATIVE" dst="setlabel_54" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_54_val" dstEdge="LEFT" src="setlabel_53" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_54_val" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="setlabel_54" srcEdge="BOTTOM"/>
+ <anchoritem dst="setlabel_54_val" dstEdge="RIGHT" src="setlabel_53" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditRealm" dstEdge="LEFT" src="setlabel_53" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditRealm" dstEdge="TOP" prefLength="var(hb-param-margin-gene-bottom)" src="setlabel_54_val" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditRealm" dstEdge="RIGHT" src="setlabel_53" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
<section name="landscape_section">
- <widget name="setlabel_53" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint type="PREFERRED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
<widget name="occ_eap_wizard_03" type="HbWidget">
<layout type="anchor">
- <anchoritem dst="setlabel_53" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_53" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="setlabel_53" dstEdge="BOTTOM" spacing="0un" src="lineEditUsername" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_53_val" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="setlabel_53" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_53_val" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="setlabel_53_val" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditUsername" dstEdge="LEFT" spacing="0un" src="setlabel_53_val" srcEdge="LEFT"/>
- <anchoritem dst="lineEditUsername" dstEdge="TOP" spacing="0un" src="setlabel_53_val" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditUsername" dstEdge="RIGHT" spacing="0un" src="setlabel_53_val" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_54" dstEdge="LEFT" spacing="0un" src="setlabel_53" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_54" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="lineEditUsername" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_54" dstEdge="RIGHT" spacing="0un" src="setlabel_53" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_54" dstEdge="BOTTOM" spacing="0un" src="lineEditRealm" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_54_val" dstEdge="LEFT" spacing="0un" src="setlabel_53_val" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_54_val" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)" src="lineEditUsername" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_54_val" dstEdge="RIGHT" spacing="0un" src="setlabel_53_val" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditRealm" dstEdge="LEFT" spacing="0un" src="setlabel_53_val" srcEdge="LEFT"/>
- <anchoritem dst="lineEditRealm" dstEdge="TOP" spacing="0un" src="setlabel_54_val" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditRealm" dstEdge="RIGHT" spacing="0un" src="setlabel_53_val" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_53" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_53" dstEdge="TOP" src="" srcEdge="TOP"/>
+ <anchoritem dst="setlabel_53" dstEdge="BOTTOM" src="lineEditUsername" srcEdge="BOTTOM"/>
+ <anchoritem direction="NEGATIVE" dst="setlabel_53" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="setlabel_53_val" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="setlabel_53" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_53_val" dstEdge="TOP" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="setlabel_53_val" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditUsername" dstEdge="LEFT" src="setlabel_53_val" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditUsername" dstEdge="TOP" src="setlabel_53_val" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditUsername" dstEdge="RIGHT" src="setlabel_53_val" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_54" dstEdge="LEFT" src="setlabel_53" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_54" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="lineEditUsername" srcEdge="BOTTOM"/>
+ <anchoritem dst="setlabel_54" dstEdge="RIGHT" src="setlabel_53" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_54" dstEdge="BOTTOM" src="lineEditRealm" srcEdge="BOTTOM"/>
+ <anchoritem dst="setlabel_54_val" dstEdge="LEFT" src="setlabel_53_val" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_54_val" dstEdge="TOP" prefLength="var(hb-param-margin-gene-bottom)" src="lineEditUsername" srcEdge="BOTTOM"/>
+ <anchoritem dst="setlabel_54_val" dstEdge="RIGHT" src="setlabel_53_val" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditRealm" dstEdge="LEFT" src="setlabel_53_val" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditRealm" dstEdge="TOP" src="setlabel_54_val" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditRealm" dstEdge="RIGHT" src="setlabel_53_val" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
- <metadata activeUIState="landscape" display="NHD-3.2-inch_landscape" unit="un">
+ <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
<uistate name="portrait" sections="#common portrait_section"/>
<uistate name="landscape" sections="#common landscape_section"/>
--- a/wlanutilities/eapwizard/resources/occ_eap_wizard_05_07.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/eapwizard/resources/occ_eap_wizard_05_07.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,59 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="view" type="HbWidget">
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="setlabel_55" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
- <fontspec name="fontSpec" role="Secondary" textheight="0"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
<widget name="lineEditUsername" type="HbLineEdit"/>
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="setlabel_56" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
- <fontspec name="fontSpec" role="Secondary" textheight="0"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
<widget name="lineEditPassword" type="HbLineEdit"/>
<layout type="anchor"/>
</widget>
<section name="portrait_section">
<widget name="view" type="HbWidget">
- <widget name="setlabel_55" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="setlabel_55" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_55" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="setlabel_55" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditUsername" dstEdge="LEFT" spacing="0un" src="setlabel_55" srcEdge="LEFT"/>
- <anchoritem dst="lineEditUsername" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="setlabel_55" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditUsername" dstEdge="RIGHT" spacing="0un" src="setlabel_55" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_56" dstEdge="LEFT" spacing="0un" src="setlabel_55" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_56" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)" src="lineEditUsername" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_56" dstEdge="RIGHT" spacing="0un" src="setlabel_55" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditPassword" dstEdge="LEFT" spacing="0un" src="setlabel_55" srcEdge="LEFT"/>
- <anchoritem dst="lineEditPassword" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="setlabel_56" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditPassword" dstEdge="RIGHT" spacing="0un" src="setlabel_55" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_55" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_55" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="setlabel_55" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditUsername" dstEdge="LEFT" src="setlabel_55" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditUsername" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="setlabel_55" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditUsername" dstEdge="RIGHT" src="setlabel_55" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_56" dstEdge="LEFT" src="setlabel_55" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_56" dstEdge="TOP" prefLength="var(hb-param-margin-gene-bottom)" src="lineEditUsername" srcEdge="BOTTOM"/>
+ <anchoritem dst="setlabel_56" dstEdge="RIGHT" src="setlabel_55" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditPassword" dstEdge="LEFT" src="setlabel_55" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditPassword" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="setlabel_56" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditPassword" dstEdge="RIGHT" src="setlabel_55" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
<section name="landscape_section">
<widget name="view" type="HbWidget">
- <widget name="setlabel_55" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint type="PREFERRED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="setlabel_55" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_55" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="setlabel_55" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)" src="lineEditUsername" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditUsername" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="setlabel_55" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditUsername" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="lineEditUsername" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_56" dstEdge="LEFT" spacing="0un" src="setlabel_55" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_56" dstEdge="TOP" spacing="0un" src="setlabel_55" srcEdge="BOTTOM"/>
- <anchoritem dst="setlabel_56" dstEdge="RIGHT" spacing="0un" src="setlabel_55" srcEdge="RIGHT"/>
- <anchoritem dst="setlabel_56" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)" src="lineEditPassword" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditPassword" dstEdge="LEFT" spacing="0un" src="lineEditUsername" srcEdge="LEFT"/>
- <anchoritem dst="lineEditPassword" dstEdge="RIGHT" spacing="0un" src="lineEditUsername" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditPassword" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-bottom)+var(hb-param-margin-gene-popup))" src="lineEditUsername" srcEdge="BOTTOM"/>
+ <anchoritem dst="setlabel_55" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_55" dstEdge="TOP" src="" srcEdge="TOP"/>
+ <anchoritem dst="setlabel_55" dstEdge="BOTTOM" prefLength="var(hb-param-margin-gene-bottom)" src="lineEditUsername" srcEdge="BOTTOM"/>
+ <anchoritem direction="NEGATIVE" dst="setlabel_55" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="lineEditUsername" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="setlabel_55" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditUsername" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="lineEditUsername" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_56" dstEdge="LEFT" src="setlabel_55" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_56" dstEdge="TOP" src="setlabel_55" srcEdge="BOTTOM"/>
+ <anchoritem dst="setlabel_56" dstEdge="RIGHT" src="setlabel_55" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_56" dstEdge="BOTTOM" prefLength="var(hb-param-margin-gene-bottom)" src="lineEditPassword" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditPassword" dstEdge="LEFT" src="lineEditUsername" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditPassword" dstEdge="RIGHT" src="lineEditUsername" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditPassword" dstEdge="TOP" prefLength="expr(var(hb-param-margin-gene-bottom)+var(hb-param-margin-gene-popup))" src="lineEditUsername" srcEdge="BOTTOM"/>
</layout>
</widget>
</section>
--- a/wlanutilities/eapwizard/resources/occ_eap_wizard_06.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/eapwizard/resources/occ_eap_wizard_06.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,59 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="occ_eap_wizard_06" type="HbWidget">
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="title" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<string locid="txt_occ_title_select_user_certificate" name="plainText" value="Select user certificate"/>
- <fontspec name="fontSpec" role="Secondary" textheight="0"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
+ <!-- layout id: txt_occ_dblist_val_infrastructure_public -->
<widget name="list" type="HbRadioButtonList"/>
+ <!-- layout id: qtl_dialog_pri3 -->
<widget name="errorLabel" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignLeft|AlignTop|AlignLeading"/>
<string locid="txt_occ_dialog_no_certificates_installed_wizard_c" name="plainText" value="No certificates installed. Wizard cannot continue."/>
- <fontspec name="fontSpec" role="Secondary" textheight="0"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="3"/>
</widget>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<layout type="anchor"/>
</widget>
<section name="portrait_section">
<widget name="occ_eap_wizard_06" type="HbWidget">
- <widget name="title" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="title" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="title" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="title" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="list" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="title" srcEdge="BOTTOM"/>
- <anchoritem dst="list" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="errorLabel" dstEdge="LEFT" spacing="0un" src="title" srcEdge="LEFT"/>
- <anchoritem dst="errorLabel" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="title" srcEdge="BOTTOM"/>
- <anchoritem dst="errorLabel" dstEdge="RIGHT" spacing="0un" src="title" srcEdge="RIGHT"/>
+ <anchoritem dst="title" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="title" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="title" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="LEFT" src="" srcEdge="LEFT"/>
+ <anchoritem dst="list" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="title" srcEdge="BOTTOM"/>
+ <anchoritem dst="list" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="errorLabel" dstEdge="LEFT" src="title" srcEdge="LEFT"/>
+ <anchoritem dst="errorLabel" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="title" srcEdge="BOTTOM"/>
+ <anchoritem dst="errorLabel" dstEdge="RIGHT" src="title" srcEdge="RIGHT"/>
</layout>
</widget>
- <widget name="list" type="HbRadioButtonList">
- <size height="230un" name="transformOriginPoint" width="0un"/>
- </widget>
</section>
<section name="landscape_section">
<widget name="occ_eap_wizard_06" type="HbWidget">
- <widget name="title" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint type="FIXED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="title" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="title" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="list" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="title" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="TOP" spacing="0un" src="title" srcEdge="TOP"/>
- <anchoritem dst="list" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="errorLabel" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="title" srcEdge="RIGHT"/>
- <anchoritem dst="errorLabel" dstEdge="TOP" spacing="0un" src="title" srcEdge="TOP"/>
- <anchoritem dst="errorLabel" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="title" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="title" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem direction="NEGATIVE" dst="title" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="list" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="title" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="TOP" src="" srcEdge="TOP"/>
+ <anchoritem dst="list" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="errorLabel" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="title" srcEdge="RIGHT"/>
+ <anchoritem dst="errorLabel" dstEdge="TOP" src="title" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="errorLabel" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
--- a/wlanutilities/eapwizard/resources/occ_eap_wizard_08.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/eapwizard/resources/occ_eap_wizard_08.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,53 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="view" type="HbWidget">
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="setlabel_59" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<string locid="txt_occ_setlabel_eap_pac_store_password" name="plainText" value="PAC store password"/>
- <fontspec name="fontSpec" role="Secondary" textheight="0"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
<widget name="lineEditPasswordConfirm" type="HbLineEdit"/>
+ <!-- layout id: qtl_dialog_pri3 -->
<widget name="labelError" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
- <fontspec name="fontSpec" role="Secondary" textheight="0"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="3"/>
</widget>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<layout type="anchor"/>
</widget>
<section name="portrait_section">
<widget name="view" type="HbWidget">
- <widget name="setlabel_59" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="setlabel_59" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_59" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="setlabel_59" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditPasswordConfirm" dstEdge="LEFT" spacing="0un" src="setlabel_59" srcEdge="LEFT"/>
- <anchoritem dst="lineEditPasswordConfirm" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="setlabel_59" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditPasswordConfirm" dstEdge="RIGHT" spacing="0un" src="setlabel_59" srcEdge="RIGHT"/>
- <anchoritem dst="labelError" dstEdge="LEFT" spacing="0un" src="setlabel_59" srcEdge="LEFT"/>
- <anchoritem dst="labelError" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)" src="lineEditPasswordConfirm" srcEdge="BOTTOM"/>
- <anchoritem dst="labelError" dstEdge="RIGHT" spacing="0un" src="setlabel_59" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_59" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_59" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="setlabel_59" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditPasswordConfirm" dstEdge="LEFT" src="setlabel_59" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditPasswordConfirm" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="setlabel_59" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditPasswordConfirm" dstEdge="RIGHT" src="setlabel_59" srcEdge="RIGHT"/>
+ <anchoritem dst="labelError" dstEdge="LEFT" src="setlabel_59" srcEdge="LEFT"/>
+ <anchoritem dst="labelError" dstEdge="TOP" prefLength="var(hb-param-margin-gene-bottom)" src="lineEditPasswordConfirm" srcEdge="BOTTOM"/>
+ <anchoritem dst="labelError" dstEdge="RIGHT" src="setlabel_59" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
<section name="landscape_section">
<widget name="view" type="HbWidget">
- <widget name="setlabel_59" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <sizehint type="PREFERRED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="setlabel_59" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="setlabel_59" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="setlabel_59" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-bottom)" src="lineEditPasswordConfirm" srcEdge="BOTTOM"/>
- <anchoritem dst="lineEditPasswordConfirm" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="setlabel_59" srcEdge="RIGHT"/>
- <anchoritem dst="lineEditPasswordConfirm" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="lineEditPasswordConfirm" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="labelError" dstEdge="LEFT" spacing="0un" src="setlabel_59" srcEdge="LEFT"/>
- <anchoritem dst="labelError" dstEdge="TOP" spacing="var(hb-param-margin-gene-bottom)" src="lineEditPasswordConfirm" srcEdge="BOTTOM"/>
- <anchoritem dst="labelError" dstEdge="RIGHT" spacing="0un" src="lineEditPasswordConfirm" srcEdge="RIGHT"/>
+ <anchoritem dst="setlabel_59" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="setlabel_59" dstEdge="TOP" src="" srcEdge="TOP"/>
+ <anchoritem dst="setlabel_59" dstEdge="BOTTOM" prefLength="var(hb-param-margin-gene-bottom)" src="lineEditPasswordConfirm" srcEdge="BOTTOM"/>
+ <anchoritem direction="NEGATIVE" dst="setlabel_59" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="lineEditPasswordConfirm" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="setlabel_59" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditPasswordConfirm" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="lineEditPasswordConfirm" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="labelError" dstEdge="LEFT" src="setlabel_59" srcEdge="LEFT"/>
+ <anchoritem dst="labelError" dstEdge="TOP" prefLength="var(hb-param-margin-gene-bottom)" src="lineEditPasswordConfirm" srcEdge="BOTTOM"/>
+ <anchoritem dst="labelError" dstEdge="RIGHT" src="lineEditPasswordConfirm" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
--- a/wlanutilities/eapwizard/src/eapwizard_p.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/eapwizard/src/eapwizard_p.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -542,7 +542,7 @@
bool ret = true;
EapQtPacStoreConfig pacStoreConf;
- eapConf.setValue(EapQtConfig::ProvisioningModeAuthenticated, false);
+ eapConf.setValue(EapQtConfig::ProvisioningModeAuthenticated, true);
eapConf.setValue(EapQtConfig::ProvisioningModeUnauthenticated, true);
eapConf.setValue(EapQtConfig::VerifyServerRealm, false);
eapConf.setValue(EapQtConfig::UseIdentityPrivacy, false);
--- a/wlanutilities/testwizard/src/FirstView.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/testwizard/src/FirstView.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -86,7 +86,8 @@
if (mUseConf->isChecked()) {
mWizard->setParameters(
- mSsid->text(),
+ mSsid->text(),
+ mSsid->text().toUtf8(),
mNetworkMode->currentIndex(),
1 << mSecurityMode->currentIndex(),
mUseWpaPsk->isChecked(),
--- a/wlanutilities/wlanentryplugin/src/cpwlanentryitemdata.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanentryplugin/src/cpwlanentryitemdata.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -28,11 +28,6 @@
#include <xqaiwdecl.h>
#include <xqaiwdeclplat.h>
-// This workaround can be removed when XQOP_WLAN_SNIFFER is correctly
-// defined without the "void" parameter restriction:
-#undef XQOP_WLAN_SNIFFER
-#define XQOP_WLAN_SNIFFER QLatin1String("listView()")
-
#include <cpitemdatahelper.h>
#include <cpbasesettingview.h>
--- a/wlanutilities/wlanqtutilities/base/inc/wlanqtutils.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/base/inc/wlanqtutils.h Fri Sep 03 09:37:37 2010 +0300
@@ -28,7 +28,6 @@
// Forward declarations
-class WlanQtUtilsIap;
class WlanQtUtilsAp;
class WlanQtUtilsPrivate;
@@ -101,7 +100,7 @@
void stopWlanScan();
void availableWlans(
- QList< QSharedPointer<WlanQtUtilsIap> > &wlanIapList,
+ QList< QSharedPointer<WlanQtUtilsAp> > &wlanIapList,
QList< QSharedPointer<WlanQtUtilsAp> > &wlanApList) const;
void availableWlanAps(
@@ -117,6 +116,8 @@
void disconnectIap(int iapId);
+ void moveIapToInternetSnap(int iapId);
+
ConnStatus connectionStatus() const;
int activeIap() const;
--- a/wlanutilities/wlanqtutilities/base/inc/wlanqtutils_p.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/base/inc/wlanqtutils_p.h Fri Sep 03 09:37:37 2010 +0300
@@ -32,7 +32,6 @@
// Forward declarations
class WlanQtUtils;
-class WlanQtUtilsIap;
class WlanQtUtilsAp;
class WlanQtUtilsConnection;
class WlanQtUtilsIapSettings;
@@ -67,7 +66,7 @@
void stopWlanScan();
void availableWlans(
- QList< QSharedPointer<WlanQtUtilsIap> > &wlanIapList,
+ QList< QSharedPointer<WlanQtUtilsAp> > &wlanIapList,
QList< QSharedPointer<WlanQtUtilsAp> > &wlanApList) const;
void availableWlanAps(
@@ -82,6 +81,8 @@
void connectIap(int iapId, bool runIct);
void disconnectIap(int iapId);
+
+ void moveIapToInternetSnap(int iapId);
WlanQtUtils::ConnStatus connectionStatus() const;
@@ -102,22 +103,24 @@
Q_DISABLE_COPY(WlanQtUtilsPrivate)
bool wlanIapExists(
- const QList< QSharedPointer<WlanQtUtilsIap> > list,
+ const QList< QSharedPointer<WlanQtUtilsAp> > list,
const WlanQtUtilsAp *ap) const;
+ void reportScanResult(int status, int mode);
+
void traceIapsAndAps(
- const QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ const QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
const QList< QSharedPointer<WlanQtUtilsAp> > &aps) const;
private slots:
void updateAvailableWlanIaps(
- QList< QSharedPointer<WlanQtUtilsIap> > &availableIaps);
+ QList< QSharedPointer<WlanQtUtilsAp> > &availableIaps);
void updateAvailableWlanAps(
QList< QSharedPointer<WlanQtUtilsAp> > &availableWlans);
-
- void reportScanResult(int status);
+
+ void updateScanFailed(int status);
void updateConnectionStatus(bool isOpened);
@@ -169,7 +172,7 @@
ScanMode mScanMode;
//! List of available WLAN IAPs according to the latest scan.
- QList< QSharedPointer<WlanQtUtilsIap> > mIapScanList;
+ QList< QSharedPointer<WlanQtUtilsAp> > mIapScanList;
//! List of available WLAN APs according to the latest scan.
QList< QSharedPointer<WlanQtUtilsAp> > mWlanScanList;
--- a/wlanutilities/wlanqtutilities/base/inc/wlanqtutilsap.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/base/inc/wlanqtutilsap.h Fri Sep 03 09:37:37 2010 +0300
@@ -55,6 +55,7 @@
Configuration IDs that can be read and set in this class.
ConfID's available for scan results:
+ - ConfIdName
- ConfIdSsid
- ConfIdBssid
- ConfIdSignalStrength
@@ -65,6 +66,7 @@
ConfID's for IAP creation and updates, these are
mandatory for all security modes:
+ - ConfIdName
- ConfIdSsid
- ConfIdConnectionMode
- ConfIdSecurityMode
@@ -77,24 +79,39 @@
- ConfIdWpaPsk (Empty if not used)
- ConfIdHidden
- ConfIdWlanScanSSID
+
+ Values available for IAPs when reading:
+ - ConfIdIapId
+ - ConfIdName
+ - ConfIdSsid
+ - ConfIdNetworkId
+ - ConfIdConnectionMode
+ - ConfIdSecurityMode
+ - ConfIdWpaPskUse
*/
enum ConfId {
- //! QString: WLAN Network Name (SSID)
- ConfIdSsid = 0,
+ //! QString: Name
+ ConfIdName = 1,
+ //! QByteArray: WLAN Network Name (SSID)
+ ConfIdSsid = 2,
//! QByteArray: Basic Service Set Identifier
- ConfIdBssid = 1,
+ ConfIdBssid = 3,
//! int: signal strength in RSSI (dBm)
- ConfIdSignalStrength = 2,
+ ConfIdSignalStrength = 4,
//! int: (CMManagerShim::WlanNetMode)
- ConfIdConnectionMode = 3,
+ ConfIdConnectionMode = 5,
+ //! int: IAP ID
+ ConfIdIapId = 6,
+ //! int: Network ID
+ ConfIdNetworkId = 7,
//! int: (CMManagerShim::WlanSecMode)
- ConfIdSecurityMode = 4,
+ ConfIdSecurityMode = 8,
//! bool: true - WPA PSK, false - WPA EAP
- ConfIdWpaPskUse = 5,
+ ConfIdWpaPskUse = 9,
//! QString: Pre-Shared Key for WPA
//! Length: 8-63 - Ascii key
//! Length: 64 - Hex key
- ConfIdWpaPsk = 6,
+ ConfIdWpaPsk = 10,
//! QString: WEP Key for index 1:
//! HEX:
//! - 64 bit: allowed key length = 10
@@ -103,21 +120,21 @@
//! ASCII:
//! - 64 bit: allowed key length = 5
//! - 128 bit: allowed key length = 13
- ConfIdWepKey1 = 7,
+ ConfIdWepKey1 = 11,
//! QString: WEP Key for index 2
- ConfIdWepKey2 = 8,
+ ConfIdWepKey2 = 12,
//! QString: WEP Key for index 3
- ConfIdWepKey3 = 9,
+ ConfIdWepKey3 = 13,
//! QString: WEP Key for index 4
- ConfIdWepKey4 = 10,
+ ConfIdWepKey4 = 14,
//! int: (CMManagerShim::WlanWepKeyIndex): Default WEP Key index
- ConfIdWepDefaultIndex = 11,
+ ConfIdWepDefaultIndex = 15,
//! bool: Is WLAN hidden (CMManagerShim::CmHidden).
- ConfIdHidden = 12,
+ ConfIdHidden = 16,
//! bool: Does WLAN AP need explicit scanning (CMManagerShim::WlanScanSSID)
- ConfIdWlanScanSSID = 13,
+ ConfIdWlanScanSSID = 17,
//! bool: true - Wifi Protected setup is supported, false - not
- ConfIdWpsSupported = 14
+ ConfIdWpsSupported = 18,
};
/*!
--- a/wlanutilities/wlanqtutilities/base/inc/wlanqtutilsiap.h Mon Aug 23 13:30:09 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* WLAN IAP (Internet Access Point, known network) class.
-*/
-
-#ifndef WLANQTUTILSIAP_H
-#define WLANQTUTILSIAP_H
-
-// System includes
-
-#include <QScopedPointer>
-
-// User includes
-
-#include "wlanqtutilsap.h"
-
-// Forward declarations
-
-class WlanQtUtilsIapPrivate;
-
-// External data types
-
-// Constants
-
-//! Library interface export macro
-#ifdef BUILD_WLANQTUTILITIES_DLL
-#define WLANQTUTILSIAP_EXPORT Q_DECL_EXPORT
-#else
-#define WLANQTUTILSIAP_EXPORT Q_DECL_IMPORT
-#endif
-
-// Class declaration
-
-class WLANQTUTILSIAP_EXPORT WlanQtUtilsIap : public WlanQtUtilsAp
-{
-
-public:
-
- // Data types
-
- /*!
- Configuration IDs that can be read and set in this class (via
- functions declared in the parent class). Values under 100 are
- reserved for the parent class.
-
- Remember to update traces/trace.properties file when modifying
- this enum (tracing is also the cause for fixing the enum values).
-
- Values available for IAPs:
- - ConfIdIapId
- - ConfIdName
- - ConfIdNetworkId
- - WlanQtUtilsAp::ConfIdSsid
- - WlanQtUtilsAp::ConfIdSignalStrength
- - WlanQtUtilsAp::ConfIdConnectionMode
- - WlanQtUtilsAp::ConfIdSecurityMode
- - WlanQtUtilsAp::ConfIdWpaPskUse
- */
- enum ConfId {
- //! int: IAP ID
- ConfIdIapId = 100,
- //! QString: Name
- ConfIdName = 101,
- //! int: Network ID
- ConfIdNetworkId = 102
- };
-
- WlanQtUtilsIap();
-
- virtual ~WlanQtUtilsIap();
-
-signals:
-
-public slots:
-
-protected:
-
-protected slots:
-
-private:
-
- Q_DISABLE_COPY(WlanQtUtilsIap)
-
-private slots:
-
-private: // data
-
- QScopedPointer<WlanQtUtilsIapPrivate> d_ptr; //!< Private implementation
-
- // Friend classes
-};
-
-#endif // WLANQTUTILSIAP_H
--- a/wlanutilities/wlanqtutilities/base/inc/wlanqtutilsiapsettings.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/base/inc/wlanqtutilsiapsettings.h Fri Sep 03 09:37:37 2010 +0300
@@ -31,7 +31,6 @@
class CmManagerShim;
class CmConnectionMethodShim;
-class WlanQtUtilsIap;
class WlanQtUtilsAp;
// External data types
@@ -52,9 +51,9 @@
virtual ~WlanQtUtilsIapSettings();
- void fetchIaps(QList< QSharedPointer<WlanQtUtilsIap> > &iapList) const;
+ void fetchIaps(QList< QSharedPointer<WlanQtUtilsAp> > &iapList) const;
- QSharedPointer<WlanQtUtilsIap> fetchIap(uint iapId) const;
+ QSharedPointer<WlanQtUtilsAp> fetchIap(uint iapId) const;
int createIap(const WlanQtUtilsAp *wlanAp);
--- a/wlanutilities/wlanqtutilities/base/src/wlanqtutils.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/base/src/wlanqtutils.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -20,7 +20,6 @@
// User includes
#include "wlanqtutilsap.h"
-#include "wlanqtutilsiap.h"
#include "wlanqtutils_p.h"
#include "wlanqtutils.h"
@@ -124,7 +123,7 @@
*/
void WlanQtUtils::availableWlans(
- QList< QSharedPointer<WlanQtUtilsIap> > &wlanIapList,
+ QList< QSharedPointer<WlanQtUtilsAp> > &wlanIapList,
QList< QSharedPointer<WlanQtUtilsAp> > &wlanApList) const
{
d_ptr->availableWlans(wlanIapList, wlanApList);
@@ -217,6 +216,17 @@
d_ptr->disconnectIap(iapId);
}
+/*
+ Moves the given IAP into the Internet SNAP.
+
+ @param [in] iapId ID of the IAP to be moved.
+*/
+
+void WlanQtUtils::moveIapToInternetSnap(int iapId)
+{
+ d_ptr->moveIapToInternetSnap(iapId);
+}
+
/*!
Function to retrieve the name of the IAP with the given ID.
--- a/wlanutilities/wlanqtutilities/base/src/wlanqtutils_p.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/base/src/wlanqtutils_p.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -22,7 +22,6 @@
// User includes
#include "wlanqtutilsap.h"
-#include "wlanqtutilsiap.h"
#include "wlanqtutilsconnection.h"
#include "wlanqtutilsiapsettings.h"
#include "wlanqtutilsconmonwrapper.h"
@@ -78,9 +77,9 @@
// Make all connections.
bool connectStatus = connect(
mScanWrapper,
- SIGNAL(availableWlanIaps(QList< QSharedPointer<WlanQtUtilsIap> > &)),
+ SIGNAL(availableWlanIaps(QList< QSharedPointer<WlanQtUtilsAp> > &)),
this,
- SLOT(updateAvailableWlanIaps(QList< QSharedPointer<WlanQtUtilsIap> > &)));
+ SLOT(updateAvailableWlanIaps(QList< QSharedPointer<WlanQtUtilsAp> > &)));
Q_ASSERT(connectStatus);
connectStatus = connect(
@@ -94,7 +93,7 @@
mScanWrapper,
SIGNAL(scanFailed(int)),
this,
- SLOT(reportScanResult(int)));
+ SLOT(updateScanFailed(int)));
Q_ASSERT(connectStatus);
connectStatus = connect(
@@ -205,12 +204,13 @@
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_STOPWLANSCAN_ENTRY, this);
if (mScanMode != ScanModeNone) {
- // Inform that scan was cancelled
- reportScanResult(WlanQtUtils::ScanStatusCancelled);
-
+ int mode = mScanMode;
// Stop the scan
mScanMode = ScanModeNone;
mScanWrapper->stopScan();
+
+ // Inform that scan was cancelled
+ reportScanResult(WlanQtUtils::ScanStatusCancelled, mode);
}
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_STOPWLANSCAN_EXIT, this);
@@ -221,7 +221,7 @@
*/
void WlanQtUtilsPrivate::availableWlans(
- QList< QSharedPointer<WlanQtUtilsIap> > &wlanIapList,
+ QList< QSharedPointer<WlanQtUtilsAp> > &wlanIapList,
QList< QSharedPointer<WlanQtUtilsAp> > &wlanApList) const
{
OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_AVAILABLEWLAN_ENTRY, this);
@@ -230,13 +230,13 @@
wlanApList.clear();
// Read the list of configured IAPs
- QList< QSharedPointer<WlanQtUtilsIap> > configuredIapList;
+ QList< QSharedPointer<WlanQtUtilsAp> > configuredIapList;
mSettings->fetchIaps(configuredIapList);
// Update the list of available IAPs
- foreach (QSharedPointer<WlanQtUtilsIap> iapIter, mIapScanList) {
- int iapId = iapIter->value(WlanQtUtilsIap::ConfIdIapId).toInt();
- QSharedPointer<WlanQtUtilsIap> iap(mSettings->fetchIap(iapId));
+ foreach (QSharedPointer<WlanQtUtilsAp> iapIter, mIapScanList) {
+ int iapId = iapIter->value(WlanQtUtilsAp::ConfIdIapId).toInt();
+ QSharedPointer<WlanQtUtilsAp> iap(mSettings->fetchIap(iapId));
if (iap) {
// Only add the IAP if we (still) have the settings for it
iap->setValue(
@@ -379,6 +379,19 @@
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_DISCONNECTIAP_EXIT, this);
}
+/*
+ See WlanQtUtils::moveIapToInternetSnap().
+*/
+
+void WlanQtUtilsPrivate::moveIapToInternetSnap(int iapId)
+{
+ OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_MOVEIAPTOINTERNETSNAP_ENTRY);
+
+ mSettings->moveIapToInternetSnap(iapId);
+
+ OstTraceFunctionExit0(WLANQTUTILSPRIVATE_MOVEIAPTOINTERNETSNAP_EXIT);
+}
+
/*!
See WlanQtUtils::connectionStatus().
*/
@@ -435,9 +448,9 @@
QString name;
// Read the IAP from settings and return its name
- QSharedPointer<WlanQtUtilsIap> iap = mSettings->fetchIap(iapId);
+ QSharedPointer<WlanQtUtilsAp> iap = mSettings->fetchIap(iapId);
if (iap) {
- name = iap->value(WlanQtUtilsIap::ConfIdName).toString();
+ name = iap->value(WlanQtUtilsAp::ConfIdName).toString();
}
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_IAPNAME_EXIT, this);
@@ -454,12 +467,12 @@
*/
bool WlanQtUtilsPrivate::wlanIapExists(
- const QList< QSharedPointer<WlanQtUtilsIap> > list,
+ const QList< QSharedPointer<WlanQtUtilsAp> > list,
const WlanQtUtilsAp *ap) const
{
bool match = false; // Return value
- foreach (QSharedPointer<WlanQtUtilsIap> iap, list) {
+ foreach (QSharedPointer<WlanQtUtilsAp> iap, list) {
if (WlanQtUtilsAp::compare(iap.data(), ap) == 0) {
// Match found
match = true;
@@ -471,6 +484,52 @@
}
/*!
+ Reports the scanning result to the client.
+
+ @param [in] status Scan status code (WlanQtUtils::ScanStatus).
+ @param [in] mode Mode of the scan whose status is reported.
+*/
+
+void WlanQtUtilsPrivate::reportScanResult(int status, int mode)
+{
+ switch (mode) {
+ case ScanModeAvailableWlans:
+ OstTrace1(
+ TRACE_BORDER,
+ WLANQTUTILSPRIVATE_WLANSCANREADY,
+ "WlanQtUtilsPrivate::reportScanResult emit wlanScanReady;status=%{ScanStatus};",
+ status);
+ emit q_ptr->wlanScanReady(status);
+ break;
+
+ case ScanModeAvailableWlanAps:
+ OstTrace1(
+ TRACE_BORDER,
+ WLANQTUTILSPRIVATE_WLANSCANAPREADY,
+ "WlanQtUtilsPrivate::reportScanResult emit wlanScanApReady;status=%{ScanStatus};",
+ status);
+ emit q_ptr->wlanScanApReady(status);
+ break;
+
+ case ScanModeDirect:
+ OstTrace1(
+ TRACE_BORDER,
+ WLANQTUTILSPRIVATE_WLANSCANDIRECTREADY,
+ "WlanQtUtilsPrivate::reportScanResult emit wlanScanDirectReady;status=%{ScanStatus};",
+ status);
+ emit q_ptr->wlanScanDirectReady(status);
+ break;
+
+#ifndef QT_NO_DEBUG
+ default:
+ // Invalid scan mode detected
+ Q_ASSERT(0);
+ break;
+#endif
+ }
+}
+
+/*!
This function traces the given IAPs and APs.
@param [in] iaps IAPs to trace.
@@ -478,15 +537,15 @@
*/
void WlanQtUtilsPrivate::traceIapsAndAps(
- const QList<QSharedPointer<WlanQtUtilsIap> > &iaps,
- const QList<QSharedPointer<WlanQtUtilsAp> > &aps) const
+ const QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
+ const QList< QSharedPointer<WlanQtUtilsAp> > &aps) const
{
#ifndef OST_TRACE_COMPILER_IN_USE
Q_UNUSED(iaps);
Q_UNUSED(aps);
#else
- foreach (QSharedPointer<WlanQtUtilsIap> iap, iaps) {
- QString tmp(iap->value(WlanQtUtilsIap::ConfIdName).toString());
+ foreach (QSharedPointer<WlanQtUtilsAp> iap, iaps) {
+ QString tmp(iap->value(WlanQtUtilsAp::ConfIdSsid).toString());
TPtrC16 name(tmp.utf16(), tmp.length());
OstTraceExt3(
TRACE_NORMAL,
@@ -518,7 +577,7 @@
*/
void WlanQtUtilsPrivate::updateAvailableWlanIaps(
- QList< QSharedPointer<WlanQtUtilsIap> > &availableIaps)
+ QList< QSharedPointer<WlanQtUtilsAp> > &availableIaps)
{
OstTraceFunctionEntry0(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANIAPS_ENTRY);
@@ -562,58 +621,33 @@
}
}
- // The information is forwarded to the client
- reportScanResult(WlanQtUtils::ScanStatusOk);
-
+ int mode = mScanMode;
// Scan is complete
mScanMode = ScanModeNone;
+ // The information is forwarded to the client
+ reportScanResult(WlanQtUtils::ScanStatusOk, mode);
+
OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATEAVAILABLEWLANAPS_EXIT, this);
}
/*!
- Scan result handler. Reports the scanning result to the client.
-
+ Slot for handling WLAN scan failure event from wrapper. Result is
+ reported to client.
+
@param [in] status Scan status code (WlanQtUtils::ScanStatus).
*/
-void WlanQtUtilsPrivate::reportScanResult(int status)
+void WlanQtUtilsPrivate::updateScanFailed(int status)
{
- switch (mScanMode) {
- case ScanModeAvailableWlans:
- OstTrace1(
- TRACE_BORDER,
- WLANQTUTILSPRIVATE_WLANSCANREADY,
- "WlanQtUtilsPrivate::reportScanResult emit wlanScanReady;status=%{ScanStatus};",
- status);
- emit q_ptr->wlanScanReady(status);
- break;
+ OstTraceFunctionEntry1(WLANQTUTILSPRIVATE_UPDATESCANFAILED_ENTRY, this);
- case ScanModeAvailableWlanAps:
- OstTrace1(
- TRACE_BORDER,
- WLANQTUTILSPRIVATE_WLANSCANAPREADY,
- "WlanQtUtilsPrivate::reportScanResult emit wlanScanApReady;status=%{ScanStatus};",
- status);
- emit q_ptr->wlanScanApReady(status);
- break;
-
- case ScanModeDirect:
- OstTrace1(
- TRACE_BORDER,
- WLANQTUTILSPRIVATE_WLANSCANDIRECTREADY,
- "WlanQtUtilsPrivate::reportScanResult emit wlanScanDirectReady;status=%{ScanStatus};",
- status);
- emit q_ptr->wlanScanDirectReady(status);
- break;
-
-#ifndef QT_NO_DEBUG
- default:
- // Invalid scan mode detected
- Q_ASSERT(0);
- break;
-#endif
- }
+ int mode = mScanMode;
+ // Scan is now done
+ mScanMode = ScanModeNone;
+ reportScanResult(status, mode);
+
+ OstTraceFunctionExit1(WLANQTUTILSPRIVATE_UPDATESCANFAILED_EXIT, this);
}
/*!
@@ -657,7 +691,7 @@
// Start ICT, if needed
if (mConnectingIapId == mToBeTestedIapId) {
- QSharedPointer<WlanQtUtilsIap> iap(mSettings->fetchIap(mConnectingIapId));
+ QSharedPointer<WlanQtUtilsAp> iap(mSettings->fetchIap(mConnectingIapId));
mIctService = QSharedPointer<IctsWlanLoginInterface>(
new IctsWlanLoginInterface(this));
@@ -682,7 +716,7 @@
mIctService->start(
mToBeTestedIapId,
- iap->value(WlanQtUtilsIap::ConfIdNetworkId).toInt());
+ iap->value(WlanQtUtilsAp::ConfIdNetworkId).toInt());
}
}
// IAP is no more in connecting state
--- a/wlanutilities/wlanqtutilities/base/src/wlanqtutilsiap.cpp Mon Aug 23 13:30:09 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* WLAN IAP (Internet Access Point, known network) class.
-*/
-
-// System includes
-
-// User includes
-
-#include "wlanqtutilsiap.h"
-
-/*!
- \class WlanQtUtilsIapPrivate
- \brief Private implementation of WlanQtUtilsIap.
-
- This class is reserved for WlanQtUtilsIap private implementation.
-
- NOTE: Even though there is currently no implementation, this is
- required for possible later additions to avoid binary compatibility
- break.
-*/
-
-class WlanQtUtilsIapPrivate
-{
- friend class WlanQtUtilsIap;
-};
-
-/*!
- \class WlanQtUtilsIap
- \brief WLAN Internet Access Point class.
-
- Contains the information related to known WLAN access points.
-*/
-
-// External function prototypes
-
-// Local constants
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-/*!
- Constructor.
-*/
-
-WlanQtUtilsIap::WlanQtUtilsIap() :
- WlanQtUtilsAp(),
- d_ptr(new WlanQtUtilsIapPrivate())
-{
-}
-
-/*!
- Destructor.
-*/
-
-WlanQtUtilsIap::~WlanQtUtilsIap()
-{
-}
--- a/wlanutilities/wlanqtutilities/base/src/wlanqtutilsiapsettings.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/base/src/wlanqtutilsiapsettings.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -29,7 +29,6 @@
#include "wlanqtutils.h"
#include "wlanqtutilsap.h"
-#include "wlanqtutilsiap.h"
#include "wlanqtutilsiapsettings.h"
#include "OstTraceDefinitions.h"
@@ -101,7 +100,7 @@
*/
void WlanQtUtilsIapSettings::fetchIaps(
- QList< QSharedPointer<WlanQtUtilsIap> > &iapList) const
+ QList< QSharedPointer<WlanQtUtilsAp> > &iapList) const
{
OstTraceFunctionEntry0(WLANQTUTILSIAPSETTINGS_FETCHIAPS_ENTRY);
@@ -130,7 +129,7 @@
#endif
foreach (uint iapId, iapIds) {
- QSharedPointer<WlanQtUtilsIap> wlanIap = fetchIap(iapId);
+ QSharedPointer<WlanQtUtilsAp> wlanIap = fetchIap(iapId);
if (wlanIap) {
iapList.append(wlanIap);
}
@@ -147,11 +146,11 @@
@return Found IAP, NULL if not found.
*/
-QSharedPointer<WlanQtUtilsIap> WlanQtUtilsIapSettings::fetchIap(uint iapId) const
+QSharedPointer<WlanQtUtilsAp> WlanQtUtilsIapSettings::fetchIap(uint iapId) const
{
OstTraceFunctionEntry0(WLANQTUTILSIAPSETTINGS_FETCHIAP_ENTRY);
- QSharedPointer<WlanQtUtilsIap> wlanIap;
+ QSharedPointer<WlanQtUtilsAp> wlanIap;
try {
QScopedPointer<CmConnectionMethodShim> iap(
mCmManager->connectionMethod(iapId));
@@ -169,10 +168,10 @@
CMManagerShim::WlanEnableWpaPsk);
// Create a WLAN Qt Utils IAP
- wlanIap = QSharedPointer<WlanQtUtilsIap>(new WlanQtUtilsIap());
- wlanIap->setValue(WlanQtUtilsIap::ConfIdIapId, iapId);
- wlanIap->setValue(WlanQtUtilsIap::ConfIdNetworkId, netId);
- wlanIap->setValue(WlanQtUtilsIap::ConfIdName, name);
+ wlanIap = QSharedPointer<WlanQtUtilsAp>(new WlanQtUtilsAp());
+ wlanIap->setValue(WlanQtUtilsAp::ConfIdIapId, iapId);
+ wlanIap->setValue(WlanQtUtilsAp::ConfIdNetworkId, netId);
+ wlanIap->setValue(WlanQtUtilsAp::ConfIdName, name);
wlanIap->setValue(WlanQtUtilsAp::ConfIdSsid, ssid);
wlanIap->setValue(WlanQtUtilsAp::ConfIdConnectionMode, connMode);
wlanIap->setValue(WlanQtUtilsAp::ConfIdSecurityMode, secMode);
@@ -394,13 +393,16 @@
{
OstTraceFunctionEntry0(WLANQTUTILSIAPSETTINGS_STORESETTINGS_ENTRY);
- int secMode = wlanAp->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt();
- QString ssid = wlanAp->value(WlanQtUtilsAp::ConfIdSsid).toString();
-
// Store general settings
- iap->setStringAttribute(CMManagerShim::CmName, ssid);
- iap->setStringAttribute(CMManagerShim::WlanSSID, ssid);
- iap->setIntAttribute(CMManagerShim::WlanSecurityMode, secMode);
+ iap->setStringAttribute(
+ CMManagerShim::CmName,
+ wlanAp->value(WlanQtUtilsAp::ConfIdName).toString());
+ iap->setStringAttribute(
+ CMManagerShim::WlanSSID,
+ wlanAp->value(WlanQtUtilsAp::ConfIdSsid).toString());
+ iap->setIntAttribute(
+ CMManagerShim::WlanSecurityMode,
+ wlanAp->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt());
iap->setIntAttribute(
CMManagerShim::WlanConnectionMode,
wlanAp->value(WlanQtUtilsAp::ConfIdConnectionMode).toInt());
--- a/wlanutilities/wlanqtutilities/bwins/wlanqtutilitiesu.def Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/bwins/wlanqtutilitiesu.def Fri Sep 03 09:37:37 2010 +0300
@@ -5,16 +5,16 @@
?createIap@WlanQtUtils@@QAEHPBVWlanQtUtilsAp@@@Z @ 4 NONAME ; int WlanQtUtils::createIap(class WlanQtUtilsAp const *)
?Start@RConnection@@QAEXAAVTConnPref@@AAVTRequestStatus@@@Z @ 5 NONAME ; void RConnection::Start(class TConnPref &, class TRequestStatus &)
?value@WlanQtUtilsAp@@QBE?AVQVariant@@H@Z @ 6 NONAME ; class QVariant WlanQtUtilsAp::value(int) const
- ??1WlanQtUtilsIap@@UAE@XZ @ 7 NONAME ; WlanQtUtilsIap::~WlanQtUtilsIap(void)
- ?qt_metacast@WlanQtUtils@@UAEPAXPBD@Z @ 8 NONAME ; void * WlanQtUtils::qt_metacast(char const *)
- ?qt_metacall@WlanQtUtils@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 9 NONAME ; int WlanQtUtils::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?availableWlanAps@WlanQtUtils@@QBEXAAV?$QList@V?$QSharedPointer@VWlanQtUtilsAp@@@@@@@Z @ 10 NONAME ; void WlanQtUtils::availableWlanAps(class QList<class QSharedPointer<class WlanQtUtilsAp> > &) const
- ??1WlanQtUtilsAp@@UAE@XZ @ 11 NONAME ; WlanQtUtilsAp::~WlanQtUtilsAp(void)
- ?wlanScanApReady@WlanQtUtils@@IAEXH@Z @ 12 NONAME ; void WlanQtUtils::wlanScanApReady(int)
- ?staticMetaObject@WlanQtUtils@@2UQMetaObject@@B @ 13 NONAME ; struct QMetaObject const WlanQtUtils::staticMetaObject
- ??0WlanQtUtilsAp@@QAE@ABV0@@Z @ 14 NONAME ; WlanQtUtilsAp::WlanQtUtilsAp(class WlanQtUtilsAp const &)
- ??_EWlanQtUtilsAp@@UAE@I@Z @ 15 NONAME ; WlanQtUtilsAp::~WlanQtUtilsAp(unsigned int)
- ?disconnectIap@WlanQtUtils@@QAEXH@Z @ 16 NONAME ; void WlanQtUtils::disconnectIap(int)
+ ?qt_metacast@WlanQtUtils@@UAEPAXPBD@Z @ 7 NONAME ; void * WlanQtUtils::qt_metacast(char const *)
+ ?qt_metacall@WlanQtUtils@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 8 NONAME ; int WlanQtUtils::qt_metacall(enum QMetaObject::Call, int, void * *)
+ ?availableWlanAps@WlanQtUtils@@QBEXAAV?$QList@V?$QSharedPointer@VWlanQtUtilsAp@@@@@@@Z @ 9 NONAME ; void WlanQtUtils::availableWlanAps(class QList<class QSharedPointer<class WlanQtUtilsAp> > &) const
+ ??1WlanQtUtilsAp@@UAE@XZ @ 10 NONAME ; WlanQtUtilsAp::~WlanQtUtilsAp(void)
+ ?wlanScanApReady@WlanQtUtils@@IAEXH@Z @ 11 NONAME ; void WlanQtUtils::wlanScanApReady(int)
+ ?staticMetaObject@WlanQtUtils@@2UQMetaObject@@B @ 12 NONAME ; struct QMetaObject const WlanQtUtils::staticMetaObject
+ ??0WlanQtUtilsAp@@QAE@ABV0@@Z @ 13 NONAME ; WlanQtUtilsAp::WlanQtUtilsAp(class WlanQtUtilsAp const &)
+ ??_EWlanQtUtilsAp@@UAE@I@Z @ 14 NONAME ; WlanQtUtilsAp::~WlanQtUtilsAp(unsigned int)
+ ?disconnectIap@WlanQtUtils@@QAEXH@Z @ 15 NONAME ; void WlanQtUtils::disconnectIap(int)
+ ?availableWlans@WlanQtUtils@@QBEXAAV?$QList@V?$QSharedPointer@VWlanQtUtilsAp@@@@@@0@Z @ 16 NONAME ; void WlanQtUtils::availableWlans(class QList<class QSharedPointer<class WlanQtUtilsAp> > &, class QList<class QSharedPointer<class WlanQtUtilsAp> > &) const
?scanWlanDirect@WlanQtUtils@@QAEXABVQString@@@Z @ 17 NONAME ; void WlanQtUtils::scanWlanDirect(class QString const &)
?tr@WlanQtUtils@@SA?AVQString@@PBD0@Z @ 18 NONAME ; class QString WlanQtUtils::tr(char const *, char const *)
?wlanNetworkClosed@WlanQtUtils@@IAEXHH@Z @ 19 NONAME ; void WlanQtUtils::wlanNetworkClosed(int, int)
@@ -29,18 +29,16 @@
?scanWlanAps@WlanQtUtils@@QAEXXZ @ 28 NONAME ; void WlanQtUtils::scanWlanAps(void)
?wlanNetworkOpened@WlanQtUtils@@IAEXH@Z @ 29 NONAME ; void WlanQtUtils::wlanNetworkOpened(int)
?connectIap@WlanQtUtils@@QAEXH_N@Z @ 30 NONAME ; void WlanQtUtils::connectIap(int, bool)
- ??_EWlanQtUtilsIap@@UAE@I@Z @ 31 NONAME ; WlanQtUtilsIap::~WlanQtUtilsIap(unsigned int)
- ?metaObject@WlanQtUtils@@UBEPBUQMetaObject@@XZ @ 32 NONAME ; struct QMetaObject const * WlanQtUtils::metaObject(void) const
- ??_EWlanQtUtils@@UAE@I@Z @ 33 NONAME ; WlanQtUtils::~WlanQtUtils(unsigned int)
- ?wlanScanReady@WlanQtUtils@@IAEXH@Z @ 34 NONAME ; void WlanQtUtils::wlanScanReady(int)
- ??0WlanQtUtils@@QAE@XZ @ 35 NONAME ; WlanQtUtils::WlanQtUtils(void)
- ?stopWlanScan@WlanQtUtils@@QAEXXZ @ 36 NONAME ; void WlanQtUtils::stopWlanScan(void)
- ?availableWlans@WlanQtUtils@@QBEXAAV?$QList@V?$QSharedPointer@VWlanQtUtilsIap@@@@@@AAV?$QList@V?$QSharedPointer@VWlanQtUtilsAp@@@@@@@Z @ 37 NONAME ; void WlanQtUtils::availableWlans(class QList<class QSharedPointer<class WlanQtUtilsIap> > &, class QList<class QSharedPointer<class WlanQtUtilsAp> > &) const
- ?tr@WlanQtUtils@@SA?AVQString@@PBD0H@Z @ 38 NONAME ; class QString WlanQtUtils::tr(char const *, char const *, int)
- ?getStaticMetaObject@WlanQtUtils@@SAABUQMetaObject@@XZ @ 39 NONAME ; struct QMetaObject const & WlanQtUtils::getStaticMetaObject(void)
- ?trUtf8@WlanQtUtils@@SA?AVQString@@PBD0@Z @ 40 NONAME ; class QString WlanQtUtils::trUtf8(char const *, char const *)
- ?deleteIap@WlanQtUtils@@QAEXH@Z @ 41 NONAME ; void WlanQtUtils::deleteIap(int)
- ??0WlanQtUtilsIap@@QAE@XZ @ 42 NONAME ; WlanQtUtilsIap::WlanQtUtilsIap(void)
- ?wlanScanDirectReady@WlanQtUtils@@IAEXH@Z @ 43 NONAME ; void WlanQtUtils::wlanScanDirectReady(int)
- ?trUtf8@WlanQtUtils@@SA?AVQString@@PBD0H@Z @ 44 NONAME ; class QString WlanQtUtils::trUtf8(char const *, char const *, int)
+ ?metaObject@WlanQtUtils@@UBEPBUQMetaObject@@XZ @ 31 NONAME ; struct QMetaObject const * WlanQtUtils::metaObject(void) const
+ ??_EWlanQtUtils@@UAE@I@Z @ 32 NONAME ; WlanQtUtils::~WlanQtUtils(unsigned int)
+ ?wlanScanReady@WlanQtUtils@@IAEXH@Z @ 33 NONAME ; void WlanQtUtils::wlanScanReady(int)
+ ??0WlanQtUtils@@QAE@XZ @ 34 NONAME ; WlanQtUtils::WlanQtUtils(void)
+ ?stopWlanScan@WlanQtUtils@@QAEXXZ @ 35 NONAME ; void WlanQtUtils::stopWlanScan(void)
+ ?tr@WlanQtUtils@@SA?AVQString@@PBD0H@Z @ 36 NONAME ; class QString WlanQtUtils::tr(char const *, char const *, int)
+ ?getStaticMetaObject@WlanQtUtils@@SAABUQMetaObject@@XZ @ 37 NONAME ; struct QMetaObject const & WlanQtUtils::getStaticMetaObject(void)
+ ?trUtf8@WlanQtUtils@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString WlanQtUtils::trUtf8(char const *, char const *)
+ ?deleteIap@WlanQtUtils@@QAEXH@Z @ 39 NONAME ; void WlanQtUtils::deleteIap(int)
+ ?wlanScanDirectReady@WlanQtUtils@@IAEXH@Z @ 40 NONAME ; void WlanQtUtils::wlanScanDirectReady(int)
+ ?trUtf8@WlanQtUtils@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString WlanQtUtils::trUtf8(char const *, char const *, int)
+ ?moveIapToInternetSnap@WlanQtUtils@@QAEXH@Z @ 42 NONAME ; void WlanQtUtils::moveIapToInternetSnap(int)
--- a/wlanutilities/wlanqtutilities/eabi/wlanqtutilitiesu.def Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/eabi/wlanqtutilitiesu.def Fri Sep 03 09:37:37 2010 +0300
@@ -32,22 +32,16 @@
_ZN13WlanQtUtilsApD0Ev @ 31 NONAME
_ZN13WlanQtUtilsApD1Ev @ 32 NONAME
_ZN13WlanQtUtilsApD2Ev @ 33 NONAME
- _ZN14WlanQtUtilsIapC1Ev @ 34 NONAME
- _ZN14WlanQtUtilsIapC2Ev @ 35 NONAME
- _ZN14WlanQtUtilsIapD0Ev @ 36 NONAME
- _ZN14WlanQtUtilsIapD1Ev @ 37 NONAME
- _ZN14WlanQtUtilsIapD2Ev @ 38 NONAME
- _ZNK11WlanQtUtils10metaObjectEv @ 39 NONAME
- _ZNK11WlanQtUtils14availableWlansER5QListI14QSharedPointerI14WlanQtUtilsIapEERS0_IS1_I13WlanQtUtilsApEE @ 40 NONAME
- _ZNK11WlanQtUtils16availableWlanApsER5QListI14QSharedPointerI13WlanQtUtilsApEE @ 41 NONAME
- _ZNK11WlanQtUtils16connectionStatusEv @ 42 NONAME
- _ZNK11WlanQtUtils7iapNameEi @ 43 NONAME
- _ZNK11WlanQtUtils9activeIapEv @ 44 NONAME
- _ZNK13WlanQtUtilsAp5valueEi @ 45 NONAME
- _ZTI11WlanQtUtils @ 46 NONAME
- _ZTI13WlanQtUtilsAp @ 47 NONAME
- _ZTI14WlanQtUtilsIap @ 48 NONAME
- _ZTV11WlanQtUtils @ 49 NONAME
- _ZTV13WlanQtUtilsAp @ 50 NONAME
- _ZTV14WlanQtUtilsIap @ 51 NONAME
+ _ZNK11WlanQtUtils10metaObjectEv @ 34 NONAME
+ _ZNK11WlanQtUtils14availableWlansER5QListI14QSharedPointerI13WlanQtUtilsApEES5_ @ 35 NONAME
+ _ZNK11WlanQtUtils16availableWlanApsER5QListI14QSharedPointerI13WlanQtUtilsApEE @ 36 NONAME
+ _ZNK11WlanQtUtils16connectionStatusEv @ 37 NONAME
+ _ZNK11WlanQtUtils7iapNameEi @ 38 NONAME
+ _ZNK11WlanQtUtils9activeIapEv @ 39 NONAME
+ _ZNK13WlanQtUtilsAp5valueEi @ 40 NONAME
+ _ZTI11WlanQtUtils @ 41 NONAME
+ _ZTI13WlanQtUtilsAp @ 42 NONAME
+ _ZTV11WlanQtUtils @ 43 NONAME
+ _ZTV13WlanQtUtilsAp @ 44 NONAME
+ _ZN11WlanQtUtils21moveIapToInternetSnapEi @ 45 NONAME
--- a/wlanutilities/wlanqtutilities/tsrc/context/wlanqtutilstestcontext.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/tsrc/context/wlanqtutilstestcontext.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -25,7 +25,6 @@
#include "wlanqtutils.h"
#include "wlanqtutilstestcontext.h"
#include "wlanqtutilsap.h"
-#include "wlanqtutilsiap.h"
#include "wlanqtutilsconnection.h"
// ---------------------------------------------------------
@@ -169,11 +168,12 @@
clearWlanScanIapResultList();
for (int i = 0; i < numberOfWlanIaps; i++) {
- QSharedPointer<WlanQtUtilsIap> iap(new WlanQtUtilsIap());
- iap->setValue(WlanQtUtilsIap::ConfIdIapId, i);
- iap->setValue(WlanQtUtilsIap::ConfIdName, "TestWlanAp" + QString::number(i + 1));
+ QSharedPointer<WlanQtUtilsAp> iap(new WlanQtUtilsAp());
+ iap->setValue(WlanQtUtilsAp::ConfIdIapId, i);
+ QString ssid("TestWlanAp" + QString::number(i + 1));
+ iap->setValue(WlanQtUtilsAp::ConfIdName, ssid);
// ConfIdNetworkId?
- iap->setValue(WlanQtUtilsAp::ConfIdSsid, "TestWlanAp" + QString::number(i + 1));
+ iap->setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8());
iap->setValue(WlanQtUtilsAp::ConfIdSignalStrength, 20);
iap->setValue(WlanQtUtilsAp::ConfIdConnectionMode, CMManagerShim::Infra);
iap->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeOpen);
@@ -188,14 +188,14 @@
}
void WlanQtUtilsWlanScan::verifyWlanScanIapResultList(
- QList< QSharedPointer<WlanQtUtilsIap> > wlanIapList)
+ QList< QSharedPointer<WlanQtUtilsAp> > wlanIapList)
{
QCOMPARE(wlanIapList.count(), mWlanScanIapResultList.count());
for (int i = 0; i < mWlanScanIapResultList.count(); i++) {
QCOMPARE(
- wlanIapList[i]->value(WlanQtUtilsIap::ConfIdIapId),
- mWlanScanIapResultList[i]->value(WlanQtUtilsIap::ConfIdIapId));
+ wlanIapList[i]->value(WlanQtUtilsAp::ConfIdIapId),
+ mWlanScanIapResultList[i]->value(WlanQtUtilsAp::ConfIdIapId));
QCOMPARE(
wlanIapList[i]->value(WlanQtUtilsAp::ConfIdSignalStrength),
mWlanScanIapResultList[i]->value(WlanQtUtilsAp::ConfIdSignalStrength));
--- a/wlanutilities/wlanqtutilities/tsrc/context/wlanqtutilstestcontext.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/tsrc/context/wlanqtutilstestcontext.h Fri Sep 03 09:37:37 2010 +0300
@@ -160,7 +160,7 @@
* @param[in] wlanIapList WLAN IAPs that are verified against the context.
*/
void verifyWlanScanIapResultList(
- QList< QSharedPointer<WlanQtUtilsIap> > wlanIapList);
+ QList< QSharedPointer<WlanQtUtilsAp> > wlanIapList);
/**
* Creates a list of WLAN APs for scan results.
@@ -183,7 +183,7 @@
// List of WLAN IAPs that WLAN Management API stub will return when
// requesting for wlan IAP scan results.
- QList< QSharedPointer<WlanQtUtilsIap> > mWlanScanIapResultList;
+ QList< QSharedPointer<WlanQtUtilsAp> > mWlanScanIapResultList;
// List of WLAN access points that WLAN Management API stub will return when
// requesting for wlan scan results.
--- a/wlanutilities/wlanqtutilities/tsrc/stubs/stub_wlanmgmtclient.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/tsrc/stubs/stub_wlanmgmtclient.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -20,7 +20,7 @@
#include "wlanmgmtclient.h"
#include "wlanqtutilstestcontext.h"
-#include "wlanqtutilsiap.h"
+#include "wlanqtutilsap.h"
extern WlanQtUtilsTestContext testContext;
@@ -136,9 +136,9 @@
// Form results as defined in context
aAvailableIaps.Reset();
for (int i=0; i < testContext.mScan.mWlanScanIapResultList.count(); i++) {
- QSharedPointer<WlanQtUtilsIap> iap(testContext.mScan.mWlanScanIapResultList[i]);
+ QSharedPointer<WlanQtUtilsAp> iap(testContext.mScan.mWlanScanIapResultList[i]);
TWlanIapAvailabilityData data;
- data.iIapId = (TUint)iap->value(WlanQtUtilsIap::ConfIdIapId).toInt();
+ data.iIapId = (TUint)iap->value(WlanQtUtilsAp::ConfIdIapId).toInt();
data.iRssi = (TUint)iap->value(WlanQtUtilsAp::ConfIdSignalStrength).toInt();
aAvailableIaps.AppendL(data);
}
--- a/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -25,7 +25,6 @@
#include <cmmanagerdefines_shim.h>
#include "wlanqtutilsap.h"
-#include "wlanqtutilsiap.h"
#include "wlanqtutils.h"
#include "wlanqtutils_p.h"
#include "wlanqtutilsconmonwrapper.h"
@@ -159,7 +158,7 @@
subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
// Get and verify the list of available WLAN APs.
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
wlanQtUtils_->availableWlans(iaps, aps);
@@ -200,7 +199,7 @@
subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
// Get and verify the list of available WLAN APs.
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
wlanQtUtils_->availableWlans(iaps, aps);
@@ -244,7 +243,7 @@
subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
// Get and verify the list of available WLAN APs.
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
wlanQtUtils_->availableWlans(iaps, aps);
@@ -275,7 +274,7 @@
subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
// Get and verify the list of available WLAN APs.
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
wlanQtUtils_->availableWlans(iaps, aps);
@@ -294,8 +293,8 @@
// Form WLAN IAP scan result list
testContext.mScan.createDefaultWlanScanIapResultList(3);
testContext.mScan.mWlanScanIapResultList.removeAt(1);
- testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdIapId, 5);
- testContext.mScan.mWlanScanIapResultList[1]->setValue(WlanQtUtilsIap::ConfIdIapId, 7);
+ testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdIapId, 5);
+ testContext.mScan.mWlanScanIapResultList[1]->setValue(WlanQtUtilsAp::ConfIdIapId, 7);
// Form WLAN AP scan result list
testContext.mScan.createDefaultWlanScanApResultList(7);
@@ -314,7 +313,7 @@
subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
// Get and verify the list of available WLAN APs.
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
wlanQtUtils_->availableWlans(iaps, aps);
@@ -337,7 +336,7 @@
void TestWlanQtUtils::testAvailableWlanSequence()
{
// **************** Before 1st scan ********************
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
wlanQtUtils_->availableWlans(iaps, aps);
// Verify we have no results
@@ -402,7 +401,7 @@
subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
// Get and verify the list of available WLAN APs.
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
wlanQtUtils_->availableWlans(iaps, aps);
testContext.mScan.verifyWlanScanApResultList(aps);
@@ -633,7 +632,7 @@
subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
// Ensure there are no WLAN IAPs but there is one scan result.
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
wlanQtUtils_->availableWlans(iaps, aps);
@@ -642,6 +641,7 @@
// Execute createIap() function
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testCreateIapOk");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testCreateIapOk");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
wlanAp->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, true);
@@ -651,11 +651,11 @@
// Form WLAN IAP scan result list
testContext.mScan.createDefaultWlanScanIapResultList(1);
- testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdIapId, iapId);
- testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdName, QString("testCreateIapOk"));
- testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdSsid, QString("testCreateIapOk"));
- testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdSecurityMode, (int)(CMManagerShim::WlanSecModeWpa));
- testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsIap::ConfIdWpaPskUse, true);
+ testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdIapId, iapId);
+ testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdName, QString("testCreateIapOk"));
+ testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdSsid, QString("testCreateIapOk"));
+ testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdSecurityMode, (int)(CMManagerShim::WlanSecModeWpa));
+ testContext.mScan.mWlanScanIapResultList[0]->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, true);
// Re-execute the scan so that scan lists get updated due to the IAP creation
wlanQtUtils_->scanWlans();
@@ -674,6 +674,7 @@
{
// Execute createIap() function with invalid parameters
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testCreateIapErr");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testCreateIapErr");
wlanAp->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, false);
// Invalid security mode -> exception
@@ -691,6 +692,7 @@
{
// Create the IAPs with different kind of WEP keys
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testCreateIapWepKeys");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testCreateIapWepKeys");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWep);
wlanAp->setValue(WlanQtUtilsAp::ConfIdWepDefaultIndex, CMManagerShim::WepKeyIndex2);
@@ -731,10 +733,12 @@
{
// Create an IAP that can be updated
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testUpdateIapOk");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testUpdateIapOk");
int iapId = wlanQtUtils_->createIap(wlanAp.data());
// Update the name and verify it changed
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "UPDATED_testUpdateIapOk");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "UPDATED_testUpdateIapOk");
bool success = wlanQtUtils_->updateIap(iapId, wlanAp.data());
@@ -761,6 +765,7 @@
{
// Create an IAP that can be deleted
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testDeleteIapOk");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testDeleteIapOk");
int iapId = wlanQtUtils_->createIap(wlanAp.data());
@@ -857,6 +862,7 @@
{
// Create and connect an IAP we can then disconnect
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testDisconnectIapOk");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testDisconnectIapOk");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
@@ -888,6 +894,30 @@
}
/**
+ * This function tests moving of an IAP into Internet destination.
+ */
+void TestWlanQtUtils::testMoveIapToInternetOk()
+{
+ // First create the IAP to move
+ QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testMoveIapToInternetOk");
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testMoveIapToInternetOk");
+ int iapId = wlanQtUtils_->createIap(wlanAp.data());
+ QVERIFY(iapId != WlanQtUtils::IapIdNone);
+
+ // Verify the name
+ QCOMPARE(wlanQtUtils_->iapName(iapId), QString("testMoveIapToInternetOk"));
+
+ // Now move the IAP to internet destination
+ wlanQtUtils_->moveIapToInternetSnap(iapId);
+
+ // No interface for checking the destination via WlanQtUtils, so skipping it
+
+ // Delete the IAP
+ wlanQtUtils_->deleteIap(iapId);
+}
+
+/**
* This function tests connection status getter.
*/
void TestWlanQtUtils::testConnectionStatus()
@@ -934,6 +964,7 @@
{
// Create the IAP we want to find with the getter
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testIapFound");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testIapFound");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa2);
@@ -967,6 +998,7 @@
{
// Create the IAP we want to find with the getter
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectedWlanIdFound");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectedWlanIdFound");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
@@ -1068,6 +1100,14 @@
// Catch & check the scan result signal
subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusCancelled);
+
+ // Restart scan to make sure previous is really finished
+ testContext.mScan.mCompleteWlanApScan = true;
+ wlanQtUtils_->scanWlans();
+
+ // No need to verify scan results here, testAvailableWlan* test cases
+ // are for that. Just make sure the result signal is received.
+ subTestScanResultSignal(mSignalScanReady, WlanQtUtils::ScanStatusOk);
}
/**
@@ -1190,6 +1230,7 @@
{
// Create new IAP to test
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectionTestOk");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestOk");
int iapId = wlanQtUtils_->createIap(wlanAp.data());
QVERIFY(iapId != WlanQtUtils::IapIdNone);
@@ -1239,6 +1280,7 @@
{
// Create and connect an IAP and request ICT to be run
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectionTestErr1");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestErr1");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
@@ -1286,6 +1328,7 @@
QCOMPARE(arguments.at(0).toInt(), iapId);
QCOMPARE(arguments.at(1).toInt(), KErrNone);
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectionTestErr2");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestErr2");
iapId = wlanQtUtils_->createIap(wlanAp.data());
@@ -1323,6 +1366,7 @@
{
// Create new IAP to test
QScopedPointer<WlanQtUtilsAp> wlanAp(subTestNewAp());
+ wlanAp->setValue(WlanQtUtilsAp::ConfIdName, "testConnectionTestHotspot");
wlanAp->setValue(WlanQtUtilsAp::ConfIdSsid, "testConnectionTestHotspot");
int iapId = wlanQtUtils_->createIap(wlanAp.data());
QVERIFY(iapId != WlanQtUtils::IapIdNone);
@@ -1557,7 +1601,8 @@
WlanQtUtilsAp *ap = new WlanQtUtilsAp;
// Set default values
- ap->setValue(WlanQtUtilsAp::ConfIdSsid, QString());
+ ap->setValue(WlanQtUtilsAp::ConfIdName, QString());
+ ap->setValue(WlanQtUtilsAp::ConfIdSsid, QByteArray());
ap->setValue(WlanQtUtilsAp::ConfIdSignalStrength, 90);
ap->setValue(WlanQtUtilsAp::ConfIdConnectionMode, CMManagerShim::Infra);
ap->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeOpen);
--- a/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.h Fri Sep 03 09:37:37 2010 +0300
@@ -77,6 +77,8 @@
void testDisconnectIapOk();
void testDisconnectIapIgnored();
+ void testMoveIapToInternetOk();
+
void testConnectionStatus();
void testIapNameFound();
--- a/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.pro Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/tsrc/testwlanqtutils.pro Fri Sep 03 09:37:37 2010 +0300
@@ -55,7 +55,6 @@
context/wlanqtutilstestcontext.h \
../base/inc/wlanqtutils.h \
../base/inc/wlanqtutils_p.h \
- ../base/inc/wlanqtutilsiap.h \
../base/inc/wlanqtutilsiapsettings.h \
../base/inc/wlanqtutilsap.h \
../base/inc/wlanqtutilsconnection.h \
@@ -69,7 +68,6 @@
context/wlanqtutilstestcontext.cpp \
../base/src/wlanqtutils.cpp \
../base/src/wlanqtutils_p.cpp \
- ../base/src/wlanqtutilsiap.cpp \
../base/src/wlanqtutilsap.cpp \
../base/src/wlanqtutilsconnection.cpp \
../base/src/wlanqtutilsiapsettings.cpp \
--- a/wlanutilities/wlanqtutilities/wlanqtutilities.pro Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wlanqtutilities.pro Fri Sep 03 09:37:37 2010 +0300
@@ -42,7 +42,6 @@
base/inc/wlanqtutils_p.h \
base/inc/wlanqtutilsap.h \
base/inc/wlanqtutilsconnection.h \
- base/inc/wlanqtutilsiap.h \
base/inc/wlanqtutilsiapsettings.h \
wrapper/inc/wlanqtutilsconmonwrapper.h \
wrapper/inc/wlanqtutilsesockwrapper.h \
@@ -54,7 +53,6 @@
base/src/wlanqtutils_p.cpp \
base/src/wlanqtutilsap.cpp \
base/src/wlanqtutilsconnection.cpp \
- base/src/wlanqtutilsiap.cpp \
base/src/wlanqtutilsiapsettings.cpp \
wrapper/src/wlanqtutilsconmonwrapper.cpp \
wrapper/src/wlanqtutilsesockwrapper.cpp \
@@ -85,8 +83,7 @@
BLD_INF_RULES.prj_exports += "rom/wlanqtutilities.iby CORE_MW_LAYER_IBY_EXPORT_PATH(wlanqtutilities.iby)"
BLD_INF_RULES.prj_exports += \
"base/inc/wlanqtutils.h |../inc/wlanqtutils.h" \
- "base/inc/wlanqtutilsap.h |../inc/wlanqtutilsap.h" \
- "base/inc/wlanqtutilsiap.h |../inc/wlanqtutilsiap.h"
+ "base/inc/wlanqtutilsap.h |../inc/wlanqtutilsap.h"
# S60 libraries
LIBS += -lconnmon -lecom -lesock -lextendedconnpref -lnetmeta -lictswlanlogininterface -lcharconv
--- a/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsscan.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsscan.h Fri Sep 03 09:37:37 2010 +0300
@@ -26,7 +26,7 @@
// User includes
-#include "wlanqtutilsiap.h"
+#include "wlanqtutilsap.h"
// Forward declarations
@@ -67,7 +67,7 @@
@param [in] availableIaps Available WLAN IAP's found in scan.
*/
void availableWlanIaps(
- QList< QSharedPointer<WlanQtUtilsIap> > &availableIaps);
+ QList< QSharedPointer<WlanQtUtilsAp> > &availableIaps);
/*!
Signal indicating available WLAN access points.
--- a/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsscanap_symbian.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsscanap_symbian.h Fri Sep 03 09:37:37 2010 +0300
@@ -72,7 +72,7 @@
void ExtractScanResults(
QList< QSharedPointer<WlanQtUtilsAp> > &scanResults);
- QString ExtractSsid();
+ void ExtractSsid(QByteArray &ssid, QString &name);
QByteArray ExtractBssid();
--- a/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsscaniap_symbian.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsscaniap_symbian.h Fri Sep 03 09:37:37 2010 +0300
@@ -25,7 +25,7 @@
// User includes
-#include "wlanqtutilsiap.h"
+#include "wlanqtutilsap.h"
// Forward declarations
@@ -66,7 +66,7 @@
void ConstructL();
void ExtractScanResults(
- QList< QSharedPointer<WlanQtUtilsIap> > &scanResults);
+ QList< QSharedPointer<WlanQtUtilsAp> > &scanResults);
private: // data
--- a/wlanutilities/wlanqtutilities/wrapper/src/wlanqtutilsscanap_symbian.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wrapper/src/wlanqtutilsscanap_symbian.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -239,17 +239,20 @@
QSharedPointer<WlanQtUtilsAp> ap(new WlanQtUtilsAp());
// SSID
- QString ssid = ExtractSsid();
+ QByteArray ssid;
+ QString name;
+ ExtractSsid(ssid, name);
// Skip over hidden networks. There is no spec for what
// their names will contain, but at least names with only
// null characters and whitespace characters are seen
// in real life.
- if (ssid.trimmed().isEmpty()) {
+ if (name.trimmed().isEmpty()) {
continue;
}
ap->setValue(WlanQtUtilsAp::ConfIdSsid, ssid);
-
+ ap->setValue(WlanQtUtilsAp::ConfIdName, name);
+
// BSSID
QByteArray bssid = ExtractBssid();
ap->setValue(WlanQtUtilsAp::ConfIdBssid, bssid);
@@ -290,38 +293,79 @@
/*!
Extracts and cleans up the WLAN SSID from current scan result element.
- @return SSID string.
+ @param [out] ssid SSID in raw byte form (to be used in connect).
+ @param [out] name SSID in decoded form (to be used in UI).
*/
-QString WlanQtUtilsScanApPrivate::ExtractSsid()
+void WlanQtUtilsScanApPrivate::ExtractSsid(QByteArray &ssid, QString &name)
{
// Get the SSID in raw data format
TUint8 ieLen;
- const TUint8* ieData;
+ const TUint8 *ieData;
TInt ret = mResults->InformationElement(KWlan802Dot11SsidIE, ieLen, &ieData);
-
- // Convert into QString
- QString ssid;
+
+ // Default to empty
+ name.clear();
+ ssid.clear();
+
if (ret == KErrNone && ieLen > 0) {
+ // Store the SSID exactly like we get it from the scanning.
+ // This is to make sure the connecting works even if our character
+ // conversion changes how the SSID looks like in UI.
+ ssid = QByteArray((char *)ieData, (int)ieLen);
+
// Trace the buffer as data to ease low level debugging
OstTraceData(
TRACE_DUMP,
WLANQTUTILSSCANAPPRIVATE_EXTRACTSSID_DATA,
"WlanQtUtilsScanApPrivate::ExtractSsid data 0x%{hex8[]}",
- ieData,
- ieLen);
+ ssid.data(),
+ ssid.length());
+
+#ifdef OST_TRACE_COMPILER_IN_USE
+ // Additional trace since one byte hex string tracing has problems
+ // TODO: To be removed when the hex above tracing works OK
+ QString ssidHex(ssid.toHex());
+ TPtrC16 hexString(ssidHex.utf16(), ssidHex.length());
+
+ OstTraceExt1(
+ TRACE_DUMP,
+ WLANQTUTILSSCANAPPRIVATE_EXTRACTSSID_HEX,
+ "WlanQtUtilsScanApPrivate::ExtractSsid;ssid hex=%S",
+ hexString);
+#endif
// The IEEE 802.11-2007 section 7.3.2.1 only specifies that
// the SSID is 0-32 octets, leaving the format of the octets
- // completely open.
+ // completely open. This means that there are bound to be WLAN
+ // SSID data handling implementations that can not be supported
+ // all at the same time.
+
// To support a bit wider character set than 7-bit ASCII, we
- // treat the raw SSID bytes as the lowest octets of Unicode.
- for (int i = 0; i < ieLen; i++) {
- ssid.append(QChar((uint)ieData[i]));
+ // first try to treat the raw SSID bytes as UTF-8.
+ TPtrC8 ssid_data(ieData, (TInt)ieLen);
+ TBuf16<CMManagerShim::WlanSSIDLength> ssid_utf8;
+ TInt err = CnvUtfConverter::ConvertToUnicodeFromUtf8(
+ ssid_utf8,
+ ssid_data);
+ if (err == KErrNone) {
+ // UTF-8 conversion succeeded, using it.
+ name = QString(
+ reinterpret_cast<const QChar *>(ssid_utf8.Ptr()),
+ ssid_utf8.Length());
+ } else {
+ // If UTF-8 conversion fails, we fall back to treating each SSID
+ // data byte as the lowest octet of Unicode (UCS-2).
+ for (int i = 0; i < ieLen; i++) {
+ name.append(QChar((uint)ieData[i]));
+ }
}
+ // Remove nul characters
+ name.remove(QChar());
+
#ifdef OST_TRACE_COMPILER_IN_USE
- TPtrC16 string(ssid.utf16(), ssid.length());
+ TPtrC16 string(name.utf16(), name.length());
OstTraceExt1(
TRACE_DUMP,
WLANQTUTILSSCANAPPRIVATE_EXTRACTSSID_STRING,
@@ -329,11 +373,6 @@
string);
#endif
}
-
- // Remove nul characters
- ssid.remove(QChar());
-
- return ssid;
}
/*!
@@ -346,21 +385,16 @@
{
TWlanBssid wlanBssid;
mResults->Bssid(wlanBssid);
- QByteArray bssid;
- for (int i = 0; i < (int)wlanBssid.Length(); i++) {
- bssid[i] = (char)wlanBssid[i];
- }
+ QByteArray bssid(
+ reinterpret_cast<const char *>(wlanBssid.Ptr()),
+ wlanBssid.Length());
-#ifdef OST_TRACE_COMPILER_IN_USE
- QString bssidHex(bssid.toHex());
- TPtrC16 string(bssidHex.utf16(), bssidHex.length());
-
- OstTraceExt1(
+ OstTraceData(
TRACE_DUMP,
- WLANQTUTILSSCANAPPRIVATE_EXTRACTBSSID,
- "WlanQtUtilsScanApPrivate::ExtractBssid;bssid=%S",
- string);
-#endif
+ WLANQTUTILSSCANAPPRIVATE_EXTRACTBSSID_DATA,
+ "WlanQtUtilsScanApPrivate::ExtractBssid data 0x%{hex8[]}",
+ bssid.data(),
+ bssid.length());
return bssid;
}
--- a/wlanutilities/wlanqtutilities/wrapper/src/wlanqtutilsscaniap_symbian.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wrapper/src/wlanqtutilsscaniap_symbian.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -23,7 +23,7 @@
// User includes
#include "wlanqtutils.h"
-#include "wlanqtutilsiap.h"
+#include "wlanqtutilsap.h"
#include "wlanqtutilsscan.h"
#include "wlanqtutilsscaniap_symbian.h"
@@ -137,7 +137,7 @@
emit q_ptr->scanFailed(WlanQtUtils::ScanStatusError);
} else {
// Scan succeeded
- QList< QSharedPointer<WlanQtUtilsIap> > scanResults;
+ QList< QSharedPointer<WlanQtUtilsAp> > scanResults;
ExtractScanResults(scanResults);
// Inform about the results
@@ -200,22 +200,22 @@
*/
void WlanQtUtilsScanIapPrivate::ExtractScanResults(
- QList< QSharedPointer<WlanQtUtilsIap> > &scanResults)
+ QList< QSharedPointer<WlanQtUtilsAp> > &scanResults)
{
OstTraceFunctionEntry0(WLANQTUTILSSCANIAPPRIVATE_EXTRACTSCANRESULTS_ENTRY);
for (int i=0; i < mAvailableIaps.Count(); i++) {
// Create an IAP for each result
- QSharedPointer<WlanQtUtilsIap> iap(new WlanQtUtilsIap());
+ QSharedPointer<WlanQtUtilsAp> iap(new WlanQtUtilsAp());
// IAP ID
iap->setValue(
- WlanQtUtilsIap::ConfIdIapId,
+ WlanQtUtilsAp::ConfIdIapId,
(int)mAvailableIaps[i].iIapId);
// Signal strength
iap->setValue(
- WlanQtUtilsIap::ConfIdSignalStrength,
+ WlanQtUtilsAp::ConfIdSignalStrength,
(int)mAvailableIaps[i].iRssi);
// Append the IAP to scan result list
--- a/wlanutilities/wlansniffer/wlansnifferapplication/inc/wlansnifferlistview.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/inc/wlansnifferlistview.h Fri Sep 03 09:37:37 2010 +0300
@@ -113,7 +113,7 @@
void startWlanWizard();
- void handleWlanEnableDialogClosed(HbAction *action);
+ void handleWlanEnableDialogClosed(int action);
private: // data
--- a/wlanutilities/wlansniffer/wlansnifferapplication/inc/wlansnifferlistwidget.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/inc/wlansnifferlistwidget.h Fri Sep 03 09:37:37 2010 +0300
@@ -31,7 +31,6 @@
class HbListWidget;
class HbListWidgetItem;
class WlanSnifferListItem;
-class WlanQtUtilsIap;
class WlanQtUtilsAp;
// External data types
@@ -62,7 +61,7 @@
virtual ~WlanSnifferListWidget();
void updateContent(
- QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
QList< QSharedPointer<WlanQtUtilsAp> > &aps,
int connectedIapId);
@@ -81,26 +80,26 @@
Q_DISABLE_COPY(WlanSnifferListWidget)
void sortIaps(
- QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
int connectedIapId);
void sortAps(
QList< QSharedPointer<WlanQtUtilsAp> > &aps);
static bool iapLessThan(
- const QSharedPointer<WlanQtUtilsIap> iap1,
- const QSharedPointer<WlanQtUtilsIap> iap2);
+ const QSharedPointer<WlanQtUtilsAp> iap1,
+ const QSharedPointer<WlanQtUtilsAp> iap2);
static bool apLessThan(
const QSharedPointer<WlanQtUtilsAp> ap1,
const QSharedPointer<WlanQtUtilsAp> ap2);
- WlanSnifferListItem *findFromOldList(QSharedPointer<WlanQtUtilsIap> iap);
+ WlanSnifferListItem *findFromOldIapList(QSharedPointer<WlanQtUtilsAp> iap);
- WlanSnifferListItem *findFromOldList(QSharedPointer<WlanQtUtilsAp> ap);
+ WlanSnifferListItem *findFromOldApList(QSharedPointer<WlanQtUtilsAp> ap);
HbListWidgetItem *listItemCreate(
- QSharedPointer<WlanQtUtilsIap> iap,
+ QSharedPointer<WlanQtUtilsAp> iap,
int connectedIapId);
HbListWidgetItem *listItemCreate(QSharedPointer<WlanQtUtilsAp> ap);
@@ -110,11 +109,11 @@
QString leftIconChoose(int iapId, int connectedIapId);
void removeLostItems(
- const QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ const QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
const QList< QSharedPointer<WlanQtUtilsAp> > &aps);
void addDiscoveredItemsAndUpdateRest(
- const QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ const QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
const QList< QSharedPointer<WlanQtUtilsAp> > &aps,
int connectedIapId);
--- a/wlanutilities/wlansniffer/wlansnifferapplication/res/listview.css Mon Aug 23 13:30:09 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-/* WLAN status label in list view. */
-HbLabel#statusLabel::text {
- /* Status label should take no more than two rows. */
- text-line-count-min: 1;
- text-line-count-max: 2;
-}
--- a/wlanutilities/wlansniffer/wlansnifferapplication/res/wlansniffer.qrc Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/res/wlansniffer.qrc Fri Sep 03 09:37:37 2010 +0300
@@ -5,7 +5,6 @@
</qresource>
<qresource prefix="/wlansnifferlayout" >
- <file>listview.css</file>
<file>hblistviewitem.css</file>
<file>hblistviewitem.widgetml</file>
</qresource>
--- a/wlanutilities/wlansniffer/wlansnifferapplication/res/wlansnifferlistview.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/res/wlansnifferlistview.docml Fri Sep 03 09:37:37 2010 +0300
@@ -13,6 +13,7 @@
<widget name="statusContainer" type="HbWidget">
<widget name="statusLabel" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
+ <integer name="maximumLines" value="2"/>
<enums name="aspectRatioMode" value="IgnoreAspectRatio"/>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
--- a/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -38,7 +38,6 @@
#include "wlanqtutils.h"
#include "wlanqtutilsap.h"
-#include "wlanqtutilsiap.h"
#include "wlansnifferengine.h"
#include "wlansniffermainwindow.h"
@@ -375,7 +374,7 @@
if (!mIgnoreWlanScanResults) {
// Get the latest scan results
- QList< QSharedPointer<WlanQtUtilsIap> > iaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > iaps;
QList< QSharedPointer<WlanQtUtilsAp> > aps;
mEngine->wlanQtUtils()->availableWlans(iaps, aps);
@@ -633,8 +632,9 @@
new HbMessageBox(HbMessageBox::MessageTypeQuestion));
mWlanEnableDialog->setTimeout(HbPopup::StandardTimeout);
mWlanEnableDialog->setText(hbTrId("txt_occ_info_activate_wlan_in_airplane_mode"));
+ mWlanEnableDialog->setStandardButtons(HbMessageBox::Yes | HbMessageBox::No);
// Open the dialog and connect the result to the handleWlanEnableDialogClosed slot
- mWlanEnableDialog->open(this, SLOT(handleWlanEnableDialogClosed(HbAction*)));
+ mWlanEnableDialog->open(this, SLOT(handleWlanEnableDialogClosed(int)));
} else {
// Stop WLAN scanning immediately when switching WLAN OFF.
// WLAN might have sent scan results just before disabling WLAN.
@@ -655,8 +655,6 @@
{
OstTraceFunctionEntry0(WLANSNIFFERLISTVIEW_STARTWLANWIZARD_ENTRY);
- // TODO: Stop connections & do other cleanup before wizard can start?
-
emit wizardTriggered(NULL);
OstTraceFunctionExit0(WLANSNIFFERLISTVIEW_STARTWLANWIZARD_EXIT);
@@ -669,17 +667,16 @@
@param [in] action The user action received from the dialog.
*/
-void WlanSnifferListView::handleWlanEnableDialogClosed(HbAction *action)
+void WlanSnifferListView::handleWlanEnableDialogClosed(int action)
{
OstTraceFunctionEntry0(WLANSNIFFERLISTVIEW_HANDLEWLANENABLEDIALOGCLOSED_ENTRY);
-
+
// The dialog must exist
Q_ASSERT(mWlanEnableDialog);
-
+
// If the user selected yes, then the wlan value is toggled,
// otherwise nothing needs to be done.
- // TODO: Update actions().at(0) when a better solution is provided by orbit
- if (action == mWlanEnableDialog->actions().at(0)) {
+ if (action == HbMessageBox::Yes) {
mEngine->setMasterWlan(true);
}
--- a/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistwidget.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistwidget.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -28,7 +28,6 @@
#include "wlanqtutils.h"
#include "wlanqtutilsap.h"
-#include "wlanqtutilsiap.h"
#include "wlansniffer.h"
#include "wlansnifferlistitem.h"
@@ -108,7 +107,7 @@
*/
void WlanSnifferListWidget::updateContent(
- QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
QList< QSharedPointer<WlanQtUtilsAp> > &aps,
int connectedIapId)
{
@@ -169,7 +168,7 @@
*/
void WlanSnifferListWidget::sortIaps(
- QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
int connectedIapId)
{
OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_SORTIAPS_ENTRY);
@@ -183,7 +182,7 @@
// Find the possible connected IAP
int connectedIndex = 0;
for (int i = 0; i < iaps.size(); i++) {
- if (iaps[i]->value(WlanQtUtilsIap::ConfIdIapId).toInt() == connectedIapId) {
+ if (iaps[i]->value(WlanQtUtilsAp::ConfIdIapId).toInt() == connectedIapId) {
connectedIndex = i;
break;
}
@@ -235,13 +234,13 @@
*/
bool WlanSnifferListWidget::iapLessThan(
- const QSharedPointer<WlanQtUtilsIap> iap1,
- const QSharedPointer<WlanQtUtilsIap> iap2)
+ const QSharedPointer<WlanQtUtilsAp> iap1,
+ const QSharedPointer<WlanQtUtilsAp> iap2)
{
// Primary comparison is based on the name
int result = HbStringUtil::compareC(
- iap1->value(WlanQtUtilsIap::ConfIdName).toString(),
- iap2->value(WlanQtUtilsIap::ConfIdName).toString());
+ iap1->value(WlanQtUtilsAp::ConfIdName).toString(),
+ iap2->value(WlanQtUtilsAp::ConfIdName).toString());
return (result < 0) ? true : false;
}
@@ -276,13 +275,13 @@
@return Found WLAN List Widget item, 0 if not found.
*/
-WlanSnifferListItem *WlanSnifferListWidget::findFromOldList(
- QSharedPointer<WlanQtUtilsIap> iap)
+WlanSnifferListItem *WlanSnifferListWidget::findFromOldIapList(
+ QSharedPointer<WlanQtUtilsAp> iap)
{
- OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_FINDFROMOLDLIST_IAP_ENTRY);
+ OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_FINDFROMOLDIAPLIST_IAP_ENTRY);
WlanSnifferListItem *result = NULL;
- QVariant iapData = iap->value(WlanQtUtilsIap::ConfIdIapId);
+ QVariant iapData = iap->value(WlanQtUtilsAp::ConfIdIapId);
for (int row = 0; row < mListWidget->count(); row++) {
HbListWidgetItem *item = mListWidget->item(row);
if (item->data() == iapData) {
@@ -293,12 +292,12 @@
OstTraceExt2(
TRACE_DUMP,
- WLANSNIFFERLISTWIDGET_FINDFROMOLDLIST_IAP,
- "WlanSnifferListWidget::findFromOldList;iapId=%d;found=%hhu",
+ WLANSNIFFERLISTWIDGET_FINDFROMOLDIAPLIST_IAP,
+ "WlanSnifferListWidget::findFromOldIapList;iapId=%d;found=%hhu",
iapData.toInt(),
(result != NULL) ? true : false);
- OstTraceFunctionExit0(WLANSNIFFERLISTWIDGET_FINDFROMOLDLIST_IAP_EXIT);
+ OstTraceFunctionExit0(WLANSNIFFERLISTWIDGET_FINDFROMOLDIAPLIST_IAP_EXIT);
return result;
}
@@ -310,10 +309,10 @@
@return Found WLAN List Widget item, 0 if not found.
*/
-WlanSnifferListItem *WlanSnifferListWidget::findFromOldList(
+WlanSnifferListItem *WlanSnifferListWidget::findFromOldApList(
QSharedPointer<WlanQtUtilsAp> ap)
{
- OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_FINDFROMOLDLIST_AP_ENTRY);
+ OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_FINDFROMOLDAPLIST_ENTRY);
WlanSnifferListItem *result = NULL;
for (int row = 0; row < mListWidget->count(); row++) {
@@ -332,13 +331,13 @@
TPtrC16 ssid(tmp.utf16(), tmp.length());
OstTraceExt2(
TRACE_NORMAL,
- WLANSNIFFERLISTWIDGET_FINDFROMOLDLIST_AP,
- "WlanSnifferListWidget::findFromOldList;found=%hhu;ssid=%S",
+ WLANSNIFFERLISTWIDGET_FINDFROMOLDAPLIST,
+ "WlanSnifferListWidget::findFromOldApList;found=%hhu;ssid=%S",
(result != NULL) ? true : false,
ssid);
#endif
- OstTraceFunctionExit0(WLANSNIFFERLISTWIDGET_FINDFROMOLDLIST_AP_EXIT);
+ OstTraceFunctionExit0(WLANSNIFFERLISTWIDGET_FINDFROMOLDAPLIST_EXIT);
return result;
}
@@ -353,13 +352,13 @@
*/
HbListWidgetItem *WlanSnifferListWidget::listItemCreate(
- QSharedPointer<WlanQtUtilsIap> iap,
+ QSharedPointer<WlanQtUtilsAp> iap,
int connectedIapId)
{
OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_LISTITEMCREATE_IAP_ENTRY);
WlanSnifferListItem *item = new WlanSnifferListItem();
- item->setNetworkName(iap->value(WlanQtUtilsIap::ConfIdName).toString());
+ item->setNetworkName(iap->value(WlanQtUtilsAp::ConfIdName).toString());
// Note: WPS icon is needed only in IAP setup, no longer here
if (iap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt() !=
CMManagerShim::WlanSecModeOpen) {
@@ -368,13 +367,13 @@
item->setLeftIcon(
leftIconChoose(
- iap->value(WlanQtUtilsIap::ConfIdIapId).toInt(),
+ iap->value(WlanQtUtilsAp::ConfIdIapId).toInt(),
connectedIapId));
item->setSignalIcon(
signalStrengthIconChoose(
iap->value(WlanQtUtilsAp::ConfIdSignalStrength).toInt()));
- item->setData(iap->value(WlanQtUtilsIap::ConfIdIapId));
+ item->setData(iap->value(WlanQtUtilsAp::ConfIdIapId));
OstTraceFunctionExit0(WLANSNIFFERLISTWIDGET_LISTITEMCREATE_IAP_EXIT);
return item;
@@ -394,7 +393,7 @@
OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_LISTITEMCREATE_AP_ENTRY);
WlanSnifferListItem *item = new WlanSnifferListItem();
- item->setNetworkName(ap->value(WlanQtUtilsAp::ConfIdSsid).toString());
+ item->setNetworkName(ap->value(WlanQtUtilsAp::ConfIdName).toString());
if (ap->value(WlanQtUtilsAp::ConfIdWpsSupported).toBool()) {
// WPS is supported, use a dedicated security icon
item->setSecureIcon("qtg_small_wifi");
@@ -406,11 +405,11 @@
item->setSignalIcon(
signalStrengthIconChoose(
ap->value(WlanQtUtilsAp::ConfIdSignalStrength).toInt()));
-
+
QVariant data;
data.setValue(*ap);
item->setData(data);
-
+
OstTraceFunctionExit0(WLANSNIFFERLISTWIDGET_LISTITEMCREATE_AP_EXIT);
return item;
}
@@ -477,7 +476,7 @@
*/
void WlanSnifferListWidget::removeLostItems(
- const QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ const QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
const QList< QSharedPointer<WlanQtUtilsAp> > &aps)
{
OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_REMOVELOSTITEMS_ENTRY);
@@ -490,8 +489,8 @@
const HbListWidgetItem *item = mListWidget->item(row);
if (item->data().canConvert<int>()) {
// Item was an IAP, try to find it from the new IAP list
- foreach (QSharedPointer<WlanQtUtilsIap> iap, iaps) {
- if (iap->value(WlanQtUtilsIap::ConfIdIapId) ==
+ foreach (QSharedPointer<WlanQtUtilsAp> iap, iaps) {
+ if (iap->value(WlanQtUtilsAp::ConfIdIapId) ==
item->data()) {
found = true;
break;
@@ -540,7 +539,7 @@
*/
void WlanSnifferListWidget::addDiscoveredItemsAndUpdateRest(
- const QList< QSharedPointer<WlanQtUtilsIap> > &iaps,
+ const QList< QSharedPointer<WlanQtUtilsAp> > &iaps,
const QList< QSharedPointer<WlanQtUtilsAp> > &aps,
int connectedIapId)
{
@@ -548,13 +547,13 @@
int row = 0;
// Loop through new IAPs and try to find them from the old list
- foreach (QSharedPointer<WlanQtUtilsIap> newIap, iaps) {
- WlanSnifferListItem *oldItem = findFromOldList(newIap);
+ foreach (QSharedPointer<WlanQtUtilsAp> newIap, iaps) {
+ WlanSnifferListItem *oldItem = findFromOldIapList(newIap);
if (oldItem != NULL) {
// Match found, update icons
oldItem->setLeftIcon(
leftIconChoose(
- newIap->value(WlanQtUtilsIap::ConfIdIapId).toInt(),
+ newIap->value(WlanQtUtilsAp::ConfIdIapId).toInt(),
connectedIapId));
oldItem->setSignalIcon(
signalStrengthIconChoose(
@@ -588,7 +587,7 @@
// Repeat the same for new APs. Notice that row index continues from
// previous loop
foreach (QSharedPointer<WlanQtUtilsAp> newAp, aps) {
- WlanSnifferListItem *oldItem = findFromOldList(newAp);
+ WlanSnifferListItem *oldItem = findFromOldApList(newAp);
if (oldItem != NULL) {
oldItem->setSignalIcon(
signalStrengthIconChoose(
--- a/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansniffermainwindow.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansniffermainwindow.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -161,7 +161,8 @@
// Create an IAP for a specific AP
if (ap) {
mWizard->setParameters(
- ap->value(WlanQtUtilsAp::ConfIdSsid).toString(),
+ ap->value(WlanQtUtilsAp::ConfIdName).toString(),
+ ap->value(WlanQtUtilsAp::ConfIdSsid).toByteArray(),
ap->value(WlanQtUtilsAp::ConfIdConnectionMode).toInt(),
ap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt(),
ap->value(WlanQtUtilsAp::ConfIdWpaPskUse).toInt(),
--- a/wlanutilities/wlansniffer/wlansnifferapplication/tsrc/t_wlansniffer.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/tsrc/t_wlansniffer.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -26,7 +26,6 @@
// User includes
-#include "wlanqtutilsiap.h"
#include "wlanqtutilsap.h"
#include "wlansnifferlistwidget.h"
@@ -348,18 +347,18 @@
void TestWlanSniffer::testUpdateContentRobustness2()
{
- QSharedPointer<WlanQtUtilsIap> iap2(new WlanQtUtilsIap());
- iap2->setValue(WlanQtUtilsIap::ConfIdIapId, 2);
- iap2->setValue(WlanQtUtilsIap::ConfIdNetworkId, 0);
- iap2->setValue(WlanQtUtilsIap::ConfIdName, "SSID 2");
+ QSharedPointer<WlanQtUtilsAp> iap2(new WlanQtUtilsAp());
+ iap2->setValue(WlanQtUtilsAp::ConfIdIapId, 2);
+ iap2->setValue(WlanQtUtilsAp::ConfIdNetworkId, 0);
+ iap2->setValue(WlanQtUtilsAp::ConfIdName, "SSID 2");
iap2->setValue(WlanQtUtilsAp::ConfIdSsid, "SSID 2");
iap2->setValue(WlanQtUtilsAp::ConfIdSignalStrength, 10);
iap2->setValue(WlanQtUtilsAp::ConfIdConnectionMode, CMManagerShim::Infra);
iap2->setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeWpa);
- QSharedPointer<WlanQtUtilsIap> iap4(new WlanQtUtilsIap());
- iap4->setValue(WlanQtUtilsIap::ConfIdIapId, 4);
- iap4->setValue(WlanQtUtilsIap::ConfIdNetworkId, 0);
- iap4->setValue(WlanQtUtilsIap::ConfIdName, "SSID 4");
+ QSharedPointer<WlanQtUtilsAp> iap4(new WlanQtUtilsAp());
+ iap4->setValue(WlanQtUtilsAp::ConfIdIapId, 4);
+ iap4->setValue(WlanQtUtilsAp::ConfIdNetworkId, 0);
+ iap4->setValue(WlanQtUtilsAp::ConfIdName, "SSID 4");
iap4->setValue(WlanQtUtilsAp::ConfIdSsid, "SSID 4");
iap4->setValue(WlanQtUtilsAp::ConfIdSignalStrength, 20);
iap4->setValue(WlanQtUtilsAp::ConfIdConnectionMode, CMManagerShim::Infra);
@@ -528,6 +527,7 @@
int securityMode)
{
QSharedPointer<WlanQtUtilsAp> ap(new WlanQtUtilsAp());
+ ap->setValue(WlanQtUtilsAp::ConfIdName, ssId);
ap->setValue(WlanQtUtilsAp::ConfIdSsid, ssId);
ap->setValue(WlanQtUtilsAp::ConfIdSignalStrength, signalStrength);
ap->setValue(WlanQtUtilsAp::ConfIdConnectionMode, networkMode);
@@ -549,15 +549,15 @@
int signalStrength,
int securityMode)
{
- WlanQtUtilsIap *iap = new WlanQtUtilsIap();
- iap->setValue(WlanQtUtilsIap::ConfIdIapId, iapId);
- iap->setValue(WlanQtUtilsIap::ConfIdNetworkId, netId);
- iap->setValue(WlanQtUtilsIap::ConfIdName, name);
+ WlanQtUtilsAp *iap = new WlanQtUtilsAp();
+ iap->setValue(WlanQtUtilsAp::ConfIdIapId, iapId);
+ iap->setValue(WlanQtUtilsAp::ConfIdNetworkId, netId);
+ iap->setValue(WlanQtUtilsAp::ConfIdName, name);
iap->setValue(WlanQtUtilsAp::ConfIdSsid, ssId);
iap->setValue(WlanQtUtilsAp::ConfIdSignalStrength, signalStrength);
iap->setValue(WlanQtUtilsAp::ConfIdConnectionMode, CMManagerShim::Infra);
iap->setValue(WlanQtUtilsAp::ConfIdSecurityMode, securityMode);
iap->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, false);
iap->setValue(WlanQtUtilsAp::ConfIdWpsSupported, false);
- mIaps.append(QSharedPointer<WlanQtUtilsIap>(iap));
+ mIaps.append(QSharedPointer<WlanQtUtilsAp>(iap));
}
--- a/wlanutilities/wlansniffer/wlansnifferapplication/tsrc/t_wlansniffer.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/tsrc/t_wlansniffer.h Fri Sep 03 09:37:37 2010 +0300
@@ -28,7 +28,6 @@
// Forward declarations
class HbListWidget;
-class WlanQtUtilsIap;
class WlanQtUtilsAp;
class WlanSnifferListWidget;
@@ -84,7 +83,7 @@
HbListWidget *mListWidget;
WlanSnifferListWidget *mWidget;
- QList< QSharedPointer<WlanQtUtilsIap> > mIaps;
+ QList< QSharedPointer<WlanQtUtilsAp> > mIaps;
QList< QSharedPointer<WlanQtUtilsAp> > mAps;
};
--- a/wlanutilities/wlanwizard/bwins/wlanwizardu.def Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/bwins/wlanwizardu.def Fri Sep 03 09:37:37 2010 +0300
@@ -1,16 +1,16 @@
EXPORTS
?qt_metacall@WlanWizard@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1 NONAME ; int WlanWizard::qt_metacall(enum QMetaObject::Call, int, void * *)
- ?setParameters@WlanWizard@@QAEXABVQString@@HH_N1@Z @ 2 NONAME ; void WlanWizard::setParameters(class QString const &, int, int, bool, bool)
- ?metaObject@WlanWizard@@UBEPBUQMetaObject@@XZ @ 3 NONAME ; struct QMetaObject const * WlanWizard::metaObject(void) const
- ?trUtf8@WlanWizard@@SA?AVQString@@PBD0@Z @ 4 NONAME ; class QString WlanWizard::trUtf8(char const *, char const *)
- ?tr@WlanWizard@@SA?AVQString@@PBD0H@Z @ 5 NONAME ; class QString WlanWizard::tr(char const *, char const *, int)
- ?trUtf8@WlanWizard@@SA?AVQString@@PBD0H@Z @ 6 NONAME ; class QString WlanWizard::trUtf8(char const *, char const *, int)
- ??_EWlanWizard@@UAE@I@Z @ 7 NONAME ; WlanWizard::~WlanWizard(unsigned int)
- ?show@WlanWizard@@QAEXXZ @ 8 NONAME ; void WlanWizard::show(void)
- ?cancelled@WlanWizard@@IAEXXZ @ 9 NONAME ; void WlanWizard::cancelled(void)
- ?tr@WlanWizard@@SA?AVQString@@PBD0@Z @ 10 NONAME ; class QString WlanWizard::tr(char const *, char const *)
- ?getStaticMetaObject@WlanWizard@@SAABUQMetaObject@@XZ @ 11 NONAME ; struct QMetaObject const & WlanWizard::getStaticMetaObject(void)
- ??1WlanWizard@@UAE@XZ @ 12 NONAME ; WlanWizard::~WlanWizard(void)
+ ?metaObject@WlanWizard@@UBEPBUQMetaObject@@XZ @ 2 NONAME ; struct QMetaObject const * WlanWizard::metaObject(void) const
+ ?trUtf8@WlanWizard@@SA?AVQString@@PBD0@Z @ 3 NONAME ; class QString WlanWizard::trUtf8(char const *, char const *)
+ ?tr@WlanWizard@@SA?AVQString@@PBD0H@Z @ 4 NONAME ; class QString WlanWizard::tr(char const *, char const *, int)
+ ?trUtf8@WlanWizard@@SA?AVQString@@PBD0H@Z @ 5 NONAME ; class QString WlanWizard::trUtf8(char const *, char const *, int)
+ ??_EWlanWizard@@UAE@I@Z @ 6 NONAME ; WlanWizard::~WlanWizard(unsigned int)
+ ?show@WlanWizard@@QAEXXZ @ 7 NONAME ; void WlanWizard::show(void)
+ ?cancelled@WlanWizard@@IAEXXZ @ 8 NONAME ; void WlanWizard::cancelled(void)
+ ?tr@WlanWizard@@SA?AVQString@@PBD0@Z @ 9 NONAME ; class QString WlanWizard::tr(char const *, char const *)
+ ?getStaticMetaObject@WlanWizard@@SAABUQMetaObject@@XZ @ 10 NONAME ; struct QMetaObject const & WlanWizard::getStaticMetaObject(void)
+ ??1WlanWizard@@UAE@XZ @ 11 NONAME ; WlanWizard::~WlanWizard(void)
+ ?setParameters@WlanWizard@@QAEXABVQString@@ABVQByteArray@@HH_N2@Z @ 12 NONAME ; void WlanWizard::setParameters(class QString const &, class QByteArray const &, int, int, bool, bool)
?finished@WlanWizard@@IAEXH_N@Z @ 13 NONAME ; void WlanWizard::finished(int, bool)
?staticMetaObject@WlanWizard@@2UQMetaObject@@B @ 14 NONAME ; struct QMetaObject const WlanWizard::staticMetaObject
??0WlanWizard@@QAE@PAVHbMainWindow@@@Z @ 15 NONAME ; WlanWizard::WlanWizard(class HbMainWindow *)
--- a/wlanutilities/wlanwizard/eabi/wlanwizardu.def Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/eabi/wlanwizardu.def Fri Sep 03 09:37:37 2010 +0300
@@ -1,18 +1,18 @@
EXPORTS
_ZN10WlanWizard11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
_ZN10WlanWizard11qt_metacastEPKc @ 2 NONAME
- _ZN10WlanWizard13setParametersERK7QStringiibb @ 3 NONAME
- _ZN10WlanWizard16staticMetaObjectE @ 4 NONAME DATA 16
- _ZN10WlanWizard19getStaticMetaObjectEv @ 5 NONAME
- _ZN10WlanWizard4showEv @ 6 NONAME
- _ZN10WlanWizard8finishedEib @ 7 NONAME
- _ZN10WlanWizard9cancelledEv @ 8 NONAME
- _ZN10WlanWizardC1EP12HbMainWindow @ 9 NONAME
- _ZN10WlanWizardC2EP12HbMainWindow @ 10 NONAME
- _ZN10WlanWizardD0Ev @ 11 NONAME
- _ZN10WlanWizardD1Ev @ 12 NONAME
- _ZN10WlanWizardD2Ev @ 13 NONAME
- _ZNK10WlanWizard10metaObjectEv @ 14 NONAME
- _ZTI10WlanWizard @ 15 NONAME
- _ZTV10WlanWizard @ 16 NONAME
+ _ZN10WlanWizard16staticMetaObjectE @ 3 NONAME DATA 16
+ _ZN10WlanWizard19getStaticMetaObjectEv @ 4 NONAME
+ _ZN10WlanWizard4showEv @ 5 NONAME
+ _ZN10WlanWizard8finishedEib @ 6 NONAME
+ _ZN10WlanWizard9cancelledEv @ 7 NONAME
+ _ZN10WlanWizardC1EP12HbMainWindow @ 8 NONAME
+ _ZN10WlanWizardC2EP12HbMainWindow @ 9 NONAME
+ _ZN10WlanWizardD0Ev @ 10 NONAME
+ _ZN10WlanWizardD1Ev @ 11 NONAME
+ _ZN10WlanWizardD2Ev @ 12 NONAME
+ _ZNK10WlanWizard10metaObjectEv @ 13 NONAME
+ _ZTI10WlanWizard @ 14 NONAME
+ _ZTV10WlanWizard @ 15 NONAME
+ _ZN10WlanWizard13setParametersERK7QStringRK10QByteArrayiibb @ 16 NONAME
--- a/wlanutilities/wlanwizard/inc/wlanwizard.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/inc/wlanwizard.h Fri Sep 03 09:37:37 2010 +0300
@@ -12,18 +12,22 @@
* Contributors:
*
* Description:
-* WLAN Wizard API
+* WLAN Wizard API.
*/
#ifndef WLANWIZARD_H
#define WLANWIZARD_H
// System includes
+
#include <QObject>
+#include <QString>
+#include <QByteArray>
// User includes
// Forward declarations
+
class HbMainWindow;
class WlanWizardPrivate;
class TestWlanWizardContext;
@@ -31,6 +35,7 @@
// External data types
// Constants
+
#ifdef BUILD_WLAN_WIZARD_DLL
#define WLAN_WIZARD_EXPORT Q_DECL_EXPORT
#else
@@ -50,7 +55,8 @@
~WlanWizard();
void setParameters(
- const QString &ssid,
+ const QString &name,
+ const QByteArray &ssid,
int networkMode,
int securityMode,
bool usePsk,
--- a/wlanutilities/wlanwizard/inc/wlanwizard_p.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/inc/wlanwizard_p.h Fri Sep 03 09:37:37 2010 +0300
@@ -62,7 +62,8 @@
virtual ~WlanWizardPrivate();
void setParameters(
- const QString &ssid,
+ const QString &name,
+ const QByteArray &ssid,
int networkMode,
int securityMode,
bool usePsk,
@@ -73,7 +74,8 @@
public:
// For WLAN Wizard pages
int getNextPageId(
- const QString &ssid,
+ const QString &name,
+ const QByteArray &ssid,
int networkMode,
int securityMode,
bool usePsk,
--- a/wlanutilities/wlanwizard/inc/wlanwizardhelper.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/inc/wlanwizardhelper.h Fri Sep 03 09:37:37 2010 +0300
@@ -52,45 +52,47 @@
Please remember to update trace.properties upon changes.
*/
enum ConfigurationId {
- //! QString: WLAN Network name (aka SSID)
- ConfSsid = 0,
+ //! QString: WLAN Network name
+ ConfName = 0,
+ //! QByteArray: WLAN Network SSID
+ ConfSsid = 1,
//! int: CMManagerShim::WlanConnectionMode
- ConfNetworkMode = 1,
+ ConfNetworkMode = 2,
//! int: CMManagerShim::WlanSecMode
- ConfSecurityMode = 2,
+ ConfSecurityMode = 3,
//! QString: WPA PSK
- ConfKeyWpa = 3,
+ ConfKeyWpa = 4,
//! QString: WEP Key 1
- ConfKeyWep1 = 4,
+ ConfKeyWep1 = 5,
//! QString: WEP Key 2
- ConfKeyWep2 = 5,
+ ConfKeyWep2 = 6,
//! QString: WEP Key 3
- ConfKeyWep3 = 6,
+ ConfKeyWep3 = 7,
//! QString: WEP Key 4
- ConfKeyWep4 = 7,
+ ConfKeyWep4 = 8,
//! int: CMManagerShim:::WlanWepKeyIndex, Default WEP Key index
- ConfKeyWepDefault = 8,
+ ConfKeyWepDefault = 9,
//! bool: Internet Connectivity Test result, true passed.
- ConfIctStatus = 9,
+ ConfIctStatus = 10,
//! int, -1 (WlanQtUtils::IapIdNone): not defined: IAP ID
- ConfIapId = 10,
+ ConfIapId = 11,
//! bool: true if connection was established successfully
- ConfConnected = 11,
+ ConfConnected = 12,
//! bool: WLAN AP explicit scanning need
- ConfWlanScanSSID = 12,
+ ConfWlanScanSSID = 13,
//! bool: if true use psk, if false use EAP
- ConfUsePsk = 13,
+ ConfUsePsk = 14,
//! bool: if true processing connection page is required.
- ConfProcessSettings = 14,
+ ConfProcessSettings = 15,
//! QString: Localized error string for WlanWizardPageGenericError
- ConfGenericErrorString = 15,
+ ConfGenericErrorString = 16,
//! WlanWizardScanList: Available network options
- ConfAvailableNetworkOptions = 16,
+ ConfAvailableNetworkOptions = 17,
//! bool: Wps supported
- ConfWpsSupported = 17,
+ ConfWpsSupported = 18,
//! int: Identifies how many steps should be gone backwards from
// GenericErrorPage
- ConfGenericErrorPageStepsBackwards = 18,
+ ConfGenericErrorPageStepsBackwards = 19,
};
public:
--- a/wlanutilities/wlanwizard/resources/custom.css Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/resources/custom.css Fri Sep 03 09:37:37 2010 +0300
@@ -1,11 +1,19 @@
+HbDialog#dialog:content
+{
+ left:0un;
+ right:0un;
+ top:0un;
+ bottom:0un;
+}
+
HbDialog#dialog:portrait
{
-pref-width: var(hb-param-screen-width);
-pref-height: var(hb-param-screen-height);
+ pref-width: var(hb-param-screen-width);
+ pref-height: var(hb-param-screen-height);
}
HbDialog#dialog:landscape
{
-pref-width: var(hb-param-screen-width);
-pref-height: var(hb-param-screen-height);
+ pref-width: var(hb-param-screen-width);
+ pref-height: var(hb-param-screen-height);
}
--- a/wlanutilities/wlanwizard/resources/hblistviewitem.css Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/resources/hblistviewitem.css Fri Sep 03 09:37:37 2010 +0300
@@ -13,6 +13,8 @@
text-align: left;
size-policy-horizontal: preferred;
pref-width:-1;
+ text-line-count-min:1;
+ text-line-count-max:1;
}
HbListViewItem::text-1[layoutName="wlanwizardsummaryitem"]:landscape{
@@ -28,4 +30,6 @@
font-variant: secondary;
pref-width:-1;
text-align: left;
+ text-line-count-min:1;
+ text-line-count-max:1;
}
--- a/wlanutilities/wlanwizard/resources/occ_add_wlan_01_04.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/resources/occ_add_wlan_01_04.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,60 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="occ_add_wlan_01" type="HbWidget">
- <widget name="container" type="HbWidget">
- <widget name="dialog" type="HbLabel">
- <enums name="textWrapping" value="TextWordWrap"/>
- <enums name="alignment" value="AlignLeft|AlignTop|AlignLeading"/>
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
- </widget>
- <widget name="lineEditKey" type="HbLineEdit">
- <integer name="maxRows" value="3"/>
- </widget>
- <widget name="labelErrorNote" type="HbLabel">
- <enums name="textWrapping" value="TextWordWrap"/>
- <contentsmargins bottom="0un" left="0un" right="0un" top="var(hb-param-margin-gene-top)"/>
- <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
- </widget>
- <layout type="grid"/>
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
+ <widget name="dialog" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <enums name="alignment" value="AlignLeft|AlignTop|AlignLeading"/>
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
+ <string name="plainText" value=""/>
</widget>
- <layout orientation="Vertical" spacing="0un" type="linear">
- <contentsmargins bottom="0un" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
- <linearitem itemname="container"/>
- <stretchitem stretchfactor="1"/>
- </layout>
+ <widget name="lineEditKey" type="HbLineEdit">
+ <integer name="maxRows" value="3"/>
+ </widget>
+ <!-- layout id: qtl_dialog_pri3 -->
+ <widget name="labelErrorNote" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="3"/>
+ <string name="plainText" value=""/>
+ </widget>
+ <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+ <layout type="anchor"/>
</widget>
<section name="portrait_section">
<widget name="occ_add_wlan_01" type="HbWidget">
- <widget name="container" type="HbWidget">
- <widget name="dialog" type="HbLabel">
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- <contentsmargins bottom="var(hb-param-margin-gene-middle-vertical)" left="0un" right="0un" top="0un"/>
- </widget>
- <layout spacing="0un" type="grid">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <griditem column="0" itemname="lineEditKey" row="1"/>
- <griditem column="0" itemname="labelErrorNote" row="2"/>
- <griditem column="0" itemname="dialog" row="0"/>
- </layout>
- </widget>
+ <layout type="anchor">
+ <anchoritem dst="dialog" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="dialog" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="dialog" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditKey" dstEdge="LEFT" src="dialog" srcEdge="LEFT"/>
+ <anchoritem dst="lineEditKey" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="dialog" srcEdge="BOTTOM"/>
+ <anchoritem dst="lineEditKey" dstEdge="RIGHT" src="dialog" srcEdge="RIGHT"/>
+ <anchoritem dst="labelErrorNote" dstEdge="LEFT" src="dialog" srcEdge="LEFT"/>
+ <anchoritem dst="labelErrorNote" dstEdge="RIGHT" src="dialog" srcEdge="RIGHT"/>
+ <anchoritem dst="labelErrorNote" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="lineEditKey" srcEdge="BOTTOM"/>
+ </layout>
</widget>
</section>
<section name="landscape_section">
<widget name="occ_add_wlan_01" type="HbWidget">
- <widget name="container" type="HbWidget">
- <widget name="dialog" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint type="FIXED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup) +var(hb-param-margin-gene-middle-horizontal))"/>
- <contentsmargins bottom="0un" left="0un" right="var(hb-param-margin-gene-middle-horizontal)" top="0un"/>
- </widget>
- <layout spacing="0un" type="grid">
- <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
- <griditem column="0" itemname="dialog" row="0"/>
- <griditem column="1" itemname="lineEditKey" row="0"/>
- <griditem column="0" column_span="2" itemname="labelErrorNote" row="1"/>
- </layout>
- </widget>
+ <layout type="anchor">
+ <anchoritem dst="dialog" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="dialog" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="dialog" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal)/2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="lineEditKey" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="dialog" srcEdge="RIGHT"/>
+ <anchoritem dst="lineEditKey" dstEdge="TOP" src="dialog" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="lineEditKey" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="labelErrorNote" dstEdge="LEFT" src="dialog" srcEdge="LEFT"/>
+ <anchoritem dst="labelErrorNote" dstEdge="RIGHT" src="lineEditKey" srcEdge="RIGHT"/>
+ <anchoritem direction="NEGATIVE" dst="lineEditKey" dstEdge="BOTTOM" minLength="var(hb-param-margin-gene-popup)" prefLength="var(hb-param-margin-gene-popup)" sizePolicy="Minimum" src="labelErrorNote" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="dialog" dstEdge="BOTTOM" minLength="var(hb-param-margin-gene-popup)" prefLength="var(hb-param-margin-gene-popup)" sizePolicy="Minimum" src="labelErrorNote" srcEdge="TOP"/>
+ </layout>
</widget>
</section>
<metadata activeUIState="landscape" display="NHD-3.2-inch_landscape" unit="un">
--- a/wlanutilities/wlanwizard/resources/occ_add_wlan_02_03.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/resources/occ_add_wlan_02_03.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,48 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="occ_add_wlan_02" type="HbWidget">
+ <!-- layout id: txt_occ_dblist_val_infrastructure_public -->
<widget name="list" type="HbRadioButtonList"/>
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="dialog_6" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<enums name="alignment" value="AlignLeft|AlignTop|AlignLeading"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<layout type="anchor"/>
</widget>
<section name="portrait_section">
<widget name="occ_add_wlan_02" type="HbWidget">
- <widget name="dialog_6" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="list" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="list" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="dialog_6" srcEdge="BOTTOM"/>
- <anchoritem dst="list" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="dialog_6" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="dialog_6" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="dialog_6" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="LEFT" src="" srcEdge="LEFT"/>
+ <anchoritem dst="list" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="dialog_6" srcEdge="BOTTOM"/>
+ <anchoritem dst="list" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="dialog_6" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="dialog_6" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="dialog_6" direction="NEGATIVE" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
<section name="landscape_section">
<widget name="occ_add_wlan_02" type="HbWidget">
- <widget name="dialog_6" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint type="FIXED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="dialog_6" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="dialog_6" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="list" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="dialog_6" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="TOP" spacing="0un" src="dialog_6" srcEdge="TOP"/>
- <anchoritem dst="list" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="list" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="list" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="dialog_6" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="TOP" src="" srcEdge="TOP"/>
+ <anchoritem dst="list" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="list" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="dialog_6" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="dialog_6" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="dialog_6" direction="NEGATIVE" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
</layout>
</widget>
</section>
- <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
+ <metadata activeUIState="landscape" display="NHD-3.2-inch_landscape" unit="un">
<uistate name="Common ui state" sections="#common"/>
<uistate name="landscape" sections="#common landscape_section"/>
<uistate name="portrait" sections="#common portrait_section"/>
--- a/wlanutilities/wlanwizard/resources/occ_add_wlan_06.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/resources/occ_add_wlan_06.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="occ_add_wlan_06" type="HbWidget">
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="dialog" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
</widget>
<widget name="progressBar" type="HbProgressBar">
<integer name="progressValue" value="0"/>
@@ -16,31 +18,25 @@
</widget>
<section name="portrait_section">
<widget name="occ_add_wlan_06" type="HbWidget">
- <widget name="dialog" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="dialog" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="dialog" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="dialog" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="progressBar" dstEdge="LEFT" spacing="0un" src="dialog" srcEdge="LEFT"/>
- <anchoritem dst="progressBar" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="dialog" srcEdge="BOTTOM"/>
- <anchoritem dst="progressBar" dstEdge="RIGHT" spacing="0un" src="dialog" srcEdge="RIGHT"/>
+ <anchoritem dst="dialog" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="dialog" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="dialog" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="progressBar" dstEdge="LEFT" src="dialog" srcEdge="LEFT"/>
+ <anchoritem dst="progressBar" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="dialog" srcEdge="BOTTOM"/>
+ <anchoritem dst="progressBar" dstEdge="RIGHT" src="dialog" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
<section name="landscape_section">
<widget name="occ_add_wlan_06" type="HbWidget">
- <widget name="dialog" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint type="FIXED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
<layout type="anchor">
- <anchoritem dst="dialog" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="dialog" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="progressBar" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="dialog" srcEdge="RIGHT"/>
- <anchoritem dst="progressBar" dstEdge="TOP" spacing="0un" src="dialog" srcEdge="TOP"/>
- <anchoritem dst="progressBar" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="dialog" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="dialog" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="dialog" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="progressBar" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="dialog" srcEdge="RIGHT"/>
+ <anchoritem dst="progressBar" dstEdge="TOP" src="dialog" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="progressBar" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
</layout>
</widget>
</section>
--- a/wlanutilities/wlanwizard/resources/occ_add_wlan_error.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/resources/occ_add_wlan_error.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="occ_add_wlan_error" type="HbWidget">
+ <!-- layout id: qtl_dialog_pri3 -->
<widget name="dialog" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="3"/>
</widget>
<real name="z" value="0"/>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<layout type="anchor">
- <anchoritem dst="dialog" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="dialog" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="dialog" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="dialog" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="dialog" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="dialog" dstEdge="RIGHT" minLength="var(hb-param-margin-gene-popup)" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
</layout>
</widget>
<metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
--- a/wlanutilities/wlanwizard/resources/occ_wlan_wizard_main.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/resources/occ_wlan_wizard_main.docml Fri Sep 03 09:37:37 2010 +0300
@@ -18,6 +18,7 @@
<integer name="timeout" value="0"/>
<enums name="frameType" value="Strong"/>
<enums name="dismissPolicy" value="NoDismiss"/>
+ <!-- layout id: qtl_fullscreen_dialog_heading_pri -->
<widget name="title" role="HbDialog:headingWidget" type="HbLabel"/>
<widget name="stackedWidget" role="HbDialog:contentWidget" type="HbStackedWidget"/>
</widget>
--- a/wlanutilities/wlanwizard/src/wlanwizard.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizard.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -137,20 +137,22 @@
Wifi Protected Setup
\a wps can be used with Open, WEP and WPA (2) with PSK.
- @param [in] ssid The name of WLAN network (ssid), max length 32 characters.
+ @param [in] name The name of WLAN network, max length 32 characters.
+ @param [in] ssid The SSID of WLAN network, max length 32 characters.
@param [in] networkMode Network mode of known access point
@param [in] securityMode Security mode of known access point
@param [in] usePsk used only with WPA or WPA2 \a securityMode
@param [in] wps is Wifi Protected Setup supported?
*/
void WlanWizard::setParameters(
- const QString &ssid,
+ const QString &name,
+ const QByteArray &ssid,
int networkMode,
int securityMode,
bool usePsk,
bool wps)
{
- d_ptr->setParameters(ssid, networkMode, securityMode, usePsk, wps);
+ d_ptr->setParameters(name, ssid, networkMode, securityMode, usePsk, wps);
}
/*!
--- a/wlanutilities/wlanwizard/src/wlanwizard_p.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizard_p.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -182,7 +182,6 @@
// timer is cancelled/deleted automatically when the parent (this) is deleted
- // TODO: See TSW Error: MTAA-854DK8 and loadDocml()
HbStyleLoader::unregisterFilePath(":/css/custom.css");
mDialog->setAttribute( Qt::WA_DeleteOnClose, true );
@@ -203,7 +202,8 @@
See WlanWizard::setParameters().
*/
void WlanWizardPrivate::setParameters(
- const QString &ssid,
+ const QString &name,
+ const QByteArray &ssid,
int networkMode,
int securityMode,
bool usePsk,
@@ -218,6 +218,7 @@
this);
mFirstPageId = getNextPageId(
+ name,
ssid,
networkMode,
securityMode,
@@ -269,21 +270,23 @@
@return next page id based on provided configurations.
*/
int WlanWizardPrivate::getNextPageId(
- const QString &ssid,
+ const QString &name,
+ const QByteArray &ssid,
int networkMode,
int securityMode,
bool usePsk,
- bool hidden,
+ bool hidden,
bool wps)
{
OstTraceFunctionEntry0(WLANWIZARDPRIVATE_GETNEXTPAGEID_ENTRY);
- setConfiguration(ConfProcessSettings, true);
+ setConfiguration(ConfName, name);
setConfiguration(ConfSsid, ssid);
setConfiguration(ConfNetworkMode, networkMode);
setConfiguration(ConfSecurityMode, securityMode);
setConfiguration(ConfUsePsk, usePsk);
setConfiguration(ConfWlanScanSSID, hidden);
+ setConfiguration(ConfProcessSettings, true);
OstTrace1(
TRACE_NORMAL,
@@ -374,17 +377,17 @@
bool WlanWizardPrivate::handleIap()
{
OstTraceFunctionEntry0(WLANWIZARDPRIVATE_HANDLEIAP_ENTRY);
-
+
OstTrace0(
TRACE_FLOW,
WLANWIZARDPRIVATE_HANDLEIAP,
"WlanWizardPrivate::handleIap");
-
+
bool ret = true;
bool usePsk = true;
int securityMode = configuration(ConfSecurityMode).toInt();
WlanQtUtilsAp wlanAp;
-
+
// Set default values
wlanAp.setValue(WlanQtUtilsAp::ConfIdWpaPsk, QString());
wlanAp.setValue(WlanQtUtilsAp::ConfIdWpaPskUse, true );
@@ -393,8 +396,9 @@
wlanAp.setValue(WlanQtUtilsAp::ConfIdWepKey2, QString());
wlanAp.setValue(WlanQtUtilsAp::ConfIdWepKey3, QString());
wlanAp.setValue(WlanQtUtilsAp::ConfIdWepKey4, QString());
-
+
// Set configuration
+ wlanAp.setValue(WlanQtUtilsAp::ConfIdName, configuration(ConfName));
wlanAp.setValue(WlanQtUtilsAp::ConfIdSsid, configuration(ConfSsid));
wlanAp.setValue(
WlanQtUtilsAp::ConfIdConnectionMode,
@@ -430,7 +434,7 @@
break;
}
- // Create IAP if does not exists or update the existing IAP
+ // Create an IAP if it does not exist or update the existing IAP
int referenceId = configuration(ConfIapId).toInt();
if (referenceId == WlanQtUtils::IapIdNone) {
OstTrace0(
@@ -998,7 +1002,10 @@
// 2/ scanning page has found match with given SSID
if (pageId == WlanWizardPage::PageProcessSettings) {
if (configuration(ConfProcessSettings).toBool() == false) {
- if (handleIap()){
+ if (handleIap()) {
+ // Manually added IAP is by default an Internet IAP if
+ // we can not run the internet connectivity test.
+ mWlanQtUtils->moveIapToInternetSnap(configuration(ConfIapId).toInt());
pageId = WlanWizardPageInternal::PageSummary;
} else {
pageId = WlanWizardPage::PageGenericError;
@@ -1218,13 +1225,6 @@
mDialog->addAction(mActionNext);
mDialog->addAction(mActionFinish);
- // TODO: workaround to prevent action to close the dialog
- disconnect(mActionPrevious, SIGNAL(triggered()), mDialog.data(), SLOT(close()));
- disconnect(mActionCancel, SIGNAL(triggered()), mDialog.data(), SLOT(close()));
- disconnect(mActionNext, SIGNAL(triggered()), mDialog.data(), SLOT(close()));
- disconnect(mActionFinish, SIGNAL(triggered()), mDialog.data(), SLOT(close()));
-
- ok = true;
ok = connect(mPageTimer, SIGNAL(timeout()), this, SLOT(onTimeOut()));
Q_ASSERT(ok);
@@ -1256,12 +1256,9 @@
SLOT(cancelTriggered()));
Q_ASSERT(ok);
- // TODO: workaround for full screen dialog, with docml it is possible to
- // define fullscreen dialog, mut resize is not done correctly when orientation
- // is changed. See TSW Error: MTAA-854DK8
ok = HbStyleLoader::registerFilePath(":/css/custom.css");
Q_ASSERT(ok);
-
+
OstTraceFunctionExit0(WLANWIZARDPRIVATE_LOADDOCML_EXIT);
}
--- a/wlanutilities/wlanwizard/src/wlanwizardpagekeyquery.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpagekeyquery.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -1,22 +1,22 @@
/*
- * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- * WLAN Wizard Page: Key query page for WEP and WPA (2).
- *
- */
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* WLAN Wizard Page: Key query page for WEP and WPA (2).
+*/
// System includes
+
#include <HbDocumentLoader>
#include <HbMainWindow>
#include <HbWidget>
@@ -26,10 +26,12 @@
#include <HbParameterLengthLimiter>
// User includes
+
#include "wlanwizard.h"
#include "wlanwizard_p.h"
#include "wlanwizardpagekeyquery.h"
#include "wlanwizardutils.h"
+
#include "OstTraceDefinitions.h"
#ifdef OST_TRACE_COMPILER_IN_USE
#include "wlanwizardpagekeyqueryTraces.h"
@@ -63,8 +65,8 @@
mLabelError(NULL),
mDocLoader(NULL)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_ENTRY );
- OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_EXIT );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_ENTRY);
+ OstTraceFunctionExit0(WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_EXIT);
}
/*!
@@ -72,11 +74,12 @@
*/
WlanWizardPageKeyQuery::~WlanWizardPageKeyQuery()
{
- OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_ENTRY );
+ OstTraceFunctionEntry0(DUP1_WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_ENTRY);
+
delete mDocLoader;
// Wizard framework deletes the visualization (owns mWidget).
- OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_EXIT );
+ OstTraceFunctionExit0(DUP1_WLANWIZARDPAGEKEYQUERY_WLANWIZARDPAGEKEYQUERY_EXIT);
}
/*!
@@ -87,7 +90,8 @@
*/
HbWidget* WlanWizardPageKeyQuery::initializePage()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_INITIALIZEPAGE_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEKEYQUERY_INITIALIZEPAGE_ENTRY);
+
if (!mWidget) {
bool ok;
@@ -137,9 +141,9 @@
mLabelTitle->setPlainText(
HbParameterLengthLimiter("txt_occ_dialog_enter_key_for_1").arg(
- mWizard->configuration(WlanWizardPrivate::ConfSsid).toString()));
+ mWizard->configuration(WlanWizardPrivate::ConfName).toString()));
- OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_INITIALIZEPAGE_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGEKEYQUERY_INITIALIZEPAGE_EXIT);
return mWidget;
}
@@ -151,14 +155,16 @@
*/
void WlanWizardPageKeyQuery::loadDocmlSection(Qt::Orientation orientation)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_LOADDOCMLSECTION_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEKEYQUERY_LOADDOCMLSECTION_ENTRY);
+
WlanWizardPageInternal::loadDocmlSection(
mDocLoader,
orientation,
":/docml/occ_add_wlan_01_04.docml",
"portrait_section",
"landscape_section");
- OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_LOADDOCMLSECTION_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEKEYQUERY_LOADDOCMLSECTION_EXIT);
}
/*!
@@ -175,7 +181,8 @@
*/
int WlanWizardPageKeyQuery::nextId(bool &removeFromStack) const
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_NEXTID_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEKEYQUERY_NEXTID_ENTRY);
+
WlanWizardUtils::KeyStatus status(WlanWizardUtils::KeyStatusOk);
int pageId = WlanWizardPage::nextId(removeFromStack);
int secMode = mWizard->configuration(
@@ -211,7 +218,8 @@
}
removeFromStack = false;
- OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_NEXTID_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEKEYQUERY_NEXTID_EXIT);
return pageId;
}
@@ -220,11 +228,12 @@
*/
bool WlanWizardPageKeyQuery::showPage()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_SHOWPAGE_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEKEYQUERY_SHOWPAGE_ENTRY);
+
// Open virtual keyboard by setting focus to line edit
mLineEdit->setFocus();
- OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_SHOWPAGE_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGEKEYQUERY_SHOWPAGE_EXIT);
return true;
}
@@ -239,11 +248,13 @@
*/
bool WlanWizardPageKeyQuery::eventFilter(QObject *obj, QEvent *event)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_EVENTFILTER_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEKEYQUERY_EVENTFILTER_ENTRY);
+
if (obj == mLineEdit && event->type() == QEvent::FocusIn) {
mLabelError->setPlainText("");
}
- OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_EVENTFILTER_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEKEYQUERY_EVENTFILTER_EXIT);
return false;
}
@@ -258,7 +269,8 @@
QString WlanWizardPageKeyQuery::keyStatusToErrorString(
WlanWizardUtils::KeyStatus status) const
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEKEYQUERY_KEYSTATUSTOERRORSTRING_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEKEYQUERY_KEYSTATUSTOERRORSTRING_ENTRY);
+
QString errorString;
switch (status) {
case WlanWizardUtils::KeyStatusIllegalCharacters:
@@ -278,6 +290,7 @@
// nothing to do here.
break;
}
- OstTraceFunctionExit0( WLANWIZARDPAGEKEYQUERY_KEYSTATUSTOERRORSTRING_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEKEYQUERY_KEYSTATUSTOERRORSTRING_EXIT);
return errorString;
}
--- a/wlanutilities/wlanwizard/src/wlanwizardpageprocessingsettings.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpageprocessingsettings.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description:
-* WLAN Wizard Page: Processing settings, connection and running ict.
+* WLAN Wizard Page: Processing settings, connection and running ICT.
*/
// System includes
@@ -66,7 +66,8 @@
mLabel(NULL),
mNextPageId(WlanWizardPageInternal::PageSummary)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_ENTRY);
+
WlanQtUtils* utils = mWizard->wlanQtUtils();
bool ok;
@@ -93,7 +94,8 @@
Q_UNUSED(ok);
Q_ASSERT(ok);
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_EXIT);
}
/*!
@@ -101,12 +103,14 @@
*/
WlanWizardPageProcessingSettings::~WlanWizardPageProcessingSettings()
{
- OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_ENTRY );
+ OstTraceFunctionEntry0(DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_ENTRY);
+
// signals are automatically disconnected
delete mDocLoader;
// Wizard framework deletes the visualization (owns mWidget).
- OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_EXIT );
+
+ OstTraceFunctionExit0(DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANWIZARDPAGEPROCESSINGSETTINGS_EXIT);
}
/*!
@@ -114,7 +118,8 @@
*/
HbWidget* WlanWizardPageProcessingSettings::initializePage()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_INITIALIZEPAGE_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_INITIALIZEPAGE_ENTRY);
+
if (!mWidget) {
mDocLoader = new HbDocumentLoader(mWizard->mainWindow());
@@ -138,9 +143,9 @@
mLabel->setPlainText(
HbParameterLengthLimiter(
"txt_occ_dialog_checking_connection_to_1").arg(
- mWizard->configuration(WlanWizardPrivate::ConfSsid).toString()));
+ mWizard->configuration(WlanWizardPrivate::ConfName).toString()));
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_INITIALIZEPAGE_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_INITIALIZEPAGE_EXIT);
return mWidget;
}
@@ -153,9 +158,11 @@
*/
int WlanWizardPageProcessingSettings::nextId(bool &removeFromStack) const
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_NEXTID_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_NEXTID_ENTRY);
+
removeFromStack = true;
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_NEXTID_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_NEXTID_EXIT);
return mNextPageId;
}
@@ -167,8 +174,8 @@
*/
bool WlanWizardPageProcessingSettings::showPage()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_SHOWPAGE_ENTRY );
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_SHOWPAGE_EXIT );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_SHOWPAGE_ENTRY);
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_SHOWPAGE_EXIT);
return false;
}
@@ -180,14 +187,16 @@
*/
void WlanWizardPageProcessingSettings::loadDocmlSection(Qt::Orientation orientation)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_LOADDOCMLSECTION_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_LOADDOCMLSECTION_ENTRY);
+
WlanWizardPageInternal::loadDocmlSection(
mDocLoader,
orientation,
":/docml/occ_add_wlan_06.docml",
"portrait_section",
"landscape_section");
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_LOADDOCMLSECTION_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_LOADDOCMLSECTION_EXIT);
}
/*!
@@ -201,14 +210,17 @@
*/
void WlanWizardPageProcessingSettings::wlanNetworkClosed(int iapId, int reason)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_ENTRY );
- OstTraceExt2( TRACE_BORDER,
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_ENTRY);
+
+ OstTraceExt2(
+ TRACE_BORDER,
WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED,
"WlanWizardPageProcessingSettings::wlanNetworkClosed;iapId=%d;reason=%d",
- iapId, reason );
+ iapId,
+ reason);
if (iapId != mWizard->configuration(WlanWizardHelper::ConfIapId).toInt()) {
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_EXIT);
return;
}
@@ -262,9 +274,11 @@
}
OstTrace0(
- TRACE_BORDER, WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_DONE,
- "WlanWizardPageProcessingSettings::wlanNetworkClosed - Done" );
- OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_EXIT );
+ TRACE_BORDER,
+ WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_DONE,
+ "WlanWizardPageProcessingSettings::wlanNetworkClosed - Done");
+
+ OstTraceFunctionExit0(DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKCLOSED_EXIT);
}
/*!
@@ -276,15 +290,17 @@
*/
void WlanWizardPageProcessingSettings::ictResult(int iapId, int reason)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_ENTRY);
+
OstTraceExt2(
TRACE_BORDER,
WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT,
"WlanWizardPageProcessingSettings::ictResult;iapId=%d;result=%d",
- iapId, reason );
+ iapId,
+ reason);
if (iapId != mWizard->configuration(WlanWizardHelper::ConfIapId).toInt()) {
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_EXIT);
return;
}
@@ -304,9 +320,12 @@
mWizard->nextPage();
- OstTrace0( TRACE_BORDER, WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_DONE,
- "WlanWizardPageProcessingSettings::ictResult - Done" );
- OstTraceFunctionExit0( DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_EXIT );
+ OstTrace0(
+ TRACE_BORDER,
+ WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_DONE,
+ "WlanWizardPageProcessingSettings::ictResult - Done");
+
+ OstTraceFunctionExit0(DUP1_WLANWIZARDPAGEPROCESSINGSETTINGS_ICTRESULT_EXIT);
}
/*!
@@ -316,14 +335,16 @@
*/
void WlanWizardPageProcessingSettings::wlanNetworkOpened(int iapId)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKOPENED_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKOPENED_ENTRY);
+
Q_UNUSED(iapId);
OstTrace1(
TRACE_BORDER,
WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKOPENED,
"WlanWizardPageProcessingSettings::wlanNetworkOpened;iapId=%d",
iapId);
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKOPENED_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_WLANNETWORKOPENED_EXIT);
}
/*!
@@ -333,8 +354,8 @@
*/
bool WlanWizardPageProcessingSettings::requiresStartOperation()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_REQUIRESSTARTOPERATION_ENTRY );
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_REQUIRESSTARTOPERATION_EXIT );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_REQUIRESSTARTOPERATION_ENTRY);
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_REQUIRESSTARTOPERATION_EXIT);
return true;
}
@@ -345,7 +366,8 @@
*/
void WlanWizardPageProcessingSettings::startOperation()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGEPROCESSINGSETTINGS_STARTOPERATION_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGEPROCESSINGSETTINGS_STARTOPERATION_ENTRY);
+
if (mWizard->handleIap()) {
mNextPageId = WlanWizardPageInternal::PageSummary;
@@ -370,5 +392,6 @@
WlanWizardPage::OneStepBackwards);
mWizard->nextPage();
}
- OstTraceFunctionExit0( WLANWIZARDPAGEPROCESSINGSETTINGS_STARTOPERATION_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGEPROCESSINGSETTINGS_STARTOPERATION_EXIT);
}
--- a/wlanutilities/wlanwizard/src/wlanwizardpagescanning.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpagescanning.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -16,19 +16,23 @@
*/
// System includes
+
#include <HbParameterLengthLimiter>
#include <HbMainWindow>
#include <HbDocumentLoader>
#include <HbWidget>
#include <HbLabel>
#include <HbProgressBar>
+
#include <cmmanagerdefines_shim.h>
#include <wlanqtutils.h>
#include <wlanqtutilsap.h>
// User includes
+
#include "wlanwizard_p.h"
#include "wlanwizardpagescanning.h"
+
#include "OstTraceDefinitions.h"
#ifdef OST_TRACE_COMPILER_IN_USE
#include "wlanwizardpagescanningTraces.h"
@@ -49,7 +53,8 @@
mScanResultsAvailable(false),
mScanStatus(WlanQtUtils::ScanStatusOk)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_ENTRY);
+
WlanQtUtils* utils = mWizard->wlanQtUtils();
// Connect normal scan completion signal from wlanQtUtils to result
@@ -60,9 +65,9 @@
SIGNAL(wlanScanApReady(int)),
this,
SLOT(wlanScanResultPreCheck(int)));
+ Q_ASSERT(ok);
- Q_ASSERT(ok);
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_EXIT);
}
/*!
@@ -71,9 +76,11 @@
*/
WlanWizardPageScanning::~WlanWizardPageScanning()
{
- OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_ENTRY );
+ OstTraceFunctionEntry0(DUP1_WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_ENTRY);
+
delete mLoader;
- OstTraceFunctionExit0( DUP1_WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_EXIT );
+
+ OstTraceFunctionExit0(DUP1_WLANWIZARDPAGESCANNING_WLANWIZARDPAGESCANNING_EXIT);
}
/*!
@@ -83,7 +90,8 @@
*/
HbWidget* WlanWizardPageScanning::initializePage()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_INITIALIZEPAGE_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_INITIALIZEPAGE_ENTRY);
+
OstTrace0(
TRACE_NORMAL,
WLANWIZARDPAGESCANNING_INITIALIZEPAGE,
@@ -136,7 +144,7 @@
"txt_occ_dialog_searching").arg(mWizard->configuration(
WlanWizardPrivate::ConfSsid).toString()));
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_INITIALIZEPAGE_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_INITIALIZEPAGE_EXIT);
return mWidget;
}
@@ -148,10 +156,11 @@
*/
int WlanWizardPageScanning::nextId(bool &removeFromStack) const
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_NEXTID_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_NEXTID_ENTRY);
+
removeFromStack = true;
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_NEXTID_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_NEXTID_EXIT);
return mNextPageId;
}
@@ -165,12 +174,22 @@
*/
int WlanWizardPageScanning::previousTriggered()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_PREVIOUSTRIGGERED_ENTRY );
- disconnect(this, SLOT(wlanScanDirectReady(int)));
- disconnect(this, SLOT(wlanScanResultPreCheck(int)));
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_PREVIOUSTRIGGERED_ENTRY);
WlanQtUtils* utils = mWizard->wlanQtUtils();
+ disconnect(
+ utils,
+ SIGNAL(wlanScanApReady(int)),
+ this,
+ SLOT(wlanScanResultPreCheck(int)));
+
+ disconnect(
+ utils,
+ SIGNAL(wlanScanDirectReady(int)),
+ this,
+ SLOT(wlanScanDirectReady(int)));
+
utils->stopWlanScan();
bool ok = connect(
@@ -187,7 +206,7 @@
SLOT(wlanScanDirectReady(int)));
Q_ASSERT(ok);
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_PREVIOUSTRIGGERED_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_PREVIOUSTRIGGERED_EXIT);
return OneStepBackwards;
}
@@ -202,9 +221,11 @@
*/
bool WlanWizardPageScanning::showPage()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_SHOWPAGE_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_SHOWPAGE_ENTRY);
+
mWizard->setConfiguration(WlanWizardHelper::ConfProcessSettings, false);
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_SHOWPAGE_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_SHOWPAGE_EXIT);
return false;
}
@@ -216,8 +237,8 @@
*/
bool WlanWizardPageScanning::requiresStartOperation()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_REQUIRESSTARTOPERATION_ENTRY );
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_REQUIRESSTARTOPERATION_EXIT );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_REQUIRESSTARTOPERATION_ENTRY);
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_REQUIRESSTARTOPERATION_EXIT);
return true;
}
@@ -227,16 +248,20 @@
*/
void WlanWizardPageScanning::startOperation()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_STARTOPERATION_ENTRY );
- OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_STARTOPERATION,
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_STARTOPERATION_ENTRY);
+
+ OstTrace0(
+ TRACE_NORMAL,
+ WLANWIZARDPAGESCANNING_STARTOPERATION,
"WlanWizardPageScanning::startOperation - start AP scan if results"
- " are available." );
+ " are available.");
if (mScanResultsAvailable) {
mScanResultsAvailable = false;
wlanScanApReady();
}
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_STARTOPERATION_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_STARTOPERATION_EXIT);
}
/*!
@@ -247,10 +272,13 @@
*/
void WlanWizardPageScanning::loadDocmlSection(Qt::Orientation orientation)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_LOADDOCMLSECTION_ENTRY );
- OstTrace1( TRACE_NORMAL, WLANWIZARDPAGESCANNING_LOADDOCML,
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_LOADDOCMLSECTION_ENTRY);
+
+ OstTrace1(
+ TRACE_NORMAL,
+ WLANWIZARDPAGESCANNING_LOADDOCML,
"WlanWizardPageScanning::loadDocml - orientation ;orientation=%x",
- ( TUint )( orientation ) );
+ (TUint)orientation);
WlanWizardPageInternal::loadDocmlSection(
mLoader,
@@ -258,7 +286,8 @@
":/docml/occ_add_wlan_06.docml",
"portrait_section",
"landscape_section");
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_LOADDOCMLSECTION_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_LOADDOCMLSECTION_EXIT);
}
/*!
@@ -269,32 +298,38 @@
*/
void WlanWizardPageScanning::wlanScanResultPreCheck(int scanStatus)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK_ENTRY);
+
mScanStatus = scanStatus;
if (!mWidget) {
- OstTrace1( TRACE_BORDER, WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK,
+ OstTrace1(
+ TRACE_BORDER,
+ WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK,
"WlanWizardPageScanning::wlanScanResultPreCheck no widget;this=%x",
- this );
+ this);
mScanResultsAvailable = true;
} else {
if (mWizard->isCurrentPage(mWidget)) {
- OstTrace0( TRACE_BORDER,
+ OstTrace0(
+ TRACE_BORDER,
DUP1_WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK,
"WlanWizardPageScanning::wlanScanResultPreCheck go to results");
wlanScanApReady();
} else {
- OstTrace0( TRACE_BORDER,
+ OstTrace0(
+ TRACE_BORDER,
DUP2_WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK,
"WlanWizardPageScanning::wlanScanResultPreCheck"
- " not current widget" );
+ " not current widget");
mScanResultsAvailable = true;
}
}
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_WLANSCANRESULTPRECHECK_EXIT);
}
/*!
@@ -304,9 +339,12 @@
*/
void WlanWizardPageScanning::wlanScanDirectReady(int scanStatus)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY_ENTRY );
- OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY,
- "WlanWizardPageScanning::wlanScanDirectReady" );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY_ENTRY);
+
+ OstTrace0(
+ TRACE_NORMAL,
+ WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY,
+ "WlanWizardPageScanning::wlanScanDirectReady");
WlanQtUtils* utils = mWizard->wlanQtUtils();
@@ -315,7 +353,7 @@
QList<WlanScanResult> filteredResults;
if (scanStatus == WlanQtUtils::ScanStatusOk) {
- QList<QSharedPointer<WlanQtUtilsAp> > directScanResults;
+ QList< QSharedPointer<WlanQtUtilsAp> > directScanResults;
// Read the directed scan results from Qt Utils
utils->availableWlanAps(directScanResults);
@@ -326,7 +364,8 @@
// Process the scan results. If scan status is not ok, feed an empty
// result table to the selection function.
selectNextPageActions(filteredResults);
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_WLANSCANDIRECTREADY_EXIT);
}
/*!
@@ -337,9 +376,12 @@
*/
void WlanWizardPageScanning::wlanScanApReady()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_WLANSCANAPREADY_ENTRY );
- OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESCANNING_WLANSCANAPREADY,
- "WlanWizardPageScanning::wlanScanApReady" );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_WLANSCANAPREADY_ENTRY);
+
+ OstTrace0(
+ TRACE_NORMAL,
+ WLANWIZARDPAGESCANNING_WLANSCANAPREADY,
+ "WlanWizardPageScanning::wlanScanApReady");
if (mScanStatus == WlanQtUtils::ScanStatusOk) {
WlanQtUtils* utils = mWizard->wlanQtUtils();
@@ -365,7 +407,8 @@
mNextPageId = WlanWizardPageInternal::PageNetworkMode;
mWizard->nextPage();
}
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_WLANSCANAPREADY_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_WLANSCANAPREADY_EXIT);
}
/*!
@@ -378,7 +421,8 @@
QString ssid,
const QList<QSharedPointer<WlanQtUtilsAp> > &matchList)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_GETSSIDMATCHLIST_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_GETSSIDMATCHLIST_ENTRY);
+
mWlanApList.clear();
QSharedPointer<WlanQtUtilsAp> item;
@@ -388,7 +432,8 @@
mWlanApList.append(item);
}
}
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_GETSSIDMATCHLIST_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_GETSSIDMATCHLIST_EXIT);
}
/*
@@ -403,7 +448,8 @@
const QList<QSharedPointer<WlanQtUtilsAp> > &openScanResults,
QList<WlanScanResult> &finalResults)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_GETFINALSCANRESULTS_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_GETFINALSCANRESULTS_ENTRY);
+
finalResults.clear();
// The key assumption of this algorithm is that both direct and public scan
@@ -430,7 +476,8 @@
finalResults.append(resultItem);
}
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_GETFINALSCANRESULTS_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_GETFINALSCANRESULTS_EXIT);
}
/*!
@@ -442,7 +489,8 @@
int WlanWizardPageScanning::processMultipleScanResults(
const QList<WlanScanResult> &finalResults)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_PROCESSMULTIPLESCANRESULTS_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_PROCESSMULTIPLESCANRESULTS_ENTRY);
+
WlanWizardScanList networkOptions;
int nextPage;
@@ -473,7 +521,7 @@
nextPage = WlanWizardPageInternal::PageNetworkSecurity;
}
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_PROCESSMULTIPLESCANRESULTS_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_PROCESSMULTIPLESCANRESULTS_EXIT);
return nextPage;
}
@@ -484,9 +532,10 @@
void WlanWizardPageScanning::selectNextPageActions(
const QList<WlanScanResult> &finalResults)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESCANNING_SELECTNEXTPAGEACTIONS_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESCANNING_SELECTNEXTPAGEACTIONS_ENTRY);
+
mWizard->clearConfiguration(WlanWizardHelper::ConfAvailableNetworkOptions);
-
+
if (finalResults.isEmpty()) {
// In case of no results at all were found.
mNextPageId = WlanWizardPageInternal::PageNetworkMode;
@@ -494,7 +543,8 @@
// In case there is only a single result.
WlanScanResult item = finalResults.first();
mNextPageId = mWizard->getNextPageId(
- item.scanResult->value(WlanQtUtilsAp::ConfIdSsid).toString(),
+ item.scanResult->value(WlanQtUtilsAp::ConfIdName).toString(),
+ item.scanResult->value(WlanQtUtilsAp::ConfIdSsid).toByteArray(),
item.scanResult->value(WlanQtUtilsAp::ConfIdConnectionMode).toInt(),
item.scanResult->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt(),
item.scanResult->value(WlanQtUtilsAp::ConfIdWpaPskUse).toBool(),
@@ -507,5 +557,6 @@
}
mWizard->nextPage();
- OstTraceFunctionExit0( WLANWIZARDPAGESCANNING_SELECTNEXTPAGEACTIONS_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESCANNING_SELECTNEXTPAGEACTIONS_EXIT);
}
--- a/wlanutilities/wlanwizard/src/wlanwizardpagessid.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpagessid.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -16,18 +16,22 @@
*/
// System includes
+
#include <HbDocumentLoader>
#include <HbMainWindow>
#include <HbWidget>
#include <HbLineEdit>
#include <HbEditorInterface>
#include <HbLabel>
+
#include <wlanqtutils.h>
// User includes
+
#include "wlanwizardpagessid.h"
#include "wlanwizard_p.h"
#include "wlanwizardutils.h"
+
#include "OstTraceDefinitions.h"
#ifdef OST_TRACE_COMPILER_IN_USE
#include "wlanwizardpagessidTraces.h"
@@ -44,9 +48,8 @@
mSsid(NULL),
mLoader(NULL)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_ENTRY );
-
- OstTraceFunctionExit0( WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_EXIT );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_ENTRY);
+ OstTraceFunctionExit0(WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_EXIT);
}
/*!
@@ -55,9 +58,11 @@
*/
WlanWizardPageSsid::~WlanWizardPageSsid()
{
- OstTraceFunctionEntry0( DUP1_WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_ENTRY );
+ OstTraceFunctionEntry0(DUP1_WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_ENTRY);
+
delete mLoader;
- OstTraceFunctionExit0( DUP1_WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_EXIT );
+
+ OstTraceFunctionExit0(DUP1_WLANWIZARDPAGESSID_WLANWIZARDPAGESSID_EXIT);
}
/*!
@@ -66,9 +71,12 @@
*/
HbWidget* WlanWizardPageSsid::initializePage()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESSID_INITIALIZEPAGE_ENTRY );
- OstTrace0( TRACE_NORMAL, WLANWIZARDPAGESSID_INITIALIZEPAGE,
- "WlanWizardPageSsid::initializePage" );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESSID_INITIALIZEPAGE_ENTRY);
+
+ OstTrace0(
+ TRACE_NORMAL,
+ WLANWIZARDPAGESSID_INITIALIZEPAGE,
+ "WlanWizardPageSsid::initializePage");
// It is not possible for this method to be called more than once during
// wizard lifetime.
@@ -112,11 +120,9 @@
HbEditorInterface editInterface(mSsid);
- // TODO: remove (HbEditorConstraints) type cast when
- // Q_DECLARE_OPERATORS_FOR_FLAGS(HbEditorConstraints) is defined (SDK xxx)
editInterface.setInputConstraints(
- (HbEditorConstraints)(HbEditorConstraintAutoCompletingField |
- HbEditorConstraintLatinAlphabetOnly));
+ HbEditorConstraintAutoCompletingField |
+ HbEditorConstraintLatinAlphabetOnly);
editInterface.setSmileyTheme(HbSmileyTheme());
editInterface.setEditorClass(HbInputEditorClassNetworkName);
@@ -124,7 +130,7 @@
Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase);
mSsid->setMaxLength(WlanWizardUtils::SsidMaxLength);
- OstTraceFunctionExit0( WLANWIZARDPAGESSID_INITIALIZEPAGE_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGESSID_INITIALIZEPAGE_EXIT);
return mWidget;
}
@@ -135,13 +141,15 @@
*/
bool WlanWizardPageSsid::showPage()
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESSID_SHOWPAGE_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESSID_SHOWPAGE_ENTRY);
+
// Initiate the scanning of public APs here.
mWizard->wlanQtUtils()->scanWlanAps();
// Open virtual keyboard by setting focus to line edit
mSsid->setFocus();
- OstTraceFunctionExit0( WLANWIZARDPAGESSID_SHOWPAGE_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESSID_SHOWPAGE_EXIT);
return !(mSsid->text().isEmpty());
}
@@ -152,13 +160,16 @@
*/
int WlanWizardPageSsid::nextId(bool &removeFromStack) const
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESSID_NEXTID_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESSID_NEXTID_ENTRY);
+
removeFromStack = false;
// SSID is stored into configuration
- mWizard->setConfiguration(WlanWizardPrivate::ConfSsid, mSsid->text());
+ QString ssid(mSsid->text());
+ mWizard->setConfiguration(WlanWizardPrivate::ConfName, ssid);
+ mWizard->setConfiguration(WlanWizardPrivate::ConfSsid, ssid.toUtf8());
- OstTraceFunctionExit0( WLANWIZARDPAGESSID_NEXTID_EXIT );
+ OstTraceFunctionExit0(WLANWIZARDPAGESSID_NEXTID_EXIT);
return WlanWizardPageInternal::PageScanning;
}
@@ -170,10 +181,13 @@
*/
void WlanWizardPageSsid::loadDocmlSection(Qt::Orientation orientation)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESSID_LOADDOCMLSECTION_ENTRY );
- OstTrace1( TRACE_FLOW, WLANWIZARDPAGESSID_LOADDOCML,
+ OstTraceFunctionEntry0(WLANWIZARDPAGESSID_LOADDOCMLSECTION_ENTRY);
+
+ OstTrace1(
+ TRACE_FLOW,
+ WLANWIZARDPAGESSID_LOADDOCML,
"WlanWizardPageSsid::loadDocml - orientation ;orientation=%x",
- ( TUint )( orientation ) );
+ (TUint)orientation);
WlanWizardPageInternal::loadDocmlSection(
mLoader,
@@ -181,7 +195,8 @@
":/docml/occ_add_wlan_01_04.docml",
"portrait_section",
"landscape_section");
- OstTraceFunctionExit0( WLANWIZARDPAGESSID_LOADDOCMLSECTION_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESSID_LOADDOCMLSECTION_EXIT);
}
/*!
@@ -191,11 +206,15 @@
*/
void WlanWizardPageSsid::textChanged(const QString &text)
{
- OstTraceFunctionEntry0( WLANWIZARDPAGESSID_TEXTCHANGED_ENTRY );
+ OstTraceFunctionEntry0(WLANWIZARDPAGESSID_TEXTCHANGED_ENTRY);
+
Q_UNUSED(text);
- OstTrace0( TRACE_FLOW, WLANWIZARDPAGESSID_TEXTCHANGED,
- "WlanWizardPageSsid::textChanged in text edit widget" );
+ OstTrace0(
+ TRACE_FLOW,
+ WLANWIZARDPAGESSID_TEXTCHANGED,
+ "WlanWizardPageSsid::textChanged in text edit widget");
mWizard->enableNextButton(!(mSsid->text().isEmpty()));
- OstTraceFunctionExit0( WLANWIZARDPAGESSID_TEXTCHANGED_EXIT );
+
+ OstTraceFunctionExit0(WLANWIZARDPAGESSID_TEXTCHANGED_EXIT);
}
--- a/wlanutilities/wlanwizard/src/wlanwizardpagesummary.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/src/wlanwizardpagesummary.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -98,7 +98,7 @@
appendToList(
row,
hbTrId("txt_occ_dblist_network_name"),
- mWizard->configuration(WlanWizardPrivate::ConfSsid).toString());
+ mWizard->configuration(WlanWizardPrivate::ConfName).toString());
appendToList(
row, hbTrId("txt_occ_dblist_network_mode"), networkModeText());
--- a/wlanutilities/wlanwizard/traces/trace.properties Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/traces/trace.properties Fri Sep 03 09:37:37 2010 +0300
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<trace_properties>
<enum name="ConfigurationId">
- <value id="0">ConfSsid</value>
- <value id="1">ConfNetworkMode</value>
- <value id="2">ConfSecurityMode</value>
- <value id="3">ConfKeyWpa</value>
- <value id="4">ConfKeyWep1</value>
- <value id="5">ConfKeyWep2</value>
- <value id="6">ConfKeyWep3</value>
- <value id="7">ConfKeyWep4</value>
- <value id="8">ConfKeyWepDefault</value>
- <value id="9">ConfIctStatus</value>
- <value id="10">ConfIapId</value>
- <value id="11">ConfConnected</value>
- <value id="12">ConfWlanScanSSID</value>
- <value id="13">ConfUsePsk</value>
- <value id="14">ConfProcessSessings</value>
- <value id="15">ConfGenericErrorString</value>
- <value id="16">ConfAvailableNetworkOptions</value>
- <value id="17">ConfWpsSupported</value>
- <value id="18">ConfGenericErrorPageStepsBackwards</value>
+ <value id="0">ConfName</value>
+ <value id="1">ConfSsid</value>
+ <value id="2">ConfNetworkMode</value>
+ <value id="3">ConfSecurityMode</value>
+ <value id="4">ConfKeyWpa</value>
+ <value id="5">ConfKeyWep1</value>
+ <value id="6">ConfKeyWep2</value>
+ <value id="7">ConfKeyWep3</value>
+ <value id="8">ConfKeyWep4</value>
+ <value id="9">ConfKeyWepDefault</value>
+ <value id="10">ConfIctStatus</value>
+ <value id="11">ConfIapId</value>
+ <value id="12">ConfConnected</value>
+ <value id="13">ConfWlanScanSSID</value>
+ <value id="14">ConfUsePsk</value>
+ <value id="15">ConfProcessSessings</value>
+ <value id="16">ConfGenericErrorString</value>
+ <value id="17">ConfAvailableNetworkOptions</value>
+ <value id="18">ConfWpsSupported</value>
+ <value id="19">ConfGenericErrorPageStepsBackwards</value>
</enum>
<enum name="PageIds">
<value id="0">PageNone</value>
--- a/wlanutilities/wlanwizard/tsrc/stubs/eapqtconfiginterface_context.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/stubs/eapqtconfiginterface_context.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -266,7 +266,7 @@
}
EapQtConfig config;
- config.setValue(EapQtConfig::ProvisioningModeAuthenticated, false);
+ config.setValue(EapQtConfig::ProvisioningModeAuthenticated, true);
config.setValue(EapQtConfig::ProvisioningModeUnauthenticated, true);
config.setValue(EapQtConfig::VerifyServerRealm, false);
config.setValue(EapQtConfig::UseIdentityPrivacy, false);
--- a/wlanutilities/wlanwizard/tsrc/stubs/wlanqtutils.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/stubs/wlanqtutils.h Fri Sep 03 09:37:37 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -12,6 +12,7 @@
* Contributors:
*
* Description:
+* WLAN Qt Utilities library test stub.
*/
#ifndef STUB_WLANQTUTILS_H
@@ -86,7 +87,9 @@
int connectedWlanId();
void disconnectIap(int iapId);
-
+
+ void moveIapToInternetSnap(int iapId);
+
int activeIap();
void scanWlanAps();
@@ -140,6 +143,4 @@
int mScanDirectStatus;
};
-#endif /* WLANQTUTILS_H */
-
-// End of File
+#endif // WLANQTUTILS_H
--- a/wlanutilities/wlanwizard/tsrc/stubs/wlanqtutils_stub.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/stubs/wlanqtutils_stub.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -1,18 +1,19 @@
/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- */
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* WLAN Qt Utilities library test stub.
+*/
#include "wlanqtutilsap.h"
#include "wlanqtutils.h"
@@ -100,6 +101,12 @@
QCOMPARE(iapId, mActiveWlanIapReturn);
}
+void WlanQtUtils::moveIapToInternetSnap(int iapId)
+{
+ qDebug("moveIapToInternetSnap iapId = %d", iapId);
+ //mCalledMethods.append("moveIapToInternetSnap");
+}
+
int WlanQtUtils::activeIap()
{
mCalledMethods.append("activeIap");
--- a/wlanutilities/wlanwizard/tsrc/stubs/wlanqtutilsap.h Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/stubs/wlanqtutilsap.h Fri Sep 03 09:37:37 2010 +0300
@@ -39,6 +39,7 @@
Configuration IDs that can be read and set in this class.
ConfID's available for scan results:
+ - ConfIdName
- ConfIdSsid
- ConfIdBssid
- ConfIdSignalStrength
@@ -49,6 +50,7 @@
ConfID's for IAP creation and updates, these are
mandatory for all security modes:
+ - ConfIdName
- ConfIdSsid
- ConfIdConnectionMode
- ConfIdSecurityMode
@@ -61,24 +63,39 @@
- ConfIdWpaPsk (Empty if not used)
- ConfIdHidden
- ConfIdWlanScanSSID
+
+ Values available for IAPs when reading:
+ - ConfIdIapId
+ - ConfIdName
+ - ConfIdSsid
+ - ConfIdNetworkId
+ - ConfIdConnectionMode
+ - ConfIdSecurityMode
+ - ConfIdWpaPskUse
*/
enum ConfId {
- //! QString: WLAN Network Name (SSID)
- ConfIdSsid = 0,
+ //! QString: Name
+ ConfIdName = 1,
+ //! QByteArray: WLAN Network Name (SSID)
+ ConfIdSsid = 2,
//! QByteArray: Basic Service Set Identifier
- ConfIdBssid = 1,
+ ConfIdBssid = 3,
//! int: signal strength in RSSI (dBm)
- ConfIdSignalStrength = 2,
+ ConfIdSignalStrength = 4,
//! int: (CMManagerShim::WlanNetMode)
- ConfIdConnectionMode = 3,
+ ConfIdConnectionMode = 5,
+ //! int: IAP ID
+ ConfIdIapId = 6,
+ //! int: Network ID
+ ConfIdNetworkId = 7,
//! int: (CMManagerShim::WlanSecMode)
- ConfIdSecurityMode = 4,
+ ConfIdSecurityMode = 8,
//! bool: true - WPA PSK, false - WPA EAP
- ConfIdWpaPskUse = 5,
+ ConfIdWpaPskUse = 9,
//! QString: Pre-Shared Key for WPA
//! Length: 8-63 - Ascii key
//! Length: 64 - Hex key
- ConfIdWpaPsk = 6,
+ ConfIdWpaPsk = 10,
//! QString: WEP Key for index 1:
//! HEX:
//! - 64 bit: allowed key length = 10
@@ -87,21 +104,21 @@
//! ASCII:
//! - 64 bit: allowed key length = 5
//! - 128 bit: allowed key length = 13
- ConfIdWepKey1 = 7,
+ ConfIdWepKey1 = 11,
//! QString: WEP Key for index 2
- ConfIdWepKey2 = 8,
+ ConfIdWepKey2 = 12,
//! QString: WEP Key for index 3
- ConfIdWepKey3 = 9,
+ ConfIdWepKey3 = 13,
//! QString: WEP Key for index 4
- ConfIdWepKey4 = 10,
+ ConfIdWepKey4 = 14,
//! int: (CMManagerShim::WlanWepKeyIndex): Default WEP Key index
- ConfIdWepDefaultIndex = 11,
+ ConfIdWepDefaultIndex = 15,
//! bool: Is WLAN hidden (CMManagerShim::CmHidden).
- ConfIdHidden = 12,
+ ConfIdHidden = 16,
//! bool: Does WLAN AP need explicit scanning (CMManagerShim::WlanScanSSID)
- ConfIdWlanScanSSID = 13,
+ ConfIdWlanScanSSID = 17,
//! bool: true - Wifi Protected setup is supported, false - not
- ConfIdWpsSupported = 14
+ ConfIdWpsSupported = 18,
};
public:
@@ -123,4 +140,4 @@
Q_DECLARE_METATYPE(WlanQtUtilsAp)
-#endif /* WLANQTUTILSWLANIAP_H */
+#endif // STUB_WLANQTUTILSWLANAP_H
--- a/wlanutilities/wlanwizard/tsrc/t_wlanwizard.pro Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/t_wlanwizard.pro Fri Sep 03 09:37:37 2010 +0300
@@ -38,6 +38,22 @@
RESOURCES += ../../eapwizard/resources/eapwizard_resource.qrc
RESOURCES += ../../wpswizard/resources/wpswizard_resource.qrc
+DOCML += \
+ ../resources/occ_wlan_wizard_main.docml \
+ ../resources/occ_add_wlan_05.docml \
+ ../resources/occ_add_wlan_06.docml \
+ ../resources/occ_add_wlan_02_03.docml \
+ ../resources/occ_add_wlan_01_04.docml \
+ ../resources/occ_add_wlan_error.docml \
+ ../../eapwizard/resources/occ_eap_wizard_01_02_04.docml \
+ ../../eapwizard/resources/occ_eap_wizard_03.docml \
+ ../../eapwizard/resources/occ_eap_wizard_05_07.docml \
+ ../../eapwizard/resources/occ_eap_wizard_06.docml \
+ ../../eapwizard/resources/occ_eap_wizard_08.docml \
+ ../../wpswizard/resources/occ_wps_01_05.docml \
+ ../../wpswizard/resources/occ_wps_02_03.docml \
+ ../../wpswizard/resources/occ_wps_04.docml
+
INCLUDEPATH += \
stubs
--- a/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardconnect.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardconnect.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -16,6 +16,7 @@
*/
// System includes
+
#include <HbApplication>
#include <HbDocumentLoader>
#include <HbStackedWidget>
@@ -23,16 +24,19 @@
#include <HbAction>
#include <HbLineEdit>
#include <HbLabel>
+
#include <QGraphicsWidget>
#include <QObjectList>
#include <QtCore>
#include <QTest>
#include <QDebug>
#include <QList>
+
#include <cmmanagerdefines_shim.h>
#include <wlanerrorcodes.h>
// User includes
+
#include "testwlanwizardconnect.h"
#include "testwlanwizardconnect_conf.h"
#include "hbautotest.h"
@@ -131,6 +135,7 @@
mView->mWizard->setParameters(
"tc_connect_to_open_success_cancel",
+ "tc_connect_to_open_success_cancel",
CMManagerShim::Infra,
CMManagerShim::WlanSecModeOpen,
false,
@@ -349,6 +354,7 @@
mView->mWizard->setParameters(
ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeOpen,
false,
@@ -383,6 +389,7 @@
mView->mWizard->setParameters(
ssid,
+ ssid.toUtf8(),
CMManagerShim::Adhoc,
CMManagerShim::WlanSecModeWep,
true,
@@ -421,6 +428,7 @@
mView->mWizard->setParameters(
ssid,
+ ssid.toUtf8(),
networkMode,
securityMode,
true,
@@ -429,7 +437,8 @@
WlanQtUtilsAp ap;
ap.setValue(WlanQtUtilsAp::ConfIdConnectionMode, networkMode);
ap.setValue(WlanQtUtilsAp::ConfIdSecurityMode, securityMode);
- ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid);
+ ap.setValue(WlanQtUtilsAp::ConfIdName, ssid);
+ ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8());
ap.setValue(WlanQtUtilsAp::ConfIdHidden, false);
ap.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, hidden);
@@ -531,6 +540,7 @@
mWlanQtUtilsContext->setActiveWlanIapResult(1);
mView->mWizard->setParameters(
ssid,
+ ssid.toUtf8(),
networkMode,
securityMode,
true,
@@ -539,7 +549,8 @@
WlanQtUtilsAp ap;
ap.setValue(WlanQtUtilsAp::ConfIdConnectionMode, networkMode);
ap.setValue(WlanQtUtilsAp::ConfIdSecurityMode, securityMode);
- ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid);
+ ap.setValue(WlanQtUtilsAp::ConfIdName, ssid);
+ ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8());
ap.setValue(WlanQtUtilsAp::ConfIdHidden, false);
ap.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, hidden);
--- a/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardcontext.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardcontext.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -1,20 +1,22 @@
/*
- * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- */
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* WLAN Wizard test context.
+*/
// System includes
+
#include <HbApplication>
#include <HbDocumentLoader>
#include <HbStackedWidget>
@@ -23,17 +25,19 @@
#include <HbLineEdit>
#include <HbLabel>
#include <HbCheckBox>
+#include <HbListWidget>
+#include <HbListWidgetItem>
+#include <HbParameterLengthLimiter>
+
#include <QGraphicsWidget>
#include <QObjectList>
#include <QtCore>
#include <QTest>
#include <QDebug>
#include <QList>
-#include <HbListWidget>
-#include <HbListWidgetItem>
-#include <HbParameterLengthLimiter>
// User includes
+
#include "testwlanwizardcontext.h"
#include "hbautotest.h"
#include "wlanwizard.h"
@@ -78,11 +82,17 @@
clear();
}
-void ContextWlanApList::Add(QString name, int netMode, int secMode, bool wpaPskInUse,
- bool wpsSupported, int signalStrength)
+void ContextWlanApList::Add(
+ QString name,
+ int netMode,
+ int secMode,
+ bool wpaPskInUse,
+ bool wpsSupported,
+ int signalStrength)
{
QSharedPointer<WlanQtUtilsAp> temp = QSharedPointer<WlanQtUtilsAp>(new WlanQtUtilsAp());
- temp->setValue(WlanQtUtilsAp::ConfIdSsid, name);
+ temp->setValue(WlanQtUtilsAp::ConfIdName, name);
+ temp->setValue(WlanQtUtilsAp::ConfIdSsid, name.toUtf8());
temp->setValue(WlanQtUtilsAp::ConfIdConnectionMode, netMode);
temp->setValue(WlanQtUtilsAp::ConfIdSecurityMode, secMode);
temp->setValue(WlanQtUtilsAp::ConfIdWpaPskUse, wpaPskInUse);
@@ -964,5 +974,3 @@
}
return ret;
}
-
-
--- a/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardeap.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardeap.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -16,14 +16,18 @@
*/
// System includes
+
+#include <HbParameterLengthLimiter>
+
#include <QTest>
#include <QDebug>
#include <QList>
+
#include <cmmanagerdefines_shim.h>
#include <wlanerrorcodes.h>
-#include <HbParameterLengthLimiter>
// User includes
+
#include "testwlanwizardeap.h"
#include "testwlanwizardeap_conf.h"
#include "hbautotest.h"
@@ -60,7 +64,8 @@
mEapQtUtilsContext->createEapAkaSim(EapQtPluginHandle::PluginEapAka);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -112,7 +117,8 @@
const QString ssid("tc_eap_leap");
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
@@ -555,7 +561,8 @@
mEapQtUtilsContext->setSelectectedOuterTypesReturn(false);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -590,7 +597,8 @@
mEapQtUtilsContext->setOuterConfigReturn(false);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -624,7 +632,8 @@
mEapQtUtilsContext->createEapAkaSim(EapQtPluginHandle::PluginEapAka);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -690,7 +699,8 @@
EapQtExpandedEapType::TypePeap,EapQtConfig::Realm);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
@@ -776,7 +786,8 @@
validatorPassword->setReturnValue(EapQtValidator::StatusInvalid);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
@@ -831,7 +842,8 @@
-1);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -875,7 +887,8 @@
0);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -939,7 +952,8 @@
1);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -1005,7 +1019,8 @@
0);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -1149,7 +1164,8 @@
"p");
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
@@ -1205,7 +1221,8 @@
password);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
@@ -1273,7 +1290,8 @@
"p");
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
@@ -1338,7 +1356,8 @@
password);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
@@ -1611,7 +1630,8 @@
const QString ssid("tc_eap_aka_sim");
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecMode802_1x,
false,
@@ -1679,7 +1699,8 @@
mEapQtUtilsContext->setInnerConfigReturn(saveInnerConfReturn);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
@@ -1736,7 +1757,8 @@
mEapQtUtilsContext->createEapAkaSim(EapQtPluginHandle::PluginEapAka);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa2,
false,
@@ -1792,7 +1814,8 @@
password);
mView->mWizard->setParameters(
- ssid,
+ ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeWpa,
false,
--- a/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardmanual.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardmanual.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -1,20 +1,29 @@
/*
- * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- */
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* WLAN Wizard manual IAP addition cases.
+*/
// System includes
+
+#include <QGraphicsWidget>
+#include <QObjectList>
+#include <QtCore>
+#include <QTest>
+#include <QDebug>
+#include <QList>
+
#include <HbApplication>
#include <HbDocumentLoader>
#include <HbStackedWidget>
@@ -22,15 +31,11 @@
#include <HbAction>
#include <HbLineEdit>
#include <HbLabel>
-#include <QGraphicsWidget>
-#include <QObjectList>
-#include <QtCore>
-#include <QTest>
-#include <QDebug>
-#include <QList>
+
#include <cmmanagerdefines_shim.h>
// User includes
+
#include "testwlanwizardmanual.h"
#include "testwlanwizardmanual_conf.h"
#include "hbautotest.h"
--- a/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardwps.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wlanwizard/tsrc/ut/testwlanwizardwps.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -16,13 +16,16 @@
*/
// System includes
+
#include <QTest>
#include <QDebug>
#include <QList>
+
#include <cmmanagerdefines_shim.h>
#include <wlanerrorcodes.h>
// User includes
+
#include "testwlanwizardwps.h"
#include "testwlanwizardwps_conf.h"
#include "wlanwizard.h"
@@ -61,7 +64,8 @@
WlanQtUtilsAp ap;
ap.setValue(WlanQtUtilsAp::ConfIdConnectionMode, CMManagerShim::Infra);
ap.setValue(WlanQtUtilsAp::ConfIdSecurityMode, CMManagerShim::WlanSecModeOpen);
- ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid);
+ ap.setValue(WlanQtUtilsAp::ConfIdName, ssid);
+ ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8());
ap.setValue(WlanQtUtilsAp::ConfIdHidden, false);
ap.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, false);
@@ -76,6 +80,7 @@
mView->mWizard->setParameters(
ssid,
+ ssid.toUtf8(),
CMManagerShim::Infra,
CMManagerShim::WlanSecModeOpen,
false,
@@ -386,7 +391,8 @@
WlanQtUtilsAp ap;
ap.setValue(WlanQtUtilsAp::ConfIdConnectionMode, operModeCmm);
ap.setValue(WlanQtUtilsAp::ConfIdSecurityMode, secModeCmm);
- ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid);
+ ap.setValue(WlanQtUtilsAp::ConfIdName, ssid);
+ ap.setValue(WlanQtUtilsAp::ConfIdSsid, ssid.toUtf8());
ap.setValue(WlanQtUtilsAp::ConfIdHidden, false);
ap.setValue(WlanQtUtilsAp::ConfIdWlanScanSSID, false);
@@ -424,6 +430,7 @@
mView->mWizard->setParameters(
ssid,
+ ssid.toUtf8(),
CMManagerShim::Adhoc,
CMManagerShim::WlanSecModeWep,
false,
@@ -467,6 +474,7 @@
mView->mWizard->setParameters(
ssid,
+ ssid.toUtf8(),
CMManagerShim::Adhoc,
CMManagerShim::WlanSecModeWep,
false,
--- a/wlanutilities/wpswizard/resources/occ_wps_01_05.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wpswizard/resources/occ_wps_01_05.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,51 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
- <widget name="occ_wps_P1" type="HbWidget">
- <widget name="radioButtonList" type="HbRadioButtonList"/>
+<hbdocument version="1.2">
+ <widget name="occ_wps_P1" type="HbWidget">
+ <!-- layout id: txt_occ_dblist_val_infrastructure_public -->
+ <widget name="radioButtonList" type="HbRadioButtonList"/>
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="label" type="HbLabel">
- <enums name="textWrapping" value="TextWordWrap"/>
- <enums name="alignment" value="AlignTop"/>
- <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
- </widget>
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
- <layout type="anchor"/>
- </widget>
- <section name="portrait">
- <widget name="occ_wps_P1" type="HbWidget">
- <widget name="label" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
- <layout type="anchor">
- <anchoritem dst="radioButtonList" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
- <anchoritem dst="radioButtonList" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="label" srcEdge="BOTTOM"/>
- <anchoritem dst="radioButtonList" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="radioButtonList" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="label" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="label" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="label" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <enums name="alignment" value="AlignTop"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
+ </widget>
+ <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+ <layout type="anchor"/>
+ </widget>
+ <section name="portrait">
+ <widget name="occ_wps_P1" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="radioButtonList" dstEdge="LEFT" src="" srcEdge="LEFT"/>
+ <anchoritem dst="radioButtonList" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="label" srcEdge="BOTTOM"/>
+ <anchoritem dst="radioButtonList" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="radioButtonList" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="label" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
</layout>
- </widget>
- </section>
- <section name="landscape">
- <widget name="occ_wps_P1" type="HbWidget">
- <widget name="label" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint type="FIXED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
- <layout type="anchor">
- <anchoritem dst="label" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="label" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="radioButtonList" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="label" srcEdge="RIGHT"/>
- <anchoritem dst="radioButtonList" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
- <anchoritem dst="radioButtonList" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="radioButtonList" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ </widget>
+ </section>
+ <section name="landscape">
+ <widget name="occ_wps_P1" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="label" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="label" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem direction="NEGATIVE" dst="label" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="radioButtonList" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="label" srcEdge="RIGHT"/>
+ <anchoritem dst="radioButtonList" dstEdge="TOP" src="" srcEdge="TOP"/>
+ <anchoritem dst="radioButtonList" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="radioButtonList" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
</layout>
- </widget>
- </section>
- <metadata activeUIState="portrait" display="NHD portrait" unit="un">
+ </widget>
+ </section>
+ <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
<uistate name="landscape" sections="#common landscape"/>
<uistate name="portrait" sections="#common portrait"/>
</metadata>
</hbdocument>
-
\ No newline at end of file
--- a/wlanutilities/wpswizard/resources/occ_wps_02_03.docml Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wpswizard/resources/occ_wps_02_03.docml Fri Sep 03 09:37:37 2010 +0300
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
+<hbdocument version="1.2">
<widget name="occ_wps_P2" type="HbWidget">
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
<widget name="label_heading" type="HbLabel">
<enums name="textWrapping" value="TextWordWrap"/>
- <enums name="alignment" value="AlignTop"/>
+ <enums name="alignment" value="AlignTop"/>
+ <integer name="maximumLines" value="4"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
</widget>
<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
<layout orientation="Vertical" type="linear">
@@ -11,7 +14,7 @@
<linearitem itemname="label_heading"/>
</layout>
</widget>
- <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
</metadata>
</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wlanutilities/wpswizard/resources/occ_wps_04.docml Fri Sep 03 09:37:37 2010 +0300
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.2">
+ <widget name="occ_wps_04" type="HbWidget">
+ <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
+ <widget name="label_heading" type="HbLabel">
+ <string locid="txt_occ_dialog_negotiating" name="plainText" value="Negotiating...."/>
+ <enums name="alignment" value="AlignTop"/>
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+ <integer name="maximumLines" value="4"/>
+ </widget>
+ <widget name="horizontalProgressBar" type="HbProgressBar">
+ <integer name="progressValue" value="0"/>
+ <integer name="minimum" value="0"/>
+ <enums name="orientation" value="Horizontal"/>
+ <integer name="maximum" value="0"/>
+ </widget>
+ <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+ <layout type="anchor"/>
+ </widget>
+ <section name="portrait">
+ <widget name="occ_wps_04" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="horizontalProgressBar" dstEdge="LEFT" src="label_heading" srcEdge="LEFT"/>
+ <anchoritem dst="horizontalProgressBar" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="label_heading" srcEdge="BOTTOM"/>
+ <anchoritem dst="horizontalProgressBar" dstEdge="RIGHT" src="label_heading" srcEdge="RIGHT"/>
+ <anchoritem dst="label_heading" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_heading" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="label_heading" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ </layout>
+ </widget>
+ </section>
+ <section name="landscape">
+ <widget name="occ_wps_04" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="label_heading" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_heading" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+ <anchoritem direction="NEGATIVE" dst="label_heading" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+ <anchoritem dst="horizontalProgressBar" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="label_heading" srcEdge="RIGHT"/>
+ <anchoritem dst="horizontalProgressBar" dstEdge="TOP" src="label_heading" srcEdge="TOP"/>
+ <anchoritem direction="NEGATIVE" dst="horizontalProgressBar" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+ </layout>
+ </widget>
+ </section>
+ <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ <uistate name="landscape" sections="#common landscape"/>
+ <uistate name="portrait" sections="#common portrait"/>
+ </metadata>
+</hbdocument>
--- a/wlanutilities/wpswizard/resources/occ_wps_P4.docml Mon Aug 23 13:30:09 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
- <widget name="occ_wps_P4" type="HbWidget">
- <widget name="label_heading" type="HbLabel">
- <string locid="txt_occ_dialog_negotiating" name="plainText" value="Negotiating...."/>
- <enums name="alignment" value="AlignTop"/>
- <enums name="textWrapping" value="TextWordWrap"/>
- <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
- </widget>
- <widget name="horizontalProgressBar" type="HbProgressBar">
- <integer name="progressValue" value="0"/>
- <integer name="minimum" value="0"/>
- <enums name="orientation" value="Horizontal"/>
- <integer name="maximum" value="0"/>
- </widget>
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
- <layout type="anchor"/>
- </widget>
- <section name="portrait">
- <widget name="occ_wps_P4" type="HbWidget">
- <widget name="label_heading" type="HbLabel">
- <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
- </widget>
- <layout type="anchor">
- <anchoritem dst="horizontalProgressBar" dstEdge="LEFT" spacing="0un" src="label_heading" srcEdge="LEFT"/>
- <anchoritem dst="horizontalProgressBar" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="label_heading" srcEdge="BOTTOM"/>
- <anchoritem dst="horizontalProgressBar" dstEdge="RIGHT" spacing="0un" src="label_heading" srcEdge="RIGHT"/>
- <anchoritem dst="label_heading" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="label_heading" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="label_heading" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- </layout>
- </widget>
- </section>
- <section name="landscape">
- <widget name="occ_wps_P4" type="HbWidget">
- <widget name="label_heading" type="HbLabel">
- <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint type="FIXED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal)) / 2 - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
- </widget>
- <layout type="anchor">
- <anchoritem dst="label_heading" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
- <anchoritem dst="label_heading" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
- <anchoritem dst="horizontalProgressBar" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="label_heading" srcEdge="RIGHT"/>
- <anchoritem dst="horizontalProgressBar" dstEdge="TOP" spacing="0un" src="label_heading" srcEdge="TOP"/>
- <anchoritem dst="horizontalProgressBar" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
- </layout>
- </widget>
- </section>
- <metadata activeUIState="portrait" display="NHD portrait" unit="un">
- <uistate name="Common ui state" sections="#common"/>
- <uistate name="landscape" sections="#common landscape"/>
- <uistate name="portrait" sections="#common portrait"/>
- </metadata>
-</hbdocument>
-
\ No newline at end of file
--- a/wlanutilities/wpswizard/resources/wpswizard_resource.qrc Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wpswizard/resources/wpswizard_resource.qrc Fri Sep 03 09:37:37 2010 +0300
@@ -3,6 +3,6 @@
<qresource prefix="/docml">
<file alias="occ_wps_01_05.docml">occ_wps_01_05.docml.bin</file>
<file alias="occ_wps_02_03.docml">occ_wps_02_03.docml.bin</file>
- <file alias="occ_wps_P4.docml">occ_wps_P4.docml.bin</file>
+ <file alias="occ_wps_04.docml">occ_wps_04.docml.bin</file>
</qresource>
</RCC>
--- a/wlanutilities/wpswizard/src/wpswizard_p.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wpswizard/src/wpswizard_p.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -1,40 +1,37 @@
/*
- * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of the "Eclipse Public License v1.0"
- * which accompanies this distribution, and is available
- * at the URL "http://www.eclipse.org/legal/epl-v10.html".
- *
- * Initial Contributors:
- * Nokia Corporation - initial contribution.
- *
- * Contributors:
- *
- * Description:
- * WPS Wizard: Private implementation.
- *
- */
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* WPS Wizard: Private implementation.
+*/
// System includes
+
+#include <QGraphicsWidget>
+#include <QApplication>
+
#include <HbTranslator>
#include <HbDocumentLoader>
-#include <QGraphicsWidget>
#include <HbMainWindow>
#include <HbView>
#include <HbStackedWidget>
#include <HbLabel>
#include <HbAction>
-#include <QApplication>
+
#include <cmmanagerdefines_shim.h>
-// Trace includes
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "wpswizard_pTraces.h"
-#endif
+// User includes
-// User includes
#include "wlanwizardhelper.h"
// WPS Wizard
#include "wpswizard.h"
@@ -46,6 +43,13 @@
#include "wpswizardstepfour.h"
#include "wpswizardstepfive.h"
+// Trace includes
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "wpswizard_pTraces.h"
+#endif
+
//Forward Decalrations
// External function prototypes
@@ -70,7 +74,8 @@
@return WpsWizardPrivate
*/
-WpsWizardPrivate::WpsWizardPrivate(WpsWizard* wizard,
+WpsWizardPrivate::WpsWizardPrivate(
+ WpsWizard* wizard,
WlanWizardHelper *wizardHelper) :
q_ptr(wizard),
mWizardHelper(wizardHelper),
@@ -142,7 +147,8 @@
// SSID
QString ssid = QString::fromUtf8(reinterpret_cast<const char*> (mWpsAttr.iSsid.Ptr()),
mWpsAttr.iSsid.Length());
- mWizardHelper->setConfiguration(WlanWizardHelper::ConfSsid, ssid);
+ mWizardHelper->setConfiguration(WlanWizardHelper::ConfName, ssid);
+ mWizardHelper->setConfiguration(WlanWizardHelper::ConfSsid, ssid.toUtf8());
// WEP Key1
QString str = QString::fromUtf8(reinterpret_cast<const char*>(mWpsAttr.iWepKey1.Ptr()),
mWpsAttr.iWepKey1.Length());
--- a/wlanutilities/wpswizard/src/wpswizardstepfour.cpp Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wpswizard/src/wpswizardstepfour.cpp Fri Sep 03 09:37:37 2010 +0300
@@ -97,13 +97,13 @@
mLoader = new HbDocumentLoader(mWizard->mainWindow());
- mLoader->load(":/docml/occ_wps_P4.docml", &ok);
+ mLoader->load(":/docml/occ_wps_04.docml", &ok);
Q_ASSERT(ok);
// Initialize orientation
loadDocmlSection(mWizard->mainWindow()->orientation());
- mWidget = qobject_cast<HbWidget*> (mLoader->findWidget("occ_wps_P4"));
+ mWidget = qobject_cast<HbWidget*> (mLoader->findWidget("occ_wps_04"));
Q_ASSERT(mWidget);
bool connectOk = connect(
@@ -318,12 +318,12 @@
// Load the orientation specific section
if (orientation == Qt::Horizontal) {
- mLoader->load(":/docml/occ_wps_P4.docml", "landscape", &ok);
+ mLoader->load(":/docml/occ_wps_04.docml", "landscape", &ok);
Q_ASSERT(ok);
}
else {
Q_ASSERT(orientation == Qt::Vertical);
- mLoader->load(":/docml/occ_wps_P4.docml", "portrait", &ok);
+ mLoader->load(":/docml/occ_wps_04.docml", "portrait", &ok);
Q_ASSERT(ok);
}
}
--- a/wlanutilities/wpswizard/wpswizard.pro Mon Aug 23 13:30:09 2010 +0300
+++ b/wlanutilities/wpswizard/wpswizard.pro Fri Sep 03 09:37:37 2010 +0300
@@ -28,7 +28,7 @@
DOCML += \
resources/occ_wps_01_05.docml \
resources/occ_wps_02_03.docml \
- resources/occ_wps_P4.docml
+ resources/occ_wps_04.docml
INCLUDEPATH += inc \
../inc