--- a/group/bld.inf	Thu Jan 07 12:39:41 2010 +0200
+++ b/group/bld.inf	Mon Jan 18 20:10:36 2010 +0200
@@ -20,6 +20,7 @@
 #include "../homescreen_plat/group/bld.inf"
 #include "../idlehomescreen/group/bld.inf"
 #include "../menufw/group/bld.inf"
+#include "../taskswitcher/group/bld.inf"
 
 PRJ_PLATFORMS
 

--- a/idlehomescreen/data/qhd_tch/group/bld.inf	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/group/bld.inf	Mon Jan 18 20:10:36 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-//#include "../shortcut_2001f483/group/bld.inf"
-//#include "../shortcut2_2001f484/group/bld.inf"
 #include "../desktop_20026f4f/group/bld.inf"
 #include "../empty_2001f47f/group/bld.inf"
 #include "../onerow_2001f480/group/bld.inf"

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/00/profile.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/00/profile.css	Mon Jan 18 20:10:36 2010 +0200
@@ -81,7 +81,7 @@
 
 image#SatIdleModeIcon
 {
-    display: block;
+    display: none;
     width: 18px;
     height: 20px;
     position: static;

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/37/profile.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/37/profile.css	Mon Jan 18 20:10:36 2010 +0200
@@ -80,7 +80,7 @@
 
 image#SatIdleModeIcon
 {
-    display: block;
+    display: none;
     width: 18px;
     height: 20px;
     position: static;

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/50/profile.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/50/profile.css	Mon Jan 18 20:10:36 2010 +0200
@@ -80,7 +80,7 @@
 
 image#SatIdleModeIcon
 {
-    display: block;
+    display: none;
     width: 18px;
     height: 20px;
     position: static;

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/57/profile.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/57/profile.css	Mon Jan 18 20:10:36 2010 +0200
@@ -80,7 +80,7 @@
 
 image#SatIdleModeIcon
 {
-    display: block;
+    display: none;
     width: 18px;
     height: 20px;
     position: static;

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/94/profile.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/94/profile.css	Mon Jan 18 20:10:36 2010 +0200
@@ -80,7 +80,7 @@
 
 image#SatIdleModeIcon
 {
-    display: block;
+    display: none;
     width: 18px;
     height: 20px;
     position: static;

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/gfx/shortcut2logo.svg	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32px"
-   height="32px"
-   id="svg2466"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="drawing.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2468">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective2474" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.938205"
-     inkscape:cx="9.927765"
-     inkscape:cy="10.627086"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1680"
-     inkscape:window-height="1031"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata2471">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <image
-       y="5.765738"
-       x="-0.030936712"
-       id="image2462"
-       height="18.19879"
-       width="31.139833"
-       sodipodi:absref="Y:\HS_Domain\homescreen\idlehomescreen\data\qhd_tch\shortcut2_2001f484\gfx\shortcut2logo.png"
-       xlink:href="Y:\HS_Domain\homescreen\idlehomescreen\data\qhd_tch\shortcut2_2001f484\gfx\shortcut2logo.png"
-       transform="matrix(1,0,2.5955691e-2,0.9996631,0,0)" />
-  </g>
-</svg>

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/group/bld.inf	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* The information required for building
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// Support for productization and Carbide.Ui customization
-//********************************************************
-../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/hsps/manifest.dat
-../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/hsps/widgetconfiguration.xml
-../hsps/00/shortcut2configuration.dtd /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/hsps/shortcut2configuration.dtd
-
-../xuikon/00/shortcut2.dat /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/xuikon/shortcut2_2001f484.dat
-../xuikon/00/shortcut2.css /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/xuikon/shortcut2.css
-../xuikon/00/shortcut2.xml /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/xuikon/shortcut2.xml
-
-// logo icon
-../gfx/shortcut2logo.svg /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/hsps/shortcut2logo.svg
-
-// Arabic languages
-//*****************
-../xuikon/37/shortcut2.css /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/xuikon/37/shortcut2.css
-../xuikon/50/shortcut2.css /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/xuikon/50/shortcut2.css
-../xuikon/57/shortcut2.css /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/xuikon/57/shortcut2.css
-../xuikon/94/shortcut2.css /epoc32/data/Z/resource/homescreen/shortcut2_2001f484/xuikon/94/shortcut2.css
-
-
-// Support for S60 localization
-//*****************************
-#ifndef __SHORTCUT2CONFIGURATION_LOC__
-#define __SHORTCUT2CONFIGURATION_LOC__
- ../loc/shortcut2configuration.loc APP_LAYER_LOC_EXPORT_PATH(shortcut2configuration.loc)
-#endif // __SHORTCUT2CONFIGURATION_LOC__
-
-// Support for S60 builds
-//***********************
-../rom/shortcut2_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(shortcut2_2001f484_resources.iby)
-../rom/shortcut2_customer.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(shortcut2_2001f484_customer.iby)
-../rom/shortcut2_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(shortcut2_2001f484_variant.iby)
-../rom/shortcut2.iby CORE_APP_LAYER_IBY_EXPORT_PATH(shortcut2_2001f484.iby)
-
-
-// Dtd-localization
-//*****************
-PRJ_EXTENSIONS
-START EXTENSION tools/dtd
-OPTION SWITCH_LOC_FILE_NAME shortcut2_2001f484
-OPTION DTD_TYPE widget
-OPTION LOC_FOLDERS yes
-END
-
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-//  End of File  

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/hsps/00/manifest.dat	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<package version="1.0">
-
-
-
-  <family>qhd_tch</family>
-
-
-
-  <type>widget</type>
-
-
-
-  <!-- interface uid -->
-
-	<interfaceuid>0x2001f48a</interfaceuid>
-
-
-
-	<!-- vendor uid  -->
-
-	<provideruid>0x101fb657</provideruid>
-
-
-
-	<!-- uid -->
-
-	<configurationuid>0x2001f484</configurationuid>
-
-	
-
-	<!-- description -->
-
-	<fullname>&amp;qtn_shortcut2_configuration_name;</fullname>
-
-	<shortname>sc2</shortname>
-
-	<version>1.0</version>
-
-
-
-	<!-- configuration -->
-
-	<filexml>widgetconfiguration.xml</filexml>
-
-	
-
-	<!-- Name of the localization files -->
-
-	<filedtd>shortcut2configuration.dtd</filedtd>
-
-	
-
-	<!-- Locale independent/common resources -->
-
-	
-        <description>&amp;qtn_shortcut2_configuration_desc;</description>
-        <filelogo>shortcut2logo.svg</filelogo>
-
-	
-
-	<!-- Locale specific resources -->
-
-	<localization>
-		<fileresource tag="xuikon">shortcut2.o0000</fileresource>
-	</localization>
-
-
-
-</package>
\ No newline at end of file

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/hsps/00/shortcut2configuration.dtd	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-============================================================================
-<FileName: "shortcut1configuration.dtd">
-
-<FileDescription: "Localization strings for HSPS shortcut1 configuration">
-<FileVersion    : >
-
-<Copyright:
-"Copyright © 2005 Nokia Corporation.
-This material, including documentation and any related 
-computer programs, is protected by copyright controlled by 
-Nokia Corporation. All rights are reserved. Copying, 
-including reproducing, storing,  adapting or translating, any 
-or all of this material requires the prior written consent of 
-Nokia Corporation. This material also contains confidential 
-information which may not be disclosed to others without the 
-prior written consent of Nokia Corporation.">
-============================================================================
--->
-
-<!--  LOCALISATION STRINGS  -->
-
-<!--
-qtn_shortcut2_configuration_name.attributes
-qtn_shortcut2_configuration_name.layout "list_single_pane_t1_cp2"
-qtn_shortcut2_configuration_name.release "TB9.2"
-qtn_shortcut2_configuration_name.description "Shortcut 2"
-qtn_shortcut2_configuration_name.parents ""
--->
-<!ENTITY qtn_shortcut2_configuration_name "Shortcut 2">
-<!ENTITY qtn_shortcut2_configuration_desc  "RnD shortcut 2 description.">
-
-<!-- End of File-->

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/hsps/00/widgetconfiguration.xml	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<configuration>
-    <control>
-        <settings/>
-    </control>
-</configuration>

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/loc/shortcut2configuration.loc	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Localization strings for Shortcuts 2 plugin configuration (HSPS)
-*
-*/
-
-// d: Shortcuts
-// l: list_single_pane_t1_cp2
-// w:
-// r: TB9.2
-#define qtn_shortcut2_configuration_name  "Shortcut 2"
-#define qtn_shortcut2_configuration_desc  "localized RnD shortcut 2 description."

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/rom/shortcut2.iby	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Shortcut2 widget HSPS-plugin IBY file. 
-*
-*/
-
-#ifndef __SHORTCUT2_2001F484_IBY__
-#define __SHORTCUT2_2001F484_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by DTD-localization tools
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\hsps\00\manifest.dat \private\200159c0\install\shortcut2_2001f484\hsps\00\manifest.dat
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif // __SHORTCUT2_2001F484_IBY__

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/rom/shortcut2_customer.iby	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Shortcut2 widget HSPS-plugin language specific IBY file.  
-*
-*/
-
-#ifndef __SHORTCUT2_2001F484_CUSTOMER_IBY__
-#define __SHORTCUT2_2001F484_CUSTOMER_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by DTD-localization tools, language specific
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\xuikon\00\shortcut2.o0000 \private\200159c0\install\shortcut2_2001f484\xuikon\00\shortcut2.o0000
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\hsps\00\shortcut2configuration.dtd \private\200159c0\install\shortcut2_2001f484\hsps\00\shortcut2configuration.dtd
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif // __SHORTCUT2_2001F484_CUSTOMER_IBY__

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/rom/shortcut2_resources.iby	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Shortcut2 widget HSPS-plugin language specific IBY file.
-*
-*/
-
-#ifndef __SHORTCUT2_2001F484_RESOURCES_IBY__
-#define __SHORTCUT2_2001F484_RESOURCES_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)
-
-// Enabled by DTD-localization tools, language specific
-#if defined (__LOCALES_37_IBY__)
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\xuikon\37\shortcut2.o0037 \private\200159c0\install\shortcut2_2001f484\xuikon\37\shortcut2.o0037
-#endif
-#if defined  (__LOCALES_50_IBY__)
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\xuikon\50\shortcut2.o0050 \private\200159c0\install\shortcut2_2001f484\xuikon\50\shortcut2.o0050
-#endif
-#if defined  (__LOCALES_57_IBY__)
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\xuikon\57\shortcut2.o0057 \private\200159c0\install\shortcut2_2001f484\xuikon\57\shortcut2.o0057
-#endif
-#if defined  (__LOCALES_94_IBY__)
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\xuikon\94\shortcut2.o0094 \private\200159c0\install\shortcut2_2001f484\xuikon\94\shortcut2.o0094
-#endif
-
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\hsps\00\shortcut2configuration.dtd \private\200159c0\install\shortcut2_2001f484\hsps\00\shortcut2configuration.dtd
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\hsps\00\shortcut2logo.svg \private\200159c0\install\shortcut2_2001f484\hsps\00\shortcut2logo.svg
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif // __SHORTCUT2_2001F484_RESOURCES_IBY__

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/rom/shortcut2_variant.iby	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Shortcut2 widget HSPS-plugin variant specific IBY file.  
-*
-*/
-
-#ifndef __SHORTCUT2_2001F484_VARIANT_IBY__
-#define __SHORTCUT2_2001F484_VARIANT_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by variation tools, variant specific
-data=ZPRIVATE\200159c0\install\shortcut2_2001f484\hsps\00\widgetconfiguration.xml \private\200159c0\install\shortcut2_2001f484\hsps\00\widgetconfiguration.xml
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif  // __SHORTCUT2_2001F484_VARIANT_IBY__

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/xuikon/00/shortcut2.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: ltr;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/xuikon/00/shortcut2.dat	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<data>
-	<AppUid>2001CB4F</AppUid>
-	<Provideruid>101FB657</Provideruid>
-	<ThemeUid>11001552</ThemeUid>
-	<ThemeFullName>Shortcut2</ThemeFullName>
-	<ThemeShortName>Shortcut2</ThemeShortName>
-	<ThemeVersion>1.0</ThemeVersion>
-	<FileXML>shortcut2.xml</FileXML>
-	<FileCSS>shortcut2.css</FileCSS>
-</data>
\ No newline at end of file

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/xuikon/00/shortcut2.xml	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmluiml xmlns="http://www.series60.com/xml/xmluiml/1" version="1.0">
-    <widget id="shortcutPluginContainer" >
-        <!-- Data plugin(s) in this widget -->
-        <contentsource name="Shortcut" value="0x102750FA" />
-                
-            <!-- Shortcut #5, Calendar -->
-            <property class="Settings/Shortcut" name="0x00000005" value="localapp:0x10005901"/>
-            <!-- Shortcut #6, New message -->
-            <property class="Settings/Shortcut" name="0x00000006" value="localapp:msg?new=msg"/>
-            <!-- Shortcut #7, Music Player -->        
-            <property class="Settings/Shortcut" name="0x00000007" value="localapp:0x102072C3"/>
-            <!-- Shortcut #8, Radio -->
-            <property class="Settings/Shortcut" name="0x00000008" value="localapp:0x10207A89"/>
-                
-        <!-- #5 -->
-        <button id="shortcutButton5" class="shortcutButton" focusable="true" _s60-initial-focus="1">
-            <actions>
-                <action>
-                    <trigger name="stylus">
-                        <property name="eventtype" value="downup" />
-                    </trigger>
-                    <trigger name="activate"/>
-                    <trigger name="keyevent">
-                        <!-- EStdKeyEnter (enum from e32keys.h) -->
-                        <property name="scancode" value="3"/>                       
-                        <property name="eventtype" value="1"/>
-                    </trigger>
-                    <event name="Shortcut/LaunchByIndex(0x00000005)"/>
-                </action>
-            </actions>
-            <image id="Shortcut_shortcutIcon5" class="shortcutIcon" >
-                <property class="Shortcut/ShortcutIcon" name="ordinal" value="0x00000005"/>
-            </image>
-            <tooltip id="shortcutTooltip5" class="shortcutTooltip" >
-                <text id="Shortcut_shortcutTooltipText5" class="shortcutTooltipText" >
-                    <property class="Shortcut/ShortcutCaption" name="ordinal" value="0x00000005"/>
-                </text>
-            </tooltip>        
-        </button>        
-        <!-- #6 -->
-        <button id="shortcutButton6" class="shortcutButton" focusable="true">
-            <actions>
-                <action>
-                    <trigger name="stylus">
-                        <property name="eventtype" value="downup" />
-                    </trigger>
-                    <trigger name="activate"/>
-                    <trigger name="keyevent">
-                        <!-- EStdKeyEnter (enum from e32keys.h) -->
-                        <property name="scancode" value="3"/>                       
-                        <property name="eventtype" value="1"/>                      
-                    </trigger>        
-                    <event name="Shortcut/LaunchByIndex(0x00000006)"/>
-                </action>
-            </actions>
-            <image id="Shortcut_shortcutIcon6" class="shortcutIcon" >
-                <property class="Shortcut/ShortcutIcon" name="ordinal" value="0x00000006"/>
-            </image>
-            <tooltip id="Shortcut_shortcutTooltip6" class="shortcutTooltip" >
-                <text id="Shortcut_shortcutTooltipText6" class="shortcutTooltipText" >
-                    <property class="Shortcut/ShortcutCaption" name="ordinal" value="0x00000006"/>
-                </text>
-            </tooltip>
-        </button>        
-        <!-- #7 -->
-        <button id="shortcutButton7" class="shortcutButton" focusable="true">
-            <actions>
-                <action>
-                    <trigger name="stylus">
-                        <property name="eventtype" value="downup" />
-                    </trigger>
-                    <trigger name="activate"/>
-                    <trigger name="keyevent">
-                        <!-- EStdKeyEnter (enum from e32keys.h) -->
-                        <property name="scancode" value="3"/>               
-                        <property name="eventtype" value="1"/>                              
-                    </trigger>        
-                    <event name="Shortcut/LaunchByIndex(0x00000007)"/>
-                </action>
-            </actions>
-            <image id="Shortcut_shortcutIcon7" class="shortcutIcon" >
-                <property class="Shortcut/ShortcutIcon" name="ordinal" value="0x00000007"/>
-            </image>
-            <tooltip id="shortcutTooltip7" class="shortcutTooltip" >
-                <text id="Shortcut_shortcutTooltipText7" class="shortcutTooltipText" >
-                    <property class="Shortcut/ShortcutCaption" name="ordinal" value="0x00000007"/>
-                </text>
-            </tooltip>
-        </button>        
-        <!-- #8 -->
-        <button id="shortcutButton8" class="shortcutButton" focusable="true">
-            <actions>
-                <action>
-                    <trigger name="stylus">
-                        <property name="eventtype" value="downup" />
-                    </trigger>
-                    <trigger name="activate"/>
-                    <trigger name="keyevent">
-                        <!-- EStdKeyEnter (enum from e32keys.h) -->
-                        <property name="scancode" value="3"/>               
-                        <property name="eventtype" value="1"/>                              
-                    </trigger>        
-                    <event name="Shortcut/LaunchByIndex(0x00000008)"/>
-                </action>
-            </actions>
-            <image id="Shortcut_shortcutIcon8" class="shortcutIcon" >
-                <property class="Shortcut/ShortcutIcon" name="ordinal" value="0x00000008"/>
-            </image>
-            <tooltip id="Shortcut_shortcutTooltip8" class="shortcutTooltip" >
-                <text id="Shortcut_shortcutTooltipText8" class="shortcutTooltipText" >
-                    <property class="Shortcut/ShortcutCaption" name="ordinal" value="0x00000008"/>
-                </text>
-            </tooltip>
-        </button>
-        <menuextension>
-            <menuitem target="hs_widget_menuitem_settings">
-                <actions>
-                    <action>
-                        <trigger name="activate"/>
-                        <event name="Shortcut/ShowSettings(0x00000005,0x00000006,0x00000007,0x00000008)"/>
-                    </action>
-                </actions>
-            </menuitem>     
-        </menuextension>        
-    </widget>
-</xmluiml>

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/xuikon/37/shortcut2.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: rtl;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/xuikon/50/shortcut2.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: rtl;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/xuikon/57/shortcut2.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: rtl;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/shortcut2_2001f484/xuikon/94/shortcut2.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: rtl;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

Binary file idlehomescreen/data/qhd_tch/shortcut_2001f483/gfx/shortcut1logo.png has changed

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/group/bld.inf	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* The information required for building 
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// Support for productization and Carbide.Ui customization
-//********************************************************
-../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/shortcut_2001f483/hsps/manifest.dat
-../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/shortcut_2001f483/hsps/widgetconfiguration.xml
-../hsps/00/shortcutconfiguration.dtd /epoc32/data/Z/resource/homescreen/shortcut_2001f483/hsps/shortcutconfiguration.dtd
-
-../xuikon/00/shortcut.dat /epoc32/data/Z/resource/homescreen/shortcut_2001f483/xuikon/shortcut_2001f483.dat
-../xuikon/00/shortcut.css /epoc32/data/Z/resource/homescreen/shortcut_2001f483/xuikon/shortcut.css
-../xuikon/00/shortcut.xml /epoc32/data/Z/resource/homescreen/shortcut_2001f483/xuikon/shortcut.xml
-
-// logo icon
-../gfx/shortcut1logo.png /epoc32/data/Z/resource/homescreen/shortcut_2001f483/hsps/shortcut1logo.png
-
-// Arabic languages
-//*****************
-../xuikon/37/shortcut.css /epoc32/data/Z/resource/homescreen/shortcut_2001f483/xuikon/37/shortcut.css
-../xuikon/50/shortcut.css /epoc32/data/Z/resource/homescreen/shortcut_2001f483/xuikon/50/shortcut.css
-../xuikon/57/shortcut.css /epoc32/data/Z/resource/homescreen/shortcut_2001f483/xuikon/57/shortcut.css
-../xuikon/94/shortcut.css /epoc32/data/Z/resource/homescreen/shortcut_2001f483/xuikon/94/shortcut.css
-
-
-// Support for S60 localization
-//*****************************
-#ifndef __SHORTCUTCONFIGURATION_LOC__
-#define __SHORTCUTCONFIGURATION_LOC__
-../loc/shortcutconfiguration.loc APP_LAYER_LOC_EXPORT_PATH(shortcutconfiguration.loc)
-#endif // __SHORTCUTCONFIGURATION_LOC__
-
-// Support for S60 builds
-//***********************
-../rom/shortcut_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(shortcut_2001f483_resources.iby)
-../rom/shortcut_customer.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(shortcut_2001f483_customer.iby)
-../rom/shortcut_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(shortcut_2001f483_variant.iby)
-../rom/shortcut.iby CORE_APP_LAYER_IBY_EXPORT_PATH(shortcut_2001f483.iby)
-
-
-// Dtd-localization
-//*****************
-PRJ_EXTENSIONS
-START EXTENSION tools/dtd
-OPTION SWITCH_LOC_FILE_NAME shortcut_2001f483
-OPTION DTD_TYPE widget
-OPTION LOC_FOLDERS yes
-END
-
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-//  End of File  
-
-
-
-

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/hsps/00/manifest.dat	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<package version="1.0">
-
-  <family>qhd_tch</family>
-
-  <type>widget</type>
-
-  <!-- interface uid -->
-	<interfaceuid>0x2001f48a</interfaceuid>
-
-	<!-- vendor uid  -->
-	<provideruid>0x101fb657</provideruid>
-
-	<!-- uid -->
-	<configurationuid>0x2001f483</configurationuid>
-
-	<!-- description -->
-	<fullname>&amp;qtn_shortcut1_configuration_name;</fullname>
-	<shortname>sc</shortname>
-	<version>1.0</version>
-
-	<!-- configuration -->
-	<filexml>widgetconfiguration.xml</filexml>
-	
-	<!-- Name of the localization files -->
-	<filedtd>shortcutconfiguration.dtd</filedtd>
-	
-	<!-- Locale independent/common resources -->
-	
-        <description>&amp;qtn_shortcut1_configuration_desc;</description>
-        <filelogo>shortcut1logo.png</filelogo>
-
-	
-	<!-- Locale specific resources -->
-	<localization>
-        <fileresource tag="xuikon">shortcut.o0000</fileresource>
-	</localization>
-
-</package>
\ No newline at end of file

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/hsps/00/shortcutconfiguration.dtd	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-============================================================================
-<FileName: "shortcutconfiguration.dtd">
-<PartOf  : "shortcutconfiguration">
-
-<FileDescription: "Localization strings for the configuration">
-<FileVersion    : >
-
-<Copyright:
-"Copyright © 2007 Nokia Corporation.
-This material, including documentation and any related
-computer programs, is protected by copyright controlled by
-Nokia Corporation. All rights are reserved. Copying,
-including reproducing, storing,  adapting or translating, any
-or all of this material requires the prior written consent of
-Nokia Corporation. This material also contains confidential
-information which may not be disclosed to others without the
-prior written consent of Nokia Corporation.">
-============================================================================
--->
-
-<!-- NOTE: make sure that there is at last one space character (hex 20) after the entity name -->
-
-<!--
-qtn_shortcut1_configuration_name.attributes
-qtn_shortcut1_configuration_name.layout "list_single_pane_t1_cp2"
-qtn_shortcut1_configuration_name.release "TB9.2"
-qtn_shortcut1_configuration_name.description "Shortcut 1"
-qtn_shortcut1_configuration_name.parents ""
--->
-<!ENTITY qtn_shortcut1_configuration_name  "Shortcut 1">
-<!ENTITY qtn_shortcut1_configuration_desc  "RnD shortcut 1 description.">
\ No newline at end of file

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/hsps/00/widgetconfiguration.xml	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<configuration>
-    <control>
-        <settings/>
-    </control>
-</configuration>

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/loc/shortcutconfiguration.loc	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* Copyright (c) 2005-2006 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Localization strings for Shortcut1 plugin configuration (HSPS)
-*
-*/
-
-
-// d: Shortcuts
-// l: list_single_pane_t1_cp2
-// w:
-// r: TB9.2
-#define qtn_shortcut1_configuration_name  "Shortcut 1"
-#define qtn_shortcut1_configuration_desc  "localized RnD shortcut 1 description."
-

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/rom/shortcut.iby	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Shortcut widget HSPS-plugin IBY file. 
-*
-*/
-
-#ifndef __SHORTCUT_2001F483_IBY__
-#define __SHORTCUT_2001F483_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by DTD-localization tools
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\hsps\00\manifest.dat \private\200159c0\install\shortcut_2001f483\hsps\00\manifest.dat
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH 
-
-#endif // __SHORTCUT_2001F483_IBY__

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/rom/shortcut_customer.iby	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Shortcut widget HSPS-plugin language specific IBY file.  
-*
-*/
-
-#ifndef __SHORTCUT_2001F483_CUSTOMER_IBY__
-#define __SHORTCUT_2001F483_CUSTOMER_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by DTD-localization tools, language specific
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\xuikon\00\shortcut.o0000 \private\200159c0\install\shortcut_2001f483\xuikon\00\shortcut.o0000
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\hsps\00\shortcutconfiguration.dtd \private\200159c0\install\shortcut_2001f483\hsps\00\shortcutconfiguration.dtd
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif // __SHORTCUT_2001F483_CUSTOMER_IBY__

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/rom/shortcut_resources.iby	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Shortcut widget HSPS-plugin language specific IBY file.  
-*
-*/
-
-#ifndef __SHORTCUT_2001F483_RESOURCES_IBY__
-#define __SHORTCUT_2001F483_RESOURCES_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by DTD-localization tools, language specific
-#if defined (__LOCALES_37_IBY__)
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\xuikon\37\shortcut.o0037 \private\200159c0\install\shortcut_2001f483\xuikon\37\shortcut.o0037
-#endif
-#if defined  (__LOCALES_50_IBY__)
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\xuikon\50\shortcut.o0050 \private\200159c0\install\shortcut_2001f483\xuikon\50\shortcut.o0050
-#endif
-#if defined  (__LOCALES_57_IBY__)
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\xuikon\57\shortcut.o0057 \private\200159c0\install\shortcut_2001f483\xuikon\57\shortcut.o0057
-#endif
-#if defined  (__LOCALES_94_IBY__)
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\xuikon\94\shortcut.o0094 \private\200159c0\install\shortcut_2001f483\xuikon\94\shortcut.o0094
-#endif
-
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\hsps\00\shortcutconfiguration.dtd \private\200159c0\install\shortcut_2001f483\hsps\00\shortcutconfiguration.dtd
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\hsps\00\shortcut1logo.png \private\200159c0\install\shortcut_2001f483\hsps\00\shortcut1logo.png
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif // __SHORTCUT_2001F483_RESOURCES_IBY__

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/rom/shortcut_variant.iby	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* Shortcut widget HSPS-plugin variant specific IBY file.  
-*
-*/
-
-#ifndef __SHORTCUT_2001F483_VARIANT_IBY__
-#define __SHORTCUT_2001F483_VARIANT_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by variation tools, variant specific
-data=ZPRIVATE\200159c0\install\shortcut_2001f483\hsps\00\widgetconfiguration.xml \private\200159c0\install\shortcut_2001f483\hsps\00\widgetconfiguration.xml
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif  // __SHORTCUT_2001F483_VARIANT_IBY__

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/xuikon/00/Shortcut.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: ltr;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/xuikon/00/Shortcut.xml	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmluiml xmlns="http://www.series60.com/xml/xmluiml/1" version="1.0">
-    <widget id="shortcutPluginContainer">
-        <!-- Data plugin(s) in this widget -->
-        <contentsource name="Shortcut" value="0x102750FA" />
-
-            <!-- Shortcut #1, Phonebook -->
-            <property class="Settings/Shortcut" name="0x00000001" value="localapp:0x101F4CCE"/>
-            <!-- Shortcut #2, Messaging -->
-            <property class="Settings/Shortcut" name="0x00000002" value="localapp:0x100058C5"/>
-            <!-- Shortcut #3, Browser -->        
-            <property class="Settings/Shortcut" name="0x00000003" value="localapp:0x10008D39"/>
-            <!-- Shortcut #4, Photos -->
-            <property class="Settings/Shortcut" name="0x00000004" value="localapp:0x200009EE"/>    
-
-        <!-- #1 -->
-        <button id="shortcutButton1" class="shortcutButton" focusable="true" _s60-initial-focus="1">
-            <actions>
-                <action>
-                    <trigger name="stylus">
-                        <property name="eventtype" value="downup" />
-                    </trigger>
-                    <trigger name="activate"/>
-                    <trigger name="keyevent">
-                        <!-- EStdKeyEnter (enum from e32keys.h) -->
-                        <property name="scancode" value="3"/>                       
-                        <property name="eventtype" value="1"/>
-                    </trigger>
-                    <event name="Shortcut/LaunchByIndex(0x00000001)"/>
-                </action>
-            </actions>
-            <image id="Shortcut_shortcutIcon1" class="shortcutIcon" >
-                <property class="Shortcut/ShortcutIcon" name="ordinal" value="0x00000001"/>
-            </image>
-            <tooltip id="shortcutTooltip1" class="shortcutTooltip" >
-                <text id="Shortcut_shortcutTooltipText1" class="shortcutTooltipText" >
-                    <property class="Shortcut/ShortcutCaption" name="ordinal" value="0x00000001"/>
-                </text>
-            </tooltip>
-        </button>
-        <!-- #2 -->
-        <button id="shortcutButton2" class="shortcutButton" focusable="true">
-            <actions>
-                <action>
-                    <trigger name="stylus">
-                        <property name="eventtype" value="downup" />
-                    </trigger>
-                    <trigger name="activate"/>
-                    <trigger name="keyevent">
-                        <!-- EStdKeyEnter (enum from e32keys.h) -->
-                        <property name="scancode" value="3"/>                       
-                        <property name="eventtype" value="1"/>                      
-                    </trigger>
-                    <event name="Shortcut/LaunchByIndex(0x00000002)"/>
-                </action>
-            </actions>
-            <image id="Shortcut_shortcutIcon2" class="shortcutIcon" >
-                <property class="Shortcut/ShortcutIcon" name="ordinal" value="0x00000002"/>
-            </image>
-            <tooltip id="shortcutTooltip2" class="shortcutTooltip" >
-                <text id="Shortcut_shortcutTooltipText2" class="shortcutTooltipText" >
-                    <property class="Shortcut/ShortcutCaption" name="ordinal" value="0x00000002"/>
-                </text>             
-            </tooltip>
-        </button>
-        <!-- #3 -->
-        <button id="shortcutButton3" class="shortcutButton" focusable="true">
-            <actions>
-                <action>
-                    <trigger name="stylus">
-                        <property name="eventtype" value="downup" />
-                    </trigger>
-                    <trigger name="activate"/>
-                    <trigger name="keyevent">
-                        <!-- EStdKeyEnter (enum from e32keys.h) -->
-                        <property name="scancode" value="3"/>               
-                        <property name="eventtype" value="1"/>                              
-                    </trigger>
-                    <event name="Shortcut/LaunchByIndex(0x00000003)"/>
-                </action>
-            </actions>
-            <image id="Shortcut_shortcutIcon3" class="shortcutIcon" >
-                <property class="Shortcut/ShortcutIcon" name="ordinal" value="0x00000003"/>
-            </image>
-            <tooltip id="shortcutTooltip3" class="shortcutTooltip" >
-                <text id="Shortcut_shortcutTooltipText3" class="shortcutTooltipText" >
-                    <property class="Shortcut/ShortcutCaption" name="ordinal" value="0x00000003"/>
-                </text>
-            </tooltip>
-        </button>
-        <!-- #4 -->
-        <button id="shortcutButton4" class="shortcutButton" focusable="true">
-            <actions>
-                <action>
-                    <trigger name="stylus">
-                        <property name="eventtype" value="downup" />
-                    </trigger>
-                    <trigger name="activate"/>
-                    <trigger name="keyevent">
-                        <!-- EStdKeyEnter (enum from e32keys.h) -->
-                        <property name="scancode" value="3"/>                       
-                        <property name="eventtype" value="1"/>                      
-                    </trigger>
-                    <event name="Shortcut/LaunchByIndex(0x00000004)"/>
-                </action>
-            </actions>
-            <image id="Shortcut_shortcutIcon4" class="shortcutIcon" >
-                <property class="Shortcut/ShortcutIcon" name="ordinal" value="0x00000004"/>
-            </image>
-            <tooltip id="shortcutTooltip4" class="shortcutTooltip" >
-                <text id="Shortcut_shortcutTooltipText4" class="shortcutTooltipText" >
-                    <property class="Shortcut/ShortcutCaption" name="ordinal" value="0x00000004"/>
-                </text>
-            </tooltip>
-        </button>
-        <menuextension>
-            <menuitem target="hs_widget_menuitem_settings">
-                <actions>
-                    <action>
-                        <trigger name="activate"/>
-                        <event name="Shortcut/ShowSettings(0x00000001,0x00000002,0x00000003,0x00000004)"/>
-                    </action>
-                </actions>
-            </menuitem>     
-        </menuextension>
-    </widget>
-</xmluiml>

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/xuikon/00/shortcut.dat	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<data>
-	<AppUid>2001CB4F</AppUid>
-	<Provideruid>101FB657</Provideruid>
-	<ThemeUid>11001551</ThemeUid>
-	<ThemeFullName>Shortcut</ThemeFullName>
-	<ThemeShortName>Shortcut</ThemeShortName>
-	<ThemeVersion>1.0</ThemeVersion>
-	<FileXML>Shortcut.xml</FileXML>
-	<FileCSS>Shortcut.css</FileCSS>
-</data>
\ No newline at end of file

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/xuikon/37/Shortcut.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: rtl;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/xuikon/50/Shortcut.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: rtl;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/xuikon/57/Shortcut.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: rtl;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/shortcut_2001f483/xuikon/94/Shortcut.css	Thu Jan 07 12:39:41 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-widget#shortcutPluginContainer 
-{
-    block-progression: rl;
-    direction: rtl;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    padding-left: 3px;
-    background-color: none;
-}
-
-button.shortcutButton 
-{
-    width: 74px;
-    margin-right: 3px;
-    nav-index: appearance;
-}
-
-button.shortcutButton:focus 
-{
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive; 
-    focus-background:"SKIN(268458534 9896)";
-}
-
-button.shortcutButton:hold
-{
-    background-color: "SKIN(268458534 9956)";
-}
-
-image.shortcutIcon 
-{
-    _s60-aspect-ratio: preserve;
-}
-
-tooltip.shortcutTooltip 
-{ 
-    width: adaptive;
-    max-width: 350px;
-    height: 33px;
-    border-style: solid; 
-    border-width: 5px; 
-    _s60-start-delay: 1000000;
-    _s60-display-time: 1000000;
-    background-color:"SKIN(268458534 8480)";
-    display: block;    
-    padding-left: 6px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-right: 6px;
-}
-
-text.shortcutTooltipText 
-{ 
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
-    width: adaptive;
-    color: "SKIN(268458534 13056 19)";
-}
-

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/loc/templateview.loc	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/loc/templateview.loc	Mon Jan 18 20:10:36 2010 +0200
@@ -260,3 +260,9 @@
 // w:
 // r: TB9.2
 #define qtn_hs_edit_widget_catalog "Widget Catalog"
+
+// d: Deletes the current Home screen page and focus goes to the next available Home screen page in Edit mode
+// l: list_single_pane_t1_cp2
+// w:
+// r: TB9.2
+#define qtn_hs_page_edit_options_delete "Delete page"

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/templateview.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/templateview.css	Mon Jan 18 20:10:36 2010 +0200
@@ -26,9 +26,6 @@
 
     _s60-longtap: true;
 
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive;
-
     nav-index: appearance;
 }
 

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/templateview.xml	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/templateview.xml	Mon Jan 18 20:10:36 2010 +0200
@@ -276,8 +276,7 @@
                     </action>
                 </actions>
             </softkey>
-            <!-- <softkey id="rsk" type="right" mode="mode_callinactive" label="&text_softkey_call;"> -->
-            <softkey id="rsk" type="right" mode="mode_callinactive" label="#Call">
+            <softkey id="rsk" type="right" mode="mode_callinactive" label="&text_softkey_call;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/view.dtd	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/view.dtd	Mon Jan 18 20:10:36 2010 +0200
@@ -299,22 +299,22 @@
 <!ENTITY text_softkey_cancel "Cancel">
 
 <!--
-qtn_hs_web_online.attributes
-qtn_hs_web_online.layout "list_single_pane_t1_cp2"
-qtn_hs_web_online.release "TB9.2"
-qtn_hs_web_online.description "Online"
-qtn_hs_web_online.grammar "Online"
-qtn_hs_web_online.parents "list_single_pane_cp2"
+qtn_hs_online.attributes
+qtn_hs_online.layout "list_single_pane_t1_cp2"
+qtn_hs_online.release "TB9.2"
+qtn_hs_online.description "Online"
+qtn_hs_online.grammar "Online"
+qtn_hs_online.parents "list_single_pane_cp2"
 -->
 <!ENTITY qtn_hs_online "Switch Home to online">
 
 <!--
-qtn_hs_web_offline.attributes
-qtn_hs_web_offline.layout "list_single_pane_t1_cp2"
-qtn_hs_web_offline.release "TB9.2"
-qtn_hs_web_offline.description "Offline"
-qtn_hs_web_offline.grammar "Offline"
-qtn_hs_web_offline.parents "list_single_pane_cp2"
+qtn_hs_offline.attributes
+qtn_hs_offline.layout "list_single_pane_t1_cp2"
+qtn_hs_offline.release "TB9.2"
+qtn_hs_offline.description "Offline"
+qtn_hs_offline.grammar "Offline"
+qtn_hs_offline.parents "list_single_pane_cp2"
 -->
 <!ENTITY qtn_hs_offline "Switch Home to offline">
 
@@ -373,20 +373,20 @@
 <!ENTITY qtn_hs_edit_replace "Replace">
 
 <!--
-qtn_hs_edit_replace.attributes
-qtn_hs_edit_replace.layout "list_single_pane_t1_cp2"
-qtn_hs_edit_replace.release "TB9.2"
-qtn_hs_edit_replace.description "deletes current home screen page"
-qtn_hs_edit_replace.parents ""
+qtn_hs_page_options_delete.attributes
+qtn_hs_page_options_delete.layout "list_single_pane_t1_cp2"
+qtn_hs_page_options_delete.release "TB9.2"
+qtn_hs_page_options_delete.description "deletes current home screen page"
+qtn_hs_page_options_delete.parents ""
 -->
 <!ENTITY qtn_hs_page_options_delete "Delete page">
 
 <!--
-qtn_hs_edit_replace.attributes
-qtn_hs_edit_replace.layout "list_single_pane_t1_cp2"
-qtn_hs_edit_replace.release "TB9.2"
-qtn_hs_edit_replace.description "creates new home screen page"
-qtn_hs_edit_replace.parents ""
+qtn_hs_page_options_new.attributes
+qtn_hs_page_options_new.layout "list_single_pane_t1_cp2"
+qtn_hs_page_options_new.release "TB9.2"
+qtn_hs_page_options_new.description "creates new home screen page"
+qtn_hs_page_options_new.parents ""
 -->
 <!ENTITY qtn_hs_page_options_new "New page">
 
@@ -409,11 +409,20 @@
 <!ENTITY text_softkey_call "Call">
 
 <!--
-qtn_hs_add_widget.attributes
-qtn_hs_add_widget.layout "list_single_pane_t1_cp2"
-qtn_hs_add_widget.release "TB9.2"
-qtn_hs_add_widget.description "Added new option menu item to Edit mode for opening the widget catalog"
-qtn_hs_add_widget.grammar "Widget Catalog"
-qtn_hs_add_widget.parents "list_single_pane_cp2"
+qtn_hs_edit_widget_catalog.attributes
+qtn_hs_edit_widget_catalog.layout "list_single_pane_t1_cp2"
+qtn_hs_edit_widget_catalog.release "TB9.2"
+qtn_hs_edit_widget_catalog.description "Added new option menu item to Edit mode for opening the widget catalog"
+qtn_hs_edit_widget_catalog.grammar "Widget Catalog"
+qtn_hs_edit_widget_catalog.parents "list_single_pane_cp2"
 -->
 <!ENTITY qtn_hs_edit_widget_catalog "Widget Catalog">
+
+<!--
+qtn_hs_page_edit_options_delete.attributes
+qtn_hs_page_edit_options_delete.layout "list_single_pane_t1_cp2"
+qtn_hs_page_edit_options_delete.release "TB9.2"
+qtn_hs_page_edit_options_delete.description "Deletes the current Home screen page and focus goes to the next available Home screen page in Edit mode"
+qtn_hs_page_edit_options_delete.parents ""
+-->
+<!ENTITY qtn_hs_page_edit_options_delete "Delete page">

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/37/templateview.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/37/templateview.css	Mon Jan 18 20:10:36 2010 +0200
@@ -27,9 +27,6 @@
 
     _s60-longtap: true;
 
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive;
-
     nav-index: appearance;
 }
 

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/50/templateview.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/50/templateview.css	Mon Jan 18 20:10:36 2010 +0200
@@ -27,9 +27,6 @@
 
     _s60-longtap: true;
 
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive;
-
     nav-index: appearance;
 }
 

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/57/templateview.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/57/templateview.css	Mon Jan 18 20:10:36 2010 +0200
@@ -27,9 +27,6 @@
 
     _s60-longtap: true;
 
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive;
-
     nav-index: appearance;
 }
 

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/94/templateview.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/94/templateview.css	Mon Jan 18 20:10:36 2010 +0200
@@ -27,9 +27,6 @@
 
     _s60-longtap: true;
 
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive;
-
     nav-index: appearance;
 }
 

