⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 17905 in webkit


Ignore:
Timestamp:
Nov 28, 2006, 9:21:23 AM (20 years ago)
Author:
spadma
Message:

2006-11-17 vbradley <​vincent.bradley@nokia.com>

Reviewed by Sachin.
DESC: Removed the obsolete flags RD_32_BROWSER and RD_BROWSER_VIDEO_PLUGIN
​http://bugs.webkit.org/show_bug.cgi?id=11604

  • BrowserControl/inc/BrCtlDefs.h: (TBrCtlDefs::):
  • BrowserControl/src/BrCtl.cpp: (CBrCtl::HandleCommandL): (CBrCtl::CountComponentControls): (CBrCtl::ComponentControl):
  • BrowserCore/Formcontrols/inc/FControlInputWidget.h:
  • BrowserCore/Formcontrols/src/FControlInputSkin.cpp: (CFormInputSkin::ActivateL):
  • BrowserCore/Formcontrols/src/FControlInputWidget.cpp: (CControlInputWidget::ConstructTextEditorL): (CControlInputWidget::OfferKeyEventL): (CControlInputWidget::SetWebKitCursorPosition):
  • BrowserCore/Misc/src/CannedImages.cpp: (CCannedImages::GetImage):
  • BrowserView/inc/BrowserSettingsContainer.h:
  • BrowserView/inc/SmartLinkHandler.h:
  • BrowserView/inc/WebKitControl.h:
  • BrowserView/inc/WebKitCursor.h:
  • BrowserView/inc/WebKitFrame.h:
  • BrowserView/inc/WebKitView.h:
  • BrowserView/src/BrowserSettingsContainer.cpp: (CBrowserSettingsContainer::InsertDefaultSettingsL):
  • BrowserView/src/KeyEventHandler.cpp: (CKeyEventHandler::HandleArrowKeysL): (CKeyEventHandler::HandleActivateKeysL):
  • BrowserView/src/SmartLinkHandler.cpp: (CSmartLinkHandler::~CSmartLinkHandler): (CSmartLinkHandler::PrepareAiwHandlerL): (CSmartLinkHandler::HandleMakeCall):
  • BrowserView/src/WebKitControl.cpp: (CWebKitControl::~CWebKitControl): (CWebKitControl::SetBrowserSettingL): (CWebKitControl::GetBrowserSettingL): (CWebKitControl::PageInfoLC): (CWebKitControl::ProgressCompleted):
  • BrowserView/src/WebKitCursor.cpp: (CWebKitCursor::ConstructL): (CWebKitCursor::CursorUpdate): (CWebKitCursor::MoveCursorAdjusted): (CWebKitCursor::GetSmartLinkEntry): (CWebKitCursor::CalcSearchRect):
  • BrowserView/src/WebKitFrame.cpp: (CWebKitFrame::ConstructL): (CWebKitFrame::~CWebKitFrame):
  • BrowserView/src/WebKitLoader.cpp: (CWebKitLoader::LoadPageL):
  • BrowserView/src/WebKitView.cpp: (CWebKitView::CWebKitView): (CWebKitView::ZoomLevelChanged): (CWebKitView::FindNextSmartLink):
  • Plugin/inc/PluginSkin.h: (CPluginSkin::CanInteract):
  • Plugin/inc/PluginWin.h:
  • Plugin/src/PluginWin.cpp:
  • ResourceLoader/src/HttpDownloadObserver.cpp: (CHttpDownloadObserver::InitDownloadMgrL): (CHttpDownloadObserver::HandleDMgrCompletedEventL):
  • data/Webkit.loc:
  • data/Webkit.rss:
  • data/Webkit_sdk.loc:
  • data/Webkit_sdk.rss:
  • group/BrowserView.mmp:
  • group/webkit.mmp:
Location:
S60/trunk
Files:
33 edited

Legend:

