Changeset 17905 in webkit
- Timestamp:
- Nov 28, 2006 9:21:23 AM (17 years ago)
- Location:
- S60/trunk
- Files:
-
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
S60/trunk/S60Internals/ChangeLog
r17077 r17905 1 2006-11-17 vbradley <vincent.bradley@nokia.com> 2 3 Reviewed by Sachin. 4 DESC: Added new header files HttpDownloadMgrCommon.h and 5 BrowserUiInternalCRKeys.h. 6 http://bugs.webkit.org/show_bug.cgi?id=11604 7 8 * S60Headers.zip: 9 1 10 2006-10-13 brmorris <thisisbradley@gmail.com> 2 11 -
S60/trunk/WebKit/BrowserControl/inc/BrCtlDefs.h
r17793 r17905 556 556 EStateWmlView, ///< For WML view 557 557 EStateSmartTextView, ///< For Smart text recognition mode 558 EStateToolBarMode ///< For toolbar 559 #ifdef RD_32_BROWSER 560 , EStatePluginPlayer 561 #endif 558 EStateToolBarMode, ///< For toolbar 559 EStatePluginPlayer 562 560 }; 563 561 /** -
S60/trunk/WebKit/BrowserControl/src/BrCtl.cpp
r17301 r17905 78 78 #include "UrlRequestInfo.h" 79 79 #include "ToolBar.h" 80 80 81 #ifdef RD_BROWSER_WIDGETS 81 82 #include "WidgetExtension.h" 82 83 #endif //RD_BROWSER_WIDGETS 83 84 84 #ifdef RD_32_BROWSER85 85 #include "SmartLinkHandler.h" 86 #endif87 86 88 87 #include "PluginControl.h" … … 108 107 {TBrCtlDefs::EElementCheckBoxChecked, TBrCtlDefs::ECommandOpen, R_TEXT_WML_DYN_LABEL_UNCHECK, NULL}, 109 108 {TBrCtlDefs::EElementCheckBoxUnChecked, TBrCtlDefs::ECommandOpen, R_TEXT_WML_DYN_LABEL_CHECK, NULL}, 110 {TBrCtlDefs::EElementRadioButtonUnSelected, TBrCtlDefs::ECommandOpen, R_TEXT_WML_DYN_LABEL_SELECT, NULL} 111 #ifdef RD_32_BROWSER 112 , 109 {TBrCtlDefs::EElementRadioButtonUnSelected, TBrCtlDefs::ECommandOpen, R_TEXT_WML_DYN_LABEL_SELECT, NULL}, 113 110 {TBrCtlDefs::EElementSmartLinkTel, TBrCtlDefs::ECommandSmartLinkMakeCall, R_TEXT_WML_LIST_CALL, NULL}, 114 111 {TBrCtlDefs::EElementSmartLinkTel, TBrCtlDefs::ECommandSmartLinkAddToPhoneBook, R_TEXT_WML_ADD_TO_CONTACTS, NULL}, … … 116 113 {TBrCtlDefs::EElementSmartLinkEmail, TBrCtlDefs::ECommandSmartLinkSendMessage, R_TEXT_WML_SEND_MESSAGE, NULL}, 117 114 {TBrCtlDefs::EElementSmartLinkEmail, TBrCtlDefs::ECommandSmartLinkAddToPhoneBook, R_TEXT_WML_ADD_TO_CONTACTS, NULL} 118 119 #endif120 121 115 }; 122 116 … … 539 533 break; 540 534 } 541 #ifdef RD_32_BROWSER542 535 if (iWebKitControl->IsPluginPlayer()) 543 536 { … … 555 548 break; 556 549 } 557 #endif558 550 if (WmlMode()) 559 551 { … … 726 718 break; 727 719 } 728 #ifdef RD_32_BROWSER729 720 case TBrCtlDefs::ECommandFindItemPhoneNumber: 730 721 { … … 753 744 break; 754 745 } 755 #endif756 746 case TBrCtlDefs::ECommandClearFind: 757 747 { … … 759 749 break; 760 750 } 761 #ifdef RD_32_BROWSER762 751 case TBrCtlDefs::ECommandSmartLinkMakeCall: 763 752 { … … 775 764 break; 776 765 } 777 #endif778 766 case TBrCtlDefs::ECommandShowDownloads: 779 767 { … … 1705 1693 } 1706 1694 1707 #ifdef RD_32_BROWSER1708 1695 if( iWebKitControl->IsPluginPlayer() ) 1709 1696 { 1710 1697 count++; 1711 1698 } 1712 #endif1713 1699 1714 1700 return count; … … 1727 1713 return (CCoeControl*)iWebKitControl->HistoryView(); 1728 1714 } 1729 #ifdef RD_32_BROWSER1730 1715 if( iWebKitControl->IsPluginPlayer() ) 1731 1716 { 1732 1717 return iWebKitControl->PluginPlayer(); 1733 1718 } 1734 #endif1735 1719 1736 1720 TInt count(0); -
S60/trunk/WebKit/BrowserCore/Formcontrols/inc/FControlInputWidget.h
r15509 r17905 359 359 static TInt PredictiveTextOnOffGSNotifiaction( TAny* aObj ); 360 360 361 #ifdef RD_32_BROWSER362 361 /** 363 362 * Sets the Cursor Position … … 371 370 */ 372 371 void SetWebKitCursorPosition(const TKeyEvent& aKeyEvent); 373 #endif374 375 372 376 373 private: // Data -
S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputSkin.cpp
r16265 r17905 790 790 791 791 // constuct the input widget 792 #ifdef RD_32_BROWSER793 792 TRAP(err, iInputWidget = CControlInputWidget::NewL( 794 793 &webkitFrame->WebKitView(), this, iType, displayRect, … … 798 797 ) 799 798 ); 800 #else801 TRAP(err, iInputWidget = CControlInputWidget::NewL(802 &webkitFrame->WebKitView(), this, iType, displayRect,803 margins, iRect.Width(), *data, *tmpFormat, isPassword, iEmptyOk,804 iMaxLength, *iFont, 1, iWebCorePalette,805 webkitFrame->WebKitView().WebKitControl().BrCtl().BrCtlDialogsProvider()806 )807 );808 #endif809 810 799 // if the inputwidget construction fails reset the flags 811 800 if (err != KErrNone) -
S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp
r17819 r17905 57 57 #include <WebKit.rsg> 58 58 #endif 59 #ifdef RD_32_BROWSER60 59 #include "WebKitCursor.h" 61 #endif62 60 63 61 #include <centralrepository.h> … … 84 82 static const TInt KASCII9 = 0x39; 85 83 86 #ifdef RD_32_BROWSER87 84 static const TInt KCharacterWidth = 6; 88 #endif89 85 90 86 … … 258 254 TBool t9Allowed; 259 255 260 #ifdef RD_32_BROWSER261 256 iRect = aInitialRectangle; 262 #endif 257 263 258 //Create a new repository 264 259 CRepository* repository = CRepository::NewL( KCRUidAknFep ); … … 372 367 373 368 // move cursor 374 #ifdef RD_32_BROWSER375 369 SetCursorPositionL(aInitialText, aInitialRectangle); 376 #else377 iEditor->SetCursorPosL(iEditor->TextLength(), EFalse);378 #endif379 370 380 371 iEditor->SetiCursorPos();// turns on correct t9 banner based on format … … 535 526 else 536 527 { 537 #ifdef RD_32_BROWSER538 528 if (iType == ENormal && ((aKeyEvent.iScanCode == EStdKeyRightArrow && CurPos() == 0 && 539 529 iLastCurPos == iEditor->ReadableTextL()->Length()) || … … 548 538 response = iEditor->OfferKeyEventL( aKeyEvent, aType ); 549 539 } 550 #else551 response = iEditor->OfferKeyEventL( aKeyEvent, aType );552 #endif553 554 540 } 555 541 if(response == EKeyWasConsumed) … … 564 550 } 565 551 else if (aType == EEventKey && (aKeyEvent.iScanCode == EStdKeyUpArrow || 566 aKeyEvent.iScanCode == EStdKeyDownArrow 567 #ifdef RD_32_BROWSER 568 || aKeyEvent.iScanCode == EStdKeyRightArrow 569 #endif 570 )) 552 aKeyEvent.iScanCode == EStdKeyDownArrow || 553 aKeyEvent.iScanCode == EStdKeyRightArrow)) 571 554 { 572 555 SimulateDoneKeyL((TStdScanCode )aKeyEvent.iScanCode ); … … 588 571 response = EKeyWasConsumed; 589 572 } 590 #ifdef RD_32_BROWSER 591 iLastCurPos = CurPos(); 592 #endif 573 iLastCurPos = CurPos(); 593 574 return response; 594 575 } … … 1242 1223 } 1243 1224 1244 #ifdef RD_32_BROWSER1245 1225 // --------------------------------------------------------- 1246 1226 // CControlInputWidget::SetCursorPosition … … 1257 1237 } 1258 1238 TPoint pos = cur->Position(); 1259 TInt const lineNumber = (pos.iY - aInitialRectangle.iTl.iY) / iFont.FontLineGap(); //iFont.HeightInPixels(); 1239 TInt fontGap = iFont.FontLineGap(); 1240 TInt lineNumber = 0; 1241 1242 if(fontGap) 1243 { 1244 lineNumber = (pos.iY - aInitialRectangle.iTl.iY) / fontGap; //iFont.HeightInPixels(); 1245 } 1260 1246 1261 1247 if(lineNumber) … … 1328 1314 } 1329 1315 } 1330 #endif1331 1316 // End of File -
S60/trunk/WebKit/BrowserCore/Misc/src/CannedImages.cpp
r17380 r17905 207 207 KAknsIIDDefault, *iSvgMbmFile, img); 208 208 break; 209 case EImageSmartLinkPhone: 210 LoadSvg(EMbmWebkiticons_sdkQgn_prop_nrtyp_phone, 211 KAknsIIDDefault, *iSvgMbmFile, img); 212 break; 213 case EImageSmartLinkEmail: 214 LoadSvg(EMbmWebkiticons_sdkQgn_indi_ai_nt_message, 215 KAknsIIDDefault, *iSvgMbmFile, img); 216 break; 209 217 #else 210 218 case EImageMissing: … … 252 260 KAknsIIDDefault, *iSvgMbmFile, img); 253 261 break; 254 #endif255 #ifdef RD_32_BROWSER256 262 case EImageSmartLinkPhone: 257 263 LoadSvg(EMbmWebkiticonsQgn_prop_nrtyp_phone, … … 262 268 KAknsIIDDefault, *iSvgMbmFile, img); 263 269 break; 264 #endif 270 #endif 265 271 default: 266 272 TRAP_IGNORE(LoadCannedImageDirL(aImageId, *iMbmFile, img)); -
S60/trunk/WebKit/BrowserView/inc/BrowserSettingsContainer.h
r17793 r17905 73 73 const TBool KDefaultESettingsAutoFormFillEnabled = 2; 74 74 const TInt KDefaultESettingsUid = 0; 75 #ifdef RD_32_BROWSER76 75 const TBool KDefaultESettingsSmartLink = ETrue; 77 #endif78 76 const TBool KDefaultESettingsAutoOpenDownloads = ETrue; 79 77 const TBool KDefaultESettingsDisableFlash = EFalse; 80 81 78 82 79 const TInt KDefaultESettingsApId = 0; -
S60/trunk/WebKit/BrowserView/inc/SmartLinkHandler.h
r16469 r17905 57 57 58 58 // FORWARD DECLARATIONS 59 #ifndef __BROWSER_SDK 59 60 class CAiwServiceHandler; 61 #endif 60 62 class CWebKitFrame; 61 63 class CPbkContactEngine; … … 136 138 CWebKitFrame* iWebKitFrame; // not owned 137 139 140 #ifndef __BROWSER_SDK 138 141 CAiwServiceHandler* iAiwHandler; //owned 142 #endif 139 143 140 144 // Phonebook contact engine -
S60/trunk/WebKit/BrowserView/inc/WebKitControl.h
r17821 r17905 730 730 void ForegroundEvent(TBool aForeground); 731 731 732 733 #ifdef RD_32_BROWSER734 732 /* 735 733 * open plugin content player … … 756 754 */ 757 755 CCoeControl* PluginPlayer(); 758 #endif 756 759 757 /** 760 758 * DumpRenderTree … … 764 762 */ 765 763 void DumpRenderTree(); 766 767 764 768 765 private: … … 913 910 TBool iSuspendTimers; 914 911 915 #ifdef RD_32_BROWSER916 912 // plugin player 917 913 CPluginContentPlayer* iPluginPlayer; 918 #endif 914 919 915 #ifdef RD_BROWSER_WIDGETS 920 916 CWidgetExtension* iWidgetExtension; -
S60/trunk/WebKit/BrowserView/inc/WebKitCursor.h
r15887 r17905 45 45 #include "WebCoreBridge.h" 46 46 #include "CannedImages.h" 47 #include "SmartLinkMap.h" 47 48 48 #ifdef RD_32_BROWSER49 #include "SmartLinkMap.h"50 #endif51 49 /** 52 50 * virtual cursor remembers the document position … … 89 87 void IncreaseTransparencyMoveCount(); 90 88 void ResetTransparency(); 91 92 #ifdef RD_32_BROWSER93 89 CWebKitFrame* GetCurrentFrame(); 94 90 CSmartLink* GetSmartLinkEntry(); … … 97 93 void IncreaseSearchRect(TInt lr,TInt tb,TRect& aRect); 98 94 99 #endif100 95 private: 101 96 … … 113 108 TCannedImageData iArrowImage; 114 109 TCannedImageData iWaitArrowImage; 115 #ifdef RD_32_BROWSER116 110 TCannedImageData iSmartLinkPhoneImage; 117 111 TCannedImageData iSmartLinkEmailImage; 118 #endif119 112 CWebKitView* iView; 120 113 TBool iIsVisible; -
S60/trunk/WebKit/BrowserView/inc/WebKitFrame.h
r15885 r17905 66 66 class CWebKitLoader; 67 67 class CWcSettingsController; 68 #ifdef RD_32_BROWSER69 68 class CSmartLinkMap; 70 69 class CSmartLinkHandler; 71 #endif72 70 73 71 // CLASS DECLARATIONS … … 397 395 public: 398 396 RPointerArray<MPluginInstance>& PluginInstanceArray() { return iPluginInstanceArray; } 399 #ifdef RD_32_BROWSER400 397 CPluginSkin* FocusedPlugin(); 401 #endif402 398 void NotifyPluginsOfScrolling(); 403 399 TInt AppendPluginInstance( MPluginInstance* aPluginInstance ); … … 448 444 TPoint FrameCoordsInViewCoords( const TPoint &aPoint); 449 445 450 #ifdef RD_32_BROWSER451 446 /** 452 447 * smart text map 453 448 */ 454 CSmartLinkMap* SmartLinkMap() { return iSmartLinkMap; }449 CSmartLinkMap* SmartLinkMap() { return iSmartLinkMap; } 455 450 456 451 /** … … 458 453 */ 459 454 CSmartLinkHandler* SmartLinkHandler() { return iSmartLinkHandler; } 460 #endif 455 461 456 private: 462 457 void AddFramePathToString(TDes& aPath); … … 496 491 TBool iHasBorder; 497 492 498 #ifdef RD_32_BROWSER 499 // smart text map 500 CSmartLinkMap* iSmartLinkMap; 493 // smart text map 494 CSmartLinkMap* iSmartLinkMap; 501 495 CSmartLinkHandler* iSmartLinkHandler; 502 #endif 496 503 497 // Variables to represent the horizontal and vertical scrolling modes 504 498 TWebCoreScrollBarMode iHorizontalScrollBarMode; … … 516 510 // End of File 517 511 512 -
S60/trunk/WebKit/BrowserView/inc/WebKitView.h
r16809 r17905 96 96 }; 97 97 98 #ifdef RD_32_BROWSER99 98 enum TSmartLinkMode 100 99 { … … 103 102 ESmartLinkNone // Normal Mode 104 103 }; 105 #endif106 104 107 105 // FUNCTION PROTOTYPES … … 676 674 TBool IsSmallPage(); 677 675 678 #ifdef RD_32_BROWSER679 676 /* 680 677 * IsSmartLinkMode … … 694 691 * Method to search for next element 695 692 */ 696 TInt FindNextSmartLink(TBool aForward); 697 #endif 693 TInt FindNextSmartLink(TBool aForward); 698 694 699 695 private: // from MImageDecodeListener … … 764 760 //Flag set if the page is RTL 765 761 TBool iRtlPage; 766 #ifdef RD_32_BROWSER 762 767 763 // smart text mode 768 764 TSmartLinkMode iSmartLinkMode; 769 #endif770 765 771 766 //Class that gets callbacks from the toolbar … … 779 774 // End of File 780 775 776 -
S60/trunk/WebKit/BrowserView/src/BrowserSettingsContainer.cpp
r17793 r17905 291 291 SettingL( TBrCtlDefs::ESettingsLaunchCustomMessageId ).SetIntValueL( KDefaultESettingsUid ); 292 292 SettingL( TBrCtlDefs::ESettingsApId ).SetIntValueL(KDefaultESettingsApId); 293 #ifdef RD_32_BROWSER294 293 SettingL( TBrCtlDefs::ESettingsSmartLink ).SetBoolValueL( KDefaultESettingsSmartLink ); 295 #endif296 294 SettingL( TBrCtlDefs::ESettingsAutoOpenDownloads ).SetBoolValueL( KDefaultESettingsAutoOpenDownloads ); 297 295 SettingL( TBrCtlDefs::ESettingsDisableFlash ).SetBoolValueL( KDefaultESettingsDisableFlash ); -
S60/trunk/WebKit/BrowserView/src/KeyEventHandler.cpp
r17683 r17905 50 50 #include "ToolBar.h" 51 51 #include <aknutils.h> 52 53 #ifdef RD_32_BROWSER54 52 #include "SmartLinkHandler.h" 55 #endif 53 56 54 // constants 57 58 55 const TInt KNormalScrollRange = 60; 59 56 const TInt KPanningStartSpeed = 30; … … 333 330 } 334 331 335 #ifdef RD_32_BROWSER336 332 if(iWebKitView->MainFrame().FocusedFrame() && iWebKitView->SmartLinkMode() != ESmartLinkNone) 337 333 { … … 346 342 return EKeyWasConsumed; 347 343 } 348 #endif349 344 350 345 TBool finding = iWebKitView->MainFrame().FocusedFrame() && iWebKitView->InFindState(); … … 487 482 TPoint pt(0,0); 488 483 focused->WebKitBridge().WebCoreBridge().ActivateEvent(pt); 489 #ifdef RD_32_BROWSER490 484 iWebKitView->WebKitControl().OpenPluginPlayer(); 491 #endif492 485 } 493 486 return EKeyWasConsumed; … … 502 495 TBrCtlDefs::TBrCtlElementType elType( iWebKitView->FocusedElementType() ); 503 496 504 #ifdef RD_32_BROWSER505 497 if(elType == TBrCtlDefs::EElementSmartLinkTel) 506 498 { … … 512 504 } 513 505 else 514 #endif515 506 if( elType == TBrCtlDefs::EElementInputBox 516 507 || elType == TBrCtlDefs::EElementCheckBoxChecked … … 538 529 // switch to plugin player 539 530 focused->WebKitBridge().WebCoreBridge().ActivateEvent(absCursorPos); 540 #ifdef RD_32_BROWSER541 531 iWebKitView->WebKitControl().OpenPluginPlayer(); 542 #endif543 532 } 544 533 } -
S60/trunk/WebKit/BrowserView/src/SmartLinkHandler.cpp
r16969 r17905 43 43 // INCLUDE FILES 44 44 #include <commonphoneparser.h> 45 #include <AiwServiceHandler.h> 46 #include <AiwDialDataTypes.h> 45 47 46 #if defined(__BROWSER_SDK) 48 47 #include <webkit_sdk.rsg> 49 48 #else 50 49 #include <Webkit.rsg> 50 #include <AiwServiceHandler.h> 51 #include <AiwDialDataTypes.h> 51 52 #endif 53 52 54 #include <CPbkContactEngine.h> // Phonebook Engine 53 55 #include <cpbkdatasaveappui.h> // for PbkDataSaveAppUi … … 123 125 } 124 126 127 // ----------------------------------------------------------------------------- 125 128 // Destructor 126 129 CSmartLinkHandler::~CSmartLinkHandler() 127 130 { 131 #ifndef __BROWSER_SDK 128 132 delete iAiwHandler; 133 #endif 134 129 135 delete iPbkEngine; 130 136 delete iPbkDataSave; … … 145 151 void CSmartLinkHandler::PrepareAiwHandlerL() 146 152 { 153 #ifndef __BROWSER_SDK 147 154 if(!iAiwHandler) 148 155 { … … 150 157 iAiwHandler->AttachL( R_WEBKIT_AIW_INTERESTS ); 151 158 } 152 } 153 159 #endif 160 } 161 162 // ----------------------------------------------------------------------------- 154 163 void CSmartLinkHandler::PreparePhoneBookApp() 155 164 { … … 169 178 } 170 179 180 // ----------------------------------------------------------------------------- 171 181 void CSmartLinkHandler::PrepareSendUi() 172 182 { … … 185 195 void CSmartLinkHandler::HandleMakeCall() 186 196 { 187 197 #ifndef __BROWSER_SDK 188 198 //Prepare AIW service handler 189 199 PrepareAiwHandlerL(); … … 217 227 0, 0 ); // // No options used , no dial results are wanted. 218 228 } 229 #endif 219 230 } 220 231 -
S60/trunk/WebKit/BrowserView/src/WebKitControl.cpp
r17821 r17905 86 86 #endif //RD_BROWSER_WIDGETS 87 87 88 #ifdef RD_32_BROWSER89 88 #include "PluginContentPlayer.h" 90 89 #include "PluginSkin.h" 91 90 #include "SmartLinkMap.h" 92 #endif 91 93 92 #include <sysutil.h> 94 93 #include <stringloader.h> … … 597 596 delete iPageView; 598 597 delete iWebKitView; 599 #ifdef RD_32_BROWSER 598 600 599 if( iPluginPlayer ) 601 600 delete iPluginPlayer; 602 #endif603 601 604 602 if( iCancelTimer ) … … 662 660 case TBrCtlDefs::ESettingsSavedPage: 663 661 case TBrCtlDefs::ESettingsAutoRefresh: 664 #ifdef RD_32_BROWSER665 662 case TBrCtlDefs::ESettingsSmartLink: 666 #endif667 663 case TBrCtlDefs::ESettingsAutoOpenDownloads: 668 664 case TBrCtlDefs::ESettingsDisableFlash: … … 742 738 case TBrCtlDefs::ESettingsSendRefererHeader: 743 739 case TBrCtlDefs::ESettingsAutoRefresh: 744 #ifdef RD_32_BROWSER745 740 case TBrCtlDefs::ESettingsSmartLink: 746 #endif747 741 case TBrCtlDefs::ESettingsAutoOpenDownloads: 748 742 case TBrCtlDefs::ESettingsDisableFlash: … … 817 811 return iHistoryController->PageInfoLC( aPageInfo ); 818 812 } 819 #ifdef RD_32_BROWSER820 813 else if( iPluginPlayer ) { 821 814 HBufC* info = NULL; … … 828 821 } 829 822 else 830 #endif831 823 832 824 switch( aPageInfo ) … … 1474 1466 #endif // PROGRESS_LOG 1475 1467 1476 #ifdef RD_32_BROWSER1477 1468 CWebKitFrame* frame = &(iWebKitView->MainFrame()); 1478 1469 … … 1482 1473 frame = frame->TraverseNext(); 1483 1474 } 1484 #endif1485 1475 1486 1476 if( iNumProgressTrackedFrames == 0 ) … … 2113 2103 } 2114 2104 #endif //RD_BROWSER_WIDGETS 2115 #ifdef RD_32_BROWSER 2105 2116 2106 //------------------------------------------------------------------------------- 2117 2107 // Called when user clicks a plugin which is able to accept user input, … … 2151 2141 } 2152 2142 2143 //------------------------------------------------------------------------------- 2153 2144 void CWebKitControl::ClosePluginPlayer() 2154 2145 { … … 2170 2161 } 2171 2162 2163 //------------------------------------------------------------------------------- 2172 2164 TBool CWebKitControl::IsPluginPlayer() const 2173 2165 { … … 2175 2167 } 2176 2168 2169 //------------------------------------------------------------------------------- 2177 2170 CCoeControl* CWebKitControl::PluginPlayer() 2178 2171 { 2179 2172 return iPluginPlayer; 2180 2173 } 2181 #endif //RD_32_BROWSER 2174 2182 2175 // End of File -
S60/trunk/WebKit/BrowserView/src/WebKitCursor.cpp
r16325 r17905 45 45 #include "WebKitBridge.h" 46 46 #include "WebKitControl.h" 47 #ifdef RD_32_BROWSER48 47 #include "SmartLinkMap.h" 49 #endif50 48 #include <w32std.h> 51 49 #include <stdlib.h> … … 58 56 const TInt KTransparencyMoveThreshold = 15; 59 57 60 #ifdef RD_32_BROWSER61 58 const TInt KAgresiveSearch = 50; 62 #endif63 59 64 60 #define KCursorOffset TPoint(-3,-4) … … 122 118 iArrowImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageArrowBitmap); 123 119 iHandImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageFingerBitmap); 124 #ifdef RD_32_BROWSER125 120 iSmartLinkPhoneImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageSmartLinkPhone); 126 121 iSmartLinkEmailImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageSmartLinkEmail); 127 #endif128 122 iWaitArrowImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageWaitArrowBitmap); 129 123 TSize s = iArrowImage.iMask->SizeInPixels(); … … 218 212 : iArrowImage.iMask; 219 213 } 220 #ifdef RD_32_BROWSER221 214 else if ( iView->FocusedElementType() == TBrCtlDefs::EElementSmartLinkTel ) 222 215 { … … 231 224 spriteMem.iMaskBitmap = iSmartLinkEmailImage.iMask; 232 225 } 233 #endif234 226 else 235 227 { … … 366 358 ,focusedFrame->ViewCoordsInFrameCoords(iPosition)); 367 359 } 368 #ifdef RD_32_BROWSER 369 // check if the text is recognised 370 CheckSmartTextEntry(); 371 #endif 360 // check if the text is recognised 361 CheckSmartTextEntry(); 362 372 363 // now fire the mouseover event 373 364 frame->WebKitBridge().WebCoreBridge().PointerEvent( TPointerEvent::EMove,pt); … … 376 367 } 377 368 378 #ifdef RD_32_BROWSER379 369 // ----------------------------------------------------------------------------- 380 370 // CWebKitCursor::CheckSmartTextEntry … … 427 417 return NULL; 428 418 } 429 #endif430 419 431 420 // ----------------------------------------------------------------------------- … … 505 494 searchRect = TRect(pt,sz); 506 495 507 #ifdef RD_32_BROWSER508 496 TBrCtlDefs::TBrCtlElementType elType = iView->FocusedElementType(); 509 497 if( elType == TBrCtlDefs::EElementInputBox || elType == TBrCtlDefs::EElementTextAreaBox || elType == TBrCtlDefs::EElementRadioButtonUnSelected || … … 513 501 IncreaseSearchRect(lr, tb, searchRect); 514 502 } 515 #endif516 503 } 517 504 return searchRect; 518 505 } 519 506 520 #ifdef RD_32_BROWSER521 507 // ----------------------------------------------------------------------------- 522 508 // CWebKitCursor::IncreaseSearchRect … … 530 516 iFlipCounter = 0; 531 517 } 532 #endif 518 533 519 // ----------------------------------------------------------------------------- 534 520 // CWebKitCursor::OffsetCursor -
S60/trunk/WebKit/BrowserView/src/WebKitFrame.cpp
r16591 r17905 50 50 #include "PluginSkin.h" 51 51 52 #ifdef RD_32_BROWSER53 52 #include "SmartLinkMap.h" 54 53 #include "SmartLinkHandler.h" 55 #endif56 54 57 55 #include "WebKitCursor.h" … … 134 132 iWebCoreSettingsController->SetWcsSaveRawDataEnabled(true); 135 133 136 #ifdef RD_32_BROWSER 137 iSmartLinkMap = CSmartLinkMap::NewL(this); 138 iSmartLinkHandler = CSmartLinkHandler::NewL(*this); 139 #endif 134 iSmartLinkMap = CSmartLinkMap::NewL(this); 135 iSmartLinkHandler = CSmartLinkHandler::NewL(*this); 140 136 141 137 iBridge->WebCoreBridge().CreateKHTMLView( *this, aMarginWidth, aMarginHeight ); … … 177 173 #endif 178 174 179 #ifdef RD_32_BROWSER180 175 delete iSmartLinkMap; 181 176 delete iSmartLinkHandler; 182 #endif183 177 } 184 178 … … 1075 1069 } 1076 1070 1077 #ifdef RD_32_BROWSER1078 1071 // ---------------------------------------------------------------------------- 1079 1072 // CWebKitFrame::FocusedPlugin … … 1099 1092 return NULL; 1100 1093 } 1101 #endif 1094 1102 1095 //------------------------------------------------------------------------------- 1103 1096 // AppendPluginInstance -
S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp
r17790 r17905 244 244 } 245 245 246 #ifdef RD_32_BROWSER247 246 // close the plugin play if it is active 248 247 if( aUrlRequestInfo->TopLevel() && iWebKitControl->IsPluginPlayer() ) 249 248 iWebKitControl->ClosePluginPlayer(); 250 #endif251 249 252 250 // -
S60/trunk/WebKit/BrowserView/src/WebKitView.cpp
r17301 r17905 127 127 ,iRenderTarget( 0 ) 128 128 ,iTabbedNavigation(EFalse) 129 #ifdef RD_32_BROWSER130 129 ,iSmartLinkMode(ESmartLinkNone) 131 #endif132 130 { 133 131 } … … 370 368 f->CalcBidiWidth(); 371 369 f->WebKitBridge().WebCoreBridge().ScalingFactorChanged( z ); 372 #ifdef RD_32_BROWSER373 370 f->SmartLinkMap()->ReIndexSmartLinks(); 374 #endif375 371 f = f->TraverseNext(); 376 372 } … … 1518 1514 // Method to search for next telephone number in the document 1519 1515 //------------------------------------------------------------------------------- 1520 #ifdef RD_32_BROWSER1521 1516 TInt CWebKitView::FindNextSmartLink(TBool aForward) 1522 1517 { … … 1615 1610 return KErrNotFound; 1616 1611 } 1617 #endif1618 1612 1619 1613 //------------------------------------------------------------------------------- -
S60/trunk/WebKit/ChangeLog
r17877 r17905 24 24 25 25 * ResourceLoader/CacheSrc/HttpCacheStreamHandler.cpp: 26 27 2006-11-17 vbradley <vincent.bradley@nokia.com> 28 29 Reviewed by Sachin. 30 DESC: Removed the obsolete flags RD_32_BROWSER and RD_BROWSER_VIDEO_PLUGIN 31 http://bugs.webkit.org/show_bug.cgi?id=11604 32 33 * BrowserControl/inc/BrCtlDefs.h: 34 (TBrCtlDefs::): 35 * BrowserControl/src/BrCtl.cpp: 36 (CBrCtl::HandleCommandL): 37 (CBrCtl::CountComponentControls): 38 (CBrCtl::ComponentControl): 39 * BrowserCore/Formcontrols/inc/FControlInputWidget.h: 40 * BrowserCore/Formcontrols/src/FControlInputSkin.cpp: 41 (CFormInputSkin::ActivateL): 42 * BrowserCore/Formcontrols/src/FControlInputWidget.cpp: 43 (CControlInputWidget::ConstructTextEditorL): 44 (CControlInputWidget::OfferKeyEventL): 45 (CControlInputWidget::SetWebKitCursorPosition): 46 * BrowserCore/Misc/src/CannedImages.cpp: 47 (CCannedImages::GetImage): 48 * BrowserView/inc/BrowserSettingsContainer.h: 49 * BrowserView/inc/SmartLinkHandler.h: 50 * BrowserView/inc/WebKitControl.h: 51 * BrowserView/inc/WebKitCursor.h: 52 * BrowserView/inc/WebKitFrame.h: 53 * BrowserView/inc/WebKitView.h: 54 * BrowserView/src/BrowserSettingsContainer.cpp: 55 (CBrowserSettingsContainer::InsertDefaultSettingsL): 56 * BrowserView/src/KeyEventHandler.cpp: 57 (CKeyEventHandler::HandleArrowKeysL): 58 (CKeyEventHandler::HandleActivateKeysL): 59 * BrowserView/src/SmartLinkHandler.cpp: 60 (CSmartLinkHandler::~CSmartLinkHandler): 61 (CSmartLinkHandler::PrepareAiwHandlerL): 62 (CSmartLinkHandler::HandleMakeCall): 63 * BrowserView/src/WebKitControl.cpp: 64 (CWebKitControl::~CWebKitControl): 65 (CWebKitControl::SetBrowserSettingL): 66 (CWebKitControl::GetBrowserSettingL): 67 (CWebKitControl::PageInfoLC): 68 (CWebKitControl::ProgressCompleted): 69 * BrowserView/src/WebKitCursor.cpp: 70 (CWebKitCursor::ConstructL): 71 (CWebKitCursor::CursorUpdate): 72 (CWebKitCursor::MoveCursorAdjusted): 73 (CWebKitCursor::GetSmartLinkEntry): 74 (CWebKitCursor::CalcSearchRect): 75 * BrowserView/src/WebKitFrame.cpp: 76 (CWebKitFrame::ConstructL): 77 (CWebKitFrame::~CWebKitFrame): 78 * BrowserView/src/WebKitLoader.cpp: 79 (CWebKitLoader::LoadPageL): 80 * BrowserView/src/WebKitView.cpp: 81 (CWebKitView::CWebKitView): 82 (CWebKitView::ZoomLevelChanged): 83 (CWebKitView::FindNextSmartLink): 84 * Plugin/inc/PluginSkin.h: 85 (CPluginSkin::CanInteract): 86 * Plugin/inc/PluginWin.h: 87 * Plugin/src/PluginWin.cpp: 88 * ResourceLoader/src/HttpDownloadObserver.cpp: 89 (CHttpDownloadObserver::InitDownloadMgrL): 90 (CHttpDownloadObserver::HandleDMgrCompletedEventL): 91 * data/Webkit.loc: 92 * data/Webkit.rss: 93 * data/Webkit_sdk.loc: 94 * data/Webkit_sdk.rss: 95 * group/BrowserView.mmp: 96 * group/webkit.mmp: 26 97 27 98 2006-11-15 yaharon <yael.aharon@nokia.com> -
S60/trunk/WebKit/Plugin/inc/PluginSkin.h
r17301 r17905 296 296 TBool IsFocusable() const; 297 297 298 #ifdef RD_32_BROWSER299 298 HBufC* Url() { return iUrl; } 300 #endif 299 301 300 /** 302 301 * Close … … 360 359 */ 361 360 void StopPluginContent(const TDesC& aUrl); 362 #ifdef RD_32_BROWSER 361 363 362 /** 364 363 * CanInteract … … 368 367 */ 369 368 TBool CanInteract() const { return iCanPluginInteract; } 370 #endif371 369 372 370 #ifdef RD_BROWSER_WIDGETS -
S60/trunk/WebKit/Plugin/inc/PluginWin.h
r17301 r17905 450 450 */ 451 451 void SetOptionMenuHandler(MOptionMenuHandler* aOptionMenuHandler) {iOptionMenuHandler = aOptionMenuHandler;} 452 #ifdef RD_32_BROWSER 452 453 453 HBufC* PluginDataUrl(); 454 #endif 454 455 455 public: //From MCoeForegroundObserver 456 456 -
S60/trunk/WebKit/Plugin/src/PluginWin.cpp
r17301 r17905 1120 1120 } 1121 1121 1122 #ifdef RD_32_BROWSER 1122 // ----------------------------------------------------------------------------- 1123 1123 HBufC* CPluginWin::PluginDataUrl() 1124 1124 { 1125 1125 return iPluginSkin->Url(); 1126 1126 } 1127 #endif 1127 1128 1128 // ----------------------------------------------------------------------------- 1129 1129 // CPluginWin::GetParentControlObserver … … 1313 1313 } 1314 1314 1315 -
S60/trunk/WebKit/ResourceLoader/src/HttpDownloadObserver.cpp
r17710 r17905 210 210 iDownloadMgr.SetBoolAttribute( EDlMgrAutoConnect, EFalse ); 211 211 // 212 #ifdef RD_32_BROWSER 213 if (TWebCoreLoaderContainer::LoaderContainer()->DownloadsOpenEnabled()) 212 #ifdef __BROWSER_SDK 213 iDownloadMgr.SetDefaultIntAttribute( EDlAttrAction, iLaunchViewer ? ELaunch : EDoNothing ); 214 #else 215 if (TWebCoreLoaderContainer::LoaderContainer()->DownloadsOpenEnabled()) 214 216 iDownloadMgr.SetDefaultIntAttribute( EDlAttrAction, EMove + EPdLaunch); 215 else217 else 216 218 iDownloadMgr.SetDefaultIntAttribute( EDlAttrAction, EMove); 217 #else218 iDownloadMgr.SetDefaultIntAttribute( EDlAttrAction, iLaunchViewer ? ELaunch : EDoNothing );219 219 #endif 220 220 … … 636 636 { 637 637 PREPARE_DOWNLOAD_MANAGER 638 #if ndef RD_32_BROWSER638 #ifdef __SDK_BROWSER 639 639 if( !iLaunchViewer && aEvent == EHttpDlCompleted ) 640 640 { … … 663 663 } 664 664 #endif 665 666 667 668 669 670 671 672 673 674 675 665 TInt32 dlId( KErrNotFound ); 666 aDownload.GetIntAttribute( EDlAttrId, dlId ); 667 if( dlId != KErrNotFound ) 668 { 669 CBaseTransaction* trans = FindDownloadTrans( dlId ); 670 if (trans) 671 { 672 trans->iTransactionLink.Deque(); 673 delete trans; 674 } 675 } 676 676 677 677 // check if we need to keep pipelining off … … 1022 1022 // End of File 1023 1023 1024 -
S60/trunk/WebKit/data/Webkit.loc
r15604 r17905 10 10 * All rights reserved. 11 11 * 12 * 13 * 14 * 12 * Redistribution and use in source and binary forms, with or without 13 * modification, are permitted provided that the following conditions 14 * are met: 15 15 * 16 16 * * Redistributions of source code must retain the above copyright … … 24 24 * from this software without specific prior written permission. 25 25 * 26 * 27 * 28 * 29 * 30 * 31 * 32 * 33 * 34 * 35 * 36 * 37 * 26 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 27 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 28 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 29 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 30 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 31 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 32 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 33 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 34 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 35 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 36 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 37 * DAMAGE. 38 38 * 39 39 * Please see file patentlicense.txt for further grants. … … 50 50 //w: 51 51 //r: 3.0 52 #define qtn_xhtml_object_select_to_download 52 #define qtn_xhtml_object_select_to_download "Select to download" 53 53 54 54 //d: Default label for an object standby text when … … 57 57 //w: 58 58 //r: 3.0 59 #define qtn_xhtml_object_downloading 59 #define qtn_xhtml_object_downloading "Downloading data" 60 60 61 61 //d: Label for an object in case downloading was tried … … 64 64 //w: 65 65 //r: 3.0 66 #define qtn_xhtml_object_unsupported 66 #define qtn_xhtml_object_unsupported "Unsupported" 67 67 68 68 //d: Confirmation prompt displayed when a selected … … 72 72 //w: 73 73 //r: 3.0 74 #define qtn_xhtml_query_file_missing 74 #define qtn_xhtml_query_file_missing "File missing:\n %U\n Continue?" 75 75 76 76 //d: Confirmation prompt displayed when more than … … 80 80 //w: 81 81 //r: 3.0 82 #define qtn_xhtml_query_files_missing 82 #define qtn_xhtml_query_files_missing "Files missing:\n %N files\n Continue?" 83 83 84 84 … … 90 90 //w: 91 91 //r: 3.0 92 #define qtn_xhtml_query_file_restricted 92 #define qtn_xhtml_query_file_restricted "File restricted:\n %U\n Continue?" 93 93 94 94 … … 97 97 //w: 98 98 //r: 3.0 99 #define qtn_xhtml_object_query_open_to 99 #define qtn_xhtml_object_query_open_to "Open to:" 100 100 101 101 //d: Open the object on page … … 103 103 //w: 104 104 //r: 3.0 105 #define qtn_xhtml_object_query_open_to_on_page 105 #define qtn_xhtml_object_query_open_to_on_page "On page" 106 106 107 107 //d: Open the object to viewer application … … 109 109 //w: 110 110 //r: 3.0 111 #define qtn_xhtml_object_query_open_to_ext_viewer 111 #define qtn_xhtml_object_query_open_to_ext_viewer "Viewer application" 112 112 113 113 //d: Download already in progress … … 115 115 //w: 116 116 //r: 3.0 117 #define qtn_browser_note_object_downloading 117 #define qtn_browser_note_object_downloading "Downloading" 118 118 119 119 … … 123 123 //w: 124 124 //r: 3.0 125 #define qtn_browser_form_submit 126 125 #define qtn_browser_form_submit "Submit" 126 127 127 //d: Default label for form reset button when there 128 128 //d: is no label specified by the content author … … 130 130 //w: 131 131 //r: 3.0 132 #define qtn_browser_form_reset 132 #define qtn_browser_form_reset "Reset" 133 133 134 134 //d: Default title for form option selection when … … 137 137 //w: 138 138 //r: 3.0 139 #define qtn_browser_form_select 139 #define qtn_browser_form_select "Select" 140 140 141 141 //d: Command text associated to a softkey . … … 143 143 //w: 144 144 //r: 3.0 145 #define text_softkey_back 145 #define text_softkey_back "Back" 146 146 147 147 //d: Open selected deck … … 150 150 //w: 151 151 //r: 3.0 152 #define qtn_wml_list_open 152 #define qtn_wml_list_open "Open" 153 153 154 154 //d: Make phone call … … 156 156 //w: 157 157 //r: 3.0 158 #define qtn_xhtml_list_call 158 #define qtn_xhtml_list_call "Call now" 159 159 160 160 //d: Store phone nr and/or e-mail address to the phonebook … … 162 162 //w: 163 163 //r: 3.0 164 #define qtn_wml_add_to_contacts 164 #define qtn_wml_add_to_contacts "Add to Contacts" 165 165 166 166 //d: Send a message to phone numer or email address … … 169 169 //r: 3.0 170 170 #define qtn_wml_send_message "Send Message" 171 171 172 //d: Display wallet application 172 173 //l: list_single_popup_menu_pane_1 173 174 //w: 174 175 //r: 3.0 175 #define qtn_wall_list_browser_use 176 #define qtn_wall_list_browser_use "Use wallet" 176 177 177 178 //d: Display wallet application 178 179 //l: list_single_popup_menu_pane_1 179 #define qtn_wall_list_browser_close 180 #define qtn_wall_list_browser_close "Close wallet" 180 181 181 182 //d: Accept entry of input element … … 183 184 //w: 184 185 //r: 3.0 185 #define qtn_browser_list_accept 186 #define qtn_browser_list_accept "Accept" 186 187 187 188 //d: Menu item to open a plugin into external viewer … … 189 190 //w: 190 191 //r: 3.0 191 #define qtn_browser_list_open_to_viewer 192 #define qtn_browser_list_open_to_viewer "Open to viewer" 192 193 193 194 //d: Removes a file when focus on a selection box … … 195 196 //w: 196 197 //r: 3.0 197 #define qtn_browser_list_remove_file 198 #define qtn_browser_list_remove_file "Remove file" 198 199 199 200 //d: Check unchecked checkbox. … … 201 202 //w: 202 203 //r: 3.0 203 #define qtn_wml_dyn_label_check 204 #define qtn_wml_dyn_label_check "Check" 204 205 205 206 //d:Uncheck checked checkbox. … … 207 208 //w: 208 209 //r: 3.0 209 #define qtn_wml_dyn_label_uncheck 210 #define qtn_wml_dyn_label_uncheck "Uncheck" 210 211 211 212 //d: Select radio button or drop down menu. … … 213 214 //w: 214 215 //r: 3.0 215 #define qtn_wml_dyn_label_select 216 #define qtn_wml_dyn_label_select "Select" 216 217 217 218 //d: Select action button or link … … 220 221 //w: 221 222 //r: 3.0 222 #define qtn_wml_dyn_go 223 #define qtn_wml_dyn_go "Go" 223 224 224 225 //d: Edit text field. … … 226 227 //w: 227 228 //r: 3.0 228 #define qtn_wml_dyn_label_edit 229 #define qtn_wml_dyn_label_edit "Edit" 229 230 230 231 //d: Indicate done when focus is within a text field … … 232 233 //w: 233 234 //r: 3.0 234 #define qtn_wml_dyn_label_done 235 #define qtn_wml_dyn_label_done "Done" 235 236 236 237 //d: Command text associated to a softkey in the control pane. … … 239 240 //w: 240 241 //r: 3.0 241 #define qtn_text_softkey_option 242 #define qtn_text_softkey_option "Options" 242 243 243 244 //d: Command text associated to a softkey in the control pane. … … 246 247 //w: 247 248 //r: 3.0 248 #define qtn_text_softkey_cancel 249 #define qtn_text_softkey_cancel "Cancel" 249 250 250 251 //d: Command text associated to a softkey in the control pane. … … 253 254 //w: 254 255 //r: 3.0 255 #define qtn_text_softkey_ok 256 #define qtn_text_softkey_ok "Ok" 256 257 257 258 //d: Text used by BrCtlDialogsProvider for dialogs without a title. … … 259 260 //w: 260 261 //r: 3.0 261 #define qtn_text_empty_title 262 #define qtn_text_empty_title "" 262 263 263 264 //d: Command text associated to a softkey . … … 265 266 //w: 266 267 //r: 3.0 267 #define qtn_text_softkey_yes 268 #define qtn_text_softkey_yes "Yes" 268 269 269 270 //d: Command text associated to a softkey . … … 271 272 //w: 272 273 //r: 3.0 273 #define qtn_text_softkey_no 274 #define qtn_text_softkey_no "No" 274 275 275 276 //d: Command text associated to a softkey . … … 277 278 //w: 278 279 //r: 3.0 279 #define qtn_text_softkey_continue 280 #define qtn_text_softkey_continue "Continue" 280 281 281 282 //d: Note shown when the user is browsing a "normal" … … 284 285 //w: 285 286 //r: 3.0 286 #define qtn_httpsec_enter_secure_site 287 #define qtn_httpsec_enter_secure_site "You are about to view pages over a secured connection; any information you share with the site cannot be viewed by anyone else." 287 288 288 289 //d: Note shown when the user is browsing a secure … … 291 292 //w: 292 293 //r: 3.0 293 #define qtn_httpsec_leave_secure_site 294 #define qtn_httpsec_leave_secure_site "You are about to leave secured connection. Do you want to continue?" 294 295 295 296 //d: Note shown when the secure site contains unsecure items e.g. images. … … 297 298 //w: 298 299 //r: 3.0 299 #define qtn_httpsec_items_not_secured 300 #define qtn_httpsec_items_not_secured "This site contains unsecure items. Load items?" 300 301 301 302 //d: Note shown when user is browsing in secure site … … 304 305 //w: 305 306 //r: 3.0 306 #define qtn_httpsec_submit_not_secure 307 #define qtn_httpsec_submit_not_secure "Form will be submitted using unsecure connection. Continue?" 307 308 308 309 //d: popup query string for repost confirmation … … 310 311 //w: 311 312 //r: 3.0 312 #define qtn_http_repost_confirmation 313 #define qtn_http_repost_confirmation "Form will be re-submitted.Accept resending information again?" 313 314 314 315 //d: popup query string for repost confirmation … … 316 317 //w: 317 318 //r: 3.0 318 #define qtn_http_redirect_post_confirmation 319 #define qtn_http_redirect_post_confirmation "You are being redirected to another site. Continue?" 319 320 320 321 //d: Confirmation query prompt when user confirmation … … 323 324 //w: 324 325 //r: 3.0 325 #define qtn_browser_query_basic_authentication 326 #define qtn_browser_query_basic_authentication "Authentication data will be sent as plain text. Continue?" 326 327 327 328 //d: Authentication of the WML card failed. … … 329 330 //w: 330 331 //r: 3.0 331 #define text_wml_auth_fail_retry_query 332 #define text_wml_auth_fail_retry_query "Authorisation failed. Try again?" 332 333 333 334 //d: input element's message … … 335 336 //w: 336 337 //r: 3.0 337 #define qtn_text_input_req 338 #define qtn_text_input_req "Some text must\nbe entered" 338 339 339 340 //d: input element's message … … 341 342 //w: 342 343 //r: 3.0 343 #define qtn_text_more_input_req 344 #define qtn_text_more_input_req "At least %U\ncharacters\nmust be entered" 344 345 345 346 //d: Header text for the pop up window … … 347 348 //w: 348 349 //r: 3.0 349 #define qtn_wml_header_history 350 #define qtn_wml_header_history "History:" 350 351 351 352 … … 373 374 //w: 374 375 //r: 3.1 375 #define qtn_browser_form_autofill_save 376 #define qtn_browser_form_autofill_save "Save login information for this page?" 376 377 377 378 //d: Confirmation prompt displayed when No is selected for qtn_browser_form_autofill_save … … 380 381 //w: 381 382 //r: 3.1 382 #define qtn_browser_form_autofill_ask_later 383 #define qtn_browser_form_autofill_ask_later "Ask later for this page?" 383 384 384 385 //d: Browser name … … 391 392 //l:list_single_popup_submenu_pane_1 392 393 // 393 #define text_wml_option_ok 394 395 //d:DO element menu item 396 //l:list_single_popup_submenu_pane_1 397 // 398 #define text_wml_option_back 399 400 //d:DO element menu item 401 //l:list_single_popup_submenu_pane_1 402 // 403 #define text_wml_option_reset 404 405 //d:DO element menu item 406 //l:list_single_popup_submenu_pane_1 407 // 408 #define text_wml_option_options 409 410 //d:DO element menu item 411 //l:list_single_popup_submenu_pane_1 412 // 413 #define text_wml_option_erase 414 415 //d:DO element menu item 416 //l:list_single_popup_submenu_pane_1 417 // 418 #define text_wml_option_unknown 394 #define text_wml_option_ok "Ok" 395 396 //d:DO element menu item 397 //l:list_single_popup_submenu_pane_1 398 // 399 #define text_wml_option_back "Back" 400 401 //d:DO element menu item 402 //l:list_single_popup_submenu_pane_1 403 // 404 #define text_wml_option_reset "Reset" 405 406 //d:DO element menu item 407 //l:list_single_popup_submenu_pane_1 408 // 409 #define text_wml_option_options "Options" 410 411 //d:DO element menu item 412 //l:list_single_popup_submenu_pane_1 413 // 414 #define text_wml_option_erase "Erase" 415 416 //d:DO element menu item 417 //l:list_single_popup_submenu_pane_1 418 // 419 #define text_wml_option_unknown "Unknown" 419 420 420 421 //d:Browser main menu 421 422 //l:list_single_popup_menu_pane_1 422 423 // 423 #define text_wml_option_help 424 #define text_wml_option_help "Help" 424 425 425 426 426 427 // End of File 427 428 429 -
S60/trunk/WebKit/data/Webkit.rss
r15604 r17905 10 10 * All rights reserved. 11 11 * 12 * 13 * 14 * 12 * Redistribution and use in source and binary forms, with or without 13 * modification, are permitted provided that the following conditions 14 * are met: 15 15 * 16 16 * * Redistributions of source code must retain the above copyright … … 24 24 * from this software without specific prior written permission. 25 25 * 26 * 27 * 28 * 29 * 30 * 31 * 32 * 33 * 34 * 35 * 36 * 37 * 26 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 27 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 28 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 29 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 30 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 31 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 32 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 33 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 34 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 35 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 36 * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 37 * DAMAGE. 38 38 * 39 39 * Please see file patentlicense.txt for further grants. … … 49 49 #include <avkon.rh> 50 50 51 #ifdef RD_32_BROWSER52 51 #include <AiwCommon.hrh> 53 52 #include <AiwCommon.rh> 54 #endif55 53 #include <CommonDialogs.rh> 56 54 #include "Webkit.loc" 57 55 58 56 RESOURCE RSS_SIGNATURE { } 59 57 60 58 RESOURCE TBUF { buf="OSS"; } 61 59 … … 78 76 // File Upload Confirmations 79 77 // =================================================== 80 RESOURCE TBUF r_qtn_xhtml_query_file_missing 81 RESOURCE TBUF r_qtn_xhtml_query_files_missing 78 RESOURCE TBUF r_qtn_xhtml_query_file_missing { buf=qtn_xhtml_query_file_missing; } 79 RESOURCE TBUF r_qtn_xhtml_query_files_missing { buf=qtn_xhtml_query_files_missing; } 82 80 RESOURCE TBUF r_qtn_xhtml_query_file_restricted { buf=qtn_xhtml_query_file_restricted; } 83 81 … … 85 83 // Plugin API resources 86 84 // =================================================== 87 RESOURCE TBUF r_xhtml_object_select_to_download 88 RESOURCE TBUF r_xhtml_object_downloading 89 RESOURCE TBUF r_xhtml_object_unsupported 90 RESOURCE TBUF r_xhtml_object_query_open_to 91 RESOURCE TBUF r_xhtml_object_query_open_to_on_page 85 RESOURCE TBUF r_xhtml_object_select_to_download { buf = qtn_xhtml_object_select_to_download; } 86 RESOURCE TBUF r_xhtml_object_downloading { buf = qtn_xhtml_object_downloading; } 87 RESOURCE TBUF r_xhtml_object_unsupported { buf = qtn_xhtml_object_unsupported; } 88 RESOURCE TBUF r_xhtml_object_query_open_to { buf = qtn_xhtml_object_query_open_to; } 89 RESOURCE TBUF r_xhtml_object_query_open_to_on_page { buf = qtn_xhtml_object_query_open_to_on_page; } 92 90 RESOURCE TBUF r_xhtml_object_query_open_to_ext_viewer { buf = qtn_xhtml_object_query_open_to_ext_viewer; } 93 RESOURCE TBUF r_browser_note_object_downloading 91 RESOURCE TBUF r_browser_note_object_downloading { buf = qtn_browser_note_object_downloading; } 94 92 95 93 … … 97 95 // WML Form controls 98 96 // =================================================== 99 RESOURCE TBUF r_kimono_form_button_submit 100 RESOURCE TBUF r_kimono_form_button_reset 101 RESOURCE TBUF r_kimono_form_option_select 102 RESOURCE TBUF r_kimono_softkey_back 97 RESOURCE TBUF r_kimono_form_button_submit { buf = qtn_browser_form_submit; } 98 RESOURCE TBUF r_kimono_form_button_reset { buf = qtn_browser_form_reset; } 99 RESOURCE TBUF r_kimono_form_option_select { buf = qtn_browser_form_select; } 100 RESOURCE TBUF r_kimono_softkey_back { buf = text_softkey_back; } 103 101 104 102 RESOURCE TBUF r_text_wml_list_open { buf = qtn_wml_list_open; } … … 110 108 RESOURCE TBUF r_text_wml_list_open_to_viewer { buf = qtn_browser_list_open_to_viewer; } 111 109 RESOURCE TBUF r_text_wml_list_remove_file { buf = qtn_browser_list_remove_file; } 112 #ifdef RD_32_BROWSER113 110 RESOURCE TBUF r_text_wml_send_message { buf = qtn_wml_send_message; } 114 #endif115 111 116 112 RESOURCE TBUF r_text_wml_dyn_label_uncheck { buf = qtn_wml_dyn_label_uncheck; } … … 121 117 RESOURCE TBUF r_text_wml_dyn_label_done { buf = qtn_wml_dyn_label_done; } 122 118 123 RESOURCE TBUF r_wml_options_button 124 RESOURCE TBUF r_wml_cancel_button 125 RESOURCE TBUF r_wml_ok_button 119 RESOURCE TBUF r_wml_options_button { buf = qtn_text_softkey_option; } 120 RESOURCE TBUF r_wml_cancel_button { buf = qtn_text_softkey_cancel; } 121 RESOURCE TBUF r_wml_ok_button { buf = qtn_text_softkey_ok; } 126 122 127 123 // =================================================== 128 124 // BrCtl Dialog Provider 129 125 // =================================================== 130 RESOURCE TBUF r_text_empty_title 131 RESOURCE TBUF r_text_softkey_yes 132 RESOURCE TBUF r_text_softkey_no 133 RESOURCE TBUF r_text_softkey_continue 134 RESOURCE TBUF r_text_input_req 135 RESOURCE TBUF r_text_more_input_req 136 137 RESOURCE TBUF r_httpsec_enter_secure_site 138 RESOURCE TBUF r_httpsec_leave_secure_site 139 RESOURCE TBUF r_httpsec_some_items_not_secure 126 RESOURCE TBUF r_text_empty_title { buf = qtn_text_empty_title; } 127 RESOURCE TBUF r_text_softkey_yes { buf = qtn_text_softkey_yes; } 128 RESOURCE TBUF r_text_softkey_no { buf = qtn_text_softkey_no; } 129 RESOURCE TBUF r_text_softkey_continue { buf = qtn_text_softkey_continue; } 130 RESOURCE TBUF r_text_input_req { buf = qtn_text_input_req; } 131 RESOURCE TBUF r_text_more_input_req { buf = qtn_text_more_input_req; } 132 133 RESOURCE TBUF r_httpsec_enter_secure_site { buf = qtn_httpsec_enter_secure_site; } 134 RESOURCE TBUF r_httpsec_leave_secure_site { buf = qtn_httpsec_leave_secure_site; } 135 RESOURCE TBUF r_httpsec_some_items_not_secure { buf = qtn_httpsec_items_not_secured; } 140 136 RESOURCE TBUF r_httpsec_submitting_to_non_secure_page { buf = qtn_httpsec_submit_not_secure; } 141 RESOURCE TBUF r_httpsec_submit_not_secure 142 RESOURCE TBUF r_http_repost_confirmation 143 RESOURCE TBUF r_http_redirect_post_confirmation 137 RESOURCE TBUF r_httpsec_submit_not_secure { buf = qtn_httpsec_submit_not_secure; } 138 RESOURCE TBUF r_http_repost_confirmation { buf = qtn_http_repost_confirmation; } 139 RESOURCE TBUF r_http_redirect_post_confirmation { buf = qtn_http_redirect_post_confirmation; } 144 140 RESOURCE TBUF r_browser_query_basic_authentication { buf = qtn_browser_query_basic_authentication; } 145 141 RESOURCE TBUF r_wml_auth_fail_retry_query { buf = text_wml_auth_fail_retry_query; } … … 151 147 //---------------------------------------------------- 152 148 // 153 RESOURCE TBUF r_DO_element_accept 154 RESOURCE TBUF r_DO_element_prev 155 RESOURCE TBUF r_DO_element_help 156 RESOURCE TBUF r_DO_element_reset 157 RESOURCE TBUF r_DO_element_options 158 RESOURCE TBUF r_DO_element_delete 159 RESOURCE TBUF r_DO_element_unknown 149 RESOURCE TBUF r_DO_element_accept { buf=text_wml_option_ok; } 150 RESOURCE TBUF r_DO_element_prev { buf=text_wml_option_back; } 151 RESOURCE TBUF r_DO_element_help { buf=text_wml_option_help; } 152 RESOURCE TBUF r_DO_element_reset { buf=text_wml_option_reset; } 153 RESOURCE TBUF r_DO_element_options { buf=text_wml_option_options; } 154 RESOURCE TBUF r_DO_element_delete { buf=text_wml_option_erase; } 155 RESOURCE TBUF r_DO_element_unknown { buf=text_wml_option_unknown; } 160 156 161 157 // =================================================== 162 158 // History popup heading pane aka history page title 163 159 // =================================================== 164 RESOURCE TBUF r_history_popup_heading_pane 160 RESOURCE TBUF r_history_popup_heading_pane { buf = qtn_wml_header_history; } 165 161 166 162 // =================================================== 167 163 // Form Fill Save Dialogs 168 164 // =================================================== 169 RESOURCE TBUF r_browser_form_autofill_save 170 RESOURCE TBUF r_browser_form_autofill_ask_later 171 172 //---------------------------------------------------- 173 // 174 // 175 // 176 // 165 RESOURCE TBUF r_browser_form_autofill_save { buf = qtn_browser_form_autofill_save; } 166 RESOURCE TBUF r_browser_form_autofill_ask_later { buf = qtn_browser_form_autofill_ask_later; } 167 168 //---------------------------------------------------- 169 // Browser fonts 170 // 171 // Currently we're using fonts created both by 172 // the system and by us. 177 173 //---------------------------------------------------- 178 174 #define KDefaultFontHeight 180 179 175 RESOURCE ARRAY r_browser_fonts 180 181 182 183 NAMED_FONT// italic12184 185 186 187 188 NAMED_FONT// bold-italic12189 190 191 192 193 NAMED_FONT// plain13194 195 196 197 198 NAMED_FONT// italic13199 200 201 202 203 NAMED_FONT// bold-italic13204 205 206 207 208 NAMED_FONT// plain17209 210 211 212 213 NAMED_FONT// italic17214 215 216 217 218 NAMED_FONT// bold-italic17219 220 221 222 223 224 176 { 177 items = 178 { 179 NAMED_FONT // italic12 180 { 181 name = "Alpi12"; 182 height = KDefaultFontHeight; 183 }, 184 NAMED_FONT // bold-italic12 185 { 186 name = "Albi12"; 187 height = KDefaultFontHeight; 188 }, 189 NAMED_FONT // plain13 190 { 191 name = "Alp13"; 192 height = KDefaultFontHeight; 193 }, 194 NAMED_FONT // italic13 195 { 196 name = "Alpi13"; 197 height = KDefaultFontHeight; 198 }, 199 NAMED_FONT // bold-italic13 200 { 201 name = "Albi13"; 202 height = KDefaultFontHeight; 203 }, 204 NAMED_FONT // plain17 205 { 206 name = "Alp17"; 207 height = KDefaultFontHeight; 208 }, 209 NAMED_FONT // italic17 210 { 211 name = "Alpi17"; 212 height = KDefaultFontHeight; 213 }, 214 NAMED_FONT // bold-italic17 215 { 216 name = "Albi17b"; 217 height = KDefaultFontHeight; 218 } 219 }; 220 } 225 221 226 222 … … 239 235 //---------------------------------------------------- 240 236 // 241 // 237 // Script querys' header texts 242 238 // 243 239 //---------------------------------------------------- … … 246 242 RESOURCE TBUF r_qtn_browser_query_script_alert { buf=qtn_browser_query_script_alert; } 247 243 RESOURCE TBUF r_qtn_browsers_browser_name_oss { buf=qtn_browsers_browser_name_oss; } 248 #ifdef RD_32_BROWSER 244 249 245 //---------------------------------------------------- 250 246 // … … 267 263 }; 268 264 } 269 #endif -
S60/trunk/WebKit/data/Webkit_sdk.loc
r16969 r17905 1 1 /* 2 2 * ============================================================================== 3 * Name : Webkit .loc3 * Name : Webkit_sdk.loc 4 4 * Part of : Webkit 5 5 * Description : … … 164 164 #define qtn_wml_add_to_contacts "Add to Contacts" 165 165 166 //d: Send a message to phone numer or email address 167 //l: list_single_popup_menu_pane_1 168 //w: 169 //r: 3.0 170 #define qtn_wml_send_message "Send Message" 171 166 172 //d: Display wallet application 167 173 //l: list_single_popup_menu_pane_1 … … 421 427 // End of File 422 428 429 -
S60/trunk/WebKit/data/Webkit_sdk.rss
r16969 r17905 1 1 /* 2 2 * ============================================================================== 3 * Name : Webkit .rss3 * Name : Webkit_sdk.rss 4 4 * Part of : Webkit 5 5 * Description : … … 105 105 RESOURCE TBUF r_text_wml_list_open_to_viewer { buf = qtn_browser_list_open_to_viewer; } 106 106 RESOURCE TBUF r_text_wml_list_remove_file { buf = qtn_browser_list_remove_file; } 107 RESOURCE TBUF r_text_wml_send_message { buf = qtn_wml_send_message; } 107 108 108 109 RESOURCE TBUF r_text_wml_dyn_label_uncheck { buf = qtn_wml_dyn_label_uncheck; } -
S60/trunk/WebKit/group/BrowserView.mmp
r17301 r17905 73 73 SOURCE FaviconListener.cpp 74 74 SOURCE WebKitToolBarInterface.cpp 75 #ifdef RD_32_BROWSER76 75 SOURCE PluginContentPlayer.cpp 77 76 SOURCE SmartLinkHandler.cpp 78 77 SOURCE SmartLinkMap.cpp 79 #endif80 78 #ifdef RD_BROWSER_WIDGETS 81 79 SOURCE WidgetExtension.cpp … … 111 109 SYSTEMINCLUDE ..\..\MemoryManager\Inc 112 110 111 -
S60/trunk/WebKit/group/webkit.mmp
r17301 r17905 109 109 USERINCLUDE ..\..\..\HistoryProvider\inc 110 110 MW_LAYER_SYSTEMINCLUDE 111 #ifdef RD_32_BROWSER112 111 USERINCLUDE ..\..\..\ToolBar\inc 113 #endif114 112 #else 115 113 SYSTEMINCLUDE \Epoc32\include \Epoc32\include\oem … … 221 219 LIBRARY aknicon.lib 222 220 223 #ifdef RD_32_BROWSER224 221 LIBRARY ServiceHandler.lib 225 222 LIBRARY PbkView.lib // For class RPbkViewResourceFile, class CPbkDataSaveAppUi 226 223 LIBRARY PbkEng.lib // For class CPbkContactEngine, class CPbkFieldInfo 227 224 LIBRARY sendui.lib // For class CSendUi, class CMessageData 228 #endif229 225 230 226 #if defined(GCCE) … … 232 228 #endif 233 229 230
Note: See TracChangeset
for help on using the changeset viewer.