--- a/idlehomescreen/data/qhd_tch/view_2001f48b/loc/View.loc	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/view_2001f48b/loc/View.loc	Mon Jan 18 20:10:36 2010 +0200
@@ -260,3 +260,9 @@
 // w:
 // r: TB9.2
 #define qtn_hs_edit_widget_catalog "Widget Catalog"
+
+// d: Deletes the current Home screen page and focus goes to the next available Home screen page in Edit mode
+// l: list_single_pane_t1_cp2
+// w:
+// r: TB9.2
+#define qtn_hs_page_edit_options_delete "Delete page"

--- a/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.css	Mon Jan 18 20:10:36 2010 +0200
@@ -26,9 +26,6 @@
  
     _s60-longtap: true;
 
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive;
-
     nav-index: appearance;
 }
 

--- a/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.dtd	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.dtd	Mon Jan 18 20:10:36 2010 +0200
@@ -299,22 +299,22 @@
 <!ENTITY text_softkey_cancel "Cancel">
 
 <!--
-qtn_hs_web_online.attributes
-qtn_hs_web_online.layout "list_single_pane_t1_cp2"
-qtn_hs_web_online.release "TB9.2"
-qtn_hs_web_online.description "Online"
-qtn_hs_web_online.grammar "Online"
-qtn_hs_web_online.parents "list_single_pane_cp2"
+qtn_hs_online.attributes
+qtn_hs_online.layout "list_single_pane_t1_cp2"
+qtn_hs_online.release "TB9.2"
+qtn_hs_online.description "Online"
+qtn_hs_online.grammar "Online"
+qtn_hs_online.parents "list_single_pane_cp2"
 -->
 <!ENTITY qtn_hs_online "Switch Home to online">
 
 <!--
