--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/empty_2001f47f/group/bld.inf	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,55 @@
+/*
+* 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/empty_2001f47f/hsps/manifest.dat
+../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/empty_2001f47f/hsps/widgetconfiguration.xml
+../xuikon/00/empty.dat /epoc32/data/Z/resource/homescreen/empty_2001f47f/xuikon/empty_2001f47f.dat
+../xuikon/00/empty.css /epoc32/data/Z/resource/homescreen/empty_2001f47f/xuikon/empty.css
+../xuikon/00/empty.xml /epoc32/data/Z/resource/homescreen/empty_2001f47f/xuikon/empty.xml
+
+// Support for S60 builds
+//***********************
+../rom/empty_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(empty_2001f47f_variant.iby)
+../rom/empty.iby CORE_APP_LAYER_IBY_EXPORT_PATH(empty_2001f47f.iby)
+
+// Dtd-localization
+//*****************
+PRJ_EXTENSIONS
+START EXTENSION tools/dtd
+OPTION SWITCH_LOC_FILE_NAME empty_2001f47f
+OPTION DTD_TYPE widget
+OPTION LOC_FOLDERS yes
+END
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+//  End of File  
+
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/empty_2001f47f/hsps/00/manifest.dat	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<package version="2.0">
+
+
+	<family>qhd_tch</family>
+	<family>vga_tch</family>
+
+
+
+  <type>widget</type>
+
+
+
+  <!-- interface uid -->
+
+	<interfaceuid>0x2001f48a</interfaceuid>
+
+
+
+	<!-- vendor uid  -->
+
+	<provideruid>0x101fb657</provideruid>
+
+
+
+	<!-- uid -->
+
+	<configurationuid>0x2001f47f</configurationuid>
+
+
+
+	<!-- description -->
+
+	<fullname>&amp;qtn_empty_2001f47f_name;</fullname>
+
+	<shortname>empty</shortname>
+
+	<version>1.0</version>
+
+
+
+	<!-- configuration -->
+
+	<filexml>widgetconfiguration.xml</filexml>
+
+		
+	<!-- Locale independent/common resources -->
+
+  <fileresource>empty.o0000</fileresource>
+
+
+
+  <!-- Locale specific resources -->
+
+	<localization/>
+
+
+
+</package>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/empty_2001f47f/hsps/00/widgetconfiguration.xml	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,5 @@
+<configuration>
+    <control>
+        <settings/>
+    </control>
+</configuration>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/empty_2001f47f/rom/empty.iby	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* 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: 
+* Empty widget HSPS-plugin IBY file 
+*
+*/
+
+#ifndef __EMPTY_2001F47F_IBY__
+#define __EMPTY_2001F47F_IBY__
+
+// Enabled by DTD-localization tools
+data=ZPRIVATE\200159c0\install\empty_2001f47f\xuikon\00\empty.o0000 \private\200159c0\install\empty_2001f47f\xuikon\00\empty.o0000
+data=ZPRIVATE\200159c0\install\empty_2001f47f\hsps\00\manifest.dat \private\200159c0\install\empty_2001f47f\hsps\00\manifest.dat
+
+#endif // __EMPTY_2001F47F_IBY__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/empty_2001f47f/rom/empty_variant.iby	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* 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:  
+* Empty widget HSPS-plugin variant specific IBY file.
+*
+*/
+
+#ifndef __EMPTY_2001F47F_VARIANT_IBY__
+#define __EMPTY_2001F47F_VARIANT_IBY__
+
+// Enabled by variation tools, variant specific
+data=ZPRIVATE\200159c0\install\empty_2001f47f\hsps\00\widgetconfiguration.xml \private\200159c0\install\empty_2001f47f\hsps\00\widgetconfiguration.xml
+
+#endif  // __EMPTY_2001F47F_VARIANT_IBY__

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/empty_2001f47f/xuikon/00/empty.css	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,6 @@
+widget
+{
+    display: none;
+    visibility: hidden;
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/empty_2001f47f/xuikon/00/empty.dat	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data>
+    <AppUid>E029CF57</AppUid>
+    <Provideruid>101FB657</Provideruid>
+    <ThemeUid>11001001</ThemeUid>
+    <ThemeFullName>empty</ThemeFullName>
+    <ThemeShortName>empty</ThemeShortName>
+    <ThemeVersion>1.0</ThemeVersion>
+    <FileXML>empty.xml</FileXML>
+    <FileCSS>empty.css</FileCSS>
+</data>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/empty_2001f47f/xuikon/00/empty.xml	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmluiml xmlns="http://www.series60.com/xml/xmluiml/1" version="1.0">
+    <widget id="empty"/>    
+</xmluiml>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/group/bld.inf	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* Copyright (c) 2009 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 "../empty_2001f47f/group/bld.inf"
+#include "../view_200286ed/group/bld.inf"
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/view_200286ed/conf/view200286ed.confml	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="http://www.s60.com/xml/confml/2" name="Banko Homescreen" version="1">
+  <feature ref="BlankoHomescreenPlugins" name="Blanko Homescreen Widgets">
+    <setting ref="Plugins" name="Widgets" type="sequence">
+      <desc>Widgets on Blanko Homescreen</desc>
+      <setting ref="Uid" name="Widget" type="string">
+        <desc>Widget name</desc>
+        <option name="Empty" value="0x2001f47f"/>
+        <option name="wrtplugin_1" value="0x20022FD4"/>
+        <option name="wrtplugin_2" value="0x20022FD5"/>
+        <option name="wrtplugin_3" value="0x20022FD6"/>
+        <option name="wrtplugin_4" value="0x20022FD7"/>
+        <option name="wrtplugin_5" value="0x20022FD8"/>
+        <option name="wrtplugin_6" value="0x20022FD9"/>
+        <option name="wrtplugin_7" value="0x20022FDA"/>
+        <option name="wrtplugin_8" value="0x20022FDB"/>
+        <option name="wrtplugin_9" value="0x2001CB7D"/>
+        <option name="wrtplugin_10" value="0x2001CB7E"/>
+        <option name="wrtplugin_11" value="0x2001CB7F"/>
+        <option name="wrtplugin_12" value="0x200286EE"/>
+      </setting>
+      <setting ref="BundleIdentifier" name="Bundle Identifier" type="string">
+        <desc>Bundle identifier for the (C)WRT widgets. Leave empty if not set.</desc>
+        <option name="8TV Catch Up" value="com.nerdattack.widget.8TV"/>
+        <option name="Aftonbladet WebbTV" value="apegroup.aftonbladet.webbtv.symbian3"/>
+        <option name="Al Jazeera" value="si.inova.verve.aljazeera"/>
+        <option name="BBC Arabic Web TV" value="com.nokia.forum.bbcatv1.widget"/>
+        <option name="BH TV" value="com.bollywoodhungama.widget.BollywoodHungamaTV"/>
+        <option name="Channel NewsAsia" value="Channel.newsasia"/>
+        <option name="CNN Video" value="com.cnn"/>
+        <option name="DigiturkWebTV" value="com.digiturkwebtv.widget"/>
+        <option name="EFE Videos" value="com.ericsson.efe.widget"/>
+        <option name="E!" value="com.moderati.eonline"/>
+        <option name="Bollywood" value="br.org.indt.widget.eros"/>
+        <option name="Ovi Files" value="com.nokia.ss.sas.filesql"/>
+        <option name="Hi5" value="com.hi5.widget.Launcher"/>
+        <option name="凤凰电视" value="com.ifeng.www.webtv.widget"/>
+        <option name="Chat" value="com.nokia.ChatClient"/>
+        <option name="芒果 TV" value="com.imgo.tv"/>
+        <option name="India Today" value="br.org.indt.widget.indiatoday"/>
+        <option name="BBC iPlayer" value="com.bbc.widget.iplayer"/>
+        <option name="Contacts' latest activities" value="com.nokia.somawebui.xwidget"/>
+        <option name="M1TV" value="com.m1tv.basic.widget"/>
+        <option name="Makansutr" value="com.nerdattack.wrt.Makansutra"/>
+        <option name="bose" value="com.bose.basic.widget"/>
+        <option name="SingTel MTVS" value="com.nokia.widget.sapi.mtvs"/>
+        <option name="Nat Geo" value="com.natgeo"/>
+        <option name="NRK Mobil-TV" value="no.nrk.mobil.mobiltv.widget"/>
+        <option name="ontv" value="ontv.cc.on.tv.widget"/>
+        <option name="ovi" value="com.nokia.ovi"/>
+        <option name="Movie Teasers" value="com.movieteasers"/>
+        <option name="Schweizer Fernsehen" value="com.sftvreader.basic.widget"/>
+        <option name="Sky News On Demand" value="com.nerdattack.widget.SKYNEWS"/>
+        <option name="Social" value="com.nokia.socialmixer.v1"/>
+        <option name="��娱�" value="com.sohu.widget.webtv4ovi"/>
+        <option name="SSOUI" value="ovi.serviceui.SSOUI"/>
+        <option name="Terra TV" value="com.terra.widget.wrt.tv"/>
+        <option name="Terra TV Lat" value="com.terra.widget.wrt.tv.latam"/>
+        <option name="topApps" value="com.topApps.basic.widget"/>
+        <option name="Tudou" value="com.Tudou.widget"/>
+        <option name="tv2news" value="com.nokia.forum.widget.tv2news"/>
+        <option name="TV2Play" value="no.tv2.tv2play.widget"/>
+        <option name="TV3 Catch Up" value="com.nerdattack.widget.TV3"/>
+        <option name="Ве�ти" value="com.vesti.basic.widget"/>
+        <option name="Viasat No" value="no.viasat.widget"/>
+        <option name="Viasat Swe" value="se.viasat.widget"/>
+        <option name="Virtual Malaysia" value="com.nerdattack.widget.VirtualMalaysia"/>
+        <option name="央广新浪" value="cn.com.sina.3g"/>
+        <option name="Web TV Demo" value="com.nokia.forum.webtv.widget"/>
+        <option name="Yle Areena" value="com.tieto.yle"/>
+        <option name="优酷" value="com.youku.s605th.webtv"/>
+      </setting>
+      <setting ref="TemplateIdentifier" name="Template Identifier" type="selection">
+        <desc>Templeate identifier for the (C)WRT widgets. None for the native widgets</desc>
+        <option name="None" value="0"/>
+        <option name="wideimage_qhd" value="0x2001f489"/>
+        <option name="wideimage_vga" value="0x10009dff"/>
+      </setting>
+      <setting ref="LockingStatus" name="locking Status" type="selection">
+        <desc>Locking status</desc>
+        <option name="None" value="none"/>
+        <option name="Locked" value="locked"/>
+      </setting>
+    </setting>
+  </feature>
+  <data>
+  <!--  <BlankoHomescreenPlugins>
+      <Plugins extensionPolicy="replace"><Uid>0x2001f47f</Uid><BundleIdentifier></BundleIdentifier><TemplateIdentifier>0</TemplateIdentifier><LockingStatus>none</LockingStatus></Plugins>
+      <Plugins><Uid>0x2001f47f</Uid><BundleIdentifier></BundleIdentifier><TemplateIdentifier>0</TemplateIdentifier><LockingStatus>none</LockingStatus></Plugins>
+      <Plugins><Uid>0x2001f47f</Uid><BundleIdentifier></BundleIdentifier><TemplateIdentifier>0</TemplateIdentifier><LockingStatus>none</LockingStatus></Plugins>
+      <Plugins><Uid>0x2001f47f</Uid><BundleIdentifier></BundleIdentifier><TemplateIdentifier>0</TemplateIdentifier><LockingStatus>none</LockingStatus></Plugins>
+      <Plugins><Uid>0x2001f47f</Uid><BundleIdentifier></BundleIdentifier><TemplateIdentifier>0</TemplateIdentifier><LockingStatus>none</LockingStatus></Plugins>
+      <Plugins><Uid>0x2001f47f</Uid><BundleIdentifier></BundleIdentifier><TemplateIdentifier>0</TemplateIdentifier><LockingStatus>none</LockingStatus></Plugins>
+    </BlankoHomescreenPlugins> -->
+  </data>
+</configuration>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/view_200286ed/conf/view200286ed.gcfml	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://www.symbianfoundation.org/xml/implml/1">
+	<tag name="target" value="uda"/>
+	<tag name="target" value="emmc"/>
+	<phase name='post'/> <!-- post phase for making sure that all required data is available -->
+	
+<file xmlns="http://www.s60.com/xml/genconfml/1" name="viewconfiguration.xml" target="\private\200159c0\install\view_200286ed\hsps\00\">
+		<setting ref="BlankoHomescreenPlugins/Plugins"/>
+	<xsl:stylesheet version="1.0" 
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+                xmlns:xi="http://www.w3.org/2001/xinclude">
+		<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+		<xsl:template match="configuration/data">
+			<configuration>
+			 	<control>
+				  <plugins>
+						<xsl:for-each select="BlankoHomescreenPlugins/Plugins">
+							<plugin>
+								<xsl:attribute name="uid"><xsl:value-of select="Uid"/></xsl:attribute>
+								<xsl:attribute name="bundle_id"><xsl:value-of select="BundleIdentifier"/></xsl:attribute>
+								<xsl:attribute name="template_id"><xsl:value-of select="TemplateIdentifier"/></xsl:attribute>
+								<xsl:attribute name="locking_status"><xsl:value-of select="LockingStatus"/></xsl:attribute>
+							</plugin>
+						</xsl:for-each>
+					</plugins>
+				</control>
+			</configuration>
+		</xsl:template>
+	</xsl:stylesheet>
+</file>
+</container>
\ No newline at end of file

Binary file idlehomescreen/data/common/view_200286ed/conf/view200286edmanifest.confml has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/view_200286ed/conf/view200286edmanifest.gcfml	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://www.symbianfoundation.org/xml/implml/1">
+	<tag name="target" value="uda"/>
+	<tag name="target" value="emmc"/>
+<file xmlns="http://www.s60.com/xml/genconfml/1" name="manifest.dat" target="\private\200159c0\install\view_200286ed\hsps\00\">
+	<setting ref="BlankoHomescreenManifest/PackageVersion"/>
+	<setting ref="BlankoHomescreenManifest/DeviceFamily"/>
+	<setting ref="BlankoHomescreenManifest/ConfigurationType"/>
+	<setting ref="BlankoHomescreenManifest/InterfaceUid"/>
+	<setting ref="BlankoHomescreenManifest/ProviderUid"/>
+	<setting ref="BlankoHomescreenManifest/ConfigurationUid"/>
+	<setting ref="BlankoHomescreenManifest/FullName"/>
+	<setting ref="BlankoHomescreenManifest/ShortName"/>
+	<setting ref="BlankoHomescreenManifest/ConfigurationVersion"/>
+	<setting ref="BlankoHomescreenManifest/ConfigurationFile"/>
+	<setting ref="BlankoHomescreenManifest/UiResourceFile"/>
+		<xsl:stylesheet version="1.0" 
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+                xmlns:xi="http://www.w3.org/2001/xinclude">
+		<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+		<xsl:template match="configuration/data">
+		<package>
+	  <xsl:attribute name="version"><xsl:value-of select="BlankoHomescreenManifest/PackageVersion"/></xsl:attribute>
+    <family>
+    <xsl:value-of select="BlankoHomescreenManifest/DeviceFamily"/>
+    </family>
+    <type>
+    <xsl:value-of select="BlankoHomescreenManifest/ConfigurationType"/>
+    </type>
+    <interfaceuid>
+    <xsl:value-of select="BlankoHomescreenManifest/InterfaceUid"/>
+    </interfaceuid>
+    <provideruid>
+    <xsl:value-of select="BlankoHomescreenManifest/ProviderUid"/>
+    </provideruid>
+    <configurationuid>
+    <xsl:value-of select="BlankoHomescreenManifest/ConfigurationUid"/>
+    </configurationuid>
+    <fullname>
+    <xsl:text>&#x26;</xsl:text>
+    <xsl:value-of select="BlankoHomescreenManifest/FullName"/>
+    <xsl:text>&#x3B;</xsl:text>
+    </fullname>
+    <shortname>
+    <xsl:value-of select="BlankoHomescreenManifest/ShortName"/>
+    </shortname>
+    <version>
+    <xsl:value-of select="BlankoHomescreenManifest/ConfigurationVersion"/>
+    </version>
+    <filexml>
+    <xsl:value-of select="BlankoHomescreenManifest/ConfigurationFile"/>
+    </filexml>
+    <localization>
+        <fileresource>
+        <xsl:value-of select="BlankoHomescreenManifest/UiResourceFile"/>
+        </fileresource>
+    </localization>
+  </package>
+  </xsl:template>
+	</xsl:stylesheet>
+</file>
+</container>
\ No newline at end of file

Binary file idlehomescreen/data/common/view_200286ed/conf/view200286edxuikon.confml has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/view_200286ed/conf/view200286edxuikon.gcfml	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://www.symbianfoundation.org/xml/implml/1">
+	<tag name="target" value="uda"/>
+	<tag name="target" value="emmc"/>
+<file xmlns="http://www.s60.com/xml/genconfml/1" name="empty.foo" target="\private\200159c0\install\view_200286ed\xuikon\">
+	<setting ref="BlankoHomescreenXuikonFolder/FolderCFG"/>
+		<xsl:stylesheet version="1.0" 
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+                xmlns:xi="http://www.w3.org/2001/xinclude">
+		<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+		<xsl:template match="configuration/data">
+		<whois>
+	  <xsl:attribute name="dude"><xsl:value-of select="BlankoHomescreenXuikonFolder/FolderCFG"/></xsl:attribute>
+	  </whois>
+  </xsl:template>
+	</xsl:stylesheet>
+</file>
+</container>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/idlehomescreen/data/common/view_200286ed/group/bld.inf	Tue Sep 14 20:58:58 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* 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
+
+//Confml and cfgml files for the customization
+// starting use confml it is need to remove root_configuration.xml direct exporting (view_200286e5_variant.iby)
+//***********************************
+../conf/view200286ed.confml   APP_LAYER_CONFML(view200286ed.confml)
+../conf/view200286ed.gcfml    APP_LAYER_GCFML(view200286ed.gcfml)
+../conf/view200286edmanifest.confml   APP_LAYER_CONFML(view200286edmanifest.confml)
+../conf/view200286edmanifest.gcfml    APP_LAYER_GCFML(view200286edmanifest.gcfml)
+../conf/view200286edxuikon.confml   APP_LAYER_CONFML(view200286edxuikon.confml)
+../conf/view200286edxuikon.gcfml    APP_LAYER_GCFML(view200286edxuikon.gcfml)
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+//  End of File  

--- a/idlehomescreen/data/group/bld.inf	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/group/bld.inf	Tue Sep 14 20:58:58 2010 +0300
@@ -16,7 +16,8 @@
 */
 
 
-#include "../vga_tch/group/bld.inf"         // Buzzidle
+#include "../common/group/bld.inf"       
+// #include "../vga_tch/group/bld.inf"         // Buzzidle
 #include "../qhd_tch/group/bld.inf"     // Flashidle
 
 PRJ_PLATFORMS

--- a/idlehomescreen/data/qhd_tch/desktop_20026f4f/hsps/00/widgetconfiguration.xml	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/desktop_20026f4f/hsps/00/widgetconfiguration.xml	Tue Sep 14 20:58:58 2010 +0300
@@ -4,28 +4,28 @@
       <!-- Shortcut #1, Phonebook -->
       <item id="first" name="Shortcut1" >
         <property  name="type" value="application"/>
-        <property  name="uid" value="0x101F4CCE"/>
+        <property  name="uid" value="0x99999990"/>
         <property  name="view" value=""/>
         <property  name="param" value=""/>
       </item>
       <!-- Shortcut #2, New Message -->
       <item id="second" name="Shortcut2" >
-        <property  name="type" value="shortcut"/>
-        <property  name="uid" value="0x99999999"/>
+        <property  name="type" value="application"/>
+        <property  name="uid" value="0x99999990"/>
         <property  name="view" value=""/>
-        <property  name="param" value="messaging:msg"/>
+        <property  name="param" value=""/>
       </item>
       <!-- Shortcut #3, Browser -->
       <item id="third" name="Shortcut3" >
         <property  name="type" value="application"/>
-        <property  name="uid" value="0x10008D39"/>
+        <property  name="uid" value="0x99999990"/>
         <property  name="view" value=""/>
         <property  name="param" value=""/>
       </item>
       <!-- Shortcut #4, Calendar -->
       <item id="fourth" name="Shortcut4" >
         <property  name="type" value="application"/>
-        <property  name="uid" value="0x10005901"/>
+        <property  name="uid" value="0x99999990"/>
         <property  name="view" value=""/>
         <property  name="param" value=""/>
       </item>

--- a/idlehomescreen/data/qhd_tch/empty_2001f47f/group/bld.inf	Wed Sep 01 12:32:46 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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/empty_2001f47f/hsps/manifest.dat
-../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/empty_2001f47f/hsps/widgetconfiguration.xml
-../xuikon/00/empty.dat /epoc32/data/Z/resource/homescreen/empty_2001f47f/xuikon/empty_2001f47f.dat
-../xuikon/00/empty.css /epoc32/data/Z/resource/homescreen/empty_2001f47f/xuikon/empty.css
-../xuikon/00/empty.xml /epoc32/data/Z/resource/homescreen/empty_2001f47f/xuikon/empty.xml
-
-// Support for S60 builds
-//***********************
-../rom/empty_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(empty_2001f47f_variant.iby)
-../rom/empty.iby CORE_APP_LAYER_IBY_EXPORT_PATH(empty_2001f47f.iby)
-
-// Dtd-localization
-//*****************
-PRJ_EXTENSIONS
-START EXTENSION tools/dtd
-OPTION SWITCH_LOC_FILE_NAME empty_2001f47f
-OPTION DTD_TYPE widget
-OPTION LOC_FOLDERS yes
-END
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-//  End of File  
-
-
-
-

--- a/idlehomescreen/data/qhd_tch/empty_2001f47f/hsps/00/manifest.dat	Wed Sep 01 12:32:46 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-
-<package version="2.0">
-
-
-
-  <family>qhd_tch</family>
-
-
-
-  <type>widget</type>
-
-
-
-  <!-- interface uid -->
-
-	<interfaceuid>0x2001f48a</interfaceuid>
-
-
-
-	<!-- vendor uid  -->
-
-	<provideruid>0x101fb657</provideruid>
-
-
-
-	<!-- uid -->
-
-	<configurationuid>0x2001f47f</configurationuid>
-
-
-
-	<!-- description -->
-
-	<fullname>&amp;qtn_empty_2001f47f_name;</fullname>
-
-	<shortname>empty</shortname>
-
-	<version>1.0</version>
-
-
-
-	<!-- configuration -->
-
-	<filexml>widgetconfiguration.xml</filexml>
-
-		
-	<!-- Locale independent/common resources -->
-
-  <fileresource>empty.o0000</fileresource>
-
-
-
-  <!-- Locale specific resources -->
-
-	<localization/>
-
-
-
-</package>

--- a/idlehomescreen/data/qhd_tch/empty_2001f47f/hsps/00/widgetconfiguration.xml	Wed Sep 01 12:32:46 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<configuration>
-    <control>
-        <settings/>
-    </control>
-</configuration>

--- a/idlehomescreen/data/qhd_tch/empty_2001f47f/rom/empty.iby	Wed Sep 01 12:32:46 2010 +0100
+++ /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: 
-* Empty widget HSPS-plugin IBY file 
-*
-*/
-
-#ifndef __EMPTY_2001F47F_IBY__
-#define __EMPTY_2001F47F_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by DTD-localization tools
-data=ZPRIVATE\200159c0\install\empty_2001f47f\xuikon\00\empty.o0000 \private\200159c0\install\empty_2001f47f\xuikon\00\empty.o0000
-data=ZPRIVATE\200159c0\install\empty_2001f47f\hsps\00\manifest.dat \private\200159c0\install\empty_2001f47f\hsps\00\manifest.dat
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif // __EMPTY_2001F47F_IBY__

--- a/idlehomescreen/data/qhd_tch/empty_2001f47f/rom/empty_variant.iby	Wed Sep 01 12:32:46 2010 +0100
+++ /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:  
-* Empty widget HSPS-plugin variant specific IBY file.
-*
-*/
-
-#ifndef __EMPTY_2001F47F_VARIANT_IBY__
-#define __EMPTY_2001F47F_VARIANT_IBY__
-
-#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH)          
-
-// Enabled by variation tools, variant specific
-data=ZPRIVATE\200159c0\install\empty_2001f47f\hsps\00\widgetconfiguration.xml \private\200159c0\install\empty_2001f47f\hsps\00\widgetconfiguration.xml
-
-#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH
-
-#endif  // __EMPTY_2001F47F_VARIANT_IBY__

--- a/idlehomescreen/data/qhd_tch/empty_2001f47f/xuikon/00/empty.css	Wed Sep 01 12:32:46 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-widget
-{
-    display: none;
-    visibility: hidden;
-}
-

--- a/idlehomescreen/data/qhd_tch/empty_2001f47f/xuikon/00/empty.dat	Wed Sep 01 12:32:46 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<data>
-    <AppUid>E029CF57</AppUid>
-    <Provideruid>101FB657</Provideruid>
-    <ThemeUid>11001001</ThemeUid>
-    <ThemeFullName>empty</ThemeFullName>
-    <ThemeShortName>empty</ThemeShortName>
-    <ThemeVersion>1.0</ThemeVersion>
-    <FileXML>empty.xml</FileXML>
-    <FileCSS>empty.css</FileCSS>
-</data>
\ No newline at end of file

--- a/idlehomescreen/data/qhd_tch/empty_2001f47f/xuikon/00/empty.xml	Wed Sep 01 12:32:46 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmluiml xmlns="http://www.series60.com/xml/xmluiml/1" version="1.0">
-    <widget id="empty"/>    
-</xmluiml>

--- a/idlehomescreen/data/qhd_tch/group/bld.inf	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/group/bld.inf	Tue Sep 14 20:58:58 2010 +0300
@@ -16,7 +16,6 @@
 */
 
 #include "../desktop_20026f4f/group/bld.inf"
-#include "../empty_2001f47f/group/bld.inf"
 #include "../onerow_2001f480/group/bld.inf"
 #include "../tworows_2001f488/group/bld.inf"
 #include "../threerows_2001f486/group/bld.inf"
@@ -28,7 +27,6 @@
 #include "../view_20022fe0/group/bld.inf"
 #include "../view_200286e4/group/bld.inf"
 #include "../view_200286e5/group/bld.inf"
-#include "../view_200286ed/group/bld.inf"
 #include "../templateview_20026f50/group/bld.inf"
 #include "../root_2001f482/group/bld.inf"
 

--- a/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/00/onerow.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/00/onerow.css	Tue Sep 14 20:58:58 2010 +0300
@@ -1,30 +1,40 @@
 widget#onerow_template
 {
     block-progression:rl;
+    
 }
 
 image#image_container
 {
-    padding-top:8px;
-    padding-bottom:8px;
-    padding-left:8px;
-    padding-right:8px;
-    height: 90%;
-    width: 20%;
+    height: 70px;
+    width: 70px;
+    margin-top:3px;
+    margin-bottom:3px;
+    margin-left:3px;
+    margin-right:2px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     nav-index:appearance;
     _s60-aspect-ratio:preserve;
 }
 
 text
 {
-    padding-left:8px;
-    padding-right:8px;
-    font-line-space: 15;
-    text-align:left;
+    font-size:3.5u;
+    margin-left:2px;
+    margin-right:3px;
+    margin-top:3px;
+    margin-bottom:3px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
+    text-align:center;
     text-overflow-mode: wrap;
     max-line-amount: 2;
     font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
     color: "SKIN(268458534 13056 74)";
     nav-index:appearance;
 }

--- a/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/37/onerow.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/37/onerow.css	Tue Sep 14 20:58:58 2010 +0300
@@ -6,27 +6,36 @@
 
 image#image_container
 {
-    padding-top:8px;
-    padding-bottom:8px;
-    padding-left:8px;
-    padding-right:8px;
-    height: 90%;
-    width: 20%;
+    height: 70px;
+    width: 70px;
+    margin-top:3px;
+    margin-bottom:3px;
+    margin-left:3px;
+    margin-right:2px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     nav-index:appearance;
     _s60-aspect-ratio:preserve;
 }
 
 text
 {
-    padding-left:8px;
-    padding-right:8px;
-    font-line-space: 15;
+    font-size:3.5u;
+    margin-left:2px;
+    margin-right:3px;
+    margin-top:3px;
+    margin-bottom:3px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     direction: ltr;
-    text-align: right;
+    text-align:center;
     text-overflow-mode: wrap;
     max-line-amount: 2;
     font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
     color: "SKIN(268458534 13056 74)";
     nav-index:appearance;
 }

--- a/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/50/onerow.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/50/onerow.css	Tue Sep 14 20:58:58 2010 +0300
@@ -6,27 +6,36 @@
 
 image#image_container
 {
-    padding-top:8px;
-    padding-bottom:8px;
-    padding-left:8px;
-    padding-right:8px;
-    height: 90%;
-    width: 20%;
+    height: 70px;
+    width: 70px;
+    margin-top:3px;
+    margin-bottom:3px;
+    margin-left:3px;
+    margin-right:2px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     nav-index:appearance;
     _s60-aspect-ratio:preserve;
 }
 
 text
 {
-    padding-left:8px;
-    padding-right:8px;
-    font-line-space: 15;
+    font-size:3.5u;
+    margin-left:2px;
+    margin-right:3px;
+    margin-top:3px;
+    margin-bottom:3px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     direction: ltr;
-    text-align: right;
+    text-align:center;
     text-overflow-mode: wrap;
     max-line-amount: 2;
     font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
     color: "SKIN(268458534 13056 74)";
     nav-index:appearance;
 }

--- a/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/57/onerow.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/57/onerow.css	Tue Sep 14 20:58:58 2010 +0300
@@ -6,27 +6,36 @@
 
 image#image_container
 {
-    padding-top:8px;
-    padding-bottom:8px;
-    padding-left:8px;
-    padding-right:8px;
-    height: 90%;
-    width: 20%;
+    height: 70px;
+    width: 70px;
+    margin-top:3px;
+    margin-bottom:3px;
+    margin-left:3px;
+    margin-right:2px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     nav-index:appearance;
     _s60-aspect-ratio:preserve;
 }
 
 text
 {
-    padding-left:8px;
-    padding-right:8px;
-    font-line-space: 15;
+    font-size:3.5u;
+    margin-left:2px;
+    margin-right:3px;
+    margin-top:3px;
+    margin-bottom:3px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     direction: ltr;
-    text-align: right;
+    text-align:center;
     text-overflow-mode: wrap;
     max-line-amount: 2;
     font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
     color: "SKIN(268458534 13056 74)";
     nav-index:appearance;
 }

--- a/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/94/onerow.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/onerow_2001f480/xuikon/94/onerow.css	Tue Sep 14 20:58:58 2010 +0300
@@ -6,27 +6,36 @@
 
 image#image_container
 {
-    padding-top:8px;
-    padding-bottom:8px;
-    padding-left:8px;
-    padding-right:8px;
-    height: 90%;
-    width: 20%;
+    height: 70px;
+    width: 70px;
+    margin-top:3px;
+    margin-bottom:3px;
+    margin-left:3px;
+    margin-right:2px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     nav-index:appearance;
     _s60-aspect-ratio:preserve;
 }
 
 text
 {
-    padding-left:8px;
-    padding-right:8px;
-    font-line-space: 15;
+    font-size:3.5u;
+    margin-left:2px;
+    margin-right:3px;
+    margin-top:3px;
+    margin-bottom:3px;
+    padding-top:3px;
+    padding-bottom:3px;
+    padding-left:3px;
+    padding-right:3px;
     direction: ltr;
-    text-align: right;
+    text-align:center;
     text-overflow-mode: wrap;
     max-line-amount: 2;
     font-family: EAknLogicalFontSecondaryFont;
-    font-size: 23px;
     color: "SKIN(268458534 13056 74)";
     nav-index:appearance;
 }

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/00/profile.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/00/profile.css	Tue Sep 14 20:58:58 2010 +0300
@@ -9,20 +9,30 @@
     block-progression: lr;
 }
 
