# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282200215 -10800
# Node ID f00a6757af32134861f69160e1fedf2e860bcfa1
# Parent  89165693e770bf1869564121de68f561e8823ca3
Revision: 201026
Kit: 201033

diff -r 89165693e770 -r f00a6757af32 idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/templateview.xml
--- a/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/templateview.xml	Thu Jul 15 18:25:29 2010 +0300
+++ b/idlehomescreen/data/qhd_tch/templateview_20026f50/xuikon/00/templateview.xml	Thu Aug 19 09:43:35 2010 +0300
@@ -226,7 +226,7 @@
                     </actions>
                 </menuitem>
             </menu>
-            <softkey id="lsk" type="left" label="&text_softkey_options;">
+            <softkey id="lsk" type="left" label="&qtn_hs_text_softkey_options;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
@@ -236,7 +236,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="&qtn_hs_text_softkey_call;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -249,7 +249,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&text_softkey_back;">
+            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&qtn_hs_text_softkey_back;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -257,7 +257,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_done" type="right" mode="mode_edit" label="&text_softkey_done;">
+            <softkey id="rsk_done" type="right" mode="mode_edit" label="&qtn_hs_text_softkey_done;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
diff -r 89165693e770 -r f00a6757af32 idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.xml
--- a/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.xml	Thu Jul 15 18:25:29 2010 +0300
+++ b/idlehomescreen/data/qhd_tch/view_2001f48b/xuikon/00/View.xml	Thu Aug 19 09:43:35 2010 +0300
@@ -226,7 +226,7 @@
                     </actions>
                 </menuitem>
             </menu>
-            <softkey id="lsk" type="left" label="&text_softkey_options;">
+            <softkey id="lsk" type="left" label="&qtn_hs_text_softkey_options;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
@@ -236,7 +236,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="&qtn_hs_text_softkey_call;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -249,7 +249,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&text_softkey_back;">
+            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&qtn_hs_text_softkey_back;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -257,7 +257,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_done" type="right" mode="mode_edit" label="&text_softkey_done;">
+            <softkey id="rsk_done" type="right" mode="mode_edit" label="&qtn_hs_text_softkey_done;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
diff -r 89165693e770 -r f00a6757af32 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.xml
--- a/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.xml	Thu Jul 15 18:25:29 2010 +0300
+++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.xml	Thu Aug 19 09:43:35 2010 +0300
@@ -226,7 +226,7 @@
                     </actions>
                 </menuitem>
             </menu>
-            <softkey id="lsk" type="left" label="&text_softkey_options;">
+            <softkey id="lsk" type="left" label="&qtn_hs_text_softkey_options;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
@@ -236,7 +236,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="&qtn_hs_text_softkey_call;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -249,7 +249,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&text_softkey_back;">
+            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&qtn_hs_text_softkey_back;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -257,7 +257,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_done" type="right" mode="mode_edit" label="&text_softkey_done;">
+            <softkey id="rsk_done" type="right" mode="mode_edit" label="&qtn_hs_text_softkey_done;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
diff -r 89165693e770 -r f00a6757af32 idlehomescreen/data/qhd_tch/view_200286e4/xuikon/00/View.xml
--- a/idlehomescreen/data/qhd_tch/view_200286e4/xuikon/00/View.xml	Thu Jul 15 18:25:29 2010 +0300
+++ b/idlehomescreen/data/qhd_tch/view_200286e4/xuikon/00/View.xml	Thu Aug 19 09:43:35 2010 +0300
@@ -226,7 +226,7 @@
                     </actions>
                 </menuitem>
             </menu>