-qtn_hs_web_offline.attributes
-qtn_hs_web_offline.layout "list_single_pane_t1_cp2"
-qtn_hs_web_offline.release "TB9.2"
-qtn_hs_web_offline.description "Offline"
-qtn_hs_web_offline.grammar "Offline"
-qtn_hs_web_offline.parents "list_single_pane_cp2"
+qtn_hs_offline.attributes
+qtn_hs_offline.layout "list_single_pane_t1_cp2"
+qtn_hs_offline.release "TB9.2"
+qtn_hs_offline.description "Offline"
+qtn_hs_offline.grammar "Offline"
+qtn_hs_offline.parents "list_single_pane_cp2"
 -->
 <!ENTITY qtn_hs_offline "Switch Home to offline">
 
@@ -373,20 +373,20 @@
 <!ENTITY qtn_hs_edit_replace "Replace">
 
 <!--
-qtn_hs_edit_replace.attributes
-qtn_hs_edit_replace.layout "list_single_pane_t1_cp2"
-qtn_hs_edit_replace.release "TB9.2"
-qtn_hs_edit_replace.description "deletes current home screen page"
-qtn_hs_edit_replace.parents ""
+qtn_hs_page_options_delete.attributes
+qtn_hs_page_options_delete.layout "list_single_pane_t1_cp2"
+qtn_hs_page_options_delete.release "TB9.2"
+qtn_hs_page_options_delete.description "deletes current home screen page"
+qtn_hs_page_options_delete.parents ""
 -->
 <!ENTITY qtn_hs_page_options_delete "Delete page">
 
 <!--