-clock
+clock#clock
 {
     width: 152px;
     margin-right: 3px;
     padding-top: 2px;
     padding-bottom: 2px;
     _s60-format: locale;
-    _s60-ampm-font-size: 16px;
-    _s60-digital-font-size: 56px;
+    _s60-font-size: 56px;
     color: "SKIN(268458534 13056 74)";
     background-color: "SKIN(268458534 9916)";
     nav-index: appearance;
 }
 
+ampm
+{
+	position: absolute;
+	width: 46px;
+	height: 20px;
+	left: 88px;
+	top: 60px;
+	text-align: right;
+	_s60-font-size: 16px;
+}
+
 box.clock_profile
 {
     background-color: "SKIN(268458534 9916)";
@@ -36,34 +46,22 @@
     block-progression: tb;
 }
 
-box#date_container
+clock#date_content
 {
     width: auto;
     height: 26px;
-    block-progression: lr;
-    margin-bottom: 3px;
-    padding-bottom: 2px;
-}
-
-box#date_content
-{
-    width: adaptive;
-    height: adaptive;
     margin-left: auto;
     margin-right: auto;
+    margin-bottom: 3px;
+    padding-bottom: 2px;
+    color:"SKIN(268458534 13056 74)";
+    background-color: "SKIN(268458534 9916)";
+    nav-index: appearance;
 }
 
