# HG changeset patch # User William Roberts # Date 1246883581 -3600 # Node ID 3d957c30fcd9be20f351fbf66080175d0057adfe # Parent e45c3f40ea5fa18a1e67a739b1cd6581b6a38657# Parent 5685981055e4314c98ed561246f1fbd5be4b6f18 Merge diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp --- a/browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/group/BrowserAudioVideoPluginEcom.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -40,7 +40,11 @@ HEADER TARGET BrowserAudioVideoPlugin.rsc TARGETPATH RESOURCE_FILES_DIR -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif END APP_LAYER_SYSTEMINCLUDE diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/inc/BavpController.h --- a/browserplugins/browseraudiovideoplugin/inc/BavpController.h Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/inc/BavpController.h Mon Jul 06 13:33:01 2009 +0100 @@ -31,7 +31,7 @@ #include "BavpVolumeHandler.h" #include "BavpHwKeyEvents.h" // Hardware Key Events #include "BavpClipInfo.h" // Clip info - +#include // FORWARD DECLARATIONS class RFs; @@ -226,6 +226,8 @@ * @return none */ virtual void BavpFocusChanged( TBool aFocus ); + + virtual TBool HandleGesture(RT_GestureHelper::TGestureEvent *gesture); public: // New methods @@ -253,7 +255,7 @@ * @param none * @return void */ - virtual void RefreshRectCoordinates(); + virtual void RefreshRectCoordinatesL(); /** * Sets original file name (used for scripting functionality) diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/inc/BavpControllerVideo.h --- a/browserplugins/browseraudiovideoplugin/inc/BavpControllerVideo.h Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/inc/BavpControllerVideo.h Mon Jul 06 13:33:01 2009 +0100 @@ -207,6 +207,8 @@ * @return void */ void HandleCommandL( TBavpCommandIds aCommand ); + + TBool HandleGesture(RT_GestureHelper::TGestureEvent *gesture); public: // From MBavpController diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/inc/BavpPlugin.h --- a/browserplugins/browseraudiovideoplugin/inc/BavpPlugin.h Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/inc/BavpPlugin.h Mon Jul 06 13:33:01 2009 +0100 @@ -28,6 +28,7 @@ #include #include #include "BavpNPObject.h" +#include // FORWARD DECLARATIONS class CBavpView; @@ -215,6 +216,10 @@ void SetMimeType(NPMIMEType type); NPP getNPP() {return iNPP;} + + NPNetscapeFuncs* getNPNFuncs(); + + TBool HandleGesture(void* aEvent); private: /** diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/inc/BavpView.h --- a/browserplugins/browseraudiovideoplugin/inc/BavpView.h Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/inc/BavpView.h Mon Jul 06 13:33:01 2009 +0100 @@ -205,6 +205,8 @@ * @return TKeyResponse */ TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType ); + + void HandlePointerEventL(const TPointerEvent &aPointerEvent); protected: // Methods from CCoeControl diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/src/BavpApi.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpApi.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/src/BavpApi.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -401,11 +401,25 @@ // ----------------------------------------------------------------------------- // BavpEvent NOT SUPPORTED // ----------------------------------------------------------------------------- -int16 BavpEvent( NPP /*instance*/, - void* /*event*/ ) +int16 BavpEvent( NPP instance, + void* event ) { - // Not implemented - return NPERR_NO_ERROR; + TInt ret = EFalse; + if (instance) + { + CBavpPlugin *plugin = static_cast(instance->pdata); + NPEvent *ev = static_cast(event); + + if (plugin) + { + if (ev->event == ENppEventPointer) + { + NPEventPointer *evp =static_cast (ev->param); + ret = plugin->HandleGesture(evp->reserved); + } + } + } + return ret; } // ----------------------------------------------------------------------------- diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/src/BavpController.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpController.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/src/BavpController.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -40,6 +40,7 @@ #include "eikon.hrh" +using namespace RT_GestureHelper; // CONSTANTS const TInt KBavpMaxLinkFileSize = 5120; // 5kB @@ -321,12 +322,12 @@ } // ----------------------------------------------------------------------------- -// CBavpControllerAudioo::RefreshRectCoordinates +// CBavpControllerAudioo::RefreshRectCoordinatesL // Refresh the coordinates of rect for display // ----------------------------------------------------------------------------- -void CBavpController::RefreshRectCoordinates() +void CBavpController::RefreshRectCoordinatesL() { - Log( EFalse, _L("CBavpController::RefreshRectCoordinates()") ); + Log( EFalse, _L("CBavpController::RefreshRectCoordinatesL()") ); } // ----------------------------------------------------------------------------- @@ -866,4 +867,14 @@ HandleCommandL( aCommand ); } */ + +// ----------------------------------------------------------------------------- +// HandleGesture(TGestureEvent *gesture) +// ----------------------------------------------------------------------------- +TBool CBavpController::HandleGesture(TGestureEvent* /*gesture*/) + { + // should be implemented in derrived class. + return EFalse; + } + // End of File diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/src/BavpControllerVideo.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpControllerVideo.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/src/BavpControllerVideo.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -29,6 +29,8 @@ #include #include +using namespace RT_GestureHelper; + // CONSTANTS // One second represented in microseconds const TInt KBavpOneSecond = 1000000; @@ -1344,4 +1346,26 @@ RevertToNormalScreenL(); } } + +// ----------------------------------------------------------------------------- +// CBavpControllerVideo::HandleGesture +// ----------------------------------------------------------------------------- +TBool CBavpControllerVideo::HandleGesture(TGestureEvent *gesture) +{ + TBool ret = EFalse; + TGestureCode gtype = gesture->Code(EAxisBoth); + switch(gtype) + { + case EGestureTap: + { + if (IsClipFullScreen()) + { + ToggleScreen(); + ret = ETrue; + } + break; + } + } + return ret; +} // End of File diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/src/BavpPlugin.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpPlugin.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/src/BavpPlugin.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -29,6 +29,7 @@ #include "BavpControllerVideo.h" #include +using namespace RT_GestureHelper; // CONSTANTS _LIT( KBrowserAVPluginRscFileZ, "z:BrowserAudioVideoPlugin.rsc" ); @@ -365,5 +366,26 @@ iMimeType = type.Alloc(); } +// ----------------------------------------------------------------------------- +// CBavpPlugin::HandleGesture +// ----------------------------------------------------------------------------- +TBool CBavpPlugin::HandleGesture(void* aEvent) + { + TBool ret = EFalse; + TGestureEvent *gesture = static_cast(aEvent); + ret = iBavpController->HandleGesture(gesture); + + return ret; + } + +// ----------------------------------------------------------------------------- +// CBavpPlugin::getNPNFuncs +// ----------------------------------------------------------------------------- +NPNetscapeFuncs* CBavpPlugin::getNPNFuncs() + { + CBavpPluginEcomMain* npm = (CBavpPluginEcomMain*)Dll::Tls(); + return npm ? npm->Funcs() : NULL; + } + // End of File diff -r 5685981055e4 -r 3d957c30fcd9 browserplugins/browseraudiovideoplugin/src/BavpView.cpp --- a/browserplugins/browseraudiovideoplugin/src/BavpView.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserplugins/browseraudiovideoplugin/src/BavpView.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -32,6 +32,7 @@ #include "BavpView.h" #include "BrCtlDefs.h" #include "BavpController.h" +#include "BavpPlugin.h" // ============================ MEMBER FUNCTIONS =============================== @@ -225,7 +226,7 @@ if ( iBavpController ) { iRect = Rect(); - iBavpController->RefreshRectCoordinates(); + iBavpController->RefreshRectCoordinatesL(); } } @@ -742,4 +743,30 @@ } + +void CBavpView::HandlePointerEventL(const TPointerEvent &aPointerEvent) + { + /* + * Plugin is sending all pointer events to the browser. + * Browser will process them to gesture and return back using + * event() function. (see PluginWin::HandleGesture(), BavpEvent() and + * CBavpPlugin::HandleGesture(). + * Browser expects event position to be in absolute co-ordinates, + * so we convert position of the pointer event here. + */ + TPoint point(aPointerEvent.iPosition + PositionRelativeToScreen()); + TPointerEvent tmpEvent(aPointerEvent); + tmpEvent.iPosition = point; + + NPNetscapeFuncs* funcs = iBavPlugin->getNPNFuncs(); + + + if(funcs && funcs->setvalue) + { + (funcs->setvalue)(iBavPlugin->getNPP(), + (NPPVariable) NPPVPluginPointerEvent, + (void*) &(tmpEvent)); + } + } + // End of File diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/BrowserAppSrc/BrowserContentView.cpp --- a/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/BrowserAppSrc/BrowserContentView.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -3066,7 +3066,8 @@ { delete(iShortcutKeyMap); iShortcutKeyMap = NULL; - UpdateCbaL(); + TRAP_IGNORE(UpdateCbaL()); + TRAP_IGNORE(UpdateFullScreenL()); } // --------------------------------------------------------------------------- @@ -3153,7 +3154,7 @@ { #ifdef RD_SCALABLE_UI_V2 if ( Layout_Meta_Data::IsLandscapeOrientation() ) - StatusPane()->SwitchLayoutL(R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS); + StatusPane()->SwitchLayoutL(R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS); #endif StatusPane()->MakeVisible( ETrue ); iContainer->SetRect(ClientRect()); @@ -3289,7 +3290,6 @@ && !iOptionsMenuActive && !ApiProvider().IsDisplayingMenuOrDialog() && !ApiProvider().WindowMgr().CurrentWindow()->WMLMode() - && !IsEditMode() && !iIsPluginFullScreenMode) { EnableFullScreenModeL( ETrue); diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp --- a/browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/BrowserAppSrc/BrowserContentViewContainer.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -203,10 +203,14 @@ } TKeyEvent keyEvent( aKeyEvent ); + TBrCtlDefs::TBrCtlElementType elementtype = + iApiProvider.BrCtlInterface().FocusedElementType(); // Don't allow virtual keyboard backspace key event to close the window + // And don't close window if editing in an input box if ( !AknLayoutUtils::PenEnabled() && aType == EEventKey - && keyEvent.iCode == EKeyBackspace ) + && keyEvent.iCode == EKeyBackspace + && elementtype != TBrCtlDefs::EElementActivatedInputBox ) { if ( iApiProvider.Preferences().UiLocalFeatureSupported( KBrowserMultipleWindows ) ) @@ -275,8 +279,7 @@ { if ( keyEvent.iRepeats && iSelectionKeyPressed ) { - TBrCtlDefs::TBrCtlElementType elementtype = - iApiProvider.BrCtlInterface().FocusedElementType(); + TInt command( KErrNotFound ); switch( elementtype ) { diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/BrowserAppSrc/BrowserDisplay.cpp --- a/browserui/browser/BrowserAppSrc/BrowserDisplay.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/BrowserAppSrc/BrowserDisplay.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -220,8 +220,9 @@ iTitle = temp; CAknIndicatorContainer* indicContainerEditing = SelectIndicContainerEditing(); // Checking to see if we are in contentview so that title is updated for other views like - // Bookmarks and Settings - if((indicContainerEditing) && (ApiProvider().LastActiveViewId() == KUidBrowserContentViewId )) + // Bookmarks and Settings. In landscape mode title could be updated all the time regardless of progress bar. + if ( !Layout_Meta_Data::IsLandscapeOrientation() && + (indicContainerEditing) && (ApiProvider().LastActiveViewId() == KUidBrowserContentViewId )) { //Under full screen mode, the progress bar is at the bottom and the title should be updated //all the time. diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp --- a/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/BrowserAppSrc/BrowserGotoPane.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -487,7 +487,15 @@ return EKeyWasConsumed; // Ignore diagonal navigation events here } - if ( (aKeyEvent.iCode == EKeyOK ) && iGPObserver && IsFocused() ) + // For touch UI, handle enter key from VKB as a "GOTO" + if (AknLayoutUtils::PenEnabled() && aKeyEvent.iCode == EKeyEnter) + { + CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneGoTo); + return EKeyWasConsumed; + } + else if ( ((aKeyEvent.iCode == EKeyOK ) || (aKeyEvent.iCode == EKeyEnter)) + && iGPObserver + && IsFocused() ) { if ( CBrowserAppUi::Static()->ContentView()->MenuBar()->MenuPane()->IsVisible() ) { @@ -495,17 +503,13 @@ } else { + // If there is an observer and we have the focus, enter key is + // consumed and observer is notified. iGPObserver->HandleGotoPaneEventL ( this, MGotoPaneObserver::EEventEnterKeyPressed ); - return EKeyWasConsumed; // If there is an observer and we have the focus, - } // enter key is consumed and observer is notified. - } - - else if (AknLayoutUtils::PenEnabled() && aKeyEvent.iCode == EKeyEnter) - { // For touch UI, handle enter key from VKB as a "GOTO" - CBrowserAppUi::Static()->ActiveView()->HandleCommandL(EWmlCmdGotoPaneGoTo); - return EKeyWasConsumed; - } + return EKeyWasConsumed; + } + } if ( iSearchEditor && iSearchPaneActive ) { diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/BrowserAppSrc/BrowserPreferences.cpp --- a/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/BrowserAppSrc/BrowserPreferences.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -803,6 +803,11 @@ CApListItem* apItem = iCommsModel.AccessPointsL()->ItemForUid( aDefaultAccessPoint ); if (apItem == NULL) { + if( iVpnEngine->IsVpnApL( aDefaultAccessPoint ) ) + { + BROWSER_LOG( ( _L( " This is VPN AP which has a snap in it" ) ) ); + break; + } aDefaultAccessPoint = KWmlNoDefaultAccessPoint; aAssocVpn = KWmlNoDefaultAccessPoint; delete iAllPreferences.iDefaultAPDetails; diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/FavouritesInc/BrowserFavouritesListbox.h --- a/browserui/browser/FavouritesInc/BrowserFavouritesListbox.h Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/FavouritesInc/BrowserFavouritesListbox.h Mon Jul 06 13:33:01 2009 +0100 @@ -280,6 +280,14 @@ { return iSkinUpdated; } void SetSkinUpdated(TBool aSkinUpdated); + + /** + * Italicizes listbox row at index aRowIndex + * + * @param aRowIndex - index of row to be italicized + */ + void ItalicizeRowItemL(TInt aRowIndex); + protected: // Construct / destruct @@ -441,6 +449,12 @@ CBrowserFavouritesListboxState* iNewState; TBrowserFavouritesListboxDefaultDatas iDefaultDatas; CBrowserFaviconHandler* iFaviconHandler; + + /** + * Italicized font for setting listbox rows to italics font. + */ + CFbsFont *iFontItalic; + }; diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesListbox.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -107,6 +107,12 @@ delete iIconIndexes; delete iItems; delete iNewState; + + if ( iFontItalic ) + { + CWsScreenDevice& screenDev = *( CEikonEnv::Static()->ScreenDevice() ); + screenDev.ReleaseFont( iFontItalic ); + } } // --------------------------------------------------------- @@ -653,6 +659,19 @@ listBoxGraphicSize ); ItemDrawer()->ColumnData()->EnableMarqueeL( ETrue ); + + + // Setup italicized font for use later + const CFont* logicalFont = AknLayoutUtils::FontFromId(EAknLogicalFontPrimaryFont); + + // Note: This font is owned by the application's system font array (where it + // is likely already to have been created) and does not need to be + // released. It can just go out of scope.// Extract font information + TFontSpec fontSpec = logicalFont->FontSpecInTwips();// Desired height, weight, and posture already set in locals + fontSpec.iFontStyle.SetPosture( EPostureItalic );// Obtain new font + CWsScreenDevice& screenDev = *( CEikonEnv::Static()->ScreenDevice() ); + screenDev.GetNearestFontInTwips( ( CFont*& )iFontItalic, fontSpec ); + } // --------------------------------------------------------- @@ -1111,5 +1130,16 @@ iSkinUpdated = aSkinUpdated; } +// --------------------------------------------------------- +// CBrowserFavouritesListbox::ItalicizeRowItemL +// --------------------------------------------------------- +// +void CBrowserFavouritesListbox::ItalicizeRowItemL(TInt aRowIndex) + { + if (ItemDrawer() && ItemDrawer()->ColumnData() && iFontItalic) + { + ItemDrawer()->ColumnData()->SetColumnFontForRowL( aRowIndex, 1, iFontItalic ); + } + } // End of File diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp --- a/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/FavouritesSrc/BrowserFavouritesView.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -1249,6 +1249,9 @@ CRepository* repository = CRepository::NewLC( KCRUidBrowser ); User::LeaveIfError( repository->Set(KBrowserFirstBoot, EFalse) ); CleanupStack::PopAndDestroy( repository ); + + // Set Search item to italics font + iContainer->Listbox()->ItalicizeRowItemL(0); } CleanupStack::Pop(); // items: passing ownership to listbox. diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/FeedsSrc/FeedsClientUtilities.cpp --- a/browserui/browser/FeedsSrc/FeedsClientUtilities.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/FeedsSrc/FeedsClientUtilities.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -1572,6 +1572,15 @@ labelId = R_FEEDS_MALFORMED_FEED_ERROR; break; } + + case KErrNotFound: + // A pop up error note should be displayed if import is requested, + // else will be handled in default case. + if (aRequestType == CTransaction::EImportOPML) + { + labelId = R_FEEDS_FILE_NOT_FOUND_ERROR; + break; + } default: if (aStatus > 0) // All network errors { diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp --- a/browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/FeedsSrc/FeedsEditFeedDialog.cpp Mon Jul 06 13:33:01 2009 +0100 @@ -129,10 +129,7 @@ // void CFeedsEditFeedDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent) { - if ((iSelectedDlgLine == EFeedsEditAutomaticUpdatingId) && (aPointerEvent.iType == TPointerEvent::EButton1Up)) - HandleFreqCmdL(); - else - CAknForm::HandlePointerEventL(aPointerEvent); + CAknForm::HandlePointerEventL(aPointerEvent); } // --------------------------------------------------------- @@ -316,6 +313,7 @@ { // make the 'Change' Button visible cba.MakeCommandVisible(EAknSoftkeyChange, ETrue); + HandleFreqCmdL(); } else { diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/Group/BrowserNG.mmp --- a/browserui/browser/Group/BrowserNG.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/Group/BrowserNG.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -48,7 +48,11 @@ START RESOURCE ../SrcData/BrowserNG.rss TARGETPATH APP_RESOURCE_DIR HEADER -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif END START RESOURCE ../SrcData/BrowserNG_reg.rss diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/Group/bld.inf --- a/browserui/browser/Group/bld.inf Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/Group/bld.inf Mon Jul 06 13:33:01 2009 +0100 @@ -23,8 +23,15 @@ DEFAULT +// Help exports +#include "../help/group/bld.inf" + PRJ_EXPORTS -../rom/browser_stub.sis /epoc32/release/armv5/urel/browser_stub.sis +#ifdef __S60_32__ +../rom/browser_stub_32.sis /epoc32/release/armv5/urel/browser_stub.sis +#else +../rom/browser_stub.sis /epoc32/release/armv5/urel/browser_stub.sis +#endif ../SrcData/feeds_view_template.html /epoc32/winscw/c/feeds_view_template.html ../SrcData/feeds_view_template.html /epoc32/data/c/feeds_view_template.html diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/Rom/Browser_stub.SIS Binary file browserui/browser/Rom/Browser_stub.SIS has changed diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/Rom/Browser_stub.pkg --- a/browserui/browser/Rom/Browser_stub.pkg Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/Rom/Browser_stub.pkg Mon Jul 06 13:33:01 2009 +0100 @@ -18,7 +18,7 @@ &EN ;Header -#{"Web Browser"},(0x10008D39),1,0,0, TYPE=SA +#{"Web Browser"},(0x10008D39),7,1,0, TYPE=SA ;Localised Vendor name %{"Nokia"} @@ -26,141 +26,3 @@ ;Unique Vendor name :"Nokia" -""-"z:\RESOURCE\APPS\BrowserAudioVideoPlugin_aif.mif" -""-"z:\RESOURCE\APPS\VideoServices_AIF.MIF" -""-"z:\RESOURCE\APPS\browser.mif" -""-"z:\RESOURCE\APPS\browserng_aif.mif" -""-"z:\RESOURCE\APPS\connman.mif" -""-"z:\RESOURCE\APPS\downloadmgruilib.mif" -""-"z:\RESOURCE\APPS\operatormenu_aif.mif" -""-"z:\RESOURCE\APPS\pushmtm.mif" -""-"z:\RESOURCE_FILES_DIR\WidgetMenu.R*" -""-"z:\Resource\APPS\webkiticons.mif" -""-"z:\Resource\APPS\webkitutilsicons.mif" -""-"z:\Resource\Plugins\CodRecog.rsc" -""-"z:\Resource\Plugins\CookieFilter.rsc" -""-"z:\Resource\Plugins\DdRecog.rsc" -""-"z:\Resource\Plugins\DeflateFilter.rsc" -""-"z:\Resource\Plugins\HttpFilterAcceptHeader.rsc" -""-"z:\Resource\Plugins\HttpFilterAuthentication.rsc" -""-"z:\Resource\Plugins\HttpFilterCache.rsc" -""-"z:\Resource\Plugins\HttpFilterPipeliningConfig.rsc" -""-"z:\Resource\Plugins\PushMtmPushContentHandler.rsc" -""-"z:\Resource\Plugins\PushMtmWhiteListAdapter.rsc" -""-"z:\Resource\Plugins\SchemeDispatcher.rsc" -""-"z:\Resource\Plugins\WidgetInstallerUI.rsc" -""-"z:\Resource\Plugins\WidgetRecognizer.rsc" -""-"z:\Resource\Plugins\httpfilterIop.rsc" -""-"z:\Resource\Plugins\httpfilterconnhandler.rsc" -""-"z:\Resource\Plugins\httpfilterproxy.rsc" -""-"z:\Resource\Plugins\memoryplugin.rsc" -""-"z:\Resource\Plugins\npBrowserAudioVideoPlugin.rsc" -""-"z:\Resource\Plugins\npGpsPlugin.rsc" -""-"z:\Resource\Plugins\npSystemInfoPlugin.rsc" -""-"z:\Resource\Plugins\uaproffilter.rsc" -""-"z:\Resource\Plugins\widgetmemoryplugin.rsc" -""-"z:\Resource\WidgetInstallerUI.R*" -""-"z:\private\10003a3f\import\apps\BrowserNG_reg.rsc" -""-"z:\private\10003a3f\import\apps\CodViewer_reg.rsc" -""-"z:\private\10003a3f\import\apps\DdViewer_reg.rsc" -""-"z:\private\10003a3f\import\apps\Operatormenu_reg.rsc" -""-"z:\private\10003a3f\import\apps\PushViewer_reg.rsc" -""-"z:\private\10003a3f\import\apps\RoapApp_reg.rsc" -""-"z:\private\10003a3f\import\apps\SchemeApp_reg.rsc" -""-"z:\private\10003a3f\import\apps\VideoServices_reg.rsc" -""-"z:\private\10003a3f\import\apps\WidgetUi_reg.rsc" -""-"z:\resource\AiwBrowserProvider.R*" -""-"z:\resource\BrowserAudioVideoPlugin.R*" -""-"z:\resource\BrowserDialogsProvider.R*" -""-"z:\resource\CodUi.R*" -""-"z:\resource\ConnectionManager.R*" -""-"z:\resource\DownloadMgrUiLib.R*" -""-"z:\resource\apps\BrowserNG.R*" -""-"z:\resource\apps\CodViewer.R*" -""-"z:\resource\apps\DdViewer.R*" -""-"z:\resource\apps\Operatormenu.R*" -""-"z:\resource\apps\PushViewer.R*" -""-"z:\resource\apps\RoapApp.R*" -""-"z:\resource\apps\SchemeApp.R*" -""-"z:\resource\apps\VideoServices.R*" -""-"z:\resource\apps\WidgetUi.R*" -""-"z:\resource\apps\schemeapp_aif.mif" -""-"z:\resource\browsertelservice.R*" -""-"z:\resource\messaging\PushMtmUi.R*" -""-"z:\resource\messaging\mtm\PushRegistry.R*" -""-"z:\resource\plugins\AiwBrowserProvider.rsc" -""-"z:\resource\webkit.R*" -""-"z:\resource\webkitutils.R*" -""-"z:\sys\bin\AiwBrowserProvider.dll" -""-"z:\sys\bin\BrowserCache.dll" -""-"z:\sys\bin\BrowserLauncher.dll" -""-"z:\sys\bin\BrowserNG.exe" -""-"z:\sys\bin\BrowserTelService.dll" -""-"z:\sys\bin\CodDownload.dll" -""-"z:\sys\bin\CodEng.dll" -""-"z:\sys\bin\CodRecog.dll" -""-"z:\sys\bin\CodUi.dll" -""-"z:\sys\bin\CodViewer.exe" -""-"z:\sys\bin\ConnectionManager.dll" -""-"z:\sys\bin\CookieServer.exe" -""-"z:\sys\bin\DdRecog.dll" -""-"z:\sys\bin\DdViewer.exe" -""-"z:\sys\bin\DeflateFilter.DLL" -""-"z:\sys\bin\DownloadMgr.dll" -""-"z:\sys\bin\DownloadMgrServer.exe" -""-"z:\sys\bin\DownloadMgrUiLib.dll" -""-"z:\sys\bin\FavouritesEngine.dll" -""-"z:\sys\bin\FavouritesSrv.exe" -""-"z:\sys\bin\FeedsServer.exe" -""-"z:\sys\bin\FeedsServerClient.dll" -""-"z:\sys\bin\HttpCacheManager.dll" -""-"z:\sys\bin\HttpDMServEng.dll" -""-"z:\sys\bin\HttpFilterAcceptHeader.dll" -""-"z:\sys\bin\HttpFilterAuthentication.dll" -""-"z:\sys\bin\HttpFilterCache.dll" -""-"z:\sys\bin\HttpFilterCommon.dll" -""-"z:\sys\bin\HttpFilterPipeliningConfig.dll" -""-"z:\sys\bin\JavaScriptCore.DLL" -""-"z:\sys\bin\MemMan.dll" -""-"z:\sys\bin\MultipartParser.dll" -""-"z:\sys\bin\OperatorMenu.exe" -""-"z:\sys\bin\PushMtmCliSrv.dll" -""-"z:\sys\bin\PushMtmPushContentHandler.dll" -""-"z:\sys\bin\PushMtmUi.dll" -""-"z:\sys\bin\PushMtmUtil.dll" -""-"z:\sys\bin\PushMtmWhiteListAdapter.dll" -""-"z:\sys\bin\PushViewer.exe" -""-"z:\sys\bin\RECENTURLSTORE.DLL" -""-"z:\sys\bin\RoapApp.exe" -""-"z:\sys\bin\SchemeApp.exe" -""-"z:\sys\bin\SchemeDispatcher.dll" -""-"z:\sys\bin\VideoServices.exe" -""-"z:\sys\bin\WidgetBackupRestore.exe" -""-"z:\sys\bin\WidgetInstaller.dll" -""-"z:\sys\bin\WidgetInstallerUI.dll" -""-"z:\sys\bin\WidgetRecognizer.DLL" -""-"z:\sys\bin\WidgetRegistry.exe" -""-"z:\sys\bin\WidgetRegistryClient.dll" -""-"z:\sys\bin\WidgetUi.exe" -""-"z:\sys\bin\browserdialogsprovider.dll" -""-"z:\sys\bin\browserengine.dll" -""-"z:\sys\bin\cXmlParser.dll" -""-"z:\sys\bin\cookiefilter.dll" -""-"z:\sys\bin\cookiemanager.dll" -""-"z:\sys\bin\httpfilterIop.dll" -""-"z:\sys\bin\httpfilterconnhandler.dll" -""-"z:\sys\bin\httpfilterproxy.dll" -""-"z:\sys\bin\memoryplugin.DLL" -""-"z:\sys\bin\npBrowserAudioVideoPlugin.dll" -""-"z:\sys\bin\npGpsPlugin.dll" -""-"z:\sys\bin\npSystemInfoPlugin.dll" -""-"z:\sys\bin\npscript.dll" -""-"z:\sys\bin\pagescaler.dll" -""-"z:\sys\bin\uaproffilter.dll" -""-"z:\sys\bin\webkitutils.dll" -""-"z:\sys\bin\webutils.dll" -""-"z:\sys\bin\widgetengine.dll" -""-"z:\sys\bin\widgetlauncher.exe" -""-"z:\sys\bin\widgetmemoryplugin.DLL" -""-"z:\sys\bin\wmlEngine.dll" -""-"z:\sys\bin\rt_gesturehelper.dll" diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/SrcData/Feeds.rssi --- a/browserui/browser/SrcData/Feeds.rssi Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/SrcData/Feeds.rssi Mon Jul 06 13:33:01 2009 +0100 @@ -758,8 +758,9 @@ RESOURCE TBUF r_feeds_general_error { buf = qtn_feeds_general_error_dialog_text; } RESOURCE TBUF r_feeds_general_error_main_pane { buf = qtn_feeds_general_error_main_pane_text; } RESOURCE TBUF r_feeds_name_already_in_use { buf = qtn_feeds_duplicate_title_error_dialog_text; } -RESOURCE TBUF r_feeds_invalid_url { buf = qtn_feeds_invalid_url_main_pane_text; } -RESOURCE TBUF r_feeds_opening_wait { buf = qtn_feeds_opening_wait_dialog_text; } +RESOURCE TBUF r_feeds_invalid_url { buf = qtn_feeds_invalid_url_main_pane_text; } +RESOURCE TBUF r_feeds_opening_wait { buf = qtn_feeds_opening_wait_dialog_text; } +RESOURCE TBUF r_feeds_file_not_found_error { buf = qtn_feeds_file_not_found_dialog_text; } // Automatic updating RESOURCE TBUF r_feeds_autoupdating_feeds_off { buf = qtn_feeds_autoupdating_off; } diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/conf/Feeds.confml Binary file browserui/browser/conf/Feeds.confml has changed diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/conf/browserui.confml Binary file browserui/browser/conf/browserui.confml has changed diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/help/data/xhtml.zip Binary file browserui/browser/help/data/xhtml.zip has changed diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/help/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/help/group/bld.inf Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,26 @@ +/* +* 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 +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) diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/help/inc/browser.hlp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/help/inc/browser.hlp.hrh Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,28 @@ +// +// 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 diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/help/rom/browseruihelps_variant.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/browser/help/rom/browseruihelps_variant.iby Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,28 @@ +/* +* 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 diff -r 5685981055e4 -r 3d957c30fcd9 browserui/browser/loc/Feeds.loc --- a/browserui/browser/loc/Feeds.loc Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/browser/loc/Feeds.loc Mon Jul 06 13:33:01 2009 +0100 @@ -465,6 +465,13 @@ //r:3.0 #define qtn_feeds_general_error_dialog_text "An unkown error occurred" +//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 +//d: user then tries to select and import it. +//l:popup_note_window +//w: +//r:7.1 +#define qtn_feeds_file_not_found_dialog_text "File Not Found" /* Misc Strings */ /* -------------------------------------------------------------------- */ diff -r 5685981055e4 -r 3d957c30fcd9 browserui/operatormenu/group/OperatorMenu.mmp --- a/browserui/operatormenu/group/OperatorMenu.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/operatormenu/group/OperatorMenu.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -38,7 +38,11 @@ START RESOURCE ../data/Operatormenu.rss HEADER TARGETPATH APP_RESOURCE_DIR -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif END START RESOURCE ../data/Operatormenu_reg.rss diff -r 5685981055e4 -r 3d957c30fcd9 browserui/operatormenu/group/bld.inf --- a/browserui/operatormenu/group/bld.inf Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/operatormenu/group/bld.inf Mon Jul 06 13:33:01 2009 +0100 @@ -24,6 +24,9 @@ DEFAULT +// Help exports +#include "../help/group/bld.inf" + PRJ_EXPORTS ../rom/operatormenu.iby CORE_APP_LAYER_IBY_EXPORT_PATH(operatormenu.iby) ../rom/OperatorMenuResources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(OperatorMenuResources.iby) diff -r 5685981055e4 -r 3d957c30fcd9 browserui/operatormenu/help/data/xhtml.zip Binary file browserui/operatormenu/help/data/xhtml.zip has changed diff -r 5685981055e4 -r 3d957c30fcd9 browserui/operatormenu/help/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/operatormenu/help/group/bld.inf Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,26 @@ +/* +* 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 +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) diff -r 5685981055e4 -r 3d957c30fcd9 browserui/operatormenu/help/inc/ope.hlp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/operatormenu/help/inc/ope.hlp.hrh Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,14 @@ +// +// 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 diff -r 5685981055e4 -r 3d957c30fcd9 browserui/operatormenu/help/rom/operatormenuhelps_variant.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/browserui/operatormenu/help/rom/operatormenuhelps_variant.iby Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,28 @@ +/* +* 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 diff -r 5685981055e4 -r 3d957c30fcd9 browserui/videoservices/group/VideoServices.mmp --- a/browserui/videoservices/group/VideoServices.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/browserui/videoservices/group/VideoServices.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -40,7 +40,11 @@ HEADER TARGETPATH APP_RESOURCE_DIR -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif END START RESOURCE ../data/VideoServices_reg.rss diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/Group/Bld.inf --- a/pushmtm/Group/Bld.inf Thu Jun 25 01:05:35 2009 +0100 +++ b/pushmtm/Group/Bld.inf Mon Jul 06 13:33:01 2009 +0100 @@ -21,6 +21,9 @@ PRJ_PLATFORMS DEFAULT +// Help exports +#include "../help/group/bld.inf" + PRJ_EXPORTS ../Inc/PushMtmCommands.hrh APP_LAYER_PLATFORM_EXPORT_PATH(PushMtmCommands.hrh) ../rom/PushMtm.iby CORE_APP_LAYER_IBY_EXPORT_PATH(PushMtm.iby) diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/Group/PushMtmCliSrv.mmp --- a/pushmtm/Group/PushMtmCliSrv.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/pushmtm/Group/PushMtmCliSrv.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -75,6 +75,10 @@ START RESOURCE ../Data/PushRegistry.rss TARGET PushRegistry.rsc TARGETPATH MTM_INFO_FILE_DIR -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif END diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/Group/PushMtmUi.mmp --- a/pushmtm/Group/PushMtmUi.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/pushmtm/Group/PushMtmUi.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -32,7 +32,11 @@ START RESOURCE ../Data/PushMtmUi.rss HEADER -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif TARGETPATH MTM_RESOURCE_DIR END // RESOURCE diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/Group/PushViewer.mmp --- a/pushmtm/Group/PushViewer.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/pushmtm/Group/PushViewer.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -81,7 +81,11 @@ START RESOURCE ../Data/PushViewer.rss HEADER -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif TARGETPATH APP_RESOURCE_DIR END // RESOURCE diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/Plugins/Group/PushMtmPushContentHandler.mmp --- a/pushmtm/Plugins/Group/PushMtmPushContentHandler.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/pushmtm/Plugins/Group/PushMtmPushContentHandler.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -32,7 +32,11 @@ SOURCEPATH ../PushContentHandler START RESOURCE 101F854C.rss -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif TARGET PushMtmPushContentHandler.rsc END // RESOURCE diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/Plugins/Group/PushMtmWhiteListAdapter.mmp --- a/pushmtm/Plugins/Group/PushMtmWhiteListAdapter.mmp Thu Jun 25 01:05:35 2009 +0100 +++ b/pushmtm/Plugins/Group/PushMtmWhiteListAdapter.mmp Mon Jul 06 13:33:01 2009 +0100 @@ -34,7 +34,11 @@ // RESOURCES START RESOURCE ../Data/10008D3E.rss -LANGUAGE_IDS +#ifdef __S60_32__ +LANG sc +#else +LANGUAGE_IDS +#endif TARGET PushMtmWhiteListAdapter.rsc END // RESOURCE diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/help/data/xhtml.zip Binary file pushmtm/help/data/xhtml.zip has changed diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/help/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pushmtm/help/group/bld.inf Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,26 @@ +/* +* 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 +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) diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/help/inc/wpush.hlp.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pushmtm/help/inc/wpush.hlp.hrh Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,15 @@ +// +// 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 diff -r 5685981055e4 -r 3d957c30fcd9 pushmtm/help/rom/pushmtmhelps_variant.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pushmtm/help/rom/pushmtmhelps_variant.iby Mon Jul 06 13:33:01 2009 +0100 @@ -0,0 +1,28 @@ +/* +* 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