1.1 --- a/epoc32/include/app/spdiacontrol.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/app/spdiacontrol.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -2,9 +2,9 @@
     1.4  * Copyright (c) 2002 - 2005 Nokia Corporation and/or its subsidiary(-ies).
     1.5  * All rights reserved.
     1.6  * This component and the accompanying materials are made available
     1.7 -* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +* under the terms of "Eclipse Public License v1.0"
     1.9  * which accompanies this distribution, and is available
    1.10 -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  *
    1.13  * Initial Contributors:
    1.14  * Nokia Corporation - initial contribution.
    1.15 @@ -348,22 +348,6 @@
    1.16          TBool CreateDataL(const CAknGrid& aGrid);
    1.17  
    1.18          /**
    1.19 -        * Returns the size of grid.
    1.20 -        */
    1.21 -//        TSize GridSize() const;  // not referenced...
    1.22 -
    1.23 -        /**
    1.24 -        * Display confirmation dialog from id's
    1.25 -        *
    1.26 -        * @param aIndex     a index of array.
    1.27 -        * @param aId        resource id
    1.28 -        * @param aPromptId  prompt id
    1.29 -        */
    1.30 -        TBool ConfirmationNumberL(TInt aIndex,
    1.31 -                        TInt aId,
    1.32 -                        TInt aPromptId);
    1.33 -
    1.34 -        /**
    1.35          * Thumbnail's shadow is drawn.
    1.36          *
    1.37          * @param aGc    window gc
    1.38 @@ -648,20 +632,31 @@
    1.39  
    1.40          CAknsBasicBackgroundControlContext* iBgContext;
    1.41  	
    1.42 -		// Variable used to know if the popup dialog has to be shown
    1.43 -		// according to the release.
    1.44 -		TBool iBooleanVarForAddingDialogVariation;
    1.45 -		//Code added for build ver 2.6.
    1.46 -		RArray<TAknsItemID>*iDialSkinBmp;
    1.47 -		RArray<TAknsItemID>*iSkinIcons;
    1.48 -		TAknLayoutRect icellLayout[KArraySize];
    1.49 -		TBuf<254> iBmpPath;
    1.50 -		TBuf<254> iRscPath;
    1.51 -		TInt iType;
    1.52 -		TInt iError;
    1.53 -		TBool iPopupDialog;
    1.54 -		CAknQueryDialog* iSaveChangesDialog;
    1.55 -		TBool iSaveDlg;
    1.56 +        // Variable used to know if the popup dialog has to be shown
    1.57 +        // according to the release.
    1.58 +        TBool iBooleanVarForAddingDialogVariation;
    1.59 +
    1.60 +        //Code added for build ver 2.6.
    1.61 +        RArray<TAknsItemID>*iDialSkinBmp;
    1.62 +        RArray<TAknsItemID>*iSkinIcons;
    1.63 +        RArray<TInt>*iIcons;
    1.64 +        RArray<TInt>*iIconsId;
    1.65 +        RArray<TInt>*iIconsMask;
    1.66 +        TAknLayoutRect icellLayout[KArraySize];
    1.67 +        TBuf<254> iBmpPath;
    1.68 +        TBuf<254> iRscPath;
    1.69 +        TInt iType;
    1.70 +        TInt iError;
    1.71 +        TBool iPopupDialog;
    1.72 +        CAknQueryDialog* iSaveChangesDialog;
    1.73 +        TBool iSaveDlg;
    1.74 +
    1.75 +        // Record the current index before swtich to Speeddial if needed. 
    1.76 +        TInt iFocusedGrid;   
    1.77 +        
    1.78 +        TInt iIconsCount;
    1.79 +        TInt iIconsIdCount;
    1.80 +        TInt iIconsMaskCount;
    1.81      };
    1.82  
    1.83  #endif // SPDIACONTROL_H