--- a/browserui/browser/BrowserAppInc/BrowserContentView.h Wed Apr 14 16:00:33 2010 +0300
+++ b/browserui/browser/BrowserAppInc/BrowserContentView.h Tue Apr 27 16:41:18 2010 +0300
@@ -633,7 +633,9 @@
* @return void
*/
void ShowFsStatusPane(TBool aShow);
-
+
+ void setFullScreenFlag(){ iWasContentFullScreenMode = iContentFullScreenMode; }
+
private:
CAknNavigationControlContainer* iNaviPane;
--- a/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Wed Apr 14 16:00:33 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserAppUi.cpp Tue Apr 27 16:41:18 2010 +0300
@@ -1345,9 +1345,7 @@
CAknViewAppUi::HandleForegroundEventL( aForeground );
if( iIsForeground )
- {
- // We need to refresh the softkeys
- UpdateCbaL();
+ {
if ( Preferences().FullScreen() == EWmlSettingsFullScreenFullScreen )
{
ContentView()->UpdateFullScreenL();
--- a/browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp Wed Apr 14 16:00:33 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp Tue Apr 27 16:41:18 2010 +0300
@@ -102,6 +102,12 @@
void CBrowserContentViewContainer::ConstructL()
{
CreateWindowL();
+
+#if defined(BRDO_MULTITOUCH_ENABLED_FF) && !defined (__WINSCW__)
+ //Enable advance pointer info for multi-touch.
+ Window().EnableAdvancedPointers();
+#endif
+
SetAllowStrayPointers();
SetMopParent( iView );
@@ -317,6 +323,11 @@
// Ignore key event in zoom mode
if ( result == EKeyWasNotConsumed && !iView->isZoomMode())
{
+ if ( !iView->PenEnabled() && iView->FullScreenMode() && keyEvent.iRepeats)
+ {
+ iView->setFullScreenFlag();
+ iView->EnableFullScreenModeL( EFalse );
+ }
TRAP_IGNORE(result = iApiProvider.BrCtlInterface().OfferKeyEventL(keyEvent, aType));
}
--- a/browserui/browser/BrowserAppSrc/BrowserContentViewToolbar.cpp Wed Apr 14 16:00:33 2010 +0300
+++ b/browserui/browser/BrowserAppSrc/BrowserContentViewToolbar.cpp Tue Apr 27 16:41:18 2010 +0300
@@ -115,8 +115,9 @@
TBool wmlMode = iBrowserContentView->ApiProvider().WindowMgr().CurrentWindow()->WMLMode();
TBool DimHomePage = iBrowserContentView->ApiProvider().IsLaunchHomePageDimmedL();
TBool searchMode = iBrowserContentView->ApiProvider().Preferences().SearchFeature();
-
-
+ TBool embeddedMode = iBrowserContentView->ApiProvider().IsEmbeddedModeOn();
+ TBool embeddedOperatorMenu = CBrowserAppUi::Static()->IsEmbeddedInOperatorMenu();
+ iBrowserContentView->Toolbar()->SetItemDimmed(EWmlCmdFavourites, (embeddedMode || embeddedOperatorMenu), ETrue);
// Extended Toolbar
iBrowserContentView->Toolbar()->SetItemDimmed( EWmlCmdToolbarExtensionContentView,
(pageOverview), ETrue );
@@ -181,10 +182,11 @@
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 );
+ TBool dimDownloads = iBrowserContentView->ApiProvider().BrCtlInterface().BrowserSettingL(TBrCtlDefs::ESettingsNumOfDownloads) ? EFalse : ETrue;
+ iBrowserContentView->Toolbar()->ToolbarExtension()->SetItemDimmed( EWmlCmdDownloads, dimDownloads );
#else
iBrowserContentView->Toolbar()->ToolbarExtension()->SetItemDimmed( EWmlCmdShowMiniature, wmlMode );
#endif
--- a/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Wed Apr 14 16:00:33 2010 +0300
+++ b/browserui/browser/FavouritesSrc/BrowserBookmarksView.cpp Tue Apr 27 16:41:18 2010 +0300
@@ -1118,26 +1118,32 @@
iEnteredURL = NULL;
BROWSER_LOG( ( _L("delete iEnteredUrl 3") ) );
iCursorPos = -1;
-
-
+
//Since the webcore will be reading the bookmark information in background
//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;
+ Toolbar()->HideItem( EWmlCmdAddBookmark, ETrue , EFalse);
+
+ //disable both the goto items and activate one of them depending on availability of search feature during bookmarks activation
+ Toolbar()->HideItem( EWmlCmdGoToAddress, ETrue , EFalse);
+ Toolbar()->HideItem( EWmlCmdGoToAddressAndSearch, ETrue , EFalse );
+
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
+ Toolbar()->HideItem( EWmlCmdDelete, ETrue , EFalse);
+#else
+ Toolbar()->HideItem( EWmlCmdPreferences, ETrue , EFalse);
+#endif
+
+ Cba()->MakeVisible( EFalse);
+ StatusPane()->MakeVisible( EFalse );
+
if (iPenEnabled)
{
Toolbar()->SetToolbarObserver(this);
- }
- if ( ApiProvider().Preferences().SearchFeature() )
- {
- Toolbar()->HideItem( EWmlCmdGoToAddress, ETrue, ETrue );
- }
- else
- {
- Toolbar()->HideItem( EWmlCmdGoToAddressAndSearch, ETrue, EFalse );
- }
+ }
}
// ----------------------------------------------------------------------------
@@ -2117,6 +2123,25 @@
LOG_ENTERFN("CBrowserBookmarksView::DoActivateL");
LOG_WRITE_FORMAT(" aCustomMessageId: %d", aCustomMessageId);
+ Toolbar()->HideItem( EWmlCmdAddBookmark, EFalse , ETrue);
+
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
+ Toolbar()->HideItem( EWmlCmdDelete, EFalse , ETrue);
+#else
+ Toolbar()->HideItem( EWmlCmdPreferences, EFalse , ETrue);
+#endif
+
+ if ( ApiProvider().Preferences().SearchFeature() )
+ {
+ Toolbar()->HideItem( EWmlCmdGoToAddressAndSearch, EFalse, ETrue);
+ }
+ else
+ {
+ Toolbar()->HideItem( EWmlCmdGoToAddress, EFalse, ETrue);
+ }
+
+ Cba()->MakeVisible( ETrue);
+
StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_USUAL );
StatusPane()->MakeVisible( ETrue );
ApiProvider().Display().ClearMessageInfo();
--- a/browserui/browser/Group/72browsericons.txt Wed Apr 14 16:00:33 2010 +0300
+++ b/browserui/browser/Group/72browsericons.txt Tue Apr 27 16:41:18 2010 +0300
@@ -98,4 +98,4 @@
-c8,8 qgn_indi_browser_tb_goto_and_search.svg
-c8,8 qgn_prop_browser_info_small.svg
-c8,8 qgn_indi_browser_tb_exit.svg
-
+-c8,8 qgn_indi_browser_tb_downloads.svg
--- a/browserui/browser/SrcData/BrowserToolbar.hrh Wed Apr 14 16:00:33 2010 +0300
+++ b/browserui/browser/SrcData/BrowserToolbar.hrh Tue Apr 27 16:41:18 2010 +0300
@@ -373,4 +373,14 @@
//skin KAknsIIDQgnIndiBrowserTbGotoAndSearch
}
#endif
+#ifdef BRDO_MULTITOUCH_ENABLED_FF
+
+RESOURCE AVKON_BUTTON_STATE_EXTENSION r_browser_ext_qgn_indi_browser_tb_downloads
+ {
+ bmbSkinIdMajor = EAknsMajorGeneric;
+ bmbSkinIdMinor = EAknsMinorGenericQgnIndiBrowserTbDownloads;
+ //skin KAknsIIDQgnIndiBrowserTbDownloads
+ }
+
+#endif
#endif // BROWSERTOOLBAR_HRH
--- a/browserui/browser/SrcData/browser_toolbar.rssi Wed Apr 14 16:00:33 2010 +0300
+++ b/browserui/browser/SrcData/browser_toolbar.rssi Tue Apr 27 16:41:18 2010 +0300
@@ -177,6 +177,7 @@
};
};
},
+#ifndef BRDO_MULTITOUCH_ENABLED_FF
TBAR_CTRL
{
type = EAknCtButton;
@@ -199,6 +200,30 @@
};
};
},
+#else
+ TBAR_CTRL
+ {
+ type = EAknCtButton;
+ id = EWmlCmdDownloads;
+
+ control = AVKON_BUTTON
+ {
+ flags = KAknButtonRequestExitOnButtonUpEvent;
+ states =
+ {
+ AVKON_BUTTON_STATE
+ {
+ txt = qtn_browser_list_downloads;
+ helptxt = qtn_browser_list_downloads;
+ bmpfile = "\\Resource\\apps\\browser.mif";
+ bmpid = EMbmBrowserQgn_indi_browser_tb_downloads;
+ bmpmask = EMbmBrowserQgn_indi_browser_tb_downloads_mask;
+ extension = r_browser_ext_qgn_indi_browser_tb_downloads;
+ }
+ };
+ };
+ },
+#endif
TBAR_CTRL
{
type = EAknCtButton;