-text#date_text
+date
 {
-    text-align: center;
-    margin-left: 2px;
-    margin-right: 2px;
-    width: adaptive;
-    height: adaptive;
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 3.5u;
-    _s60-text-valign: top;
-    color:"SKIN(268458534 13056 74)";
+	  _s60-font-size: 3.5u;
 }
 
 box#profile_softindicator

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/00/profile.xml	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/00/profile.xml	Tue Sep 14 20:58:58 2010 +0300
@@ -9,6 +9,14 @@
                 
         <box id="clock_profile_container">
             <clock id="clock" focusable="true" _s60-initial-focus="1">
+            	<digital>
+            		<face24/>
+            		<face12/>
+            		<ampm/>
+            	</digital>
+            	<analog>
+            		<face/>
+            	</analog>
               <actions>
                   <action>
                       <trigger name="activate"/>
@@ -17,20 +25,16 @@
               </actions>
             </clock>
           <box id="date_profiles_container" focusable="false">
-              <box id="date_container" class="clock_profile" focusable="true">
-                  <box id="date_content" focusable="false">
-                      <text id="date_text" focusable="false">
-                          <property class="DeviceStatus/Date"/>
-                      </text>                 
-                  </box>
-                  <actions>
+                  <clock id="date_content" focusable="true">
+                    <date/>
+                    <actions>
                       <action>
                           <trigger name="activate"/>
                           <!-- open organizer -->
                           <event name="EventHandler/LaunchApp" uid="0x10005901"/><!--organizer application-->
                       </action>