-qtn_hs_edit_replace.attributes
-qtn_hs_edit_replace.layout "list_single_pane_t1_cp2"
-qtn_hs_edit_replace.release "TB9.2"
-qtn_hs_edit_replace.description "creates new home screen page"
-qtn_hs_edit_replace.parents ""
+qtn_hs_page_options_new.attributes
+qtn_hs_page_options_new.layout "list_single_pane_t1_cp2"
+qtn_hs_page_options_new.release "TB9.2"
+qtn_hs_page_options_new.description "creates new home screen page"
+qtn_hs_page_options_new.parents ""
 -->
 <!ENTITY qtn_hs_page_options_new "New page">
 
@@ -409,11 +409,20 @@
 <!ENTITY text_softkey_call "Call">
 
 <!--
-qtn_hs_widget_catalog.attributes
-qtn_hs_widget_catalog.layout "list_single_pane_t1_cp2"
-qtn_hs_widget_catalog.release "TB9.2"
-qtn_hs_widget_catalog.description "Added new option menu item to Edit mode for opening the widget catalog"
-qtn_hs_widget_catalog.grammar "Widget catalog"
-qtn_hs_widget_catalog.parents "list_single_pane_cp2"
+qtn_hs_edit_widget_catalog.attributes
+qtn_hs_edit_widget_catalog.layout "list_single_pane_t1_cp2"
+qtn_hs_edit_widget_catalog.release "TB9.2"
+qtn_hs_edit_widget_catalog.description "Added new option menu item to Edit mode for opening the widget catalog"
+qtn_hs_edit_widget_catalog.grammar "Widget Catalog"
+qtn_hs_edit_widget_catalog.parents "list_single_pane_cp2"
 -->
 <!ENTITY qtn_hs_edit_widget_catalog "Widget Catalog">
