# HG changeset patch # User Christian Morlok # Date 1273154383 -7200 # Node ID 9f778a73d522c4900080200a3d2dee6d67d824dd # Parent f3dfe99e68bf25766434ba2939780057745fb5be updated dependencies; added icons; everything (hssrv and hs) compiles with winscw_udeb without error diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/group/bld.inf --- a/idlehomescreen/group/bld.inf Tue Apr 13 15:11:45 2010 +0300 +++ b/idlehomescreen/group/bld.inf Thu May 06 15:59:43 2010 +0200 @@ -29,7 +29,7 @@ #include "../widgetmanager/group/bld.inf" #ifdef FF_HOMESCREEN_COMMON_IDLEFW -//#include "../data/group/bld.inf" +#include "../data/group/bld.inf" #endif PRJ_PLATFORMS diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/nativeuicontroller/group/ainatiui.mmp --- a/idlehomescreen/nativeuicontroller/group/ainatiui.mmp Tue Apr 13 15:11:45 2010 +0300 +++ b/idlehomescreen/nativeuicontroller/group/ainatiui.mmp Thu May 06 15:59:43 2010 +0200 @@ -62,6 +62,7 @@ USERINCLUDE ../../inc APP_LAYER_SYSTEMINCLUDE +SYSTEMINCLUDE /epoc32/include/platform/app/loc LIBRARY euser.lib LIBRARY ecom.lib diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/nativeuicontroller/src/appui.cpp --- a/idlehomescreen/nativeuicontroller/src/appui.cpp Tue Apr 13 15:11:45 2010 +0300 +++ b/idlehomescreen/nativeuicontroller/src/appui.cpp Thu May 06 15:59:43 2010 +0200 @@ -50,6 +50,7 @@ #include #include #include +#include namespace { diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/xmluicontroller/group/bld.inf --- a/idlehomescreen/xmluicontroller/group/bld.inf Tue Apr 13 15:11:45 2010 +0300 +++ b/idlehomescreen/xmluicontroller/group/bld.inf Thu May 06 15:59:43 2010 +0200 @@ -43,6 +43,7 @@ START EXTENSION s60/mifconv OPTION TARGETFILE activeidle2.mif OPTION HEADERFILE activeidle2.mbg +OPTION SOURCEDIR . OPTION SOURCES -c8,8 qgn_indi_tb_appsgrid \ -c8,8 qgn_indi_tb_dialler \ -c8,8 qgn_indi_tb_profiles @@ -50,18 +51,19 @@ START EXTENSION s60/mifconv OPTION TARGETFILE homescreen_aif.mif +OPTION SOURCEDIR . OPTION SOURCES -c8,8 qgn_menu_idlestate END PRJ_MMPFILES -#ifdef __SCALABLE_ICONS -// gnumakefile icons.mk -// gnumakefile icons_aif_scalable.mk -#else - gnumakefile icons_aif_bitmaps.mk -#endif +// #ifdef __SCALABLE_ICONS +// // gnumakefile icons.mk +// // gnumakefile icons_aif_scalable.mk +// #else +// gnumakefile icons_aif_bitmaps.mk +// #endif aixmluimain.mmp diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/xmluicontroller/group/icons_aif_bitmaps.mk --- a/idlehomescreen/xmluicontroller/group/icons_aif_bitmaps.mk Tue Apr 13 15:11:45 2010 +0300 +++ b/idlehomescreen/xmluicontroller/group/icons_aif_bitmaps.mk Thu May 06 15:59:43 2010 +0200 @@ -25,7 +25,7 @@ ICONTARGETFILENAME=$(TARGETDIR)\homescreen_aif.mbm MAKMAKE : - mifconv $(ICONTARGETFILENAME) \ + mifconv-s3 $(ICONTARGETFILENAME) \ /c8,8 qgn_menu_idlestate_lst.bmp \ /c8,8 qgn_menu_idlestate_cxt.bmp diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/xmluicontroller/group/qgn_indi_tb_appsgrid.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/xmluicontroller/group/qgn_indi_tb_appsgrid.svg Thu May 06 15:59:43 2010 +0200 @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/xmluicontroller/group/qgn_indi_tb_dialler.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/xmluicontroller/group/qgn_indi_tb_dialler.svg Thu May 06 15:59:43 2010 +0200 @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/xmluicontroller/group/qgn_indi_tb_profiles.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/xmluicontroller/group/qgn_indi_tb_profiles.svg Thu May 06 15:59:43 2010 +0200 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r f3dfe99e68bf -r 9f778a73d522 idlehomescreen/xmluicontroller/group/qgn_menu_idlestate.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/idlehomescreen/xmluicontroller/group/qgn_menu_idlestate.svg Thu May 06 15:59:43 2010 +0200 @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file