# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282117680 -10800 # Node ID 4c5ac0e85ed36823a53a36658b66c23387fd0266 # Parent 3bd7be4c92788250eb4e72ca7fa799c140f3de91 Revision: 201031 Kit: 201033 diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 fontsupport/fontprovider/Group/bld.inf --- a/fontsupport/fontprovider/Group/bld.inf Tue Jul 06 15:23:53 2010 +0300 +++ b/fontsupport/fontprovider/Group/bld.inf Wed Aug 18 10:48:00 2010 +0300 @@ -20,6 +20,8 @@ #include +#ifndef FF_PRODUCT_FONTS + PRJ_EXPORTS ../data/link.ini /epoc32/data/z/private/1020509C/link.ini ../data/link.ini /epoc32/RELEASE/WINSCW/udeb/Z/private/1020509C/link.ini @@ -33,5 +35,5 @@ #ifndef TOOLS FontProvider.mmp #endif - +#endif // End of file diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 fontsupport/fontutils/group/bld.inf --- a/fontsupport/fontutils/group/bld.inf Tue Jul 06 15:23:53 2010 +0300 +++ b/fontsupport/fontutils/group/bld.inf Wed Aug 18 10:48:00 2010 +0300 @@ -26,15 +26,6 @@ PRJ_EXPORTS -// Copy font rasterizer -../iTypeRaster/winscw/ityperast.dll /epoc32/release/winscw/udeb/iTypeRast.dll -../iTypeRaster/winscw/ityperast.dll /epoc32/release/winscw/urel/iTypeRast.dll -../iTypeRaster/winscw/ityperast.RSC /epoc32/release/winscw/udeb/z/resource/plugins/iTypeRast.rsc -../iTypeRaster/winscw/ityperast.RSC /epoc32/release/winscw/urel/z/resource/plugins/iTypeRast.rsc - -../iTypeRaster/armv5/ityperast.dll /epoc32/release/armv5/udeb/iTypeRast.dll -../iTypeRaster/armv5/ityperast.dll /epoc32/release/armv5/urel/iTypeRast.dll -../iTypeRaster/armv5/ityperast.RSC /epoc32/data/z/resource/plugins/iTypeRast.RSC // Select correct font source directory #ifndef RD_KANNADA_FONTS @@ -137,7 +128,9 @@ // Export IBY files ../rom/FontUtils.iby CORE_MW_LAYER_IBY_EXPORT_PATH(FontUtils.iby) +#ifndef FF_PRODUCT_FONTS ../rom/fonts_variant.iby CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(fonts_variant.iby) +#endif ./removegtfiles.meta /epoc32/tools/makefile_templates/s60/removegtfiles.meta ./removegtfiles.flm /epoc32/tools/makefile_templates/s60/removegtfiles.flm diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 fontsupport/fontutils/group/removegtfiles.mk --- a/fontsupport/fontutils/group/removegtfiles.mk Tue Jul 06 15:23:53 2010 +0300 +++ b/fontsupport/fontutils/group/removegtfiles.mk Wed Aug 18 10:48:00 2010 +0300 @@ -24,7 +24,6 @@ # Remove any gt files that we do not want # MAKMAKE : - @if exist $(TARGETDIR)\RESOURCE\FONTS\eon14.gdr erase /F $(TARGETDIR)\RESOURCE\FONTS\eon14.gdr @if exist $(TARGETDIR)\RESOURCE\FONTS\ncrbiu.ttf erase /F $(TARGETDIR)\RESOURCE\FONTS\ncrbiu.ttf @if exist $(TARGETDIR)\RESOURCE\FONTS\ncrbru.ttf erase /F $(TARGETDIR)\RESOURCE\FONTS\ncrbru.ttf @if exist $(TARGETDIR)\RESOURCE\FONTS\ncrriu.ttf erase /F $(TARGETDIR)\RESOURCE\FONTS\ncrriu.ttf diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 fontsupport/group/bld.inf --- a/fontsupport/group/bld.inf Tue Jul 06 15:23:53 2010 +0300 +++ b/fontsupport/group/bld.inf Wed Aug 18 10:48:00 2010 +0300 @@ -15,6 +15,7 @@ * */ - +#ifndef FF_PRODUCT_FONTS #include "../fontprovider/Group/bld.inf" +#endif #include "../fontutils/group/bld.inf" diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 locales/loce32/language/group/elocl_language_eu.mmp --- a/locales/loce32/language/group/elocl_language_eu.mmp Tue Jul 06 15:23:53 2010 +0300 +++ b/locales/loce32/language/group/elocl_language_eu.mmp Wed Aug 18 10:48:00 2010 +0300 @@ -19,7 +19,7 @@ #include -TARGET elocl_lan.401 +TARGET elocl_lan.102 CAPABILITY ALL TARGETTYPE dll diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 locales/loce32/language/group/elocl_language_sv.mmp --- a/locales/loce32/language/group/elocl_language_sv.mmp Tue Jul 06 15:23:53 2010 +0300 +++ b/locales/loce32/language/group/elocl_language_sv.mmp Wed Aug 18 10:48:00 2010 +0300 @@ -27,7 +27,7 @@ SOURCEPATH ../src SOURCE language.cpp -SOURCE language_en_gb.cpp +SOURCE language_sv.cpp // This is a SYSTEMINCLUDE macro containing the middleware // layer specific include directories diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 locales/loce32/language/src/language_sv.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locales/loce32/language/src/language_sv.cpp Wed Aug 18 10:48:00 2010 +0300 @@ -0,0 +1,139 @@ +/* +* Copyright (c) 1994-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + + +// EXTERNAL RESOURCES + + +// Include Files + +#include +#include "locl_language.h" + +const TLanguage LanguageAspect::Language = ELangSwedish; +const TLanguage LanguageAspect::LanguageDowngrade[3] = {ELangNone, ELangNone, ELangNone}; +const TDigitType LanguageAspect::DigitType = EDigitTypeWestern; +const TFatUtilityFunctions* const LanguageAspect::FatUtilityFunctions = NULL; + + + +// LOCAL CONSTANTS AND MACROS +const TText * const LanguageAspect::MsgTable[ELocaleMessages_LastMsg] = + { +// Fileserver + _S("Försök igen"), // Button 1 + _S("Stopp"), // Button 2 + _S("Sätt tillbaka disketten"), // Put the card back - line1 + _S("annars kommer du att förlora data"), // Put the card back - line2 + _S("Batteriet har för lite laddning kvar"), // Low power - line1 + _S("Kan inte avsluta lagring på diskett"), // Low power - line2 + _S("Diskettfel - kan inte avsluta lagring"), // Disk error - line1 + _S("Försök igen annars kommer du att förlora data"), // Disk error - line2 +// SoundDriver + _S("Klockringning"), // Chimes + _S("Ringsignaler"), // Rings + _S("Signal"), // Signal +// MediaDriver diskname (max 16 chars) + _S("Internal"), // Internal + _S("External(01)"), // External(01) + _S("External(02)"), // External(02) + _S("External(03)"), // External(03) + _S("External(04)"), // External(04) + _S("External(05)"), // External(05) + _S("External(06)"), // External(06) + _S("External(07)"), // External(07) + _S("External(08)"), // External(08) +// MediaDriver socketname (max 16 chars) + _S("Socket(01)"), // Socket(01) + _S("Socket(02)"), // Socket(02) + _S("Socket(03)"), // Socket(03) + _S("Socket(04)") // Socket(04) + }; + +// The suffix table +const TText * const LanguageAspect::DateSuffixTable[KMaxSuffixes] = + { + _S(""),_S(""),_S(""),_S(""),_S(""), + _S(""),_S(""),_S(""),_S(""),_S(""), + _S(""),_S(""),_S(""),_S(""),_S(""), + _S(""),_S(""),_S(""),_S(""),_S(""), + _S(""),_S(""),_S(""),_S(""),_S(""), + _S(""),_S(""),_S(""),_S(""),_S(""), + _S("") + }; +// The day names +const TText * const LanguageAspect::DayTable[KMaxDays] = + { + _S("måndag"), + _S("tisdag"), + _S("onsdag"), + _S("torsdag"), + _S("fredag"), + _S("lördag"), + _S("söndag") + }; +// The abbreviated day names +const TText * const LanguageAspect::DayAbbTable[KMaxDays] = + { + _S("Må"), + _S("Ti"), + _S("On"), + _S("To"), + _S("Fr"), + _S("Lö"), + _S("Sö") + }; +// The month names +const TText * const LanguageAspect::MonthTable[KMaxMonths] = + { + _S("januari"), + _S("februari"), + _S("mars"), + _S("april"), + _S("maj"), + _S("juni"), + _S("juli"), + _S("augusti"), + _S("september"), + _S("oktober"), + _S("november"), + _S("december") + }; +// The abbreviated month names +const TText * const LanguageAspect::MonthAbbTable[KMaxMonths] = + { + _S("jan"), + _S("feb"), + _S("mar"), + _S("apr"), + _S("maj"), + _S("jun"), + _S("jul"), + _S("aug"), + _S("sep"), + _S("okt"), + _S("nov"), + _S("dec") + }; +// The am/pm strings +const TText * const LanguageAspect::AmPmTable[KMaxAmPms] = {_S("AM"),_S("PM")}; + + + +// End of File diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 locales/loce32/region/src/region.cpp --- a/locales/loce32/region/src/region.cpp Tue Jul 06 15:23:53 2010 +0300 +++ b/locales/loce32/region/src/region.cpp Wed Aug 18 10:48:00 2010 +0300 @@ -45,8 +45,8 @@ aLocale->iStartOfWeek=RegionAspect::StartOfWeek; aLocale->iClockFormat=RegionAspect::ClockFormat; aLocale->iUnitsGeneral=RegionAspect::UnitsGeneral; - aLocale->iUnitsDistanceLong=RegionAspect::UnitsGeneral; - aLocale->iUnitsDistanceShort=RegionAspect::UnitsGeneral; + aLocale->iUnitsDistanceLong=RegionAspect::UnitsDistanceLong; + aLocale->iUnitsDistanceShort=RegionAspect::UnitsDistanceShort; aLocale->iExtraNegativeCurrencyFormatFlags=RegionAspect::ExtraNegativeCurrencyFormatFlags; aLocale->iDeviceTimeState = EDeviceUserTime; } diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 package_definition.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_definition.xml Wed Aug 18 10:48:00 2010 +0300 @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Wed Aug 18 10:48:00 2010 +0300 @@ -0,0 +1,1 @@ + diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/AknIcon/MifToCdlIndex/DllCreator.cpp --- a/uigraphics/AknIcon/MifToCdlIndex/DllCreator.cpp Tue Jul 06 15:23:53 2010 +0300 +++ b/uigraphics/AknIcon/MifToCdlIndex/DllCreator.cpp Wed Aug 18 10:48:00 2010 +0300 @@ -25,8 +25,8 @@ #include #include -DllCreator::DllCreator() -: iInterface(*CCdlTkCdlFileParser("\\epoc32\\include\\platform\\mw\\MifHeader.cdl").LoadAndParse(true)), +DllCreator::DllCreator( const std::string& aFileName ) +: iInterface(*CCdlTkCdlFileParser(aFileName).LoadAndParse(true)), iInstance(iInterface) { iInstance.TemplateAllImplementations(); diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/AknIcon/MifToCdlIndex/DllCreator.h --- a/uigraphics/AknIcon/MifToCdlIndex/DllCreator.h Tue Jul 06 15:23:53 2010 +0300 +++ b/uigraphics/AknIcon/MifToCdlIndex/DllCreator.h Wed Aug 18 10:48:00 2010 +0300 @@ -33,7 +33,7 @@ class DllCreator { public: - DllCreator(); + DllCreator( const std::string& aFileName ); void SetNameAndUid(const string& aDllName, const string& dllUid); void SetIndex(const MifIndex& index); void WriteSource(); diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/AknIcon/MifToCdlIndex/MifToCdlIndex.cpp --- a/uigraphics/AknIcon/MifToCdlIndex/MifToCdlIndex.cpp Tue Jul 06 15:23:53 2010 +0300 +++ b/uigraphics/AknIcon/MifToCdlIndex/MifToCdlIndex.cpp Wed Aug 18 10:48:00 2010 +0300 @@ -107,7 +107,17 @@ mif.Modify(dllUid); mif.Write(mifName); - DllCreator dll; +// START: Raptor chnages for linux + const char* epocRoot = getenv("EPOCROOT"); + if(NULL == epocRoot) + { + throw MainArgsErr(); + } + std::string epocRootStr(epocRoot); + std::string finalStr = epocRootStr + "epoc32//include//platform//mw//MifHeader.cdl"; + + DllCreator dll(finalStr); +// END dll.SetNameAndUid(dllName, dllUid); dll.SetIndex(index); dll.WriteSource(); diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/AknIcon/group/MifToCdlIndex.mmp --- a/uigraphics/AknIcon/group/MifToCdlIndex.mmp Tue Jul 06 15:23:53 2010 +0300 +++ b/uigraphics/AknIcon/group/MifToCdlIndex.mmp Wed Aug 18 10:48:00 2010 +0300 @@ -37,11 +37,12 @@ SYSTEMINCLUDE ../MifToCdlIndex ../inc MW_LAYER_SYSTEMINCLUDE -START TOOLS - #if defined(CW32) - win32_library /epoc32/release/cwtools/rel/CdlCompilerToolkit.lib - #elif defined(VC32) - win32_library /epoc32/release/tools/rel/CdlCompilerToolkit.lib - #endif -END +STATICLIBRARY CdlCompilerToolkit.lib +//START TOOLS +// #if defined(CW32) +// win32_library /epoc32/release/cwtools/rel/CdlCompilerToolkit.lib +// #elif defined(VC32) +// win32_library /epoc32/release/tools/rel/CdlCompilerToolkit.lib +// #endif +//END diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/AknIcon/group/bld.inf --- a/uigraphics/AknIcon/group/bld.inf Tue Jul 06 15:23:53 2010 +0300 +++ b/uigraphics/AknIcon/group/bld.inf Wed Aug 18 10:48:00 2010 +0300 @@ -20,7 +20,7 @@ #include PRJ_PLATFORMS -DEFAULT TOOLS +DEFAULT TOOLS2 TOOLS PRJ_EXPORTS @@ -36,7 +36,7 @@ ./s60extensions.xml /epoc32/tools/makefile_templates/s60/s60extensions.xml PRJ_EXTENSIONS -#if defined(SBSV2) && !defined(TOOLS) +#if defined(SBSV2) && !defined(TOOLS) && !defined(TOOLS2) start extension s60/akniconinterfaces option FILENAME MifHeader end @@ -44,7 +44,7 @@ PRJ_MMPFILES -#if defined(TOOLS) +#if defined(TOOLS) || defined(TOOLS2) MifToCdlIndex.mmp #else diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/AknIcon/src/AknNvgFormatHandler.cpp --- a/uigraphics/AknIcon/src/AknNvgFormatHandler.cpp Tue Jul 06 15:23:53 2010 +0300 +++ b/uigraphics/AknIcon/src/AknNvgFormatHandler.cpp Wed Aug 18 10:48:00 2010 +0300 @@ -170,6 +170,8 @@ CFbsBitmap* aMask, TSize Bitmapsize, TDisplayMode Bitmapdepth, TDisplayMode Maskdepth, TRgb aColor, TBool aMarginFlag) { + if(!iData) + User::Leave(KErrNotFound); FormCommonHeader(aBitmap, EFalse, aColor, aMarginFlag); aBitmap->CreateExtendedBitmap(Bitmapsize, Bitmapdepth, KUidNvgProprietaryFormat, iData->Ptr(), iData->Length()); @@ -238,7 +240,7 @@ { // Modes currently supported by SVG engine are: // EGray2, EColor4K, EColor64K, EColor16M - if ( aMode != EGray2 ) +// if ( aMode != EGray2 ) EASK-824CMD:VGISymbianCopyToBitmap fails for bitmaps with EGray2 display modes.Modifying to create bitmaps with supported displaymodes { aMode = aPreferredMode; } diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/Icons/data/A_H.zip Binary file uigraphics/Icons/data/A_H.zip has changed diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/Icons/data/Icons.zip Binary file uigraphics/Icons/data/Icons.zip has changed diff -r 3bd7be4c9278 -r 4c5ac0e85ed3 uigraphics/Icons/data/Skin_Green.zip Binary file uigraphics/Icons/data/Skin_Green.zip has changed