+
+<!--
+qtn_hs_page_edit_options_delete.attributes
+qtn_hs_page_edit_options_delete.layout "list_single_pane_t1_cp2"
+qtn_hs_page_edit_options_delete.release "TB9.2"
+qtn_hs_page_edit_options_delete.description "Deletes the current Home screen page and focus goes to the next available Home screen page in Edit mode"
+qtn_hs_page_edit_options_delete.parents ""
+-->
+<!ENTITY qtn_hs_page_edit_options_delete "Delete page">

--- a/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.xml	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.xml	Mon Jan 18 20:10:36 2010 +0200
@@ -276,8 +276,7 @@
                     </action>
                 </actions>
             </softkey>
-            <!-- <softkey id="rsk" type="right" mode="mode_callinactive" label="&text_softkey_call;"> -->
-            <softkey id="rsk" type="right" mode="mode_callinactive" label="#Call">
+            <softkey id="rsk" type="right" mode="mode_callinactive" label="&text_softkey_call;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>

--- a/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/37/View.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/37/View.css	Mon Jan 18 20:10:36 2010 +0200
@@ -27,9 +27,6 @@
 
     _s60-longtap: true;
 
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive;
-
     nav-index: appearance;
 }
 

--- a/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/50/View.css	Thu Jan 07 12:39:41 2010 +0200
+++ b/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/50/View.css	Mon Jan 18 20:10:36 2010 +0200
@@ -27,9 +27,6 @@
 
     _s60-longtap: true;
 
-    touchfeedbackdown: basic; 
-    touchfeedbackdrag: sensitive;
-
     nav-index: appearance;
 }