--- a/browserplugins/browseraudiovideoplugin/group/BLD.INF Fri Jul 03 15:46:41 2009 +0100
+++ b/browserplugins/browseraudiovideoplugin/group/BLD.INF Thu Aug 27 07:42:55 2009 +0300
@@ -17,6 +17,7 @@
#include <platform_paths.hrh>
+#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
PRJ_PLATFORMS
DEFAULT
--- a/browserplugins/browseraudiovideoplugin/src/BavpControllerVideo.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserplugins/browseraudiovideoplugin/src/BavpControllerVideo.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -1344,6 +1344,7 @@
if ( IsClipFullScreen() )
{
RevertToNormalScreenL();
+ iBavpView->ControllerStateChangedL();
}
}
--- a/browserplugins/browseraudiovideoplugin/src/BavpPlugin.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserplugins/browseraudiovideoplugin/src/BavpPlugin.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -373,7 +373,10 @@
{
TBool ret = EFalse;
TGestureEvent *gesture = static_cast<TGestureEvent*>(aEvent);
- ret = iBavpController->HandleGesture(gesture);
+ // Fix crash when iBavpController is null for bug EGUY-7TYHDC
+ if (iBavpController) {
+ ret = iBavpController->HandleGesture(gesture);
+ }
return ret;
}
--- a/browserplugins/browsersysteminfoplugin/src/SystemInfoPlugin.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserplugins/browsersysteminfoplugin/src/SystemInfoPlugin.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -611,7 +611,7 @@
{
char* newString = NULL;
if (string.Length()) {
- newString = new char(string.Length());
+ newString = new char[string.Length()];
}
if (newString) {
Mem::Copy(newString, string.Ptr(), string.Length());
--- a/browserui/browser/BrowserAppInc/CommonConstants.h Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppInc/CommonConstants.h Thu Aug 27 07:42:55 2009 +0300
@@ -91,6 +91,8 @@
const TUint KCharacterSetIdentifierKoi8_u = 0x101f8761; // Ukrainian
const TUint KCharacterSetIdentifierIscii = 0x1027508E;
+const TUint KCharacterSetIdentifierEucKr = 0x2000E526; // Korean
+const TUint KCharacterSetIdentifierKsc5601 = 0x200113CD; // Korean
const TUint KCharacterSetIdentifierAutomatic = 0x00;
const TUint KCharacterSetIdentifierUCS2 = 0xffffffff; // dummy value this id is never checked
--- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -355,6 +355,26 @@
// get client rect before hiding CBAs
TRect rect = ClientRect();
Cba()->MakeVisible( EFalse );
+ //-------------------------------------------------------------------------
+ // Create bookmarkview
+ PERFLOG_STOPWATCH_START;
+ CBrowserBookmarksView* bookmarksView = NULL;
+ TInt folderUid = doc->GetFolderToOpen();
+ if ( IsEmbeddedModeOn() && folderUid!= KFavouritesRootUid)
+ {
+ bookmarksView = CBrowserBookmarksView::NewLC( *this, *iRecentUrlStore, folderUid );
+ }
+ else
+ {
+ bookmarksView = CBrowserBookmarksView::NewLC( *this, *iRecentUrlStore );
+ }
+ PERFLOG_STOP_WRITE("\t BMView NewL")
+
+ iBookmarksView = bookmarksView;
+
+ AddViewL( bookmarksView ); // transfer ownership to CAknViewAppUi
+ CleanupStack::Pop(); // bookmarksView
+ BROWSER_LOG( ( _L( "Bookmarksview up" ) ) );
//-------------------------------------------------------------------------
// Create ContentView
@@ -417,24 +437,6 @@
//-------------------------------------------------------------------------
- PERFLOG_STOPWATCH_START;
- CBrowserBookmarksView* bookmarksView = NULL;
- TInt folderUid = doc->GetFolderToOpen();
- if ( IsEmbeddedModeOn() && folderUid!= KFavouritesRootUid)
- {
- bookmarksView = CBrowserBookmarksView::NewLC( *this, *iRecentUrlStore, folderUid );
- }
- else
- {
- bookmarksView = CBrowserBookmarksView::NewLC( *this, *iRecentUrlStore );
- }
- PERFLOG_STOP_WRITE("\t BMView NewL")
-
- iBookmarksView = bookmarksView;
-
- AddViewL( bookmarksView ); // transfer ownership to CAknViewAppUi
- CleanupStack::Pop(); // bookmarksView
- BROWSER_LOG( ( _L( "Bookmarksview up" ) ) );
CBrowserSettingsView* settingsView = CBrowserSettingsView::NewLC( *this );
AddViewL( settingsView ); // transfer ownership to CAknViewAppUi
@@ -446,11 +448,6 @@
CleanupStack::Pop(); // windowSelectionView
BROWSER_LOG( ( _L( "windowSelectionView up" ) ) );
- CBrowserInitialView* initialView = CBrowserInitialView::NewLC( *this );
- AddViewL( initialView ); // transfer ownership to CAknViewAppUi
- CleanupStack::Pop(); // initialView
- BROWSER_LOG( ( _L( "initialView up" ) ) );
-
//-------------------------------------------------------------------------
iIdle = CIdle::NewL( CActive::EPriorityIdle );
@@ -1118,9 +1115,14 @@
}
else
{
- // LastActiveViewId() might return with 0!
- TRAP_IGNORE( ActivateLocalViewL( LastActiveViewId() ) );
- }
+ TVwsViewId activeViewId;
+ if( ( GetActiveViewId( activeViewId ) == KErrNone ) &&
+ ( LastActiveViewId() != activeViewId.iViewUid ) )
+ {
+ // LastActiveViewId() might return with 0!
+ TRAP_IGNORE( ActivateLocalViewL( LastActiveViewId() ) );
+ }
+ }
}
iViewToBeActivatedIfNeeded.iUid = 0;
CAknViewAppUi::HandleForegroundEventL( aForeground );
@@ -1139,12 +1141,6 @@
Display().StopProgressAnimationL();
}
}
- else if (ContentView()->FullScreenMode())
- {
- //Disable content view full screen mode if it goes to background
- ContentView()->EnableFullScreenModeL( EFalse);
- }
-
if (iWindowManager)
{
@@ -1634,7 +1630,7 @@
if (name && name->Length())
{
- iRecentUrlStore->SaveData(*url,*name);
+ iRecentUrlStore->SaveDataL(*url,*name);
}
else
{
@@ -1650,12 +1646,12 @@
cnameDes.Append( cnameLeft );
cnameDes.AppendFill( TChar(KDot),5 ); // '.....'
cnameDes.Append( cnameRight );
- iRecentUrlStore->SaveData(*url,*cname);
+ iRecentUrlStore->SaveDataL(*url,*cname);
CleanupStack::PopAndDestroy();//cname
}
else
{
- iRecentUrlStore->SaveData(*url,*url);
+ iRecentUrlStore->SaveDataL(*url,*url);
}
}
}
@@ -1684,12 +1680,12 @@
cnameDes.Append( cnameLeft );
cnameDes.AppendFill( TChar(KDot),5 ); // '.....'
cnameDes.Append( cnameRight );
- iRecentUrlStore->SaveData(*url,*cname);
+ iRecentUrlStore->SaveDataL(*url,*cname);
CleanupStack::PopAndDestroy();//cname
}
else
{
- iRecentUrlStore->SaveData(*url,*url);
+ iRecentUrlStore->SaveDataL(*url,*url);
}
}
CleanupStack().PopAndDestroy(); // url
@@ -2378,6 +2374,9 @@
{
CancelFetch();
}
+ //Close the uploading dialog.
+ iDialogsProvider->UploadProgressNoteL(
+ 0, 0, ETrue, (MBrowserDialogsProviderObserver *)this );
// SendDisconnectEventL();
// not needed as by that point HTTPSession was already shutdown by executing disconnect menu option
--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -274,6 +274,10 @@
}
#endif // __RSS_FEEDS
+ if ( ( aCommand != EWmlCmdZoomSliderShow ) && ZoomSliderVisible() )
+ {
+ MakeZoomSliderVisibleL( EFalse );
+ }
switch ( aCommand )
{
case EWmlCmdFavourites:
@@ -897,27 +901,6 @@
EnableFullScreenModeL( ETrue );
iWasContentFullScreenMode = EFalse;
}
-
- // Any other commands must cause the zoom slider to be hidden (if it is
- // currently visible).
- switch ( aCommand )
- {
- // case EWmlCmdZoomMode:
- case EWmlCmdZoomSliderShow:
- {
- // Do nothing, we want to display zoom indicator
- break;
- }
- default:
- {
- // If any other command and zoom indicator is displayed, close it
- if ( ZoomSliderVisible() )
- {
- MakeZoomSliderVisibleL( EFalse );
- }
- break;
- }
- } // end of switch
}
// -----------------------------------------------------------------------------
@@ -1223,8 +1206,7 @@
{
TBrCtlDefs::TBrCtlElementType elementtype =
ApiProvider().BrCtlInterface().FocusedElementType();
- if( (elementtype == TBrCtlDefs::EElementActivatedInputBox ) ||
- (elementtype == TBrCtlDefs::EElementActivatedObjectBox ) )
+ if( elementtype == TBrCtlDefs::EElementActivatedObjectBox )
{
if ( !iContentFullScreenMode )
{
@@ -2753,6 +2735,10 @@
{
iContainer->HandleResourceChange(KEikDynamicLayoutVariantSwitch);
UpdateFullScreenL();
+ if(KeymapIsUp())
+ {
+ RedrawKeymap();
+ }
}
}
@@ -3124,8 +3110,10 @@
{
iIsPluginFullScreenMode = aFullScreen;
if (aFullScreen) {
- iOrientation = AppUi()->Orientation();
- TRAP_IGNORE( AppUi()->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape));
+ if (AppUi()->Orientation() != CAknAppUiBase::EAppUiOrientationLandscape) {
+ iOrientation = AppUi()->Orientation();
+ TRAP_IGNORE(AppUi()->SetOrientationL(CAknAppUiBase::EAppUiOrientationLandscape));
+ }
if (iPenEnabled) {
Toolbar()->SetToolbarVisibility( EFalse, EFalse );
}
--- a/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -19,6 +19,7 @@
// INCLUDE FILES
+#include <Browser_Platform_Variant.hrh>
#include <eikmenub.h>
#include <eikdef.h>
#include <akninfrm.h>
@@ -538,7 +539,11 @@
if ( iSearchPaneActive )
{
SetGotoPaneActiveL();
+
+#if defined(BRDO_SEARCH_INTEGRATION_FF)
iEditor->RemoveFlagFromUserFlags( CEikEdwin::EAvkonDisableVKB );
+#endif
+
}
}
if ( aKeyEvent.iCode == EKeyDownArrow )
@@ -547,11 +552,16 @@
if ( iGotoPaneActive )
{
SetSearchPaneActiveL();
+
+#if defined(BRDO_SEARCH_INTEGRATION_FF)
iSearchEditor->RemoveFlagFromUserFlags( CEikEdwin::EAvkonDisableVKB );
+#endif
+
}
}
}
}
+
}
return resp;
@@ -573,6 +583,7 @@
if (Rect().Contains(aPointerEvent.iPosition))
{
iGotoKeyHandled->EnableL(ETrue);
+
// If search feature exists, check and route to appropriate editor //
if ( iSearchEditor )
{
@@ -586,7 +597,9 @@
{
SetSearchPaneActiveL();
}
+#if defined(BRDO_SEARCH_INTEGRATION_FF)
iSearchEditor->RemoveFlagFromUserFlags( CEikEdwin::EAvkonDisableVKB);
+#endif
}
else
{
@@ -598,7 +611,9 @@
{
SetGotoPaneActiveL();
}
+#if defined(BRDO_SEARCH_INTEGRATION_FF)
iEditor->RemoveFlagFromUserFlags( CEikEdwin::EAvkonDisableVKB);
+#endif
}
}
else
@@ -1211,7 +1226,9 @@
if ( iSearchEditor )
{
+#if defined(BRDO_SEARCH_INTEGRATION_FF)
iEditor->AddFlagToUserFlags( CEikEdwin::EAvkonDisableVKB );
+#endif
// if searchpane is empty add default text
if ( !SearchTextLength() )
{
@@ -1242,7 +1259,9 @@
if ( iSearchEditor )
{
+#if defined(BRDO_SEARCH_INTEGRATION_FF)
iSearchEditor->AddFlagToUserFlags( CEikEdwin::EAvkonDisableVKB );
+#endif
// if gotopane is empty add default text
if ( !TextLength() )
{
--- a/browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserLoadObserver.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -102,14 +102,7 @@
iWindow->ResetPageOverviewLocalSettingL();
iWindow->SetImagesLoaded(EFalse);
}
- switch( iLoadUrlType )
- {
- default:
- {
- HandleLoadEventOtherL( aLoadEvent, aSize, aTransactionId );
- break;
- }
- }
+ HandleLoadEventOtherL( aLoadEvent, aSize, aTransactionId );
}
// ----------------------------------------------------------------------------
@@ -128,6 +121,11 @@
{
case TBrCtlDefs::EEventLoadError:
{
+ if(LoadStatus( ELoadStatusSecurePage ))
+ {
+ ClearStatus();
+ UpdateSecureIndicatorL();
+ }
SetStatus( ELoadStatusMainError );
break;
}
--- a/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -802,12 +802,17 @@
// if it doesn't, reset access point to always ask and homepage to blank access point home page.
CApListItem* apItem = iCommsModel.AccessPointsL()->ItemForUid( aDefaultAccessPoint );
if (apItem == NULL)
- {
- if( iVpnEngine->IsVpnApL( aDefaultAccessPoint ) )
+ {
+ TBool isVpn = EFalse;
+ TRAPD(leaveCode, isVpn = iVpnEngine->IsVpnApL( aDefaultAccessPoint ))
+ if ( leaveCode == KErrNone )
{
- BROWSER_LOG( ( _L( " This is VPN AP which has a snap in it" ) ) );
- break;
- }
+ if ( isVpn )
+ {
+ BROWSER_LOG( ( _L( " This is VPN AP which has a snap in it" ) ) );
+ break;
+ }
+ }
aDefaultAccessPoint = KWmlNoDefaultAccessPoint;
aAssocVpn = KWmlNoDefaultAccessPoint;
delete iAllPreferences.iDefaultAPDetails;
--- a/browserui/browser/BrowserAppSrc/BrowserProgressIndicator.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserProgressIndicator.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -39,7 +39,7 @@
const TInt KGranularity = 4;
const TUint KkBLimit = 999;
const TUint KOnekB = 1024;
-const TUint KOneMB = 1048580;
+const TUint KOneMB = 1024 * 1024;
const TInt KMaxPercentage = 100;
const TInt KMBLimit = 10;
const TInt KMaxMBLimit = 100;
--- a/browserui/browser/BrowserAppSrc/BrowserShortcutKeyMap.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserShortcutKeyMap.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -67,9 +67,8 @@
#define KKeymapVScrollbarSize 4
// sizing for entire keymap (not counting scrollbar)
-// as a percentage of vertical screen size, and an aspect ratio width/height
+// as a percentage of vertical and horizontal screen size
#define KKeymapVSize 0.90
-#define KKeymapHVAspectRatio 0.88
#define KKeymapHSize 0.90
// margins for each cell
@@ -273,14 +272,15 @@
// resize it to account for scrollbar width/height
iTargetRect.Resize(-TSize(KKeymapHScrollbarSize,KKeymapVScrollbarSize));
+
+ TBool landscape = iTargetRect.Size().iWidth > iTargetRect.Size().iHeight ;
//
// derive shrink amounts based on keymap size constants and shrink the rect
//
TInt newHeight = (KKeymapVSize * iTargetRect.Size().iHeight);
- //TInt newWidth = (KKeymapHSize * iTargetRect.Size().iWidth);
- TInt newWidth = newHeight * KKeymapHVAspectRatio;
-
+ TInt newWidth = (KKeymapHSize * iTargetRect.Size().iWidth);
+
if(newWidth > KKeymapHSize * iTargetRect.Size().iWidth)
{
newWidth = (KKeymapHSize * iTargetRect.Size().iWidth);
@@ -306,7 +306,15 @@
// Set font types
iLineFont = LatinPlain12();
- iKeyFont = LatinBold16();
+
+ if (landscape)
+ { // in landscape need to shrink the font or else it gets clipped
+ iKeyFont = LatinBold13();
+ }
+ else
+ {
+ iKeyFont = LatinBold16();
+ }
// init cell data
InitCellDataL();
--- a/browserui/browser/BrowserAppSrc/BrowserUtil.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/BrowserAppSrc/BrowserUtil.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -334,6 +334,9 @@
TInt spaces(0);
TPtr ptr = aString->Des();
+ //Trim leading and trailing spaces in URL before encoding spaces inside URL
+ ptr.Trim();
+
for (TInt i = ptr.Length()-1; i > 0 ; i--)
{
if (ptr[i] == ' ')
--- a/browserui/browser/FavouritesInc/BrowserAdaptiveListPopup.h Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesInc/BrowserAdaptiveListPopup.h Thu Aug 27 07:42:55 2009 +0300
@@ -150,6 +150,10 @@
*/
void ShowPopupListL(TBool aRelayout = EFalse);
void UpdateScrollBarPositionL(const TInt aPosition);
+ void HandleItemClickedL(CEikListBox* aListBox );
+
+
+
private: // from CCoeControl
--- a/browserui/browser/FavouritesInc/BrowserBookmarksView.h Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesInc/BrowserBookmarksView.h Thu Aug 27 07:42:55 2009 +0300
@@ -271,7 +271,7 @@
* @param aFolder Folder which contains the items.
* @return List of items. Pushed on the cleanup stack.
*/
- virtual CFavouritesItemList* GetItemsLC( TInt aFolder );
+ virtual CFavouritesItemList* GetItemsL( TInt aFolder );
/**
* Some displayed data has changed (Favourites database, AP-s, etc).
@@ -545,6 +545,9 @@
// Re-Entry Gate flag for Delete Bookmark routine
TBool iHandleDeleteInProgress;
+ // updates the softkey
+ TBool iSoftKeyUpdate;
+
};
#endif
--- a/browserui/browser/FavouritesInc/BrowserFavouritesView.h Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesView.h Thu Aug 27 07:42:55 2009 +0300
@@ -220,7 +220,7 @@
* @param aFolder Folder which contains the items.
* @return List of items. Pushed on the cleanup stack.
*/
- virtual CFavouritesItemList* GetItemsLC( TInt aFolder );
+ virtual CFavouritesItemList* GetItemsL( TInt aFolder );
public:
@@ -564,6 +564,9 @@
TBool iSaveStateOnDeactivate;
CBrowserFavouritesListboxState* iSavedListboxState;
+
+ //Added one variable to hold the data retrieved from database
+ CFavouritesItemList* iBookmarkitems;
};
#include "BrowserFavouritesView.inl"
--- a/browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -292,79 +292,9 @@
{
if (iList && iTouchSupported)
{
- TInt idx = iList->CurrentItemIndex();
-
- //the first time
- if ( !iList->HighLightEnabled() )
- {
- iList->SetHighLight( ETrue );
-
- //save the original content
- if ( iFirstGotoContent != NULL )
- {
- delete iFirstGotoContent;
- iFirstGotoContent = NULL;
- }
- iFirstGotoContent = iEditor->GetTextInHBufL();
- if ( iFirstGotoContent == NULL )
- {
- iFirstGotoContent = KNullDesC().AllocL();
- }
- }
-
//using ComponentControl(0) instead of iList because need access to a
//protected function
ComponentControl(0)->HandlePointerEventL( aPointerEvent );
- TInt idx2 = iList->CurrentItemIndex();
- if ((idx2 != idx) || (idx == 0)) // 0 is pre-selected
- {
- idx2 = iItems->Count() - idx2 - 1;
- TPtrC16 item;
- TPtrC rightSide;
- item.Set( (*iItems)[ idx2 ] );
- //cut the slash from the end if needed
- //permanent sollution until AHLE does not
- //solve this problem related to ID: TMCN-5TTRXV error
- if ( item[item.Length() - 1] != KSlash )
- {
- rightSide.Set( item.Left( item.Length() ) );
- }
- else
- {
- rightSide.Set( item.Left( item.Length() - 1 ) );
- }
-
- //if true then append the suffix(rightSide), to the
- //user-typed data
- //else just use the recent URLs text(rightSide) only
- if ( iUrlCompletionMode )
- {
- HBufC* currentCompletion = HBufC::NewLC(
- iFirstGotoContent->Des().Length() + rightSide.Length() + 1 );
- TPtr currentCompletionPtr = currentCompletion->Des();
-
- currentCompletionPtr.Copy( iFirstGotoContent->Des() );
- currentCompletionPtr.Append( rightSide );
- currentCompletionPtr.ZeroTerminate();
- iEditor->SetTextL( currentCompletion );
- iEditor->SetCursorPosL( currentCompletionPtr.Length(), EFalse );
- CleanupStack::PopAndDestroy( currentCompletion );
- }
- else
- {
- iEditor->SetTextL( &rightSide );
- iEditor->SetCursorPosL( rightSide.Length(), EFalse );
- }
- iEditor->HandleTextChangedL();
-
- delete iPrevGotoContent;
- iPrevGotoContent = NULL;
- iPrevGotoContent = item.AllocL();
- iEditor->DrawNow();
- //change the CBA depending on whether the highlight is
- //on url or domain
- CBrowserAppUi::Static()->UpdateCbaL();
- }
}
}
@@ -392,12 +322,84 @@
}
}
break;
+ case MEikListBoxObserver::EEventItemClicked:
+ HandleItemClickedL( aListBox );
+ break;
default:
break;
}
}
}
+void CBrowserAdaptiveListPopup::HandleItemClickedL( CEikListBox* aListBox )
+ {
+ //the first time
+ if ( !iList->HighLightEnabled() )
+ {
+ iList->SetHighLight( ETrue );
+
+ //save the original content
+ if ( !iFirstGotoContent )
+ {
+ delete iFirstGotoContent;
+ iFirstGotoContent = NULL;
+ }
+ iFirstGotoContent = iEditor->GetTextInHBufL();
+ if ( !iFirstGotoContent )
+ {
+ iFirstGotoContent = KNullDesC().AllocL();
+ }
+ }
+ TInt index = aListBox->CurrentItemIndex();
+ index = iItems->Count() - index - 1;
+ TPtrC16 item((*iItems)[ index ] );
+ TPtrC rightSide;
+
+ //cut the slash from the end if needed
+ //permanent sollution until AHLE does not
+ //solve this problem related to ID: TMCN-5TTRXV error
+ if ( item[item.Length() - 1] != KSlash )
+ {
+ rightSide.Set( item.Left( item.Length() ) );
+ }
+ else
+ {
+ rightSide.Set( item.Left( item.Length() - 1 ) );
+ }
+
+ //if true then append the suffix(rightSide), to the
+ //user-typed data
+ //else just use the recent URLs text(rightSide) only
+ if ( iUrlCompletionMode )
+ {
+ HBufC* currentCompletion = HBufC::NewLC(
+ iFirstGotoContent->Des().Length() + rightSide.Length() + 1 );
+ TPtr currentCompletionPtr = currentCompletion->Des();
+
+ currentCompletionPtr.Copy( iFirstGotoContent->Des() );
+ currentCompletionPtr.Append( rightSide );
+ currentCompletionPtr.ZeroTerminate();
+ iEditor->SetTextL( currentCompletion );
+ iEditor->SetCursorPosL( currentCompletionPtr.Length(), EFalse );
+ CleanupStack::PopAndDestroy( currentCompletion );
+ }
+ else
+ {
+ iEditor->SetTextL( &rightSide );
+ iEditor->SetCursorPosL( rightSide.Length(), EFalse );
+ }
+ iEditor->HandleTextChangedL();
+
+ delete iPrevGotoContent;
+ iPrevGotoContent = NULL;
+ iPrevGotoContent = item.AllocL();
+ iEditor->DrawNow();
+ //change the CBA depending on whether the highlight is
+ //on url or domain
+ CBrowserAppUi::Static()->UpdateCbaL();
+ }
+
+
//------------------------------------------------------------------
// CBrowserAdaptiveListPopup::ShowSingleItemPopupListWithGraphicsL(TBool aShowTitle)
// shows "List pane for single item with graphic"
@@ -521,14 +523,9 @@
windowLineLayoutMainTmp = windowLineLayoutMain;
layoutMainRect.LayoutRect( rect, windowLineLayoutMainTmp );
- if ( iParentType == EBookmarksGotoPane )
- {
- windowLineLayoutLW = AppLayout::popup_wml_address_window( 1, itemstoshow );
- }
- else
- {
- windowLineLayoutLW = AppLayout::popup_wml_address_window( 1, itemstoshow );
- }
+
+ windowLineLayoutLW = AppLayout::popup_wml_address_window( 1, itemstoshow );
+
windowLineLayoutLWTmp = windowLineLayoutLW;
layoutLWRect.LayoutRect( layoutMainRect.Rect(), windowLineLayoutLWTmp );
windowLineLayoutSLW = AknLayoutScalable_Apps::listscroll_popup_wml_pane();
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -11,9 +11,9 @@
*
* Contributors:
*
-* Description:
+* Description:
* Implementation of CBrowserBookmarksContainer.
-*
+*
*
*/
@@ -60,14 +60,14 @@
CBrowserBookmarksContainer* CBrowserBookmarksContainer::NewL(
const TRect& aRect,
CBrowserFavouritesView& aView)
- {
- CBrowserBookmarksContainer* container =
+ {
+ CBrowserBookmarksContainer* container =
new (ELeave) CBrowserBookmarksContainer;
- CleanupStack::PushL( container );
- container->ConstructL( aRect, aView );
+ CleanupStack::PushL( container );
+ container->ConstructL( aRect, aView );
CleanupStack::Pop(); // container
- return container;
- }
+ return container;
+ }
// ---------------------------------------------------------
// CBrowserBookmarksContainer::~CBrowserBookmarksContainer
@@ -85,35 +85,35 @@
// ---------------------------------------------------------
//
void CBrowserBookmarksContainer::SetGotoActiveL()
- {
+ {
if( !iGotoPaneActive)
- {
- iGotoPaneActive = ETrue;
+ {
+ iGotoPaneActive = ETrue;
- Listbox()->UpdateFilterL();
- if( iSearchPane )
- {
- iGotoPane->SetVKBFlag( EFalse );
- // Check for Search Configuration Changes //
- if( View().ApiProvider().Preferences().GetIntValue( KBrowserSearchIconId )
- != iSearchIconId )
- {
- ConstructSearchPaneL();
+ Listbox()->UpdateFilterL();
+ if( iSearchPane )
+ {
+ iGotoPane->SetVKBFlag( EFalse );
+ // Check for Search Configuration Changes //
+ if( View().ApiProvider().Preferences().GetIntValue( KBrowserSearchIconId )
+ != iSearchIconId )
+ {
+ ConstructSearchPaneL();
}
-
+
iSearchPane->SetFocus( EFalse );
- // only one editor can be active at a time //
- iSearchPaneActive = EFalse;
- // we still need to display search, when showing for first time //
- iSearchPane->MakeVisible(ETrue);
+ // only one editor can be active at a time //
+ iSearchPaneActive = EFalse;
+ // we still need to display search, when showing for first time //
+ iSearchPane->MakeVisible(ETrue);
iSearchPane->CancelEditingL();
- }
-
- // redraw
- SizeChanged();
-
+ }
+
+ // redraw
+ SizeChanged();
+
// It is important to set the Text and Italic property after SizeChanged, because
- // iInputFrame->SetRect() event on GoTo/Search Pane calls the scalable version
+ // iInputFrame->SetRect() event on GoTo/Search Pane calls the scalable version
// ( AknLayoutUtils::LayoutEdwinScalable ) which overwrites all the properties for
// Char and Para Formats.
if( iSearchPane )
@@ -127,41 +127,41 @@
}
CleanupStack::PopAndDestroy( text );
}
-
+
iGotoPane->BeginEditingL();
- DrawDeferred();
- }
+ DrawDeferred();
+ }
}
-
+
// ---------------------------------------------------------
// CBrowserBookmarksContainer::SetSearchActiveL
// ---------------------------------------------------------
//
void CBrowserBookmarksContainer::SetSearchActiveL()
- {
+ {
if( ! iSearchPaneActive )
{
// Check for Search Configuration Changes //
- if( View().ApiProvider().Preferences().GetIntValue( KBrowserSearchIconId )
+ if( View().ApiProvider().Preferences().GetIntValue( KBrowserSearchIconId )
!= iSearchIconId )
{
ConstructSearchPaneL();
}
-
+
iSearchPane->SetVKBFlag( EFalse );
iSearchPane->SetFocus( ETrue );
iSearchPaneActive = ETrue;
-
+
Listbox()->UpdateFilterL();
// only one editor can be active at a time
iGotoPaneActive = EFalse;
iGotoPane->MakeVisible(ETrue);
- iGotoPane->SetFocus( EFalse );
+ iGotoPane->SetFocus( EFalse );
iGotoPane->CancelEditingL();
-
+
// redraw
SizeChanged();
-
+
// Not Focused, so set the current Text Mode to italics.
iGotoPane->SetTextModeItalicL();
// if gotopane is empty add default text
@@ -172,11 +172,11 @@
iGotoPane->SetTextL( KWWWString );
}
CleanupStack::PopAndDestroy( text );
-
+
iSearchPane->BeginEditingL();
DrawDeferred();
}
-
+
}
@@ -186,36 +186,36 @@
//
void CBrowserBookmarksContainer::SetGotoInactiveL()
- {
- if( iGotoPaneActive || iSearchPaneActive )
- {
-
- if( iSearchPane )
+ {
+ if( iGotoPaneActive || iSearchPaneActive )
+ {
+
+ if( iSearchPane )
{
- /* In Search Feature we have to move between the editors preserving the
+ /* In Search Feature we have to move between the editors preserving the
* text added, clear the text when cancel is pressed.
*/
iGotoPane->SetTextL( KNullDesC , ETrue );
SetSearchInactiveL();
}
- // Deactivate GoTo Pane
- iGotoPaneActive = EFalse;
-
- // Deactivate GoTo Pane
- iGotoPane->MakeVisible( EFalse );
- iGotoPane->CancelEditingL();
- iGotoPane->SetFocus( EFalse );
-
- // redraw
- Listbox()->UpdateFilterL();
- SizeChanged();
- DrawDeferred();
- }
- }
-
+ // Deactivate GoTo Pane
+ iGotoPaneActive = EFalse;
+
+ // Deactivate GoTo Pane
+ iGotoPane->MakeVisible( EFalse );
+ iGotoPane->CancelEditingL();
+ iGotoPane->SetFocus( EFalse );
+
+ // redraw
+ Listbox()->UpdateFilterL();
+ SizeChanged();
+ DrawDeferred();
+ }
+ }
+
void CBrowserBookmarksContainer::SetSearchInactiveL()
{
- iSearchPaneActive = EFalse;
+ iSearchPaneActive = EFalse;
iSearchPane->SetTextL( KNullDesC , ETrue);
iSearchPane->MakeVisible( EFalse );
iSearchPane->CancelEditingL();
@@ -267,60 +267,60 @@
{
TRect rect = Rect();
TInt unfilteredNumberOfItems = Listbox()->UnfilteredNumberOfItems();
-
+
// if goto pane is active
if( iGotoPaneActive || iSearchPaneActive )
- {
- if( iSearchPane )
- {
- TAknWindowLineLayout findPane = AknLayout::find_pane();
-
- // Enable / disable line in Goto Pane (hide if listbox is empty).
- iGotoPane->SetLineState( unfilteredNumberOfItems > 0 );
-
- TAknWindowLineLayout listLayout = AknLayout::list_gen_pane( 1 );
-
- TRect listBoxRect = AknLayoutUtils::RectFromCoords( rect,listLayout.il,
- listLayout.it, listLayout.ir, listLayout.ib, listLayout.iW, listLayout.iH);
-
- /* Now we need to make room for both Goto and Search Pane.
- * No layout specification was suitable for this case, so
- * substracting the height of pane.
- */
- listBoxRect.iBr.iY -= findPane.iH;
-
- // In Goto Mode, the listbox is laid out leaving space for Goto Pane.
- Listbox()->SetRect( listBoxRect );
-
-
- // Now Lay out Search Pane as if it was the old Find Pane.
+ {
+ if( iSearchPane )
+ {
+ TAknWindowLineLayout findPane = AknLayout::find_pane();
+
+ // Enable / disable line in Goto Pane (hide if listbox is empty).
+ iGotoPane->SetLineState( unfilteredNumberOfItems > 0 );
+
+ TAknWindowLineLayout listLayout = AknLayout::list_gen_pane( 1 );
+
+ TRect listBoxRect = AknLayoutUtils::RectFromCoords( rect,listLayout.il,
+ listLayout.it, listLayout.ir, listLayout.ib, listLayout.iW, listLayout.iH);
+
+ /* Now we need to make room for both Goto and Search Pane.
+ * No layout specification was suitable for this case, so
+ * substracting the height of pane.
+ */
+ listBoxRect.iBr.iY -= findPane.iH;
+
+ // In Goto Mode, the listbox is laid out leaving space for Goto Pane.
+ Listbox()->SetRect( listBoxRect );
+
+
+ // Now Lay out Search Pane as if it was the old Find Pane.
AknLayoutUtils::LayoutControl( iSearchPane, rect, findPane );
-
- TRect gotoRect = AknLayoutUtils::RectFromCoords( rect,findPane.il, findPane.it,
- findPane.ir, findPane.ib, findPane.iW, findPane.iH);
-
- // Calculate the new position for GoToPane.
- gotoRect.iTl.iY -= ( findPane.iH );
- gotoRect.iBr.iY -= ( findPane.iH );
- iGotoPane->SetRect( gotoRect );
-
- }
- else
- {
- // Enable / disable line in Goto Pane (hide if listbox is empty).
+
+ TRect gotoRect = AknLayoutUtils::RectFromCoords( rect,findPane.il, findPane.it,
+ findPane.ir, findPane.ib, findPane.iW, findPane.iH);
+
+ // Calculate the new position for GoToPane.
+ gotoRect.iTl.iY -= ( findPane.iH );
+ gotoRect.iBr.iY -= ( findPane.iH );
+ iGotoPane->SetRect( gotoRect );
+
+ }
+ else
+ {
+ // Enable / disable line in Goto Pane (hide if listbox is empty).
iGotoPane->SetLineState( unfilteredNumberOfItems > 0 );
-
+
// In Goto Mode, the listbox is laid out leaving space for Goto Pane.
AknLayoutUtils::LayoutControl( Listbox(), rect, AknLayout::list_gen_pane( 1 ));
-
+
// Lay out Goto Pane as if it was the old Find Pane.
AknLayoutUtils::LayoutControl( iGotoPane, rect, AknLayout::find_pane() );
- }
- }
- else
- {
- // Fall back upon default behavior in base-class, which lays out the bookmarks list only
- CBrowserFavouritesContainer::SizeChanged();
+ }
+ }
+ else
+ {
+ // Fall back upon default behavior in base-class, which lays out the bookmarks list only
+ CBrowserFavouritesContainer::SizeChanged();
}
}
@@ -330,7 +330,7 @@
//
TKeyResponse CBrowserBookmarksContainer::OfferKeyEventL
( const TKeyEvent& aKeyEvent, TEventCode aType )
- {
+ {
/*
LOG_ENTERFN( "BookmarksContainer::OfferKeyEventL" );
BROWSER_LOG( ( _L("aType: %d, aKeyEvent.iCode: %d, iScanCode: %d, iRepeats: %d"),
@@ -338,177 +338,209 @@
*/
TKeyResponse result = EKeyWasNotConsumed;
TKeyEvent keyEvent( aKeyEvent );
-
- // Selection Key handling
- if( keyEvent.iScanCode == EStdKeyDevice3 )
- {
+
+ // Selection Key handling
+ if( keyEvent.iScanCode == EStdKeyDevice3 )
+ {
// it is possible to activate BookmarksView from ContentView
// via a long press of Selection key, so here we must capture
- // the KeyDown. Long press processing will be done only if key
+ // the KeyDown. Long press processing will be done only if key
// was pressed originally in this view.
- if( aType == EEventKeyDown )
- {
+ if( aType == EEventKeyDown )
+ {
iSelectionKeyDownPressed = ETrue;
- result = EKeyWasConsumed;
- }
+ result = EKeyWasConsumed;
+ }
else if( aType == EEventKeyUp )
- {
- if( !iSelectionKeyLongPress && iSelectionKeyDownPressed )
- {
- // short press of Selection key, pass it to GotoPane
+ {
+ if( !iSelectionKeyLongPress && iSelectionKeyDownPressed )
+ {
+ // short press of Selection key, pass it to GotoPane
keyEvent.iCode = EKeyOK;
result = EKeyWasNotConsumed;
- }
- else
- {
- // long press of Selection key was already processed
+ }
+ else
+ {
+ // long press of Selection key was already processed
result = EKeyWasConsumed;
}
- iSelectionKeyDownPressed = EFalse;
- iSelectionKeyLongPress = EFalse;
- }
- else if( aType == EEventKey )
- {
- if( keyEvent.iRepeats && iSelectionKeyDownPressed )
- {
+ iSelectionKeyDownPressed = EFalse;
+ iSelectionKeyLongPress = EFalse;
+ }
+ else if( aType == EEventKey )
+ {
+ if( keyEvent.iRepeats && iSelectionKeyDownPressed )
+ {
const CFavouritesItem* item = Listbox()->CurrentItem();
if ( item )
{
- // The option for the user to download the page in new window is disabled
+ // The option for the user to download the page in new window is disabled
CBrowserAppUi::Static()->FetchBookmarkL( *item );
- }
- iSelectionKeyLongPress = ETrue;
- iSelectionKeyDownPressed = EFalse;
- }
-
+ }
+ iSelectionKeyLongPress = ETrue;
+ iSelectionKeyDownPressed = EFalse;
+ }
+
if ( (aKeyEvent.iScanCode == EStdKeyHash) ||
( aKeyEvent.iModifiers &
( EModifierShift | EModifierLeftShift | EModifierRightShift |
EModifierCtrl | EModifierLeftCtrl | EModifierRightCtrl ) ) )
{
-
+
// Hash key press will be used for Mark/UnMark functionality
// Let Platform Listbox handle this.
result = EKeyWasNotConsumed;
}
else
- {
- result = EKeyWasConsumed;
- }
- }
- }
- // If the Goto Pane exists and we're not fetching, then decide
- // if we should pass keystroke to it
- if(iGotoPane && !CBrowserAppUi::Static()->Fetching())
- {
- // If the key so far hadn't been consumed or if the pane is already active,
- // pass the keystroke on
- if( (result == EKeyWasNotConsumed) || iGotoPaneActive || iSearchPaneActive )
- {
- // Goto pane has highest priority; if it's active, arrow keys go there.
- // If fetching is in progress, no key events are offered, to prevent it
- // from getting the focus and popping up a new CBA.
-
- // Enter Key now handled through HandleCommand in BrowserBookmarksView like MSK
- // This change affects the enter key on the QWERTY keyboard when we run emulator
- if(EStdKeyEnter == aKeyEvent.iScanCode && EEventKeyUp == aType && AknLayoutUtils::MSKEnabled() && (iGotoPaneActive || iSearchPaneActive ))
- {
- CEikButtonGroupContainer* myCba = CEikButtonGroupContainer::Current();
- if(myCba != NULL)
- {
- TInt cmdId = myCba->ButtonGroup()->CommandId(CEikButtonGroupContainer::EMiddleSoftkeyPosition);
- View().HandleCommandL(cmdId);
- result = EKeyWasConsumed;
- }
- }
- else
- {
- if( iSearchPane )
- {
- // Process separately for Search Feature //
- if( iGotoPaneActive )
+ {
+ result = EKeyWasConsumed;
+ }
+ }
+ }
+
+ // If the Goto Pane exists and we're not fetching, decide
+ // if we should pass key event to the goto pane
+ if ( iGotoPane && !CBrowserAppUi::Static()->Fetching() )
+ {
+ // If the key hadn't been consumed, so far, determine if the keystroke
+ // should be handled by goto pane
+ if ( ( result == EKeyWasNotConsumed ) || iSearchPaneActive )
+ {
+ // Goto pane has highest priority; if it's active, arrow keys go there.
+ // If fetching is in progress, no key events are offered, to prevent it
+ // from getting the focus and popping up a new CBA.
+
+ // Enter Key now handled through HandleCommand in BrowserBookmarksView like MSK
+ // This change affects the enter key on the QWERTY keyboard when we run emulator
+ if ( EStdKeyEnter == aKeyEvent.iScanCode && EEventKeyUp == aType &&
+ AknLayoutUtils::MSKEnabled() &&
+ ( iGotoPaneActive || iSearchPaneActive ) )
+ {
+ // Handle MSK press
+ CEikButtonGroupContainer* myCba = CEikButtonGroupContainer::Current();
+ if ( myCba != NULL )
+ {
+ TInt cmdId = myCba->ButtonGroup()->CommandId(CEikButtonGroupContainer::EMiddleSoftkeyPosition);
+ View().HandleCommandL(cmdId);
+ result = EKeyWasConsumed;
+ }
+ }
+ else
+ {
+ if ( iSearchPane )
+ {
+ // Process separately for Search Feature
+ if ( iGotoPaneActive )
{
result = iGotoPane->OfferKeyEventL( keyEvent, aType );
}
- else
+ else
{
result = iSearchPane->OfferKeyEventL( keyEvent, aType );
}
- }
- else
- result = iGotoPane->OfferKeyEventL( keyEvent, aType );
- }
-
- if( iSearchPane )
- {
- if( ( iGotoPaneActive || iSearchPaneActive) && result == EKeyWasNotConsumed )
+ }
+ else
{
-
- if( aKeyEvent.iCode == EKeyUpArrow )
+ if ( iGotoPaneActive )
+ {
+ // Once activated let goto pane handle all the keys
+ result = iGotoPane->OfferKeyEventL( keyEvent, aType );
+ }
+ else // if ( !iGotoPaneActive )
+ {
+ // Only a valid digit or character should popup the goto pane.
+ // We will ignore h/w key events, i.e. camera cover, camera
+ // shutter, zoom, etc... iCode is only valid for EEventKey,
+ // not EEventKeyDown, so we have to use iScanCode. because
+ // the goto pane decides to popup on EEventKeyDown. Use
+ // upper case of iScanCode since there is no overlap of
+ // h/w scan codes and uppercase letters.
+ TChar inputCharCode( aKeyEvent.iScanCode );
+ TBool isDigit = inputCharCode.IsDigit();
+ TUint upperCase = inputCharCode.GetUpperCase();
+ if ( isDigit ||
+ (( upperCase >= 0x41 /*A*/ ) && ( upperCase <= 0x5A /*Z*/ )) )
+ {
+ // Valid digit or character was entered, let goto pane
+ // determine if it handles the keys from here on.
+ result = iGotoPane->OfferKeyEventL( aKeyEvent, aType );
+ if ( result == EKeyWasConsumed )
+ {
+ // goto pane is not active, make it active now
+ SetGotoActiveL();
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if ( iSearchPane )
+ {
+ if ( ( iGotoPaneActive || iSearchPaneActive) &&
+ result == EKeyWasNotConsumed )
+ {
+
+ if ( aKeyEvent.iCode == EKeyUpArrow )
{
result = EKeyWasConsumed;
- if( iSearchPaneActive )
+ if ( iSearchPaneActive )
{
SetGotoActiveL();
iGotoPane->SetVKBFlag( ETrue );
}
}
- if( aKeyEvent.iCode == EKeyDownArrow )
+
+ if ( aKeyEvent.iCode == EKeyDownArrow )
{
result = EKeyWasConsumed;
- if( iGotoPaneActive )
+ if ( iGotoPaneActive )
{
SetSearchActiveL();
iSearchPane->SetVKBFlag( ETrue );
}
}
}
- }
-
- // if key is consumed, goto pane was not active, make it active now.
- if(result == EKeyWasConsumed && (!iGotoPaneActive && !iSearchPaneActive))
- {
- SetGotoActiveL();
- }
- }
- }
- // For handling Enter key in emulator / Keyboard ( Enter key should behave similar to MSK )
- if(EStdKeyEnter == keyEvent.iScanCode && EEventKey == aType && AknLayoutUtils::MSKEnabled() && result == EKeyWasNotConsumed )
- {
- CEikButtonGroupContainer* myCba = CEikButtonGroupContainer::Current();
- if(myCba != NULL)
- {
- TInt cmdId = myCba->ButtonGroup()->CommandId(CEikButtonGroupContainer::EMiddleSoftkeyPosition);
- if(EAknSoftkeyContextOptions == cmdId)
- {
- View().MenuBar()->TryDisplayContextMenuBarL();
- result = EKeyWasConsumed;
- }
- else if(Listbox()->Model()->ItemTextArray()->MdcaCount() == 0)
- {
- View().HandleCommandL(cmdId);
- result = EKeyWasConsumed;
- }
- }
- }
+ }
+ }
+
+ // For handling Enter key in emulator / Keyboard ( Enter key should behave similar to MSK )
+ if ( EStdKeyEnter == keyEvent.iScanCode && EEventKey == aType &&
+ AknLayoutUtils::MSKEnabled() && result == EKeyWasNotConsumed )
+ {
+ CEikButtonGroupContainer* myCba = CEikButtonGroupContainer::Current();
+ if(myCba != NULL)
+ {
+ TInt cmdId = myCba->ButtonGroup()->CommandId(CEikButtonGroupContainer::EMiddleSoftkeyPosition);
+ if(EAknSoftkeyContextOptions == cmdId)
+ {
+ View().MenuBar()->TryDisplayContextMenuBarL();
+ result = EKeyWasConsumed;
+ }
+ else if(Listbox()->Model()->ItemTextArray()->MdcaCount() == 0)
+ {
+ View().HandleCommandL(cmdId);
+ result = EKeyWasConsumed;
+ }
+ }
+ }
if ( result == EKeyWasNotConsumed )
{
// Otherwise, base class handles Find pane, arrows between folders and
// the listbox.
- result = CBrowserFavouritesContainer::OfferKeyEventL
- ( keyEvent, aType );
+ result = CBrowserFavouritesContainer::OfferKeyEventL( keyEvent, aType );
}
return result;
- }
+ }
// ---------------------------------------------------------
// CBrowserBookmarksContainer::HandleCursorChangedL
// ---------------------------------------------------------
//
void CBrowserBookmarksContainer::HandleCursorChangedL
-( CEikListBox*
+( CEikListBox*
#ifdef _DEBUG
aListBox // used only for debugging purposes
#endif
@@ -537,7 +569,7 @@
}
}
iGotoPane->SetTextL( url, ETrue );
- iGotoPane->SetFocus ( EFalse );
+ iGotoPane->SetFocus ( EFalse );
}
}
@@ -598,7 +630,8 @@
// ---------------------------------------------------------
//
CBrowserBookmarksContainer::CBrowserBookmarksContainer()
-: iGotoPaneActive( EFalse ),iSearchPaneActive(EFalse)
+ : iGotoPaneActive( EFalse ),
+ iSearchPaneActive(EFalse)
{
}
@@ -615,13 +648,13 @@
// Construct Goto Pane.
-
+
//pass view to bookmarks goto pane
iGotoPane = CBrowserBookmarksGotoPane::NewL( *this, &aView, KAvkonBitmapFile,
EMbmAvkonQgn_indi_find_goto,
EMbmAvkonQgn_indi_find_goto_mask);
iGotoPane->SetFocus( EFalse );
-
+
if( View().ApiProvider().Preferences().SearchFeature() )
{
ConstructSearchPaneL();
@@ -648,7 +681,7 @@
void CBrowserBookmarksContainer::GetHelpContext( TCoeHelpContext& aContext ) const
{
aContext.iMajor = KUidBrowserApplication;
- aContext.iContext = KOSS_HLP_BM_MAIN;
+ aContext.iContext = KOSS_HLP_BM_MAIN;
}
#endif // __SERIES60_HELP
@@ -677,15 +710,15 @@
// ----------------------------------------------------------------------------
//
void CBrowserBookmarksContainer::HandlePointerEventL(const TPointerEvent& aPointerEvent)
- {
+ {
if (AknLayoutUtils::PenEnabled())
{
- // if goto is active, if a pointer event falls within its rect,
- // pass all pointer events to it (such as, to bring up the editor's letter-entry)
- //
- // otherwise, if it falls within the listbox's rect
- //
-
+ // if goto is active, if a pointer event falls within its rect,
+ // pass all pointer events to it (such as, to bring up the editor's letter-entry)
+ //
+ // otherwise, if it falls within the listbox's rect
+ //
+
// Now we have two different panes so we have to check explicitly before passing controls
// to any panes.
if( iGotoPane && ( iGotoPaneActive || iSearchPaneActive) )
@@ -700,9 +733,9 @@
}
else
{
- SetGotoActiveL();
+ SetGotoActiveL();
}
- iGotoPane->SetVKBFlag( ETrue );
+ iGotoPane->SetVKBFlag( ETrue );
}
else if( iSearchPane->Rect().Contains( aPointerEvent.iPosition) )
{
@@ -712,9 +745,9 @@
}
else
{
- SetSearchActiveL();
+ SetSearchActiveL();
}
- iSearchPane->SetVKBFlag( ETrue );
+ iSearchPane->SetVKBFlag( ETrue );
}
else
{
@@ -728,10 +761,10 @@
}
}
else
- {
- // normally, pass all pointer events down to the listbox
- Listbox()->HandlePointerEventL(aPointerEvent);
- }
+ {
+ // normally, pass all pointer events down to the listbox
+ Listbox()->HandlePointerEventL(aPointerEvent);
+ }
}
}
@@ -744,29 +777,29 @@
{
TFileName iconFile;
MPreferences& preferences = View().ApiProvider().Preferences();
-
+
TInt iconId = preferences.GetIntValue( KBrowserSearchIconId );
// Get the Search Icon File Path.
preferences.GetStringValueL( KBrowserSearchIconPath, KMaxFileName, iconFile );
-
+
// If Icon File Path Changed or Icon Id Changed, Refresh the Icon for Search Pane.
- // Comparing Icon File path as well, because it may be possible that two different
+ // Comparing Icon File path as well, because it may be possible that two different
// Icon files have same icon id.
- if( iconId != iSearchIconId
+ if( iconId != iSearchIconId
|| iSearchIconFilePath.Compare( iconFile ) != 0 )
{
-
+
TInt iconMaskId = preferences.GetIntValue( KBrowserSearchIconMaskId );
- // Save IconId
+ // Save IconId
iSearchIconId = iconId;
// Save Icon File
iSearchIconFilePath = iconFile;
-
- // No Icon file or IconId or IconMaskId set , then it means no search provider is still
+
+ // No Icon file or IconId or IconMaskId set , then it means no search provider is still
// selected and set by search application, in that case we use the default icon for Search.
- if( ! iconFile.Length()
+ if( ! iconFile.Length()
|| iconId == -1
|| iconMaskId == -1 )
{
@@ -774,26 +807,26 @@
iconMaskId = EMbmAvkonQgn_indi_find_glass_mask;
iconFile = KAvkonBitmapFile;
}
-
+
if( iSearchPane )
{
delete iSearchPane;
iSearchPane = NULL;
}
-
-
+
+
// iSearchPane != NULL, implies presence of search feature, hence it can be
// used to validate search feature avoiding repetative calls to utils and
// avoiding need of separate variable.
- iSearchPane = CBrowserBookmarksGotoPane::NewL( *this,
- &(View()),
- iconFile,
+ iSearchPane = CBrowserBookmarksGotoPane::NewL( *this,
+ &(View()),
+ iconFile,
iconId,
iconMaskId,
GOTOPANE_POPUPLIST_DISABLE,
ETrue
);
-
+
CBrowserBookmarksView* bookmarkView = REINTERPRET_CAST( CBrowserBookmarksView* , &( View() ));
// Set Pane observer
iSearchPane->SetGPObserver( bookmarkView );
@@ -810,7 +843,7 @@
if( aType == KEikDynamicLayoutVariantSwitch)
{
// If search feature exsist
- if( iSearchPane )
+ if( iSearchPane )
{
if( iSearchPaneActive )
{
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksGotoPane.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -19,6 +19,7 @@
// INCLUDE FILES
+#include <Browser_Platform_Variant.hrh>
#include <akninfrm.h>
#include <eikedwin.h>
@@ -360,10 +361,9 @@
if ( iEditing && response != EKeyWasConsumed)
{
-
- switch ( aKeyEvent.iCode ) // Already editing; most keys simply forwarded to the editor.
+ // Editing; most keys simply forwarded to the editor.
+ switch ( aKeyEvent.iCode )
{
-
case EKeyOK:
{
response = EKeyWasConsumed; // MSK is now handled through HandleCommand in BrowserBookmarksView
@@ -383,7 +383,8 @@
break;
}
- case EKeyEnter: // Handle EnterKey as "GOTO" for Touch, VKB's enter key
+ case EKeyEnter:
+ // Handle EnterKey as "GOTO" for Touch, VKB's enter key
if ( AknLayoutUtils::PenEnabled() )
{
CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneGoTo);
@@ -393,7 +394,9 @@
response = EKeyWasConsumed;
}
break;
- } // Else *FALL THROUGH* to default in case Pen is not enabled.
+ }
+
+ // Else *FALL THROUGH* to default in case Pen is not enabled.
default:
{
response = iEditor->OfferKeyEventL(aKeyEvent, aType );
@@ -411,9 +414,9 @@
response = EKeyWasConsumed;
}
}
- else if ( response != EKeyWasConsumed ) // Key consumed yet? If not, process onwards...
+ else if ( response != EKeyWasConsumed )
{
-
+ // Key consumed yet? If not, process onwards...
if ( (aKeyEvent.iScanCode == EStdKeyHash) ||
( aKeyEvent.iModifiers &
( EModifierShift | EModifierLeftShift | EModifierRightShift |
@@ -427,7 +430,8 @@
//
// Not currently editing the GoTo pane.
- // Catch alpha and numeric to pop up the GoTo pane
+ // Catch alpha and numeric to pop
+ // up goto pane
//
// Only popup the GoTo Pane with a KeyDown event.
// Otherwise, if browser is pushed to the backround (but still active)
@@ -447,27 +451,33 @@
//
else if ( !iFrozen
&& aType == EEventKeyDown
- && iInputChar.IsAlphaDigit()
- && iInputChar != EStdKeyYes
- && iInputChar != EStdKeyNo
- && iInputChar != EKeyRightUpArrow // Northeast
+ && iInputChar.IsAlphaDigit() // We want alpha numeric keys to popup goto pane
+ && iInputChar != EStdKeyYes // Ignore Send (green key)
+ && iInputChar != EStdKeyNo // Ignore End (red key)
+ && iInputChar != EKeyRightUpArrow // Ignore Northeast
&& iInputChar != EStdKeyDevice11 // : Extra KeyEvent supports diagonal event simulator wedge
- && iInputChar != EKeyRightDownArrow // Southeast
+ && iInputChar != EKeyRightDownArrow // Ignore Southeast
&& iInputChar != EStdKeyDevice12 // : Extra KeyEvent supports diagonal event simulator wedge
- && iInputChar != EKeyLeftDownArrow // Southwest
+ && iInputChar != EKeyLeftDownArrow // Ignore Southwest
&& iInputChar != EStdKeyDevice13 // : Extra KeyEvent supports diagonal event simulator wedge
- && iInputChar != EKeyLeftUpArrow // Northwest
+ && iInputChar != EKeyLeftUpArrow // Ignore Northwest
&& iInputChar != EStdKeyDevice10 ) // : Extra KeyEvent supports diagonal event simulator wedge
- { // Most other alphanumeric keys activate the Goto Pane...
- response = EKeyWasConsumed; // We'll consume the key event so it ends here
+ {
+ // These keys activate the Goto Pane.
+ // We'll consume the key event so it ends here
+ response = EKeyWasConsumed;
+
BeginEditingL();
+
iEditor->SetCursorPosL( iEditor->TextLength(), EFalse );
iCoeEnv->SyncNotifyFocusObserversOfChangeInFocus();
iCoeEnv->SimulateKeyEventL( aKeyEvent, aType );
}
else
- { // Other keys do not activate the Goto Pane.
- response = EKeyWasNotConsumed; // Let someone else take the key event
+ {
+ // Other keys do not activate the Goto Pane.
+ // Let someone else take the key event
+ response = EKeyWasNotConsumed;
}
}
return response;
@@ -829,6 +839,7 @@
// ----------------------------------------------------------------------------
void CBrowserBookmarksGotoPane::SetVKBFlag( TBool aVKBFlag )
{
+#if defined(BRDO_SEARCH_INTEGRATION_FF)
if( aVKBFlag )
{
iEditor->RemoveFlagFromUserFlags( CEikEdwin::EAvkonDisableVKB );
@@ -837,5 +848,6 @@
{
iEditor->AddFlagToUserFlags( CEikEdwin::EAvkonDisableVKB );
}
+#endif
}
// End of File
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksListboxIconHandler.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksListboxIconHandler.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
-
+#include <Browser_Platform_Variant.hrh>
#include <ApListItem.h>
#include <ApListItemList.h>
#include <ApEngineConsts.h>
@@ -374,6 +374,7 @@
icons->AppendL( newIcon );
CleanupStack::Pop(newIcon);
+#if defined(BRDO_SEARCH_INTEGRATION_FF)
//Browser service
AknsUtils::CreateIconLC( skinInstance,
@@ -388,6 +389,7 @@
CleanupStack::PushL(newIcon);
icons->AppendL( newIcon );
CleanupStack::Pop(newIcon);
+#endif
CleanupStack::Pop(); // POP Icon
return icons;
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -493,6 +493,7 @@
case EWmlCmdGoToAddress: // MSK for Recent Url page
case EWmlCmdSwitchToGotoActive:
{
+ iSoftKeyUpdate = EFalse;
DimToolbarButtons(ETrue);
TheContainer()->SetGotoActiveL();
break;
@@ -654,7 +655,7 @@
iDomainFolderName = NULL;
CFavouritesItemList* items =
- GetItemsLC( KFavouritesAdaptiveItemsFolderUid );
+ GetItemsL( KFavouritesAdaptiveItemsFolderUid );
TInt indexToHighlight = 0;
for ( TInt i = 0; i < items->Count(); i++ )
@@ -665,7 +666,7 @@
}
}
- CleanupStack::PopAndDestroy(); // items
+ delete items;
CleanupStack::PopAndDestroy(); // domainFolderNameToHighlight
HBufC* title;
@@ -820,7 +821,7 @@
CBrowserBookmarksContainer* theContainer = TheContainer();
// if the container doesn't exist, leave gotoPanePtr at NULL
- if (theContainer)
+ if (theContainer && !iSoftKeyUpdate)
{
gotoPanePtr = theContainer->GotoPane();
}
@@ -1120,8 +1121,7 @@
if ( Model().BeginL( /*aWrite=*/ETrue, /*aDbErrorNote*/ EFalse ) ==
KErrNone )
{
- CFavouritesItemList* items = GetItemsLC( KFavouritesRootUid );
- CleanupStack::PopAndDestroy();
+ iBookmarkitems = GetItemsL( KFavouritesRootUid );
Model().CommitL();
}
@@ -1129,8 +1129,8 @@
//thread, its important to refresh when the thread notifies the fresh data.
//Call to GetItemsLC above, which inturn calls ManualBMSortL will set iRefresh to false
//Make it true so that latest FavIcon db info is shown
- iRefresh = ETrue;
-
+ //Removed the iRefresh becoming ETrue, move to RefreshL
+
if (iPenEnabled)
{
Toolbar()->SetToolbarObserver(this);
@@ -1458,7 +1458,7 @@
case R_BROWSER_BOOKMARKS_MENU_PANE_OK:
{
// Bookmark-specific handling.
- if ( aState.IsEmpty() || (TheContainer()->Listbox()->UnfilteredNumberOfItems() < 2) )
+ if ( aState.IsEmpty() || (TheContainer()->Listbox()->UnfilteredNumberOfItems() < 2)||iInAdaptiveBookmarksFolder)
{
aMenuPane->SetItemDimmed( EWmlCmdMove, ETrue );
}
@@ -1466,6 +1466,12 @@
{
aMenuPane->SetItemDimmed( EWmlCmdMove, EFalse );
}
+
+ //Disable MoveToFolder option if you are in RecentlyVisitedUrl folder
+ if( iInAdaptiveBookmarksFolder )
+ {
+ aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
+ }
const CFavouritesItem* item = TheContainer()->Listbox()->CurrentItem();
if ( ( item ) &&
( ( item->Uid() == KFavouritesAdaptiveItemsFolderUid ) ||
@@ -1845,10 +1851,10 @@
}
// ----------------------------------------------------------------------------
-// CBrowserBookmarksView::GetItemsLC
+// CBrowserBookmarksView::GetItemsL
// ----------------------------------------------------------------------------
//
-CFavouritesItemList* CBrowserBookmarksView::GetItemsLC( TInt aFolder )
+CFavouritesItemList* CBrowserBookmarksView::GetItemsL( TInt aFolder )
{
PERFLOG_LOCAL_INIT
PERFLOG_STOPWATCH_START
@@ -1856,7 +1862,6 @@
if ( iInAdaptiveBookmarksFolder )
{
items= new (ELeave) CFavouritesItemList();
- CleanupStack::PushL(items);//1
CDesCArrayFlat* aditems = new ( ELeave )
CDesCArrayFlat( KBrowserDesCArrayGranularity );
aditems->Reset();
@@ -1888,7 +1893,6 @@
else
{
items = new (ELeave) CFavouritesItemList();
- CleanupStack::PushL( items );
Model().Database().GetAll( *items, aFolder );
TInt aBMPosition = KAdaptiveBookmarksFirstPositionInBMView; // Adaptive BM folder is first if there is no startpage
if ( aFolder == KFavouritesRootUid )
@@ -2002,6 +2006,10 @@
iInAdaptiveBookmarksFolder = ETrue;
}
+ if( iPreviousViewID == KUidBrowserBookmarksViewId )
+ {
+ iSoftKeyUpdate = ETrue;
+ }
CBrowserFavouritesView::DoActivateL
( aPrevViewId, aCustomMessageId, aCustomMessage );
ApiProvider().BrCtlInterface().AddLoadEventObserverL( this );
@@ -2050,7 +2058,7 @@
{
ExitAdaptiveBookmarks();
}
-
+ iSoftKeyUpdate = EFalse;
if ( !ApiProvider().ExitInProgress() )
{
ApiProvider().BrCtlInterface().RemoveLoadEventObserver( this );
--- a/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -240,7 +240,7 @@
iIsActivated( EFalse ),
iLastSelection( 0 ),
iUpdatePending( EFalse ),
- iRefresh( ETrue )
+ iRefresh( EFalse )
{
}
@@ -258,13 +258,12 @@
}
// ---------------------------------------------------------
-// CBrowserFavouritesView::GetItemsLC
+// CBrowserFavouritesView::GetItemsL
// ---------------------------------------------------------
//
-CFavouritesItemList* CBrowserFavouritesView::GetItemsLC( TInt aFolder )
+CFavouritesItemList* CBrowserFavouritesView::GetItemsL( TInt aFolder )
{
CFavouritesItemList* items = new (ELeave) CFavouritesItemList();
- CleanupStack::PushL( items );
iModel->Database().GetAll( *items, aFolder );
iModel->SortL( *items );
return items;
@@ -412,6 +411,8 @@
// not activated (and tries to refresh); but this "activated-check" is
// made here, not in Bookmarks View, because it makes things more safe and
// "future-proof".)
+ //Making iRefresh ETrue
+ iRefresh = ETrue;
if ( iIsActivated )
{
iUpdatePending = ETrue;
@@ -483,7 +484,6 @@
iLastSelection = 0;
}
iContainer->Listbox()->SetCurrentItemIndex( iLastSelection );
- UpdateGotoPaneL();
}
iContainer->Listbox()->View()->SetDisableRedraw( redrawDisabled );
@@ -772,7 +772,16 @@
if (count ==1)
{
- CFavouritesItemList* allItems = GetItemsLC( KFavouritesRootUid );
+ CFavouritesItemList* allItems=NULL;
+ if(iRefresh)
+ {
+ allItems = GetItemsL( KFavouritesRootUid );
+ CleanupStack::PushL(allItems);
+ }
+ else
+ {
+ allItems = iBookmarkitems;
+ }
item = items->At(0);
iPreferredHighlightUid = item->Uid();
TInt index = allItems->UidToIndex(iPreferredHighlightUid);
@@ -1167,8 +1176,16 @@
listbox->View()->SetDisableRedraw( ETrue );
// Change the data.
- CFavouritesItemList* items = GetItemsLC( aFolder );
-
+ CFavouritesItemList* items = NULL;
+ if (iRefresh)
+ {
+ items = GetItemsL( aFolder );
+ CleanupStack::PushL(items);
+ }
+ else
+ {
+ items = iBookmarkitems;
+ }
// Next take localized item names for seamless links.
TInt contextId;
TInt resId = 0;
@@ -1253,8 +1270,10 @@
// Set Search item to italics font
iContainer->Listbox()->ItalicizeRowItemL(0);
}
-
- CleanupStack::Pop(); // items: passing ownership to listbox.
+ if(iRefresh)
+ {
+ CleanupStack::Pop(); // items: passing ownership to listbox.
+ }
iContainer->Listbox()->SetDataL
( items, /*ApiProvider().CommsModel(),*/ aKeepState );
CAknColumnListBoxView *aknview = STATIC_CAST(CAknColumnListBoxView*, iContainer->Listbox()->View() );
--- a/browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -129,7 +129,21 @@
//
void CFeedsEditFeedDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
{
- CAknForm::HandlePointerEventL(aPointerEvent);
+ if ((iSelectedDlgLine != IdOfFocusControl()) && (aPointerEvent.iType == TPointerEvent::EButton1Up))
+ {
+ LineChangedL(IdOfFocusControl());
+ }
+ else
+ {
+ if ((iSelectedDlgLine == EFeedsEditAutomaticUpdatingId) && (aPointerEvent.iType == TPointerEvent::EButton1Up))
+ {
+ HandleFreqCmdL();
+ }
+ else
+ {
+ CAknForm::HandlePointerEventL(aPointerEvent);
+ }
+ }
}
// ---------------------------------------------------------
@@ -313,7 +327,6 @@
{
// make the 'Change' Button visible
cba.MakeCommandVisible(EAknSoftkeyChange, ETrue);
- HandleFreqCmdL();
}
else
{
@@ -575,7 +588,11 @@
break;
#endif //__SERIES60_HELP
-
+ case EWmlCmdAboutProduct:
+ {
+ iAppUi->HandleCommandL( aCommandId );
+ break;
+ }
default:
// Standard form commands.
CAknForm::ProcessCommandL(aCommandId);
--- a/browserui/browser/FeedsSrc/FeedsFeedView.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FeedsSrc/FeedsFeedView.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -194,10 +194,14 @@
// fix bug RFON-7FJS2Z: need to activate status pane going back from full story page to feeds view
StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_USUAL );
StatusPane()->MakeVisible( ETrue );
-
+ //Take Button group pointer
+ CEikButtonGroupContainer* pButtonGroupContainer = CEikButtonGroupContainer::Current();
if (!iContainerOnStack)
{
AppUi()->AddToViewStackL(*this, iContainer);
+ //Make button group invisible in order to let container have correct Rect.
+ //Patch is based on comments received from AVKON
+ if(pButtonGroupContainer) pButtonGroupContainer->MakeVisible(EFalse);
iContainer->SetRect(ClientRect());
if(iContainer->iBrowserControl->BrowserSettingL(TBrCtlDefs::ESettingsPageOverview))
{
@@ -208,6 +212,8 @@
(TInt)TBrCtlDefs::ECommandIdBase + (TInt)TBrCtlDefs::ECommandGainFocus));
iContainer->MakeVisible(ETrue);
+ //Again make Button group visible
+ if(pButtonGroupContainer) pButtonGroupContainer->MakeVisible(ETrue);
iContainerOnStack = ETrue;
// resize screen after calling SetRect. This way looks better
iContainer->HandleResourceChange(KEikDynamicLayoutVariantSwitch);
--- a/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -15,7 +15,6 @@
*
*/
-
#include <AknNavi.h>
#include <AknNaviDe.h>
#include <AknNaviLabel.h>
@@ -410,7 +409,6 @@
TBool isFeed = EFalse;
TBool feedInFocus = EFalse;
- __ASSERT_DEBUG( (iCurrentFolder != NULL), Util::Panic( Util::EUninitializedData ));
if (iMoveActive || !iCurrentFolder)
{
@@ -650,9 +648,9 @@
TPtrC title;
// Set the view's title.
- if (iCurrentFolder != iRootFolder)
+ if (iCurrentFolder != NULL && iCurrentFolder != iRootFolder)
{
- if (iCurrentFolder->GetStringValue(EFeedAttributeTitle,title) != KErrNotFound && title.Length() != 0)
+ if (iCurrentFolder->GetStringValue(EFolderAttributeTitle,title) != KErrNotFound && title.Length() != 0)
{
iApiProvider.Display().SetTitleL(title);
}
@@ -2224,3 +2222,4 @@
// it to top and draws.
naviPane->PushL(*iNaviDecorator);
}
+
--- a/browserui/browser/FeedsSrc/FeedsFolderView.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/FeedsSrc/FeedsFolderView.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -457,7 +457,7 @@
// Create Folder
iApiProvider.FeedsClientUtilities().AddItemL(*aMenuPane, EFeedsNewFolder, R_OPTIONS_ORG_NEW_FOLDER);
}
- else if(aResourceId == R_FEEDS_OPTIONS_MARKUNMARK_SUBMENU)
+ else if( (aResourceId == R_FEEDS_OPTIONS_MARKUNMARK_SUBMENU) || (aResourceId == R_FEEDS_FOLDER_VIEW_MARK_UNMARK_MENU ) )
{
// Mark (or unmark)
if(IsCurrentItemMarked())
@@ -482,7 +482,22 @@
{
- }
+ }
+ else if(aResourceId == R_FEEDS_FOLDER_MENU_PANE_CONTEXT_MENU)
+ {
+ aMenuPane->SetItemDimmed(EFeedsMoveToFolder,ETrue);
+
+ if (!(item->GetType() == EFolder))
+ {
+ TInt folderCount = 0;
+ iContainer->CountFolderFolders(iContainer->iRootFolder, folderCount);
+
+ if(iContainer && (folderCount> 0) && !iContainer->IsMarkedItemFolder())
+ {
+ aMenuPane->SetItemDimmed(EFeedsMoveToFolder,EFalse);
+ }
+ }
+ }
iApiProvider.FeedsClientUtilities().DynInitMenuPaneL(aResourceId, aMenuPane );
}
--- a/browserui/browser/Group/bld.inf Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/Group/bld.inf Thu Aug 27 07:42:55 2009 +0300
@@ -18,6 +18,7 @@
*/
#include <platform_paths.hrh>
+#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
PRJ_PLATFORMS
--- a/browserui/browser/Rom/Browser_stub.pkg Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/Rom/Browser_stub.pkg Thu Aug 27 07:42:55 2009 +0300
@@ -1,5 +1,5 @@
;
-; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+; Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
; All rights reserved.
; This component and the accompanying materials are made available
; under the terms of the License "Eclipse Public License v1.0"
@@ -9,10 +9,6 @@
; Initial Contributors:
; Nokia Corporation - initial contribution.
;
-; Contributors:
-;
-; Description:
-;
;Languages
&EN
--- a/browserui/browser/SettingsInc/BrowserUiPrivateCRKeys.h Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/SettingsInc/BrowserUiPrivateCRKeys.h Thu Aug 27 07:42:55 2009 +0300
@@ -65,15 +65,6 @@
// Valid values: URL string, up to 1000 characters
const TUint32 KBrowserNGHomepageURL = 0x00000030;
-// Integer type value to indicate what type of Home Page
-// should be launched when "Home" option is activated.
-// Valid values:
-// AccessPoint = 0,
-// User defined home page address = 1,
-// Current URL = 2,
-// Bookmarks = 3
-const TUint32 KBrowserNGHomepageType = 0x00000031;
-
//DEPRECATED/OBSOLETE: Determine if the platform toolbar should be visible next time Browser starts
const TUint32 KBrowserNGShowPlatformToolbar = 0x00000048;
--- a/browserui/browser/SettingsSrc/SettingsContainer.cpp Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/SettingsSrc/SettingsContainer.cpp Thu Aug 27 07:42:55 2009 +0300
@@ -252,18 +252,18 @@
if (!iPenEnabled)
{
- // Toolbar Category item
+ // Toolbar Category item
AddCategoryListBoxItemL( R_SETTINGS_CATEGORY_TOOLBAR, *itemArray );
iSettingIndex->AppendL( EWmlSettingsToolbar );
// Shortcut Keys Category item
if(!ApiProvider().Preferences().ShortcutKeysForQwerty())
- {
- AddCategoryListBoxItemL( R_SETTINGS_CATEGORY_SHORTCUTS, *itemArray );
- iSettingIndex->AppendL( EWmlSettingsShortcuts );
- }
+ {
+ AddCategoryListBoxItemL( R_SETTINGS_CATEGORY_SHORTCUTS, *itemArray );
+ iSettingIndex->AppendL( EWmlSettingsShortcuts );
+ }
}
-
+
RestoreListBoxIndexL();
@@ -379,29 +379,29 @@
AppendHomePageL( itemArray, itemText );
}
- // Minimap not supported on touch devices
+ // Minimap not supported on touch devices
if (!iPenEnabled)
- {
- //MiniMap feature is determined by the PageScaler dll, not by the preference setting.
- //We should query webkit for the feature.
- if(ApiProvider().WindowMgr().CurrentWindow()->IsPageOverviewSupportedL())
- {
- // Page Overview
- AppendPageOverviewL( itemArray, itemText );
- }
- }
-
-
- if( iApiProvider.Preferences().UiLocalFeatureSupported( KBrowserGraphicalHistory ))
- {
- // Back List
- AppendBackListL( itemArray, itemText );
- }
-
- if (!ApiProvider().IsEmbeddedModeOn())
- {
- AppendURLSuffixListL(itemArray, itemText);
- }
+ {
+ //MiniMap feature is determined by the PageScaler dll, not by the preference setting.
+ //We should query webkit for the feature.
+ if(ApiProvider().WindowMgr().CurrentWindow()->IsPageOverviewSupportedL())
+ {
+ // Page Overview
+ AppendPageOverviewL( itemArray, itemText );
+ }
+ }
+
+
+ if( iApiProvider.Preferences().UiLocalFeatureSupported( KBrowserGraphicalHistory ))
+ {
+ // Back List
+ AppendBackListL( itemArray, itemText );
+ }
+
+ if (!ApiProvider().IsEmbeddedModeOn())
+ {
+ AppendURLSuffixListL(itemArray, itemText);
+ }
// Http Security Warnings
if ( !ApiProvider().Preferences().HttpSecurityWarningsStatSupressed() )
{
@@ -411,19 +411,19 @@
// Ecma
AppendEcmaL( itemArray, itemText );
- // Script Logging
+ // Script Logging
AppendScriptLogL( itemArray, itemText );
// Downloads open settings
if( PROGRESSIVE_DOWNLOAD )
- {
- AppendDownloadsOpenL( itemArray, itemText );
- }
+ {
+ AppendDownloadsOpenL( itemArray, itemText );
+ }
if( ApiProvider().Preferences().SearchFeature() )
- {
- AppendSearchProviderL( itemArray, itemText );
- }
+ {
+ AppendSearchProviderL( itemArray, itemText );
+ }
RestoreListBoxIndexL();
iSettingListBox->DrawNow();
@@ -513,11 +513,11 @@
AppendAdaptiveBookmarksL( itemArray, itemText );
}
- if (iApiProvider.Preferences().UiLocalFeatureSupported(KBrowserAutoFormFill) )
- {
- // Form Data Saving
- AppendFormDataSavingL( itemArray, itemText );
- }
+ if (iApiProvider.Preferences().UiLocalFeatureSupported(KBrowserAutoFormFill) )
+ {
+ // Form Data Saving
+ AppendFormDataSavingL( itemArray, itemText );
+ }
// Cookies
AppendCookiesL( itemArray, itemText );
@@ -685,60 +685,69 @@
void CSettingsContainer::AppendDefaultAccessPointL( CDesCArray*& aItemArray,
TBuf<KWmlSettingsItemMaxLength>& aItemText )
{
- //get the connection identifier based on the connection type
+ //get the connection identifier based on the connection type
switch (ApiProvider().Preferences().AccessPointSelectionMode())
{
case EAlwaysAsk:
- {
- CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_DEFAULT_AP,
- R_WML_SETTINGS_ACCESS_POINT_ASK_WHEN_NEEDED,
- aItemText );
-
- break;
- }
-
+ {
+ #if !defined(BRDO_BROWSER_50_FF)
+ CreateItemFromTwoStringsL(
+ R_WMLBROWSER_SETTINGS_DEFAULT_AP,
+ R_WML_SETTINGS_ACCESS_POINT_ALWAYS_ASK,
+ aItemText );
+ #else
+ CreateItemFromTwoStringsL(
+ R_WMLBROWSER_SETTINGS_DEFAULT_AP,
+ R_WML_SETTINGS_ACCESS_POINT_ASK_WHEN_NEEDED,
+ aItemText );
+ #endif //BRDO_BROWSER_50_FF
+ break;
+ }
+
//get the destination identifyer based on the snap Id
case EDestination:
- {
- aItemText.Zero();
- aItemText.Append( KWmlSettingsListBoxItemPrefix );
- HBufC* defaultAp = iCoeEnv->AllocReadResourceLC(
- R_WMLBROWSER_SETTINGS_DEFAULT_AP );
- aItemText.Append( *defaultAp );
- CleanupStack::PopAndDestroy(); // defaultAp
- aItemText.Append( KWmlSettingsListBoxItemPostfix );
-
- RCmManager cmManager;
- cmManager.OpenL();
+ {
+ aItemText.Zero();
+ aItemText.Append( KWmlSettingsListBoxItemPrefix );
+ HBufC* defaultAp = iCoeEnv->AllocReadResourceLC(
+ R_WMLBROWSER_SETTINGS_DEFAULT_AP );
+ aItemText.Append( *defaultAp );
+ CleanupStack::PopAndDestroy(); // defaultAp
+ aItemText.Append( KWmlSettingsListBoxItemPostfix );
+
+ RCmManager cmManager;
+ cmManager.OpenL();
TInt snapId = ApiProvider().Preferences().DefaultSnapId();
if (snapId != KWmlNoDefaultSnapId)
{
- TRAPD(err, RCmDestination dest = cmManager.DestinationL( snapId ));
- if (err == KErrNone)
- {
- RCmDestination dest = cmManager.DestinationL( snapId );
- CleanupClosePushL( dest );
- HBufC* destName = dest.NameLC();
- aItemText.Append(*destName);
- CleanupStack::PopAndDestroy( 2 ); // destName, dest
- cmManager.Close();
- break;
+ TRAPD(err, RCmDestination dest = cmManager.DestinationL( snapId ));
+ if (err == KErrNone)
+ {
+ RCmDestination dest = cmManager.DestinationL( snapId );
+ CleanupClosePushL( dest );
+ HBufC* destName = dest.NameLC();
+ aItemText.Append(*destName);
+ CleanupStack::PopAndDestroy( 2 ); // destName, dest
+ cmManager.Close();
+ break;
}
}
-
- HBufC* name = iCoeEnv->AllocReadResourceLC( R_WML_SETTINGS_ACCESS_POINT_ASK_WHEN_NEEDED );
+ #if !defined(BRDO_BROWSER_50_FF)
+ HBufC* name = iCoeEnv->AllocReadResourceLC( R_WML_SETTINGS_ACCESS_POINT_ALWAYS_ASK );
+ #else
+ HBufC* name = iCoeEnv->AllocReadResourceLC( R_WML_SETTINGS_ACCESS_POINT_ASK_WHEN_NEEDED );
+ #endif // BRDO_BROWSER_50_FF
aItemText.Append( *name );
CleanupStack::PopAndDestroy(); // name
ApiProvider().Preferences().SetAccessPointSelectionModeL( EAlwaysAsk );
- cmManager.Close();
-
- break;
- }
-
- //if connecting with Iap Id
+ cmManager.Close();
+
+ break;
+ }
+
+ //if connecting with Iap Id
case EConnectionMethod:
{
aItemText.Zero();
@@ -760,20 +769,24 @@
}
else
{
- HBufC* name = iCoeEnv->AllocReadResourceLC( R_WML_SETTINGS_ACCESS_POINT_ASK_WHEN_NEEDED );
+ #if !defined(BRDO_BROWSER_50_FF)
+ HBufC* name = iCoeEnv->AllocReadResourceLC( R_WML_SETTINGS_ACCESS_POINT_ALWAYS_ASK );
+ #else
+ HBufC* name = iCoeEnv->AllocReadResourceLC( R_WML_SETTINGS_ACCESS_POINT_ASK_WHEN_NEEDED );
+ #endif // BRDO_BROWSER_50_FF
aItemText.Append( *name );
CleanupStack::PopAndDestroy(); // name
ApiProvider().Preferences().SetAccessPointSelectionModeL( EAlwaysAsk );
}
- break;
- }
+ break;
+ }
default:
- {
- User::Leave( KErrNotSupported);
- }
+ {
+ User::Leave( KErrNotSupported);
+ }
}
aItemArray->AppendL( aItemText );
@@ -852,16 +865,16 @@
if ( iApiProvider.Preferences().PageOverview() )
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_PAGEOVERVIEW,
- R_WMLBROWSER_SETTINGS_PAGEOVERVIEW_ON,
- aItemText );
+ R_WMLBROWSER_SETTINGS_PAGEOVERVIEW,
+ R_WMLBROWSER_SETTINGS_PAGEOVERVIEW_ON,
+ aItemText );
}
else
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_PAGEOVERVIEW,
- R_WMLBROWSER_SETTINGS_PAGEOVERVIEW_OFF,
- aItemText );
+ R_WMLBROWSER_SETTINGS_PAGEOVERVIEW,
+ R_WMLBROWSER_SETTINGS_PAGEOVERVIEW_OFF,
+ aItemText );
}
aItemArray->AppendL( aItemText );
iSettingIndex->AppendL( EWmlSettingsPageOverview );
@@ -878,16 +891,16 @@
if ( iApiProvider.Preferences().ShowToolbarOnOff() )
{
CreateItemFromTwoStringsL(
- R_BROWSER_SETTING_TOOLBAR_ON_OFF,
- R_BROWSER_SETTING_TOOLBAR_ON,
- aItemText );
+ R_BROWSER_SETTING_TOOLBAR_ON_OFF,
+ R_BROWSER_SETTING_TOOLBAR_ON,
+ aItemText );
}
else
{
CreateItemFromTwoStringsL(
- R_BROWSER_SETTING_TOOLBAR_ON_OFF,
- R_BROWSER_SETTING_TOOLBAR_OFF,
- aItemText );
+ R_BROWSER_SETTING_TOOLBAR_ON_OFF,
+ R_BROWSER_SETTING_TOOLBAR_OFF,
+ aItemText );
}
aItemArray->AppendL( aItemText );
iSettingIndex->AppendL( EWmlSettingsToolbarOnOff );
@@ -906,16 +919,16 @@
if ( iApiProvider.Preferences().BackList() )
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_BACK_LIST,
- R_WMLBROWSER_SETTINGS_BACK_LIST_ON,
- aItemText );
+ R_WMLBROWSER_SETTINGS_BACK_LIST,
+ R_WMLBROWSER_SETTINGS_BACK_LIST_ON,
+ aItemText );
}
else
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_BACK_LIST,
- R_WMLBROWSER_SETTINGS_BACK_LIST_OFF,
- aItemText );
+ R_WMLBROWSER_SETTINGS_BACK_LIST,
+ R_WMLBROWSER_SETTINGS_BACK_LIST_OFF,
+ aItemText );
}
aItemArray->AppendL( aItemText );
iSettingIndex->AppendL( EWmlSettingsBackList );
@@ -1101,8 +1114,8 @@
void CSettingsContainer::AppendSearchProviderL(
CDesCArray*& aItemArray,
TBuf<KWmlSettingsItemMaxLength>& aItemText)
- {
- aItemText.Zero();
+ {
+ aItemText.Zero();
aItemText.Append( KWmlSettingsListBoxItemPrefix );
HBufC* settingTitle = iCoeEnv->AllocReadResourceLC( R_BROWSERS_SETT_WEB_SEARCH_PROVIDER );
aItemText.Append( *settingTitle );
@@ -1116,17 +1129,17 @@
KMaxTitleLength , searchProviderPtr);
if(searchProvider->Compare(KNullDesC()) == 0)
- {
- CleanupStack::PopAndDestroy(searchProvider);
- searchProvider = iCoeEnv->AllocReadResourceLC( R_IS_LABEL_NOT_SELECTED );
- }
+ {
+ CleanupStack::PopAndDestroy(searchProvider);
+ searchProvider = iCoeEnv->AllocReadResourceLC( R_IS_LABEL_NOT_SELECTED );
+ }
aItemText.Append( *searchProvider );
CleanupStack::PopAndDestroy( searchProvider );
aItemArray->AppendL( aItemText );
iSettingIndex->AppendL( EWmlSettingsSearchProvider );
- }
+ }
// -----------------------------------------------------------------------------
// CSettingsContainer::AppendAutoLoadContentL
@@ -1233,12 +1246,23 @@
aItemText.Append( *defaultAp );
CleanupStack::PopAndDestroy(); // defaultAp
aItemText.Append( KWmlSettingsListBoxItemPostfix );
-
- TBuf< KCommsDbSvrMaxFieldLength > name;
- CApUtils* au = CApUtils::NewLC( ApiProvider().CommsModel().CommsDb() );
- TRAP_IGNORE(au->NameL( id, name ));
- aItemText.Append( name );
- CleanupStack::PopAndDestroy(); // au
+
+ if ( id == -1 )
+ {
+ // If user hasn't selected an AP, show a blank list entry. Once user
+ // selects an AP, it will be displayed. Note: The browser's default AP
+ // is used, until user makes a different AP selection.
+ aItemText.Append( KNullDesC );
+ }
+ else
+ {
+ // User (or configuration) has already selected an AP, display its name
+ TBuf< KCommsDbSvrMaxFieldLength > name;
+ CApUtils* au = CApUtils::NewLC( ApiProvider().CommsModel().CommsDb() );
+ TRAP_IGNORE(au->NameL( id, name ));
+ aItemText.Append( name );
+ CleanupStack::PopAndDestroy(); // au
+ }
aItemArray->AppendL( aItemText );
iSettingIndex->AppendL( EWmlSettingsAutomaticUpdatingAP );
@@ -1256,16 +1280,16 @@
if ( iApiProvider.Preferences().AutomaticUpdatingWhileRoaming() )
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING,
- R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING_ON,
- aItemText );
+ R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING,
+ R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING_ON,
+ aItemText );
}
else
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING,
- R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING_OFF,
- aItemText );
+ R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING,
+ R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING_OFF,
+ aItemText );
}
aItemArray->AppendL( aItemText );
@@ -1346,9 +1370,9 @@
if( iEncodingArray->At(i).iSystemId == iEncoding )
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_ENCODING,
- iEncodingArray->At(i).iResId,
- aItemText );
+ R_WMLBROWSER_SETTINGS_ENCODING,
+ iEncodingArray->At(i).iResId,
+ aItemText );
currentEncodingFound = ETrue;
break;
}
@@ -1400,16 +1424,16 @@
if ( iApiProvider.Preferences().AutoRefresh() )
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_AUTO_REFRESH,
- R_WMLBROWSER_SETTINGS_AUTO_REFRESH_ON,
- aItemText );
+ R_WMLBROWSER_SETTINGS_AUTO_REFRESH,
+ R_WMLBROWSER_SETTINGS_AUTO_REFRESH_ON,
+ aItemText );
}
else
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_AUTO_REFRESH,
- R_WMLBROWSER_SETTINGS_AUTO_REFRESH_OFF,
- aItemText );
+ R_WMLBROWSER_SETTINGS_AUTO_REFRESH,
+ R_WMLBROWSER_SETTINGS_AUTO_REFRESH_OFF,
+ aItemText );
}
aItemArray->AppendL( aItemText );
iSettingIndex->AppendL( EWmlSettingsAutoRefresh );
@@ -1436,9 +1460,9 @@
case EWmlSettingsAdaptiveBookmarksHideFolder:
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_ADAPTIVE_BOOKMARKS,
- R_WMLBROWSER_SETTINGS_ADAPTIVE_BOOKMARKS_VALUE_HIDE_FOLDER,
- aItemText );
+ R_WMLBROWSER_SETTINGS_ADAPTIVE_BOOKMARKS,
+ R_WMLBROWSER_SETTINGS_ADAPTIVE_BOOKMARKS_VALUE_HIDE_FOLDER,
+ aItemText );
break;
}
case EWmlSettingsAdaptiveBookmarksOff:
@@ -1468,29 +1492,29 @@
switch ( ApiProvider().Preferences().FormDataSaving() )
{
case EWmlSettingsFormDataPlusPassword:
- {
- CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING,
- R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_ON,
- aItemText );
- break;
- }
+ {
+ CreateItemFromTwoStringsL(
+ R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING,
+ R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_ON,
+ aItemText );
+ break;
+ }
case EWmlSettingsFormDataOnly:
- {
- CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING,
- R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_ONLY,
- aItemText );
- break;
- }
+ {
+ CreateItemFromTwoStringsL(
+ R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING,
+ R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_ONLY,
+ aItemText );
+ break;
+ }
case EWmlSettingsFormDataOff:
- {
- CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING,
- R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_OFF,
- aItemText );
- break;
- }
+ {
+ CreateItemFromTwoStringsL(
+ R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING,
+ R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_OFF,
+ aItemText );
+ break;
+ }
default:
break;
@@ -1512,17 +1536,17 @@
case EWmlSettingsCookieAllow:
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_COOKIES,
- R_WMLBROWSER_SETTINGS_C_VALUE_ALLOW,
- aItemText );
+ R_WMLBROWSER_SETTINGS_COOKIES,
+ R_WMLBROWSER_SETTINGS_C_VALUE_ALLOW,
+ aItemText );
break;
}
case EWmlSettingsCookieReject:
{
CreateItemFromTwoStringsL(
- R_WMLBROWSER_SETTINGS_COOKIES,
- R_WMLBROWSER_SETTINGS_C_VALUE_REJECT,
- aItemText );
+ R_WMLBROWSER_SETTINGS_COOKIES,
+ R_WMLBROWSER_SETTINGS_C_VALUE_REJECT,
+ aItemText );
break;
}
default:
@@ -1633,7 +1657,7 @@
// -----------------------------------------------------------------------------
//
void CSettingsContainer::AppendToolbarButtonsL( CDesCArray*& aItemArray,
- TBuf<KWmlSettingsItemMaxLength>& aItemText)
+ TBuf<KWmlSettingsItemMaxLength>& aItemText)
{
CreateItemFromTwoStringsL(
@@ -1693,7 +1717,7 @@
// -----------------------------------------------------------------------------
//
void CSettingsContainer::AppendShortcutKeysL( CDesCArray*& aItemArray,
- TBuf<KWmlSettingsItemMaxLength>& aItemText)
+ TBuf<KWmlSettingsItemMaxLength>& aItemText)
{
CreateItemFromTwoStringsL(
@@ -1892,133 +1916,133 @@
case EWmlSettingsAccesspoint:
{
TInt err(KErrNone);
- TInt retVal( KErrNone );
- //start the connection dialog
- CCmApplicationSettingsUi* settings = CCmApplicationSettingsUi::NewL();
- CleanupStack::PushL( settings );
-
- TCmSettingSelection selection;
-
- //
- // In Avkon tradition,
- // set the id of selection from the existing setting in preferences
- // so it is shown that way in the selection dialog box.
- //
- // Note the CCmApplicationSettingsUi API should ensure that if
- // "Connection Method" was previously selected, it should show up as
- // "Uncategorized" being shown selected
- //
- switch (preferences.AccessPointSelectionMode())
- {
- case EAlwaysAsk:
- {
- selection.iResult = EAlwaysAsk;
- selection.iId = preferences.DefaultSnapId();
- break;
- }
- case EDestination:
- {
- selection.iResult = EDestination;
- selection.iId = preferences.DefaultSnapId();
- break;
- }
- case EConnectionMethod:
- {
- selection.iResult = EConnectionMethod;
- selection.iId = Util::IapIdFromWapIdL( ApiProvider(), preferences.DefaultAccessPoint() );
- break;
- }
- default:
- // default case, set it to nothing
- selection.iResult = EDefaultConnection;
- break;
- }
-
+ TInt retVal( KErrNone );
+ //start the connection dialog
+ CCmApplicationSettingsUi* settings = CCmApplicationSettingsUi::NewL();
+ CleanupStack::PushL( settings );
+
+ TCmSettingSelection selection;
+
+ //
+ // In Avkon tradition,
+ // set the id of selection from the existing setting in preferences
+ // so it is shown that way in the selection dialog box.
+ //
+ // Note the CCmApplicationSettingsUi API should ensure that if
+ // "Connection Method" was previously selected, it should show up as
+ // "Uncategorized" being shown selected
+ //
+ switch (preferences.AccessPointSelectionMode())
+ {
+ case EAlwaysAsk:
+ {
+ selection.iResult = EAlwaysAsk;
+ selection.iId = preferences.DefaultSnapId();
+ break;
+ }
+ case EDestination:
+ {
+ selection.iResult = EDestination;
+ selection.iId = preferences.DefaultSnapId();
+ break;
+ }
+ case EConnectionMethod:
+ {
+ selection.iResult = EConnectionMethod;
+ selection.iId = Util::IapIdFromWapIdL( ApiProvider(), preferences.DefaultAccessPoint() );
+ break;
+ }
+ default:
+ // default case, set it to nothing
+ selection.iResult = EDefaultConnection;
+ break;
+ }
+
// empty filter array because no filtering is wanted
TBearerFilterArray filterArray;
- TRAP ( err, retVal = settings->RunApplicationSettingsL( selection,
+ TRAP ( err, retVal = settings->RunApplicationSettingsL( selection,
EShowAlwaysAsk | EShowDestinations | EShowConnectionMethods,
// turn off SNAP
// EShowAlwaysAsk | EShowConnectionMethods,
filterArray ) );
- CleanupStack::PopAndDestroy();//settings
-
- //if something has been selected
- if (retVal)
- {
- //set the selection mode
+ CleanupStack::PopAndDestroy();//settings
+
+ //if something has been selected
+ if (retVal)
+ {
+ //set the selection mode
preferences.SetAccessPointSelectionModeL(
STATIC_CAST( TCmSettingSelectionMode, selection.iResult ) );
- //based on the chosen connection type, store the connection identifier(iapid, snap id, always ask)
- //in the preferences list
- switch (preferences.AccessPointSelectionMode())
- {
- case EConnectionMethod:
- {
- BROWSER_LOG( ( _L( "CSettingsContainer::ChangeItemL CApSettingsHandler" ) ) );
-
- TUint32 id = preferences.DefaultAccessPoint();
+ //based on the chosen connection type, store the connection identifier(iapid, snap id, always ask)
+ //in the preferences list
+ switch (preferences.AccessPointSelectionMode())
+ {
+ case EConnectionMethod:
+ {
+ BROWSER_LOG( ( _L( "CSettingsContainer::ChangeItemL CApSettingsHandler" ) ) );
+
+ TUint32 id = preferences.DefaultAccessPoint();
// CMManager gives us IAPid, need to translate to WAPid
- if (selection.iId != 0)
- {
- id = Util::WapIdFromIapIdL( ApiProvider(), selection.iId );
- }
- preferences.SetDefaultAccessPointL( id );
- BROWSER_LOG( ( _L( " SetDefaultAccessPointL OK" ) ) );
- // Requested AP is preset for PushMtm
- ApiProvider().SetRequestedAP( preferences.DefaultAccessPoint() );
- break;
- }
-
- case EDestination:
- {
- TUint32 snapId = preferences.DefaultSnapId();
- if (selection.iId != 0)
- {
- snapId = selection.iId;
- }
- preferences.SetDefaultSnapId( snapId );
-
- break;
- }
-
- case EAlwaysAsk:
- {
- break;
- }
-
- default:
- {
- LOG_ENTERFN(" Wrong value in CSettingsContainer::ChangeItemL");
- }
- }
- }
-
- DisplayGeneralSettingsL();
- BROWSER_LOG( ( _L( "DisplayGeneralSettingsL OK" ) ) );
+ if (selection.iId != 0)
+ {
+ id = Util::WapIdFromIapIdL( ApiProvider(), selection.iId );
+ }
+ preferences.SetDefaultAccessPointL( id );
+ BROWSER_LOG( ( _L( " SetDefaultAccessPointL OK" ) ) );
+ // Requested AP is preset for PushMtm
+ ApiProvider().SetRequestedAP( preferences.DefaultAccessPoint() );
+ break;
+ }
+
+ case EDestination:
+ {
+ TUint32 snapId = preferences.DefaultSnapId();
+ if (selection.iId != 0)
+ {
+ snapId = selection.iId;
+ }
+ preferences.SetDefaultSnapId( snapId );
+
+ break;
+ }
+
+ case EAlwaysAsk:
+ {
+ break;
+ }
+
+ default:
+ {
+ LOG_ENTERFN(" Wrong value in CSettingsContainer::ChangeItemL");
+ }
+ }
+ }
+
+ DisplayGeneralSettingsL();
+ BROWSER_LOG( ( _L( "DisplayGeneralSettingsL OK" ) ) );
break;
- }
+ }
case EWmlSettingsAutoLoadContent:
- {
- if(iFlashPluginPresent)
- {
- value = 2 - preferences.AutoLoadContent();
-
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_ALL ); // 2
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_IMAGES_NO_FLASH ); // 1
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_TEXT ); // 0
-
- value = 2 - (ShowRadioButtonSettingPageL(R_WMLBROWSER_SETTINGS_AUTOLOAD_CONTENT,
+ {
+ if(iFlashPluginPresent)
+ {
+ value = 2 - preferences.AutoLoadContent();
+
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_ALL ); // 2
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_IMAGES_NO_FLASH ); // 1
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_TEXT ); // 0
+
+ value = 2 - (ShowRadioButtonSettingPageL(R_WMLBROWSER_SETTINGS_AUTOLOAD_CONTENT,
values,
value ));
- }
- else
- {
- // Below is cenrep values for Load Content for cenrep key KBrowserNGImagesEnabled
- // Load Content
+ }
+ else
+ {
+ // Below is cenrep values for Load Content for cenrep key KBrowserNGImagesEnabled
+ // Load Content
// Valid values:
// If flash plugin is present: 0 = Text only, 1 = Images,No flash, 2 = All
// If flash plugin is not present 0 = Text only, 1 = All
@@ -2027,7 +2051,7 @@
// in case where the flash plugin is not present.
- value = 1 - preferences.AutoLoadContent();
+ value = 1 - preferences.AutoLoadContent();
if ( value < 0 )
{
@@ -2036,10 +2060,10 @@
value = 0;
}
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_ALL ); // 1 (translated from 2 when flash plugin is present)
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_TEXT ); // 0
-
- value = 1 - (ShowRadioButtonSettingPageL(R_WMLBROWSER_SETTINGS_AUTOLOAD_CONTENT,
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_ALL ); // 1 (translated from 2 when flash plugin is present)
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTOLOAD_TEXT ); // 0
+
+ value = 1 - (ShowRadioButtonSettingPageL(R_WMLBROWSER_SETTINGS_AUTOLOAD_CONTENT,
values,
value ));
@@ -2048,12 +2072,12 @@
{
value = EWmlSettingsAutoloadAll;
}
- }
-
- preferences.SetAutoLoadContentL( value );
+ }
+
+ preferences.SetAutoLoadContentL( value );
DisplayPageSettingsL();
- break;
- }
+ break;
+ }
case EWmlSettingsFontSize:
{
@@ -2092,79 +2116,79 @@
}
case EWmlSettingsPageOverview:
- {
- if( ApiProvider().WindowMgr().CurrentWindow()->IsPageOverviewSupportedL() )
+ {
+ if( ApiProvider().WindowMgr().CurrentWindow()->IsPageOverviewSupportedL() )
{
- values->AppendL( R_WMLBROWSER_SETTINGS_PAGEOVERVIEW_OFF );
- values->AppendL( R_WMLBROWSER_SETTINGS_PAGEOVERVIEW_ON );
- value = preferences.PageOverview();
- value = aSelectKeyWasPressed ?
- 1 - value :
- ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_PAGEOVERVIEW,
- values,
- value );
- preferences.SetPageOverviewL( value );
+ values->AppendL( R_WMLBROWSER_SETTINGS_PAGEOVERVIEW_OFF );
+ values->AppendL( R_WMLBROWSER_SETTINGS_PAGEOVERVIEW_ON );
+ value = preferences.PageOverview();
+ value = aSelectKeyWasPressed ?
+ 1 - value :
+ ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_PAGEOVERVIEW,
+ values,
+ value );
+ preferences.SetPageOverviewL( value );
DisplayGeneralSettingsL();
}
- break;
- }
-
- case EWmlSettingsBackList:
- {
- values->AppendL( R_WMLBROWSER_SETTINGS_BACK_LIST_OFF );
- values->AppendL( R_WMLBROWSER_SETTINGS_BACK_LIST_ON );
- value = preferences.BackList();
- value = aSelectKeyWasPressed ?
- 1 - value :
- ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_BACK_LIST,
- values,
- value );
- preferences.SetBackListL( value );
+ break;
+ }
+
+ case EWmlSettingsBackList:
+ {
+ values->AppendL( R_WMLBROWSER_SETTINGS_BACK_LIST_OFF );
+ values->AppendL( R_WMLBROWSER_SETTINGS_BACK_LIST_ON );
+ value = preferences.BackList();
+ value = aSelectKeyWasPressed ?
+ 1 - value :
+ ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_BACK_LIST,
+ values,
+ value );
+ preferences.SetBackListL( value );
DisplayGeneralSettingsL();
- break;
- }
- case EWmlSettingsUrlSuffix:
- {
- TInt ret;
-
- HBufC* suffixBuf = iApiProvider.Preferences().URLSuffixList();
- HBufC* suffixToPass = HBufC::NewLC( KMaxSearchPgUrlLength );
- suffixToPass = suffixBuf;
- TPtr ptr = suffixToPass->Des();
-
- TInt resource = R_URL_SUFFIX_PAGE;
-
- CAknSettingPage* dlg = new ( ELeave ) CAknTextSettingPage(
- resource, ptr, CAknTextSettingPage::EZeroLengthAllowed );
-
- ret = dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged );
-
- if ( ret )
- {
- iApiProvider.Preferences().SetURLSuffixList(suffixToPass);
- }
-
- CleanupStack::PopAndDestroy(); // suffixToPass
+ break;
+ }
+ case EWmlSettingsUrlSuffix:
+ {
+ TInt ret;
+
+ HBufC* suffixBuf = iApiProvider.Preferences().URLSuffixList();
+ HBufC* suffixToPass = HBufC::NewLC( KMaxSearchPgUrlLength );
+ suffixToPass = suffixBuf;
+ TPtr ptr = suffixToPass->Des();
+
+ TInt resource = R_URL_SUFFIX_PAGE;
+
+ CAknSettingPage* dlg = new ( ELeave ) CAknTextSettingPage(
+ resource, ptr, CAknTextSettingPage::EZeroLengthAllowed );
+
+ ret = dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged );
+
+ if ( ret )
+ {
+ iApiProvider.Preferences().SetURLSuffixList(suffixToPass);
+ }
+
+ CleanupStack::PopAndDestroy(); // suffixToPass
DisplayGeneralSettingsL();
- break;
- }
- case EWmlSettingsAutoRefresh:
- {
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTO_REFRESH_OFF );
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTO_REFRESH_ON );
- value = preferences.AutoRefresh();
- value = aSelectKeyWasPressed ?
- 1 - value :
- ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_AUTO_REFRESH,
- values,
- value );
- preferences.SetAutoRefreshL( value );
+ break;
+ }
+ case EWmlSettingsAutoRefresh:
+ {
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTO_REFRESH_OFF );
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTO_REFRESH_ON );
+ value = preferences.AutoRefresh();
+ value = aSelectKeyWasPressed ?
+ 1 - value :
+ ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_AUTO_REFRESH,
+ values,
+ value );
+ preferences.SetAutoRefreshL( value );
DisplayPageSettingsL();
- break;
- }
+ break;
+ }
case EWmlSettingsEncoding:
{
@@ -2225,9 +2249,9 @@
value = 2-preferences.AdaptiveBookmarks();
value = ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_ADAPTIVE_BOOKMARKS,
- values,
- value );
+ R_WMLBROWSER_SETTINGS_ADAPTIVE_BOOKMARKS,
+ values,
+ value );
preferences.SetAdaptiveBookmarksL(
( TWmlSettingsAdaptiveBookmarks )(2-value) );
DisplayPrivacySettingsL();
@@ -2235,56 +2259,56 @@
}
case EWmlSettingsFormDataSaving:
- {
- values->AppendL( R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_OFF );
+ {
+ values->AppendL( R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_OFF );
values->AppendL( R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_ONLY );
values->AppendL( R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING_ON );
value = preferences.FormDataSaving();
TInt origValue(value);
value = ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING,
- values,
- value );
+ R_WMLBROWSER_SETTINGS_FORM_DATA_SAVING,
+ values,
+ value );
preferences.SetFormDataSavingL( (TWmlSettingsFormData) value );
if (origValue > value)
- {
- // query to see if we need to delete stored form data
- if (origValue == EWmlSettingsFormDataPlusPassword && value == EWmlSettingsFormDataOnly)
- {
- // delete password data?
- ShowFormDataDeletePasswordQueryDialogL();
- }
- else if (origValue == EWmlSettingsFormDataPlusPassword && value == EWmlSettingsFormDataOff)
- {
- // delete password and form data
- ShowFormDataDeleteAllQueryDialogL();
- }
- else if (origValue == EWmlSettingsFormDataOnly && value == EWmlSettingsFormDataOff)
- {
- // delete form data
- ShowFormDataDeleteAllQueryDialogL();
- }
- }
+ {
+ // query to see if we need to delete stored form data
+ if (origValue == EWmlSettingsFormDataPlusPassword && value == EWmlSettingsFormDataOnly)
+ {
+ // delete password data?
+ ShowFormDataDeletePasswordQueryDialogL();
+ }
+ else if (origValue == EWmlSettingsFormDataPlusPassword && value == EWmlSettingsFormDataOff)
+ {
+ // delete password and form data
+ ShowFormDataDeleteAllQueryDialogL();
+ }
+ else if (origValue == EWmlSettingsFormDataOnly && value == EWmlSettingsFormDataOff)
+ {
+ // delete form data
+ ShowFormDataDeleteAllQueryDialogL();
+ }
+ }
DisplayPrivacySettingsL();
- break;
- }
+ break;
+ }
case EWmlSettingsFullScreen:
{
values->AppendL( R_WMLBROWSER_SETTINGS_SOFTKEYS_OFF );
- values->AppendL( R_WMLBROWSER_SETTINGS_SOFTKEYS_ON );
+ values->AppendL( R_WMLBROWSER_SETTINGS_SOFTKEYS_ON );
value = preferences.FullScreen();
- value = aSelectKeyWasPressed ?
- 1 - value :
- ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_SOFTKEYS,
- values,
- value );
- preferences.SetFullScreenL( ( TWmlSettingsFullScreen )( value ) );
+ value = aSelectKeyWasPressed ?
+ 1 - value :
+ ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_SOFTKEYS,
+ values,
+ value );
+ preferences.SetFullScreenL( ( TWmlSettingsFullScreen )( value ) );
DisplayPageSettingsL();
break;
}
@@ -2312,18 +2336,18 @@
{
value = preferences.HomePageType();
if( !useCurrent )
- {
- // 'Use current' is not shown as current item
- if( (TWmlSettingsHomePage)value == EWmlSettingsHomePageUseCurrent )
- {
- value = EWmlSettingsHomePageAddress;
- }
- // items behind UseCurrent must be shifted below
- else if( (TWmlSettingsHomePage)value > EWmlSettingsHomePageUseCurrent )
- {
- --value;
- }
- }
+ {
+ // 'Use current' is not shown as current item
+ if( (TWmlSettingsHomePage)value == EWmlSettingsHomePageUseCurrent )
+ {
+ value = EWmlSettingsHomePageAddress;
+ }
+ // items behind UseCurrent must be shifted below
+ else if( (TWmlSettingsHomePage)value > EWmlSettingsHomePageUseCurrent )
+ {
+ --value;
+ }
+ }
// sanity check
if( value >= 7 + useCurrent )
{
@@ -2397,8 +2421,8 @@
break;
}
- case EWmlSettingsAutomaticUpdatingAP:
- {
+ case EWmlSettingsAutomaticUpdatingAP:
+ {
TUint32 id = preferences.AutomaticUpdatingAP();
SelectUserDefinedAPL( id );
@@ -2406,79 +2430,79 @@
BROWSER_LOG( ( _L( "EWmlSettingsAutomaticUpdatingAP SetAutomaticUpdatingApL()" ) ) );
DisplayWebFeedsSettingsL();
- BROWSER_LOG( ( _L( "EWmlSettingsAutomaticUpdatingAP DisplayWebFeedsSettingsL()" ) ) );
- break;
- }
-
- case EWmlSettingsMediaVolume:
- {
- // Add option list items
- values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_4 );
- values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_3 );
- values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_2 );
- values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_1 );
- values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_MUTED );
-
- TInt itemcount = values->Count();
-
- // Get Media Volume Value
- value = preferences.MediaVolume();
-
- // Convert volume to list index
- switch ( value )
- {
- case EWmlSettingsVolumeMuted:
- value = EVolumeMute;
- break;
- case EWmlSettingsVolume1:
- value = EVolumeLevel1;
- break;
- case EWmlSettingsVolume2:
- value = EVolumeLevel2;
- break;
- case EWmlSettingsVolume3:
- value = EVolumeLevel3;
- break;
- case EWmlSettingsVolume4:
- value = EVolumeLevel4;
- break;
- default:
- break;
- }
-
- // Open Volume Option List Page
- value = ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_MEDIA_VOLUME, values,
- ( itemcount - 1 ) - value );
-
- // Reconvert list index to volume
- value = ( itemcount - 1 ) - value;
- switch ( value )
- {
- case EVolumeMute:
- value = EWmlSettingsVolumeMuted;
- break;
- case EVolumeLevel1:
- value = EWmlSettingsVolume1;
- break;
- case EVolumeLevel2:
- value = EWmlSettingsVolume2;
- break;
- case EVolumeLevel3:
- value = EWmlSettingsVolume3;
- break;
- case EVolumeLevel4:
- value = EWmlSettingsVolume4;
- break;
- default:
- break;
- }
-
- // Save Media Volume Value
- preferences.SetMediaVolumeL( value );
+ BROWSER_LOG( ( _L( "EWmlSettingsAutomaticUpdatingAP DisplayWebFeedsSettingsL()" ) ) );
+ break;
+ }
+
+ case EWmlSettingsMediaVolume:
+ {
+ // Add option list items
+ values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_4 );
+ values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_3 );
+ values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_2 );
+ values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_1 );
+ values->AppendL( R_WMLBROWSER_SETTINGS_MEDIA_VOLUME_MUTED );
+
+ TInt itemcount = values->Count();
+
+ // Get Media Volume Value
+ value = preferences.MediaVolume();
+
+ // Convert volume to list index
+ switch ( value )
+ {
+ case EWmlSettingsVolumeMuted:
+ value = EVolumeMute;
+ break;
+ case EWmlSettingsVolume1:
+ value = EVolumeLevel1;
+ break;
+ case EWmlSettingsVolume2:
+ value = EVolumeLevel2;
+ break;
+ case EWmlSettingsVolume3:
+ value = EVolumeLevel3;
+ break;
+ case EWmlSettingsVolume4:
+ value = EVolumeLevel4;
+ break;
+ default:
+ break;
+ }
+
+ // Open Volume Option List Page
+ value = ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_MEDIA_VOLUME, values,
+ ( itemcount - 1 ) - value );
+
+ // Reconvert list index to volume
+ value = ( itemcount - 1 ) - value;
+ switch ( value )
+ {
+ case EVolumeMute:
+ value = EWmlSettingsVolumeMuted;
+ break;
+ case EVolumeLevel1:
+ value = EWmlSettingsVolume1;
+ break;
+ case EVolumeLevel2:
+ value = EWmlSettingsVolume2;
+ break;
+ case EVolumeLevel3:
+ value = EWmlSettingsVolume3;
+ break;
+ case EVolumeLevel4:
+ value = EWmlSettingsVolume4;
+ break;
+ default:
+ break;
+ }
+
+ // Save Media Volume Value
+ preferences.SetMediaVolumeL( value );
DisplayPageSettingsL();
- break;
- }
+ break;
+ }
case EWmlSettingsCookies:
{
@@ -2486,9 +2510,9 @@
values->AppendL( R_WMLBROWSER_SETTINGS_C_VALUE_ALLOW );
value = preferences.Cookies();
value = aSelectKeyWasPressed ? 1 - value : ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_COOKIES,
- values,
- value );
+ R_WMLBROWSER_SETTINGS_COOKIES,
+ values,
+ value );
preferences.SetCookiesL( ( TWmlSettingsCookies )value );
DisplayPrivacySettingsL();
break;
@@ -2508,25 +2532,25 @@
break;
}
- case EWmlSettingsScriptLog:
- {
- value = 3 - preferences.ScriptLog();
-
- values->AppendL( R_WMLBROWSER_SETTINGS_SCRIPTLOG_VALUE_TO_CONSOLE_FILE );
+ case EWmlSettingsScriptLog:
+ {
+ value = 3 - preferences.ScriptLog();
+
+ values->AppendL( R_WMLBROWSER_SETTINGS_SCRIPTLOG_VALUE_TO_CONSOLE_FILE );
values->AppendL( R_WMLBROWSER_SETTINGS_SCRIPTLOG_VALUE_TO_CONSOLE );
- values->AppendL( R_WMLBROWSER_SETTINGS_SCRIPTLOG_VALUE_TO_FILE );
- values->AppendL( R_WMLBROWSER_SETTINGS_SCRIPTLOG_VALUE_DISABLE );
-
- value = 3 - (ShowRadioButtonSettingPageL(R_WMLBROWSER_SETTINGS_SCRIPTLOG,
+ values->AppendL( R_WMLBROWSER_SETTINGS_SCRIPTLOG_VALUE_TO_FILE );
+ values->AppendL( R_WMLBROWSER_SETTINGS_SCRIPTLOG_VALUE_DISABLE );
+
+ value = 3 - (ShowRadioButtonSettingPageL(R_WMLBROWSER_SETTINGS_SCRIPTLOG,
values,
value ));
- preferences.SetScriptLogL( value );
+ preferences.SetScriptLogL( value );
DisplayGeneralSettingsL();
- break;
- }
-
- case EWmlSettingsDownloadsOpen:
+ break;
+ }
+
+ case EWmlSettingsDownloadsOpen:
{
values->AppendL( R_WMLBROWSER_SETTINGS_DOWNLOAD_OPEN_YES );
values->AppendL( R_WMLBROWSER_SETTINGS_DOWNLOAD_OPEN_NO );
@@ -2541,8 +2565,8 @@
break;
}
- case EWmlSettingsHttpSecurityWarnings:
- {
+ case EWmlSettingsHttpSecurityWarnings:
+ {
values->AppendL( R_WMLBROWSER_SETTINGS_WRN_VALUE_SHOW );
values->AppendL( R_WMLBROWSER_SETTINGS_WRN_VALUE_HIDE );
value = preferences.HttpSecurityWarnings();
@@ -2554,166 +2578,166 @@
preferences.SetHttpSecurityWarningsL( 1 - value ); // show=1, hide=0 in preferences
DisplayGeneralSettingsL();
break;
- }
-
+ }
+
case EWmlSettingsSearchProvider:
- {
- RunSearchSettingsL();
- break;
- }
-
-
-
- case EWmlSettingsIMEINotification:
- {
- if ( IMEI_NOTIFICATION )
- {
- values->AppendL( R_WMLBROWSER_SETTINGS_IMEI_VALUE_DISABLED );
- values->AppendL( R_WMLBROWSER_SETTINGS_IMEI_VALUE_ENABLED );
- value = preferences.IMEINotification();
- //items need to be appended in reverse order
- value = aSelectKeyWasPressed ? 1 - value :
- ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_IMEI,
- values,
- value );
- preferences.SetIMEINotificationL( ( TWmlSettingsIMEI ) value );
+ {
+ RunSearchSettingsL();
+ break;
+ }
+
+
+
+ case EWmlSettingsIMEINotification:
+ {
+ if ( IMEI_NOTIFICATION )
+ {
+ values->AppendL( R_WMLBROWSER_SETTINGS_IMEI_VALUE_DISABLED );
+ values->AppendL( R_WMLBROWSER_SETTINGS_IMEI_VALUE_ENABLED );
+ value = preferences.IMEINotification();
+ //items need to be appended in reverse order
+ value = aSelectKeyWasPressed ? 1 - value :
+ ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_IMEI,
+ values,
+ value );
+ preferences.SetIMEINotificationL( ( TWmlSettingsIMEI ) value );
DisplayPrivacySettingsL();
- }
- break;
- }
+ }
+ break;
+ }
case EWmlSettingsSendReferrer:
- {
- values->AppendL( R_WMLBROWSER_SETTINGS_SEND_REFERRER_OFF );
- values->AppendL( R_WMLBROWSER_SETTINGS_SEND_REFERRER_ON );
- value = preferences.SendReferrer();
- value = aSelectKeyWasPressed ? 1 - value : ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_SEND_REFERRER,
- values,
- value );
+ {
+ values->AppendL( R_WMLBROWSER_SETTINGS_SEND_REFERRER_OFF );
+ values->AppendL( R_WMLBROWSER_SETTINGS_SEND_REFERRER_ON );
+ value = preferences.SendReferrer();
+ value = aSelectKeyWasPressed ? 1 - value : ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_SEND_REFERRER,
+ values,
+ value );
DisplayPrivacySettingsL();
- break;
- }
+ break;
+ }
case EWmlSettingsPopupBlocking:
- {
- values->AppendL( R_WMLBROWSER_SETTINGS_POPUP_BLOCKING_OFF );
- values->AppendL( R_WMLBROWSER_SETTINGS_POPUP_BLOCKING_ON );
- value = preferences.PopupBlocking();
- value = aSelectKeyWasPressed ? 1 - value : ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_POPUP_BLOCKING,
- values,
- value );
- preferences.SetPopupBlockingL( value );
+ {
+ values->AppendL( R_WMLBROWSER_SETTINGS_POPUP_BLOCKING_OFF );
+ values->AppendL( R_WMLBROWSER_SETTINGS_POPUP_BLOCKING_ON );
+ value = preferences.PopupBlocking();
+ value = aSelectKeyWasPressed ? 1 - value : ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_POPUP_BLOCKING,
+ values,
+ value );
+ preferences.SetPopupBlockingL( value );
DisplayPageSettingsL();
- break;
- }
-
-
- case EWmlSettingsAutomaticUpdatingWhileRoaming:
- {
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING_OFF );
- values->AppendL( R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING_ON );
-
- value = preferences.AutomaticUpdatingWhileRoaming();
- value = aSelectKeyWasPressed ?
- 1 - value :
- ShowRadioButtonSettingPageL(
- R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING,
- values,
- value );
- preferences.SetAutomaticUpdatingWhileRoamingL( value );
-
- DisplayWebFeedsSettingsL();
- break;
- }
-
-
- case EWmlSettingsToolbarOnOff:
- {
- values->AppendL( R_BROWSER_SETTING_TOOLBAR_OFF );
- values->AppendL( R_BROWSER_SETTING_TOOLBAR_ON );
-
- value = preferences.ShowToolbarOnOff();
- value = aSelectKeyWasPressed ?
- 1 - value :
- ShowRadioButtonSettingPageL(
- R_BROWSER_SETTING_TOOLBAR_ON_OFF,
- values,
- value );
- preferences.SetToolbarOnOffL( value );
+ break;
+ }
+
+
+ case EWmlSettingsAutomaticUpdatingWhileRoaming:
+ {
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING_OFF );
+ values->AppendL( R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING_ON );
+
+ value = preferences.AutomaticUpdatingWhileRoaming();
+ value = aSelectKeyWasPressed ?
+ 1 - value :
+ ShowRadioButtonSettingPageL(
+ R_WMLBROWSER_SETTINGS_AUTOUPDATING_ROAMING,
+ values,
+ value );
+ preferences.SetAutomaticUpdatingWhileRoamingL( value );
+
+ DisplayWebFeedsSettingsL();
+ break;
+ }
+
+
+ case EWmlSettingsToolbarOnOff:
+ {
+ values->AppendL( R_BROWSER_SETTING_TOOLBAR_OFF );
+ values->AppendL( R_BROWSER_SETTING_TOOLBAR_ON );
+
+ value = preferences.ShowToolbarOnOff();
+ value = aSelectKeyWasPressed ?
+ 1 - value :
+ ShowRadioButtonSettingPageL(
+ R_BROWSER_SETTING_TOOLBAR_ON_OFF,
+ values,
+ value );
+ preferences.SetToolbarOnOffL( value );
DisplayToolbarSettingsL();
- break;
- }
-
-
- case EWmlSettingsToolbarButton1Cmd:
+ break;
+ }
+
+
+ case EWmlSettingsToolbarButton1Cmd:
{
value = preferences.ShowToolbarButton1Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetToolbarButtonValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON1,
- values,
- value );
-
- preferences.SetToolbarButton1CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON1,
+ values,
+ value );
+
+ preferences.SetToolbarButton1CmdL( valueDisplayMapping->At(value) );
DisplayToolbarSettingsL();
break;
}
- case EWmlSettingsToolbarButton2Cmd:
+ case EWmlSettingsToolbarButton2Cmd:
{
value = preferences.ShowToolbarButton2Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetToolbarButtonValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON2,
- values,
- value );
-
- preferences.SetToolbarButton2CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON2,
+ values,
+ value );
+
+ preferences.SetToolbarButton2CmdL( valueDisplayMapping->At(value) );
DisplayToolbarSettingsL();
break;
}
- case EWmlSettingsToolbarButton3Cmd:
+ case EWmlSettingsToolbarButton3Cmd:
{
value = preferences.ShowToolbarButton3Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetToolbarButtonValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON3,
- values,
- value );
-
- preferences.SetToolbarButton3CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON3,
+ values,
+ value );
+
+ preferences.SetToolbarButton3CmdL( valueDisplayMapping->At(value) );
DisplayToolbarSettingsL();
break;
}
- case EWmlSettingsToolbarButton4Cmd:
+ case EWmlSettingsToolbarButton4Cmd:
{
value = preferences.ShowToolbarButton4Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetToolbarButtonValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON4,
- values,
- value );
-
- preferences.SetToolbarButton4CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON4,
+ values,
+ value );
+
+ preferences.SetToolbarButton4CmdL( valueDisplayMapping->At(value) );
DisplayToolbarSettingsL();
break;
}
- case EWmlSettingsToolbarButton5Cmd:
+ case EWmlSettingsToolbarButton5Cmd:
{
value = preferences.ShowToolbarButton5Cmd();
// set toolbar values will build values into an array to be displayed to the user
@@ -2721,16 +2745,16 @@
// fixed array of commands as well as the current value from settings
value = SetToolbarButtonValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON5,
- values,
- value );
-
- preferences.SetToolbarButton5CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON5,
+ values,
+ value );
+
+ preferences.SetToolbarButton5CmdL( valueDisplayMapping->At(value) );
DisplayToolbarSettingsL();
break;
}
- case EWmlSettingsToolbarButton6Cmd:
+ case EWmlSettingsToolbarButton6Cmd:
{
value = preferences.ShowToolbarButton6Cmd();
// set toolbar values will build values into an array to be displayed to the user
@@ -2738,16 +2762,16 @@
// fixed array of commands as well as the current value from settings
value = SetToolbarButtonValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON6,
- values,
- value );
-
- preferences.SetToolbarButton6CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON6,
+ values,
+ value );
+
+ preferences.SetToolbarButton6CmdL( valueDisplayMapping->At(value) );
DisplayToolbarSettingsL();
break;
}
- case EWmlSettingsToolbarButton7Cmd:
+ case EWmlSettingsToolbarButton7Cmd:
{
value = preferences.ShowToolbarButton7Cmd();
// set toolbar values will build values into an array to be displayed to the user
@@ -2755,200 +2779,200 @@
// fixed array of commands as well as the current value from settings
value = SetToolbarButtonValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON7,
- values,
- value );
-
- preferences.SetToolbarButton7CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_TOOLBAR_BUTTON7,
+ values,
+ value );
+
+ preferences.SetToolbarButton7CmdL( valueDisplayMapping->At(value) );
DisplayToolbarSettingsL();
break;
}
- case EWmlSettingsShortCutKey1Cmd:
+ case EWmlSettingsShortCutKey1Cmd:
{
value = preferences.ShortcutKey1Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY1,
- values,
- value );
- preferences.SetShortcutKey1CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY1,
+ values,
+ value );
+ preferences.SetShortcutKey1CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey2Cmd:
+ case EWmlSettingsShortCutKey2Cmd:
{
value = preferences.ShortcutKey2Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY2,
- values,
- value );
- preferences.SetShortcutKey2CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY2,
+ values,
+ value );
+ preferences.SetShortcutKey2CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey3Cmd:
+ case EWmlSettingsShortCutKey3Cmd:
{
value = preferences.ShortcutKey3Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY3,
- values,
- value );
- preferences.SetShortcutKey3CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY3,
+ values,
+ value );
+ preferences.SetShortcutKey3CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey4Cmd:
+ case EWmlSettingsShortCutKey4Cmd:
{
value = preferences.ShortcutKey4Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY4,
- values,
- value );
- preferences.SetShortcutKey4CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY4,
+ values,
+ value );
+ preferences.SetShortcutKey4CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey5Cmd:
+ case EWmlSettingsShortCutKey5Cmd:
{
value = preferences.ShortcutKey5Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY5,
- values,
- value );
- preferences.SetShortcutKey5CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY5,
+ values,
+ value );
+ preferences.SetShortcutKey5CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey6Cmd:
+ case EWmlSettingsShortCutKey6Cmd:
{
value = preferences.ShortcutKey6Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY6,
- values,
- value );
- preferences.SetShortcutKey6CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY6,
+ values,
+ value );
+ preferences.SetShortcutKey6CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey7Cmd:
+ case EWmlSettingsShortCutKey7Cmd:
{
value = preferences.ShortcutKey7Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY7,
- values,
- value );
- preferences.SetShortcutKey7CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY7,
+ values,
+ value );
+ preferences.SetShortcutKey7CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey8Cmd:
+ case EWmlSettingsShortCutKey8Cmd:
{
value = preferences.ShortcutKey8Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY8,
- values,
- value );
- preferences.SetShortcutKey8CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY8,
+ values,
+ value );
+ preferences.SetShortcutKey8CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey9Cmd:
+ case EWmlSettingsShortCutKey9Cmd:
{
value = preferences.ShortcutKey9Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY9,
- values,
- value );
- preferences.SetShortcutKey9CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY9,
+ values,
+ value );
+ preferences.SetShortcutKey9CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKey0Cmd:
+ case EWmlSettingsShortCutKey0Cmd:
{
value = preferences.ShortcutKey0Cmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY0,
- values,
- value );
- preferences.SetShortcutKey0CmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEY0,
+ values,
+ value );
+ preferences.SetShortcutKey0CmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKeyStarCmd:
+ case EWmlSettingsShortCutKeyStarCmd:
{
value = preferences.ShortcutKeyStarCmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEYSTAR,
- values,
- value );
- preferences.SetShortcutKeyStarCmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEYSTAR,
+ values,
+ value );
+ preferences.SetShortcutKeyStarCmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- case EWmlSettingsShortCutKeyHashCmd:
+ case EWmlSettingsShortCutKeyHashCmd:
{
value = preferences.ShortcutKeyHashCmd();
// set toolbar values will build values into an array to be displayed to the user
// this may mean filtering out some items, so we have to know the mapping between our
// fixed array of commands as well as the current value from settings
value = SetShortcutKeysValues(values, value, valueDisplayMapping);
- value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEYHASH,
- values,
- value );
- preferences.SetShortcutKeyHashCmdL( valueDisplayMapping->At(value) );
+ value = ShowRadioButtonSettingPageL( R_BROWSER_SETTING_SHORTCUT_KEYHASH,
+ values,
+ value );
+ preferences.SetShortcutKeyHashCmdL( valueDisplayMapping->At(value) );
DisplayShortcutsSettingsL();
break;
}
- default:
- break;
- }
- CleanupStack::PopAndDestroy(2); // values, valueDisplayMapping
- }
+ default:
+ break;
+ }
+ CleanupStack::PopAndDestroy(2); // values, valueDisplayMapping
+ }
// -----------------------------------------------------------------------------
@@ -3076,14 +3100,14 @@
// -----------------------------------------------------------------------------
//
TInt CSettingsContainer::ShowRadioButtonSettingPageL(
- TInt aTitle,
- CArrayFixFlat<TInt>* aValues,
- TInt aCurrentItem )
+ TInt aTitle,
+ CArrayFixFlat<TInt>* aValues,
+ TInt aCurrentItem )
{
// title of the dialog
HBufC* title = iCoeEnv->AllocReadResourceLC( aTitle );
- __ASSERT_DEBUG( (aValues != NULL), Util::Panic( Util::EUninitializedData ));
+ __ASSERT_DEBUG( (aValues != NULL), Util::Panic( Util::EUninitializedData ));
// options array
@@ -3109,7 +3133,7 @@
//dlg->ConstructL();
//dlg->ListBoxControl()->SetCurrentItemIndex( newItem );
CleanupStack::Pop(); // dlg
- iActionCancelled = EFalse;
+ iActionCancelled = EFalse;
if ( !dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
{
// Changes confirmed
@@ -3129,15 +3153,15 @@
// -----------------------------------------------------------------------------
//
TBool CSettingsContainer::ShowRadioButtonSettingPageBoolL(
- TInt aTitle,
- CArrayFixFlat<TInt>* aValues,
- TInt* aCurrentItem )
+ TInt aTitle,
+ CArrayFixFlat<TInt>* aValues,
+ TInt* aCurrentItem )
{
// title of the dialog
HBufC* title = iCoeEnv->AllocReadResourceLC( aTitle );
- __ASSERT_DEBUG( (aValues != NULL), Util::Panic( Util::EUninitializedData ));
- __ASSERT_DEBUG( (aCurrentItem != NULL), Util::Panic( Util::EUninitializedData ));
+ __ASSERT_DEBUG( (aValues != NULL), Util::Panic( Util::EUninitializedData ));
+ __ASSERT_DEBUG( (aCurrentItem != NULL), Util::Panic( Util::EUninitializedData ));
// options array
@@ -3182,7 +3206,7 @@
if ( iFontSize != preferences.FontSize() )
{
- preferences.SetFontSizeL( iFontSize );
+ preferences.SetFontSizeL( iFontSize );
}
if ( iEncoding != preferences.Encoding() )
@@ -3194,9 +3218,9 @@
{
preferences.SetTextWrapL( iTextWrap );
}
- preferences.FlushSD();
-
- preferences.NotifyObserversL( EPreferencesDeactivate, TBrCtlDefs::ESettingsUnknown );
+ preferences.FlushSD();
+
+ preferences.NotifyObserversL( EPreferencesDeactivate, TBrCtlDefs::ESettingsUnknown );
}
@@ -3205,53 +3229,53 @@
// -----------------------------------------------------------------------------
//
TKeyResponse CSettingsContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType )
- {
- TKeyResponse ret = EKeyWasNotConsumed;
- TKeyEvent keyEvent(aKeyEvent);
-
- // Special case for MSK enabled mode - turn MSK KeyUp to MSK KeyEvent to process Settings toggle function
+ {
+ TKeyResponse ret = EKeyWasNotConsumed;
+ TKeyEvent keyEvent(aKeyEvent);
+
+ // Special case for MSK enabled mode - turn MSK KeyUp to MSK KeyEvent to process Settings toggle function
// This is what is done in BookmarksContainer::OfferKeyEventL
if (( keyEvent.iScanCode == EStdKeyDevice3 ) || (keyEvent.iScanCode == EStdKeyEnter))
{
if( aType == EEventKeyDown )
- {
+ {
iSelectionKeyDownPressed = ETrue;
- ret = EKeyWasConsumed;
- }
+ ret = EKeyWasConsumed;
+ }
else if( aType == EEventKeyUp )
- {
- if( iSelectionKeyDownPressed )
- {
+ {
+ if( iSelectionKeyDownPressed )
+ {
keyEvent.iCode = EKeyOK;
ret = EKeyWasNotConsumed;
iSelectionKeyDownPressed = EFalse;
- }
- else
- {
- // long press of Selection key was already processed
+ }
+ else
+ {
+ // long press of Selection key was already processed
ret = EKeyWasConsumed;
}
- }
+ }
}
- switch ( keyEvent.iCode )
- {
+ switch ( keyEvent.iCode )
+ {
// Open List Box item
- case EKeyEnter:
- {
+ case EKeyEnter:
+ {
switch ( iSettingIndex->At( iSettingListBox->CurrentItemIndex() ) )
- {
- case EWmlSettingsGeneral:
+ {
+ case EWmlSettingsGeneral:
case EWmlSettingsPrivacy:
case EWmlSettingsPage:
case EWmlSettingsWebFeeds:
- case EWmlSettingsToolbar:
- case EWmlSettingsShortcuts:
+ case EWmlSettingsToolbar:
+ case EWmlSettingsShortcuts:
{
- DisplayCorrectSettingCategoryListL();
+ DisplayCorrectSettingCategoryListL();
break;
- }
+ }
// Individual Settings
case EWmlSettingsAccesspoint:
@@ -3259,7 +3283,7 @@
case EWmlSettingsBackList:
case EWmlSettingsHttpSecurityWarnings:
case EWmlSettingsEcma:
- case EWmlSettingsScriptLog:
+ case EWmlSettingsScriptLog:
case EWmlSettingsDownloadsOpen:
case EWmlSettingsAutoLoadContent:
case EWmlSettingsFullScreen:
@@ -3276,50 +3300,50 @@
case EWmlSettingsCookies:
case EWmlSettingsIMEINotification:
case EWmlSettingsAutomaticUpdatingAP:
- case EWmlSettingsAutomaticUpdatingWhileRoaming:
- case EWmlSettingsUrlSuffix:
+ case EWmlSettingsAutomaticUpdatingWhileRoaming:
+ case EWmlSettingsUrlSuffix:
case EWmlSettingsFontSize:
- case EWmlSettingsToolbarButton1Cmd:
- case EWmlSettingsToolbarButton2Cmd:
- case EWmlSettingsToolbarButton3Cmd:
- case EWmlSettingsToolbarButton4Cmd:
- case EWmlSettingsToolbarButton5Cmd:
- case EWmlSettingsToolbarButton6Cmd:
- case EWmlSettingsToolbarButton7Cmd:
- case EWmlSettingsShortCutKey1Cmd:
- case EWmlSettingsShortCutKey2Cmd:
- case EWmlSettingsShortCutKey3Cmd:
- case EWmlSettingsShortCutKey4Cmd:
- case EWmlSettingsShortCutKey5Cmd:
- case EWmlSettingsShortCutKey6Cmd:
- case EWmlSettingsShortCutKey7Cmd:
- case EWmlSettingsShortCutKey8Cmd:
- case EWmlSettingsShortCutKey9Cmd:
- case EWmlSettingsShortCutKey0Cmd:
- case EWmlSettingsShortCutKeyStarCmd:
- case EWmlSettingsShortCutKeyHashCmd:
- case EWmlSettingsSearchProvider:
+ case EWmlSettingsToolbarButton1Cmd:
+ case EWmlSettingsToolbarButton2Cmd:
+ case EWmlSettingsToolbarButton3Cmd:
+ case EWmlSettingsToolbarButton4Cmd:
+ case EWmlSettingsToolbarButton5Cmd:
+ case EWmlSettingsToolbarButton6Cmd:
+ case EWmlSettingsToolbarButton7Cmd:
+ case EWmlSettingsShortCutKey1Cmd:
+ case EWmlSettingsShortCutKey2Cmd:
+ case EWmlSettingsShortCutKey3Cmd:
+ case EWmlSettingsShortCutKey4Cmd:
+ case EWmlSettingsShortCutKey5Cmd:
+ case EWmlSettingsShortCutKey6Cmd:
+ case EWmlSettingsShortCutKey7Cmd:
+ case EWmlSettingsShortCutKey8Cmd:
+ case EWmlSettingsShortCutKey9Cmd:
+ case EWmlSettingsShortCutKey0Cmd:
+ case EWmlSettingsShortCutKeyStarCmd:
+ case EWmlSettingsShortCutKeyHashCmd:
+ case EWmlSettingsSearchProvider:
{
- ChangeItemL( ETrue );
+ ChangeItemL( ETrue );
ret = EKeyWasConsumed;
break;
}
default:
break;
}
- break;
- }
-
- case EKeyOK:
+ break;
+ }
+
+ case EKeyOK:
{
// MSK command handles the commands - no need for key handling
ret = EKeyWasConsumed;
break;
}
-
+
default:
- break;
- }
+ break;
+ }
if ( iSettingListBox && ( ret == EKeyWasNotConsumed || iSettingListBox ) )
{
@@ -3367,16 +3391,16 @@
// -----------------------------------------------------------------------------
//
void CSettingsContainer::HandleGainingForegroundL()
- {
- switch(iCurrentSettingCategory)
- {
- case EGeneral:
- DisplayGeneralSettingsL();
- break;
- default: // do nothing
- break;
- }
- }
+ {
+ switch(iCurrentSettingCategory)
+ {
+ case EGeneral:
+ DisplayGeneralSettingsL();
+ break;
+ default: // do nothing
+ break;
+ }
+ }
// -----------------------------------------------------------------------------
// CSettingsContainer::CreateItemFromTwoStringsL
@@ -3426,10 +3450,10 @@
CleanupClosePushL<RFs>( fsSession );
CCnvCharacterSetConverter* charConv;
- charConv = CCnvCharacterSetConverter::NewLC();
+ charConv = CCnvCharacterSetConverter::NewLC();
CArrayFix<CCnvCharacterSetConverter::SCharacterSet>* charSets;
- charSets = charConv->CreateArrayOfCharacterSetsAvailableLC(fsSession);
+ charSets = charConv->CreateArrayOfCharacterSetsAvailableLC(fsSession);
TInt lastIndex = iEncodingArray->Count()-1;
@@ -3484,15 +3508,17 @@
AddEncodingL( KCharacterSetIdentifierWindows1253, R_WMLBROWSER_SETTINGS_ENCODING_WINDOWS_1253 );
AddEncodingL( KCharacterSetIdentifierWindows1254, R_WMLBROWSER_SETTINGS_ENCODING_WINDOWS_1254 );
AddEncodingL( KCharacterSetIdentifierWindows1257, R_WMLBROWSER_SETTINGS_ENCODING_WINDOWS_1257 );
- AddEncodingL( KCharacterSetIdentifierWindows1258, R_WMLBROWSER_SETTINGS_ENCODING_WINDOWS_1258 );
- AddEncodingL( KCharacterSetIdentifierTis620, R_WMLBROWSER_SETTINGS_ENCODING_TIS_620 ); // Thai
- AddEncodingL( KCharacterSetIdentifierWindows874, R_WMLBROWSER_SETTINGS_ENCODING_WINDOWS_874 ); // Thai
- AddEncodingL( KCharacterSetIdentifierEucJpPacked, R_WMLBROWSER_SETTINGS_ENCODING_EUC_JP );
- AddEncodingL( KCharacterSetIdentifierJis, R_WMLBROWSER_SETTINGS_ENCODING_ISO_2022_JP );
- AddEncodingL( KCharacterSetIdentifierShiftJis, R_WMLBROWSER_SETTINGS_ENCODING_SHIFT_JIS );
+ AddEncodingL( KCharacterSetIdentifierWindows1258, R_WMLBROWSER_SETTINGS_ENCODING_WINDOWS_1258 );
+ AddEncodingL( KCharacterSetIdentifierTis620, R_WMLBROWSER_SETTINGS_ENCODING_TIS_620 ); // Thai
+ AddEncodingL( KCharacterSetIdentifierWindows874, R_WMLBROWSER_SETTINGS_ENCODING_WINDOWS_874 ); // Thai
+ AddEncodingL( KCharacterSetIdentifierEucJpPacked, R_WMLBROWSER_SETTINGS_ENCODING_EUC_JP );
+ AddEncodingL( KCharacterSetIdentifierJis, R_WMLBROWSER_SETTINGS_ENCODING_ISO_2022_JP );
+ AddEncodingL( KCharacterSetIdentifierShiftJis, R_WMLBROWSER_SETTINGS_ENCODING_SHIFT_JIS );
AddEncodingL( KCharacterSetIdentifierKoi8_r, R_WMLBROWSER_SETTINGS_ENCODING_KOI8_R );
AddEncodingL( KCharacterSetIdentifierKoi8_u, R_WMLBROWSER_SETTINGS_ENCODING_KOI8_U );
AddEncodingL( KCharacterSetIdentifierIscii, R_WMLBROWSER_SETTINGS_ENCODING_ISCII);
+ AddEncodingL( KCharacterSetIdentifierEucKr, R_WMLBROWSER_SETTINGS_ENCODING_EUC_KR );
+ AddEncodingL( KCharacterSetIdentifierKsc5601, R_WMLBROWSER_SETTINGS_ENCODING_KSC_5601 );
AddEncodingL( KCharacterSetIdentifierAutomatic, R_WMLBROWSER_SETTINGS_ENCODING_AUTOMATIC );
}
@@ -3507,16 +3533,16 @@
/*
context is dependent on what Category we are in
enum TSettingCategory
- {
- EMain = 0,
- EGeneral,
- EPrivacy,
- EPage,
- EWebFeeds,
- EToolbar,
- EShortCuts,
- ENone
- };
+ {
+ EMain = 0,
+ EGeneral,
+ EPrivacy,
+ EPage,
+ EWebFeeds,
+ EToolbar,
+ EShortCuts,
+ ENone
+ };
*/
switch ( iCurrentSettingCategory )
{
@@ -3584,12 +3610,12 @@
// -----------------------------------------------------------------------------
//
void CSettingsContainer::SizeChanged()
- {
- if ( iSettingListBox )
- {
- iSettingListBox->SetRect( Rect() );
- }
- }
+ {
+ if ( iSettingListBox )
+ {
+ iSettingListBox->SetRect( Rect() );
+ }
+ }
// ----------------------------------------------------------------------------
@@ -3695,10 +3721,10 @@
CApSelect* ApSel = CApSelect::NewLC(
iApiProvider.CommsModel().CommsDb(),
KEApIspTypeAll, //KEApIspTypeWAPMandatory,
- EApBearerTypeAll,
- KEApSortNameAscending,
- EIPv4 | EIPv6 );
- TInt apSelCount = ApSel->Count();
+ EApBearerTypeAll,
+ KEApSortNameAscending,
+ EIPv4 | EIPv6 );
+ TInt apSelCount = ApSel->Count();
BROWSER_LOG( ( _L( " ApSel->Count(): %d" ), apSelCount ) );
CleanupStack::PopAndDestroy( ApSel ); //ApSel
--- a/browserui/browser/SrcData/BrowserSettings.rssi Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/SrcData/BrowserSettings.rssi Thu Aug 27 07:42:55 2009 +0300
@@ -25,7 +25,7 @@
#include "Browser.hrh" // Data definitions
#include <wmlbrowser.loc> // Localization constants
#include <avkon.loc>
-
+#include <Browser_platform_variant.hrh> //Browser feature flags
//-----------------------------------------------------------------------------
// CBAs
@@ -78,12 +78,12 @@
// ---------------------------------------------------------
//
RESOURCE MENU_BAR r_browser_settings_settings_menubar
- {
+ {
titles=
- {
+ {
MENU_TITLE { menu_pane=r_browser_settings_settings_menu; txt="App"; }
- };
- }
+ };
+ }
// ---------------------------------------------------------
@@ -94,15 +94,15 @@
// ---------------------------------------------------------
//
RESOURCE MENU_PANE r_browser_settings_settings_menu
- {
+ {
items=
- {
- MENU_ITEM { command=EWmlCmdSettingsOpen; txt=qtn_options_open; },
+ {
+ MENU_ITEM { command=EWmlCmdSettingsOpen; txt=qtn_options_open; },
MENU_ITEM { command=EWmlCmdSettingsChange; txt=qtn_wmls_local_set_opt_change; },
- MENU_ITEM {cascade = r_help_submenu; txt=qtn_options_help;},
+ MENU_ITEM {cascade = r_help_submenu; txt=qtn_options_help;},
MENU_ITEM { command=EWmlCmdUserExit; txt=qtn_options_exit; }
- };
- }
+ };
+ }
//-----------------------------------------------------------------------------
@@ -117,9 +117,9 @@
// ---------------------------------------------------------
//
RESOURCE LISTBOX r_browser_setting_categories_listbox
- {
- flags = EAknListBoxSelectionList;
- }
+ {
+ flags = EAknListBoxSelectionList;
+ }
// ---------------------------------------------------------
//
// r_browser_settings_listbox
@@ -128,9 +128,9 @@
// ---------------------------------------------------------
//
RESOURCE LISTBOX r_browser_settings_settings_listbox
- {
- flags = EAknListBoxSelectionList;
- }
+ {
+ flags = EAknListBoxSelectionList;
+ }
//-----------------------------------------------------------------------------
// Arrays for listboxes
@@ -147,11 +147,11 @@
// ---------------------------------------------------------
//
RESOURCE AVKON_SETTING_PAGE r_radio_button_setting_page
- {
- softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
- type = EAknSetListBox;
- editor_resource_id= r_setting_app_listbox;
- }
+ {
+ softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
+ type = EAknSetListBox;
+ editor_resource_id= r_setting_app_listbox;
+ }
// ---------------------------------------------------------
//
@@ -161,9 +161,9 @@
// ---------------------------------------------------------
//
RESOURCE LISTBOX r_setting_app_listbox
- {
- flags = EEikListBoxMultipleSelection;
- }
+ {
+ flags = EEikListBoxMultipleSelection;
+ }
// RESOURCE DEFINITIONS
@@ -174,23 +174,23 @@
// ---------------------------------------------------------
//
RESOURCE DIALOG r_settings_query_lines
- {
- flags=EGeneralQueryFlags;
- buttons=R_AVKON_SOFTKEYS_YES_NO__YES;
- items=
- {
- DLG_LINE
- {
- type=EAknCtQuery;
- id=EGeneralQuery;
- control= AVKON_CONFIRMATION_QUERY
- {
- layout = EConfirmationLayout;
- label = "dummy";
- };
- }
- };
- }
+ {
+ flags=EGeneralQueryFlags;
+ buttons=R_AVKON_SOFTKEYS_YES_NO__YES;
+ items=
+ {
+ DLG_LINE
+ {
+ type=EAknCtQuery;
+ id=EGeneralQuery;
+ control= AVKON_CONFIRMATION_QUERY
+ {
+ layout = EConfirmationLayout;
+ label = "dummy";
+ };
+ }
+ };
+ }
//----------------------------------------------------
@@ -220,7 +220,7 @@
{
};
}
- };
+ };
}
//----------------------------------------------------
@@ -250,7 +250,7 @@
{
};
}
- };
+ };
}
//----------------------------------------------------
@@ -264,7 +264,7 @@
items=
{
DLG_LINE
- {
+ {
type = EAknCtPopupHeadingPane;
id = EAknMessageQueryHeaderId;
control = AVKON_HEADING
@@ -280,7 +280,7 @@
{
};
}
- };
+ };
}
//----------------------------------------------------
@@ -294,7 +294,7 @@
items=
{
DLG_LINE
- {
+ {
type = EAknCtPopupHeadingPane;
id = EAknMessageQueryHeaderId;
control = AVKON_HEADING
@@ -310,7 +310,7 @@
{
};
}
- };
+ };
}
//----------------------------------------------------
@@ -368,79 +368,79 @@
// Default Access Point
-RESOURCE TBUF r_wmlbrowser_settings_default_ap { buf = qtn_wmls_local_set_default_ap; }
+RESOURCE TBUF r_wmlbrowser_settings_default_ap { buf = qtn_wmls_local_set_default_ap; }
// Autoload Images and Objects
-RESOURCE TBUF r_wmlbrowser_settings_image_autoload { buf = qtn_browsers_sett_autoload_objects; }
+RESOURCE TBUF r_wmlbrowser_settings_image_autoload { buf = qtn_browsers_sett_autoload_objects; }
// Autoload Content
-RESOURCE TBUF r_wmlbrowser_settings_autoload_content { buf = qtn_browser_sett_autoload_objects; }
+RESOURCE TBUF r_wmlbrowser_settings_autoload_content { buf = qtn_browser_sett_autoload_objects; }
// Page overview
-RESOURCE TBUF r_wmlbrowser_settings_pageoverview { buf = qtn_wmls_local_set_pageoverview; }
+RESOURCE TBUF r_wmlbrowser_settings_pageoverview { buf = qtn_wmls_local_set_pageoverview; }
-RESOURCE TBUF r_wmlbrowser_settings_pageoverview_on { buf = qtn_browsers_sett_pageoverview_on; }
-RESOURCE TBUF r_wmlbrowser_settings_pageoverview_off { buf = qtn_browsers_sett_pageoverview_off; }
+RESOURCE TBUF r_wmlbrowser_settings_pageoverview_on { buf = qtn_browsers_sett_pageoverview_on; }
+RESOURCE TBUF r_wmlbrowser_settings_pageoverview_off { buf = qtn_browsers_sett_pageoverview_off; }
// Back list
-RESOURCE TBUF r_wmlbrowser_settings_back_list { buf = qtn_browsers_sett_back_list; }
+RESOURCE TBUF r_wmlbrowser_settings_back_list { buf = qtn_browsers_sett_back_list; }
-RESOURCE TBUF r_wmlbrowser_settings_back_list_on { buf = qtn_browsers_sett_val_back_list_on; }
-RESOURCE TBUF r_wmlbrowser_settings_back_list_off { buf = qtn_browsers_sett_val_back_list_off; }
+RESOURCE TBUF r_wmlbrowser_settings_back_list_on { buf = qtn_browsers_sett_val_back_list_on; }
+RESOURCE TBUF r_wmlbrowser_settings_back_list_off { buf = qtn_browsers_sett_val_back_list_off; }
// Autorefresh
-RESOURCE TBUF r_wmlbrowser_settings_auto_refresh { buf = qtn_browsers_sett_auto_refresh; }
+RESOURCE TBUF r_wmlbrowser_settings_auto_refresh { buf = qtn_browsers_sett_auto_refresh; }
-RESOURCE TBUF r_wmlbrowser_settings_auto_refresh_on { buf = qtn_browsers_sett_val_auto_refresh_on; }
-RESOURCE TBUF r_wmlbrowser_settings_auto_refresh_off { buf = qtn_browsers_sett_val_auto_refresh_off; }
+RESOURCE TBUF r_wmlbrowser_settings_auto_refresh_on { buf = qtn_browsers_sett_val_auto_refresh_on; }
+RESOURCE TBUF r_wmlbrowser_settings_auto_refresh_off { buf = qtn_browsers_sett_val_auto_refresh_off; }
// Font Size
-RESOURCE TBUF r_wmlbrowser_settings_font_size { buf = qtn_wmls_pref_fontsize; }
+RESOURCE TBUF r_wmlbrowser_settings_font_size { buf = qtn_wmls_pref_fontsize; }
// Adaptive Bookmarks
-RESOURCE TBUF r_wmlbrowser_settings_adaptive_bookmarks { buf = qtn_browsers_sett_adaptive_bookmarks;}
+RESOURCE TBUF r_wmlbrowser_settings_adaptive_bookmarks { buf = qtn_browsers_sett_adaptive_bookmarks;}
// Full Screen
-RESOURCE TBUF r_wmlbrowser_settings_fullscreen { buf = qtn_browsers_sett_full_screen; }
+RESOURCE TBUF r_wmlbrowser_settings_fullscreen { buf = qtn_browsers_sett_full_screen; }
// Search Web
-RESOURCE TBUF r_wmlbrowser_settings_search_web { buf = qtn_browsers_sett_search; }
+RESOURCE TBUF r_wmlbrowser_settings_search_web { buf = qtn_browsers_sett_search; }
// Url Suffix
-RESOURCE TBUF r_wmlbrowser_settings_url_suffix { buf = qtn_browsers_sett_url_suffix; }
+RESOURCE TBUF r_wmlbrowser_settings_url_suffix { buf = qtn_browsers_sett_url_suffix; }
// Cookies
-RESOURCE TBUF r_wmlbrowser_settings_cookies { buf = qtn_wmls_sett_cookies; }
+RESOURCE TBUF r_wmlbrowser_settings_cookies { buf = qtn_wmls_sett_cookies; }
// ECMA Script
-RESOURCE TBUF r_wmlbrowser_settings_ecma { buf = qtn_browsers_sett_scripting; }
+RESOURCE TBUF r_wmlbrowser_settings_ecma { buf = qtn_browsers_sett_scripting; }
// HTTP Security Warnings
-RESOURCE TBUF r_wmlbrowser_settings_http_sec_wrns { buf = qtn_browser_sett_security; }
+RESOURCE TBUF r_wmlbrowser_settings_http_sec_wrns { buf = qtn_browser_sett_security; }
// Open downloads
-RESOURCE TBUF r_wmlbrowser_settings_download_open { buf = qtn_browsers_sett_open_loading; }
+RESOURCE TBUF r_wmlbrowser_settings_download_open { buf = qtn_browsers_sett_open_loading; }
// IMEI
-RESOURCE TBUF r_wmlbrowser_settings_imei { buf = qtn_wmls_local_set_imei_notif; }
+RESOURCE TBUF r_wmlbrowser_settings_imei { buf = qtn_wmls_local_set_imei_notif; }
// Wallet
RESOURCE TBUF r_wmlbrowser_settings_ewallet_auto { buf = qtn_wmls_set_wallet_auto; }
// Save Receipt
-RESOURCE TBUF r_wmlbrowser_settings_save_receipt { buf = qtn_wmls_save_receipt; }
+RESOURCE TBUF r_wmlbrowser_settings_save_receipt { buf = qtn_wmls_save_receipt; }
// Default Encoding
-RESOURCE TBUF r_wmlbrowser_settings_encoding { buf = qtn_brow_sett_defenc; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding { buf = qtn_brow_sett_defenc; }
// Query Exit
-RESOURCE TBUF r_wmlbrowser_settings_query_exit { buf = qtn_wml_setting_exit_confirm; }
+RESOURCE TBUF r_wmlbrowser_settings_query_exit { buf = qtn_wml_setting_exit_confirm; }
// Send Referrer header
-RESOURCE TBUF r_wmlbrowser_settings_send_referrer { buf = qtn_wml_setting_referrer; }
+RESOURCE TBUF r_wmlbrowser_settings_send_referrer { buf = qtn_wml_setting_referrer; }
// Media Volume
-RESOURCE TBUF r_wmlbrowser_settings_media_volume { buf = qtn_browsers_sett_media_volume; }
+RESOURCE TBUF r_wmlbrowser_settings_media_volume { buf = qtn_browsers_sett_media_volume; }
// Homepage
RESOURCE TBUF r_wmlbrowser_settings_homepage { buf = qtn_browsers_sett_homepage; }
@@ -463,8 +463,8 @@
// Automatic updating
RESOURCE TBUF r_wmlbrowser_settings_autoupdating_roaming { buf = qtn_browsers_sett_autoupdating_roaming; }
-RESOURCE TBUF r_wmlbrowser_settings_autoupdating_roaming_on { buf = qtn_browsers_sett_val_autoupdating_roaming_on; }
-RESOURCE TBUF r_wmlbrowser_settings_autoupdating_roaming_off { buf = qtn_browsers_sett_val_autoupdating_roaming_off; }
+RESOURCE TBUF r_wmlbrowser_settings_autoupdating_roaming_on { buf = qtn_browsers_sett_val_autoupdating_roaming_on; }
+RESOURCE TBUF r_wmlbrowser_settings_autoupdating_roaming_off { buf = qtn_browsers_sett_val_autoupdating_roaming_off; }
// Automatic updating info note ( if AP = Always Ask and automatic updating is off.)
@@ -481,43 +481,43 @@
//
// Autoload Images and Objects
-RESOURCE TBUF r_wmlbrowser_settings_ai_value_on { buf = qtn_wmls_local_var_image_on; }
-RESOURCE TBUF r_wmlbrowser_settings_ai_value_off { buf = qtn_wmls_local_var_image_off; }
+RESOURCE TBUF r_wmlbrowser_settings_ai_value_on { buf = qtn_wmls_local_var_image_on; }
+RESOURCE TBUF r_wmlbrowser_settings_ai_value_off { buf = qtn_wmls_local_var_image_off; }
// Autoload Content
-RESOURCE TBUF r_wmlbrowser_settings_autoload_text { buf = qtn_browser_sett_autoload_text; }
-RESOURCE TBUF r_wmlbrowser_settings_autoload_images_no_flash { buf = qtn_browser_sett_autoload_images_no_flash; }
-RESOURCE TBUF r_wmlbrowser_settings_autoload_all { buf = qtn_browser_sett_autoload_all; }
+RESOURCE TBUF r_wmlbrowser_settings_autoload_text { buf = qtn_browser_sett_autoload_text; }
+RESOURCE TBUF r_wmlbrowser_settings_autoload_images_no_flash { buf = qtn_browser_sett_autoload_images_no_flash; }
+RESOURCE TBUF r_wmlbrowser_settings_autoload_all { buf = qtn_browser_sett_autoload_all; }
// Expanded View (Text Wrapping)
-RESOURCE TBUF r_wmlbrowser_settings_ev_value_on { buf = qtn_wmls_local_var_expand_on; }
-RESOURCE TBUF r_wmlbrowser_settings_ev_value_off { buf = qtn_wmls_local_var_expand_off; }
+RESOURCE TBUF r_wmlbrowser_settings_ev_value_on { buf = qtn_wmls_local_var_expand_on; }
+RESOURCE TBUF r_wmlbrowser_settings_ev_value_off { buf = qtn_wmls_local_var_expand_off; }
// Default Encoding
-RESOURCE TBUF r_wmlbrowser_settings_encoding_gb2312 { buf = qtn_brow_sett_defenc_gb2312; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_1 { buf = qtn_brow_sett_defenc_latin1; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_big5 { buf = qtn_brow_sett_defenc_big5; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_utf8 { buf = qtn_brow_sett_defenc_utf8; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_2 { buf = qtn_brow_sett_charenc_iso_8859_2; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_4 { buf = qtn_brow_sett_charenc_iso_8859_4; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_5 { buf = qtn_brow_sett_charenc_iso_8859_5; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_7 { buf = qtn_brow_sett_charenc_iso_8859_7; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_9 { buf = qtn_brow_sett_charenc_iso_8859_9; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_6 { buf = qtn_wmls_sett_defenc_iso_88596; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_8 { buf = qtn_wmls_sett_defenc_iso_88598; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_8i { buf = qtn_wmls_sett_defenc_iso_88598_i; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1256 { buf = qtn_wmls_sett_defenc_windows_1256; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1255 { buf = qtn_wmls_sett_defenc_windows_1255; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1250 { buf = qtn_wmls_sett_defenc_windows_1250; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1251 { buf = qtn_wmls_sett_defenc_windows_1251; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1253 { buf = qtn_wmls_sett_defenc_windows_1253; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1254 { buf = qtn_wmls_sett_defenc_windows_1254; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1257 { buf = qtn_wmls_sett_defenc_windows_1257; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1258 { buf = qtn_wmls_sett_defenc_windows_1258; }
-RESOURCE TBUF r_wmlbrowser_settings_encoding_tis_620 { buf = qtn_wmls_sett_defenc_tis_620; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_gb2312 { buf = qtn_brow_sett_defenc_gb2312; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_1 { buf = qtn_brow_sett_defenc_latin1; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_big5 { buf = qtn_brow_sett_defenc_big5; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_utf8 { buf = qtn_brow_sett_defenc_utf8; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_2 { buf = qtn_brow_sett_charenc_iso_8859_2; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_4 { buf = qtn_brow_sett_charenc_iso_8859_4; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_5 { buf = qtn_brow_sett_charenc_iso_8859_5; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_7 { buf = qtn_brow_sett_charenc_iso_8859_7; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_9 { buf = qtn_brow_sett_charenc_iso_8859_9; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_6 { buf = qtn_wmls_sett_defenc_iso_88596; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_8 { buf = qtn_wmls_sett_defenc_iso_88598; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_iso8859_8i { buf = qtn_wmls_sett_defenc_iso_88598_i; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1256 { buf = qtn_wmls_sett_defenc_windows_1256; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1255 { buf = qtn_wmls_sett_defenc_windows_1255; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1250 { buf = qtn_wmls_sett_defenc_windows_1250; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1251 { buf = qtn_wmls_sett_defenc_windows_1251; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1253 { buf = qtn_wmls_sett_defenc_windows_1253; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1254 { buf = qtn_wmls_sett_defenc_windows_1254; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1257 { buf = qtn_wmls_sett_defenc_windows_1257; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_1258 { buf = qtn_wmls_sett_defenc_windows_1258; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_tis_620 { buf = qtn_wmls_sett_defenc_tis_620; }
RESOURCE TBUF r_wmlbrowser_settings_encoding_windows_874 { buf = qtn_wmls_sett_defenc_windows_874;}
RESOURCE TBUF r_wmlbrowser_settings_encoding_shift_jis { buf = qtn_wmls_sett_defenc_shift_jis; }
RESOURCE TBUF r_wmlbrowser_settings_encoding_euc_jp { buf = qtn_wmls_sett_defenc_euc_jp; }
@@ -526,21 +526,23 @@
RESOURCE TBUF r_wmlbrowser_settings_encoding_koi8_r { buf = qtn_wmls_sett_defenc_shift_koi8_r; }
RESOURCE TBUF r_wmlbrowser_settings_encoding_koi8_u { buf = qtn_wmls_sett_defenc_shift_koi8_u; }
RESOURCE TBUF r_wmlbrowser_settings_encoding_iscii { buf = qtn_wmls_sett_defenc_iscii; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_euc_kr { buf = qtn_wmls_sett_defenc_euc_kr; }
+RESOURCE TBUF r_wmlbrowser_settings_encoding_ksc_5601 { buf = "Korean (Euc-Kr)"; }
RESOURCE TBUF r_wmlbrowser_settings_encoding_automatic { buf = qtn_wmls_sett_defenc_automatic; }
// Media Volume
-RESOURCE TBUF r_wmlbrowser_settings_media_volume_muted { buf = qtn_browsers_sett_volume_muted; }
-RESOURCE TBUF r_wmlbrowser_settings_media_volume_1 { buf = qtn_browsers_sett_volume_1; }
-RESOURCE TBUF r_wmlbrowser_settings_media_volume_2 { buf = qtn_browsers_sett_volume_2; }
-RESOURCE TBUF r_wmlbrowser_settings_media_volume_3 { buf = qtn_browsers_sett_volume_3; }
-RESOURCE TBUF r_wmlbrowser_settings_media_volume_4 { buf = qtn_browsers_sett_volume_4; }
+RESOURCE TBUF r_wmlbrowser_settings_media_volume_muted { buf = qtn_browsers_sett_volume_muted; }
+RESOURCE TBUF r_wmlbrowser_settings_media_volume_1 { buf = qtn_browsers_sett_volume_1; }
+RESOURCE TBUF r_wmlbrowser_settings_media_volume_2 { buf = qtn_browsers_sett_volume_2; }
+RESOURCE TBUF r_wmlbrowser_settings_media_volume_3 { buf = qtn_browsers_sett_volume_3; }
+RESOURCE TBUF r_wmlbrowser_settings_media_volume_4 { buf = qtn_browsers_sett_volume_4; }
// Font Size
-RESOURCE TBUF r_wmlbrowser_settings_fs_value_all_small { buf = qtn_xhtml_settings_all_small; }
-RESOURCE TBUF r_wmlbrowser_settings_fs_value_smaller { buf = qtn_xhtml_settings_smaller; }
-RESOURCE TBUF r_wmlbrowser_settings_fs_value_normal { buf = qtn_xhtml_settings_normal; }
-RESOURCE TBUF r_wmlbrowser_settings_fs_value_larger { buf = qtn_xhtml_settings_larger; }
-RESOURCE TBUF r_wmlbrowser_settings_fs_value_all_large { buf = qtn_xhtml_settings_all_large; }
+RESOURCE TBUF r_wmlbrowser_settings_fs_value_all_small { buf = qtn_xhtml_settings_all_small; }
+RESOURCE TBUF r_wmlbrowser_settings_fs_value_smaller { buf = qtn_xhtml_settings_smaller; }
+RESOURCE TBUF r_wmlbrowser_settings_fs_value_normal { buf = qtn_xhtml_settings_normal; }
+RESOURCE TBUF r_wmlbrowser_settings_fs_value_larger { buf = qtn_xhtml_settings_larger; }
+RESOURCE TBUF r_wmlbrowser_settings_fs_value_all_large { buf = qtn_xhtml_settings_all_large; }
// Adaptive Bookmarks
RESOURCE TBUF r_wmlbrowser_settings_adaptive_bookmarks_value_on {buf =qtn_browsers_sett_adaptive_bookmarks_on;}
@@ -548,54 +550,54 @@
RESOURCE TBUF r_wmlbrowser_settings_adaptive_bookmarks_value_off {buf =qtn_browsers_sett_adaptive_bookmarks_off;}
// Full Screen
-RESOURCE TBUF r_wmlbrowser_settings_fullscreen_value_normal { buf = qtn_browsers_sett_full_screen_normal; }
-RESOURCE TBUF r_wmlbrowser_settings_fullscreen_value_softkeysonly { buf = qtn_browsers_sett_full_screen_normal; }
-RESOURCE TBUF r_wmlbrowser_settings_fullscreen_value_fullscreen { buf = qtn_browsers_sett_full_screen_full_screen;}
+RESOURCE TBUF r_wmlbrowser_settings_fullscreen_value_normal { buf = qtn_browsers_sett_full_screen_normal; }
+RESOURCE TBUF r_wmlbrowser_settings_fullscreen_value_softkeysonly { buf = qtn_browsers_sett_full_screen_normal; }
+RESOURCE TBUF r_wmlbrowser_settings_fullscreen_value_fullscreen { buf = qtn_browsers_sett_full_screen_full_screen;}
// Display Softkeys
-RESOURCE TBUF r_wmlbrowser_settings_softkeys { buf = qtn_browsers_sett_softkeys; }
-RESOURCE TBUF r_wmlbrowser_settings_softkeys_on { buf = qtn_browsers_sett_softkeys_on; }
-RESOURCE TBUF r_wmlbrowser_settings_softkeys_off { buf = qtn_browsers_sett_softkeys_off; }
+RESOURCE TBUF r_wmlbrowser_settings_softkeys { buf = qtn_browsers_sett_softkeys; }
+RESOURCE TBUF r_wmlbrowser_settings_softkeys_on { buf = qtn_browsers_sett_softkeys_on; }
+RESOURCE TBUF r_wmlbrowser_settings_softkeys_off { buf = qtn_browsers_sett_softkeys_off; }
// Cookies
-RESOURCE TBUF r_wmlbrowser_settings_c_value_allow { buf = qtn_wmls_sett_cookie_allow; }
-RESOURCE TBUF r_wmlbrowser_settings_c_value_reject { buf = qtn_wmls_sett_cookie_reject; }
+RESOURCE TBUF r_wmlbrowser_settings_c_value_allow { buf = qtn_wmls_sett_cookie_allow; }
+RESOURCE TBUF r_wmlbrowser_settings_c_value_reject { buf = qtn_wmls_sett_cookie_reject; }
// ECMA
-RESOURCE TBUF r_wmlbrowser_settings_ecma_value_enable { buf = qtn_browsers_sett_scripting_enable; }
-RESOURCE TBUF r_wmlbrowser_settings_ecma_value_disable { buf = qtn_browsers_sett_scripting_disable; }
+RESOURCE TBUF r_wmlbrowser_settings_ecma_value_enable { buf = qtn_browsers_sett_scripting_enable; }
+RESOURCE TBUF r_wmlbrowser_settings_ecma_value_disable { buf = qtn_browsers_sett_scripting_disable; }
// HTTP Security Warnings
-RESOURCE TBUF r_wmlbrowser_settings_wrn_value_show { buf = qtn_browser_sett_item_show_all; }
-RESOURCE TBUF r_wmlbrowser_settings_wrn_value_hide { buf = qtn_browser_sett_item_hide_all; }
+RESOURCE TBUF r_wmlbrowser_settings_wrn_value_show { buf = qtn_browser_sett_item_show_all; }
+RESOURCE TBUF r_wmlbrowser_settings_wrn_value_hide { buf = qtn_browser_sett_item_hide_all; }
// Download Open Selection
-RESOURCE TBUF r_wmlbrowser_settings_download_open_yes { buf = qtn_brow_sett_open_downloads_yes; }
-RESOURCE TBUF r_wmlbrowser_settings_download_open_no { buf = qtn_brow_sett_open_downloads_no; }
+RESOURCE TBUF r_wmlbrowser_settings_download_open_yes { buf = qtn_brow_sett_open_downloads_yes; }
+RESOURCE TBUF r_wmlbrowser_settings_download_open_no { buf = qtn_brow_sett_open_downloads_no; }
// IMEI
-RESOURCE TBUF r_wmlbrowser_settings_imei_value_enabled { buf = qtn_wmls_local_set_imei_notif_enabled; }
-RESOURCE TBUF r_wmlbrowser_settings_imei_value_disabled { buf = qtn_wmls_local_set_imei_notif_disabled; }
+RESOURCE TBUF r_wmlbrowser_settings_imei_value_enabled { buf = qtn_wmls_local_set_imei_notif_enabled; }
+RESOURCE TBUF r_wmlbrowser_settings_imei_value_disabled { buf = qtn_wmls_local_set_imei_notif_disabled; }
// DTMF
-RESOURCE TBUF r_wmlbrowser_settings_sdtmf_value_always_confirm { buf = qtn_wmls_wtai_dtmf_alcon; }
-RESOURCE TBUF r_wmlbrowser_settings_sdtmf_value_confirm_once { buf = qtn_wmls_wtai_dtmf_one; }
+RESOURCE TBUF r_wmlbrowser_settings_sdtmf_value_always_confirm { buf = qtn_wmls_wtai_dtmf_alcon; }
+RESOURCE TBUF r_wmlbrowser_settings_sdtmf_value_confirm_once { buf = qtn_wmls_wtai_dtmf_one; }
// Save Receipt
-RESOURCE TBUF r_wmlbrowser_settings_sr_value_to_notepad { buf = qtn_wmls_save_to_notepad; }
-RESOURCE TBUF r_wmlbrowser_settings_sr_value_never { buf = qtn_wmls_save_not; }
+RESOURCE TBUF r_wmlbrowser_settings_sr_value_to_notepad { buf = qtn_wmls_save_to_notepad; }
+RESOURCE TBUF r_wmlbrowser_settings_sr_value_never { buf = qtn_wmls_save_not; }
// Wallet
-RESOURCE TBUF r_wmlbrowser_settings_wallet_auto_on { buf = qtn_wmls_wall_auto_on; }
-RESOURCE TBUF r_wmlbrowser_settings_wallet_auto_off { buf = qtn_wmls_wall_auto_off; }
+RESOURCE TBUF r_wmlbrowser_settings_wallet_auto_on { buf = qtn_wmls_wall_auto_on; }
+RESOURCE TBUF r_wmlbrowser_settings_wallet_auto_off { buf = qtn_wmls_wall_auto_off; }
// Query Exit
-RESOURCE TBUF r_wmlbrowser_settings_query_exit_on { buf = qtn_wml_setting_exit_on; }
-RESOURCE TBUF r_wmlbrowser_settings_query_exit_off { buf = qtn_wml_setting_exit_off; }
+RESOURCE TBUF r_wmlbrowser_settings_query_exit_on { buf = qtn_wml_setting_exit_on; }
+RESOURCE TBUF r_wmlbrowser_settings_query_exit_off { buf = qtn_wml_setting_exit_off; }
// Send Referrer header
-RESOURCE TBUF r_wmlbrowser_settings_send_referrer_on { buf = qtn_wml_setting_refer_on; }
-RESOURCE TBUF r_wmlbrowser_settings_send_referrer_off { buf = qtn_wml_setting_refer_off; }
+RESOURCE TBUF r_wmlbrowser_settings_send_referrer_on { buf = qtn_wml_setting_refer_on; }
+RESOURCE TBUF r_wmlbrowser_settings_send_referrer_off { buf = qtn_wml_setting_refer_off; }
// Home Page
RESOURCE TBUF r_wmlbrowser_settings_homepage_access_point { buf = qtn_browsers_sett_ap_home_page; }
@@ -607,8 +609,8 @@
RESOURCE TBUF r_wmlbrowser_settings_searchpage_new_address { buf = qtn_browsers_sett_search; }
// Enable Popup Blocking (Multiple Windows)
-RESOURCE TBUF r_wmlbrowser_settings_popup_blocking_on { buf = qtn_brow_sett_pop_up_blocking_on; }
-RESOURCE TBUF r_wmlbrowser_settings_popup_blocking_off { buf = qtn_brow_sett_pop_up_blocking_off; }
+RESOURCE TBUF r_wmlbrowser_settings_popup_blocking_on { buf = qtn_brow_sett_pop_up_blocking_on; }
+RESOURCE TBUF r_wmlbrowser_settings_popup_blocking_off { buf = qtn_brow_sett_pop_up_blocking_off; }
// Form Data Saving
RESOURCE TBUF r_wmlbrowser_settings_form_data_saving_on { buf = qtn_brow_sett_form_data_saving_on; }
@@ -621,8 +623,8 @@
// SCRIPT LOG
RESOURCE TBUF r_wmlbrowser_settings_scriptlog { buf = qtn_browsers_sett_scriptlog; }
-RESOURCE TBUF r_wmlbrowser_settings_scriptlog_value_disable { buf = qtn_browsers_sett_scriptlog_disable; }
-RESOURCE TBUF r_wmlbrowser_settings_scriptlog_value_to_file { buf = qtn_browsers_sett_scriptlog_to_file; }
+RESOURCE TBUF r_wmlbrowser_settings_scriptlog_value_disable { buf = qtn_browsers_sett_scriptlog_disable; }
+RESOURCE TBUF r_wmlbrowser_settings_scriptlog_value_to_file { buf = qtn_browsers_sett_scriptlog_to_file; }
RESOURCE TBUF r_wmlbrowser_settings_scriptlog_value_to_console { buf = qtn_browsers_sett_scriptlog_to_console; }
RESOURCE TBUF r_wmlbrowser_settings_scriptlog_value_to_console_file { buf = qtn_browsers_sett_scriptlog_to_console_file; }
@@ -703,10 +705,10 @@
//
// ---------------------------------------------------------
//
-RESOURCE TBUF r_wml_session_view_title { buf=qtn_wmls_session_info; }
-RESOURCE TBUF r_wml_session_view_ap { buf = qtn_wmls_ses_view_ap; }
-RESOURCE TBUF r_wml_session_view_bt { buf = qtn_wmls_ses_view_bearer_type; }
-RESOURCE TBUF r_wml_session_view_cs { buf = qtn_wmls_ses_view_max_speed; }
+RESOURCE TBUF r_wml_session_view_title { buf=qtn_wmls_session_info; }
+RESOURCE TBUF r_wml_session_view_ap { buf = qtn_wmls_ses_view_ap; }
+RESOURCE TBUF r_wml_session_view_bt { buf = qtn_wmls_ses_view_bearer_type; }
+RESOURCE TBUF r_wml_session_view_cs { buf = qtn_wmls_ses_view_max_speed; }
// ---------------------------------------------------------
//
@@ -715,16 +717,16 @@
//
// ---------------------------------------------------------
//
-RESOURCE TBUF r_wml_security_view_title { buf=qtn_wmlsec_security_info; }
-RESOURCE TBUF r_wml_certificate_details { buf = qtn_wmlsec_cert_details; }
-RESOURCE TBUF r_wml_security_conn_type { buf = qtn_wmlsec_ses_info_contype; }
-RESOURCE TBUF r_wml_security_server_aut { buf = qtn_wmlsec_ses_info_server; }
-RESOURCE TBUF r_wml_security_info_issuer { buf = qtn_wmlsec_ses_info_issuer; }
-RESOURCE TBUF r_wml_security_cert_owner { buf = qtn_wmlsec_ses_info_cert_owner; }
-RESOURCE TBUF r_wml_security_valid_from { buf = qtn_wmlsec_ses_info_valid_from; }
-RESOURCE TBUF r_wml_security_valid_to { buf = qtn_wmlsec_ses_info_valid_to; }
-RESOURCE TBUF r_wml_security_fingerprint { buf = qtn_wmlsec_ses_info_fingerprint; }
-RESOURCE TBUF r_wml_security_serialno { buf = qtn_wmlsec_ses_info_serialno; }
+RESOURCE TBUF r_wml_security_view_title { buf=qtn_wmlsec_security_info; }
+RESOURCE TBUF r_wml_certificate_details { buf = qtn_wmlsec_cert_details; }
+RESOURCE TBUF r_wml_security_conn_type { buf = qtn_wmlsec_ses_info_contype; }
+RESOURCE TBUF r_wml_security_server_aut { buf = qtn_wmlsec_ses_info_server; }
+RESOURCE TBUF r_wml_security_info_issuer { buf = qtn_wmlsec_ses_info_issuer; }
+RESOURCE TBUF r_wml_security_cert_owner { buf = qtn_wmlsec_ses_info_cert_owner; }
+RESOURCE TBUF r_wml_security_valid_from { buf = qtn_wmlsec_ses_info_valid_from; }
+RESOURCE TBUF r_wml_security_valid_to { buf = qtn_wmlsec_ses_info_valid_to; }
+RESOURCE TBUF r_wml_security_fingerprint { buf = qtn_wmlsec_ses_info_fingerprint; }
+RESOURCE TBUF r_wml_security_serialno { buf = qtn_wmlsec_ses_info_serialno; }
// ---------------------------------------------------------
//
@@ -733,8 +735,8 @@
//
// ---------------------------------------------------------
//
-RESOURCE TBUF r_wml_security_conn_secure { buf=qtn_wmlsec_ses_info_con_secur; }
-RESOURCE TBUF r_wml_security_conn_unsecure { buf=qtn_wmlsec_ses_info_con_unsec; }
+RESOURCE TBUF r_wml_security_conn_secure { buf=qtn_wmlsec_ses_info_con_secur; }
+RESOURCE TBUF r_wml_security_conn_unsecure { buf=qtn_wmlsec_ses_info_con_unsec; }
// ---------------------------------------------------------
//
@@ -744,11 +746,11 @@
// ---------------------------------------------------------
//
-RESOURCE TBUF r_wml_bearer_data_call { buf=qtn_set_bearer_data_call; }
-RESOURCE TBUF r_wml_bearer_packet_data { buf=qtn_set_bearer_packet_data; }
-RESOURCE TBUF r_wml_bearer_hscsd { buf=qtn_browser_set_bearer_hscsd; }
+RESOURCE TBUF r_wml_bearer_data_call { buf=qtn_set_bearer_data_call; }
+RESOURCE TBUF r_wml_bearer_packet_data { buf=qtn_set_bearer_packet_data; }
+RESOURCE TBUF r_wml_bearer_hscsd { buf=qtn_browser_set_bearer_hscsd; }
-RESOURCE TBUF r_wml_conn_speed_ad { buf=qtn_set_auto_detect; }
+RESOURCE TBUF r_wml_conn_speed_ad { buf=qtn_set_auto_detect; }
// ---------------------------------------------------------
//
@@ -757,12 +759,12 @@
//
// ---------------------------------------------------------
//
-RESOURCE TBUF r_wmlbrowser_settings_title { buf = qtn_wmls_browser_opt_sett; }
+RESOURCE TBUF r_wmlbrowser_settings_title { buf = qtn_wmls_browser_opt_sett; }
-RESOURCE TBUF r_wmlbrowser_settings_title_general { buf = qtn_browsers_title_general; }
-RESOURCE TBUF r_wmlbrowser_settings_title_page { buf = qtn_browsers_title_page; }
-RESOURCE TBUF r_wmlbrowser_settings_title_privacy { buf = qtn_browsers_title_privacy; }
-RESOURCE TBUF r_wmlbrowser_settings_title_webfeeds { buf = qtn_browsers_fldr_feeds; }
+RESOURCE TBUF r_wmlbrowser_settings_title_general { buf = qtn_browsers_title_general; }
+RESOURCE TBUF r_wmlbrowser_settings_title_page { buf = qtn_browsers_title_page; }
+RESOURCE TBUF r_wmlbrowser_settings_title_privacy { buf = qtn_browsers_title_privacy; }
+RESOURCE TBUF r_wmlbrowser_settings_title_webfeeds { buf = qtn_browsers_fldr_feeds; }
// ---------------------------------------------------------
//
@@ -771,7 +773,7 @@
//
// ---------------------------------------------------------
//
-RESOURCE TBUF r_wml_settings_default_access_point_none { buf = qtn_selec_sett_val_field_none; }
+RESOURCE TBUF r_wml_settings_default_access_point_none { buf = qtn_selec_sett_val_field_none; }
// ---------------------------------------------------------
@@ -782,8 +784,8 @@
// ---------------------------------------------------------
//
-RESOURCE TBUF r_browser_query_current_page { buf = qtn_browser_query_current_page; }
-RESOURCE TBUF r_browser_query_current_page_url { buf = qtn_browser_query_current_page_url; }
+RESOURCE TBUF r_browser_query_current_page { buf = qtn_browser_query_current_page; }
+RESOURCE TBUF r_browser_query_current_page_url { buf = qtn_browser_query_current_page_url; }
// ---------------------------------------------------------
//
@@ -793,8 +795,12 @@
// ---------------------------------------------------------
//
-RESOURCE TBUF r_wml_settings_access_point_user_defined { buf = qtn_wml_settings_access_point_user_defined; }
-RESOURCE TBUF r_wml_settings_access_point_ask_when_needed { buf = qtn_wml_settings_access_point_ask_when_needed; }
+RESOURCE TBUF r_wml_settings_access_point_user_defined { buf = qtn_wml_settings_access_point_user_defined; }
+#if !defined(BRDO_BROWSER_50_FF)
+ RESOURCE TBUF r_wml_settings_access_point_always_ask { buf = qtn_wml_settings_access_point_always_ask; }
+#else
+ RESOURCE TBUF r_wml_settings_access_point_ask_when_needed { buf = qtn_wml_settings_access_point_ask_when_needed; }
+#endif // BRDO_BROWSER_50_FF
#endif
Binary file browserui/browser/help/data/xhtml.zip has changed
--- a/browserui/browser/help/group/bld.inf Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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 the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-*
-* Contributors:
-*
-*
-* Description:
-* Export help related files.
-*
-*/
-
-#include <platform_paths.hrh>
-PRJ_EXPORTS
-:zip ../data/xhtml.zip /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip /epoc32/winscw/c/resource/ overwrite
-
-../inc/browser.hlp.hrh APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/browser.hlp.hrh)
-../rom/browseruihelps_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(browseruihelps_variant.iby)
--- a/browserui/browser/help/inc/browser.hlp.hrh Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-//
-// browser.hlp.hrh
-//
-
-//
-// File generated by CSXHelp Utilities on 2009-04-17
-//
-
-#ifndef __BROWSER_HLP_HRH__
-#define __BROWSER_HLP_HRH__
-
-_LIT(KOSS_HLP_BM_ADDBM, "OSS_HLP_BM_ADDBM"); //
-_LIT(KOSS_HLP_RSS_ADD, "OSS_HLP_RSS_ADD"); //
-_LIT(KOSS_HLP_BM_MAIN, "OSS_HLP_BM_MAIN"); //
-_LIT(KOSS_HLP_PAGEVIEW, "OSS_HLP_PAGEVIEW"); //
-_LIT(KOSS_HLP_BM_EDIT, "OSS_HLP_BM_EDIT"); //
-_LIT(KOSS_HLP_RSS_EDIT, "OSS_HLP_RSS_EDIT"); //
-_LIT(KOSS_HLP_SETTINGS_GENERAL, "OSS_HLP_SETTINGS_GENERAL"); //
-_LIT(KOSS_HLP_SETTINGS_PAGE, "OSS_HLP_SETTINGS_PAGE"); //
-_LIT(KOSS_HLP_SETTINGS_PRIVACY, "OSS_HLP_SETTINGS_PRIVACY"); //
-_LIT(KOSS_HLP_RSS_ARTICLE, "OSS_HLP_RSS_ARTICLE"); //
-_LIT(KOSS_HLP_SETTINGS_RSS, "OSS_HLP_SETTINGS_RSS"); //
-_LIT(KOSS_HLP_RSS_ARTICLELST, "OSS_HLP_RSS_ARTICLELST"); //
-_LIT(KOSS_HLP_PAGEVIEW_EMBED, "OSS_HLP_PAGEVIEW_EMBED"); //
-_LIT(KOSS_HLP_SETTINGS_FOLDERS, "OSS_HLP_SETTINGS_FOLDERS"); //
-_LIT(KOSS_HLP_RSS_MAIN, "OSS_HLP_RSS_MAIN"); //
-
-#endif
\ No newline at end of file
--- a/browserui/browser/help/rom/browseruihelps_variant.iby Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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 the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __BROWSERUIHELPS_VARIANT_IBY__
-#define __BROWSERUIHELPS_VARIANT_IBY__
-
-#if defined(FF_S60_HELPS_IN_USE) && defined(__BROWSERUI_USED)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008d39\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10008d39\contents.zip)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008d39\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008d39\index.xml)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008d39\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008d39\keywords.xml)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008d39\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008d39\meta.xml)
-#endif
-
-#endif
\ No newline at end of file
--- a/browserui/browser/loc/Feeds.loc Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/loc/Feeds.loc Thu Aug 27 07:42:55 2009 +0300
@@ -21,6 +21,11 @@
/* Application related */
/* -------------------------------------------------------------------- */
//d:application name
+//l:list_single_large_graphic_pane_t1
+//w:
+//r:3.0
+#define qtn_apps_feeds_list "Web Feeds"
+//d:application name
//l:cell_app_pane_t1
//w:
//r:3.0
@@ -467,6 +472,14 @@
//d: Information text for the error dialog. Displayed when an OPML file
//d: somehow gets deleted after it is found and displayed in the list, and the
+#define qtn_feeds_malformed_dialog_text "Can't process feed"
+
+//d: Information text for the error dialog. Displayed when a requested
+//d: feed is in an unsupported format.
+//l:popup_note_window
+//w:
+//r:3.0
+#define qtn_feeds_unsupported_dialog_text "Feed format is not supported"
//d: user then tries to select and import it.
//l:popup_note_window
//w:
@@ -482,4 +495,58 @@
#define qtn_feeds_unnamed_item "Unnamed item"
+/* Strings copied from wmlBrowser.loc */
+/* -------------------------------------------------------------------- */
+//d:DO element menu item
+//l:list_single_popup_submenu_pane_t1
+//
+#define text_wml_option_back "Back"
+//d:Menu item in Bookmarks View: activate highlighted bookmark
+//l:list_single_pane_t1_cp2
+//
+#define qtn_wmlbm_load_bm "Activate"
+
+// WmlBrowser Settings/Session listbox items
+
+//d:Browser settings session list item texts
+//l:heading_pane_t1
+//
+#define qtn_wmls_session_info "Session info"
+
+//d:Format title text in session view.
+//l:popup_info_list_pane_t1
+//
+#define qtn_wmls_ses_view_ap "Access point name:"
+
+//d:Browser settings session list item texts
+//l:popup_info_list_pane_t1
+//
+#define qtn_wmls_ses_view_bearer_type "Bearer type:"
+
+//d:Browser settings session list item texts
+//l:popup_info_list_pane_t1
+//
+#define qtn_wmls_ses_view_max_speed "Max. connection speed:"
+
+//d:Text in About Product information note's heading
+//l:heading_pane_t1
+#define qtn_browsers_title_about "Name and Version"
+
+//d:Text in About Product information note, the first %U is the browser version number, the second is the Browser build number
+//l:popup_info_list_pane_t1
+#define qtn_browsers_about_version_label "Version: %0U (%1U)"
+
+//d:Browser settings session list item texts
+//l:popup_info_list_pane_t1
+//
+#define qtn_browser_set_bearer_hscsd "HSCSD"
+
+//d: Information text for the error dialog. Displayed when a requested
+//d: feed couldn't be fetched from the network.
+//l:popup_note_window
+//w:
+//r:3.0
+#define qtn_feeds_network_error_dialog_text "Couldn't update feed"
+
+
--- a/browserui/browser/loc/WmlBrowser.loc Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/browser/loc/WmlBrowser.loc Thu Aug 27 07:42:55 2009 +0300
@@ -255,6 +255,9 @@
// Authentication Dialog
+//d:label for bookmark name query
+//l:popup_query_data_window
+#define qtn_wml_query_bookmark_title "Enter bookmark name"
//d:label for saved deck name query
//l:popup_query_data_window
#define qtn_wml_query_savedpage_title "Enter name for saved page"
@@ -846,6 +849,16 @@
//
#define qtn_wmls_sett_defenc_iscii "ISCII"
+//d: Browser default character encoding in browser settings: Korean (Euc-Kr)
+//l: list_set_graphic_pane_t1
+//
+#define qtn_wmls_sett_defenc_euc_kr "Korean (Euc-Kr)"
+
+//d: Browser default character encoding in browser settings: Korean (KSC5601)
+//l: list_set_graphic_pane_t1
+//
+#define qtn_wmls_sett_defenc_ksc_5601 "Korean (KSC5601)"
+
//d:Browser settings main list item texts
//l:list_setting_pane_t1
//
@@ -1256,6 +1269,10 @@
//l:list_single_popup_submenu_pane_t1
//
#define qtn_browserbm_options_copy_to_bookmarks_sm "Copy to bookmarks"
+//d: Options menu item for deleting all Recent URLs.
+//l:list_single_pane_t1_cp2
+//
+#define qtn_browserbm_options_clear_adaptive_bookmarks "Clear Recent URLs"
//d: Confirmation note shown when 1 Adaptive Bookmark has been copied to root level of Bookmarks View.
//l:popup_note_window
@@ -1410,6 +1427,9 @@
//d:Menu item in Preferences->Options->Info menu
//l:list_single_pane_t1_cp2
#define qtn_wml_opt_about_product "Name and version"
+//d:Text in About Product information note's heading
+//l:heading_pane_t1
+#define qtn_browsers_title_about "Name and Version"
//d:Menu item in Preferences->Options->Info menu
//l:list_single_pane_t1_cp2
@@ -1977,6 +1997,65 @@
//w:
//r:3.1
//
+#define qtn_browsers_sett_autoupdating "Automatic updating"
+
+//d: Selectable text for the Automatic updating setting
+//d: If Off is selected, automatic updating does not occur
+//l: list_set_graphic_pane_t1
+//w:
+//r:3.1
+//
+#define qtn_browsers_sett_autoupdating_off "Off"
+
+//d: Selectable text for the Automatic updating setting
+//d: Autoupdating is done every 15 minutes
+//l: list_set_graphic_pane_t1
+//w:
+//r:3.1
+//
+#define qtn_browsers_sett_feeds_updating_interval_15min "Every 15 minutes"
+
+
+//d: Selectable text for the Automatic updating setting
+//d: Autoupdating is done every hour
+//l: list_set_graphic_pane_t1
+//w:
+//r:3.1
+//
+#define qtn_browsers_sett_feeds_updating_interval_hourly "Every hour"
+
+
+//d: Selectable text for the Automatic updating setting
+//d: Autoupdating is done every 4 hours
+//l: list_set_graphic_pane_t1
+//w:
+//r:3.1
+//
+#define qtn_browsers_sett_feeds_updating_interval_4hours "Every 4 hours"
+
+
+//d: Selectable text for the Automatic updating setting
+//d: Autoupdating is done daily
+//l: list_set_graphic_pane_t1
+//w:
+//r:3.1
+//
+#define qtn_browsers_sett_feeds_updating_interval_daily "Every day"
+
+
+//d: Selectable text for the Automatic updating setting
+//d: Autoupdating is done weekly
+//l: list_set_graphic_pane_t1
+//w:
+//r:3.1
+//
+#define qtn_browsers_sett_feeds_updating_interval_weekly "Every week"
+
+//d:Browser settings main list item texts for Automatic updating of web feeds
+//l:list_setting_pane_t1
+//w:
+//r:3.1
+//
#define qtn_browsers_sett_autoupdating_ap "Update via access point"
//d:Browser settings main list item texts for Automatic updating of web feeds while roaming
@@ -2008,6 +2087,13 @@
#define qtn_browsers_sett_dataquery_autoupdate_ap "The access point has to be defined to enable automatic updating."
+//d: When the user enables automatic updating of feeds, a confirmation query is displayed to the user
+//d: noting that turning the feature on may cost them money
+//l: popup_note_window
+//w:
+//r:3.1
+//
+#define qtn_browsers_sett_dataquery_autoupdatewarn "Enabling automatic updating may increase your monthly phone bill"
//d: Query user to close existing WML page when activating a link to a WML page
//d: from another window. Only one WML page can be opened at once.
//l: popup_note_window
@@ -2025,6 +2111,12 @@
//r:3.1
//
#define qtn_browser_list_toolbar "Toolbar"
+//d: Tooltip that is showns when the toolbar is activated via the Options menu
+//l: popup_preview_text_window/opt3
+//w:
+//r:3.1
+//
+#define qtn_browser_tooltip_toolbar "Click an empty area of the page to show the toolbar"
//d:Browser settings main list item texts
@@ -2087,6 +2179,13 @@
//l: list_single_pane_t1_cp2
//r: 3.2
//
+#define qtn_options_call "Call"
+
+//d: Label for stylus activated popup.
+//d: Popup is shown when user taps on a phone number
+//l: list_single_pane_t1_cp2
+//r: 3.2
+//
#define qtn_browser_create_sms "Create text message"
//d: Label for stylus activated popup.
@@ -3006,6 +3105,70 @@
//
#define qtn_browser_list_new_web_page "New web page"
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_next "Next Toolbar"
+
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_back "Back"
+
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_forward "Forward"
+
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_pageoverview "Page Overview"
+
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_reload "Reload"
+
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_findkeyword "Find Keyword"
+
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_home "Home"
+
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_subscribe "subscribe"
+
+//d: Tooltip for toolbar button
+//l: popup_preview_text_window/opt3
+//w:
+//r: 3.2
+#define qtn_browser_toolbar_tooltip_go "Go"
+
+//d: List of feeds to choose from .
+//l: heading_pane_t1
+//
+#define qtn_browser_toolbar_subscribe_header "Select to subscribe"
+
+//d: Confirmation query shown before setting new home page
+//l:popup_note_window
+//
+#define qtn_browser_query_set_as_home_page "Set as home page?"
+
// -----------------------------------------------------------------
// View sub-options
// -----------------------------------------------------------------
--- a/browserui/operatormenu/group/bld.inf Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/operatormenu/group/bld.inf Thu Aug 27 07:42:55 2009 +0300
@@ -19,6 +19,7 @@
#include <platform_paths.hrh>
#include <data_caging_paths_strings.hrh>
+#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
PRJ_PLATFORMS
Binary file browserui/operatormenu/help/data/xhtml.zip has changed
--- a/browserui/operatormenu/help/group/bld.inf Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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 the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-*
-* Contributors:
-*
-*
-* Description:
-* Export help related files.
-*
-*/
-
-#include <platform_paths.hrh>
-PRJ_EXPORTS
-:zip ../data/xhtml.zip /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip /epoc32/winscw/c/resource/ overwrite
-
-../inc/ope.hlp.hrh APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/ope.hlp.hrh)
-../rom/operatormenuhelps_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(operatormenuhelps_variant.iby)
--- a/browserui/operatormenu/help/inc/ope.hlp.hrh Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-//
-// ope.hlp.hrh
-//
-
-//
-// File generated by CSXHelp Utilities on 2009-04-17
-//
-
-#ifndef __OPE_HLP_HRH__
-#define __OPE_HLP_HRH__
-
-_LIT(KOPERATOR_HLP_OPTIONS_LIST, "OPERATOR_HLP_OPTIONS_LIST"); //
-
-#endif
\ No newline at end of file
--- a/browserui/operatormenu/help/rom/operatormenuhelps_variant.iby Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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 the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __OPERATORMENUHELPS_VARIANT_IBY__
-#define __OPERATORMENUHELPS_VARIANT_IBY__
-
-#if defined(FF_S60_HELPS_IN_USE) && defined(__OPERATORMENU_USED)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D5E\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D5E\contents.zip)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D5E\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D5E\index.xml)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D5E\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D5E\keywords.xml)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D5E\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D5E\meta.xml)
-#endif
-
-#endif
\ No newline at end of file
--- a/browserui/videoservices/group/bld.inf Fri Jul 03 15:46:41 2009 +0100
+++ b/browserui/videoservices/group/bld.inf Thu Aug 27 07:42:55 2009 +0300
@@ -19,6 +19,7 @@
#include <platform_paths.hrh>
#include <data_caging_paths_strings.hrh>
+#include "../../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
PRJ_PLATFORMS
DEFAULT
--- a/pushmtm/Group/Bld.inf Fri Jul 03 15:46:41 2009 +0100
+++ b/pushmtm/Group/Bld.inf Thu Aug 27 07:42:55 2009 +0300
@@ -17,6 +17,7 @@
#include <platform_paths.hrh>
+#include "../../../../mw/web/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
PRJ_PLATFORMS
DEFAULT
Binary file pushmtm/help/data/xhtml.zip has changed
--- a/pushmtm/help/group/bld.inf Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* 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 the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-*
-* Contributors:
-*
-*
-* Description:
-* Export help related files.
-*
-*/
-
-#include <platform_paths.hrh>
-PRJ_EXPORTS
-:zip ../data/xhtml.zip /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip /epoc32/winscw/c/resource/ overwrite
-
-../inc/wpush.hlp.hrh APP_LAYER_PLATFORM_EXPORT_PATH(csxhelp/wpush.hlp.hrh)
-../rom/pushmtmhelps_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(pushmtmhelps_variant.iby)
--- a/pushmtm/help/inc/wpush.hlp.hrh Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-//
-// wpush.hlp.hrh
-//
-
-//
-// File generated by CSXHelp Utilities on 2009-04-17
-//
-
-#ifndef __WPUSH_HLP_HRH__
-#define __WPUSH_HLP_HRH__
-
-_LIT(KWPUSH_HLP_SETTINGS, "WPUSH_HLP_SETTINGS"); //
-_LIT(KWPUSH_HLP_VIEWER, "WPUSH_HLP_VIEWER"); //
-
-#endif
\ No newline at end of file
--- a/pushmtm/help/rom/pushmtmhelps_variant.iby Fri Jul 03 15:46:41 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* 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 the License "Symbian Foundation License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __PUSHMTMHELPS_VARIANT_IBY__
-#define __PUSHMTMHELPS_VARIANT_IBY__
-
-#if defined(FF_S60_HELPS_IN_USE) && defined(__PUSHMTM_USED)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D3C\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D3C\contents.zip)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D3C\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D3C\index.xml)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D3C\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D3C\keywords.xml)
- data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10008D3C\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10008D3C\meta.xml)
-#endif
-
-#endif
\ No newline at end of file