--- a/browserui/browser/BrowserAppInc/BrowserAppUi.h Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserAppUi.h Wed Apr 14 16:00:33 2010 +0300
@@ -1094,7 +1094,7 @@
MConnection* iConnection;
CBrowserDialogsProvider* iDialogsProvider;
- CBrowserPopupEngine* iPopupEngine;
+ mutable CBrowserPopupEngine* iPopupEngine;
CBrowserLauncherService* iBrowserLauncherService; // Not owned
CActiveSchedulerWait iLauncherServiceWait;
TBool iClientWantsToContinue;
--- a/browserui/browser/BrowserAppInc/BrowserContentView.h Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserContentView.h Wed Apr 14 16:00:33 2010 +0300
@@ -643,9 +643,6 @@
CBrowserContentViewContainer* iContainer;
- // Goto Pane's entered URL
- HBufC* iEnteredURL;
-
// Find keyword pane's keyword
HBufC* iEnteredKeyword;
--- a/browserui/browser/BrowserAppInc/BrowserUIVariant.hrh Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserUIVariant.hrh Wed Apr 14 16:00:33 2010 +0300
@@ -63,9 +63,13 @@
//
// Feature to enable Page Overview and Graphical History
+// After 9.2 TB, This feature is used only to enable page overview
//
-#define KBrowserGraphicalPage 0x20
-
+#ifdef BRDO_MULTITOUCH_ENABLED_FF
+ #define KBrowserGraphicalPage 0x00
+#else
+ #define KBrowserGraphicalPage 0x20
+#endif
//
// Feature to enable Auto Form Fill and Password Management options
//
--- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -612,13 +612,7 @@
KMaxNumOfOpenedWindows );
}
LOG_WRITE_FORMAT("WindowManager Up. Max windows number. %d",
- KMaxNumOfOpenedWindows );
-
- // bug fix for: EMBI-6NBAYM
- // Be very careful of the location to initialize the iPopupEngine before
- // PopupEngine is improved.
- iPopupEngine = CBrowserPopupEngine::NewL();
- BROWSER_LOG( ( _L( "PopupEngine up" ) ) );
+ KMaxNumOfOpenedWindows );
}
else
{
@@ -915,8 +909,14 @@
{
if(WindowMgr().WindowCount() > 1)
{
+#ifdef BRDO_MULTITOUCH_ENABLED_FF
// use switch window tab view if pageoverview bitmaps are available
- if (Preferences().UiLocalFeatureSupported( KBrowserGraphicalPage ))
+ if (Preferences().UiLocalFeatureSupported( KBrowserGraphicalPage )
+ || Preferences().UiLocalFeatureSupported( KBrowserGraphicalHistory ))
+#else
+ // use switch window tab view if pageoverview bitmaps are available
+ if (Preferences().UiLocalFeatureSupported( KBrowserGraphicalPage ))
+#endif
{
SetViewToBeActivatedIfNeededL( KUidBrowserWindowSelectionViewId );
}
@@ -1794,6 +1794,14 @@
//
CBrowserPopupEngine& CBrowserAppUi::PopupEngine() const
{
+ if(!iPopupEngine)
+ {
+ if ( Preferences().UiLocalFeatureSupported( KBrowserMultipleWindows ) )
+ {
+ iPopupEngine = CBrowserPopupEngine::NewL();
+ BROWSER_LOG( ( _L( "PopupEngine up" ) ) );
+ }
+ }
return *iPopupEngine;
}
--- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -161,7 +161,6 @@
delete iNaviDecorator;
delete iBookmarksModel;
delete iContainer;
- delete iEnteredURL;
delete iEnteredKeyword;
delete iTextZoomLevelArray;
delete iFontSizeArray;
@@ -197,7 +196,6 @@
iContainer->FindKeywordPane()->SetGPObserver(this);
iEnteredKeyword = NULL;
- iEnteredURL = NULL;
// get the StatusPane pointer
if ( !iNaviPane )
{
@@ -1683,10 +1681,8 @@
{
if ( iContainer->GotoPane() )
{
- delete iEnteredURL;
- iEnteredURL = NULL;
- iEnteredURL = iContainer->GotoPane()->GetTextL(); // the url
- if( iEnteredURL )
+ HBufC* url = iContainer->GotoPane()->GetTextL(); // the url
+ if( url )
{
iContainer->ShutDownGotoURLEditorL();
@@ -1706,7 +1702,7 @@
UpdateCbaL();
UpdateFullScreenL();
- ApiProvider().FetchL( iEnteredURL->Des(),
+ ApiProvider().FetchL( url->Des(),
KNullDesC,
KNullDesC,
accessPoint,
@@ -1762,14 +1758,17 @@
CCoeEnv::Static()->AppUi()->RemoveFromStack( iContainer->GotoPane() );
CCoeEnv::Static()->AppUi()->AddToStackL( iContainer->GotoPane(), ECoeStackPriorityMenu );
iContainer->GotoPane()->MakeVisible( ETrue );
- if ( iEnteredURL && iEnteredURL->Length() )
+ HBufC* url = ApiProvider().BrCtlInterface().PageInfoLC(
+ TBrCtlDefs::EPageInfoUrl );
+ if ( url && url->Length() )
{
- iContainer->GotoPane()->SetTextL(*iEnteredURL);
+ iContainer->GotoPane()->SetTextL(*url);
iContainer->GotoPane()->SelectAllL();
+ CleanupStack::PopAndDestroy(); // url
}
else
{
- // nor iEnteredURL; use default name.
+ // nor url; use default name.
// set "http://www." per Browser UI spec
iContainer->GotoPane()->SetTextL(KWWWString );
}
--- a/browserui/browser/BrowserAppSrc/BrowserContentViewToolbar.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentViewToolbar.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -181,7 +181,13 @@
iBrowserContentView->ApiProvider().WindowMgr().WindowCount() < 2);
iBrowserContentView->Toolbar()->ToolbarExtension()->SetItemDimmed( EWmlCmdFindKeyword, wmlMode );
+//Disable page overview for TB9.2
+//TODO: Removed this code when Downloads icon is available for extended toolbar
+#ifdef BRDO_MULTITOUCH_ENABLED_FF
+ iBrowserContentView->Toolbar()->ToolbarExtension()->SetItemDimmed( EWmlCmdShowMiniature, true );
+#else
iBrowserContentView->Toolbar()->ToolbarExtension()->SetItemDimmed( EWmlCmdShowMiniature, wmlMode );
+#endif
iBrowserContentView->Toolbar()->ToolbarExtension()->SetItemDimmed( EWmlCmdShowSubscribeList,
(!subscribeToItems || wmlMode) );
iBrowserContentView->Toolbar()->ToolbarExtension()->SetItemDimmed( EWmlCmdSwitchWindow, noMultiWin );
--- a/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -615,7 +615,14 @@
else
{
// pointer outside of control
- CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneCancel);
+ if ( iFindKeywordMode )
+ {
+ CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdFindKeywordPaneClose);
+ }
+ else
+ {
+ CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneCancel);
+ }
}
}
--- a/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -484,19 +484,13 @@
//Read show connection queries setting
iAllPreferences.iConnDialogs = GetIntValue( KBrowserConnectionDialogs );
-
- if( !iAllPreferences.iHTTPSecuritySupressed )
- {
- // Read HTTP security warnings setting
- iAllPreferences.iHttpSecurityWarnings = GetIntValue (
- KBrowserNGShowSecurityWarnings );
- }
- else
- {
- //we don't want to see sec warning because they're supressed
- iAllPreferences.iHttpSecurityWarnings = EFalse;
- }
-
+
+ // Read HTTP security warnings setting
+ // value 0 :we don't want to see sec warning because they're supressed
+ // value 1 : want to see sec warning and warnings are enabled
+ iAllPreferences.iHttpSecurityWarnings = GetIntValue (
+ KBrowserNGShowSecurityWarnings );
+
// Media Volume uses different SD ini. Revert to Browser SD ini after use
iAllPreferences.iMediaVolume = GetIntValue( KBrowserMediaVolumeControl );
@@ -545,7 +539,12 @@
TInt ap;
// Read Accesss point selection mode for advanced settings
+#ifdef BRDO_OCC_ENABLED_FF
+ const TInt selectionMode = GetIntValue( KBrowserOccAccessPointSelectionMode ); //2 Destination
+ BROWSER_LOG( ( _L( " OCC Ap Selection mode : %d" ), selectionMode ) );
+#else
const TInt selectionMode = GetIntValue( KBrowserAccessPointSelectionMode );
+#endif
switch ( selectionMode )
{
@@ -581,7 +580,36 @@
}
else if (iAllPreferences.iAccessPointSelectionMode == EDestination)
{
+#ifdef BRDO_OCC_ENABLED_FF
+ iAllPreferences.iDefaultSnapId = GetIntValue( KBrowserOccNGDefaultSnapId );
+ if ( iAllPreferences.iDefaultSnapId == 0)
+ {
+ BROWSER_LOG( ( _L( " Cenrep OCC Default Snap id is : %d" ), iAllPreferences.iDefaultSnapId ) );
+ TUint32 snapId(0);
+ RCmManager manager;
+ manager.OpenLC();
+ RArray<TUint32> destIdArray;
+ CleanupClosePushL(destIdArray);
+ manager.AllDestinationsL( destIdArray );
+ const TInt count = destIdArray.Count();
+ for ( TInt i = 0; i < count && !snapId; i++ )
+ {
+ RCmDestination dests = manager.DestinationL( destIdArray[i] );
+ CleanupClosePushL( dests );
+ if ( CMManager::TSnapPurpose( dests.MetadataL( CMManager::ESnapMetadataPurpose ) )
+ == CMManager::ESnapPurposeInternet )
+ {
+ BROWSER_LOG( ( _L( " Using Internet snap for connection" ) ) );
+ snapId = destIdArray[i];
+ SetDefaultSnapId(snapId);
+ }
+ CleanupStack::PopAndDestroy( 1 ); //dests
+ }
+ CleanupStack::PopAndDestroy( 2 ); // destIdArray, manager
+ }
+#else
iAllPreferences.iDefaultSnapId = GetIntValue( KBrowserNGDefaultSnapId );
+#endif
}
// For Short Cut keys
@@ -963,13 +991,16 @@
//
void CBrowserPreferences::SetDefaultSnapId (TUint aSnapId)
{
-
- //storing the value of the default snap ID
- iAllPreferences.iDefaultSnapId = aSnapId;
-
+ LOG_ENTERFN("CBrowserPreferences::SetDefaultSnapId");
+ //storing the value of the default snap ID
+ iAllPreferences.iDefaultSnapId = aSnapId;
+#ifdef BRDO_OCC_ENABLED_FF
+ SetIntValueL ( KBrowserOccNGDefaultSnapId, iAllPreferences.iDefaultSnapId );
+ BROWSER_LOG( ( _L( " Setting OCC Snap id : %d" ), iAllPreferences.iDefaultSnapId ) );
+#else
SetIntValueL ( KBrowserNGDefaultSnapId,
iAllPreferences.iDefaultSnapId );
-
+#endif
}
@@ -1901,31 +1932,37 @@
if ( aAccessPointSelectionMode != iAllPreferences.iAccessPointSelectionMode )
{
iAllPreferences.iAccessPointSelectionMode = aAccessPointSelectionMode;
-
+ TUint32 cenrepKey;
+#ifdef BRDO_OCC_ENABLED_FF
+ BROWSER_LOG( ( _L( " Setting OCC parameter " )) );
+ cenrepKey= KBrowserOccAccessPointSelectionMode;
+#else
+ cenrepKey = KBrowserAccessPointSelectionMode;
+#endif
switch ( aAccessPointSelectionMode )
- {
- case EAlwaysAsk:
- {
- SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeAlwaysAsk );
- break;
- }
- case EDestination:
- {
- SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeDestination );
- break;
- }
- case EConnectionMethod:
- {
- SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeUserDefined );
- break;
- }
- default:
- {
- SetIntValueL ( KBrowserAccessPointSelectionMode, EBrowserCenRepApSelModeAlwaysAsk );
- break;
- }
- }
- }
+ {
+ case EAlwaysAsk:
+ {
+ SetIntValueL ( cenrepKey, EBrowserCenRepApSelModeAlwaysAsk );
+ break;
+ }
+ case EDestination:
+ {
+ SetIntValueL ( cenrepKey, EBrowserCenRepApSelModeDestination );
+ break;
+ }
+ case EConnectionMethod:
+ {
+ SetIntValueL ( cenrepKey, EBrowserCenRepApSelModeUserDefined );
+ break;
+ }
+ default:
+ {
+ SetIntValueL ( cenrepKey, EBrowserCenRepApSelModeAlwaysAsk );
+ break;
+ }
+ }
+ }
}
// ----------------------------------------------------------------------------
--- a/browserui/browser/BrowserAppSrc/BrowserWindow.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserWindow.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -236,9 +236,13 @@
{
capabilityFlags = capabilityFlags | TBrCtlDefs::ECapabilityGraphicalPage;
}
- if ( Preferences().UiLocalFeatureSupported( KBrowserGraphicalPage ) &&
- Preferences().UiLocalFeatureSupported( KBrowserGraphicalHistory ))
- {
+#ifdef BRDO_MULTITOUCH_ENABLED_FF
+ if (Preferences().UiLocalFeatureSupported( KBrowserGraphicalHistory ))
+#else
+ if ( Preferences().UiLocalFeatureSupported( KBrowserGraphicalPage ) &&
+ Preferences().UiLocalFeatureSupported( KBrowserGraphicalHistory ))
+#endif
+ {
capabilityFlags = capabilityFlags | TBrCtlDefs::ECapabilityGraphicalHistory;
}
if ( Preferences().UiLocalFeatureSupported( KBrowserAutoFormFill ) )
--- a/browserui/browser/BrowserAppSrc/BrowserWindowSelectionContainer.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserWindowSelectionContainer.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -167,14 +167,23 @@
{
CWindowGc& gc = SystemGc();
- // example code...
- gc.SetPenStyle( CGraphicsContext::ENullPen );
- gc.SetBrushColor( KRgbWhite );
+ // Create a gray background...
+ gc.SetPenColor(TRgb(45,44,50));
+ gc.SetPenStyle(CGraphicsContext::ESolidPen);
+ gc.SetBrushColor( KRgbDarkGray );
gc.SetBrushStyle( CGraphicsContext::ESolidBrush );
gc.DrawRect( aRect );
-
+
if ( iThumbnail )
{
+#ifdef BRDO_MULTITOUCH_ENABLED_FF
+ TSize viewSize(aRect.Width(), aRect.Height());
+ int centerImageWidth(viewSize.iWidth*60/100);
+ int centerImageHeight(viewSize.iHeight*75/100);
+ int centerImageX(viewSize.iWidth*20/100);
+ int centerImageY(viewSize.iHeight*(100-75)/(2*100));
+ TPoint centerImageOrigin(centerImageX, centerImageY);
+#endif
// Put in center
// release
TSize bitmapSize = iThumbnail->Bitmap()->SizeInPixels();
@@ -184,7 +193,11 @@
TInt y = ( aRect.Height()-bitmapSize.iHeight ) / 2;
// Draw thumbnail
// release
- gc.BitBlt( TPoint(x,y), iThumbnail->Bitmap() );
+#ifdef BRDO_MULTITOUCH_ENABLED_FF
+ gc.BitBlt( centerImageOrigin, iThumbnail->Bitmap(), TRect(0, 0, centerImageWidth, centerImageHeight) );
+#else
+ gc.BitBlt( TPoint(x,y), iThumbnail->Bitmap() );
+#endif
// test
// gc.BitBlt( TPoint(x,y), iThumbnail );
}
--- a/browserui/browser/FavouritesInc/BrowserFavouritesView.h Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FavouritesInc/BrowserFavouritesView.h Wed Apr 14 16:00:33 2010 +0300
@@ -110,6 +110,7 @@
*/
void ConfigContextMenu();
+ static TInt RefeshFavoriteListBox( TAny* aFavouritesView );
public: // public methods from CAknView (CBrowserViewBase)
@@ -462,7 +463,6 @@
*/
void RenameAndMoveItemsL
( const CArrayFix<TInt>& aUids, TInt aFolder );
-
protected: // new methods
/**
@@ -555,7 +555,8 @@
CBrowserFavouritesIncrementalOp* iIncrementalOp;
/// ETrue if data update is missed due to incremental operation.
TBool iUpdatePending;
-
+ /// Asynchronously update the favourite item's List Box
+ CIdle* iFavViewRefresh;
protected:
TBool iRefresh; // Flag to indicate that Bookmarks list should be refreshed.
--- a/browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserAdaptiveListPopup.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -42,6 +42,8 @@
#include "CommonConstants.h"
#include "BrowserAppViewBase.h"
#include <data_caging_path_literals.hrh>
+#include <Uri8.h>
+#include <utf.h>
#include "eikon.hrh"
@@ -54,6 +56,8 @@
_LIT( KProtocolIdentifier,"://" );
const TUint KSlash('/');
const TUint KPeriod('.');
+const TInt KListHeight = 45;
+const TInt KFontHeight = 150;
static void TextPos(TPoint *aResultArray, const TAknTextLineLayout
&aLayout, TSize aItemSize)
@@ -472,6 +476,62 @@
iUrlCompletionMode = EFalse;
//only include recent URLs if not including the url completion items
iRecentUrlStore->GetData( *iItems, *iItemNames, trimmedContent );
+
+ //sort alphabetically and...
+ for(TInt i=0; i<iItems->Count(); i++)
+ {
+ for(TInt j=0; j<iItems->Count()-1; j++)
+ {
+ if ((*iItems)[j].CompareF((*iItems)[j+1]) > 0)
+ {
+ RBuf tmp;
+ CleanupClosePushL(tmp);
+ tmp.Create((*iItems)[j]);
+ iItems->Delete(j);
+ iItems->InsertL( j+1, tmp );
+ tmp.Close();
+ tmp.Create((*iItemNames)[j]);
+ iItemNames->Delete(j);
+ iItemNames->InsertL( j+1, tmp );
+ CleanupStack::PopAndDestroy( &tmp );
+ }
+ }
+ }
+ //and move url with params i.e google.fi/m=q?xyz do the back of list
+ TInt i = 0; //iterator
+ TInt j = 0; //counter
+ while (i < (iItems->Count()-1) && j < iItems->Count())
+ {
+ TUriParser8 parser;
+ RBuf8 out;
+ CleanupClosePushL( out );
+ out.Create( (*iItems)[i].Length() );
+ RBuf in;
+ CleanupClosePushL( in );
+ in.Create( (*iItems)[i] );
+
+ CnvUtfConverter::ConvertFromUnicodeToUtf8(out, in );
+
+ if (( parser.Parse( out ) == KErrNone ) && //if parse ok and
+ ( parser.Extract( EUriPath ).Length() > 0 || //url contains path
+ parser.Extract( EUriQuery ).Length() > 0 )) //or query item
+ {
+ iItems->AppendL( (*iItems)[i] );//move item to back of the list
+ iItems->Delete( i );
+ iItemNames->AppendL( (*iItemNames)[i] );
+ iItemNames->Delete( i );
+ }
+ else
+ {
+ i++;
+ }
+ j++;
+
+ CleanupStack::PopAndDestroy( &in );
+ CleanupStack::PopAndDestroy( &out );
+ };
+
+
}
iDirectoryMode = EFalse;
CleanupStack::PopAndDestroy();//newText
@@ -546,8 +606,13 @@
// force listbox on top of goto pane
rectTemp.iBr.iY = iParent->PositionRelativeToScreen().iY;
rectTemp.iTl.iX = iParent->PositionRelativeToScreen().iX;
- // shrink list box to size of list
- rectTemp.iTl.iY = rectTemp.iBr.iY - (AppLayout::list_single_graphic_popup_wml_pane( 0 ).iH * itemstoshow);
+ // shrink list box to size of list
+#ifdef BRDO_TOUCH_ENABLED_FF
+ TInt listH = KListHeight;
+#else
+ TInt listH = AppLayout::list_single_graphic_popup_wml_pane( 0 ).iH;
+#endif
+ rectTemp.iTl.iY = rectTemp.iBr.iY - (listH * itemstoshow);
// set bottom right x axis to full width
rectTemp.iBr.iX = rect.iBr.iX;
@@ -572,6 +637,24 @@
}
//the last item is visible
iList->ScrollToMakeItemVisible( iList->Model()->NumberOfItems()-1 );
+#ifdef BRDO_TOUCH_ENABLED_FF
+ const CFont* pFont = AknLayoutUtils::FontFromId(EAknLogicalFontPrimaryFont);
+ TFontSpec fontSpec = pFont->FontSpecInTwips();
+ fontSpec.iHeight =KFontHeight;
+
+ CFont* fontNew;
+ CEikonEnv::Static()->ScreenDevice()->GetNearestFontInTwips( ( CFont*&)fontNew, fontSpec );
+ CFormattedCellListBoxData *pLBData = iList->ItemDrawer()->ColumnData();
+ iList->SetItemHeightL(KListHeight);
+
+ if(pLBData && pFont)
+ {
+ pLBData->SetSubCellFontL(1,fontNew);
+ }
+
+ CEikonEnv::Static()->ScreenDevice()->ReleaseFont(fontNew);
+#endif
+
MakeVisible( ETrue );
iPoppedUp = ETrue;
DrawNow();
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksContainer.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -416,7 +416,7 @@
// 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 ( iGotoPane && ( !CBrowserAppUi::Static()->Fetching() || iGotoPaneActive ) )
{
// If the key hadn't been consumed, so far, determine if the keystroke
// should be handled by goto pane
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -882,13 +882,7 @@
// default for goto is go
aLsk.setPair(EWmlCmdGotoPaneGoTo, R_BROWSER_BOOKMARKS_DYN_SK_QTN_WML_SOFTK_GO);
- // special goto cases
- if ( ApiProvider().Fetching() )
- {
- // No assignment. Set as default
- aLsk.setPair(EBrowserBookmarksCmdSoftkeyEmpty, R_BROWSER_BOOKMARKS_DYN_SK_TEXT_SOFTKEY_EMPTY);
- }
- else if (aGotoPane->PopupList() &&
+ if (aGotoPane->PopupList() &&
aGotoPane->PopupList()->IsOpenDirToShow() )
{
aLsk.setPair(EBrowserBookmarksCmdOpen, R_BROWSER_BOOKMARKS_DYN_SK_TEXT_SOFTKEY_OPEN);
@@ -1125,21 +1119,6 @@
BROWSER_LOG( ( _L("delete iEnteredUrl 3") ) );
iCursorPos = -1;
- // The following code gets all bookmarks and saves them back in the correct
- // order in Favourites db. It was important to add this piece of code here
- // in the constructor so that the first time when a bookmark is added
- // through content view the correct index is used to insert the bookmark.
- // TSW Error report id# MLEN-6Z8HMM
-
- iSaveBMOrder = ETrue;
-
- if ( Model().BeginL( /*aWrite=*/ETrue, /*aDbErrorNote*/ EFalse ) ==
- KErrNone )
- {
- CFavouritesItemList* items = GetItemsLC( KFavouritesRootUid );
- CleanupStack::PopAndDestroy();
- Model().CommitL();
- }
//Since the webcore will be reading the bookmark information in background
//thread, its important to refresh when the thread notifies the fresh data.
@@ -1249,6 +1228,70 @@
{
case R_BROWSER_BOOKMARKS_MENU_PANE:
{
+#ifdef BRDO_SINGLE_CLICK_ENABLED_FF
+ if(iItemsToMove )
+ {
+ aMenuPane->SetItemDimmed( EWmlCmdMove, ETrue );
+ aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
+ aMenuPane->SetItemDimmed( EWmlCmdDelete, ETrue );
+ aMenuPane->SetItemDimmed( EWmlCmdSendAddressViaUnifiedMessage, ETrue );
+ aMenuPane->SetItemDimmed( EWmlCmdSendBookmarkViaUnifiedMessage, ETrue );
+ aMenuPane->SetItemDimmed( EWmlCmdSetAsHomePage, ETrue );
+ }
+ else
+ {
+ if ( ApiProvider().Preferences().UiLocalFeatureSupported( KBrowserUiHomePageSetting ) )
+ {
+ TBool dimSaveAsHomePage = EFalse;
+
+ if ( (item && (item->IsFolder() ||
+ item->Uid() == KFavouritesAdaptiveItemsFolderUid ||
+ item->ContextId())))
+ {
+ dimSaveAsHomePage = ETrue;
+ }
+ else
+ {
+ dimSaveAsHomePage = ApiProvider().IsEmbeddedModeOn() || !aState.CurrentIsItem()
+ || ( aState.MarkedCount() > 1 );
+ }
+
+ aMenuPane->SetItemDimmed( EWmlCmdSetAsHomePage, dimSaveAsHomePage );
+ }
+ if (!item)
+ {
+ aMenuPane->SetItemDimmed( EWmlCmdSendBookmarkViaUnifiedMessage, ETrue );
+ }
+ else if ( (item && (item->IsFolder() ||
+ item->Uid() == KFavouritesAdaptiveItemsFolderUid ||
+ item->ContextId())))
+ {
+ aMenuPane->SetItemDimmed( EWmlCmdSendBookmarkViaUnifiedMessage, ETrue );
+ }
+ }
+
+ aMenuPane->SetItemDimmed( EWmlCmdSendAddressViaUnifiedMessage, ETrue );
+
+ if(iInAdaptiveBookmarksFolder)
+ {
+ aMenuPane->SetItemDimmed( EWmlCmdMove, ETrue );
+ aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
+ }
+ if ( ( item ) &&
+ ( ( item->Uid() == KFavouritesAdaptiveItemsFolderUid ) ||
+ ( item->ContextId() != NULL ) )
+ )
+ {
+ // We can't delete adaptive bookmarks folder,
+ // or seamless folders
+ aMenuPane->SetItemDimmed( EWmlCmdDelete, ETrue );
+ aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
+ }
+ if( item && item->IsFolder())
+ {
+ aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
+ }
+#endif
// downloads
aMenuPane->SetItemDimmed( EWmlCmdDownloads, !ApiProvider().BrCtlInterface().BrowserSettingL( TBrCtlDefs::ESettingsNumOfDownloads ) );
@@ -1324,6 +1367,7 @@
}
case R_BMACTIONS_SUBMENU:
{
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
// send
aMenuPane->SetItemDimmed( EWmlCmdSendAddressViaUnifiedMessage, ETrue );
@@ -1337,13 +1381,13 @@
{
aMenuPane->SetItemDimmed( EWmlCmdSendBookmarkViaUnifiedMessage, ETrue );
}
-
+#endif
// copy to bookmarks
if ( !iInAdaptiveBookmarksFolder )
{
aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, ETrue );
}
-
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
// set as homepage
if ( ApiProvider().Preferences().UiLocalFeatureSupported( KBrowserUiHomePageSetting ) )
{
@@ -1363,7 +1407,6 @@
aMenuPane->SetItemDimmed( EWmlCmdSetAsHomePage, dimSaveAsHomePage );
}
-#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
// add bookmark
if ( iInAdaptiveBookmarksFolder )
{
@@ -1432,7 +1475,7 @@
aMenuPane->SetItemDimmed( EWmlCmdRename, ETrue );
}
-
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
// delete
if (!item)
{
@@ -1457,7 +1500,6 @@
{
aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue );
}
-#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
// create folder
if ( iCurrentFolder != KFavouritesRootUid || iInAdaptiveBookmarksFolder )
{
@@ -2201,6 +2243,8 @@
Toolbar()->SetItemDimmed( EWmlCmdGoToAddressAndSearch, aDimButtons , ETrue );
#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
Toolbar()->SetItemDimmed( EWmlCmdDelete, aDimButtons , ETrue );
+#else
+ Toolbar()->SetItemDimmed( EWmlCmdPreferences, aDimButtons , ETrue );
#endif
if (!aDimButtons)
{
--- a/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -111,6 +111,7 @@
//
CBrowserFavouritesView::~CBrowserFavouritesView()
{
+ delete iFavViewRefresh;
delete iIncrementalOp;
delete iContainer;
delete iModel;
@@ -241,7 +242,8 @@
iIsActivated( EFalse ),
iLastSelection( 0 ),
iUpdatePending( EFalse ),
- iRefresh( ETrue )
+ iRefresh( ETrue ),
+ iFavViewRefresh(0)
{
}
@@ -506,6 +508,22 @@
iContainer->Listbox()->SetStateL(*iSavedListboxState);
}
iIsActivated = ETrue;
+
+ PERFLOG_STOPWATCH_START;
+ if(!iFavViewRefresh)
+ iFavViewRefresh = CIdle::NewL( CActive::EPriorityIdle );
+ iFavViewRefresh ->Start( TCallBack( RefeshFavoriteListBox, this ) );
+ PERFLOG_STOP_WRITE("\t Favourite view NewL");
+ }
+
+
+TInt CBrowserFavouritesView::RefeshFavoriteListBox(TAny* aFavouritesView)
+ {
+ __ASSERT_DEBUG(aFavouritesView, Util::Panic( Util::EUninitializedData ));
+ TRAP_IGNORE(
+ ((CBrowserFavouritesView*)aFavouritesView)->RefreshL();
+ );
+ return KErrNone;
}
// ----------------------------------------------------------------------------
@@ -529,6 +547,12 @@
{
iIsActivated = EFalse;
TRAP_IGNORE(ApiProvider().StopProgressAnimationL());
+
+ if(iFavViewRefresh)
+ {
+ iFavViewRefresh->Cancel();
+ }
+
if ( iContainer )
{
iLastSelection = iContainer->Listbox()->CurrentItemIndex();
@@ -1107,6 +1131,7 @@
iCurrentFolder = aFolder;
FillListboxL( aFolder, /*aKeepState=*/EFalse );
+
Container()->Listbox()->ClearSelection();
UpdateCbaL();
UpdateNaviPaneL();
@@ -1278,7 +1303,6 @@
iContainer->HandleCursorChangedL( listbox );
listbox->View()->SetDisableRedraw( redrawDisabled );
listbox->DrawNow();
-
UpdateCbaL();
UpdateNaviPaneL();
}
--- a/browserui/browser/FeedsInc/FeedsFeedView.h Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FeedsInc/FeedsFeedView.h Wed Apr 14 16:00:33 2010 +0300
@@ -187,6 +187,7 @@
TInt iInitialItem;
TBool iPageScalerEnabled;
TBool iPenEnabled;
+ TRect iOrigRect;
};
#endif // FEED_VIEW_H
--- a/browserui/browser/FeedsInc/FeedsFolderContainer.h Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FeedsInc/FeedsFolderContainer.h Wed Apr 14 16:00:33 2010 +0300
@@ -468,6 +468,16 @@
* @return ETrue if feed item is found
*/
TBool SearchForFeedL(const CFeedsEntity* item);
+
+#ifdef BRDO_SINGLE_CLICK_ENABLED_FF
+ /**
+ * To know Whether any feed item selected for move
+ *
+ * @since 7.2
+ * @return ETrue if feed item is selected for move
+ */
+ TBool isMoveActive(){ return iMoveActive;}
+#endif
private:
/**
@@ -661,4 +671,4 @@
#endif // FEEDS_FOLDER_CONTAINER_H
-// End of File
\ No newline at end of file
+// End of File
--- a/browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -339,6 +339,10 @@
{
// make the 'Change' button invisible
cba.MakeCommandVisible(EAknSoftkeyChange, EFalse);
+ CEikEdwin* edwin = NULL;
+ edwin = static_cast<CEikEdwin*>(ControlOrNull(EFeedsEditDialogUrlId));
+ if(edwin)
+ edwin->SetAknEditorFlags(EAknEditorFlagNoT9);
}
else if(aControlId == EFeedsEditAutomaticUpdatingId)
{
--- a/browserui/browser/FeedsSrc/FeedsFeedView.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsFeedView.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -36,7 +36,6 @@
#include "Logger.h"
-
// -----------------------------------------------------------------------------
// CFeedsFeedView::NewL
//
@@ -84,6 +83,8 @@
iContainer = CFeedsFeedContainer::NewL( this, ApiProvider() );
iContainer->SetRect( aRect );
+ iOrigRect.iTl = aRect.iTl;
+ iOrigRect.iBr = aRect.iBr;
iContainer->MakeVisible(EFalse);
if(iPenEnabled)
@@ -202,7 +203,7 @@
//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());
+ iContainer->SetRect(iOrigRect);
if(iContainer->iBrowserControl->BrowserSettingL(TBrCtlDefs::ESettingsPageOverview))
{
TRAP_IGNORE(iContainer->iBrowserControl->SetBrowserSettingL(TBrCtlDefs::ESettingsPageOverview, EFalse));
--- a/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -2043,7 +2043,11 @@
if (iMoveActive)
{
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
commandSet = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
+#else
+ commandSet = R_AVKON_SOFTKEYS_CANCEL;
+#endif
}
iView->UpdateCbaL(commandSet);
@@ -2182,7 +2186,9 @@
//
void CFeedsFolderContainer::DimToolbar(TBool aDim)
{
- iView->Toolbar()->SetDimmed(aDim);
+ iView->Toolbar()->SetItemDimmed(EFeedsNewFeed, aDim, ETrue);
+ iView->Toolbar()->SetItemDimmed(EFeedsUpdateAll, aDim, ETrue);
+ iView->Toolbar()->SetItemDimmed(EWmlCmdPreferences, aDim, ETrue);
iView->Toolbar()->DrawNow();
}
@@ -2274,3 +2280,4 @@
naviPane->PushL(*iNaviDecorator);
}
+
--- a/browserui/browser/FeedsSrc/FeedsFolderView.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsFolderView.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -373,7 +373,7 @@
if(iContainer->iCurrentFolder && ( iContainer->iCurrentFolder == iRootFolder) )
iApiProvider.FeedsClientUtilities().AddItemL( *aMenuPane, EFeedsNewFolder, R_OPTIONS_ORG_NEW_FOLDER);
iApiProvider.FeedsClientUtilities().AddItemL( *aMenuPane, EFeedsImport, R_OPTIONS_IMPORT_FEEDS);
- if( item && iContainer->iCurrentFolder )
+ if( item && iContainer->iCurrentFolder && !iContainer->isMoveActive() )
{
if ( (item->GetType() == EFolder) )
{
--- a/browserui/browser/SrcData/BrowserBookmarks.rssi Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/SrcData/BrowserBookmarks.rssi Wed Apr 14 16:00:33 2010 +0300
@@ -88,6 +88,24 @@
command = EWmlCmdNewFolder;
txt = qtn_options_org_new_folder;
},
+ MENU_ITEM
+ {
+ command = EWmlCmdSendAddressViaUnifiedMessage;
+ txt = qtn_options_send_via;
+ flags = EEikMenuItemSpecific;
+ },
+ MENU_ITEM
+ {
+ command = EWmlCmdSendBookmarkViaUnifiedMessage;
+ txt = qtn_options_send_via;
+ flags = EEikMenuItemSpecific;
+ },
+ MENU_ITEM
+ {
+ command = EWmlCmdSetAsHomePage;
+ txt = qtn_browserbm_list_set_as_home_page_sm;
+ flags = EEikMenuItemSpecific;
+ },
#endif
MENU_ITEM
{
@@ -114,6 +132,26 @@
command = EWmlCmdMarkUnmark;
txt = qtn_browser_options_markunmark;
},
+#else
+ MENU_ITEM
+ {
+ command = EWmlCmdDelete;
+ txt = qtn_fldr_delete;
+ flags = EEikMenuItemSpecific;
+ },
+ MENU_ITEM
+ {
+ command = EWmlCmdMove;
+ txt = qtn_options_org_move;
+ flags = EEikMenuItemSpecific;
+ },
+ MENU_ITEM
+ {
+ command = EWmlCmdMoveToFolder;
+ txt = qtn_options_org_move_to_folder;
+ flags = EEikMenuItemSpecific;
+ },
+
#endif
MENU_ITEM
{
@@ -170,7 +208,9 @@
{
command = EWmlCmdRename;
txt = qtn_fldr_rename;
- },
+ }
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
+ ,
MENU_ITEM
{
command = EWmlCmdDelete;
@@ -185,9 +225,7 @@
{
command = EWmlCmdMoveToFolder;
txt = qtn_options_org_move_to_folder;
- }
-#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
- ,
+ },
MENU_ITEM
{
command = EWmlCmdNewFolder;
@@ -208,10 +246,10 @@
{
items =
{
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
MENU_ITEM { command = EWmlCmdSendAddressViaUnifiedMessage; txt=qtn_options_send_via; },
MENU_ITEM { command = EWmlCmdSendBookmarkViaUnifiedMessage; txt =qtn_options_send_via; },
MENU_ITEM { command = EWmlCmdSetAsHomePage; txt=qtn_browserbm_list_set_as_home_page_sm; },
-#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
MENU_ITEM { command = EWmlCmdAddBookmark; txt = text_wmlbm_option_enter_new; },
#endif
MENU_ITEM { command = EWmlCmdCopyToBookmarks; txt = qtn_browserbm_options_copy_to_bookmarks_sm; },
--- a/browserui/browser/SrcData/browser_toolbar.rssi Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/SrcData/browser_toolbar.rssi Wed Apr 14 16:00:33 2010 +0300
@@ -316,7 +316,7 @@
TBAR_CTRL
{
type = EAknCtButton;
- id = EWmlCmdCloseWindow;
+ id = EWmlCmdUserExit;
control = AVKON_BUTTON
{
Binary file browserui/browser/conf/browserui.confml has changed
Binary file browserui/browser/conf/browserui_10008D39.crml has changed
--- a/pushmtm/MtmUiSrc/PushMessageInfoOp.cpp Wed Mar 31 21:35:49 2010 +0300
+++ b/pushmtm/MtmUiSrc/PushMessageInfoOp.cpp Wed Apr 14 16:00:33 2010 +0300
@@ -96,9 +96,8 @@
// when iDialog->ExecuteLD() is running. It means that this object must
// be active in that time in order DoCancel() will be called.
iStatus = KRequestPending;
+ iDialog->ExecuteLD( iMsvSession, iEntryId );
SetActive();
- iDialog->ExecuteLD( iMsvSession, iEntryId );
-
// Ready.
if ( !deleted )
{