-                  </actions>
-              </box>
+                  	</actions>
+                  </clock>
                 <box id="profile_softindicator" class="clock_profile" focusable="true">                                     
                     <!-- UI resources -->
                     <desc id="Profile/ActiveProfileGeneralIconResource" path="SKIN(270501603 8586 74)"/>

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/37/profile.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/37/profile.css	Tue Sep 14 20:58:58 2010 +0300
@@ -9,20 +9,30 @@
     block-progression: lr;
 }
 
-clock
+clock#clock
 {
     width: 152px;
     margin-left: 3px;
     padding-top: 2px;
     padding-bottom: 2px;
     _s60-format: locale;
-    _s60-ampm-font-size: 16px;
-    _s60-digital-font-size: 56px;
+    _s60-font-size: 56px;
     color: "SKIN(268458534 13056 74)";
     background-color: "SKIN(268458534 9916)";
     nav-index: appearance;
 }
 
+ampm
+{
+	position: absolute;
+	width: 46px;
+	height: 20px;
+	left: 88px;
+	top: 60px;
+	text-align: right;
+	_s60-font-size: 16px;
+}
+
 box.clock_profile
 {
     background-color: "SKIN(268458534 9916)";
@@ -36,34 +46,22 @@
     block-progression: tb;
 }
 