Unmodified
Added
Removed
  • S60/trunk/S60Internals/ChangeLog

    r17077 r17905  
     12006-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
    1102006-10-13  brmorris  <thisisbradley@gmail.com>
    211
  • S60/trunk/WebKit/BrowserControl/inc/BrCtlDefs.h

    r17793 r17905  
    556556            EStateWmlView,        ///< For WML view
    557557            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
    562560            };
    563561        /**
  • S60/trunk/WebKit/BrowserControl/src/BrCtl.cpp

    r17301 r17905  
    7878#include "UrlRequestInfo.h"
    7979#include "ToolBar.h"
     80
    8081#ifdef  RD_BROWSER_WIDGETS
    8182#include "WidgetExtension.h"
    8283#endif //RD_BROWSER_WIDGETS
    8384
    84 #ifdef RD_32_BROWSER
    8585#include "SmartLinkHandler.h"
    86 #endif
    8786
    8887#include "PluginControl.h"
    … …  
    108107    {TBrCtlDefs::EElementCheckBoxChecked, TBrCtlDefs::ECommandOpen, R_TEXT_WML_DYN_LABEL_UNCHECK, NULL},
    109108    {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},
    113110    {TBrCtlDefs::EElementSmartLinkTel, TBrCtlDefs::ECommandSmartLinkMakeCall, R_TEXT_WML_LIST_CALL, NULL},
    114111    {TBrCtlDefs::EElementSmartLinkTel, TBrCtlDefs::ECommandSmartLinkAddToPhoneBook, R_TEXT_WML_ADD_TO_CONTACTS, NULL},
    … …  
    116113    {TBrCtlDefs::EElementSmartLinkEmail, TBrCtlDefs::ECommandSmartLinkSendMessage, R_TEXT_WML_SEND_MESSAGE, NULL},
    117114    {TBrCtlDefs::EElementSmartLinkEmail, TBrCtlDefs::ECommandSmartLinkAddToPhoneBook, R_TEXT_WML_ADD_TO_CONTACTS, NULL}
    118 
    119 #endif
    120 
    121115    };
    122116
    … …  
    539533                break;
    540534                }
    541 #ifdef RD_32_BROWSER
    542535            if (iWebKitControl->IsPluginPlayer())
    543536                {
    … …  
    555548                break;
    556549                }
    557 #endif
    558550            if (WmlMode())
    559551                {
    … …  
    726718            break;
    727719            }
    728 #ifdef RD_32_BROWSER
    729720        case TBrCtlDefs::ECommandFindItemPhoneNumber:
    730721            {
    … …  
    753744            break;
    754745            }
    755 #endif
    756746        case TBrCtlDefs::ECommandClearFind:
    757747            {
    … …  
    759749            break;
    760750            }
    761 #ifdef RD_32_BROWSER
    762751        case TBrCtlDefs::ECommandSmartLinkMakeCall:
    763752            {
    … …  
    775764            break;
    776765            }
    777 #endif
    778766        case TBrCtlDefs::ECommandShowDownloads:
    779767            {
    … …  
    17051693        }
    17061694
    1707 #ifdef RD_32_BROWSER
    17081695    if( iWebKitControl->IsPluginPlayer() )
    17091696        {
    17101697        count++;
    17111698        }
    1712 #endif
    17131699
    17141700    return count;
    … …  
    17271713        return (CCoeControl*)iWebKitControl->HistoryView();
    17281714        }
    1729 #ifdef RD_32_BROWSER
    17301715    if( iWebKitControl->IsPluginPlayer() )
    17311716        {
    17321717        return iWebKitControl->PluginPlayer();
    17331718        }
    1734 #endif
    17351719
    17361720    TInt count(0);
  • S60/trunk/WebKit/BrowserCore/Formcontrols/inc/FControlInputWidget.h

    r15509 r17905  
    359359        static TInt PredictiveTextOnOffGSNotifiaction( TAny* aObj );
    360360       
    361 #ifdef RD_32_BROWSER
    362361        /**
    363362        * Sets the Cursor Position
    … …  
    371370        */
    372371        void SetWebKitCursorPosition(const TKeyEvent& aKeyEvent);
    373 #endif
    374 
    375372
    376373    private:        // Data
  • S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputSkin.cpp

    r16265 r17905  
    790790
    791791        // constuct the input widget
    792 #ifdef RD_32_BROWSER
    793792        TRAP(err, iInputWidget = CControlInputWidget::NewL(
    794793            &webkitFrame->WebKitView(), this, iType, displayRect,
    … …  
    798797            )
    799798            );
    800 #else
    801         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 #endif
    809 
    810799        // if the inputwidget construction fails reset the flags
    811800        if (err != KErrNone)
  • S60/trunk/WebKit/BrowserCore/Formcontrols/src/FControlInputWidget.cpp

    r17819 r17905  
    5757#include <WebKit.rsg>
    5858#endif
    59 #ifdef RD_32_BROWSER
    6059#include "WebKitCursor.h"
    61 #endif
    6260
    6361#include <centralrepository.h>
    … …  
    8482static const TInt KASCII9 = 0x39;
    8583
    86 #ifdef RD_32_BROWSER
    8784static const TInt KCharacterWidth = 6;
    88 #endif
    8985
    9086
    … …  
    258254  TBool t9Allowed;
    259255 
    260 #ifdef RD_32_BROWSER
    261256  iRect = aInitialRectangle;
    262 #endif
     257
    263258    //Create a new repository
    264259    CRepository* repository = CRepository::NewL( KCRUidAknFep );
    … …  
    372367   
    373368    // move cursor
    374 #ifdef RD_32_BROWSER
    375369    SetCursorPositionL(aInitialText, aInitialRectangle);
    376 #else
    377     iEditor->SetCursorPosL(iEditor->TextLength(), EFalse);
    378 #endif
    379370   
    380371    iEditor->SetiCursorPos();// turns on correct t9 banner based on format
    … …  
    535526    else
    536527        {
    537 #ifdef RD_32_BROWSER
    538528      if (iType == ENormal && ((aKeyEvent.iScanCode == EStdKeyRightArrow && CurPos() == 0  &&
    539529        iLastCurPos == iEditor->ReadableTextL()->Length()) ||
    … …  
    548538          response = iEditor->OfferKeyEventL( aKeyEvent, aType );
    549539          }
    550 #else
    551         response = iEditor->OfferKeyEventL( aKeyEvent, aType );
    552 #endif 
    553        
    554540        }
    555541    if(response == EKeyWasConsumed)
    … …  
    564550        }
    565551    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))
    571554        {
    572555        SimulateDoneKeyL((TStdScanCode )aKeyEvent.iScanCode );
    … …  
    588571        response = EKeyWasConsumed;
    589572        }
    590 #ifdef RD_32_BROWSER
    591   iLastCurPos = CurPos();
    592 #endif
     573    iLastCurPos = CurPos();
    593574    return response;
    594575    }
    … …  
    12421223  }
    12431224
    1244 #ifdef RD_32_BROWSER
    12451225// ---------------------------------------------------------
    12461226// CControlInputWidget::SetCursorPosition
    … …  
    12571237      }
    12581238  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    }
    12601246   
    12611247  if(lineNumber)
    … …  
    13281314      }
    13291315  }
    1330 #endif
    13311316//  End of File
  • S60/trunk/WebKit/BrowserCore/Misc/src/CannedImages.cpp

    r17380 r17905  
    207207                    KAknsIIDDefault, *iSvgMbmFile, img);
    208208                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;
    209217#else
    210218            case EImageMissing:
    … …  
    252260                    KAknsIIDDefault, *iSvgMbmFile, img);
    253261                break;
    254 #endif
    255 #ifdef RD_32_BROWSER                                   
    256262            case EImageSmartLinkPhone:
    257263                LoadSvg(EMbmWebkiticonsQgn_prop_nrtyp_phone,
    … …  
    262268                    KAknsIIDDefault, *iSvgMbmFile, img);
    263269                break;
    264 #endif               
     270#endif
    265271            default:
    266272                TRAP_IGNORE(LoadCannedImageDirL(aImageId, *iMbmFile, img));
  • S60/trunk/WebKit/BrowserView/inc/BrowserSettingsContainer.h

    r17793 r17905  
    7373const TBool KDefaultESettingsAutoFormFillEnabled = 2;
    7474const TInt KDefaultESettingsUid = 0;
    75 #ifdef RD_32_BROWSER
    7675const TBool KDefaultESettingsSmartLink = ETrue;
    77 #endif
    7876const TBool KDefaultESettingsAutoOpenDownloads = ETrue;
    7977const TBool KDefaultESettingsDisableFlash = EFalse;
    80 
    8178
    8279const TInt KDefaultESettingsApId = 0;
  • S60/trunk/WebKit/BrowserView/inc/SmartLinkHandler.h

    r16469 r17905  
    5757
    5858// FORWARD DECLARATIONS
     59#ifndef __BROWSER_SDK
    5960class CAiwServiceHandler;
     61#endif
    6062class CWebKitFrame;
    6163class CPbkContactEngine;
    … …  
    136138        CWebKitFrame*             iWebKitFrame;   // not owned
    137139
     140#ifndef __BROWSER_SDK
    138141        CAiwServiceHandler*         iAiwHandler; //owned
     142#endif
    139143
    140144        // Phonebook contact engine
  • S60/trunk/WebKit/BrowserView/inc/WebKitControl.h

    r17821 r17905  
    730730        void ForegroundEvent(TBool aForeground);
    731731           
    732 
    733 #ifdef RD_32_BROWSER
    734732        /*
    735733        * open plugin content player
    … …  
    756754        */
    757755        CCoeControl* PluginPlayer();
    758 #endif
     756
    759757        /**
    760758        * DumpRenderTree
    … …  
    764762        */
    765763        void DumpRenderTree();
    766 
    767764
    768765    private:
    … …  
    913910        TBool   iSuspendTimers;
    914911       
    915 #ifdef RD_32_BROWSER
    916912        // plugin player
    917913        CPluginContentPlayer*       iPluginPlayer;
    918 #endif
     914
    919915#ifdef  RD_BROWSER_WIDGETS
    920916        CWidgetExtension* iWidgetExtension;
  • S60/trunk/WebKit/BrowserView/inc/WebKitCursor.h

    r15887 r17905  
    4545#include "WebCoreBridge.h"
    4646#include "CannedImages.h"
     47#include "SmartLinkMap.h"
    4748
    48 #ifdef RD_32_BROWSER
    49 #include "SmartLinkMap.h"
    50 #endif
    5149/**
    5250 * virtual cursor remembers the document position
    … …  
    8987        void IncreaseTransparencyMoveCount();
    9088        void ResetTransparency();
    91    
    92 #ifdef RD_32_BROWSER   
    9389        CWebKitFrame* GetCurrentFrame();
    9490        CSmartLink* GetSmartLinkEntry(); 
    … …  
    9793        void IncreaseSearchRect(TInt lr,TInt tb,TRect& aRect);
    9894
    99 #endif
    10095    private:
    10196
    … …  
    113108        TCannedImageData                iArrowImage;
    114109        TCannedImageData                iWaitArrowImage;
    115 #ifdef RD_32_BROWSER   
    116110        TCannedImageData                iSmartLinkPhoneImage;
    117111        TCannedImageData                iSmartLinkEmailImage;       
    118 #endif       
    119112        CWebKitView*                    iView;
    120113        TBool                           iIsVisible;
  • S60/trunk/WebKit/BrowserView/inc/WebKitFrame.h

    r15885 r17905  
    6666class CWebKitLoader;
    6767class CWcSettingsController;
    68 #ifdef RD_32_BROWSER
    6968class CSmartLinkMap;
    7069class CSmartLinkHandler;
    71 #endif
    7270
    7371// CLASS DECLARATIONS
    … …  
    397395public:
    398396        RPointerArray<MPluginInstance>& PluginInstanceArray() { return iPluginInstanceArray; }
    399 #ifdef RD_32_BROWSER
    400397        CPluginSkin* FocusedPlugin();
    401 #endif
    402398        void NotifyPluginsOfScrolling();
    403399        TInt AppendPluginInstance( MPluginInstance* aPluginInstance );
    … …  
    448444        TPoint FrameCoordsInViewCoords( const TPoint &aPoint);
    449445
    450 #ifdef RD_32_BROWSER
    451446        /**
    452447         * smart text map
    453448         */
    454     CSmartLinkMap* SmartLinkMap()     { return iSmartLinkMap; }
     449        CSmartLinkMap* SmartLinkMap()     { return iSmartLinkMap; }
    455450
    456451        /**
    … …  
    458453         */
    459454        CSmartLinkHandler* SmartLinkHandler()       { return iSmartLinkHandler; }
    460 #endif
     455
    461456private:
    462457        void AddFramePathToString(TDes& aPath);
    … …  
    496491        TBool iHasBorder;
    497492
    498 #ifdef RD_32_BROWSER
    499     // smart text map
    500     CSmartLinkMap* iSmartLinkMap;
     493        // smart text map
     494        CSmartLinkMap* iSmartLinkMap;
    501495        CSmartLinkHandler* iSmartLinkHandler;
    502 #endif
     496
    503497        // Variables to represent the horizontal and vertical scrolling modes
    504498        TWebCoreScrollBarMode iHorizontalScrollBarMode;
    … …  
    516510// End of File
    517511
     512
  • S60/trunk/WebKit/BrowserView/inc/WebKitView.h

    r16809 r17905  
    9696    };
    9797
    98 #ifdef RD_32_BROWSER
    9998enum TSmartLinkMode
    10099    {
    … …  
    103102    ESmartLinkNone                         // Normal Mode
    104103    };
    105 #endif
    106104
    107105// FUNCTION PROTOTYPES
    … …  
    676674        TBool IsSmallPage();
    677675
    678 #ifdef RD_32_BROWSER
    679676       /*
    680677        * IsSmartLinkMode
    … …  
    694691        * Method to search for next element
    695692        */
    696     TInt FindNextSmartLink(TBool aForward);
    697 #endif
     693        TInt FindNextSmartLink(TBool aForward);
    698694
    699695    private:    // from MImageDecodeListener
    … …  
    764760        //Flag set if the page is RTL
    765761        TBool iRtlPage;
    766 #ifdef RD_32_BROWSER
     762
    767763        // smart text mode
    768764        TSmartLinkMode iSmartLinkMode;
    769 #endif
    770765
    771766    //Class that gets callbacks from the toolbar
    … …  
    779774// End of File
    780775
     776
  • S60/trunk/WebKit/BrowserView/src/BrowserSettingsContainer.cpp

    r17793 r17905  
    291291    SettingL( TBrCtlDefs::ESettingsLaunchCustomMessageId ).SetIntValueL( KDefaultESettingsUid );
    292292    SettingL( TBrCtlDefs::ESettingsApId ).SetIntValueL(KDefaultESettingsApId);
    293 #ifdef RD_32_BROWSER   
    294293    SettingL( TBrCtlDefs::ESettingsSmartLink ).SetBoolValueL( KDefaultESettingsSmartLink );
    295 #endif   
    296294    SettingL( TBrCtlDefs::ESettingsAutoOpenDownloads ).SetBoolValueL( KDefaultESettingsAutoOpenDownloads );
    297295    SettingL( TBrCtlDefs::ESettingsDisableFlash ).SetBoolValueL( KDefaultESettingsDisableFlash );
  • S60/trunk/WebKit/BrowserView/src/KeyEventHandler.cpp

    r17683 r17905  
    5050#include "ToolBar.h"
    5151#include <aknutils.h>
    52 
    53 #ifdef RD_32_BROWSER
    5452#include "SmartLinkHandler.h"
    55 #endif
     53
    5654// constants
    57 
    5855const TInt KNormalScrollRange = 60;
    5956const TInt KPanningStartSpeed = 30;
    … …  
    333330            }
    334331
    335 #ifdef RD_32_BROWSER
    336332        if(iWebKitView->MainFrame().FocusedFrame() && iWebKitView->SmartLinkMode() != ESmartLinkNone)
    337333            {
    … …  
    346342            return EKeyWasConsumed;
    347343            }
    348 #endif
    349344
    350345        TBool finding = iWebKitView->MainFrame().FocusedFrame() && iWebKitView->InFindState();
    … …  
    487482            TPoint pt(0,0);
    488483            focused->WebKitBridge().WebCoreBridge().ActivateEvent(pt);
    489 #ifdef RD_32_BROWSER
    490484            iWebKitView->WebKitControl().OpenPluginPlayer();
    491 #endif
    492485            }
    493486        return EKeyWasConsumed;
    … …  
    502495        TBrCtlDefs::TBrCtlElementType elType( iWebKitView->FocusedElementType() );
    503496
    504 #ifdef RD_32_BROWSER
    505497        if(elType == TBrCtlDefs::EElementSmartLinkTel)
    506498            {
    … …  
    512504            }
    513505        else
    514 #endif
    515506        if( elType == TBrCtlDefs::EElementInputBox
    516507            || elType == TBrCtlDefs::EElementCheckBoxChecked
    … …  
    538529                // switch to plugin player
    539530                focused->WebKitBridge().WebCoreBridge().ActivateEvent(absCursorPos);
    540 #ifdef RD_32_BROWSER
    541531                iWebKitView->WebKitControl().OpenPluginPlayer();
    542 #endif
    543532                }
    544533            }
  • S60/trunk/WebKit/BrowserView/src/SmartLinkHandler.cpp

    r16969 r17905  
    4343// INCLUDE FILES
    4444#include <commonphoneparser.h>
    45 #include <AiwServiceHandler.h>
    46 #include <AiwDialDataTypes.h>
     45
    4746#if defined(__BROWSER_SDK)
    4847#include <webkit_sdk.rsg>
    4948#else
    5049#include <Webkit.rsg>
     50#include <AiwServiceHandler.h>
     51#include <AiwDialDataTypes.h>
    5152#endif
     53
    5254#include <CPbkContactEngine.h>  // Phonebook Engine
    5355#include <cpbkdatasaveappui.h>      // for PbkDataSaveAppUi
    … …  
    123125    }
    124126
     127// -----------------------------------------------------------------------------
    125128// Destructor
    126129CSmartLinkHandler::~CSmartLinkHandler()
    127130    {
     131#ifndef __BROWSER_SDK
    128132    delete iAiwHandler;
     133#endif
     134
    129135    delete iPbkEngine;
    130136    delete iPbkDataSave;
    … …  
    145151void CSmartLinkHandler::PrepareAiwHandlerL()
    146152    {
     153#ifndef __BROWSER_SDK
    147154    if(!iAiwHandler)
    148155        {
    … …  
    150157        iAiwHandler->AttachL( R_WEBKIT_AIW_INTERESTS );
    151158        }
    152     }
    153 
     159#endif
     160    }
     161
     162// -----------------------------------------------------------------------------
    154163void CSmartLinkHandler::PreparePhoneBookApp()
    155164    {
    … …  
    169178    }
    170179
     180// -----------------------------------------------------------------------------
    171181void CSmartLinkHandler::PrepareSendUi()
    172182    {
    … …  
    185195void CSmartLinkHandler::HandleMakeCall()
    186196    {
    187    
     197#ifndef __BROWSER_SDK
    188198    //Prepare AIW service handler
    189199    PrepareAiwHandlerL();
    … …  
    217227            0, 0 ); // // No options used , no dial results are wanted.
    218228        }
     229#endif
    219230    }
    220231
  • S60/trunk/WebKit/BrowserView/src/WebKitControl.cpp

    r17821 r17905  
    8686#endif //RD_BROWSER_WIDGETS
    8787
    88 #ifdef RD_32_BROWSER
    8988#include "PluginContentPlayer.h"
    9089#include "PluginSkin.h"
    9190#include "SmartLinkMap.h"
    92 #endif
     91
    9392#include <sysutil.h>
    9493#include <stringloader.h>
    … …  
    597596    delete iPageView;
    598597    delete iWebKitView;
    599 #ifdef RD_32_BROWSER
     598
    600599    if( iPluginPlayer )
    601600        delete iPluginPlayer;
    602 #endif
    603601
    604602    if( iCancelTimer )
    … …  
    662660        case TBrCtlDefs::ESettingsSavedPage:
    663661        case TBrCtlDefs::ESettingsAutoRefresh:
    664 #ifdef RD_32_BROWSER
    665662        case TBrCtlDefs::ESettingsSmartLink:
    666 #endif
    667663        case TBrCtlDefs::ESettingsAutoOpenDownloads:
    668664        case TBrCtlDefs::ESettingsDisableFlash:
    … …  
    742738        case TBrCtlDefs::ESettingsSendRefererHeader:
    743739        case TBrCtlDefs::ESettingsAutoRefresh:
    744 #ifdef RD_32_BROWSER
    745740        case TBrCtlDefs::ESettingsSmartLink:
    746 #endif
    747741        case TBrCtlDefs::ESettingsAutoOpenDownloads:
    748742        case TBrCtlDefs::ESettingsDisableFlash:
    … …  
    817811        return iHistoryController->PageInfoLC( aPageInfo );
    818812        }
    819 #ifdef RD_32_BROWSER
    820813    else if( iPluginPlayer ) {
    821814        HBufC* info = NULL;
    … …  
    828821    }
    829822    else
    830 #endif
    831823
    832824    switch( aPageInfo )
    … …  
    14741466#endif // PROGRESS_LOG
    14751467
    1476 #ifdef RD_32_BROWSER
    14771468    CWebKitFrame* frame = &(iWebKitView->MainFrame());
    14781469
    … …  
    14821473        frame = frame->TraverseNext();
    14831474        }
    1484 #endif
    14851475
    14861476    if( iNumProgressTrackedFrames == 0 )
    … …  
    21132103    }
    21142104#endif //RD_BROWSER_WIDGETS
    2115 #ifdef RD_32_BROWSER
     2105
    21162106//-------------------------------------------------------------------------------
    21172107// Called when user clicks a plugin which is able to accept user input,
    … …  
    21512141    }
    21522142
     2143//-------------------------------------------------------------------------------
    21532144void CWebKitControl::ClosePluginPlayer()
    21542145    {
    … …  
    21702161    }
    21712162
     2163//-------------------------------------------------------------------------------
    21722164TBool CWebKitControl::IsPluginPlayer() const
    21732165    {
    … …  
    21752167    }
    21762168
     2169//-------------------------------------------------------------------------------
    21772170CCoeControl* CWebKitControl::PluginPlayer()
    21782171    {
    21792172    return iPluginPlayer;
    21802173    }
    2181 #endif //RD_32_BROWSER
     2174
    21822175//  End of File
  • S60/trunk/WebKit/BrowserView/src/WebKitCursor.cpp

    r16325 r17905  
    4545#include "WebKitBridge.h"
    4646#include "WebKitControl.h"
    47 #ifdef RD_32_BROWSER
    4847#include "SmartLinkMap.h"
    49 #endif
    5048#include <w32std.h>
    5149#include <stdlib.h>
    … …  
    5856const TInt KTransparencyMoveThreshold = 15;
    5957
    60 #ifdef RD_32_BROWSER
    6158const TInt KAgresiveSearch = 50;
    62 #endif
    6359
    6460#define KCursorOffset TPoint(-3,-4)
    … …  
    122118    iArrowImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageArrowBitmap);
    123119    iHandImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageFingerBitmap);
    124 #ifdef RD_32_BROWSER   
    125120    iSmartLinkPhoneImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageSmartLinkPhone);
    126121    iSmartLinkEmailImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageSmartLinkEmail);
    127 #endif   
    128122    iWaitArrowImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(CCannedImages::EImageWaitArrowBitmap);
    129123    TSize s = iArrowImage.iMask->SizeInPixels();
    … …  
    218212                    : iArrowImage.iMask;
    219213                }
    220 #ifdef RD_32_BROWSER               
    221214            else if ( iView->FocusedElementType() == TBrCtlDefs::EElementSmartLinkTel )
    222215                {
    … …  
    231224                spriteMem.iMaskBitmap = iSmartLinkEmailImage.iMask;
    232225                }
    233 #endif               
    234226            else
    235227                {
    … …  
    366358                ,focusedFrame->ViewCoordsInFrameCoords(iPosition));
    367359            }
    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
    372363        // now fire the mouseover event
    373364        frame->WebKitBridge().WebCoreBridge().PointerEvent( TPointerEvent::EMove,pt);
    … …  
    376367    }
    377368
    378 #ifdef RD_32_BROWSER
    379369// -----------------------------------------------------------------------------
    380370// CWebKitCursor::CheckSmartTextEntry
    … …  
    427417    return NULL;           
    428418  }
    429 #endif
    430419
    431420// -----------------------------------------------------------------------------
    … …  
    505494        searchRect = TRect(pt,sz);
    506495
    507 #ifdef RD_32_BROWSER
    508496        TBrCtlDefs::TBrCtlElementType elType = iView->FocusedElementType();
    509497        if( elType == TBrCtlDefs::EElementInputBox || elType == TBrCtlDefs::EElementTextAreaBox || elType == TBrCtlDefs::EElementRadioButtonUnSelected ||
    … …  
    513501          IncreaseSearchRect(lr, tb, searchRect);
    514502          }
    515 #endif
    516503        }
    517504    return searchRect;
    518505    }
    519506
    520 #ifdef RD_32_BROWSER
    521507// -----------------------------------------------------------------------------
    522508// CWebKitCursor::IncreaseSearchRect
    … …  
    530516    iFlipCounter = 0;
    531517    }
    532 #endif
     518
    533519// -----------------------------------------------------------------------------
    534520// CWebKitCursor::OffsetCursor
  • S60/trunk/WebKit/BrowserView/src/WebKitFrame.cpp

    r16591 r17905  
    5050#include "PluginSkin.h"
    5151
    52 #ifdef RD_32_BROWSER
    5352#include "SmartLinkMap.h"
    5453#include "SmartLinkHandler.h"
    55 #endif
    5654
    5755#include "WebKitCursor.h"
    … …  
    134132      iWebCoreSettingsController->SetWcsSaveRawDataEnabled(true);
    135133
    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);
    140136
    141137    iBridge->WebCoreBridge().CreateKHTMLView( *this, aMarginWidth, aMarginHeight );
    … …  
    177173#endif
    178174
    179 #ifdef RD_32_BROWSER
    180175  delete iSmartLinkMap;
    181176    delete iSmartLinkHandler;
    182 #endif
    183177    }
    184178
    … …  
    10751069    }
    10761070
    1077 #ifdef RD_32_BROWSER
    10781071// ----------------------------------------------------------------------------
    10791072// CWebKitFrame::FocusedPlugin
    … …  
    10991092    return NULL;
    11001093    }
    1101 #endif
     1094
    11021095//-------------------------------------------------------------------------------
    11031096// AppendPluginInstance
  • S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp

    r17790 r17905  
    244244        }
    245245
    246 #ifdef RD_32_BROWSER
    247246    // close the plugin play if it is active
    248247    if( aUrlRequestInfo->TopLevel() && iWebKitControl->IsPluginPlayer() )
    249248        iWebKitControl->ClosePluginPlayer();
    250 #endif
    251249
    252250    //
  • S60/trunk/WebKit/BrowserView/src/WebKitView.cpp

    r17301 r17905  
    127127     ,iRenderTarget( 0 )
    128128     ,iTabbedNavigation(EFalse)
    129 #ifdef RD_32_BROWSER
    130129    ,iSmartLinkMode(ESmartLinkNone)
    131 #endif
    132130    {
    133131    }
    … …  
    370368        f->CalcBidiWidth();
    371369        f->WebKitBridge().WebCoreBridge().ScalingFactorChanged( z );
    372 #ifdef RD_32_BROWSER
    373370        f->SmartLinkMap()->ReIndexSmartLinks();
    374 #endif
    375371        f = f->TraverseNext();
    376372        }
    … …  
    15181514// Method to search for next telephone number in the document
    15191515//-------------------------------------------------------------------------------
    1520 #ifdef RD_32_BROWSER
    15211516TInt CWebKitView::FindNextSmartLink(TBool aForward)
    15221517  {
    … …  
    16151610    return KErrNotFound;
    16161611  }
    1617 #endif
    16181612
    16191613//-------------------------------------------------------------------------------
  • S60/trunk/WebKit/ChangeLog

    r17877 r17905  
    2424
    2525        * ResourceLoader/CacheSrc/HttpCacheStreamHandler.cpp:
     26
     272006-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:
    2697
    27982006-11-15  yaharon  <yael.aharon@nokia.com>
  • S60/trunk/WebKit/Plugin/inc/PluginSkin.h

    r17301 r17905  
    296296        TBool IsFocusable() const;
    297297
    298 #ifdef RD_32_BROWSER       
    299298        HBufC* Url()                            { return iUrl; }
    300 #endif
     299
    301300    /**
    302301    * Close
    … …  
    360359        */
    361360        void StopPluginContent(const TDesC& aUrl);
    362 #ifdef RD_32_BROWSER
     361
    363362        /**
    364363        * CanInteract
    … …  
    368367        */
    369368        TBool CanInteract() const           { return iCanPluginInteract; }
    370 #endif
    371369
    372370#ifdef  RD_BROWSER_WIDGETS
  • S60/trunk/WebKit/Plugin/inc/PluginWin.h

    r17301 r17905  
    450450        */
    451451        void SetOptionMenuHandler(MOptionMenuHandler* aOptionMenuHandler) {iOptionMenuHandler = aOptionMenuHandler;}
    452 #ifdef RD_32_BROWSER
     452
    453453        HBufC* PluginDataUrl();
    454 #endif
     454
    455455  public: //From MCoeForegroundObserver
    456456
  • S60/trunk/WebKit/Plugin/src/PluginWin.cpp

    r17301 r17905  
    11201120    }
    11211121
    1122 #ifdef RD_32_BROWSER
     1122// -----------------------------------------------------------------------------
    11231123HBufC* CPluginWin::PluginDataUrl()
    11241124    {
    11251125    return iPluginSkin->Url();
    11261126    }
    1127 #endif
     1127
    11281128// -----------------------------------------------------------------------------
    11291129// CPluginWin::GetParentControlObserver
    … …  
    13131313    }
    13141314
     1315
  • S60/trunk/WebKit/ResourceLoader/src/HttpDownloadObserver.cpp

    r17710 r17905  
    210210    iDownloadMgr.SetBoolAttribute( EDlMgrAutoConnect, EFalse );
    211211    //
    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())
    214216        iDownloadMgr.SetDefaultIntAttribute( EDlAttrAction, EMove + EPdLaunch);
    215   else
     217    else
    216218        iDownloadMgr.SetDefaultIntAttribute( EDlAttrAction, EMove);
    217 #else
    218     iDownloadMgr.SetDefaultIntAttribute( EDlAttrAction, iLaunchViewer ? ELaunch : EDoNothing );
    219219#endif
    220220
    … …  
    636636    {
    637637    PREPARE_DOWNLOAD_MANAGER
    638 #ifndef RD_32_BROWSER
     638#ifdef __SDK_BROWSER
    639639    if( !iLaunchViewer && aEvent == EHttpDlCompleted )
    640640        {
    … …  
    663663        }
    664664#endif
    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             }
     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        }
    676676
    677677    // check if we need to keep pipelining off
    … …  
    10221022//  End of File
    10231023
     1024
  • S60/trunk/WebKit/data/Webkit.loc

    r15604 r17905  
    1010*    All rights reserved.
    1111* 
    12 *       Redistribution and use in source and binary forms, with or without
    13 *       modification, are permitted provided that the following conditions
    14 *       are met:
     12*   Redistribution and use in source and binary forms, with or without
     13*   modification, are permitted provided that the following conditions
     14*   are met:
    1515* 
    1616*      * Redistributions of source code must retain the above copyright
    … …  
    2424*        from this software without specific prior written permission.
    2525* 
    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.
     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.
    3838* 
    3939*    Please see file patentlicense.txt for further grants.
    … …  
    5050//w:
    5151//r: 3.0
    52 #define qtn_xhtml_object_select_to_download                             "Select to download"
     52#define qtn_xhtml_object_select_to_download       "Select to download"
    5353
    5454//d: Default label for an object standby text when
    … …  
    5757//w:
    5858//r: 3.0
    59 #define qtn_xhtml_object_downloading                                    "Downloading data"
     59#define qtn_xhtml_object_downloading          "Downloading data"
    6060
    6161//d: Label for an object in case downloading was tried
    … …  
    6464//w:
    6565//r: 3.0
    66 #define qtn_xhtml_object_unsupported                                    "Unsupported"
     66#define qtn_xhtml_object_unsupported          "Unsupported"
    6767
    6868//d: Confirmation prompt displayed when a selected
    … …  
    7272//w:
    7373//r: 3.0
    74 #define qtn_xhtml_query_file_missing                                    "File missing:\n %U\n Continue?"
     74#define qtn_xhtml_query_file_missing          "File missing:\n %U\n Continue?"
    7575
    7676//d: Confirmation prompt displayed when more than
    … …  
    8080//w:
    8181//r: 3.0
    82 #define qtn_xhtml_query_files_missing                                   "Files missing:\n %N files\n Continue?"
     82#define qtn_xhtml_query_files_missing         "Files missing:\n %N files\n Continue?"
    8383
    8484
    … …  
    9090//w:
    9191//r: 3.0
    92 #define qtn_xhtml_query_file_restricted                                 "File restricted:\n %U\n Continue?"
     92#define qtn_xhtml_query_file_restricted         "File restricted:\n %U\n Continue?"
    9393
    9494
    … …  
    9797//w:
    9898//r: 3.0
    99 #define qtn_xhtml_object_query_open_to                                  "Open to:"
     99#define qtn_xhtml_object_query_open_to          "Open to:"
    100100
    101101//d: Open the object on page
    … …  
    103103//w:
    104104//r: 3.0
    105 #define qtn_xhtml_object_query_open_to_on_page                  "On page"
     105#define qtn_xhtml_object_query_open_to_on_page      "On page"
    106106
    107107//d: Open the object to viewer application
    … …  
    109109//w:
    110110//r: 3.0
    111 #define qtn_xhtml_object_query_open_to_ext_viewer               "Viewer application"
     111#define qtn_xhtml_object_query_open_to_ext_viewer   "Viewer application"
    112112
    113113//d: Download already in progress
    … …  
    115115//w:
    116116//r: 3.0
    117 #define qtn_browser_note_object_downloading                             "Downloading"
     117#define qtn_browser_note_object_downloading       "Downloading"
    118118
    119119
    … …  
    123123//w:
    124124//r: 3.0
    125 #define qtn_browser_form_submit                                                 "Submit"
    126        
     125#define qtn_browser_form_submit             "Submit"
     126 
    127127//d: Default label for form reset button when there
    128128//d: is no label specified by the content author
    … …  
    130130//w:
    131131//r: 3.0
    132 #define qtn_browser_form_reset                                                  "Reset"
     132#define qtn_browser_form_reset              "Reset"
    133133
    134134//d: Default title  for form option selection when
    … …  
    137137//w:
    138138//r: 3.0
    139 #define qtn_browser_form_select                                                 "Select"
     139#define qtn_browser_form_select             "Select"
    140140
    141141//d: Command text associated to a softkey .
    … …  
    143143//w:
    144144//r: 3.0
    145 #define text_softkey_back                                                               "Back"
     145#define text_softkey_back               "Back"
    146146
    147147//d: Open selected deck
    … …  
    150150//w:
    151151//r: 3.0
    152 #define qtn_wml_list_open                                                               "Open"
     152#define qtn_wml_list_open               "Open"
    153153
    154154//d: Make phone call
    … …  
    156156//w:
    157157//r: 3.0
    158 #define qtn_xhtml_list_call                                                             "Call now"
     158#define qtn_xhtml_list_call               "Call now"
    159159
    160160//d: Store phone nr and/or e-mail address to the phonebook
    … …  
    162162//w:
    163163//r: 3.0
    164 #define qtn_wml_add_to_contacts                                                 "Add to Contacts"
     164#define qtn_wml_add_to_contacts             "Add to Contacts"
    165165
    166166//d: Send a message to phone numer or email address
    … …  
    169169//r: 3.0
    170170#define qtn_wml_send_message                                                    "Send Message"
     171
    171172//d: Display wallet application
    172173//l: list_single_popup_menu_pane_1
    173174//w:
    174175//r: 3.0
    175 #define qtn_wall_list_browser_use                                               "Use wallet"
     176#define qtn_wall_list_browser_use           "Use wallet"
    176177
    177178//d: Display wallet application
    178179//l: list_single_popup_menu_pane_1
    179 #define qtn_wall_list_browser_close                                             "Close wallet"
     180#define qtn_wall_list_browser_close           "Close wallet"
    180181
    181182//d: Accept entry of input element
    … …  
    183184//w:
    184185//r: 3.0
    185 #define qtn_browser_list_accept                                                 "Accept"
     186#define qtn_browser_list_accept             "Accept"
    186187
    187188//d: Menu item to open a plugin into external viewer
    … …  
    189190//w:
    190191//r: 3.0
    191 #define qtn_browser_list_open_to_viewer                                 "Open to viewer"
     192#define qtn_browser_list_open_to_viewer         "Open to viewer"
    192193
    193194//d: Removes a file when focus on a selection box
    … …  
    195196//w:
    196197//r: 3.0
    197 #define qtn_browser_list_remove_file                                    "Remove file"
     198#define qtn_browser_list_remove_file          "Remove file"
    198199
    199200//d: Check unchecked checkbox.
    … …  
    201202//w:
    202203//r: 3.0
    203 #define qtn_wml_dyn_label_check                                                 "Check"
     204#define qtn_wml_dyn_label_check             "Check"
    204205
    205206//d:Uncheck checked checkbox.
    … …  
    207208//w:
    208209//r: 3.0
    209 #define qtn_wml_dyn_label_uncheck                                               "Uncheck"
     210#define qtn_wml_dyn_label_uncheck           "Uncheck"
    210211
    211212//d: Select radio button or drop down menu.
    … …  
    213214//w:
    214215//r: 3.0
    215 #define qtn_wml_dyn_label_select                                                "Select"
     216#define qtn_wml_dyn_label_select            "Select"
    216217
    217218//d: Select action button or link
    … …  
    220221//w:
    221222//r: 3.0
    222 #define qtn_wml_dyn_go                                                                  "Go"
     223#define qtn_wml_dyn_go                  "Go"
    223224
    224225//d: Edit text field.
    … …  
    226227//w:
    227228//r: 3.0
    228 #define qtn_wml_dyn_label_edit                                                  "Edit"
     229#define qtn_wml_dyn_label_edit              "Edit"
    229230
    230231//d: Indicate done when focus is within a text field
    … …  
    232233//w:
    233234//r: 3.0
    234 #define qtn_wml_dyn_label_done                                                  "Done"
     235#define qtn_wml_dyn_label_done              "Done"
    235236
    236237//d: Command text associated to a softkey in the control pane.
    … …  
    239240//w:
    240241//r: 3.0
    241 #define qtn_text_softkey_option                                                 "Options"
     242#define qtn_text_softkey_option             "Options"
    242243
    243244//d: Command text associated to a softkey in the control pane.
    … …  
    246247//w:
    247248//r: 3.0
    248 #define qtn_text_softkey_cancel                                                 "Cancel"
     249#define qtn_text_softkey_cancel             "Cancel"
    249250
    250251//d: Command text associated to a softkey in the control pane.
    … …  
    253254//w:
    254255//r: 3.0
    255 #define qtn_text_softkey_ok                                                             "Ok"
     256#define qtn_text_softkey_ok               "Ok"
    256257
    257258//d: Text used by BrCtlDialogsProvider for dialogs without a title.
    … …  
    259260//w:
    260261//r: 3.0
    261 #define qtn_text_empty_title                                                    ""
     262#define qtn_text_empty_title              ""
    262263
    263264//d: Command text associated to a softkey .
    … …  
    265266//w:
    266267//r: 3.0
    267 #define qtn_text_softkey_yes                                                    "Yes"
     268#define qtn_text_softkey_yes              "Yes"
    268269
    269270//d: Command text associated to a softkey .
    … …  
    271272//w:
    272273//r: 3.0
    273 #define qtn_text_softkey_no                                                             "No"
     274#define qtn_text_softkey_no               "No"
    274275
    275276//d: Command text associated to a softkey .
    … …  
    277278//w:
    278279//r: 3.0
    279 #define qtn_text_softkey_continue                                               "Continue"
     280#define qtn_text_softkey_continue           "Continue"
    280281
    281282//d: Note shown when the user is browsing a "normal"
    … …  
    284285//w:
    285286//r: 3.0
    286 #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#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."
    287288
    288289//d: Note shown when the user is browsing a secure
    … …  
    291292//w:
    292293//r: 3.0
    293 #define qtn_httpsec_leave_secure_site                                   "You are about to leave secured connection. Do you want to continue?"
     294#define qtn_httpsec_leave_secure_site         "You are about to leave secured connection. Do you want to continue?"
    294295
    295296//d: Note shown when the secure site contains unsecure items e.g. images.
    … …  
    297298//w:
    298299//r: 3.0
    299 #define qtn_httpsec_items_not_secured                                   "This site contains unsecure items. Load items?"
     300#define qtn_httpsec_items_not_secured         "This site contains unsecure items. Load items?"
    300301
    301302//d: Note shown when user is browsing in secure site
    … …  
    304305//w:
    305306//r: 3.0
    306 #define qtn_httpsec_submit_not_secure                                   "Form will be submitted using unsecure connection. Continue?"
     307#define qtn_httpsec_submit_not_secure         "Form will be submitted using unsecure connection. Continue?"
    307308
    308309//d: popup query string for repost confirmation
    … …  
    310311//w:
    311312//r: 3.0
    312 #define qtn_http_repost_confirmation                                    "Form will be re-submitted.Accept resending information again?"
     313#define qtn_http_repost_confirmation          "Form will be re-submitted.Accept resending information again?"
    313314
    314315//d: popup query string for repost confirmation
    … …  
    316317//w:
    317318//r: 3.0
    318 #define qtn_http_redirect_post_confirmation                             "You are being redirected to another site. Continue?"
     319#define qtn_http_redirect_post_confirmation       "You are being redirected to another site. Continue?"
    319320
    320321//d: Confirmation query prompt when user confirmation
    … …  
    323324//w:
    324325//r: 3.0
    325 #define qtn_browser_query_basic_authentication                  "Authentication data will be sent as plain text. Continue?"
     326#define qtn_browser_query_basic_authentication      "Authentication data will be sent as plain text. Continue?"
    326327
    327328//d: Authentication of the WML card failed.
    … …  
    329330//w:
    330331//r: 3.0
    331 #define text_wml_auth_fail_retry_query                                  "Authorisation failed. Try again?"
     332#define text_wml_auth_fail_retry_query          "Authorisation failed. Try again?"
    332333
    333334//d: input element's message
    … …  
    335336//w:
    336337//r: 3.0
    337 #define qtn_text_input_req                                                              "Some text must\nbe entered"
     338#define qtn_text_input_req                "Some text must\nbe entered"
    338339
    339340//d: input element's message
    … …  
    341342//w:
    342343//r: 3.0
    343 #define qtn_text_more_input_req                                                 "At least %U\ncharacters\nmust be entered"
     344#define qtn_text_more_input_req             "At least %U\ncharacters\nmust be entered"
    344345
    345346//d: Header text for the pop up window
    … …  
    347348//w:
    348349//r: 3.0
    349 #define qtn_wml_header_history                                                  "History:"
     350#define qtn_wml_header_history              "History:"
    350351
    351352
    … …  
    373374//w:
    374375//r: 3.1
    375 #define qtn_browser_form_autofill_save                  "Save login information for this page?"
     376#define qtn_browser_form_autofill_save      "Save login information for this page?"
    376377
    377378//d: Confirmation prompt displayed when No is selected for qtn_browser_form_autofill_save
    … …  
    380381//w:
    381382//r: 3.1
    382 #define qtn_browser_form_autofill_ask_later             "Ask later for this page?"
     383#define qtn_browser_form_autofill_ask_later   "Ask later for this page?"
    383384
    384385//d: Browser name
    … …  
    391392//l:list_single_popup_submenu_pane_1
    392393//
    393 #define text_wml_option_ok                                      "Ok"
    394 
    395 //d:DO element menu item
    396 //l:list_single_popup_submenu_pane_1
    397 //
    398 #define text_wml_option_back                                    "Back"
    399 
    400 //d:DO element menu item
    401 //l:list_single_popup_submenu_pane_1
    402 //
    403 #define text_wml_option_reset                                   "Reset"
    404 
    405 //d:DO element menu item
    406 //l:list_single_popup_submenu_pane_1
    407 //
    408 #define text_wml_option_options                         "Options"
    409 
    410 //d:DO element menu item
    411 //l:list_single_popup_submenu_pane_1
    412 //
    413 #define text_wml_option_erase                                   "Erase"
    414 
    415 //d:DO element menu item
    416 //l:list_single_popup_submenu_pane_1
    417 //
    418 #define text_wml_option_unknown                         "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"
    419420
    420421//d:Browser main menu
    421422//l:list_single_popup_menu_pane_1
    422423//
    423 #define text_wml_option_help                                    "Help"
     424#define text_wml_option_help              "Help"
    424425
    425426
    426427// End of File
    427428
     429
  • S60/trunk/WebKit/data/Webkit.rss

    r15604 r17905  
    1010*    All rights reserved.
    1111* 
    12 *       Redistribution and use in source and binary forms, with or without
    13 *       modification, are permitted provided that the following conditions
    14 *       are met:
     12*   Redistribution and use in source and binary forms, with or without
     13*   modification, are permitted provided that the following conditions
     14*   are met:
    1515* 
    1616*      * Redistributions of source code must retain the above copyright
    … …  
    2424*        from this software without specific prior written permission.
    2525* 
    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.
     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.
    3838* 
    3939*    Please see file patentlicense.txt for further grants.
    … …  
    4949#include <avkon.rh>
    5050
    51 #ifdef RD_32_BROWSER
    5251#include <AiwCommon.hrh>
    5352#include <AiwCommon.rh>
    54 #endif
    5553#include <CommonDialogs.rh>
    5654#include "Webkit.loc"
    5755
    5856RESOURCE RSS_SIGNATURE { }
    59        
     57 
    6058RESOURCE TBUF { buf="OSS"; }
    6159
    … …  
    7876// File Upload Confirmations
    7977// ===================================================
    80 RESOURCE TBUF r_qtn_xhtml_query_file_missing            { buf=qtn_xhtml_query_file_missing; }
    81 RESOURCE TBUF r_qtn_xhtml_query_files_missing           { buf=qtn_xhtml_query_files_missing; }
     78RESOURCE TBUF r_qtn_xhtml_query_file_missing    { buf=qtn_xhtml_query_file_missing; }
     79RESOURCE TBUF r_qtn_xhtml_query_files_missing   { buf=qtn_xhtml_query_files_missing; }
    8280RESOURCE TBUF r_qtn_xhtml_query_file_restricted { buf=qtn_xhtml_query_file_restricted; }
    8381
    … …  
    8583// Plugin API resources
    8684// ===================================================
    87 RESOURCE TBUF r_xhtml_object_select_to_download         { buf = qtn_xhtml_object_select_to_download; }
    88 RESOURCE TBUF r_xhtml_object_downloading                        { buf = qtn_xhtml_object_downloading; }
    89 RESOURCE TBUF r_xhtml_object_unsupported                        { buf = qtn_xhtml_object_unsupported; }
    90 RESOURCE TBUF r_xhtml_object_query_open_to                      { buf = qtn_xhtml_object_query_open_to; }
    91 RESOURCE TBUF r_xhtml_object_query_open_to_on_page      { buf = qtn_xhtml_object_query_open_to_on_page; }
     85RESOURCE TBUF r_xhtml_object_select_to_download   { buf = qtn_xhtml_object_select_to_download; }
     86RESOURCE TBUF r_xhtml_object_downloading      { buf = qtn_xhtml_object_downloading; }
     87RESOURCE TBUF r_xhtml_object_unsupported      { buf = qtn_xhtml_object_unsupported; }
     88RESOURCE TBUF r_xhtml_object_query_open_to      { buf = qtn_xhtml_object_query_open_to; }
     89RESOURCE TBUF r_xhtml_object_query_open_to_on_page  { buf = qtn_xhtml_object_query_open_to_on_page; }
    9290RESOURCE 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         { buf = qtn_browser_note_object_downloading; }
     91RESOURCE TBUF r_browser_note_object_downloading   { buf = qtn_browser_note_object_downloading; }
    9492
    9593
    … …  
    9795// WML Form controls
    9896// ===================================================
    99 RESOURCE TBUF r_kimono_form_button_submit                       { buf = qtn_browser_form_submit; }
    100 RESOURCE TBUF r_kimono_form_button_reset                        { buf = qtn_browser_form_reset; }
    101 RESOURCE TBUF r_kimono_form_option_select                       { buf = qtn_browser_form_select; }
    102 RESOURCE TBUF r_kimono_softkey_back                                     { buf = text_softkey_back; }
     97RESOURCE TBUF r_kimono_form_button_submit     { buf = qtn_browser_form_submit; }
     98RESOURCE TBUF r_kimono_form_button_reset      { buf = qtn_browser_form_reset; }
     99RESOURCE TBUF r_kimono_form_option_select     { buf = qtn_browser_form_select; }
     100RESOURCE TBUF r_kimono_softkey_back         { buf = text_softkey_back; }
    103101
    104102RESOURCE TBUF r_text_wml_list_open                  { buf = qtn_wml_list_open; }
    … …  
    110108RESOURCE TBUF r_text_wml_list_open_to_viewer        { buf = qtn_browser_list_open_to_viewer; }
    111109RESOURCE TBUF r_text_wml_list_remove_file           { buf = qtn_browser_list_remove_file; }
    112 #ifdef RD_32_BROWSER
    113110RESOURCE TBUF r_text_wml_send_message               { buf = qtn_wml_send_message; }
    114 #endif
    115111
    116112RESOURCE TBUF r_text_wml_dyn_label_uncheck          { buf = qtn_wml_dyn_label_uncheck; }
    … …  
    121117RESOURCE TBUF r_text_wml_dyn_label_done             { buf = qtn_wml_dyn_label_done; }
    122118
    123 RESOURCE TBUF r_wml_options_button                                      { buf = qtn_text_softkey_option; }
    124 RESOURCE TBUF r_wml_cancel_button                                       { buf = qtn_text_softkey_cancel; }
    125 RESOURCE TBUF r_wml_ok_button                                           { buf = qtn_text_softkey_ok; }
     119RESOURCE TBUF r_wml_options_button          { buf = qtn_text_softkey_option; }
     120RESOURCE TBUF r_wml_cancel_button         { buf = qtn_text_softkey_cancel; }
     121RESOURCE TBUF r_wml_ok_button           { buf = qtn_text_softkey_ok; }
    126122
    127123// ===================================================
    128124// BrCtl Dialog Provider
    129125// ===================================================
    130 RESOURCE TBUF r_text_empty_title                                        { buf = qtn_text_empty_title; }
    131 RESOURCE TBUF r_text_softkey_yes                                        { buf = qtn_text_softkey_yes; }
    132 RESOURCE TBUF r_text_softkey_no                                         { buf = qtn_text_softkey_no; }
    133 RESOURCE TBUF r_text_softkey_continue                           { buf = qtn_text_softkey_continue; }
    134 RESOURCE TBUF r_text_input_req                                          { buf = qtn_text_input_req; }
    135 RESOURCE TBUF r_text_more_input_req                                     { buf = qtn_text_more_input_req; }
    136 
    137 RESOURCE TBUF r_httpsec_enter_secure_site                       { buf = qtn_httpsec_enter_secure_site; }
    138 RESOURCE TBUF r_httpsec_leave_secure_site                       { buf = qtn_httpsec_leave_secure_site; }
    139 RESOURCE TBUF r_httpsec_some_items_not_secure           { buf = qtn_httpsec_items_not_secured; }
     126RESOURCE TBUF r_text_empty_title          { buf = qtn_text_empty_title; }
     127RESOURCE TBUF r_text_softkey_yes          { buf = qtn_text_softkey_yes; }
     128RESOURCE TBUF r_text_softkey_no           { buf = qtn_text_softkey_no; }
     129RESOURCE TBUF r_text_softkey_continue       { buf = qtn_text_softkey_continue; }
     130RESOURCE TBUF r_text_input_req            { buf = qtn_text_input_req; }
     131RESOURCE TBUF r_text_more_input_req         { buf = qtn_text_more_input_req; }
     132
     133RESOURCE TBUF r_httpsec_enter_secure_site     { buf = qtn_httpsec_enter_secure_site; }
     134RESOURCE TBUF r_httpsec_leave_secure_site     { buf = qtn_httpsec_leave_secure_site; }
     135RESOURCE TBUF r_httpsec_some_items_not_secure   { buf = qtn_httpsec_items_not_secured; }
    140136RESOURCE TBUF r_httpsec_submitting_to_non_secure_page { buf = qtn_httpsec_submit_not_secure; }
    141 RESOURCE TBUF r_httpsec_submit_not_secure                       { buf = qtn_httpsec_submit_not_secure; }
    142 RESOURCE TBUF r_http_repost_confirmation                        { buf = qtn_http_repost_confirmation; }
    143 RESOURCE TBUF r_http_redirect_post_confirmation         { buf = qtn_http_redirect_post_confirmation; }
     137RESOURCE TBUF r_httpsec_submit_not_secure     { buf = qtn_httpsec_submit_not_secure; }
     138RESOURCE TBUF r_http_repost_confirmation      { buf = qtn_http_repost_confirmation; }
     139RESOURCE TBUF r_http_redirect_post_confirmation   { buf = qtn_http_redirect_post_confirmation; }
    144140RESOURCE TBUF r_browser_query_basic_authentication  { buf = qtn_browser_query_basic_authentication; }
    145141RESOURCE TBUF r_wml_auth_fail_retry_query           { buf = text_wml_auth_fail_retry_query; }
    … …  
    151147//----------------------------------------------------
    152148//
    153  RESOURCE TBUF r_DO_element_accept              { buf=text_wml_option_ok; }
    154  RESOURCE TBUF r_DO_element_prev                { buf=text_wml_option_back; }
    155  RESOURCE TBUF r_DO_element_help                { buf=text_wml_option_help; }
    156  RESOURCE TBUF r_DO_element_reset               { buf=text_wml_option_reset; }
    157  RESOURCE TBUF r_DO_element_options                     { buf=text_wml_option_options; }
    158  RESOURCE TBUF r_DO_element_delete              { buf=text_wml_option_erase; }
    159  RESOURCE TBUF r_DO_element_unknown                             { buf=text_wml_option_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; }
    160156
    161157// ===================================================
    162158// History popup heading pane aka history page title
    163159// ===================================================
    164 RESOURCE TBUF r_history_popup_heading_pane                      { buf = qtn_wml_header_history; }
     160RESOURCE TBUF r_history_popup_heading_pane      { buf = qtn_wml_header_history; }
    165161
    166162// ===================================================
    167163// Form Fill Save Dialogs
    168164// ===================================================
    169 RESOURCE TBUF r_browser_form_autofill_save              { buf = qtn_browser_form_autofill_save; }
    170 RESOURCE TBUF r_browser_form_autofill_ask_later         { buf = qtn_browser_form_autofill_ask_later; }
    171 
    172 //----------------------------------------------------
    173 //      Browser fonts
    174 //
    175 //      Currently we're using fonts created both by
    176 //      the system and by us.
     165RESOURCE TBUF r_browser_form_autofill_save    { buf = qtn_browser_form_autofill_save; }
     166RESOURCE 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.
    177173//----------------------------------------------------
    178174#define KDefaultFontHeight 180
    179175RESOURCE ARRAY r_browser_fonts
    180         {
    181         items =
    182                 {
    183                 NAMED_FONT                      // italic12
    184                         {
    185                         name = "Alpi12";
    186                         height = KDefaultFontHeight;
    187                         },
    188                 NAMED_FONT                      // bold-italic12
    189                         {
    190                         name = "Albi12";
    191                         height = KDefaultFontHeight;
    192                         },
    193                 NAMED_FONT                      // plain13
    194                         {
    195                         name = "Alp13";
    196                         height = KDefaultFontHeight;
    197                         },
    198                 NAMED_FONT                      // italic13
    199                         {
    200                         name = "Alpi13";
    201                         height = KDefaultFontHeight;
    202                         },
    203                 NAMED_FONT                      // bold-italic13
    204                         {
    205                         name = "Albi13";
    206                         height = KDefaultFontHeight;
    207                         },
    208                 NAMED_FONT                      // plain17
    209                         {
    210                         name = "Alp17";
    211                         height = KDefaultFontHeight;
    212                         },
    213                 NAMED_FONT                      // italic17
    214                         {
    215                         name = "Alpi17";
    216                         height = KDefaultFontHeight;
    217                         },
    218                 NAMED_FONT                      // bold-italic17
    219                         {
    220                         name = "Albi17b";
    221                         height = KDefaultFontHeight;
    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  }
    225221
    226222
    … …  
    239235//----------------------------------------------------
    240236//
    241 //      Script querys' header texts
     237//  Script querys' header texts
    242238//
    243239//----------------------------------------------------
    … …  
    246242RESOURCE TBUF r_qtn_browser_query_script_alert { buf=qtn_browser_query_script_alert; }
    247243RESOURCE TBUF r_qtn_browsers_browser_name_oss { buf=qtn_browsers_browser_name_oss; }
    248 #ifdef RD_32_BROWSER
     244
    249245//----------------------------------------------------
    250246//
    … …  
    267263        };
    268264    }
    269 #endif   
  • S60/trunk/WebKit/data/Webkit_sdk.loc

    r16969 r17905  
    11/*
    22* ==============================================================================
    3 *  Name        : Webkit.loc
     3*  Name        : Webkit_sdk.loc
    44*  Part of     : Webkit
    55*  Description :
    … …  
    164164#define qtn_wml_add_to_contacts             "Add to Contacts"
    165165
     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
    166172//d: Display wallet application
    167173//l: list_single_popup_menu_pane_1
    … …  
    421427// End of File
    422428
     429
  • S60/trunk/WebKit/data/Webkit_sdk.rss

    r16969 r17905  
    11/*
    22* ==============================================================================
    3 *  Name        : Webkit.rss
     3*  Name        : Webkit_sdk.rss
    44*  Part of     : Webkit
    55*  Description :
    … …  
    105105RESOURCE TBUF r_text_wml_list_open_to_viewer        { buf = qtn_browser_list_open_to_viewer; }
    106106RESOURCE TBUF r_text_wml_list_remove_file           { buf = qtn_browser_list_remove_file; }
     107RESOURCE TBUF r_text_wml_send_message               { buf = qtn_wml_send_message; }
    107108
    108109RESOURCE TBUF r_text_wml_dyn_label_uncheck          { buf = qtn_wml_dyn_label_uncheck; }
  • S60/trunk/WebKit/group/BrowserView.mmp

    r17301 r17905  
    7373SOURCE          FaviconListener.cpp
    7474SOURCE          WebKitToolBarInterface.cpp
    75 #ifdef RD_32_BROWSER
    7675SOURCE          PluginContentPlayer.cpp
    7776SOURCE          SmartLinkHandler.cpp
    7877SOURCE          SmartLinkMap.cpp
    79 #endif
    8078#ifdef  RD_BROWSER_WIDGETS
    8179SOURCE          WidgetExtension.cpp
    … …  
    111109SYSTEMINCLUDE       ..\..\MemoryManager\Inc
    112110
     111
  • S60/trunk/WebKit/group/webkit.mmp

    r17301 r17905  
    109109USERINCLUDE   ..\..\..\HistoryProvider\inc
    110110MW_LAYER_SYSTEMINCLUDE
    111 #ifdef RD_32_BROWSER
    112111USERINCLUDE   ..\..\..\ToolBar\inc
    113 #endif
    114112#else
    115113SYSTEMINCLUDE \Epoc32\include \Epoc32\include\oem
    … …  
    221219LIBRARY     aknicon.lib
    222220
    223 #ifdef RD_32_BROWSER
    224221LIBRARY     ServiceHandler.lib
    225222LIBRARY     PbkView.lib             // For class RPbkViewResourceFile, class CPbkDataSaveAppUi
    226223LIBRARY     PbkEng.lib              // For class CPbkContactEngine, class CPbkFieldInfo
    227224LIBRARY         sendui.lib              // For class CSendUi, class CMessageData
    228 #endif
    229225
    230226#if defined(GCCE)
    … …  
    232228#endif
    233229
     230
Note: See TracChangeset for help on using the changeset viewer.