# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286141892 -10800 # Node ID 80e4d18b72f54724f8c87730cf19368f07f6afa8 # Parent b7da29130b0e65b596bf93fd7c09f3ee9c6e1f0f Revision: 201037 Kit: 201039 diff -r b7da29130b0e -r 80e4d18b72f5 hb.pro --- a/hb.pro Fri Sep 17 08:32:10 2010 +0300 +++ b/hb.pro Mon Oct 04 00:38:12 2010 +0300 @@ -51,12 +51,9 @@ BLD_INF_RULES.prj_exports += "mkspecs/docml2bin.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/docml2bin.prf" host_tools { - exists($${HB_BUILD_DIR}/bin/docml2bin) { - hbPrjExport("$${HB_BUILD_DIR}/bin/docml2bin", "$${HB_BIN_DIR}/docml2bin") - } - exists($${HB_BUILD_DIR}/bin/docml2bin.exe) { - hbPrjExport("$${HB_BUILD_DIR}/bin/docml2bin.exe", "$${HB_BIN_DIR}/docml2bin.exe") - } + hbToolExport("$${HB_BUILD_DIR}/bin/docml2bin", "$${HB_BIN_DIR}/docml2bin") + hbToolExport("$${HB_BUILD_DIR}/bin/hbbincssmaker", "$${HB_BIN_DIR}/hbbincssmaker") + hbToolExport("$${HB_BUILD_DIR}/bin/hbthemeindexer", "$${HB_BIN_DIR}/hbthemeindexer") } } @@ -97,17 +94,24 @@ !symbian { LRELEASE = $$hbNativePath($$[QT_INSTALL_BINS]/lrelease) COMMON_EXTENSIONS = ar eu bg ca hr cs da nl en_US et fi fr fr_CA gl de el he hi zh_HK hu is id it ja ko lv lt ms nb pl pt pt_BR zh ro ru sr sk sl es es_419 sv tl zh_TW th tr uk ur vi - translations.input = $$HB_SOURCE_DIR/src/hbcore/i18n/translations/commonstrings + translations.input = $$HB_SOURCE_DIR/src/hbcore/i18n/translations translations.path = $${HB_TRANSLATIONS_DIR} - translations.commands = $$LRELEASE -silent -idbased $$translations.input/commonstrings_en.ts -qm $$translations.path/commonstrings_en.qm -# for(ext, COMMON_EXTENSIONS) { -# file = commonstrings_$$ext -# eval(trans_$${ext}.commands += $$LRELEASE -silent -idbased $$translations.input/$${file}.ts -qm $$translations.path/$${file}.qm) -# QMAKE_EXTRA_TARGETS += trans_$${ext} -# eval(translations.depends += trans_$${ext}) -# } + pre_translations.commands = $$hbCreateDir($${HB_TRANSLATIONS_DIR}) + translations.depends += pre_translations + translations.commands = $$LRELEASE -silent -idbased $$translations.input/commonstrings/commonstrings_en.ts -qm $$translations.path/commonstrings_en.qm + translations.commands += && $$LRELEASE -silent -idbased $$translations.input/directorynamelocalizer/directorynamelocalizer_en.ts -qm $$translations.path/directorynamelocalizer_en.qm + for(ext, COMMON_EXTENSIONS) { + file1 = commonstrings_$$ext + file2 = directorynamelocalizer_$$ext + commands = trans_$${ext}.commands + $$commands += $$LRELEASE -silent -idbased $$translations.input/commonstrings/$${file1}.ts -qm $$translations.path/$${file1}.qm + $$commands += && $$LRELEASE -silent -idbased $$translations.input/directorynamelocalizer/$${file2}.ts -qm $$translations.path/$${file2}.qm + QMAKE_EXTRA_TARGETS += trans_$${ext} + translations.depends += trans_$${ext} + } + QMAKE_EXTRA_TARGETS += pre_translations QMAKE_EXTRA_TARGETS += translations INSTALLS += translations } diff -r b7da29130b0e -r 80e4d18b72f5 mkspecs/docml2bin.prf --- a/mkspecs/docml2bin.prf Fri Sep 17 08:32:10 2010 +0300 +++ b/mkspecs/docml2bin.prf Mon Oct 04 00:38:12 2010 +0300 @@ -3,7 +3,7 @@ include(hb_functions.prf) QMAKE_DOCML2BIN = $$hbToolCommand(docml2bin) - + docml2bin.input = DOCML docml2bin.output = ${QMAKE_FILE_IN}.bin docml2bin.commands = "$$QMAKE_DOCML2BIN" -s "${QMAKE_FILE_IN}" -t "${QMAKE_FILE_OUT}" @@ -12,19 +12,8 @@ for(DOCMLFILE, $$list($$unique(DOCML))) { DOCMLFILE_PWD = $${_PRO_FILE_PWD_}/$${DOCMLFILE} + symbian:PRE_TARGETDEPS += $${DOCMLFILE_PWD}.bin rcc.depends += $${DOCMLFILE_PWD}.bin - - DOCML2BINEXTENSION = \ - "START EXTENSION qt/qmake_extra_pre_targetdep.export" \ - "OPTION PREDEP_TARGET $${DOCMLFILE_PWD}.bin" \ - "OPTION DEPS $${DOCMLFILE_PWD}" \ - "OPTION COMMAND $${QMAKE_DOCML2BIN} -s $${DOCMLFILE_PWD} -t $${DOCMLFILE_PWD}.bin" \ - "END" - symbian_test { - BLD_INF_RULES.prj_testextensions += $$DOCML2BINEXTENSION - } else { - BLD_INF_RULES.prj_extensions += $$DOCML2BINEXTENSION - } } QMAKE_EXTRA_COMPILERS += docml2bin diff -r b7da29130b0e -r 80e4d18b72f5 mkspecs/hb_functions.prf --- a/mkspecs/hb_functions.prf Fri Sep 17 08:32:10 2010 +0300 +++ b/mkspecs/hb_functions.prf Mon Oct 04 00:38:12 2010 +0300 @@ -88,6 +88,20 @@ return(true) } +# params: +# e.g. hbToolExport("$${HB_BUILD_DIR}/bin/docml2bin", "$${HB_BIN_DIR}/docml2bin") +defineTest(hbToolExport) { + contains(QMAKE_HOST.os, Windows) { + 1 = "$${1}.exe" + 2 = "$${2}.exe" + } + exists($$1) { + hbPrjExport($$1, $$2) + return(true) + } + return(false) +} + # params: # NOTE: exports PUBLIC_HEADERS, RESTRICTED_HEADERS and CONVENIENCE_HEADERS # eg. hbExportHeaders(hbcore) @@ -197,3 +211,20 @@ return(($$chk_dir_exists_mkdir) && $$copy) } + +defineReplace(hbCreateDir) { + dir = $$hbNativePath($$1) + + contains(QMAKE_HOST.os, Windows):isEmpty(QMAKE_SH) { + chk_dir_exists = if not exist $$dir + mkdir = mkdir $$dir + } else { + chk_dir_exists = test -d $$dir + mkdir = mkdir -p $$dir + } + + hbUnixStyle(): chk_dir_exists_mkdir = $$chk_dir_exists || $$mkdir + else:chk_dir_exists_mkdir = $$chk_dir_exists $$mkdir + + return($$chk_dir_exists_mkdir) +} diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/core/hbapplication.cpp --- a/src/hbcore/core/hbapplication.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/core/hbapplication.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -34,6 +34,7 @@ #include #include #include +#include #endif // Q_OS_SYMBIAN #ifdef HB_GESTURE_FW @@ -93,6 +94,12 @@ Hb::NoSplash only when absolutely needed (or when the splash screen will not be shown at all). + On Symbian the splash will be automatically suppressed (i.e. not shown) if + the application is started to background, that is, + HbApplication::startedToBackground() returns true. To override this default + behavior, pass Hb::ShowSplashWhenStartingToBackground to the HbApplication + constructor. + Applications that support the 'activities' concept may check the start-up reason like this: @@ -142,6 +149,9 @@ if (flags & Hb::ForceQtSplash) { splashFlags |= HbSplashScreen::ForceQt; } + if (flags & Hb::ShowSplashWhenStartingToBackground) { + splashFlags |= HbSplashScreen::ShowWhenStartingToBackground; + } #if defined(Q_OS_SYMBIAN) && defined(HBAPP_LOGGING) ELAPSED_TIMER t; @@ -465,3 +475,29 @@ Q_D(HbApplication); return d->activateData(); } + +/*! + Returns true if the process command line indicates that + application is started to background. + + This is usually achieved by setting the corresponding 'background' + flag in the startup list entry (for auto-started applications) or, + in case of services, starting the service provider application to + background. + + When an application is launched normally, the result will be false. + */ +bool HbApplication::startedToBackground() +{ +#if defined(Q_OS_SYMBIAN) + CApaCommandLine *commandLine = 0; + if (CApaCommandLine::GetCommandLineFromProcessEnvironment(commandLine) == KErrNone + && commandLine) { + TApaCommand command = commandLine->Command(); + delete commandLine; + return command == EApaCommandBackground + || command == EApaCommandBackgroundAndWithoutViews; + } +#endif + return false; +} diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/core/hbapplication.h --- a/src/hbcore/core/hbapplication.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/core/hbapplication.h Mon Oct 04 00:38:12 2010 +0300 @@ -66,6 +66,8 @@ QVariant activateData(); void hideSplash(); + + static bool startedToBackground(); protected: HbApplicationPrivate *d_ptr; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/core/hbglobal.h --- a/src/hbcore/core/hbglobal.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/core/hbglobal.h Mon Oct 04 00:38:12 2010 +0300 @@ -31,13 +31,11 @@ //#pragma hb_header(HbGlobal) // HB_VERSION_STR="M.N.P-B" (M=major, N=minor, P=patch, B=build=[dev|tag]) -#define HB_VERSION_STR "0.5.0-2010wk35" +#define HB_VERSION_STR "0.5.0-2010wk37" // HB_VERSION=0xMMNNPP (MM=major, NN=minor, PP=patch) #define HB_VERSION 0x000500 -#define HB_EXPORT \ - HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead \ - { &HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead; }; class +#ifndef HB_DOXYGEN #define HB_DECL_DEPRECATED Q_DECL_DEPRECATED #define HB_DECL_VARIABLE_DEPRECATED Q_DECL_VARIABLE_DEPRECATED @@ -136,6 +134,8 @@ #endif // HB_TEXT_MEASUREMENT_UTILITY +#endif // HB_DOXYGEN + HB_CORE_EXPORT uint hbVersion(); HB_CORE_EXPORT const char *hbVersionString(); HB_CORE_EXPORT QString hbTrId(const char *id, int n = -1); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/core/hbnamespace.cpp --- a/src/hbcore/core/hbnamespace.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/core/hbnamespace.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -282,6 +282,17 @@ \sa HbSplashScreen::ForceQt */ +/*! \var Hb::ApplicationFlag Hb::ShowSpashWhenStartingToBackground + + Does not suppress the splash when the application is started to background. + Normally HbSplashScreen::start() will do nothing if the process command line + indicates that the application is started to background (by specifying the + corresponding flags in the system startup list entry or by starting to + background as a service). This flag disables the check. + + \sa HbSplashScreen::ShowWhenStartingToBackground +*/ + /*! \enum Hb::ViewSwitchFlag diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/core/hbnamespace.h --- a/src/hbcore/core/hbnamespace.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/core/hbnamespace.h Mon Oct 04 00:38:12 2010 +0300 @@ -239,7 +239,8 @@ NoSplash = 0x01, SplashFixedVertical = 0x02, SplashFixedHorizontal = 0x04, - ForceQtSplash = 0x08 + ForceQtSplash = 0x08, + ShowSplashWhenStartingToBackground = 0x10 }; Q_DECLARE_FLAGS(ApplicationFlags, ApplicationFlag) diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/core/hbvariant_p.cpp --- a/src/hbcore/core/hbvariant_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/core/hbvariant_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -38,7 +38,7 @@ HbVariant::HbVariantData::HbVariantData() : stringSize(0), - stringListCount(0), + listCount(0), mRef(1), mDataType(Invalid) { @@ -58,7 +58,7 @@ mDataType = dataType; #ifdef HB_BIN_CSS // Types that allocate memory from memory manager - if (mDataType == String || mDataType == StringList || mDataType == Color) { + if (mDataType == String || mDataType == StringList || mDataType == Color || mDataType == IntList) { // Does not matter if register same offset holder many times HbCssConverterUtils::registerOffsetHolder(&mData.offset); } else { @@ -214,6 +214,20 @@ } /* +* C'tor taking intlist +*/ +HbVariant::HbVariant(const QList &val, HbMemoryManager::MemoryType type) + : mMemoryType( type ), mShared( false ) +{ + initializeData(); + fillIntListData(val); + +#ifdef HB_BIN_CSS + HbCssConverterUtils::registerOffsetHolder(&mDataOffset); +#endif +} + +/* * copy C'tor */ HbVariant::HbVariant( const HbVariant &other ) @@ -279,6 +293,13 @@ case HbVariant::Color: case HbVariant::StringList: return 0; + case HbVariant::IntList: + if (data->listCount == 1) { + const char *address = getAddress(mMemoryType, data->mData.offset, mShared); + return *((int*)address); + } + return 0; + default: return 0; } @@ -301,12 +322,17 @@ case HbVariant::Color: return getColor().name(); case HbVariant::StringList: - if (data->stringListCount == 1) { + if (data->listCount == 1) { const char *address = getAddress(mMemoryType, data->mData.offset, mShared); int length = *((int*)address); return QString((const QChar *)(address + sizeof(int)), length); - } - + } + return QString(); + case HbVariant::IntList: + if (data->listCount == 1) { + const char *address = getAddress(mMemoryType, data->mData.offset, mShared); + return QString::number(*((int*)address)); + } return QString(); default: return QString(); @@ -346,6 +372,7 @@ case HbVariant::StringList: case HbVariant::Int: case HbVariant::Double: + case HbVariant::IntList: return QColor(); default: return QColor(); @@ -384,6 +411,11 @@ list.append(string); address += sizeof(QChar) * length; } + } else if (data->dataType() == HbVariant::IntList) { + QList intList = toIntList(); + for (int i=0; ilistCount == 1) { + return double(toInt()); + } + return double(); default: return double(); } } /* +* to get int list +*/ +QList HbVariant::toIntList() const +{ + HbVariantData *data = getAddress(mMemoryType, mDataOffset, mShared); + QList list; + + if (data) { + if (data->dataType() == HbVariant::IntList) { + const char *address = getAddress(mMemoryType, data->mData.offset, mShared); + const char *end = address + data->listCount * sizeof(int); + + // Append strings to stringlist + while (address < end) { + list.append(*(int *)address); + address += sizeof(int); + } + } else { + list.append(toInt()); + } + } + + return list; +} + +/* * initializeData */ HbVariant::HbVariantData * HbVariant::initializeData() @@ -488,7 +551,7 @@ // In stringlist case, set stringSize to indicate size allocated for the whole stringlist buffer data->stringSize = allocBytes; - data->stringListCount = stringList.count(); + data->listCount = stringList.count(); data->setDataType(StringList); if (oldOffset != -1) { @@ -520,6 +583,40 @@ } /* +* fillIntListData +*/ +void HbVariant::fillIntListData(const QList &intList) +{ + GET_MEMORY_MANAGER(mMemoryType); + HbVariantData *data = getAddress(mMemoryType, mDataOffset, mShared); + qptrdiff oldOffset = reservesMemory(data) ? data->mData.offset : -1; + + if (intList.isEmpty()) { + data->mData.offset = -1; + } else { + // allocate memory and copy data. + data->mData.offset = manager->alloc(intList.count() * sizeof(int)); + char *address = getAddress(mMemoryType, data->mData.offset, mShared); + + for (int j=0; jstringSize = 0; + data->listCount = intList.count(); + + data->setDataType(IntList); + if (oldOffset != -1) { + // Free old memory block + HbMemoryUtils::freeMemory(mMemoryType, oldOffset); + } +} + + + +/* * = operator taking int */ HbVariant & HbVariant::operator=(int val) @@ -587,6 +684,15 @@ } /* +* = operator taking QList +*/ +HbVariant& HbVariant::operator=(const QList& intList) +{ + fillIntListData(intList); + return *this; +} + +/* * = operator taking HbVariant */ HbVariant &HbVariant::operator=(const HbVariant &other) @@ -636,22 +742,38 @@ } switch(uint(t)) { case HbVariant::Int: - return data->dataType() == HbVariant::Double - || data->dataType() == HbVariant::String; + if (data->dataType() == HbVariant::IntList) { + return data->listCount <= 1; + } else { + return data->dataType() == HbVariant::Double + || data->dataType() == HbVariant::String; + } case HbVariant::Double: - return data->dataType() == HbVariant::Int - || data->dataType() == HbVariant::String; + if (data->dataType() == HbVariant::IntList) { + return data->listCount <= 1; + } else { + return data->dataType() == HbVariant::Int + || data->dataType() == HbVariant::String; + } case HbVariant::String: - if (data->dataType() == HbVariant::StringList) { - return data->stringListCount <= 1; + if (data->dataType() == HbVariant::StringList + || data->dataType() == HbVariant::IntList) { + return data->listCount <= 1; } else { return data->dataType() == HbVariant::Int || data->dataType() == HbVariant::Double || data->dataType() == HbVariant::Color; } case HbVariant::StringList: + return data->dataType() == HbVariant::String + || data->dataType() == HbVariant::IntList; case HbVariant::Color: return data->dataType() == HbVariant::String; + case HbVariant::IntList: + return data->dataType() == HbVariant::Int + || data->dataType() == HbVariant::Double + || data->dataType() == HbVariant::String + || data->dataType() == HbVariant::IntList; default : return false; } @@ -670,6 +792,7 @@ QColor col; QString str; QStringList strList; + QList intList; if(data->dataType() == t) { return true; @@ -728,7 +851,7 @@ } case HbVariant::StringList: // canConvert checks that there is max 1 string in the stringlist - if (data->stringListCount == 0) { + if (data->listCount == 0) { fillStringData(0, 0); } else { QString string = toString(); @@ -766,6 +889,15 @@ default: return false; } + case HbVariant::IntList: + switch(data->dataType()) { + case HbVariant::Int: + intList.append(data->mData.i); + fillIntListData(intList); + return true; + default: + return false; + } default: return false; @@ -792,6 +924,14 @@ QVariant var = getColor(); return var; } + case HbVariant::IntList : { + QList intList = toIntList(); + QList variantList; + for (int i=0; imData.offset); break; default: @@ -847,6 +988,8 @@ break; case HbVariant::StringList: qDebug() << toStringList(); + case HbVariant::IntList: + qDebug() << toIntList(); default: qDebug() << "Invalid Type"; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/core/hbvariant_p.h --- a/src/hbcore/core/hbvariant_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/core/hbvariant_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -48,6 +48,7 @@ String = 3, StringList = 4, Color = 5, + IntList = 6, LastType = 0xffffffff // need this so that gcc >= 3.4 allocates 32 bits for Type }; @@ -68,7 +69,7 @@ } mData; int stringSize; - int stringListCount; + int listCount; QAtomicInt mRef; private: Type mDataType; @@ -83,6 +84,7 @@ HbVariant(const char *val, HbMemoryManager::MemoryType type); HbVariant(const QStringList &val, HbMemoryManager::MemoryType type); HbVariant(const QColor &col, HbMemoryManager::MemoryType type); + HbVariant(const QList &val, HbMemoryManager::MemoryType type); ~HbVariant(); HbMemoryManager::MemoryType memoryType() @@ -105,6 +107,7 @@ QColor toColor() const; QStringList toStringList() const; double toDouble() const; + QList toIntList() const; HbVariant & operator=( int val ); HbVariant & operator=( double val ); @@ -112,6 +115,7 @@ HbVariant & operator=( const HbString& val ); HbVariant & operator=( const QColor& col ); HbVariant & operator=( const QStringList& strList ); + HbVariant & operator=( const QList& intList ); HbVariant & operator=( const HbVariant& other ); bool canConvert ( HbVariant::Type t ) const; @@ -125,6 +129,7 @@ void fillStringData(const QChar *str, int size); void fillStringListData(const QStringList &stringList); void fillColorData(const QColor &col); + void fillIntListData(const QList &intList); QString getString() const; QColor getColor() const; /** @@ -147,7 +152,8 @@ { return data->dataType() == HbVariant::String || data->dataType() == HbVariant::Color - || data->dataType() == HbVariant::StringList; + || data->dataType() == HbVariant::StringList + || data->dataType() == HbVariant::IntList; } void freeMemory(HbVariantData *data) { diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/cssparser/hbcssformatter_p.cpp --- a/src/hbcore/cssparser/hbcssformatter_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/cssparser/hbcssformatter_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -288,19 +288,31 @@ str.append("-"); case HbCss::Value::Expression: str.append("expr("); - str.append(val.variant.toString()); + str.append(val.original); str.append(")"); break; case HbCss::Value::VariableNegative: str.append("-"); case HbCss::Value::Variable: str.append("var("); - str.append(val.variant.toString()); + str.append(val.original); str.append(")"); break; case HbCss::Value::KnownIdentifier: str.append(val.original); break; + case HbCss::Value::LengthInUnits: + str.append(val.variant.toString()); + str.append("un"); + break; + case HbCss::Value::LengthInPixels: + str.append(val.variant.toString()); + str.append("px"); + break; + case HbCss::Value::LengthInMillimeters: + str.append(val.variant.toString()); + str.append("mm"); + break; default: str.append(val.variant.toString()); } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/cssparser/hbcssparser.pri --- a/src/hbcore/cssparser/hbcssparser.pri Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/cssparser/hbcssparser.pri Mon Oct 04 00:38:12 2010 +0300 @@ -30,6 +30,7 @@ PUBLIC_HEADERS += $$PWD/hbstyleloader.h PRIVATE_HEADERS += $$PWD/hbcssparser_p.h +PRIVATE_HEADERS += $$PWD/hbexpressionparser_p.h PRIVATE_HEADERS += $$PWD/hblayeredstyleloader_p.h PRIVATE_HEADERS += $$PWD/hbstyleselector_p.h PRIVATE_HEADERS += $$PWD/hbwidgetstyleloader_p.h @@ -37,6 +38,7 @@ SOURCES += $$PWD/hbcssparser_p.cpp SOURCES += $$PWD/hbcssscanner_p.cpp +SOURCES += $$PWD/hbexpressionparser_p.cpp SOURCES += $$PWD/hblayeredstyleloader_p.cpp SOURCES += $$PWD/hbstyleloader.cpp SOURCES += $$PWD/hbstyleselector_p.cpp diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/cssparser/hbcssparser_p.cpp --- a/src/hbcore/cssparser/hbcssparser_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/cssparser/hbcssparser_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -25,15 +25,11 @@ #include "hbcssparser_p.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //QT_BEGIN_NAMESPACE @@ -49,6 +45,7 @@ using namespace HbCss; const QString GLOBAL_CSS_SELECTOR = "*"; +const uint GLOBAL_CSS_SELECTOR_HASH = qHash(GLOBAL_CSS_SELECTOR.toLatin1()); struct HbCssKnownValue { @@ -198,7 +195,7 @@ } } -qreal ValueExtractor::asReal(const Value& v, bool *ok) +qreal ValueExtractor::asReal(const Value& v, bool *ok) const { if (ok) { *ok = true; @@ -222,21 +219,47 @@ *ok = tempOk; } return factor * variableValue; + } else if (v.type == Value::Expression || v.type == Value::ExpressionNegative) { + qreal factor = (v.type == Value::Expression) ? 1.0 : -1.0; + qreal variableValue(0.0); + bool tempOk = extractExpressionValue(v.variant.toIntList(), variableValue); + if (ok) { + *ok = tempOk; + } + return factor * variableValue; } QString s = v.variant.toString(); s.reserve(s.length()); - if (v.type == Value::Expression || v.type == Value::ExpressionNegative) { - qreal factor = (v.type == Value::Expression) ? 1.0 : -1.0; - qreal value = 0; - extractExpressionValue(s, value); - return factor * value; - } return asReal(s, v.type, ok); } -qreal ValueExtractor::asReal(QString &s, Value::Type type, bool *ok) +qreal ValueExtractor::asReal(int token, HbExpressionParser::Token type, bool &ok) const +{ + ok = true; + qreal result(0.0); + switch (type) { + case HbExpressionParser::Variable: + ok = extractVariableValue((quint32)token, result); + break; + case HbExpressionParser::LengthInUnits: + result = HbExpressionParser::fromFixed(token) * currentProfile.unitValue(); + break; + case HbExpressionParser::LengthInPixels: + result = HbExpressionParser::fromFixed(token); + break; + case HbExpressionParser::LengthInMillimeters: + result = HbExpressionParser::fromFixed(token) * currentProfile.ppmValue(); + break; + default: + ok = false; + break; + } + return result; +} + +qreal ValueExtractor::asReal(QString &s, Value::Type type, bool *ok) const { if (ok) { *ok = true; @@ -288,7 +311,7 @@ return result; } -qreal ValueExtractor::asReal(const Declaration &decl, bool *ok) +qreal ValueExtractor::asReal(const Declaration &decl, bool *ok) const { if (decl.values.count() < 1) { if (ok) { @@ -299,7 +322,7 @@ return asReal(decl.values.first(), ok); } -bool ValueExtractor::asReals(const Declaration &decl, qreal *m) +bool ValueExtractor::asReals(const Declaration &decl, qreal *m) const { bool ok = true; int i; @@ -487,7 +510,7 @@ const Value &v = decl.values.at(i); if (v.type == Value::TermOperatorComma) break; - const QString str = v.variant.toString(); + const QString &str = v.variant.toString(); if (str.isEmpty()) break; family += str; @@ -539,7 +562,7 @@ } if (i < decl.values.count()) { - QString fam = decl.values.at(i).variant.toString(); + const QString &fam = decl.values.at(i).variant.toString(); if (!fam.isEmpty()) font.setFamily(fam); } @@ -578,7 +601,7 @@ } } -bool ValueExtractor::extractKnownProperties(KnownProperties &prop) +bool ValueExtractor::extractKnownProperties(KnownProperties &prop) const { KnownPropertyFlags flags(0); bool hit = false; @@ -804,7 +827,7 @@ } -bool ValueExtractor::extractVariableValue(quint32 hashValue, qreal& value) +bool ValueExtractor::extractVariableValue(quint32 hashValue, qreal& value) const { bool variableFound = false; HbCss::Value v; @@ -820,235 +843,92 @@ return extractVariableValue(hbHash(variableName), value); } -bool ValueExtractor::extractVariableValue(const QString& variableName, qreal& value) +bool ValueExtractor::extractVariableValue(const QString& variableName, qreal& value) const { return extractVariableValue(hbHash(variableName), value); } -bool ValueExtractor::extractExpressionValue(QString &expression, qreal &value) +bool ValueExtractor::extractExpressionValue(const QList &tokens, qreal &value) const { - // todo: invalid global variables are not checked because asReal() doesn't check them - value = 0; - const QChar SPACE(' '); - const QChar LPARENTHESIS('('); - const QChar RPARENTHESIS(')'); - const QChar MINUS('-'); - const QChar PLUS('+'); - const QChar STAR('*'); - const QChar SLASH('/'); - - int position = 0; - int begin = -1; - // + and - are level 0, * and / in level 1, unary - is level 2 - // every parenthesis add 10 to (base) precedence level - int precedenceLevel = 0; - bool parseVariable = false; - bool endMark = false; - int operatorCount = 1;//there can only be 2 sequental operators if the latter one is unary '-' - while (position < expression.size()) { - endMark = false; - if (expression.at(position) == SPACE) { - endMark = true; - } else if ((expression.at(position) == LPARENTHESIS) && !parseVariable) { - precedenceLevel+=10; - position++; - operatorCount = 1; - continue; - } else if (expression.at(position) == RPARENTHESIS) { - if (parseVariable) { - parseVariable = false; - operatorCount = 0; - position++; - continue; - } - precedenceLevel-=10; - operatorCount = 0; - endMark = true; - } else if ((expression.at(position) == MINUS) && !parseVariable) { - endMark = true; - } else if ((expression.at(position) == PLUS) || - (expression.at(position) == STAR) || - (expression.at(position) == SLASH)) { - endMark = true; - } - - if (endMark) { - if (begin >= 0) { - // parse value - QString valueString = expression.mid(begin, position - begin); - qreal val = 0; - if (valueString.startsWith("var(") && valueString.endsWith(")")) { - // remove var( and last ) - QString variableString = valueString.mid(4, valueString.size()-5); - if (!extractVariableValue(variableString, val)) { - expressionValues.clear(); - return false; - } - } else { - bool real_ok = true; - val = asReal(valueString, Value::String, &real_ok); - if (!real_ok) { - expressionValues.clear(); - return false; - } - } - expressionValues.append(ExpressionValue(ExpressionValue::None, 0, val)); - operatorCount = 0; - } - begin = -1; - if (expression.at(position) == MINUS) { - if (operatorCount == 1) { - expressionValues.append( - ExpressionValue(ExpressionValue::UnaryMinus,precedenceLevel+2,0)); - } else if (operatorCount > 1) { - expressionValues.clear(); - return false; - } else { - expressionValues.append( - ExpressionValue(ExpressionValue::Minus,precedenceLevel,0)); - } - operatorCount++; - } else if (expression.at(position) == PLUS) { - if (operatorCount > 0) { - expressionValues.clear(); - return false; - } - expressionValues.append( - ExpressionValue(ExpressionValue::Plus,precedenceLevel,0)); - operatorCount++; - } else if (expression.at(position) == STAR) { - if (operatorCount > 0) { - expressionValues.clear(); - return false; - } - expressionValues.append( - ExpressionValue(ExpressionValue::Star,precedenceLevel+1,0)); - operatorCount++; - } else if (expression.at(position) == SLASH) { - if (operatorCount > 0) { - expressionValues.clear(); + // The expression is in RPN format + bool ok(true); + QStack values; + for (int i=0; i= 0) { - QString valueString = expression.mid(begin, position - begin); - qreal val = 0; - if (valueString.startsWith("var(") && valueString.endsWith(")")) { - // remove var( and last ) - QString variableString = valueString.mid(4, valueString.size()-5); - if (!extractVariableValue(variableString, val)) { - expressionValues.clear(); - return false; - } - } else { - bool real_ok = true; - val = asReal(valueString, Value::String, &real_ok); - if (!real_ok) { - expressionValues.clear(); - return false; - } - } - expressionValues.append(ExpressionValue(ExpressionValue::None, 0, val)); - } - - if(expressionValues.isEmpty()) { - expressionValues.clear(); - return false; - } - - // if last value is operator, fail - if (expressionValues[expressionValues.size()-1].mToken != ExpressionValue::None) { - expressionValues.clear(); - return false; - } - - - while (expressionValues.size() > 1) { // we have an answer when size = 1 - int maxPrecedence = -1; - int calculateIndex = -1; - for (int i = 0; i < expressionValues.size(); i++) { - if ((expressionValues[i].mToken != ExpressionValue::None) && - (expressionValues[i].mPrecedence > maxPrecedence)) { - maxPrecedence = expressionValues[i].mPrecedence; - calculateIndex = i; // contains operator with highest precedence - } - } - qreal answer = 0; - - if(calculateIndex < 0){ - return false; - } - - switch (expressionValues[calculateIndex].mToken) { - case ExpressionValue::Minus: - answer = expressionValues[calculateIndex-1].mValue - - expressionValues[calculateIndex+1].mValue; + break; + } + case HbExpressionParser::Addition: + { + qreal op1 = values.pop(); + qreal op2 = values.pop(); + values.push(op2+op1); break; - case ExpressionValue::Plus: - answer = expressionValues[calculateIndex-1].mValue + - expressionValues[calculateIndex+1].mValue; + } + case HbExpressionParser::Subtraction: + { + qreal op1 = values.pop(); + qreal op2 = values.pop(); + values.push(op2-op1); break; - case ExpressionValue::Star: - answer = expressionValues[calculateIndex-1].mValue * - expressionValues[calculateIndex+1].mValue; + } + case HbExpressionParser::Multiplication: + { + qreal op1 = values.pop(); + qreal op2 = values.pop(); + values.push(op2*op1); break; - case ExpressionValue::Slash: - if (expressionValues[calculateIndex+1].mValue == 0) { - expressionValues.clear(); + } + case HbExpressionParser::Division: + { + qreal op1 = values.pop(); + qreal op2 = values.pop(); + if (op1 == 0) { return false; } - answer = expressionValues[calculateIndex-1].mValue / - expressionValues[calculateIndex+1].mValue; - break; - default: + values.push(op2/op1); break; - } - if (expressionValues[calculateIndex].mToken == ExpressionValue::UnaryMinus) { - expressionValues[calculateIndex+1].mValue = - -expressionValues[calculateIndex+1].mValue; - expressionValues.removeAt(calculateIndex); - } else { - expressionValues[calculateIndex-1].mValue = answer; - expressionValues.removeAt(calculateIndex+1); - expressionValues.removeAt(calculateIndex); + } + case HbExpressionParser::Negation: + { + qreal op1 = values.pop(); + values.push(-op1); + break; + } + default: + return false;; } } - value = expressionValues[0].mValue; - expressionValues.clear(); + if (values.count() != 1) { + return false; + } + value = values.at(0); + return true; +} - return true; +bool ValueExtractor::extractExpressionValue(const QString &expression, qreal &value) const +{ + QList tokens; + if (!HbExpressionParser::parse(expression, tokens)) { + return false; + } + return extractExpressionValue(tokens, value); } -bool ValueExtractor::extractCustomProperties( const QList &keys, QList &values ) +bool ValueExtractor::extractCustomProperties( const QList &keys, QList &values ) const { if ( keys.count() != values.count() ) { return false; @@ -1083,7 +963,7 @@ return true; } -bool ValueExtractor::extractLayout(QString &layoutName, QString §ionName) +bool ValueExtractor::extractLayout(QString &layoutName, QString §ionName) const { QString tempSectionName; bool hit = false; @@ -1213,8 +1093,13 @@ } int StyleSelector::selectorMatches( - const Selector &selector, NodePtr node, bool nameCheckNeeded) const + const Selector &selector, + NodePtr node, + QSet *dirtyNodes, + bool nameCheckNeeded) const { + Q_ASSERT(dirtyNodes); + if (selector.basicSelectors.isEmpty()) { return -1; } @@ -1223,7 +1108,7 @@ if (selector.basicSelectors.count() != 1) { return -1; } - return basicSelectorMatches(selector.basicSelectors.first(), node, nameCheckNeeded); + return basicSelectorMatches(selector.basicSelectors.first(), node, dirtyNodes, nameCheckNeeded); } if (selector.basicSelectors.count() <= 1) { @@ -1237,7 +1122,7 @@ BasicSelector sel = selector.basicSelectors.at(i); bool firstLoop = true; do { - matchLevel = basicSelectorMatches(sel, node, (nameCheckNeeded || !firstLoop)); + matchLevel = basicSelectorMatches(sel, node, dirtyNodes, (nameCheckNeeded || !firstLoop)); if (firstLoop) { firstMatchLevel = matchLevel; } @@ -1292,8 +1177,13 @@ const uint CLASS_HASH = qHash(QString("class")); int StyleSelector::basicSelectorMatches( - const BasicSelector &sel, NodePtr node, bool nameCheckNeeded) const + const BasicSelector &sel, + NodePtr node, + QSet *dirtyNodes, + bool nameCheckNeeded) const { + Q_ASSERT(dirtyNodes); + int matchLevel = 0; HbString elementName(HbMemoryManager::HeapMemory); @@ -1301,6 +1191,8 @@ if (!hasAttributes(node)) return -1; + dirtyNodes->insert(node); + for (int i = 0; i < sel.attributeSelectors.count(); ++i) { const AttributeSelector &a = sel.attributeSelectors.at(i); if (a.nameHash == CLASS_HASH) { @@ -1344,25 +1236,40 @@ } void StyleSelector::matchRules( - NodePtr node, const HbVector &rules, StyleSheetOrigin origin, - int depth, QVector *weightedRules, bool nameCheckNeeded) const + NodePtr node, + const HbVector &rules, + StyleSheetOrigin origin, + int depth, + QList *weightedRules, + QSet *dirtyNodes, + bool nameCheckNeeded) const { + Q_ASSERT(weightedRules); + Q_ASSERT(dirtyNodes); + for (int i = 0; i < rules.count(); ++i) { const StyleRule &rule = rules.at(i); - for (int j = 0; j < rule.selectors.count(); ++j) { + int selectorCount = rule.selectors.count(); + for (int j = 0; j < selectorCount; ++j) { const Selector& selector = rule.selectors.at(j); - int matchLevel = selectorMatches(selector, node, nameCheckNeeded); + int matchLevel = selectorMatches(selector, node, dirtyNodes, nameCheckNeeded); if ( matchLevel >= 0 ) { - WeightedRule wRule; - wRule.first = selector.specificity() + int specificity = selector.specificity() + 0x1000* matchLevel + (origin == StyleSheetOrigin_Inline)*0x10000*depth; - wRule.second.selectors.append(selector); - wRule.second.declarations = rule.declarations; + if (selectorCount > 1) { + WeightedRule wRule; + wRule.first = specificity; + wRule.second.selectors.append(selector); + wRule.second.declarations = rule.declarations; #ifdef HB_CSS_INSPECTOR - wRule.second.owningStyleSheet = rule.owningStyleSheet; + wRule.second.owningStyleSheet = rule.owningStyleSheet; #endif - weightedRules->append(wRule); + weightedRules->append(wRule); + } else { + WeightedRule wRule(specificity, rule); + weightedRules->append(wRule); + } } } } @@ -1377,7 +1284,8 @@ if (styleSheets.isEmpty()) return rules; - QVector weightedRules = weightedStyleRulesForNode(node, orientation); + QList weightedRules; + weightedStyleRulesForNode(node, orientation, &weightedRules); qStableSort(weightedRules.begin(), weightedRules.end(), qcss_selectorStyleRuleLessThan); @@ -1387,84 +1295,91 @@ return rules; } +// Generate inheritance list (reverse order) +static QList generateAncestorHashList(const StyleSelector::NodePtr &node) +{ + QList ancestorList; + static QHash > ancestorsCache; + const QGraphicsWidget *widgetPtr = static_cast(node.ptr); + if (widgetPtr) { + const QMetaObject *metaObject = widgetPtr->metaObject(); + const char *className = metaObject->className(); + uint classHash = qHash(className); + if (ancestorsCache.contains(classHash)) { + ancestorList = ancestorsCache[classHash]; + } else { + do { + className = metaObject->className(); + const QByteArray classNameBA = QByteArray::fromRawData(className, strlen(className)); + ancestorList << qHash(classNameBA); + metaObject = metaObject->superClass(); + } while (metaObject != 0); + ancestorList << GLOBAL_CSS_SELECTOR_HASH; + ancestorsCache[classHash] = ancestorList; + } + } + return ancestorList; +} // Returns style rules and specificity values (unordered) -QVector StyleSelector::weightedStyleRulesForNode( - NodePtr node, const Qt::Orientation orientation) const +void StyleSelector::weightedStyleRulesForNode( + NodePtr node, + const Qt::Orientation orientation, + QList *matchedRules) const { initNode(node); - QVector weightedRules; // (spec, rule) that will be sorted below - - // Generate inheritance list (reverse order) - QStringList classNames; - QGraphicsWidget *widgetPtr = static_cast (node.ptr); - const QMetaObject *metaObject = widgetPtr->metaObject(); - do { - const QString className = metaObject->className(); - classNames << className; - metaObject = metaObject->superClass(); - } while (metaObject != 0); - classNames << GLOBAL_CSS_SELECTOR; - + QSet dirtyNodes; + + QList ancestorClasses = generateAncestorHashList(node); // Iterate backwards through list to append most-derived classes last - int count = classNames.count(); + int count = ancestorClasses.count(); bool firstLoop = true; while(count--){ - const QString &className = classNames.at(count); - uint classNameHash = qHash(className); + uint classNameHash = ancestorClasses.at(count); QVectorIterator iter(widgetSheets[classNameHash]); while (iter.hasNext()) { const StyleSheet *styleSheet = iter.next(); - if(styleSheet) { - WidgetStyleRules* widgetStack = styleSheet->widgetStack(classNameHash); - if (widgetStack) { - matchRules(node, widgetStack->styleRules, styleSheet->origin, - styleSheet->depth, &weightedRules, false); - // Append orientation-specific rules - if (orientation == Qt::Vertical) { - matchRules(node, widgetStack->portraitRules, styleSheet->origin, - styleSheet->depth, &weightedRules, false); - }else if (orientation == Qt::Horizontal) { - matchRules(node, widgetStack->landscapeRules, styleSheet->origin, - styleSheet->depth, &weightedRules, false); + if (!styleSheet) + continue; + + WidgetStyleRules* widgetStack = styleSheet->widgetStack(classNameHash); + if (widgetStack) { + matchRules(node, widgetStack->styleRules, styleSheet->origin, + styleSheet->depth, matchedRules, &dirtyNodes, false); + // Append orientation-specific rules + if (orientation == Qt::Vertical) { + matchRules(node, widgetStack->portraitRules, styleSheet->origin, + styleSheet->depth, matchedRules, &dirtyNodes, false); + }else if (orientation == Qt::Horizontal) { + matchRules(node, widgetStack->landscapeRules, styleSheet->origin, + styleSheet->depth, matchedRules, &dirtyNodes, false); + } + } + if (firstLoop && !medium.isEmpty()) { // Media rules are only added to global widget stack + int mediaRuleCount = styleSheet->mediaRules.count(); + for (int i = 0; i < mediaRuleCount; ++i) { + if (styleSheet->mediaRules.at(i).media.contains( + HbString(medium, HbMemoryManager::HeapMemory), + Qt::CaseInsensitive)) { + matchRules(node, styleSheet->mediaRules.at(i).styleRules, + styleSheet->origin, styleSheet->depth, matchedRules, &dirtyNodes); } } - if (firstLoop && !medium.isEmpty()) { // Media rules are only added to global widget stack - int mediaRuleCount = styleSheet->mediaRules.count(); - for (int i = 0; i < mediaRuleCount; ++i) { - if (styleSheet->mediaRules.at(i).media.contains( - HbString(medium, HbMemoryManager::HeapMemory), - Qt::CaseInsensitive)) { - matchRules(node, styleSheet->mediaRules.at(i).styleRules, - styleSheet->origin, styleSheet->depth, &weightedRules); - } - } - }// End medium.isEmpty loop - }// End styleSheet + }// End medium.isEmpty loop } firstLoop = false; } - cleanupNode(node); - return weightedRules; + QSet::const_iterator dirtyNode; + for (dirtyNode = dirtyNodes.begin(); dirtyNode != dirtyNodes.end(); ++dirtyNode) + cleanupNode(*dirtyNode); } bool StyleSelector::hasOrientationSpecificStyleRules(NodePtr node) const { - // Generate inheritance list (reverse order) - QStringList classNames; - QGraphicsWidget *widgetPtr = static_cast (node.ptr); - const QMetaObject *metaObject = widgetPtr->metaObject(); - do { - const QString className = metaObject->className(); - classNames << className; - metaObject = metaObject->superClass(); - } while (metaObject != 0); - classNames << GLOBAL_CSS_SELECTOR; - - int count = classNames.count(); + QList ancestorClasses = generateAncestorHashList(node); + int count = ancestorClasses.count(); while (count--) { - const QString &className = classNames.at(count); - uint classNameHash = qHash(className); + uint classNameHash = ancestorClasses.at(count); QVectorIterator iter(widgetSheets[classNameHash]); while (iter.hasNext()) { const StyleSheet *styleSheet = iter.next(); @@ -1485,16 +1400,17 @@ // Returns declarations and specificity values (unordered) -QVector StyleSelector::weightedDeclarationsForNode( +void StyleSelector::weightedDeclarationsForNode( NodePtr node, const Qt::Orientation orientation, + QList *matchedDecls, const char *extraPseudo) const { - QVector decls; - QVector rules = weightedStyleRulesForNode(node, orientation); + QList rules; + weightedStyleRulesForNode(node, orientation, &rules); for (int i = 0; i < rules.count(); i++) { const Selector& selector = rules.at(i).second.selectors.at(0); - const QString pseudoElement = selector.pseudoElement(); + const QString &pseudoElement = selector.pseudoElement(); bool pseudoElementMatches = (extraPseudo && pseudoElement == QLatin1String(extraPseudo)); @@ -1511,14 +1427,11 @@ if (pseudoClassIsValid || pseudoElementMatches) { HbVector ruleDecls = rules.at(i).second.declarations; for (int j=0; jappend(wDecl); } } } - return decls; } // for qtexthtmlparser which requires just the declarations with Enabled state @@ -1532,8 +1445,8 @@ if (styleSheets.isEmpty()) return decls; - QVector weightedDecls = - weightedDeclarationsForNode(node, orientation, extraPseudo); + QList weightedDecls; + weightedDeclarationsForNode(node, orientation, &weightedDecls, extraPseudo); qStableSort(weightedDecls.begin(), weightedDecls.end(), qcss_selectorDeclarationLessThan); @@ -1760,9 +1673,10 @@ #endif if(rule.selectors.count() > 1){ foreach(const HbCss::Selector &selector, rule.selectors){ - QString stackName = selector.basicSelectors.last().elementName; - if(stackName.length() < 1){ - stackName = GLOBAL_CSS_SELECTOR; + uint stackNameHash = GLOBAL_CSS_SELECTOR_HASH; // Default to global selector value + const QString &stackName = selector.basicSelectors.last().elementName; + if(stackName.length() > 0){ + stackNameHash = qHash(stackName.toLatin1()); } StyleRule newRule(rule.memoryType); newRule.declarations = rule.declarations; @@ -1770,14 +1684,15 @@ #ifdef HB_CSS_INSPECTOR newRule.owningStyleSheet = styleSheet; #endif - addRuleToWidgetStack(styleSheet, stackName, newRule); + addRuleToWidgetStack(styleSheet, stackNameHash, newRule); } } else { - QString stackName = rule.selectors.at(0).basicSelectors.last().elementName; - if(stackName.length() < 1){ - stackName = GLOBAL_CSS_SELECTOR; + uint stackNameHash = GLOBAL_CSS_SELECTOR_HASH; // Default to global selector value + const QString &stackName = rule.selectors.at(0).basicSelectors.last().elementName; + if(stackName.length() > 0){ + stackNameHash = qHash(stackName.toLatin1()); } - addRuleToWidgetStack(styleSheet, stackName, rule); + addRuleToWidgetStack(styleSheet, stackNameHash, rule); } } else if (test(ATKEYWORD_SYM)) { if (!until(RBRACE)) return false; @@ -1798,15 +1713,11 @@ return true; } -void Parser::addRuleToWidgetStack(StyleSheet *sheet, const QString &stackName, StyleRule &rule) +void Parser::addRuleToWidgetStack(StyleSheet *sheet, uint stackNameHash, StyleRule &rule) { - uint stackNameHash = qHash(stackName); WidgetStyleRules* widgetStack = sheet->widgetStack(stackNameHash); if (!widgetStack) { -#ifdef CSSPARSER_DEBUG - qDebug() << "Creating stack for classname" << stackName; -#endif HbCss::WidgetStyleRules rules(stackNameHash, sheet->memoryType); widgetStack = sheet->addWidgetStack(rules); } @@ -2382,24 +2293,27 @@ args.prepend(sourcePath); } value->variant = args; - } - //changes for variable support - else if (name == QLatin1String("var")) { - value->type = Value::Variable; - value->variant = (int)hbHash( args ); - } else if (name == QLatin1String("-var")) { - value->type = Value::VariableNegative; + } else if (name == QLatin1String("var") || name == QLatin1String("-var")) { + value->type = name.startsWith(QLatin1Char('-')) + ? Value::VariableNegative + : Value::Variable; value->variant = (int)hbHash( args ); - } //change end - //changes for expression support - else if (name == QLatin1String("expr")) { - value->type = Value::Expression; - value->variant = args; - } else if (name == QLatin1String("-expr")) { - value->type = Value::ExpressionNegative; - value->variant = args; - } //change end - else { +#ifdef HB_CSS_INSPECTOR + value->original = args; +#endif + } else if (name == QLatin1String("expr") || name == QLatin1String("-expr")) { + value->type = name.startsWith(QLatin1Char('-')) + ? Value::ExpressionNegative + : Value::Expression; + QList tokens; + if (!HbExpressionParser::parse(args, tokens)) { + return false; + } + value->variant = tokens; +#ifdef HB_CSS_INSPECTOR + value->original = args; +#endif + } else { value->type = Value::Function; value->variant = QStringList() << name << args; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/cssparser/hbcssparser_p.h --- a/src/hbcore/cssparser/hbcssparser_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/cssparser/hbcssparser_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -49,6 +49,8 @@ #include "hbvariant_p.h" #include "hbstringvector_p.h" +#include "hbexpressionparser_p.h" + class HbLayoutParameters; namespace HbCss @@ -463,40 +465,24 @@ void setVariables(const QHash &vars) { variables = &vars; } bool extractVariableValue(quint32 hashValue, HbCss::Value &value) const; - bool extractVariableValue(quint32 hashValue, qreal &value); + bool extractVariableValue(quint32 hashValue, qreal &value) const; bool extractVariableValue(const QString &variableName, HbCss::Value &value) const; - bool extractVariableValue(const QString &variableName, qreal &value); - bool extractExpressionValue(QString &expression, qreal &value); + bool extractVariableValue(const QString &variableName, qreal &value) const; + bool extractExpressionValue(const QList &tokens, qreal &value) const; + bool extractExpressionValue(const QString &expression, qreal &value) const; - bool extractKnownProperties(KnownProperties &prop); - bool extractCustomProperties(const QList &keys, QList &values); - bool extractLayout(QString &layoutName, QString §ionName); + bool extractKnownProperties(KnownProperties &prop) const; + bool extractCustomProperties(const QList &keys, QList &values) const; + bool extractLayout(QString &layoutName, QString §ionName) const; bool extractColor(QColor &color) const; private: - qreal asReal(const Declaration &decl, bool *ok = 0); - qreal asReal(const Value &v, bool *ok = 0); - qreal asReal(QString &s, Value::Type type, bool *ok = 0); - bool asReals(const Declaration &decl, qreal *m); - - struct ExpressionValue - { - enum Token { - None = 0, - Minus = 1, - Plus = 2, - Star = 3, - Slash = 4, - UnaryMinus = 5 - }; - - ExpressionValue() : mToken(None), mPrecedence(0), mValue(0) {} - ExpressionValue(Token token, int precedence, qreal value) : mToken(token), mPrecedence(precedence), mValue(value) {} - Token mToken; - int mPrecedence; - qreal mValue; - }; + qreal asReal(const Declaration &decl, bool *ok = 0) const; + qreal asReal(const Value &v, bool *ok = 0) const; + qreal asReal(QString &s, Value::Type type, bool *ok = 0) const; + qreal asReal(int token, HbExpressionParser::Token type, bool &ok) const; + bool asReals(const Declaration &decl, qreal *m) const; HbVector declarations; @@ -504,7 +490,6 @@ const QHash *variables; HbDeviceProfile currentProfile; - QList expressionValues; // for parsed expression string }; struct StyleSheet; @@ -718,11 +703,19 @@ union NodePtr { void *ptr; int id; + bool operator==(const NodePtr &other) const { return(ptr == other.ptr); } }; bool hasOrientationSpecificStyleRules(NodePtr node) const; - QVector weightedStyleRulesForNode(NodePtr node, const Qt::Orientation orientation) const; - QVector weightedDeclarationsForNode(NodePtr node, const Qt::Orientation orientation, const char *extraPseudo = 0) const; + void weightedStyleRulesForNode( + NodePtr node, + const Qt::Orientation orientation, + QList *matchedRules) const; + void weightedDeclarationsForNode( + NodePtr node, + const Qt::Orientation orientation, + QList *matchedDecls, + const char *extraPseudo = 0) const; HbVector styleRulesForNode(NodePtr node, const Qt::Orientation orientation) const; HbVector declarationsForNode(NodePtr node, const Qt::Orientation orientation, const char *extraPseudo = 0) const; void variableRuleSets(QHash *variables) const; @@ -744,13 +737,27 @@ QHash > widgetSheets; QString medium; private: - void matchRules(NodePtr node, const HbVector &rules, StyleSheetOrigin origin, - int depth, QVector *weightedRules, bool nameCheckNeeded=true) const; - int selectorMatches(const Selector &rule, NodePtr node, bool nameCheckNeeded) const; - int basicSelectorMatches(const BasicSelector &rule, NodePtr node, bool nameCheckNeeded) const; + void matchRules( + NodePtr node, + const HbVector &rules, + StyleSheetOrigin origin, + int depth, + QList *weightedRules, + QSet *dirtyNodes, + bool nameCheckNeeded=true) const; + int selectorMatches(const Selector &rule, NodePtr node, + QSet *dirtyNodes, bool nameCheckNeeded) const; + int basicSelectorMatches(const BasicSelector &rule, NodePtr node, + QSet *dirtyNodes, bool nameCheckNeeded) const; int inheritanceDepth(NodePtr node, HbString &elementName) const; }; +inline uint qHash(const StyleSelector::NodePtr &key) +{ + int k = (int)(key.ptr); + return ::qHash(k); +} + enum TokenType { NONE, @@ -854,7 +861,7 @@ bool parseHexColor(QColor *col); bool testAndParseUri(HbString *uri); - void addRuleToWidgetStack(StyleSheet *sheet, const QString &stackName, StyleRule &rule); + void addRuleToWidgetStack(StyleSheet *sheet, uint stackNameHash, StyleRule &rule); inline bool testRuleset() { return testSelector(); } inline bool testSelector() { return testSimpleSelector(); } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/cssparser/hbexpressionparser_p.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/cssparser/hbexpressionparser_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,329 @@ +/**************************************************************************** +** +** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (developer.feedback@nokia.com) +** +** This file is part of the HbCore module of the UI Extensions for Mobile. +** +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at developer.feedback@nokia.com. +** +****************************************************************************/ + +#include "hbexpressionparser_p.h" +#include "hbhash_p.h" + +#include + + +static bool parseExpressionOperand( + const QString &str, + HbExpressionParser::Token &type, + int &value) +{ + QString valueString = str; + if (valueString.startsWith("var(") && valueString.endsWith(")")) { + // remove var( and last ) + type = HbExpressionParser::Variable; + value = hbHash(valueString.midRef(4, valueString.size()-5)); + } else { + if (valueString.endsWith(QLatin1String("un"), Qt::CaseInsensitive)) { + valueString.chop(2); + type = HbExpressionParser::LengthInUnits; + } else if (valueString.endsWith(QLatin1String("px"), Qt::CaseInsensitive)) { + valueString.chop(2); + type = HbExpressionParser::LengthInPixels; + } else if (valueString.endsWith(QLatin1String("mm"), Qt::CaseInsensitive)) { + valueString.chop(2); + type = HbExpressionParser::LengthInMillimeters; + } else { + // assume pixels + type = HbExpressionParser::LengthInPixels; + } + bool ok(true); + value = HbExpressionParser::toFixed(valueString.toFloat(&ok)); + if (!ok) { + return false; + } + } + return true; +} + +static int precedence(HbExpressionParser::Token op) +{ + switch (op) { + case HbExpressionParser::Addition: + case HbExpressionParser::Subtraction: + return 1; + case HbExpressionParser::Multiplication: + case HbExpressionParser::Division: + return 2; + case HbExpressionParser::Negation: + return 3; + default: + return 0; + } +} + +static bool isLeft(HbExpressionParser::Token op) +{ + switch (op) { + case HbExpressionParser::Addition: + case HbExpressionParser::Subtraction: + case HbExpressionParser::Multiplication: + case HbExpressionParser::Division: + return true; + case HbExpressionParser::Negation: + default: + return false; + } +} + + +bool HbExpressionParser::parse(const QString &str, QList &tokens) +{ + tokens.clear(); + + // Parse the infix notation to "tempTokens" + QList tempTokens; + + const QChar SPACE(' '); + const QChar OPENPARENTHESIS('('); + const QChar CLOSEPARENTHESIS(')'); + const QChar PLUS('+'); + const QChar MINUS('-'); + const QChar STAR('*'); + const QChar SLASH('/'); + + int position = 0; + + if (str.startsWith("expr(") && str.endsWith(")")) { + position = 4; + } else if (str.startsWith("-expr(") && str.endsWith(")")) { + position = 5; + tempTokens.append(LengthInPixels); + tempTokens.append(toFixed(-1.0)); + tempTokens.append(Multiplication); + } + + int begin = -1; + int nestingLevel = 0; + bool parseVariable = false; + bool endMark = false; + int operatorCount = 1;//there can only be 2 sequental operators if the latter one is negation + while (position < str.size()) { + endMark = false; + bool appendCloseParenthesis(false); + if (str.at(position) == SPACE) { + endMark = true; + } else if ((str.at(position) == OPENPARENTHESIS) && !parseVariable) { + tempTokens.append(OpenParenthesis); + nestingLevel++; + position++; + operatorCount = 1; + continue; + } else if (str.at(position) == CLOSEPARENTHESIS) { + if (parseVariable) { + parseVariable = false; + position++; + continue; + } + appendCloseParenthesis = true; + nestingLevel--; + endMark = true; + } else if ((str.at(position) == MINUS) && !parseVariable) { + endMark = true; + } else if ((str.at(position) == PLUS) || + (str.at(position) == STAR) || + (str.at(position) == SLASH)) { + endMark = true; + } + + if (endMark) { + if (begin >= 0) { + // parse operand + QString valueString = str.mid(begin, position - begin); + if (operatorCount==0) { + // an operand without operator + return false; + } + HbExpressionParser::Token type; + int val; + if ( !parseExpressionOperand(valueString, type, val ) ) { + return false; + } + tempTokens.append(type); + tempTokens.append(val); + operatorCount = 0; + } + begin = -1; + if (str.at(position) == PLUS) { + if (operatorCount > 0) { + return false; + } + tempTokens.append(Addition); + operatorCount++; + } else if (str.at(position) == MINUS) { + if (operatorCount == 1) { + tempTokens.append(Negation); + } else if (operatorCount > 1) { + return false; + } else { + tempTokens.append(Subtraction); + } + operatorCount++; + } else if (str.at(position) == STAR) { + if (operatorCount > 0) { + return false; + } + tempTokens.append(Multiplication); + operatorCount++; + } else if (str.at(position) == SLASH) { + if (operatorCount > 0) { + return false; + } + tempTokens.append(Division); + operatorCount++; + } + if (appendCloseParenthesis) { + tempTokens.append(CloseParenthesis); + if (operatorCount != 0) { + // an operator without operand + return false; + } + } + position++; + continue; + } + + if (begin == -1) { + begin = position; + } + + // flag variable parsing (variable syntax contains parenthesis) + if ((str.at(position) == QChar('v')) && !parseVariable) { + parseVariable = true; + position++; + continue; + } + position++; + } + + // check for unmatching parentheses + if (nestingLevel != 0) { + return false; + } + + // parse last value + if (begin >= 0) { + // parse operand + if (operatorCount==0) { + // an operand without operator + return false; + } + QString valueString = str.mid(begin, position - begin); + HbExpressionParser::Token type; + int val; + if ( !parseExpressionOperand(valueString, type, val ) ) { + return false; + } + tempTokens.append(type); + tempTokens.append(val); + } else { + if (operatorCount!=0) { + // an operator without operand + return false; + } + } + + if (tempTokens.count()<2) { + return false; + } + + // Convert the infix notation to RPN with "shunting-yard" algorithm + + QStack operatorStack; + for (int i=0; i +#include + +#include +#include + +class HB_CORE_PRIVATE_EXPORT HbExpressionParser //krazy:exclude=multiclasses +{ +public: + + enum Token { + Variable, + LengthInPixels, + LengthInUnits, + LengthInMillimeters, + OpenParenthesis, + CloseParenthesis, + Addition, + Subtraction, + Multiplication, + Division, + Negation + }; + + static bool parse(const QString &str, QList &tokens); + static int toFixed(float f); + static int toFixed(double d); + static qreal fromFixed(int i); +}; + + +#endif // HBEXPRESSIONPARSER_P_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/cssparser/hblayeredstyleloader_p.cpp --- a/src/hbcore/cssparser/hblayeredstyleloader_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/cssparser/hblayeredstyleloader_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -116,10 +116,12 @@ void HbLayeredStyleLoader::init(Concern con) { mConcern = con; - if (con != Concern_All) { - HbLayeredStyleLoader *allStack = getStack(Concern_All); - if (allStack) { - mUsedLayers = allStack->mUsedLayers; + if (con == Concern_All) { + mAllStack = 0; + } else { + mAllStack = getStack(Concern_All); + if (mAllStack) { + mUsedLayers = mAllStack->mUsedLayers; } } #ifdef HB_USETHEMESERVER @@ -308,11 +310,15 @@ { QVector fileList; + bool dirPathHasSeparator = dirPath.endsWith(QDir::separator()); + QDir dir(dirPath, CSS_FILTER, sort, QDir::Readable | QDir::Files); QStringList files = dir.entryList(); + fileList.reserve(files.count()); + for (QStringList::Iterator it = files.begin(); it != files.end(); ++it) { QString cssPath = dirPath; - if (!dirPath.endsWith(QDir::separator())) { + if (!dirPathHasSeparator) { cssPath.append(QDir::separator()); } cssPath.append(*it); @@ -408,14 +414,14 @@ } -static inline bool qcss_selectorStyleRuleLessThan( - const QPair &lhs, const QPair &rhs) +static inline bool qcss_selectorStyleRuleLessThan(const HbCss::WeightedRule &lhs, + const HbCss::WeightedRule &rhs) { return lhs.first < rhs.first; } -static inline bool qcss_selectorDeclarationLessThan( - const QPair &lhs, const QPair &rhs) +static inline bool qcss_selectorDeclarationLessThan(const HbCss::WeightedDeclaration &lhs, + const HbCss::WeightedDeclaration &rhs) { return lhs.first < rhs.first; } @@ -426,9 +432,6 @@ HbWidget* widget = (HbWidget*) node.ptr; HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance(); loader->loadCss(widget); - - QVector > weightedRulesList; - HbLayeredStyleLoader *allStack = mConcern == Concern_All ? 0 : getStack(Concern_All); QListIterator iter(mUsedLayers); while (iter.hasNext()) { @@ -439,10 +442,10 @@ return true; } } - if (allStack) { + if (mAllStack) { QMap::const_iterator allIt = - allStack->mStyleLayers.constFind(priority); - if (allIt != allStack->mStyleLayers.constEnd()) { + mAllStack->mStyleLayers.constFind(priority); + if (allIt != mAllStack->mStyleLayers.constEnd()) { if (allIt->styleSelector.hasOrientationSpecificStyleRules(node)) { return true; } @@ -467,43 +470,39 @@ HbWidget* widget = (HbWidget*) node.ptr; HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance(); loader->loadCss(widget); - - QVector > weightedDeclsList; - HbLayeredStyleLoader *allStack = mConcern == Concern_All ? 0 : getStack(Concern_All); + + QList weightedDecls; QListIterator iter(mUsedLayers); while (iter.hasNext()) { LayerPriority priority = iter.next(); QMap::const_iterator it = mStyleLayers.constFind(priority); if (it != mStyleLayers.constEnd()) { - weightedDeclsList.append( - it->styleSelector.weightedDeclarationsForNode(node, orientation, extraPseudo)); + it->styleSelector.weightedDeclarationsForNode( + node, + orientation, + &weightedDecls, + extraPseudo); } - if (allStack) { + if (mAllStack) { QMap::const_iterator allIt = - allStack->mStyleLayers.constFind(priority); - if (allIt != allStack->mStyleLayers.constEnd()) { - weightedDeclsList.append( - allIt->styleSelector.weightedDeclarationsForNode( - node, - orientation, - extraPseudo)); + mAllStack->mStyleLayers.constFind(priority); + if (allIt != mAllStack->mStyleLayers.constEnd()) { + allIt->styleSelector.weightedDeclarationsForNode( + node, + orientation, + &weightedDecls, + extraPseudo); } } } - QVector weightedDecls; - int count = 0; - for (int i=0; i 1) { + qStableSort(weightedDecls.begin(), weightedDecls.end(), qcss_selectorDeclarationLessThan); } - weightedDecls.reserve(count); - for (int i=0; i decls; + decls.reserve(weightedDecls.count()); for (int j = 0; j < weightedDecls.count(); j++) decls += weightedDecls.at(j).second; return decls; @@ -519,50 +518,38 @@ const Qt::Orientation orientation) const { HbWidget* widget = (HbWidget*) node.ptr; - HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance(); - loader->loadCss(widget); - - QVector > weightedRulesList; - HbLayeredStyleLoader *allStack = mConcern == Concern_All ? 0 : getStack(Concern_All); + HbWidgetStyleLoader::instance()->loadCss(widget); + + QList weightedRules; QListIterator iter(mUsedLayers); while (iter.hasNext()) { LayerPriority priority = iter.next(); QMap::const_iterator it = mStyleLayers.constFind(priority); if (it != mStyleLayers.constEnd()) { - weightedRulesList.append( - it->styleSelector.weightedStyleRulesForNode(node, orientation)); + it->styleSelector.weightedStyleRulesForNode(node, orientation, &weightedRules); } - if (allStack) { + if (mAllStack) { QMap::const_iterator allIt = - allStack->mStyleLayers.constFind(priority); - if (allIt != allStack->mStyleLayers.constEnd()) { - weightedRulesList.append( - allIt->styleSelector.weightedStyleRulesForNode(node, orientation)); + mAllStack->mStyleLayers.constFind(priority); + if (allIt != mAllStack->mStyleLayers.constEnd()) { + allIt->styleSelector.weightedStyleRulesForNode(node, orientation, &weightedRules); } } } - - QVector weightedRules; - int count = 0; - for (int i=0; i 1) { + qStableSort(weightedRules.begin(), weightedRules.end(), qcss_selectorStyleRuleLessThan); } - weightedRules.reserve(count); - for (int i=0; i rules; #ifdef LAYEREDSTYLELOADER_DEBUG qDebug() << "Style rules for" << widget->metaObject()->className(); qDebug("\n%s", HbCssFormatter::weightedStyleRulesToString(weightedRules).toLatin1().constData()); #endif - rules.reserve(count); - for (int j = 0; j < weightedRules.count(); j++) { + + HbVector rules; + rules.reserve(weightedRules.count()); + for (int j = 0; j < weightedRules.count(); j++) rules += weightedRules.at(j).second; - } return rules; } @@ -572,8 +559,6 @@ */ void HbLayeredStyleLoader::variableRuleSets(QHash *variables) const { - HbLayeredStyleLoader *allStack = mConcern == Concern_All ? 0 : getStack(Concern_All); - QListIterator iter(mUsedLayers); while (iter.hasNext()) { LayerPriority priority = iter.next(); @@ -593,10 +578,10 @@ } } } - if (allStack) { + if (mAllStack) { QMap::const_iterator allIt = - allStack->mStyleLayers.constFind(priority); - if (allIt != allStack->mStyleLayers.constEnd()) { + mAllStack->mStyleLayers.constFind(priority); + if (allIt != mAllStack->mStyleLayers.constEnd()) { allIt->styleSelector.variableRuleSets(variables); } } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/cssparser/hblayeredstyleloader_p.h --- a/src/hbcore/cssparser/hblayeredstyleloader_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/cssparser/hblayeredstyleloader_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -97,6 +97,7 @@ HbCss::StyleSheet *mCurrentSheet; #endif HbVector *mServerHbCssMisses; + HbLayeredStyleLoader *mAllStack; }; #endif // HBLAYEREDSTYLELOADER_P_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/cssparser/hbwidgetstyleloader_p.cpp --- a/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -44,6 +44,7 @@ static const QString CSS_EXTENSION = ".css"; static const QString PATTERN_WILDCARD = "%w"; static const QString HBWIDGETBASE_CLASSNAME = "HbWidgetBase"; +static QStringList FILEPATH_NAME_FILTERS = QStringList() << "*.css" << "*.widgetml"; /*! \proto @@ -123,13 +124,10 @@ QDir fileDir(filePath); if( fileDir.exists() ) { // go through all the style files in the directory - QStringList nameFilters; - nameFilters << "*.css"; - nameFilters << "*.widgetml"; - QFileInfoList files = fileDir.entryInfoList(nameFilters); + QFileInfoList files = fileDir.entryInfoList(FILEPATH_NAME_FILTERS); if (files.count()) { bool success( true ); - foreach(QFileInfo file, files) { + foreach(const QFileInfo &file, files) { success &= addFilePath( file.absoluteFilePath(), concern, priority ); } return success; @@ -158,12 +156,9 @@ QDir fileDir(filePath); if( fileDir.exists() ) { // go through all the style files in the directory - QStringList nameFilters; - nameFilters << "*.css"; - nameFilters << "*.widgetml"; - QFileInfoList files = fileDir.entryInfoList(nameFilters); + QFileInfoList files = fileDir.entryInfoList(FILEPATH_NAME_FILTERS); bool success( true ); - foreach(QFileInfo file, files) { + foreach(const QFileInfo &file, files) { success &= removeFilePath( file.absoluteFilePath(), concern, priority ); } return success; @@ -223,16 +218,18 @@ const HbLayeredStyleLoader::Concern concern, const HbLayeredStyleLoader::LayerPriority priority) { - for(int i=0; imetaObject()->className(); #endif - for(int i=0; iload(mFileSets[i].path, mFileSets[i].priority); + int hand = stack->load(fileSet.path, fileSet.priority); if (hand) { #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Successfully loaded CSS from file" << mFileSets[i].path; + qDebug() << "Successfully loaded CSS from file" << fileSet.path; #endif - mFileSets[i].loadedCss.insert(0, hand); + fileSet.loadedCss.insert(0, hand); } else { #ifdef WIDGETSTYLELOADER_DEBUG qDebug() << "Failed to load CSS from file" << mFileSets[i].path; #endif - mFileSets[i].missedCss.append(0); + fileSet.missedCss.append(0); } } continue; @@ -413,34 +413,34 @@ if (!meta) { break; } - if (mFileSets[i].loadedCss.contains(classNameHash)){ + if (fileSet.loadedCss.contains(classNameHash)){ #ifdef WIDGETSTYLELOADER_DEBUG qDebug() << "CSS already loaded for" << className; #endif continue; } - if (mFileSets[i].missedCss.contains(classNameHash)){ + if (fileSet.missedCss.contains(classNameHash)){ #ifdef WIDGETSTYLELOADER_DEBUG qDebug() << "CSS already searched but missed for" << className; #endif continue; } - QString filename = mFileSets[i].path; + QString filename = fileSet.path; filename.replace(PATTERN_WILDCARD, className.toLatin1().toLower()); #ifdef WIDGETSTYLELOADER_DEBUG qDebug() << "Loading CSS for widget" << className << "from file" << filename; #endif - int hand = stack->load(filename, mFileSets[i].priority); + int hand = stack->load(filename, fileSet.priority); if (hand) { #ifdef WIDGETSTYLELOADER_DEBUG qDebug() << "Successfully loaded CSS for" << className; #endif - mFileSets[i].loadedCss.insert(classNameHash, hand); + fileSet.loadedCss.insert(classNameHash, hand); } else { #ifdef WIDGETSTYLELOADER_DEBUG qDebug() << "Failed to load CSS for" << className; #endif - mFileSets[i].missedCss.append(classNameHash); + fileSet.missedCss.append(classNameHash); } } } @@ -480,23 +480,24 @@ // portrait) int c = mFileSets.count(); while(c-- && !loaded){ - if ( !(mFileSets.at(c).type == FileSetType_Pattern - || mFileSets.at(c).type == FileSetType_WidgetML ) ) { + const FileSet& fileSet = mFileSets.at(c); + if ( !(fileSet.type == FileSetType_Pattern + || fileSet.type == FileSetType_WidgetML ) ) { continue; } - if (mFileSets.at(c).type == FileSetType_Pattern - && mFileSets.at(c).patternType != PatternType_WidgetML) { + if (fileSet.type == FileSetType_Pattern + && fileSet.patternType != PatternType_WidgetML) { continue; } const QMetaObject *meta = widget->metaObject(); QString className = meta->className(); #ifdef WIDGETSTYLELOADER_DEBUG - qDebug() << "Checking fileset " << mFileSets[c].path; + qDebug() << "Checking fileset " << fileSet.path; #endif while(className != HBWIDGETBASE_CLASSNAME){ - QString filename = mFileSets[c].path; + QString filename = fileSet.path; bool attemptToLoad(true); - if ( mFileSets[c].type == FileSetType_Pattern ) { + if ( fileSet.type == FileSetType_Pattern ) { filename.replace(PATTERN_WILDCARD, className.toLatin1().toLower()); } else { QString classFilename( className.toLatin1().toLower() ); @@ -520,7 +521,7 @@ qDebug() << "Attempting to load file " << filename; #endif HbMemoryManager::MemoryType type = - HbLayeredStyleLoader::sharingNeeded(mFileSets[c].priority) + HbLayeredStyleLoader::sharingNeeded(fileSet.priority) ? HbMemoryManager::SharedMemory : HbMemoryManager::HeapMemory; if(loader.load(widget, filename, layoutName, sectionName, type)) { @@ -551,10 +552,12 @@ #ifdef WIDGETSTYLELOADER_DEBUG qDebug() << "Clearing list for stack" << concern; #endif - for(int i=0; imLevelPercent; +} + +bool HbBatteryIndicator::isCharging() const +{ + Q_D(const HbBatteryIndicator); + // Cannot use mChargingOn only because this function must work + // reliably even when called while being in setLevel(). On the + // other hand the timer is stopped while being in sleep mode. So + // check both. + return d->mChargingTimer.isActive() || d->mChargingOn; +} + +void HbBatteryIndicator::chargingEvent(bool start) +{ + Q_D(HbBatteryIndicator); + if (start) { + if (d->mChargingOn) { + d->mChargingTimer.start(250, this); + } + } else { + d->mChargingTimer.stop(); + } +} + void HbBatteryIndicator::createPrimitives() { Q_D(HbBatteryIndicator); @@ -146,12 +174,6 @@ HbStylePrivate::updatePrimitive(d->mBatteryLevelIcon, HbStylePrivate::P_BatteryLevel_icon, &option); } -int HbBatteryIndicator::level() const -{ - Q_D(const HbBatteryIndicator); - return d->mLevelPercent; -} - /* set battery strength level. \a level value should be between 0 and 100 \a level value is ignored if out of range. @@ -222,16 +244,6 @@ option->batteryValue = d->mLevelPercent; } -bool HbBatteryIndicator::isCharging() const -{ - Q_D(const HbBatteryIndicator); - // Cannot use mChargingOn only because this function must work - // reliably even when called while being in setLevel(). On the - // other hand the timer is stopped while being in sleep mode. So - // check both. - return d->mChargingTimer.isActive() || d->mChargingOn; -} - /*! \reimp */ diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/decorators/hbbatteryindicator_p.h --- a/src/hbcore/decorators/hbbatteryindicator_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/decorators/hbbatteryindicator_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -51,6 +51,7 @@ inline int type() const { return Type; } int level() const; bool isCharging() const; + void chargingEvent(bool start); public slots: virtual void createPrimitives(); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/decorators/hbindicatorbutton.cpp --- a/src/hbcore/decorators/hbindicatorbutton.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/decorators/hbindicatorbutton.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -103,6 +103,9 @@ mHandleIcon(0), mDefaultAction(0), mNewEventAction(0), mProgressAction(0), mDeviceDialog(0), mProgressAnimationFound(false), mNewEventIcon(0), mNewEvent(false), mStyle(0), mIndicatorMenuOpen(false), mTouchArea(0) +#if defined(Q_OS_SYMBIAN) + ,mIndicatorButtonStatusPrivate(0) +#endif // defined(Q_OS_SYMBIAN) { } @@ -156,7 +159,8 @@ void HbIndicatorButtonPrivate::addIndicators(const QList &clientInfo) { for (int i = 0; i < clientInfo.size(); ++i) { - if (clientInfo.at(i).hasMenuData) { + if (clientInfo.at(i).hasMenuData + || clientInfo.at(i).category == HbIndicatorInterface::ProgressCategory) { mIndicators.prepend(clientInfo.at(i)); if (clientInfo.at(i).category == HbIndicatorInterface::NotificationCategory) { mNewEvent = true; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/decorators/hbstatusbar.cpp --- a/src/hbcore/decorators/hbstatusbar.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/decorators/hbstatusbar.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -37,6 +37,7 @@ #include "hbsignalindicator_p.h" #include "hbbatteryindicator_p.h" #include "hbindicatorgroup_p.h" +#include "hbdevicedialogserverstatus_p.h" #if defined(Q_OS_SYMBIAN) #include "hbindicatorsym_p.h" @@ -46,7 +47,7 @@ #include "hbindicatorwin32_p.h" #endif // defined(Q_OS_SYMBIAN) -const int clockUpdateDelay = 10000; // 10 s +const int clockUpdateDelay = 1000; // 1 s /* \class HbStatusBar @@ -65,7 +66,8 @@ mSettingsIndicatorGroup(0), mMainWindow(0), mPreviousProperties(0), - mIndicatorPrivate(0) + mIndicatorPrivate(0), + mServerStatus(0) { #if defined(Q_OS_SYMBIAN) // Register for system environment changes @@ -76,6 +78,7 @@ mEnvChangeNotifier->Start(); #endif + mServerStatus = new HbDeviceDialogServerStatus(false); } HbStatusBarPrivate::~HbStatusBarPrivate() @@ -91,6 +94,7 @@ delete mEnvChangeNotifier; } #endif + delete mServerStatus; } void HbStatusBarPrivate::delayedConstruction() @@ -138,6 +142,9 @@ q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*))); + q->connect(mMainWindow, SIGNAL(revealed()), q, SLOT(startClockTimer())); + q->connect(mMainWindow, SIGNAL(obscured()), q, SLOT(startClockTimer())); + mClockTimerId = q->startTimer(clockUpdateDelay); mIndicatorPrivate->startListen(); @@ -252,6 +259,22 @@ } } +void HbStatusBarPrivate::startClockTimer() +{ + Q_Q(HbStatusBar); + updateTime(); + mClockTimerId = q->startTimer(clockUpdateDelay); +} + +void HbStatusBarPrivate::killClockTimer() +{ + Q_Q(HbStatusBar); + if (mClockTimerId != 0) { + q->killTimer(mClockTimerId); + mClockTimerId = 0; + } +} + #if defined(Q_OS_SYMBIAN) TInt HbStatusBarPrivate::EnvChangeCallback(TAny *aObject) { @@ -284,6 +307,7 @@ d->init(); setFlag(QGraphicsItem::ItemHasNoContents, true); createPrimitives(); + qApp->installEventFilter(this); } /* @@ -429,15 +453,33 @@ { Q_D(HbStatusBar); if (e->type() == HbEvent::SleepModeEnter) { - if (d->mClockTimerId != 0) { - killTimer(d->mClockTimerId); - d->mClockTimerId = 0; - } + d->killClockTimer(); } else if (e->type() == HbEvent::SleepModeExit) { - d->updateTime(); - d->mClockTimerId = startTimer(clockUpdateDelay); + d->startClockTimer(); } return HbWidget::event(e); } +bool HbStatusBar::eventFilter(QObject *obj, QEvent *event) +{ + Q_D(HbStatusBar); + if (event->type() == QEvent::ApplicationActivate) { + d->startClockTimer(); + d->mBatteryIndicator->chargingEvent(true); + } else if (event->type() == QEvent::ApplicationDeactivate) { + HbDeviceDialogServerStatus::StatusFlags flags = d->mServerStatus->status(); + if (flags != HbDeviceDialogServerStatus::ShowingDialog) { + d->killClockTimer(); + d->mBatteryIndicator->chargingEvent(false); + } + } + return HbWidget::eventFilter(obj, event); +} + +void HbStatusBar::startClockTimer() +{ + Q_D(HbStatusBar); + d->startClockTimer(); +} + #include "moc_hbstatusbar_p.cpp" diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/decorators/hbstatusbar_p.h --- a/src/hbcore/decorators/hbstatusbar_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/decorators/hbstatusbar_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -75,6 +75,10 @@ void timerEvent(QTimerEvent *event); void gestureEvent(QGestureEvent* e); bool event(QEvent *e); + bool eventFilter(QObject *obj, QEvent *event); + +private slots: + void startClockTimer(); private: Q_DECLARE_PRIVATE_D(d_ptr, HbStatusBar) diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/decorators/hbstatusbar_p_p.h --- a/src/hbcore/decorators/hbstatusbar_p_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/decorators/hbstatusbar_p_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -33,6 +33,8 @@ class HbBatteryIndicator; class HbIndicatorGroup; class HbIndicatorPrivate; +class HbDeviceDialogServerStatus; + #if defined(Q_OS_SYMBIAN) class CEnvironmentChangeNotifier; // Receive system event notifications #endif @@ -49,6 +51,8 @@ void init(); void updateTime(); QString timeFormat(); + void startClockTimer(); + void killClockTimer(); #if defined(Q_OS_SYMBIAN) static TInt EnvChangeCallback(TAny *aObject); @@ -73,6 +77,8 @@ // Notifications about locale and time changes CEnvironmentChangeNotifier *mEnvChangeNotifier; #endif + + HbDeviceDialogServerStatus *mServerStatus; void _q_signalLevelChanged(); void _q_batteryLevelChanged(); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/decorators/hbtitlebar.cpp --- a/src/hbcore/decorators/hbtitlebar.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/decorators/hbtitlebar.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -265,7 +265,9 @@ d->mNavigationButton->updatePrimitives(); repolish(); } + view->menu()->installEventFilter(d->mTitlePane); } + d->mTitlePane->repolish(); } /* @@ -401,8 +403,6 @@ propertiesChanged(); d->mIndicatorButton->currentViewChanged(view); - view->menu()->installEventFilter(d->mTitlePane); - d->mTitlePane->repolish(); } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/decorators/hbtitlepane.cpp --- a/src/hbcore/decorators/hbtitlepane.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/decorators/hbtitlepane.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -43,9 +43,7 @@ #include -/*! - @beta - @hbcore +/* \class HbTitlePane \brief HbTitlePane represents a title pane decorator. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/defs/bwins/HbCoreu.def --- a/src/hbcore/defs/bwins/HbCoreu.def Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/defs/bwins/HbCoreu.def Mon Oct 04 00:38:12 2010 +0300 @@ -208,7 +208,7 @@ ??_EHbStyleOld@@UAE@I@Z @ 207 NONAME ABSENT ; HbStyleOld::~HbStyleOld(unsigned int) ?panGesture@HbScrollArea@@MAEXABVQPointF@@@Z @ 208 NONAME ; void HbScrollArea::panGesture(class QPointF const &) ?target@HbItemHighlight@@QBEPAVQGraphicsWidget@@XZ @ 209 NONAME ABSENT ; class QGraphicsWidget * HbItemHighlight::target(void) const - ??1HbStyleOptionListViewItem@@QAE@XZ @ 210 NONAME ; HbStyleOptionListViewItem::~HbStyleOptionListViewItem(void) + ??1HbStyleOptionListViewItem@@QAE@XZ @ 210 NONAME ABSENT ; HbStyleOptionListViewItem::~HbStyleOptionListViewItem(void) ?testPseudo@Parser@HbCss@@QAE_NXZ @ 211 NONAME ; bool HbCss::Parser::testPseudo(void) ?DeviceProfileChanged@HbEvent@@2HB @ 212 NONAME ; int const HbEvent::DeviceProfileChanged ?shutdown@HbInputModeCache@@QAEXXZ @ 213 NONAME ; void HbInputModeCache::shutdown(void) @@ -337,7 +337,7 @@ ?indexInBindingTable@HbKeyMapData@@IBEHV?$QFlags@W4HbKeyboardTypeFlag@@@@HV?$QFlags@W4HbModifier@@@@@Z @ 336 NONAME ABSENT ; int HbKeyMapData::indexInBindingTable(class QFlags, int, class QFlags) const ?getStaticMetaObject@HbListWidgetViewItem@@SAABUQMetaObject@@XZ @ 337 NONAME ABSENT ; struct QMetaObject const & HbListWidgetViewItem::getStaticMetaObject(void) ?setGlobalInputLanguage@HbInputSettingProxy@@QAEXABVHbInputLanguage@@@Z @ 338 NONAME ; void HbInputSettingProxy::setGlobalInputLanguage(class HbInputLanguage const &) - ??0HbStyleOptionTreeViewItem@@QAE@XZ @ 339 NONAME ; HbStyleOptionTreeViewItem::HbStyleOptionTreeViewItem(void) + ??0HbStyleOptionTreeViewItem@@QAE@XZ @ 339 NONAME ABSENT ; HbStyleOptionTreeViewItem::HbStyleOptionTreeViewItem(void) ?tr@HbAbstractButton@@SA?AVQString@@PBD0H@Z @ 340 NONAME ; class QString HbAbstractButton::tr(char const *, char const *, int) ?staticMetaObject@HbIconAnimator@@2UQMetaObject@@B @ 341 NONAME ; struct QMetaObject const HbIconAnimator::staticMetaObject ??0HbStringVector@@QAE@W4MemoryType@HbMemoryManager@@@Z @ 342 NONAME ; HbStringVector::HbStringVector(enum HbMemoryManager::MemoryType) @@ -1335,7 +1335,7 @@ ??0HbView@@QAE@PAVQGraphicsItem@@@Z @ 1334 NONAME ; HbView::HbView(class QGraphicsItem *) ??0HbInputStateMachinePrcChinese@@AAE@XZ @ 1335 NONAME ABSENT ; HbInputStateMachinePrcChinese::HbInputStateMachinePrcChinese(void) ?alignRect@HbStackedLayout@@AAEXAAVQRectF@@ABV2@@Z @ 1336 NONAME ; void HbStackedLayout::alignRect(class QRectF &, class QRectF const &) - ??0HbStyleOptionGridViewItem@@QAE@ABV0@@Z @ 1337 NONAME ; HbStyleOptionGridViewItem::HbStyleOptionGridViewItem(class HbStyleOptionGridViewItem const &) + ??0HbStyleOptionGridViewItem@@QAE@ABV0@@Z @ 1337 NONAME ABSENT ; HbStyleOptionGridViewItem::HbStyleOptionGridViewItem(class HbStyleOptionGridViewItem const &) ?eventFilter@HbGestureFilter@@EAE_NPAVQObject@@PAVQEvent@@@Z @ 1338 NONAME ABSENT ; bool HbGestureFilter::eventFilter(class QObject *, class QEvent *) ??_EHbMemoryManager@@UAE@I@Z @ 1339 NONAME ; HbMemoryManager::~HbMemoryManager(unsigned int) ?focusObject@HbInputMethod@@QBEPAVHbInputFocusObject@@XZ @ 1340 NONAME ; class HbInputFocusObject * HbInputMethod::focusObject(void) const @@ -1698,7 +1698,7 @@ ?activeHwKeyboardChanged@HbInputSettingProxy@@IAEXV?$QFlags@W4HbKeyboardTypeFlag@@@@@Z @ 1697 NONAME ABSENT ; void HbInputSettingProxy::activeHwKeyboardChanged(class QFlags) ?isLatinAlphabetLanguage@HbInputLanguage@@QBE_NXZ @ 1698 NONAME ; bool HbInputLanguage::isLatinAlphabetLanguage(void) const ?error@HbDeviceDialog@@QBEHXZ @ 1699 NONAME ; int HbDeviceDialog::error(void) const - ??0HbStyleOptionGridViewItem@@QAE@XZ @ 1700 NONAME ; HbStyleOptionGridViewItem::HbStyleOptionGridViewItem(void) + ??0HbStyleOptionGridViewItem@@QAE@XZ @ 1700 NONAME ABSENT ; HbStyleOptionGridViewItem::HbStyleOptionGridViewItem(void) ?tr@HbPredictionFactory@@SA?AVQString@@PBD0H@Z @ 1701 NONAME ; class QString HbPredictionFactory::tr(char const *, char const *, int) ?trUtf8@HbFocusObjectWidget@@SA?AVQString@@PBD0@Z @ 1702 NONAME ABSENT ; class QString HbFocusObjectWidget::trUtf8(char const *, char const *) ??0HbStyleOptionScrollBar@@QAE@XZ @ 1703 NONAME ; HbStyleOptionScrollBar::HbStyleOptionScrollBar(void) @@ -1718,7 +1718,7 @@ ?releaseFocus@HbFocusObjectGraphicsWidget@@UAEXXZ @ 1717 NONAME ABSENT ; void HbFocusObjectGraphicsWidget::releaseFocus(void) ?popupClosed@HbInteractionListener@@MAEXPBVQObject@@@Z @ 1718 NONAME ABSENT ; void HbInteractionListener::popupClosed(class QObject const *) ?rowsAboutToBeInserted@HbAbstractItemView@@MAEXABVQModelIndex@@HH@Z @ 1719 NONAME ABSENT ; void HbAbstractItemView::rowsAboutToBeInserted(class QModelIndex const &, int, int) - ??0HbStyleOptionAbstractViewItem@@QAE@XZ @ 1720 NONAME ; HbStyleOptionAbstractViewItem::HbStyleOptionAbstractViewItem(void) + ??0HbStyleOptionAbstractViewItem@@QAE@XZ @ 1720 NONAME ABSENT ; HbStyleOptionAbstractViewItem::HbStyleOptionAbstractViewItem(void) ??1HbPopup@@UAE@XZ @ 1721 NONAME ; HbPopup::~HbPopup(void) ?mouseReleaseEvent@HbScrollBar@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1722 NONAME ; void HbScrollBar::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) ?lookup@Parser@HbCss@@QBE?AW4TokenType@2@XZ @ 1723 NONAME ; enum HbCss::TokenType HbCss::Parser::lookup(void) const @@ -1767,7 +1767,7 @@ ?maxCellSizeSupported@HbMultiSegmentAlgo@@QBEHXZ @ 1766 NONAME ABSENT ; int HbMultiSegmentAlgo::maxCellSizeSupported(void) const ??_EHbItemHighlight@@UAE@I@Z @ 1767 NONAME ABSENT ; HbItemHighlight::~HbItemHighlight(unsigned int) ?qicon@HbIcon@@QBEAAVQIcon@@XZ @ 1768 NONAME ; class QIcon & HbIcon::qicon(void) const - ??1HbStyleOptionTreeViewItem@@QAE@XZ @ 1769 NONAME ; HbStyleOptionTreeViewItem::~HbStyleOptionTreeViewItem(void) + ??1HbStyleOptionTreeViewItem@@QAE@XZ @ 1769 NONAME ABSENT ; HbStyleOptionTreeViewItem::~HbStyleOptionTreeViewItem(void) ?pseudoElement@Selector@HbCss@@QBE?AVQString@@XZ @ 1770 NONAME ; class QString HbCss::Selector::pseudoElement(void) const ?tr@HbAction@@SA?AVQString@@PBD0@Z @ 1771 NONAME ; class QString HbAction::tr(char const *, char const *) ?primitive@HbGridViewItem@@UBEPAVQGraphicsItem@@W4Primitive@HbStyle@@@Z @ 1772 NONAME ABSENT ; class QGraphicsItem * HbGridViewItem::primitive(enum HbStyle::Primitive) const @@ -2027,7 +2027,7 @@ ?mouseReleaseEvent@HbToolButton@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 2026 NONAME ABSENT ; void HbToolButton::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) ?supportedFeatures@HbInteractionPluginGroup@@QBE?AVQStringList@@XZ @ 2027 NONAME ABSENT ; class QStringList HbInteractionPluginGroup::supportedFeatures(void) const ?indicatorRemoved@HbDeviceDialogServer@@QAEXABV?$QList@UIndicatorClientInfo@@@@@Z @ 2028 NONAME ; void HbDeviceDialogServer::indicatorRemoved(class QList const &) - ??4StyleRule@HbCss@@QAEAAU01@ABU01@@Z @ 2029 NONAME ; struct HbCss::StyleRule & HbCss::StyleRule::operator=(struct HbCss::StyleRule const &) + ??4StyleRule@HbCss@@QAEAAU01@ABU01@@Z @ 2029 NONAME ABSENT ; struct HbCss::StyleRule & HbCss::StyleRule::operator=(struct HbCss::StyleRule const &) ?instance@HbInputModeCache@@QAEPAVHbInputMethod@@ABVHbInputMode@@@Z @ 2030 NONAME ABSENT ; class HbInputMethod * HbInputModeCache::instance(class HbInputMode const &) ??4HbGridViewItem@@IAEAAV0@ABV0@@Z @ 2031 NONAME ABSENT ; class HbGridViewItem & HbGridViewItem::operator=(class HbGridViewItem const &) ?instance@HbInputStateMachineFactory@@SAPAV1@XZ @ 2032 NONAME ABSENT ; class HbInputStateMachineFactory * HbInputStateMachineFactory::instance(void) @@ -2374,7 +2374,7 @@ ?q_func@HbPopupPrivate@@ABEPBVHbPopup@@XZ @ 2371 NONAME ; class HbPopup const * HbPopupPrivate::q_func(void) const ?setIndentation@HbTreeLayout@@QAEXM@Z @ 2372 NONAME ABSENT ; void HbTreeLayout::setIndentation(float) ?tr@HbInputContextProxy@@SA?AVQString@@PBD0@Z @ 2373 NONAME ; class QString HbInputContextProxy::tr(char const *, char const *) - ??0HbStyleOptionAbstractViewItem@@QAE@ABV0@@Z @ 2374 NONAME ; HbStyleOptionAbstractViewItem::HbStyleOptionAbstractViewItem(class HbStyleOptionAbstractViewItem const &) + ??0HbStyleOptionAbstractViewItem@@QAE@ABV0@@Z @ 2374 NONAME ABSENT ; HbStyleOptionAbstractViewItem::HbStyleOptionAbstractViewItem(class HbStyleOptionAbstractViewItem const &) ??_EHbInputFocusObject@@UAE@I@Z @ 2375 NONAME ; HbInputFocusObject::~HbInputFocusObject(unsigned int) ?d_func@HbDeviceDialog@@ABEPBVHbDeviceDialogPrivate@@XZ @ 2376 NONAME ; class HbDeviceDialogPrivate const * HbDeviceDialog::d_func(void) const ?rotated90Degrees@HbInteractionListener@@MAEXPBVQObject@@@Z @ 2377 NONAME ABSENT ; void HbInteractionListener::rotated90Degrees(class QObject const *) @@ -2392,7 +2392,7 @@ ?stateChangeInProgress@HbInputMethod@@IBE_NXZ @ 2389 NONAME ; bool HbInputMethod::stateChangeInProgress(void) const ?qt_metacast@HbDecorator@@UAEPAXPBD@Z @ 2390 NONAME ABSENT ; void * HbDecorator::qt_metacast(char const *) ?animationStarted@HbIconAnimator@@IAEXXZ @ 2391 NONAME ; void HbIconAnimator::animationStarted(void) - ??0HbStyleOptionListViewItem@@QAE@XZ @ 2392 NONAME ; HbStyleOptionListViewItem::HbStyleOptionListViewItem(void) + ??0HbStyleOptionListViewItem@@QAE@XZ @ 2392 NONAME ABSENT ; HbStyleOptionListViewItem::HbStyleOptionListViewItem(void) ?testProperty@Parser@HbCss@@QAE_NXZ @ 2393 NONAME ; bool HbCss::Parser::testProperty(void) ?initStyleOption@HbTreeViewItem@@IBEXPAVHbStyleOptionTreeViewItem@@@Z @ 2394 NONAME ABSENT ; void HbTreeViewItem::initStyleOption(class HbStyleOptionTreeViewItem *) const ?trUtf8@HbTreeView@@SA?AVQString@@PBD0H@Z @ 2395 NONAME ABSENT ; class QString HbTreeView::trUtf8(char const *, char const *, int) @@ -2855,7 +2855,7 @@ ??0HbStyleOptionDataForm@@QAE@ABV0@@Z @ 2852 NONAME ; HbStyleOptionDataForm::HbStyleOptionDataForm(class HbStyleOptionDataForm const &) ??_EHbInteractionPluginGroup@@UAE@I@Z @ 2853 NONAME ABSENT ; HbInteractionPluginGroup::~HbInteractionPluginGroup(unsigned int) ??_EHbAbstractItemContainer@@UAE@I@Z @ 2854 NONAME ABSENT ; HbAbstractItemContainer::~HbAbstractItemContainer(unsigned int) - ??0HbStyleOptionTreeViewItem@@QAE@ABV0@@Z @ 2855 NONAME ; HbStyleOptionTreeViewItem::HbStyleOptionTreeViewItem(class HbStyleOptionTreeViewItem const &) + ??0HbStyleOptionTreeViewItem@@QAE@ABV0@@Z @ 2855 NONAME ABSENT ; HbStyleOptionTreeViewItem::HbStyleOptionTreeViewItem(class HbStyleOptionTreeViewItem const &) ??0HbStyleOptionColorGridViewItem@@QAE@ABV0@@Z @ 2856 NONAME ; HbStyleOptionColorGridViewItem::HbStyleOptionColorGridViewItem(class HbStyleOptionColorGridViewItem const &) ??0HbIndicator@@QAE@PAVQObject@@@Z @ 2857 NONAME ; HbIndicator::HbIndicator(class QObject *) ?d_func@HbItemHighlight@@ABEPBVHbItemHighlightPrivate@@XZ @ 2858 NONAME ABSENT ; class HbItemHighlightPrivate const * HbItemHighlight::d_func(void) const @@ -3050,7 +3050,7 @@ ?clearConcernFileList@HbWidgetStyleLoader@@QAEXW4Concern@HbLayeredStyleLoader@@@Z @ 3047 NONAME ; void HbWidgetStyleLoader::clearConcernFileList(enum HbLayeredStyleLoader::Concern) ?eventFilter@HbScrollArea@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 3048 NONAME ; bool HbScrollArea::eventFilter(class QObject *, class QEvent *) ??1HbStyleOptionScrollBar@@QAE@XZ @ 3049 NONAME ; HbStyleOptionScrollBar::~HbStyleOptionScrollBar(void) - ??1HbStyleOptionGridViewItem@@QAE@XZ @ 3050 NONAME ; HbStyleOptionGridViewItem::~HbStyleOptionGridViewItem(void) + ??1HbStyleOptionGridViewItem@@QAE@XZ @ 3050 NONAME ABSENT ; HbStyleOptionGridViewItem::~HbStyleOptionGridViewItem(void) ?trUtf8@HbInputContextProxy@@SA?AVQString@@PBD0H@Z @ 3051 NONAME ; class QString HbInputContextProxy::trUtf8(char const *, char const *, int) ??0HbAction@@QAE@PAVQObject@@@Z @ 3052 NONAME ; HbAction::HbAction(class QObject *) ?parseNextExpr@Parser@HbCss@@QAE_NPAV?$HbVector@UValue@HbCss@@@@@Z @ 3053 NONAME ; bool HbCss::Parser::parseNextExpr(class HbVector *) @@ -3342,7 +3342,7 @@ ??1Value@HbCss@@QAE@XZ @ 3339 NONAME ; HbCss::Value::~Value(void) ?tr@HbVkbHost@@SA?AVQString@@PBD0@Z @ 3340 NONAME ; class QString HbVkbHost::tr(char const *, char const *) ??0BasicSelector@HbCss@@QAE@W4MemoryType@HbMemoryManager@@@Z @ 3341 NONAME ; HbCss::BasicSelector::BasicSelector(enum HbMemoryManager::MemoryType) - ??0HbStyleOptionListViewItem@@QAE@ABV0@@Z @ 3342 NONAME ; HbStyleOptionListViewItem::HbStyleOptionListViewItem(class HbStyleOptionListViewItem const &) + ??0HbStyleOptionListViewItem@@QAE@ABV0@@Z @ 3342 NONAME ABSENT ; HbStyleOptionListViewItem::HbStyleOptionListViewItem(class HbStyleOptionListViewItem const &) ?d_func@HbGraphicsScene@@AAEPAVHbGraphicsScenePrivate@@XZ @ 3343 NONAME ; class HbGraphicsScenePrivate * HbGraphicsScene::d_func(void) ?editorGeometry@HbFocusObjectGraphicsWidget@@UBE?AVQRectF@@XZ @ 3344 NONAME ABSENT ; class QRectF HbFocusObjectGraphicsWidget::editorGeometry(void) const ??0HbInputLanguage@@QAE@XZ @ 3345 NONAME ; HbInputLanguage::HbInputLanguage(void) @@ -3474,7 +3474,7 @@ ??_EHbDeviceDialogInterface@@UAE@I@Z @ 3471 NONAME ; HbDeviceDialogInterface::~HbDeviceDialogInterface(unsigned int) ??1HbStyleOptionDataForm@@QAE@XZ @ 3472 NONAME ; HbStyleOptionDataForm::~HbStyleOptionDataForm(void) ?currentChanged@HbStackedWidget@@IAEXH@Z @ 3473 NONAME ; void HbStackedWidget::currentChanged(int) - ??1HbStyleOptionAbstractViewItem@@QAE@XZ @ 3474 NONAME ; HbStyleOptionAbstractViewItem::~HbStyleOptionAbstractViewItem(void) + ??1HbStyleOptionAbstractViewItem@@QAE@XZ @ 3474 NONAME ABSENT ; HbStyleOptionAbstractViewItem::~HbStyleOptionAbstractViewItem(void) ??0HbWidget@@QAE@PAVQGraphicsItem@@V?$QFlags@W4WindowType@Qt@@@@@Z @ 3475 NONAME ; HbWidget::HbWidget(class QGraphicsItem *, class QFlags) ?focusInEvent@HbGraphicsScene@@MAEXPAVQFocusEvent@@@Z @ 3476 NONAME ; void HbGraphicsScene::focusInEvent(class QFocusEvent *) ?rawDataArea@HbExtraUserDictionary@@QBEPAVQChar@@XZ @ 3477 NONAME ; class QChar * HbExtraUserDictionary::rawDataArea(void) const @@ -4375,7 +4375,7 @@ ?NewL@CHbSymbianVariantMap@@SAPAV1@XZ @ 4372 NONAME ; class CHbSymbianVariantMap * CHbSymbianVariantMap::NewL(void) ?_q_orientationChange@HbPopupPrivate@@QAEXXZ @ 4373 NONAME ABSENT ; void HbPopupPrivate::_q_orientationChange(void) ??1CHbSymbianVariant@@UAE@XZ @ 4374 NONAME ; CHbSymbianVariant::~CHbSymbianVariant(void) - ?setPreferredPos@HbPopup@@QAEXABVQPointF@@W4Placement@1@@Z @ 4375 NONAME ; void HbPopup::setPreferredPos(class QPointF const &, enum HbPopup::Placement) + ?setPreferredPos@HbPopup@@QAEXABVQPointF@@W4Placement@1@@Z @ 4375 NONAME ABSENT ; void HbPopup::setPreferredPos(class QPointF const &, enum HbPopup::Placement) ?SetData@CHbSymbianVariant@@QAEXPAXW4TType@1@@Z @ 4376 NONAME ; void CHbSymbianVariant::SetData(void *, enum CHbSymbianVariant::TType) ?titleBarEffectFinished@HbView@@AAEXABUEffectStatus@HbEffect@@@Z @ 4377 NONAME ; void HbView::titleBarEffectFinished(struct HbEffect::EffectStatus const &) ?Keys@CHbSymbianVariantMap@@QBEAAVMDesC16Array@@XZ @ 4378 NONAME ; class MDesC16Array & CHbSymbianVariantMap::Keys(void) const @@ -4598,7 +4598,7 @@ ?add@HbEffectInternal@@SA_NABVQStringList@@00@Z @ 4594 NONAME ; bool HbEffectInternal::add(class QStringList const &, class QStringList const &, class QStringList const &) ??0HbInputMethodPrivate@@QAE@PAVHbInputMethod@@@Z @ 4595 NONAME ; HbInputMethodPrivate::HbInputMethodPrivate(class HbInputMethod *) ?tr@HbTextMeasurementUtility@@SA?AVQString@@PBD0@Z @ 4596 NONAME ABSENT ; class QString HbTextMeasurementUtility::tr(char const *, char const *) - ?addRuleToWidgetStack@Parser@HbCss@@QAEXPAUStyleSheet@2@ABVQString@@AAUStyleRule@2@@Z @ 4597 NONAME ; void HbCss::Parser::addRuleToWidgetStack(struct HbCss::StyleSheet *, class QString const &, struct HbCss::StyleRule &) + ?addRuleToWidgetStack@Parser@HbCss@@QAEXPAUStyleSheet@2@ABVQString@@AAUStyleRule@2@@Z @ 4597 NONAME ABSENT ; void HbCss::Parser::addRuleToWidgetStack(struct HbCss::StyleSheet *, class QString const &, struct HbCss::StyleRule &) ?d_func@HbInputSettingProxy@@AAEPAVHbInputSettingProxyPrivate@@XZ @ 4598 NONAME ; class HbInputSettingProxyPrivate * HbInputSettingProxy::d_func(void) ?locTestMode@HbTextMeasurementUtility@@QAE_NXZ @ 4599 NONAME ABSENT ; bool HbTextMeasurementUtility::locTestMode(void) ?replace@HbSmileyTheme@@QAEXABVQString@@0@Z @ 4600 NONAME ; void HbSmileyTheme::replace(class QString const &, class QString const &) @@ -4808,7 +4808,7 @@ ?trUtf8@HbPopupVkbHost@@SA?AVQString@@PBD0@Z @ 4804 NONAME ABSENT ; class QString HbPopupVkbHost::trUtf8(char const *, char const *) ?completeProfileData@HbDeviceProfileDatabase@@AAEXXZ @ 4805 NONAME ; void HbDeviceProfileDatabase::completeProfileData(void) ?setLibraryPaths@HbInstance@@QAEXABVQStringList@@@Z @ 4806 NONAME ; void HbInstance::setLibraryPaths(class QStringList const &) - ?extractExpressionValue@ValueExtractor@HbCss@@QAE_NAAVQString@@AAM@Z @ 4807 NONAME ; bool HbCss::ValueExtractor::extractExpressionValue(class QString &, float &) + ?extractExpressionValue@ValueExtractor@HbCss@@QAE_NAAVQString@@AAM@Z @ 4807 NONAME ABSENT ; bool HbCss::ValueExtractor::extractExpressionValue(class QString &, float &) ?iconData@HbIconImpl@@QBE?AUHbSharedIconInfo@@XZ @ 4808 NONAME ABSENT ; struct HbSharedIconInfo HbIconImpl::iconData(void) const ?staticMetaObject@HbPopupVkbHost@@2UQMetaObject@@B @ 4809 NONAME ABSENT ; struct QMetaObject const HbPopupVkbHost::staticMetaObject ?isCreatedOnServer@HbIconImpl@@QBE_NXZ @ 4810 NONAME ABSENT ; bool HbIconImpl::isCreatedOnServer(void) const @@ -5251,7 +5251,7 @@ ?qt_metacast@HbVgMaskEffect@@UAEPAXPBD@Z @ 5247 NONAME ; void * HbVgMaskEffect::qt_metacast(char const *) ??1HbVgShadowEffect@@UAE@XZ @ 5248 NONAME ; HbVgShadowEffect::~HbVgShadowEffect(void) ?instance@HbFeatureManager@@SAPAV1@XZ @ 5249 NONAME ; class HbFeatureManager * HbFeatureManager::instance(void) - ??1HbStyleOptionIndexFeedback@@QAE@XZ @ 5250 NONAME ; HbStyleOptionIndexFeedback::~HbStyleOptionIndexFeedback(void) + ??1HbStyleOptionIndexFeedback@@QAE@XZ @ 5250 NONAME ABSENT ; HbStyleOptionIndexFeedback::~HbStyleOptionIndexFeedback(void) ?initStyleOption@HbWidgetBase@@IBEXPAVHbStyleOption@@@Z @ 5251 NONAME ; void HbWidgetBase::initStyleOption(class HbStyleOption *) const ?Activate@CHbIndicatorSymbian@@QAEHABVTDesC16@@PBVCHbSymbianVariant@@@Z @ 5252 NONAME ; int CHbIndicatorSymbian::Activate(class TDesC16 const &, class CHbSymbianVariant const *) ?sizeHint@HbAbstractButton@@MBE?AVQSizeF@@W4SizeHint@Qt@@ABV2@@Z @ 5253 NONAME ; class QSizeF HbAbstractButton::sizeHint(enum Qt::SizeHint, class QSizeF const &) const @@ -5259,7 +5259,7 @@ ??_EHbDeviceDialogServerStatus@@UAE@I@Z @ 5255 NONAME ; HbDeviceDialogServerStatus::~HbDeviceDialogServerStatus(unsigned int) ?status@HbDeviceDialogServerStatus@@QAE?AV?$QFlags@W4StatusFlag@HbDeviceDialogServerStatus@@@@XZ @ 5256 NONAME ; class QFlags HbDeviceDialogServerStatus::status(void) ??0HbStyleOptionComboBox@@QAE@ABV0@@Z @ 5257 NONAME ; HbStyleOptionComboBox::HbStyleOptionComboBox(class HbStyleOptionComboBox const &) - ??0HbStyleOptionIndexFeedback@@QAE@XZ @ 5258 NONAME ; HbStyleOptionIndexFeedback::HbStyleOptionIndexFeedback(void) + ??0HbStyleOptionIndexFeedback@@QAE@XZ @ 5258 NONAME ABSENT ; HbStyleOptionIndexFeedback::HbStyleOptionIndexFeedback(void) ?toString@HbFeatureManager@@AAE?AVQString@@W4HbFeature@1@@Z @ 5259 NONAME ABSENT ; class QString HbFeatureManager::toString(enum HbFeatureManager::HbFeature) ?staticMetaObject@HbStaticVkbHost@@2UQMetaObject@@B @ 5260 NONAME ; struct QMetaObject const HbStaticVkbHost::staticMetaObject ?d_ptr@HbWidgetBasePrivate@@CAPAV1@PAVHbWidgetBase@@@Z @ 5261 NONAME ; class HbWidgetBasePrivate * HbWidgetBasePrivate::d_ptr(class HbWidgetBase *) @@ -5327,7 +5327,7 @@ ?getStaticMetaObject@HbDeviceDialogServerStatus@@SAABUQMetaObject@@XZ @ 5323 NONAME ; struct QMetaObject const & HbDeviceDialogServerStatus::getStaticMetaObject(void) ?statusChanged@HbDeviceDialogServerStatus@@IAEXXZ @ 5324 NONAME ; void HbDeviceDialogServerStatus::statusChanged(void) ?trUtf8@HbDeviceDialogServerStatus@@SA?AVQString@@PBD0@Z @ 5325 NONAME ; class QString HbDeviceDialogServerStatus::trUtf8(char const *, char const *) - ??0HbStyleOptionIndexFeedback@@QAE@ABV0@@Z @ 5326 NONAME ; HbStyleOptionIndexFeedback::HbStyleOptionIndexFeedback(class HbStyleOptionIndexFeedback const &) + ??0HbStyleOptionIndexFeedback@@QAE@ABV0@@Z @ 5326 NONAME ABSENT ; HbStyleOptionIndexFeedback::HbStyleOptionIndexFeedback(class HbStyleOptionIndexFeedback const &) ?signalSender@HbDeviceDialogInterface@@UBEPAVQObject@@XZ @ 5327 NONAME ; class QObject * HbDeviceDialogInterface::signalSender(void) const ??0HbStaticVkbHost@@QAE@PAVHbWidget@@@Z @ 5328 NONAME ; HbStaticVkbHost::HbStaticVkbHost(class HbWidget *) ?toolTip@HbAction@@QBE?AVQString@@XZ @ 5329 NONAME ; class QString HbAction::toolTip(void) const @@ -6110,7 +6110,7 @@ ?tr@HbThemeSystemEffect@@SA?AVQString@@PBD0@Z @ 6106 NONAME ; class QString HbThemeSystemEffect::tr(char const *, char const *) ?setSceneStartPos@HbTapGesture@@QAEXABVQPointF@@@Z @ 6107 NONAME ; void HbTapGesture::setSceneStartPos(class QPointF const &) ?storeIconEngineInfo@HbIconLoader@@QAEXPAVHbIconEngine@@@Z @ 6108 NONAME ; void HbIconLoader::storeIconEngineInfo(class HbIconEngine *) - ?velocity@HbVelocityCalculator@@QBE?AVQPointF@@ABVQTime@@@Z @ 6109 NONAME ; class QPointF HbVelocityCalculator::velocity(class QTime const &) const + ?velocity@HbVelocityCalculator@@QBE?AVQPointF@@ABVQTime@@@Z @ 6109 NONAME ABSENT ; class QPointF HbVelocityCalculator::velocity(class QTime const &) const ?refresh@HbVkbHostBridge@@MAEXXZ @ 6110 NONAME ; void HbVkbHostBridge::refresh(void) ?resetGesture@HbTapGestureLogic@@QAEXPAVHbTapGesture@@@Z @ 6111 NONAME ; void HbTapGestureLogic::resetGesture(class HbTapGesture *) ?trUtf8@HbPinchGesture@@SA?AVQString@@PBD0H@Z @ 6112 NONAME ; class QString HbPinchGesture::trUtf8(char const *, char const *, int) @@ -6137,7 +6137,7 @@ ??1HbPanGestureRecognizer@@UAE@XZ @ 6133 NONAME ; HbPanGestureRecognizer::~HbPanGestureRecognizer(void) ?autocompletionStateChanged@HbInputSettingProxy@@IAEXV?$QFlags@W4HbKeyboardSettingFlag@@@@_N@Z @ 6134 NONAME ; void HbInputSettingProxy::autocompletionStateChanged(class QFlags, bool) ?painterPathToVGPath@HbVgImageIconRenderer@@AAEKABVQPainterPath@@@Z @ 6135 NONAME ABSENT ; unsigned long HbVgImageIconRenderer::painterPathToVGPath(class QPainterPath const &) - ?q_func@HbPanGesturePrivate@@QBEPBVHbPanGesture@@XZ @ 6136 NONAME ; class HbPanGesture const * HbPanGesturePrivate::q_func(void) const + ?q_func@HbPanGesturePrivate@@QBEPBVHbPanGesture@@XZ @ 6136 NONAME ABSENT ; class HbPanGesture const * HbPanGesturePrivate::q_func(void) const ?handleMouseRelease@HbTapGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbTapGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6137 NONAME ; class QFlags HbTapGestureLogic::handleMouseRelease(enum Qt::GestureState, class HbTapGesture *, class QObject *, class QMouseEvent *) ?setMode@HbPixmapIconRenderer@@QAEXW4Mode@QIcon@@@Z @ 6138 NONAME ; void HbPixmapIconRenderer::setMode(enum QIcon::Mode) ?startTimer@HbTapAndHoldGestureLogic@@QAEHPAVHbTapAndHoldGesture@@H@Z @ 6139 NONAME ABSENT ; int HbTapAndHoldGestureLogic::startTimer(class HbTapAndHoldGesture *, int) @@ -6149,7 +6149,7 @@ ?handleMouseMove@HbTapAndHoldGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbTapAndHoldGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6145 NONAME ; class QFlags HbTapAndHoldGestureLogic::handleMouseMove(enum Qt::GestureState, class HbTapAndHoldGesture *, class QObject *, class QMouseEvent *) ?trUtf8@HbVkbHostBridge@@SA?AVQString@@PBD0H@Z @ 6146 NONAME ; class QString HbVkbHostBridge::trUtf8(char const *, char const *, int) ?gestureEvent@HbWidgetBase@@MAEXPAVQGestureEvent@@@Z @ 6147 NONAME ; void HbWidgetBase::gestureEvent(class QGestureEvent *) - ??0HbTapAndHoldGesturePrivate@@QAE@PAVHbTapAndHoldGesture@@@Z @ 6148 NONAME ; HbTapAndHoldGesturePrivate::HbTapAndHoldGesturePrivate(class HbTapAndHoldGesture *) + ??0HbTapAndHoldGesturePrivate@@QAE@PAVHbTapAndHoldGesture@@@Z @ 6148 NONAME ABSENT ; HbTapAndHoldGesturePrivate::HbTapAndHoldGesturePrivate(class HbTapAndHoldGesture *) ?primaryCandidateModeChanged@HbInputSettingProxy@@IAEXW4HbPrimaryCandidateMode@@@Z @ 6149 NONAME ; void HbInputSettingProxy::primaryCandidateModeChanged(enum HbPrimaryCandidateMode) ?setAutocompletionStatus@HbInputSettingProxy@@QAEXV?$QFlags@W4HbKeyboardSettingFlag@@@@_N@Z @ 6150 NONAME ; void HbInputSettingProxy::setAutocompletionStatus(class QFlags, bool) ?d_func@HbPinchGesture@@ABEPBVHbPinchGesturePrivate@@XZ @ 6151 NONAME ; class HbPinchGesturePrivate const * HbPinchGesture::d_func(void) const @@ -6163,7 +6163,7 @@ ?activeKeypad@HbVkbHostBridge@@UBEPAVHbVirtualKeyboard@@XZ @ 6159 NONAME ; class HbVirtualKeyboard * HbVkbHostBridge::activeKeypad(void) const ?ensureCursorVisibility@HbVkbHostBridge@@UAEXXZ @ 6160 NONAME ; void HbVkbHostBridge::ensureCursorVisibility(void) ??0HbThemeSystemEffect@@AAE@PAVQObject@@@Z @ 6161 NONAME ; HbThemeSystemEffect::HbThemeSystemEffect(class QObject *) - ?calculate_velocity@HbVelocityCalculator@@ABEMABVHbPointRecorder@@ABVQTime@@@Z @ 6162 NONAME ; float HbVelocityCalculator::calculate_velocity(class HbPointRecorder const &, class QTime const &) const + ?calculate_velocity@HbVelocityCalculator@@ABEMABVHbPointRecorder@@ABVQTime@@@Z @ 6162 NONAME ABSENT ; float HbVelocityCalculator::calculate_velocity(class HbPointRecorder const &, class QTime const &) const ?setSceneSwipeAngle@HbSwipeGesture@@QAEXM@Z @ 6163 NONAME ; void HbSwipeGesture::setSceneSwipeAngle(float) ?handleMouseRelease@HbTapAndHoldGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbTapAndHoldGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6164 NONAME ; class QFlags HbTapAndHoldGestureLogic::handleMouseRelease(enum Qt::GestureState, class HbTapAndHoldGesture *, class QObject *, class QMouseEvent *) ??1HbPanGestureLogic@@QAE@XZ @ 6165 NONAME ; HbPanGestureLogic::~HbPanGestureLogic(void) @@ -6179,7 +6179,7 @@ ??1HbPixmapIconRenderer@@QAE@XZ @ 6175 NONAME ; HbPixmapIconRenderer::~HbPixmapIconRenderer(void) ?metaObject@HbThemeSystemEffect@@UBEPBUQMetaObject@@XZ @ 6176 NONAME ; struct QMetaObject const * HbThemeSystemEffect::metaObject(void) const ?removeFrameDrawerInfo@HbIconLoader@@QAEXPAVHbFrameDrawerPrivate@@@Z @ 6177 NONAME ; void HbIconLoader::removeFrameDrawerInfo(class HbFrameDrawerPrivate *) - ?handleMouseMove@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6178 NONAME ; class QFlags HbPanGestureLogic::handleMouseMove(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *) + ?handleMouseMove@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6178 NONAME ABSENT ; class QFlags HbPanGestureLogic::handleMouseMove(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *) ?mode@HbVgImageIconRenderer@@QAE?AW4Mode@QIcon@@XZ @ 6179 NONAME ; enum QIcon::Mode HbVgImageIconRenderer::mode(void) ?primaryCandidateMode@HbInputSettingProxy@@QBE?AW4HbPrimaryCandidateMode@@XZ @ 6180 NONAME ; enum HbPrimaryCandidateMode HbInputSettingProxy::primaryCandidateMode(void) const ?handleTimer@HbTapAndHoldGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@PAVHbTapAndHoldGesture@@PAVQTimerEvent@@@Z @ 6181 NONAME ABSENT ; class QFlags HbTapAndHoldGestureLogic::handleTimer(class HbTapAndHoldGesture *, class QTimerEvent *) @@ -6192,12 +6192,12 @@ ?getMaskedPixmap@HbPixmapIconRenderer@@AAE?AVQPixmap@@PAVHbMaskableIconImpl@@@Z @ 6188 NONAME ; class QPixmap HbPixmapIconRenderer::getMaskedPixmap(class HbMaskableIconImpl *) ?parseConfigurationFile@HbThemeSystemEffect@@AAE_NABVQString@@@Z @ 6189 NONAME ABSENT ; bool HbThemeSystemEffect::parseConfigurationFile(class QString const &) ?delayedConstruction@HbBatteryIndicator@@QAEXXZ @ 6190 NONAME ; void HbBatteryIndicator::delayedConstruction(void) - ?q_func@HbTapGesturePrivate@@AAEPAVHbTapGesture@@XZ @ 6191 NONAME ; class HbTapGesture * HbTapGesturePrivate::q_func(void) + ?q_func@HbTapGesturePrivate@@AAEPAVHbTapGesture@@XZ @ 6191 NONAME ABSENT ; class HbTapGesture * HbTapGesturePrivate::q_func(void) ?userActivated@HbIndicatorInterface@@IAEXABV?$QMap@VQString@@VQVariant@@@@@Z @ 6192 NONAME ; void HbIndicatorInterface::userActivated(class QMap const &) ?lastPoint@HbPointRecorder@@QBEMXZ @ 6193 NONAME ; float HbPointRecorder::lastPoint(void) const ?moveEffectFinnished@HbIndicatorGroup@@AAEXABUEffectStatus@HbEffect@@@Z @ 6194 NONAME ; void HbIndicatorGroup::moveEffectFinnished(struct HbEffect::EffectStatus const &) ?digitType@HbEditorInterface@@QBE?AW4HbInputDigitType@@XZ @ 6195 NONAME ; enum HbInputDigitType HbEditorInterface::digitType(void) const - ?handleMouseRelease@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6196 NONAME ; class QFlags HbSwipeGestureLogic::handleMouseRelease(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *) + ?handleMouseRelease@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6196 NONAME ABSENT ; class QFlags HbSwipeGestureLogic::handleMouseRelease(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *) ?operatorHierarchy@HbThemeUtils@@2PBDB @ 6197 NONAME ; char const * const HbThemeUtils::operatorHierarchy ?sceneStartPos@HbPanGesture@@QBE?AVQPointF@@XZ @ 6198 NONAME ; class QPointF HbPanGesture::sceneStartPos(void) const ??1HbPinchGestureLogic@@QAE@XZ @ 6199 NONAME ; HbPinchGestureLogic::~HbPinchGestureLogic(void) @@ -6243,7 +6243,7 @@ ?registerEffects@HbThemeSystemEffect@@AAEXXZ @ 6239 NONAME ABSENT ; void HbThemeSystemEffect::registerEffects(void) ?effectsResourceFolder@HbThemeUtils@@2PBDB @ 6240 NONAME ; char const * const HbThemeUtils::effectsResourceFolder ?destroy@HbSplashScreen@@SAXXZ @ 6241 NONAME ; void HbSplashScreen::destroy(void) - ?q_func@HbPanGesturePrivate@@QAEPAVHbPanGesture@@XZ @ 6242 NONAME ; class HbPanGesture * HbPanGesturePrivate::q_func(void) + ?q_func@HbPanGesturePrivate@@QAEPAVHbPanGesture@@XZ @ 6242 NONAME ABSENT ; class HbPanGesture * HbPanGesturePrivate::q_func(void) ?unLoadIcon@HbIconLoader@@QAEXPAVHbIconImpl@@_N@Z @ 6243 NONAME ABSENT ; void HbIconLoader::unLoadIcon(class HbIconImpl *, bool) ?removeIconEngineInfo@HbIconLoader@@QAEXPAVHbIconEngine@@@Z @ 6244 NONAME ; void HbIconLoader::removeIconEngineInfo(class HbIconEngine *) ??0HbPinchGesture@@IAE@AAVHbPinchGesturePrivate@@PAVQObject@@@Z @ 6245 NONAME ; HbPinchGesture::HbPinchGesture(class HbPinchGesturePrivate &, class QObject *) @@ -6263,7 +6263,7 @@ ?openMinimizedKeypad@HbVkbHostBridge@@UAEXPAVHbVirtualKeyboard@@PAVHbInputMethod@@@Z @ 6259 NONAME ; void HbVkbHostBridge::openMinimizedKeypad(class HbVirtualKeyboard *, class HbInputMethod *) ?handleThemeChange@HbThemeSystemEffect@@SAXABVQString@@@Z @ 6260 NONAME ; void HbThemeSystemEffect::handleThemeChange(class QString const &) ?isThemeValid@HbThemeUtils@@SA_NABUHbThemeInfo@@@Z @ 6261 NONAME ABSENT ; bool HbThemeUtils::isThemeValid(struct HbThemeInfo const &) - ?handleMouseRelease@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6262 NONAME ; class QFlags HbPanGestureLogic::handleMouseRelease(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *) + ?handleMouseRelease@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6262 NONAME ABSENT ; class QFlags HbPanGestureLogic::handleMouseRelease(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *) ?error@HbDeviceDialogServer@@QBEHXZ @ 6263 NONAME ; int HbDeviceDialogServer::error(void) const ?removeItemInCache@HbIconLoader@@QAEXPAVHbIconImpl@@@Z @ 6264 NONAME ; void HbIconLoader::removeItemInCache(class HbIconImpl *) ?sceneLastCenterPoint@HbPinchGesture@@QBE?AVQPointF@@XZ @ 6265 NONAME ; class QPointF HbPinchGesture::sceneLastCenterPoint(void) const @@ -6325,7 +6325,7 @@ ?tfxTransitionAction@HbThemeSystemEffect@@ABEHW4SystemEffectId@1@@Z @ 6321 NONAME ABSENT ; int HbThemeSystemEffect::tfxTransitionAction(enum HbThemeSystemEffect::SystemEffectId) const ?setColor@HbPixmapIconRenderer@@QAEXABVQColor@@@Z @ 6322 NONAME ; void HbPixmapIconRenderer::setColor(class QColor const &) ?pan@HbScrollAreaPrivate@@QAE_NPAVQPanGesture@@@Z @ 6323 NONAME ; bool HbScrollAreaPrivate::pan(class QPanGesture *) - ?handleMousePress@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6324 NONAME ; class QFlags HbSwipeGestureLogic::handleMousePress(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *) + ?handleMousePress@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6324 NONAME ABSENT ; class QFlags HbSwipeGestureLogic::handleMousePress(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *) ?applyIconProperties@HbVgImageIconRenderer@@AAEXXZ @ 6325 NONAME ; void HbVgImageIconRenderer::applyIconProperties(void) ?sceneTotalRotationAngle@HbPinchGesture@@QBEMXZ @ 6326 NONAME ; float HbPinchGesture::sceneTotalRotationAngle(void) const ?toMouseEvent@HbTapGestureLogic@@QAEPAVQMouseEvent@@PAVQEvent@@@Z @ 6327 NONAME ; class QMouseEvent * HbTapGestureLogic::toMouseEvent(class QEvent *) @@ -6336,7 +6336,7 @@ ?gestureEvent@HbScrollArea@@MAEXPAVQGestureEvent@@@Z @ 6332 NONAME ; void HbScrollArea::gestureEvent(class QGestureEvent *) ??0HbSwipeGestureLogic@@QAE@XZ @ 6333 NONAME ; HbSwipeGestureLogic::HbSwipeGestureLogic(void) ?setFlags@HbSplashScreen@@SAXV?$QFlags@W4Flag@HbSplashScreen@@@@@Z @ 6334 NONAME ; void HbSplashScreen::setFlags(class QFlags) - ?handleMousePress@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6335 NONAME ; class QFlags HbPanGestureLogic::handleMousePress(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *) + ?handleMousePress@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 6335 NONAME ABSENT ; class QFlags HbPanGestureLogic::handleMousePress(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *) ?tapStyleHint@HbTapGesture@@QBE?AW4TapStyleHint@1@XZ @ 6336 NONAME ; enum HbTapGesture::TapStyleHint HbTapGesture::tapStyleHint(void) const ??1HbStyleOptionProgressSliderHandle@@QAE@XZ @ 6337 NONAME ; HbStyleOptionProgressSliderHandle::~HbStyleOptionProgressSliderHandle(void) ?handleForegroundLost@HbIconLoader@@QAEXXZ @ 6338 NONAME ; void HbIconLoader::handleForegroundLost(void) @@ -6367,7 +6367,7 @@ ?updateBackgroundImage@HbBackgroundItem@@QAEXXZ @ 6363 NONAME ; void HbBackgroundItem::updateBackgroundImage(void) ??1HbTapGestureLogic@@QAE@XZ @ 6364 NONAME ; HbTapGestureLogic::~HbTapGestureLogic(void) ??1HbVkbHostBridge@@UAE@XZ @ 6365 NONAME ; HbVkbHostBridge::~HbVkbHostBridge(void) - ?lastTime@HbPointRecorder@@QBEABVQTime@@XZ @ 6366 NONAME ; class QTime const & HbPointRecorder::lastTime(void) const + ?lastTime@HbPointRecorder@@QBEABVQTime@@XZ @ 6366 NONAME ABSENT ; class QTime const & HbPointRecorder::lastTime(void) const ?create@HbPinchGestureRecognizer@@UAEPAVQGesture@@PAVQObject@@@Z @ 6367 NONAME ; class QGesture * HbPinchGestureRecognizer::create(class QObject *) ?doDraw@HbPixmapIconRenderer@@AAEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQPainterPath@@@Z @ 6368 NONAME ; void HbPixmapIconRenderer::doDraw(class QPainter *, class QPointF const &, class QPixmap const &, class QPainterPath const &) ?delayedConstruction@HbSignalIndicator@@QAEXXZ @ 6369 NONAME ; void HbSignalIndicator::delayedConstruction(void) @@ -6407,7 +6407,7 @@ ?setCurrentTheme@HbThemeSystemEffect@@AAEXABVQString@@@Z @ 6403 NONAME ; void HbThemeSystemEffect::setCurrentTheme(class QString const &) ?gestureEvent@HbTouchArea@@MAEXPAVQGestureEvent@@@Z @ 6404 NONAME ; void HbTouchArea::gestureEvent(class QGestureEvent *) ?minimizeKeypad@HbVkbHostBridge@@UAEX_N@Z @ 6405 NONAME ; void HbVkbHostBridge::minimizeKeypad(bool) - ?q_func@HbTapGesturePrivate@@ABEPBVHbTapGesture@@XZ @ 6406 NONAME ; class HbTapGesture const * HbTapGesturePrivate::q_func(void) const + ?q_func@HbTapGesturePrivate@@ABEPBVHbTapGesture@@XZ @ 6406 NONAME ABSENT ; class HbTapGesture const * HbTapGesturePrivate::q_func(void) const ??1HbThemeSystemEffect@@UAE@XZ @ 6407 NONAME ; HbThemeSystemEffect::~HbThemeSystemEffect(void) ?idFromEffectIdString@HbThemeSystemEffect@@ABEHABVQString@@@Z @ 6408 NONAME ABSENT ; int HbThemeSystemEffect::idFromEffectIdString(class QString const &) const ?isMouseEvent@HbSwipeGestureLogic@@QAE_NW4Type@QEvent@@@Z @ 6409 NONAME ; bool HbSwipeGestureLogic::isMouseEvent(enum QEvent::Type) @@ -6443,7 +6443,7 @@ ?parsePushWidget@HbXmlLoaderBinarySyntax@@AAE_NXZ @ 6439 NONAME ; bool HbXmlLoaderBinarySyntax::parsePushWidget(void) ?setGridLayoutRowHeights@HbXmlLoaderAbstractActions@@UAE_NHABUHbXmlLengthValue@@0000@Z @ 6440 NONAME ; bool HbXmlLoaderAbstractActions::setGridLayoutRowHeights(int, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &) ?parseSetSizeHint@HbXmlLoaderBinarySyntax@@AAE_NXZ @ 6441 NONAME ; bool HbXmlLoaderBinarySyntax::parseSetSizeHint(void) - ?currentLanguage@HbLanguageUtil@@SAHXZ @ 6442 NONAME ; int HbLanguageUtil::currentLanguage(void) + ?currentLanguage@HbLanguageUtil@@SAHXZ @ 6442 NONAME ABSENT ; int HbLanguageUtil::currentLanguage(void) ?load@HbWidgetLoader@@QAE_NPAVHbWidget@@ABVQString@@11W4MemoryType@HbMemoryManager@@@Z @ 6443 NONAME ; bool HbWidgetLoader::load(class HbWidget *, class QString const &, class QString const &, class QString const &, enum HbMemoryManager::MemoryType) ?fadeLengths@HbTextItem@@QBE?AVQPointF@@XZ @ 6444 NONAME ; class QPointF HbTextItem::fadeLengths(void) const ?createNullLayout@HbXmlLoaderBinaryActions@@UAE_NABVQString@@@Z @ 6445 NONAME ; bool HbXmlLoaderBinaryActions::createNullLayout(class QString const &) @@ -6520,7 +6520,7 @@ ?allocatedSharedMemory@HbSharedMemoryManager@@QAEHXZ @ 6516 NONAME ; int HbSharedMemoryManager::allocatedSharedMemory(void) ?setToolTip@HbXmlLoaderBinaryActions@@UAE_NABVHbXmlVariable@@@Z @ 6517 NONAME ; bool HbXmlLoaderBinaryActions::setToolTip(class HbXmlVariable const &) ?parseCreateAnchorLayout@HbXmlLoaderBinarySyntax@@AAE_NXZ @ 6518 NONAME ; bool HbXmlLoaderBinarySyntax::parseCreateAnchorLayout(void) - ??0HbXmlLengthValue@@QAE@MW4Type@0@@Z @ 6519 NONAME ; HbXmlLengthValue::HbXmlLengthValue(float, enum HbXmlLengthValue::Type) + ??0HbXmlLengthValue@@QAE@MW4Type@0@@Z @ 6519 NONAME ABSENT ; HbXmlLengthValue::HbXmlLengthValue(float, enum HbXmlLengthValue::Type) ?parsePushObject@HbXmlLoaderBinarySyntax@@AAE_NXZ @ 6520 NONAME ; bool HbXmlLoaderBinarySyntax::parsePushObject(void) ?resetNvgEngine@HbNvgEngineInstance@@QAEXXZ @ 6521 NONAME ; void HbNvgEngineInstance::resetNvgEngine(void) ?deleteAll@HbXmlLoaderBinaryActions@@UAEXXZ @ 6522 NONAME ; void HbXmlLoaderBinaryActions::deleteAll(void) @@ -6546,7 +6546,7 @@ ?processLayout@HbXmlLoaderBaseSyntax@@UAE_NXZ @ 6542 NONAME ; bool HbXmlLoaderBaseSyntax::processLayout(void) ?addStackedLayoutItem@HbXmlLoaderBinaryActions@@UAE_NABVQString@@PAH@Z @ 6543 NONAME ; bool HbXmlLoaderBinaryActions::addStackedLayoutItem(class QString const &, int *) ?addStackedLayoutItem@HbXmlLoaderAbstractActions@@UAE_NABVQString@@PAH@Z @ 6544 NONAME ; bool HbXmlLoaderAbstractActions::addStackedLayoutItem(class QString const &, int *) - ??0HbXmlLengthValue@@QAE@XZ @ 6545 NONAME ; HbXmlLengthValue::HbXmlLengthValue(void) + ??0HbXmlLengthValue@@QAE@XZ @ 6545 NONAME ABSENT ; HbXmlLengthValue::HbXmlLengthValue(void) ?lookUp@HbXmlLoaderBaseActions@@IAE?AU?$QPair@V?$QPointer@VQObject@@@@W4ElementType@HbXml@@@@ABVQString@@00@Z @ 6546 NONAME ABSENT ; struct QPair, enum HbXml::ElementType> HbXmlLoaderBaseActions::lookUp(class QString const &, class QString const &, class QString const &) ??1HbXmlLoaderBaseSyntax@@UAE@XZ @ 6547 NONAME ; HbXmlLoaderBaseSyntax::~HbXmlLoaderBaseSyntax(void) ?readDocument@HbXmlLoaderBaseSyntax@@UAE_NXZ @ 6548 NONAME ; bool HbXmlLoaderBaseSyntax::readDocument(void) @@ -6608,7 +6608,7 @@ ?cleanUp@HbXmlLoaderBinaryActions@@UAEXXZ @ 6604 NONAME ; void HbXmlLoaderBinaryActions::cleanUp(void) ?deleteAll@HbXmlLoaderAbstractActions@@UAEXXZ @ 6605 NONAME ; void HbXmlLoaderAbstractActions::deleteAll(void) ?instance@HbNvgEnginePool@@SAPAV1@XZ @ 6606 NONAME ; class HbNvgEnginePool * HbNvgEnginePool::instance(void) - ?supportedLanguages@HbLanguageUtil@@SA?AV?$QHash@HVQString@@@@XZ @ 6607 NONAME ; class QHash HbLanguageUtil::supportedLanguages(void) + ?supportedLanguages@HbLanguageUtil@@SA?AV?$QHash@HVQString@@@@XZ @ 6607 NONAME ABSENT ; class QHash HbLanguageUtil::supportedLanguages(void) ?calculateShape@HbPopupPrivate@@QAEXXZ @ 6608 NONAME ; void HbPopupPrivate::calculateShape(void) ?elementType@HbXmlLoaderBaseSyntax@@UBE?AW4ElementType@HbXml@@VQStringRef@@@Z @ 6609 NONAME ; enum HbXml::ElementType HbXmlLoaderBaseSyntax::elementType(class QStringRef) const ?d_func@HbWidgetLoader@@AAEPAVHbWidgetLoaderPrivate@@XZ @ 6610 NONAME ; class HbWidgetLoaderPrivate * HbWidgetLoader::d_func(void) @@ -6622,13 +6622,13 @@ ?getTlvEncodedData@HbTlvWrapper@@QAE?BVQByteArray@@ABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@@Z @ 6618 NONAME ABSENT ; class QByteArray const HbTlvWrapper::getTlvEncodedData(class QString const &, class QSizeF const &, enum Qt::AspectRatioMode) ?pushConnect@HbXmlLoaderBinaryActions@@UAE_NABVQString@@000@Z @ 6619 NONAME ; bool HbXmlLoaderBinaryActions::pushConnect(class QString const &, class QString const &, class QString const &, class QString const &) ?deref@HbNvgEngineInstance@@QAEXXZ @ 6620 NONAME ; void HbNvgEngineInstance::deref(void) - ?allLanguages@HbLanguageUtil@@SA?AV?$QHash@HVQString@@@@XZ @ 6621 NONAME ; class QHash HbLanguageUtil::allLanguages(void) + ?allLanguages@HbLanguageUtil@@SA?AV?$QHash@HVQString@@@@XZ @ 6621 NONAME ABSENT ; class QHash HbLanguageUtil::allLanguages(void) ?addToObjectMap@HbXmlLoaderBaseActions@@IAEXV?$QList@PAVQGraphicsItem@@@@@Z @ 6622 NONAME ; void HbXmlLoaderBaseActions::addToObjectMap(class QList) ?parseSetGridLayoutRowHeights@HbXmlLoaderBinarySyntax@@AAE_NXZ @ 6623 NONAME ; bool HbXmlLoaderBinarySyntax::parseSetGridLayoutRowHeights(void) ?fillStringData@HbVariant@@AAEXPBVQChar@@H@Z @ 6624 NONAME ; void HbVariant::fillStringData(class QChar const *, int) ??_EHbXmlLoaderBaseActions@@UAE@I@Z @ 6625 NONAME ; HbXmlLoaderBaseActions::~HbXmlLoaderBaseActions(unsigned int) ?setGridLayoutColumnWidths@HbXmlLoaderBinaryActions@@UAE_NHABUHbXmlLengthValue@@0000@Z @ 6626 NONAME ; bool HbXmlLoaderBinaryActions::setGridLayoutColumnWidths(int, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &, struct HbXmlLengthValue const &) - ?changeLanguage@HbLanguageUtil@@SA_NH@Z @ 6627 NONAME ; bool HbLanguageUtil::changeLanguage(int) + ?changeLanguage@HbLanguageUtil@@SA_NH@Z @ 6627 NONAME ABSENT ; bool HbLanguageUtil::changeLanguage(int) ?pushDocument@HbXmlLoaderBinaryActions@@UAE_NABVQString@@@Z @ 6628 NONAME ; bool HbXmlLoaderBinaryActions::pushDocument(class QString const &) ?parseAddGridLayoutCell@HbXmlLoaderBinarySyntax@@AAE_NXZ @ 6629 NONAME ; bool HbXmlLoaderBinarySyntax::parseAddGridLayoutCell(void) ?pop@HbXmlLoaderAbstractActions@@UAE_NW4ElementType@HbXml@@@Z @ 6630 NONAME ; bool HbXmlLoaderAbstractActions::pop(enum HbXml::ElementType) @@ -6899,7 +6899,7 @@ ?qt_metacast@HbIconTheme@@UAEPAXPBD@Z @ 6895 NONAME ; void * HbIconTheme::qt_metacast(char const *) ?init@HbTypefaceXmlParser@@QAE_NXZ @ 6896 NONAME ; bool HbTypefaceXmlParser::init(void) ?trUtf8@HbPopupManager@@SA?AVQString@@PBD0H@Z @ 6897 NONAME ; class QString HbPopupManager::trUtf8(char const *, char const *, int) - ?matchRules@StyleSelector@HbCss@@ABEXTNodePtr@12@ABV?$HbVector@UStyleRule@HbCss@@@@W4StyleSheetOrigin@2@HPAV?$QVector@U?$QPair@HUStyleRule@HbCss@@@@@@_N@Z @ 6898 NONAME ; void HbCss::StyleSelector::matchRules(union HbCss::StyleSelector::NodePtr, class HbVector const &, enum HbCss::StyleSheetOrigin, int, class QVector > *, bool) const + ?matchRules@StyleSelector@HbCss@@ABEXTNodePtr@12@ABV?$HbVector@UStyleRule@HbCss@@@@W4StyleSheetOrigin@2@HPAV?$QVector@U?$QPair@HUStyleRule@HbCss@@@@@@_N@Z @ 6898 NONAME ABSENT ; void HbCss::StyleSelector::matchRules(union HbCss::StyleSelector::NodePtr, class HbVector const &, enum HbCss::StyleSheetOrigin, int, class QVector > *, bool) const ??0HbTimer@@AAE@PAVQObject@@@Z @ 6899 NONAME ; HbTimer::HbTimer(class QObject *) ?trUtf8@HbIndicatorPluginManager@@SA?AVQString@@PBD0H@Z @ 6900 NONAME ; class QString HbIndicatorPluginManager::trUtf8(char const *, char const *, int) ??1HbDockWidgetPrivate@@UAE@XZ @ 6901 NONAME ; HbDockWidgetPrivate::~HbDockWidgetPrivate(void) @@ -7072,7 +7072,7 @@ ?GraphicsMemoryGood@HbOogmWatcherPrivate@@UAEXXZ @ 7068 NONAME ABSENT ; void HbOogmWatcherPrivate::GraphicsMemoryGood(void) ??_EHbSharedMemoryManagerUt@@UAE@I@Z @ 7069 NONAME ; HbSharedMemoryManagerUt::~HbSharedMemoryManagerUt(unsigned int) ?setOutlineDrawing@HbTouchAreaPrivate@@SAX_N@Z @ 7070 NONAME ; void HbTouchAreaPrivate::setOutlineDrawing(bool) - ?weightedDeclarationsForNode@StyleSelector@HbCss@@QBE?AV?$QVector@U?$QPair@HUDeclaration@HbCss@@@@@@TNodePtr@12@W4Orientation@Qt@@PBD@Z @ 7071 NONAME ; class QVector > HbCss::StyleSelector::weightedDeclarationsForNode(union HbCss::StyleSelector::NodePtr, enum Qt::Orientation, char const *) const + ?weightedDeclarationsForNode@StyleSelector@HbCss@@QBE?AV?$QVector@U?$QPair@HUDeclaration@HbCss@@@@@@TNodePtr@12@W4Orientation@Qt@@PBD@Z @ 7071 NONAME ABSENT ; class QVector > HbCss::StyleSelector::weightedDeclarationsForNode(union HbCss::StyleSelector::NodePtr, enum Qt::Orientation, char const *) const ?actionRemoved@HbToolBarPrivate@@QAEXHPAVHbToolButton@@@Z @ 7072 NONAME ; void HbToolBarPrivate::actionRemoved(int, class HbToolButton *) ?unLoadMultiIcon@HbThemeClient@@QAEXABVQStringList@@ABV?$QVector@VQSizeF@@@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NABVQColor@@@Z @ 7073 NONAME ABSENT ; void HbThemeClient::unLoadMultiIcon(class QStringList const &, class QVector const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QColor const &) ?getStaticMetaObject@HbToolTipLabel@@SAABUQMetaObject@@XZ @ 7074 NONAME ; struct QMetaObject const & HbToolTipLabel::getStaticMetaObject(void) @@ -7295,7 +7295,7 @@ ?removeAnchor@HbMeshLayout@@QAE_NABVQString@@W4Edge@Hb@@@Z @ 7291 NONAME ABSENT ; bool HbMeshLayout::removeAnchor(class QString const &, enum Hb::Edge) ?setOriginalPos@HbEffectTranslateAnimation@@QAEXM@Z @ 7292 NONAME ; void HbEffectTranslateAnimation::setOriginalPos(float) ?qt_metacast@HbMenuItem@@UAEPAXPBD@Z @ 7293 NONAME ; void * HbMenuItem::qt_metacast(char const *) - ?selectorMatches@StyleSelector@HbCss@@ABEHABUSelector@2@TNodePtr@12@_N@Z @ 7294 NONAME ; int HbCss::StyleSelector::selectorMatches(struct HbCss::Selector const &, union HbCss::StyleSelector::NodePtr, bool) const + ?selectorMatches@StyleSelector@HbCss@@ABEHABUSelector@2@TNodePtr@12@_N@Z @ 7294 NONAME ABSENT ; int HbCss::StyleSelector::selectorMatches(struct HbCss::Selector const &, union HbCss::StyleSelector::NodePtr, bool) const ?clearEffectRunning@HbEffectGroup@@AAEXXZ @ 7295 NONAME ; void HbEffectGroup::clearEffectRunning(void) ?deactivated@HbTitleBar@@IAEXABV?$QList@UIndicatorClientInfo@@@@@Z @ 7296 NONAME ; void HbTitleBar::deactivated(class QList const &) ??0HbPixmapIconImpl@@QAE@ABVQPixmap@@ABVQString@@@Z @ 7297 NONAME ; HbPixmapIconImpl::HbPixmapIconImpl(class QPixmap const &, class QString const &) @@ -7353,7 +7353,7 @@ ?select@HbDeviceProfileManager@@SAXABVHbDeviceProfile@@@Z @ 7349 NONAME ; void HbDeviceProfileManager::select(class HbDeviceProfile const &) ??0HbEffectAnimation@@QAE@PAVHbEffectGroup@@@Z @ 7350 NONAME ; HbEffectAnimation::HbEffectAnimation(class HbEffectGroup *) ?allocatedSharedMemory@HbThemeClientPrivate@@QAEHXZ @ 7351 NONAME ; int HbThemeClientPrivate::allocatedSharedMemory(void) - ?basicSelectorMatches@StyleSelector@HbCss@@ABEHABUBasicSelector@2@TNodePtr@12@_N@Z @ 7352 NONAME ; int HbCss::StyleSelector::basicSelectorMatches(struct HbCss::BasicSelector const &, union HbCss::StyleSelector::NodePtr, bool) const + ?basicSelectorMatches@StyleSelector@HbCss@@ABEHABUBasicSelector@2@TNodePtr@12@_N@Z @ 7352 NONAME ABSENT ; int HbCss::StyleSelector::basicSelectorMatches(struct HbCss::BasicSelector const &, union HbCss::StyleSelector::NodePtr, bool) const ?extRect@HbEffectGroup@@QBE?AVQRectF@@XZ @ 7353 NONAME ; class QRectF HbEffectGroup::extRect(void) const ?setLooping@HbEffectGroup@@QAEX_N@Z @ 7354 NONAME ; void HbEffectGroup::setLooping(bool) ?declarationsToString@HbCssFormatter@@SA?AVQString@@ABV?$HbVector@UDeclaration@HbCss@@@@@Z @ 7355 NONAME ; class QString HbCssFormatter::declarationsToString(class HbVector const &) @@ -7448,7 +7448,7 @@ ??_EHbIconTheme@@UAE@I@Z @ 7444 NONAME ; HbIconTheme::~HbIconTheme(unsigned int) ?trUtf8@HbTitlePane@@SA?AVQString@@PBD0H@Z @ 7445 NONAME ; class QString HbTitlePane::trUtf8(char const *, char const *, int) ??1HbSensorListener@@UAE@XZ @ 7446 NONAME ; HbSensorListener::~HbSensorListener(void) - ?weightedStyleRulesForNode@StyleSelector@HbCss@@QBE?AV?$QVector@U?$QPair@HUStyleRule@HbCss@@@@@@TNodePtr@12@W4Orientation@Qt@@@Z @ 7447 NONAME ; class QVector > HbCss::StyleSelector::weightedStyleRulesForNode(union HbCss::StyleSelector::NodePtr, enum Qt::Orientation) const + ?weightedStyleRulesForNode@StyleSelector@HbCss@@QBE?AV?$QVector@U?$QPair@HUStyleRule@HbCss@@@@@@TNodePtr@12@W4Orientation@Qt@@@Z @ 7447 NONAME ABSENT ; class QVector > HbCss::StyleSelector::weightedStyleRulesForNode(union HbCss::StyleSelector::NodePtr, enum Qt::Orientation) const ?getMultiIconInfo@HbThemeClientPrivate@@QAE?AUHbSharedIconInfoList@@ABVQStringList@@ABV?$QVector@VQSizeF@@@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@@Z @ 7448 NONAME ABSENT ; struct HbSharedIconInfoList HbThemeClientPrivate::getMultiIconInfo(class QStringList const &, class QVector const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &) ??_EHbMainWindowOrientation@@UAE@I@Z @ 7449 NONAME ; HbMainWindowOrientation::~HbMainWindowOrientation(unsigned int) ?setStartState@HbEffectOpacity@@UAEXAAVQTransform@@@Z @ 7450 NONAME ; void HbEffectOpacity::setStartState(class QTransform &) @@ -7615,14 +7615,14 @@ ?instance@HbTypefaceInfoDatabase@@SAPAV1@W4MemoryType@HbMemoryManager@@@Z @ 7611 NONAME ; class HbTypefaceInfoDatabase * HbTypefaceInfoDatabase::instance(enum HbMemoryManager::MemoryType) ?getBaseThemeFromCenRep@HbThemeUtils@@CA?AUHbThemeInfo@@ABVQString@@@Z @ 7612 NONAME ABSENT ; struct HbThemeInfo HbThemeUtils::getBaseThemeFromCenRep(class QString const &) ?saveBaseThemeSettings@HbThemeUtils@@CAXAAUHbThemeInfo@@ABVQString@@1@Z @ 7613 NONAME ABSENT ; void HbThemeUtils::saveBaseThemeSettings(struct HbThemeInfo &, class QString const &, class QString const &) - ?handleMouseMove@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 7614 NONAME ; class QFlags HbSwipeGestureLogic::handleMouseMove(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *) - ?recognize@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQEvent@@VQTime@@@Z @ 7615 NONAME ; class QFlags HbSwipeGestureLogic::recognize(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QEvent *, class QTime) - ?getLastRecords@HbPointRecorder@@QBE?AV?$QList@U?$QPair@MVQTime@@@@@@H@Z @ 7616 NONAME ; class QList > HbPointRecorder::getLastRecords(int) const - ?record@HbPointRecorder@@QAEXMABVQTime@@@Z @ 7617 NONAME ; void HbPointRecorder::record(float, class QTime const &) + ?handleMouseMove@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@@Z @ 7614 NONAME ABSENT ; class QFlags HbSwipeGestureLogic::handleMouseMove(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *) + ?recognize@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQEvent@@VQTime@@@Z @ 7615 NONAME ABSENT ; class QFlags HbSwipeGestureLogic::recognize(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QEvent *, class QTime) + ?getLastRecords@HbPointRecorder@@QBE?AV?$QList@U?$QPair@MVQTime@@@@@@H@Z @ 7616 NONAME ABSENT ; class QList > HbPointRecorder::getLastRecords(int) const + ?record@HbPointRecorder@@QAEXMABVQTime@@@Z @ 7617 NONAME ABSENT ; void HbPointRecorder::record(float, class QTime const &) ?resetRecorder@HbPointRecorder@@QAEXM@Z @ 7618 NONAME ; void HbPointRecorder::resetRecorder(float) - ??AHbPointRecorder@@QBE?AU?$QPair@MVQTime@@@@H@Z @ 7619 NONAME ; struct QPair HbPointRecorder::operator[](int) const + ??AHbPointRecorder@@QBE?AU?$QPair@MVQTime@@@@H@Z @ 7619 NONAME ABSENT ; struct QPair HbPointRecorder::operator[](int) const ??1HbSwipeGesturePrivate@@QAE@XZ @ 7620 NONAME ; HbSwipeGesturePrivate::~HbSwipeGesturePrivate(void) - ?recognize@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQEvent@@VQTime@@@Z @ 7621 NONAME ; class QFlags HbPanGestureLogic::recognize(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QEvent *, class QTime) + ?recognize@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQEvent@@VQTime@@@Z @ 7621 NONAME ABSENT ; class QFlags HbPanGestureLogic::recognize(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QEvent *, class QTime) ?switchRenderingMode@HbThemeClientPrivate@@QAE_NW4HbRenderingMode@@@Z @ 7622 NONAME ; bool HbThemeClientPrivate::switchRenderingMode(enum HbRenderingMode) ?getMultiPartIconInfo@HbThemeClientPrivate@@QAE?AUHbSharedIconInfo@@ABVQStringList@@ABUHbMultiPartSizeData@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NV?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4HbRenderingMode@@@Z @ 7623 NONAME ; struct HbSharedIconInfo HbThemeClientPrivate::getMultiPartIconInfo(class QStringList const &, struct HbMultiPartSizeData const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, class QFlags, class QColor const &, enum HbRenderingMode) ?getMultiIconImplFromServer@HbIconLoader@@AAEXAAVQStringList@@AAV?$QVector@VQSizeF@@@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_N4V?$QFlags@W4IconLoaderOption@HbIconLoader@@@@ABVQColor@@W4IconDataType@1@W4Purpose@1@AAV?$QVector@PAVHbIconImpl@@@@W4HbRenderingMode@@@Z @ 7624 NONAME ABSENT ; void HbIconLoader::getMultiIconImplFromServer(class QStringList &, class QVector &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, bool, class QFlags, class QColor const &, enum HbIconLoader::IconDataType, enum HbIconLoader::Purpose, class QVector &, enum HbRenderingMode) @@ -7696,20 +7696,20 @@ ?fillStringListData@HbVariant@@AAEXABVQStringList@@@Z @ 7692 NONAME ; void HbVariant::fillStringListData(class QStringList const &) ?gestureEvent@HbStatusBar@@MAEXPAVQGestureEvent@@@Z @ 7693 NONAME ; void HbStatusBar::gestureEvent(class QGestureEvent *) ?showEvent@HbMainWindow@@MAEXPAVQShowEvent@@@Z @ 7694 NONAME ; void HbMainWindow::showEvent(class QShowEvent *) - ?asReals@ValueExtractor@HbCss@@AAE_NABUDeclaration@2@PAM@Z @ 7695 NONAME ; bool HbCss::ValueExtractor::asReals(struct HbCss::Declaration const &, float *) + ?asReals@ValueExtractor@HbCss@@AAE_NABUDeclaration@2@PAM@Z @ 7695 NONAME ABSENT ; bool HbCss::ValueExtractor::asReals(struct HbCss::Declaration const &, float *) ?extractVariableValue@ValueExtractor@HbCss@@QBE_NABVQString@@AAV?$HbVector@UValue@HbCss@@@@@Z @ 7696 NONAME ABSENT ; bool HbCss::ValueExtractor::extractVariableValue(class QString const &, class HbVector &) const ?extractColor@ValueExtractor@HbCss@@QBE_NAAVQColor@@@Z @ 7697 NONAME ; bool HbCss::ValueExtractor::extractColor(class QColor &) const ?key@HbStyleParameters@@QAE?AVQString@@H@Z @ 7698 NONAME ; class QString HbStyleParameters::key(int) ??0ValueExtractor@HbCss@@QAE@ABV?$HbVector@UDeclaration@HbCss@@@@ABVHbDeviceProfile@@@Z @ 7699 NONAME ; HbCss::ValueExtractor::ValueExtractor(class HbVector const &, class HbDeviceProfile const &) - ?asReal@ValueExtractor@HbCss@@AAEMABUDeclaration@2@PA_N@Z @ 7700 NONAME ; float HbCss::ValueExtractor::asReal(struct HbCss::Declaration const &, bool *) - ?extractCustomProperties@ValueExtractor@HbCss@@QAE_NABV?$QList@VQString@@@@AAV?$QList@VQVariant@@@@@Z @ 7701 NONAME ; bool HbCss::ValueExtractor::extractCustomProperties(class QList const &, class QList &) - ?extractVariableValue@ValueExtractor@HbCss@@QAE_NABVQString@@AAM@Z @ 7702 NONAME ; bool HbCss::ValueExtractor::extractVariableValue(class QString const &, float &) + ?asReal@ValueExtractor@HbCss@@AAEMABUDeclaration@2@PA_N@Z @ 7700 NONAME ABSENT ; float HbCss::ValueExtractor::asReal(struct HbCss::Declaration const &, bool *) + ?extractCustomProperties@ValueExtractor@HbCss@@QAE_NABV?$QList@VQString@@@@AAV?$QList@VQVariant@@@@@Z @ 7701 NONAME ABSENT ; bool HbCss::ValueExtractor::extractCustomProperties(class QList const &, class QList &) + ?extractVariableValue@ValueExtractor@HbCss@@QAE_NABVQString@@AAM@Z @ 7702 NONAME ABSENT ; bool HbCss::ValueExtractor::extractVariableValue(class QString const &, float &) ??0ValueExtractor@HbCss@@QAE@ABV?$HbVector@UDeclaration@HbCss@@@@ABV?$QHash@VQString@@UDeclaration@HbCss@@@@ABVHbDeviceProfile@@@Z @ 7703 NONAME ABSENT ; HbCss::ValueExtractor::ValueExtractor(class HbVector const &, class QHash const &, class HbDeviceProfile const &) - ?extractKnownProperties@ValueExtractor@HbCss@@QAE_NAAUKnownProperties@2@@Z @ 7704 NONAME ; bool HbCss::ValueExtractor::extractKnownProperties(struct HbCss::KnownProperties &) - ?extractLayout@ValueExtractor@HbCss@@QAE_NAAVQString@@0@Z @ 7705 NONAME ; bool HbCss::ValueExtractor::extractLayout(class QString &, class QString &) + ?extractKnownProperties@ValueExtractor@HbCss@@QAE_NAAUKnownProperties@2@@Z @ 7704 NONAME ABSENT ; bool HbCss::ValueExtractor::extractKnownProperties(struct HbCss::KnownProperties &) + ?extractLayout@ValueExtractor@HbCss@@QAE_NAAVQString@@0@Z @ 7705 NONAME ABSENT ; bool HbCss::ValueExtractor::extractLayout(class QString &, class QString &) ?extractVariableValue@ValueExtractor@HbCss@@QBE_NABVQString@@AAUValue@2@@Z @ 7706 NONAME ; bool HbCss::ValueExtractor::extractVariableValue(class QString const &, struct HbCss::Value &) const - ?asReal@ValueExtractor@HbCss@@AAEMABUValue@2@PA_N@Z @ 7707 NONAME ; float HbCss::ValueExtractor::asReal(struct HbCss::Value const &, bool *) - ?asReal@ValueExtractor@HbCss@@AAEMAAVQString@@W4Type@Value@2@PA_N@Z @ 7708 NONAME ; float HbCss::ValueExtractor::asReal(class QString &, enum HbCss::Value::Type, bool *) + ?asReal@ValueExtractor@HbCss@@AAEMABUValue@2@PA_N@Z @ 7707 NONAME ABSENT ; float HbCss::ValueExtractor::asReal(struct HbCss::Value const &, bool *) + ?asReal@ValueExtractor@HbCss@@AAEMAAVQString@@W4Type@Value@2@PA_N@Z @ 7708 NONAME ABSENT ; float HbCss::ValueExtractor::asReal(class QString &, enum HbCss::Value::Type, bool *) ?keys@HbStyleParameters@@AAEAAV?$QList@VQString@@@@XZ @ 7709 NONAME ; class QList & HbStyleParameters::keys(void) ?qt_metacall@HbShrinkingVkbHost@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 7710 NONAME ; int HbShrinkingVkbHost::qt_metacall(enum QMetaObject::Call, int, void * *) ?d_func@HbShrinkingVkbHost@@ABEPBVHbShrinkingVkbHostPrivate@@XZ @ 7711 NONAME ; class HbShrinkingVkbHostPrivate const * HbShrinkingVkbHost::d_func(void) const @@ -8281,12 +8281,12 @@ ??0HbThemeIndexResource@@QAE@I@Z @ 8277 NONAME ; HbThemeIndexResource::HbThemeIndexResource(unsigned int) ?variableRuleSets@HbLayeredStyleLoader@@QBEXPAV?$QHash@IUDeclaration@HbCss@@@@@Z @ 8278 NONAME ; void HbLayeredStyleLoader::variableRuleSets(class QHash *) const ?setVariables@ValueExtractor@HbCss@@QAEXABV?$QHash@IUDeclaration@HbCss@@@@@Z @ 8279 NONAME ; void HbCss::ValueExtractor::setVariables(class QHash const &) - ?parameterFromHashValue@HbStylePrivate@@QBE_NIAAMABVHbDeviceProfile@@@Z @ 8280 NONAME ; bool HbStylePrivate::parameterFromHashValue(unsigned int, float &, class HbDeviceProfile const &) const + ?parameterFromHashValue@HbStylePrivate@@QBE_NIAAMABVHbDeviceProfile@@@Z @ 8280 NONAME ABSENT ; bool HbStylePrivate::parameterFromHashValue(unsigned int, float &, class HbDeviceProfile const &) const ?extractVariableValue@ValueExtractor@HbCss@@QBE_NIAAUValue@2@@Z @ 8281 NONAME ; bool HbCss::ValueExtractor::extractVariableValue(unsigned int, struct HbCss::Value &) const ?getItemData@HbThemeIndex@@QAEPBUHbThemeIndexItemData@@I@Z @ 8282 NONAME ; struct HbThemeIndexItemData const * HbThemeIndex::getItemData(unsigned int) ?hbHash@@YAIABVQString@@@Z @ 8283 NONAME ; unsigned int hbHash(class QString const &) ?setLayoutParameters@ValueExtractor@HbCss@@QAEXABVHbLayoutParameters@@@Z @ 8284 NONAME ; void HbCss::ValueExtractor::setLayoutParameters(class HbLayoutParameters const &) - ?extractVariableValue@ValueExtractor@HbCss@@QAE_NIAAM@Z @ 8285 NONAME ; bool HbCss::ValueExtractor::extractVariableValue(unsigned int, float &) + ?extractVariableValue@ValueExtractor@HbCss@@QAE_NIAAM@Z @ 8285 NONAME ABSENT ; bool HbCss::ValueExtractor::extractVariableValue(unsigned int, float &) ?hbHash@@YAIABVQStringRef@@@Z @ 8286 NONAME ; unsigned int hbHash(class QStringRef const &) ?find@HbLayoutParameters@@QBEPBUHbParameterItem@@I@Z @ 8287 NONAME ; struct HbParameterItem const * HbLayoutParameters::find(unsigned int) const ?variableRuleSets@StyleSelector@HbCss@@QBEXPAV?$QHash@IUDeclaration@HbCss@@@@@Z @ 8288 NONAME ; void HbCss::StyleSelector::variableRuleSets(class QHash *) const @@ -8295,4 +8295,121 @@ ?createIconImpl@HbIconImplCreator@@SAPAVHbIconImpl@@ABVQPixmap@@AAUHbIconLoadingParams@@@Z @ 8291 NONAME ; class HbIconImpl * HbIconImplCreator::createIconImpl(class QPixmap const &, struct HbIconLoadingParams &) ??0HbPixmapIconImpl@@QAE@UHbSharedIconInfo@@ABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_NW4HbRenderingMode@@@Z @ 8292 NONAME ; HbPixmapIconImpl::HbPixmapIconImpl(struct HbSharedIconInfo, class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool, enum HbRenderingMode) ??0HbPixmapIconImpl@@QAE@ABVQPixmap@@ABVQString@@ABVQSizeF@@W4AspectRatioMode@Qt@@W4Mode@QIcon@@_N@Z @ 8293 NONAME ; HbPixmapIconImpl::HbPixmapIconImpl(class QPixmap const &, class QString const &, class QSizeF const &, enum Qt::AspectRatioMode, enum QIcon::Mode, bool) + ?_q_maskEffectDestroyed@HbPopupPrivate@@QAEXXZ @ 8294 NONAME ; void HbPopupPrivate::_q_maskEffectDestroyed(void) + ?themeChangeFinished@HbIconLoader@@AAEXXZ @ 8295 NONAME ; void HbIconLoader::themeChangeFinished(void) + ?setBackground@HbXmlLoaderAbstractActions@@UAE_NABVQString@@W4FrameType@HbFrameDrawer@@@Z @ 8296 NONAME ; bool HbXmlLoaderAbstractActions::setBackground(class QString const &, enum HbFrameDrawer::FrameType) + ?setBackground@HbXmlLoaderBinaryActions@@UAE_NABVQString@@W4FrameType@HbFrameDrawer@@@Z @ 8297 NONAME ; bool HbXmlLoaderBinaryActions::setBackground(class QString const &, enum HbFrameDrawer::FrameType) + ?parseSetBackground@HbXmlLoaderBinarySyntax@@AAE_NXZ @ 8298 NONAME ; bool HbXmlLoaderBinarySyntax::parseSetBackground(void) + ?isTouchEvent@HbPanGestureLogic@@QAE_NW4Type@QEvent@@@Z @ 8299 NONAME ; bool HbPanGestureLogic::isTouchEvent(enum QEvent::Type) + ?handleTouchBegin@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQTouchEvent@@@Z @ 8300 NONAME ABSENT ; class QFlags HbPanGestureLogic::handleTouchBegin(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QTouchEvent *) + ?handleTouchEnd@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQTouchEvent@@@Z @ 8301 NONAME ABSENT ; class QFlags HbPanGestureLogic::handleTouchEnd(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QTouchEvent *) + ?getNextId@HbPanGestureLogic@@QAEHPAVQTouchEvent@@@Z @ 8302 NONAME ; int HbPanGestureLogic::getNextId(class QTouchEvent *) + ?handleTouchMove@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQTouchEvent@@@Z @ 8303 NONAME ABSENT ; class QFlags HbPanGestureLogic::handleTouchMove(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QTouchEvent *) + ?followedTouchPointIndex@HbPanGestureLogic@@QAEHPAVQTouchEvent@@PAVHbPanGesture@@@Z @ 8304 NONAME ; int HbPanGestureLogic::followedTouchPointIndex(class QTouchEvent *, class HbPanGesture *) + ?setPreferredPos@HbMenu@@UAEXABVQPointF@@W4Placement@HbPopup@@@Z @ 8305 NONAME ; void HbMenu::setPreferredPos(class QPointF const &, enum HbPopup::Placement) + ?setPreferredPos@HbPopup@@UAEXABVQPointF@@W4Placement@1@@Z @ 8306 NONAME ; void HbPopup::setPreferredPos(class QPointF const &, enum HbPopup::Placement) + ?editorPriority@HbInputFocusObject@@QBEEXZ @ 8307 NONAME ; unsigned char HbInputFocusObject::editorPriority(void) const + ?_q_thumbPositionChanged2@HbScrollAreaPrivate@@QAEXMH@Z @ 8308 NONAME ; void HbScrollAreaPrivate::_q_thumbPositionChanged2(float, int) + ?addRuleToWidgetStack@Parser@HbCss@@QAEXPAUStyleSheet@2@IAAUStyleRule@2@@Z @ 8309 NONAME ; void HbCss::Parser::addRuleToWidgetStack(struct HbCss::StyleSheet *, unsigned int, struct HbCss::StyleRule &) + ?matchRules@StyleSelector@HbCss@@ABEXTNodePtr@12@ABV?$HbVector@UStyleRule@HbCss@@@@W4StyleSheetOrigin@2@HPAV?$QList@U?$QPair@HUStyleRule@HbCss@@@@@@PAV?$QSet@TNodePtr@StyleSelector@HbCss@@@@_N@Z @ 8310 NONAME ; void HbCss::StyleSelector::matchRules(union HbCss::StyleSelector::NodePtr, class HbVector const &, enum HbCss::StyleSheetOrigin, int, class QList > *, class QSet *, bool) const + ?selectorMatches@StyleSelector@HbCss@@ABEHABUSelector@2@TNodePtr@12@PAV?$QSet@TNodePtr@StyleSelector@HbCss@@@@_N@Z @ 8311 NONAME ; int HbCss::StyleSelector::selectorMatches(struct HbCss::Selector const &, union HbCss::StyleSelector::NodePtr, class QSet *, bool) const + ?basicSelectorMatches@StyleSelector@HbCss@@ABEHABUBasicSelector@2@TNodePtr@12@PAV?$QSet@TNodePtr@StyleSelector@HbCss@@@@_N@Z @ 8312 NONAME ; int HbCss::StyleSelector::basicSelectorMatches(struct HbCss::BasicSelector const &, union HbCss::StyleSelector::NodePtr, class QSet *, bool) const + ?weightedDeclarationsForNode@StyleSelector@HbCss@@QBEXTNodePtr@12@W4Orientation@Qt@@PAV?$QList@U?$QPair@HUDeclaration@HbCss@@@@@@PBD@Z @ 8313 NONAME ; void HbCss::StyleSelector::weightedDeclarationsForNode(union HbCss::StyleSelector::NodePtr, enum Qt::Orientation, class QList > *, char const *) const + ?weightedStyleRulesForNode@StyleSelector@HbCss@@QBEXTNodePtr@12@W4Orientation@Qt@@PAV?$QList@U?$QPair@HUStyleRule@HbCss@@@@@@@Z @ 8314 NONAME ; void HbCss::StyleSelector::weightedStyleRulesForNode(union HbCss::StyleSelector::NodePtr, enum Qt::Orientation, class QList > *) const + ?add@HbEffectInternal@@SA_NQAPBD00H@Z @ 8315 NONAME ; bool HbEffectInternal::add(char const * * const, char const * * const, char const * * const, int) + ??4HbVariant@@QAEAAV0@ABV?$QList@H@@@Z @ 8316 NONAME ; class HbVariant & HbVariant::operator=(class QList const &) + ?extractCustomProperties@ValueExtractor@HbCss@@QBE_NABV?$QList@VQString@@@@AAV?$QList@VQVariant@@@@@Z @ 8317 NONAME ; bool HbCss::ValueExtractor::extractCustomProperties(class QList const &, class QList &) const + ?parse@HbExpressionParser@@SA_NABVQString@@AAV?$QList@H@@@Z @ 8318 NONAME ; bool HbExpressionParser::parse(class QString const &, class QList &) + ?asReal@ValueExtractor@HbCss@@ABEMABUValue@2@PA_N@Z @ 8319 NONAME ; float HbCss::ValueExtractor::asReal(struct HbCss::Value const &, bool *) const + ?toIntList@HbVariant@@QBE?AV?$QList@H@@XZ @ 8320 NONAME ; class QList HbVariant::toIntList(void) const + ?valueFromTokens@HbStylePrivate@@QBE_NABV?$QList@H@@AAMABVHbDeviceProfile@@@Z @ 8321 NONAME ; bool HbStylePrivate::valueFromTokens(class QList const &, float &, class HbDeviceProfile const &) const + ?asReals@ValueExtractor@HbCss@@ABE_NABUDeclaration@2@PAM@Z @ 8322 NONAME ; bool HbCss::ValueExtractor::asReals(struct HbCss::Declaration const &, float *) const + ?fillIntListData@HbVariant@@AAEXABV?$QList@H@@@Z @ 8323 NONAME ; void HbVariant::fillIntListData(class QList const &) + ??0HbVariant@@QAE@ABV?$QList@H@@W4MemoryType@HbMemoryManager@@@Z @ 8324 NONAME ; HbVariant::HbVariant(class QList const &, enum HbMemoryManager::MemoryType) + ?extractExpressionValue@ValueExtractor@HbCss@@QBE_NABV?$QList@H@@AAM@Z @ 8325 NONAME ; bool HbCss::ValueExtractor::extractExpressionValue(class QList const &, float &) const + ?extractVariableValue@ValueExtractor@HbCss@@QBE_NABVQString@@AAM@Z @ 8326 NONAME ; bool HbCss::ValueExtractor::extractVariableValue(class QString const &, float &) const + ?extractKnownProperties@ValueExtractor@HbCss@@QBE_NAAUKnownProperties@2@@Z @ 8327 NONAME ; bool HbCss::ValueExtractor::extractKnownProperties(struct HbCss::KnownProperties &) const + ?toFixed@HbExpressionParser@@SAHM@Z @ 8328 NONAME ; int HbExpressionParser::toFixed(float) + ?asReal@ValueExtractor@HbCss@@ABEMHW4Token@HbExpressionParser@@AA_N@Z @ 8329 NONAME ; float HbCss::ValueExtractor::asReal(int, enum HbExpressionParser::Token, bool &) const + ?extractLayout@ValueExtractor@HbCss@@QBE_NAAVQString@@0@Z @ 8330 NONAME ; bool HbCss::ValueExtractor::extractLayout(class QString &, class QString &) const + ?asReal@ValueExtractor@HbCss@@ABEMABUDeclaration@2@PA_N@Z @ 8331 NONAME ; float HbCss::ValueExtractor::asReal(struct HbCss::Declaration const &, bool *) const + ?toFixed@HbExpressionParser@@SAHN@Z @ 8332 NONAME ; int HbExpressionParser::toFixed(double) + ?asReal@ValueExtractor@HbCss@@ABEMAAVQString@@W4Type@Value@2@PA_N@Z @ 8333 NONAME ; float HbCss::ValueExtractor::asReal(class QString &, enum HbCss::Value::Type, bool *) const + ?extractExpressionValue@ValueExtractor@HbCss@@QBE_NABVQString@@AAM@Z @ 8334 NONAME ; bool HbCss::ValueExtractor::extractExpressionValue(class QString const &, float &) const + ?extractVariableValue@ValueExtractor@HbCss@@QBE_NIAAM@Z @ 8335 NONAME ; bool HbCss::ValueExtractor::extractVariableValue(unsigned int, float &) const + ?fromFixed@HbExpressionParser@@SAMH@Z @ 8336 NONAME ; float HbExpressionParser::fromFixed(int) + ?handleMouseMove@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@_J@Z @ 8337 NONAME ; class QFlags HbSwipeGestureLogic::handleMouseMove(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *, long long) + ??0HbTapAndHoldGesturePrivate@@QAE@XZ @ 8338 NONAME ; HbTapAndHoldGesturePrivate::HbTapAndHoldGesturePrivate(void) + ?handleMouseRelease@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@_J@Z @ 8339 NONAME ; class QFlags HbPanGestureLogic::handleMouseRelease(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *, long long) + ?lastTime@HbPointRecorder@@QBE_JXZ @ 8340 NONAME ; long long HbPointRecorder::lastTime(void) const + ?recognize@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQEvent@@_J@Z @ 8341 NONAME ; class QFlags HbPanGestureLogic::recognize(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QEvent *, long long) + ?handleMousePress@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@_J@Z @ 8342 NONAME ; class QFlags HbPanGestureLogic::handleMousePress(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *, long long) + ?handleTouchEnd@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQTouchEvent@@_J@Z @ 8343 NONAME ; class QFlags HbPanGestureLogic::handleTouchEnd(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QTouchEvent *, long long) + ?d_func@HbTapAndHoldGesture@@ABEPBVHbTapAndHoldGesturePrivate@@XZ @ 8344 NONAME ; class HbTapAndHoldGesturePrivate const * HbTapAndHoldGesture::d_func(void) const + ?getLastRecords@HbPointRecorder@@QBE?AV?$QList@U?$QPair@M_J@@@@H@Z @ 8345 NONAME ; class QList > HbPointRecorder::getLastRecords(int) const + ?handleMousePress@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@_J@Z @ 8346 NONAME ; class QFlags HbSwipeGestureLogic::handleMousePress(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *, long long) + ?at@HbPointRecorder@@QBE?AU?$QPair@M_J@@H@Z @ 8347 NONAME ; struct QPair HbPointRecorder::at(int) const + ?count@HbPointRecorder@@QBEHXZ @ 8348 NONAME ; int HbPointRecorder::count(void) const + ?handleTouchMove@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQTouchEvent@@_J@Z @ 8349 NONAME ; class QFlags HbPanGestureLogic::handleTouchMove(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QTouchEvent *, long long) + ?velocity@HbVelocityCalculator@@QBE?AVQPointF@@_J@Z @ 8350 NONAME ; class QPointF HbVelocityCalculator::velocity(long long) const + ?handleMouseMove@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQMouseEvent@@_J@Z @ 8351 NONAME ; class QFlags HbPanGestureLogic::handleMouseMove(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QMouseEvent *, long long) + ?handleMouseRelease@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQMouseEvent@@_J@Z @ 8352 NONAME ; class QFlags HbSwipeGestureLogic::handleMouseRelease(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QMouseEvent *, long long) + ?calculate_velocity@HbVelocityCalculator@@ABEMABVHbPointRecorder@@_J@Z @ 8353 NONAME ; float HbVelocityCalculator::calculate_velocity(class HbPointRecorder const &, long long) const + ?recognize@HbSwipeGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbSwipeGesture@@PAVQObject@@PAVQEvent@@_J@Z @ 8354 NONAME ; class QFlags HbSwipeGestureLogic::recognize(enum Qt::GestureState, class HbSwipeGesture *, class QObject *, class QEvent *, long long) + ?d_func@HbTapAndHoldGesture@@AAEPAVHbTapAndHoldGesturePrivate@@XZ @ 8355 NONAME ; class HbTapAndHoldGesturePrivate * HbTapAndHoldGesture::d_func(void) + ?handleTouchBegin@HbPanGestureLogic@@QAE?AV?$QFlags@W4ResultFlag@QGestureRecognizer@@@@W4GestureState@Qt@@PAVHbPanGesture@@PAVQObject@@PAVQTouchEvent@@_J@Z @ 8356 NONAME ; class QFlags HbPanGestureLogic::handleTouchBegin(enum Qt::GestureState, class HbPanGesture *, class QObject *, class QTouchEvent *, long long) + ?record@HbPointRecorder@@QAEXM_J@Z @ 8357 NONAME ; void HbPointRecorder::record(float, long long) + ??1HbStylePrimitiveData@@QAE@XZ @ 8358 NONAME ; HbStylePrimitiveData::~HbStylePrimitiveData(void) + ?qt_metacast@HbGlobalStatusBar@@UAEPAXPBD@Z @ 8359 NONAME ; void * HbGlobalStatusBar::qt_metacast(char const *) + ?staticMetaObject@HbGlobalStatusBar@@2UQMetaObject@@B @ 8360 NONAME ; struct QMetaObject const HbGlobalStatusBar::staticMetaObject + ?tr@HbGlobalStatusBar@@SA?AVQString@@PBD0H@Z @ 8361 NONAME ; class QString HbGlobalStatusBar::tr(char const *, char const *, int) + ??1HbGlobalStatusBar@@UAE@XZ @ 8362 NONAME ; HbGlobalStatusBar::~HbGlobalStatusBar(void) + ??0HbGlobalStatusBar@@QAE@PAVQObject@@@Z @ 8363 NONAME ; HbGlobalStatusBar::HbGlobalStatusBar(class QObject *) + ?metaObject@HbGlobalStatusBar@@UBEPBUQMetaObject@@XZ @ 8364 NONAME ; struct QMetaObject const * HbGlobalStatusBar::metaObject(void) const + ?getImage@HbGlobalStatusBar@@QAE?AVQImage@@W4Orientation@Qt@@@Z @ 8365 NONAME ; class QImage HbGlobalStatusBar::getImage(enum Qt::Orientation) + ??_EHbGlobalStatusBar@@UAE@I@Z @ 8366 NONAME ; HbGlobalStatusBar::~HbGlobalStatusBar(unsigned int) + ?getStaticMetaObject@HbGlobalStatusBar@@SAABUQMetaObject@@XZ @ 8367 NONAME ; struct QMetaObject const & HbGlobalStatusBar::getStaticMetaObject(void) + ?tr@HbGlobalStatusBar@@SA?AVQString@@PBD0@Z @ 8368 NONAME ; class QString HbGlobalStatusBar::tr(char const *, char const *) + ?changed@HbGlobalStatusBar@@IAEXXZ @ 8369 NONAME ; void HbGlobalStatusBar::changed(void) + ?trUtf8@HbGlobalStatusBar@@SA?AVQString@@PBD0H@Z @ 8370 NONAME ; class QString HbGlobalStatusBar::trUtf8(char const *, char const *, int) + ?qt_metacall@HbGlobalStatusBar@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 8371 NONAME ; int HbGlobalStatusBar::qt_metacall(enum QMetaObject::Call, int, void * *) + ?trUtf8@HbGlobalStatusBar@@SA?AVQString@@PBD0@Z @ 8372 NONAME ; class QString HbGlobalStatusBar::trUtf8(char const *, char const *) + ?startedToBackground@HbApplication@@SA_NXZ @ 8373 NONAME ; bool HbApplication::startedToBackground(void) + ?openKeypadWithoutAnimation@HbAbstractVkbHostPrivate@@UAEXXZ @ 8374 NONAME ; void HbAbstractVkbHostPrivate::openKeypadWithoutAnimation(void) + ?ensureVisibilityInsideScrollArea@HbAbstractVkbHostPrivate@@QBEXXZ @ 8375 NONAME ; void HbAbstractVkbHostPrivate::ensureVisibilityInsideScrollArea(void) const + ?closeKeypadWithoutAnimation@HbAbstractVkbHostPrivate@@UAEXXZ @ 8376 NONAME ; void HbAbstractVkbHostPrivate::closeKeypadWithoutAnimation(void) + ?connectSignals@HbVkbHostContainerWidget@@QAEXPAVQObject@@@Z @ 8377 NONAME ; void HbVkbHostContainerWidget::connectSignals(class QObject *) + ?disconnectSignals@HbAbstractVkbHostPrivate@@UAEXXZ @ 8378 NONAME ; void HbAbstractVkbHostPrivate::disconnectSignals(void) + ?setPos@HbVkbHostContainerWidget@@QAEXVQPointF@@@Z @ 8379 NONAME ; void HbVkbHostContainerWidget::setPos(class QPointF) + ?q_func@HbAbstractVkbHostPrivate@@AAEPAVHbAbstractVkbHost@@XZ @ 8380 NONAME ; class HbAbstractVkbHost * HbAbstractVkbHostPrivate::q_func(void) + ??1HbVkbHostContainerWidget@@QAE@XZ @ 8381 NONAME ; HbVkbHostContainerWidget::~HbVkbHostContainerWidget(void) + ??0HbAbstractVkbHostPrivate@@QAE@PAVHbAbstractVkbHost@@PAVQObject@@@Z @ 8382 NONAME ; HbAbstractVkbHostPrivate::HbAbstractVkbHostPrivate(class HbAbstractVkbHost *, class QObject *) + ?_q_containerAboutToClose@HbAbstractVkbHostPrivate@@QAEXXZ @ 8383 NONAME ; void HbAbstractVkbHostPrivate::_q_containerAboutToClose(void) + ?prepareAnimations@HbAbstractVkbHostPrivate@@QAE_NW4HbVkbStatus@HbVkbHost@@@Z @ 8384 NONAME ; bool HbAbstractVkbHostPrivate::prepareAnimations(enum HbVkbHost::HbVkbStatus) + ??0HbVkbHostContainerWidget@@QAE@PAVQObject@@@Z @ 8385 NONAME ; HbVkbHostContainerWidget::HbVkbHostContainerWidget(class QObject *) + ?connectSignals@HbAbstractVkbHostPrivate@@UAEXXZ @ 8386 NONAME ; void HbAbstractVkbHostPrivate::connectSignals(void) + ?d_ptr@HbAbstractVkbHostPrivate@@CAPAV1@PAVHbAbstractVkbHost@@@Z @ 8387 NONAME ; class HbAbstractVkbHostPrivate * HbAbstractVkbHostPrivate::d_ptr(class HbAbstractVkbHost *) + ?prepareContainerAnimation@HbAbstractVkbHostPrivate@@UAE_NW4HbVkbStatus@HbVkbHost@@@Z @ 8388 NONAME ; bool HbAbstractVkbHostPrivate::prepareContainerAnimation(enum HbVkbHost::HbVkbStatus) + ?sceneBoundingRect@HbVkbHostContainerWidget@@QAE?AVQRectF@@XZ @ 8389 NONAME ; class QRectF HbVkbHostContainerWidget::sceneBoundingRect(void) + ?pos@HbVkbHostContainerWidget@@QAE?AVQPointF@@XZ @ 8390 NONAME ; class QPointF HbVkbHostContainerWidget::pos(void) + ?mainWindow@HbAbstractVkbHostPrivate@@QBEPAVHbMainWindow@@XZ @ 8391 NONAME ; class HbMainWindow * HbAbstractVkbHostPrivate::mainWindow(void) const + ?getViewAndFocusObjects@HbAbstractVkbHostPrivate@@QAE_NAAPAVHbView@@AAPAVHbInputFocusObject@@@Z @ 8392 NONAME ; bool HbAbstractVkbHostPrivate::getViewAndFocusObjects(class HbView * &, class HbInputFocusObject * &) + ?widgetObject@HbVkbHostContainerWidget@@QAEPAVQObject@@XZ @ 8393 NONAME ; class QObject * HbVkbHostContainerWidget::widgetObject(void) + ?screenSize@HbAbstractVkbHostPrivate@@QBE?AVQSizeF@@XZ @ 8394 NONAME ; class QSizeF HbAbstractVkbHostPrivate::screenSize(void) const + ??1HbAbstractVkbHostPrivate@@UAE@XZ @ 8395 NONAME ; HbAbstractVkbHostPrivate::~HbAbstractVkbHostPrivate(void) + ?setTitleAndStatusBarVisible@HbAbstractVkbHostPrivate@@QAEX_N@Z @ 8396 NONAME ; void HbAbstractVkbHostPrivate::setTitleAndStatusBarVisible(bool) + ?disableCursorShift@HbAbstractVkbHostPrivate@@QAE_NXZ @ 8397 NONAME ; bool HbAbstractVkbHostPrivate::disableCursorShift(void) + ?disconnectSignals@HbVkbHostContainerWidget@@QAEXPAVQObject@@@Z @ 8398 NONAME ; void HbVkbHostContainerWidget::disconnectSignals(class QObject *) + ?prepareKeypadAnimation@HbAbstractVkbHostPrivate@@UAE_NW4HbVkbStatus@HbVkbHost@@@Z @ 8399 NONAME ; bool HbAbstractVkbHostPrivate::prepareKeypadAnimation(enum HbVkbHost::HbVkbStatus) + ??_EHbAbstractVkbHostPrivate@@UAE@I@Z @ 8400 NONAME ; HbAbstractVkbHostPrivate::~HbAbstractVkbHostPrivate(unsigned int) + ?q_func@HbAbstractVkbHostPrivate@@ABEPBVHbAbstractVkbHost@@XZ @ 8401 NONAME ; class HbAbstractVkbHost const * HbAbstractVkbHostPrivate::q_func(void) const + ?getViewFlagsForVisibilityChange@HbAbstractVkbHostPrivate@@UAEXAAV?$QFlags@W4HbViewFlag@HbView@@@@_NPAVHbView@@@Z @ 8402 NONAME ; void HbAbstractVkbHostPrivate::getViewFlagsForVisibilityChange(class QFlags &, bool, class HbView *) + ?openKeypad@HbAbstractVkbHostPrivate@@UAEXXZ @ 8403 NONAME ; void HbAbstractVkbHostPrivate::openKeypad(void) + ?closeKeypad@HbAbstractVkbHostPrivate@@UAEXXZ @ 8404 NONAME ; void HbAbstractVkbHostPrivate::closeKeypad(void) + ?cancelAnimationAndHideVkbWidget@HbAbstractVkbHostPrivate@@UAEXXZ @ 8405 NONAME ; void HbAbstractVkbHostPrivate::cancelAnimationAndHideVkbWidget(void) + ?prepareAnimationsCommon@HbAbstractVkbHostPrivate@@QAEXXZ @ 8406 NONAME ; void HbAbstractVkbHostPrivate::prepareAnimationsCommon(void) + ?startClockTimer@HbStatusBar@@AAEXXZ @ 8407 NONAME ; void HbStatusBar::startClockTimer(void) + ?chargingEvent@HbBatteryIndicator@@QAEX_N@Z @ 8408 NONAME ; void HbBatteryIndicator::chargingEvent(bool) + ?eventFilter@HbStatusBar@@MAE_NPAVQObject@@PAVQEvent@@@Z @ 8409 NONAME ; bool HbStatusBar::eventFilter(class QObject *, class QEvent *) + ?languageRegionMappings@HbLocaleUtil@@SA?AV?$QList@UHbLanguageRegionMapping@@@@_N@Z @ 8410 NONAME ; class QList HbLocaleUtil::languageRegionMappings(bool) diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/defs/eabi/HbCoreu.def --- a/src/hbcore/defs/eabi/HbCoreu.def Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/defs/eabi/HbCoreu.def Mon Oct 04 00:38:12 2010 +0300 @@ -2012,18 +2012,18 @@ _ZN25HbLayoutDirectionNotifierD0Ev @ 2011 NONAME _ZN25HbLayoutDirectionNotifierD1Ev @ 2012 NONAME _ZN25HbLayoutDirectionNotifierD2Ev @ 2013 NONAME - _ZN25HbStyleOptionGridViewItemC1ERKS_ @ 2014 NONAME - _ZN25HbStyleOptionGridViewItemC1Ev @ 2015 NONAME - _ZN25HbStyleOptionGridViewItemC2ERKS_ @ 2016 NONAME - _ZN25HbStyleOptionGridViewItemC2Ev @ 2017 NONAME - _ZN25HbStyleOptionGridViewItemD1Ev @ 2018 NONAME - _ZN25HbStyleOptionGridViewItemD2Ev @ 2019 NONAME - _ZN25HbStyleOptionListViewItemC1ERKS_ @ 2020 NONAME - _ZN25HbStyleOptionListViewItemC1Ev @ 2021 NONAME - _ZN25HbStyleOptionListViewItemC2ERKS_ @ 2022 NONAME - _ZN25HbStyleOptionListViewItemC2Ev @ 2023 NONAME - _ZN25HbStyleOptionListViewItemD1Ev @ 2024 NONAME - _ZN25HbStyleOptionListViewItemD2Ev @ 2025 NONAME + _ZN25HbStyleOptionGridViewItemC1ERKS_ @ 2014 NONAME ABSENT + _ZN25HbStyleOptionGridViewItemC1Ev @ 2015 NONAME ABSENT + _ZN25HbStyleOptionGridViewItemC2ERKS_ @ 2016 NONAME ABSENT + _ZN25HbStyleOptionGridViewItemC2Ev @ 2017 NONAME ABSENT + _ZN25HbStyleOptionGridViewItemD1Ev @ 2018 NONAME ABSENT + _ZN25HbStyleOptionGridViewItemD2Ev @ 2019 NONAME ABSENT + _ZN25HbStyleOptionListViewItemC1ERKS_ @ 2020 NONAME ABSENT + _ZN25HbStyleOptionListViewItemC1Ev @ 2021 NONAME ABSENT + _ZN25HbStyleOptionListViewItemC2ERKS_ @ 2022 NONAME ABSENT + _ZN25HbStyleOptionListViewItemC2Ev @ 2023 NONAME ABSENT + _ZN25HbStyleOptionListViewItemD1Ev @ 2024 NONAME ABSENT + _ZN25HbStyleOptionListViewItemD2Ev @ 2025 NONAME ABSENT _ZN25HbStyleOptionProgressNoteC1ERKS_ @ 2026 NONAME ABSENT _ZN25HbStyleOptionProgressNoteC1Ev @ 2027 NONAME ABSENT _ZN25HbStyleOptionProgressNoteC2ERKS_ @ 2028 NONAME ABSENT @@ -2036,12 +2036,12 @@ _ZN25HbStyleOptionSettingGroupC2Ev @ 2035 NONAME ABSENT _ZN25HbStyleOptionSettingGroupD1Ev @ 2036 NONAME ABSENT _ZN25HbStyleOptionSettingGroupD2Ev @ 2037 NONAME ABSENT - _ZN25HbStyleOptionTreeViewItemC1ERKS_ @ 2038 NONAME - _ZN25HbStyleOptionTreeViewItemC1Ev @ 2039 NONAME - _ZN25HbStyleOptionTreeViewItemC2ERKS_ @ 2040 NONAME - _ZN25HbStyleOptionTreeViewItemC2Ev @ 2041 NONAME - _ZN25HbStyleOptionTreeViewItemD1Ev @ 2042 NONAME - _ZN25HbStyleOptionTreeViewItemD2Ev @ 2043 NONAME + _ZN25HbStyleOptionTreeViewItemC1ERKS_ @ 2038 NONAME ABSENT + _ZN25HbStyleOptionTreeViewItemC1Ev @ 2039 NONAME ABSENT + _ZN25HbStyleOptionTreeViewItemC2ERKS_ @ 2040 NONAME ABSENT + _ZN25HbStyleOptionTreeViewItemC2Ev @ 2041 NONAME ABSENT + _ZN25HbStyleOptionTreeViewItemD1Ev @ 2042 NONAME ABSENT + _ZN25HbStyleOptionTreeViewItemD2Ev @ 2043 NONAME ABSENT _ZN25HbWidgetParams_PushButtonC1Ev @ 2044 NONAME ABSENT _ZN25HbWidgetParams_PushButtonC2Ev @ 2045 NONAME ABSENT _ZN25HbWidgetParams_PushButtonD0Ev @ 2046 NONAME ABSENT @@ -2181,12 +2181,12 @@ _ZN28HbInputStateMachineHKChinese9nextStateERK12HbInputStateRS0_20HbInputStateModifier @ 2180 NONAME ABSENT _ZN29HbInputStateMachinePrcChinese8instanceEv @ 2181 NONAME ABSENT _ZN29HbInputStateMachinePrcChinese9nextStateERK12HbInputStateRS0_20HbInputStateModifier @ 2182 NONAME ABSENT - _ZN29HbStyleOptionAbstractViewItemC1ERKS_ @ 2183 NONAME - _ZN29HbStyleOptionAbstractViewItemC1Ev @ 2184 NONAME - _ZN29HbStyleOptionAbstractViewItemC2ERKS_ @ 2185 NONAME - _ZN29HbStyleOptionAbstractViewItemC2Ev @ 2186 NONAME - _ZN29HbStyleOptionAbstractViewItemD1Ev @ 2187 NONAME - _ZN29HbStyleOptionAbstractViewItemD2Ev @ 2188 NONAME + _ZN29HbStyleOptionAbstractViewItemC1ERKS_ @ 2183 NONAME ABSENT + _ZN29HbStyleOptionAbstractViewItemC1Ev @ 2184 NONAME ABSENT + _ZN29HbStyleOptionAbstractViewItemC2ERKS_ @ 2185 NONAME ABSENT + _ZN29HbStyleOptionAbstractViewItemC2Ev @ 2186 NONAME ABSENT + _ZN29HbStyleOptionAbstractViewItemD1Ev @ 2187 NONAME ABSENT + _ZN29HbStyleOptionAbstractViewItemD2Ev @ 2188 NONAME ABSENT _ZN29HbStyleOptionSelectionControlC1ERKS_ @ 2189 NONAME ABSENT _ZN29HbStyleOptionSelectionControlC1Ev @ 2190 NONAME ABSENT _ZN29HbStyleOptionSelectionControlC2ERKS_ @ 2191 NONAME ABSENT @@ -2262,7 +2262,7 @@ _ZN5HbCss14ValueExtractor6asBoolERKNS_11DeclarationE @ 2261 NONAME ABSENT _ZN5HbCss14ValueExtractor6asRealERKNS_11DeclarationE @ 2262 NONAME ABSENT _ZN5HbCss14ValueExtractor6asRealERKNS_5ValueE @ 2263 NONAME ABSENT - _ZN5HbCss14ValueExtractor7asRealsERKNS_11DeclarationEPf @ 2264 NONAME + _ZN5HbCss14ValueExtractor7asRealsERKNS_11DeclarationEPf @ 2264 NONAME ABSENT _ZN5HbCss14ValueExtractor8asPolicyERKNS_5ValueE @ 2265 NONAME ABSENT _ZN5HbCss14ValueExtractor9sizeValueERKNS_11DeclarationE @ 2266 NONAME ABSENT _ZN5HbCss14ValueExtractorC1ERK7QVectorINS_11DeclarationEERK15HbDeviceProfileRK8QPalette @ 2267 NONAME ABSENT @@ -4940,7 +4940,7 @@ _ZN29HbIconAnimationManagerPrivateD2Ev @ 4936 NONAME _ZN5HbCss14ValueExtractor15extractPositionEPfS1_S1_S1_S1_S1_PNS_6OriginEP6QFlagsIN2Qt13AlignmentFlagEEPNS_12PositionModeES8_PbS1_PS4_INS_16PositionAttrFlagEE @ 4937 NONAME ABSENT _ZN5HbCss14ValueExtractor17extractTextValuesERNS0_10TextValuesE @ 4938 NONAME ABSENT - _ZN5HbCss6Parser20addRuleToWidgetStackEPNS_10StyleSheetERK7QStringRNS_9StyleRuleE @ 4939 NONAME + _ZN5HbCss6Parser20addRuleToWidgetStackEPNS_10StyleSheetERK7QStringRNS_9StyleRuleE @ 4939 NONAME ABSENT _ZN7HbStyle18updateThemedParamsEP8HbWidget @ 4940 NONAME _ZN8HbEffect3addEP13QGraphicsItemRK11QStringListS4_ @ 4941 NONAME _ZN8HbEffect3addERK11QStringListS2_S2_ @ 4942 NONAME @@ -5202,7 +5202,7 @@ _ZN29HbTapAndHoldGestureRecognizer9recognizeEP8QGestureP7QObjectP6QEvent @ 5198 NONAME _ZN29HbTapAndHoldGestureRecognizerC1Ev @ 5199 NONAME _ZN29HbTapAndHoldGestureRecognizerC2Ev @ 5200 NONAME - _ZN5HbCss14ValueExtractor22extractExpressionValueER7QStringRf @ 5201 NONAME + _ZN5HbCss14ValueExtractor22extractExpressionValueER7QStringRf @ 5201 NONAME ABSENT _ZN5HbCss14ValueExtractor6asRealER7QStringNS_5Value4TypeE @ 5202 NONAME ABSENT _ZN5HbCss14ValueExtractor6asRealER7QStringRf @ 5203 NONAME ABSENT _ZN6HbMenu4execEP8HbAction @ 5204 NONAME ABSENT @@ -5679,12 +5679,12 @@ _ZN26HbDeviceDialogServerStatusD0Ev @ 5675 NONAME _ZN26HbDeviceDialogServerStatusD1Ev @ 5676 NONAME _ZN26HbDeviceDialogServerStatusD2Ev @ 5677 NONAME - _ZN26HbStyleOptionIndexFeedbackC1ERKS_ @ 5678 NONAME - _ZN26HbStyleOptionIndexFeedbackC1Ev @ 5679 NONAME - _ZN26HbStyleOptionIndexFeedbackC2ERKS_ @ 5680 NONAME - _ZN26HbStyleOptionIndexFeedbackC2Ev @ 5681 NONAME - _ZN26HbStyleOptionIndexFeedbackD1Ev @ 5682 NONAME - _ZN26HbStyleOptionIndexFeedbackD2Ev @ 5683 NONAME + _ZN26HbStyleOptionIndexFeedbackC1ERKS_ @ 5678 NONAME ABSENT + _ZN26HbStyleOptionIndexFeedbackC1Ev @ 5679 NONAME ABSENT + _ZN26HbStyleOptionIndexFeedbackC2ERKS_ @ 5680 NONAME ABSENT + _ZN26HbStyleOptionIndexFeedbackC2Ev @ 5681 NONAME ABSENT + _ZN26HbStyleOptionIndexFeedbackD1Ev @ 5682 NONAME ABSENT + _ZN26HbStyleOptionIndexFeedbackD2Ev @ 5683 NONAME ABSENT _ZN27HbDeviceProfileChangedEventC1ERK15HbDeviceProfileS2_ @ 5684 NONAME _ZN27HbDeviceProfileChangedEventC2ERK15HbDeviceProfileS2_ @ 5685 NONAME _ZN27HbDeviceProfileChangedEventD0Ev @ 5686 NONAME @@ -6473,9 +6473,9 @@ _ZN17HbIndicatorButton19delayedConstructionEv @ 6468 NONAME _ZN17HbPanGestureLogic12isMouseEventEN6QEvent4TypeE @ 6469 NONAME _ZN17HbPanGestureLogic12resetGestureEP12HbPanGesture @ 6470 NONAME - _ZN17HbPanGestureLogic15handleMouseMoveEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEvent @ 6471 NONAME - _ZN17HbPanGestureLogic16handleMousePressEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEvent @ 6472 NONAME - _ZN17HbPanGestureLogic18handleMouseReleaseEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEvent @ 6473 NONAME + _ZN17HbPanGestureLogic15handleMouseMoveEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEvent @ 6471 NONAME ABSENT + _ZN17HbPanGestureLogic16handleMousePressEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEvent @ 6472 NONAME ABSENT + _ZN17HbPanGestureLogic18handleMouseReleaseEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEvent @ 6473 NONAME ABSENT _ZN17HbPanGestureLogic9recognizeEN2Qt12GestureStateEP12HbPanGestureP7QObjectP6QEvent @ 6474 NONAME ABSENT _ZN17HbPanGestureLogicC1Ev @ 6475 NONAME _ZN17HbPanGestureLogicC2Ev @ 6476 NONAME @@ -6529,8 +6529,8 @@ _ZN19HbSleepModeListenerD2Ev @ 6524 NONAME _ZN19HbSwipeGestureLogic12isMouseEventEN6QEvent4TypeE @ 6525 NONAME _ZN19HbSwipeGestureLogic12resetGestureEP14HbSwipeGesture @ 6526 NONAME - _ZN19HbSwipeGestureLogic16handleMousePressEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEvent @ 6527 NONAME - _ZN19HbSwipeGestureLogic18handleMouseReleaseEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEvent @ 6528 NONAME + _ZN19HbSwipeGestureLogic16handleMousePressEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEvent @ 6527 NONAME ABSENT + _ZN19HbSwipeGestureLogic18handleMouseReleaseEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEvent @ 6528 NONAME ABSENT _ZN19HbSwipeGestureLogic9recognizeEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP6QEvent @ 6529 NONAME ABSENT _ZN19HbSwipeGestureLogicC1Ev @ 6530 NONAME _ZN19HbSwipeGestureLogicC2Ev @ 6531 NONAME @@ -6539,8 +6539,8 @@ _ZN19HbTapAndHoldGesture16setScenePositionERK7QPointF @ 6534 NONAME _ZN19HbTapAndHoldGestureC1EP26HbTapAndHoldGesturePrivateP7QObject @ 6535 NONAME _ZN19HbTapAndHoldGestureC2EP26HbTapAndHoldGesturePrivateP7QObject @ 6536 NONAME - _ZN19HbTapGesturePrivateC1Ev @ 6537 NONAME - _ZN19HbTapGesturePrivateC2Ev @ 6538 NONAME + _ZN19HbTapGesturePrivateC1Ev @ 6537 NONAME ABSENT + _ZN19HbTapGesturePrivateC2Ev @ 6538 NONAME ABSENT _ZN19HbThemeSystemEffect11qt_metacallEN11QMetaObject4CallEiPPv @ 6539 NONAME _ZN19HbThemeSystemEffect11qt_metacastEPKc @ 6540 NONAME _ZN19HbThemeSystemEffect12parseEffectsER16QXmlStreamReader @ 6541 NONAME ABSENT @@ -6691,8 +6691,8 @@ _ZNK19HbThemeSystemEffect19validApplicationUidERK7QString @ 6686 NONAME ABSENT _ZNK19HbThemeSystemEffect20getThemeEffectFolderER7QStringRKS0_ @ 6687 NONAME ABSENT _ZNK19HbThemeSystemEffect20idFromEffectIdStringERK7QString @ 6688 NONAME ABSENT - _ZNK20HbVelocityCalculator18calculate_velocityERK15HbPointRecorderRK5QTime @ 6689 NONAME - _ZNK20HbVelocityCalculator8velocityERK5QTime @ 6690 NONAME + _ZNK20HbVelocityCalculator18calculate_velocityERK15HbPointRecorderRK5QTime @ 6689 NONAME ABSENT + _ZNK20HbVelocityCalculator8velocityERK5QTime @ 6690 NONAME ABSENT _ZTI14HbPinchGesture @ 6691 NONAME _ZTI15HbVkbHostBridge @ 6692 NONAME _ZTI17HbPanGestureLogic @ 6693 NONAME @@ -6727,10 +6727,10 @@ _ZN13HbXmlVariableC2Ev @ 6722 NONAME _ZN13HbXmlVariableD1Ev @ 6723 NONAME _ZN13HbXmlVariableD2Ev @ 6724 NONAME - _ZN14HbLanguageUtil12allLanguagesEv @ 6725 NONAME - _ZN14HbLanguageUtil14changeLanguageEi @ 6726 NONAME - _ZN14HbLanguageUtil15currentLanguageEv @ 6727 NONAME - _ZN14HbLanguageUtil18supportedLanguagesEv @ 6728 NONAME + _ZN14HbLanguageUtil12allLanguagesEv @ 6725 NONAME ABSENT + _ZN14HbLanguageUtil14changeLanguageEi @ 6726 NONAME ABSENT + _ZN14HbLanguageUtil15currentLanguageEv @ 6727 NONAME ABSENT + _ZN14HbLanguageUtil18supportedLanguagesEv @ 6728 NONAME ABSENT _ZN14HbPopupPrivate14calculateShapeEv @ 6729 NONAME _ZN14HbSplashScreen11setScreenIdERK7QString @ 6730 NONAME _ZN14HbSplashScreen8setAppIdERK7QString @ 6731 NONAME @@ -7614,6 +7614,7 @@ _ZN28HbContinuousInteractionEventD0Ev @ 7609 NONAME _ZN28HbContinuousInteractionEventD1Ev @ 7610 NONAME _ZN28HbContinuousInteractionEventD2Ev @ 7611 NONAME + _ZN5HbCss13StyleSelector13addStyleSheetEPNS_10StyleSheetE @ 7612 NONAME _ZN5HbCss13StyleSelector16removeStyleSheetEPNS_10StyleSheetE @ 7613 NONAME _ZN5HbCss13StyleSelectorC2ERKS0_ @ 7614 NONAME @@ -7734,15 +7735,15 @@ _ZNK24HbIndicatorPluginManager10metaObjectEv @ 7729 NONAME _ZNK24HbIndicatorPluginManager18statusAreaIconPathEPK20HbIndicatorInterface @ 7730 NONAME _ZNK24HbIndicatorPluginManager23indicatorClientInfoListEv @ 7731 NONAME - _ZNK5HbCss13StyleSelector10matchRulesENS0_7NodePtrERK8HbVectorINS_9StyleRuleEENS_16StyleSheetOriginEiP7QVectorI5QPairIiS3_EEb @ 7732 NONAME - _ZNK5HbCss13StyleSelector15selectorMatchesERKNS_8SelectorENS0_7NodePtrEb @ 7733 NONAME + _ZNK5HbCss13StyleSelector10matchRulesENS0_7NodePtrERK8HbVectorINS_9StyleRuleEENS_16StyleSheetOriginEiP7QVectorI5QPairIiS3_EEb @ 7732 NONAME ABSENT + _ZNK5HbCss13StyleSelector15selectorMatchesERKNS_8SelectorENS0_7NodePtrEb @ 7733 NONAME ABSENT _ZNK5HbCss13StyleSelector16inheritanceDepthENS0_7NodePtrER8HbString @ 7734 NONAME _ZNK5HbCss13StyleSelector16variableRuleSetsEP5QHashI7QStringNS_11DeclarationEE @ 7735 NONAME ABSENT _ZNK5HbCss13StyleSelector17styleRulesForNodeENS0_7NodePtrEN2Qt11OrientationE @ 7736 NONAME _ZNK5HbCss13StyleSelector19declarationsForNodeENS0_7NodePtrEN2Qt11OrientationEPKc @ 7737 NONAME - _ZNK5HbCss13StyleSelector20basicSelectorMatchesERKNS_13BasicSelectorENS0_7NodePtrEb @ 7738 NONAME - _ZNK5HbCss13StyleSelector25weightedStyleRulesForNodeENS0_7NodePtrEN2Qt11OrientationE @ 7739 NONAME - _ZNK5HbCss13StyleSelector27weightedDeclarationsForNodeENS0_7NodePtrEN2Qt11OrientationEPKc @ 7740 NONAME + _ZNK5HbCss13StyleSelector20basicSelectorMatchesERKNS_13BasicSelectorENS0_7NodePtrEb @ 7738 NONAME ABSENT + _ZNK5HbCss13StyleSelector25weightedStyleRulesForNodeENS0_7NodePtrEN2Qt11OrientationE @ 7739 NONAME ABSENT + _ZNK5HbCss13StyleSelector27weightedDeclarationsForNodeENS0_7NodePtrEN2Qt11OrientationEPKc @ 7740 NONAME ABSENT _ZNK5HbCss13StyleSelector32hasOrientationSpecificStyleRulesENS0_7NodePtrE @ 7741 NONAME _ZTI10HbMenuItem @ 7742 NONAME @@ -8009,12 +8010,12 @@ _ZN12HbThemeUtils21saveBaseThemeSettingsER11HbThemeInfoRK7QStringS4_ @ 8003 NONAME ABSENT _ZN12HbThemeUtils22getBaseThemeFromCenRepERK7QString @ 8004 NONAME ABSENT _ZN15HbPointRecorder13resetRecorderEf @ 8005 NONAME - _ZN15HbPointRecorder6recordEfRK5QTime @ 8006 NONAME - _ZN17HbPanGestureLogic9recognizeEN2Qt12GestureStateEP12HbPanGestureP7QObjectP6QEvent5QTime @ 8007 NONAME - _ZN19HbSwipeGestureLogic15handleMouseMoveEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEvent @ 8008 NONAME - _ZN19HbSwipeGestureLogic9recognizeEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP6QEvent5QTime @ 8009 NONAME + _ZN15HbPointRecorder6recordEfRK5QTime @ 8006 NONAME ABSENT + _ZN17HbPanGestureLogic9recognizeEN2Qt12GestureStateEP12HbPanGestureP7QObjectP6QEvent5QTime @ 8007 NONAME ABSENT + _ZN19HbSwipeGestureLogic15handleMouseMoveEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEvent @ 8008 NONAME ABSENT + _ZN19HbSwipeGestureLogic9recognizeEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP6QEvent5QTime @ 8009 NONAME ABSENT _ZNK15HbPointRecorder14getLastRecordsEi @ 8010 NONAME - _ZNK15HbPointRecorderixEi @ 8011 NONAME + _ZNK15HbPointRecorderixEi @ 8011 NONAME ABSENT _ZN12HbIconLoader19switchRenderingModeE15HbRenderingMode @ 8012 NONAME _ZN12HbIconLoader19updateRenderingModeEN12QPaintEngine4TypeE @ 8013 NONAME _ZN12HbIconLoader26getMultiIconImplFromServerER11QStringListR7QVectorI6QSizeFEN2Qt15AspectRatioModeEN5QIcon4ModeEbb6QFlagsINS_16IconLoaderOptionEERK6QColorNS_12IconDataTypeENS_7PurposeERS2_IP10HbIconImplE15HbRenderingMode @ 8014 NONAME ABSENT @@ -8098,13 +8099,13 @@ _ZN12HbMainWindow9showEventEP10QShowEvent @ 8092 NONAME _ZN17HbStyleParameters3keyEi @ 8093 NONAME _ZN17HbStyleParameters4keysEv @ 8094 NONAME - _ZN5HbCss14ValueExtractor13extractLayoutER7QStringS2_ @ 8095 NONAME - _ZN5HbCss14ValueExtractor20extractVariableValueERK7QStringRf @ 8096 NONAME - _ZN5HbCss14ValueExtractor22extractKnownPropertiesERNS_15KnownPropertiesE @ 8097 NONAME - _ZN5HbCss14ValueExtractor23extractCustomPropertiesERK5QListI7QStringERS1_I8QVariantE @ 8098 NONAME - _ZN5HbCss14ValueExtractor6asRealER7QStringNS_5Value4TypeEPb @ 8099 NONAME - _ZN5HbCss14ValueExtractor6asRealERKNS_11DeclarationEPb @ 8100 NONAME - _ZN5HbCss14ValueExtractor6asRealERKNS_5ValueEPb @ 8101 NONAME + _ZN5HbCss14ValueExtractor13extractLayoutER7QStringS2_ @ 8095 NONAME ABSENT + _ZN5HbCss14ValueExtractor20extractVariableValueERK7QStringRf @ 8096 NONAME ABSENT + _ZN5HbCss14ValueExtractor22extractKnownPropertiesERNS_15KnownPropertiesE @ 8097 NONAME ABSENT + _ZN5HbCss14ValueExtractor23extractCustomPropertiesERK5QListI7QStringERS1_I8QVariantE @ 8098 NONAME ABSENT + _ZN5HbCss14ValueExtractor6asRealER7QStringNS_5Value4TypeEPb @ 8099 NONAME ABSENT + _ZN5HbCss14ValueExtractor6asRealERKNS_11DeclarationEPb @ 8100 NONAME ABSENT + _ZN5HbCss14ValueExtractor6asRealERKNS_5ValueEPb @ 8101 NONAME ABSENT _ZN5HbCss14ValueExtractorC1ERK8HbVectorINS_11DeclarationEERK15HbDeviceProfile @ 8102 NONAME _ZN5HbCss14ValueExtractorC1ERK8HbVectorINS_11DeclarationEERK5QHashI7QStringS2_ERK15HbDeviceProfile @ 8103 NONAME ABSENT _ZN5HbCss14ValueExtractorC2ERK8HbVectorINS_11DeclarationEERK15HbDeviceProfile @ 8104 NONAME @@ -8679,10 +8680,10 @@ _ZN12HbThemeIndex11getItemDataEj @ 8673 NONAME _ZN20HbThemeIndexResourceC1Ej @ 8674 NONAME _ZN20HbThemeIndexResourceC2Ej @ 8675 NONAME - _ZN5HbCss14ValueExtractor20extractVariableValueEjRf @ 8676 NONAME + _ZN5HbCss14ValueExtractor20extractVariableValueEjRf @ 8676 NONAME ABSENT _ZN5HbCss14ValueExtractorC1ERK15HbDeviceProfile @ 8677 NONAME _ZN5HbCss14ValueExtractorC2ERK15HbDeviceProfile @ 8678 NONAME - _ZNK14HbStylePrivate22parameterFromHashValueEjRfRK15HbDeviceProfile @ 8679 NONAME + _ZNK14HbStylePrivate22parameterFromHashValueEjRfRK15HbDeviceProfile @ 8679 NONAME ABSENT _ZNK18HbLayoutParameters4findEj @ 8680 NONAME _ZNK20HbLayeredStyleLoader16variableRuleSetsEP5QHashIjN5HbCss11DeclarationEE @ 8681 NONAME _ZNK5HbCss13StyleSelector16variableRuleSetsEP5QHashIjNS_11DeclarationEE @ 8682 NONAME @@ -8692,4 +8693,113 @@ _ZN16HbPixmapIconImplC2E16HbSharedIconInfoRK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb15HbRenderingMode @ 8686 NONAME _ZN16HbPixmapIconImplC2ERK7QPixmapRK7QStringRK6QSizeFN2Qt15AspectRatioModeEN5QIcon4ModeEb @ 8687 NONAME _ZN17HbIconImplCreator14createIconImplERK7QPixmapR19HbIconLoadingParams @ 8688 NONAME + _ZN12HbIconLoader19themeChangeFinishedEv @ 8689 NONAME + _ZN14HbPopupPrivate22_q_maskEffectDestroyedEv @ 8690 NONAME + _ZN23HbXmlLoaderBinarySyntax18parseSetBackgroundEv @ 8691 NONAME + _ZN24HbXmlLoaderBinaryActions13setBackgroundERK7QStringN13HbFrameDrawer9FrameTypeE @ 8692 NONAME + _ZN26HbXmlLoaderAbstractActions13setBackgroundERK7QStringN13HbFrameDrawer9FrameTypeE @ 8693 NONAME + _ZN17HbPanGestureLogic12isTouchEventEN6QEvent4TypeE @ 8694 NONAME + _ZN17HbPanGestureLogic14handleTouchEndEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QTouchEvent @ 8695 NONAME ABSENT + _ZN17HbPanGestureLogic15handleTouchMoveEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QTouchEvent @ 8696 NONAME ABSENT + _ZN17HbPanGestureLogic16handleTouchBeginEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QTouchEvent @ 8697 NONAME ABSENT + _ZN17HbPanGestureLogic23followedTouchPointIndexEP11QTouchEventP12HbPanGesture @ 8698 NONAME + _ZN17HbPanGestureLogic9getNextIdEP11QTouchEvent @ 8699 NONAME + _ZN6HbMenu15setPreferredPosERK7QPointFN7HbPopup9PlacementE @ 8700 NONAME + _ZNK18HbInputFocusObject14editorPriorityEv @ 8701 NONAME + _ZN19HbScrollAreaPrivate24_q_thumbPositionChanged2Efi @ 8702 NONAME + _ZN5HbCss6Parser20addRuleToWidgetStackEPNS_10StyleSheetEjRNS_9StyleRuleE @ 8703 NONAME + _ZNK5HbCss13StyleSelector10matchRulesENS0_7NodePtrERK8HbVectorINS_9StyleRuleEENS_16StyleSheetOriginEiP5QListI5QPairIiS3_EEP4QSetIS1_Eb @ 8704 NONAME + _ZNK5HbCss13StyleSelector15selectorMatchesERKNS_8SelectorENS0_7NodePtrEP4QSetIS4_Eb @ 8705 NONAME + _ZNK5HbCss13StyleSelector20basicSelectorMatchesERKNS_13BasicSelectorENS0_7NodePtrEP4QSetIS4_Eb @ 8706 NONAME + _ZNK5HbCss13StyleSelector25weightedStyleRulesForNodeENS0_7NodePtrEN2Qt11OrientationEP5QListI5QPairIiNS_9StyleRuleEEE @ 8707 NONAME + _ZNK5HbCss13StyleSelector27weightedDeclarationsForNodeENS0_7NodePtrEN2Qt11OrientationEP5QListI5QPairIiNS_11DeclarationEEEPKc @ 8708 NONAME + _ZN16HbEffectInternal3addEPPKcS2_S2_i @ 8709 NONAME + _ZN18HbExpressionParser5parseERK7QStringR5QListIiE @ 8710 NONAME + _ZN18HbExpressionParser7toFixedEd @ 8711 NONAME + _ZN18HbExpressionParser7toFixedEf @ 8712 NONAME + _ZN18HbExpressionParser9fromFixedEi @ 8713 NONAME + _ZN9HbVariant15fillIntListDataERK5QListIiE @ 8714 NONAME + _ZN9HbVariantC1ERK5QListIiEN15HbMemoryManager10MemoryTypeE @ 8715 NONAME + _ZN9HbVariantC2ERK5QListIiEN15HbMemoryManager10MemoryTypeE @ 8716 NONAME + _ZN9HbVariantaSERK5QListIiE @ 8717 NONAME + _ZNK14HbStylePrivate15valueFromTokensERK5QListIiERfRK15HbDeviceProfile @ 8718 NONAME + _ZNK5HbCss14ValueExtractor13extractLayoutER7QStringS2_ @ 8719 NONAME + _ZNK5HbCss14ValueExtractor20extractVariableValueERK7QStringRf @ 8720 NONAME + _ZNK5HbCss14ValueExtractor20extractVariableValueEjRf @ 8721 NONAME + _ZNK5HbCss14ValueExtractor22extractExpressionValueERK5QListIiERf @ 8722 NONAME + _ZNK5HbCss14ValueExtractor22extractExpressionValueERK7QStringRf @ 8723 NONAME + _ZNK5HbCss14ValueExtractor22extractKnownPropertiesERNS_15KnownPropertiesE @ 8724 NONAME + _ZNK5HbCss14ValueExtractor23extractCustomPropertiesERK5QListI7QStringERS1_I8QVariantE @ 8725 NONAME + _ZNK5HbCss14ValueExtractor6asRealER7QStringNS_5Value4TypeEPb @ 8726 NONAME + _ZNK5HbCss14ValueExtractor6asRealERKNS_11DeclarationEPb @ 8727 NONAME + _ZNK5HbCss14ValueExtractor6asRealERKNS_5ValueEPb @ 8728 NONAME + _ZNK5HbCss14ValueExtractor6asRealEiN18HbExpressionParser5TokenERb @ 8729 NONAME + _ZNK5HbCss14ValueExtractor7asRealsERKNS_11DeclarationEPf @ 8730 NONAME + _ZNK9HbVariant9toIntListEv @ 8731 NONAME + _ZN15HbPointRecorder6recordEfx @ 8732 NONAME + _ZN17HbPanGestureLogic14handleTouchEndEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QTouchEventx @ 8733 NONAME + _ZN17HbPanGestureLogic15handleMouseMoveEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEventx @ 8734 NONAME + _ZN17HbPanGestureLogic15handleTouchMoveEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QTouchEventx @ 8735 NONAME + _ZN17HbPanGestureLogic16handleMousePressEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEventx @ 8736 NONAME + _ZN17HbPanGestureLogic16handleTouchBeginEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QTouchEventx @ 8737 NONAME + _ZN17HbPanGestureLogic18handleMouseReleaseEN2Qt12GestureStateEP12HbPanGestureP7QObjectP11QMouseEventx @ 8738 NONAME + _ZN17HbPanGestureLogic9recognizeEN2Qt12GestureStateEP12HbPanGestureP7QObjectP6QEventx @ 8739 NONAME + _ZN19HbSwipeGestureLogic15handleMouseMoveEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEventx @ 8740 NONAME + _ZN19HbSwipeGestureLogic16handleMousePressEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEventx @ 8741 NONAME + _ZN19HbSwipeGestureLogic18handleMouseReleaseEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP11QMouseEventx @ 8742 NONAME + _ZN19HbSwipeGestureLogic9recognizeEN2Qt12GestureStateEP14HbSwipeGestureP7QObjectP6QEventx @ 8743 NONAME + _ZNK20HbVelocityCalculator18calculate_velocityERK15HbPointRecorderx @ 8744 NONAME + _ZNK20HbVelocityCalculator8velocityEx @ 8745 NONAME + _ZN17HbGlobalStatusBar11qt_metacallEN11QMetaObject4CallEiPPv @ 8746 NONAME + _ZN17HbGlobalStatusBar11qt_metacastEPKc @ 8747 NONAME + _ZN17HbGlobalStatusBar16staticMetaObjectE @ 8748 NONAME DATA 16 + _ZN17HbGlobalStatusBar19getStaticMetaObjectEv @ 8749 NONAME + _ZN17HbGlobalStatusBar7changedEv @ 8750 NONAME + _ZN17HbGlobalStatusBar8getImageEN2Qt11OrientationE @ 8751 NONAME + _ZN17HbGlobalStatusBarC1EP7QObject @ 8752 NONAME + _ZN17HbGlobalStatusBarC2EP7QObject @ 8753 NONAME + _ZN17HbGlobalStatusBarD0Ev @ 8754 NONAME + _ZN17HbGlobalStatusBarD1Ev @ 8755 NONAME + _ZN17HbGlobalStatusBarD2Ev @ 8756 NONAME + _ZNK17HbGlobalStatusBar10metaObjectEv @ 8757 NONAME + _ZTI17HbGlobalStatusBar @ 8758 NONAME + _ZTV17HbGlobalStatusBar @ 8759 NONAME + _ZN13HbApplication19startedToBackgroundEv @ 8760 NONAME + _ZN24HbAbstractVkbHostPrivate10openKeypadEv @ 8761 NONAME + _ZN24HbAbstractVkbHostPrivate11closeKeypadEv @ 8762 NONAME + _ZN24HbAbstractVkbHostPrivate14connectSignalsEv @ 8763 NONAME + _ZN24HbAbstractVkbHostPrivate17disconnectSignalsEv @ 8764 NONAME + _ZN24HbAbstractVkbHostPrivate17prepareAnimationsEN9HbVkbHost11HbVkbStatusE @ 8765 NONAME + _ZN24HbAbstractVkbHostPrivate18disableCursorShiftEv @ 8766 NONAME + _ZN24HbAbstractVkbHostPrivate22getViewAndFocusObjectsERP6HbViewRP18HbInputFocusObject @ 8767 NONAME + _ZN24HbAbstractVkbHostPrivate22prepareKeypadAnimationEN9HbVkbHost11HbVkbStatusE @ 8768 NONAME + _ZN24HbAbstractVkbHostPrivate23prepareAnimationsCommonEv @ 8769 NONAME + _ZN24HbAbstractVkbHostPrivate24_q_containerAboutToCloseEv @ 8770 NONAME + _ZN24HbAbstractVkbHostPrivate25prepareContainerAnimationEN9HbVkbHost11HbVkbStatusE @ 8771 NONAME + _ZN24HbAbstractVkbHostPrivate26openKeypadWithoutAnimationEv @ 8772 NONAME + _ZN24HbAbstractVkbHostPrivate27closeKeypadWithoutAnimationEv @ 8773 NONAME + _ZN24HbAbstractVkbHostPrivate27setTitleAndStatusBarVisibleEb @ 8774 NONAME + _ZN24HbAbstractVkbHostPrivate31cancelAnimationAndHideVkbWidgetEv @ 8775 NONAME + _ZN24HbAbstractVkbHostPrivate31getViewFlagsForVisibilityChangeER6QFlagsIN6HbView10HbViewFlagEEbPS1_ @ 8776 NONAME + _ZN24HbAbstractVkbHostPrivateC1EP17HbAbstractVkbHostP7QObject @ 8777 NONAME + _ZN24HbAbstractVkbHostPrivateC2EP17HbAbstractVkbHostP7QObject @ 8778 NONAME + _ZN24HbAbstractVkbHostPrivateD0Ev @ 8779 NONAME + _ZN24HbAbstractVkbHostPrivateD1Ev @ 8780 NONAME + _ZN24HbAbstractVkbHostPrivateD2Ev @ 8781 NONAME + _ZN24HbVkbHostContainerWidget14connectSignalsEP7QObject @ 8782 NONAME + _ZN24HbVkbHostContainerWidget17disconnectSignalsEP7QObject @ 8783 NONAME + _ZN24HbVkbHostContainerWidget17sceneBoundingRectEv @ 8784 NONAME + _ZN24HbVkbHostContainerWidget3posEv @ 8785 NONAME + _ZN24HbVkbHostContainerWidget6setPosE7QPointF @ 8786 NONAME + _ZN24HbVkbHostContainerWidgetC1EP7QObject @ 8787 NONAME + _ZN24HbVkbHostContainerWidgetC2EP7QObject @ 8788 NONAME + _ZNK24HbAbstractVkbHostPrivate10mainWindowEv @ 8789 NONAME + _ZNK24HbAbstractVkbHostPrivate10screenSizeEv @ 8790 NONAME + _ZNK24HbAbstractVkbHostPrivate32ensureVisibilityInsideScrollAreaEv @ 8791 NONAME + _ZTI24HbAbstractVkbHostPrivate @ 8792 NONAME + _ZTV24HbAbstractVkbHostPrivate @ 8793 NONAME + _ZN11HbStatusBar11eventFilterEP7QObjectP6QEvent @ 8794 NONAME + _ZN11HbStatusBar15startClockTimerEv @ 8795 NONAME + _ZN18HbBatteryIndicator13chargingEventEb @ 8796 NONAME + _ZN12HbLocaleUtil22languageRegionMappingsEb @ 8797 NONAME diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -115,8 +115,8 @@ if (event->type() == QEvent::QEvent::GraphicsSceneResize) { HbPopup *popup = qobject_cast(obj); if (popup) { - QRectF rect = popup->rect(); - rect.moveTo(popup->pos()); + QRectF rect = popup->mapToScene(popup->rect()).boundingRect(); + rect = mDeviceDialogManger->mMainWindow->mapFromScene(rect).boundingRect(); HbDeviceDialogsContainer::Dialog & dialog = mDeviceDialogManger->mDialogs.find(popup); mDeviceDialogManger->addRegionRect(dialog.id(), rect); } @@ -240,6 +240,7 @@ { TRACE_ENTRY + parameters.mError = HbDeviceDialogNoError; int id = 0; HbDeviceDialogPlugin::DeviceDialogInfo info; @@ -290,8 +291,16 @@ HbDeviceDialogsContainer::Dialog &dialog = mDialogs.find(id); if (dialog.isValid()) { HbDeviceDialogInterface *interface = dialog.widget(); - bool success = interface->setDeviceDialogParameters(parameters); - if (!success) { + bool success = false; + bool catched = false; + try { + success = interface->setDeviceDialogParameters(parameters); + } catch (const std::bad_alloc &) { + catched = true; + } + if (catched) { + ret = HbDeviceDialogGeneralError; + } else if (!success) { ret = checkpluginerror(interface->deviceDialogError()); } else { ret = HbDeviceDialogNoError; @@ -314,9 +323,13 @@ if (!byClient) { dialog.setFlags(HbDeviceDialogsContainer::Dialog::ClosedByServer); } - dialog.widget()->closeDeviceDialog(byClient); + ret = HbDeviceDialogNoError; + try { + dialog.widget()->closeDeviceDialog(byClient); + } catch(const std::bad_alloc &) { + ret = HbDeviceDialogGeneralError; + } startHousekeeperTimer(); - ret = HbDeviceDialogNoError; } TRACE_EXIT return ret; @@ -350,6 +363,11 @@ int HbDeviceDialogManagerPrivate::activateIndicator( HbDeviceDialogServer::IndicatorParameters ¶meters) { + // In order to prevent dialogs/indicators trowing bad_alloc during execution, amount + // of heap available is checked before activation is allowed. + if (!heapAvailable(NormalLevelMinHeap)) { + return HbDeviceDialogGeneralError; + } QVariantMap credentials; addSecurityCredentials(parameters, credentials); int result = HbDeviceDialogNoError; @@ -461,7 +479,7 @@ RWindowBase *win = static_cast(mMainWindow->effectiveWinId()->DrawableWindow()); if (win) { - RRegionBuf<1> windowRegion(QRectToTRect(mMainWindow->sceneRect())); + RRegionBuf<1> windowRegion(QRectToTRect(mMainWindow->rect())); win->SetShape(windowRegion); } } @@ -636,7 +654,12 @@ HbDeviceDialogServer::DialogParameters ¶meters, HbDeviceDialogPlugin::DeviceDialogInfo &deviceDialogInfo, HbPopup *&popup) { - parameters.mError = HbDeviceDialogNoError; + // In order to prevent a dialog trowing bad_alloc when it is executing, amount + // of heap available is checked before new dialog is allowed. + if (!heapAvailable(SecurityLevelMinHeap)) { + parameters.mError = HbDeviceDialogGeneralError; + return 0; + } QString pluginFilePath; if (!mPluginManager.loadPlugin(parameters.mType, QString(), &pluginFilePath)) { @@ -658,6 +681,15 @@ return 0; } + // Normal level device dialogs require bigger heap reserve in order to not to + // block higher level dialogs. + if (deviceDialogInfo.showLevel == HbDeviceDialogPlugin::NormalLevel && + !heapAvailable(NormalLevelMinHeap)) { + parameters.mError = HbDeviceDialogGeneralError; + mPluginManager.unloadPlugin(pluginFilePath); + return 0; + } + // Plugin may request security check of the client if (deviceDialogInfo.flags & HbDeviceDialogPlugin::SecurityCheck) { QVariantMap credentials; @@ -819,6 +851,34 @@ return true; } +// Check there is minimum amount of heap available +bool HbDeviceDialogManagerPrivate::heapAvailable(int aBytes) +{ + const int MaxFragments = 16; + const int MinFragmentSize = 0x1000; // 4 kB + int fragmentSize = aBytes / MaxFragments; + if (fragmentSize < MinFragmentSize) { + fragmentSize = MinFragmentSize; + } + char *fragments[MaxFragments]; + memset(&fragments, 0, sizeof(fragments)); + bool success = true; + int i = 0; + while(success && i < MaxFragments && aBytes >= 0) { + try { + fragments[i] = new char[fragmentSize]; + } catch(const std::bad_alloc &) { + success = false; + } + i++; + aBytes -= fragmentSize; + } + for(--i; i >= 0; i--) { + delete [] fragments[i]; + } + return success; +} + // Called by device dialog widget to send some data to client. void HbDeviceDialogManagerPrivate::deviceDialogUpdate(const QVariantMap &data) const { diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -102,13 +102,18 @@ enum { HousekeeperTimerPeriod = 2000, MaxSessionlessDialogLife = 5, // 5 * HousekeeperTimerPeriod - MaxDialogClosingPeriod = 2 // 2 * HousekeeperTimerPeriod + MaxDialogClosingPeriod = 2, // 2 * HousekeeperTimerPeriod + // Minimum heap to be available to allow normal level device dialog show + NormalLevelMinHeap = 0x200000, // 2MB + // Minimum heap to be available to allow indicator activation + IndicatorMinHeap = NormalLevelMinHeap, + SecurityLevelMinHeap = 0x100000, // 1MB }; - enum ForegroundControl { FgControlNone, FgControlSecurityCriticalClosed }; + // Constructor and destructor explicit HbDeviceDialogManagerPrivate(HbDeviceDialogManager *manager); virtual ~HbDeviceDialogManagerPrivate(); @@ -143,6 +148,7 @@ QVariantMap &credentials); static void setDialogPriority(HbPopup *popup, HbDeviceDialogsContainer::Dialog::Flags flags); static bool checkDialogInfo(const HbDeviceDialogPlugin::DeviceDialogInfo &deviceDialogInfo); + static bool heapAvailable(int aBytes = NormalLevelMinHeap); void deleteDeviceDialog(int id); bool eventFilter(QObject *obj, QEvent *event); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -54,11 +54,6 @@ have been loaded first time. */ -// Created widget gets a property added containing the device dialog type. - -// declared but never referenced: -//static const char deviceDialogTypePropertyName[] = "HbDevDlgPlugManXX"; - // Constructor HbDeviceDialogPluginManager::HbDeviceDialogPluginManager(Flags flags, QObject *parent) : QObject(parent), mNameCache(pluginKeys) @@ -134,7 +129,10 @@ if (pluginInstance) { HbDeviceDialogPluginInterface *pluginIf = qobject_cast(pluginInstance); - widgetIf = pluginIf->createDeviceDialog(deviceDialogType, parameters); + try { + widgetIf = pluginIf->createDeviceDialog(deviceDialogType, parameters); + } catch (const std::bad_alloc &) { + } if (widgetIf) { pluginInfo.mWidgets.append(widgetIf); pluginInfo.mRefCount++; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserver.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -84,8 +84,8 @@ HbDeviceDialogServer::~HbDeviceDialogServer() { TRACE_ENTRY + delete d_ptr; delete iManager; - delete d_ptr; TRACE_EXIT } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -64,7 +64,6 @@ #ifdef HB_HAVE_QT_MOBILITY delete mDeviceInfo; #endif // HB_HAVE_QT_MOBILITY - // delete mExitTimer; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogsession.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogsession.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogsession.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -241,52 +241,71 @@ \internal Forward call to HbDeviceDialogManager. Store dialog id if call is successful. */ -void HbDeviceDialogSession::ShowDeviceDialogL( const RMessage2 &aMessage ) +void HbDeviceDialogSession::ShowDeviceDialogL(const RMessage2 &aMessage) { TRACE_ENTRY mEventList.clear(); iKeepAfterClose = EFalse; iWriteCloseId = 0; - TInt dataSize = aMessage.GetDesLength( KSlot0 ); + int error = KErrNone; + TInt dataSize = aMessage.GetDesLength(KSlot0); if (dataSize < 0) { - User::Leave(KErrBadDescriptor); + aMessage.Complete(KErrBadDescriptor); + return; } - HBufC8* data = HBufC8::NewLC( dataSize ); - TPtr8 ptr( data->Des() ); - aMessage.ReadL( KSlot0, ptr ); - - QByteArray resArray( (const char*) ptr.Ptr(), ptr.Size() ); - QDataStream outStream( &resArray, QIODevice::ReadOnly ); - QString title; + HBufC8* data = HBufC8::NewLC(dataSize); + TPtr8 ptr(data->Des()); + aMessage.ReadL(KSlot0, ptr); - QVariant var; - outStream >> title; - outStream >> var; + QString title; + QVariantMap mapdata; + QT_TRYCATCH_ERROR(error, + QVariant var; + QByteArray resArray((const char*) ptr.Ptr(), ptr.Size()); + QDataStream outStream(&resArray, QIODevice::ReadOnly); + outStream >> title; + outStream >> var; + mapdata = var.toMap(); + ) + CleanupStack::PopAndDestroy(data); - QVariantMap mapdata = var.toMap(); - - CleanupStack::PopAndDestroy( data ); + if (error != KErrNone) { + aMessage.Complete(error); + return; + } int identifier = 0; - int error = Server().AddSessionToList(this); + struct { + bool mSession:1; + bool mId:1; + } cleanup; + error = Server().AddSessionToList(this); + cleanup.mSession = (error == HbDeviceDialogNoError); + if (error == HbDeviceDialogNoError) { + QT_TRYCATCH_ERROR(error, mIdList.insert(0, identifier)) + } + cleanup.mId = (error == HbDeviceDialogNoError); if (error == HbDeviceDialogNoError) { HbDeviceDialogServer::DialogParameters showParameters(title, aMessage, mapdata, reinterpret_cast(this)); identifier = Server().showDeviceDialog(showParameters); error = showParameters.mError; - if (error != HbDeviceDialogNoError) { - Server().RemoveSessionFromList(this); - } } if (error == HbDeviceDialogNoError) { TPckgBuf deviceDialogId(identifier); error = aMessage.Write(KSlot1, deviceDialogId); aMessage.Complete(error); - mIdList.insert(0, identifier); + mIdList[0] = identifier; } else { + if (cleanup.mSession) { + Server().RemoveSessionFromList(this); + } + if (cleanup.mId) { + mIdList.removeFirst(); + } aMessage.Complete(error); } TRACE_EXIT_ARGS("identifier " << identifier) @@ -296,31 +315,40 @@ \internal Forward call to HbDeviceDialogManager. Return result. */ -void HbDeviceDialogSession::UpdateDeviceDialogL( const RMessage2 &aMessage ) +void HbDeviceDialogSession::UpdateDeviceDialogL(const RMessage2 &aMessage) { TRACE_ENTRY - TInt dataSize = aMessage.GetDesLength( KSlot0 ); + TInt dataSize = aMessage.GetDesLength(KSlot0); if (dataSize < 0) { - User::Leave(KErrBadDescriptor); + aMessage.Complete(KErrBadDescriptor); + return; } - HBufC8* data = HBufC8::NewLC( dataSize ); - TPtr8 ptr( data->Des() ); - aMessage.ReadL( KSlot0, ptr ); + HBufC8* data = HBufC8::NewLC(dataSize); + TPtr8 ptr(data->Des()); + aMessage.ReadL(KSlot0, ptr); - QByteArray resArray( (const char*) ptr.Ptr(), ptr.Size() ); - QDataStream outStream( &resArray, QIODevice::ReadOnly ); + QVariantMap mapdata; + int error = KErrNone; + QT_TRYCATCH_ERROR(error, + QVariant var; + QByteArray resArray( (const char*) ptr.Ptr(), ptr.Size() ); + QDataStream outStream( &resArray, QIODevice::ReadOnly ); - QVariant var; - outStream >> var; + outStream >> var; + mapdata = var.toMap(); + ) - QVariantMap mapdata = var.toMap(); + CleanupStack::PopAndDestroy(data); - CleanupStack::PopAndDestroy( data ); + if (error != KErrNone) { + aMessage.Complete(error); + return; + } - TInt result = Server().updateDeviceDialog( DeviceDialogIdentifier(), mapdata ); - aMessage.Complete( result ); + TInt result = Server().updateDeviceDialog(DeviceDialogIdentifier(), mapdata); + aMessage.Complete(result); TRACE_EXIT_ARGS("result " << result) } @@ -373,7 +401,7 @@ // not made a new request for device dialog (processing the // previous message). if ( mEventList.count() > 0 ) { - QVariantMap data = mEventList[0]; + const QVariantMap data = mEventList.at(0); WriteUpdateData(data, mIdList.isEmpty() ? 0 : mIdList.first()); mEventList.removeFirst(); @@ -400,20 +428,20 @@ QVariantMap data = mEventList[0]; QByteArray array; - QDataStream stream( &array, QIODevice::WriteOnly ); + QDataStream stream(&array, QIODevice::WriteOnly); QVariant var(data); stream << var; - TPtr8 ptr( reinterpret_cast(array.data()), array.size(), array.size()); + TPtr8 ptr(reinterpret_cast(array.data()), array.size(), array.size()); - error = aMessage.Write( KSlot0, ptr ); + error = aMessage.Write(KSlot0, ptr); - if ( error == KErrNone) { + if (error == KErrNone) { mEventList.removeFirst(); } } - aMessage.Complete( error ); + aMessage.Complete(error); TRACE_EXIT_ARGS("error " << error) } @@ -442,7 +470,8 @@ void HbDeviceDialogSession::WriteUpdateData(const QVariantMap ¶meters, int deviceDialogId) { TRACE_ENTRY - if ( iUpdateChannelOpen ) { + + if (iUpdateChannelOpen) { // Client is listening and ready to receive data iUpdateChannelOpen = EFalse; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -28,6 +28,7 @@ #include #include #include +#include #include "hbdevicedialogsession_p.h" #include "hbdevicedialogserversym_p_p.h" #include "hbdevicedialogserverdefs_p.h" @@ -190,16 +191,18 @@ \internal handle indicator activation. */ -void HbIndicatorSessionHandler::ActivateIndicatorL( const RMessage2 &aMessage ) +void HbIndicatorSessionHandler::ActivateIndicatorL(const RMessage2 &aMessage) { TRACE_ENTRY + + QString type; QVariant parameter; - QString type = indicatorTypeFromMessageL(aMessage, parameter); - if (!indicatorTypes.contains(type)) { - indicatorTypes.append(type); - } + indicatorTypeFromMessageL(aMessage, type, parameter); HbDeviceDialogServer::IndicatorParameters indicatorParameters(type, aMessage, parameter); TInt result = Server().activateIndicator(indicatorParameters); + if (result == HbDeviceDialogNoError && !indicatorTypes.contains(type)) { + indicatorTypes.append(type); // there is heap to append if activate succeeded + } aMessage.Complete(result); TRACE_EXIT_ARGS("result: " << result) } @@ -211,8 +214,9 @@ void HbIndicatorSessionHandler::DeactivateIndicatorL( const RMessage2 &aMessage ) { TRACE_ENTRY + QString type; QVariant parameter; - QString type = indicatorTypeFromMessageL(aMessage, parameter); + indicatorTypeFromMessageL(aMessage, type, parameter); indicatorTypes.removeAll(type); if (indicatorTypes.isEmpty() && iIndicatorChannelOpen) { @@ -391,26 +395,29 @@ \internal get the indicator type and parameter from the message. */ -QString HbIndicatorSessionHandler::indicatorTypeFromMessageL(const RMessage2 &aMessage, - QVariant ¶meter) const +void HbIndicatorSessionHandler::indicatorTypeFromMessageL(const RMessage2 &aMessage, + QString &indicatorType, QVariant ¶meter) const { TRACE_ENTRY - TInt dataSize = aMessage.GetDesLength( KSlot0 ); + TInt dataSize = aMessage.GetDesLength(KSlot0); + if (dataSize < 0) { + User::Leave(KErrBadDescriptor); + } - HBufC8* data = HBufC8::NewLC( dataSize ); - TPtr8 ptr( data->Des() ); - aMessage.ReadL( KSlot0, ptr ); + HBufC8* data = HBufC8::NewLC(dataSize); + TPtr8 ptr(data->Des()); + aMessage.ReadL(KSlot0, ptr); - QByteArray resArray( (const char*) ptr.Ptr(), ptr.Size() ); - QDataStream outStream( &resArray, QIODevice::ReadOnly ); - QString indicatorType; - - outStream >> indicatorType; - outStream >> parameter; - - CleanupStack::PopAndDestroy( data ); + int error = KErrNone; + QT_TRYCATCH_ERROR(error, + QByteArray resArray((const char*) ptr.Ptr(), ptr.Size()); + QDataStream outStream(&resArray, QIODevice::ReadOnly); + outStream >> indicatorType; + outStream >> parameter; + ) + User::LeaveIfError(error); + CleanupStack::PopAndDestroy(data); TRACE_EXIT - return indicatorType; } /*! diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler_p.h --- a/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorsessionhandler_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -90,7 +90,8 @@ void WriteIndicatorInfoL(); void WriteIndicatorDataL(const RMessage2 &aMessage); TInt DoWriteIndicatorInfoL(TInt &error); - QString indicatorTypeFromMessageL(const RMessage2 &aMessage, QVariant ¶meter) const; + void indicatorTypeFromMessageL(const RMessage2 &aMessage, QString &indicatorType, + QVariant ¶meter) const; HbIndicatorSessionHandler(HbDeviceDialogSession *aSession); private: diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp --- a/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -71,6 +71,7 @@ //#define MONITOR_INSTALLATION_DIRS 1 // Thread that scans directories and keeps the cache current +/// \cond class HbPluginNameCacheThread : public QThread { public: @@ -98,6 +99,7 @@ HbPluginNameCache &mNameCache; static QMutex *mMutex; }; +/// \endcond // Share lock between all instances of the cache. QMutex *HbPluginNameCacheThread::mMutex = 0; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbdevicedialog.cpp --- a/src/hbcore/devicedialogbase/hbdevicedialog.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialog.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -250,7 +250,7 @@ QVariantMap data = deviceDialog.receivedData(); \endcode - \sa HbDeviceDialogPlugin + \sa HbDeviceDialogPlugin, CHbDeviceDialogSymbian */ /*! @@ -346,10 +346,10 @@ #endif // defined(Q_OS_SYMBIAN) /*! - Constructor. + Constructs HbDeviceDialog. \param f Contains the construct flags. See DeviceDialogFlag - \param parent The parent pointer. + \param parent Parent pointer. HbDeviceDialog can be allocated on the stack if no signals are to be connected. The Device dialog service keeps dialogs launched when the object goes out of scope. If any signals @@ -366,7 +366,7 @@ } /*! - Constructor required by the shared d-pointer paradigm. + Constructs HbDeviceDialog. Allows class derivation by shared d-pointer paradigm. */ HbDeviceDialog::HbDeviceDialog(HbDeviceDialogPrivate &dd, DeviceDialogFlags f, QObject *parent) : QObject(parent), d_ptr(&dd) @@ -377,7 +377,9 @@ } /*! - Destructor. + Destructs HbDeviceDialog. The sialog launched by show() is closed if deviceDialogClosed() + or dataReceived() signals are connected to by an application. Otherwise the dialog is + left executing and should close itself by timeout. */ HbDeviceDialog::~HbDeviceDialog() { diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbdevicedialogconnecthelper_p_p.h --- a/src/hbcore/devicedialogbase/hbdevicedialogconnecthelper_p_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogconnecthelper_p_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -27,25 +27,24 @@ #define HBDEVICEDIALOGCONNECTHELPER_P_P_H #include -#include class HbDeviceDialogConnectHelper; class HbDeviceDialogConnectHelperPrivate : public CActive -{ +{ public: HbDeviceDialogConnectHelperPrivate(HbDeviceDialogConnectHelper *wrapper); ~HbDeviceDialogConnectHelperPrivate(); void connect(); - + protected: // From CActive void RunL(); void DoCancel(); - -private: + +private: HbDeviceDialogConnectHelper *q_ptr; - RHbDeviceDialogClientSession mClientSession; + RHbDeviceDialogClientSession mClientSession; bool mSessionConnected; }; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp --- a/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -93,8 +93,25 @@ function returns false. In addition, HbDeviceDialogPlugin constructor has a check which allows only device dialog service to load plugins derived from it. + \section _exceptions Exception handling + + Device dialog service uses two strategies in exception handling: Avoidance and trapping. + Memory allocation exceptions while a dialog is running are avoided by ensuring there is + sufficient heap space available before allowing new dialogs. Trapping is used while + a dialog is created. A call to createDeviceDialog() is enclosed in try/catch block. + Memory allocation exception causes dialog creation to fail and an error is returned + to a client. Plugin should take care there are no memory leaks if exception is thrown + inside createDeviceDialog(). All calls to HbDeviceDialogInterface functions are trapped + and thrown allocation exceptions are ignored. Plugins can provide more fine grained + exception handling by trapping exceptions themselves. + \section _checklist Checklist for well behaving device dialogs + Well behaving plugin should observe following rules: + - Delay plugin initializations until HbDeviceDialogPluginInterface::createDeviceDialog() is + called. Plugin may be loaded/unloaded several times by different threads during plugin search. + The search is slowed down by unnessary initializations by plugins. + Well behaving dialog widget should observe following rules: - Should not create and show other dialogs - No calls to show(), hide() or setVisible() @@ -663,7 +680,9 @@ #include #endif // Q_OS_SYMBIAN -// Constructor +/*! + Constructs HbDeviceDialogPlugin. +*/ HbDeviceDialogPlugin::HbDeviceDialogPlugin() { #ifdef Q_OS_SYMBIAN @@ -677,7 +696,9 @@ #endif // Q_OS_SYMBIAN } -// Destructor +/*! + Destructs HbDeviceDialogPlugin. +*/ HbDeviceDialogPlugin::~HbDeviceDialogPlugin() { } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbdevicedialogsym_p.cpp --- a/src/hbcore/devicedialogbase/hbdevicedialogsym_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogsym_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -80,7 +80,6 @@ TRACE_ENTRY mDeviceDialogFlags = f; mLastError = HbDeviceDialogNoError; - CActiveScheduler::Add(this); iRequesting = EFalse; if (mDeviceDialogFlags & HbDeviceDialog::ImmediateResourceReservationFlag) { int error = symToDeviceDialogError(initialize()); @@ -95,10 +94,13 @@ \internal Initialisation step. Session to server is created. */ -int HbDeviceDialogPrivate::initialize() +int HbDeviceDialogPrivate::initialize(bool connect) { TRACE_ENTRY + if (!IsAdded()) { + CActiveScheduler::Add(this); + } if (!iBuffer) { TRAP_IGNORE(iBuffer = HBufC8::NewL(64)); if (iBuffer) { @@ -109,7 +111,10 @@ } } - int error = mHbSession.Connect(); + int error = KErrNone; + if (connect) { + mHbSession.Connect(); + } TRACE_EXIT_ARGS("error" << error) return error; @@ -123,16 +128,8 @@ int HbDeviceDialogPrivate::connect() { - if (!iBuffer) { - TRAP_IGNORE(iBuffer = HBufC8::NewL(64)); - if (iBuffer) { - iDataPtr.Set(iBuffer->Des()); - } else { - TRACE_EXIT_ARGS("error " << KErrNoMemory) - return KErrNoMemory; - } - } - + initialize(false); + int error(HbDeviceDialogNoError); if (!IsActive() && !iConnecting) { diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbdevicedialogsym_p.h --- a/src/hbcore/devicedialogbase/hbdevicedialogsym_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogsym_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -56,7 +56,7 @@ void init(HbDeviceDialog::DeviceDialogFlags f); int connect(); - int initialize(); + int initialize(bool connect = true); bool show(const QString &deviceDialogType, const QVariantMap ¶meters); bool update(const QVariantMap ¶meters); bool cancel(); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp --- a/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -500,7 +500,8 @@ } /*! - Constructs CHbDeviceDialogSymbian object. \a f contains construct flags. + Constructs CHbDeviceDialogSymbian and returns a pointer to it. + \a f contains construct flags. */ EXPORT_C CHbDeviceDialogSymbian* CHbDeviceDialogSymbian::NewL(TInt aFlags) { @@ -515,10 +516,18 @@ return self; } +/*! + Constructs CHbDeviceDialogSymbian. +*/ CHbDeviceDialogSymbian::CHbDeviceDialogSymbian() { } +/*! + Destructs CHbDeviceDialogSymbian. The dialog launched by ShowL() + is closed if observer is set. If there is no observer, the dialog is + left executing and should close itself by timeout. +*/ EXPORT_C CHbDeviceDialogSymbian::~CHbDeviceDialogSymbian() { delete d; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbdevicedialogsymbian.h --- a/src/hbcore/devicedialogbase/hbdevicedialogsymbian.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogsymbian.h Mon Oct 04 00:38:12 2010 +0300 @@ -64,7 +64,7 @@ }; IMPORT_C static CHbDeviceDialogSymbian* NewL(TInt aFlags = ENoDeviceDialogFlags); - IMPORT_C ~CHbDeviceDialogSymbian(); + IMPORT_C virtual ~CHbDeviceDialogSymbian(); IMPORT_C TInt Show(const TDesC& aDeviceDialogType, const CHbSymbianVariantMap& aParameters, MHbDeviceDialogObserver* aObserver = NULL); IMPORT_C CHbSymbianVariantMap* ReceivedDataL() const; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbindicator.cpp --- a/src/hbcore/devicedialogbase/hbindicator.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbindicator.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -101,7 +101,7 @@ #endif // defined(Q_OS_SYMBIAN) /*! - Constructs an indicator object. \a parent is a pointer to the parent. + Constructs HbIndicator with \a parent. */ HbIndicator::HbIndicator(QObject *parent) : QObject(parent), d_ptr(new HbIndicatorPrivate) @@ -111,6 +111,9 @@ d->init(); } +/*! + Constructs HbIndicator. Allows class derivation by shared d-pointer paradigm. +*/ HbIndicator::HbIndicator(HbIndicatorPrivate &dd, QObject *parent) : QObject(parent), d_ptr(&dd) { @@ -119,6 +122,9 @@ d->init(); } +/*! + Destructs HbIndicator. +*/ HbIndicator::~HbIndicator() { delete d_ptr; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbindicatorsymbian.cpp --- a/src/hbcore/devicedialogbase/hbindicatorsymbian.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbindicatorsymbian.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -277,6 +277,9 @@ return KErrNone; } +/*! + Constructs a new CHbIndicatorSymbian and returns a pointer it. +*/ EXPORT_C CHbIndicatorSymbian* CHbIndicatorSymbian::NewL() { CHbIndicatorSymbian *me = new (ELeave) CHbIndicatorSymbian(); @@ -286,6 +289,9 @@ return me; } +/*! + Destructs CHbIndicatorSymbian. +*/ EXPORT_C CHbIndicatorSymbian::~CHbIndicatorSymbian() { delete d; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbindicatorsymbian.h --- a/src/hbcore/devicedialogbase/hbindicatorsymbian.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbindicatorsymbian.h Mon Oct 04 00:38:12 2010 +0300 @@ -52,7 +52,7 @@ }; IMPORT_C static CHbIndicatorSymbian* NewL(); - IMPORT_C ~CHbIndicatorSymbian(); + IMPORT_C virtual ~CHbIndicatorSymbian(); IMPORT_C TBool Activate(const TDesC& aIndicatorType, const CHbSymbianVariant* aParameter = 0); IMPORT_C TBool Deactivate(const TDesC& aIndicatorType, const CHbSymbianVariant* aParameter = 0); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbsymbianvariant.cpp --- a/src/hbcore/devicedialogbase/hbsymbianvariant.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbsymbianvariant.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -342,8 +342,8 @@ */ /*! - Creates a new CHbSymbianVariant. Data passed to the constructor is copied to the - CHbSymbianVariant. + Creates a new CHbSymbianVariant and returns a pointer to it. Data passed to + the constructor is copied to the CHbSymbianVariant. \param aData Data to copy into the variant. Note: If EDesArray is used, data pointer must be casted to MDesCArray. \param aDataType Type of data. @@ -401,6 +401,9 @@ return EFalse; } +/*! + Destructs CHbSymbianVariant. +*/ EXPORT_C CHbSymbianVariant::~CHbSymbianVariant() { delete d; @@ -448,7 +451,8 @@ */ /*! - Creates an empty CHbSymbianVariantMap. + Constructs a new CHbSymbianVariantMap and returns a pointer it. The container is empty after + construction. */ EXPORT_C CHbSymbianVariantMap* CHbSymbianVariantMap::NewL() { @@ -459,6 +463,9 @@ return map; } +/*! + Destructs CHbSymbianVariantMap. +*/ EXPORT_C CHbSymbianVariantMap::~CHbSymbianVariantMap() { delete d; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/devicedialogbase/hbsymbianvariant.h --- a/src/hbcore/devicedialogbase/hbsymbianvariant.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbsymbianvariant.h Mon Oct 04 00:38:12 2010 +0300 @@ -47,7 +47,7 @@ }; IMPORT_C static CHbSymbianVariant* NewL(const TAny* aData, TType aDataType); - IMPORT_C ~CHbSymbianVariant(); + IMPORT_C virtual ~CHbSymbianVariant(); IMPORT_C CHbSymbianVariant::TType Type() const; @@ -80,7 +80,7 @@ { public: IMPORT_C static CHbSymbianVariantMap* NewL(); - IMPORT_C ~CHbSymbianVariantMap(); + IMPORT_C virtual ~CHbSymbianVariantMap(); IMPORT_C TInt Add(const TDesC& aKey, CHbSymbianVariant* aVariant); IMPORT_C TInt Delete(const TDesC& aKey); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/effects/hbeffect.cpp --- a/src/hbcore/effects/hbeffect.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/effects/hbeffect.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -1083,6 +1083,35 @@ /*! \internal */ +bool HbEffectInternal::add(const char *itemType[], const char *filePath[], const char *effectEvent[], int count) +{ +#ifdef HB_EFFECT_API_OFF + Q_UNUSED(itemType); + Q_UNUSED(filePath); + Q_UNUSED(effectEvent); + return false; +#else + bool ret = false; + // Try to add all the files, stop when one fails. + for (int i = 0; i < count; ++i) { + ret = add(QLatin1String(itemType[i]), QLatin1String(filePath[i]), !effectEvent ? QString() : QLatin1String(effectEvent[i])); + if (!ret) { + break; + } + } + // If any of the files were not added then remove all the others too. + if (!ret) { + for (int i = 0; i < count; ++i) { + remove(QLatin1String(itemType[i]), QLatin1String(filePath[i]), !effectEvent ? QString() : QLatin1String(effectEvent[i])); + } + } + return ret; +#endif // HB_EFFECT_API_OFF +} + +/*! + \internal +*/ bool HbEffectInternal::add(QGraphicsItem *item, const QString &filePath, const QString &effectEvent) { #ifdef HB_EFFECT_API_OFF diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/effects/hbeffectgroup.cpp --- a/src/hbcore/effects/hbeffectgroup.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/effects/hbeffectgroup.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -41,6 +41,7 @@ #ifdef HB_FILTER_EFFECTS #include "hbvgeffect_p.h" #include "hbvgchainedeffect_p.h" +#include "hbvgmaskeffect_p.h" #endif static const char effect_fw_marker[] = "effw_chain"; @@ -286,14 +287,20 @@ // chain, keeping single effects is not possible due to ownership // issues. HbVgChainedEffect *c = qobject_cast(mTargetItem->graphicsEffect()); - // Effects set by another HbEffectGroup instance must be ignored - // here, those should go away because they probably would not work - // well together anyway. - if (c && c->objectName().compare(QLatin1String(effect_fw_marker))) { + if (c) { QList effects = c->takeAll(); HbVgChainedEffect *newChain = vgEffect(); + // Effects set by another HbEffectGroup instance must be ignored + // here, those should go away because they probably would not work + // well together anyway. + bool chainIsFromEffectFw = c->objectName().compare(QLatin1String(effect_fw_marker)) == 0; foreach (HbVgEffect *effect, effects) { - newChain->add(effect); + // Special handling for mask effects: These must be preserved always. + if (!chainIsFromEffectFw || qobject_cast(effect) != 0) { + newChain->add(effect); + } else { + delete effect; + } } } } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/effects/hbeffectinternal_p.h --- a/src/hbcore/effects/hbeffectinternal_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/effects/hbeffectinternal_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -86,6 +86,7 @@ static bool add(const QString &itemType, const QString &filePath, const QString &effectEvent = QString()); static bool add(const QStringList &itemType, const QStringList &filePath, const QStringList &effectEvent = QStringList()); + static bool add(const char *itemType[], const char *filePath[], const char *effectEvent[], int count); static bool add(QGraphicsItem *item, const QString &filePath, const QString &effectEvent = QString()); static bool add(QGraphicsItem *item, const QStringList &filePath, const QStringList &effectEvent = QStringList()); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/gestures.pri --- a/src/hbcore/gestures/gestures.pri Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/gestures.pri Mon Oct 04 00:38:12 2010 +0300 @@ -33,18 +33,13 @@ contains(DEFINES, HB_GESTURE_FW) { PRIVATE_HEADERS += $$PWD/hbgestures_p.h - PRIVATE_HEADERS += $$PWD/hbpangesture_p.h PRIVATE_HEADERS += $$PWD/hbpangesturelogic_p.h PRIVATE_HEADERS += $$PWD/hbtapgesturelogic_p.h PRIVATE_HEADERS += $$PWD/hbtapandholdgesturelogic_p.h PRIVATE_HEADERS += $$PWD/hbpinchgesturelogic_p.h PRIVATE_HEADERS += $$PWD/hbpointrecorder_p.h PRIVATE_HEADERS += $$PWD/hbvelocitycalculator_p.h - PRIVATE_HEADERS += $$PWD/hbswipegesture_p.h PRIVATE_HEADERS += $$PWD/hbswipegesturelogic_p.h - PRIVATE_HEADERS += $$PWD/hbtapandholdgesture_p.h - PRIVATE_HEADERS += $$PWD/hbtapgesture_p.h - PRIVATE_HEADERS += $$PWD/hbpinchgesture_p.h PRIVATE_HEADERS += $$PWD/hbgesturerecognizers_p.h SOURCES += $$PWD/hbgesturerecognizers_p.cpp diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbgesturerecognizers_p.cpp --- a/src/hbcore/gestures/hbgesturerecognizers_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbgesturerecognizers_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -25,15 +25,16 @@ #include "hbgestures_p.h" #include "hbgesturerecognizers_p.h" + +#include "hbtapgesture.h" #include "hbpangesture.h" -#include "hbtapgesture.h" #include "hbtapandholdgesture.h" +#include "hbswipegesture.h" #include "hbpinchgesture.h" -#include "hbswipegesture.h" #include -#include #include +#include //#define RECOGNIZERS_DEBUG #ifdef RECOGNIZERS_DEBUG @@ -42,6 +43,8 @@ #define DEBUG if (0) qDebug #endif +#define GESTURE_D(Class, ptr) Class##Private * const d = static_cast(ptr)->d_func() + //////////////////////////////////////////////////////////////////////////// // Pan gesture //////////////////////////////////////////////////////////////////////////// @@ -98,7 +101,9 @@ // this is to enable testability within logic classes. // QGesture contains gesture state, which cannot be modified by // anything else, but QGestureManager itself. - return HbPanGestureLogic::recognize(state->state(), static_cast(state), watched, event, QTime::currentTime()); + GESTURE_D(HbPanGesture, state); + Q_ASSERT(d->mTime.isValid()); + return HbPanGestureLogic::recognize(state->state(), static_cast(state), watched, event, d->mTime.elapsed()); } /*! @@ -109,6 +114,8 @@ */ void HbPanGestureRecognizer::reset(QGesture *state) { + GESTURE_D(HbPanGesture, state); + d->mTime.restart(); HbPanGestureLogic::resetGesture(static_cast(state)); QGestureRecognizer::reset(state); } @@ -367,7 +374,9 @@ // this is to enable testability within logic classes. // QGesture contains gesture state, which cannot be modified by // anything else, but QGestureManager itself. - return HbSwipeGestureLogic::recognize(state->state(), static_cast(state), watched, event, QTime::currentTime()); + GESTURE_D(HbSwipeGesture, state); + Q_ASSERT(d->mTime.isValid()); + return HbSwipeGestureLogic::recognize(state->state(), static_cast(state), watched, event, d->mTime.elapsed()); } /*! @@ -378,6 +387,8 @@ */ void HbSwipeGestureRecognizer::reset(QGesture *state) { + GESTURE_D(HbSwipeGesture, state); + d->mTime.restart(); HbSwipeGestureLogic::resetGesture(static_cast(state)); QGestureRecognizer::reset(state); } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbgesturerecognizers_p.h --- a/src/hbcore/gestures/hbgesturerecognizers_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbgesturerecognizers_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -26,7 +26,6 @@ #ifndef HBGESTURERECOGNIZERS_P_H #define HBGESTURERECOGNIZERS_P_H -#include "hbgestures_p.h" #include "hbpangesturelogic_p.h" #include "hbtapgesturelogic_p.h" #include "hbtapandholdgesturelogic_p.h" diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbgestures_p.h --- a/src/hbcore/gestures/hbgestures_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbgestures_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -26,10 +26,23 @@ #ifndef HBGESTURES_P_H #define HBGESTURES_P_H +#include "hbtapgesture.h" +#include "hbpointrecorder_p.h" + +#include "hbglobal.h" + #include #include #include +#if QT_VERSION >= 0x040700 +#include +#define ELAPSED_TIMER QElapsedTimer +#else +#include +#define ELAPSED_TIMER QTime +#endif + const qreal HbDefaultPanThreshold = 1.0; // mm const qreal HbPanVelocityUpdateThreshold = 3.3; // mm @@ -44,7 +57,6 @@ const int HbTapAndHoldTriggerTimeout = 150; // ms const int HbTapAndHoldTimeout = 500; // ms - class HbGestureUtils { public: @@ -67,4 +79,84 @@ } }; +class HB_CORE_PRIVATE_EXPORT HbPanGesturePrivate +{ +public: + QPointF mStartPos; + + QPointF mSceneStartPos; + QPointF mSceneLastOffset; + QPointF mSceneOffset; + + // for the recognizer + QPointF mDeltaSinceLastTimeStamp; + QPointF mSceneDeltaSinceLastTimeStamp; + qint64 mLastTimeStamp; + + HbPointRecorder mAxisX; + HbPointRecorder mAxisY; + HbPointRecorder mSceneAxisX; + HbPointRecorder mSceneAxisY; + + qreal mThresholdSquare; + + bool mIgnoreMouseEvents; + int mFollowedTouchPointId; + + ELAPSED_TIMER mTime; +}; + +class HB_CORE_PRIVATE_EXPORT HbPinchGesturePrivate +{ +public: + bool mIsNewSequence; + + qreal mSceneTotalRotationAngle; + qreal mSceneLastRotationAngle; + qreal mSceneRotationAngle; + + QPointF mSceneStartCenterPoint; + QPointF mSceneLastCenterPoint; + QPointF mSceneCenterPoint; +}; + +class HB_CORE_PRIVATE_EXPORT HbSwipeGesturePrivate +{ +public: + QPointF mStartPos; + QPointF mSceneStartPos; + + qint64 mStartTime; + + qreal mSceneSwipeAngle; + + HbPointRecorder mAxisX; + HbPointRecorder mAxisY; + + ELAPSED_TIMER mTime; +}; + + +class HB_CORE_PRIVATE_EXPORT HbTapAndHoldGesturePrivate +{ +public: + HbTapAndHoldGesturePrivate() : mTimerID(0) {} + + QPointF mScenePos; + int mRunningTime; + int mTimerID; +}; + +class HB_CORE_PRIVATE_EXPORT HbTapGesturePrivate +{ +public: + HbTapGesturePrivate() : mTimerId(0) {} + + QPointF mStartPos; + QPointF mSceneStartPos; + QPointF mScenePosition; + HbTapGesture::TapStyleHint mTapStyleHint; + int mTimerId; +}; + #endif // HBGESTURES_P_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpangesture.cpp --- a/src/hbcore/gestures/hbpangesture.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpangesture.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,9 +23,9 @@ ** ****************************************************************************/ +#include "hbpangesture.h" + #include "hbgestures_p.h" -#include "hbpangesture.h" -#include "hbpangesture_p.h" #include "hbvelocitycalculator_p.h" #include @@ -127,8 +127,8 @@ */ HbPanGesture::HbPanGesture(QObject *parent) : QPanGesture(parent), d_ptr(new HbPanGesturePrivate) { - d_ptr->q_ptr = this; d_ptr->mIgnoreMouseEvents = false; + d_ptr->mTime.start(); } /*! @@ -138,9 +138,9 @@ */ HbPanGesture::HbPanGesture( HbPanGesturePrivate &dd, QObject *parent ) - : QPanGesture(parent), d_ptr( &dd ) + : QPanGesture(parent), d_ptr(&dd) { - d_ptr->q_ptr = this; + hbWarning("Shared private not supported for HbPanGesture"); } /*! @@ -181,7 +181,7 @@ QPointF HbPanGesture::velocity() const { Q_D(const HbPanGesture); - return HbVelocityCalculator( d->mAxisX, d->mAxisY ).velocity(QTime::currentTime()); + return HbVelocityCalculator( d->mAxisX, d->mAxisY ).velocity( d->mLastTimeStamp ); } /*! diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpangesture.h --- a/src/hbcore/gestures/hbpangesture.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpangesture.h Mon Oct 04 00:38:12 2010 +0300 @@ -75,6 +75,7 @@ Q_DECLARE_PRIVATE_D(d_ptr, HbPanGesture) Q_DISABLE_COPY(HbPanGesture) friend class HbPanGestureLogic; + friend class HbPanGestureRecognizer; }; #endif // HBPANGESTURE_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpangesture_p.h --- a/src/hbcore/gestures/hbpangesture_p.h Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (developer.feedback@nokia.com) -** -** This file is part of the HbCore module of the UI Extensions for Mobile. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at developer.feedback@nokia.com. -** -****************************************************************************/ - -#ifndef HBPANGESTURE_P_H -#define HBPANGESTURE_P_H - -#include "hbglobal.h" -#include "hbgestures_p.h" -#include "hbpointrecorder_p.h" - -#include -#include -#include -#include - -class HbPanGesture; - -class HB_CORE_PRIVATE_EXPORT HbPanGesturePrivate -{ -public: - Q_DECLARE_PUBLIC(HbPanGesture) - - QPointF mStartPos; - - QPointF mSceneStartPos; - QPointF mSceneLastOffset; - QPointF mSceneOffset; - - // for the recognizer - QPointF mDeltaSinceLastTimeStamp; - QPointF mSceneDeltaSinceLastTimeStamp; - QTime mLastTimeStamp; - - HbPanGesture *q_ptr; - - HbPointRecorder mAxisX; - HbPointRecorder mAxisY; - HbPointRecorder mSceneAxisX; - HbPointRecorder mSceneAxisY; - - qreal mThresholdSquare; - - bool mIgnoreMouseEvents; - int mFollowedTouchPointId; -}; - -#endif // HBPANGESTURE_P_H - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpangesturelogic_p.cpp --- a/src/hbcore/gestures/hbpangesturelogic_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpangesturelogic_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,18 +23,19 @@ ** ****************************************************************************/ +#include "hbpangesture.h" +#include "hbpangesturelogic_p.h" +#include "hbgestures_p.h" + +#include "hbnamespace_p.h" +#include + #include #include #include #include #include -#include - -#include "hbpangesture.h" -#include "hbpangesture_p.h" -#include "hbpangesturelogic_p.h" -#include "hbnamespace_p.h" #define followedTouchPoint(te, gesture) te->touchPoints().at(followedTouchPointIndex(te, gesture)) @@ -56,7 +57,6 @@ */ HbPanGestureLogic::HbPanGestureLogic() { - mCurrentTime = QTime(); } HbPanGestureLogic::~HbPanGestureLogic() {} @@ -102,10 +102,10 @@ gesture->d_ptr->mSceneLastOffset = QPointF(0,0); gesture->d_ptr->mSceneOffset = QPointF(0,0); gesture->d_ptr->mSceneDeltaSinceLastTimeStamp = QPointF(0,0); - gesture->d_ptr->mAxisX.clear(); - gesture->d_ptr->mAxisY.clear(); - gesture->d_ptr->mSceneAxisX.clear(); - gesture->d_ptr->mSceneAxisY.clear(); + gesture->d_ptr->mAxisX.resetRecorder(); + gesture->d_ptr->mAxisY.resetRecorder(); + gesture->d_ptr->mSceneAxisX.resetRecorder(); + gesture->d_ptr->mSceneAxisY.resetRecorder(); gesture->setLastOffset(QPointF()); gesture->setOffset(QPointF(0,0)); @@ -126,7 +126,8 @@ Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QMouseEvent *me ) + QMouseEvent *me, + qint64 currentTime ) { // Just ignore situations that are not interesting at all. if ( !( gestureState == Qt::NoGesture && me->button() == Qt::LeftButton ) ) @@ -142,7 +143,7 @@ gesture->d_ptr->mSceneStartPos = scenePos; gesture->d_ptr->mSceneOffset = HbGestureUtils::mapToScene(watched, QPointF(0,0)); gesture->d_ptr->mSceneLastOffset = HbGestureUtils::mapToScene(watched, QPointF(0,0)); - gesture->d_ptr->mLastTimeStamp = mCurrentTime; + gesture->d_ptr->mLastTimeStamp = currentTime; gesture->d_ptr->mThresholdSquare = HbDefaultPanThreshold * HbDeviceProfile::current().ppmValue(); @@ -154,10 +155,10 @@ gesture->d_ptr->mAxisY.resetRecorder(velocityThreshold); gesture->d_ptr->mSceneAxisX.resetRecorder(velocityThreshold); gesture->d_ptr->mSceneAxisY.resetRecorder(velocityThreshold); - gesture->d_ptr->mAxisX.record( me->globalPos().x(), mCurrentTime ); - gesture->d_ptr->mAxisY.record( me->globalPos().y(), mCurrentTime ); - gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime ); - gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime ); + gesture->d_ptr->mAxisX.record( me->globalPos().x(), currentTime ); + gesture->d_ptr->mAxisY.record( me->globalPos().y(), currentTime ); + gesture->d_ptr->mSceneAxisX.record( scenePos.x(), currentTime ); + gesture->d_ptr->mSceneAxisY.record( scenePos.y(), currentTime ); return QGestureRecognizer::MayBeGesture; } @@ -172,7 +173,8 @@ Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QMouseEvent *me ) + QMouseEvent *me, + qint64 currentTime ) { if ( !me->buttons().testFlag(Qt::LeftButton)) { @@ -185,13 +187,13 @@ gesture->d_ptr->mSceneLastOffset = gesture->d_ptr->mSceneOffset; gesture->d_ptr->mSceneOffset = HbGestureUtils::mapToScene(watched, me->globalPos()) - gesture->d_ptr->mSceneStartPos; - gesture->d_ptr->mLastTimeStamp = mCurrentTime; + gesture->d_ptr->mLastTimeStamp = currentTime; QPointF scenePos = HbGestureUtils::mapToScene(watched, me->globalPos()); - gesture->d_ptr->mAxisX.record( me->globalPos().x(), mCurrentTime ); - gesture->d_ptr->mAxisY.record( me->globalPos().y(), mCurrentTime ); - gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime ); - gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime ); + gesture->d_ptr->mAxisX.record( me->globalPos().x(), currentTime ); + gesture->d_ptr->mAxisY.record( me->globalPos().y(), currentTime ); + gesture->d_ptr->mSceneAxisX.record( scenePos.x(), currentTime ); + gesture->d_ptr->mSceneAxisY.record( scenePos.y(), currentTime ); QGraphicsView* view = qobject_cast(watched->parent()); @@ -227,13 +229,14 @@ Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QMouseEvent *me ) + QMouseEvent *me, + qint64 currentTime) { Q_UNUSED(me); Q_UNUSED(gesture); Q_UNUSED(watched); - gesture->d_ptr->mLastTimeStamp = mCurrentTime; + gesture->d_ptr->mLastTimeStamp = currentTime; if ( gestureState == Qt::GestureStarted || gestureState == Qt::GestureUpdated ) { @@ -269,7 +272,8 @@ Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QTouchEvent *te ) + QTouchEvent *te, + qint64 currentTime) { gesture->d_ptr->mFollowedTouchPointId = getNextId(te); @@ -288,7 +292,7 @@ gesture->d_ptr->mSceneStartPos = scenePos; gesture->d_ptr->mSceneOffset = QPointF(0,0); gesture->d_ptr->mSceneLastOffset = QPointF(0,0); - gesture->d_ptr->mLastTimeStamp = mCurrentTime; + gesture->d_ptr->mLastTimeStamp = currentTime; qreal defaultThreshold = HbDefaultPanThreshold * HbDeviceProfile::current().ppmValue(); gesture->d_ptr->mThresholdSquare = defaultThreshold * defaultThreshold; @@ -297,10 +301,10 @@ gesture->d_ptr->mAxisY.resetRecorder(defaultThreshold); gesture->d_ptr->mSceneAxisX.resetRecorder(defaultThreshold); gesture->d_ptr->mSceneAxisY.resetRecorder(defaultThreshold); - gesture->d_ptr->mAxisY.record( tp.screenPos().y(), mCurrentTime ); - gesture->d_ptr->mAxisX.record( tp.screenPos().x(), mCurrentTime ); - gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime ); - gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime ); + gesture->d_ptr->mAxisY.record( tp.screenPos().y(), currentTime ); + gesture->d_ptr->mAxisX.record( tp.screenPos().x(), currentTime ); + gesture->d_ptr->mSceneAxisX.record( scenePos.x(), currentTime ); + gesture->d_ptr->mSceneAxisY.record( scenePos.y(), currentTime ); if (gestureState != Qt::NoGesture) { return QGestureRecognizer::Ignore; @@ -319,7 +323,8 @@ Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QTouchEvent *te) + QTouchEvent *te, + qint64 currentTime) { QTouchEvent::TouchPoint tp = followedTouchPoint(te, gesture); @@ -345,13 +350,13 @@ gesture->d_ptr->mSceneLastOffset = gesture->d_ptr->mSceneOffset; gesture->d_ptr->mSceneOffset = HbGestureUtils::mapToScene(watched, tp.screenPos()) - gesture->d_ptr->mSceneStartPos; - gesture->d_ptr->mLastTimeStamp = mCurrentTime; + gesture->d_ptr->mLastTimeStamp = currentTime; - gesture->d_ptr->mAxisX.record( tp.screenPos().x(), mCurrentTime ); - gesture->d_ptr->mAxisY.record( tp.screenPos().y(), mCurrentTime ); + gesture->d_ptr->mAxisX.record( tp.screenPos().x(), currentTime ); + gesture->d_ptr->mAxisY.record( tp.screenPos().y(), currentTime ); QPointF scenePos = HbGestureUtils::mapToScene(watched, tp.screenPos()); - gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime ); - gesture->d_ptr->mSceneAxisY.record( scenePos.y(), mCurrentTime ); + gesture->d_ptr->mSceneAxisX.record( scenePos.x(), currentTime ); + gesture->d_ptr->mSceneAxisY.record( scenePos.y(), currentTime ); QGraphicsView* view = qobject_cast(watched->parent()); if (view) { @@ -375,13 +380,14 @@ Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QTouchEvent *te ) + QTouchEvent *te, + qint64 currentTime) { Q_UNUSED(te); Q_UNUSED(gesture); Q_UNUSED(watched); - gesture->d_ptr->mLastTimeStamp = mCurrentTime; + gesture->d_ptr->mLastTimeStamp = currentTime; if ( gestureState == Qt::GestureStarted || gestureState == Qt::GestureUpdated ) { @@ -405,11 +411,8 @@ HbPanGesture *gesture, QObject *watched, QEvent *event, - QTime currentTime) + qint64 currentTime) { - // Record the time right away. - mCurrentTime = currentTime; - if ( isMouseEvent(event->type()) ) { if (gesture->d_ptr->mIgnoreMouseEvents) { @@ -420,11 +423,11 @@ { case QEvent::MouseButtonDblClick: case QEvent::MouseButtonPress: - return handleMousePress(gestureState, gesture, watched, me); + return handleMousePress(gestureState, gesture, watched, me, currentTime); case QEvent::MouseMove: - return handleMouseMove(gestureState, gesture, watched, me); + return handleMouseMove(gestureState, gesture, watched, me, currentTime); case QEvent::MouseButtonRelease: - return handleMouseRelease(gestureState, gesture, watched, me); + return handleMouseRelease(gestureState, gesture, watched, me, currentTime); default: break; } } @@ -435,24 +438,23 @@ switch(event->type()) { case QEvent::TouchBegin: - return handleTouchBegin(gestureState, gesture, watched, te); - break; + return handleTouchBegin(gestureState, gesture, watched, te, currentTime); case QEvent::TouchUpdate: { gesture->d_ptr->mIgnoreMouseEvents = true; if (followedTouchPoint(te, gesture).state() == Qt::TouchPointReleased) { //qDebug() << "---- Finger changed ----"; - return handleTouchBegin(gestureState, gesture, watched, te); + return handleTouchBegin(gestureState, gesture, watched, te, currentTime); } if (followedTouchPoint(te, gesture).state() == Qt::TouchPointMoved) { - return handleTouchMove(gestureState, gesture, watched, te); + return handleTouchMove(gestureState, gesture, watched, te, currentTime); } break; } case QEvent::TouchEnd: //qDebug() << "===== TOUCHEND ======" ; gesture->d_ptr->mIgnoreMouseEvents = false; - return handleTouchEnd(gestureState, gesture, watched, te); + return handleTouchEnd(gestureState, gesture, watched, te, currentTime); default: break; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpangesturelogic_p.h --- a/src/hbcore/gestures/hbpangesturelogic_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpangesturelogic_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -26,11 +26,8 @@ #ifndef HBPANGESTURELOGIC_P_H #define HBPANGESTURELOGIC_P_H -#include "hbgestures_p.h" #include "hbglobal.h" -#include "hbpangesture_p.h" -#include #include #include #include @@ -55,40 +52,44 @@ Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QMouseEvent *me ); + QMouseEvent *me, + qint64 currentTime ); QGestureRecognizer::Result handleMouseMove( Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QMouseEvent *me ); + QMouseEvent *me, + qint64 currentTime ); QGestureRecognizer::Result handleMouseRelease( Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QMouseEvent *me ); + QMouseEvent *me, + qint64 currentTime ); QGestureRecognizer::Result handleTouchBegin( Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QTouchEvent *te ); + QTouchEvent *te, + qint64 currentTime ); QGestureRecognizer::Result handleTouchMove( Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QTouchEvent *te ); + QTouchEvent *te, + qint64 currentTime ); QGestureRecognizer::Result handleTouchEnd( Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, - QTouchEvent *te ); + QTouchEvent *te, + qint64 currentTime ); QGestureRecognizer::Result recognize( Qt::GestureState gestureState, HbPanGesture *gesture, QObject *watched, QEvent *event, - QTime currentTime); - - QTime mCurrentTime; + qint64 currentTime); }; #endif // HBPANGESTURELOGIC_P_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpinchgesture.cpp --- a/src/hbcore/gestures/hbpinchgesture.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpinchgesture.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,9 +23,8 @@ ** ****************************************************************************/ +#include "hbpinchgesture.h" #include "hbgestures_p.h" -#include "hbpinchgesture.h" -#include "hbpinchgesture_p.h" /*! @hbcore diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpinchgesture.h --- a/src/hbcore/gestures/hbpinchgesture.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpinchgesture.h Mon Oct 04 00:38:12 2010 +0300 @@ -71,6 +71,7 @@ Q_DISABLE_COPY(HbPinchGesture) friend class HbPinchGestureLogic; + friend class HbPinchGestureRecognizer; }; #endif // HBPINCHGESTURE_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpinchgesture_p.h --- a/src/hbcore/gestures/hbpinchgesture_p.h Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (developer.feedback@nokia.com) -** -** This file is part of the HbCore module of the UI Extensions for Mobile. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at developer.feedback@nokia.com. -** -****************************************************************************/ - -#ifndef HBPINCHGESTURE_P_H -#define HBPINCHGESTURE_P_H - -#include -#include - -class HB_CORE_PRIVATE_EXPORT HbPinchGesturePrivate -{ -public: - bool mIsNewSequence; - - qreal mSceneTotalRotationAngle; - qreal mSceneLastRotationAngle; - qreal mSceneRotationAngle; - - QPointF mSceneStartCenterPoint; - QPointF mSceneLastCenterPoint; - QPointF mSceneCenterPoint; -}; - -#endif // HBPINCHGESTURE_P_H - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpinchgesturelogic_p.cpp --- a/src/hbcore/gestures/hbpinchgesturelogic_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpinchgesturelogic_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,15 +23,16 @@ ** ****************************************************************************/ +#include "hbpinchgesture.h" +#include "hbpinchgesturelogic_p.h" +#include "hbgestures_p.h" + #include #include #include #include #include -#include "hbpinchgesture.h" -#include "hbpinchgesture_p.h" -#include "hbpinchgesturelogic_p.h" /*! @hbcore diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpinchgesturelogic_p.h --- a/src/hbcore/gestures/hbpinchgesturelogic_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpinchgesturelogic_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -30,8 +30,8 @@ #include #include +#include -class QPoint; class HbPinchGesture; class HB_CORE_PRIVATE_EXPORT HbPinchGestureLogic diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpointrecorder_p.cpp --- a/src/hbcore/gestures/hbpointrecorder_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpointrecorder_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -26,7 +26,6 @@ #include "hbpointrecorder_p.h" #include -#include #include //#define POINT_DEBUG @@ -75,7 +74,7 @@ void HbPointRecorder::resetRecorder(qreal threshold) { mThreshold = threshold; - clear(); + mPoints.clear(); } /*! @@ -86,18 +85,23 @@ \return Nothing. */ -void HbPointRecorder::record(qreal point, const QTime &time) +void HbPointRecorder::record(qreal point, qint64 time) { +#ifdef POINT_DEBUG + if (mThreshold == 0.0f) + hbWarning("Threshold has not been set for HbPointRecorder"); +#endif + // Empty list always accepts first point without tests. - if ( !isEmpty() ) { + if ( !mPoints.isEmpty() ) { // No point to record a point, if timestamp is less or equal with previous. - if ( lastTime().msecsTo(time) == 0 ) { + if ( time - lastTime() <= 0 ) { DEBUG() << "Ignoring point, because no difference in time stamps."; return; } // Don't tolerate points, which are too close to previously recorded point. - if ( qAbs(lastPoint() - point) < mThreshold ) { + if ( qAbs(lastPoint() - point) < mThreshold ) { DEBUG() << "Ignoring point, because it is withing threshold of previous point"; return; } @@ -106,21 +110,21 @@ // In case the list contains two or more points, direction can be // determined. Each new point added needs to be checked for direction // change. - if ( length() > 1 ) { + if ( mPoints.length() > 1 ) { // Clear list, on direction change. Leave the last recorded point // to the list, as it can be considered as first point for new direction. if ( dirChanged( point ) ) { - HbPointTime temp = last(); - clear(); - append(temp); + HbPointTime temp = mPoints.last(); + mPoints.clear(); + mPoints.append(temp); } } // Finally check, if the position has changed. Don't record point, when no position // change. - if ( isEmpty() || point != lastPoint() ) { + if ( mPoints.isEmpty() || point != lastPoint() ) { // Add point and time to list. - append(HbPointTime(point, time)); + mPoints.append(HbPointTime(point, time)); } else { DEBUG() << "Ignoring point, because it equals previous."; } @@ -134,8 +138,8 @@ */ qreal HbPointRecorder::lastPoint() const { - Q_ASSERT(!isEmpty()); - return last().first; + Q_ASSERT(!mPoints.isEmpty()); + return mPoints.last().first; } /*! @@ -144,10 +148,10 @@ \return Last recorded timestamp. */ -const QTime& HbPointRecorder::lastTime() const +qint64 HbPointRecorder::lastTime() const { - Q_ASSERT(!isEmpty()); - return last().second; + Q_ASSERT(!mPoints.isEmpty()); + return mPoints.last().second; } /*! @@ -158,11 +162,13 @@ */ bool HbPointRecorder::dirChanged( qreal point ) const { - // Without direction, the direction cannot really change - if ( length() < 2 ) { return false; } + int len = mPoints.length(); - qreal pos0 = (*this)[-2].first; - qreal pos1 = (*this)[-1].first; + // Without direction, the direction cannot really change + if ( len < 2 ) { return false; } + + qreal pos0 = mPoints.at(len-2).first; + qreal pos1 = mPoints.at(len-1).first; qreal dir0 = pos1 - pos0; qreal dir1 = point - pos1; @@ -174,21 +180,6 @@ return ( dir0 < 0 && dir1 >= 0 ) || ( dir0 > 0 && dir1 <= 0 ); } -/*! - \internal - \brief Operator to access the list. - - Supports negative values, which will define order from the end. -*/ -HbPointTime HbPointRecorder::operator[]( int number ) const -{ - // Let's trust, that QList::at() takes care of validity checks. - if ( number < 0 ) { - number = count() + number; - } - return at(number); -} - /*! \internal @@ -196,11 +187,6 @@ */ QList HbPointRecorder::getLastRecords( int number ) const { - QList recordings; - number = number > count() ? count() : number; - for (int i=count()-number; i < count(); i++) { - recordings.append((*this)[i]); - } - - return recordings; + number = qMin(number, mPoints.count()); + return mPoints.mid(mPoints.count() - number); } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbpointrecorder_p.h --- a/src/hbcore/gestures/hbpointrecorder_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbpointrecorder_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -27,39 +27,36 @@ #define HBPOINTRECORDER_P_H #include "hbglobal.h" -#include "hbgestures_p.h" #include #include #include -class QTime; -typedef QPair HbPointTime; +typedef QPair HbPointTime; -class HB_CORE_PRIVATE_EXPORT HbPointRecorder : public QList +class HB_CORE_PRIVATE_EXPORT HbPointRecorder { public: HbPointRecorder(); ~HbPointRecorder(); - void record(qreal pos, const QTime &time); - void resetRecorder(qreal threshold); + void record(qreal pos, qint64 time); + void resetRecorder(qreal threshold = 0.0f); qreal lastPoint() const; - const QTime& lastTime() const; + qint64 lastTime() const; bool dirChanged(qreal point) const; - HbPointTime operator[](int index) const; QList getLastRecords( int number ) const; + int count() const { return mPoints.count(); } + bool isEmpty() const { return mPoints.isEmpty(); } + HbPointTime at(int i) const { return mPoints.at(i); } + qreal mThreshold; + QList mPoints; }; -inline uint qHash(const QTime &) -{ - return 0; -} - inline uint qHash(const qreal) { return 0; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbswipegesture.cpp --- a/src/hbcore/gestures/hbswipegesture.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbswipegesture.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,9 +23,8 @@ ** ****************************************************************************/ +#include "hbswipegesture.h" #include "hbgestures_p.h" -#include "hbswipegesture.h" -#include "hbswipegesture_p.h" #include "hbglobal_p.h" #include #include @@ -121,6 +120,7 @@ { d_ptr->mSceneSwipeAngle = 0; + d_ptr->mTime.start(); } /*! diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbswipegesture.h --- a/src/hbcore/gestures/hbswipegesture.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbswipegesture.h Mon Oct 04 00:38:12 2010 +0300 @@ -60,6 +60,7 @@ Q_DISABLE_COPY(HbSwipeGesture) friend class HbSwipeGestureLogic; + friend class HbSwipeGestureRecognizer; public: // Deprecated qreal speed() const; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbswipegesture_p.h --- a/src/hbcore/gestures/hbswipegesture_p.h Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (developer.feedback@nokia.com) -** -** This file is part of the HbCore module of the UI Extensions for Mobile. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at developer.feedback@nokia.com. -** -****************************************************************************/ - -#ifndef HBSWIPEGESTURE_P_H -#define HBSWIPEGESTURE_P_H - -#include "hbpointrecorder_p.h" -#include - -#include -#include - -class HB_CORE_PRIVATE_EXPORT HbSwipeGesturePrivate -{ -public: - QPointF mStartPos; - QPointF mSceneStartPos; - QTime mStartTime; - - qreal mSceneSwipeAngle; - - HbPointRecorder mAxisX; - HbPointRecorder mAxisY; -}; - -#endif // HBSWIPEGESTURE_P_H - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbswipegesturelogic_p.cpp --- a/src/hbcore/gestures/hbswipegesturelogic_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbswipegesturelogic_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,10 +23,10 @@ ** ****************************************************************************/ +#include "hbswipegesture.h" +#include "hbswipegesturelogic_p.h" #include "hbgestures_p.h" -#include "hbswipegesture.h" -#include "hbswipegesture_p.h" -#include "hbswipegesturelogic_p.h" + #include "hbpointrecorder_p.h" #include "hbvelocitycalculator_p.h" @@ -55,7 +55,6 @@ */ HbSwipeGestureLogic::HbSwipeGestureLogic() { - mCurrentTime = QTime(); } HbSwipeGestureLogic::~HbSwipeGestureLogic() {} @@ -99,13 +98,14 @@ Qt::GestureState gestureState, HbSwipeGesture *gesture, QObject *watched, - QMouseEvent *me ) + QMouseEvent *me, + qint64 currentTime) { // Just ignore situations that are not interesting at all. if (!(gestureState == Qt::NoGesture && me->button() == Qt::LeftButton)) { return QGestureRecognizer::Ignore; } - gesture->d_func()->mStartTime = mCurrentTime; + gesture->d_func()->mStartTime = currentTime; gesture->d_func()->mStartPos = me->globalPos(); gesture->d_func()->mSceneStartPos = HbGestureUtils::mapToScene(watched, me->globalPos()); @@ -116,8 +116,8 @@ gesture->d_ptr->mAxisX.resetRecorder(velocityThreshold); gesture->d_ptr->mAxisY.resetRecorder(velocityThreshold); - gesture->d_ptr->mAxisX.record(me->globalPos().x(), mCurrentTime); - gesture->d_ptr->mAxisY.record(me->globalPos().y(), mCurrentTime); + gesture->d_ptr->mAxisX.record(me->globalPos().x(), currentTime); + gesture->d_ptr->mAxisY.record(me->globalPos().y(), currentTime); return QGestureRecognizer::MayBeGesture; } @@ -132,7 +132,8 @@ Qt::GestureState gestureState, HbSwipeGesture *gesture, QObject *watched, - QMouseEvent *me ) + QMouseEvent *me, + qint64 currentTime ) { Q_UNUSED(watched); Q_UNUSED(gestureState); @@ -141,8 +142,8 @@ return QGestureRecognizer::Ignore; } - gesture->d_ptr->mAxisX.record(me->globalPos().x(), mCurrentTime); - gesture->d_ptr->mAxisY.record(me->globalPos().y(), mCurrentTime); + gesture->d_ptr->mAxisX.record(me->globalPos().x(), currentTime); + gesture->d_ptr->mAxisY.record(me->globalPos().y(), currentTime); return QGestureRecognizer::MayBeGesture; } @@ -158,7 +159,8 @@ Qt::GestureState gestureState, HbSwipeGesture *gesture, QObject *watched, - QMouseEvent *me ) + QMouseEvent *me, + qint64 currentTime ) { Q_UNUSED(gesture); Q_UNUSED(watched); @@ -170,14 +172,14 @@ QPoint totalOffset = me->globalPos() - gesture->d_func()->mStartPos.toPoint(); - int deltaTime = gesture->d_func()->mStartTime.msecsTo(mCurrentTime); + qint64 deltaTime = currentTime - gesture->d_func()->mStartTime; QPointF velocity = deltaTime != 0 ? totalOffset / deltaTime : QPointF(0,0); gesture->setSwipeAngle(QLineF(gesture->d_func()->mStartPos, me->globalPos()).angle()); gesture->setSceneSwipeAngle(QLineF(gesture->d_func()->mSceneStartPos, HbGestureUtils::mapToScene(watched, me->globalPos())).angle()); bool movedEnough = totalOffset.manhattanLength() >= (int)(HbSwipeMinOffset * HbDeviceProfile::current().ppmValue()); bool fastEnough = velocity.manhattanLength() >= HbSwipeMinSpeed * HbDeviceProfile::current().ppmValue(); - bool notStoppedAtEnd = HbVelocityCalculator(gesture->d_ptr->mAxisX, gesture->d_ptr->mAxisY).velocity(mCurrentTime) != QPointF(0,0); + bool notStoppedAtEnd = HbVelocityCalculator(gesture->d_func()->mAxisX, gesture->d_func()->mAxisY).velocity(currentTime) != QPointF(0,0); if (movedEnough && fastEnough && notStoppedAtEnd) { return QGestureRecognizer::FinishGesture; @@ -197,11 +199,8 @@ HbSwipeGesture *gesture, QObject *watched, QEvent *event, - QTime currentTime) -{ - // Record the time right away. - mCurrentTime = currentTime; - + qint64 currentTime) +{ if ( isMouseEvent(event->type()) ) { QMouseEvent* me = static_cast(event); @@ -209,13 +208,13 @@ { case QEvent::MouseButtonDblClick: case QEvent::MouseButtonPress: - return handleMousePress(gestureState, gesture, watched, me); + return handleMousePress(gestureState, gesture, watched, me, currentTime); case QEvent::MouseMove: - return handleMouseMove(gestureState, gesture, watched, me); + return handleMouseMove(gestureState, gesture, watched, me, currentTime); case QEvent::MouseButtonRelease: - return handleMouseRelease(gestureState, gesture, watched, me); + return handleMouseRelease(gestureState, gesture, watched, me, currentTime); default: break; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbswipegesturelogic_p.h --- a/src/hbcore/gestures/hbswipegesturelogic_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbswipegesturelogic_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -46,25 +46,28 @@ Qt::GestureState gestureState, HbSwipeGesture *gesture, QObject *watched, - QMouseEvent *me); + QMouseEvent *me, + qint64 currentTime); QGestureRecognizer::Result handleMouseMove( Qt::GestureState gestureState, HbSwipeGesture *gesture, QObject *watched, - QMouseEvent *me); + QMouseEvent *me, + qint64 currentTime); QGestureRecognizer::Result handleMouseRelease( Qt::GestureState gestureState, HbSwipeGesture *gesture, QObject *watched, - QMouseEvent *me); + QMouseEvent *me, + qint64 currentTime); QGestureRecognizer::Result recognize( Qt::GestureState gestureState, HbSwipeGesture *gesture, QObject *watched, QEvent *event, - QTime currentTime); + qint64 currentTime); - QTime mCurrentTime; + qint64 mCurrentTime; }; #endif // HBSWIPEGESTURELOGIC_P_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapandholdgesture.cpp --- a/src/hbcore/gestures/hbtapandholdgesture.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbtapandholdgesture.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,9 +23,8 @@ ** ****************************************************************************/ +#include "hbtapandholdgesture.h" #include "hbgestures_p.h" -#include "hbtapandholdgesture_p.h" -#include "hbtapandholdgesture.h" #include @@ -121,9 +120,9 @@ */ HbTapAndHoldGesture::HbTapAndHoldGesture(QObject* parent) : - QTapAndHoldGesture(parent) + QTapAndHoldGesture(parent), + priv(new HbTapAndHoldGesturePrivate) { - priv = new HbTapAndHoldGesturePrivate(this); } /*! @@ -136,7 +135,7 @@ QTapAndHoldGesture(parent), priv(dd) { - priv->q_ptr = this; + hbWarning("Shared private not supported for tap-and-hold"); } /*! diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapandholdgesture.h --- a/src/hbcore/gestures/hbtapandholdgesture.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbtapandholdgesture.h Mon Oct 04 00:38:12 2010 +0300 @@ -48,8 +48,10 @@ HbTapAndHoldGesture(HbTapAndHoldGesturePrivate* data, QObject* parent = NULL); private: + Q_DECLARE_PRIVATE_D(priv, HbTapAndHoldGesture) HbTapAndHoldGesturePrivate* priv; friend class HbTapAndHoldGestureLogic; + friend class HbTapAndHoldGestureRecognizer; }; #endif // HBTAPANDHOLDGESTURE_P_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapandholdgesture_p.h --- a/src/hbcore/gestures/hbtapandholdgesture_p.h Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (developer.feedback@nokia.com) -** -** This file is part of the HbCore module of the UI Extensions for Mobile. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at developer.feedback@nokia.com. -** -****************************************************************************/ - -#ifndef HBTAPANDHOLDGESTURE_P_P_H -#define HBTAPANDHOLDGESTURE_P_P_H - -#include "hbtapandholdgesture.h" - -#include -#include -#include -#include -#include - -class HB_CORE_PRIVATE_EXPORT HbTapAndHoldGesturePrivate -{ -public: - HbTapAndHoldGesturePrivate(HbTapAndHoldGesture* owner = NULL) - : - q_ptr(owner), - mScenePos(QPointF(0,0)), - mRunningTime(0), - mTimerID(0) {}; - HbTapAndHoldGesture* q_ptr; - - QPointF mScenePos; - - int mRunningTime; - int mTimerID; -}; - -#endif // HBTAPANDHOLDGESTURE_P_P_H - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp --- a/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,12 +23,12 @@ ** ****************************************************************************/ +#include "hbtapandholdgesture.h" +#include "hbtapandholdgesturelogic_p.h" #include "hbgestures_p.h" -#include "hbtapandholdgesture.h" -#include "hbtapandholdgesture_p.h" -#include "hbtapandholdgesturelogic_p.h" #include + #include #include #include diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapandholdgesturelogic_p.h --- a/src/hbcore/gestures/hbtapandholdgesturelogic_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbtapandholdgesturelogic_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -26,11 +26,10 @@ #ifndef HBTAPANDHOLDGESTURELOGIC_P_H #define HBTAPANDHOLDGESTURELOGIC_P_H -#include "hbgestures_p.h" +#include #include #include -#include class QEvent; class QMouseEvent; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapgesture.cpp --- a/src/hbcore/gestures/hbtapgesture.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbtapgesture.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,9 +23,8 @@ ** ****************************************************************************/ +#include "hbtapgesture.h" #include "hbgestures_p.h" -#include "hbtapgesture.h" -#include "hbtapgesture_p.h" #include #include @@ -39,10 +38,6 @@ #endif -HbTapGesturePrivate::HbTapGesturePrivate(): mTapStyleHint(HbTapGesture::Tap), mTimerId(0) -{ -} - /*! @proto @hbcore diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapgesture.h --- a/src/hbcore/gestures/hbtapgesture.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbtapgesture.h Mon Oct 04 00:38:12 2010 +0300 @@ -65,6 +65,7 @@ Q_DECLARE_PRIVATE_D(d_ptr, HbTapGesture) Q_DISABLE_COPY(HbTapGesture) friend class HbTapGestureLogic; + friend class HbTapGestureRecognizer; }; #endif // HBTAPGESTURE_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapgesture_p.h --- a/src/hbcore/gestures/hbtapgesture_p.h Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (developer.feedback@nokia.com) -** -** This file is part of the HbCore module of the UI Extensions for Mobile. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at developer.feedback@nokia.com. -** -****************************************************************************/ - -#ifndef HBTAPGESTURE_P_H -#define HBTAPGESTURE_P_H -#include "hbtapgesture.h" - -class HB_CORE_PRIVATE_EXPORT HbTapGesturePrivate -{ - Q_DECLARE_PUBLIC(HbTapGesture) -public: - HbTapGesturePrivate(); - - QPointF mStartPos; - QPointF mSceneStartPos; - QPointF mScenePosition; - HbTapGesture::TapStyleHint mTapStyleHint; - int mTimerId; -protected: - HbTapGesture *q_ptr; -}; -#endif // HBTAPGESTURE_P_H - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapgesturelogic_p.cpp --- a/src/hbcore/gestures/hbtapgesturelogic_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbtapgesturelogic_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,13 +23,13 @@ ** ****************************************************************************/ -#include "hbgestures_p.h" +#include "hbtapgesture.h" #include "hbtapgesturelogic_p.h" -#include "hbtapgesture.h" -#include "hbtapgesture_p.h" +#include "hbgestures_p.h" + #include "hbnamespace_p.h" +#include -#include #include #include #include diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbtapgesturelogic_p.h --- a/src/hbcore/gestures/hbtapgesturelogic_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbtapgesturelogic_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -26,9 +26,7 @@ #ifndef HBTAPGESTURELOGIC_P_H #define HBTAPGESTURELOGIC_P_H -#include "hbgestures_p.h" #include "hbglobal.h" -#include "hbtapgesture_p.h" #include #include diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbvelocitycalculator_p.cpp --- a/src/hbcore/gestures/hbvelocitycalculator_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbvelocitycalculator_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -29,7 +29,6 @@ #include "hbgestures_p.h" #include -#include #include //#define VELOCITY_DEBUG @@ -69,12 +68,12 @@ \return */ -QPointF HbVelocityCalculator::velocity( const QTime& time ) const +QPointF HbVelocityCalculator::velocity( qint64 currentTime ) const { QPointF velocity(0.0, 0.0); - velocity.setX(calculate_velocity(mListX, time)); - velocity.setY(calculate_velocity(mListY, time)); + velocity.setX(calculate_velocity(mListX, currentTime)); + velocity.setY(calculate_velocity(mListY, currentTime)); DEBUG() << "Velocity: " << velocity; @@ -88,29 +87,30 @@ */ qreal HbVelocityCalculator::calculate_velocity( - const HbPointRecorder &list, - const QTime& time ) const + const HbPointRecorder &list, + qint64 currentTime) const { - Q_UNUSED(time) - if (list.count() < 2) { return 0.0; } - DEBUG() << "Stationary time: " << list.lastTime().msecsTo(time); - if (list.lastTime().msecsTo(time) >= HbVelocityStopTime) { + if (currentTime-list.lastTime() >= HbVelocityStopTime) { return 0.0; } // Accumulate the distance from previous point until we have sufficient sample qreal delta = 0.0; - int timeDelta = 0; + qint64 timeDelta = 0; int i = list.count(); while (timeDelta < HbVelocitySampleTime && i > 0) { i--; - timeDelta = list.at(i).second.msecsTo(time); + timeDelta = currentTime - list.at(i).second; } + if(timeDelta <= 0) { + return 0.0; + } + delta = list.lastPoint() - list.at(i).first; - return delta / (qreal)(list.at(i).second.msecsTo(time)); + return delta / (qreal)(timeDelta); } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gestures/hbvelocitycalculator_p.h --- a/src/hbcore/gestures/hbvelocitycalculator_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gestures/hbvelocitycalculator_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -30,17 +30,16 @@ class HbPointRecorder; class QPointF; -class QTime; class HB_CORE_PRIVATE_EXPORT HbVelocityCalculator { public: HbVelocityCalculator( const HbPointRecorder& listX, const HbPointRecorder& listY ); - QPointF velocity( const QTime& time ) const; + QPointF velocity( qint64 currentTime ) const; private: - qreal calculate_velocity( const HbPointRecorder& list, const QTime& time ) const; + qreal calculate_velocity( const HbPointRecorder& list, qint64 currentTime ) const; const HbPointRecorder& mListX; const HbPointRecorder& mListY; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/gui.pri --- a/src/hbcore/gui/gui.pri Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/gui.pri Mon Oct 04 00:38:12 2010 +0300 @@ -46,6 +46,8 @@ PUBLIC_HEADERS += $$PWD/hbsplashscreen.h PUBLIC_HEADERS += $$PWD/hblongpressvisualizer.h +RESTRICTED_HEADERS += $$PWD/hbglobalstatusbar_r.h + PRIVATE_HEADERS += $$PWD/hbabstractbutton_p.h PRIVATE_HEADERS += $$PWD/hbactionmanager_p.h PRIVATE_HEADERS += $$PWD/hbactionmanagerxmlparser_p.h @@ -130,6 +132,7 @@ SOURCES += $$PWD/hblongpressvisualizer.cpp SOURCES += $$PWD/hbwindowobscured_p.cpp SOURCES += $$PWD/hbscreenshotitem.cpp +SOURCES += $$PWD/hbglobalstatusbar.cpp symbian:SOURCES += $$PWD/hbdevicefadecontrolsym.cpp else:SOURCES += $$PWD/hbdevicefadecontrolwin.cpp diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbdialog.cpp --- a/src/hbcore/gui/hbdialog.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbdialog.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -505,6 +505,9 @@ void HbDialog::setPrimaryAction(HbAction *action) { HB_DEPRECATED("HbDialog::setPrimaryAction(HbAction *action) is deprecated. Use QGraphicsWidget action api instead"); + /* HbDialog::setPrimaryAction deprecation action coloring - begin */ + action->setProperty("invalid_addition", true); + /* HbDialog::setPrimaryAction deprecation action coloring - end */ Q_D(HbDialog); if (d->primaryAction && action != d->primaryAction) { removeAction(d->primaryAction); @@ -541,6 +544,9 @@ void HbDialog::setSecondaryAction(HbAction *action) { HB_DEPRECATED("HbDialog::setSecondaryAction(HbAction *action) is deprecated. Use QGraphicsWidget action api instead"); + /* HbDialog::setPrimaryAction deprecation action coloring - begin */ + action->setProperty("invalid_addition", true); + /* HbDialog::setPrimaryAction deprecation action coloring - end */ Q_D(HbDialog); if (d->secondaryAction && action != d->secondaryAction) { removeAction(d->secondaryAction); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbglobalstatusbar.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/gui/hbglobalstatusbar.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,200 @@ +/**************************************************************************** +** +** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (developer.feedback@nokia.com) +** +** This file is part of the HbCore module of the UI Extensions for Mobile. +** +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at developer.feedback@nokia.com. +** +****************************************************************************/ + +#include "hbglobalstatusbar_r.h" +#include "hbsplashdefs_p.h" +#include + +/*! + \class HbGlobalStatusBar + + \brief Provides access and change notifications for the image (screenshot) of + the statusbar rendered in background by the hbsplashgenerator process. + + \internal +*/ + +#ifdef Q_OS_SYMBIAN +#include +#include +#include + +class BitmapHandleWatcher : public CActive +{ +public: + BitmapHandleWatcher(HbSplashStatusBarKeys key, TCallBack callback); + ~BitmapHandleWatcher(); + void DoCancel(); + void RunL(); + TInt value(); + +private: + RProperty mProperty; + TCallBack mCallback; +}; + +BitmapHandleWatcher::BitmapHandleWatcher(HbSplashStatusBarKeys key, TCallBack callback) + : CActive(EPriorityStandard) +{ + CActiveScheduler::Add(this); + if (mProperty.Attach(hbsplash_server_uid3, key) == KErrNone) { + mCallback = callback; + mProperty.Subscribe(iStatus); + SetActive(); + } +} + +BitmapHandleWatcher::~BitmapHandleWatcher() +{ + Cancel(); + mProperty.Close(); +} + +void BitmapHandleWatcher::DoCancel() +{ + mProperty.Cancel(); +} + +void BitmapHandleWatcher::RunL() +{ + if (iStatus != KErrCancel) { + mProperty.Subscribe(iStatus); + SetActive(); + if (mCallback.iFunction) { + mCallback.CallBack(); + } + } +} + +TInt BitmapHandleWatcher::value() +{ + TInt v = 0; + mProperty.Get(v); + return v; +} + +class HbGlobalStatusBarPrivate +{ +public: + HbGlobalStatusBarPrivate(HbGlobalStatusBar *q); + ~HbGlobalStatusBarPrivate(); + static TInt splashImageChanged(TAny *param); + TInt bitmapHandle(Qt::Orientation orientation); + CFbsBitmap **storedBitmap(Qt::Orientation orientation); + + CFbsBitmap *mBmpPrt; + CFbsBitmap *mBmpLsc; + QScopedPointer mPrt; + QScopedPointer mLsc; +}; + +HbGlobalStatusBarPrivate::HbGlobalStatusBarPrivate(HbGlobalStatusBar *q) + : mBmpPrt(0), mBmpLsc(0) +{ + // Don't emit changed() twice, it's enough to have one callback because both + // statusbars are regenerated for every change. Note however that passing + // TCallBack() would cause a compiler warning with armcc because iPtr is + // left uninitialized, so specify 0 explicitly. + mPrt.reset(new BitmapHandleWatcher(HbSplashSbBitmapPrtKey, TCallBack(0, 0))); + mLsc.reset(new BitmapHandleWatcher(HbSplashSbBitmapLscKey, TCallBack(splashImageChanged, q))); +} + +HbGlobalStatusBarPrivate::~HbGlobalStatusBarPrivate() +{ + delete mBmpPrt; + delete mBmpLsc; +} + +TInt HbGlobalStatusBarPrivate::splashImageChanged(TAny *param) +{ + emit static_cast(param)->changed(); + return 0; +} + +TInt HbGlobalStatusBarPrivate::bitmapHandle(Qt::Orientation orientation) +{ + return orientation == Qt::Vertical ? mPrt->value() : mLsc->value(); +} + +CFbsBitmap **HbGlobalStatusBarPrivate::storedBitmap(Qt::Orientation orientation) +{ + return orientation == Qt::Vertical ? &mBmpPrt : &mBmpLsc; +} + +#endif + +HbGlobalStatusBar::HbGlobalStatusBar(QObject *parent) + : QObject(parent), d(0) +{ +#ifdef Q_OS_SYMBIAN + d = new HbGlobalStatusBarPrivate(this); +#endif +} + +HbGlobalStatusBar::~HbGlobalStatusBar() +{ +#ifdef Q_OS_SYMBIAN + delete d; +#endif +} + +QImage HbGlobalStatusBar::getImage(Qt::Orientation orientation) +{ +#ifdef Q_OS_SYMBIAN + QImage result; + TInt handle = d->bitmapHandle(orientation); + CFbsBitmap **store = d->storedBitmap(orientation); + if (!*store || (*store)->Handle() != handle) { + delete *store; + *store = 0; + CFbsBitmap *bmp = new CFbsBitmap; + if (bmp->Duplicate(handle) == KErrNone) { + *store = bmp; + } else { + qWarning("HbGlobalStatusBar: Duplicate() failed for handle %d", handle); + delete bmp; + } + } + if (*store) { + CFbsBitmap *bmp = *store; + // Make a deep copy because the bitmap content may change at any time. + uchar *src = reinterpret_cast(bmp->DataAddress()); + TSize sz = bmp->SizeInPixels(); + int srcBpl = CFbsBitmap::ScanLineLength(sz.iWidth, bmp->DisplayMode()); + QImage image(sz.iWidth, sz.iHeight, QImage::Format_ARGB32_Premultiplied); + uchar *dst = image.bits(); + if (srcBpl == image.bytesPerLine() && bmp->DisplayMode() == EColor16MAP) { + qMemCopy(dst, src, sz.iHeight * image.bytesPerLine()); + result = image; + } else { + qWarning("HbGlobalStatusBar: Bitmap mismatch"); + } + } + return result; +#else + Q_UNUSED(orientation); + return QImage(); +#endif +} diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbglobalstatusbar_r.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/gui/hbglobalstatusbar_r.h Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (developer.feedback@nokia.com) +** +** This file is part of the HbCore module of the UI Extensions for Mobile. +** +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at developer.feedback@nokia.com. +** +****************************************************************************/ + +#ifndef HBGLOBALSTATUSBAR_R_H +#define HBGLOBALSTATUSBAR_R_H + +#include +#include +#include + +class HbGlobalStatusBarPrivate; + +class HB_CORE_RESTRICTED_EXPORT HbGlobalStatusBar : public QObject +{ + Q_OBJECT + +public: + HbGlobalStatusBar(QObject *parent = 0); + ~HbGlobalStatusBar(); + QImage getImage(Qt::Orientation orientation); + +signals: + void changed(); + +private: + HbGlobalStatusBarPrivate *d; + friend class HbGlobalStatusBarPrivate; +}; + +#endif // HBGLOBALSTATUSBAR_R_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbmainwindow.cpp --- a/src/hbcore/gui/hbmainwindow.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbmainwindow.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -265,6 +265,10 @@ \internal */ +#ifdef Q_OS_SYMBIAN +#define HB_SPLASH_FLICKER_WORKAROUND +#endif + class HbRootItem : public HbWidget { public: @@ -1029,7 +1033,7 @@ d->mTheTestUtility = new HbTheTestUtility(this); } } -#ifdef Q_OS_SYMBIAN +#ifdef HB_SPLASH_FLICKER_WORKAROUND // Disable surface transparency unless we were really asked to be transparent. // Must be done before destroying the splash screen widget. if (!testAttribute(Qt::WA_TranslucentBackground)) { @@ -1105,7 +1109,7 @@ void HbMainWindow::showEvent(QShowEvent *event) { -#ifdef Q_OS_SYMBIAN +#ifdef HB_SPLASH_FLICKER_WORKAROUND // Enable surface transparency if QWidget did not do it already. This is a // workaround for having non-transparent surfaces filled automatically with // black color. The showEvent is a suitable place because the native control diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbmainwindow_p.cpp --- a/src/hbcore/gui/hbmainwindow_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbmainwindow_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -569,38 +569,36 @@ // Register the view switch animations from the theme. // Use HbEffectInternal and the HB_ prefix to prevent general overriding of these effects. // Instead, view switch effects can be overridden on a per-instance basis. - bool ok = HbEffectInternal::add( - QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view", - QStringList() << "view_show_normal" << "view_hide_normal" << "view_show_back" << "view_hide_back", - QStringList() << "show" << "hide" << "show_back" << "hide_back"); + const char *vsType[] = { "HB_view", "HB_view", "HB_view", "HB_view" }; + const char *vsPath[] = { "view_show_normal", "view_hide_normal", "view_show_back", "view_hide_back" }; + const char *vsEvent[] = { "show", "hide", "show_back", "hide_back" }; + bool ok = HbEffectInternal::add(vsType, vsPath, vsEvent, 4); if (!ok) { hbWarning("HbMainWindow: addViewEffects: atomic registration for show/hide effects failed"); } // Register the alternative default. - ok = HbEffectInternal::add( - QStringList() << "HB_view" << "HB_view" << "HB_view" << "HB_view", - QStringList() << "view_show_normal_alt" << "view_hide_normal_alt" << "view_show_back_alt" << "view_hide_back_alt", - QStringList() << "show_alt" << "hide_alt" << "show_alt_back" << "hide_alt_back"); + const char *vsAltPath[] = { "view_show_normal_alt", "view_hide_normal_alt", "view_show_back_alt", "view_hide_back_alt" }; + const char *vsAltEvent[] = { "show_alt", "hide_alt", "show_alt_back", "hide_alt_back" }; + ok = HbEffectInternal::add(vsType, vsAltPath, vsAltEvent, 4); if (!ok) { hbWarning("HbMainWindow: addViewEffects: atomic registration for alternative show/hide effects failed"); } // Register titlebar effects. // These should be overridable in general (so we use HbEffect and no HB_ prefix). - ok = HbEffect::add( - QStringList() << "titlebar" << "titlebar" << "titlebar" << "titlebar", - QStringList() << "titlebar_disappear" << "titlebar_appear" << "titlebar_orient_disappear" << "titlebar_orient_appear", - QStringList() << "disappear" << "appear" << "disappear_orient" << "appear_orient"); + const char *tbType[] = { "titlebar", "titlebar", "titlebar", "titlebar" }; + const char *tbPath[] = { "titlebar_disappear", "titlebar_appear", "titlebar_orient_disappear", "titlebar_orient_appear" }; + const char *tbEvent[] = { "disappear", "appear", "disappear_orient", "appear_orient" }; + ok = HbEffectInternal::add(tbType, tbPath, tbEvent, 4); if (!ok) { hbWarning("HbMainWindow: addViewEffects: atomic registration for titlebar effects failed"); } // Register statusbar effects. - ok = HbEffect::add( - QStringList() << "statusbar" << "statusbar" << "statusbar" << "statusbar", - QStringList() << "statusbar_disappear" << "statusbar_appear" << "statusbar_orient_disappear" << "statusbar_orient_appear", - QStringList() << "disappear" << "appear" << "disappear_orient" << "appear_orient"); + const char *sbType[] = { "statusbar", "statusbar", "statusbar", "statusbar" }; + const char *sbPath[] = { "statusbar_disappear", "statusbar_appear", "statusbar_orient_disappear", "statusbar_orient_appear" }; + ok = HbEffectInternal::add(sbType, sbPath, tbEvent, 4); if (!ok) { hbWarning("HbMainWindow: addViewEffects: atomic registration for statusbar effects failed"); } @@ -1218,9 +1216,7 @@ } process.Close(); } -#endif -#ifdef Q_OS_SYMBIAN void HbMainWindowPrivate::deviceDialogConnectionReady(RHbDeviceDialogClientSession *clientSession) { mDevDlgClientSession = clientSession; @@ -1228,5 +1224,4 @@ updateForegroundOrientationPSKey(); } } - #endif //Q_OS_SYMBIAN diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbmenu.cpp --- a/src/hbcore/gui/hbmenu.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbmenu.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -76,19 +76,28 @@ void HbMenuPrivate::addPopupEffects() { #ifdef HB_EFFECTS - effectType = "HB_MENU"; + if (menuType == HbMenu::OptionsMenu) { + effectType = "HB_MENU"; + } else { + effectType = "HB_SUBMENU"; + } hasEffects = menuEffectsLoaded; if (menuEffectsLoaded) return; menuEffectsLoaded = true; hasEffects = HbEffectInternal::add("HB_MENU", "menu_appear", "appear"); if (hasEffects) { - //We load the disappear effect only if appear effect was also loaded hasEffects = HbEffectInternal::add("HB_MENU", "menu_disappear", "disappear"); if (hasEffects) { hasEffects = HbEffectInternal::add("HB_menuitem", "menuitem_press", "clicked"); } + if (hasEffects) { + hasEffects = HbEffectInternal::add("HB_SUBMENU", "submenu_appear", "appear"); + } + if (hasEffects) { + hasEffects = HbEffectInternal::add("HB_SUBMENU", "submenu_disappear", "disappear"); + } } #endif } @@ -104,7 +113,6 @@ } #endif HbAction *hbAction = qobject_cast(currentItem->action()); - q->setActiveAction(hbAction); if (hbAction && hbAction->menu() && !actionTriggered) { hbAction->trigger(); stopTimeout(); @@ -148,6 +156,7 @@ void HbMenuPrivate::changeToOptionsMenu() { menuType = HbMenu::OptionsMenu; + effectType = "HB_MENU"; } HbMenuItem *HbMenuPrivate::subMenuItem() @@ -163,9 +172,12 @@ void HbMenuPrivate::_q_onActionTriggered() { Q_Q(HbMenu); - HbAction *action = qobject_cast(q->sender()); - if (action && !action->menu() ) { // do not trigger from opening submenu - emit q->triggered(action); + HbAction *action = qobject_cast(q->sender()); + if (action) { + q->setActiveAction(action); + if (!action->menu()) { // do not trigger from opening submenu + emit q->triggered(action); + } } } @@ -415,7 +427,7 @@ mSubMenuItem->size().width() + mRightMargin - q->size().width(); } - q->setPreferredPos(QPointF(leftEdge, upperEdge)); + q->setPreferredPos(QPointF(leftEdge, upperEdge), HbPopup::TopLeftCorner); } else { qreal rightEdge = mSubMenuItem->scenePos().x() + mRightMargin; if ((rightEdge - q->size().width()) < 0) { @@ -972,4 +984,41 @@ HbMenu::show(); } +/*! + Overidden from popup. Sets the preferred position of the menu. + + \param preferredPos Defines the coordinates of preferred position on the screen where + the menu is to open. + \param placement The corner or edge of the dialog that is to be placed at \a preferredPos. + + \b Example: + \code + HbMenu *menu = new HbMenu(); + + menu->setPreferredPos( QPointF(x,y), HbPopup::BottomEdgeCenter ); + menu->show(); + \endcode + */ +void HbMenu::setPreferredPos( const QPointF& preferredPos, + HbPopup::Placement placement ) +{ + Q_D(HbMenu); + bool layoutFlag = false; + if (d->preferredPos != preferredPos ) { + d->preferredPos = preferredPos; + layoutFlag = true; + } + if (d->placement != placement) { + d->placement = placement; + layoutFlag = true; + } + d->preferredPosSet = true; + //If position updated, informing layoutproxy with layoutrequest + if (layoutFlag) { + QEvent layoutRequest = QEvent::LayoutRequest; + QApplication::sendEvent(this, &layoutRequest); + } +} + + #include "moc_hbmenu.cpp" diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbmenu.h --- a/src/hbcore/gui/hbmenu.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbmenu.h Mon Oct 04 00:38:12 2010 +0300 @@ -77,6 +77,9 @@ int type() const { return Type; } QPainterPath shape() const; + void setPreferredPos(const QPointF& position, + HbPopup::Placement placement = HbPopup::BottomEdgeCenter); + public slots: void open(QObject *receiver = 0, const char *member = 0); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbmenuitem_p.cpp --- a/src/hbcore/gui/hbmenuitem_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbmenuitem_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -270,28 +270,27 @@ #ifdef HB_GESTURE_FW void HbMenuItem::gestureEvent(QGestureEvent *event) { - //Q_D(HbMenuItem); if(HbTapGesture *gesture = qobject_cast(event->gesture(Qt::TapGesture))) { if (gesture->state() == Qt::GestureStarted) { - if (scene()) + if (scene()) { scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture); + } gesture->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect()); - - // Tactile feedback HbWidgetFeedback::triggered(this, Hb::InstantPressed); - pressStateChanged(true); event->accept(); } else if (gesture->state() == Qt::GestureFinished) { - if (scene()) + if (scene()) { scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant()); + } HbWidgetFeedback::triggered(this, Hb::InstantReleased); pressStateChanged(false); event->accept(); HbMenuPrivate::d_ptr(menu())->_q_triggerAction(this); } else if (gesture->state() == Qt::GestureCanceled) { - if (scene()) + if (scene()) { scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant()); + } pressStateChanged(false); } } @@ -389,6 +388,10 @@ focusItem->setGeometry(boundingRect()); } } else if (d->mFocusItem){ + // hide() is required below in case there is a gesture + // cancellation going on. Without hide() the highlight is not + // removed. + d->mFocusItem->hide(); delete d->mFocusItem; d->mFocusItem = 0; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbpopup.cpp --- a/src/hbcore/gui/hbpopup.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbpopup.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -283,6 +283,24 @@ }; /* + Currently, virtual keyboard must be able to position a popup + containing an editor to an arbitrary place. VKB does its best to + reposition the popup back to original position when needed. At least in + orientation switch the old position naturally is wrong, hence popup + must be relayouted. + + It would be unreasonable to make special checks for popup in vkb + side. It also would be unreasonable to do special checks for vkb in + popup side. Hence this semi-hidden dynamic property for + communicating this special case. + + WARNING: Do not count on this special behaviour, we might remove it + without prior notice. If you do require such a behavior, please + raise a feature request and we might make this a proper API. + */ +const char* KPositionManagedByVKB("PositionManagedByVKB"); + +/* \primitives \primitive{background} HbFrameItem representing the popup background. The background can be weak or strong (different graphical styles) depending on popup type. @@ -424,6 +442,8 @@ itemFlags |= QGraphicsItem::ItemIsPanel; q->setFlags(itemFlags); q->setActive(false); + + q->setAcceptTouchEvents(true); } void HbPopupPrivate::_q_appearEffectEnded(HbEffect::EffectStatus status) @@ -431,6 +451,11 @@ Q_UNUSED(status); } +void HbPopupPrivate::_q_maskEffectDestroyed() +{ + mVgMaskEffect = 0; +} + CSystemToneService* HbPopupPrivate::systemToneService() { return HbInstancePrivate::d_ptr()->systemTone(); @@ -486,7 +511,7 @@ { Q_Q(HbPopup); if (q->isVisible() || q) { - QEvent userEvent(QEvent::ContextMenu); + QEvent userEvent(QEvent::LayoutRequest); QCoreApplication::sendEvent(q, &userEvent); } @@ -718,6 +743,10 @@ mVgMaskEffect = 0; } } + if (mVgMaskEffect) { + // Make sure that mask effect is reset when destroyed + QObject::connect(mVgMaskEffect, SIGNAL(destroyed()), q, SLOT(_q_maskEffectDestroyed())); + } } QPixmap image(q->backgroundItem()->boundingRect().size().toSize()); image.fill(Qt::transparent); @@ -749,7 +778,7 @@ { Q_D(HbPopup); d->q_ptr = this; - d->init(); + d->init(); } @@ -761,7 +790,7 @@ { Q_D(HbPopup); d->q_ptr = this; - d->init(); + d->init(); } /*! Destructor. @@ -972,7 +1001,15 @@ { Q_D(HbPopup); - if (change == QGraphicsItem::ItemPositionChange) { + if (change == QGraphicsItem::ItemPositionChange) { + // Skipping X-coordinate changes made by VKB since popupmanager handles popup to be in the + // center of the screen + if (property(KPositionManagedByVKB).isValid() && property(KPositionManagedByVKB).toBool() && + !d->mAutoLayouting && value.isValid() && !value.toPointF().isNull()) { + QPointF newPointF(geometry().x(), value.toPointF().y()); + d->mAutoLayouting = false; + return newPointF; + } d->mAutoLayouting = false; } if (change == QGraphicsItem::ItemVisibleHasChanged) { @@ -1224,25 +1261,6 @@ HbWidget::closeEvent(event); } - -/* - Currently, virtual keyboard must be able to position a popup - containing an editor to an arbitrary place. VKB does its best to - reposition the popup back to original position when needed. At least in - orientation switch the old position naturally is wrong, hence popup - must be relayouted. - - It would be unreasonable to make special checks for popup in vkb - side. It also would be unreasonable to do special checks for vkb in - popup side. Hence this semi-hidden dynamic property for - communicating this special case. - - WARNING: Do not count on this special behaviour, we might remove it - without prior notice. If you do require such a behavior, please - raise a feature request and we might make this a proper API. - */ -const char* KPositionManagedByVKB("PositionManagedByVKB"); - /*! Reimplemented from QGraphicsWidget. */ @@ -1287,6 +1305,10 @@ } #endif //HB_EFFECTS //workaround ends + } else if (event->type() == QEvent::TouchBegin) { + // Accept all touch begin events to get the full Begin..End sequence + event->accept(); + return true; } else if (d->mGestureOverride && event->type() == QEvent::GestureOverride) { event->accept(); return true; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbpopup.h --- a/src/hbcore/gui/hbpopup.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbpopup.h Mon Oct 04 00:38:12 2010 +0300 @@ -111,7 +111,7 @@ enum { Type = Hb::ItemType_Popup }; int type() const { return Type; } - void setPreferredPos(const QPointF& position, + virtual void setPreferredPos(const QPointF& position, HbPopup::Placement placement = HbPopup::TopLeftCorner); QPainterPath shape() const; @@ -145,6 +145,7 @@ Q_PRIVATE_SLOT(d_func(), void _q_orientationAboutToChange(Qt::Orientation orient, bool animate)) Q_PRIVATE_SLOT(d_func(), void _q_orientationChanged()) Q_PRIVATE_SLOT(d_func(), void _q_appearEffectEnded(HbEffect::EffectStatus status)) + Q_PRIVATE_SLOT(d_func(), void _q_maskEffectDestroyed()) #endif // HB_EFFECTS Q_PRIVATE_SLOT(d_func(), void _q_timeoutFinished()) }; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbpopup_p.h --- a/src/hbcore/gui/hbpopup_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbpopup_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -121,6 +121,7 @@ void _q_delayedHide(HbEffect::EffectStatus status); virtual void _q_appearEffectEnded(HbEffect::EffectStatus status); void _q_orientationAboutToChange(Qt::Orientation orient, bool animate); + void _q_maskEffectDestroyed(); #endif // HB_EFFECTS void _q_timeoutFinished(); void _q_orientationChanged(); @@ -155,6 +156,7 @@ friend class HbPopupLayoutProxy; friend class HbDeviceDialogManagerPrivate; friend class HbInputCommonDialogs; + friend class HbInputFocusObject; // To be able to unit test private features friend class TestHbPopup; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbpopupmanager.cpp --- a/src/hbcore/gui/hbpopupmanager.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbpopupmanager.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -39,9 +39,10 @@ #include #include #include -#include #include +extern const char* KPositionManagedByVKB; + HbPopupLayoutSpacer::HbPopupLayoutSpacer( QGraphicsItem *parent ) : HbWidgetBase( parent ) { @@ -77,7 +78,7 @@ void HbPopupLayoutProxy::setGeometry(const QRectF &rect) { - if (!mPopup.isNull()) { + if (!mPopup.isNull()) { const QSizeF popupPreferredSize = mPopup->effectiveSizeHint(Qt::PreferredSize); const QSizeF usedSize( qMin(rect.width(), popupPreferredSize.width() ), @@ -122,8 +123,16 @@ usedy = qMin(y-uh/2, ph-uh); break; case HbPopup::BottomEdgeCenter: + { usedx = qMin(x-uw/2, pw-uw); - usedy = qMin(y-uh, ph-uh); + HbMenu *menu = qobject_cast(mPopup); + if(menu && ((y-uh) < 0)) { + usedy = qMin(y,ph-uh); + } + else { + usedy = qMin(y-uh, ph-uh); + } + } break; case HbPopup::LeftEdgeCenter: usedx = qMin(x, pw-uw); @@ -137,14 +146,23 @@ //should not happen break; } + if ( usedx < screenMargin ) usedx = screenMargin; if ( usedy < screenMargin ) usedy = screenMargin; - usedPos = QPointF(usedx, usedy); } if (((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting) { mPopup->setGeometry(QRectF(usedPos, usedSize)); + ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting = true; + } else if (mPopup->property(KPositionManagedByVKB).isValid() && + mPopup->property(KPositionManagedByVKB).toBool()) { + //Special case for the popups which y-position is handled by VKB + QPointF currentPos = mPopup->pos(); + currentPos.setX(usedPos.x()); + bool previousLayouting = ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting; ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting = true; + mPopup->setGeometry(QRectF(currentPos, usedSize)); + ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting = previousLayouting; } else { mPopup->resize(usedSize); } @@ -168,7 +186,6 @@ Q_UNUSED( obj ); switch( event->type() ) { case QEvent::LayoutRequest: - case QEvent::ContextMenu: case QEvent::Close: { updateGeometry(); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbscrollarea.cpp --- a/src/hbcore/gui/hbscrollarea.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbscrollarea.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -33,6 +33,7 @@ #include "hbglobal_p.h" #include #include +#include #include @@ -543,6 +544,8 @@ d->adjustContent(); else d->_q_hideScrollBars(); + //need to invalidate the whole region as we apply clipping + prepareGeometryChange(); } return HbWidget::itemChange(change, value); @@ -763,7 +766,17 @@ Q_UNUSED(obj); Q_D(HbScrollArea); if (event && event->type() == QEvent::GraphicsSceneResize) { - if (isVisible()) { + //If layoutdirection is from right to left, we expand the contentwidget to the left + //instead of the right + if (layoutDirection() == Qt::RightToLeft) { + QGraphicsSceneResizeEvent *resizeEvent = static_cast(event); + if (resizeEvent) { + qreal xChange = resizeEvent->newSize().width() - resizeEvent->oldSize().width(); + qreal newXPos = d->mContents->pos().x() - xChange; + d->mContents->setPos(newXPos, d->mContents->pos().y()); + } + } + if (isVisible()) { d->adjustContent(); } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbscrollarea.h --- a/src/hbcore/gui/hbscrollarea.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbscrollarea.h Mon Oct 04 00:38:12 2010 +0300 @@ -156,6 +156,7 @@ private: Q_DECLARE_PRIVATE_D(d_ptr, HbScrollArea) Q_PRIVATE_SLOT(d_func(), void _q_thumbPositionChanged(qreal value, Qt::Orientation orientation)) + Q_PRIVATE_SLOT(d_func(), void _q_thumbPositionChanged2(qreal value, int orientation)) Q_PRIVATE_SLOT(d_func(), void _q_groovePressed(qreal value, Qt::Orientation orientation)) Q_PRIVATE_SLOT(d_func(), void _q_thumbPressed()) Q_PRIVATE_SLOT(d_func(), void _q_thumbReleased()) diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbscrollarea_p.cpp --- a/src/hbcore/gui/hbscrollarea_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbscrollarea_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -708,11 +708,11 @@ QRectF contentsBoundingRect = mContents->boundingRect(); QPointF alignedPosition = mContents->pos(); - bool xAlignmentNeeded = (!mAbleToScrollX && ((-alignedPosition.x() < leftBoundary()) || + bool xAlignmentNeeded = mResetAlignment || (!mAbleToScrollX && ((-alignedPosition.x() < leftBoundary()) || -alignedPosition.x() > rightBoundary())); - bool yAlignmentNeeded = (!mAbleToScrollY && ((-alignedPosition.y() < topBoundary()) || + bool yAlignmentNeeded = mResetAlignment || (!mAbleToScrollY && ((-alignedPosition.y() < topBoundary()) || -alignedPosition.y() > bottomBoundary())); - if (mResetAlignment || xAlignmentNeeded || yAlignmentNeeded) { + if (xAlignmentNeeded) { if (mAlignment & Qt::AlignHCenter) { alignedPosition.setX((scrollAreaBoundingRect.width() - contentsBoundingRect.width()) / 2.0); } else if (mAlignment & Qt::AlignRight) { @@ -721,7 +721,8 @@ mContents->pos().x() + contentsBoundingRect.x() > 0.0) { alignedPosition.setX(-contentsBoundingRect.x()); } - + } + if (yAlignmentNeeded) { if (mAlignment & Qt::AlignVCenter) { alignedPosition.setY((scrollAreaBoundingRect.height() - contentsBoundingRect.height()) / 2.0); } else if (mAlignment & Qt::AlignBottom) { @@ -744,6 +745,12 @@ } if (alignedPosition != mContents->pos()) { setContentPosition(alignedPosition); + if (mAbleToScrollX && mHorizontalScrollBar->isVisible()) { + updateScrollBar(Qt::Horizontal); + } + if (mAbleToScrollY && mVerticalScrollBar->isVisible()) { + updateScrollBar(Qt::Vertical); + } } if (mContinuationIndicators) { updateIndicators(-mContents->pos()); @@ -979,10 +986,19 @@ } } +void HbScrollAreaPrivate::_q_thumbPositionChanged(qreal value, Qt::Orientation orientation) +{ + Q_Q( HbScrollArea ); + // TODO Making syncronous asynhronous...Qt::QueuedConnection in signal slot connection would have done the job. + // Doing it requires Qt::Orientation to be registered as meta type. When done, handling Qt::Orientation as + // QMetaEnum is broken. When fixed by Qt, this workaround can be replaced by Qt::QueuedConnection. + QMetaObject::invokeMethod(q, "_q_thumbPositionChanged2", Qt::QueuedConnection, Q_ARG(qreal, value), Q_ARG(int, orientation)); +} + /** * */ -void HbScrollAreaPrivate::_q_thumbPositionChanged(qreal value, Qt::Orientation orientation) +void HbScrollAreaPrivate::_q_thumbPositionChanged2(qreal value, int orientation) { if ( mTargetAnimationInProgress ) { stopAnimating(); @@ -1000,7 +1016,7 @@ return; } - setContentPosition(value, orientation, false); + setContentPosition(value, (Qt::Orientation)orientation, false); reStartScrollbarHideTimer(); if (mContinuationIndicators) { diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbscrollarea_p.h --- a/src/hbcore/gui/hbscrollarea_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbscrollarea_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -93,6 +93,7 @@ void _q_animateScrollTimeout(); void _q_hideScrollBars(); void _q_thumbPositionChanged(qreal value, Qt::Orientation orientation); + void _q_thumbPositionChanged2(qreal value, int orientation); void _q_groovePressed(qreal value, Qt::Orientation orientation); void _q_thumbPressed(); void _q_thumbReleased(); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbscrollbar.cpp --- a/src/hbcore/gui/hbscrollbar.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbscrollbar.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -41,7 +41,7 @@ #endif static const int REPEATION_TIME = 500; -static const qreal THRESHOLD_VALUE = 2.0; +static const qreal THRESHOLD_VALUE = 4.0; /*! @stable @hbcore @@ -348,7 +348,7 @@ */ bool HbScrollBar::isInteractive() const { - const Q_D(HbScrollBar); + Q_D(const HbScrollBar); return d->mInteractive; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbsettingswindow_p.cpp --- a/src/hbcore/gui/hbsettingswindow_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbsettingswindow_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -103,7 +103,6 @@ mGeneralSettingsForSensorsComboBox = new QComboBox(this); //krazy:exclude=qclasses mUnsetOrientationButton = new QPushButton(tr("&Unset orientation"), this); //krazy:exclude=qclasses - mLights = true; HbIcon icon("qtg_mono_light"); mLightsButton = new QPushButton(icon.pixmap(), "", this); //krazy:exclude=qclasses mAnimationButton = new QPushButton(tr("&Animation on"), this); //krazy:exclude=qclasses @@ -376,21 +375,25 @@ void HbSettingsWindow::toggleLights() { - HbIcon icon("qtg_mono_light"); + HbIcon icon; + if (mLights) { + mLights = false; + icon.setIconName("qtg_mono_light_off"); + } else { + mLights = true; + icon.setIconName("qtg_mono_light"); + } + mLightsButton->setIcon(icon.pixmap()); + QList mainWindowList = hbInstance->allMainWindows(); for (int i = 0; i < mainWindowList.count(); ++i) { if (mLights) { - icon.setIconName("qtg_mono_light_off"); - mainWindowList[i]->broadcastEvent(HbEvent::SleepModeEnter); - mLights = false; - mainWindowList[i]->setForegroundBrush(QBrush(Qt::black, Qt::Dense1Pattern)); + mainWindowList[i]->broadcastEvent(HbEvent::SleepModeExit); + mainWindowList[i]->setForegroundBrush(Qt::NoBrush); } else { - icon.setIconName("qtg_mono_light"); - mainWindowList[i]->broadcastEvent(HbEvent::SleepModeExit); - mLights = true; - mainWindowList[i]->setForegroundBrush(Qt::NoBrush); + mainWindowList[i]->broadcastEvent(HbEvent::SleepModeEnter); + mainWindowList[i]->setForegroundBrush(QBrush(Qt::black, Qt::Dense1Pattern)); } - mLightsButton->setIcon(icon.pixmap()); } } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbsplashdefs_p.h --- a/src/hbcore/gui/hbsplashdefs_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbsplashdefs_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -51,6 +51,12 @@ HbSplashSrvBadParam }; +// Keys for P&S properties containing the statusbar bitmap handles. +enum HbSplashStatusBarKeys { + HbSplashSbBitmapPrtKey = 1, + HbSplashSbBitmapLscKey +}; + #endif // Q_OS_SYMBIAN enum HbSplashStoredExtraFlags { diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbsplashscreen.cpp --- a/src/hbcore/gui/hbsplashscreen.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbsplashscreen.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -27,6 +27,7 @@ #include "hbsplashscreen_generic_p.h" #include "hbsplash_p.h" #include "hbsplashdefs_p.h" +#include "hbapplication.h" #include #include @@ -40,7 +41,7 @@ #if defined(Q_OS_SYMBIAN) && defined(HB_EFFECTS_OPENVG) // When Symbian/EGL/OpenVG is available we can use the more efficient -// implementation which is not just faster but is able to operate +// implementation which is not only faster but is able to operate // without having Qt or any other framework initialized. This means // having truly 'instant' splash screens. #define HB_SPLASH_DIRECT_WS @@ -162,13 +163,23 @@ the application, this becomes important because the application startup experience can be greatly improved by making sure the splash is shown as early as possible. + + On Symbian the splash will be automatically suppressed (i.e. not shown) if the + application was started to background, that is, + HbApplication::startedToBackground() returns true. To override this default + behavior, pass HbSplashScreen::ShowWhenStartingToBackground. */ void HbSplashScreen::start(Flags flags) { Flags realFlags = flags | requestProps()->mSplashFlags; + if (!realFlags.testFlag(ShowWhenStartingToBackground) + && HbApplication::startedToBackground()) { + splDebug("[hbsplash] app started to background, suppressing splash"); + return; + } if (!splashScreen) { #ifdef HB_SPLASH_DIRECT_WS - if (realFlags.testFlag(HbSplashScreen::ForceQt)) { + if (realFlags.testFlag(ForceQt)) { splashScreen = new HbSplashScreenGeneric; } else { splashScreen = new HbSplashScreenSymbianVg; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbsplashscreen.h --- a/src/hbcore/gui/hbsplashscreen.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbsplashscreen.h Mon Oct 04 00:38:12 2010 +0300 @@ -35,7 +35,8 @@ Default = 0x00, FixedVertical = 0x01, FixedHorizontal = 0x02, - ForceQt = 0x04 + ForceQt = 0x04, + ShowWhenStartingToBackground = 0x08 }; Q_DECLARE_FLAGS(Flags, Flag) diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbtoolbar.cpp --- a/src/hbcore/gui/hbtoolbar.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbtoolbar.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -37,6 +37,7 @@ #include "hbactionmanager_p.h" #include "hbmainwindow_p.h" #include "hbcolorscheme.h" +#include "hbevent.h" #include @@ -463,6 +464,14 @@ if (event->type() == QEvent::LayoutDirectionChange) { d->updateToolBarExtensions(); d->updateButtonsLayoutDirection(); + } else if (event->type() == HbEvent::ThemeChanged) { + // forward change event to toolbuttons + if (d->moreExtensionButton) { + d->moreExtensionButton->event(event); + } + foreach(HbToolButton *button, d->mToolButtons) { + button->event(event); + } } QGraphicsWidget::changeEvent(event); @@ -475,7 +484,7 @@ { Q_D(HbToolBar); HbWidget::resizeEvent(event); - if (isVisible()) { + if (d->polished && isVisible()) { d->updateToolBarForSizeChange(); } } @@ -543,7 +552,12 @@ void HbToolBar::polish(HbStyleParameters ¶ms) { Q_D(HbToolBar); - if (d->mDoLayoutPending && isVisible()) { + bool resize = d->mDialogToolBar || testAttribute(Qt::WA_Resized) || + !parentItem() || (parentLayoutItem() && !parentLayoutItem()->isLayout()) + || (parentLayoutItem() && parentLayoutItem()->isLayout() && static_cast(parentLayoutItem())->isActivated()) + || d->polished; + if (d->mDoLayoutPending && isVisible() && resize) { + d->initialButtonsPolish = false; d->doLayout(); } HbWidget::polish(params); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbtoolbar.h --- a/src/hbcore/gui/hbtoolbar.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbtoolbar.h Mon Oct 04 00:38:12 2010 +0300 @@ -64,6 +64,8 @@ void setOrientation(Qt::Orientation orientation); protected: + friend class HbView; + HbToolBar( HbToolBarPrivate &dd, QGraphicsItem *parent = 0 ); QVariant itemChange( GraphicsItemChange change, const QVariant &value ); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbtoolbar_p.cpp --- a/src/hbcore/gui/hbtoolbar_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbtoolbar_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -43,6 +43,7 @@ #include #include // for QWIDGETSIZE_MAX #include +#include #include #ifdef HB_EFFECTS @@ -74,7 +75,8 @@ mDoLayoutPending(true), mOrientationEffectsRunning(false), mSuppressNextAppearEffect(false), - mAppearedOnce(false) + mAppearedOnce(false), + initialButtonsPolish(true) { } @@ -581,6 +583,23 @@ updateButtons(maxToolBarButtons); q->setLayout(mLayout); q->layout()->setMinimumSize(minimumToolButtonSize); + //This needs to be done when toolbar is not in a dialog and being added first time to view. + //Since toolbar needs to make a decision of having a more button or not based on the no of actions and + //its width. Width is not set correctly till hbscreen layout is activated.HbScreen layout is activated before + //the paint but its too late for toolbar since all the polish handling is done beforei.e toolbuttons layout is not + //activated before the paint + if (initialButtonsPolish && !mDialogToolBar && q->scene()) { + int slotIndex = q->scene()->metaObject()->indexOfSlot("_q_polishItems()"); + QMetaMethod method = q->scene()->metaObject()->method(slotIndex); + method.invoke(q->scene()); + for (int i = 0; i < visibleItemsCount; i++) { + HbToolButton *button = mVisibleToolButtons.at(i); + if (button && button->layout() && !button->layout()->isActivated()) + button->layout()->activate(); + } + q->layout()->activate(); + } + initialButtonsPolish = false; if (delayedStartEffects && hasEffects && !mSuppressNextAppearEffect) { startAppearEffect(); delayedStartEffects = false; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbtoolbar_p.h --- a/src/hbcore/gui/hbtoolbar_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbtoolbar_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -141,6 +141,7 @@ bool mOrientationEffectsRunning; bool mSuppressNextAppearEffect; bool mAppearedOnce; + bool initialButtonsPolish; private: static HbToolBarPrivate *d_ptr( HbToolBar *toolbar ) { diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbtoolbutton.cpp --- a/src/hbcore/gui/hbtoolbutton.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbtoolbutton.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -35,6 +35,8 @@ #include "hbiconitem.h" #include "hbview.h" #include "hbmainwindow.h" +#include "hbframeitem.h" +#include "hbevent.h" #include "hbglobal_p.h" // remove when removing HB_DEPRECATED @@ -212,16 +214,12 @@ return (action != 0 && toolbarExtensionFrame); } - - - void HbToolButtonPrivate::framePrimitiveData(HbStyleFramePrimitiveData *data) { - Q_Q(HbToolButton); data->fillWholeRect = true; - + if (orientation == Qt::Vertical) { data->frameType = HbFrameDrawer::ThreePiecesHorizontal; } else { @@ -233,7 +231,7 @@ // data->state already set by abstractbutton's data init QIcon::Mode mode = HbStylePrivate::iconMode(data->state); QIcon::State state = HbStylePrivate::iconState(data->state); - + // custom background if (!q->background().isNull()) { data->frameGraphicsName = customBackground.iconName(mode, state); @@ -242,8 +240,8 @@ // in toolbar extension if(isToolBarExtension()) { - if (mode == QIcon::Normal && state == QIcon::On) { - if(!q->isCheckable()){ + if (mode == QIcon::Normal && state == QIcon::On) { + if(!q->isCheckable()){ data->frameGraphicsName = QLatin1String("qtg_fr_popup_grid_pressed"); } else { data->frameGraphicsName = QLatin1String("qtg_fr_tb_ext"); @@ -251,8 +249,8 @@ } else { data->frameGraphicsName = QLatin1String(""); } - data->frameType = HbFrameDrawer::NinePieces; - return; + data->frameType = HbFrameDrawer::NinePieces; + return; } if (!toolBarPosition) { @@ -272,80 +270,77 @@ data->frameType = HbFrameDrawer::NinePieces; return; } -// For toolbar: + // For toolbar: - QString frameGraphicsHeader; - if (!mDialogToolBar){ - if (useTransparentGraphics()) { - frameGraphicsHeader = orientation == Qt::Vertical ? - QLatin1String("qtg_fr_tb_trans_h_"): - QLatin1String("qtg_fr_tb_trans_v_"); - } else { - frameGraphicsHeader = orientation == Qt::Vertical ? - QLatin1String("qtg_fr_tb_h_"): - QLatin1String("qtg_fr_tb_v_"); - } - }else { - frameGraphicsHeader = QLatin1String("qtg_fr_popup_sk_"); - data->mirroringMode = HbIcon::LayoutDirection; - } + QString frameGraphicsHeader; + if (!mDialogToolBar){ + if (useTransparentGraphics()) { + frameGraphicsHeader = orientation == Qt::Vertical ? + QLatin1String("qtg_fr_tb_trans_h_"): + QLatin1String("qtg_fr_tb_trans_v_"); + } else { + frameGraphicsHeader = orientation == Qt::Vertical ? + QLatin1String("qtg_fr_tb_h_"): + QLatin1String("qtg_fr_tb_v_"); + } + } else { + frameGraphicsHeader = QLatin1String("qtg_fr_popup_sk_"); + data->mirroringMode = HbIcon::LayoutDirection; + } - switch (toolBarPosition) { - case TB_OnlyOne: - if (orientation == Qt::Vertical) { - list << QLatin1String("_l") << QLatin1String("_c") << QLatin1String("_r"); - } else { - list << QLatin1String("_t") << QLatin1String("_c") << QLatin1String("_b"); - } - break; - case TB_Beginning: - if (orientation== Qt::Vertical) { - list << QLatin1String("_l") << QLatin1String("_c") << QLatin1String("_cr"); - } else { - list << QLatin1String("_t") << QLatin1String("_c") << QLatin1String("_cb"); - } - break; - case TB_Middle: - if (orientation == Qt::Vertical) { - list << QLatin1String("_cl") << QLatin1String("_c") << QLatin1String("_cr"); - } else { - list << QLatin1String("_ct") << QLatin1String("_c") << QLatin1String("_cb"); - } - break; - case TB_End: - if (orientation== Qt::Vertical) { - list << QLatin1String("_cl") << QLatin1String("_c") << QLatin1String("_r"); - } else { - list << QLatin1String("_ct") << QLatin1String("_c") << QLatin1String("_b"); - } - break; + switch (toolBarPosition) { + case TB_OnlyOne: + if (orientation == Qt::Vertical) { + list << QLatin1String("_l") << QLatin1String("_c") << QLatin1String("_r"); + } else { + list << QLatin1String("_t") << QLatin1String("_c") << QLatin1String("_b"); + } + break; + case TB_Beginning: + if (orientation== Qt::Vertical) { + list << QLatin1String("_l") << QLatin1String("_c") << QLatin1String("_cr"); + } else { + list << QLatin1String("_t") << QLatin1String("_c") << QLatin1String("_cb"); + } + break; + case TB_Middle: + if (orientation == Qt::Vertical) { + list << QLatin1String("_cl") << QLatin1String("_c") << QLatin1String("_cr"); + } else { + list << QLatin1String("_ct") << QLatin1String("_c") << QLatin1String("_cb"); + } + break; + case TB_End: + if (orientation== Qt::Vertical) { + list << QLatin1String("_cl") << QLatin1String("_c") << QLatin1String("_r"); + } else { + list << QLatin1String("_ct") << QLatin1String("_c") << QLatin1String("_b"); + } + break; - default: - case TB_None: - break; - }; // switch case end - - + default: + case TB_None: + break; + } // switch case end - data->fileNameSuffixList = list; - if (mode == QIcon::Disabled && state == QIcon::Off) { - frameGraphicsFooter = QLatin1String("disabled"); - } else if (mode == QIcon::Normal && state == QIcon::On) { - if(!q->isCheckable()) { - frameGraphicsFooter = QLatin1String("pressed"); - } else { - frameGraphicsFooter = QLatin1String("latched"); - } - } else if (mode == QIcon::Selected && state == QIcon::Off) { - frameGraphicsFooter = QLatin1String("highlight"); - } else { - frameGraphicsFooter = QLatin1String("normal"); - } - data->frameGraphicsName = QString ("%0%1").arg(frameGraphicsHeader).arg(frameGraphicsFooter); - data->mirroringMode = HbIcon::LayoutDirection; - return; + data->fileNameSuffixList = list; + if (mode == QIcon::Disabled && state == QIcon::Off) { + frameGraphicsFooter = QLatin1String("disabled"); + } else if (mode == QIcon::Normal && state == QIcon::On) { + if(!q->isCheckable()) { + frameGraphicsFooter = QLatin1String("pressed"); + } else { + frameGraphicsFooter = QLatin1String("latched"); + } + } else if (mode == QIcon::Selected && state == QIcon::Off) { + frameGraphicsFooter = QLatin1String("highlight"); + } else { + frameGraphicsFooter = QLatin1String("normal"); + } + data->frameGraphicsName = QString ("%0%1").arg(frameGraphicsHeader).arg(frameGraphicsFooter); + data->mirroringMode = HbIcon::LayoutDirection; +} -} void HbToolButtonPrivate::iconPrimitiveData(HbStyleIconPrimitiveData *data) { Q_Q(HbToolButton); @@ -353,6 +348,8 @@ data->icon = q->action()->icon(); } else if(action){ data->icon = action->icon(); + } else { + data->icon = HbIcon(); } data->iconMode = HbStylePrivate::iconMode(data->state); data->iconState = HbStylePrivate::iconState(data->state); @@ -362,6 +359,8 @@ { if(action) { data->text = action->text(); + } else { + data->text = QString(); } } @@ -560,7 +559,7 @@ bool itemHasNoContents = false; if (data.text.isSet()) { if ( data.text.value().isEmpty() || data.text.value().isNull() || - (property(BUTTONSTYLE).toInt() == HbToolButtonPrivate::ToolButtonIcon)) { + (property(BUTTONSTYLE).toInt() == HbToolButtonPrivate::ToolButtonIcon)) { itemHasNoContents = true; } } @@ -568,6 +567,12 @@ if(!itemHasNoContents) { style()->updatePrimitive(d->textItem, &data, this); + /* HbDialog::setPrimaryAction deprecation action coloring - begin */ + if (d->action && d->action->property("invalid_addition").isValid() ) { + HbTextItem *textItem = qgraphicsitem_cast(d->textItem); + textItem->setTextColor(QColor("magenta")); + } + /* HbDialog::setPrimaryAction deprecation action coloring - end */ d->textItem->update(); } } @@ -580,13 +585,18 @@ if (data.icon.value().isNull() || (property(BUTTONSTYLE).toInt() == HbToolButtonPrivate::ToolButtonText)) { itemHasNoContents = true; } else { - style()->updatePrimitive(d->iconItem, &data, this); - d->iconItem->update(); + style()->updatePrimitive(d->iconItem, &data, this); + /* HbDialog::setPrimaryAction deprecation action coloring - begin */ + if (d->action && d->action->property("invalid_addition").isValid() ) { + HbIconItem *iconItem = qgraphicsitem_cast(d->iconItem); + iconItem->setColor(QColor("magenta")); + } + /* HbDialog::setPrimaryAction deprecation action coloring - end */ + d->iconItem->update(); } } d->iconItem->setFlag(QGraphicsItem::ItemHasNoContents, itemHasNoContents); } - } @@ -687,6 +697,13 @@ if (event->type() == QEvent::GraphicsSceneMouseRelease) { mouseReleaseEvent(static_cast(event)); return true; + } else if(event->type() == HbEvent::ThemeChanged) { + Q_D(HbToolButton); + changeEvent(event); + if (d->frameItem) { + HbFrameItem *item = static_cast(d->frameItem); + item->frameDrawer().themeChanged(); + } } return HbAbstractButton::event(event); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbtoolbutton.h --- a/src/hbcore/gui/hbtoolbutton.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbtoolbutton.h Mon Oct 04 00:38:12 2010 +0300 @@ -62,6 +62,8 @@ void triggered( HbAction *action ); protected: + friend class HbToolBar; + HbToolButton( HbToolButtonPrivate &dd, QGraphicsItem *parent ); void resizeEvent( QGraphicsSceneResizeEvent *event ); void nextCheckState(); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbview.cpp --- a/src/hbcore/gui/hbview.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbview.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -38,6 +38,7 @@ #include "hbscreen_p.h" #include "hbviewactionmanager_p.h" #include "hbglobal_p.h" +#include "hbevent.h" #include /*! @@ -740,11 +741,12 @@ HbView::HbViewFlags originalFlags(d->mViewFlags); d->mViewFlags = flags; if (mainWindow()) { - - // Statusbar-animation - bool statusBarAnimating = false; - HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mainWindow())->mStatusBar; - if ((d->mViewFlags & HbView::ViewStatusBarHidden) && !(originalFlags & HbView::ViewStatusBarHidden)) { + bool isCurrentView(mainWindow()->currentView() == this); + if (isCurrentView) { + // Statusbar-animation + bool statusBarAnimating = false; + HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mainWindow())->mStatusBar; + if ((d->mViewFlags & HbView::ViewStatusBarHidden) && !(originalFlags & HbView::ViewStatusBarHidden)) { #ifdef HB_EFFECTS HbEffect::start(statusBar, "statusbar", "disappear", this, "statusBarEffectFinished"); #endif // HB_EFFECTS @@ -755,36 +757,37 @@ HbEffect::start(statusBar, "statusbar", "appear", this, "statusBarEffectFinished"); #endif // HB_EFFECTS statusBarAnimating = true; - } + } - // Titlebar-animation - bool titleBarAnimating = false; - HbTitleBar *titleBar = HbMainWindowPrivate::d_ptr(mainWindow())->mTitleBar; - if ((d->mViewFlags & HbView::ViewTitleBarHidden) && !(originalFlags & HbView::ViewTitleBarHidden)) { + // Titlebar-animation + bool titleBarAnimating = false; + HbTitleBar *titleBar = HbMainWindowPrivate::d_ptr(mainWindow())->mTitleBar; + if ((d->mViewFlags & HbView::ViewTitleBarHidden) && !(originalFlags & HbView::ViewTitleBarHidden)) { #ifdef HB_EFFECTS - HbEffect::start(titleBar, "titlebar", "disappear", this, "titleBarEffectFinished"); + HbEffect::start(titleBar, "titlebar", "disappear", this, "titleBarEffectFinished"); #endif // HB_EFFECTS - titleBarAnimating = true; - } else if (!(d->mViewFlags & HbView::ViewTitleBarHidden) && (originalFlags & HbView::ViewTitleBarHidden)) { + titleBarAnimating = true; + } else if (!(d->mViewFlags & HbView::ViewTitleBarHidden) && (originalFlags & HbView::ViewTitleBarHidden)) { #ifdef HB_EFFECTS - titleBar->setVisible(true); - HbEffect::start(titleBar, "titlebar", "appear", this, "titleBarEffectFinished"); + titleBar->setVisible(true); + HbEffect::start(titleBar, "titlebar", "appear", this, "titleBarEffectFinished"); #endif // HB_EFFECTS - titleBarAnimating = true; - } + titleBarAnimating = true; + } - if (!statusBarAnimating && !titleBarAnimating) { - statusBar->setVisible(!(d->mViewFlags & HbView::ViewStatusBarHidden)); - statusBar->propertiesChanged(); - } - if (!titleBarAnimating && !statusBarAnimating) { - titleBar->setVisible(!(d->mViewFlags & HbView::ViewTitleBarHidden)); - if (d->mNavigationActionSet) { - titleBar->setNavigationAction(d->mNavigationAction); - } else { - titleBar->setDefaultNavigationAction(); + if (!statusBarAnimating && !titleBarAnimating) { + statusBar->setVisible(!(d->mViewFlags & HbView::ViewStatusBarHidden)); + statusBar->propertiesChanged(); } - titleBar->propertiesChanged(); + if (!titleBarAnimating && !statusBarAnimating) { + titleBar->setVisible(!(d->mViewFlags & HbView::ViewTitleBarHidden)); + if (d->mNavigationActionSet) { + titleBar->setNavigationAction(d->mNavigationAction); + } else { + titleBar->setDefaultNavigationAction(); + } + titleBar->propertiesChanged(); + } } if (d->toolBar) { d->toolBar->updatePrimitives(); @@ -812,7 +815,7 @@ int visibilityFlags = HbView::ViewTitleBarMinimized | HbView::ViewTitleBarFloating | HbView::ViewTitleBarMinimizable | HbView::ViewStatusBarHidden | HbView::ViewStatusBarFloating | HbView::ViewTitleBarHidden | HbView::ViewDisableRelayout; - if ((d->mViewFlags & visibilityFlags) != (originalFlags & visibilityFlags)) { + if (isCurrentView && (d->mViewFlags & visibilityFlags) != (originalFlags & visibilityFlags)) { HbMainWindowPrivate::d_ptr(mainWindow())->mClippingItem->decoratorVisibilityChanged(); } } @@ -911,6 +914,7 @@ */ void HbView::changeEvent(QEvent *event) { + Q_D(const HbView); // We're listening for layout direction changes, because the screen needs to be // repolished, if the layout direction changes and the titlebar is minimizable. @@ -923,6 +927,11 @@ if (mw && mw->currentView() == this) { HbMainWindowPrivate::d_ptr(mw)->mClippingItem->decoratorVisibilityChanged(); } + } else if(event->type() == HbEvent::ThemeChanged) { + HbMainWindow *mw = mainWindow(); + if (d->toolBar && mw && mw->currentView() != this) { + d->toolBar->changeEvent(event); + } } HbWidget::changeEvent(event); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbwidget.cpp --- a/src/hbcore/gui/hbwidget.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbwidget.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -661,7 +661,8 @@ return true; case QEvent::DynamicPropertyChange: - if (!qstrcmp(static_cast(event)->propertyName(), "state")) { + if (!qstrcmp(static_cast(event)->propertyName(), "state") || + !qstrcmp(static_cast(event)->propertyName(), "toolbutton_extension_layout")) { if(!d->themingPending){ style()->updateThemedParams(this); } @@ -697,7 +698,7 @@ HbDeviceProfileChangedEvent* dpEvent = static_cast(event); if ( dpEvent->profile().alternateProfileName() == dpEvent->oldProfile().name() ) { // This is an orientation change event. - if (style()->hasOrientationSpecificStyleRules(this)) { + if (d->polished && style()->hasOrientationSpecificStyleRules(this)) { polishEvent(); } } else { @@ -851,7 +852,7 @@ backend). When overriding, always call the base classes impelentation. - \param params, For querying (custom) style parameters from HbStyle. + \param params For querying (custom) style parameters from HbStyle. \sa polish() */ diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/gui/hbwidgetbase.cpp --- a/src/hbcore/gui/hbwidgetbase.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/gui/hbwidgetbase.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -418,8 +418,8 @@ Derived implementations should create a base call to this method. This function does not call the base class implementation. - \param primitiveData, pointer to the primitive data - \param primitive, primitive pointer, in case there is a need to query data from the primitive (e.g. item name) + \param primitiveData pointer to the primitive data + \param primitive primitive pointer, in case there is a need to query data from the primitive (e.g. item name) */ void HbWidgetBase::initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive) diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/hbcore.pro --- a/src/hbcore/hbcore.pro Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/hbcore.pro Mon Oct 04 00:38:12 2010 +0300 @@ -102,12 +102,7 @@ #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbcore/*) #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbcore/private/*) -TRANSLATIONS += i18n/translations/directorylocalizer_en_GB.ts -TRANSLATIONS += i18n/translations/directorylocalizer_de_DE.ts -TRANSLATIONS += i18n/translations/languages.ts -TRANSLATIONS += i18n/translations/collations.ts -TRANSLATIONS += i18n/translations/regions.ts -TRANSLATIONS += i18n/translations/languages_OLD.ts +load(symbian_i18n.prf):TRANSLATIONS = directorynamelocalizer.ts symbian { defFilePath = defs @@ -157,17 +152,11 @@ hbExportHeaders(hbcore) - # i18n's .qm files export - exportqm.path = $${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations - exportqm.sources = $$TRANSLATIONS - for(file, exportqm.sources) { - file2 = $$replace(file, .ts, .qm) - file3 = $${PWD}/$$file2 - hbPrjExport("$$file3", "$$exportqm.path/$$basename(file2)") - } - # i18n's other files export hbPrjExport("$${PWD}/i18n/translations/language_list.txt", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/language_list.txt") hbPrjExport("$${PWD}/i18n/translations/locale_mappings.txt", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/locale_mappings.txt") + hbPrjExport("$${PWD}/i18n/translations/collations.qm", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/collations.qm") + hbPrjExport("$${PWD}/i18n/translations/languages.qm", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/languages.qm") + hbPrjExport("$${PWD}/i18n/translations/regions.qm", "$${EPOCROOT}epoc32/winscw/c/resource/hbi18n/translations/regions.qm") LIBS += -lapparc LIBS += -lavkon @@ -198,10 +187,4 @@ hbPrjExport("$${PWD}/resources/centralrepository/20022E82.txt", "$${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/20022E82.txt") } -hb_maemo_dui { - INCLUDEPATH += /usr/include/dui - INCLUDEPATH += /usr/local/include/dui - LIBS += -ldui -} - include($${HB_SOURCE_DIR}/src/hbcommon.pri) diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/hbdntxmlreader.cpp --- a/src/hbcore/i18n/hbdntxmlreader.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/hbdntxmlreader.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -23,14 +23,13 @@ ** ****************************************************************************/ -#include #if defined(Q_OS_SYMBIAN) #include #endif // Q_OS_SYMBIAN +#include #include "hbdntxmlreader_p.h" #define DirectoryLocalizerFile ":/i18n/hbdirectorylocalizer.xml" -#define DirectoryLocalizerTranslationsFile "/resource/hbi18n/translations/directorylocalizer_" /*! Constructor of class. @@ -39,49 +38,26 @@ { fullPaths = NULL; pathStrings = NULL; - - parseDirectoryPaths = false; parsePathStrings = false; elementNumber = 0; validElement = false; twoDone = false; - QLocale locale = QLocale::system(); - - trans = new QTranslator(); - QString languageStr; - languageStr.append(DirectoryLocalizerTranslationsFile); - - languageStr.append(locale.name()); - -// Support for checking both Z and C drives - -#if defined(Q_OS_SYMBIAN) - bool succeed = false; - succeed = trans->load("z:" + languageStr); - if ( succeed == false ) { - trans->load("c:" + languageStr); - } -#else // Q_OS_SYMBIAN - trans->load(languageStr); -#endif // Q_OS_SYMBIAN - - QCoreApplication::installTranslator(trans); validElement = false; + HbTranslator* trans = new HbTranslator("directorynamelocalizer"); + Q_UNUSED(trans); + QFile xmlFile(DirectoryLocalizerFile); - pathStrings = new QMap; fullPaths = new QMap; - - if( xmlFile.exists() ) - { - QXmlInputSource source( &xmlFile ); - QXmlSimpleReader reader; - reader.setContentHandler( this ); - reader.parse( source ) ; - } + if ( xmlFile.exists() ) { + QXmlInputSource source( &xmlFile ); + QXmlSimpleReader reader; + reader.setContentHandler( this ); + reader.parse( source ); + } } /*! @@ -91,8 +67,6 @@ { delete fullPaths; delete pathStrings; - QCoreApplication::removeTranslator(trans); - delete trans; } /*! @@ -197,7 +171,7 @@ case 3: // DirectoryLocalizerTranslationStr elements.insert(0,t); - localizedStr = QCoreApplication::translate(0,charPtr); + localizedStr = hbTrId(charPtr); delete ba; ba = 0; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/hblanguageutil.cpp --- a/src/hbcore/i18n/hblanguageutil.cpp Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,316 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (developer.feedback@nokia.com) -** -** This file is part of the HbCore module of the UI Extensions for Mobile. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at developer.feedback@nokia.com. -** -****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(Q_OS_SYMBIAN) -#include -#include -#include -#include -#include -#include //Ui language -#endif // Q_OS_SYMBIAN - -#include "hblanguageutil.h" -#include "hbfeaturemanager_r.h" - -#if defined(Q_OS_SYMBIAN) -#define LANGUAGE_LIST_FILE "/resource/hbi18n/translations/language_list.txt" -#define LANGUAGE_ID_PREFIX "language_" -#define TRANSLATOR_PATH "/resource/hbi18n/translations/languages_OLD" -#endif // Q_OS_SYMBIAN - -/*! - @beta - @hbcore - \class HbLanguageUtil - \brief HbLanguageUtil provides functions for quering supported languages and switching the system language. - - \deprecated HbLanguageUtil class - is deprecated. Please use HbLocaleUtil class instead. -*/ - -#if defined(Q_OS_SYMBIAN) -/*! - \brief Returns identifiers and localized names of all known languages. - - \return localized names and integer identifiers of languages supported in a device -*/ -QHash readLanguageList() -{ - QHash hashLanguages; - QString path = "c:"; - path += QString(LANGUAGE_LIST_FILE); - QFile* file = new QFile(path); - if (!file->exists() ) { - path = "z:"; - path += QString(LANGUAGE_LIST_FILE); - delete file; - file = new QFile(path); - } - if (!file->open(QIODevice::ReadOnly | QIODevice::Text)) { - delete file; - return hashLanguages; - } - QTextStream in(file); - while (!in.atEnd()) { - QString line = in.readLine(256); - if (!line.isEmpty()) { - int sep = line.indexOf(','); - QString strCode = line.left(sep); - QString name = line.mid(sep+1); - - bool ok; - int code = strCode.toUInt(&ok); - if (!ok) { - continue; - } - hashLanguages.insert(code, name); - } - } - delete file; - return hashLanguages; -} -#endif // Q_OS_SYMBIAN - -#if defined(Q_OS_SYMBIAN) - -/*! - \brief Changes the system UI language. - - \param language identifier of the language - \return true if operation was successful -*/ -bool setLocale( int language ) -{ - TExtendedLocale dummy; - dummy.LoadSystemSettings(); - QString no; - no = QString( "%1" ).arg( language, 2, 10, QLatin1Char( '0' ) ); - QString name = QString( "elocl." ).append( no ); - TPtrC nameptr(name.utf16()); - - TInt err = dummy.LoadLocale( nameptr ); - if( err != KErrNone ) - return false; - dummy.SaveSystemSettings(); - // cause localeprivate update on next qlocale object( glp->m_language_id = 0 ) - QSystemLocale dummy2; - return true; -} -#endif // Q_OS_SYMBIAN - - -/*! - \brief Returns names and identifiers of supported languages in a phone. - - Language names are localized according the language's native presentation. - Language ID's returned by this functions may be used as language parameter for changeLanguage(int language) function. - Language IDs and names are OS specific and may vary across the platforms and releases. - - \attention Symbian specific API - - \deprecated HbLanguageUtil::supportedLanguages() - is deprecated. Please use HbLocaleUtil::supportedLanguages() instead. - - \return Symbian - localized names and integer identifiers of languages supported in a device - \return other platforms - empty QHash -*/ -QHash HbLanguageUtil::supportedLanguages() -{ -#if defined(Q_OS_SYMBIAN) - QHash languages; - - QTranslator translator; - QString path = "c:"; - path += QString(TRANSLATOR_PATH); - if (!translator.load(path)) { - path = "z:"; - path += QString(TRANSLATOR_PATH); - if (!translator.load(path)) { - return languages; - } - } - - QCoreApplication::installTranslator(&translator); - QHash hashLanguageNames = readLanguageList(); - - CArrayFixFlat* systemEpocLanguageCodes = 0; - TInt error = SysLangUtil::GetInstalledLanguages( systemEpocLanguageCodes ); - if ( error != KErrNone ) { - delete systemEpocLanguageCodes; - return languages; - } - - for (int i = 0; i < systemEpocLanguageCodes->Count(); ++i) { - int code = systemEpocLanguageCodes->At(i); - QString id = QString(LANGUAGE_ID_PREFIX); - id += QString::number(code); - QString locName = hbTrId(id.toAscii().constData()); - if (locName.isEmpty() || locName == id) { - locName = hashLanguageNames.value(code); - } - languages.insert(code, locName); - } - - delete systemEpocLanguageCodes; - return languages; -#else - QHash dummy; - return dummy; -#endif -} - -/*! - \brief Returns names and identifiers of all known languages. - - Language names are localized according the language's native presentation. - Language ID's returned by this functions may be used as language parameter for changeLanguage(int language) function. - Language IDs and names are OS specific and may vary across the platforms and releases. - - \attention Symbian specific API - - \deprecated HbLanguageUtil::allLanguages() - is deprecated. - - \return Symbian - localized names and integer identifiers of known languages - \return other platforms - empty QHash -*/ -QHash HbLanguageUtil::allLanguages() -{ -#if defined(Q_OS_SYMBIAN) - QHash langs; - - QTranslator translator; - QString path = "c:"; - path += QString(TRANSLATOR_PATH); - if (!translator.load(path)) { - path = "z:"; - path += QString(TRANSLATOR_PATH); - if (!translator.load(path)) { - return langs; - } - } - - QCoreApplication::installTranslator(&translator); - - QHash languageNameList = readLanguageList(); - QHashIterator i(languageNameList); - while (i.hasNext()) { - i.next(); - int code = i.key(); - QString id = QString(LANGUAGE_ID_PREFIX); - id += QString::number(code); - QString locName = hbTrId(id.toAscii().constData()); - if (locName.isEmpty()) { - locName = i.value(); - } - langs.insert(code, locName); - } - return langs; -#else - QHash dummy; - return dummy; -#endif -} - -/*! - \brief Changes the device system language. - - \attention Symbian specific API - - \deprecated HbLanguageUtil::changeLanguage( int language ) - is deprecated. Please use HbLocaleUtil::changeLanguage( const QString &language ) instead. - - \param language identifier of language to set active - \return true for Symbian if succesfull and false for other platforms -*/ -bool HbLanguageUtil::changeLanguage( int language ) -{ -#if defined(Q_OS_SYMBIAN) - if ( !HbFeatureManager::instance()->featureStatus(HbFeatureManager::LanguageSwitch) ) { - return false; - } - - CRepository* commonEngineRepository = 0; - TRAPD( err1, commonEngineRepository = CRepository::NewL( KCRUidCommonEngineKeys ) ); - if ( err1 != KErrNone ) { - return false; - } - - if (!setLocale(language)) { - delete commonEngineRepository; - return false; - } - - // Never set Language code 0 to HAL - if ( language !=0 ) { - if ( HAL::Set( HAL::ELanguageIndex, language ) != KErrNone ) { - delete commonEngineRepository; - return false; - } - } - if ( commonEngineRepository->Set( KGSDisplayTxtLang, language ) != KErrNone ) { - delete commonEngineRepository; - return false; - } - delete commonEngineRepository; - return true; - -#else - Q_UNUSED(language); - return false; -#endif -} - -/*! - \brief Returns ID of current language. - - \attention Symbian specific API - - \deprecated HbLanguageUtil::currentLanguage() - is deprecated. Please use HbLocaleUtil::currentLanguage() instead. - - \return identifier of current system language for Symbian and '0' for other platforms -*/ -int HbLanguageUtil::currentLanguage() -{ - #if defined(Q_OS_SYMBIAN) - TLanguage l = User::Language(); - return l; - #else - return 0; - #endif -} - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/hblanguageutil.h --- a/src/hbcore/i18n/hblanguageutil.h Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (developer.feedback@nokia.com) -** -** This file is part of the HbCore module of the UI Extensions for Mobile. -** -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at developer.feedback@nokia.com. -** -****************************************************************************/ - -#ifndef HBLANGUAGEUTIL_H -#define HBLANGUAGEUTIL_H - -#include -#include - -class HB_CORE_EXPORT HbLanguageUtil -{ -public: - static bool changeLanguage( int language ); - static int currentLanguage(); - static QHash supportedLanguages(); - static QHash allLanguages(); -}; - -#endif /* HBLANGUAGEUTIL_H */ diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/hblocaleutil.cpp --- a/src/hbcore/i18n/hblocaleutil.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/hblocaleutil.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -49,16 +49,16 @@ #if defined(Q_OS_SYMBIAN) #define LANGUAGE_LIST_FILE "/resource/hbi18n/translations/language_list.txt" #define LANGUAGE_MAPPINGS_FILE "/resource/hbi18n/translations/locale_mappings.txt" -#define LANGUAGE_ID_PREFIX "language" +#define LANGUAGE_ID_PREFIX "txt_language" #define LANGUAGE_TRANSLATOR_PATH "/resource/hbi18n/translations/languages" #define REGION_LIST_FILE "z:/resource/bootdata/regions.txt" -#define REGION_ID_PREFIX "region" +#define REGION_ID_PREFIX "txt_region" #define REGION_TRANSLATOR_PATH "/resource/hbi18n/translations/regions" #define REGION_DLL_PREFIX "elocl_reg." #define COLLATION_LIST_FILE "z:/resource/bootdata/collations.txt" -#define COLLATION_ID_PREFIX "collation" +#define COLLATION_ID_PREFIX "txt_collation" #define COLLATION_TRANSLATOR_PATH "/resource/hbi18n/translations/collations" #define COLLATION_DLL_PREFIX "elocl_col." #define COLLATION_DLL_PREFIX_POSITION 3 @@ -68,12 +68,29 @@ @beta @hbcore \class HbLocaleUtil - \brief HbLocaleUtil provides functions for quering supported languages, regions and collations and activing them. + \brief The HbLocaleUtil class supports querying the supported languages, regions and collations, and activating them. - Language and collation identifiers typically corresponds with two-letter ISO 639 language code, but for certain languages and collations combination of ISO 639 language code and ISO 3166 country code id used. - Region identifiers always corresponds with two-letter ISO 3166 country code. + With HbLocaleUtil, you can query the supported languages, regions and + collations from the device, and the ones currently set in the device. You + can then use this data to activate the language, region and collation in the + device; either individually, or as a set determined by the specified + language. - HbLocaleUtil also provides functions for converting language, region and collation identifiers to their localised names. + HbLocaleUtil returns the data from the device as identifiers. + The language and collation identifiers typically correspond to two-letter ISO 639 language codes. + However, some languages and collations use a combination of an ISO 639 language code + and an ISO 3166 country code which are separated by the underscore character. + Region identifiers always correspond to a two-letter ISO 3166 country code. + + HbLocaleUtil also provides functions for converting language, region and + collation identifiers to their localized names. + + Example: + \snippet{unittest_hblocaleutil/unittest_hblocaleutil.cpp,1} + + + \sa HbStringUtil, HbExtendedLocale + */ #if defined(Q_OS_SYMBIAN) @@ -98,7 +115,9 @@ QHash locCollationNames; /*! - \brief Reads langauge, region and collation mappings. + \relates HbLocaleUtil + + Reads language, region and collation mappings. */ void readMappings() { @@ -156,10 +175,14 @@ #if defined(Q_OS_SYMBIAN) /*! - \brief Changes the system UI language. - - \param dllExtension extension of the locale dll - \return true if operation was successful + \relates HbLocaleUtil + + Changes the system UI language. + + \param dllExtension The extension of the locale DLL. + + \return True if successful, otherwise false. + */ bool setLocale( const QString &dllExtension ) { @@ -179,11 +202,16 @@ #endif //Q_OS_SYMBIAN /*! - \brief Return identifier of the current UI language. + + Returns the identifier of the current UI language. + Identifier is typically two-letter ISO 639 code, like "en" for universal english, + but for some languages such United States english it is combination of an ISO 639 code and an ISO 3166 code ("en_US") - \attention Symbian specific API + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QString. + + \sa supportedLanguages(), localisedLanguageName(), changeLanguage() - \return Identifier of the language code for Symbian and empty QString for other platforms. */ QString HbLocaleUtil::currentLanguage() { @@ -205,14 +233,18 @@ } /*! - \brief Returns identifiers of languages supported in a device. - Language identifier may be two-letter ISO 639 language code or combination of ISO 639 language code and ISO 3166 country code - Ex: Great Britain english it returns "en". - Ex: For U.S. english it returns "en_US" - \attention Symbian specific API + Returns the identifiers of the languages supported on the device. The + language identifier can be either a two-letter ISO 639 language code, or a + combination of an ISO 639 language code and an ISO 3166 country code. For + example, for UK English, this returns "en", and for US English, this returns + "en_US". - \return identifiers of supported languages for Symbian and empty QStringList for other platforms + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QStringList. + + \sa localisedLanguageName(), currentLanguage(), changeLanguage(), changeLocale() + */ QStringList HbLocaleUtil::supportedLanguages() { @@ -248,14 +280,17 @@ } /*! - \brief Converts two or five letter language identifier code to localised language name. - \attention Symbian specific API + Returns the localised language name for the specified language identifier. + If the translation fails, returns an empty QString. + + \param language The two- or five-letter language identifier that correspond to an identifier returned by supportedLanguages() - \param language identifier + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QString. - \return Symbian - localised name of the language, an empty String if translation fails - \return other platforms - empty QString + \sa changeLanguage(), currentLanguage() + */ QString HbLocaleUtil::localisedLanguageName( const QString &language ) { @@ -287,14 +322,19 @@ } /*! - \brief Changes the system language. - The language parameter should correspond with one of the identifiers returned by supportedLanguages(). + + Changes the system language to the one specified in \a language. + + \param language The language identifier. This must correspond to an + identifier returned by supportedLanguages(). - \attention Symbian specific API - - \param language identifier of language to set active + \return True if successful, otherwise false. - \return true if language change was successful and false for other platforms + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns false. + + \sa localisedLanguageName(), currentLanguage() + */ bool HbLocaleUtil::changeLanguage( const QString &language ) { @@ -381,13 +421,16 @@ #endif /*! - \brief Returns names supported regions in a phone. - Region names are identified by 2 letter code(ISO 3166 standard). - Ex: For United Kingdom it returns GB + + Returns the identifiers of regions supported on the device. The region + identifier is a two-letter ISO 3166 code, for example, "GB" for United + Kingdom. - \attention Symbian specific API + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QStringList. + + \sa localisedRegionName(), currentRegion(), changeRegion() - \return list of supported regions in a device for Symbian and empty QStringList for other platforms */ QStringList HbLocaleUtil::supportedRegions() { @@ -429,14 +472,18 @@ } /*! - \brief Converts two letter region identifier to localised region name. - - \attention Symbian specific API + + Returns the localised region name for the given two-letter region + identifier. If the translation fails, returns an empty String. ###QString? - \param region region identifier + \param region The region identifier that correspond to an identifier + returned by supportedRegions() - \return Symbian - localised name of the region, an empty String if translation fails - \return other platforms - empty QString + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QString. + + \sa currentRegion(), changeRegion() + */ QString HbLocaleUtil::localisedRegionName( const QString ®ion ) { @@ -481,14 +528,18 @@ } /*! - \brief Changes the system region. - The region parameter should correspond with one of the identifiers returned by supportedRegions(). - - \attention Symbian specific API + Changes the system region to the one specified in \a region. - \param region identifier of region to set active + \param region The region identifier. This must correspond to an identifier + returned by supportedRegions(). + + \return True if successful, otherwise false. - \return true if region change was successful for Symbian and false for other platforms + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns false. + + \sa localisedRegionName(), currentRegion() + */ bool HbLocaleUtil::changeRegion( const QString ®ion ) { @@ -547,11 +598,14 @@ } /*! - \brief Return identifier of the current region. + + Returns the identifier of the current region. - \attention Symbian specific API + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QString. + + \sa supportedRegions(), localisedRegionName(), changeRegion() - \return identifier of the region for Symbian and empty QString for other platforms */ QString HbLocaleUtil::currentRegion() { @@ -607,14 +661,16 @@ #endif /*! - \brief Returns identifiers of collations supported in a device. - Collation identifier may be two-letter ISO 639 language code or combination of ISO 639 language code and ISO 3166 country code - Ex: Great Britain english it returns "en". - Ex: For U.S. english it returns "en_US" + + Returns the identifiers of the collations supported on a device. The + collation identifier is either an ISO 639 language code, or a combination of + an ISO 639 language code and an ISO 3166 country code. - \attention Symbian specific API - - \return identifiers of supported collations for Symbian and empty QStringList for other platforms + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QStringList. + + \sa localisedCollationName(), currentCollation(), changeCollation() + */ QStringList HbLocaleUtil::supportedCollations() { @@ -656,14 +712,18 @@ } /*! - \brief Converts collation identifier to localised collation name. - \attention Symbian specific API + Returns the localised collation name for the given collation identifier. If + the translation fails, returns an empty QString. - \param collation region collation identifier + \param collation The region collation identifier corresponding to an + identifier returned by supportedCollations(). - \return Symbian - localised name of the collation, an empty String if translation fails - \return other platforms - empty QString + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QString. + + \sa currentCollation(), changeCollation() + */ QString HbLocaleUtil::localisedCollationName( const QString &collation ) { @@ -708,13 +768,18 @@ } /*! - \brief Changes the system collation. - The collation parameter should correspond with one of the identifiers returned by supportedCollations(). - - \attention Symbian specific API + + Changes the system collation to the one specified \a collation. + + \param collation The collation identifier. This must correspond to an + identifier returned by supportedCollations(). - \param collation identifier of collation to set active - \return true if collation change was successful for Symbian and false for other platforms + \return True if successful, otherwise false. + + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns false. + + \sa localisedCollationName(), currentCollation() */ bool HbLocaleUtil::changeCollation( const QString &collation ) { @@ -772,11 +837,14 @@ } /*! - \brief Return identifier of the current collation. + + Returns the identifier of the current collation. + Typically an identifier is ISO 639 code. - \attention Symbian specific API + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns an empty QString. - \return identifier of the collation for Symbian and empty QString for other platforms + \sa supportedCollations(), localisedCollationName(), changeCollation() */ QString HbLocaleUtil::currentCollation() { @@ -813,16 +881,21 @@ } /*! - \brief Changes the system language, region and collation. - The language parameter should correspond with one of the identifiers returned by supportedLanguages(). - Proper region and collation is selected automatically according the language. + + Changes the system language, region and collation as specified by \a + language. The region and collation are selected automatically based on the + specified language. + + \param language The language identifier. This must correspond to an + identifier returned by supportedLanguages(). - \attention Symbian specific API + \return True if successful, otherwise false. - \param language identifier of language which language, region and collation settings should set active + \attention Only fully implemented on the Symbian platform. For other + platforms, always returns false. - \return Symbian - true if language, region and collation change was successful - \return other platforms - false + \sa supportedRegions(), supportedCollations() + */ bool HbLocaleUtil::changeLocale( const QString &language ) { @@ -852,3 +925,70 @@ return false; } +/*! + Returns list of language, region and collation ID mappings. + For example for UK english entry have "en" as language, "GB" as region and "en" as collation. + Similar values for US english are "en_US", "US" and "en_US" + + Returned list may contain languages which does not have corresponding region, then HbLanguageRegionMapping struct has an empty region QString. + List may also contain regions which does not have corresponding language and collation, then HbLanguageRegionMapping struct contains an empty language and collation QStrings. + + Example: + \snippet{unittest_hblocaleutil/unittest_hblocaleutil.cpp,2} + + \attention Symbian specific API + + \param onlySupported Should return mappings only for those languages, regions and collations which are supported on the device + true - returns mappings only for those languages, regions and collations which are available on device. + false - returns all know languages, regions and collations. + + \return Symbian - list of language, region and collation mappings + \return other platforms - an empty list +*/ +QList HbLocaleUtil::languageRegionMappings( bool onlySupported ) +{ + QList mps; +#if defined(Q_OS_SYMBIAN) + if (mappingList.isEmpty()) { + readMappings(); + } + + QStringList supportedLanguages; + QStringList supportedRegions; + if (onlySupported) { + supportedLanguages = HbLocaleUtil::supportedLanguages(); + supportedRegions = HbLocaleUtil::supportedRegions(); + } + + for (int i = 0; i < mappingList.count(); ++i) { + + HbLocaleMapping map = mappingList.at(i); + + HbLanguageRegionMapping mapping; + mapping.languageId = map.langName; + mapping.regionId = map.regName; + mapping.collationId = map.collName; + + if (onlySupported) { + bool langSupported = supportedLanguages.contains(map.langName); + bool regSupported = supportedRegions.contains(map.regName); + if (!langSupported && !regSupported) { + continue; + } + if (!langSupported) { + mapping.languageId = ""; + } + if (!regSupported) { + mapping.regionId = ""; + } + } + + mps.append(mapping); + + } +#else + Q_UNUSED(onlySupported); +#endif // Q_OS_SYMBIAN + return mps; +} + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/hblocaleutil.h --- a/src/hbcore/i18n/hblocaleutil.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/hblocaleutil.h Mon Oct 04 00:38:12 2010 +0300 @@ -29,6 +29,13 @@ #include #include +struct HbLanguageRegionMapping +{ + QString languageId; + QString regionId; + QString collationId; +}; + class HB_CORE_EXPORT HbLocaleUtil { public: @@ -48,6 +55,8 @@ static bool changeCollation( const QString &collation ); static bool changeLocale( const QString &language ); + + static QList languageRegionMappings( bool onlySupported=true ); }; #endif /* HBLOCALEUTIL_H */ diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/hbparameterlengthlimiter.cpp --- a/src/hbcore/i18n/hbparameterlengthlimiter.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/hbparameterlengthlimiter.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -45,7 +45,7 @@ - %Lx for inserting numbers, x is used to indicate argument inserting order. Example of how to use HbParameterLengthLimiter: - \snippet{unittest_HbParameterLengthLimiter/unittest_HbParameterLengthLimiter.cpp,1} + \snippet{unittest_hbparameterlengthlimiter/unittest_hbparameterlengthlimiter.cpp,1} */ diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/hbtranslator.cpp --- a/src/hbcore/i18n/hbtranslator.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/hbtranslator.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -372,7 +372,7 @@ (*this)["it_IT"] = "it"; (*this)["sv_SE"] = "sv"; (*this)["da_DK"] = "da"; - (*this)["no_NO"] = "no"; + (*this)["nb_NO"] = "nb"; (*this)["fi_FI"] = "fi"; (*this)["en_US"] = "en_US"; (*this)["pt_PT"] = "pt"; @@ -387,7 +387,7 @@ (*this)["sl_SI"] = "sl"; (*this)["zh_TW"] = "zh_TW"; (*this)["zh_HK"] = "zh_HK"; - (*this)["zh_CN"] = "zh_CN"; + (*this)["zh_CN"] = "zh"; (*this)["ja_JP"] = "ja"; (*this)["th_TH"] = "th"; (*this)["ar_AE"] = "ar"; @@ -408,8 +408,8 @@ (*this)["ms_MY"] = "ms"; (*this)["pt_BR"] = "pt_BR"; (*this)["ro_RO"] = "ro"; - (*this)["sr_YU"] = "sr"; - (*this)["es_MX"] = "es_MX"; + (*this)["sr_RS"] = "sr"; + (*this)["es_419"] = "es_419"; (*this)["uk_UA"] = "uk"; (*this)["ur_PK"] = "ur"; (*this)["vi_VN"] = "vi"; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/i18n.pri --- a/src/hbcore/i18n/i18n.pri Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/i18n.pri Mon Oct 04 00:38:12 2010 +0300 @@ -34,7 +34,6 @@ PUBLIC_HEADERS += $$PWD/hbparameterlengthlimiter.h PUBLIC_HEADERS += $$PWD/hbfindfile.h PUBLIC_HEADERS += $$PWD/hbtranslator.h -PUBLIC_HEADERS += $$PWD/hblanguageutil.h PUBLIC_HEADERS += $$PWD/hblocaleutil.h PRIVATE_HEADERS += $$PWD/hbdntxmlreader_p.h @@ -55,7 +54,6 @@ SOURCES += $$PWD/hbparameterlengthlimiter.cpp SOURCES += $$PWD/hbtranslator.cpp SOURCES += $$PWD/hbfindfile.cpp -SOURCES += $$PWD/hblanguageutil.cpp SOURCES += $$PWD/hblocaleutil.cpp symbian:LIBS += -leuser -lhal -lcentralrepository -lptiengine -lSysLangUtil diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/collations.qm Binary file src/hbcore/i18n/translations/collations.qm has changed diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/collations.ts --- a/src/hbcore/i18n/translations/collations.ts Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/translations/collations.ts Mon Oct 04 00:38:12 2010 +0300 @@ -3,207 +3,207 @@ hblanguageswitch - + English English - + French Français - + German Deutsch - + Spanish Español - + Italian Italiano - + Swedish Svenska - + Danish Dansk - + Norwegian Norsk - + Finnish Suomi - + English (American) English - + Portuguese Português - + Turkish Türkçe - + Icelandic Íslenska - + Russian Русский - + Hungarian Magyar - + Dutch Nederlands - + Czech Čeština - + Slovak Slovenčina - + Polish Polski - + Slovenian Slovenščina - + Chinese TW 繁體中文(台灣) - + Chinese HK 繁體中文(香港) - + Chinese PRC 简体中文 - + Japanese 日本語 - + Thai ภาษาไทย - + Arabic العربية - + Pilipino Pilipino - + Burgarian Български - + Catalan Català - + Croatian Hrvatski - + Estonian Eesti - + Farsi فارسى - + French (Canadian) Français - + Greek Ελληνικά - + Hebrew עברית - + Hindi हिन्दी - + Indonesian Indonesia - + Korean 한국어 - + Latvian Latviešu - + Lithuanian Lietuvių - + Malay Melayu - + Marathi मराठी - + Portuguese (Brazil) Português - + Romanian Română - + Serbian Srpski - + Spanish (American) Español - + Ukrainian Українська - + Urdu اردو - + Vietnamese Tiếng Việt - + Basque Euskara - + Galician Galego diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorylocalizer_de_DE.qm Binary file src/hbcore/i18n/translations/directorylocalizer_de_DE.qm has changed diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorylocalizer_de_DE.ts --- a/src/hbcore/i18n/translations/directorylocalizer_de_DE.ts Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ - - - - - HbDirectoryLocalization - - games - Spiele - - - install files - Install. Dateien - - - images - Bilder - - - Picture messages - Bildmitteilungen - - - Wallpapers - Hintergr.-bilder - - - Presence logos - Erreichb.-logos - - - Others - Sonstige - - - Sound files - Tondateien - - - Sound clips - Soundclips - - - Ringing tones - Klingeltöne - - - Video clips - Videoclips - - - Contats - Kontakte - - - Links - Links - - - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorylocalizer_en_GB.qm Binary file src/hbcore/i18n/translations/directorylocalizer_en_GB.qm has changed diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorylocalizer_en_GB.ts --- a/src/hbcore/i18n/translations/directorylocalizer_en_GB.ts Fri Sep 17 08:32:10 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ - - - - - HbDirectoryLocalization - - games - Games - - - install files - Install files - - - images - Images - - - Picture messages - Picture messages - - - Wallpapers - Wallpapers - - - Presence logos - Presence logos - - - Others - Others - - - Sound files - Sound files - - - Sound clips - Sound clips - - - Ringing tones - Ringing tones - - - Video clips - Video clips - - - Contats - Contats - - - Links - Links - - - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ar.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ar.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + ملفات الصوت + + + Wallpapers + خلفيات + + + Video clips + مقاطع الفيديو + + + Games + الألعاب + + + Contats + الأسماء + + + Others + غير ذلك + + + Picture messages + رسائل مصورة + + + Ringing tones + نغمات الرنين + + + Links + الروابط + + + Sound clips + مقاطع الصوت + + + Images + الصور + + + Install files + الملفات المثبتة + + + Presence logos + شعارات التواجد + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_bg.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_bg.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Звукови файлове + + + Wallpapers + Тапети + + + Video clips + Видеоклипове + + + Games + Игри + + + Contats + Контакти + + + Others + Други + + + Picture messages + Съобщение с картинка + + + Ringing tones + Тонове на звънене + + + Links + Линкове + + + Sound clips + Звукови клипове + + + Images + Изображения + + + Install files + Инсталирани файлове + + + Presence logos + Лога за присъствие + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ca.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ca.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Fitxers de so + + + Wallpapers + Empaperats + + + Video clips + Clips de vídeo + + + Games + Jocs + + + Contats + Contactes + + + Others + Altres + + + Picture messages + Missatges d'imatges + + + Ringing tones + Sons de trucada + + + Links + Enllaços + + + Sound clips + Clips de so + + + Images + Imatges + + + Install files + Fitxers instal·lats + + + Presence logos + Logos de presència + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_cs.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_cs.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Zvukové soubory + + + Wallpapers + Tapety + + + Video clips + Videoklipy + + + Games + Hry + + + Contats + Kontakty + + + Others + Jiné + + + Picture messages + Obrázkové zprávy + + + Ringing tones + Vyzváněcí tóny + + + Links + Odkazy + + + Sound clips + Zvukové klipy + + + Images + Obrázky + + + Install files + Instalované soubory + + + Presence logos + Loga přítomnosti + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_da.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_da.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Lydfiler + + + Wallpapers + Baggrunde + + + Video clips + Videoklip + + + Games + Spil + + + Contats + Kontakter + + + Others + Andet + + + Picture messages + Billedbeskeder + + + Ringing tones + Ringetoner + + + Links + Links + + + Sound clips + Lydklip + + + Images + Billeder + + + Install files + Installerede filer + + + Presence logos + Statuslogoer + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_de.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_de.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Tondateien + + + Wallpapers + Hintergrundbilder + + + Video clips + Videoclips + + + Games + Spiele + + + Contats + Kontakte + + + Others + Sonstige + + + Picture messages + Bildmitteilungen + + + Ringing tones + Klingeltöne + + + Links + Links + + + Sound clips + Soundclips + + + Images + Bilder + + + Install files + Installierte Dateien + + + Presence logos + Erreichbarkeitslogos + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_el.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_el.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Αρχεία ήχου + + + Wallpapers + Ταπετσαρίες + + + Video clips + Κλιπ βίντεο + + + Games + Παιχνίδια + + + Contats + Επαφές + + + Others + Άλλα + + + Picture messages + Εικονομηνύματα + + + Ringing tones + Ήχοι κλήσης + + + Links + Σύνδεσμοι + + + Sound clips + Κλιπ ήχου + + + Images + Εικόνες + + + Install files + Εγκατεστημένα αρχεία + + + Presence logos + Λογότυπα παρουσίας + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_en.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_en.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Sound files + + + Wallpapers + Wallpapers + + + Video clips + Video clips + + + Games + Games + + + Contats + Contacts + + + Others + Other + + + Picture messages + Picture messages + + + Ringing tones + Ringtones + + + Links + Links + + + Sound clips + Sound clips + + + Images + Images + + + Install files + Installed files + + + Presence logos + Presence logos + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_en_US.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_en_US.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Sound files + + + Wallpapers + Wallpapers + + + Video clips + Video clips + + + Games + Games + + + Contats + Contacts + + + Others + Other + + + Picture messages + Picture messages + + + Ringing tones + Ring tones + + + Links + Links + + + Sound clips + Sound clips + + + Images + Images + + + Install files + Installed files + + + Presence logos + Presence logos + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_es.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_es.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Archivos de sonido + + + Wallpapers + Papeles tapiz + + + Video clips + Videoclips + + + Games + Juegos + + + Contats + Contactos + + + Others + Otros + + + Picture messages + Mensajes gráficos + + + Ringing tones + Señales de llamada + + + Links + Enlaces + + + Sound clips + Clips de sonido + + + Images + Imágenes + + + Install files + Archivos instalados + + + Presence logos + Logos de presencia + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_es_419.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_es_419.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Archivos de sonido + + + Wallpapers + Imágenes de fondo + + + Video clips + Videoclips + + + Games + Juegos + + + Contats + Contactos + + + Others + Otra + + + Picture messages + Mensajes de imagen + + + Ringing tones + Tonos de timbre + + + Links + Enlaces + + + Sound clips + Clips de sonido + + + Images + Imágenes + + + Install files + Archivos instalados + + + Presence logos + Logotipos de presencia + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_et.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_et.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Helifailid + + + Wallpapers + Taustpildid + + + Video clips + Videoklipid + + + Games + Mängud + + + Contats + Kontaktid + + + Others + Muu + + + Picture messages + Piltsõnumid + + + Ringing tones + Helinad + + + Links + Lingid + + + Sound clips + Heliklipid + + + Images + Pildid + + + Install files + Installitud failid + + + Presence logos + Olekulogod + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_eu.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_eu.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Soinu-fitxategiak + + + Wallpapers + Horma-paperak + + + Video clips + Bideoklipak + + + Games + Jokoak + + + Contats + Kontaktuak + + + Others + Bestelakoa + + + Picture messages + Irudi-mezuak + + + Ringing tones + Dei tonuak + + + Links + Estekak + + + Sound clips + Soinu-klipak + + + Images + Irudiak + + + Install files + Instalatutako fitxategiak + + + Presence logos + Presentzia-logoak + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_fa.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_fa.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + پرونده های صوتی + + + Wallpapers + تصاویر زمینه + + + Video clips + كلیپ های ویدیویی + + + Games + بازی ها + + + Contats + مخاطبین + + + Others + دیگر موارد + + + Picture messages + پیام های تصویری + + + Ringing tones + آهنگ های زنگ + + + Links + پیوندها + + + Sound clips + کلیپ های صوتی + + + Images + تصاویر + + + Install files + پرونده های نصب شده + + + Presence logos + آرم های حضور + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_fi.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_fi.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Äänitiedostot + + + Wallpapers + Taustakuvat + + + Video clips + Videoleikkeet + + + Games + Pelit + + + Contats + Nimet + + + Others + Muut + + + Picture messages + Kuvaviestit + + + Ringing tones + Soittoäänet + + + Links + Linkit + + + Sound clips + Äänitteet + + + Images + Kuvat + + + Install files + Asennetut tiedostot + + + Presence logos + Olotilatunnukset + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_fr.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_fr.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Fichiers audio + + + Wallpapers + Fonds d'écran + + + Video clips + Vidéos + + + Games + Jeux + + + Contats + Contacts + + + Others + Autre + + + Picture messages + Messages image + + + Ringing tones + Sonneries + + + Links + Liens + + + Sound clips + Sons + + + Images + Photos + + + Install files + Fichiers installés + + + Presence logos + Logos de présence + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_fr_CA.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_fr_CA.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Fichiers audio + + + Wallpapers + Papiers peints + + + Video clips + Clips vidéo + + + Games + Jeux + + + Contats + Contacts + + + Others + Autres + + + Picture messages + Messages graphiques + + + Ringing tones + Sonneries + + + Links + Liens + + + Sound clips + Clips audio + + + Images + Images + + + Install files + Fichiers installés + + + Presence logos + Symboles de présence + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_gl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_gl.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Ficheiros de son + + + Wallpapers + Fondos + + + Video clips + Videoclips + + + Games + Xogos + + + Contats + Contactos + + + Others + Outros + + + Picture messages + Mensaxes de imaxes + + + Ringing tones + Tons de chamada + + + Links + Ligazóns + + + Sound clips + Clips de son + + + Images + Imaxes + + + Install files + Ficheiros instalados + + + Presence logos + Logos de presenza + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_he.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_he.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + קובצי קול + + + Wallpapers + תמונות רקע + + + Video clips + וידאו קליפים + + + Games + משחקים + + + Contats + אנשי קשר + + + Others + אחר + + + Picture messages + הודעות תמונה + + + Ringing tones + רינגטונים + + + Links + קישורים + + + Sound clips + קליפים קוליים + + + Images + תמונות + + + Install files + קבצים מותקנים + + + Presence logos + סמלי לוגו של נוכחות + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_hi.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_hi.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Sound files + + + Wallpapers + Wallpapers + + + Video clips + Video clips + + + Games + Games + + + Contats + Contats + + + Others + Others + + + Picture messages + Picture messages + + + Ringing tones + Ringing tones + + + Links + Links + + + Sound clips + Sound clips + + + Images + Images + + + Install files + Install files + + + Presence logos + Presence logos + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_hr.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_hr.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Zvučne datoteke + + + Wallpapers + Pozadine + + + Video clips + Videoisječci + + + Games + Igre + + + Contats + Kontakti + + + Others + Ostalo + + + Picture messages + Slikovne poruke + + + Ringing tones + Melodije zvona + + + Links + Veze + + + Sound clips + Zvučni isječci + + + Images + Slike + + + Install files + Instalirane datoteke + + + Presence logos + Logotip dostupnosti + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_hu.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_hu.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Hangfájlok + + + Wallpapers + Háttérképek + + + Video clips + Videofájlok + + + Games + Játékok + + + Contats + Névjegyzék + + + Others + Egyéb + + + Picture messages + Képüzenetek + + + Ringing tones + Csengőhangok + + + Links + Hivatkozások + + + Sound clips + Hangfájlok + + + Images + Képek + + + Install files + Telepített fájlok + + + Presence logos + Jelenlétlogók + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_id.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_id.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + File suara + + + Wallpapers + Wallpaper + + + Video clips + Klip video + + + Games + Permainan + + + Contats + Kontak + + + Others + Lainnya + + + Picture messages + Pesan gambar + + + Ringing tones + Nada dering + + + Links + Link + + + Sound clips + Klip suara + + + Images + Foto + + + Install files + File terinstal + + + Presence logos + Logo kehadiran + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_is.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_is.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Hljóðskrár + + + Wallpapers + Veggfóður + + + Video clips + Myndskeið + + + Games + Leikir + + + Contats + Tengiliðir + + + Others + Annað + + + Picture messages + Myndskilaboð + + + Ringing tones + Hringitónar + + + Links + Tenglar + + + Sound clips + Hljóðskrár + + + Images + Myndir + + + Install files + Uppsettar skrár + + + Presence logos + Viðverutákn + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_it.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_it.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + File audio + + + Wallpapers + Sfondi + + + Video clips + Clip video + + + Games + Giochi + + + Contats + Schede Rubrica + + + Others + Altro + + + Picture messages + Messaggi con disegno + + + Ringing tones + Toni di chiamata + + + Links + Collegamenti + + + Sound clips + Clip audio + + + Images + Immagini + + + Install files + File installati + + + Presence logos + Logo presenza + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ja.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ja.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Sound files + + + Wallpapers + Wallpapers + + + Video clips + Video clips + + + Games + Games + + + Contats + Contats + + + Others + Others + + + Picture messages + Picture messages + + + Ringing tones + Ringing tones + + + Links + Links + + + Sound clips + Sound clips + + + Images + Images + + + Install files + Install files + + + Presence logos + Presence logos + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ko.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ko.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + 사운드 파일 + + + Wallpapers + 배경 무늬 + + + Video clips + 동영상 + + + Games + 게임 + + + Contats + 연락처 + + + Others + 기타 + + + Picture messages + 그림 메시지 + + + Ringing tones + 벨소리 + + + Links + 링크 + + + Sound clips + 사운드 클립 + + + Images + 이미지 + + + Install files + 설치된 파일 + + + Presence logos + 표시 로고 + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_lt.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_lt.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Garso failai + + + Wallpapers + Fono paveikslėliai + + + Video clips + Vaizdo įrašai + + + Games + Žaidimai + + + Contats + Adresų knyga + + + Others + Kiti + + + Picture messages + Grafiniai pranešimai + + + Ringing tones + Skambėjimo tonai + + + Links + Nuorodos + + + Sound clips + Garso įrašai + + + Images + Atvaizdai + + + Install files + Įdiegti failai + + + Presence logos + Dalyvavimo logotipai + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_lv.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_lv.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Skaņas faili + + + Wallpapers + Foni + + + Video clips + Videoklipi + + + Games + Spēles + + + Contats + Kontakti + + + Others + Cits + + + Picture messages + Grafiskās īsziņas + + + Ringing tones + Zvana signāli + + + Links + Saites + + + Sound clips + Skaņas klipi + + + Images + Attēli + + + Install files + Instalētie faili + + + Presence logos + Dalības logotipi + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_mr.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_mr.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Sound files + + + Wallpapers + Wallpapers + + + Video clips + Video clips + + + Games + Games + + + Contats + Contats + + + Others + Others + + + Picture messages + Picture messages + + + Ringing tones + Ringing tones + + + Links + Links + + + Sound clips + Sound clips + + + Images + Images + + + Install files + Install files + + + Presence logos + Presence logos + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ms.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ms.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Fail bunyi + + + Wallpapers + Gambar latar + + + Video clips + Klip video + + + Games + Permainan + + + Contats + Kenalan + + + Others + Lain-lain + + + Picture messages + Mesej bergambar + + + Ringing tones + Nada dering + + + Links + Pautan + + + Sound clips + Klip bunyi + + + Images + Imej + + + Install files + Fail dipasang + + + Presence logos + Logo kehadiran + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_nb.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_nb.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Lydfiler + + + Wallpapers + Bakgrunnsbilder + + + Video clips + Videoklipp + + + Games + Spill + + + Contats + Kontakter + + + Others + Annet + + + Picture messages + Bildemeldinger + + + Ringing tones + Ringetoner + + + Links + Koblinger + + + Sound clips + Lydklipp + + + Images + Bilder + + + Install files + Installerte filer + + + Presence logos + Tilstedelogoer + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_nl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_nl.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Geluidsbestanden + + + Wallpapers + Achtergronden + + + Video clips + Videoclips + + + Games + Spelletjes + + + Contats + Contacten + + + Others + Overige + + + Picture messages + Beeldberichten + + + Ringing tones + Beltonen + + + Links + Koppelingen + + + Sound clips + Geluidsclips + + + Images + Afbeeldingen + + + Install files + Geïnstalleerde bestanden + + + Presence logos + Presencelogo's + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_pl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_pl.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Pliki dźwiękowe + + + Wallpapers + Tapety + + + Video clips + Pliki wideo + + + Games + Gry + + + Contats + Kontakty + + + Others + Inne + + + Picture messages + Wiadomości graficzne + + + Ringing tones + Dźwięki dzwonka + + + Links + Łącza + + + Sound clips + Pliki audio + + + Images + Zdjęcia + + + Install files + Zainstalowane pliki + + + Presence logos + Logo dostępności + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_pt.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_pt.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Ficheiros de som + + + Wallpapers + Papéis parede + + + Video clips + Clips de vídeo + + + Games + Jogos + + + Contats + Contactos + + + Others + Outro + + + Picture messages + Msgs. de imagem + + + Ringing tones + Tons de toque + + + Links + Ligações + + + Sound clips + Clips de som + + + Images + Imagens + + + Install files + Ficheiros instalados + + + Presence logos + Logótipos presença + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_pt_BR.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_pt_BR.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Arquivos de som + + + Wallpapers + Papéis de parede + + + Video clips + Vídeos + + + Games + Jogos + + + Contats + Contatos + + + Others + Outros + + + Picture messages + Mensagens gráficas + + + Ringing tones + Toques musicais + + + Links + Links + + + Sound clips + Clipes de som + + + Images + Imagens + + + Install files + Arquivos instalados + + + Presence logos + Logotipos de presença + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ro.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ro.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + FiȘiere audio + + + Wallpapers + Imagini de fundal + + + Video clips + Videoclipuri + + + Games + Jocuri + + + Contats + Contacte + + + Others + Altul + + + Picture messages + Mesaje grafice + + + Ringing tones + Sunete de apel + + + Links + Legături + + + Sound clips + Clipuri audio + + + Images + Imagini + + + Install files + FiȘiere instalate + + + Presence logos + Embleme prezenȚă + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ru.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ru.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Звуковые файлы + + + Wallpapers + Фоновые рисунки + + + Video clips + Видеоклипы + + + Games + Игры + + + Contats + Контакты + + + Others + Другое + + + Picture messages + Графические сообщения + + + Ringing tones + Мелодии сигналов + + + Links + Ссылки + + + Sound clips + Аудиоклипы + + + Images + Изображения + + + Install files + Установленные файлы + + + Presence logos + Логотипы присутствия + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_sk.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_sk.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Zvukové súbory + + + Wallpapers + Tapety + + + Video clips + Videoklipy + + + Games + Hry + + + Contats + Kontakty + + + Others + Iné + + + Picture messages + Obrazové správy + + + Ringing tones + Zvonenia + + + Links + Odkazy + + + Sound clips + Zvukové klipy + + + Images + Snímky + + + Install files + Nainštalované súbory + + + Presence logos + Logá účasti + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_sl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_sl.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Zvočne datoteke + + + Wallpapers + Ozadja + + + Video clips + Video posnetki + + + Games + Igre + + + Contats + Imenik + + + Others + Drugo + + + Picture messages + Slikovna sporočila + + + Ringing tones + Toni zvonjenja + + + Links + Povezave + + + Sound clips + Zvočni posnetki + + + Images + Slike + + + Install files + Nameščene datoteke + + + Presence logos + Logotipi prisotnosti + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_sr.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_sr.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Audio datoteke + + + Wallpapers + Pozadine + + + Video clips + Video snimci + + + Games + Igre + + + Contats + Kontakti + + + Others + Ostalo + + + Picture messages + Grafičke poruke + + + Ringing tones + Tonovi zvona + + + Links + Linkovi + + + Sound clips + Audio snimci + + + Images + Slike + + + Install files + Instalacione datoteke + + + Presence logos + Logo prisutnosti + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_sv.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_sv.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Ljudfiler + + + Wallpapers + Bakgrundsbilder + + + Video clips + Videoklipp + + + Games + Spel + + + Contats + Kontakter + + + Others + Övrigt + + + Picture messages + Bildmeddelanden + + + Ringing tones + Ringtoner + + + Links + Länkar + + + Sound clips + Ljudklipp + + + Images + Bilder + + + Install files + Installerade filer + + + Presence logos + Statusloggor + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_th.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_th.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + ไฟล์เสียง + + + Wallpapers + ภาพพื้นหลัง + + + Video clips + วิดีโอคลิป + + + Games + เกมส์ + + + Contats + รายชื่อ + + + Others + อื่นๆ + + + Picture messages + ข้อความรูปภาพ + + + Ringing tones + เสียงเรียกเข้า + + + Links + ลิงค์ + + + Sound clips + คลิปเสียง + + + Images + รูปภาพ + + + Install files + ไฟล์ที่​ติดตั้ง + + + Presence logos + โลโก้สถานะ + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_tl.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_tl.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Mga file ng sound + + + Wallpapers + Mga wallpaper + + + Video clips + Mga video clip + + + Games + Mga laro + + + Contats + Mga contact + + + Others + Iba pa + + + Picture messages + Mga mensaheng larawan + + + Ringing tones + Mga ringtone + + + Links + Mga link + + + Sound clips + Mga sound clip + + + Images + Mga imahe + + + Install files + Mga naka-install na file + + + Presence logos + Mga logo ng presensya + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_tr.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_tr.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Ses dosyaları + + + Wallpapers + Duvar kağıtları + + + Video clips + Video klipler + + + Games + Oyunlar + + + Contats + Rehber + + + Others + Diğer + + + Picture messages + Resimli mesajlar + + + Ringing tones + Zil sesleri + + + Links + Bağlantılar + + + Sound clips + Ses klipleri + + + Images + Görüntüler + + + Install files + Yüklü dosyalar + + + Presence logos + Durum logoları + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_uk.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_uk.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Аудіофайли + + + Wallpapers + Шпалери + + + Video clips + Відеокліпи + + + Games + Ігри + + + Contats + Контакти + + + Others + Інший + + + Picture messages + Графічні повідомлення + + + Ringing tones + Тони дзвінка + + + Links + Посилання + + + Sound clips + Аудіокліпи + + + Images + Зображення + + + Install files + Установлені файли + + + Presence logos + Логотипи присутності + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ur.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_ur.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + صوتی فائلیں + + + Wallpapers + وال پیپر + + + Video clips + ویڈیو کلپس + + + Games + کھیل + + + Contats + روابط + + + Others + دیگر + + + Picture messages + تصویری پیغامات + + + Ringing tones + گھنٹی ٹونز + + + Links + ربط + + + Sound clips + صوتی کلپس + + + Images + شبیہات + + + Install files + نصب شدہ فائلیں + + + Presence logos + موجودگی لوگوز + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_vi.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_vi.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + Tập tin âm thanh + + + Wallpapers + Hình nền + + + Video clips + Video clip + + + Games + Trò chơi + + + Contats + Số liên lạc + + + Others + Khác + + + Picture messages + Tin nhắn hình + + + Ringing tones + Nhạc chuông + + + Links + Liên kết + + + Sound clips + Tập tin âm thanh + + + Images + Hình ảnh + + + Install files + Tập tin đã cài đặt + + + Presence logos + Logo presence + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_zh.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_zh.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + 声音文件 + + + Wallpapers + 壁纸 + + + Video clips + 视频片段 + + + Games + 游戏 + + + Contats + 名片 + + + Others + 其他 + + + Picture messages + 图片信息 + + + Ringing tones + 铃声 + + + Links + 链接 + + + Sound clips + 声音片段 + + + Images + 图像 + + + Install files + 已安装的文件 + + + Presence logos + 状态标志 + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_zh_HK.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_zh_HK.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + 音效 + + + Wallpapers + 背景圖片 + + + Video clips + 短片 + + + Games + 遊戲 + + + Contats + 通訊錄 + + + Others + 其他 + + + Picture messages + 圖片訊息 + + + Ringing tones + 鈴聲 + + + Links + 連結 + + + Sound clips + 音效檔 + + + Images + 圖像 + + + Install files + 已安裝的檔案 + + + Presence logos + 線上狀態標誌 + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_zh_TW.ts --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/i18n/translations/directorynamelocalizer/directorynamelocalizer_zh_TW.ts Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,58 @@ + + + + nString + + Sound files + 聲音 + + + Wallpapers + 桌面圖案 + + + Video clips + 影片 + + + Games + 遊戲 + + + Contats + 通訊錄 + + + Others + 其他 + + + Picture messages + 圖片訊息 + + + Ringing tones + 鈴聲 + + + Links + 連結 + + + Sound clips + 聲音檔 + + + Images + 影像 + + + Install files + 已安裝的檔案 + + + Presence logos + 線上狀態標誌 + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/languages.qm Binary file src/hbcore/i18n/translations/languages.qm has changed diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/languages.ts --- a/src/hbcore/i18n/translations/languages.ts Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/translations/languages.ts Mon Oct 04 00:38:12 2010 +0300 @@ -3,207 +3,207 @@ hblanguageswitch - + English English - + French Français - + German Deutsch - + Spanish Español - + Italian Italiano - + Swedish Svenska - + Danish Dansk - + Norwegian Norsk - + Finnish Suomi - + English (American) English - + Portuguese Português - + Turkish Türkçe - + Icelandic Íslenska - + Russian Русский - + Hungarian Magyar - + Dutch Nederlands - + Czech Čeština - + Slovak Slovenčina - + Polish Polski - + Slovenian Slovenščina - + Chinese TW 繁體中文(台灣) - + Chinese HK 繁體中文(香港) - + Chinese PRC 简体中文 - + Japanese 日本語 - + Thai ภาษาไทย - + Arabic العربية - + Pilipino Pilipino - + Burgarian Български - + Catalan Català - + Croatian Hrvatski - + Estonian Eesti - + Farsi فارسى - + French (Canadian) Français - + Greek Ελληνικά - + Hebrew עברית - + Hindi हिन्दी - + Indonesian Indonesia - + Korean 한국어 - + Latvian Latviešu - + Lithuanian Lietuvių - + Malay Melayu - + Marathi मराठी - + Portuguese (Brazil) Português - + Romanian Română - + Serbian Srpski - + Spanish (American) Español - + Ukrainian Українська - + Urdu اردو - + Vietnamese Tiếng Việt - + Basque Euskara - + Galician Galego diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/locale_mappings.txt --- a/src/hbcore/i18n/translations/locale_mappings.txt Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/translations/locale_mappings.txt Mon Oct 04 00:38:12 2010 +0300 @@ -23,10 +23,10 @@ 31,031,156,031,zh,CN,zh 32,032,392,032,ja,JP,ja 33,033,764,033,th,TH,th -37,037,682,037,ar,SA,ar +37,037,784,037,ar,AE,ar 39,039,608,039,tl,PH,tl 42,042,100,042,bg,BG,bg -44,044, ,044,ca, ,ca +44,044,724,044,ca,ES,ca 45,045,191,045,hr,HR,hr 49,049,233,049,et,EE,et 50,050,364,050,fa,IR,fa @@ -42,9 +42,9 @@ 76,076,076,076,pt_BR,BR,pt_BR 78,078,642,078,ro,RO,ro 79,079,891,079,sr,RS,sr -83,083, ,083,es_419, ,es_419 +83,083,484,083,es_419,MX,es_419 93,093,804,093,uk,UA,uk 94,094,586,094,ur,PK,ur 96,096,704,096,vi,VN,vi -102,102, ,102,eu, ,eu -103,103, ,103,gl, ,gl \ No newline at end of file +102,102,724,102,eu,ES,eu +103,103,724,103,gl,ES,gl \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/regions.qm Binary file src/hbcore/i18n/translations/regions.qm has changed diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/i18n/translations/regions.ts --- a/src/hbcore/i18n/translations/regions.ts Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/i18n/translations/regions.ts Mon Oct 04 00:38:12 2010 +0300 @@ -3,189 +3,193 @@ hblanguageswitch - + English United Kingdom - + France France - + Germany Deutschland - + Spain España - + Italy Italia - + Sweden Sverige - + Denmark Danmark - + Norway Norge - + Finland Suomi - + United States United States - + Portugal Portugal - + Turkey Türkiye - + Iceland Ísland - + Russia Россия - + Hungary Magyarország - + Netherlands Nederland - + Czech Český - + Slovakia Slovensko - + Poland Polska - + Slovenia Slovenija - + Taiwan 台灣 - + Hong Kong 香港 - + China 中国 - + Japan 日本 - + Thailand ประเทศไทย - - Saudi Arabia - العربية السعودية + + United Arab Emirates + الإمارات العربية المتحدة - + Philippines Pilipinas - + Bulgaria България - + Croatian Hrvatska - + Estonia Eesti - + Iran ایران - + Canada Canada - + Greece Ελλάδα - + Israel ישראל - + India भारत - + Indonesia Indonesia - + Korea 한국 - + Latvia Latvija - + Lithuania Lietuva - + Malaysia Malaysia - + Brazil Brasil - + Romania România - + Serbia - Србија + Srbija - + Ukraine Україна - + Pakistan Pakistan - + Vietnam Việt Nam + + Mexico + México + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/image/hbframedrawer.cpp --- a/src/hbcore/image/hbframedrawer.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/image/hbframedrawer.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -980,18 +980,20 @@ } /*! -* Resets the MaskableIcon -*/ + * Drops the underlying icon(s). No need to send an unload req to server because the + * server drops the icon by itself in this case. + */ void HbFrameDrawerPrivate::resetMaskableIcon() { -#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON) HbIconLoader *loader = HbIconLoader::global(); if (icon) { //consolidated icon case icon->decrementRefCount(); - if (icon->refCount() == 0 && icon->isCreatedOnServer()) { + if (icon->refCount() == 0) { // remove the item from cache and delete the icon - loader->removeItemInCache(icon->iconImpl()); + if (loader) { + loader->removeItemInCache(icon->iconImpl()); + } icon->dispose(); } icon = 0; @@ -1002,8 +1004,10 @@ // remove the item in cache, dispose if needed. foreach(HbMaskableIconImpl * impl, fallbackMaskableIconList) { impl->decrementRefCount(); - if (impl->refCount() == 0 && impl->isCreatedOnServer()) { - loader->removeItemInCache(impl->iconImpl()); + if (impl->refCount() == 0) { + if (loader) { + loader->removeItemInCache(impl->iconImpl()); + } impl->dispose(); } } @@ -1011,7 +1015,6 @@ } } frameParts = 0; -#endif } HbIconLoader::IconLoaderOptions HbFrameDrawerPrivate::iconLoaderOptions() diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/image/hbicon.cpp --- a/src/hbcore/image/hbicon.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/image/hbicon.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -413,9 +413,8 @@ /*! Constructs a new icon with the icon name \a iconName. */ -HbIcon::HbIcon(const QString &iconName) +HbIcon::HbIcon(const QString &iconName) : d( new HbIconPrivate(iconName) ) { - d = new HbIconPrivate(iconName); } /*! @@ -437,9 +436,8 @@ * painting performance when compared to a native HbIcon. Some advanced resource * management features are not available for such icons either. */ -HbIcon::HbIcon(const QIcon &icon) +HbIcon::HbIcon(const QIcon &icon) : d( new HbIconPrivate(icon) ) { - d = new HbIconPrivate(icon); } /*! @@ -672,7 +670,7 @@ QSizeF pixmapSize = pixmap.size(); // QIcon::pixmap() will not do upscaling. - if (pixmapSize.width() < size.width() || pixmapSize.height() < size.height()) { + if (!pixmap.isNull() && (pixmapSize.width() < size.width() || pixmapSize.height() < size.height())) { // Native HbIcons are scaled using SmoothTransformation so use the same. pixmap = pixmap.scaled(size.toSize(), aspectRatioMode, Qt::SmoothTransformation); pixmapSize = pixmap.size(); @@ -936,7 +934,7 @@ * Adds a badge icon to the existing icon. The badge icons * are drawn relative to the alignment you specify with the * z-order you provide. - * + * * By default the badge icon will use its default size. If this is * not suitable (which is typical in case of vector graphics) then * call setSize() explicitly on \a badge before passing it to this diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/image/hbiconengine.cpp --- a/src/hbcore/image/hbiconengine.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/image/hbiconengine.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -1280,7 +1280,7 @@ } /*! - * Drops the underlying iconimpl if it is SgImage or NVG based. + * Drops the underlying icon data. * * There is no unload request to the server in this case, server-side * unref will be handled by the server when HbIconLoader notifies it @@ -1289,19 +1289,17 @@ */ void HbIconEngine::resetIconImpl() const { -#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON) - - if (d->icon) { - d->icon->decrementRefCount(); - if (d->icon->refCount() == 0 && d->icon->isCreatedOnServer()) { - HbIconLoader *loader = HbIconLoader::global(); + if (d->icon) { + d->icon->decrementRefCount(); + if (d->icon->refCount() == 0) { + HbIconLoader *loader = HbIconLoader::global(); + if (loader) { loader->removeItemInCache(d->icon); } - d->icon->dispose(); - d->icon = 0; } - -#endif + d->icon->dispose(); + d->icon = 0; + } } void HbIconEngine::addBadge(Qt::Alignment align, diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/image/hbiconimpl_p.h --- a/src/hbcore/image/hbiconimpl_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/image/hbiconimpl_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -48,8 +48,8 @@ HbIconImpl() : createdOnServer(false), - iconRefCount(1) - + iconRefCount(1), + renderMode( ESWRendering ) { } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/image/hbiconloader.cpp --- a/src/hbcore/image/hbiconloader.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/image/hbiconloader.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -84,7 +84,7 @@ */ // Allocated dynamically so it can be deleted before the application object is destroyed. -// Deleting it later causes segmentation fault. +// Deleting it later causes segmentation fault so Q_GLOBAL_STATIC cannot be used. static HbIconLoader *theLoader = 0; static bool loaderDestroyed = false; @@ -96,6 +96,14 @@ // Icons with size above a certain limit are always ignored by the cachekeeper. const int MAX_KEEPALIVE_ITEM_SIZE_BYTES = MAX_KEEPALIVE_CACHE_SIZE_BYTES / 2; +static void cleanupLoader() +{ + if (theLoader) { + delete theLoader; + theLoader = 0; + } +} + class HbLocalLoaderThread : public QThread { public: @@ -620,8 +628,13 @@ // Set default rendering mode to EHWRendering renderMode = EHWRendering; - // Delete the icon loader when the application is destroyed. - connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), SLOT(destroy())); + // Delete the icon loader during QCoreApplication destruction. Relying on + // aboutToQuit() would cause destruction to happen too early, with Q_GLOBAL_STATIC it + // would be too late. Recreation is forbidden so HbIconLoader::global() will return 0 + // after destroying the application instance but at least in a typical application the + // loader will still be available e.g. in widget (and thus graphics widget, hb view, + // etc.) destructors. + qAddPostRoutine(cleanupLoader); connect(HbLayoutDirectionNotifier::instance(), SIGNAL(layoutDirectionChangeStarted()), this, SLOT(updateLayoutDirection())); @@ -649,7 +662,9 @@ if (!theLoader && !loaderDestroyed) { theLoader = new HbIconLoader; } - + if (!theLoader) { + qWarning("HbIconLoader instance not present, returning null."); + } return theLoader; } @@ -829,10 +844,7 @@ void HbIconLoader::destroy() { - if (theLoader) { - delete theLoader; - theLoader = 0; - } + cleanupLoader(); } void HbIconLoader::updateLayoutDirection() diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/image/hbnvgrasterizer_p.cpp --- a/src/hbcore/image/hbnvgrasterizer_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/image/hbnvgrasterizer_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -178,7 +178,6 @@ void * destination, int stride, QImage::Format imageFormat) { - initialize(renderSize.width(), renderSize.height()); bool isIconCreated = false; TSize surfaceSize(TSize(renderSize.width(), renderSize.height())); @@ -213,10 +212,6 @@ isIconCreated = true; } - // destroy the previous surface, - // as we don't have a way to clear the surface - terminate(); - return isIconCreated; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/image/hbpixmapiconimpl_p.cpp --- a/src/hbcore/image/hbpixmapiconimpl_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/image/hbpixmapiconimpl_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -151,13 +151,13 @@ if (alignment & Qt::AlignRight) { topLeft.setX(rect.right() - pixmapSize.width()); } else if (alignment & Qt::AlignHCenter) { - topLeft.setX(topLeft.x() + (rect.width() - pixmapSize.width()) / 2); + topLeft.setX(topLeft.x() + (qRound(rect.width()) - qRound(pixmapSize.width())) / 2.0f); } if (alignment & Qt::AlignBottom) { topLeft.setY(rect.bottom() - pixmapSize.height()); } else if (alignment & Qt::AlignVCenter) { - topLeft.setY(topLeft.y() + (rect.height() - pixmapSize.height()) / 2); + topLeft.setY(topLeft.y() + (qRound(rect.height()) - qRound(pixmapSize.height())) / 2.0f); } pixmapIconRenderer->draw(painter, topLeft, clipPath, maskIconData); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/image/hbsgimageiconimpl_p.cpp --- a/src/hbcore/image/hbsgimageiconimpl_p.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/image/hbsgimageiconimpl_p.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -308,13 +308,13 @@ if (alignment & Qt::AlignRight) { topLeft.setX(rect.right() - renderSize.width()); } else if (alignment & Qt::AlignHCenter) { - topLeft.setX(topLeft.x() + (rect.width() - renderSize.width()) / 2); + topLeft.setX(topLeft.x() + (qRound(rect.width()) - qRound(renderSize.width())) / 2.0f); } if (alignment & Qt::AlignBottom) { topLeft.setY(rect.bottom() - renderSize.height()); } else if (alignment & Qt::AlignVCenter) { - topLeft.setY(topLeft.y() + (rect.height() - renderSize.height()) / 2); + topLeft.setY(topLeft.y() + (qRound(rect.height()) - qRound(renderSize.height())) / 2.0f); } return topLeft; } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/indicatorplugins/hbindicatorplugininterface.cpp --- a/src/hbcore/indicatorplugins/hbindicatorplugininterface.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/indicatorplugins/hbindicatorplugininterface.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -53,6 +53,18 @@ clients, it should check client security credentials in accessAllowed() function. Indicator framework calls this function before activating/deactivating indicators. + \section _exceptions Exception handling + + Indicator service uses two strategies in exception handling: Avoidance and trapping. + Memory allocation exceptions while an indicator is running are avoided by ensuring there is + sufficient heap space available before allowing new indicators to be activated. + Trapping is used while an indicator is created. A call to createIndicator() is enclosed + in try/catch block. Memory allocation exception causes indicator activation to fail + and an error is returned to a client. Plugin should take care there are no memory leaks + if exception is thrown inside createIndicator(). Calls to HbIndicatorInterface + functions are trapped and thrown allocation exceptions are ignored. Plugins can + provide more fine grained exception handling by trapping exceptions themselves. + \section _platform_hbindicatorplugin Platform-specific implementation notes for HbIndicatorPluginInterface \subsection _nonsymbian Non-Symbian diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp --- a/src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -168,24 +168,29 @@ indicator->disconnect(this, SLOT(deactivateIndicator())); connect(indicator, SIGNAL(deactivate()), SLOT(deactivateIndicator()), Qt::QueuedConnection); - - indicator->processClientRequest( + success = true; + try { + indicator->processClientRequest( HbIndicatorInterface::RequestActivate, parameter); - //in case indicator deactivated itself, find the indicator again. - index = findPlugin(indicatorType, &indicatorInfo); + } catch (const std::bad_alloc &) { + success = false; + } + if (success) { + //in case indicator deactivated itself, find the indicator again. + index = findPlugin(indicatorType, &indicatorInfo); - if (index >= 0 && !indicatorInfo->activated) { - indicatorInfo->activated = true; - emit indicatorActivated(indicator); - indicatorInfo->statusAreaIconPath = statusAreaIconPath(indicator); - emit indicatorActivated(IndicatorClientInfo( - indicator->indicatorType(), indicatorInfo->statusAreaIconPath, - indicator->category(), hasMenuData(*indicator))); + if (index >= 0 && !indicatorInfo->activated) { + indicatorInfo->activated = true; + emit indicatorActivated(indicator); + indicatorInfo->statusAreaIconPath = statusAreaIconPath(indicator); + emit indicatorActivated(IndicatorClientInfo( + indicator->indicatorType(), indicatorInfo->statusAreaIconPath, + indicator->category(), hasMenuData(*indicator))); - connect(indicator, SIGNAL(dataChanged()), SLOT(indicatorDataChanged())); - connect(indicator, SIGNAL(userActivated(QVariantMap)), SLOT(userActivateIndicator(QVariantMap))); + connect(indicator, SIGNAL(dataChanged()), SLOT(indicatorDataChanged())); + connect(indicator, SIGNAL(userActivated(QVariantMap)), SLOT(userActivateIndicator(QVariantMap))); + } } - success = true; } return success; } @@ -298,11 +303,15 @@ int index = findPlugin(indicatorType, &info); if (index >= 0 && checkAccess(index, indicatorType, securityCredentials)) { HbIndicatorInterface *indicator = info->indicator; + success = true; if (indicator->indicatorType() == indicatorType && info->activated) { - indicator->processClientRequest( + try { + indicator->processClientRequest( HbIndicatorInterface::RequestDeactivate, parameter); + } catch (const std::bad_alloc &) { + success = false; + } } - success = true; } TRACE_EXIT return success; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputcontextplugin.cpp --- a/src/hbcore/inputfw/hbinputcontextplugin.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputcontextplugin.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -26,7 +26,7 @@ #include "hbinputcontextplugin.h" /*! -@proto +@stable @hbcore \class HbInputContextPlugin \brief Extends QInputContextPlugin to support HbInputMethod input method selection UI elements. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputcontextproxy.cpp --- a/src/hbcore/inputfw/hbinputcontextproxy.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputcontextproxy.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -34,7 +34,7 @@ #include /*! -@alpha +@stable @hbcore \class HbInputContextProxy \brief A proxy class forwarding calls from QInputContext to HbInputMethod diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputeditorinterface.cpp --- a/src/hbcore/inputfw/hbinputeditorinterface.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputeditorinterface.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -38,28 +38,124 @@ #include "hbinpututils.h" /*! -@alpha +@stable @hbcore \class HbEditorInterface -\brief An interface for accessing editor specific input attributes. +\brief The HbEditorInterface class provides an interface for accessing +editor-specific input attributes. + +HbEditorInterface is an interface for different editor widget types, which +do not always derive from the same base classes. The interface defines +a set of properties that applications can modify to constrain the input +characters that the user can enter into an editor widget. %HbEditorInterface +gives applications a common way of setting properties for both %Hb and %Qt editors +(such as HbLineEdit, HbTextEdit, QLineEdit). The interface is also used in +input method code. + +HbEditorInterface does not store the editor widget properties locally or +duplicate them. Its memory footprint is very small. You can create as many +interfaces to the same editor as you require for your application. +The HbInput framework maintains only one copy of the editor attributes for +each editor. All interface instances for an editor use those attributes. + +With HbEditorInterface, you can control, for example, the following editor attributes: -This class is an interface for accessing and manipulating editor attributes, such as input mode, text case, -constraints, input filter and so on. It also contains some useful convenience and utility methods. -This interface is meant to be used from both client application and input method code. +
    +
  • text case: lower case, upper case, automatic
    • +
  • input mode type: numeric, handwriting, ...
    • +
  • input constraints: Latin only, auto-completing, ...
    • +
  • input filter: digits only, input lower case, phone number, URL, ...
    • +
  • editor class type: e-mail, URL, username, password, phone number, ...
    • +
  • extra dictionary to be used in predictive text input
    • +
  • smiley theme
    • +
  • custom button for an editor-specific or application-specific action
    • +
+ +The interface also contains useful convenience functions to define the type of data +that the user can enter into an editor. The convenience functions set all the necessary +attributes for some commonly used editor cases: + +
    +
  • setUpAsCompletingEmailField()
    • +
  • setUpAsCompletingUrlField()
    • +
  • setUpAsLatinAlphabetOnlyEditor()
    • +
+ +\section _usecases_hbeditorinterface Using HbEditorInterface + +\subsection _uc_001_hbeditorinterface Creating and using HbEditorInterface + +The following example shows how to create an editor interface, attach an editor +to it, and use some attributes. + +\code +QLineEdit *lineEdit = new QLineEdit; // Create an editor +HbEditorInterface editorInterface(lineEdit); // Create an editor interface and attach lineEdit to it +editorInterface.setTextCase(HbTextCaseUpper); // Set text case to upper case +\endcode -Following example shows how to create editor interface, attach editor to it and use some attributes. +If the attached editor is deleted, the editor interface will start to return +the same values as when a null pointer is passed to the constructor. + +When any of the values is changed, a signal modified() is emitted. + +\subsection _uc_002_hbeditorinterface Using the convenience functions + +The following example shows how to use a convenience function for configuring +your editor to be a URL field. The convenience function sets the required +attributes necessary for URL input. -\snippet{unittest_hbinputeditorinterface/unittest_hbinputeditorinterface.cpp,1} +\code +HbLineEdit *myLineEdit = new HbLineEdit; // Create an editor +HbEditorInterface editorInterface2(myLineEdit); // Create an editor interface to it +editorInterface2.setUpAsCompletingUrlField(); // Use the convenience function to set the editor as an URL field +\endcode + +\subsection _uc_003_hbeditorinterface Setting input constraints + +Input constraints in the HbInput framework are defined by the enumeration HbEditorConstraint, +which is defined in the header file hbinputdef.h. You can set several input constraints +at the same time in a bit vector HbEditorConstraints, as in the following example: + +\code +HbLineEdit *mySearchField = new HbLineEdit; // Create an editor +HbEditorInterface editorInterface3(mySearchField); // Create an editor interface to it -If the attached editor is deleted, the editor interface will start to return same values -as when a null pointer is passed to the constructor. +// Use the input constraint function to set the editor as an auto-completing field +// and to prevent the change of the input mode +editorInterface3.setInputConstraints(HbEditorConstraintAutoCompletingField | HbEditorConstraintFixedInputMode); +\endcode + +One useful constraint is HbEditorConstraintIgnoreFocus. By default, a virtual +keyboard is shown when an editor gets the focus. If you want to use the editor +as a read-only viewer, or prevent the virtual keyboard from opening for some +other reason, you can set the HbEditorConstraintIgnoreFocus constraint. It prevents +the editor from getting a focus event, and the virtual keyboard is not shown. -When any of the values is changed, signal modified() is emitted. +Here is an example of setting HbEditorConstraintIgnoreFocus: +\code +HbSomeViewerPointer *myViewer; // Pointer to some kind of editor in read-only mode, so it is a viewer +HbEditorInterface editorInterface4(myViewer); // Create an editor interface to it (viewer does not have to be + // an editor for this to work as long as it is derived from QObject) + +// Instruct the input framework to ignore viewer focus events +editorInterface4.setInputConstraints(HbEditorConstraintIgnoreFocus); +\endcode + +\note Note that there are also some common editor attributes that cannot be +set with HbEditorInterface, such as disabling the predictive mode. To set this +and other input method hints in application code, use your editor's %Qt base class +function, either QGraphicsItem::setInputMethodHints(Qt::InputMethodHints hints) for +%Hb editors, or QWidget::setInputMethodHints(Qt::InputMethodHints hints) for +%Qt editors. In input method code, use +HbInputFocusObject::setInputMethodHints(Qt::InputMethodHints hints). + +\sa HbLineEdit, HbTextEdit, HbAbstractEdit */ /*! -Constructs the object and attaches given editor. +Constructor. Attaches the given editor to the interface. */ HbEditorInterface::HbEditorInterface(QObject *editor) { @@ -70,7 +166,7 @@ } /*! -Destructs the object. +Destructor. */ HbEditorInterface::~HbEditorInterface() { @@ -78,7 +174,7 @@ } /*! -Returns text case. Returned value is HbTextCase +Returns the text case. \sa setTextCase */ @@ -95,10 +191,9 @@ } /*! -Sets text case. +Sets the text case. \sa textCase -\sa HbTextCase */ void HbEditorInterface::setTextCase(HbTextCase textCase) { @@ -111,9 +206,9 @@ } /*! -Returns active editor input mode. +Returns the active editor input mode. -\sa setInputMode +\sa setMode */ HbInputModeType HbEditorInterface::mode() const { @@ -128,9 +223,9 @@ } /*! -Sets active editor input mode. +Sets the active editor input mode. -\sa inputMode +\sa mode */ void HbEditorInterface::setMode(HbInputModeType inputMode) { @@ -179,8 +274,8 @@ } /*! -Returns active input filter. The input framework will always run any text it produces -through the active filter before it is committed into editor buffer. +Returns the active input filter. The input framework will always run any input text +through the active filter before committing the text into the editor buffer. In some cases, the input framework also automatically sets the filter to match input method hints. The default filter can still be overridden. @@ -200,7 +295,13 @@ } /*! -Sets active input filter. The ownership is not transferred. +Sets the active input filter. The ownership is not transferred. + +The input framework will always run any input text through the active filter +before committing the text into the editor buffer. + +In some cases, the input framework also automatically sets the filter to match +input method hints. The default filter can still be overridden. \sa filter */ @@ -215,8 +316,8 @@ } /*! -Returns local digit type setting. If this value is set, it will override device wide -digit type setting. +Returns the local digit type setting. If this value is set, it will override +the device-wide digit type setting. \sa setDigitType */ @@ -234,7 +335,8 @@ } /*! -Sets local digit type. +Sets the local digit type. If this value is set, it will override the device-wide +digit type setting. \sa digitType */ @@ -249,21 +351,24 @@ } /*! -Adds action to this editor's list of actions on the first position. +Adds \a action to this editor's list of actions on the first position. -The action is used in virtual keyboards to define the application specific button. The -keyboard will display a button using the text, icon and tooltip specified in the action. +The action is used in virtual keyboards to define a custom button. +The keyboard will display a button using the icon specified in the action. When the button is clicked, the action is triggered. -If the action is already in the list, it will be removed before adding it again. +If the action is already in the list, it will be removed before being added +again. -Hb input methods currently use only the first action in the list. +%Hb input methods currently use only the first action in the list and display +only the icon, not the text. Different input methods may display 0 or more than one button. -Note that the custom button action is only a request to show it. Whether or not the -virtual keyboard widget actually shows it depends on the situation and -the active input method. That's why a function asigned to custom button should never -be the only way to use a feature but only a shortcut. +Note that the custom button action is only a request to show it. Whether +or not the virtual keyboard widget actually shows the action depends on +the situation and the active input method. That is why a function assigned +to the custom button should never be the only way to use a feature, but +only a shortcut. \sa insertAction \sa removeAction @@ -275,8 +380,8 @@ } /*! -Inserts action to this editor's list of actions before the action before. -If the action is already in the list, it will be removed before inserting it again. +Inserts \a action to this editor's list of actions before the action \a before. +If the action is already in the list, it will be removed before being inserted again. \sa addAction \sa removeAction @@ -354,8 +459,8 @@ } /*! -Returns id value for attached extra user dictionary. Returns zero if no extra -user dictinaries are attached to this editor. +Returns the id value for the attached extra user dictionary. Returns zero if no extra +user dictionaries are attached to this editor. \sa setExtraDictionaryId \sa HbUserDictionary @@ -375,9 +480,9 @@ } /*! -Sets extra user dictionary id value. After setting this value those prediction -engines that support extra dictionaries attach given dictionary to be -part of prediction vocabulary. +Sets the extra user dictionary id value. After setting this value those prediction +engines that support extra dictionaries attach the given dictionary to be +part of the prediction vocabulary. \sa extraDictionaryId \sa HbUserDictionary @@ -394,7 +499,9 @@ } /*! -Returns editor class. +Returns the editor class type. + +\sa setEditorClass */ HbInputEditorClass HbEditorInterface::editorClass() const { @@ -410,7 +517,9 @@ } /*! -Sets editor class. +Sets the editor class type. + +\sa editorClass */ void HbEditorInterface::setEditorClass(HbInputEditorClass editorClass) { @@ -423,7 +532,7 @@ } /*! -Returns editor sepcific smiley theme. +Returns the editor-specific smiley theme. \sa setSmileyTheme */ @@ -441,8 +550,8 @@ } /*! -Sets editor specific smiley theme. The smiley picker will display smileys provided -by given theme. +Sets the editor-specific smiley theme. The smiley picker will display smileys +provided by \a theme. \sa smileyTheme */ @@ -457,7 +566,7 @@ } /*! -Finds and returns virtual keyboard host for this editor. +Finds and returns a virtual keyboard host for the attached editor. */ HbVkbHost *HbEditorInterface::vkbHost() const { @@ -510,7 +619,8 @@ } /*! -Returns true if this instance is attached to same editor as given instance. +Returns \c true if this instance is attached to the same editor +as \a editorInterface. */ bool HbEditorInterface::operator==(const HbEditorInterface &editorInterface) const { @@ -518,7 +628,8 @@ } /*! -Returns true if this instance is not attached to same editor as given instance. +Returns \c true if this instance is not attached to the same editor +as \a editorInterface. */ bool HbEditorInterface::operator!=(const HbEditorInterface &editorInterface) const { @@ -526,7 +637,7 @@ } /*! -Returns pointer to the editor object this interface is attached to. +Returns a pointer to the editor object attached to this interface. */ QObject *HbEditorInterface::editor() const { @@ -538,8 +649,9 @@ } /*! -Last focused state remembers the editor state exactly as it was when the focus is taken away. This is framework side -API. There should never be need to use it from application code. +The last focused state remembers the editor state exactly as it was when +the focus was removed. This is for the framework side API, and there +should never be need to call it from application code. \sa setLastFocusedState */ @@ -555,7 +667,8 @@ } /*! -Sets last focused state. This is framework side API, there should neever be need to call it from application code. +Sets the last focused state. This is for the framework side API, and +there should never be need to call it from application code. \sa lastFocusedState */ @@ -568,8 +681,10 @@ } } + /*! -A convenience method for setting up the editor as completing email field. +A convenience function for setting up the editor as an auto-completing +e-mail address field. */ void HbEditorInterface::setUpAsCompletingEmailField() { @@ -583,7 +698,8 @@ } /*! -A convenience method for setting up the editor as completing url field. +A convenience function for setting up the editor as an auto-completing +URL field. */ void HbEditorInterface::setUpAsCompletingUrlField() { @@ -596,14 +712,17 @@ } /*! -A convenience method for setting up the editor as latin alphabet editor. In this mode, the input framework -will use global input language if it is naturally capable of producing latin aplhabets. Otherwise -it will switch locally to english language (is is assumed that english is always available). -It is also recommended that prediction is disabled in latin only editors. That's because predictive mode in -latin alphabet editor is controversial (which prediction database should be used if global language doesn't -apply and we locally to switch to english? If we used english database, that would lead to situation -where some global languages use their native prediction databases and some don't). -That's why this method disables predictive input by default. +A convenience function for setting up the editor as a Latin alphabet editor. +In this mode, the input framework will use the global input language if +it is naturally capable of producing Latin alphabets. Otherwise it will switch +locally to English (is is assumed that English is always available). + +It is also recommended that prediction is disabled in Latin-only editors. +That is because the predictive mode in a Latin alphabet editor is controversial: +which prediction database should be used if the global language does not +apply and we switch to English locally? Using the English database would lead +to a situation where some global languages use their native prediction databases +and some do not. To avoid this, the function disables predictive input by default. */ void HbEditorInterface::setUpAsLatinAlphabetOnlyEditor() { @@ -613,10 +732,12 @@ } /*! -Returns true if connected editor is configured to behave as numeric editor. In Qt 4.6 and beyond, numeric -editors have one of these input method hints set: Qt::ImhDigitsOnly, Qt::ImhDialableCharactersOnly or Qt::ImhFormattedNumbersOnly. -If either Qt::ImhLowercaseOnly or Qt::ImhUppercaseOnly is also set, then the editor is not numeric editor and -this method returns false. +Returns \c true if the connected editor is configured to behave as +a numeric editor. In Qt 4.6 and beyond, numeric editors have one of these +input method hints set: Qt::ImhDigitsOnly, Qt::ImhDialableCharactersOnly, +or Qt::ImhFormattedNumbersOnly. If either Qt::ImhLowercaseOnly or +Qt::ImhUppercaseOnly is also set, then the editor is not a numeric editor +and this function returns \c false. */ bool HbEditorInterface::isNumericEditor() const { @@ -625,7 +746,7 @@ } /*! -Returns true if predictive input mode is allowed in attached editor. +Returns \c true if the predictive input mode is allowed in the attached editor. */ bool HbEditorInterface::isPredictionAllowed() const { @@ -633,15 +754,29 @@ } /*! -Returns true if there is existing data record for given object. This method can -be used for testing whether someone has set editor data for given object without -creating a data record for it. This is usually not needed on application side. +Returns \c true if there is an existing data record for \a object. This function can +be used for testing whether someone has set editor data for a given object without +creating a data record for it. This is usually not needed on the application side. */ bool HbEditorInterface::isConnected(QObject *object) { return HbEditorInterfacePrivateCache::instance()->isConnected(object); } +/*! + * \fn void HbEditorInterface::modified() + * + * This signal is emitted when any of the editor settings is changed. + */ + +/*! + * \fn void HbEditorInterface::cursorPositionChanged(int oldPos, int newPos) + * + * This signal is emitted when the cursor position in the attached editor + * is changed. + */ + + /// @cond void HbEditorInterface::backendModified() diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputextradictionarycollection.cpp --- a/src/hbcore/inputfw/hbinputextradictionarycollection.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputextradictionarycollection.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -28,7 +28,7 @@ #include "hbinputextradictionaryfactory.h" /*! -@proto +@stable @hbcore \class HbExtraDictionaryCollection \brief Virtual collection of extra user dictionaries. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputextradictionaryfactory.cpp --- a/src/hbcore/inputfw/hbinputextradictionaryfactory.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputextradictionaryfactory.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -30,7 +30,7 @@ #include "hbinputextrauserdictionary.h" /*! -@proto +@stable @hbcore \class HbExtraDictionaryFactory \brief A factory class for creating and accessing instances of HbExtraDictionary database. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputextrauserdictionary.cpp --- a/src/hbcore/inputfw/hbinputextrauserdictionary.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputextrauserdictionary.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -41,7 +41,7 @@ const QString RomanOnes[9] = {"I","II","III","IV","V","VI","VII","VIII","IX"}; /*! -@proto +@stable @hbcore \class HbExtraUserDictionary \brief A generic implementation of HbUserDictionary class. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputfocusobject.cpp --- a/src/hbcore/inputfw/hbinputfocusobject.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputfocusobject.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -41,9 +41,11 @@ #include "hbevent.h" #include "hbwidget.h" #include "hbinputmainwindow_p.h" +#include "hbpopup.h" +#include "hbpopup_p.h" /*! -@beta +@stable @hbcore \class HbInputFocusObject \brief A helper class for accessing editor widget in abstract way. @@ -479,6 +481,35 @@ } /*! +Returns a priority value for the editor if the editor is inside a popup and +in other cases zero is returned. +*/ +quint8 HbInputFocusObject::editorPriority() const +{ + Q_D(const HbInputFocusObject); + + QGraphicsObject *editorWidget = d->mGraphicsObject; + if (!editorWidget) { + QWidget *widget = d->mWidget; + if (widget) { + editorWidget = widget->graphicsProxyWidget(); + } + } + + if (editorWidget) { + // Check if the editor is inside a popup and if so return the popup priority + for (QGraphicsObject *object = editorWidget; object; object = object->parentObject()) { + HbPopup *popup = qobject_cast(object); + if (popup) { + return HbPopupPrivate::d_ptr(popup)->priority(); + } + } + } + + return 0; +} + +/*! Returns input method hints. See QWidget and QGraphicsItem documentation for more information. */ Qt::InputMethodHints HbInputFocusObject::inputMethodHints() const diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputfocusobject.h --- a/src/hbcore/inputfw/hbinputfocusobject.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputfocusobject.h Mon Oct 04 00:38:12 2010 +0300 @@ -67,6 +67,7 @@ QRectF microFocus() const; QString preEditString() const; qreal findVkbZValue() const; + quint8 editorPriority() const; Qt::InputMethodHints inputMethodHints() const; void setInputMethodHints(Qt::InputMethodHints hints); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputkeymapfactory.cpp --- a/src/hbcore/inputfw/hbinputkeymapfactory.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputkeymapfactory.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -275,7 +275,7 @@ /// @endcond /*! -@alpha +@stable @hbcore \class HbKeymapFactory \brief A factory class for accessing keymap data. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputmethod_p.h --- a/src/hbcore/inputfw/hbinputmethod_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputmethod_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -115,6 +115,7 @@ return inputMethod->d_func(); } friend class TestHbInputMethodPrivate; + friend class TestHbAbstractVkbHostPrivate; friend class HbInputContextProxy; }; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputmethoddescriptor.cpp --- a/src/hbcore/inputfw/hbinputmethoddescriptor.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputmethoddescriptor.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -25,6 +25,8 @@ #include "hbinputmethoddescriptor.h" /*! +@stable +@hbcore \class HbInputMethodDescriptor \brief Describes an input method diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputmodecache.cpp --- a/src/hbcore/inputfw/hbinputmodecache.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputmodecache.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -42,7 +42,6 @@ /*! @alpha -@hbcore \class HbInputModeCache \brief Input framework's internal input mode resolver class. */ diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputpredictionengine.cpp --- a/src/hbcore/inputfw/hbinputpredictionengine.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputpredictionengine.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -26,7 +26,7 @@ #include "hbinputpredictionengine.h" /*! -@alpha +@stable @hbcore \class HbPredictionBase \brief A base class for prediction engine abstration layer. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputpredictionfactory.cpp --- a/src/hbcore/inputfw/hbinputpredictionfactory.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputpredictionfactory.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -37,7 +37,7 @@ #include "hbinputpredictionengine.h" /*! -@alpha +@stable @hbcore \class HbPredictionFactory \brief A factory class for prediction engine abstractation layer. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputregioncollector.cpp --- a/src/hbcore/inputfw/hbinputregioncollector.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputregioncollector.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -34,7 +34,7 @@ #include "hbdeviceprofile.h" /*! -\proto +@stable \class HbInputRegionCollector \brief Installs a filter on a HbWidget and observes for a change in position, size and visibility of the attached widget. As soon as it detects a change in size, position or visibility it calculates diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputsettingproxy.cpp --- a/src/hbcore/inputfw/hbinputsettingproxy.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputsettingproxy.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -52,7 +52,7 @@ #endif /*! -@alpha +@stable @hbcore \class HbInputSettingProxy \brief A singleton class providing access to system wide input related settings. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputstandardfilters.cpp --- a/src/hbcore/inputfw/hbinputstandardfilters.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputstandardfilters.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -32,7 +32,7 @@ #define HB_DIGIT_EASTERN_ARABIC_END_VALUE 0x06F9 /*! -@alpha +@stable @hbcore \class HbPhoneNumberFilter \brief Phone number editor filter. @@ -106,7 +106,7 @@ } /*! -@alpha +@stable @hbcore \class HbFormattedNumbersFilter \brief Converter number editor filter. @@ -146,7 +146,7 @@ } /*! -@alpha +@stable @hbcore \class HbDigitsOnlyFilter \brief digits only editor filter. @@ -183,7 +183,7 @@ } /*! -@alpha +@stable @hbcore \class HbUrlFilter \brief Url editor filter. @@ -233,7 +233,7 @@ } /*! -@proto +@stable @hbcore \class HbEmailAddressFilter \brief EMail address filter filter. @@ -282,7 +282,7 @@ /*! -@proto +@stable @hbcore \class HbInputLowerCaseFilter \brief Lower case character filter. @@ -316,7 +316,7 @@ /*! -@proto +@stable @hbcore \class HbInputUpperCaseFilter \brief Upper case character filter. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputvirtualkeyboard.cpp --- a/src/hbcore/inputfw/hbinputvirtualkeyboard.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputvirtualkeyboard.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -26,7 +26,8 @@ #include "hbinputvirtualkeyboard.h" /*! -\proto +@stable +@hbcore \class HbVirtualKeyboard \brief Abstract base class for virtual keyboards. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputvkbhost.cpp --- a/src/hbcore/inputfw/hbinputvkbhost.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputvkbhost.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -31,7 +31,8 @@ const char HbVkbHostPropertyName[] = "HbVkbHost"; /*! -\proto +@stable +@hbcore \class HbVkbHost \brief Virtual keyboard host base class. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/inputfw/hbinputvkbhostbridge.cpp --- a/src/hbcore/inputfw/hbinputvkbhostbridge.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/inputfw/hbinputvkbhostbridge.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -28,7 +28,8 @@ #include /*! -\proto +@stable +@hbcore \class HbVkbHostBridge \brief Provides one connection point to receive signals from all the virtual keyboard hosts. diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/ovgeffects/hbvgchainedeffect.cpp --- a/src/hbcore/ovgeffects/hbvgchainedeffect.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/ovgeffects/hbvgchainedeffect.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -25,6 +25,7 @@ #include "hbvgchainedeffect_p.h" #include "hbvgchainedeffect_p_p.h" +#include "hbinstance_p.h" #include /*! @@ -202,17 +203,29 @@ // into a pixmap first (works only for sw-based effects). QPixmap src = d->srcPixmap; QVariant srcVgImage = vgImage; - QSize srcVgImageSize = vgImageSize; - QPointF srcOffset = offset; foreach(HbVgEffect * effect, d->effects) { if (effect->chainBehavior() == ChainBehavAsSource) { // Restore the world transform temporarily because the sw // version has slightly different semantics. painter->setWorldTransform(d->worldTransform); - effect->performEffectSw(painter, &src, &srcOffset); + QPixmap modSrc = src; + QPointF modOffset; + // This can be nothing but a mask effect and it can produce smaller output if + // the source is based on a scroll area (or anything that clips its children, + // as long as the source pixmaps are not restricted to obey the clipping). So + // have its output in a temporary pixmap and copy it into the original source + // pixmap to the (hopefully) appropriate position afterwards. + effect->performEffectSw(painter, &modSrc, &modOffset); + qreal dx = modOffset.x() - offset.x(); + qreal dy = modOffset.y() - offset.y(); painter->setWorldTransform(QTransform()); - srcVgImage = QVariant::fromValue(qPixmapToVGImage(src)); - srcVgImageSize = src.size(); + if (dx >= 0 && dy >= 0) { + src.fill(Qt::transparent); + QPainter p(&src); + p.drawPixmap(QPointF(dx, dy), modSrc); + p.end(); + srcVgImage = QVariant::fromValue(qPixmapToVGImage(src)); + } break; } } @@ -228,14 +241,17 @@ effD->srcPixmap = src; effD->worldTransform = d->worldTransform; // Draw. - effect->performEffect(painter, srcOffset, srcVgImage, srcVgImageSize); + effect->performEffect(painter, offset, srcVgImage, vgImageSize); // The flags must be cleared manually for the contained effects. effD->paramsChanged = effD->cacheInvalidated = false; + if (effD->alwaysClearPixmaps || HbInstancePrivate::d_ptr()->mDropHiddenIconData) { + effD->clearPixmaps(); + } hadNormalEffects = true; } // If there are no effects in the chain then just draw the source. if (d->effects.isEmpty() || !hadNormalEffects) { - painter->drawPixmap(srcOffset, src); + painter->drawPixmap(offset, src); } #else diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/ovgeffects/hbvgeffect.cpp --- a/src/hbcore/ovgeffects/hbvgeffect.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/ovgeffects/hbvgeffect.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -33,6 +33,7 @@ #include #include #include +#include /*! * \class HbVgEffect @@ -104,7 +105,8 @@ mainWindow(0), lastUsedRotation(0), lastRotationTransformAngle(0), - forceSwMode(false) + forceSwMode(false), + alwaysClearPixmaps(true) // Enable it always for now, due to limited gpu memory. { } @@ -133,6 +135,22 @@ #endif /*! + * Clears all the pixmaps that live as member variables. This is not mandatory, + * but helps reducing graphics memory usage. + * + * The downside is decreased performance due to new pixmap creation in the next + * ensurePixmap() call. + * + * \internal + */ +void HbVgEffectPrivate::clearPixmaps() +{ + // Note: If the effect used tryCache() then the underlying pixmap data for + // dstPixmap will not really be destroyed here due to implicit sharing. + srcPixmap = dstPixmap = tmpPixmap = QPixmap(); +} + +/*! * Invalidates the cache but only if it has not been done already. * * \internal @@ -476,6 +494,12 @@ // Restore the painter's previously set transformations. painter->setWorldTransform(d->worldTransform); + // Make sure we don't keep any unused pixmaps alive in case the application + // wants to minimize gpu memory usage (on the expense of performance). + if (d->alwaysClearPixmaps || HbInstancePrivate::d_ptr()->mDropHiddenIconData) { + d->clearPixmaps(); + } + #else // OpenVG code disabled => effect is not shown (but have the source drawn still). drawSource(painter); diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/ovgeffects/hbvgeffect_p_p.h --- a/src/hbcore/ovgeffects/hbvgeffect_p_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/ovgeffects/hbvgeffect_p_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -78,6 +78,7 @@ return effect->d_func(); } + void clearPixmaps(); void ensureCacheInvalidated(); // Called whenever cacheInvalidated is changed to true. Derived classes can override @@ -136,6 +137,9 @@ mutable qreal lastRotationTransformAngle; bool forceSwMode; + + // When enabled, a clearPixmap() call is performed always after drawing. + bool alwaysClearPixmaps; }; #endif diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/primitives/hbmarqueeitem.cpp --- a/src/hbcore/primitives/hbmarqueeitem.cpp Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/primitives/hbmarqueeitem.cpp Mon Oct 04 00:38:12 2010 +0300 @@ -36,6 +36,7 @@ #include "hbdeviceprofile.h" #include "hbcolorscheme.h" #include "hbnamespace_p.h" +#include "hbforegroundwatcher_p.h" #include #include @@ -156,7 +157,7 @@ HbMarqueeItemPrivate::HbMarqueeItemPrivate() : content(0), - mAnimationPending(false) + mUserRequestedAnimation(false) { } @@ -169,6 +170,14 @@ q->setFlag(QGraphicsItem::ItemClipsChildrenToShape); QObject::connect(&mAnimGroup, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)) ,q,SLOT(_q_stateChanged())); +#ifdef Q_OS_SYMBIAN + // this feature has sence only on phone device + HbForegroundWatcher *fgWatcher = HbForegroundWatcher::instance(); + Q_ASSERT(fgWatcher); + QObject::connect(fgWatcher, SIGNAL(foregroundLost()), q, SLOT(_q_temporaryStopAnimation())); + QObject::connect(fgWatcher, SIGNAL(foregroundGained()), q, SLOT(_q_tryToResumeAnimation())); +#endif // Q_OS_SYMBIAN + #ifdef HB_TEXT_MEASUREMENT_UTILITY if ( HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) { q->setProperty( HbTextMeasurementUtilityNameSpace::textMaxLines, 1 ); @@ -248,9 +257,9 @@ { Q_Q(HbMarqueeItem); - bool oldAnimationPending = mAnimationPending; + bool oldAnimationPending = mUserRequestedAnimation; mAnimGroup.clear(); - mAnimationPending = oldAnimationPending; + mUserRequestedAnimation = oldAnimationPending; if (q->contentsRect().width() < content->mTextWidth) { @@ -314,8 +323,8 @@ anim->setDuration(1000); mAnimGroup.addAnimation(anim); - if(mAnimationPending) { - q->startAnimation(); + if(mAnimGroup.state()!=QAbstractAnimation::Running) { + _q_tryToResumeAnimation(); } } } @@ -328,13 +337,59 @@ emit q->animationStarted(); } else if (mAnimGroup.state() == QAbstractAnimation::Stopped) { initContentPosition(); - mAnimationPending = false; + mUserRequestedAnimation = false; emit q->animationStopped(); } else { // Other states are irrelevant } } +/* + Starts animation if: + 1. user what to animate it + 2. item is visible + 3. item is scene + 4. application is in foreground TODO: missing feature in HbForegroundWatcher how to read current state + */ +void HbMarqueeItemPrivate::_q_tryToResumeAnimation() +{ + Q_Q(HbMarqueeItem); + + if (mUserRequestedAnimation + && q->isVisible() + && (q->scene()!=0)) { + +#ifdef Q_OS_SYMBIAN +// if (!HbForegroundWatcher::instance()->) {// missing feature in HbForegroundWatcher +// return; +// } +#endif // Q_OS_SYMBIAN + + mAnimGroup.start(); + } +} + +void HbMarqueeItemPrivate::_q_temporaryStopAnimation() +{ + // store old state + bool oldUserRequest = mUserRequestedAnimation; + q_func()->stopAnimation(); + + // restore old state + mUserRequestedAnimation = oldUserRequest; +} + +void HbMarqueeItemPrivate::toggleAnimation(bool startAnimate) +{ + if (startAnimate) { + if (mAnimGroup.state()!=QAbstractAnimation::Running) { + _q_tryToResumeAnimation(); + } + } else { + _q_temporaryStopAnimation(); + } +} + /*! @alpha @hbcore @@ -428,6 +483,10 @@ /*! Returns if the text is currently animating. + + Note that if marquee item is not visible (isVisible is false or + it is not in scene or phone in in sleep mode) then animation is stoped and + this method will return false even when startAnimation() was called. */ bool HbMarqueeItem::isAnimating() const { @@ -436,15 +495,15 @@ } /*! - Starts or restarts the animation of the text. + Starts or restarts the animation of the text when marquee item + became/is visible and is inside of scene. */ void HbMarqueeItem::startAnimation() { Q_D(HbMarqueeItem); - if (isVisible()) { - d->mAnimGroup.start(); - } - d->mAnimationPending = true; + + d->mUserRequestedAnimation = true; + d->_q_tryToResumeAnimation(); } /*! @@ -454,6 +513,7 @@ { Q_D(HbMarqueeItem); d->mAnimGroup.stop(); + d->mUserRequestedAnimation = false; } /*! @@ -556,14 +616,19 @@ { Q_D(HbMarqueeItem); - if (change == QGraphicsItem::ItemVisibleHasChanged) { - if (!value.toBool()) { - bool oldAnimationPending = d->mAnimationPending; - stopAnimation(); - d->mAnimationPending = oldAnimationPending; - } else if (d->mAnimationPending) { - startAnimation(); + switch (change) { + case QGraphicsItem::ItemVisibleHasChanged: { + d->toggleAnimation(value.toBool()); } + break; + + case QGraphicsItem::ItemSceneHasChanged: { + d->toggleAnimation(0!=scene()); + } + break; + + default: + ;// nothing to do } return HbWidgetBase::itemChange(change, value); } @@ -575,13 +640,9 @@ { Q_D(HbMarqueeItem); if (e->type() == HbEvent::SleepModeEnter) { - bool oldAnimationPending = d->mAnimationPending; - stopAnimation(); - d->mAnimationPending = oldAnimationPending; + d->_q_temporaryStopAnimation(); } else if (e->type() == HbEvent::SleepModeExit) { - if (d->mAnimationPending) { - startAnimation(); - } + d->_q_tryToResumeAnimation(); } return HbWidgetBase::event(e); } diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/primitives/hbmarqueeitem.h --- a/src/hbcore/primitives/hbmarqueeitem.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/primitives/hbmarqueeitem.h Mon Oct 04 00:38:12 2010 +0300 @@ -71,8 +71,8 @@ private: Q_DECLARE_PRIVATE_D(d_ptr, HbMarqueeItem) Q_PRIVATE_SLOT(d_func(), void _q_stateChanged()) - - + Q_PRIVATE_SLOT(d_func(), void _q_tryToResumeAnimation()) + Q_PRIVATE_SLOT(d_func(), void void _q_temporaryStopAnimation()) }; #endif // HBMARQUEEITEM_H diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/primitives/hbmarqueeitem_p.h --- a/src/hbcore/primitives/hbmarqueeitem_p.h Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/primitives/hbmarqueeitem_p.h Mon Oct 04 00:38:12 2010 +0300 @@ -74,10 +74,14 @@ void initAnimations(); void _q_stateChanged(); + void _q_tryToResumeAnimation(); + void _q_temporaryStopAnimation(); + void toggleAnimation(bool toStart); + HbMarqueeContent *content; mutable QColor mDefaultColor; QColor mColor; - bool mAnimationPending; + bool mUserRequestedAnimation; QSequentialAnimationGroup mAnimGroup; }; diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/i18n/hbdirectorylocalizer.xml --- a/src/hbcore/resources/i18n/hbdirectorylocalizer.xml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/i18n/hbdirectorylocalizer.xml Mon Oct 04 00:38:12 2010 +0300 @@ -77,176 +77,176 @@ Links - text_directorynamelocalizer_foldername_games + txt_directorynamelocalizer_foldername_games - text_directorynamelocalizer_foldername_install + txt_directorynamelocalizer_foldername_install - text_directorynamelocalizer_foldername_images + txt_directorynamelocalizer_foldername_images - text_directorynamelocalizer_foldername_gms_pict + txt_directorynamelocalizer_foldername_gms_pict - text_directorynamelocalizer_foldername_mms_bc + txt_directorynamelocalizer_foldername_mms_bc - text_directorynamelocalizer_foldername_pres_logos + txt_directorynamelocalizer_foldername_pres_logos - text_directorynamelocalizer_foldername_fldr_others + txt_directorynamelocalizer_foldername_fldr_others - text_directorynamelocalizer_foldername_sounds + txt_directorynamelocalizer_foldername_sounds - text_directorynamelocalizer_foldername_digital_tones + txt_directorynamelocalizer_foldername_digital_tones - text_directorynamelocalizer_foldername_simple_tones + txt_directorynamelocalizer_foldername_simple_tones - text_directorynamelocalizer_foldername_videos + txt_directorynamelocalizer_foldername_videos - text_directorynamelocalizer_foldername_contacts + txt_directorynamelocalizer_foldername_contacts - text_directorynamelocalizer_foldername_links + txt_directorynamelocalizer_foldername_links text_phone_memory_root_path text_games_path - text_directorynamelocalizer_foldername_games + txt_directorynamelocalizer_foldername_games 0 text_phone_memory_root_path text_installs_path - text_directorynamelocalizer_foldername_install + txt_directorynamelocalizer_foldername_install 0 text_phone_memory_root_path text_images_path - text_directorynamelocalizer_foldername_images + txt_directorynamelocalizer_foldername_images 0 text_phone_memory_root_path text_gms_pictures_path - text_directorynamelocalizer_foldername_gms_pict + txt_directorynamelocalizer_foldername_gms_pict 0 text_phone_memory_root_path text_mms_background_images_path - text_directorynamelocalizer_foldername_mms_bc + txt_directorynamelocalizer_foldername_mms_bc 0 text_phone_memory_root_path text_presence_logos_path - text_directorynamelocalizer_foldername_pres_logos + txt_directorynamelocalizer_foldername_pres_logos 0 text_phone_memory_root_path text_others_path - text_directorynamelocalizer_foldername_others + txt_directorynamelocalizer_foldername_others 0 text_phone_memory_root_path text_sounds_path - text_directorynamelocalizer_foldername_sounds + txt_directorynamelocalizer_foldername_sounds 0 text_phone_memory_root_path text_digital_sounds_path - text_directorynamelocalizer_foldername_digital_tones + txt_directorynamelocalizer_foldername_digital_tones 0 text_phone_memory_root_path text_simple_sounds_path - text_directorynamelocalizer_foldername_simple_tones + txt_directorynamelocalizer_foldername_simple_tones 0 text_phone_memory_root_path text_videos_path - text_directorynamelocalizer_foldername_videos + txt_directorynamelocalizer_foldername_videos 0 text_memory_card_root_path text_games_path - text_directorynamelocalizer_foldername_games + txt_directorynamelocalizer_foldername_games 0 text_memory_card_root_path text_installs_path - text_directorynamelocalizer_foldername_install + txt_directorynamelocalizer_foldername_install 0 text_memory_card_root_path text_images_path - text_directorynamelocalizer_foldername_images + txt_directorynamelocalizer_foldername_images 0 text_memory_card_root_path text_others_path - text_directorynamelocalizer_foldername_others + txt_directorynamelocalizer_foldername_others 0 text_memory_card_root_path text_sounds_path - text_directorynamelocalizer_foldername_sounds + txt_directorynamelocalizer_foldername_sounds 0 text_memory_card_root_path text_digital_sounds_path - text_directorynamelocalizer_foldername_digital_tones + txt_directorynamelocalizer_foldername_digital_tones 0 text_memory_card_root_path text_simple_sounds_path - text_directorynamelocalizer_foldername_simple_tones + txt_directorynamelocalizer_foldername_simple_tones 0 text_memory_card_root_path text_videos_path - text_directorynamelocalizer_foldername_videos + txt_directorynamelocalizer_foldername_videos 0 @@ -258,13 +258,13 @@ text_memory_card_links_path - text_directorynamelocalizer_foldername_links + txt_directorynamelocalizer_foldername_links 0 text_phone_memory_root_path text_links_path - text_directorynamelocalizer_foldername_links + txt_directorynamelocalizer_foldername_links 0 diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_deletepage_pageindicator_disappear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_deletepage_pageindicator_disappear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,20 @@ + + + + 0.3 + + 0.0 + 1.0 + 1.0 + 1.0 + + + 0.3 + + 0.0 + 1.0 + 1.0 + 1.06 + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_newpage_pageindicator_appear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_newpage_pageindicator_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,14 @@ + + + + 1.0 + + 0.4 + + 0 + 0.8 + 0 + + 1.0 + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_pageindicator_appear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_pageindicator_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,10 @@ + + + + + 0.3 + 0.0 + 1.0 + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_pageindicator_disappear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_pageindicator_disappear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,10 @@ + + + + + 0.3 + 1.0 + 0.0 + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_trashcan_appear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_trashcan_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,10 @@ + + + + + 0.3 + 0.0 + 1.0 + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_trashcan_away_widget.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_trashcan_away_widget.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,12 @@ + + + + + 0.2 + + 0.9 + 0 + + #ff0000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_trashcan_disappear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_trashcan_disappear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,10 @@ + + + + + 0.3 + 1.0 + 0.0 + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_trashcan_near_widget.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_trashcan_near_widget.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,12 @@ + + + + + 0.2 + + 0.0 + 0.9 + + #ff0000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_appear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,26 @@ + + + + 0.3 + + 0.8 + 1.0 + + + 0.3 + + 0.8 + 1.0 + + + + 0.3 + 0.0 + 1.0 + + + 0.5 + 0.5 + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_away_trashcan.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_away_trashcan.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,12 @@ + + + + 2 + 3 + 0.7 + 8.0 + 4.0 + 4.0 + #000000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_delete.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_delete.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,60 @@ + + + + 0.3 + + 0.0 + 1.0 + 1.0 + 0.5 + + + 0.3 + + 0.0 + 0.9 + 1.0 + 1.0 + + + 0.3 + + 0 + 1 + 1.1 + 0.3 + + + 0.3 + + 0 + 1 + 1.1 + 0.3 + + + + 0.3 + 1.0 + 1.0 + 0.0 + + 0.0 + 1.0 + + + 2 + 3 + + + 0.3 + 0.7 + 0.7 + 0.0 + + 8.0 + 4.0 + 4.0 + #000000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_delete_trashcan.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_delete_trashcan.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,13 @@ + + + + + 0.3 + + 0.9 + 0.9 + 0 + + #ff0000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_dragmode_appear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_dragmode_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,36 @@ + + + + 0.3 + + 1 + 1 + 1.0 + 1.1 + + + 0.3 + + 1 + 1 + 1.0 + 1.1 + + 0.5 + 0.5 + + + 2 + 3 + + 0.3 + + 0 + 0.7 + + 8.0 + 4.0 + 4.0 + #000000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_dragmode_disappear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_dragmode_disappear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,32 @@ + + + + 0.3 + + 1.1 + 1 + + + 0.3 + + 1.1 + 1 + + 0.5 + 0.5 + + + 2 + 3 + + 0.3 + + 0.7 + 0 + + 8.0 + 4.0 + 4.0 + #000000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_in_dragmode.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_in_dragmode.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,31 @@ + + + + 0.3 + + 1 + 1 + 1.0 + 1.1 + + + 0.3 + + 1 + 1 + 1.0 + 1.1 + + 0.5 + 0.5 + + + 2 + 3 + 0.7 + 8.0 + 4.0 + 4.0 + #000000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_longtap_appear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_longtap_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,18 @@ + + + + 0.7 + + 1.0 + 1.1 + + + 0.7 + + 1.0 + 1.1 + + 0.5 + 0.5 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_near_trashcan.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_near_trashcan.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,12 @@ + + + + 2 + 3 + 0.7 + 8.0 + 4.0 + 4.0 + #000000 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_nonfocus_appear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_nonfocus_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,18 @@ + + + + 1.0 + + 0.3 + + 0 + -0.2 + + + 0.3 + + 1.0 + 0.6 + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_nonfocus_disappear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_nonfocus_disappear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,18 @@ + + + + 1.0 + + 0.3 + + -0.2 + 0 + + + 0.3 + + 0.6 + 1.0 + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/HS_widget_nonfocus_during_drag.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/HS_widget_nonfocus_during_drag.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,8 @@ + + + + 1.0 + -0.2 + 0.6 + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/chatincoming_appear.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/chatincoming_appear.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/chatincoming_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - 0.5 + 0.3 0.0 1.0 diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/chatoutgoing_appear.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/chatoutgoing_appear.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/chatoutgoing_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - 0.5 + 0.3 0.0 1.0 diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/indexfeedback_appear.fxml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/effects/hbdefault/indexfeedback_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,9 @@ + + + + 0.3 + 0.0 + 1.0 + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/notificationdialog_appear.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/notificationdialog_appear.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/notificationdialog_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -2,7 +2,7 @@ - 0.6 + 0.4 0.0 1.0 diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/notificationdialog_disappear.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/notificationdialog_disappear.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/notificationdialog_disappear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - 0.5 + 0.3 1.0 0.0 diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/progressslider_handleoutofbound.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/progressslider_handleoutofbound.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/progressslider_handleoutofbound.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -1,11 +1,3 @@ - - - 0.2 - - 1.0 - 0.5 - 1.0 - - + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/progressslider_trackpress.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/progressslider_trackpress.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/progressslider_trackpress.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -1,10 +1,3 @@ - - - 0.2 - - 1.0 - 0.5 - - + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/progressslider_trackrelease.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/progressslider_trackrelease.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/progressslider_trackrelease.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -1,11 +1,3 @@ - - - 0.2 - - 0.5 - 1.0 - - + - diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/submenu_appear.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/submenu_appear.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/submenu_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -2,7 +2,7 @@ - 0.3 + 0.2 0.0 1.0 diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/submenu_disappear.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/submenu_disappear.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/submenu_disappear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -2,7 +2,7 @@ - 0.3 + 0.2 1.0 0.0 diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/effects/hbdefault/viewitem_appear.fxml --- a/src/hbcore/resources/themes/effects/hbdefault/viewitem_appear.fxml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/effects/hbdefault/viewitem_appear.fxml Mon Oct 04 00:38:12 2010 +0300 @@ -1,20 +1,20 @@ - 0.3 + 0.15 - 0.8 + 0.9 1.0 - 0.3 + 0.15 - 0.8 + 0.9 1.0 - 0.3 + 0.15 0.0 1.0 diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/hbdefault.themeindex Binary file src/hbcore/resources/themes/hbdefault.themeindex has changed diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_b.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_b.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_bl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_bl.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_br.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_br.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_c.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_c.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_l.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_l.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_r.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_r.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_t.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_t.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_tl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_tl.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_tr.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_mask_tr.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_b.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_b.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_bl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_bl.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_br.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_br.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_c.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_c.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_l.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_l.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_r.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_r.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_t.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_t.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_tl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_tl.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_tr.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_editor_magnifier_overlay_tr.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,19 @@ - - - - - + + + + + + + - + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,19 @@ - - - - - + + + + + + + - + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_finetune.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_finetune.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,116 +1,137 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + - - - + + + + + + + + - - - - + + + + - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - + + + + + - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - - - + + + - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,37 @@ - - - - - - - + + + + + + + - - - - - + + + + + + - + - + - - - - + + + + + - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_account_setup.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_account_setup.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_account_setup.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,91 +1,99 @@ - + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + - - - - + + + + + - - - - + + + + - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + + + - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,29 +1,33 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,123 +1,145 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - - - - - - - + + + + - - - - + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + - + + + - - - - - + + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,100 +1,111 @@ - - + + + - - - + + + - - - - - + + + + + - + + + - - - - - + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_group_picture.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_group_picture.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_group_picture.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,107 +1,126 @@ - - + + + - - - - + + + + + + + + + + + - - - - - + + + + - - - - - + + + + + - + + + + + - - - - - + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + - - - - + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_album_art.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_album_art.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_album_art.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,32 +1,51 @@ - - - - - + + + + + - + + - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - - - - - - + + + + - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,204 +1,270 @@ - - - - - - - - + + + + + + + + + - - - - - - + + + + + + + - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + + - - - - + + + + + + - - - - - + + + + + + + + + - - - - - - + + + + - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - + + + + + - - - - + + + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - + + + + - - - - - - + + + + + + + + + + - - - - - - - - + + + + - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + - - - - + + + + + + - - - - + + + + + + - - - - - - - + + + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,54 +1,61 @@ - + + - - - + + + + - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - + + - - - - + + + + - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,48 +1,55 @@ - - - - - - + + + + + + + - - + + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - + + + - - - - - + + + + + + - + + - - - + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_essential.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_essential.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_essential.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,88 @@ - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,155 +1,159 @@ - + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,177 +1,226 @@ - - - - - - + + + + + + + - - + + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,83 +1,90 @@ - - - - - - + + + + + + + - - + + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - + + + - - - - - - - - - - + + + + - - - - + + + + + + + - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - + + - - - - + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,20 @@ - - - - - + + + + + + + - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar_mycard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar_mycard.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar_mycard.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,48 +1,53 @@ - + + - - - - - - - - + + + + - - - - - + + + + + + - - - - + + + + + - - + + + + + + + - - - + + + - - - - + + + + - - - - - + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,60 +1,63 @@ - + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,24 +1,28 @@ - + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,50 +1,61 @@ - + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - + + + + - - - - - + + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,28 @@ - - + - - - - - + + + + + + - - - - - + + + + + + - - - - + + + + - - + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide_connection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide_connection.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide_connection.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,52 +1,61 @@ - - + - - - - - + + + + + + - - - - - + + + + + + - - - - + + + + - - + + + - - - - - + + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,33 +1,39 @@ - + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - + + + + - - - - - + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,46 +1,63 @@ - + + - - - + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,168 +1,276 @@ - + + + - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - + + + + - - - - - - + + + + + + + + + + + + - - - - - + + + + + + + - - - - + + + + + + + + + + + + - - - - + + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,87 +1,104 @@ - - - - - - + + + + + + + + - - - - - + + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - - - - - + - - - - - + + + + + + - + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,145 +1,164 @@ - - - - - - + + + + + + + + - - - - - + + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + + + + - - - - - + + + + + + + - - - - - - - - - - - + + + + - - - - - - - + + + + + + + - + - - - - - + + + + + + - + - + + - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,81 +1,94 @@ - - - - - - + + + + + + + + - - - - - + + + + + + + + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + - - - - - - - + + + + + - - - - - + + + + - - - - + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - - - - - + - - - - - + + + + + + - + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,133 +1,152 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + + - - - - - - + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - - - - + + + + + + + - + + + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,88 +1,107 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + + - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + + - - - - - + + + + - - - - + + + + + + + + + - - - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,76 +1,81 @@ - + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + - - + + - - - - + + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,205 +1,296 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + - - - - - - + + + + - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + - - - - - - - - + + + + + + + - - - - + + + + + + - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,221 +1,313 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - + + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + - - - - + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,222 +1,312 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - + + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + - - - - + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - + + + + + + - + + + + + + + - - - - + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,184 +1,213 @@ - - - - - - + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + + + - - - - - - - - - + + + - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - + - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,167 +1,255 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - - - + + + - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + - - - - + + + + + + + + + + + + - - - - - + + + + - - - - + + + + + - + + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,179 +1,268 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + + + - - - - - + + + + + + - - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,180 +1,267 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + + + + - - - - + + + + - - - - - + + + + - - - - + + + + + + + + + + - - - - - + + + + + + - - - - - + + + + + - + - - - - + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,113 +1,131 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + + - - - - - - - + + + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + - - - + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + - - - - + + + + - - - - + + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,129 +1,148 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + + - - - - - - - + + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - - + + + + - - - - - - - + + + + + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,130 +1,147 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + + - - - - - - - + + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - - + + + + - - - - - - - + + + + + + + + + + - - - - - + + + + + + - - - - - + + + + + - + - - - - + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,42 +1,43 @@ - + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - + @@ -45,7 +46,7 @@ - + @@ -55,82 +56,208 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,90 +1,113 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - - - + + + - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + + + - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + - - - - + + + + + + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,65 +1,73 @@ - + + - - - - + + + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - + + + + + - - - - - - - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,90 +1,112 @@ - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + + + + + + - - - - - - - - - + + + + - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,129 +1,153 @@ - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + - - - - - + + + + + + + + + - - - - - - + + + + + - - - - + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,145 +1,217 @@ - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - + + + + + - + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,102 +1,116 @@ - + + - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + + - - - - + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + - - - - + + + + + + - - - - - + + + + + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,68 +1,81 @@ - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - + - - - - - + + + + + + + + + + - - - - + + + + + + - - - - - - + + + + - - - - - + + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,67 +1,97 @@ - - + - - - - + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,39 @@ - + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + + - - + + @@ -44,25 +46,27 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,39 @@ - + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + + - - + + @@ -44,64 +46,68 @@ - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + - - - - - + + + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + + + + + + + - - - - - - - - - - + + + + - - + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,27 +1,29 @@ - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - + + + + + - - + + @@ -34,25 +36,27 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,27 +1,29 @@ - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - + + + + + - - + + @@ -34,64 +36,68 @@ - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + - - - - - + + + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + + + + + + + - - - - - - - - - - + + + + - - + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,58 +1,69 @@ - + + - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + - - - - + + + + - - - - + + + + + - - - - - + + + + + + + + + + - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,48 +1,57 @@ - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + - - - - - - + + + + - - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,39 @@ - + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,190 +1,200 @@ - + + - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + + - - - - - + + + + + + - - - + + + - - - - + + + + - - - - + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_date_time.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_date_time.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_date_time.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,121 +1,140 @@ - - - - - - + + + + + + + + - - - - - + + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - + + + + + + - + - + + - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + + - - + + @@ -128,22 +147,23 @@ - - - - + + + + - - - - + + + + - - - - + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,128 +1,176 @@ - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + + + - - - - + + + + + - - - - + + + + + - - - - - + + + + - - - - - + + + + + + + - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - + + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,134 +1,153 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + - - - - - + + + + - - - - + + + + + - - - - - + + + + - - - - + + + + - - - - + + + + + + - - - - - - + + + + + + + + + - - - - - - - - + + + + - - - - + + + + + + + + + + - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - - - + + + - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + + + - + + + + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,114 +1,132 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + - - - + + + - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + - + + + - - - - - + + + + + + - + + - - - + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,10 +1,11 @@ - + + - - - + + + @@ -16,30 +17,32 @@ - - - + + + - - - + + + - - - + + + - - - + + + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,21 @@ - - - - - - + + + + + + + - - - - + + + + + - + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,42 +1,44 @@ - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - + - - - + + + - - - - - - - + + + + + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,24 +1,27 @@ - + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_disabled.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_disabled.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,27 @@ - - + - - - - - + + + + + + - - - - - + + + + + + - - - - + + + + - - + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,179 +1,207 @@ - + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - + + + - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - + - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,63 +1,68 @@ - + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - + + + - - - - - + + + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + + + + + + + - - - - - - - - - - + + + + - - + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,45 +1,50 @@ - + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - + + + - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,79 +1,132 @@ - + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - + + + - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - + + + + + - + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_emergency_call.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_emergency_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,43 @@ - + + - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,22 +1,25 @@ - + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,35 @@ - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,83 +1,92 @@ - + + - - - - + + + + - - - - - - - - - - - - + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + + + + - - - - - - - - - + - - - - + + + + - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,31 +1,35 @@ - - - - - - + + + + + + + - - + + - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,70 +1,76 @@ - + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,173 +1,204 @@ - + + - - - + + + + + - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,141 +1,157 @@ - + + - - - - - - - - - - - - - + + + + + + + - - - - + + + + + + + - - - - + + + + - - - - - + + + + + + + + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + - + + + - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,155 +1,159 @@ - + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,123 +1,128 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - - - - + - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - - - - + - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,31 @@ - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,192 +1,225 @@ - + + - - - + + + + + - - - - - + + + + + + - - - - - - - - - - + + + + + - - - - + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + - - - - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + + + - - - - - - + + + + + + + + - - - - - + + + + + - + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,25 +1,28 @@ - + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,41 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,57 +1,59 @@ - - - - - + + + + + - - - - + + + + - - - - + + + + - + - - - + + + - - - - + + + + - + - - - + + + - - - - - + + + + + - - - - + + + + - - + + - - - + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,44 +1,48 @@ - + + + - - - - + + + + - + - - + + - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + + - + - + - + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,145 +1,151 @@ - + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - + + - - - - + + + + - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + - - - - + + + + + - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,35 @@ - + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - \ No newline at end of file + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info_trusted.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info_trusted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info_untrusted.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info_untrusted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,76 +1,86 @@ - + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,193 +1,362 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + - - - - - + + + + - + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + + - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,70 +1,79 @@ - + + + - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + + - - - - + + + + + - - - - - - + + + + + + + - - - - + + + + + - - + + - - - - - + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,70 +1,77 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + + - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + - \ No newline at end of file + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,139 +1,215 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - + + + + - - - - - + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - - - + + + + - - - - - - - - + + + + + + + + + + - - - - + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + - - - - - + + + + - - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,253 +1,381 @@ - + + - - - - + + + + - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,83 +1,85 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,84 +1,88 @@ - + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_map_placeholder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_map_placeholder.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_map_placeholder.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,106 +1,109 @@ - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,57 +1,60 @@ - + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps_disabled.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps_disabled.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,59 +1,60 @@ - - + - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,125 +1,131 @@ - + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + - - - - - - + + + + - - - - + + + + + + + + + + - - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + - - - - - + + + + + - - - - - - - - - + + + + - - - - + + + + + - - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,58 +1,66 @@ - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + + + + + + + - - - - - - - - + + + + - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,80 +1,85 @@ - - - - - + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - + + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,39 +1,42 @@ - + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + - - - - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,194 +1,222 @@ - + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - + + + - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - + + + + - - - - + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - + - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,78 +1,83 @@ - + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + - - - - - - - - - - + + + - - - - - + + + + + + - - - - - + + + + + - - + + - - - + + + - - - - + + + + + + + + + + - - - - - - - - - - + + + + - - + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,94 +1,147 @@ - + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - + + + + + - + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,131 +1,179 @@ - + + - - - + + + - - - - + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,16 +1,22 @@ - - - - - + + + + + - - - - + + + + - - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,47 +1,85 @@ - + + - - - + + + - - - - + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,98 +1,141 @@ - + + - - - + + + + + + + + + + + + + + - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,52 +1,84 @@ - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - + - - - + + + + + + + + - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + + - - + + + + + + + + + + + + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,54 +1,84 @@ - - + - - - + + + - - - - + + + + - - - - - - + + + + + + - + - - - + + + + + + + + - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + + - - + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,97 +1,112 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - - - + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - - + + + + - - - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,35 +1,39 @@ - + + - - - + + + - - - - - + + + + + + - - - - - + + + + + - + - - - - + + + + - - - - + + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,49 +1,52 @@ - + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - - - + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,86 +1,98 @@ - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,48 +1,50 @@ - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,63 +1,68 @@ - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - + + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_disabled.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_disabled.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,50 +1,50 @@ - - + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,113 +1,121 @@ - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + - - - + + + - - - - - + + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + + - - - - + + + + + - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,119 +1,130 @@ - + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - + + + + - - - - - - - + + + + + + + + + + + + + + + + - + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,39 +1,42 @@ - + + - - - + + + - - - - - + + + + + - - - - + + + + - - + + - - - + + + - - - - + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,40 +1,46 @@ - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,49 +1,57 @@ - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,61 +1,69 @@ - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,66 +1,70 @@ - + + - - - - - - - - - - + + + + - - - - - - - + + + + + - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,53 +1,57 @@ - - - - - + + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,113 +1,159 @@ - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + + + - - - - + + + + + - - - - + + + + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,32 +1,34 @@ - + + - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - + @@ -35,60 +37,64 @@ + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,20 @@ - + + - - - - + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,57 +1,78 @@ - + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + - - - - - + + + + + + + + - - - + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_operator_info.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_operator_info.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_operator_info.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,63 +1,73 @@ - + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,46 +1,48 @@ - - - - - + + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - - - - - + + + + + + - - + + - - - + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,156 +1,164 @@ - + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - + + + + + + + + + + - - - - - + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - + - - - - - + + + + + - - - + + + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,206 +1,255 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + - - - + + + - - - - + + + + + + + + + - - - - + + + + + + - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + - - - - - + + + + + + + - - - - - - - + + + + - - - - - + + + + - - - - - - - - - + + + + + + - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - + + + + + + + + + - - - - + + + + + + + - - - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - + + + + + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,60 +1,66 @@ - + + + - - - + + + - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - + + + + + - - - - + + + + - + - - - + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photo_collection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photo_collection.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photo_collection.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,106 +1,118 @@ - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,84 +1,92 @@ - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - - + + + + + - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,36 +1,38 @@ - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,21 +1,24 @@ - + + + - - - + + + - - - - + + + + - - - - + + + + - + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,29 +1,32 @@ - + + - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + + - + @@ -32,33 +35,37 @@ + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,40 +1,43 @@ - + + + - - - - - - + + + + + + + - + - - - - + + + + - - - - - - - + + + + + + + - - + + - - - - - + + + + + - + @@ -42,59 +45,63 @@ - - - - + + + + - + + - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - + + + @@ -105,4 +112,4 @@ - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,104 +1,127 @@ - + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - - - - - + + + + + - - - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,78 +1,99 @@ - + + - - - + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - - + + + + - - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - + + + + - + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,39 @@ - + + - - - - - - + + + + + + - + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + @@ -41,27 +42,28 @@ - + - - - - + + + + - + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,27 +1,31 @@ - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query_trusted.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query_trusted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query_untrusted.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query_untrusted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,152 +1,308 @@ - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + + + + + - - - - + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + - - - - - + + + + + + + - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,19 +1,22 @@ - - - - - - + + + + + + - + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,110 +1,151 @@ - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - + + + + - - - - + + + + - - - - - - - - + + + - - - - + + + + + + + + + + + + + + - - - - + + + + + + - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + - - - - - + + + + + + + + + + - - - - + + + + + - - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,126 +1,143 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - - - - - - - + + + + - - - - + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + - + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,67 +1,112 @@ - + + - - - - + + + + - - - - - + + + + + + + + + + + + + + + - - - - + + + + + + + - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,55 +1,60 @@ - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,42 +1,44 @@ - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,150 +1,200 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + - - - - - + + + + - - - - + + + + + - - - - + + + + + - - - - - + + + + - - - - - + + + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,148 +1,159 @@ - + + - - - - - - - - - - - - - + + + + + - - - - - + + + + + + + - - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + + + - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + + - - - - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,48 +1,87 @@ - + + - - - - + + + + + + + + + + + + + + + - - - - - + + + + - - - - + + + + + + + - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,61 +1,64 @@ - + + - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - + - - - - + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,215 +1,228 @@ - + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - - + + + + + + - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + + - - - - + + + + - - - - + + + + + + - - - + + + - - - + + + - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + + + + @@ -217,34 +230,36 @@ - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,78 +1,97 @@ - + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - - + + + + - - - - + + + + - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,62 +1,93 @@ - + + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_swupdate.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_swupdate.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_swupdate.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,129 +1,144 @@ - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + - - - - + + + + + + + - - - - + + + + - - - - - + + + + - - - - + + + + + + - + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,57 +1,60 @@ - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + + + + + + - - - - + + + + + - - - - + + + + - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,29 +1,32 @@ - + + - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + + - + @@ -32,4 +35,6 @@ - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,40 @@ - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,141 +1,148 @@ - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + - - - - + + + + - + - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,31 +1,34 @@ - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,40 +1,45 @@ - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + + + - - - - - + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,167 +1,184 @@ - + + - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - - - + + + + - + - - - + + + + + + + + - - - - + + + + - - - - + + + + + + - - - - - - + + + + + + + + + - - - - - - - - + + + + - - - - + + + + - - - - + + + + + - - - - - + + + + + + + + + - - - - - - - + + + + + - + + + - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,27 +1,31 @@ - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,70 +1,86 @@ - + + - - - + + + - - - - + + + + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,109 +1,127 @@ - + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - + + + + + + - - + + + + + + + + - - - - - - - - + + + - - - - - + + + + + + + + + + - - - - + + + + - - + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,125 +1,191 @@ - + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + + - + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,29 @@ - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,55 +1,63 @@ - + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - + + - - - + + + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,32 +1,35 @@ - + + - - - - - + + + + + + + + + + + + + - - - - - - - + + + + - - - - + + + + + - - - - - - - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,120 +1,135 @@ - + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,112 +1,126 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,120 +1,136 @@ - + + - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,120 +1,134 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,133 +1,149 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - + + + + + + + - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + + - - + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,66 +1,68 @@ - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,101 +1,115 @@ - - - - - - + + + + + + + - - - - + + + + + - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - + + + + + + + - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,49 +1,55 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - - - - - + + + + + + - + + - - - + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,100 +1,116 @@ - - - - - + + + + + - - - - + + + + - - - - - - - - - + + + + - - - - - - - + + + + + + + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - + + + + + + + - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,51 +1,56 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,51 +1,56 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - - - - - - + + + + + + + + - - - - - + + + + + - + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,103 +1,116 @@ - - - - - - + + + + + + - + + - - - - - - - - - - - - - - + + + + + - - - - - - - + + + + + + + + + + - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - + + + + + + - - - - - + + + + + + + - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,66 +1,71 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + + - - + + @@ -73,22 +78,23 @@ - - - - + + + + - - - - + + + + - - - - + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,60 +1,66 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,65 +1,71 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - + + + + - - - - + + + + + - - - - - - - - - - - + + + + + + - - - - - - + + + + + - - - - + + + + + + - - + + + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,42 @@ - + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,42 +1,43 @@ - + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - + @@ -45,7 +46,7 @@ - + @@ -55,73 +56,197 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - + + + + + + + + - - - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_ui.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_ui.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_ui_off.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_ui_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,65 +1,73 @@ - + + - - - - + + + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - + + + + + - - - - - - - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,57 +1,64 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,65 +1,74 @@ - + + - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,65 +1,72 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - + + + + + - - - - - - - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,65 +1,72 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - + + + + + - - - - - - - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,68 +1,77 @@ - - - - - - + + + + + + + - - - - + + + + + - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,67 +1,78 @@ - - - - - + + + + + - - - - + + + + - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,70 +1,78 @@ - - - - - - + + + + + + - + + - - - - - + + + + + - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,41 @@ - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,30 +1,33 @@ - - - - - + + + + + - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning_trusted.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning_trusted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning_untrusted.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning_untrusted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,21 +1,23 @@ - + + - - - - - + + + + + - - - - - + + + + + - + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,78 +1,96 @@ - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + + - - - - - + + + + + - - - - + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,57 +1,59 @@ - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,51 +1,73 @@ - + + - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + + + + + + - - - - - + + + + - - - - + + + + + + + - - - - - - - + + + + + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,60 +1,84 @@ - + + - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + - - - - - + + + + + + + + + - - - - + + + + + + + - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - + + + + + + - + + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_work.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,142 +1,145 @@ - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - \ No newline at end of file + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_als_call_one.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_als_call_one.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_als_call_one.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_als_call_two.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_als_call_two.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_als_call_two.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - + - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camcorder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camcorder.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camcorder.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,9 +1,9 @@ - + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camera.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camera.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_cam_mode_camera.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,10 +1,10 @@ - + - + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast_high.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast_high.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast_high.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,9 @@ - - - - - \ No newline at end of file + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast_low.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast_low.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast_low.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,9 @@ - - - + + + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_countdown_timer.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_countdown_timer.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_countdown_timer.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_emergency_call.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_emergency_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,10 @@ + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_no_location_lock.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_no_location_lock.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_no_location_lock.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,9 +1,12 @@ - - - + + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hwr.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hwr.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_list.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_list.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_hard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_hard.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_hard.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - - + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_soft.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_soft.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness_soft.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - - - + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty_hi.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty_hi.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty_hi.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,9 +1,9 @@ - + - - - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_trim.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_trim.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_trim.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - + + + - - - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_use_image.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_use_image.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wildcard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wildcard.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wildcard.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,8 +1,11 @@ - - - - - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,19 @@ - + + - - - + + + + + + + + + - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,45 +1,58 @@ - + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,58 +1,68 @@ - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + - - - - + + + + + - - - - - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,12 +1,16 @@ - + + - - - - - + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,40 +1,43 @@ - + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - \ No newline at end of file + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,20 @@ - + + - - - + + + - - - - + + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,21 +1,29 @@ - + + - - - - - + + + + + - - - - - - - - + + + + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,29 +1,39 @@ - + + - - - - - + + + + + + - - - - + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,41 @@ - + + - - - - - - + + + + + + - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,40 +1,47 @@ - + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + - - - - - - - - + + + + - - - - - \ No newline at end of file + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,41 +1,44 @@ - + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - \ No newline at end of file + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,29 @@ - + + - - - + + + - + - + - - - + + + - - - - + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,51 @@ - - + + - - - + + + - - - - + + + + - - + + + + + + - - - + + + - - - - + + + + + + + + + - - - - - - + + + + + - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,62 +1,79 @@ - + + - - - - + + + + + - - - - - + + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + + + + + - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,60 +1,63 @@ - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,15 +1,18 @@ - - - - - - + + + + + + + + + + + + - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,62 +1,88 @@ - + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,19 @@ - + + + - - - - + + + + + + + + + - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,29 +1,37 @@ - - - - - - - + + + + + + + + + - - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,20 +1,26 @@ - - + + - - - + + + - - - - - - + + + + + - - - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,36 +1,46 @@ - + + - - - - + + + + - + - - - + + + + + + + + - - - - + + + + + + + + + + - - - - - - + + + + - - - - - - + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,19 +1,23 @@ - + + - - - + + + - - - - - + + + + + - - - - \ No newline at end of file + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,25 +1,30 @@ - + + + - - - - - - - + + + - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,15 @@ - + + + + + + + - - - - - - - - - - + + @@ -28,7 +26,7 @@ - + @@ -36,4 +34,12 @@ - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_drm_rights_expired.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_drm_rights_expired.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_drm_rights_expired.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,32 +1,42 @@ - - - - - - + + + + + + + + + - - - - - - - + - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,19 @@ - + + + + + + + + - - - - + + + + - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,25 +1,31 @@ - + + - - - - + + + + - - - - - - - - + + + + + + + + + + + - - - - + + + + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,34 @@ - + + - - - - + + + + - - - - - - - - + + + + + + + + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,15 +1,18 @@ - - + + - - - - - - + + - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,20 @@ - + + - - - + + + - - - - + + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,40 @@ - + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,12 +1,16 @@ - + + + + + - - - - + + + + - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,61 +1,91 @@ - - - - - - + + + + + + - - - - + + + + + + + + + - - - - + + + + + + - - - - - - + + + - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + - - - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,72 +1,104 @@ - + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,73 +1,105 @@ - + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,31 +1,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,16 +1,20 @@ - - - + + + - - - - + + + + + + + + - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,27 +1,29 @@ - + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,13 +1,18 @@ - + + - - - + + + + + + + + - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,16 +1,21 @@ - + + - - - - - - - - - + + + + + - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,63 +1,67 @@ - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + - - - - - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,59 +1,70 @@ - + + - - - - + + + + - - - - + + + + - - - - + + + + + + + - - - - - + + + + + - - + + - - - + + + + + + + + - - - - - - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,41 +1,46 @@ - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,23 +1,25 @@ - - - - - - + + + + + + - + - - - + + + - - + + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,18 +1,26 @@ - - - - - - + + + + + + + + + - - - - + + + + + + - - - - \ No newline at end of file + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,33 +1,55 @@ - - - - - - + + + + + + - + - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,31 +1,37 @@ - + + - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,32 +1,39 @@ - + + - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,40 +1,96 @@ - + + - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,25 +1,28 @@ - + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,104 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,47 +1,73 @@ - + + - - - - + + + + + + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + - - \ No newline at end of file + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,58 +1,86 @@ - + + - - - - + + + + + + + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,59 +1,87 @@ - + + - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - - + + + + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,20 +1,25 @@ - + + - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,23 +1,28 @@ - + + + + - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,40 +1,43 @@ - + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - \ No newline at end of file + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_map.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_map.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,47 +1,49 @@ - + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,23 +1,30 @@ - + + - - - - + + + + + - - - - - + + + + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,13 +1,18 @@ - + + + + + + + - - - - + + + + - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,44 +1,72 @@ - - - - - - + + + + + + - + - - - + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,44 +1,46 @@ - + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,55 +1,59 @@ - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,56 +1,60 @@ - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,10 +1,12 @@ - + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,10 +1,12 @@ - + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,7 @@ - + + @@ -10,4 +11,5 @@ - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,7 @@ - + + @@ -9,4 +10,5 @@ - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,7 @@ - + + @@ -10,4 +11,5 @@ - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,19 +1,21 @@ - - - - - - + + + + + + - + - - - + + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,33 @@ - - - - - - + + + + + + - + - - - + + + - - - - - - - + + + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,32 +1,39 @@ - + + - - - - + + + + - - + + - + - + - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,35 @@ - + + - - - - + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,19 +1,22 @@ - + + - - - - + + + + - + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,52 +1,61 @@ - + + - - - - - + + + + + + - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,23 +1,34 @@ - + + - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_no_signal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_no_signal.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_no_signal.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,25 +1,35 @@ - - + + - - - + + + - - + + - - - - + + + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,15 +1,19 @@ - - + + - - - + + + + + + + + + + - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,21 @@ - + + - - - - + + + + - - - - + + + + + + + - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,18 +1,23 @@ - + + - - - - - + + + + + - - - - + + + + + + + + - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,41 @@ - + + - - - + + + - + - - - + + + + + + + + - - - - + + + + + + + + + - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,27 +1,30 @@ - + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - \ No newline at end of file + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,39 +1,42 @@ - + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + - - - - + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,22 @@ - + + - - - - + + + + + - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,31 +1,33 @@ - - - - - - + + + + + + - + - - - + + + + + + + + + + - - - - - - + + + + + - - - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,45 @@ - - - - - - + + + + + + - + - - - + + + - - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,37 +1,42 @@ - + + - - - - + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,51 +1,58 @@ - + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + + + + + - - - - + + + + + + + + + + + + - - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,39 +1,42 @@ - + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,13 +1,17 @@ - + + + + + + - - - - + + + + - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,34 @@ - - + + - - - + + + - + - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,39 +1,53 @@ - + + - - - + + + - + - - - + + + - - + + - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + - - \ No newline at end of file + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,19 +1,21 @@ - - + + - - - + + + - + - - - + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,18 @@ - + + - - - + + + + + + + + - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,27 +1,29 @@ - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_disabled.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_disabled.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,8 +1,10 @@ - - + + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,30 +1,32 @@ - - + + - - - + + + - - - - + + + + - - + + - - - + + + - - - - - - + + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,13 +1,17 @@ - - - - - - + + + + + + + + + + + - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_disabled.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_disabled.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,9 @@ - - + + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,18 +1,20 @@ - - + + - - - + + + - - - - + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,24 +1,29 @@ - + + + - - - - - + + + + + - - - - - - + + + + + + + - - - - + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,20 @@ - + + - - - - - + + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,12 +1,17 @@ - + + - - - + + + + + + + - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,18 +1,24 @@ - + + - - - - + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,41 @@ - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,15 +1,20 @@ - + + - - - - + + + + + + + + + + + - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,22 +1,30 @@ - + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,13 +1,17 @@ - + + - - - + + + + + + + - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,19 +1,22 @@ - + + + - - - - + + + + - - - + + + - - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,7 @@ - + + @@ -8,4 +9,7 @@ - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_search.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_search.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,21 +1,23 @@ - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_disabled.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_disabled.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,8 +1,9 @@ - - + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,26 +1,27 @@ - - + + - - - + + + - - - - + + + + - + - - - + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,27 +1,28 @@ - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,16 +1,19 @@ - + + - - - - + + + + - - - - + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,18 +1,26 @@ - - - - - - + + + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,25 +1,38 @@ - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,18 +1,29 @@ - + + - - - + + + - + - + + + + + - - - - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,35 @@ - + + - - - + + + - + - - - + + + - - - - + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,25 +1,32 @@ - + + - - - + + + - + - + + + + + - - - + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,25 +1,28 @@ - + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,51 +1,59 @@ - + + + - - - - + + + + + - - - - - + + + + + - + - - - + + + - - - - + + + + - + - - + + + + + + - + - - - + + + - - - - + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,43 +1,54 @@ - + + + + + + - - - - - + + + + + + - - - - - + + + + + + + + + + + - - - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,46 @@ - + + + - - - - - + + + + + + - - - + + + - + - - - - - - + + + + + + + + + + + + - - - - - + + + + - - - - - - - - - \ No newline at end of file + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,32 +1,38 @@ - + + + - - - - - + + + + + + - - - - - - - - - - - + + + + + + + - - - - + + + + - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,52 +1,69 @@ - + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - + - - - + + + - - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + - - - - + + - - \ No newline at end of file + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,12 +1,16 @@ - + + + - - - - + + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,22 +1,26 @@ - + + + - - - - - + + + + + + - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,42 @@ - + + + - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,42 +1,46 @@ - + + + - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - + + - + - - - - - - - + + + + + + + - + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,39 +1,56 @@ - + + + - - - - - + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - + + - - - + + + + + + + + - - - - + + + + + + + + - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,47 +1,64 @@ - + + + - - - - - + + + + + + - - - + + + - + - - - + + + + + + + + + - - - - - + + + + + + - - - - - - + + + + + + + + + + - - - - + + - - - - - - + + + - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,34 +1,46 @@ - + + + - - - - - + + + + + + - - - - - + + + + + - + - - - + + + - - + + + + + + - - - - - - + + + - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,36 @@ - + + + - - - - - + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,47 +1,64 @@ - + + + - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - + + - - - + + + + + + + + - - - - + + + + + + + + - - - - + + + + + + + + - - - - + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,41 +1,45 @@ - + + + - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - + - - - + + + - - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,34 +1,46 @@ - + + + - - - - - + + + + + + - - - - - + + + + + - + - - - + + + - - + + + + + + - - - - - - + + + - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,46 +1,54 @@ - + + + - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,33 +1,41 @@ - + + + - - - - - + + + + + + - - - - - + + + + + - + - - - + + + + + + + + - - - - - - - - + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,49 +1,53 @@ - + + + - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - + + + + - - - - - - - - - - - + + + + - - - - - + + + + + + + + + + + - - - - - \ No newline at end of file + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,34 +1,42 @@ - + + + - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - + - + - - - - + + + + + + + + - + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,13 +1,17 @@ - + + + + + + - - - - + + + + - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,40 +1,42 @@ - - - - - - - + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - + + - - - - - + + + + + + - - - - - - + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,16 @@ - - + - - - - + + + + + + + + - - + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,42 +1,49 @@ - - - - - - - + + + + + + + + - - - - - + + + + + + - - - - - - - - - - + + + + + + + - - - - + + + + + - - + + + + + + + - - + + - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,22 +1,25 @@ - + + - - - - + + + + - - - - - - - + + + + + + + - - - - - \ No newline at end of file + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,18 +1,21 @@ - - + - - - - + + + + + + + + + + + + + - - - - - - + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,30 +1,38 @@ - + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,15 +1,19 @@ - - + + - - - + + + + + + + + + + - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,12 +1,16 @@ - - - - - - + + + + + + + + + + - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,43 @@ - + + - - - - - + + + + + + - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,22 +1,24 @@ - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - + + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,28 +1,35 @@ - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,16 +1,23 @@ - + + - - - + + + - - - - - - - \ No newline at end of file + + + + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,14 +1,17 @@ - - - - - + + + + + + + + + + + - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_disabled.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_disabled.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_disabled.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,8 @@ - - + + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,19 +1,20 @@ - - + + - - - + + + - - - - + + + + - + - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,32 +1,34 @@ - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - \ No newline at end of file + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,42 @@ - + + - - - - + + + + - - + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,49 +1,56 @@ - + + - - - - + + + + - - + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + + - - - - + + + + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,50 +1,59 @@ - + + - - - - + + + + - - + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,18 +1,19 @@ - + + - - - + + + - - - - + + + + - + @@ -23,8 +24,9 @@ - - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,54 +1,60 @@ - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,65 +1,74 @@ - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - + + + + - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,66 +1,77 @@ - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - - - - - + + + + + + + + + + - - - - - - - - \ No newline at end of file + + + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,47 +1,55 @@ - + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,17 +1,19 @@ - - - - - - + + + + + + - - - - - + + + + + - - \ No newline at end of file + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,24 +1,31 @@ - - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,16 +1,25 @@ - + + - - - - + + + + + + + + + + + + + + + + - - - + - - - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,22 +1,27 @@ - + + - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,29 +1,37 @@ - + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,38 +1,45 @@ - + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - \ No newline at end of file + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_connection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_connection.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_connection.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,9 +1,9 @@ - + + + - - - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_hide.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_hide.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_hide.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_hide_connection.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_hide_connection.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_hide_connection.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,9 +1,9 @@ - - + - - - - \ No newline at end of file + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_off.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_off.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth_off.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + + - - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gan.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gan.svg Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,8 @@ + + + + + + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,8 +1,8 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,9 +1,9 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,8 +1,8 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_offline.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_offline.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_offline.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - + - - - \ No newline at end of file + + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_profile_silent.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_profile_silent.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_profile_silent.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - + - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_psm.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_psm.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_psm.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - - \ No newline at end of file + + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,7 +1,7 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg --- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg Mon Oct 04 00:38:12 2010 +0300 @@ -1,10 +1,10 @@ - + - \ No newline at end of file + diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog.css --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog.css Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdialog/hbdialog.css Mon Oct 04 00:38:12 2010 +0300 @@ -27,7 +27,7 @@ text-wrap-mode:no-wrap; text-align:left; font-variant:primary; - max-height:expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup)); + /*max-height:expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup));*/ } HbDialog::background { @@ -35,7 +35,7 @@ right:0un; top:0un; bottom:0un; - max-height:expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup)); + /*max-height:expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-popup));*/ } HbDialog::controls { diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbinputsettingpopup/hbinputsettingpopup.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbinputsettingpopup/hbinputsettingpopup.css Mon Oct 04 00:38:12 2010 +0300 @@ -0,0 +1,7 @@ +HbInputSettingPopup +{ + min-width:expr(var(hb-param-screen-width)-1un); + min-height:expr(var(hb-param-screen-height)-1un); + max-width:expr(var(hb-param-screen-width)-1un); + max-height:expr(var(hb-param-screen-height)-1un); +} \ No newline at end of file diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.css --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.css Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.css Mon Oct 04 00:38:12 2010 +0300 @@ -170,7 +170,7 @@ text-line-count-min:1; text-line-count-max:1; text-wrap-mode:no-wrap; - size-policy-horizontal: ignored; + text-wrap-mode: no-wrap; } HbListViewItem::frame{ diff -r b7da29130b0e -r 80e4d18b72f5 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.widgetml --- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.widgetml Fri Sep 17 08:32:10 2010 +0300 +++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.widgetml Mon Oct 04 00:38:12 2010 +0300 @@ -59,38 +59,42 @@ icon-1: connected from TOP to item TOP and BOTTOM to item BOTTOM icon-2: center aligned with text-1 center - text-1: bottom aligned with icon-1 center - text-2: top aligned with icon-1 center + text-1 and text-2: connected on top of each other and then connected to icon-1 + using flexible anchors as top and bottom anchors. This will + center them on icon-1 center. --> - - + + + - + - + + - + - + + - + - + - + - +