-box#date_container
+clock#date_content
 {
     width: auto;
     height: 26px;
-    block-progression: rl;
-    margin-bottom: 3px;
-    padding-bottom: 2px;
-}
-
-box#date_content
-{
-    width: adaptive;
-    height: adaptive;
     margin-left: auto;
     margin-right: auto;
+    margin-bottom: 3px;
+    padding-bottom: 2px;
+    color:"SKIN(268458534 13056 74)";
+    background-color: "SKIN(268458534 9916)";
+    nav-index: appearance;
 }
 
-text#date_text
+date
 {
-    text-align: center;
-    margin-left: 2px;
-    margin-right: 2px;
-    width: adaptive;
-    height: adaptive;
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 3.5u;
-    _s60-text-valign: top;
-    color:"SKIN(268458534 13056 74)";
+	  _s60-font-size: 3.5u;
 }
 
 box#profile_softindicator

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/50/profile.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/50/profile.css	Tue Sep 14 20:58:58 2010 +0300
@@ -9,20 +9,30 @@
     block-progression: lr;
 }
 
-clock
+clock#clock
 {
     width: 152px;
     margin-left: 3px;
     padding-top: 2px;
     padding-bottom: 2px;
     _s60-format: locale;
-    _s60-ampm-font-size: 16px;
-    _s60-digital-font-size: 56px;
+    _s60-font-size: 56px;
     color: "SKIN(268458534 13056 74)";
     background-color: "SKIN(268458534 9916)";
     nav-index: appearance;
 }
 
