--- a/uifw/EikStd/coctlsrc/eikspmod.cpp Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/EikStd/coctlsrc/eikspmod.cpp Tue Aug 31 15:28:30 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -620,11 +620,10 @@
if (Layout_Meta_Data::IsLandscapeOrientation())
{
TAknLayoutRect layoutRect;
- layoutRect.LayoutRect(
- screenRect,
- aknLayoutScalable_Avkon.area_top_pane( 2 ) );
+ TAknWindowComponentLayout parentLayout = aknLayoutScalable_Avkon.area_top_pane(8);
+ layoutRect.LayoutRect(screenRect, parentLayout.LayoutLine());
parentRect = layoutRect.Rect();
- layout = aknLayoutScalable_Avkon.battery_pane( 14 ).LayoutLine();
+ layout = aknLayoutScalable_Avkon.battery_pane(2).LayoutLine();
}
else
{
@@ -1365,11 +1364,11 @@
TAknLayoutRect layout1ParentRect;
layout1ParentRect.LayoutRect(
iLayout->iApplicationWindowRect,
- iLayout->iAknLayoutScalable_Avkon.area_top_pane( 2 ).LayoutLine() );
+ iLayout->iAknLayoutScalable_Avkon.area_top_pane( 19 ).LayoutLine() );
TAknLayoutRect layout1Rect;
layout1Rect.LayoutRect(
layout1ParentRect.Rect(),
- iLayout->iAknLayoutScalable_Avkon.status_pane( 1 ).LayoutLine() );
+ iLayout->iAknLayoutScalable_Avkon.status_pane( 4 ).LayoutLine() );
parentRect = layout1Rect.Rect();
switch ( aPaneId.iUid )
@@ -1383,7 +1382,7 @@
case EEikStatusPaneUidSignal:
{
layout =
- aknLayoutScalable_Avkon.signal_pane( 14 ).LayoutLine();
+ aknLayoutScalable_Avkon.signal_pane( 11 ).LayoutLine();
break;
}
case EEikStatusPaneUidTitle:
@@ -1394,68 +1393,14 @@
}
case EEikStatusPaneUidIndic:
{
- TAknWindowComponentLayout nstaClockIndicPane(
- DoCompose(
- aknLayoutScalable_Avkon.area_bottom_pane( 2 ),
- DoCompose(
- aknLayoutScalable_Avkon.control_pane(),
- aknLayoutScalable_Avkon.nsta_clock_indic_pane() ) ) );
- TAknLayoutRect layoutRect;
- layoutRect.LayoutRect( applicationWindowRect,
- nstaClockIndicPane );
- parentRect = layoutRect.Rect();
-
- layout = aknLayoutScalable_Avkon.indicator_nsta_pane_cp().LayoutLine();
- layoutRect.LayoutRect( parentRect, layout );
- paneRect = layoutRect.Rect();
-
- // Digital clock pane resides inside the
- // combined pane, so it must be made relative to the
- // combined pane rectangle instead of the screen.
- paneRect.Move( applicationWindowRect.iTl.iX - parentRect.iTl.iX,
- applicationWindowRect.iTl.iY - parentRect.iTl.iY );
+ layout =
+ aknLayoutScalable_Avkon.uni_indicator_pane( 3 ).LayoutLine();
break;
}
case EEikStatusPaneUidBattery:
{
layout =
- aknLayoutScalable_Avkon.battery_pane( 14 ).LayoutLine();
- break;
- }
- case EEikStatusPaneUidDigitalClock:
- {
- TAknWindowComponentLayout nstaClockIndicPane(
- DoCompose(
- aknLayoutScalable_Avkon.area_bottom_pane( 2 ),
- DoCompose(
- aknLayoutScalable_Avkon.control_pane(),
- aknLayoutScalable_Avkon.nsta_clock_indic_pane() ) ) );
- TAknLayoutRect layoutRect;
- layoutRect.LayoutRect( applicationWindowRect,
- nstaClockIndicPane );
- parentRect = layoutRect.Rect();
-
- layout = aknLayoutScalable_Avkon.clock_nsta_pane_cp().LayoutLine();
- layoutRect.LayoutRect( parentRect, layout );
- paneRect = layoutRect.Rect();
-
- // Digital clock pane resides inside the
- // combined pane, so it must be made relative to the
- // combined pane rectangle instead of the screen.
- paneRect.Move( applicationWindowRect.iTl.iX - parentRect.iTl.iX,
- applicationWindowRect.iTl.iY - parentRect.iTl.iY );
- break;
- }
- case EEikStatusPaneUidCombined:
- {
- TAknWindowComponentLayout nstaClockIndicPane(
- DoCompose(
- aknLayoutScalable_Avkon.area_bottom_pane( 2 ),
- DoCompose(
- aknLayoutScalable_Avkon.control_pane(),
- aknLayoutScalable_Avkon.nsta_clock_indic_pane() ) ) );
- layout = nstaClockIndicPane.LayoutLine();
- parentRect = applicationWindowRect;
+ aknLayoutScalable_Avkon.battery_pane( 11 ).LayoutLine();
break;
}
}
@@ -1481,75 +1426,32 @@
{
case EEikStatusPaneUidNavi:
{
- if ( aLayoutId == R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS )
- {
- layout =
- aknLayoutScalable_Avkon.navi_pane( 2 ).LayoutLine();
- }
- else
- {
- layout =
- aknLayoutScalable_Avkon.navi_pane( 11 ).LayoutLine();
- }
+ layout =
+ aknLayoutScalable_Avkon.navi_pane( 11 ).LayoutLine();
break;
}
case EEikStatusPaneUidSignal:
{
- if (aLayoutId
- == R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS)
- {
- layout
- = aknLayoutScalable_Avkon.signal_pane(2).LayoutLine();
- }
- else
- {
- layout
- = aknLayoutScalable_Avkon.signal_pane(13).LayoutLine();
- }
+ layout =
+ aknLayoutScalable_Avkon.signal_pane( 13 ).LayoutLine();
break;
}
case EEikStatusPaneUidTitle:
{
- if ( aLayoutId == R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS )
- {
- layout =
- aknLayoutScalable_Avkon.title_pane( 2 ).LayoutLine();
- }
- else
- {
- layout =
- aknLayoutScalable_Avkon.title_pane( 13 ).LayoutLine();
- }
+ layout =
+ aknLayoutScalable_Avkon.title_pane( 13 ).LayoutLine();
break;
}
case EEikStatusPaneUidIndic:
{
- if (aLayoutId
- == R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS)
- {
- layout
- = aknLayoutScalable_Avkon.uni_indicator_pane( 1 ).LayoutLine();
- }
- else
- {
- layout
- = aknLayoutScalable_Avkon.uni_indicator_pane( 5 ).LayoutLine();
- }
+ layout =
+ aknLayoutScalable_Avkon.uni_indicator_pane( 5 ).LayoutLine();
break;
}
case EEikStatusPaneUidBattery:
{
- if (aLayoutId
- == R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS)
- {
- layout
- = aknLayoutScalable_Avkon.battery_pane(2).LayoutLine();
- }
- else
- {
- layout
- = aknLayoutScalable_Avkon.battery_pane(13).LayoutLine();
- }
+ layout =
+ aknLayoutScalable_Avkon.battery_pane( 13 ).LayoutLine();
break;
}
case EEikStatusPaneUidDigitalClock: