# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1279207529 -10800 # Node ID 89165693e770bf1869564121de68f561e8823ca3 # Parent d721605b30d0d0bebf750649d31e52252b1e98b4 Revision: 201025 Kit: 2010127 diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/group/bld.inf --- a/idlehomescreen/data/qhd_tch/group/bld.inf Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/group/bld.inf Thu Jul 15 18:25:29 2010 +0300 @@ -25,6 +25,7 @@ #include "../posterwideimage_2001fdbc/group/bld.inf" #include "../profile_2001cb7c/group/bld.inf" #include "../view_2001f48b/group/bld.inf" +#include "../view_20022fe0/group/bld.inf" #include "../view_200286e4/group/bld.inf" #include "../view_200286e5/group/bld.inf" #include "../view_200286ed/group/bld.inf" diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/group/bld.inf --- a/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/group/bld.inf Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/group/bld.inf Thu Jul 15 18:25:29 2010 +0300 @@ -29,12 +29,19 @@ ../xuikon/00/posterwideimage.dat /epoc32/data/Z/resource/homescreen/posterwideimage_2001fdbc/xuikon/posterwideimage_2001fdbc.dat ../xuikon/00/posterwideimage.css /epoc32/data/Z/resource/homescreen/posterwideimage_2001fdbc/xuikon/posterwideimage.css ../xuikon/00/posterwideimage.xml /epoc32/data/Z/resource/homescreen/posterwideimage_2001fdbc/xuikon/posterwideimage.xml - +../xuikon/00/wideimage.dtd /epoc32/data/Z/resource/homescreen/posterwideimage_2001fdbc/xuikon/wideimage.dtd // Support for S60 builds //*********************** +../rom/posterwideimage.iby CORE_APP_LAYER_IBY_EXPORT_PATH(posterwideimage_2001fdbc.iby) +../rom/posterwideimage_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(posterwideimage_2001fdbc_resources.iby) +../rom/posterwideimage_customer.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(posterwideimage_2001fdbc_customer.iby) ../rom/posterwideimage_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(posterwideimage_2001fdbc_variant.iby) -../rom/posterwideimage.iby CORE_APP_LAYER_IBY_EXPORT_PATH(posterwideimage_2001fdbc.iby) + +// Support for S60 localization +//***************************** +// export localizable loc files (engineering versions) +../loc/wideimage.loc APP_LAYER_LOC_EXPORT_PATH(wideimage.loc) // Dtd-localization //***************** diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/hsps/00/manifest.dat --- a/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/hsps/00/manifest.dat Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/hsps/00/manifest.dat Thu Jul 15 18:25:29 2010 +0300 @@ -46,16 +46,10 @@ - - + + posterwideimage.o0000 - - - - - - - + diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/loc/wideimage.loc --- a/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/loc/wideimage.loc Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/loc/wideimage.loc Thu Jul 15 18:25:29 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Localization strings for WideImage widget (Xuikon) +* Description: Localization strings for PosterWideImage widget (Xuikon) * */ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/rom/posterwideimage.iby --- a/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/rom/posterwideimage.iby Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/rom/posterwideimage.iby Thu Jul 15 18:25:29 2010 +0300 @@ -22,7 +22,7 @@ #if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) // Enabled by DTD-localization tools -data=ZPRIVATE\200159c0\install\posterwideimage_2001fdbc\xuikon\00\posterwideimage.o0000 \private\200159c0\install\posterwideimage_2001fdbc\xuikon\00\posterwideimage.o0000 + data=ZPRIVATE\200159c0\install\posterwideimage_2001fdbc\hsps\00\manifest.dat \private\200159c0\install\posterwideimage_2001fdbc\hsps\00\manifest.dat #endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/rom/posterwideimage_customer.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/rom/posterwideimage_customer.iby Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,29 @@ +/* +* 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: +* Posterwideimage widget HSPS-plugin language specific IBY file. +* +*/ + +#ifndef __POSTERWIDEIMAGE_2001F480_CUSTOMER_IBY__ +#define __POSTERWIDEIMAGE_2001F480_CUSTOMER_IBY__ + +#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) + +// Enabled by DTD-localization tools, language specific +data=ZPRIVATE\200159c0\install\posterwideimage_2001fdbc\xuikon\00\posterwideimage.o0000 \private\200159c0\install\posterwideimage_2001fdbc\xuikon\00\posterwideimage.o0000 + +#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH + +#endif // __POSTERWIDEIMAGE_2001F480_CUSTOMER_IBY__ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/rom/posterwideimage_resources.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/rom/posterwideimage_resources.iby Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,29 @@ +/* +* 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: +* Posterwideimage widget HSPS-plugin language specific IBY file. +* +*/ + +#ifndef __POSTERWIDEIMAGE_2001FDBC_RESOURCES_IBY__ +#define __POSTERWIDEIMAGE_2001FDBC_RESOURCES_IBY__ + +#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) + +// Enabled by DTD-localization tools, language specific +data=ZPRIVATE\200159c0\install\posterwideimage_2001fdbc\xuikon\00\posterwideimage.o0000 \private\200159c0\install\posterwideimage_2001fdbc\xuikon\00\posterwideimage.o0000 + +#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH + +#endif // __POSTERWIDEIMAGE_2001FDBC_RESOURCES_IBY__ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/xuikon/00/posterwideimage.xml --- a/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/xuikon/00/posterwideimage.xml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/posterwideimage_2001fdbc/xuikon/00/posterwideimage.xml Thu Jul 15 18:25:29 2010 +0300 @@ -1,5 +1,5 @@ - + @@ -32,7 +32,7 @@ - #Loading Content + &qtn_ai_loading_content; - + - diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_2001f48b/conf/view2001f48bmanifest.gcfml --- a/idlehomescreen/data/qhd_tch/view_2001f48b/conf/view2001f48bmanifest.gcfml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/view_2001f48b/conf/view2001f48bmanifest.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -3,8 +3,6 @@ - diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_2001f48b/conf/view2001f48bxuikon.gcfml --- a/idlehomescreen/data/qhd_tch/view_2001f48b/conf/view2001f48bxuikon.gcfml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/view_2001f48b/conf/view2001f48bxuikon.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -3,8 +3,6 @@ - + + + + Maximum widget amount in Homescreen 4 page. Customizable + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Path of the Wallpaper resource. Customizable. + + + Not customizable! + + + Not customizable! + + + Widgets in the Homescreen 4 + + Widget name + + + Bundle identifier for the (C)WRT widgets. None for the native widgets + + + Templeate identifier for the (C)WRT widgets. None for the native widgets + + + Locking status for the widget 1 in Homescreen 4 page + + + Customize enabler for desktop/shortcut widget + + + Customize 1st item in desktop widget + + + Type of the item: Application, bookmark, or shortcut(param specific item) + + + Uid for the application, Menu content Uid for the bookmarks and shortcuts. + + + url for the bookmark based shortcut. for example http://www.google.com + + + Params for shortcut. For example: messaging:msg + + + Customize 2nd item in desktop widget + + + Type of the item: Application, bookmark, or shortcut(param specific item) + + + Uid for the application, Menu content Uid for the bookmarks and shortcuts + + + url for the bookmark based shortcut. for example http://www.google.com + + + Params for shortcut. messaging:msg + + + Customize 3rd item in desktop widget + + + Type of the item: Application, bookmark, or shortcut(param specific item) + + + Uid for the application,Menu content Uid for the bookmarks and shortcuts. + + + url for the bookmark based shortcut. for example http://www.google.com + + + Params for shortcut. messaging:msg + + + Customize 4th item in desktop widget + + + Type of the item: Application, bookmark, or shortcut(param specific item) + + + Uid for the application, Menu content ids for the bookmarks and shortcuts + + + url for the bookmark based shortcut. for example http://www.google.com + + + Params for shortcut. messaging:msg + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + Not customizable! + + + + + + 6 + true + hs_qhd_tch_view + use_empty_widget + wallpaper + path + + + 0x2001f47f + 0 + 0 + none + 0 + 0 + + + + + + + + + + + + + + + + + + + + first + Shortcut1 + second + Shortcut2 + third + Shortcut3 + fourth + Shortcut4 + type + uid + view + param + + + 0x2001f47f + 0 + 0 + none + 0 + 0 + + + + + + + + + + + + + + + + + + + + first + Shortcut1 + second + Shortcut2 + third + Shortcut3 + fourth + Shortcut4 + type + uid + view + param + + + 0x2001f47f + 0 + 0 + none + 0 + 0 + + + + + + + + + + + + + + + + + + + + first + Shortcut1 + second + Shortcut2 + third + Shortcut3 + fourth + Shortcut4 + type + uid + view + param + + + 0x2001f47f + 0 + 0 + none + 0 + 0 + + + + + + + + + + + + + + + + + + + + first + Shortcut1 + second + Shortcut2 + third + Shortcut3 + fourth + Shortcut4 + type + uid + view + param + + + 0x2001f47f + 0 + 0 + none + 0 + 0 + + + + + + + + + + + + + + + + + + + + first + Shortcut1 + second + Shortcut2 + third + Shortcut3 + fourth + Shortcut4 + type + uid + view + param + + + 0x2001f47f + 0 + 0 + none + 0 + 0 + + + + + + + + + + + + + + + + + + + + first + Shortcut1 + second + Shortcut2 + third + Shortcut3 + fourth + Shortcut4 + type + uid + view + param + + + + \ No newline at end of file diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0.gcfml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0manifest.confml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0manifest.confml Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + 2.0 + qhd_tch + view + 0x2001f48a + 0x101fb657 + 0x20022fe0 + qtn_view_20022fe0_name + ai3_view4 + 1.0 + viewconfiguration.xml + view.o0000 + + + \ No newline at end of file diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0manifest.gcfml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0manifest.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + & + + ; + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0xuikon.confml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0xuikon.confml Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,10 @@ + + + + + + + foo + + + \ No newline at end of file diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0xuikon.gcfml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/conf/view20022fe0xuikon.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/group/bld.inf Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,81 @@ +/* +* 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 + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS +// Support for productization and Carbide.Ui customization +//******************************************************** +//../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/view_20022fe0/hsps/manifest.dat +//../hsps/00/viewconfiguration.xml /epoc32/data/Z/resource/homescreen/view_20022fe0/hsps/viewconfiguration.xml + +../xuikon/00/View.dat /epoc32/data/Z/resource/homescreen/view_20022fe0/xuikon/view_20022fe0.dat +../xuikon/00/View.css /epoc32/data/Z/resource/homescreen/view_20022fe0/xuikon/view.css +../xuikon/00/View.xml /epoc32/data/Z/resource/homescreen/view_20022fe0/xuikon/view.xml +../xuikon/00/View.dtd /epoc32/data/Z/resource/homescreen/view_20022fe0/xuikon/view.dtd + +// Arabic languages +//***************** +../xuikon/37/View.css /epoc32/data/Z/resource/homescreen/view_20022fe0/xuikon/37/view.css +../xuikon/50/View.css /epoc32/data/Z/resource/homescreen/view_20022fe0/xuikon/50/view.css +../xuikon/57/View.css /epoc32/data/Z/resource/homescreen/view_20022fe0/xuikon/57/view.css +../xuikon/94/View.css /epoc32/data/Z/resource/homescreen/view_20022fe0/xuikon/94/view.css + + +//Confml and cfgml files for the customization +// starting use confml it is need to remove root_configuration.xml direct exporting (view_20022fe0_variant.iby) +//*********************************** +../conf/view20022fe0.confml APP_LAYER_CONFML(view20022fe0.confml) +../conf/view20022fe0.gcfml APP_LAYER_GCFML(view20022fe0.gcfml) +../conf/view20022fe0manifest.confml APP_LAYER_CONFML(view20022fe0manifest.confml) +../conf/view20022fe0manifest.gcfml APP_LAYER_GCFML(view20022fe0manifest.gcfml) +../conf/view20022fe0xuikon.confml APP_LAYER_CONFML(view20022fe0xuikon.confml) +../conf/view20022fe0xuikon.gcfml APP_LAYER_GCFML(view20022fe0xuikon.gcfml) + +// Support for S60 localization +//***************************** +#ifndef __VIEW_LOC__ +#define __VIEW_LOC__ +//../loc/view.loc APP_LAYER_LOC_EXPORT_PATH(view.loc) +#endif // __VIEW_LOC__ + +// Support for S60 builds +//*********************** +../rom/view_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(view_20022fe0_resources.iby) +../rom/view_customer.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(view_20022fe0_customer.iby) +//../rom/view_variant.iby CUSTOMER_APP_LAYER_IBY_EXPORT_PATH(view_20022fe0_variant.iby) +//../rom/view.iby CORE_APP_LAYER_IBY_EXPORT_PATH(view_20022fe0.iby) + + +// Dtd-localization +//***************** +PRJ_EXTENSIONS +START EXTENSION tools/dtd +OPTION SWITCH_LOC_FILE_NAME view_20022fe0 +OPTION DTD_TYPE widget +END + + +PRJ_MMPFILES + +PRJ_TESTMMPFILES + +// End of File diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/hsps/00/manifest.dat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/hsps/00/manifest.dat Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,59 @@ + + + + + + + qhd_tch + + + + view + + + + + + 0x2001f48a + + + + + + 0x101fb657 + + + + + + 0x20022fe0 + + + + + + &qtn_view_20022fe0_name; + + ai3_view4 + + 1.0 + + + + + + viewconfiguration.xml + + + + + + + + view.o0000 + + + + + + \ No newline at end of file diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/hsps/00/viewconfiguration.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/hsps/00/viewconfiguration.xml Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/loc/View.loc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/loc/View.loc Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,310 @@ +/* +* 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 project Active Idle 3 +* +*/ + +// d: Help +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_options_help "Help" + +// d: Open +// l: control_pane_t1/opt7 +// w: +// r: TB9.2 +#define qtn_msk_open "Open" + +// d: Done +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define text_softkey_done "Done" + +// d: Open +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_options_open "Open" + +// d: Back +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define text_softkey_back "Back" + +// d: Empty string +// l: control_pane_t1/opt7 +// w: +// r: TB9.2 +#define shortcut_emptycaption " " + +// d: Add page +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_add_page "Add page" + +// d: Select +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_options_select_widget "Select" + +// d: Add content +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_add_widget "Add content" + +// d: Access the widget catalog +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_widget_catalog "Widget catalog" + +// d: Search +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define text_softkey_search "Search" + +// d: Options +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define text_softkey_options "Options" + +// d: Refresh +// l: list_single_pane_t1_cp2/opt3 +// w: +// r: TB9.2 +#define qtn_hs_refresh_widget "Refresh" + +// d: Focused widget +// l: list_single_popup_submenu_pane_t1 +// w: +// r: TB9.2 +#define qtn_hs_refresh_one_widget "One" + +// d: All widgets +// l: list_single_popup_submenu_pane_t1 +// w: +// r: TB9.2 +#define qtn_hs_refresh_all_widgets "All" + +// d: Remove content +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_remove_widget "Remove content" + +// d: Hide the content +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_hide_widgets "Hide the content" + +// d: Edit contents +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_edit_content "Edit content" + +// d: Change Wallpaper +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_change_wallpaper "Change Wallpaper" + +// d: Change Shortcut Settings +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_change_shortcut_settings "Change Shortcut Settings" + +// d: Widget settings +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_widget_settings "Widget settings" + +// d: Show widgets +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_show_widgets "Show the content" + +// d: Change Home screen page +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_change_page "Change Home screen page" + +// d: Change +// l: control_pane_t1/opt7 +// w: +// r: TB9.2 +#define qtn_msk_change "Change" + +// d: Show all profiles in Profiles widget +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_show_profiles "Show all profiles" + +// d: Right selection key +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_set_right_idle_softkey "Right selection key" + +// d: Select +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define text_softkey_select "Select" + +// d: Cancel +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define text_softkey_cancel "Cancel" + +// d: Options menu item which switches home to online. Web widgets get updates from network. +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_online "Switch Home to online" + +// d: Options menu item which switches home to offline. Web widgets are not updated +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_offline "Switch Home to offline" + +// d: String which is shown in long tap menu of Home screen if tapped widget has settings +// l: list_single_touch_menu_pane_t1 +// w: +// r: TB9.2 +#define qtn_hs_longtap_settings "Settings" + +// d: String which is shown in long tap menu of Home screen if tapped some widget which is removable +// l: list_single_touch_menu_pane_t1 +// w: +// r: TB9.2 +#define qtn_hs_longtap_remove_element "Remove" + +// d: String which is shown in long tap menu of Home screen if tapped empty space in home screen +// l: list_single_touch_menu_pane_t1 +// w: +// r: TB9.2 +#define qtn_hs_longtap_add "Add content" + +// d: String which is shown in long tap menu of Home screen +// l: list_single_touch_menu_pane_t1 +// w: +// r: TB9.2 +#define qtn_hs_change_longtap_wallpaper "Change wallpaper" + +// d: User can download new HS widgets. String is visible in add content list query +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_download_new_widgets "Download" + +// d: Changes focused widget +// l: list_single_touch_menu_pane_t1 +// w: +// r: TB9.2 +#define qtn_hs_edit_replace "Replace" + +// d: deletes current home screen page +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_page_options_delete "Delete page" + +// d: creates new home screen page +// l: list_single_pane_t1_cp2 +// w: +// r: TB9.2 +#define qtn_hs_page_options_new "New page" + +// d: view title in editing mode +// l: title_pane_t2 +// w: +// r: TB9.2 +#define qtn_hs_title_editing_view "Editing view" + +// d: Call +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define text_softkey_call "Call" + +// d: Added new option menu item to Edit mode for opening the widget catalog, +// l: list_single_pane_t1_cp2 +// 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" + +// d: Done +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define qtn_hs_text_softkey_done "Done" + +// d: Search +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define qtn_hs_text_softkey_search "Search" + +// d: Options +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define qtn_hs_text_softkey_options "Options" + +// d: Back +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define qtn_hs_text_softkey_back "Back" + +// d: Select +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define qtn_hs_text_softkey_select "Select" + +// d: Cancel +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define qtn_hs_text_softkey_cancel "Cancel" + +// d: Call +// l: nhd_control_pane_t2/opt7 +// w: +// r: TB9.2 +#define qtn_hs_text_softkey_call "Call" diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/rom/view.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/rom/view.iby Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,29 @@ +/* +* 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: +* View widget HSPS-plugin IBY file. +* +*/ + +#ifndef __AI3VIEW_20022FE0_IBY__ +#define __AI3VIEW_20022FE0_IBY__ + +#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) + +// Enabled by DTD-localization tools +data=ZPRIVATE\200159c0\install\view_20022fe0\hsps\00\manifest.dat \private\200159c0\install\view_20022fe0\hsps\00\manifest.dat + +#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH + +#endif // __AI3VIEW_20022FE0_IBY__ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/rom/view_customer.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/rom/view_customer.iby Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,29 @@ +/* +* 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: +* View widget HSPS-plugin language specific IBY file. +* +*/ + +#ifndef __AI3VIEW_20022FE0_CUSTOMER_IBY__ +#define __AI3VIEW_20022FE0_CUSTOMER_IBY__ + +#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) + +// Enabled by DTD-localization tools, language specific +data=ZPRIVATE\200159c0\install\view_20022fe0\xuikon\00\view.o0000 \private\200159c0\install\view_20022fe0\xuikon\00\view.o0000 + +#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH + +#endif // __AI3VIEW_20022FE0_CUSTOMER_IBY__ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/rom/view_resources.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/rom/view_resources.iby Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,29 @@ +/* +* 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: +* View widget HSPS-plugin language specific IBY file. +* +*/ + +#ifndef __AI3VIEW_20022FE0_RESOURCES_IBY__ +#define __AI3VIEW_20022FE0_RESOURCES_IBY__ + +#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) + +// Enabled by DTD-localization tools, language specific +data=ZPRIVATE\200159c0\install\view_20022fe0\xuikon\00\view.o0000 \private\200159c0\install\view_20022fe0\xuikon\00\view.o0000 + +#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH + +#endif // __AI3VIEW_20022FE0_RESOURCES_IBY__ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/rom/view_variant.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/rom/view_variant.iby Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,29 @@ +/* +* 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: +* View widget HSPS-plugin variant specific IBY file. +* +*/ + +#ifndef __AI3VIEW_20022FE0_VARIANT_IBY__ +#define __AI3VIEW_20022FE0_VARIANT_IBY__ + +#if defined(__LAYOUT_360_640_TOUCH) || defined(__LAYOUT_640_360_TOUCH) + +// Enabled by variation tools, variant specific +data=ZPRIVATE\200159c0\install\view_20022fe0\hsps\00\viewconfiguration.xml \private\200159c0\install\view_20022fe0\hsps\00\viewconfiguration.xml + +#endif // __LAYOUT_360_640_TOUCH || __LAYOUT_640_360_TOUCH + +#endif // __AI3VIEW_20022FE0_VARIANT_IBY__ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.css Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,67 @@ +view +{ + direction: ltr; + block-progression: tb; + background-image: wallpaper; + swipe: true; + + _s60-status-pane-layout: widescreen-flat-3softkeys; +} + +box#plugins_container +{ + direction: ltr; + block-progression: rl; + padding-top: 3px; +} + +plugin.plugins +{ + height: 82px; + width: 312px; + + margin-bottom: 4px; + margin-right: 5px; + margin-left: 5px; + + _s60-longtap: true; + + nav-index: appearance; +} + +plugin:edit +{ + background-color:"SKIN(270501603 8582)"; +} + +trigger#hs_popup_open_hold:edit +{ + display: none; +} + +trigger#hs_popup_open_up +{ + display: none; +} + +trigger#hs_popup_open_up:edit +{ + display: block; +} + +softkey#rsk +{ + _s60-longtap: true; + _s60-aspect-ratio: preserve; +} + +softkey#msk_ltr +{ + display: block; +} + +softkey#msk_rtl +{ + display: none; +} + diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.dat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.dat Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,13 @@ + + + E029CF57 + 101FB657 + 11001234 + DemoView + view + 1.0 + view.xml + view.css + view.dtd + + \ No newline at end of file diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.dtd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.dtd Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,496 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/00/View.xml Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,288 @@ + + + + + + + + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/37/View.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/37/View.css Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,64 @@ +view +{ + direction: ltr; + block-progression: tb; + background-image: wallpaper; + swipe: true; + + _s60-status-pane-layout: widescreen-flat-3softkeys; +} + +box#plugins_container +{ + direction: rtl; + block-progression: rl; + padding-top: 3px; +} + +plugin.plugins +{ + height: 82px; + width: 312px; + + margin-bottom: 4px; + margin-right: 5px; + margin-left: 5px; + _s60-longtap: true; + nav-index: appearance; +} + +plugin:edit +{ + background-color:"SKIN(270501603 8582)"; +} + +trigger#hs_popup_open_hold:edit +{ + display: none; +} + +trigger#hs_popup_open_up +{ + display: none; +} + +trigger#hs_popup_open_up:edit +{ + display: block; +} + +softkey#rsk +{ + _s60-longtap: true; + _s60-aspect-ratio: preserve; +} + +softkey#msk_ltr +{ + display: none; +} + +softkey#msk_rtl +{ + display: block; +} diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/50/View.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/50/View.css Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,64 @@ +view +{ + direction: ltr; + block-progression: tb; + background-image: wallpaper; + swipe: true; + + _s60-status-pane-layout: widescreen-flat-3softkeys; +} + +box#plugins_container +{ + direction: rtl; + block-progression: rl; + padding-top: 3px; +} + +plugin.plugins +{ + height: 82px; + width: 312px; + + margin-bottom: 4px; + margin-right: 5px; + margin-left: 5px; + _s60-longtap: true; + nav-index: appearance; +} + +plugin:edit +{ + background-color:"SKIN(270501603 8582)"; +} + +trigger#hs_popup_open_hold:edit +{ + display: none; +} + +trigger#hs_popup_open_up +{ + display: none; +} + +trigger#hs_popup_open_up:edit +{ + display: block; +} + +softkey#rsk +{ + _s60-longtap: true; + _s60-aspect-ratio: preserve; +} + +softkey#msk_ltr +{ + display: none; +} + +softkey#msk_rtl +{ + display: block; +} diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/57/View.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/57/View.css Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,64 @@ +view +{ + direction: ltr; + block-progression: tb; + background-image: wallpaper; + swipe: true; + + _s60-status-pane-layout: widescreen-flat-3softkeys; +} + +box#plugins_container +{ + direction: rtl; + block-progression: rl; + padding-top: 3px; +} + +plugin.plugins +{ + height: 82px; + width: 312px; + + margin-bottom: 4px; + margin-right: 5px; + margin-left: 5px; + _s60-longtap: true; + nav-index: appearance; +} + +plugin:edit +{ + background-color:"SKIN(270501603 8582)"; +} + +trigger#hs_popup_open_hold:edit +{ + display: none; +} + +trigger#hs_popup_open_up +{ + display: none; +} + +trigger#hs_popup_open_up:edit +{ + display: block; +} + +softkey#rsk +{ + _s60-longtap: true; + _s60-aspect-ratio: preserve; +} + +softkey#msk_ltr +{ + display: none; +} + +softkey#msk_rtl +{ + display: block; +} diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/94/View.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/data/qhd_tch/view_20022fe0/xuikon/94/View.css Thu Jul 15 18:25:29 2010 +0300 @@ -0,0 +1,64 @@ +view +{ + direction: ltr; + block-progression: tb; + background-image: wallpaper; + swipe: true; + + _s60-status-pane-layout: widescreen-flat-3softkeys; +} + +box#plugins_container +{ + direction: rtl; + block-progression: rl; + padding-top: 3px; +} + +plugin.plugins +{ + height: 82px; + width: 312px; + + margin-bottom: 4px; + margin-right: 5px; + margin-left: 5px; + _s60-longtap: true; + nav-index: appearance; +} + +plugin:edit +{ + background-color:"SKIN(270501603 8582)"; +} + +trigger#hs_popup_open_hold:edit +{ + display: none; +} + +trigger#hs_popup_open_up +{ + display: none; +} + +trigger#hs_popup_open_up:edit +{ + display: block; +} + +softkey#rsk +{ + _s60-longtap: true; + _s60-aspect-ratio: preserve; +} + +softkey#msk_ltr +{ + display: none; +} + +softkey#msk_rtl +{ + display: block; +} diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4.gcfml --- a/idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4.gcfml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -3,39 +3,7 @@ - - - - - + diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4manifest.gcfml --- a/idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4manifest.gcfml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4manifest.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -3,8 +3,6 @@ - diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4xuikon.gcfml --- a/idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4xuikon.gcfml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/view_200286e4/conf/view200286e4xuikon.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -3,8 +3,6 @@ - - - - - - + diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_200286e5/conf/view200286e5manifest.gcfml --- a/idlehomescreen/data/qhd_tch/view_200286e5/conf/view200286e5manifest.gcfml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/view_200286e5/conf/view200286e5manifest.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -3,8 +3,6 @@ - diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_200286e5/conf/view200286e5xuikon.gcfml --- a/idlehomescreen/data/qhd_tch/view_200286e5/conf/view200286e5xuikon.gcfml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/view_200286e5/conf/view200286e5xuikon.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -3,8 +3,6 @@ - - - - + + - - - diff -r d721605b30d0 -r 89165693e770 idlehomescreen/data/qhd_tch/view_200286ed/conf/view200286edxuikon.gcfml --- a/idlehomescreen/data/qhd_tch/view_200286ed/conf/view200286edxuikon.gcfml Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/data/qhd_tch/view_200286ed/conf/view200286edxuikon.gcfml Thu Jul 15 18:25:29 2010 +0300 @@ -1,8 +1,5 @@ - - - diff -r d721605b30d0 -r 89165693e770 idlehomescreen/inc/xnpanic.h --- a/idlehomescreen/inc/xnpanic.h Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/inc/xnpanic.h Thu Jul 15 18:25:29 2010 +0300 @@ -74,7 +74,8 @@ const TInt KXnErrAppendingMapItemFailed_2 = -32252; const TInt KXnErrBlockProgressionPropertyNULL = -32253; const TInt KXnErrBlockProgressionPropertyNULL_2 = -32254; -const TInt KXnErrPluginFailure = -32255; +const TInt KXnErrWidgetPluginFailure = -32255; +const TInt KXnErrViewPluginFailure = -32256; // FUNCTION PROTOTYPES GLREF_C void Panic(TXnPanic aPanic); diff -r d721605b30d0 -r 89165693e770 idlehomescreen/inc/xnviewmanager.h --- a/idlehomescreen/inc/xnviewmanager.h Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/inc/xnviewmanager.h Thu Jul 15 18:25:29 2010 +0300 @@ -181,6 +181,8 @@ void AddViewL( TInt aEffectId = 0 ); + TInt RemoveFaultyView( CXnViewData* aViewData ); + TInt RemoveViewL( const CHsContentInfo& aInfo ); void RemoveViewL( TInt aEffectId = 0 ); @@ -208,6 +210,8 @@ void ShowErrorL( TInt aResource ) const; + void HandleErrorNotes( const TInt aError ) const; + void PublishersReadyL( CXnViewData& aViewData, TInt aResult ); void NotifyAllViewsLoadedL(); diff -r d721605b30d0 -r 89165693e770 idlehomescreen/sapiwrapper/hspswrapper/bwins/hspswrapper.def --- a/idlehomescreen/sapiwrapper/hspswrapper/bwins/hspswrapper.def Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/sapiwrapper/hspswrapper/bwins/hspswrapper.def Thu Jul 15 18:25:29 2010 +0300 @@ -71,33 +71,34 @@ ?PluginId@CAddPluginResult@hspswrapper@@QBEABVTDesC8@@XZ @ 70 NONAME ; class TDesC8 const & hspswrapper::CAddPluginResult::PluginId(void) const ??1CAddPluginResult@hspswrapper@@UAE@XZ @ 71 NONAME ; hspswrapper::CAddPluginResult::~CAddPluginResult(void) ?NewLC@CPluginMap@hspswrapper@@SAPAV12@XZ @ 72 NONAME ; class hspswrapper::CPluginMap * hspswrapper::CPluginMap::NewLC(void) - ?ReplacePluginL@CHspsWrapper@hspswrapper@@QAEHABVTDesC8@@0@Z @ 73 NONAME ; int hspswrapper::CHspsWrapper::ReplacePluginL(class TDesC8 const &, class TDesC8 const &) - ?Resources@CHspsConfiguration@hspswrapper@@QAEAAV?$RPointerArray@VCObjectMap@hspswrapper@@@@XZ @ 74 NONAME ; class RPointerArray & hspswrapper::CHspsConfiguration::Resources(void) - ?MaxChild@CPluginInfo@hspswrapper@@QBEABJXZ @ 75 NONAME ; long const & hspswrapper::CPluginInfo::MaxChild(void) const - ?SetLockingStatusL@CPluginMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 76 NONAME ; class hspswrapper::CPluginMap & hspswrapper::CPluginMap::SetLockingStatusL(class TDesC8 const &) - ?ServiceHandler@CHspsWrapper@hspswrapper@@QBEPAVCLiwServiceHandler@@XZ @ 77 NONAME ; class CLiwServiceHandler * hspswrapper::CHspsWrapper::ServiceHandler(void) const - ?SetActivePluginL@CHspsWrapper@hspswrapper@@QAEHABVTDesC8@@@Z @ 78 NONAME ; int hspswrapper::CHspsWrapper::SetActivePluginL(class TDesC8 const &) - ?Interface@CPluginInfo@hspswrapper@@QBEABVTDesC8@@XZ @ 79 NONAME ; class TDesC8 const & hspswrapper::CPluginInfo::Interface(void) const - ?SetDescriptionL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 80 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetDescriptionL(class TDesC8 const &) - ?AddPluginL@CHspsWrapper@hspswrapper@@QAEPAVCAddPluginResult@2@ABVTDesC8@@0H@Z @ 81 NONAME ; class hspswrapper::CAddPluginResult * hspswrapper::CHspsWrapper::AddPluginL(class TDesC8 const &, class TDesC8 const &, int) - ?SetPluginIdL@CAddPluginResult@hspswrapper@@QAEXABVTDesC8@@@Z @ 82 NONAME ; void hspswrapper::CAddPluginResult::SetPluginIdL(class TDesC8 const &) - ?SetUidL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 83 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetUidL(class TDesC8 const &) - ?SetTagL@CObjectMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 84 NONAME ; class hspswrapper::CObjectMap & hspswrapper::CObjectMap::SetTagL(class TDesC8 const &) - ?NewLC@CPluginInfo@hspswrapper@@SAPAV12@XZ @ 85 NONAME ; class hspswrapper::CPluginInfo * hspswrapper::CPluginInfo::NewLC(void) - ?SetNameL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 86 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetNameL(class TDesC8 const &) - ?RestoreViewsL@CHspsWrapper@hspswrapper@@QAEHXZ @ 87 NONAME ; int hspswrapper::CHspsWrapper::RestoreViewsL(void) - ?SetMediaTypeL@CObjectMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 88 NONAME ; class hspswrapper::CObjectMap & hspswrapper::CObjectMap::SetMediaTypeL(class TDesC8 const &) - ?Tag@CObjectMap@hspswrapper@@QBEABVTDesC8@@XZ @ 89 NONAME ; class TDesC8 const & hspswrapper::CObjectMap::Tag(void) const - ?SetItemIdL@CItemMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 90 NONAME ; class hspswrapper::CItemMap & hspswrapper::CItemMap::SetItemIdL(class TDesC8 const &) - ?NewLC@CItemMap@hspswrapper@@SAPAV12@XZ @ 91 NONAME ; class hspswrapper::CItemMap * hspswrapper::CItemMap::NewLC(void) - ?SetLogoIconL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC16@@@Z @ 92 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetLogoIconL(class TDesC16 const &) - ?SetInterfaceL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 93 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetInterfaceL(class TDesC8 const &) - ?AddPluginMapL@CHspsConfiguration@hspswrapper@@QAEAAV12@PAVCPluginMap@2@@Z @ 94 NONAME ; class hspswrapper::CHspsConfiguration & hspswrapper::CHspsConfiguration::AddPluginMapL(class hspswrapper::CPluginMap *) - ?RemovePluginL@CHspsWrapper@hspswrapper@@QAEHABVTDesC8@@@Z @ 95 NONAME ; int hspswrapper::CHspsWrapper::RemovePluginL(class TDesC8 const &) - ?SetActivationStateL@CPluginMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 96 NONAME ; class hspswrapper::CPluginMap & hspswrapper::CPluginMap::SetActivationStateL(class TDesC8 const &) - ?LockingStatus@CPluginMap@hspswrapper@@QBEABVTDesC8@@XZ @ 97 NONAME ; class TDesC8 const & hspswrapper::CPluginMap::LockingStatus(void) const - ?Type@CPluginInfo@hspswrapper@@QBEABVTDesC8@@XZ @ 98 NONAME ; class TDesC8 const & hspswrapper::CPluginInfo::Type(void) const - ?SetConfIdL@CHspsConfiguration@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 99 NONAME ; class hspswrapper::CHspsConfiguration & hspswrapper::CHspsConfiguration::SetConfIdL(class TDesC8 const &) - ?NewLC@CPropertyMap@hspswrapper@@SAPAV12@XZ @ 100 NONAME ; class hspswrapper::CPropertyMap * hspswrapper::CPropertyMap::NewLC(void) - ??0CAddPluginResult@hspswrapper@@AAE@XZ @ 101 NONAME ; hspswrapper::CAddPluginResult::CAddPluginResult(void) + ?RestoreAllConfL@CHspsWrapper@hspswrapper@@QAEHXZ @ 73 NONAME ; int hspswrapper::CHspsWrapper::RestoreAllConfL(void) + ?ReplacePluginL@CHspsWrapper@hspswrapper@@QAEHABVTDesC8@@0@Z @ 74 NONAME ; int hspswrapper::CHspsWrapper::ReplacePluginL(class TDesC8 const &, class TDesC8 const &) + ?Resources@CHspsConfiguration@hspswrapper@@QAEAAV?$RPointerArray@VCObjectMap@hspswrapper@@@@XZ @ 75 NONAME ; class RPointerArray & hspswrapper::CHspsConfiguration::Resources(void) + ?MaxChild@CPluginInfo@hspswrapper@@QBEABJXZ @ 76 NONAME ; long const & hspswrapper::CPluginInfo::MaxChild(void) const + ?SetLockingStatusL@CPluginMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 77 NONAME ; class hspswrapper::CPluginMap & hspswrapper::CPluginMap::SetLockingStatusL(class TDesC8 const &) + ?ServiceHandler@CHspsWrapper@hspswrapper@@QBEPAVCLiwServiceHandler@@XZ @ 78 NONAME ; class CLiwServiceHandler * hspswrapper::CHspsWrapper::ServiceHandler(void) const + ?SetActivePluginL@CHspsWrapper@hspswrapper@@QAEHABVTDesC8@@@Z @ 79 NONAME ; int hspswrapper::CHspsWrapper::SetActivePluginL(class TDesC8 const &) + ?Interface@CPluginInfo@hspswrapper@@QBEABVTDesC8@@XZ @ 80 NONAME ; class TDesC8 const & hspswrapper::CPluginInfo::Interface(void) const + ?SetDescriptionL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 81 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetDescriptionL(class TDesC8 const &) + ?AddPluginL@CHspsWrapper@hspswrapper@@QAEPAVCAddPluginResult@2@ABVTDesC8@@0H@Z @ 82 NONAME ; class hspswrapper::CAddPluginResult * hspswrapper::CHspsWrapper::AddPluginL(class TDesC8 const &, class TDesC8 const &, int) + ?SetPluginIdL@CAddPluginResult@hspswrapper@@QAEXABVTDesC8@@@Z @ 83 NONAME ; void hspswrapper::CAddPluginResult::SetPluginIdL(class TDesC8 const &) + ?SetUidL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 84 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetUidL(class TDesC8 const &) + ?SetTagL@CObjectMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 85 NONAME ; class hspswrapper::CObjectMap & hspswrapper::CObjectMap::SetTagL(class TDesC8 const &) + ?NewLC@CPluginInfo@hspswrapper@@SAPAV12@XZ @ 86 NONAME ; class hspswrapper::CPluginInfo * hspswrapper::CPluginInfo::NewLC(void) + ?SetNameL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 87 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetNameL(class TDesC8 const &) + ?RestoreViewsL@CHspsWrapper@hspswrapper@@QAEHXZ @ 88 NONAME ; int hspswrapper::CHspsWrapper::RestoreViewsL(void) + ?SetMediaTypeL@CObjectMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 89 NONAME ; class hspswrapper::CObjectMap & hspswrapper::CObjectMap::SetMediaTypeL(class TDesC8 const &) + ?Tag@CObjectMap@hspswrapper@@QBEABVTDesC8@@XZ @ 90 NONAME ; class TDesC8 const & hspswrapper::CObjectMap::Tag(void) const + ?SetItemIdL@CItemMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 91 NONAME ; class hspswrapper::CItemMap & hspswrapper::CItemMap::SetItemIdL(class TDesC8 const &) + ?NewLC@CItemMap@hspswrapper@@SAPAV12@XZ @ 92 NONAME ; class hspswrapper::CItemMap * hspswrapper::CItemMap::NewLC(void) + ?SetLogoIconL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC16@@@Z @ 93 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetLogoIconL(class TDesC16 const &) + ?SetInterfaceL@CPluginInfo@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 94 NONAME ; class hspswrapper::CPluginInfo & hspswrapper::CPluginInfo::SetInterfaceL(class TDesC8 const &) + ?AddPluginMapL@CHspsConfiguration@hspswrapper@@QAEAAV12@PAVCPluginMap@2@@Z @ 95 NONAME ; class hspswrapper::CHspsConfiguration & hspswrapper::CHspsConfiguration::AddPluginMapL(class hspswrapper::CPluginMap *) + ?RemovePluginL@CHspsWrapper@hspswrapper@@QAEHABVTDesC8@@@Z @ 96 NONAME ; int hspswrapper::CHspsWrapper::RemovePluginL(class TDesC8 const &) + ?SetActivationStateL@CPluginMap@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 97 NONAME ; class hspswrapper::CPluginMap & hspswrapper::CPluginMap::SetActivationStateL(class TDesC8 const &) + ?LockingStatus@CPluginMap@hspswrapper@@QBEABVTDesC8@@XZ @ 98 NONAME ; class TDesC8 const & hspswrapper::CPluginMap::LockingStatus(void) const + ?Type@CPluginInfo@hspswrapper@@QBEABVTDesC8@@XZ @ 99 NONAME ; class TDesC8 const & hspswrapper::CPluginInfo::Type(void) const + ?SetConfIdL@CHspsConfiguration@hspswrapper@@QAEAAV12@ABVTDesC8@@@Z @ 100 NONAME ; class hspswrapper::CHspsConfiguration & hspswrapper::CHspsConfiguration::SetConfIdL(class TDesC8 const &) + ?NewLC@CPropertyMap@hspswrapper@@SAPAV12@XZ @ 101 NONAME ; class hspswrapper::CPropertyMap * hspswrapper::CPropertyMap::NewLC(void) + ??0CAddPluginResult@hspswrapper@@AAE@XZ @ 102 NONAME ; hspswrapper::CAddPluginResult::CAddPluginResult(void) diff -r d721605b30d0 -r 89165693e770 idlehomescreen/sapiwrapper/hspswrapper/eabi/hspswrapper.def --- a/idlehomescreen/sapiwrapper/hspswrapper/eabi/hspswrapper.def Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/sapiwrapper/hspswrapper/eabi/hspswrapper.def Thu Jul 15 18:25:29 2010 +0300 @@ -40,97 +40,98 @@ _ZN11hspswrapper12CHspsWrapper13RestoreViewsLEv @ 39 NONAME _ZN11hspswrapper12CHspsWrapper13SetConfStateLERK6TDesC8S3_i @ 40 NONAME _ZN11hspswrapper12CHspsWrapper14ReplacePluginLERK6TDesC8S3_ @ 41 NONAME - _ZN11hspswrapper12CHspsWrapper15RestoreRomConfLEv @ 42 NONAME - _ZN11hspswrapper12CHspsWrapper16SetActivePluginLERK6TDesC8 @ 43 NONAME - _ZN11hspswrapper12CHspsWrapper18SetPluginSettingsLERK6TDesC8RK13RPointerArrayINS_8CItemMapEE @ 44 NONAME - _ZN11hspswrapper12CHspsWrapper19RestoreDefaultConfLEv @ 45 NONAME - _ZN11hspswrapper12CHspsWrapper20GetAppConfigurationLEv @ 46 NONAME - _ZN11hspswrapper12CHspsWrapper20SetAppConfigurationLERK6TDesC8 @ 47 NONAME - _ZN11hspswrapper12CHspsWrapper21GetAppConfigurationsLER13RPointerArrayINS_11CPluginInfoEE @ 48 NONAME - _ZN11hspswrapper12CHspsWrapper23GetPluginConfigurationLERK6TDesC8 @ 49 NONAME - _ZN11hspswrapper12CHspsWrapper4NewLERK6TDesC8PNS_20MHspsWrapperObserverE @ 50 NONAME - _ZN11hspswrapper12CHspsWrapper5NewLCERK6TDesC8PNS_20MHspsWrapperObserverE @ 51 NONAME - _ZN11hspswrapper12CHspsWrapperD0Ev @ 52 NONAME - _ZN11hspswrapper12CHspsWrapperD1Ev @ 53 NONAME - _ZN11hspswrapper12CHspsWrapperD2Ev @ 54 NONAME - _ZN11hspswrapper12CPropertyMap4NewLEv @ 55 NONAME - _ZN11hspswrapper12CPropertyMap5NewLCEv @ 56 NONAME - _ZN11hspswrapper12CPropertyMap8SetNameLERK6TDesC8 @ 57 NONAME - _ZN11hspswrapper12CPropertyMap9SetValueLERK6TDesC8 @ 58 NONAME - _ZN11hspswrapper12CPropertyMapD0Ev @ 59 NONAME - _ZN11hspswrapper12CPropertyMapD1Ev @ 60 NONAME - _ZN11hspswrapper12CPropertyMapD2Ev @ 61 NONAME - _ZN11hspswrapper16CAddPluginResult12SetPluginIdLERK6TDesC8 @ 62 NONAME - _ZN11hspswrapper16CAddPluginResult4NewLEv @ 63 NONAME - _ZN11hspswrapper16CAddPluginResult9SetStatusEi @ 64 NONAME - _ZN11hspswrapper16CAddPluginResultC1Ev @ 65 NONAME - _ZN11hspswrapper16CAddPluginResultC2Ev @ 66 NONAME - _ZN11hspswrapper16CAddPluginResultD0Ev @ 67 NONAME - _ZN11hspswrapper16CAddPluginResultD1Ev @ 68 NONAME - _ZN11hspswrapper16CAddPluginResultD2Ev @ 69 NONAME - _ZN11hspswrapper18CHspsConfiguration10PluginInfoEv @ 70 NONAME - _ZN11hspswrapper18CHspsConfiguration10PluginMapsEv @ 71 NONAME - _ZN11hspswrapper18CHspsConfiguration10SetConfIdLERK6TDesC8 @ 72 NONAME - _ZN11hspswrapper18CHspsConfiguration11AddItemMapLEPNS_8CItemMapE @ 73 NONAME - _ZN11hspswrapper18CHspsConfiguration13AddObjectMapLEPNS_10CObjectMapE @ 74 NONAME - _ZN11hspswrapper18CHspsConfiguration13AddPluginMapLEPNS_10CPluginMapE @ 75 NONAME - _ZN11hspswrapper18CHspsConfiguration4NewLEv @ 76 NONAME - _ZN11hspswrapper18CHspsConfiguration5NewLCEv @ 77 NONAME - _ZN11hspswrapper18CHspsConfiguration8SettingsEv @ 78 NONAME - _ZN11hspswrapper18CHspsConfiguration9ResourcesEv @ 79 NONAME - _ZN11hspswrapper18CHspsConfigurationD0Ev @ 80 NONAME - _ZN11hspswrapper18CHspsConfigurationD1Ev @ 81 NONAME - _ZN11hspswrapper18CHspsConfigurationD2Ev @ 82 NONAME - _ZN11hspswrapper8CItemMap10SetItemIdLERK6TDesC8 @ 83 NONAME - _ZN11hspswrapper8CItemMap12SetItemNameLERK6TDesC8 @ 84 NONAME - _ZN11hspswrapper8CItemMap15AddPropertyMapLEPNS_12CPropertyMapE @ 85 NONAME - _ZN11hspswrapper8CItemMap4NewLEv @ 86 NONAME - _ZN11hspswrapper8CItemMap5NewLCEv @ 87 NONAME - _ZN11hspswrapper8CItemMapD0Ev @ 88 NONAME - _ZN11hspswrapper8CItemMapD1Ev @ 89 NONAME - _ZN11hspswrapper8CItemMapD2Ev @ 90 NONAME - _ZNK11hspswrapper10CObjectMap3TagEv @ 91 NONAME - _ZNK11hspswrapper10CObjectMap4PathEv @ 92 NONAME - _ZNK11hspswrapper10CObjectMap5NameLEv @ 93 NONAME - _ZNK11hspswrapper10CObjectMap9MediaTypeEv @ 94 NONAME - _ZNK11hspswrapper10CPluginMap13LockingStatusEv @ 95 NONAME - _ZNK11hspswrapper10CPluginMap15ActivationStateEv @ 96 NONAME - _ZNK11hspswrapper10CPluginMap8PluginIdEv @ 97 NONAME - _ZNK11hspswrapper10CPluginMap9PluginUidEv @ 98 NONAME - _ZNK11hspswrapper11CPluginInfo11DescriptionEv @ 99 NONAME - _ZNK11hspswrapper11CPluginInfo13MultiInstanceEv @ 100 NONAME - _ZNK11hspswrapper11CPluginInfo18ConfigurationStateEv @ 101 NONAME - _ZNK11hspswrapper11CPluginInfo3UidEv @ 102 NONAME - _ZNK11hspswrapper11CPluginInfo4NameEv @ 103 NONAME - _ZNK11hspswrapper11CPluginInfo4TypeEv @ 104 NONAME - _ZNK11hspswrapper11CPluginInfo8LogoIconEv @ 105 NONAME - _ZNK11hspswrapper11CPluginInfo8MaxChildEv @ 106 NONAME - _ZNK11hspswrapper11CPluginInfo9InterfaceEv @ 107 NONAME - _ZNK11hspswrapper12CHspsWrapper11HspsServiceEv @ 108 NONAME - _ZNK11hspswrapper12CHspsWrapper13HspsInterfaceEv @ 109 NONAME - _ZNK11hspswrapper12CHspsWrapper14ServiceHandlerEv @ 110 NONAME - _ZNK11hspswrapper12CPropertyMap4NameEv @ 111 NONAME - _ZNK11hspswrapper12CPropertyMap5ValueEv @ 112 NONAME - _ZNK11hspswrapper16CAddPluginResult6StatusEv @ 113 NONAME - _ZNK11hspswrapper16CAddPluginResult8PluginIdEv @ 114 NONAME - _ZNK11hspswrapper18CHspsConfiguration6ConfIdEv @ 115 NONAME - _ZNK11hspswrapper8CItemMap10PropertiesEv @ 116 NONAME - _ZNK11hspswrapper8CItemMap6ItemIdEv @ 117 NONAME - _ZNK11hspswrapper8CItemMap8ItemNameEv @ 118 NONAME - _ZTIN11hspswrapper10CObjectMapE @ 119 NONAME - _ZTIN11hspswrapper10CPluginMapE @ 120 NONAME - _ZTIN11hspswrapper11CPluginInfoE @ 121 NONAME - _ZTIN11hspswrapper12CHspsWrapperE @ 122 NONAME - _ZTIN11hspswrapper12CPropertyMapE @ 123 NONAME - _ZTIN11hspswrapper16CAddPluginResultE @ 124 NONAME - _ZTIN11hspswrapper18CHspsConfigurationE @ 125 NONAME - _ZTIN11hspswrapper8CItemMapE @ 126 NONAME - _ZTVN11hspswrapper10CObjectMapE @ 127 NONAME - _ZTVN11hspswrapper10CPluginMapE @ 128 NONAME - _ZTVN11hspswrapper11CPluginInfoE @ 129 NONAME - _ZTVN11hspswrapper12CHspsWrapperE @ 130 NONAME - _ZTVN11hspswrapper12CPropertyMapE @ 131 NONAME - _ZTVN11hspswrapper16CAddPluginResultE @ 132 NONAME - _ZTVN11hspswrapper18CHspsConfigurationE @ 133 NONAME - _ZTVN11hspswrapper8CItemMapE @ 134 NONAME + _ZN11hspswrapper12CHspsWrapper15RestoreAllConfLEv @ 42 NONAME + _ZN11hspswrapper12CHspsWrapper15RestoreRomConfLEv @ 43 NONAME + _ZN11hspswrapper12CHspsWrapper16SetActivePluginLERK6TDesC8 @ 44 NONAME + _ZN11hspswrapper12CHspsWrapper18SetPluginSettingsLERK6TDesC8RK13RPointerArrayINS_8CItemMapEE @ 45 NONAME + _ZN11hspswrapper12CHspsWrapper19RestoreDefaultConfLEv @ 46 NONAME + _ZN11hspswrapper12CHspsWrapper20GetAppConfigurationLEv @ 47 NONAME + _ZN11hspswrapper12CHspsWrapper20SetAppConfigurationLERK6TDesC8 @ 48 NONAME + _ZN11hspswrapper12CHspsWrapper21GetAppConfigurationsLER13RPointerArrayINS_11CPluginInfoEE @ 49 NONAME + _ZN11hspswrapper12CHspsWrapper23GetPluginConfigurationLERK6TDesC8 @ 50 NONAME + _ZN11hspswrapper12CHspsWrapper4NewLERK6TDesC8PNS_20MHspsWrapperObserverE @ 51 NONAME + _ZN11hspswrapper12CHspsWrapper5NewLCERK6TDesC8PNS_20MHspsWrapperObserverE @ 52 NONAME + _ZN11hspswrapper12CHspsWrapperD0Ev @ 53 NONAME + _ZN11hspswrapper12CHspsWrapperD1Ev @ 54 NONAME + _ZN11hspswrapper12CHspsWrapperD2Ev @ 55 NONAME + _ZN11hspswrapper12CPropertyMap4NewLEv @ 56 NONAME + _ZN11hspswrapper12CPropertyMap5NewLCEv @ 57 NONAME + _ZN11hspswrapper12CPropertyMap8SetNameLERK6TDesC8 @ 58 NONAME + _ZN11hspswrapper12CPropertyMap9SetValueLERK6TDesC8 @ 59 NONAME + _ZN11hspswrapper12CPropertyMapD0Ev @ 60 NONAME + _ZN11hspswrapper12CPropertyMapD1Ev @ 61 NONAME + _ZN11hspswrapper12CPropertyMapD2Ev @ 62 NONAME + _ZN11hspswrapper16CAddPluginResult12SetPluginIdLERK6TDesC8 @ 63 NONAME + _ZN11hspswrapper16CAddPluginResult4NewLEv @ 64 NONAME + _ZN11hspswrapper16CAddPluginResult9SetStatusEi @ 65 NONAME + _ZN11hspswrapper16CAddPluginResultC1Ev @ 66 NONAME + _ZN11hspswrapper16CAddPluginResultC2Ev @ 67 NONAME + _ZN11hspswrapper16CAddPluginResultD0Ev @ 68 NONAME + _ZN11hspswrapper16CAddPluginResultD1Ev @ 69 NONAME + _ZN11hspswrapper16CAddPluginResultD2Ev @ 70 NONAME + _ZN11hspswrapper18CHspsConfiguration10PluginInfoEv @ 71 NONAME + _ZN11hspswrapper18CHspsConfiguration10PluginMapsEv @ 72 NONAME + _ZN11hspswrapper18CHspsConfiguration10SetConfIdLERK6TDesC8 @ 73 NONAME + _ZN11hspswrapper18CHspsConfiguration11AddItemMapLEPNS_8CItemMapE @ 74 NONAME + _ZN11hspswrapper18CHspsConfiguration13AddObjectMapLEPNS_10CObjectMapE @ 75 NONAME + _ZN11hspswrapper18CHspsConfiguration13AddPluginMapLEPNS_10CPluginMapE @ 76 NONAME + _ZN11hspswrapper18CHspsConfiguration4NewLEv @ 77 NONAME + _ZN11hspswrapper18CHspsConfiguration5NewLCEv @ 78 NONAME + _ZN11hspswrapper18CHspsConfiguration8SettingsEv @ 79 NONAME + _ZN11hspswrapper18CHspsConfiguration9ResourcesEv @ 80 NONAME + _ZN11hspswrapper18CHspsConfigurationD0Ev @ 81 NONAME + _ZN11hspswrapper18CHspsConfigurationD1Ev @ 82 NONAME + _ZN11hspswrapper18CHspsConfigurationD2Ev @ 83 NONAME + _ZN11hspswrapper8CItemMap10SetItemIdLERK6TDesC8 @ 84 NONAME + _ZN11hspswrapper8CItemMap12SetItemNameLERK6TDesC8 @ 85 NONAME + _ZN11hspswrapper8CItemMap15AddPropertyMapLEPNS_12CPropertyMapE @ 86 NONAME + _ZN11hspswrapper8CItemMap4NewLEv @ 87 NONAME + _ZN11hspswrapper8CItemMap5NewLCEv @ 88 NONAME + _ZN11hspswrapper8CItemMapD0Ev @ 89 NONAME + _ZN11hspswrapper8CItemMapD1Ev @ 90 NONAME + _ZN11hspswrapper8CItemMapD2Ev @ 91 NONAME + _ZNK11hspswrapper10CObjectMap3TagEv @ 92 NONAME + _ZNK11hspswrapper10CObjectMap4PathEv @ 93 NONAME + _ZNK11hspswrapper10CObjectMap5NameLEv @ 94 NONAME + _ZNK11hspswrapper10CObjectMap9MediaTypeEv @ 95 NONAME + _ZNK11hspswrapper10CPluginMap13LockingStatusEv @ 96 NONAME + _ZNK11hspswrapper10CPluginMap15ActivationStateEv @ 97 NONAME + _ZNK11hspswrapper10CPluginMap8PluginIdEv @ 98 NONAME + _ZNK11hspswrapper10CPluginMap9PluginUidEv @ 99 NONAME + _ZNK11hspswrapper11CPluginInfo11DescriptionEv @ 100 NONAME + _ZNK11hspswrapper11CPluginInfo13MultiInstanceEv @ 101 NONAME + _ZNK11hspswrapper11CPluginInfo18ConfigurationStateEv @ 102 NONAME + _ZNK11hspswrapper11CPluginInfo3UidEv @ 103 NONAME + _ZNK11hspswrapper11CPluginInfo4NameEv @ 104 NONAME + _ZNK11hspswrapper11CPluginInfo4TypeEv @ 105 NONAME + _ZNK11hspswrapper11CPluginInfo8LogoIconEv @ 106 NONAME + _ZNK11hspswrapper11CPluginInfo8MaxChildEv @ 107 NONAME + _ZNK11hspswrapper11CPluginInfo9InterfaceEv @ 108 NONAME + _ZNK11hspswrapper12CHspsWrapper11HspsServiceEv @ 109 NONAME + _ZNK11hspswrapper12CHspsWrapper13HspsInterfaceEv @ 110 NONAME + _ZNK11hspswrapper12CHspsWrapper14ServiceHandlerEv @ 111 NONAME + _ZNK11hspswrapper12CPropertyMap4NameEv @ 112 NONAME + _ZNK11hspswrapper12CPropertyMap5ValueEv @ 113 NONAME + _ZNK11hspswrapper16CAddPluginResult6StatusEv @ 114 NONAME + _ZNK11hspswrapper16CAddPluginResult8PluginIdEv @ 115 NONAME + _ZNK11hspswrapper18CHspsConfiguration6ConfIdEv @ 116 NONAME + _ZNK11hspswrapper8CItemMap10PropertiesEv @ 117 NONAME + _ZNK11hspswrapper8CItemMap6ItemIdEv @ 118 NONAME + _ZNK11hspswrapper8CItemMap8ItemNameEv @ 119 NONAME + _ZTIN11hspswrapper10CObjectMapE @ 120 NONAME + _ZTIN11hspswrapper10CPluginMapE @ 121 NONAME + _ZTIN11hspswrapper11CPluginInfoE @ 122 NONAME + _ZTIN11hspswrapper12CHspsWrapperE @ 123 NONAME + _ZTIN11hspswrapper12CPropertyMapE @ 124 NONAME + _ZTIN11hspswrapper16CAddPluginResultE @ 125 NONAME + _ZTIN11hspswrapper18CHspsConfigurationE @ 126 NONAME + _ZTIN11hspswrapper8CItemMapE @ 127 NONAME + _ZTVN11hspswrapper10CObjectMapE @ 128 NONAME + _ZTVN11hspswrapper10CPluginMapE @ 129 NONAME + _ZTVN11hspswrapper11CPluginInfoE @ 130 NONAME + _ZTVN11hspswrapper12CHspsWrapperE @ 131 NONAME + _ZTVN11hspswrapper12CPropertyMapE @ 132 NONAME + _ZTVN11hspswrapper16CAddPluginResultE @ 133 NONAME + _ZTVN11hspswrapper18CHspsConfigurationE @ 134 NONAME + _ZTVN11hspswrapper8CItemMapE @ 135 NONAME diff -r d721605b30d0 -r 89165693e770 idlehomescreen/sapiwrapper/hspswrapper/inc/hspswrapper.h --- a/idlehomescreen/sapiwrapper/hspswrapper/inc/hspswrapper.h Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/sapiwrapper/hspswrapper/inc/hspswrapper.h Thu Jul 15 18:25:29 2010 +0300 @@ -237,11 +237,18 @@ IMPORT_C TInt SetActivePluginL(const TDesC8& aPluginId); /** - * Restores plug-in configurations from eMMC, UDA and ROM drives. + * Activates another application configuration. * * @return Operation status. KErrNone (success), KErrNotFound */ IMPORT_C TInt RestoreDefaultConfL(); + + /** + * Restores plug-in configurations from eMMC, UDA and ROM drives. + * + * @return Operation status. KErrNone (success), KErrNotFound + */ + IMPORT_C TInt RestoreAllConfL(); /** * Restores plug-in configurations from ROM only. To be used if content diff -r d721605b30d0 -r 89165693e770 idlehomescreen/sapiwrapper/hspswrapper/src/hspswrapper.cpp --- a/idlehomescreen/sapiwrapper/hspswrapper/src/hspswrapper.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/sapiwrapper/hspswrapper/src/hspswrapper.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -69,6 +69,7 @@ _LIT8( KHSPSCommandRestoreConfigurations, "RestoreConfigurations" ); _LIT8( KRestore, "restore" ); _LIT8( KRestoreDefault, "default" ); +_LIT8( KRestoreAll, "all" ); _LIT8( KRestoreRom, "rom" ); _LIT8( KRestoreViews, "views" ); _LIT8( K0, "0" ); @@ -858,6 +859,42 @@ // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // +EXPORT_C TInt CHspsWrapper::RestoreAllConfL() + { + CLiwGenericParamList& inParamList = iServiceHandler->InParamListL(); + CLiwGenericParamList& outParamList = iServiceHandler->OutParamListL(); + + // Compose Liw message + TLiwGenericParam restoreTypeParam; + restoreTypeParam.SetNameAndValueL( KRestore, TLiwVariant( KRestoreAll ) ); + restoreTypeParam.PushL(); + inParamList.AppendL( restoreTypeParam ); + CleanupStack::Pop( &restoreTypeParam ); + restoreTypeParam.Reset(); + + iHspsInterface->ExecuteCmdL( KHSPSCommandRestoreConfigurations, + inParamList, + outParamList ); + + inParamList.Reset(); + + // check success + const TLiwGenericParam* outParam = NULL; + TInt pos(0); + outParam = outParamList.FindFirst( pos, KOutKeyStatus ); + TInt status(KErrGeneral); + + if ( outParam ) + { + status = outParam->Value().AsTInt32(); + } + outParamList.Reset(); + return status; + } + +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// EXPORT_C TInt CHspsWrapper::RestoreDefaultConfL() { CLiwGenericParamList& inParamList = iServiceHandler->InParamListL(); diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/inc/xncontroladapterimpl.h --- a/idlehomescreen/xmluirendering/uiengine/inc/xncontroladapterimpl.h Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/inc/xncontroladapterimpl.h Thu Jul 15 18:25:29 2010 +0300 @@ -36,6 +36,7 @@ class CXnProperty; class CGulIcon; class CXnUiEngine; +class CAknPointerEventSuppressor; //Constants _LIT( KMif, "mif(" ); @@ -551,6 +552,8 @@ TBool iBackgrondInitialized; /** Tells is border images are allready created*/ TBool iBorderInitialized; + /** Suppress drag events, owned */ + CAknPointerEventSuppressor* iSuppressor; }; #endif //__XNCONTROLADAPTERIMPL_H__ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/inc/xnrootdata.h --- a/idlehomescreen/xmluirendering/uiengine/inc/xnrootdata.h Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/inc/xnrootdata.h Thu Jul 15 18:25:29 2010 +0300 @@ -206,6 +206,8 @@ TBool iLoadForward; /** Maximum of views allowed */ TInt32 iMaxPages; + /** Load error code */ + TInt iLoadError; }; #endif // _XNROOTDATA_H diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/inc/xnwidgetextensionadapter.h --- a/idlehomescreen/xmluirendering/uiengine/inc/xnwidgetextensionadapter.h Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/inc/xnwidgetextensionadapter.h Thu Jul 15 18:25:29 2010 +0300 @@ -151,10 +151,10 @@ /** UiEngine, not owned */ CXnUiEngine* iUiEngine; - /** Node, not owned */ + /** Position hint */ + TPositionHint iPositionHint; + /** Node, not owned */ CXnNodePluginIf& iNode; - /** Position hint */ - TPositionHint iPositionHint; /** AppUi, not owned */ CXnAppUiAdapter* iAppUiAdapter; /** Flag to indicate whether is permanent */ diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xnappuiadapterimpl.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xnappuiadapterimpl.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xnappuiadapterimpl.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -141,6 +141,12 @@ // void CXnAppUiAdapterImpl::ReloadUiL() { + // If the UI hasn't been loaded yet, ignore the event + if( !iViewAdapter || !iViewManager ) + { + return; + } + __PRINTS( "*** CXnAppUiAdapterImpl::ReloadUiL" ); __TIME_MARK( time ); diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -149,6 +149,12 @@ // void CXnBackgroundManager::ConstructL() { + // Connect to skin server. + User::LeaveIfError( iSkinSrv.Connect( this ) ); + + // Start listening for drive events. + User::LeaveIfError( iFsSession.Connect() ); + CreateWindowL(); iRect = TRect(); @@ -165,11 +171,6 @@ ActivateL(); iIntUpdate = 0; - User::LeaveIfError( iSkinSrv.Connect( this ) ); - - // Start listening for drive events. - User::LeaveIfError( iFsSession.Connect() ); - // Start listening file server notifications. iDiskNotifier = CDiskNotifyHandler::NewL( *this, iFsSession ); User::LeaveIfError( iDiskNotifier->NotifyDisk() ); @@ -177,7 +178,7 @@ // Reads from cenrep wheteher page specific wallpaper is enabled or not CheckFeatureTypeL(); - GfxTransEffect::Register( this, KGfxContextBgAppear ); + GfxTransEffect::Register( this, KGfxContextBgAppear ); } // ----------------------------------------------------------------------------- @@ -201,7 +202,10 @@ // CXnBackgroundManager::~CXnBackgroundManager() { - GfxTransEffect::Deregister( this ); + if ( GfxTransEffect::IsRegistered( this) ) + { + GfxTransEffect::Deregister( this ); + } iSkinSrv.RemoveAllWallpapers(); iSkinSrv.Close(); @@ -1112,7 +1116,8 @@ CXnViewData& activeView = iViewManager.ActiveViewData(); const TDesC& path( activeView.WallpaperImagePath() ); - if( path != KNullDesC && activeView.WallpaperImage() ) + RFs& fs( CEikonEnv::Static()->FsSession() ); + if ( path != KNullDesC && BaflUtils::FileExists( fs, path ) ) { iIntUpdate++; TInt err( AknsWallpaperUtils::SetIdleWallpaper( path, NULL ) ); diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xncomposer.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xncomposer.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xncomposer.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -580,7 +580,7 @@ // TInt CXnComposer::ComposeViewL( CXnViewData& aViewData ) { - TInt retval( KXnErrPluginFailure ); + TInt retval( KXnErrViewPluginFailure ); if ( aViewData.PluginId() == KNullDesC8 ) { @@ -726,7 +726,7 @@ // TInt CXnComposer::ComposeWidgetL( CXnPluginData& aPluginData ) { - TInt retval( KXnErrPluginFailure ); + TInt retval( KXnErrWidgetPluginFailure ); if ( aPluginData.PluginId() == KNullDesC8 ) { diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xncontroladapterimpl.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xncontroladapterimpl.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xncontroladapterimpl.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -28,6 +28,7 @@ #include #include #include +#include #ifdef RD_TACTILE_FEEDBACK #include #endif // RD_TACTILE_FEEDBACK @@ -62,6 +63,7 @@ #include "xneditmode.h" _LIT8(KScrollableBoxNodeName, "scrollablebox"); +_LIT8( KView, "view" ); // Constants const TInt KSkinGfxInnerRectShrink = 5; @@ -72,7 +74,8 @@ const TInt KLongTapTimeShortDelay( 600000 ); // 0.6s for SK const TInt KLongTapTimeLongDelay( 1500000 ); // 1.5s -const TInt KDragThreshold = 20; // pixels +const TInt KDragThreshold = 100; // pixels +const TInt KMaxTapMove = 100; //100x100 pixels const TReal KEps( 3e-16 ); // proximite EPS value for double FP numbers @@ -3589,6 +3592,7 @@ } delete iGestureFw; + delete iSuppressor; } // ----------------------------------------------------------------------------- @@ -3883,7 +3887,7 @@ // TBool CXnControlAdapterImpl::HandlePointerEventL( const TPointerEvent& aPointerEvent ) - { + { const TPointerEvent& event( aPointerEvent ); CXnNode* node( &iNode.Node() ); @@ -3912,6 +3916,12 @@ return ETrue; } } + else if ( iSuppressor && + iSuppressor->SuppressPointerEvent( aPointerEvent ) ) + { + // if view does not handle swipe we have to pass event to children + return ( iGestureDestination == node ); + } CAknLongTapDetector* detector( iAdapter->LongTapDetector() ); @@ -3987,8 +3997,7 @@ { if ( node->IsStateSet( XnPropertyNames::style::common::KFocus ) ) { - if ( IsDragThresholdExceeded( event.iPosition ) || - !node->MarginRect().Contains( event.iPosition ) ) + if ( IsDragThresholdExceeded( event.iPosition ) ) { // Remove focus node->UnsetStateL( @@ -4003,9 +4012,8 @@ if ( menuBar ) { node->SetStateL( XnPropertyNames::style::common::KActive ); - } - else if ( ( node->MarginRect().Contains( event.iPosition ) && - node->IsStateSet( XnPropertyNames::style::common::KFocus ) ) ) + } + else if ( node->IsStateSet( XnPropertyNames::style::common::KFocus ) ) { #ifdef RD_TACTILE_FEEDBACK MTouchFeedback* feedback( MTouchFeedback::Instance() ); @@ -5305,6 +5313,13 @@ iGestureFw = CAknTouchGestureFw::NewL( *this, aAdapter ); iGestureFw->SetGestureInterestL( EAknTouchGestureFwGroupFlick ); } + + if ( aNode.Type()->Type() == KView ) + { + iSuppressor = CAknPointerEventSuppressor::NewL(); + iSuppressor->SetMaxTapMove( TSize( KMaxTapMove, KMaxTapMove) ); + iSuppressor->SetMaxTapDuration( KLongTapTimeLongDelay ); + } } // ----------------------------------------------------------------------------- diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xneditor.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xneditor.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xneditor.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -313,8 +313,8 @@ iHspsWrapper = CHspsWrapper::NewL( aUid, this ); iRepository= CRepository::NewL( TUid::Uid( KCRUidActiveIdleLV ) ); iOomSysHandler = CXnOomSysHandler::NewL(); - iNotifyWidgetListChanged = CPeriodic::New( CActive::EPriorityIdle ); - iNotifyViewListChanged = CPeriodic::New( CActive::EPriorityIdle ); + iNotifyWidgetListChanged = CPeriodic::NewL( CActive::EPriorityIdle ); + iNotifyViewListChanged = CPeriodic::NewL( CActive::EPriorityIdle ); } // --------------------------------------------------------------------------- @@ -323,13 +323,15 @@ // CXnEditor::~CXnEditor() { - if ( iNotifyWidgetListChanged->IsActive() ) + if ( iNotifyWidgetListChanged && + iNotifyWidgetListChanged->IsActive() ) { iNotifyWidgetListChanged->Cancel(); } delete iNotifyWidgetListChanged; - if ( iNotifyViewListChanged->IsActive() ) + if ( iNotifyViewListChanged && + iNotifyViewListChanged->IsActive() ) { iNotifyViewListChanged->Cancel(); } @@ -2160,9 +2162,11 @@ for ( TInt i = 0; i < aInfos.Count() && !contentInfo; i++ ) { CHsContentInfo* info = aInfos[i]; - if ( aPlugin.PluginUid().CompareF( info->Uid() ) == 0 && - ( ( aPlugin.PublisherName().Length() == 0 ) || - ( aPlugin.PublisherName().CompareF( info->PublisherId() ) == 0 ) ) ) + if ( ( !aPlugin.PublisherName().Length() && + aPlugin.PluginUid().CompareF( info->Uid() ) == 0 ) || + ( aPlugin.PublisherName().Length() && + aPlugin.PublisherName().CompareF( info->PublisherId() ) == 0 ) + ) { contentInfo = info->CloneL(); CleanupStack::PushL( contentInfo ); diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xnplugindata.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xnplugindata.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xnplugindata.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -141,7 +141,7 @@ // Succesfully composed, try schedule publishers' loading LoadPublishers( EAiFwPluginStartup ); } - else if ( err == KXnErrPluginFailure ) + else if ( err == KXnErrWidgetPluginFailure ) { // Widget's configuration is broken, remove it TRAP_IGNORE( iManager.UnloadWidgetFromPluginL( *this, ETrue ) ); diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xnrootdata.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xnrootdata.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xnrootdata.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -19,7 +19,6 @@ // User includes -#include #include "xnviewmanager.h" #include "xnviewdata.h" @@ -160,7 +159,7 @@ if ( !iODT ) { // Can't recover - Panic( EXnInvalidConfiguration ); + return EXnInvalidConfiguration; } if ( !err ) @@ -169,7 +168,7 @@ } if ( !err ) - { + { for ( TInt i = 0; i < iPluginsData.Count(); i++ ) { CXnViewData* plugin( @@ -178,54 +177,55 @@ if ( plugin->Initial() ) { err = plugin->Load(); - + if ( plugin->Occupied() ) { - // Initial view is succesfully composed. Some plugins - // may have failed but it doesn't matter as those are removed - return KErrNone; + // Initial view is succesfully composed. Some widget plugins + // may have failed but it doesn't matter as those are removed. + // Rest of the views will be loaded asynchronously by the RunLoadL() + return err; } - - // Initial view failed, remove it - iPluginsData.Remove( i ); + + // Initial view failed + iManager.RemoveFaultyView( plugin ); delete plugin; - plugin = NULL; - break; + plugin = NULL; + break; } } - + // Initial view loading failed, fallback to load any of the views while( iPluginsData.Count() ) { CXnViewData* plugin( static_cast< CXnViewData* >( iPluginsData[ 0 ] ) ); + plugin->SetInitial(); + // Ignore error plugin->Load(); if ( plugin->Occupied() ) { - // Return error because of fallback condition - return KXnErrPluginFailure; + // Return error because of fallback condition + return KXnErrViewPluginFailure; } - // View failed, remove it - iPluginsData.Remove( 0 ); + // View failed, remove it + iManager.RemoveFaultyView( plugin ); delete plugin; - plugin = NULL; + plugin = NULL; } } else if ( err == KErrNoMemory ) { - TRAP_IGNORE( iManager.ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } - + return err; + } + // Configuration loading failed totally - Panic( EXnInvalidConfiguration ); - - return err; + return EXnInvalidConfiguration; } // ----------------------------------------------------------------------------- @@ -257,6 +257,7 @@ if ( !AllViewsLoaded() ) { iLoadForward = ETrue; + iLoadError = KErrNone; iLoadTimer->Cancel(); @@ -488,76 +489,92 @@ if ( self->iFlags.IsSet( EIsDispose ) ) { self->iLoadTimer->Cancel(); + return KErrNone; + } + + CXnPluginData& active( self->ActiveViewData() ); + + CXnPluginData* toLoad( NULL ); + + TInt index( self->iPluginsData.Find( &active ) ); + TInt count( self->iPluginsData.Count() ); + + if ( self->iLoadForward ) + { + self->iLoadForward = EFalse; + + // Start from the next one + index = index + 1; + + if ( index == count ) + { + index = 0; + } + + for ( TInt i = index; i < self->iPluginsData.Count(); i++ ) + { + if ( !self->iPluginsData[i]->Occupied() ) + { + toLoad = self->iPluginsData[i]; + break; + } + } } else - { - CXnPluginData& active( self->ActiveViewData() ); + { + self->iLoadForward = ETrue; - CXnPluginData* toLoad( NULL ); - - TInt index( self->iPluginsData.Find( &active ) ); - TInt count( self->iPluginsData.Count() ); - - if ( self->iLoadForward ) + if ( index == 0 ) { - self->iLoadForward = EFalse; - - // Start from the next one - index = index + 1; - - if ( index == count ) - { - index = 0; - } - - for ( TInt i = index; i < self->iPluginsData.Count(); i++ ) - { - if ( !self->iPluginsData[i]->Occupied() ) - { - toLoad = self->iPluginsData[i]; - break; - } - } + index = count - 1; } else { - self->iLoadForward = ETrue; - - if ( index == 0 ) - { - index = count - 1; - } - else + index = index - 1; + } + + for ( TInt i = index; i >= 0; i-- ) + { + if ( !self->iPluginsData[i]->Occupied() ) { - index = index - 1; - } - - for ( TInt i = index; i >= 0; i-- ) - { - if ( !self->iPluginsData[i]->Occupied() ) - { - toLoad = self->iPluginsData[i]; - break; - } + toLoad = self->iPluginsData[i]; + break; } } + } + + TInt err( KErrNone ); + + if ( !self->AllViewsLoaded() && toLoad ) + { + err = toLoad->Load(); - if ( !self->AllViewsLoaded() && toLoad ) - { - if ( toLoad->Load() == KErrNoMemory ) - { - TRAP_IGNORE( - self->iManager.ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } + if ( err ) + { + self->iLoadError = err; } - - if ( self->AllViewsLoaded() ) - { - self->iLoadTimer->Cancel(); - self->iManager.NotifyAllViewsLoadedL(); - } } + if ( err == KXnErrViewPluginFailure ) + { + // Remove the view + self->iManager.RemoveFaultyView( static_cast< CXnViewData* >( toLoad ) ); + + delete toLoad; + toLoad = NULL; + } + + if ( self->AllViewsLoaded() || err == KErrNoMemory ) + { + self->iLoadTimer->Cancel(); + + // Show the error note only once + self->iManager.HandleErrorNotes( self->iLoadError ); + + self->iLoadError = KErrNone; + self->iManager.NotifyAllViewsLoadedL(); + } + __PRINTS( "*** CXnRootData::RunLoadL - done" ); return KErrNone; diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xnviewdata.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xnviewdata.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xnviewdata.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -33,6 +33,7 @@ #include "ainativeuiplugins.h" #include "xnpanic.h" + #include "debug.h" // Constants @@ -162,21 +163,19 @@ // ----------------------------------------------------------------------------- // TInt CXnViewData::Load() - { - iLoadError = KErrNone; - + { + TInt err( KErrNone ); + if ( Occupied() ) { - iLoadError = KErrInUse; + err = KErrInUse; } else if ( !CXnOomSysHandler::HeapAvailable( VIEW_MIN_MEM ) ) { - iLoadError = KErrNoMemory; + err = KErrNoMemory; } else - { - TInt err( KErrNone ); - + { TRAP( err, err = iManager.Composer().ComposeViewL( *this ) ); if ( err == KErrNone ) @@ -193,7 +192,7 @@ { TInt err2( iPluginsData[i]->Load() ); - if ( err2 == KXnErrPluginFailure ) + if ( err2 == KXnErrWidgetPluginFailure ) { err = err2; } @@ -207,11 +206,11 @@ // Succesfully enough composed, publishers // will be loaded when view is activated - } - - iLoadError = err; + } } - + + iLoadError = err; + return iLoadError; } @@ -577,7 +576,7 @@ { iManager.UnloadWidgetFromPluginL( *plugin, ETrue ); - result = KXnErrPluginFailure; + result = KXnErrWidgetPluginFailure; } } } diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xnviewmanager.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xnviewmanager.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xnviewmanager.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -27,6 +27,7 @@ #include #include #include +#include // User includes #include "xnapplication.h" @@ -65,9 +66,10 @@ const TInt KPSCrashCountKey( 1 ); const TInt KStabilityInterval( 60000000 ); // 1 minute const TInt KActivationCompleteInterval( 2000000 ); // 2s -const TInt KCrashRestoreDefaultThreshold( 3 ); -const TInt KCrashRestoreRomTreshold( 4 ); -const TInt KCrashRestoreViewsTreshold( 5 ); +const TInt KCrashRestoreDefaultTreshold( 3 ); +const TInt KCrashRestoreAllTreshold( 4 ); +const TInt KCrashRestoreRomTreshold( 5 ); +const TInt KCrashRestoreViewsTreshold( 6 ); // ============================ LOCAL FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -348,8 +350,21 @@ iRootData = CXnRootData::NewL( *this, iApplicationUid ); // Load root configuration and initial view. - iRootData->Load(); - + TInt err = iRootData->Load(); + + if( err == EXnInvalidConfiguration ) + { + // Configuration loading failed totally + Panic( EXnInvalidConfiguration ); + } + + // Show the error note only once, if there are more views + // the note should be shown from CXnRootData::RunLoadL() + if( iRootData->PluginData().Count() == 1 ) + { + HandleErrorNotes( err ); + } + CleanupStack::PopAndDestroy(); // DisableRenderUiLC(); // Load initial view publishers @@ -482,14 +497,9 @@ // Report widget amount in the view ReportWidgetAmountL( viewData ); } - else if ( retval == KErrNoMemory ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } - else if ( retval == KXnErrPluginFailure ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ) ); - } + + // Handle the errors + HandleErrorNotes( retval ); CleanupStack::PopAndDestroy(); // DisableRenderUiLC } @@ -630,15 +640,10 @@ } } } - else if ( retval == KErrNoMemory ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } - else if ( retval == KXnErrPluginFailure ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ) ); - } - + + // Handle the errors + HandleErrorNotes( retval ); + CleanupStack::PopAndDestroy(); // DisableRenderUiLC } @@ -897,15 +902,7 @@ if ( err ) { - if ( err == KErrNoMemory ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } - else if ( err == KXnErrPluginFailure ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ) ); - } - + HandleErrorNotes( err ); return; } } @@ -933,15 +930,7 @@ if ( err ) { - if ( err == KErrNoMemory ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } - else if ( err == KXnErrPluginFailure ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ) ); - } - + HandleErrorNotes( err ); return; } } @@ -989,14 +978,7 @@ retval = newView->Load(); - if ( retval == KErrNoMemory ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } - else if ( retval == KXnErrPluginFailure ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ) ); - } + HandleErrorNotes( retval ); if ( newView->Occupied() ) { @@ -1072,14 +1054,7 @@ status = newView->Load(); - if ( status == KErrNoMemory ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } - else if ( status == KXnErrPluginFailure ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ) ); - } + HandleErrorNotes( status ); if ( newView->Occupied() ) { @@ -1120,6 +1095,41 @@ } // ----------------------------------------------------------------------------- +// CXnViewManager::RemoveFaultyView() +// Removes a view which has failed to load +// ----------------------------------------------------------------------------- +// +TInt CXnViewManager::RemoveFaultyView( CXnViewData* aViewData ) + { + TInt retval( KErrGeneral ); + + if( aViewData ) + { + RPointerArray< CXnPluginData >& views( iRootData->PluginData() ); + + TInt index( views.Find( aViewData ) ); + + if ( index != KErrNotFound ) + { + // Remove instance from the views array + views.Remove( index ); + + // Remove the faulty view configuration from the root configuration in HSPS + TRAP_IGNORE( iHspsWrapper->RemovePluginL( aViewData->PluginId() ) ); + + // Update MSK from the remaining views + TRAP_IGNORE( UpdatePageManagementInformationL() ); + + TRAP_IGNORE( iUiEngine->RenderUIL() ); + + retval = KErrNone; + } + } + + return retval; + } + +// ----------------------------------------------------------------------------- // CXnViewManager::RemoveViewL() // Removes view based info // ----------------------------------------------------------------------------- @@ -1404,14 +1414,7 @@ iRootData->LoadRemainingViews(); } - if ( err == KErrNoMemory ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); - } - else if ( err == KXnErrPluginFailure ) - { - TRAP_IGNORE( ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ) ); - } + HandleErrorNotes( err ); NotifyViewActivatedL( aViewToActivate ); } @@ -1457,7 +1460,7 @@ { ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ); } - else if ( aResult == KXnErrPluginFailure ) + else if ( aResult == KXnErrWidgetPluginFailure ) { ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ); } @@ -1709,6 +1712,29 @@ } // ----------------------------------------------------------------------------- +// CXnViewManager::HandleErrorNotes +// +// ----------------------------------------------------------------------------- +// +void CXnViewManager::HandleErrorNotes( const TInt aError ) const + { + switch( aError ) + { + case KErrNoMemory: + TRAP_IGNORE( ShowErrorL( R_QTN_HS_HS_MEMORY_FULL ) ); + break; + + case KXnErrViewPluginFailure: + case KXnErrWidgetPluginFailure: + TRAP_IGNORE( ShowErrorL( R_QTN_HS_ERROR_WIDGETS_REMOVED ) ); + break; + + default: + break; + } + } + +// ----------------------------------------------------------------------------- // CXnViewManager::OOMSysHandler // // ----------------------------------------------------------------------------- @@ -1818,9 +1844,9 @@ RProperty::Get( TUid::Uid( KPSCategoryUid ), KPSCrashCountKey, crashCount ); - - if( crashCount == KCrashRestoreDefaultThreshold ) - { + if( crashCount == KCrashRestoreDefaultTreshold ) + { + // Try to activate another root configuration with a licensee default status iHspsWrapper->RestoreDefaultConfL(); CAknQueryDialog* query = CAknQueryDialog::NewL(); @@ -1830,14 +1856,21 @@ query->SetPromptL( queryText->Des() ); CleanupStack::PopAndDestroy( queryText ); - query->RunLD(); + query->RunLD(); + } + else if( crashCount == KCrashRestoreAllTreshold ) + { + // Reinstall all plugins from the ROM, UDA and eMMC drives + iHspsWrapper->RestoreAllConfL(); } else if( crashCount == KCrashRestoreRomTreshold ) { + // Reinstall from the ROM drive only iHspsWrapper->RestoreRomConfL(); } else if( crashCount >= KCrashRestoreViewsTreshold ) { + // Remove all the Homescreen pages and widgets iHspsWrapper->RestoreViewsL(); ResetCrashCount(); diff -r d721605b30d0 -r 89165693e770 idlehomescreen/xmluirendering/uiengine/src/xnwidgetextensionadapter.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xnwidgetextensionadapter.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/idlehomescreen/xmluirendering/uiengine/src/xnwidgetextensionadapter.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -112,7 +112,8 @@ // ----------------------------------------------------------------------------- // CXnWidgetExtensionAdapter::CXnWidgetExtensionAdapter( CXnNodePluginIf& aNode ) - : iNode( aNode ), iPositionHint( EAboveLeft ) + : iPositionHint( AknLayoutUtils::LayoutMirrored() ? EAboveRight : EAboveLeft ), + iNode( aNode ) { } @@ -412,14 +413,13 @@ iPositionHint = EAboveLeft; } } - - if ( iPositionHint != ENone ) - { - // the popup is going visible and position-hind is available - // calculate its position - CalculatePosition(); - } - } + } + if ( iPositionHint != ENone ) + { + // the popup is going visible and position-hind is available + // calculate its position + CalculatePosition(); + } } } diff -r d721605b30d0 -r 89165693e770 taskswitcher/contextengine/tsfswserver/engine/inc/tsfswidgetlist.h --- a/taskswitcher/contextengine/tsfswserver/engine/inc/tsfswidgetlist.h Mon Jun 21 15:27:11 2010 +0300 +++ b/taskswitcher/contextengine/tsfswserver/engine/inc/tsfswidgetlist.h Thu Jul 15 18:25:29 2010 +0300 @@ -51,13 +51,13 @@ */ TBool IsCWRTWidget( TUid aUid ); + private: /** Constructor */ CTsFsWidgetList(); + void ConstructL(); void ResetArrayOfWidgetInfo( RWidgetInfoArray& aWidgetInfoArr ); - static void CleanupConnect( TAny* aThis ); - TBool IsValBetween( TInt aMinor, TInt aMajor, TInt aBetween ); private: diff -r d721605b30d0 -r 89165693e770 taskswitcher/contextengine/tsfswserver/engine/src/tsfshiddenapplist.cpp --- a/taskswitcher/contextengine/tsfswserver/engine/src/tsfshiddenapplist.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/taskswitcher/contextengine/tsfswserver/engine/src/tsfshiddenapplist.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -152,8 +152,8 @@ // must not call RunL directly from here as things are not fully initialized yet TRequestStatus* status = &iStatus; + SetActive(); User::RequestComplete( status, KErrNone ); - SetActive(); } // ----------------------------------------------------------------------------- diff -r d721605b30d0 -r 89165693e770 taskswitcher/contextengine/tsfswserver/engine/src/tsfswidgetlist.cpp --- a/taskswitcher/contextengine/tsfswserver/engine/src/tsfswidgetlist.cpp Mon Jun 21 15:27:11 2010 +0300 +++ b/taskswitcher/contextengine/tsfswserver/engine/src/tsfswidgetlist.cpp Thu Jul 15 18:25:29 2010 +0300 @@ -26,7 +26,20 @@ // CTsFsWidgetList* CTsFsWidgetList::NewL() { - return new (ELeave) CTsFsWidgetList; + CTsFsWidgetList* self = new (ELeave) CTsFsWidgetList(); + CleanupStack::PushL (self ); + self->ConstructL ( ); + CleanupStack::Pop ( self ); + return self; + } + +// -------------------------------------------------------------------------- +// CTsFsWidgetList::CTsFsWidgetList +// -------------------------------------------------------------------------- +// +void CTsFsWidgetList::ConstructL() + { + User::LeaveIfError( iWidgetRegistryClientSession.Connect() ); } // -------------------------------------------------------------------------- @@ -36,7 +49,7 @@ CTsFsWidgetList::CTsFsWidgetList() { } - + // -------------------------------------------------------------------------- // CTsFsWidgetList::~CTsFsWidgetList // -------------------------------------------------------------------------- @@ -45,16 +58,7 @@ { ResetArrayOfWidgetInfo( iRunningWidgets ); iRunningWidgets.Reset(); - } - -// -------------------------------------------------------------------------- -// CTsFsWidgetList::CleanupConnect -// -------------------------------------------------------------------------- -// -void CTsFsWidgetList::CleanupConnect( TAny* aThis ) - { - CTsFsWidgetList* self = static_cast( aThis ); - self->iWidgetRegistryClientSession.Disconnect(); + iWidgetRegistryClientSession.Disconnect(); } // -------------------------------------------------------------------------- @@ -65,17 +69,13 @@ { ResetArrayOfWidgetInfo( iRunningWidgets ); iRunningWidgets.Reset(); - User::LeaveIfError( iWidgetRegistryClientSession.Connect() ); - CleanupStack::PushL( TCleanupItem( CleanupConnect, this) ); - iWidgetRegistryClientSession.RunningWidgetsL(iRunningWidgets); + iWidgetRegistryClientSession.RunningWidgetsL(iRunningWidgets); //modify useless file size information with mode flag for ( TInt i(iRunningWidgets.Count() - 1); 0 <= i; --i ) { iRunningWidgets[i]->iFileSize = iWidgetRegistryClientSession.IsWidgetInFullView(iRunningWidgets[i]->iUid); } - CleanupStack::Pop(); // clean WidgetRegistryClientSession item - iWidgetRegistryClientSession.Disconnect(); } // --------------------------------------------------------------------------