+ampm
+{
+	position: absolute;
+	width: 46px;
+	height: 20px;
+	left: 88px;
+	top: 60px;
+	text-align: right;
+	_s60-font-size: 16px;
+}
+
 box.clock_profile
 {
     background-color: "SKIN(268458534 9916)";
@@ -36,34 +46,22 @@
     block-progression: tb;
 }
 
-box#date_container
+clock#date_content
 {
     width: auto;
     height: 26px;
-    block-progression: rl;
-    margin-bottom: 3px;
-    padding-bottom: 2px;
-}
-
-box#date_content
-{
-    width: adaptive;
-    height: adaptive;
     margin-left: auto;
     margin-right: auto;
+    margin-bottom: 3px;
+    padding-bottom: 2px;
+    color:"SKIN(268458534 13056 74)";
+    background-color: "SKIN(268458534 9916)";
+    nav-index: appearance;
 }
 
-text#date_text
+date
 {
-    text-align: center;
-    margin-left: 2px;
-    margin-right: 2px;
-    width: adaptive;
-    height: adaptive;
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 3.5u;
-    _s60-text-valign: top;
-    color:"SKIN(268458534 13056 74)";
+	  _s60-font-size: 3.5u;
 }
 
 box#profile_softindicator

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/57/profile.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/57/profile.css	Tue Sep 14 20:58:58 2010 +0300
@@ -9,20 +9,30 @@
     block-progression: lr;
 }
 
