1.1 --- a/epoc32/include/mw/avkon.rh	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/avkon.rh	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,10 +1,10 @@
     1.4  /*
     1.5 -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
     1.6 +* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
     1.7  * All rights reserved.
     1.8  * This component and the accompanying materials are made available
     1.9 -* 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.10 +* under the terms of "Eclipse Public License v1.0"
    1.11  * which accompanies this distribution, and is available
    1.12 -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.13 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.14  *
    1.15  * Initial Contributors:
    1.16  * Nokia Corporation - initial contribution.
    1.17 @@ -21,7 +21,7 @@
    1.18  #endif
    1.19  
    1.20  #if !defined(__BADEF_RH__)
    1.21 -#include <BADEF.RH>
    1.22 +#include <badef.rh>
    1.23  #endif
    1.24  
    1.25  #if !defined(__UIKON_HRH__)
    1.26 @@ -261,6 +261,23 @@
    1.27      LLINK graphical_image=0;
    1.28      }
    1.29  
    1.30 +STRUCT SLIDER_WITH_FEEDBACK_STYLE
    1.31 +    {
    1.32 +    WORD slidertype=EAknSliderWithFeedbackStyle;
    1.33 +    WORD feedbackstyle=EAknSliderFbStable;
    1.34 +    WORD layout;
    1.35 +    WORD minvalue;
    1.36 +    WORD maxvalue;
    1.37 +    WORD step;
    1.38 +    WORD valuetype=EAknSliderValueBareFigure;
    1.39 +    WORD decimalplaces=0;
    1.40 +    LTEXT singular_valuelabel = "";
    1.41 +    LTEXT minlabel="";
    1.42 +    LTEXT maxlabel="";
    1.43 +    LTEXT valuelabel="";
    1.44 +    LLINK graphical_image=0;
    1.45 +    }
    1.46 +
    1.47  /** used with CAknVolumeControl
    1.48   * see avkon.hrh for the flag definitions
    1.49   * This struct uses default values for volume range:
    1.50 @@ -338,6 +355,18 @@
    1.51      LLINK extension = 0;
    1.52      }
    1.53  
    1.54 +// --------------------------------------------------------------------------
    1.55 +// AVKON_SETTING_PAGE_EXTENSION
    1.56 +// Resource structure extension for setting page.
    1.57 +// @since 5.2
    1.58 +// --------------------------------------------------------------------------
    1.59 +//
    1.60 +STRUCT AVKON_SETTING_PAGE_EXTENSION
    1.61 +    {
    1.62 +    WORD flags = 0;         // construction flags
    1.63 +    LLINK extension = 0;    // link to extension
    1.64 +    }
    1.65 +
    1.66  STRUCT AVKON_SETTING_ITEM_LIST
    1.67      {
    1.68      WORD flags = 0; // Allowed values: EAknSettingItemListNumberedStyle 
    1.69 @@ -991,3 +1020,47 @@
    1.70      LLINK button;
    1.71      }
    1.72  
    1.73 +// --------------------------------------------------------------------------
    1.74 +// AVKON_DISCREET_POPUP
    1.75 +// Resource structure for discreet popup (CAknDiscreetPopup).
    1.76 +// @since 5.2
    1.77 +// --------------------------------------------------------------------------
    1.78 +//
    1.79 +STRUCT AVKON_DISCREET_POPUP
    1.80 +    {
    1.81 +    WORD flags = 0; // popup flags
    1.82 +    LTEXT titleTxt = ""; // first text line
    1.83 +    LTEXT bodyTxt = ""; // second text line
    1.84 +    LTEXT bmpFile = ""; // icon bitmap file
    1.85 +    WORD bmpId = 0xffff; // icon bitmap id
    1.86 +    WORD bmpMask = 0xffff; // icon bitmap mask id
    1.87 +    LLINK majorSkinId = -1; // icon major skin id
    1.88 +    LLINK minorSkinId = -1; // icon minor skin id
    1.89 +    LLINK extension = 0; // reserved for future extension
    1.90 +    }
    1.91 +
    1.92 +// --------------------------------------------------------------------------
    1.93 +// COMBINED_PANE
    1.94 +// Resource structure for status pane's combined pane.
    1.95 +// @since 5.2
    1.96 +// --------------------------------------------------------------------------
    1.97 +//
    1.98 +STRUCT COMBINED_PANE
    1.99 +    {
   1.100 +    BYTE version = 1;    // Structure version.
   1.101 +    STRUCT panes[];      // Array of subpanes embedded to the combined pane.
   1.102 +    LLINK extension = 0; // Extension for future use.
   1.103 +    }
   1.104 +
   1.105 +// --------------------------------------------------------------------------
   1.106 +// COMBINED_PANE_SUBPANE
   1.107 +// Resource structure for combined pane's subpane (in status pane).
   1.108 +// @since 5.2
   1.109 +// --------------------------------------------------------------------------
   1.110 +//
   1.111 +STRUCT COMBINED_PANE_SUBPANE
   1.112 +    {
   1.113 +    BYTE version = 1;    // Structure version.
   1.114 +    LONG uid;            // UID of the subpane, defined in @c avkon.hrh.
   1.115 +    LLINK extension = 0; // Extension for future use.
   1.116 +    }