--- a/wlanutilities/wlansniffer/aihelper/data/wsfaihelper.rss Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/aihelper/data/wsfaihelper.rss Thu Jan 07 13:31:53 2010 +0200
@@ -95,24 +95,6 @@
}
-//----------------------------------------------------------------------------
-// r_qtn_sniffer_wait_connecting
-// String for connecting waitnote
-//----------------------------------------------------------------------------
-RESOURCE TBUF r_qtn_sniffer_wait_connecting
- {
- buf = qtn_sniffer_wait_connecting;
- }
-
-//----------------------------------------------------------------------------
-// r_qtn_sniffer_wait_connecting_user_conn
-// String for connecting waitnote when WLAN usage is set as Forced
-//----------------------------------------------------------------------------
-RESOURCE TBUF r_qtn_sniffer_wait_connecting_user_conn
- {
- buf = qtn_sniffer_wait_connecting_user_conn;
- }
-
//----------------------------------------------------------------------------
// r_aihelper_localisable_app_info
--- a/wlanutilities/wlansniffer/aiplugin/group/aiplugin.mmp Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/aiplugin/group/aiplugin.mmp Thu Jan 07 13:31:53 2010 +0200
@@ -104,7 +104,7 @@
LIBRARY cmmanager.lib
LIBRARY centralrepository.lib
LIBRARY FeatMgr.lib
-
+LIBRARY connectionuiutilities.lib
DEBUGLIBRARY flogger.lib
--- a/wlanutilities/wlansniffer/aiplugin/src/wsfaicontroller.cpp Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/aiplugin/src/wsfaicontroller.cpp Thu Jan 07 13:31:53 2010 +0200
@@ -32,6 +32,7 @@
#include <cmmanager.h>
#include <internetconnectivitycrkeys.h>
#include <wlanerrorcodes.h>
+#include <ConnectionUiUtilities.h>
// CLASS HEADER
#include "wsfaicontroller.h"
@@ -1141,12 +1142,9 @@
if ( !wlanArray || !wlanArray->Count() )
{
// there are no available networks
- HBufC* infoText = StringLoader::LoadLC(
- R_QTN_WLAN_INFO_NO_NETWORKS_FOUND );
- CAknInformationNote* infoNote = new (ELeave)
- CAknInformationNote( ETrue );
- infoNote->ExecuteLD( *infoText );
- CleanupStack::PopAndDestroy( infoText );
+ CConnectionUiUtilities* connUiUtils = CConnectionUiUtilities::NewL();
+ connUiUtils->NoWLANNetworksAvailableNote();
+ delete connUiUtils;
}
// launch the search dialog
--- a/wlanutilities/wlansniffer/apwizard/loc/wsfapwizard.loc Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/apwizard/loc/wsfapwizard.loc Thu Jan 07 13:31:53 2010 +0200
@@ -146,21 +146,6 @@
//
#define qtn_netw_conset_info_eap_settings_default "Default EAP values set. Configure advanced settings by editing the method."
-//d:Confirmation query, displayed if user skipped the test.
-//l:popup_note_window
-//w:
-//r:5.0
-//
-#define qtn_netw_conset_ict_quest_skipped_save "Save connection method for later use?"
-
-//d: Note to indicate to user that the connection method/access point
-//d: will not be saved
-//l: popup_note_window
-//w:
-//r:5.0
-//
-#define qtn_netw_conset_ict_info_method_not_saved "Connection method will not be saved"
-
//d: Text of an information note used to ensure the user the a new connection
//d: method has been added successfully.
//l: popup_note_window
--- a/wlanutilities/wlansniffer/apwizard/src/wsfwlaniapwizard.cpp Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/apwizard/src/wsfwlaniapwizard.cpp Thu Jan 07 13:31:53 2010 +0200
@@ -450,14 +450,11 @@
if ( !foundSsid )
{
LOG_WRITE( "direct scan failed, entering fully manual mode" );
- // pop up info note: No WLAN networks found
- HBufC* infoText = StringLoader::LoadLC(
- R_QTN_WLAN_INFO_NO_NETWORKS_FOUND );
- CAknInformationNote* informationNote =
- new (ELeave) CAknInformationNote( ETrue );
- informationNote->ExecuteLD( *infoText );
- CleanupStack::PopAndDestroy( infoText );
+ // pop up discreet popup: No WLANs found
+ CConnectionUiUtilities* connUiUtils = CConnectionUiUtilities::NewL();
+ connUiUtils->NoWLANNetworksAvailableNote();
+ delete connUiUtils;
// now entering fully manual mode
--- a/wlanutilities/wlansniffer/engine/server/inc/wsfwlanbearerconnectionmonitor.h Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/engine/server/inc/wsfwlanbearerconnectionmonitor.h Thu Jan 07 13:31:53 2010 +0200
@@ -76,12 +76,6 @@
ECsConnectionCreated,
/**
- * Application connection preferences and default connection
- * has been changed
- */
- ECsPreferencesChanged,
-
- /**
* Connection environment fully initialized
*/
ECsConnected
--- a/wlanutilities/wlansniffer/engine/server/src/wsfwlanbearerconnectionmonitor.cpp Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/engine/server/src/wsfwlanbearerconnectionmonitor.cpp Thu Jan 07 13:31:53 2010 +0200
@@ -884,34 +884,6 @@
iClientPoll->Cancel();
}
- case ECsPreferencesChanged: // fall-through
- {
- // restoring default connection
- TCmDefConnValue defConn;
- TInt error = KErrNone;
-
- LOG_WRITE( "reading default connection" );
- TRAP( error, iCmMgr.ReadDefConnL( defConn ) );
- if ( error )
- {
- // Ignore possible failure and continue the cleanup
- LOG_WRITEF( "ReadDefConnL returned error %d", error );
- }
-
- if ( error == KErrNone && defConn == iCurrentDefConn )
- {
- // nobody has overwritten our setting so it's our duty to
- // restore the original value
- LOG_WRITE( "restoring default connection" );
- TRAP( error, iCmMgr.WriteDefConnL( iOriginalDefConn ) );
- if ( error )
- {
- // Ignore possible failure and continue the cleanup
- LOG_WRITEF( "WriteDefConnL returned error %d", error );
- }
- }
- }
-
case ECsConnectionCreated: // fall-through
{
@@ -920,6 +892,7 @@
case ECsSocketOpened: // fall-through
{
// closing the connection handle
+ LOG_WRITE( "closing the connection handle" );
iConnection.Close();
iSocketServ.Close();
}
@@ -1048,52 +1021,9 @@
{
LOG_WRITE( "<EConnectionCreated>" );
- // changing connection preferences
// start monitoring the iap
MonitorAccessPoint( iConnIap );
- TInt error = KErrNone;
-
- // store previous default connection value
- TRAP( error, iCmMgr.ReadDefConnL( iOriginalDefConn ) );
- if ( error )
- {
- // Ignore possible failure and continue
- LOG_WRITEF( "RunL ReadDefConnL returned error %d", error );
- }
- else
- {
- LOG_WRITEF( "original default connection type/id = %d/%d",
- iOriginalDefConn.iType,
- iOriginalDefConn.iId );
-
- // set the new connection as default
- iCurrentDefConn.iType = ECmDefConnConnectionMethod;
- iCurrentDefConn.iId = iConnIap;
-
- TRAP( error, iCmMgr.WriteDefConnL( iCurrentDefConn ) );
- if ( error )
- {
- // Ignore possible failure and continue
- LOG_WRITEF( "RunL WriteDefConnL returned error %d", error );
- }
-
- LOG_WRITEF( "current default connection set to type/id = %d/%d",
- iCurrentDefConn.iType,
- iCurrentDefConn.iId );
- }
-
- iConnectingState = ECsPreferencesChanged;
- SetActive();
- TRequestStatus* status = &iStatus;
- User::RequestComplete( status, KErrNone );
- break;
- }
-
- case ECsPreferencesChanged:
- {
- LOG_WRITE( "<EPreferencesChanged>" );
-
// reset inactivity time
iInactivityStart.UniversalTime();
iAutoDisconnect = EFalse;
--- a/wlanutilities/wlansniffer/mainapplication/data/wlansniffer.rss Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/mainapplication/data/wlansniffer.rss Thu Jan 07 13:31:53 2010 +0200
@@ -57,8 +57,6 @@
//
// ---------------------------------------------------------
//
-
-
RESOURCE EIK_APP_INFO
{
menubar = r_sniffer_menubar;
@@ -130,19 +128,6 @@
// ---------------------------------------------------------
//
-// r_sniffer_detailsview
-// Details
-//
-// ---------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_sniffer_detailsview
- {
- menubar = r_sniffer_menubar;
- cba = R_AVKON_SOFTKEYS_OK_EMPTY;
- }
-
-// ---------------------------------------------------------
-//
// r_Sniffer_menubar
// Menubar for Sniffer example
//
@@ -271,6 +256,37 @@
};
}
+// ---------------------------------------------------------
+//
+// r_sniffer_detailsview
+// Details
+//
+// ---------------------------------------------------------
+//
+RESOURCE AVKON_VIEW r_sniffer_detailsview
+ {
+ menubar = r_sniffer_detailsview_menubar;
+ cba = R_AVKON_SOFTKEYS_OK_EMPTY;
+ }
+
+
+// ---------------------------------------------------------
+//
+// r_sniffer_detailsview_menubar
+//
+// ---------------------------------------------------------
+//
+RESOURCE MENU_BAR r_sniffer_detailsview_menubar
+ {
+ titles =
+ {
+ MENU_TITLE
+ {
+ menu_pane = R_AVKON_MENUPANE_EMPTY;
+ }
+ };
+ }
+
//-----------------------------------------------------------------------------
//
// Details view listbox headings resources
@@ -650,11 +666,6 @@
buf = qtn_wlan_wait_searching_networks;
}
-RESOURCE TBUF r_qtn_sniffer_wait_connecting
- {
- buf = qtn_sniffer_wait_connecting;
- }
-
RESOURCE TBUF r_qtn_sniffer_title
{
buf = qtn_sniffer_title;
@@ -675,11 +686,6 @@
buf = qtn_sniffer_quest_restart_browsing_with_wlan;
}
-RESOURCE TBUF r_qtn_sniffer_wait_connecting_user_conn
- {
- buf = qtn_sniffer_wait_connecting_user_conn;
- }
-
//-----------------------------------------------------------------------------
RESOURCE LOCALISABLE_APP_INFO r_sniffer_localisable_app_info
--- a/wlanutilities/wlansniffer/mainapplication/group/mainapplication.mmp Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/mainapplication/group/mainapplication.mmp Thu Jan 07 13:31:53 2010 +0200
@@ -92,7 +92,7 @@
LIBRARY wsfwlaninfo.lib
LIBRARY wsfwlaninfosorting.lib
LIBRARY wsfmodel.lib
-
+LIBRARY connectionuiutilities.lib
// Logger
DEBUGLIBRARY flogger.lib
--- a/wlanutilities/wlansniffer/mainapplication/loc/wsfmainapplication.loc Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/mainapplication/loc/wsfmainapplication.loc Thu Jan 07 13:31:53 2010 +0200
@@ -215,12 +215,6 @@
//r:3.0
//
#define qtn_wlan_wait_searching_networks "Searching WLAN networks"
-
-//d:During connection creation a wait note Connecting via... is shown
-//l:popup_note_wait_window
-//r:3.0
-//
-#define qtn_sniffer_wait_connecting "Connecting via '%U'"
//d: This confirmation query is displayed if the user selected Start web browsing
//d: on a WLAN network but the browser is already running and using
@@ -244,14 +238,6 @@
#define qtn_note_title_filter_out_wlans "Hide selected networks:"
-//d:During connection creation the wait note is shown while
-//d:connecting to an IAP if WLAN usage option is selected as Forced
-//l:popup_note_wait_window
-//r:5.0.1
-//
-#define qtn_sniffer_wait_connecting_user_conn "Connecting. All applications will use this connection"
-
-
//------------------------------------------------------------------------------
--- a/wlanutilities/wlansniffer/mainapplication/src/wsfappui.cpp Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/mainapplication/src/wsfappui.cpp Thu Jan 07 13:31:53 2010 +0200
@@ -26,6 +26,7 @@
#include <centralrepository.h>
#include <ErrorUI.h>
#include <wlansniffer.rsg>
+#include <ConnectionUiUtilities.h>
#include "wlansettingsui.h"
#include "wsfappui.h"
@@ -404,11 +405,10 @@
void CWsfAppUi::ShowNoWlansFoundInfoL()
{
LOG_ENTERFN( "CWsfAppUi::ShowNoWlansFoundInfoL" );
- HBufC* infoText = StringLoader::LoadLC(
- R_QTN_WLAN_INFO_NO_NETWORKS_FOUND );
- CAknInformationNote* infoNote = new (ELeave) CAknInformationNote( ETrue );
- infoNote->ExecuteLD( *infoText );
- CleanupStack::PopAndDestroy( infoText );
+
+ CConnectionUiUtilities* connUiUtils = CConnectionUiUtilities::NewL();
+ connUiUtils->NoWLANNetworksAvailableNote();
+ delete connUiUtils;
}
--- a/wlanutilities/wlansniffer/widget/widget_2001E637/hsps/00/manifest.dat Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_2001E637/hsps/00/manifest.dat Thu Jan 07 13:31:53 2010 +0200
@@ -1,8 +1,7 @@
<?xml version="1.0"?>
-<package version="1.0">
+<package version="2.0">
- <family>vga</family>
- <family>qvga</family>
+ <family>vga_tch</family>
<type>widget</type>
--- a/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/00/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/00/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -11,13 +11,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- background-image: "SKIN(268458534 24576)";
- background-color: "SKIN(268458534 5120 9)";
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/00/wsfwidget.xml Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/00/wsfwidget.xml Thu Jan 07 13:31:53 2010 +0200
@@ -7,26 +7,12 @@
<actions>
<action>
- <trigger name="stylus">
- <property name="eventtype" value="up" />
- </trigger>
- <trigger name="activate"/>
- <trigger name="keyevent">
- <!-- enter key / EStdKeyEnter -->
- <property name="scancode" value="3" />
- <property name="eventtype" value="1" />
- </trigger>
- <event name="WLANWizard/OpenMenu" />
+ <trigger name="activate"/>
+ <event name="WLANWizard/OpenMenu" />
</action>
-
<action>
- <trigger name="gainfocus"/>
- <event name="WLANWizard/GainFocusInfoArea" />
- </action>
-
- <action>
- <trigger class="western" name="down" />
- <trigger class="arabic" name="up" />
+ <trigger name="gainfocus"/>
+ <event name="WLANWizard/GainFocusInfoArea" />
</action>
</actions>
@@ -37,7 +23,7 @@
<text id="statusName1" class="wizardEntryText1" focusable="false">
<property class="WLANWizard/NetworkStatus" />
</text>
- </button> <!-- enf of wizardInfoArea1 -->
+ </button> <!-- enf of wizardInfoArea1 -->
<button id="wizardInfoArea2" class="wizardStatusBox2" focusable="false">
<text id="statusName2" class="wizardEntryText2" focusable="false">
--- a/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/37/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/37/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -11,13 +11,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- background-image: "SKIN(268458534 24576)";
- background-color: "SKIN(268458534 5120 9)";
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/50/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/50/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -11,13 +11,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- background-image: "SKIN(268458534 24576)";
- background-color: "SKIN(268458534 5120 9)";
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/57/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/57/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -11,13 +11,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- background-image: "SKIN(268458534 24576)";
- background-color: "SKIN(268458534 5120 9)";
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/94/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_2001E637/xuikon/94/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -11,13 +11,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- background-image: "SKIN(268458534 24576)";
- background-color: "SKIN(268458534 5120 9)";
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_20026F45/hsps/00/manifest.dat Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_20026F45/hsps/00/manifest.dat Thu Jan 07 13:31:53 2010 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<package version="1.0">
+<package version="2.0">
<family>qhd_tch</family>
--- a/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/00/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/00/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -14,12 +14,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
- background-color: "SKIN(268458534 9896)";
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/00/wsfwidget.xml Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/00/wsfwidget.xml Thu Jan 07 13:31:53 2010 +0200
@@ -7,21 +7,8 @@
<actions>
<action>
- <trigger name="stylus">
- <property name="eventtype" value="up" />
- </trigger>
- <trigger name="activate"/>
- <trigger name="keyevent">
- <!-- enter key / EStdKeyEnter -->
- <property name="scancode" value="3" />
- <property name="eventtype" value="1" />
- </trigger>
- <event name="WLANWizard/OpenMenu" />
- </action>
-
- <action>
- <trigger class="western" name="down" />
- <trigger class="arabic" name="up" />
+ <trigger name="activate"/>
+ <event name="WLANWizard/OpenMenu" />
</action>
</actions>
@@ -32,7 +19,7 @@
<text id="statusName1" class="wizardEntryText1" focusable="false">
<property class="WLANWizard/NetworkStatus" />
</text>
- </button> <!-- enf of wizardInfoArea1 -->
+ </button> <!-- enf of wizardInfoArea1 -->
<button id="wizardInfoArea2" class="wizardStatusBox2" focusable="false">
<text id="statusName2" class="wizardEntryText2" focusable="false">
--- a/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/37/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/37/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -14,12 +14,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
- background-color: "SKIN(268458534 9896)";
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/50/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/50/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -14,12 +14,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
- background-color: "SKIN(268458534 9896)";
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/57/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/57/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -14,12 +14,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
- background-color: "SKIN(268458534 9896)";
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;
--- a/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/94/wsfwidget.css Thu Dec 17 09:20:28 2009 +0200
+++ b/wlanutilities/wlansniffer/widget/widget_20026F45/xuikon/94/wsfwidget.css Thu Jan 07 13:31:53 2010 +0200
@@ -14,12 +14,6 @@
block-progression: tb;
}
-widget#wizardPluginContainer:focus {
- touchfeedbackdown: basic;
- touchfeedbackdrag: sensitive;
- background-color: "SKIN(268458534 9896)";
-}
-
button.wizardStatusBox1 {
display: block;
visibility: visible;