-clock
+clock#clock
 {
     width: 152px;
     margin-left: 3px;
     padding-top: 2px;
     padding-bottom: 2px;
     _s60-format: locale;
-    _s60-ampm-font-size: 16px;
-    _s60-digital-font-size: 56px;
+    _s60-font-size: 56px;
     color: "SKIN(268458534 13056 74)";
     background-color: "SKIN(268458534 9916)";
     nav-index: appearance;
 }
 
+ampm
+{
+	position: absolute;
+	width: 46px;
+	height: 20px;
+	left: 88px;
+	top: 60px;
+	text-align: right;
+	_s60-font-size: 16px;
+}
+
 box.clock_profile
 {
     background-color: "SKIN(268458534 9916)";
@@ -36,34 +46,22 @@
     block-progression: tb;
 }
 
-box#date_container
+clock#date_content
 {
     width: auto;
     height: 26px;
-    block-progression: rl;
-    margin-bottom: 3px;
-    padding-bottom: 2px;
-}
-
-box#date_content
-{
-    width: adaptive;
-    height: adaptive;
     margin-left: auto;
     margin-right: auto;
+    margin-bottom: 3px;
+    padding-bottom: 2px;
+    color:"SKIN(268458534 13056 74)";
+    background-color: "SKIN(268458534 9916)";
+    nav-index: appearance;
 }
 