-            <softkey id="lsk" type="left" label="&text_softkey_options;">
+            <softkey id="lsk" type="left" label="&qtn_hs_text_softkey_options;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
@@ -236,7 +236,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="&qtn_hs_text_softkey_call;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -249,7 +249,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&text_softkey_back;">
+            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&qtn_hs_text_softkey_back;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -257,7 +257,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_done" type="right" mode="mode_edit" label="&text_softkey_done;">
+            <softkey id="rsk_done" type="right" mode="mode_edit" label="&qtn_hs_text_softkey_done;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
diff -r 89165693e770 -r f00a6757af32 idlehomescreen/data/qhd_tch/view_200286e5/xuikon/00/View.xml
--- a/idlehomescreen/data/qhd_tch/view_200286e5/xuikon/00/View.xml	Thu Jul 15 18:25:29 2010 +0300
+++ b/idlehomescreen/data/qhd_tch/view_200286e5/xuikon/00/View.xml	Thu Aug 19 09:43:35 2010 +0300
@@ -226,7 +226,7 @@
                     </actions>
                 </menuitem>
             </menu>
-            <softkey id="lsk" type="left" label="&text_softkey_options;">
+            <softkey id="lsk" type="left" label="&qtn_hs_text_softkey_options;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
@@ -236,7 +236,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="&qtn_hs_text_softkey_call;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -249,7 +249,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&text_softkey_back;">
+            <softkey id="rsk_incall" type="right" mode="mode_callactive" label="&qtn_hs_text_softkey_back;">
                 <actions>
                     <action>                        
                         <trigger name="activate"/>
@@ -257,7 +257,7 @@
                     </action>
                 </actions>
             </softkey>
-            <softkey id="rsk_done" type="right" mode="mode_edit" label="&text_softkey_done;">
+            <softkey id="rsk_done" type="right" mode="mode_edit" label="&qtn_hs_text_softkey_done;">
                 <actions>
                     <action>
                         <trigger name="activate"/>
diff -r 89165693e770 -r f00a6757af32 idlehomescreen/data/vga_tch/view1_2001fdb9/xuikon/00/view.xml
--- a/idlehomescreen/data/vga_tch/view1_2001fdb9/xuikon/00/view.xml	Thu Jul 15 18:25:29 2010 +0300
+++ b/idlehomescreen/data/vga_tch/view1_2001fdb9/xuikon/00/view.xml	Thu Aug 19 09:43:35 2010 +0300
@@ -680,7 +680,7 @@
         <property class="Settings/Shortcut" name="0x01000101" value="localapp:0x101F4CD2"/>
         <!-- UI resources for RSK shortcut -->
         <desc id="Shortcut/EmptyCaption">&shortcut_emptycaption;</desc>
-        <desc id="Shortcut/BackCaption">&text_softkey_back;</desc>
+        <desc id="Shortcut/BackCaption">&qtn_hs_text_softkey_back;</desc>
         
         <menubar id="hs_menubar">                  
             <!-- menu item grouping table is traversed through in run-time always when options menu is launched. -->                     
diff -r 89165693e770 -r f00a6757af32 idlehomescreen/nativeuicontroller/src/ai3nativeui.rss
--- a/idlehomescreen/nativeuicontroller/src/ai3nativeui.rss	Thu Jul 15 18:25:29 2010 +0300
+++ b/idlehomescreen/nativeuicontroller/src/ai3nativeui.rss	Thu Aug 19 09:43:35 2010 +0300
@@ -80,7 +80,7 @@
 
 RESOURCE TBUF r_nativeui_sk_back
     {
-    buf = text_softkey_back;
+    buf = qtn_hs_text_softkey_back;
     }
 
 RESOURCE TBUF r_nativeui_sk_newmsg
diff -r 89165693e770 -r f00a6757af32 idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp
--- a/idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp	Thu Jul 15 18:25:29 2010 +0300
+++ b/idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp	Thu Aug 19 09:43:35 2010 +0300
@@ -782,6 +782,7 @@
                 {
                 if ( !BaflUtils::FileExists( fs, path ) )
                     {
+                    RemoveWallpaperFromCache( path, viewData );
                     viewData->SetWallpaperImage( NULL );
                     if( viewData == &iViewManager.ActiveViewData() )
                         {
@@ -797,6 +798,7 @@
             {
             if ( !BaflUtils::FileExists( fs, *iBgImagePath ) )
                 {
+                RemoveWallpaperFromCache( *iBgImagePath );
                 delete iBgImage;
                 iBgImage = NULL;
                 drawingNeeded = ETrue;