-text#date_text
+date
 {
-    text-align: center;
-    margin-left: 2px;
-    margin-right: 2px;
-    width: adaptive;
-    height: adaptive;
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 3.5u;
-    _s60-text-valign: top;
-    color:"SKIN(268458534 13056 74)";
+	  _s60-font-size: 3.5u;
 }
 
 box#profile_softindicator

--- a/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/94/profile.css	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/profile_2001cb7c/xuikon/94/profile.css	Tue Sep 14 20:58:58 2010 +0300
@@ -9,20 +9,30 @@
     block-progression: lr;
 }
 
-clock
+clock#clock
 {
     width: 152px;
     margin-left: 3px;
     padding-top: 2px;
     padding-bottom: 2px;
     _s60-format: locale;
-    _s60-ampm-font-size: 16px;
-    _s60-digital-font-size: 56px;
+    _s60-font-size: 56px;
     color: "SKIN(268458534 13056 74)";
     background-color: "SKIN(268458534 9916)";
     nav-index: appearance;
 }
 
+ampm
+{
+	position: absolute;
+	width: 46px;
+	height: 20px;
+	left: 88px;
+	top: 60px;
+	text-align: right;
+	_s60-font-size: 16px;
+}
+
 box.clock_profile
 {
     background-color: "SKIN(268458534 9916)";
@@ -36,34 +46,22 @@
     block-progression: tb;
 }
 
-box#date_container
+clock#date_content
 {
     width: auto;
     height: 26px;
-    block-progression: rl;
-    margin-bottom: 3px;
-    padding-bottom: 2px;
-}
-
-box#date_content
-{
-    width: adaptive;
-    height: adaptive;
     margin-left: auto;
     margin-right: auto;
+    margin-bottom: 3px;
+    padding-bottom: 2px;
+    color:"SKIN(268458534 13056 74)";
+    background-color: "SKIN(268458534 9916)";
+    nav-index: appearance;
 }
 
-text#date_text
+date
 {
-    text-align: center;
-    margin-left: 2px;
-    margin-right: 2px;
-    width: adaptive;
-    height: adaptive;
-    font-family: EAknLogicalFontSecondaryFont;
-    font-size: 3.5u;
-    _s60-text-valign: top;
-    color:"SKIN(268458534 13056 74)";
+	  _s60-font-size: 3.5u;
 }
 
 box#profile_softindicator

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/loc/templateview.loc	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/loc/templateview.loc	Tue Sep 14 20:58:58 2010 +0300
@@ -308,3 +308,15 @@
 // w:
 // r: TB9.2
 #define qtn_hs_text_softkey_call "Call"
+
+// d: Lock keypad
+// l: list_single_pane_t1_cp2
+// w:
+// r: TB9.2
+#define qtn_hs_lock_keypad "Lock keypad"
+
+// d: Menu
+// l: nhd_control_pane_t2/opt7
+// w:
+// r: TB9.2
+#define qtn_hs_apps_menu_skey "Menu"

--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/view.dtd	Wed Sep 01 12:32:46 2010 +0100
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/view.dtd	Tue Sep 14 20:58:58 2010 +0300
@@ -494,3 +494,21 @@
 qtn_hs_text_softkey_call.parents ""
 -->
 <!ENTITY qtn_hs_text_softkey_call "Call">
+
+<!--
+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 "Lock keypad"
+qtn_hs_page_edit_options_delete.parents ""
+-->
+<!ENTITY qtn_hs_lock_keypad "Lock keypad">
+
+<!--
+qtn_hs_text_softkey_call.attributes
+qtn_hs_text_softkey_call.layout "nhd_control_pane_t2/opt7"
+qtn_hs_text_softkey_call.release "TB9.2"
+qtn_hs_text_softkey_call.description "RSK caption"
+qtn_hs_text_softkey_call.parents ""
+-->
+<!ENTITY qtn_hs_apps_menu_skey "Menu">